Packman Build Service PMBS

Changes of Revision 4

pcsxr.changes Changed

@@ -1,4 +1,26 @@
 -------------------------------------------------------------------
+Thu Oct 31 16:22:59 UTC 2013 - gber@opensuse.org
+
+- update to version 1.9.93
+  - This release includes many bugfixes over the three years, as
+    well as many enhancements to the OS X version.
+  - In General:
+    - SIO1 support is enabled by default.
+    - OpenAL can be the back-end to the sound plug-in.
+    - Removal of the GXVideo plug-in code.
+    - Multi-block saves are copied correctly.
+- rename pcsxr-1.9.92-change-plugin-path.patch to
+  pcsxr-change-plugin-path.patch
+- remove obsolete pcsxr-1.9.92-fix-int-to-pointer-warning.patch
+- rename pcsxr-1.9.92-fix-ambiguous-expressions.patch to
+  pcsxr-fix-ambiguous-expressions.patch
+- rename pcsxr-1.9.92-change-plugin-path.patch to
+  pcsxr-change-plugin-path.patch
+- rename pcsxr-1.9.92-fix-missing-headers.patch to
+  pcsxr-fix-missing-headers.patch
+- add pcsxr-fix-array-overflow.patch which fixes an array overflow
+
+-------------------------------------------------------------------
 Wed Sep  5 16:36:20 UTC 2012 - gber@opensuse.org
 
 - add missing dependencies on automake, libtool

pcsxr.spec Changed

@@ -16,33 +16,33 @@
 #
 
 Name:           pcsxr
-Version:        1.9.92
+Version:        1.9.93
 Release:        0
 License:        GPL-2.0+
 Summary:        PlayStation Emulator
 Url:            http://pcsxr.codeplex.com/
 Group:          System/Emulators/Other
 Source:         %{name}-%{version}.tar.bz2
-# PATCH-FIX-OPENSUSE pcsxr-1.9.92-change-plugin-path.patch gber@opensuse.org -- Installs plugins in libdir/psemu
-Patch0:         pcsxr-1.9.92-change-plugin-path.patch
-# PATCH-FIX-UPSTREAM pcsxr-1.9.92-fix-int-to-pointer-warning.patch gber@opensuse.org -- Fixes implicit integer to pointer conversion warnings by removing a superfluous wrapper function
-Patch1:         pcsxr-1.9.92-fix-int-to-pointer-warning.patch
-# PATCH-FIX-UPSTREAM pcsxr-1.9.92-fix-missing-headers.patch gber@opensuse.org -- Adds missing includes
-Patch2:         pcsxr-1.9.92-fix-missing-headers.patch
-# PATH-FIX-UPSTREAM pcsxr-1.9.92-fix-ambiguous-expressions.patch gber@opensuse.org -- Fixes a number of ambiguous expressions invoking undefined behavior
-Patch3:         pcsxr-1.9.92-fix-ambiguous-expressions.patch
-# PATCH-FIX-UPSTREAM pcsxr-1.9.92-fix-linking.patch http://pcsxr.codeplex.com/workitem/7815 gber@opensuse.org -- Fixes the linking order (backported from upstream SVN)
-Patch4:         pcsxr-1.9.92-fix-linking-order.patch
-BuildRequires:  pkgconfig(gtk+-2.0)
-BuildRequires:  pkgconfig(libglade-2.0)
+# PATCH-FIX-OPENSUSE pcsxr-change-plugin-path.patch gber@opensuse.org -- Installs plugins in libdir/psemu
+Patch0:         pcsxr-change-plugin-path.patch
+# PATCH-FIX-UPSTREAM pcsxr-fix-missing-headers.patch gber@opensuse.org -- Adds missing includes
+Patch1:         pcsxr-fix-missing-headers.patch
+# PATH-FIX-UPSTREAM pcsxr-ambiguous-expressions.patch gber@opensuse.org -- Fixes a number of ambiguous expressions invoking undefined behavior
+Patch2:         pcsxr-fix-ambiguous-expressions.patch
+# PATCH-FIX-UPSTREAM pcsxr-fix-array-overflow.patch gber@opensuse.org -- Fixes an array overflow
+Patch3:         pcsxr-fix-array-overflow.patch
+BuildRequires:  pkgconfig(gtk+-3.0)
+BuildRequires:  pkgconfig(glib-2.0) >= 2.20
+BuildRequires:  pkgconfig(sdl) >= 1.2.12
+BuildRequires:  pkgconfig(zlib)
 BuildRequires:  pkgconfig(x11)
-BuildRequires:  pkgconfig(xv)
 BuildRequires:  pkgconfig(xext)
+BuildRequires:  pkgconfig(xv)
+BuildRequires:  pkgconfig(xtst)
 BuildRequires:  pkgconfig(gl)
-BuildRequires:  pkgconfig(sdl)
+BuildRequires:  libcdio-devel
 BuildRequires:  intltool
 BuildRequires:  update-desktop-files
-BuildRequires:  dos2unix
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
@@ -58,14 +58,14 @@
 use their original BIOS image.
 
 %prep
-%setup -q
-dos2unix ChangeLog ChangeLog.df
-find gui libpcsxcore plugins -name '*.[ch]' -exec dos2unix {} +
+%setup -q -n %{name}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
+
+chmod 644 ChangeLog
+
 modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")"
 DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\""
 TIME="\"$(date -d "${modified}" "+%%R")\""
@@ -75,17 +75,17 @@
 %build
 export CFLAGS='%{optflags} -fno-strict-aliasing'
 ./autogen.sh
-%configure --enable-opengl
+%configure --enable-opengl --enable-libcdio --enable-sound=sdl
 make %{?_smp_mflags}
 
 %install
 %make_install
 
-rm -f %{buildroot}%{_libdir}/psemu/*.la
+rm %{buildroot}%{_libdir}/psemu/*.la
 
-%find_lang pcsx %{?_no_lang_C}
+%find_lang pcsxr %{?_no_lang_C}
 
-%suse_update_desktop_file -r pcsx System Emulator
+%suse_update_desktop_file -r pcsxr System Emulator
 
 %post
 %desktop_database_post
@@ -93,15 +93,15 @@
 %postun
 %desktop_database_postun
 
-%files -f pcsx.lang
+%files -f pcsxr.lang
 %defattr(-,root,root)
-%doc AUTHORS ChangeLog ChangeLog.df NEWS README doc/*.txt
-%{_bindir}/pcsx
+%doc AUTHORS ChangeLog ChangeLog.df README doc/*.txt
+%{_bindir}/pcsxr
 %{_libdir}/psemu
-%{_datadir}/pcsx
+%{_datadir}/pcsxr
 %{_datadir}/psemu
-%{_datadir}/applications/pcsx.desktop
-%{_datadir}/pixmaps/pcsx-icon.png
-%{_mandir}/man1/pcsx.1*
+%{_datadir}/applications/pcsxr.desktop
+%{_datadir}/pixmaps/pcsxr-icon.png
+%{_mandir}/man1/pcsxr.1*
 
 %changelog

pcsxr-1.9.92-change-plugin-path.patch Deleted

@@ -1,94 +0,0 @@
-Index: pcsxr-1.9.92/gui/Makefile.am
-===================================================================
---- pcsxr-1.9.92.orig/gui/Makefile.am
-+++ pcsxr-1.9.92/gui/Makefile.am
-@@ -4,7 +4,7 @@ INCLUDES = -DPACKAGE_DATA_DIR=\"${datadi
- 	$(GTK2_CFLAGS) $(GLADE2_CFLAGS) \
- 	-I$(top_srcdir)/libpcsxcore -I$(top_srcdir)/include \
- 	-DPSEMU_DATA_DIR=\"${datadir}/psemu\" \
--	-DDEF_PLUGIN_DIR=\"${libdir}/games/psemu\"
-+	-DDEF_PLUGIN_DIR=\"${libdir}/psemu\"
- 
- bin_PROGRAMS = pcsx
- 
-Index: pcsxr-1.9.92/plugins/dfcdrom/Makefile.am
-===================================================================
---- pcsxr-1.9.92.orig/plugins/dfcdrom/Makefile.am
-+++ pcsxr-1.9.92/plugins/dfcdrom/Makefile.am
-@@ -1,5 +1,5 @@
--bindir = @libdir@/games/psemu/
--libdir = @libdir@/games/psemu/
-+bindir = @libdir@/psemu/
-+libdir = @libdir@/psemu/
- 
- lib_LTLIBRARIES = libDFCdrom.la
- 
-Index: pcsxr-1.9.92/plugins/dfinput/Makefile.am
-===================================================================
---- pcsxr-1.9.92.orig/plugins/dfinput/Makefile.am
-+++ pcsxr-1.9.92/plugins/dfinput/Makefile.am
-@@ -1,5 +1,5 @@
--bindir = @libdir@/games/psemu/
--libdir = @libdir@/games/psemu/
-+bindir = @libdir@/psemu/
-+libdir = @libdir@/psemu/
- 
- lib_LTLIBRARIES = libDFInput.la
- 
-Index: pcsxr-1.9.92/plugins/dfnet/Makefile.am
-===================================================================
---- pcsxr-1.9.92.orig/plugins/dfnet/Makefile.am
-+++ pcsxr-1.9.92/plugins/dfnet/Makefile.am
-@@ -1,5 +1,5 @@
--bindir = @libdir@/games/psemu/
--libdir = @libdir@/games/psemu/
-+bindir = @libdir@/psemu/
-+libdir = @libdir@/psemu/
- 
- lib_LTLIBRARIES = libDFNet.la
- 
-Index: pcsxr-1.9.92/plugins/dfsound/Makefile.am
-===================================================================
---- pcsxr-1.9.92.orig/plugins/dfsound/Makefile.am
-+++ pcsxr-1.9.92/plugins/dfsound/Makefile.am
-@@ -4,8 +4,8 @@ INCLUDES = -DPIXMAPDIR=\"${datadir}/pixm
- 	$(GTK2_CFLAGS) $(GLADE2_CFLAGS) \
- 	-I../../include
- 
--bindir = @libdir@/games/psemu/
--libdir = @libdir@/games/psemu/
-+bindir = @libdir@/psemu/
-+libdir = @libdir@/psemu/
- 
- lib_LTLIBRARIES = libDFSound.la
- 
-Index: pcsxr-1.9.92/plugins/dfxvideo/Makefile.am
-===================================================================
---- pcsxr-1.9.92.orig/plugins/dfxvideo/Makefile.am
-+++ pcsxr-1.9.92/plugins/dfxvideo/Makefile.am
-@@ -13,8 +13,8 @@ INCLUDES = -DPIXMAPDIR=\"${datadir}/pixm
- 	-I../../libpcsxcore \
- 	-I../../include
- 
--bindir = @libdir@/games/psemu/
--libdir = @libdir@/games/psemu/
-+bindir = @libdir@/psemu/
-+libdir = @libdir@/psemu/
- 
- lib_LTLIBRARIES = libDFXVideo.la
- 
-Index: pcsxr-1.9.92/plugins/peopsxgl/Makefile.am
-===================================================================
---- pcsxr-1.9.92.orig/plugins/peopsxgl/Makefile.am
-+++ pcsxr-1.9.92/plugins/peopsxgl/Makefile.am
-@@ -4,8 +4,8 @@ INCLUDES = -DPIXMAPDIR=\"${datadir}/pixm
- 	$(GTK2_CFLAGS) $(GLADE2_CFLAGS) -I/usr/X11R6/include \
- 	-I../../libpcsxcore -I../../include -fPIC
- 
--bindir = @libdir@/games/psemu/
--libdir = @libdir@/games/psemu/
-+bindir = @libdir@/psemu/
-+libdir = @libdir@/psemu/
- 
- lib_LTLIBRARIES = libpeopsxgl.la
-

pcsxr-1.9.92-fix-ambiguous-expressions.patch Deleted

@@ -1,193 +0,0 @@
-Index: pcsxr-1.9.92/plugins/peopsxgl/texture.c
-===================================================================
---- pcsxr-1.9.92.orig/plugins/peopsxgl/texture.c
-+++ pcsxr-1.9.92/plugins/peopsxgl/texture.c
-@@ -994,7 +994,10 @@ void LoadStretchPackedWndTexturePage(int
- if(ldy) 
- {ldy--;
- for(TXU=g_x1;TXU<=g_x2;TXU++)
-- *ta++=*(ta-(g_x2-g_x1));
-+ {
-+ *ta=*(ta-(g_x2-g_x1));
-+ ta++;
-+ }
- }
- }
- 
-@@ -1071,7 +1074,10 @@ void LoadStretchPackedWndTexturePage(int
- if(ldy) 
- {ldy--;
- for(TXU=g_x1;TXU<=g_x2;TXU++)
-- *ta++=*(ta-(g_x2-g_x1));
-+ {
-+ *ta=*(ta-(g_x2-g_x1));
-+ ta++;
-+ }
- }
- 
- }
-@@ -1196,7 +1202,10 @@ void LoadStretchWndTexturePage(int pagei
- if(ldy) 
- {ldy--;
- for(TXU=g_x1;TXU<=g_x2;TXU++)
-- *ta++=*(ta-(g_x2-g_x1));
-+ {
-+ *ta=*(ta-(g_x2-g_x1));
-+ ta++;
-+ }
- }
- }
- 
-@@ -1280,7 +1289,10 @@ void LoadStretchWndTexturePage(int pagei
- if(ldy) 
- {ldy--;
- for(TXU=g_x1;TXU<=g_x2;TXU++)
-- *ta++=*(ta-(g_x2-g_x1));
-+ {
-+ *ta=*(ta-(g_x2-g_x1));
-+ ta++;
-+ }
- }
- 
- }
-@@ -2239,14 +2251,19 @@ GLuint LoadTextureMovie(void)
- lu=*((uint32_t *)pD);pD+=3;
- *ta++=XMBLUE(lu)|XMGREEN(lu)|XMRED(lu)|1;
- }
-- *ta++=*(ta-1);
-+ *ta=*(ta-1);
-+ ta++;
- }
- if(b_Y)
- {
- dx=xrMovieArea.x1-xrMovieArea.x0+1;
- for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
-- *ta++=*(ta-dx);
-- *ta++=*(ta-1);
-+ {
-+ *ta=*(ta-dx);
-+ ta++;
-+ }
-+ *ta=*(ta-1);
-+ ta++;
- }
- }
- else
-@@ -2265,7 +2282,10 @@ GLuint LoadTextureMovie(void)
- {
- dx=xrMovieArea.x1-xrMovieArea.x0;
- for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
-- *ta++=*(ta-dx);
-+ {
-+ *ta=*(ta-dx);
-+ ta++;
-+ }
- }
- }
- }
-@@ -2288,14 +2308,19 @@ GLuint LoadTextureMovie(void)
- *ta++=((c&0x1f)<<11)|((c&0x3e0)<<1)|((c&0x7c00)>>9)|1;
- }
- 
-- *ta++=*(ta-1);
-+ *ta=*(ta-1);
-+ ta++;
- }
- if(b_Y)
- {
- dx=xrMovieArea.x1-xrMovieArea.x0+1;
- for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
-- *ta++=*(ta-dx);
-- *ta++=*(ta-1);
-+ {
-+ *ta=*(ta-dx);
-+ ta++;
-+ }
-+ *ta=*(ta-1);
-+ ta++;
- }
- }
- else
-@@ -2313,7 +2338,10 @@ GLuint LoadTextureMovie(void)
- {
- dx=xrMovieArea.x1-xrMovieArea.x0;
- for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
-- *ta++=*(ta-dx);
-+ {
-+ *ta=*(ta-dx);
-+ ta++;
-+ }
- }
- }
- }
-@@ -2339,14 +2367,19 @@ GLuint LoadTextureMovie(void)
- *ta++=*((uint32_t *)pD)|0xff000000;
- pD+=3;
- }
-- *ta++=*(ta-1);
-+ *ta=*(ta-1);
-+ ta++;
- }
- if(b_Y)
- {
- dx=xrMovieArea.x1-xrMovieArea.x0+1;
- for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
-- *ta++=*(ta-dx);
-- *ta++=*(ta-1);
-+ {
-+ *ta=*(ta-dx);
-+ ta++;
-+ }
-+ *ta=*(ta-1);
-+ ta++;
- }
- }
- else
-@@ -2365,7 +2398,10 @@ GLuint LoadTextureMovie(void)
- {
- dx=xrMovieArea.x1-xrMovieArea.x0;
- for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
-- *ta++=*(ta-dx);
-+ {
-+ *ta=*(ta-dx);
-+ ta++;
-+ }
- }
- }
- }
-@@ -2386,15 +2422,20 @@ GLuint LoadTextureMovie(void)
- startxy=((1024)*column)+xrMovieArea.x0;
- for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
- *ta++=LTCOL(psxVuw[startxy++]|0x8000);
-- *ta++=*(ta-1);
-+ *ta=*(ta-1);
-+ ta++;
- }
- 
- if(b_Y)
- {
- dx=xrMovieArea.x1-xrMovieArea.x0+1;
- for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
-- *ta++=*(ta-dx);
-- *ta++=*(ta-1);
-+ {
-+ *ta=*(ta-dx);
-+ ta++;
-+ }
-+ *ta=*(ta-1);
-+ ta++;
- }
- }
- else
-@@ -2410,7 +2451,10 @@ GLuint LoadTextureMovie(void)
- {
- dx=xrMovieArea.x1-xrMovieArea.x0;
- for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
-- *ta++=*(ta-dx);
-+ {
-+ *ta=*(ta-dx);
-+ ta++;
-+ }
- }
- }
- }

pcsxr-1.9.92-fix-int-to-pointer-warning.patch Deleted

@@ -1,48 +0,0 @@
-Index: pcsxr-1.9.92/plugins/dfxvideo/gpucfg-0.1df/main.c
-===================================================================
---- pcsxr-1.9.92.orig/plugins/dfxvideo/gpucfg-0.1df/main.c
-+++ pcsxr-1.9.92/plugins/dfxvideo/gpucfg-0.1df/main.c
-@@ -55,11 +55,6 @@ void on_about_clicked(GtkWidget *widget,
- 	exit (0);
- }
- 
--void set_widget_sensitive(GtkWidget *widget, gpointer user_data)
--{
--	gtk_widget_set_sensitive (widget, (int)user_data);
--}
--
- void on_fullscreen_toggled(GtkWidget *widget, gpointer user_data)
- {
- 	GtkWidget *check, *resCombo2;
-@@ -69,7 +64,7 @@ void on_fullscreen_toggled(GtkWidget *wi
- 	check = glade_xml_get_widget(xml, "checkFullscreen");
- 	resCombo2 = glade_xml_get_widget(xml, "resCombo2");
- 
--	set_widget_sensitive(resCombo2, !gtk_toggle_button_get_active(check));
-+	gtk_widget_set_sensitive(resCombo2, !gtk_toggle_button_get_active(check));
- }
- 
- void on_use_fixes_toggled(GtkWidget *widget, gpointer user_data)
-@@ -82,8 +77,8 @@ void on_use_fixes_toggled(GtkWidget *wid
- 	table_fixes = glade_xml_get_widget (xml, "table_fixes");
- 
- 	/* Set the state of each of the fixes to the value of the use fixes toggle */
--	gtk_container_foreach (GTK_CONTAINER (table_fixes), (GtkCallback) set_widget_sensitive,
--		(void *)gtk_toggle_button_get_active (check));
-+	gtk_container_foreach (GTK_CONTAINER (table_fixes), (GtkCallback) gtk_widget_set_sensitive,
-+		(gpointer)gtk_toggle_button_get_active (check));
- }
- 
- void on_fps_toggled(GtkWidget *widget, gpointer user_data)
-@@ -96,9 +91,9 @@ void on_fps_toggled(GtkWidget *widget, g
- 	checkAutoFPSLimit = glade_xml_get_widget(xml, "checkAutoFPSLimit");
- 	entryFPS = glade_xml_get_widget(xml, "entryFPS");
- 
--	set_widget_sensitive(entryFPS,
-+	gtk_widget_set_sensitive(entryFPS,
- 		gtk_toggle_button_get_active(checkSetFPS) && !gtk_toggle_button_get_active(checkAutoFPSLimit));
--	set_widget_sensitive(checkAutoFPSLimit, gtk_toggle_button_get_active(checkSetFPS));
-+	gtk_widget_set_sensitive(checkAutoFPSLimit, gtk_toggle_button_get_active(checkSetFPS));
- }
- 
- void OnConfigClose(GtkWidget *widget, gpointer user_data)

pcsxr-1.9.92-fix-linking-order.patch Deleted

pcsxr-1.9.92-fix-missing-headers.patch Deleted

pcsxr-change-plugin-path.patch Added

@@ -0,0 +1,105 @@
+Index: pcsxr/gui/Makefile.am
+===================================================================
+--- pcsxr.orig/gui/Makefile.am
++++ pcsxr/gui/Makefile.am
+@@ -4,7 +4,7 @@ AM_CPPFLAGS = -DPACKAGE_DATA_DIR=\"${dat
+ 	$(GTK3_CFLAGS) \
+ 	-I$(top_srcdir)/libpcsxcore -I$(top_srcdir)/include \
+ 	-DPSEMU_DATA_DIR=\"${datadir}/psemu\" \
+-	-DDEF_PLUGIN_DIR=\"${libdir}/games/psemu\"
++	-DDEF_PLUGIN_DIR=\"${libdir}/psemu\"
+ 
+ bin_PROGRAMS = pcsxr
+ 
+Index: pcsxr/plugins/dfcdrom/Makefile.am
+===================================================================
+--- pcsxr.orig/plugins/dfcdrom/Makefile.am
++++ pcsxr/plugins/dfcdrom/Makefile.am
+@@ -1,5 +1,5 @@
+-bindir = @libdir@/games/psemu/
+-libdir = @libdir@/games/psemu/
++bindir = @libdir@/psemu/
++libdir = @libdir@/psemu/
+ 
+ lib_LTLIBRARIES = libDFCdrom.la
+ 
+Index: pcsxr/plugins/dfinput/Makefile.am
+===================================================================
+--- pcsxr.orig/plugins/dfinput/Makefile.am
++++ pcsxr/plugins/dfinput/Makefile.am
+@@ -1,5 +1,5 @@
+-bindir = @libdir@/games/psemu/
+-libdir = @libdir@/games/psemu/
++bindir = @libdir@/psemu/
++libdir = @libdir@/psemu/
+ 
+ lib_LTLIBRARIES = libDFInput.la
+ 
+Index: pcsxr/plugins/dfnet/Makefile.am
+===================================================================
+--- pcsxr.orig/plugins/dfnet/Makefile.am
++++ pcsxr/plugins/dfnet/Makefile.am
+@@ -1,5 +1,5 @@
+-bindir = @libdir@/games/psemu/
+-libdir = @libdir@/games/psemu/
++bindir = @libdir@/psemu/
++libdir = @libdir@/psemu/
+ 
+ lib_LTLIBRARIES = libDFNet.la
+ 
+Index: pcsxr/plugins/dfsound/Makefile.am
+===================================================================
+--- pcsxr.orig/plugins/dfsound/Makefile.am
++++ pcsxr/plugins/dfsound/Makefile.am
+@@ -1,7 +1,7 @@
+ AM_CPPFLAGS = -I../../include
+ 
+-bindir = @libdir@/games/psemu/
+-libdir = @libdir@/games/psemu/
++bindir = @libdir@/psemu/
++libdir = @libdir@/psemu/
+ 
+ lib_LTLIBRARIES = libDFSound.la
+ 
+Index: pcsxr/plugins/dfxvideo/Makefile.am
+===================================================================
+--- pcsxr.orig/plugins/dfxvideo/Makefile.am
++++ pcsxr/plugins/dfxvideo/Makefile.am
+@@ -12,8 +12,8 @@ AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/
+ 	-I../../libpcsxcore \
+ 	-I../../include
+ 
+-bindir = @libdir@/games/psemu/
+-libdir = @libdir@/games/psemu/
++bindir = @libdir@/psemu/
++libdir = @libdir@/psemu/
+ 
+ lib_LTLIBRARIES = libDFXVideo.la
+ 
+Index: pcsxr/plugins/peopsxgl/Makefile.am
+===================================================================
+--- pcsxr.orig/plugins/peopsxgl/Makefile.am
++++ pcsxr/plugins/peopsxgl/Makefile.am
+@@ -4,8 +4,8 @@ AM_CPPFLAGS = -DPIXMAPDIR=\"${datadir}/p
+ 	$(GTK3_CFLAGS) \
+ 	-I../../libpcsxcore -I../../include
+ 
+-bindir = @libdir@/games/psemu/
+-libdir = @libdir@/games/psemu/
++bindir = @libdir@/psemu/
++libdir = @libdir@/psemu/
+ 
+ lib_LTLIBRARIES = libpeopsxgl.la
+ 
+Index: pcsxr/plugins/bladesio1/Makefile.am
+===================================================================
+--- pcsxr.orig/plugins/bladesio1/Makefile.am
++++ pcsxr/plugins/bladesio1/Makefile.am
+@@ -1,5 +1,5 @@
+-bindir = @libdir@/games/psemu/
+-libdir = @libdir@/games/psemu/
++bindir = @libdir@/psemu/
++libdir = @libdir@/psemu/
+ 
+ lib_LTLIBRARIES = libBladeSio1.la
+

pcsxr-fix-ambiguous-expressions.patch Added

@@ -0,0 +1,193 @@
+Index: pcsxr/plugins/peopsxgl/texture.c
+===================================================================
+--- pcsxr.orig/plugins/peopsxgl/texture.c
++++ pcsxr/plugins/peopsxgl/texture.c
+@@ -1002,7 +1002,10 @@ void LoadStretchPackedWndTexturePage(int
+ if(ldy) 
+ {ldy--;
+ for(TXU=g_x1;TXU<=g_x2;TXU++)
+- *ta++=*(ta-(g_x2-g_x1));
++ {
++ *ta=*(ta-(g_x2-g_x1));
++ ta++;
++ }
+ }
+ }
+ 
+@@ -1079,7 +1082,10 @@ void LoadStretchPackedWndTexturePage(int
+ if(ldy) 
+ {ldy--;
+ for(TXU=g_x1;TXU<=g_x2;TXU++)
+- *ta++=*(ta-(g_x2-g_x1));
++ {
++ *ta=*(ta-(g_x2-g_x1));
++ ta++;
++ }
+ }
+ 
+ }
+@@ -1204,7 +1210,10 @@ void LoadStretchWndTexturePage(int pagei
+ if(ldy) 
+ {ldy--;
+ for(TXU=g_x1;TXU<=g_x2;TXU++)
+- *ta++=*(ta-(g_x2-g_x1));
++ {
++ *ta=*(ta-(g_x2-g_x1));
++ ta++;
++ }
+ }
+ }
+ 
+@@ -1288,7 +1297,10 @@ void LoadStretchWndTexturePage(int pagei
+ if(ldy) 
+ {ldy--;
+ for(TXU=g_x1;TXU<=g_x2;TXU++)
+- *ta++=*(ta-(g_x2-g_x1));
++ {
++ *ta=*(ta-(g_x2-g_x1));
++ ta++;
++ }
+ }
+ 
+ }
+@@ -2247,14 +2259,19 @@ GLuint LoadTextureMovie(void)
+ lu=*((uint32_t *)pD);pD+=3;
+ *ta++=XMBLUE(lu)|XMGREEN(lu)|XMRED(lu)|1;
+ }
+- *ta++=*(ta-1);
++ *ta=*(ta-1);
++ ta++;
+ }
+ if(b_Y)
+ {
+ dx=xrMovieArea.x1-xrMovieArea.x0+1;
+ for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
+- *ta++=*(ta-dx);
+- *ta++=*(ta-1);
++ {
++ *ta=*(ta-dx);
++ ta++;
++ }
++ *ta=*(ta-1);
++ ta++;
+ }
+ }
+ else
+@@ -2273,7 +2290,10 @@ GLuint LoadTextureMovie(void)
+ {
+ dx=xrMovieArea.x1-xrMovieArea.x0;
+ for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
+- *ta++=*(ta-dx);
++ {
++ *ta=*(ta-dx);
++ ta++;
++ }
+ }
+ }
+ }
+@@ -2296,14 +2316,19 @@ GLuint LoadTextureMovie(void)
+ *ta++=((c&0x1f)<<11)|((c&0x3e0)<<1)|((c&0x7c00)>>9)|1;
+ }
+ 
+- *ta++=*(ta-1);
++ *ta=*(ta-1);
++ ta++;
+ }
+ if(b_Y)
+ {
+ dx=xrMovieArea.x1-xrMovieArea.x0+1;
+ for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
+- *ta++=*(ta-dx);
+- *ta++=*(ta-1);
++ {
++ *ta=*(ta-dx);
++ ta++;
++ }
++ *ta=*(ta-1);
++ ta++;
+ }
+ }
+ else
+@@ -2321,7 +2346,10 @@ GLuint LoadTextureMovie(void)
+ {
+ dx=xrMovieArea.x1-xrMovieArea.x0;
+ for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
+- *ta++=*(ta-dx);
++ {
++ *ta=*(ta-dx);
++ ta++;
++ }
+ }
+ }
+ }
+@@ -2347,14 +2375,19 @@ GLuint LoadTextureMovie(void)
+ *ta++=*((uint32_t *)pD)|0xff000000;
+ pD+=3;
+ }
+- *ta++=*(ta-1);
++ *ta=*(ta-1);
++ ta++;
+ }
+ if(b_Y)
+ {
+ dx=xrMovieArea.x1-xrMovieArea.x0+1;
+ for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
+- *ta++=*(ta-dx);
+- *ta++=*(ta-1);
++ {
++ *ta=*(ta-dx);
++ ta++;
++ }
++ *ta=*(ta-1);
++ ta++;
+ }
+ }
+ else
+@@ -2373,7 +2406,10 @@ GLuint LoadTextureMovie(void)
+ {
+ dx=xrMovieArea.x1-xrMovieArea.x0;
+ for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
+- *ta++=*(ta-dx);
++ {
++ *ta=*(ta-dx);
++ ta++;
++ }
+ }
+ }
+ }
+@@ -2394,15 +2430,20 @@ GLuint LoadTextureMovie(void)
+ startxy=((1024)*column)+xrMovieArea.x0;
+ for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
+ *ta++=LTCOL(psxVuw[startxy++]|0x8000);
+- *ta++=*(ta-1);
++ *ta=*(ta-1);
++ ta++;
+ }
+ 
+ if(b_Y)
+ {
+ dx=xrMovieArea.x1-xrMovieArea.x0+1;
+ for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
+- *ta++=*(ta-dx);
+- *ta++=*(ta-1);
++ {
++ *ta=*(ta-dx);
++ ta++;
++ }
++ *ta=*(ta-1);
++ ta++;
+ }
+ }
+ else
+@@ -2418,7 +2459,10 @@ GLuint LoadTextureMovie(void)
+ {
+ dx=xrMovieArea.x1-xrMovieArea.x0;
+ for(row=xrMovieArea.x0;row<xrMovieArea.x1;row++)
+- *ta++=*(ta-dx);
++ {
++ *ta=*(ta-dx);
++ ta++;
++ }
+ }
+ }
+ }

pcsxr-fix-array-overflow.patch Added

pcsxr-fix-int-to-pointer-warning.patch Added

@@ -0,0 +1,48 @@
+Index: pcsxr-1.9.92/plugins/dfxvideo/gpucfg-0.1df/main.c
+===================================================================
+--- pcsxr-1.9.92.orig/plugins/dfxvideo/gpucfg-0.1df/main.c
++++ pcsxr-1.9.92/plugins/dfxvideo/gpucfg-0.1df/main.c
+@@ -55,11 +55,6 @@ void on_about_clicked(GtkWidget *widget,
+ 	exit (0);
+ }
+ 
+-void set_widget_sensitive(GtkWidget *widget, gpointer user_data)
+-{
+-	gtk_widget_set_sensitive (widget, (int)user_data);
+-}
+-
+ void on_fullscreen_toggled(GtkWidget *widget, gpointer user_data)
+ {
+ 	GtkWidget *check, *resCombo2;
+@@ -69,7 +64,7 @@ void on_fullscreen_toggled(GtkWidget *wi
+ 	check = glade_xml_get_widget(xml, "checkFullscreen");
+ 	resCombo2 = glade_xml_get_widget(xml, "resCombo2");
+ 
+-	set_widget_sensitive(resCombo2, !gtk_toggle_button_get_active(check));
++	gtk_widget_set_sensitive(resCombo2, !gtk_toggle_button_get_active(check));
+ }
+ 
+ void on_use_fixes_toggled(GtkWidget *widget, gpointer user_data)
+@@ -82,8 +77,8 @@ void on_use_fixes_toggled(GtkWidget *wid
+ 	table_fixes = glade_xml_get_widget (xml, "table_fixes");
+ 
+ 	/* Set the state of each of the fixes to the value of the use fixes toggle */
+-	gtk_container_foreach (GTK_CONTAINER (table_fixes), (GtkCallback) set_widget_sensitive,
+-		(void *)gtk_toggle_button_get_active (check));
++	gtk_container_foreach (GTK_CONTAINER (table_fixes), (GtkCallback) gtk_widget_set_sensitive,
++		(gpointer)gtk_toggle_button_get_active (check));
+ }
+ 
+ void on_fps_toggled(GtkWidget *widget, gpointer user_data)
+@@ -96,9 +91,9 @@ void on_fps_toggled(GtkWidget *widget, g
+ 	checkAutoFPSLimit = glade_xml_get_widget(xml, "checkAutoFPSLimit");
+ 	entryFPS = glade_xml_get_widget(xml, "entryFPS");
+ 
+-	set_widget_sensitive(entryFPS,
++	gtk_widget_set_sensitive(entryFPS,
+ 		gtk_toggle_button_get_active(checkSetFPS) && !gtk_toggle_button_get_active(checkAutoFPSLimit));
+-	set_widget_sensitive(checkAutoFPSLimit, gtk_toggle_button_get_active(checkSetFPS));
++	gtk_widget_set_sensitive(checkAutoFPSLimit, gtk_toggle_button_get_active(checkSetFPS));
+ }
+ 
+ void OnConfigClose(GtkWidget *widget, gpointer user_data)

pcsxr-fix-missing-headers.patch Added

@@ -0,0 +1,77 @@
+Index: pcsxr/plugins/dfcdrom/cdr.c
+===================================================================
+--- pcsxr.orig/plugins/dfcdrom/cdr.c
++++ pcsxr/plugins/dfcdrom/cdr.c
+@@ -21,6 +21,10 @@
+ 
+ #include "cdr.h"
+ 
++#ifndef _MACOSX
++#include <sys/wait.h>
++#endif
++
+ #ifndef USE_NULL
+ static char *LibName = N_("CD-ROM Drive Reader");
+ #else
+Index: pcsxr/plugins/dfsound/cfg.c
+===================================================================
+--- pcsxr.orig/plugins/dfsound/cfg.c
++++ pcsxr/plugins/dfsound/cfg.c
+@@ -26,6 +26,7 @@
+ ////////////////////////////////////////////////////////////////////////
+ 
+ #include <unistd.h>
++#include <sys/wait.h>
+ 
+ ////////////////////////////////////////////////////////////////////////
+ // START EXTERNAL CFG TOOL
+Index: pcsxr/plugins/dfxvideo/cfg.c
+===================================================================
+--- pcsxr.orig/plugins/dfxvideo/cfg.c
++++ pcsxr/plugins/dfxvideo/cfg.c
+@@ -18,6 +18,7 @@
+ #define _IN_CFG
+ 
+ #include <sys/stat.h>
++#include <sys/wait.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+ 
+Index: pcsxr/plugins/bladesio1/sio1.c
+===================================================================
+--- pcsxr.orig/plugins/bladesio1/sio1.c
++++ pcsxr/plugins/bladesio1/sio1.c
+@@ -31,6 +31,8 @@ void AboutDlgProc();
+ void ConfDlgProc();
+ #else
+ #include <sys/stat.h>
++#include <sys/wait.h>
++#include <unistd.h>
+ #endif
+ 
+ #include "typedefs.h"
+Index: pcsxr/plugins/dfinput/pad.c
+===================================================================
+--- pcsxr.orig/plugins/dfinput/pad.c
++++ pcsxr/plugins/dfinput/pad.c
+@@ -20,6 +20,7 @@
+ #if !SDL_VERSION_ATLEAST(1,3,0) && defined(__linux__)
+ #include <linux/input.h>
+ #include <sys/file.h>
++#include <sys/wait.h>
+ #include <time.h>
+ #endif
+ 
+Index: pcsxr/plugins/peopsxgl/gpu.c
+===================================================================
+--- pcsxr.orig/plugins/peopsxgl/gpu.c
++++ pcsxr/plugins/peopsxgl/gpu.c
+@@ -25,6 +25,8 @@
+ #include "drawgl.h"
+ #elif !defined(_MACGL) && !defined(_WINDOWS)
+ 
++#include <sys/wait.h>
++
+ #include "config.h"
+ 
+ #ifndef NOVMODE

pcsxr-1.9.92.tar.bz2/ABOUT-NLS Deleted

pcsxr-1.9.92.tar.bz2/Makefile.in Deleted

@@ -1,682 +0,0 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(top_srcdir)/configure \
-	$(top_srcdir)/include/config.h.in ABOUT-NLS AUTHORS COPYING \
-	ChangeLog INSTALL NEWS compile config.guess config.rpath \
-	config.sub depcomp install-sh ltmain.sh missing mkinstalldirs
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  { test ! -d $(distdir) \
-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr $(distdir); }; }
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCAS = @CCAS@
-CCASDEPMODE = @CCASDEPMODE@
-CCASFLAGS = @CCASFLAGS@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GLADE2_CFLAGS = @GLADE2_CFLAGS@
-GLADE2_LIBS = @GLADE2_LIBS@
-GLIB2_CFLAGS = @GLIB2_CFLAGS@
-GLIB2_LIBS = @GLIB2_LIBS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK2_CFLAGS = @GTK2_CFLAGS@
-GTK2_LIBS = @GTK2_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
-LIBCDIO_LIBS = @LIBCDIO_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NASM = @NASM@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PEOPSXGL = @PEOPSXGL@
-PKG_CONFIG = @PKG_CONFIG@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_CONFIG = @SDL_CONFIG@
-SDL_LIBS = @SDL_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-SUBDIRS = data doc po libpcsxcore gui pixmaps plugins/dfinput \
-	plugins/dfsound plugins/dfxvideo plugins/dfcdrom plugins/dfnet \
-	$(PEOPSXGL)
-EXTRA_DIST = AUTHORS COPYING INSTALL NEWS README ChangeLog ChangeLog.df
-all: all-recursive
-
-.SUFFIXES:
-am--refresh:
-	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
-	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    echo ' $(SHELL) ./config.status'; \
-	    $(SHELL) ./config.status;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-include/config.h: include/stamp-h1
-	@if test ! -f $@; then \
-	  rm -f include/stamp-h1; \
-	  $(MAKE) $(AM_MAKEFLAGS) include/stamp-h1; \
-	else :; fi
-
-include/stamp-h1: $(top_srcdir)/include/config.h.in $(top_builddir)/config.status
-	@rm -f include/stamp-h1
-	cd $(top_builddir) && $(SHELL) ./config.status include/config.h
-$(top_srcdir)/include/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
-	cd $(top_srcdir) && $(AUTOHEADER)
-	rm -f include/stamp-h1
-	touch $@
-
-distclean-hdr:
-	-rm -f include/config.h include/stamp-h1
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool config.lt
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	$(am__remove_distdir)
-	test -d $(distdir) || mkdir $(distdir)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r $(distdir)
-dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
-
-dist-lzma: distdir
-	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-	$(am__remove_distdir)
-
-dist-tarZ: distdir
-	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
-
-dist-shar: distdir
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
-
-dist-zip: distdir
-	-rm -f $(distdir).zip
-	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
-
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	case '$(DIST_ARCHIVES)' in \
-	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
-	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lzma*) \
-	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
-	*.tar.Z*) \
-	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-	*.zip*) \
-	  unzip $(distdir).zip ;;\
-	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
-	chmod a-w $(distdir)
-	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && cd $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-	        distuninstallcheck \
-	  && chmod -R a-w "$$dc_install_base" \
-	  && ({ \
-	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-	  && rm -rf "$$dc_destdir" \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
-	$(am__remove_distdir)
-	@(echo "$(distdir) archives ready for distribution: "; \
-	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
-distuninstallcheck:
-	@cd $(distuninstallcheck_dir) \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-	   || { echo "ERROR: files left after uninstall:" ; \
-	        if test -n "$(DESTDIR)"; then \
-	          echo "  (check DESTDIR support)"; \
-	        fi ; \
-	        $(distuninstallcheck_listfiles) ; \
-	        exit 1; } >&2
-distcleancheck: distclean
-	@if test '$(srcdir)' = . ; then \
-	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-	  exit 1 ; \
-	fi
-	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-	  || { echo "ERROR: files left in build directory after distclean:" ; \
-	       $(distcleancheck_listfiles) ; \
-	       exit 1; } >&2
-check-am: all-am
-check: check-recursive
-all-am: Makefile
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-hdr \
-	distclean-libtool distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-recursive
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-info: install-info-recursive
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-ps: install-ps-recursive
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am am--refresh check check-am clean clean-generic \
-	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
-	dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \
-	distclean distclean-generic distclean-hdr distclean-libtool \
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

pcsxr-1.9.92.tar.bz2/aclocal.m4 Deleted

@@ -1,11427 +0,0 @@
-# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
-[m4_warning([this file was generated for autoconf 2.63.
-You have another version of autoconf. It may work, but is not guaranteed to.
-If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
-
-# gettext.m4 serial 60 (gettext-0.17)
-dnl Copyright (C) 1995-2007 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006.
-
-dnl Macro to add for using GNU gettext.
-
-dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
-dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
-dnl default (if it is not specified or empty) is 'no-libtool'.
-dnl INTLSYMBOL should be 'external' for packages with no intl directory,
-dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory.
-dnl If INTLSYMBOL is 'use-libtool', then a libtool library
-dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static,
-dnl depending on --{enable,disable}-{shared,static} and on the presence of
-dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
-dnl $(top_builddir)/intl/libintl.a will be created.
-dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
-dnl implementations (in libc or libintl) without the ngettext() function
-dnl will be ignored. If NEEDSYMBOL is specified and is
-dnl 'need-formatstring-macros', then GNU gettext implementations that don't
-dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
-dnl INTLDIR is used to find the intl libraries. If empty,
-dnl the value `$(top_builddir)/intl/' is used.
-dnl
-dnl The result of the configuration is one of three cases:
-dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
-dnl and used.
-dnl Catalog format: GNU --> install in $(datadir)
-dnl Catalog extension: .mo after installation, .gmo in source tree
-dnl 2) GNU gettext has been found in the system's C library.
-dnl Catalog format: GNU --> install in $(datadir)
-dnl Catalog extension: .mo after installation, .gmo in source tree
-dnl 3) No internationalization, always use English msgid.
-dnl Catalog format: none
-dnl Catalog extension: none
-dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
-dnl The use of .gmo is historical (it was needed to avoid overwriting the
-dnl GNU format catalogs when building on a platform with an X/Open gettext),
-dnl but we keep it in order not to force irrelevant filename changes on the
-dnl maintainers.
-dnl
-AC_DEFUN([AM_GNU_GETTEXT],
-[
- dnl Argument checking.
- ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
- [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
-])])])])])
- ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
- [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
-])])])])
- define([gt_included_intl],
- ifelse([$1], [external],
- ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]),
- [yes]))
- define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
- gt_NEEDS_INIT
- AM_GNU_GETTEXT_NEED([$2])
-
- AC_REQUIRE([AM_PO_SUBDIRS])dnl
- ifelse(gt_included_intl, yes, [
- AC_REQUIRE([AM_INTL_SUBDIR])dnl
- ])
-
- dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
- AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
- AC_REQUIRE([AC_LIB_RPATH])
-
- dnl Sometimes libintl requires libiconv, so first search for libiconv.
- dnl Ideally we would do this search only after the
- dnl if test "$USE_NLS" = "yes"; then
- dnl if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
- dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
- dnl the configure script would need to contain the same shell code
- dnl again, outside any 'if'. There are two solutions:
- dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
- dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
- dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
- dnl documented, we avoid it.
- ifelse(gt_included_intl, yes, , [
- AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
- ])
-
- dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation.
- gt_INTL_MACOSX
-
- dnl Set USE_NLS.
- AC_REQUIRE([AM_NLS])
-
- ifelse(gt_included_intl, yes, [
- BUILD_INCLUDED_LIBINTL=no
- USE_INCLUDED_LIBINTL=no
- ])
- LIBINTL=
- LTLIBINTL=
- POSUB=
-
- dnl Add a version number to the cache macros.
- case " $gt_needs " in
- *" need-formatstring-macros "*) gt_api_version=3 ;;
- *" need-ngettext "*) gt_api_version=2 ;;
- *) gt_api_version=1 ;;
- esac
- gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
- gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
-
- dnl If we use NLS figure out what method
- if test "$USE_NLS" = "yes"; then
- gt_use_preinstalled_gnugettext=no
- ifelse(gt_included_intl, yes, [
- AC_MSG_CHECKING([whether included gettext is requested])
- AC_ARG_WITH(included-gettext,
- [ --with-included-gettext use the GNU gettext library included here],
- nls_cv_force_use_gnu_gettext=$withval,
- nls_cv_force_use_gnu_gettext=no)
- AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
-
- nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
- if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
- ])
- dnl User does not insist on using GNU NLS library. Figure out what
- dnl to use. If GNU gettext is available we use this. Else we have
- dnl to fall back to GNU NLS library.
-
- if test $gt_api_version -ge 3; then
- gt_revision_test_code='
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-changequote(,)dnl
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-changequote([,])dnl
-'
- else
- gt_revision_test_code=
- fi
- if test $gt_api_version -ge 2; then
- gt_expression_test_code=' + * ngettext ("", "", 0)'
- else
- gt_expression_test_code=
- fi
-
- AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
- [AC_TRY_LINK([#include <libintl.h>
-$gt_revision_test_code
-extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;],
- [bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings],
- [eval "$gt_func_gnugettext_libc=yes"],
- [eval "$gt_func_gnugettext_libc=no"])])
-
- if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
- dnl Sometimes libintl requires libiconv, so first search for libiconv.
- ifelse(gt_included_intl, yes, , [
- AM_ICONV_LINK
- ])
- dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
- dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
- dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
- dnl even if libiconv doesn't exist.
- AC_LIB_LINKFLAGS_BODY([intl])
- AC_CACHE_CHECK([for GNU gettext in libintl],
- [$gt_func_gnugettext_libintl],
- [gt_save_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $INCINTL"
- gt_save_LIBS="$LIBS"
- LIBS="$LIBS $LIBINTL"
- dnl Now see whether libintl exists and does not depend on libiconv.
- AC_TRY_LINK([#include <libintl.h>
-$gt_revision_test_code
-extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias (const char *);],
- [bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
- [eval "$gt_func_gnugettext_libintl=yes"],
- [eval "$gt_func_gnugettext_libintl=no"])
- dnl Now see whether libintl exists and depends on libiconv.
- if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
- LIBS="$LIBS $LIBICONV"
- AC_TRY_LINK([#include <libintl.h>
-$gt_revision_test_code
-extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias (const char *);],
- [bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
- [LIBINTL="$LIBINTL $LIBICONV"
- LTLIBINTL="$LTLIBINTL $LTLIBICONV"
- eval "$gt_func_gnugettext_libintl=yes"
- ])
- fi
- CPPFLAGS="$gt_save_CPPFLAGS"
- LIBS="$gt_save_LIBS"])
- fi
-
- dnl If an already present or preinstalled GNU gettext() is found,
- dnl use it. But if this macro is used in GNU gettext, and GNU
- dnl gettext is already preinstalled in libintl, we update this
- dnl libintl. (Cf. the install rule in intl/Makefile.in.)
- if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
- || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
- && test "$PACKAGE" != gettext-runtime \
- && test "$PACKAGE" != gettext-tools; }; then
- gt_use_preinstalled_gnugettext=yes
- else
- dnl Reset the values set by searching for libintl.
- LIBINTL=
- LTLIBINTL=
- INCINTL=
- fi
-
- ifelse(gt_included_intl, yes, [
- if test "$gt_use_preinstalled_gnugettext" != "yes"; then
- dnl GNU gettext is not found in the C library.
- dnl Fall back on included GNU gettext library.
- nls_cv_use_gnu_gettext=yes
- fi
- fi
-
- if test "$nls_cv_use_gnu_gettext" = "yes"; then
- dnl Mark actions used to generate GNU NLS library.
- BUILD_INCLUDED_LIBINTL=yes
- USE_INCLUDED_LIBINTL=yes
- LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV $LIBTHREAD"
- LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV $LTLIBTHREAD"
- LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
- fi
-
- CATOBJEXT=
- if test "$gt_use_preinstalled_gnugettext" = "yes" \
- || test "$nls_cv_use_gnu_gettext" = "yes"; then
- dnl Mark actions to use GNU gettext tools.
- CATOBJEXT=.gmo
- fi
- ])
-
- if test -n "$INTL_MACOSX_LIBS"; then
- if test "$gt_use_preinstalled_gnugettext" = "yes" \
- || test "$nls_cv_use_gnu_gettext" = "yes"; then
- dnl Some extra flags are needed during linking.
- LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
- LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
- fi
- fi
-
- if test "$gt_use_preinstalled_gnugettext" = "yes" \
- || test "$nls_cv_use_gnu_gettext" = "yes"; then
- AC_DEFINE(ENABLE_NLS, 1,
- [Define to 1 if translation of program messages to the user's native language
- is requested.])
- else
- USE_NLS=no
- fi
- fi
-
- AC_MSG_CHECKING([whether to use NLS])
- AC_MSG_RESULT([$USE_NLS])
- if test "$USE_NLS" = "yes"; then
- AC_MSG_CHECKING([where the gettext function comes from])
- if test "$gt_use_preinstalled_gnugettext" = "yes"; then
- if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
- gt_source="external libintl"
- else
- gt_source="libc"
- fi
- else
- gt_source="included intl directory"
- fi
- AC_MSG_RESULT([$gt_source])
- fi
-
- if test "$USE_NLS" = "yes"; then
-
- if test "$gt_use_preinstalled_gnugettext" = "yes"; then
- if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
- AC_MSG_CHECKING([how to link with libintl])
- AC_MSG_RESULT([$LIBINTL])
- AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
- fi
-
- dnl For backward compatibility. Some packages may be using this.
- AC_DEFINE(HAVE_GETTEXT, 1,
- [Define if the GNU gettext() function is already present or preinstalled.])
- AC_DEFINE(HAVE_DCGETTEXT, 1,
- [Define if the GNU dcgettext() function is already present or preinstalled.])
- fi
-
- dnl We need to process the po/ directory.
- POSUB=po
- fi
-
- ifelse(gt_included_intl, yes, [
- dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
- dnl to 'yes' because some of the testsuite requires it.
- if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
- BUILD_INCLUDED_LIBINTL=yes
- fi
-
- dnl Make all variables we use known to autoconf.
- AC_SUBST(BUILD_INCLUDED_LIBINTL)
- AC_SUBST(USE_INCLUDED_LIBINTL)
- AC_SUBST(CATOBJEXT)
-
- dnl For backward compatibility. Some configure.ins may be using this.
- nls_cv_header_intl=
- nls_cv_header_libgt=
-
- dnl For backward compatibility. Some Makefiles may be using this.
- DATADIRNAME=share
- AC_SUBST(DATADIRNAME)
-
- dnl For backward compatibility. Some Makefiles may be using this.
- INSTOBJEXT=.mo
- AC_SUBST(INSTOBJEXT)
-
- dnl For backward compatibility. Some Makefiles may be using this.
- GENCAT=gencat
- AC_SUBST(GENCAT)
-
- dnl For backward compatibility. Some Makefiles may be using this.
- INTLOBJS=
- if test "$USE_INCLUDED_LIBINTL" = yes; then
- INTLOBJS="\$(GETTOBJS)"
- fi
- AC_SUBST(INTLOBJS)
-
- dnl Enable libtool support if the surrounding package wishes it.
- INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
- AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
- ])
-
- dnl For backward compatibility. Some Makefiles may be using this.
- INTLLIBS="$LIBINTL"
- AC_SUBST(INTLLIBS)
-
- dnl Make all documented variables known to autoconf.
- AC_SUBST(LIBINTL)
- AC_SUBST(LTLIBINTL)
- AC_SUBST(POSUB)
-])
-
-
-dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
-m4_define([gt_NEEDS_INIT],
-[
- m4_divert_text([DEFAULTS], [gt_needs=])
- m4_define([gt_NEEDS_INIT], [])
-])
-
-
-dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL])
-AC_DEFUN([AM_GNU_GETTEXT_NEED],
-[
- m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"])
-])
-
-
-dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
-AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
-
-# iconv.m4 serial AM6 (gettext-0.17)
-dnl Copyright (C) 2000-2002, 2007 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
-[
- dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
- AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
- AC_REQUIRE([AC_LIB_RPATH])
-
- dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
- dnl accordingly.
- AC_LIB_LINKFLAGS_BODY([iconv])
-])
-
-AC_DEFUN([AM_ICONV_LINK],
-[
- dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
- dnl those with the standalone portable GNU libiconv installed).
- AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-
- dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
- dnl accordingly.
- AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
-
- dnl Add $INCICONV to CPPFLAGS before performing the following checks,
- dnl because if the user has installed libiconv and not disabled its use
- dnl via --without-libiconv-prefix, he wants to use it. The first
- dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
- am_save_CPPFLAGS="$CPPFLAGS"
- AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
-
- AC_CACHE_CHECK([for iconv], am_cv_func_iconv, [
- am_cv_func_iconv="no, consider installing GNU libiconv"
- am_cv_lib_iconv=no
- AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
- [iconv_t cd = iconv_open("","");
- iconv(cd,NULL,NULL,NULL,NULL);
- iconv_close(cd);],
- am_cv_func_iconv=yes)
- if test "$am_cv_func_iconv" != yes; then
- am_save_LIBS="$LIBS"
- LIBS="$LIBS $LIBICONV"
- AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
- [iconv_t cd = iconv_open("","");
- iconv(cd,NULL,NULL,NULL,NULL);
- iconv_close(cd);],
- am_cv_lib_iconv=yes
- am_cv_func_iconv=yes)
- LIBS="$am_save_LIBS"
- fi
- ])
- if test "$am_cv_func_iconv" = yes; then
- AC_CACHE_CHECK([for working iconv], am_cv_func_iconv_works, [
- dnl This tests against bugs in AIX 5.1 and HP-UX 11.11.
- am_save_LIBS="$LIBS"
- if test $am_cv_lib_iconv = yes; then
- LIBS="$LIBS $LIBICONV"
- fi
- AC_TRY_RUN([
-#include <iconv.h>
-#include <string.h>
-int main ()
-{
- /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
- returns. */
- {
- iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
- if (cd_utf8_to_88591 != (iconv_t)(-1))
- {
- static const char input[] = "\342\202\254"; /* EURO SIGN */
- char buf[10];
- const char *inptr = input;
- size_t inbytesleft = strlen (input);
- char *outptr = buf;
- size_t outbytesleft = sizeof (buf);
- size_t res = iconv (cd_utf8_to_88591,
- (char **) &inptr, &inbytesleft,
- &outptr, &outbytesleft);
- if (res == 0)
- return 1;
- }
- }
-#if 0 /* This bug could be worked around by the caller. */
- /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */
- {
- iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
- if (cd_88591_to_utf8 != (iconv_t)(-1))
- {
- static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
- char buf[50];
- const char *inptr = input;
- size_t inbytesleft = strlen (input);
- char *outptr = buf;
- size_t outbytesleft = sizeof (buf);
- size_t res = iconv (cd_88591_to_utf8,
- (char **) &inptr, &inbytesleft,
- &outptr, &outbytesleft);
- if ((int)res > 0)
- return 1;
- }
- }
-#endif
- /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
- provided. */
- if (/* Try standardized names. */
- iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
- /* Try IRIX, OSF/1 names. */
- && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
- /* Try AIX names. */
- && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
- /* Try HP-UX names. */
- && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
- return 1;
- return 0;
-}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no],
- [case "$host_os" in
- aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
- *) am_cv_func_iconv_works="guessing yes" ;;
- esac])
- LIBS="$am_save_LIBS"
- ])
- case "$am_cv_func_iconv_works" in
- *no) am_func_iconv=no am_cv_lib_iconv=no ;;
- *) am_func_iconv=yes ;;
- esac
- else
- am_func_iconv=no am_cv_lib_iconv=no
- fi
- if test "$am_func_iconv" = yes; then
- AC_DEFINE(HAVE_ICONV, 1,
- [Define if you have the iconv() function and it works.])
- fi
- if test "$am_cv_lib_iconv" = yes; then
- AC_MSG_CHECKING([how to link with libiconv])
- AC_MSG_RESULT([$LIBICONV])
- else
- dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
- dnl either.
- CPPFLAGS="$am_save_CPPFLAGS"
- LIBICONV=
- LTLIBICONV=
- fi
- AC_SUBST(LIBICONV)
- AC_SUBST(LTLIBICONV)
-])
-
-AC_DEFUN([AM_ICONV],
-[
- AM_ICONV_LINK
- if test "$am_cv_func_iconv" = yes; then
- AC_MSG_CHECKING([for iconv declaration])
- AC_CACHE_VAL(am_cv_proto_iconv, [
- AC_TRY_COMPILE([
-#include <stdlib.h>
-#include <iconv.h>
-extern
-#ifdef __cplusplus
-"C"
-#endif
-#if defined(__STDC__) || defined(__cplusplus)
-size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
-#else
-size_t iconv();
-#endif
-], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
- am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
- am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
- AC_MSG_RESULT([$]{ac_t:-
- }[$]am_cv_proto_iconv)
- AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
- [Define as const if the declaration of iconv() needs const.])
- fi
-])
-
-# intlmacosx.m4 serial 1 (gettext-0.17)
-dnl Copyright (C) 2004-2007 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Checks for special options needed on MacOS X.
-dnl Defines INTL_MACOSX_LIBS.
-AC_DEFUN([gt_INTL_MACOSX],
-[
- dnl Check for API introduced in MacOS X 10.2.
- AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
- gt_cv_func_CFPreferencesCopyAppValue,
- [gt_save_LIBS="$LIBS"
- LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
- AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>],
- [CFPreferencesCopyAppValue(NULL, NULL)],
- [gt_cv_func_CFPreferencesCopyAppValue=yes],
- [gt_cv_func_CFPreferencesCopyAppValue=no])
- LIBS="$gt_save_LIBS"])
- if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
- AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1,
- [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
- fi
- dnl Check for API introduced in MacOS X 10.3.
- AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent,
- [gt_save_LIBS="$LIBS"
- LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
- AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();],
- [gt_cv_func_CFLocaleCopyCurrent=yes],
- [gt_cv_func_CFLocaleCopyCurrent=no])
- LIBS="$gt_save_LIBS"])
- if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
- AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1,
- [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
- fi
- INTL_MACOSX_LIBS=
- if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
- INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
- fi
- AC_SUBST([INTL_MACOSX_LIBS])
-])
-
-# lib-ld.m4 serial 3 (gettext-0.13)
-dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl Subroutines of libtool.m4,
-dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
-dnl with libtool.m4.
-
-dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
-AC_DEFUN([AC_LIB_PROG_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
- acl_cv_prog_gnu_ld=yes ;;
-*)
- acl_cv_prog_gnu_ld=no ;;
-esac])
-with_gnu_ld=$acl_cv_prog_gnu_ld
-])
-
-dnl From libtool-1.4. Sets the variable LD.
-AC_DEFUN([AC_LIB_PROG_LD],
-[AC_ARG_WITH(gnu-ld,
-[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
- else
- PATH_SEPARATOR=:
- fi
- rm -f conf$$.sh
-fi
-ac_prog=ld
-if test "$GCC" = yes; then
- # Check if gcc -print-prog-name=ld gives a path.
- AC_MSG_CHECKING([for ld used by GCC])
- case $host in
- *-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
- *)
- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
- esac
- case $ac_prog in
- # Accept absolute paths.
- [[\\/]* | [A-Za-z]:[\\/]*)]
- [re_direlt='/[^/][^/]*/\.\./']
- # Canonicalize the path of ld
- ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
- done
- test -z "$LD" && LD="$ac_prog"
- ;;
- "")
- # If it fails, then pretend we aren't using GCC.
- ac_prog=ld
- ;;
- *)
- # If it is relative, then search for the first ld in PATH.
- with_gnu_ld=unknown
- ;;
- esac
-elif test "$with_gnu_ld" = yes; then
- AC_MSG_CHECKING([for GNU ld])
-else
- AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(acl_cv_path_LD,
-[if test -z "$LD"; then
- IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
- for ac_dir in $PATH; do
- test -z "$ac_dir" && ac_dir=.
- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
- acl_cv_path_LD="$ac_dir/$ac_prog"
- # Check to see if the program is GNU ld. I'd rather use --version,
- # but apparently some GNU ld's only accept -v.
- # Break only if it was the GNU/non-GNU ld that we prefer.
- case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
- *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break ;;
- *)
-	test "$with_gnu_ld" != yes && break ;;
- esac
- fi
- done
- IFS="$ac_save_ifs"
-else
- acl_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$acl_cv_path_LD"
-if test -n "$LD"; then
- AC_MSG_RESULT($LD)
-else
- AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_LIB_PROG_LD_GNU
-])
-
-# lib-link.m4 serial 13 (gettext-0.17)
-dnl Copyright (C) 2001-2007 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-AC_PREREQ(2.54)
-
-dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
-dnl the libraries corresponding to explicit and implicit dependencies.
-dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
-dnl augments the CPPFLAGS variable.
-dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
-dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
-AC_DEFUN([AC_LIB_LINKFLAGS],
-[
- AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
- AC_REQUIRE([AC_LIB_RPATH])
- define([Name],[translit([$1],[./-], [___])])
- define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
- AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
- AC_LIB_LINKFLAGS_BODY([$1], [$2])
- ac_cv_lib[]Name[]_libs="$LIB[]NAME"
- ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
- ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
- ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX"
- ])
- LIB[]NAME="$ac_cv_lib[]Name[]_libs"
- LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
- INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
- LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix"
- AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
- AC_SUBST([LIB]NAME)
- AC_SUBST([LTLIB]NAME)
- AC_SUBST([LIB]NAME[_PREFIX])
- dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
- dnl results of this search when this library appears as a dependency.
- HAVE_LIB[]NAME=yes
- undefine([Name])
- undefine([NAME])
-])
-
-dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
-dnl searches for libname and the libraries corresponding to explicit and
-dnl implicit dependencies, together with the specified include files and
-dnl the ability to compile and link the specified testcode. If found, it
-dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
-dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
-dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
-dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
-dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
-dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
-AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
-[
- AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
- AC_REQUIRE([AC_LIB_RPATH])
- define([Name],[translit([$1],[./-], [___])])
- define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-
- dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
- dnl accordingly.
- AC_LIB_LINKFLAGS_BODY([$1], [$2])
-
- dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
- dnl because if the user has installed lib[]Name and not disabled its use
- dnl via --without-lib[]Name-prefix, he wants to use it.
- ac_save_CPPFLAGS="$CPPFLAGS"
- AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
-
- AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
- ac_save_LIBS="$LIBS"
- LIBS="$LIBS $LIB[]NAME"
- AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
- LIBS="$ac_save_LIBS"
- ])
- if test "$ac_cv_lib[]Name" = yes; then
- HAVE_LIB[]NAME=yes
- AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
- AC_MSG_CHECKING([how to link with lib[]$1])
- AC_MSG_RESULT([$LIB[]NAME])
- else
- HAVE_LIB[]NAME=no
- dnl If $LIB[]NAME didn't lead to a usable library, we don't need
- dnl $INC[]NAME either.
- CPPFLAGS="$ac_save_CPPFLAGS"
- LIB[]NAME=
- LTLIB[]NAME=
- LIB[]NAME[]_PREFIX=
- fi
- AC_SUBST([HAVE_LIB]NAME)
- AC_SUBST([LIB]NAME)
- AC_SUBST([LTLIB]NAME)
- AC_SUBST([LIB]NAME[_PREFIX])
- undefine([Name])
- undefine([NAME])
-])
-
-dnl Determine the platform dependent parameters needed to use rpath:
-dnl acl_libext,
-dnl acl_shlibext,
-dnl acl_hardcode_libdir_flag_spec,
-dnl acl_hardcode_libdir_separator,
-dnl acl_hardcode_direct,
-dnl acl_hardcode_minus_L.
-AC_DEFUN([AC_LIB_RPATH],
-[
- dnl Tell automake >= 1.10 to complain if config.rpath is missing.
- m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
- AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
- AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
- AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
- AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
- AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
- CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
- ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
- . ./conftest.sh
- rm -f ./conftest.sh
- acl_cv_rpath=done
- ])
- wl="$acl_cv_wl"
- acl_libext="$acl_cv_libext"
- acl_shlibext="$acl_cv_shlibext"
- acl_libname_spec="$acl_cv_libname_spec"
- acl_library_names_spec="$acl_cv_library_names_spec"
- acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
- acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
- acl_hardcode_direct="$acl_cv_hardcode_direct"
- acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
- dnl Determine whether the user wants rpath handling at all.
- AC_ARG_ENABLE(rpath,
- [ --disable-rpath do not hardcode runtime library paths],
- :, enable_rpath=yes)
-])
-
-dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
-dnl the libraries corresponding to explicit and implicit dependencies.
-dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
-dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found
-dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
-AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
-[
- AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
- define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
- dnl Autoconf >= 2.61 supports dots in --with options.
- define([N_A_M_E],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit([$1],[.],[_])],[$1])])
- dnl By default, look in $includedir and $libdir.
- use_additional=yes
- AC_LIB_WITH_FINAL_PREFIX([
- eval additional_includedir=\"$includedir\"
- eval additional_libdir=\"$libdir\"
- ])
- AC_LIB_ARG_WITH([lib]N_A_M_E[-prefix],
-[ --with-lib]N_A_M_E[-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib
- --without-lib]N_A_M_E[-prefix don't search for lib$1 in includedir and libdir],
-[
- if test "X$withval" = "Xno"; then
- use_additional=no
- else
- if test "X$withval" = "X"; then
- AC_LIB_WITH_FINAL_PREFIX([
- eval additional_includedir=\"$includedir\"
- eval additional_libdir=\"$libdir\"
- ])
- else
- additional_includedir="$withval/include"
- additional_libdir="$withval/$acl_libdirstem"
- fi
- fi
-])
- dnl Search the library and its dependencies in $additional_libdir and
- dnl $LDFLAGS. Using breadth-first-seach.
- LIB[]NAME=
- LTLIB[]NAME=
- INC[]NAME=
- LIB[]NAME[]_PREFIX=
- rpathdirs=
- ltrpathdirs=
- names_already_handled=
- names_next_round='$1 $2'
- while test -n "$names_next_round"; do
- names_this_round="$names_next_round"
- names_next_round=
- for name in $names_this_round; do
- already_handled=
- for n in $names_already_handled; do
- if test "$n" = "$name"; then
- already_handled=yes
- break
- fi
- done
- if test -z "$already_handled"; then
- names_already_handled="$names_already_handled $name"
- dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
- dnl or AC_LIB_HAVE_LINKFLAGS call.
- uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
- eval value=\"\$HAVE_LIB$uppername\"
- if test -n "$value"; then
- if test "$value" = yes; then
- eval value=\"\$LIB$uppername\"
- test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
- eval value=\"\$LTLIB$uppername\"
- test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
- else
- dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
- dnl that this library doesn't exist. So just drop it.
- :
- fi
- else
- dnl Search the library lib$name in $additional_libdir and $LDFLAGS
- dnl and the already constructed $LIBNAME/$LTLIBNAME.
- found_dir=
- found_la=
- found_so=
- found_a=
- eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
- if test -n "$acl_shlibext"; then
- shrext=".$acl_shlibext" # typically: shrext=.so
- else
- shrext=
- fi
- if test $use_additional = yes; then
- dir="$additional_libdir"
- dnl The same code as in the loop below:
- dnl First look for a shared library.
- if test -n "$acl_shlibext"; then
- if test -f "$dir/$libname$shrext"; then
- found_dir="$dir"
- found_so="$dir/$libname$shrext"
- else
- if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
- ver=`(cd "$dir" && \
- for f in "$libname$shrext".*; do echo "$f"; done \
- | sed -e "s,^$libname$shrext\\\\.,," \
- | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
- | sed 1q ) 2>/dev/null`
- if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
- found_dir="$dir"
- found_so="$dir/$libname$shrext.$ver"
- fi
- else
- eval library_names=\"$acl_library_names_spec\"
- for f in $library_names; do
- if test -f "$dir/$f"; then
- found_dir="$dir"
- found_so="$dir/$f"
- break
- fi
- done
- fi
- fi
- fi
- dnl Then look for a static library.
- if test "X$found_dir" = "X"; then
- if test -f "$dir/$libname.$acl_libext"; then
- found_dir="$dir"
- found_a="$dir/$libname.$acl_libext"
- fi
- fi
- if test "X$found_dir" != "X"; then
- if test -f "$dir/$libname.la"; then
- found_la="$dir/$libname.la"
- fi
- fi
- fi
- if test "X$found_dir" = "X"; then
- for x in $LDFLAGS $LTLIB[]NAME; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- case "$x" in
- -L*)
- dir=`echo "X$x" | sed -e 's/^X-L//'`
- dnl First look for a shared library.
- if test -n "$acl_shlibext"; then
- if test -f "$dir/$libname$shrext"; then
- found_dir="$dir"
- found_so="$dir/$libname$shrext"
- else
- if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
- ver=`(cd "$dir" && \
- for f in "$libname$shrext".*; do echo "$f"; done \
- | sed -e "s,^$libname$shrext\\\\.,," \
- | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
- | sed 1q ) 2>/dev/null`
- if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
- found_dir="$dir"
- found_so="$dir/$libname$shrext.$ver"
- fi
- else
- eval library_names=\"$acl_library_names_spec\"
- for f in $library_names; do
- if test -f "$dir/$f"; then
- found_dir="$dir"
- found_so="$dir/$f"
- break
- fi
- done
- fi
- fi
- fi
- dnl Then look for a static library.
- if test "X$found_dir" = "X"; then
- if test -f "$dir/$libname.$acl_libext"; then
- found_dir="$dir"
- found_a="$dir/$libname.$acl_libext"
- fi
- fi
- if test "X$found_dir" != "X"; then
- if test -f "$dir/$libname.la"; then
- found_la="$dir/$libname.la"
- fi
- fi
- ;;
- esac
- if test "X$found_dir" != "X"; then
- break
- fi
- done
- fi
- if test "X$found_dir" != "X"; then
- dnl Found the library.
- LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
- if test "X$found_so" != "X"; then
- dnl Linking with a shared library. We attempt to hardcode its
- dnl directory into the executable's runpath, unless it's the
- dnl standard /usr/lib.
- if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
- dnl No hardcoding is needed.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
- else
- dnl Use an explicit option to hardcode DIR into the resulting
- dnl binary.
- dnl Potentially add DIR to ltrpathdirs.
- dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
- haveit=
- for x in $ltrpathdirs; do
- if test "X$x" = "X$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- ltrpathdirs="$ltrpathdirs $found_dir"
- fi
- dnl The hardcoding into $LIBNAME is system dependent.
- if test "$acl_hardcode_direct" = yes; then
- dnl Using DIR/libNAME.so during linking hardcodes DIR into the
- dnl resulting binary.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
- else
- if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
- dnl Use an explicit option to hardcode DIR into the resulting
- dnl binary.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
- dnl Potentially add DIR to rpathdirs.
- dnl The rpathdirs will be appended to $LIBNAME at the end.
- haveit=
- for x in $rpathdirs; do
- if test "X$x" = "X$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- rpathdirs="$rpathdirs $found_dir"
- fi
- else
- dnl Rely on "-L$found_dir".
- dnl But don't add it if it's already contained in the LDFLAGS
- dnl or the already constructed $LIBNAME
- haveit=
- for x in $LDFLAGS $LIB[]NAME; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- if test "X$x" = "X-L$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
- fi
- if test "$acl_hardcode_minus_L" != no; then
- dnl FIXME: Not sure whether we should use
- dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
- dnl here.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
- else
- dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH
- dnl here, because this doesn't fit in flags passed to the
- dnl compiler. So give up. No hardcoding. This affects only
- dnl very old systems.
- dnl FIXME: Not sure whether we should use
- dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
- dnl here.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
- fi
- fi
- fi
- fi
- else
- if test "X$found_a" != "X"; then
- dnl Linking with a static library.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
- else
- dnl We shouldn't come here, but anyway it's good to have a
- dnl fallback.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
- fi
- fi
- dnl Assume the include files are nearby.
- additional_includedir=
- case "$found_dir" in
- */$acl_libdirstem | */$acl_libdirstem/)
- basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
- LIB[]NAME[]_PREFIX="$basedir"
- additional_includedir="$basedir/include"
- ;;
- esac
- if test "X$additional_includedir" != "X"; then
- dnl Potentially add $additional_includedir to $INCNAME.
- dnl But don't add it
- dnl 1. if it's the standard /usr/include,
- dnl 2. if it's /usr/local/include and we are using GCC on Linux,
- dnl 3. if it's already present in $CPPFLAGS or the already
- dnl constructed $INCNAME,
- dnl 4. if it doesn't exist as a directory.
- if test "X$additional_includedir" != "X/usr/include"; then
- haveit=
- if test "X$additional_includedir" = "X/usr/local/include"; then
- if test -n "$GCC"; then
- case $host_os in
- linux* | gnu* | k*bsd*-gnu) haveit=yes;;
- esac
- fi
- fi
- if test -z "$haveit"; then
- for x in $CPPFLAGS $INC[]NAME; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- if test "X$x" = "X-I$additional_includedir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test -d "$additional_includedir"; then
- dnl Really add $additional_includedir to $INCNAME.
- INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
- fi
- fi
- fi
- fi
- fi
- dnl Look for dependencies.
- if test -n "$found_la"; then
- dnl Read the .la file. It defines the variables
- dnl dlname, library_names, old_library, dependency_libs, current,
- dnl age, revision, installed, dlopen, dlpreopen, libdir.
- save_libdir="$libdir"
- case "$found_la" in
- */* | *\\*) . "$found_la" ;;
- *) . "./$found_la" ;;
- esac
- libdir="$save_libdir"
- dnl We use only dependency_libs.
- for dep in $dependency_libs; do
- case "$dep" in
- -L*)
- additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
- dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
- dnl But don't add it
- dnl 1. if it's the standard /usr/lib,
- dnl 2. if it's /usr/local/lib and we are using GCC on Linux,
- dnl 3. if it's already present in $LDFLAGS or the already
- dnl constructed $LIBNAME,
- dnl 4. if it doesn't exist as a directory.
- if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
- haveit=
- if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
- if test -n "$GCC"; then
- case $host_os in
- linux* | gnu* | k*bsd*-gnu) haveit=yes;;
- esac
- fi
- fi
- if test -z "$haveit"; then
- haveit=
- for x in $LDFLAGS $LIB[]NAME; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- if test "X$x" = "X-L$additional_libdir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test -d "$additional_libdir"; then
- dnl Really add $additional_libdir to $LIBNAME.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
- fi
- fi
- haveit=
- for x in $LDFLAGS $LTLIB[]NAME; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- if test "X$x" = "X-L$additional_libdir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test -d "$additional_libdir"; then
- dnl Really add $additional_libdir to $LTLIBNAME.
- LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
- fi
- fi
- fi
- fi
- ;;
- -R*)
- dir=`echo "X$dep" | sed -e 's/^X-R//'`
- if test "$enable_rpath" != no; then
- dnl Potentially add DIR to rpathdirs.
- dnl The rpathdirs will be appended to $LIBNAME at the end.
- haveit=
- for x in $rpathdirs; do
- if test "X$x" = "X$dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- rpathdirs="$rpathdirs $dir"
- fi
- dnl Potentially add DIR to ltrpathdirs.
- dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
- haveit=
- for x in $ltrpathdirs; do
- if test "X$x" = "X$dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- ltrpathdirs="$ltrpathdirs $dir"
- fi
- fi
- ;;
- -l*)
- dnl Handle this in the next round.
- names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
- ;;
- *.la)
- dnl Handle this in the next round. Throw away the .la's
- dnl directory; it is already contained in a preceding -L
- dnl option.
- names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
- ;;
- *)
- dnl Most likely an immediate library name.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
- LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
- ;;
- esac
- done
- fi
- else
- dnl Didn't find the library; assume it is in the system directories
- dnl known to the linker and runtime loader. (All the system
- dnl directories known to the linker should also be known to the
- dnl runtime loader, otherwise the system is severely misconfigured.)
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
- LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
- fi
- fi
- fi
- done
- done
- if test "X$rpathdirs" != "X"; then
- if test -n "$acl_hardcode_libdir_separator"; then
- dnl Weird platform: only the last -rpath option counts, the user must
- dnl pass all path elements in one option. We can arrange that for a
- dnl single library, but not when more than one $LIBNAMEs are used.
- alldirs=
- for found_dir in $rpathdirs; do
- alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
- done
- dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl.
- acl_save_libdir="$libdir"
- libdir="$alldirs"
- eval flag=\"$acl_hardcode_libdir_flag_spec\"
- libdir="$acl_save_libdir"
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
- else
- dnl The -rpath options are cumulative.
- for found_dir in $rpathdirs; do
- acl_save_libdir="$libdir"
- libdir="$found_dir"
- eval flag=\"$acl_hardcode_libdir_flag_spec\"
- libdir="$acl_save_libdir"
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
- done
- fi
- fi
- if test "X$ltrpathdirs" != "X"; then
- dnl When using libtool, the option that works for both libraries and
- dnl executables is -R. The -R options are cumulative.
- for found_dir in $ltrpathdirs; do
- LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
- done
- fi
-])
-
-dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
-dnl unless already present in VAR.
-dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
-dnl contains two or three consecutive elements that belong together.
-AC_DEFUN([AC_LIB_APPENDTOVAR],
-[
- for element in [$2]; do
- haveit=
- for x in $[$1]; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- if test "X$x" = "X$element"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- [$1]="${[$1]}${[$1]:+ }$element"
- fi
- done
-])
-
-dnl For those cases where a variable contains several -L and -l options
-dnl referring to unknown libraries and directories, this macro determines the
-dnl necessary additional linker options for the runtime path.
-dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL])
-dnl sets LDADDVAR to linker options needed together with LIBSVALUE.
-dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed,
-dnl otherwise linking without libtool is assumed.
-AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
-[
- AC_REQUIRE([AC_LIB_RPATH])
- AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
- $1=
- if test "$enable_rpath" != no; then
- if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
- dnl Use an explicit option to hardcode directories into the resulting
- dnl binary.
- rpathdirs=
- next=
- for opt in $2; do
- if test -n "$next"; then
- dir="$next"
- dnl No need to hardcode the standard /usr/lib.
- if test "X$dir" != "X/usr/$acl_libdirstem"; then
- rpathdirs="$rpathdirs $dir"
- fi
- next=
- else
- case $opt in
- -L) next=yes ;;
- -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
- dnl No need to hardcode the standard /usr/lib.
- if test "X$dir" != "X/usr/$acl_libdirstem"; then
- rpathdirs="$rpathdirs $dir"
- fi
- next= ;;
- *) next= ;;
- esac
- fi
- done
- if test "X$rpathdirs" != "X"; then
- if test -n ""$3""; then
- dnl libtool is used for linking. Use -R options.
- for dir in $rpathdirs; do
- $1="${$1}${$1:+ }-R$dir"
- done
- else
- dnl The linker is used for linking directly.
- if test -n "$acl_hardcode_libdir_separator"; then
- dnl Weird platform: only the last -rpath option counts, the user
- dnl must pass all path elements in one option.
- alldirs=
- for dir in $rpathdirs; do
- alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir"
- done
- acl_save_libdir="$libdir"
- libdir="$alldirs"
- eval flag=\"$acl_hardcode_libdir_flag_spec\"
- libdir="$acl_save_libdir"
- $1="$flag"
- else
- dnl The -rpath options are cumulative.
- for dir in $rpathdirs; do
- acl_save_libdir="$libdir"
- libdir="$dir"
- eval flag=\"$acl_hardcode_libdir_flag_spec\"
- libdir="$acl_save_libdir"
- $1="${$1}${$1:+ }$flag"
- done
- fi
- fi
- fi
- fi
- fi
- AC_SUBST([$1])
-])
-
-# lib-prefix.m4 serial 5 (gettext-0.15)
-dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
-dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
-dnl require excessive bracketing.
-ifdef([AC_HELP_STRING],
-[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
-[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
-
-dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
-dnl to access previously installed libraries. The basic assumption is that
-dnl a user will want packages to use other packages he previously installed
-dnl with the same --prefix option.
-dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
-dnl libraries, but is otherwise very convenient.
-AC_DEFUN([AC_LIB_PREFIX],
-[
- AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
- AC_REQUIRE([AC_PROG_CC])
- AC_REQUIRE([AC_CANONICAL_HOST])
- AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
- AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
- dnl By default, look in $includedir and $libdir.
- use_additional=yes
- AC_LIB_WITH_FINAL_PREFIX([
- eval additional_includedir=\"$includedir\"
- eval additional_libdir=\"$libdir\"
- ])
- AC_LIB_ARG_WITH([lib-prefix],
-[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
- --without-lib-prefix don't search for libraries in includedir and libdir],
-[
- if test "X$withval" = "Xno"; then
- use_additional=no
- else
- if test "X$withval" = "X"; then
- AC_LIB_WITH_FINAL_PREFIX([
- eval additional_includedir=\"$includedir\"
- eval additional_libdir=\"$libdir\"
- ])
- else
- additional_includedir="$withval/include"
- additional_libdir="$withval/$acl_libdirstem"
- fi
- fi
-])
- if test $use_additional = yes; then
- dnl Potentially add $additional_includedir to $CPPFLAGS.
- dnl But don't add it
- dnl 1. if it's the standard /usr/include,
- dnl 2. if it's already present in $CPPFLAGS,
- dnl 3. if it's /usr/local/include and we are using GCC on Linux,
- dnl 4. if it doesn't exist as a directory.
- if test "X$additional_includedir" != "X/usr/include"; then
- haveit=
- for x in $CPPFLAGS; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- if test "X$x" = "X-I$additional_includedir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test "X$additional_includedir" = "X/usr/local/include"; then
- if test -n "$GCC"; then
- case $host_os in
- linux* | gnu* | k*bsd*-gnu) haveit=yes;;
- esac
- fi
- fi
- if test -z "$haveit"; then
- if test -d "$additional_includedir"; then
- dnl Really add $additional_includedir to $CPPFLAGS.
- CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
- fi
- fi
- fi
- fi
- dnl Potentially add $additional_libdir to $LDFLAGS.
- dnl But don't add it
- dnl 1. if it's the standard /usr/lib,
- dnl 2. if it's already present in $LDFLAGS,
- dnl 3. if it's /usr/local/lib and we are using GCC on Linux,
- dnl 4. if it doesn't exist as a directory.
- if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
- haveit=
- for x in $LDFLAGS; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- if test "X$x" = "X-L$additional_libdir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
- if test -n "$GCC"; then
- case $host_os in
- linux*) haveit=yes;;
- esac
- fi
- fi
- if test -z "$haveit"; then
- if test -d "$additional_libdir"; then
- dnl Really add $additional_libdir to $LDFLAGS.
- LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
- fi
- fi
- fi
- fi
- fi
-])
-
-dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
-dnl acl_final_exec_prefix, containing the values to which $prefix and
-dnl $exec_prefix will expand at the end of the configure script.
-AC_DEFUN([AC_LIB_PREPARE_PREFIX],
-[
- dnl Unfortunately, prefix and exec_prefix get only finally determined
- dnl at the end of configure.
- if test "X$prefix" = "XNONE"; then
- acl_final_prefix="$ac_default_prefix"
- else
- acl_final_prefix="$prefix"
- fi
- if test "X$exec_prefix" = "XNONE"; then
- acl_final_exec_prefix='${prefix}'
- else
- acl_final_exec_prefix="$exec_prefix"
- fi
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
- prefix="$acl_save_prefix"
-])
-
-dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
-dnl variables prefix and exec_prefix bound to the values they will have
-dnl at the end of the configure script.
-AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
-[
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- $1
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-])
-
-dnl AC_LIB_PREPARE_MULTILIB creates a variable acl_libdirstem, containing
-dnl the basename of the libdir, either "lib" or "lib64".
-AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
-[
- dnl There is no formal standard regarding lib and lib64. The current
- dnl practice is that on a system supporting 32-bit and 64-bit instruction
- dnl sets or ABIs, 64-bit libraries go under $prefix/lib64 and 32-bit
- dnl libraries go under $prefix/lib. We determine the compiler's default
- dnl mode by looking at the compiler's library search path. If at least
- dnl of its elements ends in /lib64 or points to a directory whose absolute
- dnl pathname ends in /lib64, we assume a 64-bit ABI. Otherwise we use the
- dnl default, namely "lib".
- acl_libdirstem=lib
- searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
- if test -n "$searchpath"; then
- acl_save_IFS="${IFS= 	}"; IFS=":"
- for searchdir in $searchpath; do
- if test -d "$searchdir"; then
- case "$searchdir" in
- */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
- *) searchdir=`cd "$searchdir" && pwd`
- case "$searchdir" in
- */lib64 ) acl_libdirstem=lib64 ;;
- esac ;;
- esac
- fi
- done
- IFS="$acl_save_IFS"
- fi
-])
-
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008 Free Software Foundation, Inc.
-# Written by Gordon Matzigkeit, 1996
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-m4_define([_LT_COPYING], [dnl
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008 Free Software Foundation, Inc.
-# Written by Gordon Matzigkeit, 1996
-#
-# This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING. If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-])
-
-# serial 56 LT_INIT
-
-
-# LT_PREREQ(VERSION)
-# ------------------
-# Complain and exit if this libtool version is less that VERSION.
-m4_defun([LT_PREREQ],
-[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
- [m4_default([$3],
-		 [m4_fatal([Libtool version $1 or higher is required],
-		 63)])],
- [$2])])
-
-
-# _LT_CHECK_BUILDDIR
-# ------------------
-# Complain if the absolute build directory name contains unusual characters
-m4_defun([_LT_CHECK_BUILDDIR],
-[case `pwd` in
- *\ * | *\	*)
- AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
-esac
-])
-
-
-# LT_INIT([OPTIONS])
-# ------------------
-AC_DEFUN([LT_INIT],
-[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
-AC_BEFORE([$0], [LT_LANG])dnl
-AC_BEFORE([$0], [LT_OUTPUT])dnl
-AC_BEFORE([$0], [LTDL_INIT])dnl
-m4_require([_LT_CHECK_BUILDDIR])dnl
-
-dnl Autoconf doesn't catch unexpanded LT_ macros by default:
-m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
-m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
-dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
-dnl unless we require an AC_DEFUNed macro:
-AC_REQUIRE([LTOPTIONS_VERSION])dnl
-AC_REQUIRE([LTSUGAR_VERSION])dnl
-AC_REQUIRE([LTVERSION_VERSION])dnl
-AC_REQUIRE([LTOBSOLETE_VERSION])dnl
-m4_require([_LT_PROG_LTMAIN])dnl
-
-dnl Parse OPTIONS
-_LT_SET_OPTIONS([$0], [$1])
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-_LT_SETUP
-
-# Only expand once:
-m4_define([LT_INIT])
-])# LT_INIT
-
-# Old names:
-AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
-AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
-dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
-
-
-# _LT_CC_BASENAME(CC)
-# -------------------
-# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
-m4_defun([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
- case $cc_temp in
- compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
- distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
- \-*) ;;
- *) break;;
- esac
-done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-])
-
-
-# _LT_FILEUTILS_DEFAULTS
-# ----------------------
-# It is okay to use these file commands and assume they have been set
-# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
-m4_defun([_LT_FILEUTILS_DEFAULTS],
-[: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-])# _LT_FILEUTILS_DEFAULTS
-
-
-# _LT_SETUP
-# ---------
-m4_defun([_LT_SETUP],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-_LT_DECL([], [host_alias], [0], [The host system])dnl
-_LT_DECL([], [host], [0])dnl
-_LT_DECL([], [host_os], [0])dnl
-dnl
-_LT_DECL([], [build_alias], [0], [The build system])dnl
-_LT_DECL([], [build], [0])dnl
-_LT_DECL([], [build_os], [0])dnl
-dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([LT_PATH_LD])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-dnl
-AC_REQUIRE([AC_PROG_LN_S])dnl
-test -z "$LN_S" && LN_S="ln -s"
-_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
-dnl
-AC_REQUIRE([LT_CMD_MAX_LEN])dnl
-_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
-_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
-dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-m4_require([_LT_CMD_RELOAD])dnl
-m4_require([_LT_CHECK_MAGIC_METHOD])dnl
-m4_require([_LT_CMD_OLD_ARCHIVE])dnl
-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-
-_LT_CONFIG_LIBTOOL_INIT([
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
- setopt NO_GLOB_SUBST
-fi
-])
-if test -n "${ZSH_VERSION+set}" ; then
- setopt NO_GLOB_SUBST
-fi
-
-_LT_CHECK_OBJDIR
-
-m4_require([_LT_TAG_COMPILER])dnl
-_LT_PROG_ECHO_BACKSLASH
-
-case $host_os in
-aix3*)
- # AIX sometimes has problems with the GCC collect2 program. For some
- # reason, if we set the COLLECT_NAMES environment variable, the problems
- # vanish in a puff of smoke.
- if test "X${COLLECT_NAMES+set}" != Xset; then
- COLLECT_NAMES=
- export COLLECT_NAMES
- fi
- ;;
-esac
-
-# Sed substitution that helps us do robust quoting. It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='s/$[["`$\\]]$/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/$[["`\\]]$/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-# Global variables:
-ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$LD" && LD=ld
-test -z "$ac_objext" && ac_objext=o
-
-_LT_CC_BASENAME([$compiler])
-
-# Only perform the check for file, if the check method requires it
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-case $deplibs_check_method in
-file_magic*)
- if test "$file_magic_cmd" = '$MAGIC_CMD'; then
- _LT_PATH_MAGIC
- fi
- ;;
-esac
-
-# Use C for the default configuration in the libtool script
-LT_SUPPORTED_TAG([CC])
-_LT_LANG_C_CONFIG
-_LT_LANG_DEFAULT_CONFIG
-_LT_CONFIG_COMMANDS
-])# _LT_SETUP
-
-
-# _LT_PROG_LTMAIN
-# ---------------
-# Note that this code is called both from `configure', and `config.status'
-# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably,
-# `config.status' has no value for ac_aux_dir unless we are using Automake,
-# so we pass a copy along to make sure it has a sensible value anyway.
-m4_defun([_LT_PROG_LTMAIN],
-[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
-_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
-ltmain="$ac_aux_dir/ltmain.sh"
-])# _LT_PROG_LTMAIN
-
-
-
-# So that we can recreate a full libtool script including additional
-# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
-# in macros and then make a single call at the end using the `libtool'
-# label.
-
-
-# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
-# ----------------------------------------
-# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define([_LT_CONFIG_LIBTOOL_INIT],
-[m4_ifval([$1],
- [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
- [$1
-])])])
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_INIT])
-
-
-# _LT_CONFIG_LIBTOOL([COMMANDS])
-# ------------------------------
-# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define([_LT_CONFIG_LIBTOOL],
-[m4_ifval([$1],
- [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
- [$1
-])])])
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
-
-
-# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
-# -----------------------------------------------------
-m4_defun([_LT_CONFIG_SAVE_COMMANDS],
-[_LT_CONFIG_LIBTOOL([$1])
-_LT_CONFIG_LIBTOOL_INIT([$2])
-])
-
-
-# _LT_FORMAT_COMMENT([COMMENT])
-# -----------------------------
-# Add leading comment marks to the start of each line, and a trailing
-# full-stop to the whole comment if one is not present already.
-m4_define([_LT_FORMAT_COMMENT],
-[m4_ifval([$1], [
-m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
- [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
-)])
-
-
-
-
-
-# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
-# -------------------------------------------------------------------
-# CONFIGNAME is the name given to the value in the libtool script.
-# VARNAME is the (base) name used in the configure script.
-# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
-# VARNAME. Any other value will be used directly.
-m4_define([_LT_DECL],
-[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
- [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
-	[m4_ifval([$1], [$1], [$2])])
- lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
- m4_ifval([$4],
-	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
- lt_dict_add_subkey([lt_decl_dict], [$2],
-	[tagged?], [m4_ifval([$5], [yes], [no])])])
-])
-
-
-# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
-# --------------------------------------------------------
-m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
-
-
-# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
-# ------------------------------------------------
-m4_define([lt_decl_tag_varnames],
-[_lt_decl_filter([tagged?], [yes], $@)])
-
-
-# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
-# ---------------------------------------------------------
-m4_define([_lt_decl_filter],
-[m4_case([$#],
- [0], [m4_fatal([$0: too few arguments: $#])],
- [1], [m4_fatal([$0: too few arguments: $#: $1])],
- [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
- [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
- [lt_dict_filter([lt_decl_dict], $@)])[]dnl
-])
-
-
-# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
-# --------------------------------------------------
-m4_define([lt_decl_quote_varnames],
-[_lt_decl_filter([value], [1], $@)])
-
-
-# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
-# ---------------------------------------------------
-m4_define([lt_decl_dquote_varnames],
-[_lt_decl_filter([value], [2], $@)])
-
-
-# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
-# ---------------------------------------------------
-m4_define([lt_decl_varnames_tagged],
-[m4_assert([$# <= 2])dnl
-_$0(m4_quote(m4_default([$1], [[, ]])),
- m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
- m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
-m4_define([_lt_decl_varnames_tagged],
-[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
-
-
-# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
-# ------------------------------------------------
-m4_define([lt_decl_all_varnames],
-[_$0(m4_quote(m4_default([$1], [[, ]])),
- m4_if([$2], [],
-	 m4_quote(lt_decl_varnames),
-	m4_quote(m4_shift($@))))[]dnl
-])
-m4_define([_lt_decl_all_varnames],
-[lt_join($@, lt_decl_varnames_tagged([$1],
-			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
-])
-
-
-# _LT_CONFIG_STATUS_DECLARE([VARNAME])
-# ------------------------------------
-# Quote a variable value, and forward it to `config.status' so that its
-# declaration there will have the same value as in `configure'. VARNAME
-# must have a single quote delimited value for this to work.
-m4_define([_LT_CONFIG_STATUS_DECLARE],
-[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
-
-
-# _LT_CONFIG_STATUS_DECLARATIONS
-# ------------------------------
-# We delimit libtool config variables with single quotes, so when
-# we write them to config.status, we have to be sure to quote all
-# embedded single quotes properly. In configure, this macro expands
-# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
-#
-# <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
-m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
-[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
- [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
-
-
-# _LT_LIBTOOL_TAGS
-# ----------------
-# Output comment and list of tags supported by the script
-m4_defun([_LT_LIBTOOL_TAGS],
-[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
-available_tags="_LT_TAGS"dnl
-])
-
-
-# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
-# -----------------------------------
-# Extract the dictionary values for VARNAME (optionally with TAG) and
-# expand to a commented shell variable setting:
-#
-# # Some comment about what VAR is for.
-# visible_name=$lt_internal_name
-m4_define([_LT_LIBTOOL_DECLARE],
-[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
-					 [description])))[]dnl
-m4_pushdef([_libtool_name],
- m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
-m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
- [0], [_libtool_name=[$]$1],
- [1], [_libtool_name=$lt_[]$1],
- [2], [_libtool_name=$lt_[]$1],
- [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
-m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
-])
-
-
-# _LT_LIBTOOL_CONFIG_VARS
-# -----------------------
-# Produce commented declarations of non-tagged libtool config variables
-# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
-# script. Tagged libtool config variables (even for the LIBTOOL CONFIG
-# section) are produced by _LT_LIBTOOL_TAG_VARS.
-m4_defun([_LT_LIBTOOL_CONFIG_VARS],
-[m4_foreach([_lt_var],
- m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
- [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
-
-
-# _LT_LIBTOOL_TAG_VARS(TAG)
-# -------------------------
-m4_define([_LT_LIBTOOL_TAG_VARS],
-[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
- [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
-
-
-# _LT_TAGVAR(VARNAME, [TAGNAME])
-# ------------------------------
-m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
-
-
-# _LT_CONFIG_COMMANDS
-# -------------------
-# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of
-# variables for single and double quote escaping we saved from calls
-# to _LT_DECL, we can put quote escaped variables declarations
-# into `config.status', and then the shell code to quote escape them in
-# for loops in `config.status'. Finally, any additional code accumulated
-# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
-m4_defun([_LT_CONFIG_COMMANDS],
-[AC_PROVIDE_IFELSE([LT_OUTPUT],
-	dnl If the libtool generation code has been placed in $CONFIG_LT,
-	dnl instead of duplicating it all over again into config.status,
-	dnl then we will have config.status run $CONFIG_LT later, so it
-	dnl needs to know what name is stored there:
- [AC_CONFIG_COMMANDS([libtool],
- [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
- dnl If the libtool generation code is destined for config.status,
- dnl expand the accumulated commands and init code now:
- [AC_CONFIG_COMMANDS([libtool],
- [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
-])#_LT_CONFIG_COMMANDS
-
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
-[
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-sed_quote_subst='$sed_quote_subst'
-double_quote_subst='$double_quote_subst'
-delay_variable_subst='$delay_variable_subst'
-_LT_CONFIG_STATUS_DECLARATIONS
-LTCC='$LTCC'
-LTCFLAGS='$LTCFLAGS'
-compiler='$compiler_DEFAULT'
-
-# Quote evaled strings.
-for var in lt_decl_all_varnames([[ \
-]], lt_decl_quote_varnames); do
- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
- *[[\\\\\\\`\\"\\\$]]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
- ;;
- *)
- eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
- ;;
- esac
-done
-
-# Double-quote double-evaled strings.
-for var in lt_decl_all_varnames([[ \
-]], lt_decl_dquote_varnames); do
- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
- *[[\\\\\\\`\\"\\\$]]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
- ;;
- *)
- eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
- ;;
- esac
-done
-
-# Fix-up fallback echo if it was mangled by the above quoting rules.
-case \$lt_ECHO in
-*'\\\[$]0 --fallback-echo"')dnl "
- lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
- ;;
-esac
-
-_LT_OUTPUT_LIBTOOL_INIT
-])
-
-
-# LT_OUTPUT
-# ---------
-# This macro allows early generation of the libtool script (before
-# AC_OUTPUT is called), incase it is used in configure for compilation
-# tests.
-AC_DEFUN([LT_OUTPUT],
-[: ${CONFIG_LT=./config.lt}
-AC_MSG_NOTICE([creating $CONFIG_LT])
-cat >"$CONFIG_LT" <<_LTEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate a libtool stub with the current configuration.
-
-lt_cl_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_LTEOF
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-AS_SHELL_SANITIZE
-_AS_PREPARE
-
-exec AS_MESSAGE_FD>&1
-exec AS_MESSAGE_LOG_FD>>config.log
-{
- echo
- AS_BOX([Running $as_me.])
-} >&AS_MESSAGE_LOG_FD
-
-lt_cl_help="\
-\`$as_me' creates a local libtool stub from the current configuration,
-for use in further configure time tests before the real libtool is
-generated.
-
-Usage: $[0] [[OPTIONS]]
-
- -h, --help print this help, then exit
- -V, --version print version number, then exit
- -q, --quiet do not print progress messages
- -d, --debug don't remove temporary files
-
-Report bugs to <bug-libtool@gnu.org>."
-
-lt_cl_version="\
-m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
-m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
-configured by $[0], generated by m4_PACKAGE_STRING.
-
-Copyright (C) 2008 Free Software Foundation, Inc.
-This config.lt script is free software; the Free Software Foundation
-gives unlimited permision to copy, distribute and modify it."
-
-while test $[#] != 0
-do
- case $[1] in
- --version | --v* | -V )
- echo "$lt_cl_version"; exit 0 ;;
- --help | --h* | -h )
- echo "$lt_cl_help"; exit 0 ;;
- --debug | --d* | -d )
- debug=: ;;
- --quiet | --q* | --silent | --s* | -q )
- lt_cl_silent=: ;;
-
- -*) AC_MSG_ERROR([unrecognized option: $[1]
-Try \`$[0] --help' for more information.]) ;;
-
- *) AC_MSG_ERROR([unrecognized argument: $[1]
-Try \`$[0] --help' for more information.]) ;;
- esac
- shift
-done
-
-if $lt_cl_silent; then
- exec AS_MESSAGE_FD>/dev/null
-fi
-_LTEOF
-
-cat >>"$CONFIG_LT" <<_LTEOF
-_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
-_LTEOF
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-AC_MSG_NOTICE([creating $ofile])
-_LT_OUTPUT_LIBTOOL_COMMANDS
-AS_EXIT(0)
-_LTEOF
-chmod +x "$CONFIG_LT"
-
-# configure is writing to config.log, but config.lt does its own redirection,
-# appending to config.log, which fails on DOS, as config.log is still kept
-# open by configure. Here we exec the FD to /dev/null, effectively closing
-# config.log, so it can be properly (re)opened and appended to by config.lt.
-if test "$no_create" != yes; then
- lt_cl_success=:
- test "$silent" = yes &&
- lt_config_lt_args="$lt_config_lt_args --quiet"
- exec AS_MESSAGE_LOG_FD>/dev/null
- $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
- exec AS_MESSAGE_LOG_FD>>config.log
- $lt_cl_success || AS_EXIT(1)
-fi
-])# LT_OUTPUT
-
-
-# _LT_CONFIG(TAG)
-# ---------------
-# If TAG is the built-in tag, create an initial libtool script with a
-# default configuration from the untagged config vars. Otherwise add code
-# to config.status for appending the configuration named by TAG from the
-# matching tagged config vars.
-m4_defun([_LT_CONFIG],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-_LT_CONFIG_SAVE_COMMANDS([
- m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
- m4_if(_LT_TAG, [C], [
- # See if we are running on zsh, and set the options which allow our
- # commands through without removal of \ escapes.
- if test -n "${ZSH_VERSION+set}" ; then
- setopt NO_GLOB_SUBST
- fi
-
- cfgfile="${ofile}T"
- trap "$RM \"$cfgfile\"; exit 1" 1 2 15
- $RM "$cfgfile"
-
- cat <<_LT_EOF >> "$cfgfile"
-#! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-_LT_COPYING
-_LT_LIBTOOL_TAGS
-
-# ### BEGIN LIBTOOL CONFIG
-_LT_LIBTOOL_CONFIG_VARS
-_LT_LIBTOOL_TAG_VARS
-# ### END LIBTOOL CONFIG
-
-_LT_EOF
-
- case $host_os in
- aix3*)
- cat <<\_LT_EOF >> "$cfgfile"
-# AIX sometimes has problems with the GCC collect2 program. For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
- COLLECT_NAMES=
- export COLLECT_NAMES
-fi
-_LT_EOF
- ;;
- esac
-
- _LT_PROG_LTMAIN
-
- # We use sed instead of cat because bash on DJGPP gets confused if
- # if finds mixed CR/LF and LF-only lines. Since sed operates in
- # text mode, it properly converts lines to CR/LF. This bash problem
- # is reportedly fixed, but why not run on old versions too?
- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
- || (rm -f "$cfgfile"; exit 1)
-
- _LT_PROG_XSI_SHELLFNS
-
- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
- || (rm -f "$cfgfile"; exit 1)
-
- mv -f "$cfgfile" "$ofile" ||
- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
- chmod +x "$ofile"
-],
-[cat <<_LT_EOF >> "$ofile"
-
-dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
-dnl in a comment (ie after a #).
-# ### BEGIN LIBTOOL TAG CONFIG: $1
-_LT_LIBTOOL_TAG_VARS(_LT_TAG)
-# ### END LIBTOOL TAG CONFIG: $1
-_LT_EOF
-])dnl /m4_if
-],
-[m4_if([$1], [], [
- PACKAGE='$PACKAGE'
- VERSION='$VERSION'
- TIMESTAMP='$TIMESTAMP'
- RM='$RM'
- ofile='$ofile'], [])
-])dnl /_LT_CONFIG_SAVE_COMMANDS
-])# _LT_CONFIG
-
-
-# LT_SUPPORTED_TAG(TAG)
-# ---------------------
-# Trace this macro to discover what tags are supported by the libtool
-# --tag option, using:
-# autoconf --trace 'LT_SUPPORTED_TAG:$1'
-AC_DEFUN([LT_SUPPORTED_TAG], [])
-
-
-# C support is built-in for now
-m4_define([_LT_LANG_C_enabled], [])
-m4_define([_LT_TAGS], [])
-
-
-# LT_LANG(LANG)
-# -------------
-# Enable libtool support for the given language if not already enabled.
-AC_DEFUN([LT_LANG],
-[AC_BEFORE([$0], [LT_OUTPUT])dnl
-m4_case([$1],
- [C],			[_LT_LANG(C)],
- [C++],		[_LT_LANG(CXX)],
- [Java],		[_LT_LANG(GCJ)],
- [Fortran 77],		[_LT_LANG(F77)],
- [Fortran],		[_LT_LANG(FC)],
- [Windows Resource],	[_LT_LANG(RC)],
- [m4_ifdef([_LT_LANG_]$1[_CONFIG],
- [_LT_LANG($1)],
- [m4_fatal([$0: unsupported language: "$1"])])])dnl
-])# LT_LANG
-
-
-# _LT_LANG(LANGNAME)
-# ------------------
-m4_defun([_LT_LANG],
-[m4_ifdef([_LT_LANG_]$1[_enabled], [],
- [LT_SUPPORTED_TAG([$1])dnl
- m4_append([_LT_TAGS], [$1 ])dnl
- m4_define([_LT_LANG_]$1[_enabled], [])dnl
- _LT_LANG_$1_CONFIG($1)])dnl
-])# _LT_LANG
-
-
-# _LT_LANG_DEFAULT_CONFIG
-# -----------------------
-m4_defun([_LT_LANG_DEFAULT_CONFIG],
-[AC_PROVIDE_IFELSE([AC_PROG_CXX],
- [LT_LANG(CXX)],
- [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
-
-AC_PROVIDE_IFELSE([AC_PROG_F77],
- [LT_LANG(F77)],
- [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
-
-AC_PROVIDE_IFELSE([AC_PROG_FC],
- [LT_LANG(FC)],
- [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
-
-dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
-dnl pulling things in needlessly.
-AC_PROVIDE_IFELSE([AC_PROG_GCJ],
- [LT_LANG(GCJ)],
- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
- [LT_LANG(GCJ)],
- [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
- [LT_LANG(GCJ)],
- [m4_ifdef([AC_PROG_GCJ],
-	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
- m4_ifdef([A][M_PROG_GCJ],
-	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
- m4_ifdef([LT_PROG_GCJ],
-	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
-
-AC_PROVIDE_IFELSE([LT_PROG_RC],
- [LT_LANG(RC)],
- [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
-])# _LT_LANG_DEFAULT_CONFIG
-
-# Obsolete macros:
-AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
-AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
-AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
-AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
-dnl AC_DEFUN([AC_LIBTOOL_F77], [])
-dnl AC_DEFUN([AC_LIBTOOL_FC], [])
-dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
-
-
-# _LT_TAG_COMPILER
-# ----------------
-m4_defun([_LT_TAG_COMPILER],
-[AC_REQUIRE([AC_PROG_CC])dnl
-
-_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
-_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
-_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
-_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-])# _LT_TAG_COMPILER
-
-
-# _LT_COMPILER_BOILERPLATE
-# ------------------------
-# Check for compiler boilerplate output or warnings with
-# the simple compiler test code.
-m4_defun([_LT_COMPILER_BOILERPLATE],
-[m4_require([_LT_DECL_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$RM conftest*
-])# _LT_COMPILER_BOILERPLATE
-
-
-# _LT_LINKER_BOILERPLATE
-# ----------------------
-# Check for linker boilerplate output or warnings with
-# the simple link test code.
-m4_defun([_LT_LINKER_BOILERPLATE],
-[m4_require([_LT_DECL_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$RM -r conftest*
-])# _LT_LINKER_BOILERPLATE
-
-# _LT_REQUIRED_DARWIN_CHECKS
-# -------------------------
-m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
- case $host_os in
- rhapsody* | darwin*)
- AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
- AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
- AC_CHECK_TOOL([LIPO], [lipo], [:])
- AC_CHECK_TOOL([OTOOL], [otool], [:])
- AC_CHECK_TOOL([OTOOL64], [otool64], [:])
- _LT_DECL([], [DSYMUTIL], [1],
- [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
- _LT_DECL([], [NMEDIT], [1],
- [Tool to change global to local symbols on Mac OS X])
- _LT_DECL([], [LIPO], [1],
- [Tool to manipulate fat objects and archives on Mac OS X])
- _LT_DECL([], [OTOOL], [1],
- [ldd/readelf like tool for Mach-O binaries on Mac OS X])
- _LT_DECL([], [OTOOL64], [1],
- [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
-
- AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
- [lt_cv_apple_cc_single_mod=no
- if test -z "${LT_MULTI_MODULE}"; then
-	# By default we will add the -single_module flag. You can override
-	# by either setting the environment variable LT_MULTI_MODULE
-	# non-empty at configure time, or by adding -multi_module to the
-	# link flags.
-	rm -rf libconftest.dylib*
-	echo "int foo(void){return 1;}" > conftest.c
-	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
--dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
-	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-	 -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
- _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
-	 lt_cv_apple_cc_single_mod=yes
-	else
-	 cat conftest.err >&AS_MESSAGE_LOG_FD
-	fi
-	rm -rf libconftest.dylib*
-	rm -f conftest.*
- fi])
- AC_CACHE_CHECK([for -exported_symbols_list linker flag],
- [lt_cv_ld_exported_symbols_list],
- [lt_cv_ld_exported_symbols_list=no
- save_LDFLAGS=$LDFLAGS
- echo "_main" > conftest.sym
- LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-	[lt_cv_ld_exported_symbols_list=yes],
-	[lt_cv_ld_exported_symbols_list=no])
-	LDFLAGS="$save_LDFLAGS"
- ])
- case $host_os in
- rhapsody* | darwin1.[[012]])
- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
- darwin1.*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
- darwin*) # darwin 5.x on
- # if running on 10.5 or later, the deployment target defaults
- # to the OS version, if on x86, and 10.4, the deployment
- # target defaults to 10.4. Don't you love it?
- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
-	 _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-	10.[[012]]*)
-	 _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-	10.*)
-	 _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
- esac
- ;;
- esac
- if test "$lt_cv_apple_cc_single_mod" = "yes"; then
- _lt_dar_single_mod='$single_module'
- fi
- if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
- _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
- else
- _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
- if test "$DSYMUTIL" != ":"; then
- _lt_dsymutil='~$DSYMUTIL $lib || :'
- else
- _lt_dsymutil=
- fi
- ;;
- esac
-])
-
-
-# _LT_DARWIN_LINKER_FEATURES
-# --------------------------
-# Checks for linker and compiler features on darwin
-m4_defun([_LT_DARWIN_LINKER_FEATURES],
-[
- m4_require([_LT_REQUIRED_DARWIN_CHECKS])
- _LT_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_TAGVAR(hardcode_direct, $1)=no
- _LT_TAGVAR(hardcode_automatic, $1)=yes
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
- _LT_TAGVAR(whole_archive_flag_spec, $1)=''
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
- case $cc_basename in
- ifort*) _lt_dar_can_shared=yes ;;
- *) _lt_dar_can_shared=$GCC ;;
- esac
- if test "$_lt_dar_can_shared" = "yes"; then
- output_verbose_link_cmd=echo
- _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
- _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
- _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
- _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
- m4_if([$1], [CXX],
-[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
- _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
- _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
- fi
-],[])
- else
- _LT_TAGVAR(ld_shlibs, $1)=no
- fi
-])
-
-# _LT_SYS_MODULE_PATH_AIX
-# -----------------------
-# Links a minimal program and checks the executable
-# for the system default hardcoded library path. In most cases,
-# this is /usr/lib:/lib, but when the MPI compilers are used
-# the location of the communication and MPI libs are included too.
-# If we don't find anything, use the default library path according
-# to the aix ld manual.
-m4_defun([_LT_SYS_MODULE_PATH_AIX],
-[m4_require([_LT_DECL_SED])dnl
-AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
-	/^0/ {
-	 s/^0 *$.*$$/\1/
-	 p
-	}
- }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi],[])
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-])# _LT_SYS_MODULE_PATH_AIX
-
-
-# _LT_SHELL_INIT(ARG)
-# -------------------
-m4_define([_LT_SHELL_INIT],
-[ifdef([AC_DIVERSION_NOTICE],
-	 [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
-	 [AC_DIVERT_PUSH(NOTICE)])
-$1
-AC_DIVERT_POP
-])# _LT_SHELL_INIT
-
-
-# _LT_PROG_ECHO_BACKSLASH
-# -----------------------
-# Add some code to the start of the generated configure script which
-# will find an echo command which doesn't interpret backslashes.
-m4_defun([_LT_PROG_ECHO_BACKSLASH],
-[_LT_SHELL_INIT([
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-case X$lt_ECHO in
-X*--fallback-echo)
- # Remove one level of quotation (which was required for Make).
- ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
- ;;
-esac
-
-ECHO=${lt_ECHO-echo}
-if test "X[$]1" = X--no-reexec; then
- # Discard the --no-reexec flag, and continue.
- shift
-elif test "X[$]1" = X--fallback-echo; then
- # Avoid inline document here, it may be left over
- :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
- # Yippee, $ECHO works!
- :
-else
- # Restart under the correct shell.
- exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
-fi
-
-if test "X[$]1" = X--fallback-echo; then
- # used as fallback echo
- shift
- cat <<_LT_EOF
-[$]*
-_LT_EOF
- exit 0
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test -z "$lt_ECHO"; then
- if test "X${echo_test_string+set}" != Xset; then
- # find a string as large as possible, as long as the shell can cope with it
- for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
- if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
-	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
- then
- break
- fi
- done
- fi
-
- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- :
- else
- # The Solaris, AIX, and Digital Unix default echo programs unquote
- # backslashes. This makes it impossible to quote backslashes using
- # echo "$something" | sed 's/\\/\\\\/g'
- #
- # So, first we look for a working echo in the user's PATH.
-
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for dir in $PATH /usr/ucb; do
- IFS="$lt_save_ifs"
- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- ECHO="$dir/echo"
- break
- fi
- done
- IFS="$lt_save_ifs"
-
- if test "X$ECHO" = Xecho; then
- # We didn't find a better echo, so look for alternatives.
- if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- # This shell has a builtin print -r that does the trick.
- ECHO='print -r'
- elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
-	 test "X$CONFIG_SHELL" != X/bin/ksh; then
- # If we have ksh, try running configure again with it.
- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
- export ORIGINAL_CONFIG_SHELL
- CONFIG_SHELL=/bin/ksh
- export CONFIG_SHELL
- exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
- else
- # Try using printf.
- ECHO='printf %s\n'
- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-	 echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-	 test "X$echo_testing_string" = "X$echo_test_string"; then
-	 # Cool, printf works
-	 :
- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-	 test "X$echo_testing_string" = 'X\t' &&
-	 echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	 test "X$echo_testing_string" = "X$echo_test_string"; then
-	 CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	 export CONFIG_SHELL
-	 SHELL="$CONFIG_SHELL"
-	 export SHELL
-	 ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
- elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-	 test "X$echo_testing_string" = 'X\t' &&
-	 echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	 test "X$echo_testing_string" = "X$echo_test_string"; then
-	 ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
- else
-	 # maybe with a smaller string...
-	 prev=:
-
-	 for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
-	 if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
-	 then
-	 break
-	 fi
-	 prev="$cmd"
-	 done
-
-	 if test "$prev" != 'sed 50q "[$]0"'; then
-	 echo_test_string=`eval $prev`
-	 export echo_test_string
-	 exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
-	 else
-	 # Oops. We lost completely, so just stick with echo.
-	 ECHO=echo
-	 fi
- fi
- fi
- fi
- fi
-fi
-
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-lt_ECHO=$ECHO
-if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
- lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
-fi
-
-AC_SUBST(lt_ECHO)
-])
-_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
-_LT_DECL([], [ECHO], [1],
- [An echo program that does not interpret backslashes])
-])# _LT_PROG_ECHO_BACKSLASH
-
-
-# _LT_ENABLE_LOCK
-# ---------------
-m4_defun([_LT_ENABLE_LOCK],
-[AC_ARG_ENABLE([libtool-lock],
- [AS_HELP_STRING([--disable-libtool-lock],
- [avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
- # Find out which ABI we are using.
- echo 'int i;' > conftest.$ac_ext
- if AC_TRY_EVAL(ac_compile); then
- case `/usr/bin/file conftest.$ac_objext` in
- *ELF-32*)
-	HPUX_IA64_MODE="32"
-	;;
- *ELF-64*)
-	HPUX_IA64_MODE="64"
-	;;
- esac
- fi
- rm -rf conftest*
- ;;
-*-*-irix6*)
- # Find out which ABI we are using.
- echo '[#]line __oline__ "configure"' > conftest.$ac_ext
- if AC_TRY_EVAL(ac_compile); then
- if test "$lt_cv_prog_gnu_ld" = yes; then
- case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	 LD="${LD-ld} -melf32bsmip"
-	 ;;
-	*N32*)
-	 LD="${LD-ld} -melf32bmipn32"
-	 ;;
-	*64-bit*)
-	 LD="${LD-ld} -melf64bmip"
-	;;
- esac
- else
- case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	 LD="${LD-ld} -32"
-	 ;;
-	*N32*)
-	 LD="${LD-ld} -n32"
-	 ;;
-	*64-bit*)
-	 LD="${LD-ld} -64"
-	 ;;
- esac
- fi
- fi
- rm -rf conftest*
- ;;
-
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
- # Find out which ABI we are using.
- echo 'int i;' > conftest.$ac_ext
- if AC_TRY_EVAL(ac_compile); then
- case `/usr/bin/file conftest.o` in
- *32-bit*)
-	case $host in
-	 x86_64-*kfreebsd*-gnu)
-	 LD="${LD-ld} -m elf_i386_fbsd"
-	 ;;
-	 x86_64-*linux*)
-	 LD="${LD-ld} -m elf_i386"
-	 ;;
-	 ppc64-*linux*|powerpc64-*linux*)
-	 LD="${LD-ld} -m elf32ppclinux"
-	 ;;
-	 s390x-*linux*)
-	 LD="${LD-ld} -m elf_s390"
-	 ;;
-	 sparc64-*linux*)
-	 LD="${LD-ld} -m elf32_sparc"
-	 ;;
-	esac
-	;;
- *64-bit*)
-	case $host in
-	 x86_64-*kfreebsd*-gnu)
-	 LD="${LD-ld} -m elf_x86_64_fbsd"
-	 ;;
-	 x86_64-*linux*)
-	 LD="${LD-ld} -m elf_x86_64"
-	 ;;
-	 ppc*-*linux*|powerpc*-*linux*)
-	 LD="${LD-ld} -m elf64ppc"
-	 ;;
-	 s390*-*linux*|s390*-*tpf*)
-	 LD="${LD-ld} -m elf64_s390"
-	 ;;
-	 sparc*-*linux*)
-	 LD="${LD-ld} -m elf64_sparc"
-	 ;;
-	esac
-	;;
- esac
- fi
- rm -rf conftest*
- ;;
-
-*-*-sco3.2v5*)
- # On SCO OpenServer 5, we need -belf to get full-featured binaries.
- SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -belf"
- AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
- [AC_LANG_PUSH(C)
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
- AC_LANG_POP])
- if test x"$lt_cv_cc_needs_belf" != x"yes"; then
- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
- CFLAGS="$SAVE_CFLAGS"
- fi
- ;;
-sparc*-*solaris*)
- # Find out which ABI we are using.
- echo 'int i;' > conftest.$ac_ext
- if AC_TRY_EVAL(ac_compile); then
- case `/usr/bin/file conftest.o` in
- *64-bit*)
- case $lt_cv_prog_gnu_ld in
- yes*) LD="${LD-ld} -m elf64_sparc" ;;
- *)
-	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-	 LD="${LD-ld} -64"
-	fi
-	;;
- esac
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
-esac
-
-need_locks="$enable_libtool_lock"
-])# _LT_ENABLE_LOCK
-
-
-# _LT_CMD_OLD_ARCHIVE
-# -------------------
-m4_defun([_LT_CMD_OLD_ARCHIVE],
-[AC_CHECK_TOOL(AR, ar, false)
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-_LT_DECL([], [AR], [1], [The archiver])
-_LT_DECL([], [AR_FLAGS], [1])
-
-AC_CHECK_TOOL(STRIP, strip, :)
-test -z "$STRIP" && STRIP=:
-_LT_DECL([], [STRIP], [1], [A symbol stripping program])
-
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-test -z "$RANLIB" && RANLIB=:
-_LT_DECL([], [RANLIB], [1],
- [Commands used to install an old-style archive])
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
- case $host_os in
- openbsd*)
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
- ;;
- *)
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
- ;;
- esac
- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
-_LT_DECL([], [old_postinstall_cmds], [2])
-_LT_DECL([], [old_postuninstall_cmds], [2])
-_LT_TAGDECL([], [old_archive_cmds], [2],
- [Commands used to build an old-style archive])
-])# _LT_CMD_OLD_ARCHIVE
-
-
-# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([_LT_COMPILER_OPTION],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_SED])dnl
-AC_CACHE_CHECK([$1], [$2],
- [$2=no
- m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$3"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
- # Note that $ac_compile itself does not contain backslashes and begins
- # with a dollar sign (not a hyphen), so the echo should work correctly.
- # The option is referenced via a variable to avoid confusing sed.
- lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&AS_MESSAGE_LOG_FD
- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
- $2=yes
- fi
- fi
- $RM conftest*
-])
-
-if test x"[$]$2" = xyes; then
- m4_if([$5], , :, [$5])
-else
- m4_if([$6], , :, [$6])
-fi
-])# _LT_COMPILER_OPTION
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
-
-
-# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-# [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------
-# Check whether the given linker option works
-AC_DEFUN([_LT_LINKER_OPTION],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_SED])dnl
-AC_CACHE_CHECK([$1], [$2],
- [$2=no
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $3"
- echo "$lt_simple_link_test_code" > conftest.$ac_ext
- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
- # The linker can only warn and ignore the option if not recognized
- # So say no if there are warnings
- if test -s conftest.err; then
- # Append any errors to the config.log.
- cat conftest.err 1>&AS_MESSAGE_LOG_FD
- $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if diff conftest.exp conftest.er2 >/dev/null; then
- $2=yes
- fi
- else
- $2=yes
- fi
- fi
- $RM -r conftest*
- LDFLAGS="$save_LDFLAGS"
-])
-
-if test x"[$]$2" = xyes; then
- m4_if([$4], , :, [$4])
-else
- m4_if([$5], , :, [$5])
-fi
-])# _LT_LINKER_OPTION
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
-
-
-# LT_CMD_MAX_LEN
-#---------------
-AC_DEFUN([LT_CMD_MAX_LEN],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-# find the maximum length of command line arguments
-AC_MSG_CHECKING([the maximum length of command line arguments])
-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
- i=0
- teststring="ABCD"
-
- case $build_os in
- msdosdjgpp*)
- # On DJGPP, this test can blow up pretty badly due to problems in libc
- # (any single argument exceeding 2000 bytes causes a buffer overrun
- # during glob expansion). Even if it were fixed, the result of this
- # check would be larger than it should be.
- lt_cv_sys_max_cmd_len=12288; # 12K is about right
- ;;
-
- gnu*)
- # Under GNU Hurd, this test is not required because there is
- # no limit to the length of command line arguments.
- # Libtool will interpret -1 as no limit whatsoever
- lt_cv_sys_max_cmd_len=-1;
- ;;
-
- cygwin* | mingw* | cegcc*)
- # On Win9x/ME, this test blows up -- it succeeds, but takes
- # about 5 minutes as the teststring grows exponentially.
- # Worse, since 9x/ME are not pre-emptively multitasking,
- # you end up with a "frozen" computer, even though with patience
- # the test eventually succeeds (with a max line length of 256k).
- # Instead, let's just punt: use the minimum linelength reported by
- # all of the supported platforms: 8192 (on NT/2K/XP).
- lt_cv_sys_max_cmd_len=8192;
- ;;
-
- amigaos*)
- # On AmigaOS with pdksh, this test takes hours, literally.
- # So we just punt and use a minimum line length of 8192.
- lt_cv_sys_max_cmd_len=8192;
- ;;
-
- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
- # This has been around since 386BSD, at least. Likely further.
- if test -x /sbin/sysctl; then
- lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
- elif test -x /usr/sbin/sysctl; then
- lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
- else
- lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
- fi
- # And add a safety zone
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
- ;;
-
- interix*)
- # We know the value 262144 and hardcode it with a safety zone (like BSD)
- lt_cv_sys_max_cmd_len=196608
- ;;
-
- osf*)
- # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
- # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
- # nice to cause kernel panics so lets avoid the loop below.
- # First set a reasonable default.
- lt_cv_sys_max_cmd_len=16384
- #
- if test -x /sbin/sysconfig; then
- case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
- *1*) lt_cv_sys_max_cmd_len=-1 ;;
- esac
- fi
- ;;
- sco3.2v5*)
- lt_cv_sys_max_cmd_len=102400
- ;;
- sysv5* | sco5v6* | sysv4.2uw2*)
- kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
- if test -n "$kargmax"; then
- lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[	 ]]//'`
- else
- lt_cv_sys_max_cmd_len=32768
- fi
- ;;
- *)
- lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
- if test -n "$lt_cv_sys_max_cmd_len"; then
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
- else
- # Make teststring a little bigger before we do anything with it.
- # a 1K string should be a reasonable start.
- for i in 1 2 3 4 5 6 7 8 ; do
- teststring=$teststring$teststring
- done
- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
- # If test is not a shell built-in, we'll probably end up computing a
- # maximum length that is only half of the actual maximum length, but
- # we can't tell.
- while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
-	 = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
-	 test $i != 17 # 1/2 MB should be enough
- do
- i=`expr $i + 1`
- teststring=$teststring$teststring
- done
- # Only check the string length outside the loop.
- lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
- teststring=
- # Add a significant safety factor because C++ compilers can tack on
- # massive amounts of additional arguments before passing them to the
- # linker. It appears as though 1/2 is a usable value.
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
- fi
- ;;
- esac
-])
-if test -n $lt_cv_sys_max_cmd_len ; then
- AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-else
- AC_MSG_RESULT(none)
-fi
-max_cmd_len=$lt_cv_sys_max_cmd_len
-_LT_DECL([], [max_cmd_len], [0],
- [What is the maximum length of a command?])
-])# LT_CMD_MAX_LEN
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
-
-
-# _LT_HEADER_DLFCN
-# ----------------
-m4_defun([_LT_HEADER_DLFCN],
-[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
-])# _LT_HEADER_DLFCN
-
-
-# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ----------------------------------------------------------------
-m4_defun([_LT_TRY_DLOPEN_SELF],
-[m4_require([_LT_HEADER_DLFCN])dnl
-if test "$cross_compiling" = yes; then :
- [$4]
-else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
-[#line __oline__ "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-# ifdef DL_GLOBAL
-# define LT_DLGLOBAL		DL_GLOBAL
-# else
-# define LT_DLGLOBAL		0
-# endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-# ifdef RTLD_LAZY
-# define LT_DLLAZY_OR_NOW		RTLD_LAZY
-# else
-# ifdef DL_LAZY
-# define LT_DLLAZY_OR_NOW		DL_LAZY
-# else
-# ifdef RTLD_NOW
-# define LT_DLLAZY_OR_NOW	RTLD_NOW
-# else
-# ifdef DL_NOW
-# define LT_DLLAZY_OR_NOW	DL_NOW
-# else
-# define LT_DLLAZY_OR_NOW	0
-# endif
-# endif
-# endif
-# endif
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
-
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
- else
- puts (dlerror ());
-
- return status;
-}]
-_LT_EOF
- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
- (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
- lt_status=$?
- case x$lt_status in
- x$lt_dlno_uscore) $1 ;;
- x$lt_dlneed_uscore) $2 ;;
- x$lt_dlunknown|x*) $3 ;;
- esac
- else :
- # compilation failed
- $3
- fi
-fi
-rm -fr conftest*
-])# _LT_TRY_DLOPEN_SELF
-
-
-# LT_SYS_DLOPEN_SELF
-# ------------------
-AC_DEFUN([LT_SYS_DLOPEN_SELF],
-[m4_require([_LT_HEADER_DLFCN])dnl
-if test "x$enable_dlopen" != xyes; then
- enable_dlopen=unknown
- enable_dlopen_self=unknown
- enable_dlopen_self_static=unknown
-else
- lt_cv_dlopen=no
- lt_cv_dlopen_libs=
-
- case $host_os in
- beos*)
- lt_cv_dlopen="load_add_on"
- lt_cv_dlopen_libs=
- lt_cv_dlopen_self=yes
- ;;
-
- mingw* | pw32* | cegcc*)
- lt_cv_dlopen="LoadLibrary"
- lt_cv_dlopen_libs=
- ;;
-
- cygwin*)
- lt_cv_dlopen="dlopen"
- lt_cv_dlopen_libs=
- ;;
-
- darwin*)
- # if libdl is installed we need to link against it
- AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
- lt_cv_dlopen="dyld"
- lt_cv_dlopen_libs=
- lt_cv_dlopen_self=yes
- ])
- ;;
-
- *)
- AC_CHECK_FUNC([shl_load],
-	 [lt_cv_dlopen="shl_load"],
- [AC_CHECK_LIB([dld], [shl_load],
-	 [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
-	[AC_CHECK_FUNC([dlopen],
-	 [lt_cv_dlopen="dlopen"],
-	 [AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
-	 [AC_CHECK_LIB([svld], [dlopen],
-		 [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
-	 [AC_CHECK_LIB([dld], [dld_link],
-		 [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
-	 ])
-	 ])
-	 ])
-	])
- ])
- ;;
- esac
-
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
- else
- enable_dlopen=no
- fi
-
- case $lt_cv_dlopen in
- dlopen)
- save_CPPFLAGS="$CPPFLAGS"
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
- save_LDFLAGS="$LDFLAGS"
- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
- save_LIBS="$LIBS"
- LIBS="$lt_cv_dlopen_libs $LIBS"
-
- AC_CACHE_CHECK([whether a program can dlopen itself],
-	 lt_cv_dlopen_self, [dnl
-	 _LT_TRY_DLOPEN_SELF(
-	 lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
-	 lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
- ])
-
- if test "x$lt_cv_dlopen_self" = xyes; then
- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
- AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
-	 lt_cv_dlopen_self_static, [dnl
-	 _LT_TRY_DLOPEN_SELF(
-	 lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
-	 lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross)
- ])
- fi
-
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
- ;;
- esac
-
- case $lt_cv_dlopen_self in
- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
- *) enable_dlopen_self=unknown ;;
- esac
-
- case $lt_cv_dlopen_self_static in
- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
- *) enable_dlopen_self_static=unknown ;;
- esac
-fi
-_LT_DECL([dlopen_support], [enable_dlopen], [0],
-	 [Whether dlopen is supported])
-_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
-	 [Whether dlopen of programs is supported])
-_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
-	 [Whether dlopen of statically linked programs is supported])
-])# LT_SYS_DLOPEN_SELF
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
-
-
-# _LT_COMPILER_C_O([TAGNAME])
-# ---------------------------
-# Check to see if options -c and -o are simultaneously supported by compiler.
-# This macro does not hard code the compiler like AC_PROG_CC_C_O.
-m4_defun([_LT_COMPILER_C_O],
-[m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
- [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
- [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
- $RM -r conftest 2>/dev/null
- mkdir conftest
- cd conftest
- mkdir out
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- lt_compiler_flag="-o out/conftest2.$ac_objext"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
- # Note that $ac_compile itself does not contain backslashes and begins
- # with a dollar sign (not a hyphen), so the echo should work correctly.
- lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&AS_MESSAGE_LOG_FD
- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
- $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
- if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
- _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
- fi
- fi
- chmod u+w . 2>&AS_MESSAGE_LOG_FD
- $RM conftest*
- # SGI C++ compiler will create directory out/ii_files/ for
- # template instantiation
- test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
- $RM out/* && rmdir out
- cd ..
- $RM -r conftest
- $RM conftest*
-])
-_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
-	[Does compiler simultaneously support -c and -o options?])
-])# _LT_COMPILER_C_O
-
-
-# _LT_COMPILER_FILE_LOCKS([TAGNAME])
-# ----------------------------------
-# Check to see if we can do hard links to lock some files if needed
-m4_defun([_LT_COMPILER_FILE_LOCKS],
-[m4_require([_LT_ENABLE_LOCK])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-_LT_COMPILER_C_O([$1])
-
-hard_links="nottested"
-if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
- # do not overwrite the value of need_locks provided by the user
- AC_MSG_CHECKING([if we can lock with hard links])
- hard_links=yes
- $RM conftest*
- ln conftest.a conftest.b 2>/dev/null && hard_links=no
- touch conftest.a
- ln conftest.a conftest.b 2>&5 || hard_links=no
- ln conftest.a conftest.b 2>/dev/null && hard_links=no
- AC_MSG_RESULT([$hard_links])
- if test "$hard_links" = no; then
- AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
- need_locks=warn
- fi
-else
- need_locks=no
-fi
-_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
-])# _LT_COMPILER_FILE_LOCKS
-
-
-# _LT_CHECK_OBJDIR
-# ----------------
-m4_defun([_LT_CHECK_OBJDIR],
-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
-[rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
- lt_cv_objdir=.libs
-else
- # MS-DOS does not allow filenames that begin with a dot.
- lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null])
-objdir=$lt_cv_objdir
-_LT_DECL([], [objdir], [0],
- [The name of the directory that contains temporary libtool files])dnl
-m4_pattern_allow([LT_OBJDIR])dnl
-AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
- [Define to the sub-directory in which libtool stores uninstalled libraries.])
-])# _LT_CHECK_OBJDIR
-
-
-# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
-# --------------------------------------
-# Check hardcoding attributes.
-m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
-[AC_MSG_CHECKING([how to hardcode library paths into programs])
-_LT_TAGVAR(hardcode_action, $1)=
-if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
- test -n "$_LT_TAGVAR(runpath_var, $1)" ||
- test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
-
- # We can hardcode non-existent directories.
- if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
- # If the only mechanism to avoid hardcoding is shlibpath_var, we
- # have to relink, otherwise we might link with an installed library
- # when we should be linking with a yet-to-be-installed one
- ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
- test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
- # Linking always hardcodes the temporary library directory.
- _LT_TAGVAR(hardcode_action, $1)=relink
- else
- # We can link without hardcoding, and we can hardcode nonexisting dirs.
- _LT_TAGVAR(hardcode_action, $1)=immediate
- fi
-else
- # We cannot hardcode anything, or else we can only hardcode existing
- # directories.
- _LT_TAGVAR(hardcode_action, $1)=unsupported
-fi
-AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
-
-if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
- test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
- # Fast installation is not supported
- enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
- test "$enable_shared" = no; then
- # Fast installation is not necessary
- enable_fast_install=needless
-fi
-_LT_TAGDECL([], [hardcode_action], [0],
- [How to hardcode a shared library path into an executable])
-])# _LT_LINKER_HARDCODE_LIBPATH
-
-
-# _LT_CMD_STRIPLIB
-# ----------------
-m4_defun([_LT_CMD_STRIPLIB],
-[m4_require([_LT_DECL_EGREP])
-striplib=
-old_striplib=
-AC_MSG_CHECKING([whether stripping libraries is possible])
-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
- test -z "$striplib" && striplib="$STRIP --strip-unneeded"
- AC_MSG_RESULT([yes])
-else
-# FIXME - insert some real tests, host_os isn't really good enough
- case $host_os in
- darwin*)
- if test -n "$STRIP" ; then
- striplib="$STRIP -x"
- old_striplib="$STRIP -S"
- AC_MSG_RESULT([yes])
- else
- AC_MSG_RESULT([no])
- fi
- ;;
- *)
- AC_MSG_RESULT([no])
- ;;
- esac
-fi
-_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
-_LT_DECL([], [striplib], [1])
-])# _LT_CMD_STRIPLIB
-
-
-# _LT_SYS_DYNAMIC_LINKER([TAG])
-# -----------------------------
-# PORTME Fill in your ld.so characteristics
-m4_defun([_LT_SYS_DYNAMIC_LINKER],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_OBJDUMP])dnl
-m4_require([_LT_DECL_SED])dnl
-AC_MSG_CHECKING([dynamic linker characteristics])
-m4_if([$1],
-	[], [
-if test "$GCC" = yes; then
- case $host_os in
- darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
- *) lt_awk_arg="/^libraries:/" ;;
- esac
- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
- # if the path contains ";" then we assume it to be the separator
- # otherwise default to the standard path separator (i.e. ":") - it is
- # assumed that no part of a normal pathname contains ";" but that should
- # okay in the real world where ";" in dirpaths is itself problematic.
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
- else
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
- # Ok, now we have the path, separated by spaces, we can step through it
- # and add multilib dir if necessary.
- lt_tmp_lt_search_path_spec=
- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
- for lt_sys_path in $lt_search_path_spec; do
- if test -d "$lt_sys_path/$lt_multi_os_dir"; then
- lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
- else
- test -d "$lt_sys_path" && \
-	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
- fi
- done
- lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
-BEGIN {RS=" "; FS="/|\n";} {
- lt_foo="";
- lt_count=0;
- for (lt_i = NF; lt_i > 0; lt_i--) {
- if ($lt_i != "" && $lt_i != ".") {
- if ($lt_i == "..") {
- lt_count++;
- } else {
- if (lt_count == 0) {
- lt_foo="/" $lt_i lt_foo;
- } else {
- lt_count--;
- }
- }
- }
- }
- if (lt_foo != "") { lt_freq[[lt_foo]]++; }
- if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
-}'`
- sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
-else
- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi])
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
- shlibpath_var=LIBPATH
-
- # AIX 3 has no versioning support, so we append a major version to the name.
- soname_spec='${libname}${release}${shared_ext}$major'
- ;;
-
-aix[[4-9]]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- hardcode_into_libs=yes
- if test "$host_cpu" = ia64; then
- # AIX 5 supports IA64
- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- else
- # With GCC up to 2.95.x, collect2 would create an import file
- # for dependence libraries. The import file would start with
- # the line `#! .'. This would cause the generated library to
- # depend on `.', always an invalid library. This was fixed in
- # development snapshots of GCC prior to 3.0.
- case $host_os in
- aix4 | aix4.[[01]] | aix4.[[01]].*)
- if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	 echo ' yes '
-	 echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
-	:
- else
-	can_build_shared=no
- fi
- ;;
- esac
- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
- # soname into executable. Probably we can add versioning support to
- # collect2, so additional links can be useful in future.
- if test "$aix_use_runtimelinking" = yes; then
- # If using run time linking (on AIX 4.2 or later) use lib<name>.so
- # instead of lib<name>.a to let people know that these are not
- # typical AIX shared libraries.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- else
- # We preserve .a as extension for shared libraries through AIX4.2
- # and later when we are not doing run time linking.
- library_names_spec='${libname}${release}.a $libname.a'
- soname_spec='${libname}${release}${shared_ext}$major'
- fi
- shlibpath_var=LIBPATH
- fi
- ;;
-
-amigaos*)
- case $host_cpu in
- powerpc)
- # Since July 2007 AmigaOS4 officially supports .so libraries.
- # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- ;;
- m68k)
- library_names_spec='$libname.ixlibrary $libname.a'
- # Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/$[[^/]]*$\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
- ;;
- esac
- ;;
-
-beos*)
- library_names_spec='${libname}${shared_ext}'
- dynamic_linker="$host_os ld.so"
- shlibpath_var=LIBRARY_PATH
- ;;
-
-bsdi[[45]]*)
- version_type=linux
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
- sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
- # the default ld.so.conf also contains /usr/contrib/lib and
- # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
- # libtool to hard-code these into programs
- ;;
-
-cygwin* | mingw* | pw32* | cegcc*)
- version_type=windows
- shrext_cmds=".dll"
- need_version=no
- need_lib_prefix=no
-
- case $GCC,$host_os in
- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
- library_names_spec='$libname.dll.a'
- # DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
- dldir=$destdir/`dirname \$dlpath`~
- test -d \$dldir || mkdir -p \$dldir~
- $install_prog $dir/$dlname \$dldir/$dlname~
- chmod a+x \$dldir/$dlname~
- if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
- eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
- fi'
- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
- dlpath=$dir/\$dldll~
- $RM \$dlpath'
- shlibpath_overrides_runpath=yes
-
- case $host_os in
- cygwin*)
- # Cygwin DLLs use 'cyg' prefix rather than 'lib'
- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
- ;;
- mingw* | cegcc*)
- # MinGW DLLs use traditional 'lib' prefix
- soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
- # It is most probably a Windows format PATH printed by
- # mingw gcc, but we are running on Cygwin. Gcc prints its search
- # path with ; separators, and with drive letters. We can handle the
- # drive letters (cygwin fileutils understands them), so leave them,
- # especially as we might pass files found there to a mingw objdump,
- # which wouldn't understand a cygwinified path. Ahh.
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
- else
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
- ;;
- pw32*)
- # pw32 DLLs use 'pw' prefix rather than 'lib'
- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
- ;;
- esac
- ;;
-
- *)
- library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
- ;;
- esac
- dynamic_linker='Win32 ld.exe'
- # FIXME: first we should search . and the directory the executable is in
- shlibpath_var=PATH
- ;;
-
-darwin* | rhapsody*)
- dynamic_linker="$host_os dyld"
- version_type=darwin
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
- soname_spec='${libname}${release}${major}$shared_ext'
- shlibpath_overrides_runpath=yes
- shlibpath_var=DYLD_LIBRARY_PATH
- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-m4_if([$1], [],[
- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
- ;;
-
-dgux*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-
-freebsd1*)
- dynamic_linker=no
- ;;
-
-freebsd* | dragonfly*)
- # DragonFly does not have aout. When/if they implement a new
- # versioning mechanism, adjust this.
- if test -x /usr/bin/objformat; then
- objformat=`/usr/bin/objformat`
- else
- case $host_os in
- freebsd[[123]]*) objformat=aout ;;
- *) objformat=elf ;;
- esac
- fi
- version_type=freebsd-$objformat
- case $version_type in
- freebsd-elf*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- need_version=no
- need_lib_prefix=no
- ;;
- freebsd-*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
- need_version=yes
- ;;
- esac
- shlibpath_var=LD_LIBRARY_PATH
- case $host_os in
- freebsd2*)
- shlibpath_overrides_runpath=yes
- ;;
- freebsd3.[[01]]* | freebsdelf3.[[01]]*)
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
- freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
- freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
- *) # from 4.6 on, and DragonFly
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
- esac
- ;;
-
-gnu*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- hardcode_into_libs=yes
- ;;
-
-hpux9* | hpux10* | hpux11*)
- # Give a soname corresponding to the major version so that dld.sl refuses to
- # link against other versions.
- version_type=sunos
- need_lib_prefix=no
- need_version=no
- case $host_cpu in
- ia64*)
- shrext_cmds='.so'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.so"
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- if test "X$HPUX_IA64_MODE" = X32; then
- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
- else
- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
- fi
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- hppa*64*)
- shrext_cmds='.sl'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- *)
- shrext_cmds='.sl'
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=SHLIB_PATH
- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- ;;
- esac
- # HP-UX runs *really* slowly unless shared libraries are mode 555.
- postinstall_cmds='chmod 555 $lib'
- ;;
-
-interix[[3-9]]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-
-irix5* | irix6* | nonstopux*)
- case $host_os in
- nonstopux*) version_type=nonstopux ;;
- *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
- esac
- need_lib_prefix=no
- need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
- case $host_os in
- irix5* | nonstopux*)
- libsuff= shlibsuff=
- ;;
- *)
- case $LD in # libtool.m4 will add one of these switches to LD
- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
- libsuff= shlibsuff= libmagic=32-bit;;
- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
- libsuff=32 shlibsuff=N32 libmagic=N32;;
- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
- libsuff=64 shlibsuff=64 libmagic=64-bit;;
- *) libsuff= shlibsuff= libmagic=never-match;;
- esac
- ;;
- esac
- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
- shlibpath_overrides_runpath=no
- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
- hardcode_into_libs=yes
- ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
- dynamic_linker=no
- ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- # Some binutils ld are patched to set DT_RUNPATH
- save_LDFLAGS=$LDFLAGS
- save_libdir=$libdir
- eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
- LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
- [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
- [shlibpath_overrides_runpath=yes])])
- LDFLAGS=$save_LDFLAGS
- libdir=$save_libdir
-
- # This implies no fast_install, which is unacceptable.
- # Some rework will be needed to allow for fast_install
- # before this can be enabled.
- hardcode_into_libs=yes
-
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
- fi
-
- # We used to test for /lib/ld.so.1 and disable shared libraries on
- # powerpc, because MkLinux only supported shared libraries with the
- # GNU dynamic linker. Since this was broken with cross compilers,
- # most powerpc-linux boxes support dynamic linking these days and
- # people can always --disable-shared, the test was removed, and we
- # assume the GNU/Linux dynamic linker is in use.
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
-netbsd*)
- version_type=sunos
- need_lib_prefix=no
- need_version=no
- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- dynamic_linker='NetBSD (a.out) ld.so'
- else
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- dynamic_linker='NetBSD ld.elf_so'
- fi
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
-
-newsos6)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- ;;
-
-*nto* | *qnx*)
- version_type=qnx
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='ldqnx.so'
- ;;
-
-openbsd*)
- version_type=sunos
- sys_lib_dlsearch_path_spec="/usr/lib"
- need_lib_prefix=no
- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
- case $host_os in
- openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
- *)				need_version=no ;;
- esac
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- case $host_os in
- openbsd2.[[89]] | openbsd2.[[89]].*)
-	shlibpath_overrides_runpath=no
-	;;
- *)
-	shlibpath_overrides_runpath=yes
-	;;
- esac
- else
- shlibpath_overrides_runpath=yes
- fi
- ;;
-
-os2*)
- libname_spec='$name'
- shrext_cmds=".dll"
- need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
- dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
- ;;
-
-osf3* | osf4* | osf5*)
- version_type=osf
- need_lib_prefix=no
- need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
- ;;
-
-rdos*)
- dynamic_linker=no
- ;;
-
-solaris*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- # ldd complains unless libraries are executable
- postinstall_cmds='chmod +x $lib'
- ;;
-
-sunos4*)
- version_type=sunos
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- fi
- need_version=yes
- ;;
-
-sysv4 | sysv4.3*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- case $host_vendor in
- sni)
- shlibpath_overrides_runpath=no
- need_lib_prefix=no
- runpath_var=LD_RUN_PATH
- ;;
- siemens)
- need_lib_prefix=no
- ;;
- motorola)
- need_lib_prefix=no
- need_version=no
- shlibpath_overrides_runpath=no
- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
- ;;
- esac
- ;;
-
-sysv4*MP*)
- if test -d /usr/nec ;then
- version_type=linux
- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
- soname_spec='$libname${shared_ext}.$major'
- shlibpath_var=LD_LIBRARY_PATH
- fi
- ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- version_type=freebsd-elf
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- if test "$with_gnu_ld" = yes; then
- sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
- else
- sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
- case $host_os in
- sco3.2v5*)
- sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
- esac
- fi
- sys_lib_dlsearch_path_spec='/usr/lib'
- ;;
-
-tpf*)
- # TPF is a cross-target only. Preferred cross-host = GNU/Linux.
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-
-uts4*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-
-*)
- dynamic_linker=no
- ;;
-esac
-AC_MSG_RESULT([$dynamic_linker])
-test "$dynamic_linker" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
- sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-fi
-
-_LT_DECL([], [variables_saved_for_relink], [1],
- [Variables whose values should be saved in libtool wrapper scripts and
- restored at link time])
-_LT_DECL([], [need_lib_prefix], [0],
- [Do we need the "lib" prefix for modules?])
-_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
-_LT_DECL([], [version_type], [0], [Library versioning type])
-_LT_DECL([], [runpath_var], [0], [Shared library runtime path variable])
-_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
-_LT_DECL([], [shlibpath_overrides_runpath], [0],
- [Is shlibpath searched before the hard-coded library search path?])
-_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
-_LT_DECL([], [library_names_spec], [1],
- [[List of archive names. First name is the real one, the rest are links.
- The last name is the one that the linker finds with -lNAME]])
-_LT_DECL([], [soname_spec], [1],
- [[The coded name of the library, if different from the real name]])
-_LT_DECL([], [postinstall_cmds], [2],
- [Command to use after installation of a shared archive])
-_LT_DECL([], [postuninstall_cmds], [2],
- [Command to use after uninstallation of a shared archive])
-_LT_DECL([], [finish_cmds], [2],
- [Commands used to finish a libtool library installation in a directory])
-_LT_DECL([], [finish_eval], [1],
- [[As "finish_cmds", except a single script fragment to be evaled but
- not shown]])
-_LT_DECL([], [hardcode_into_libs], [0],
- [Whether we should hardcode library paths into libraries])
-_LT_DECL([], [sys_lib_search_path_spec], [2],
- [Compile-time system search path for libraries])
-_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
- [Run-time system search path for libraries])
-])# _LT_SYS_DYNAMIC_LINKER
-
-
-# _LT_PATH_TOOL_PREFIX(TOOL)
-# --------------------------
-# find a file program which can recognize shared library
-AC_DEFUN([_LT_PATH_TOOL_PREFIX],
-[m4_require([_LT_DECL_EGREP])dnl
-AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-[[\\/*] | ?:[\\/]*])
- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
- ;;
-*)
- lt_save_MAGIC_CMD="$MAGIC_CMD"
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word. This closes a longstanding sh security hole.
- ac_dummy="m4_if([$2], , $PATH, [$2])"
- for ac_dir in $ac_dummy; do
- IFS="$lt_save_ifs"
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$1; then
- lt_cv_path_MAGIC_CMD="$ac_dir/$1"
- if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	 file_magic_regex=`expr "$deplibs_check_method" : "file_magic $.*$"`
-	 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	 if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	 $EGREP "$file_magic_regex" > /dev/null; then
-	 :
-	 else
-	 cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such. This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem. Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-	 fi ;;
-	esac
- fi
- break
- fi
- done
- IFS="$lt_save_ifs"
- MAGIC_CMD="$lt_save_MAGIC_CMD"
- ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
- AC_MSG_RESULT($MAGIC_CMD)
-else
- AC_MSG_RESULT(no)
-fi
-_LT_DECL([], [MAGIC_CMD], [0],
-	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
-])# _LT_PATH_TOOL_PREFIX
-
-# Old name:
-AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
-
-
-# _LT_PATH_MAGIC
-# --------------
-# find a file program which can recognize a shared library
-m4_defun([_LT_PATH_MAGIC],
-[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
- if test -n "$ac_tool_prefix"; then
- _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
- else
- MAGIC_CMD=:
- fi
-fi
-])# _LT_PATH_MAGIC
-
-
-# LT_PATH_LD
-# ----------
-# find the pathname to the GNU or non-GNU linker
-AC_DEFUN([LT_PATH_LD],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_DECL_EGREP])dnl
-
-AC_ARG_WITH([gnu-ld],
- [AS_HELP_STRING([--with-gnu-ld],
-	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
- [test "$withval" = no || with_gnu_ld=yes],
- [with_gnu_ld=no])dnl
-
-ac_prog=ld
-if test "$GCC" = yes; then
- # Check if gcc -print-prog-name=ld gives a path.
- AC_MSG_CHECKING([for ld used by $CC])
- case $host in
- *-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
- *)
- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
- esac
- case $ac_prog in
- # Accept absolute paths.
- [[\\/]]* | ?:[[\\/]]*)
- re_direlt='/[[^/]][[^/]]*/\.\./'
- # Canonicalize the pathname of ld
- ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
- while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
- done
- test -z "$LD" && LD="$ac_prog"
- ;;
- "")
- # If it fails, then pretend we aren't using GCC.
- ac_prog=ld
- ;;
- *)
- # If it is relative, then search for the first ld in PATH.
- with_gnu_ld=unknown
- ;;
- esac
-elif test "$with_gnu_ld" = yes; then
- AC_MSG_CHECKING([for GNU ld])
-else
- AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-[if test -z "$LD"; then
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for ac_dir in $PATH; do
- IFS="$lt_save_ifs"
- test -z "$ac_dir" && ac_dir=.
- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
- lt_cv_path_LD="$ac_dir/$ac_prog"
- # Check to see if the program is GNU ld. I'd rather use --version,
- # but apparently some variants of GNU ld only accept -v.
- # Break only if it was the GNU/non-GNU ld that we prefer.
- case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
-	;;
- *)
-	test "$with_gnu_ld" != yes && break
-	;;
- esac
- fi
- done
- IFS="$lt_save_ifs"
-else
- lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
- AC_MSG_RESULT($LD)
-else
- AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-_LT_PATH_LD_GNU
-AC_SUBST([LD])
-
-_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
-])# LT_PATH_LD
-
-# Old names:
-AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
-AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_PROG_LD], [])
-dnl AC_DEFUN([AC_PROG_LD], [])
-
-
-# _LT_PATH_LD_GNU
-#- --------------
-m4_defun([_LT_PATH_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
- lt_cv_prog_gnu_ld=yes
- ;;
-*)
- lt_cv_prog_gnu_ld=no
- ;;
-esac])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])# _LT_PATH_LD_GNU
-
-
-# _LT_CMD_RELOAD
-# --------------
-# find reload flag for linker
-# -- PORTME Some linkers may need a different reload flag.
-m4_defun([_LT_CMD_RELOAD],
-[AC_CACHE_CHECK([for $LD option to reload object files],
- lt_cv_ld_reload_flag,
- [lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
- darwin*)
- if test "$GCC" = yes; then
- reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
- else
- reload_cmds='$LD$reload_flag -o $output$reload_objs'
- fi
- ;;
-esac
-_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
-_LT_DECL([], [reload_cmds], [2])dnl
-])# _LT_CMD_RELOAD
-
-
-# _LT_CHECK_MAGIC_METHOD
-# ----------------------
-# how to check for library dependencies
-# -- PORTME fill in with the dynamic library characteristics
-m4_defun([_LT_CHECK_MAGIC_METHOD],
-[m4_require([_LT_DECL_EGREP])
-m4_require([_LT_DECL_OBJDUMP])
-AC_CACHE_CHECK([how to recognize dependent libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix[[4-9]]*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-beos*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-bsdi[[45]]*)
- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
- lt_cv_file_magic_cmd='/usr/bin/file -L'
- lt_cv_file_magic_test_file=/shlib/libc.so
- ;;
-
-cygwin*)
- # func_win32_libid is a shell function defined in ltmain.sh
- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
- lt_cv_file_magic_cmd='func_win32_libid'
- ;;
-
-mingw* | pw32*)
- # Base MSYS/MinGW do not provide the 'file' command needed by
- # func_win32_libid shell function, so use a weaker test based on 'objdump',
- # unless we find 'file', for example because we are cross-compiling.
- if ( file / ) >/dev/null 2>&1; then
- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
- lt_cv_file_magic_cmd='func_win32_libid'
- else
- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
- lt_cv_file_magic_cmd='$OBJDUMP -f'
- fi
- ;;
-
-cegcc)
- # use the weaker test based on 'objdump'. See mingw*.
- lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
- lt_cv_file_magic_cmd='$OBJDUMP -f'
- ;;
-
-darwin* | rhapsody*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-freebsd* | dragonfly*)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
- case $host_cpu in
- i*86 )
- # Not sure whether the presence of OpenBSD here was a mistake.
- # Let's accept both of them until this is cleared up.
- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
- lt_cv_file_magic_cmd=/usr/bin/file
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
- ;;
- esac
- else
- lt_cv_deplibs_check_method=pass_all
- fi
- ;;
-
-gnu*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-hpux10.20* | hpux11*)
- lt_cv_file_magic_cmd=/usr/bin/file
- case $host_cpu in
- ia64*)
- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
- lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
- ;;
- hppa*64*)
- [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
- lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
- ;;
- *)
- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
- lt_cv_file_magic_test_file=/usr/lib/libc.sl
- ;;
- esac
- ;;
-
-interix[[3-9]]*)
- # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
- ;;
-
-irix5* | irix6* | nonstopux*)
- case $LD in
- *-32|*"-32 ") libmagic=32-bit;;
- *-n32|*"-n32 ") libmagic=N32;;
- *-64|*"-64 ") libmagic=64-bit;;
- *) libmagic=never-match;;
- esac
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
- else
- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
- fi
- ;;
-
-newos6*)
- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
- lt_cv_file_magic_cmd=/usr/bin/file
- lt_cv_file_magic_test_file=/usr/lib/libnls.so
- ;;
-
-*nto* | *qnx*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-openbsd*)
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
- else
- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
- fi
- ;;
-
-osf3* | osf4* | osf5*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-rdos*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-solaris*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-sysv4 | sysv4.3*)
- case $host_vendor in
- motorola)
- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
- ;;
- ncr)
- lt_cv_deplibs_check_method=pass_all
- ;;
- sequent)
- lt_cv_file_magic_cmd='/bin/file'
- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
- ;;
- sni)
- lt_cv_file_magic_cmd='/bin/file'
- lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
- lt_cv_file_magic_test_file=/lib/libc.so
- ;;
- siemens)
- lt_cv_deplibs_check_method=pass_all
- ;;
- pc)
- lt_cv_deplibs_check_method=pass_all
- ;;
- esac
- ;;
-
-tpf*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-esac
-])
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-_LT_DECL([], [deplibs_check_method], [1],
- [Method to check whether dependent libraries are shared objects])
-_LT_DECL([], [file_magic_cmd], [1],
- [Command to use when deplibs_check_method == "file_magic"])
-])# _LT_CHECK_MAGIC_METHOD
-
-
-# LT_PATH_NM
-# ----------
-# find the pathname to a BSD- or MS-compatible name lister
-AC_DEFUN([LT_PATH_NM],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
-[if test -n "$NM"; then
- # Let the user override the test.
- lt_cv_path_NM="$NM"
-else
- lt_nm_to_check="${ac_tool_prefix}nm"
- if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
- lt_nm_to_check="$lt_nm_to_check nm"
- fi
- for lt_tmp_nm in $lt_nm_to_check; do
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
- IFS="$lt_save_ifs"
- test -z "$ac_dir" && ac_dir=.
- tmp_nm="$ac_dir/$lt_tmp_nm"
- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-	# nm: unknown option "B" ignored
-	# Tru64's nm complains that /dev/null is an invalid object file
-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-	*/dev/null* | *'Invalid file or object type'*)
-	 lt_cv_path_NM="$tmp_nm -B"
-	 break
-	 ;;
-	*)
-	 case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	 */dev/null*)
-	 lt_cv_path_NM="$tmp_nm -p"
-	 break
-	 ;;
-	 *)
-	 lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	 continue # so that we can try to find one that supports BSD flags
-	 ;;
-	 esac
-	 ;;
-	esac
- fi
- done
- IFS="$lt_save_ifs"
- done
- : ${lt_cv_path_NM=no}
-fi])
-if test "$lt_cv_path_NM" != "no"; then
- NM="$lt_cv_path_NM"
-else
- # Didn't find any BSD compatible name lister, look for dumpbin.
- AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
- AC_SUBST([DUMPBIN])
- if test "$DUMPBIN" != ":"; then
- NM="$DUMPBIN"
- fi
-fi
-test -z "$NM" && NM=nm
-AC_SUBST([NM])
-_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
-
-AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
- [lt_cv_nm_interface="BSD nm"
- echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
- (eval "$ac_compile" 2>conftest.err)
- cat conftest.err >&AS_MESSAGE_LOG_FD
- (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
- (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
- cat conftest.err >&AS_MESSAGE_LOG_FD
- (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)
- cat conftest.out >&AS_MESSAGE_LOG_FD
- if $GREP 'External.*some_variable' conftest.out > /dev/null; then
- lt_cv_nm_interface="MS dumpbin"
- fi
- rm -f conftest*])
-])# LT_PATH_NM
-
-# Old names:
-AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
-AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_PROG_NM], [])
-dnl AC_DEFUN([AC_PROG_NM], [])
-
-
-# LT_LIB_M
-# --------
-# check for math library
-AC_DEFUN([LT_LIB_M],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
- # These system don't have libm, or don't need it
- ;;
-*-ncr-sysv4.3*)
- AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
- AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
- ;;
-*)
- AC_CHECK_LIB(m, cos, LIBM="-lm")
- ;;
-esac
-AC_SUBST([LIBM])
-])# LT_LIB_M
-
-# Old name:
-AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_CHECK_LIBM], [])
-
-
-# _LT_COMPILER_NO_RTTI([TAGNAME])
-# -------------------------------
-m4_defun([_LT_COMPILER_NO_RTTI],
-[m4_require([_LT_TAG_COMPILER])dnl
-
-_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-
-if test "$GCC" = yes; then
- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-
- _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
- lt_cv_prog_compiler_rtti_exceptions,
- [-fno-rtti -fno-exceptions], [],
- [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
-fi
-_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
-	[Compiler flag to turn off builtin functions])
-])# _LT_COMPILER_NO_RTTI
-
-
-# _LT_CMD_GLOBAL_SYMBOLS
-# ----------------------
-m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-AC_REQUIRE([LT_PATH_LD])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-AC_MSG_CHECKING([command to parse $NM output from $compiler object])
-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
-[
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix. What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[[BCDEGRST]]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='$[[_A-Za-z]][[_A-Za-z0-9]]*$'
-
-# Define system-specific variables.
-case $host_os in
-aix*)
- symcode='[[BCDT]]'
- ;;
-cygwin* | mingw* | pw32* | cegcc*)
- symcode='[[ABCDGISTW]]'
- ;;
-hpux*)
- if test "$host_cpu" = ia64; then
- symcode='[[ABCDEGRST]]'
- fi
- ;;
-irix* | nonstopux*)
- symcode='[[BCDEGRST]]'
- ;;
-osf*)
- symcode='[[BCDEGQRST]]'
- ;;
-solaris*)
- symcode='[[BDRT]]'
- ;;
-sco3.2v5*)
- symcode='[[DT]]'
- ;;
-sysv4.2uw2*)
- symcode='[[DT]]'
- ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
- symcode='[[ABDT]]'
- ;;
-sysv4)
- symcode='[[DFNSTU]]'
- ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
- symcode='[[ABCDGIRSTW]]' ;;
-esac
-
-# Transform an extracted symbol line into a proper C declaration.
-# Some systems (esp. on ia64) link data and code symbols differently,
-# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern int \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: $[[^ ]]*$ $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* $[[^ ]]*$ $[[^ ]]*$$/ {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: $[[^ ]]*$ $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* $[[^ ]]*$ $lib[[^ ]]*$$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* $[[^ ]]*$ $[[^ ]]*$$/ {\"lib\2\", (void *) \&\2},/p'"
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
- opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
- ;;
-esac
-
-# Try without a prefix underscore, then with it.
-for ac_symprfx in "" "_"; do
-
- # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
- symxfrm="\\1 $ac_symprfx\\2 \\2"
-
- # Write the raw and C identifiers.
- if test "$lt_cv_nm_interface" = "MS dumpbin"; then
- # Fake it for dumpbin and say T for any non-static function
- # and D for any global variable.
- # Also find C++ and __fastcall symbols from MSVC++,
- # which start with @ or ?.
- lt_cv_sys_global_symbol_pipe="$AWK ['"\
-" {last_section=section; section=\$ 3};"\
-" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-" \$ 0!~/External *\|/{next};"\
-" / 0+ UNDEF /{next}; / UNDEF $[^|]$*()/{next};"\
-" {if(hide[section]) next};"\
-" {f=0}; \$ 0~/.*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-" s[1]~/^[@?]/{print s[1], s[1]; next};"\
-" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
-" ' prfx=^$ac_symprfx]"
- else
- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]$$symcode$symcode*$[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
- fi
-
- # Check to see that the pipe works correctly.
- pipe_works=no
-
- rm -f conftest*
- cat > conftest.$ac_ext <<_LT_EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(void);
-void nm_test_func(void){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-_LT_EOF
-
- if AC_TRY_EVAL(ac_compile); then
- # Now try to grab the symbols.
- nlist=conftest.nm
- if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
- # Try sorting and uniquifying the output.
- if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
- else
-	rm -f "$nlist"T
- fi
-
- # Make sure that we snagged all the symbols we need.
- if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
-	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
-	 cat <<_LT_EOF > conftest.$ac_ext
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-_LT_EOF
-	 # Now generate the symbol file.
-	 eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
-
-	 cat <<_LT_EOF >> conftest.$ac_ext
-
-/* The mapping between symbol names and symbols. */
-const struct {
- const char *name;
- void *address;
-}
-lt__PROGRAM__LTX_preloaded_symbols[[]] =
-{
- { "@PROGRAM@", (void *) 0 },
-_LT_EOF
-	 $SED "s/^$symcode$symcode* $.*$ $.*$$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-	 cat <<\_LT_EOF >> conftest.$ac_ext
- {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
- return lt__PROGRAM__LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-_LT_EOF
-	 # Now try linking the two files.
-	 mv conftest.$ac_objext conftstm.$ac_objext
-	 lt_save_LIBS="$LIBS"
-	 lt_save_CFLAGS="$CFLAGS"
-	 LIBS="conftstm.$ac_objext"
-	 CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
-	 if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
-	 pipe_works=yes
-	 fi
-	 LIBS="$lt_save_LIBS"
-	 CFLAGS="$lt_save_CFLAGS"
-	else
-	 echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
-	fi
- else
-	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
- fi
- else
- echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
- fi
- else
- echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
- cat conftest.$ac_ext >&5
- fi
- rm -rf conftest* conftst*
-
- # Do not use the global_symbol_pipe unless it works.
- if test "$pipe_works" = yes; then
- break
- else
- lt_cv_sys_global_symbol_pipe=
- fi
-done
-])
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
- lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
- AC_MSG_RESULT(failed)
-else
- AC_MSG_RESULT(ok)
-fi
-
-_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
- [Take the output of nm and produce a listing of raw symbols and C names])
-_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
- [Transform the output of nm in a proper C declaration])
-_LT_DECL([global_symbol_to_c_name_address],
- [lt_cv_sys_global_symbol_to_c_name_address], [1],
- [Transform the output of nm in a C name address pair])
-_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
- [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
- [Transform the output of nm in a C name address pair when lib prefix is needed])
-]) # _LT_CMD_GLOBAL_SYMBOLS
-
-
-# _LT_COMPILER_PIC([TAGNAME])
-# ---------------------------
-m4_defun([_LT_COMPILER_PIC],
-[m4_require([_LT_TAG_COMPILER])dnl
-_LT_TAGVAR(lt_prog_compiler_wl, $1)=
-_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-_LT_TAGVAR(lt_prog_compiler_static, $1)=
-
-AC_MSG_CHECKING([for $compiler option to produce PIC])
-m4_if([$1], [CXX], [
- # C++ specific cases for pic, static, wl, etc.
- if test "$GXX" = yes; then
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
- case $host_os in
- aix*)
- # All AIX code is PIC.
- if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- fi
- ;;
-
- amigaos*)
- case $host_cpu in
- powerpc)
- # see comment about AmigaOS4 .so support
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- ;;
- m68k)
- # FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
- ;;
- esac
- ;;
-
- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
- # PIC is the default for these OSes.
- ;;
- mingw* | cygwin* | os2* | pw32* | cegcc*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- # Although the cygwin gcc ignores -fPIC, still need this for old-style
- # (--disable-auto-import) libraries
- m4_if([$1], [GCJ], [],
-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
- ;;
- darwin* | rhapsody*)
- # PIC is the default on this platform
- # Common symbols not allowed in MH_DYLIB files
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
- ;;
- *djgpp*)
- # DJGPP does not support shared libraries at all
- _LT_TAGVAR(lt_prog_compiler_pic, $1)=
- ;;
- interix[[3-9]]*)
- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
- # Instead, we relocate shared libraries at runtime.
- ;;
- sysv4*MP*)
- if test -d /usr/nec; then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
- fi
- ;;
- hpux*)
- # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
- # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
- # sets the default TLS model and affects inlining.
- case $host_cpu in
- hppa*64*)
-	;;
- *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
- esac
- ;;
- *qnx* | *nto*)
- # QNX uses GNU C++, but need to define -shared option too, otherwise
- # it will coredump.
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
- ;;
- *)
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- ;;
- esac
- else
- case $host_os in
- aix[[4-9]]*)
-	# All AIX code is PIC.
-	if test "$host_cpu" = ia64; then
-	 # AIX 5 now supports IA64 processor
-	 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	else
-	 _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-	fi
-	;;
- chorus*)
-	case $cc_basename in
-	cxch68*)
-	 # Green Hills C++ Compiler
-	 # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-	 ;;
-	esac
-	;;
- dgux*)
-	case $cc_basename in
-	 ec++*)
-	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	 ;;
-	 ghcx*)
-	 # Green Hills C++ Compiler
-	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	 ;;
-	 *)
-	 ;;
-	esac
-	;;
- freebsd* | dragonfly*)
-	# FreeBSD uses GNU C++
-	;;
- hpux9* | hpux10* | hpux11*)
-	case $cc_basename in
-	 CC*)
-	 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	 _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-	 if test "$host_cpu" != ia64; then
-	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	 fi
-	 ;;
-	 aCC*)
-	 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	 _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-	 case $host_cpu in
-	 hppa*64*|ia64*)
-	 # +Z the default
-	 ;;
-	 *)
-	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	 ;;
-	 esac
-	 ;;
-	 *)
-	 ;;
-	esac
-	;;
- interix*)
-	# This is c89, which is MS Visual C++ (no shared libs)
-	# Anyone wants to do a port?
-	;;
- irix5* | irix6* | nonstopux*)
-	case $cc_basename in
-	 CC*)
-	 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	 _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	 # CC pic flag -KPIC is the default.
-	 ;;
-	 *)
-	 ;;
-	esac
-	;;
- linux* | k*bsd*-gnu)
-	case $cc_basename in
-	 KCC*)
-	 # KAI C++ Compiler
-	 _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	 ;;
-	 ecpc* )
-	 # old Intel C++ for x86_64 which still supported -KPIC.
-	 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	 _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	 ;;
-	 icpc* )
-	 # Intel C++, used to be incompatible with GCC.
-	 # ICC 10 doesn't accept -KPIC any more.
-	 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	 _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	 ;;
-	 pgCC* | pgcpp*)
-	 # Portland Group C++ compiler
-	 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	 ;;
-	 cxx*)
-	 # Compaq C++
-	 # Make sure the PIC flag is empty. It appears that all Alpha
-	 # Linux and Compaq Tru64 Unix objects are PIC.
-	 _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-	 _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	 ;;
-	 xlc* | xlC*)
-	 # IBM XL 8.0 on PPC
-	 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-	 _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-	 ;;
-	 *)
-	 case `$CC -V 2>&1 | sed 5q` in
-	 *Sun\ C*)
-	 # Sun C++ 5.9
-	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	 ;;
-	 esac
-	 ;;
-	esac
-	;;
- lynxos*)
-	;;
- m88k*)
-	;;
- mvs*)
-	case $cc_basename in
-	 cxx*)
-	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
-	 ;;
-	 *)
-	 ;;
-	esac
-	;;
- netbsd* | netbsdelf*-gnu)
-	;;
- *qnx* | *nto*)
- # QNX uses GNU C++, but need to define -shared option too, otherwise
- # it will coredump.
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
- ;;
- osf3* | osf4* | osf5*)
-	case $cc_basename in
-	 KCC*)
-	 _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	 ;;
-	 RCC*)
-	 # Rational C++ 2.4.1
-	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	 ;;
-	 cxx*)
-	 # Digital/Compaq C++
-	 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	 # Make sure the PIC flag is empty. It appears that all Alpha
-	 # Linux and Compaq Tru64 Unix objects are PIC.
-	 _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-	 _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	 ;;
-	 *)
-	 ;;
-	esac
-	;;
- psos*)
-	;;
- solaris*)
-	case $cc_basename in
-	 CC*)
-	 # Sun C++ 4.2, 5.x and Centerline C++
-	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	 ;;
-	 gcx*)
-	 # Green Hills C++ Compiler
-	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-	 ;;
-	 *)
-	 ;;
-	esac
-	;;
- sunos4*)
-	case $cc_basename in
-	 CC*)
-	 # Sun C++ 4.x
-	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	 ;;
-	 lcc*)
-	 # Lucid
-	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	 ;;
-	 *)
-	 ;;
-	esac
-	;;
- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-	case $cc_basename in
-	 CC*)
-	 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	 ;;
-	esac
-	;;
- tandem*)
-	case $cc_basename in
-	 NCC*)
-	 # NonStop-UX NCC 3.20
-	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	 ;;
-	 *)
-	 ;;
-	esac
-	;;
- vxworks*)
-	;;
- *)
-	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-	;;
- esac
- fi
-],
-[
- if test "$GCC" = yes; then
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
- case $host_os in
- aix*)
- # All AIX code is PIC.
- if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- fi
- ;;
-
- amigaos*)
- case $host_cpu in
- powerpc)
- # see comment about AmigaOS4 .so support
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- ;;
- m68k)
- # FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
- ;;
- esac
- ;;
-
- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
- # PIC is the default for these OSes.
- ;;
-
- mingw* | cygwin* | pw32* | os2* | cegcc*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- # Although the cygwin gcc ignores -fPIC, still need this for old-style
- # (--disable-auto-import) libraries
- m4_if([$1], [GCJ], [],
-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
- ;;
-
- darwin* | rhapsody*)
- # PIC is the default on this platform
- # Common symbols not allowed in MH_DYLIB files
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
- ;;
-
- hpux*)
- # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
- # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
- # sets the default TLS model and affects inlining.
- case $host_cpu in
- hppa*64*)
-	# +Z the default
-	;;
- *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
- esac
- ;;
-
- interix[[3-9]]*)
- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
- # Instead, we relocate shared libraries at runtime.
- ;;
-
- msdosdjgpp*)
- # Just because we use GCC doesn't mean we suddenly get shared libraries
- # on systems that don't support them.
- _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
- enable_shared=no
- ;;
-
- *nto* | *qnx*)
- # QNX uses GNU C++, but need to define -shared option too, otherwise
- # it will coredump.
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
- ;;
-
- sysv4*MP*)
- if test -d /usr/nec; then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
- fi
- ;;
-
- *)
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- ;;
- esac
- else
- # PORTME Check for flag to pass linker flags through the system compiler.
- case $host_os in
- aix*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- else
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
- fi
- ;;
-
- mingw* | cygwin* | pw32* | os2* | cegcc*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- m4_if([$1], [GCJ], [],
-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
- ;;
-
- hpux9* | hpux10* | hpux11*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
- # not for PA HP-UX.
- case $host_cpu in
- hppa*64*|ia64*)
-	# +Z the default
-	;;
- *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	;;
- esac
- # Is there a better lt_prog_compiler_static that works with the bundled CC?
- _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
- ;;
-
- irix5* | irix6* | nonstopux*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- # PIC (with -KPIC) is the default.
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
-
- linux* | k*bsd*-gnu)
- case $cc_basename in
- # old Intel for x86_64 which still supported -KPIC.
- ecc*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
- ;;
- # icc used to be incompatible with GCC.
- # ICC 10 doesn't accept -KPIC any more.
- icc* | ifort*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
- ;;
- # Lahey Fortran 8.1.
- lf95*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
-	;;
- pgcc* | pgf77* | pgf90* | pgf95*)
- # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
- ccc*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- # All Alpha code is PIC.
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
- xl*)
-	# IBM XL C 8.0/Fortran 10.1 on PPC
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-	;;
- *)
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)
-	 # Sun C 5.9
-	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	 ;;
-	*Sun\ F*)
-	 # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	 _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
-	 ;;
-	esac
-	;;
- esac
- ;;
-
- newsos6)
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
-
- *nto* | *qnx*)
- # QNX uses GNU C++, but need to define -shared option too, otherwise
- # it will coredump.
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
- ;;
-
- osf3* | osf4* | osf5*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- # All OSF/1 code is PIC.
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
-
- rdos*)
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
-
- solaris*)
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- case $cc_basename in
- f77* | f90* | f95*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
- *)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
- esac
- ;;
-
- sunos4*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
-
- sysv4 | sysv4.2uw2* | sysv4.3*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
-
- sysv4*MP*)
- if test -d /usr/nec ;then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- fi
- ;;
-
- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
-
- unicos*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
- ;;
-
- uts4*)
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
-
- *)
- _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
- ;;
- esac
- fi
-])
-case $host_os in
- # For platforms which do not support PIC, -DPIC is meaningless:
- *djgpp*)
- _LT_TAGVAR(lt_prog_compiler_pic, $1)=
- ;;
- *)
- _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
- ;;
-esac
-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
-	[How to pass a linker flag through the compiler])
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
- _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
- [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
- [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
- [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
- "" | " "*) ;;
- *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
- esac],
- [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
- _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
-fi
-_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
-	[Additional compiler flags for building library objects])
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
-_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
- _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
- $lt_tmp_static_flag,
- [],
- [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
-_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
-	[Compiler flag to prevent dynamic linking])
-])# _LT_COMPILER_PIC
-
-
-# _LT_LINKER_SHLIBS([TAGNAME])
-# ----------------------------
-# See if the linker supports building shared libraries.
-m4_defun([_LT_LINKER_SHLIBS],
-[AC_REQUIRE([LT_PATH_LD])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-m4_if([$1], [CXX], [
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- case $host_os in
- aix[[4-9]]*)
- # If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
- else
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
- fi
- ;;
- pw32*)
- _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
- ;;
- cygwin* | mingw* | cegcc*)
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]$[[^ ]]*$/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__$[[^ ]]*$[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
- linux* | k*bsd*-gnu)
- _LT_TAGVAR(link_all_deplibs, $1)=no
- ;;
- *)
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
- esac
- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-], [
- runpath_var=
- _LT_TAGVAR(allow_undefined_flag, $1)=
- _LT_TAGVAR(always_export_symbols, $1)=no
- _LT_TAGVAR(archive_cmds, $1)=
- _LT_TAGVAR(archive_expsym_cmds, $1)=
- _LT_TAGVAR(compiler_needs_object, $1)=no
- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
- _LT_TAGVAR(export_dynamic_flag_spec, $1)=
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- _LT_TAGVAR(hardcode_automatic, $1)=no
- _LT_TAGVAR(hardcode_direct, $1)=no
- _LT_TAGVAR(hardcode_direct_absolute, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
- _LT_TAGVAR(hardcode_libdir_separator, $1)=
- _LT_TAGVAR(hardcode_minus_L, $1)=no
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
- _LT_TAGVAR(inherit_rpath, $1)=no
- _LT_TAGVAR(link_all_deplibs, $1)=unknown
- _LT_TAGVAR(module_cmds, $1)=
- _LT_TAGVAR(module_expsym_cmds, $1)=
- _LT_TAGVAR(old_archive_from_new_cmds, $1)=
- _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
- _LT_TAGVAR(thread_safe_flag_spec, $1)=
- _LT_TAGVAR(whole_archive_flag_spec, $1)=
- # include_expsyms should be a list of space-separated symbols to be *always*
- # included in the symbol list
- _LT_TAGVAR(include_expsyms, $1)=
- # exclude_expsyms can be an extended regexp of symbols to exclude
- # it will be wrapped by ` (' and `)$', so one must not match beginning or
- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
- # as well as any symbol that contains `d'.
- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
- # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
- # platforms (ab)use it in PIC code, but their linkers get confused if
- # the symbol is explicitly referenced. Since portable code cannot
- # rely on this symbol name, it's probably fine to never include it in
- # preloaded symbol tables.
- # Exclude shared library initialization/finalization symbols.
-dnl Note also adjust exclude_expsyms for C++ above.
- extract_expsyms_cmds=
-
- case $host_os in
- cygwin* | mingw* | pw32* | cegcc*)
- # FIXME: the MSVC++ port hasn't been tested in a loooong time
- # When not using gcc, we currently assume that we are using
- # Microsoft Visual C++.
- if test "$GCC" != yes; then
- with_gnu_ld=no
- fi
- ;;
- interix*)
- # we just hope/assume this is gcc and not c89 (= MSVC++)
- with_gnu_ld=yes
- ;;
- openbsd*)
- with_gnu_ld=no
- ;;
- esac
-
- _LT_TAGVAR(ld_shlibs, $1)=yes
- if test "$with_gnu_ld" = yes; then
- # If archive_cmds runs LD, not CC, wlarc should be empty
- wlarc='${wl}'
-
- # Set some defaults for GNU ld with shared library support. These
- # are reset later if shared libraries are not supported. Putting them
- # here allows them to be overridden if necessary.
- runpath_var=LD_RUN_PATH
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- # ancient GNU ld didn't support --whole-archive et. al.
- if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
- _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
- else
- _LT_TAGVAR(whole_archive_flag_spec, $1)=
- fi
- supports_anon_versioning=no
- case `$LD -v 2>&1` in
- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
- *\ 2.11.*) ;; # other 2.11 versions
- *) supports_anon_versioning=yes ;;
- esac
-
- # See if GNU ld supports shared libraries.
- case $host_os in
- aix[[3-9]]*)
- # On AIX/PPC, the GNU linker is very broken
- if test "$host_cpu" != ia64; then
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support. If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-_LT_EOF
- fi
- ;;
-
- amigaos*)
- case $host_cpu in
- powerpc)
- # see comment about AmigaOS4 .so support
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)=''
- ;;
- m68k)
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(hardcode_minus_L, $1)=yes
- ;;
- esac
- ;;
-
- beos*)
- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined. This deserves some investigation. FIXME
-	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- else
-	_LT_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
- cygwin* | mingw* | pw32* | cegcc*)
- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
- # as there is no search path for DLLs.
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_TAGVAR(always_export_symbols, $1)=no
- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]$[[^ ]]*$/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
-
- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	 cp $export_symbols $output_objdir/$soname.def;
-	else
-	 echo EXPORTS > $output_objdir/$soname.def;
-	 cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- else
-	_LT_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
- interix[[3-9]]*)
- _LT_TAGVAR(hardcode_direct, $1)=no
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
- # Instead, shared libraries are loaded at an image base (0x10000000 by
- # default) and relocated if they conflict, which is a slow very memory
- # consuming and fragmenting process. To avoid this, we pick a random,
- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
- # time. Moving up from 0x10000000 also allows more sbrk(2) space.
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- ;;
-
- gnu* | linux* | tpf* | k*bsd*-gnu)
- tmp_diet=no
- if test "$host_os" = linux-dietlibc; then
-	case $cc_basename in
-	 diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
-	esac
- fi
- if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-	 && test "$tmp_diet" = no
- then
-	tmp_addflag=
-	tmp_sharedflag='-shared'
-	case $cc_basename,$host_cpu in
- pgcc*)				# Portland Group C compiler
-	 _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-	 tmp_addflag=' $pic_flag'
-	 ;;
-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-	 _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-	 tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
-	 tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	 tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	 tmp_addflag=' -nofor_main' ;;
-	lf95*)				# Lahey Fortran 8.1
-	 _LT_TAGVAR(whole_archive_flag_spec, $1)=
-	 tmp_sharedflag='--shared' ;;
-	xl[[cC]]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
-	 tmp_sharedflag='-qmkshrobj'
-	 tmp_addflag= ;;
-	esac
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)			# Sun C 5.9
-	 _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-	 _LT_TAGVAR(compiler_needs_object, $1)=yes
-	 tmp_sharedflag='-G' ;;
-	*Sun\ F*)			# Sun Fortran 8.3
-	 tmp_sharedflag='-G' ;;
-	esac
-	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
- if test "x$supports_anon_versioning" = xyes; then
- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-	 cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
-	 echo "local: *; };" >> $output_objdir/$libname.ver~
-	 $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- fi
-
-	case $cc_basename in
-	xlf*)
-	 # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-	 _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-	 _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-	 _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
-	 if test "x$supports_anon_versioning" = xyes; then
-	 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-	 cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
-	 echo "local: *; };" >> $output_objdir/$libname.ver~
-	 $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-	 fi
-	 ;;
-	esac
- else
- _LT_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
- netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
- else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- fi
- ;;
-
- solaris*)
- if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems. Therefore, libtool
-*** is disabling shared libraries support. We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer. Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
- elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- else
-	_LT_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
- sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
- case `$LD -v 2>&1` in
- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems. Therefore, libtool
-*** is disabling shared libraries support. We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-	;;
-	*)
-	 # For security reasons, it is highly recommended that you always
-	 # use absolute paths for naming shared libraries, and exclude the
-	 # DT_RUNPATH tag from executables and libraries. But doing so
-	 # requires that you compile everything twice, which is a pain.
-	 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	 else
-	 _LT_TAGVAR(ld_shlibs, $1)=no
-	 fi
-	;;
- esac
- ;;
-
- sunos4*)
- _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- wlarc=
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- *)
- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- else
-	_LT_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
- esac
-
- if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
- runpath_var=
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
- _LT_TAGVAR(export_dynamic_flag_spec, $1)=
- _LT_TAGVAR(whole_archive_flag_spec, $1)=
- fi
- else
- # PORTME fill in a description of your system's linker (not GNU ld)
- case $host_os in
- aix3*)
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_TAGVAR(always_export_symbols, $1)=yes
- _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
- # Note: this linker hardcodes the directories in LIBPATH if there
- # are no directories specified by -L.
- _LT_TAGVAR(hardcode_minus_L, $1)=yes
- if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	_LT_TAGVAR(hardcode_direct, $1)=unsupported
- fi
- ;;
-
- aix[[4-9]]*)
- if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
- else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	 _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	else
-	 _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-	 for ld_flag in $LDFLAGS; do
-	 if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-	 aix_use_runtimelinking=yes
-	 break
-	 fi
-	 done
-	 ;;
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
- fi
-
- # When large executables or shared objects are built, AIX ld can
- # have problems creating the table of contents. If linking a library
- # or program results in "error TOC overflow" add -mminimal-toc to
- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
- _LT_TAGVAR(archive_cmds, $1)=''
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
- _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-
- if test "$GCC" = yes; then
-	case $host_os in aix4.[[012]]|aix4.[[012]].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	 collect2name=`${CC} -print-prog-name=collect2`
-	 if test -f "$collect2name" &&
-	 strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	 then
-	 # We have reworked collect2
-	 :
-	 else
-	 # We have old collect2
-	 _LT_TAGVAR(hardcode_direct, $1)=unsupported
-	 # It fails to find uninstalled libraries when the uninstalled
-	 # path is not listed in the libpath. Setting hardcode_minus_L
-	 # to unsupported forces relinking
-	 _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	 _LT_TAGVAR(hardcode_libdir_separator, $1)=
-	 fi
-	 ;;
-	esac
-	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	 shared_flag="$shared_flag "'${wl}-G'
-	fi
-	_LT_TAGVAR(link_all_deplibs, $1)=no
- else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	 shared_flag='-G'
-	else
-	 if test "$aix_use_runtimelinking" = yes; then
-	 shared_flag='${wl}-G'
-	 else
-	 shared_flag='${wl}-bM:SRE'
-	 fi
-	fi
- fi
-
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
- # It seems that -bexpall does not export symbols beginning with
- # underscore (_), so it is better to generate a list of symbols to export.
- _LT_TAGVAR(always_export_symbols, $1)=yes
- if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
- # Determine the default libpath from the value encoded in an
- # empty executable.
- _LT_SYS_MODULE_PATH_AIX
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
- else
-	if test "$host_cpu" = ia64; then
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	 _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	 _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an
-	 # empty executable.
-	 _LT_SYS_MODULE_PATH_AIX
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	 # Warning - without using the other run time loading flags,
-	 # -berok will link without error, but may produce a broken library.
-	 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	 # Exported symbols can be pulled into shared objects from archives
-	 _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	 _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	 # This is similar to how AIX traditionally builds its shared libraries.
-	 _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
- fi
- ;;
-
- amigaos*)
- case $host_cpu in
- powerpc)
- # see comment about AmigaOS4 .so support
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)=''
- ;;
- m68k)
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(hardcode_minus_L, $1)=yes
- ;;
- esac
- ;;
-
- bsdi[[45]]*)
- _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
- ;;
-
- cygwin* | mingw* | pw32* | cegcc*)
- # When not using gcc, we currently assume that we are using
- # Microsoft Visual C++.
- # hardcode_libdir_flag_spec is actually meaningless, as there is
- # no search path for DLLs.
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- # Tell ltmain to make .lib files, not .a files.
- libext=lib
- # Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
- # FIXME: Setting linknames here is a bad hack.
- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
- # The linker will automatically build a .lib file if we build a DLL.
- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
- # FIXME: Should let the user specify the lib program.
- _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
- _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- ;;
-
- darwin* | rhapsody*)
- _LT_DARWIN_LINKER_FEATURES($1)
- ;;
-
- dgux*)
- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- freebsd1*)
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
-
- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
- # support. Future versions do this automatically, but an explicit c++rt0.o
- # does not break anything, and helps significantly (at the cost of a little
- # extra space).
- freebsd2.2*)
- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- # Unfortunately, older versions of FreeBSD 2 do not have this feature.
- freebsd2*)
- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | dragonfly*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- hpux9*)
- if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
- else
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
- fi
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- _LT_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_TAGVAR(hardcode_direct, $1)=yes
-
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- _LT_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- ;;
-
- hpux10*)
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
- fi
- if test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-	_LT_TAGVAR(hardcode_direct, $1)=yes
-	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	_LT_TAGVAR(hardcode_minus_L, $1)=yes
- fi
- ;;
-
- hpux11*)
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	 ;;
-	ia64*)
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	 ;;
-	*)
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	 ;;
-	esac
- else
-	case $host_cpu in
-	hppa*64*)
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	 ;;
-	ia64*)
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	 ;;
-	*)
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	 ;;
-	esac
- fi
- if test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	 _LT_TAGVAR(hardcode_direct, $1)=no
-	 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	 ;;
-	*)
-	 _LT_TAGVAR(hardcode_direct, $1)=yes
-	 _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-
-	 # hardcode_minus_L: Not really in the search PATH,
-	 # but as the default location of the library.
-	 _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	 ;;
-	esac
- fi
- ;;
-
- irix5* | irix6* | nonstopux*)
- if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	# Try to use the -exported_symbol ld option, if it does not
-	# work, assume that -exports_file does not work either and
-	# implicitly export all symbols.
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
- AC_LINK_IFELSE(int foo(void) {},
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
- )
- LDFLAGS="$save_LDFLAGS"
- else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
- fi
- _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_TAGVAR(inherit_rpath, $1)=yes
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- ;;
-
- netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
- else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
- fi
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- newsos6)
- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- *nto* | *qnx*)
- ;;
-
- openbsd*)
- if test -f /usr/libexec/ld.so; then
-	_LT_TAGVAR(hardcode_direct, $1)=yes
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	else
-	 case $host_os in
-	 openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-	 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	 ;;
-	 *)
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	 ;;
-	 esac
-	fi
- else
-	_LT_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
- os2*)
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
- _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
- ;;
-
- osf3*)
- if test "$GCC" = yes; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- else
-	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
- fi
- _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(hardcode_libdir_separator, $1)=:
- ;;
-
- osf4* | osf5*)	# as osf3* with the addition of -msym flag
- if test "$GCC" = yes; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- else
-	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
- fi
- _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
- _LT_TAGVAR(hardcode_libdir_separator, $1)=:
- ;;
-
- solaris*)
- _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
- if test "$GCC" = yes; then
-	wlarc='${wl}'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	 $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
- else
-	case `$CC -V 2>&1` in
-	*"Compilers 5.0"*)
-	 wlarc=''
-	 _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	 $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
-	 ;;
-	*)
-	 wlarc='${wl}'
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-	 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	 $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-	 ;;
-	esac
- fi
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- case $host_os in
- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
- *)
-	# The compiler driver will combine and reorder linker options,
-	# but understands `-z linker_flag'. GCC discards it without `$wl',
-	# but is careful enough not to reorder.
-	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test "$GCC" = yes; then
-	 _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	else
-	 _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-	fi
-	;;
- esac
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- ;;
-
- sunos4*)
- if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
- else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
- fi
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- sysv4)
- case $host_vendor in
-	sni)
-	 _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	 _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
-	;;
-	siemens)
-	 ## LD is ld it makes a PLAMLIB
-	 ## CC just makes a GrossModule.
-	 _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	 _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
-	 _LT_TAGVAR(hardcode_direct, $1)=no
- ;;
-	motorola)
-	 _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	 _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
-	;;
- esac
- runpath_var='LD_RUN_PATH'
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- sysv4.3*)
- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
- ;;
-
- sysv4*MP*)
- if test -d /usr/nec; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	_LT_TAGVAR(ld_shlibs, $1)=yes
- fi
- ;;
-
- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
- _LT_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- runpath_var='LD_RUN_PATH'
-
- if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- fi
- ;;
-
- sysv5* | sco3.2v5* | sco5v6*)
- # Note: We can NOT use -z defs as we might desire, because we do not
- # link with -lc, and that would cause any symbols used from libc to
- # always be unresolved, which means just about no library would
- # ever link correctly. If we're not using GNU ld we use -z text
- # though, which does catch some bad symbols but isn't as heavy-handed
- # as -z defs.
- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
- _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
- _LT_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
- _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
- runpath_var='LD_RUN_PATH'
-
- if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- fi
- ;;
-
- uts4*)
- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- *)
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
- esac
-
- if test x$host_vendor = xsni; then
- case $host in
- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
-	;;
- esac
- fi
- fi
-])
-AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
-
-_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
-_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
-_LT_DECL([], [extract_expsyms_cmds], [2],
- [The commands to extract the exported symbol list from a shared archive])
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
-x|xyes)
- # Assume -lc should be added
- _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-
- if test "$enable_shared" = yes && test "$GCC" = yes; then
- case $_LT_TAGVAR(archive_cmds, $1) in
- *'~'*)
- # FIXME: we may have to deal with multi-command sequences.
- ;;
- '$CC '*)
- # Test whether the compiler implicitly links with -lc since on some
- # systems, -lgcc has to come before -lc. If gcc already passes -lc
- # to ld, don't add -lc before -lgcc.
- AC_MSG_CHECKING([whether -lc should be explicitly linked in])
- $RM conftest*
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
- soname=conftest
- lib=conftest
- libobjs=conftest.$ac_objext
- deplibs=
- wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
-	pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
- compiler_flags=-v
- linker_flags=-v
- verstring=
- output_objdir=.
- libname=conftest
- lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
- _LT_TAGVAR(allow_undefined_flag, $1)=
- if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
- then
-	 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
- else
-	 _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
- fi
- _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
- else
- cat conftest.err 1>&5
- fi
- $RM conftest*
- AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
- ;;
- esac
- fi
- ;;
-esac
-
-_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
- [Whether or not to add -lc for building shared libraries])
-_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
- [enable_shared_with_static_runtimes], [0],
- [Whether or not to disallow shared libs when runtime libs are static])
-_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
- [Compiler flag to allow reflexive dlopens])
-_LT_TAGDECL([], [whole_archive_flag_spec], [1],
- [Compiler flag to generate shared objects directly from archives])
-_LT_TAGDECL([], [compiler_needs_object], [1],
- [Whether the compiler copes with passing no objects directly])
-_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
- [Create an old-style archive from a shared archive])
-_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
- [Create a temporary old-style archive to link instead of a shared archive])
-_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
-_LT_TAGDECL([], [archive_expsym_cmds], [2])
-_LT_TAGDECL([], [module_cmds], [2],
- [Commands used to build a loadable module if different from building
- a shared archive.])
-_LT_TAGDECL([], [module_expsym_cmds], [2])
-_LT_TAGDECL([], [with_gnu_ld], [1],
- [Whether we are building with GNU ld or not])
-_LT_TAGDECL([], [allow_undefined_flag], [1],
- [Flag that allows shared libraries with undefined symbols to be built])
-_LT_TAGDECL([], [no_undefined_flag], [1],
- [Flag that enforces no undefined symbols])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
- [Flag to hardcode $libdir into a binary during linking.
- This must work even if $libdir does not exist])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
- [[If ld is used when linking, flag to hardcode $libdir into a binary
- during linking. This must work even if $libdir does not exist]])
-_LT_TAGDECL([], [hardcode_libdir_separator], [1],
- [Whether we need a single "-rpath" flag with a separated argument])
-_LT_TAGDECL([], [hardcode_direct], [0],
- [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
- DIR into the resulting binary])
-_LT_TAGDECL([], [hardcode_direct_absolute], [0],
- [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
- DIR into the resulting binary and the resulting library dependency is
- "absolute", i.e impossible to change by setting ${shlibpath_var} if the
- library is relocated])
-_LT_TAGDECL([], [hardcode_minus_L], [0],
- [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
- into the resulting binary])
-_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
- [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
- into the resulting binary])
-_LT_TAGDECL([], [hardcode_automatic], [0],
- [Set to "yes" if building a shared library automatically hardcodes DIR
- into the library and all subsequent libraries and executables linked
- against it])
-_LT_TAGDECL([], [inherit_rpath], [0],
- [Set to yes if linker adds runtime paths of dependent libraries
- to runtime path list])
-_LT_TAGDECL([], [link_all_deplibs], [0],
- [Whether libtool must link a program against all its dependency libraries])
-_LT_TAGDECL([], [fix_srcfile_path], [1],
- [Fix the shell variable $srcfile for the compiler])
-_LT_TAGDECL([], [always_export_symbols], [0],
- [Set to "yes" if exported symbols are required])
-_LT_TAGDECL([], [export_symbols_cmds], [2],
- [The commands to list exported symbols])
-_LT_TAGDECL([], [exclude_expsyms], [1],
- [Symbols that should not be listed in the preloaded symbols])
-_LT_TAGDECL([], [include_expsyms], [1],
- [Symbols that must always be exported])
-_LT_TAGDECL([], [prelink_cmds], [2],
- [Commands necessary for linking programs (against libraries) with templates])
-_LT_TAGDECL([], [file_list_spec], [1],
- [Specify filename containing input files])
-dnl FIXME: Not yet implemented
-dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
-dnl [Compiler flag to generate thread safe objects])
-])# _LT_LINKER_SHLIBS
-
-
-# _LT_LANG_C_CONFIG([TAG])
-# ------------------------
-# Ensure that the configuration variables for a C compiler are suitably
-# defined. These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_C_CONFIG],
-[m4_require([_LT_DECL_EGREP])dnl
-lt_save_CC="$CC"
-AC_LANG_PUSH(C)
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
-
-_LT_TAG_COMPILER
-# Save the default compiler, since it gets overwritten when the other
-# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
-compiler_DEFAULT=$CC
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-if test -n "$compiler"; then
- _LT_COMPILER_NO_RTTI($1)
- _LT_COMPILER_PIC($1)
- _LT_COMPILER_C_O($1)
- _LT_COMPILER_FILE_LOCKS($1)
- _LT_LINKER_SHLIBS($1)
- _LT_SYS_DYNAMIC_LINKER($1)
- _LT_LINKER_HARDCODE_LIBPATH($1)
- LT_SYS_DLOPEN_SELF
- _LT_CMD_STRIPLIB
-
- # Report which library types will actually be built
- AC_MSG_CHECKING([if libtool supports shared libraries])
- AC_MSG_RESULT([$can_build_shared])
-
- AC_MSG_CHECKING([whether to build shared libraries])
- test "$can_build_shared" = "no" && enable_shared=no
-
- # On AIX, shared libraries and static libraries use the same namespace, and
- # are all built from PIC.
- case $host_os in
- aix3*)
- test "$enable_shared" = yes && enable_static=no
- if test -n "$RANLIB"; then
- archive_cmds="$archive_cmds~\$RANLIB \$lib"
- postinstall_cmds='$RANLIB $lib'
- fi
- ;;
-
- aix[[4-9]]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
- fi
- ;;
- esac
- AC_MSG_RESULT([$enable_shared])
-
- AC_MSG_CHECKING([whether to build static libraries])
- # Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
- AC_MSG_RESULT([$enable_static])
-
- _LT_CONFIG($1)
-fi
-AC_LANG_POP
-CC="$lt_save_CC"
-])# _LT_LANG_C_CONFIG
-
-
-# _LT_PROG_CXX
-# ------------
-# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
-# compiler, we have our own version here.
-m4_defun([_LT_PROG_CXX],
-[
-pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
-AC_PROG_CXX
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
- (test "X$CXX" != "Xg++"))) ; then
- AC_PROG_CXXCPP
-else
- _lt_caught_CXX_error=yes
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_CXX
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_CXX], [])
-
-
-# _LT_LANG_CXX_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for a C++ compiler are suitably
-# defined. These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_CXX_CONFIG],
-[AC_REQUIRE([_LT_PROG_CXX])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_EGREP])dnl
-
-AC_LANG_PUSH(C++)
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(compiler_needs_object, $1)=no
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for C++ test sources.
-ac_ext=cpp
-
-# Object file extension for compiled C++ test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the CXX compiler isn't working. Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_caught_CXX_error" != yes; then
- # Code to be used in simple compile tests
- lt_simple_compile_test_code="int some_variable = 0;"
-
- # Code to be used in simple link tests
- lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
-
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
- _LT_TAG_COMPILER
-
- # save warnings/boilerplate of simple test code
- _LT_COMPILER_BOILERPLATE
- _LT_LINKER_BOILERPLATE
-
- # Allow CC to be a program name with arguments.
- lt_save_CC=$CC
- lt_save_LD=$LD
- lt_save_GCC=$GCC
- GCC=$GXX
- lt_save_with_gnu_ld=$with_gnu_ld
- lt_save_path_LD=$lt_cv_path_LD
- if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
- lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
- else
- $as_unset lt_cv_prog_gnu_ld
- fi
- if test -n "${lt_cv_path_LDCXX+set}"; then
- lt_cv_path_LD=$lt_cv_path_LDCXX
- else
- $as_unset lt_cv_path_LD
- fi
- test -z "${LDCXX+set}" || LD=$LDCXX
- CC=${CXX-"c++"}
- compiler=$CC
- _LT_TAGVAR(compiler, $1)=$CC
- _LT_CC_BASENAME([$compiler])
-
- if test -n "$compiler"; then
- # We don't want -fno-exception when compiling C++ code, so set the
- # no_builtin_flag separately
- if test "$GXX" = yes; then
- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
- else
- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
- fi
-
- if test "$GXX" = yes; then
- # Set up default GNU C++ configuration
-
- LT_PATH_LD
-
- # Check if GNU C++ uses GNU ld as the underlying linker, since the
- # archiving commands below assume that GNU ld is being used.
- if test "$with_gnu_ld" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
- # If archive_cmds runs LD, not CC, wlarc should be empty
- # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
- # investigate it a little bit more. (MM)
- wlarc='${wl}'
-
- # ancient GNU ld didn't support --whole-archive et. al.
- if eval "`$CC -print-prog-name=ld` --help 2>&1" |
-	 $GREP 'no-whole-archive' > /dev/null; then
- _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
- else
- _LT_TAGVAR(whole_archive_flag_spec, $1)=
- fi
- else
- with_gnu_ld=no
- wlarc=
-
- # A generic and very simple default shared library creation
- # command for GNU C++ for the case where it uses the native
- # linker, instead of GNU ld. If possible, this setting should
- # overridden to take advantage of the native linker features on
- # the platform it is being used on.
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
- fi
-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
-
- else
- GXX=no
- with_gnu_ld=no
- wlarc=
- fi
-
- # PORTME: fill in a description of your system's C++ link characteristics
- AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
- _LT_TAGVAR(ld_shlibs, $1)=yes
- case $host_os in
- aix3*)
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
- aix[[4-9]]*)
- if test "$host_cpu" = ia64; then
- # On IA64, the linker does run time linking by default, so we don't
- # have to do anything special.
- aix_use_runtimelinking=no
- exp_sym_flag='-Bexport'
- no_entry_flag=""
- else
- aix_use_runtimelinking=no
-
- # Test if we are trying to use run time linking or normal
- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-	 for ld_flag in $LDFLAGS; do
-	 case $ld_flag in
-	 *-brtl*)
-	 aix_use_runtimelinking=yes
-	 break
-	 ;;
-	 esac
-	 done
-	 ;;
- esac
-
- exp_sym_flag='-bexport'
- no_entry_flag='-bnoentry'
- fi
-
- # When large executables or shared objects are built, AIX ld can
- # have problems creating the table of contents. If linking a library
- # or program results in "error TOC overflow" add -mminimal-toc to
- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
- _LT_TAGVAR(archive_cmds, $1)=''
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
- _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-
- if test "$GXX" = yes; then
- case $host_os in aix4.[[012]]|aix4.[[012]].*)
- # We only want to do this on AIX 4.2 and lower, the check
- # below for broken collect2 doesn't work under 4.3+
-	 collect2name=`${CC} -print-prog-name=collect2`
-	 if test -f "$collect2name" &&
-	 strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	 then
-	 # We have reworked collect2
-	 :
-	 else
-	 # We have old collect2
-	 _LT_TAGVAR(hardcode_direct, $1)=unsupported
-	 # It fails to find uninstalled libraries when the uninstalled
-	 # path is not listed in the libpath. Setting hardcode_minus_L
-	 # to unsupported forces relinking
-	 _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	 _LT_TAGVAR(hardcode_libdir_separator, $1)=
-	 fi
- esac
- shared_flag='-shared'
-	 if test "$aix_use_runtimelinking" = yes; then
-	 shared_flag="$shared_flag "'${wl}-G'
-	 fi
- else
- # not using gcc
- if test "$host_cpu" = ia64; then
-	 # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	 # chokes on -Wl,-G. The following line is correct:
-	 shared_flag='-G'
- else
-	 if test "$aix_use_runtimelinking" = yes; then
-	 shared_flag='${wl}-G'
-	 else
-	 shared_flag='${wl}-bM:SRE'
-	 fi
- fi
- fi
-
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
- # It seems that -bexpall does not export symbols beginning with
- # underscore (_), so it is better to generate a list of symbols to
-	# export.
- _LT_TAGVAR(always_export_symbols, $1)=yes
- if test "$aix_use_runtimelinking" = yes; then
- # Warning - without using the other runtime loading flags (-brtl),
- # -berok will link without error, but may produce a broken library.
- _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
- # Determine the default libpath from the value encoded in an empty
- # executable.
- _LT_SYS_MODULE_PATH_AIX
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
- else
- if test "$host_cpu" = ia64; then
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	 _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	 _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
- else
-	 # Determine the default libpath from the value encoded in an
-	 # empty executable.
-	 _LT_SYS_MODULE_PATH_AIX
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	 # Warning - without using the other run time loading flags,
-	 # -berok will link without error, but may produce a broken library.
-	 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	 # Exported symbols can be pulled into shared objects from archives
-	 _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	 _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	 # This is similar to how AIX traditionally builds its shared
-	 # libraries.
-	 _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
- fi
- fi
- ;;
-
- beos*)
-	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	 # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	 # support --undefined. This deserves some investigation. FIXME
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	else
-	 _LT_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-
- chorus*)
- case $cc_basename in
- *)
-	 # FIXME: insert proper C++ library support
-	 _LT_TAGVAR(ld_shlibs, $1)=no
-	 ;;
- esac
- ;;
-
- cygwin* | mingw* | pw32* | cegcc*)
- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
- # as there is no search path for DLLs.
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_TAGVAR(always_export_symbols, $1)=no
- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- # If the export-symbols file already is a .def file (1st line
- # is EXPORTS), use it as is; otherwise, prepend...
- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	 cp $export_symbols $output_objdir/$soname.def;
- else
-	 echo EXPORTS > $output_objdir/$soname.def;
-	 cat $export_symbols >> $output_objdir/$soname.def;
- fi~
- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- else
- _LT_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
- darwin* | rhapsody*)
- _LT_DARWIN_LINKER_FEATURES($1)
-	;;
-
- dgux*)
- case $cc_basename in
- ec++*)
-	 # FIXME: insert proper C++ library support
-	 _LT_TAGVAR(ld_shlibs, $1)=no
-	 ;;
- ghcx*)
-	 # Green Hills C++ Compiler
-	 # FIXME: insert proper C++ library support
-	 _LT_TAGVAR(ld_shlibs, $1)=no
-	 ;;
- *)
-	 # FIXME: insert proper C++ library support
-	 _LT_TAGVAR(ld_shlibs, $1)=no
-	 ;;
- esac
- ;;
-
- freebsd[[12]]*)
- # C++ shared libraries reported to be fairly broken before
-	# switch to ELF
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
-
- freebsd-elf*)
- _LT_TAGVAR(archive_cmds_need_lc, $1)=no
- ;;
-
- freebsd* | dragonfly*)
- # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
- # conventions
- _LT_TAGVAR(ld_shlibs, $1)=yes
- ;;
-
- gnu*)
- ;;
-
- hpux9*)
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- _LT_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-				 # but as the default
-				 # location of the library.
-
- case $cc_basename in
- CC*)
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
- aCC*)
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
- ;;
- *)
- if test "$GXX" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
- else
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
- esac
- ;;
-
- hpux10*|hpux11*)
- if test $with_gnu_ld = no; then
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	 _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
- case $host_cpu in
- hppa*64*|ia64*)
- ;;
- *)
-	 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- ;;
- esac
- fi
- case $host_cpu in
- hppa*64*|ia64*)
- _LT_TAGVAR(hardcode_direct, $1)=no
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
- *)
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
- _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-					 # but as the default
-					 # location of the library.
- ;;
- esac
-
- case $cc_basename in
- CC*)
-	 # FIXME: insert proper C++ library support
-	 _LT_TAGVAR(ld_shlibs, $1)=no
-	 ;;
- aCC*)
-	 case $host_cpu in
-	 hppa*64*)
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	 ;;
-	 ia64*)
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	 ;;
-	 *)
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	 ;;
-	 esac
-	 # Commands to make compiler produce verbose output that lists
-	 # what "hidden" libraries, object files and flags are used when
-	 # linking a shared library.
-	 #
-	 # There doesn't appear to be a way to prevent this compiler from
-	 # explicitly linking system object files so we need to strip them
-	 # from the output so that they don't get included in the library
-	 # dependencies.
-	 output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-	 ;;
- *)
-	 if test "$GXX" = yes; then
-	 if test $with_gnu_ld = no; then
-	 case $host_cpu in
-	 hppa*64*)
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	 ;;
-	 ia64*)
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	 ;;
-	 *)
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	 ;;
-	 esac
-	 fi
-	 else
-	 # FIXME: insert proper C++ library support
-	 _LT_TAGVAR(ld_shlibs, $1)=no
-	 fi
-	 ;;
- esac
- ;;
-
- interix[[3-9]]*)
-	_LT_TAGVAR(hardcode_direct, $1)=no
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-	# Instead, shared libraries are loaded at an image base (0x10000000 by
-	# default) and relocated if they conflict, which is a slow very memory
-	# consuming and fragmenting process. To avoid this, we pick a random,
-	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-	# time. Moving up from 0x10000000 also allows more sbrk(2) space.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	;;
- irix5* | irix6*)
- case $cc_basename in
- CC*)
-	 # SGI C++
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-
-	 # Archives containing C++ object files must be created using
-	 # "CC -ar", where "CC" is the IRIX C++ compiler. This is
-	 # necessary to make sure instantiated templates are included
-	 # in the archive.
-	 _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
-	 ;;
- *)
-	 if test "$GXX" = yes; then
-	 if test "$with_gnu_ld" = no; then
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	 else
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
-	 fi
-	 fi
-	 _LT_TAGVAR(link_all_deplibs, $1)=yes
-	 ;;
- esac
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_TAGVAR(inherit_rpath, $1)=yes
- ;;
-
- linux* | k*bsd*-gnu)
- case $cc_basename in
- KCC*)
-	 # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	 # KCC will only create a shared library if the output file
-	 # ends with ".so" (or ".sl" for HP-UX), so rename the library
-	 # to its proper name (with version) after linking.
-	 _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/$[[^()0-9A-Za-z{}]]$/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-	 _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/$[[^()0-9A-Za-z{}]]$/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-	 # Commands to make compiler produce verbose output that lists
-	 # what "hidden" libraries, object files and flags are used when
-	 # linking a shared library.
-	 #
-	 # There doesn't appear to be a way to prevent this compiler from
-	 # explicitly linking system object files so we need to strip them
-	 # from the output so that they don't get included in the library
-	 # dependencies.
-	 output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-	 # Archives containing C++ object files must be created using
-	 # "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	 _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-	 ;;
-	 icpc* | ecpc* )
-	 # Intel C++
-	 with_gnu_ld=yes
-	 # version 8.0 and above of icpc choke on multiply defined symbols
-	 # if we add $predep_objects and $postdep_objects, however 7.1 and
-	 # earlier do not add the objects themselves.
-	 case `$CC -V 2>&1` in
-	 *"Version 7."*)
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-		;;
-	 *) # Version 8.0 or newer
-	 tmp_idyn=
-	 case $host_cpu in
-		 ia64*) tmp_idyn=' -i_dynamic';;
-		esac
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-		;;
-	 esac
-	 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	 _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	 ;;
- pgCC* | pgcpp*)
- # Portland Group C++ compiler
-	 case `$CC -V` in
-	 *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
-	 _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-		compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
-	 _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
-		$RANLIB $oldlib'
-	 _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-	 _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-	 ;;
-	 *) # Version 6 will use weak symbols
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-	 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-	 ;;
-	 esac
-
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-	 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	 _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
- ;;
-	 cxx*)
-	 # Compaq C++
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-
-	 runpath_var=LD_RUN_PATH
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-	 _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	 # Commands to make compiler produce verbose output that lists
-	 # what "hidden" libraries, object files and flags are used when
-	 # linking a shared library.
-	 #
-	 # There doesn't appear to be a way to prevent this compiler from
-	 # explicitly linking system object files so we need to strip them
-	 # from the output so that they don't get included in the library
-	 # dependencies.
-	 output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/$^.*ld.*$$ .*ld .*$$/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-	 ;;
-	 xl*)
-	 # IBM XL 8.0 on PPC, with GNU ld
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	 if test "x$supports_anon_versioning" = xyes; then
-	 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-		cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
-		echo "local: *; };" >> $output_objdir/$libname.ver~
-		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-	 fi
-	 ;;
-	 *)
-	 case `$CC -V 2>&1 | sed 5q` in
-	 *Sun\ C*)
-	 # Sun C++ 5.9
-	 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	 _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-	 _LT_TAGVAR(compiler_needs_object, $1)=yes
-
-	 # Not sure whether something based on
-	 # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-	 # would be better.
-	 output_verbose_link_cmd='echo'
-
-	 # Archives containing C++ object files must be created using
-	 # "CC -xar", where "CC" is the Sun C++ compiler. This is
-	 # necessary to make sure instantiated templates are included
-	 # in the archive.
-	 _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	 ;;
-	 esac
-	 ;;
-	esac
-	;;
-
- lynxos*)
- # FIXME: insert proper C++ library support
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
- m88k*)
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
- mvs*)
- case $cc_basename in
- cxx*)
-	 # FIXME: insert proper C++ library support
-	 _LT_TAGVAR(ld_shlibs, $1)=no
-	 ;;
-	 *)
-	 # FIXME: insert proper C++ library support
-	 _LT_TAGVAR(ld_shlibs, $1)=no
-	 ;;
-	esac
-	;;
-
- netbsd*)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-	 wlarc=
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	 _LT_TAGVAR(hardcode_direct, $1)=yes
-	 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	fi
-	# Workaround some broken pre-1.5 toolchains
-	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-	;;
-
- *nto* | *qnx*)
- _LT_TAGVAR(ld_shlibs, $1)=yes
-	;;
-
- openbsd2*)
- # C++ shared libraries are fairly broken
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
- openbsd*)
-	if test -f /usr/libexec/ld.so; then
-	 _LT_TAGVAR(hardcode_direct, $1)=yes
-	 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	 _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	 if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-	 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	 _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-	 fi
-	 output_verbose_link_cmd=echo
-	else
-	 _LT_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-
- osf3* | osf4* | osf5*)
- case $cc_basename in
- KCC*)
-	 # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	 # KCC will only create a shared library if the output file
-	 # ends with ".so" (or ".sl" for HP-UX), so rename the library
-	 # to its proper name (with version) after linking.
-	 _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/$[[^()0-9A-Za-z{}]]$/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	 _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	 # Archives containing C++ object files must be created using
-	 # the KAI C++ compiler.
-	 case $host in
-	 osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
-	 *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
-	 esac
-	 ;;
- RCC*)
-	 # Rational C++ 2.4.1
-	 # FIXME: insert proper C++ library support
-	 _LT_TAGVAR(ld_shlibs, $1)=no
-	 ;;
- cxx*)
-	 case $host in
-	 osf3*)
-	 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-		;;
-	 *)
-	 _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	 _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-	 echo "-hidden">> $lib.exp~
-	 $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
-	 $RM $lib.exp'
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-		;;
-	 esac
-
-	 _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	 # Commands to make compiler produce verbose output that lists
-	 # what "hidden" libraries, object files and flags are used when
-	 # linking a shared library.
-	 #
-	 # There doesn't appear to be a way to prevent this compiler from
-	 # explicitly linking system object files so we need to strip them
-	 # from the output so that they don't get included in the library
-	 # dependencies.
-	 output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/$^.*ld.*$$ .*ld.*$$/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-	 ;;
-	 *)
-	 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	 case $host in
-	 osf3*)
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-		 ;;
-	 *)
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-		 ;;
-	 esac
-
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	 _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	 # Commands to make compiler produce verbose output that lists
-	 # what "hidden" libraries, object files and flags are used when
-	 # linking a shared library.
-	 output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
-
-	 else
-	 # FIXME: insert proper C++ library support
-	 _LT_TAGVAR(ld_shlibs, $1)=no
-	 fi
-	 ;;
- esac
- ;;
-
- psos*)
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
-
- sunos4*)
- case $cc_basename in
- CC*)
-	 # Sun C++ 4.x
-	 # FIXME: insert proper C++ library support
-	 _LT_TAGVAR(ld_shlibs, $1)=no
-	 ;;
- lcc*)
-	 # Lucid
-	 # FIXME: insert proper C++ library support
-	 _LT_TAGVAR(ld_shlibs, $1)=no
-	 ;;
- *)
-	 # FIXME: insert proper C++ library support
-	 _LT_TAGVAR(ld_shlibs, $1)=no
-	 ;;
- esac
- ;;
-
- solaris*)
- case $cc_basename in
- CC*)
-	 # Sun C++ 4.2, 5.x and Centerline C++
- _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
-	 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	 $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	 case $host_os in
-	 solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-	 *)
-		# The compiler driver will combine and reorder linker options,
-		# but understands `-z linker_flag'.
-	 # Supported since Solaris 2.6 (maybe 2.5.1?)
-		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-	 ;;
-	 esac
-	 _LT_TAGVAR(link_all_deplibs, $1)=yes
-
-	 output_verbose_link_cmd='echo'
-
-	 # Archives containing C++ object files must be created using
-	 # "CC -xar", where "CC" is the Sun C++ compiler. This is
-	 # necessary to make sure instantiated templates are included
-	 # in the archive.
-	 _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	 ;;
- gcx*)
-	 # Green Hills C++ Compiler
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-
-	 # The C++ compiler must be used to create the archive.
-	 _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-	 ;;
- *)
-	 # GNU C++ compiler with Solaris linker
-	 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
-	 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		 $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	 # Commands to make compiler produce verbose output that lists
-	 # what "hidden" libraries, object files and flags are used when
-	 # linking a shared library.
-	 output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
-	 else
-	 # g++ 2.7 appears to require `-G' NOT `-shared' on this
-	 # platform.
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		 $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	 # Commands to make compiler produce verbose output that lists
-	 # what "hidden" libraries, object files and flags are used when
-	 # linking a shared library.
-	 output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
-	 fi
-
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-	 case $host_os in
-		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-		*)
-		 _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-		 ;;
-	 esac
-	 fi
-	 ;;
- esac
- ;;
-
- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
- _LT_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- runpath_var='LD_RUN_PATH'
-
- case $cc_basename in
- CC*)
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	 ;;
-	*)
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	 ;;
- esac
- ;;
-
- sysv5* | sco3.2v5* | sco5v6*)
-	# Note: We can NOT use -z defs as we might desire, because we do not
-	# link with -lc, and that would cause any symbols used from libc to
-	# always be unresolved, which means just about no library would
-	# ever link correctly. If we're not using GNU ld we use -z text
-	# though, which does catch some bad symbols but isn't as heavy-handed
-	# as -z defs.
-	_LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-	_LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-	_LT_TAGVAR(link_all_deplibs, $1)=yes
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-	runpath_var='LD_RUN_PATH'
-
-	case $cc_basename in
- CC*)
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	 ;;
-	 *)
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	 ;;
-	esac
- ;;
-
- tandem*)
- case $cc_basename in
- NCC*)
-	 # NonStop-UX NCC 3.20
-	 # FIXME: insert proper C++ library support
-	 _LT_TAGVAR(ld_shlibs, $1)=no
-	 ;;
- *)
-	 # FIXME: insert proper C++ library support
-	 _LT_TAGVAR(ld_shlibs, $1)=no
-	 ;;
- esac
- ;;
-
- vxworks*)
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
-
- *)
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
- esac
-
- AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
- test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
- _LT_TAGVAR(GCC, $1)="$GXX"
- _LT_TAGVAR(LD, $1)="$LD"
-
- ## CAVEAT EMPTOR:
- ## There is no encapsulation within the following macros, do not change
- ## the running order or otherwise move them around unless you know exactly
- ## what you are doing...
- _LT_SYS_HIDDEN_LIBDEPS($1)
- _LT_COMPILER_PIC($1)
- _LT_COMPILER_C_O($1)
- _LT_COMPILER_FILE_LOCKS($1)
- _LT_LINKER_SHLIBS($1)
- _LT_SYS_DYNAMIC_LINKER($1)
- _LT_LINKER_HARDCODE_LIBPATH($1)
-
- _LT_CONFIG($1)
- fi # test -n "$compiler"
-
- CC=$lt_save_CC
- LDCXX=$LD
- LD=$lt_save_LD
- GCC=$lt_save_GCC
- with_gnu_ld=$lt_save_with_gnu_ld
- lt_cv_path_LDCXX=$lt_cv_path_LD
- lt_cv_path_LD=$lt_save_path_LD
- lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
- lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-fi # test "$_lt_caught_CXX_error" != yes
-
-AC_LANG_POP
-])# _LT_LANG_CXX_CONFIG
-
-
-# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
-# ---------------------------------
-# Figure out "hidden" library dependencies from verbose
-# compiler output when linking a shared library.
-# Parse the compiler output and extract the necessary
-# objects, libraries and library flags.
-m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-# Dependencies to place before and after the object being linked:
-_LT_TAGVAR(predep_objects, $1)=
-_LT_TAGVAR(postdep_objects, $1)=
-_LT_TAGVAR(predeps, $1)=
-_LT_TAGVAR(postdeps, $1)=
-_LT_TAGVAR(compiler_lib_search_path, $1)=
-
-dnl we can't use the lt_simple_compile_test_code here,
-dnl because it contains code intended for an executable,
-dnl not a library. It's possible we should let each
-dnl tag define a new lt_????_link_test_code variable,
-dnl but it's only used here...
-m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
-int a;
-void foo (void) { a = 0; }
-_LT_EOF
-], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
-class Foo
-{
-public:
- Foo (void) { a = 0; }
-private:
- int a;
-};
-_LT_EOF
-], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
- subroutine foo
- implicit none
- integer*4 a
- a=0
- return
- end
-_LT_EOF
-], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
- subroutine foo
- implicit none
- integer a
- a=0
- return
- end
-_LT_EOF
-], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
-public class foo {
- private int a;
- public void bar (void) {
- a = 0;
- }
-};
-_LT_EOF
-])
-dnl Parse the compiler output and extract the necessary
-dnl objects, libraries and library flags.
-if AC_TRY_EVAL(ac_compile); then
- # Parse the compiler output and extract the necessary
- # objects, libraries and library flags.
-
- # Sentinel used to keep track of whether or not we are before
- # the conftest object file.
- pre_test_object_deps_done=no
-
- for p in `eval "$output_verbose_link_cmd"`; do
- case $p in
-
- -L* | -R* | -l*)
- # Some compilers place space between "-{L,R}" and the path.
- # Remove the space.
- if test $p = "-L" ||
- test $p = "-R"; then
-	 prev=$p
-	 continue
- else
-	 prev=
- fi
-
- if test "$pre_test_object_deps_done" = no; then
-	 case $p in
-	 -L* | -R*)
-	 # Internal compiler library paths should come after those
-	 # provided the user. The postdeps already come after the
-	 # user supplied libs so there is no need to process them.
-	 if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
-	 _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
-	 else
-	 _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
-	 fi
-	 ;;
-	 # The "-l" case would never come before the object being
-	 # linked, so don't bother handling this case.
-	 esac
- else
-	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
-	 _LT_TAGVAR(postdeps, $1)="${prev}${p}"
-	 else
-	 _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
-	 fi
- fi
- ;;
-
- *.$objext)
- # This assumes that the test object file only shows up
- # once in the compiler output.
- if test "$p" = "conftest.$objext"; then
-	 pre_test_object_deps_done=yes
-	 continue
- fi
-
- if test "$pre_test_object_deps_done" = no; then
-	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
-	 _LT_TAGVAR(predep_objects, $1)="$p"
-	 else
-	 _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
-	 fi
- else
-	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
-	 _LT_TAGVAR(postdep_objects, $1)="$p"
-	 else
-	 _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
-	 fi
- fi
- ;;
-
- *) ;; # Ignore the rest.
-
- esac
- done
-
- # Clean up.
- rm -f a.out a.exe
-else
- echo "libtool.m4: error: problem compiling $1 test program"
-fi
-
-$RM -f confest.$objext
-
-# PORTME: override above test on systems where it is broken
-m4_if([$1], [CXX],
-[case $host_os in
-interix[[3-9]]*)
- # Interix 3.5 installs completely hosed .la files for C++, so rather than
- # hack all around it, let's just trust "g++" to DTRT.
- _LT_TAGVAR(predep_objects,$1)=
- _LT_TAGVAR(postdep_objects,$1)=
- _LT_TAGVAR(postdeps,$1)=
- ;;
-
-linux*)
- case `$CC -V 2>&1 | sed 5q` in
- *Sun\ C*)
- # Sun C++ 5.9
-
- # The more standards-conforming stlport4 library is
- # incompatible with the Cstd library. Avoid specifying
- # it if it's in CXXFLAGS. Ignore libCrun as
- # -library=stlport4 depends on it.
- case " $CXX $CXXFLAGS " in
- *" -library=stlport4 "*)
- solaris_use_stlport4=yes
- ;;
- esac
-
- if test "$solaris_use_stlport4" != yes; then
- _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
- fi
- ;;
- esac
- ;;
-
-solaris*)
- case $cc_basename in
- CC*)
- # The more standards-conforming stlport4 library is
- # incompatible with the Cstd library. Avoid specifying
- # it if it's in CXXFLAGS. Ignore libCrun as
- # -library=stlport4 depends on it.
- case " $CXX $CXXFLAGS " in
- *" -library=stlport4 "*)
- solaris_use_stlport4=yes
- ;;
- esac
-
- # Adding this requires a known-good setup of shared libraries for
- # Sun compiler versions before 5.6, else PIC objects from an old
- # archive will be linked into the output, leading to subtle bugs.
- if test "$solaris_use_stlport4" != yes; then
- _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
- fi
- ;;
- esac
- ;;
-esac
-])
-
-case " $_LT_TAGVAR(postdeps, $1) " in
-*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-esac
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=
-if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-fi
-_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
- [The directories searched by this compiler when creating a shared library])
-_LT_TAGDECL([], [predep_objects], [1],
- [Dependencies to place before and after the objects being linked to
- create a shared library])
-_LT_TAGDECL([], [postdep_objects], [1])
-_LT_TAGDECL([], [predeps], [1])
-_LT_TAGDECL([], [postdeps], [1])
-_LT_TAGDECL([], [compiler_lib_search_path], [1],
- [The library search path used internally by the compiler when linking
- a shared library])
-])# _LT_SYS_HIDDEN_LIBDEPS
-
-
-# _LT_PROG_F77
-# ------------
-# Since AC_PROG_F77 is broken, in that it returns the empty string
-# if there is no fortran compiler, we have our own version here.
-m4_defun([_LT_PROG_F77],
-[
-pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
-AC_PROG_F77
-if test -z "$F77" || test "X$F77" = "Xno"; then
- _lt_disable_F77=yes
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_F77
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_F77], [])
-
-
-# _LT_LANG_F77_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for a Fortran 77 compiler are
-# suitably defined. These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_F77_CONFIG],
-[AC_REQUIRE([_LT_PROG_F77])dnl
-AC_LANG_PUSH(Fortran 77)
-
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for f77 test sources.
-ac_ext=f
-
-# Object file extension for compiled f77 test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the F77 compiler isn't working. Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_F77" != yes; then
- # Code to be used in simple compile tests
- lt_simple_compile_test_code="\
- subroutine t
- return
- end
-"
-
- # Code to be used in simple link tests
- lt_simple_link_test_code="\
- program t
- end
-"
-
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
- _LT_TAG_COMPILER
-
- # save warnings/boilerplate of simple test code
- _LT_COMPILER_BOILERPLATE
- _LT_LINKER_BOILERPLATE
-
- # Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
- lt_save_GCC=$GCC
- CC=${F77-"f77"}
- compiler=$CC
- _LT_TAGVAR(compiler, $1)=$CC
- _LT_CC_BASENAME([$compiler])
- GCC=$G77
- if test -n "$compiler"; then
- AC_MSG_CHECKING([if libtool supports shared libraries])
- AC_MSG_RESULT([$can_build_shared])
-
- AC_MSG_CHECKING([whether to build shared libraries])
- test "$can_build_shared" = "no" && enable_shared=no
-
- # On AIX, shared libraries and static libraries use the same namespace, and
- # are all built from PIC.
- case $host_os in
- aix3*)
- test "$enable_shared" = yes && enable_static=no
- if test -n "$RANLIB"; then
- archive_cmds="$archive_cmds~\$RANLIB \$lib"
- postinstall_cmds='$RANLIB $lib'
- fi
- ;;
- aix[[4-9]]*)
-	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-	 test "$enable_shared" = yes && enable_static=no
-	fi
- ;;
- esac
- AC_MSG_RESULT([$enable_shared])
-
- AC_MSG_CHECKING([whether to build static libraries])
- # Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
- AC_MSG_RESULT([$enable_static])
-
- _LT_TAGVAR(GCC, $1)="$G77"
- _LT_TAGVAR(LD, $1)="$LD"
-
- ## CAVEAT EMPTOR:
- ## There is no encapsulation within the following macros, do not change
- ## the running order or otherwise move them around unless you know exactly
- ## what you are doing...
- _LT_COMPILER_PIC($1)
- _LT_COMPILER_C_O($1)
- _LT_COMPILER_FILE_LOCKS($1)
- _LT_LINKER_SHLIBS($1)
- _LT_SYS_DYNAMIC_LINKER($1)
- _LT_LINKER_HARDCODE_LIBPATH($1)
-
- _LT_CONFIG($1)
- fi # test -n "$compiler"
-
- GCC=$lt_save_GCC
- CC="$lt_save_CC"
-fi # test "$_lt_disable_F77" != yes
-
-AC_LANG_POP
-])# _LT_LANG_F77_CONFIG
-
-
-# _LT_PROG_FC
-# -----------
-# Since AC_PROG_FC is broken, in that it returns the empty string
-# if there is no fortran compiler, we have our own version here.
-m4_defun([_LT_PROG_FC],
-[
-pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
-AC_PROG_FC
-if test -z "$FC" || test "X$FC" = "Xno"; then
- _lt_disable_FC=yes
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_FC
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_FC], [])
-
-
-# _LT_LANG_FC_CONFIG([TAG])
-# -------------------------
-# Ensure that the configuration variables for a Fortran compiler are
-# suitably defined. These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_FC_CONFIG],
-[AC_REQUIRE([_LT_PROG_FC])dnl
-AC_LANG_PUSH(Fortran)
-
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for fc test sources.
-ac_ext=${ac_fc_srcext-f}
-
-# Object file extension for compiled fc test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the FC compiler isn't working. Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_FC" != yes; then
- # Code to be used in simple compile tests
- lt_simple_compile_test_code="\
- subroutine t
- return
- end
-"
-
- # Code to be used in simple link tests
- lt_simple_link_test_code="\
- program t
- end
-"
-
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
- _LT_TAG_COMPILER
-
- # save warnings/boilerplate of simple test code
- _LT_COMPILER_BOILERPLATE
- _LT_LINKER_BOILERPLATE
-
- # Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
- lt_save_GCC=$GCC
- CC=${FC-"f95"}
- compiler=$CC
- GCC=$ac_cv_fc_compiler_gnu
-
- _LT_TAGVAR(compiler, $1)=$CC
- _LT_CC_BASENAME([$compiler])
-
- if test -n "$compiler"; then
- AC_MSG_CHECKING([if libtool supports shared libraries])
- AC_MSG_RESULT([$can_build_shared])
-
- AC_MSG_CHECKING([whether to build shared libraries])
- test "$can_build_shared" = "no" && enable_shared=no
-
- # On AIX, shared libraries and static libraries use the same namespace, and
- # are all built from PIC.
- case $host_os in
- aix3*)
- test "$enable_shared" = yes && enable_static=no
- if test -n "$RANLIB"; then
- archive_cmds="$archive_cmds~\$RANLIB \$lib"
- postinstall_cmds='$RANLIB $lib'
- fi
- ;;
- aix[[4-9]]*)
-	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-	 test "$enable_shared" = yes && enable_static=no
-	fi
- ;;
- esac
- AC_MSG_RESULT([$enable_shared])
-
- AC_MSG_CHECKING([whether to build static libraries])
- # Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
- AC_MSG_RESULT([$enable_static])
-
- _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
- _LT_TAGVAR(LD, $1)="$LD"
-
- ## CAVEAT EMPTOR:
- ## There is no encapsulation within the following macros, do not change
- ## the running order or otherwise move them around unless you know exactly
- ## what you are doing...
- _LT_SYS_HIDDEN_LIBDEPS($1)
- _LT_COMPILER_PIC($1)
- _LT_COMPILER_C_O($1)
- _LT_COMPILER_FILE_LOCKS($1)
- _LT_LINKER_SHLIBS($1)
- _LT_SYS_DYNAMIC_LINKER($1)
- _LT_LINKER_HARDCODE_LIBPATH($1)
-
- _LT_CONFIG($1)
- fi # test -n "$compiler"
-
- GCC=$lt_save_GCC
- CC="$lt_save_CC"
-fi # test "$_lt_disable_FC" != yes
-
-AC_LANG_POP
-])# _LT_LANG_FC_CONFIG
-
-
-# _LT_LANG_GCJ_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for the GNU Java Compiler compiler
-# are suitably defined. These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_GCJ_CONFIG],
-[AC_REQUIRE([LT_PROG_GCJ])dnl
-AC_LANG_SAVE
-
-# Source file extension for Java test sources.
-ac_ext=java
-
-# Object file extension for compiled Java test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-lt_save_GCC=$GCC
-GCC=yes
-CC=${GCJ-"gcj"}
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
-_LT_CC_BASENAME([$compiler])
-
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-
-if test -n "$compiler"; then
- _LT_COMPILER_NO_RTTI($1)
- _LT_COMPILER_PIC($1)
- _LT_COMPILER_C_O($1)
- _LT_COMPILER_FILE_LOCKS($1)
- _LT_LINKER_SHLIBS($1)
- _LT_LINKER_HARDCODE_LIBPATH($1)
-
- _LT_CONFIG($1)
-fi
-
-AC_LANG_RESTORE
-
-GCC=$lt_save_GCC
-CC="$lt_save_CC"
-])# _LT_LANG_GCJ_CONFIG
-
-
-# _LT_LANG_RC_CONFIG([TAG])
-# -------------------------
-# Ensure that the configuration variables for the Windows resource compiler
-# are suitably defined. These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_RC_CONFIG],
-[AC_REQUIRE([LT_PROG_RC])dnl
-AC_LANG_SAVE
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-lt_save_GCC=$GCC
-GCC=
-CC=${RC-"windres"}
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-
-if test -n "$compiler"; then
- :
- _LT_CONFIG($1)
-fi
-
-GCC=$lt_save_GCC
-AC_LANG_RESTORE
-CC="$lt_save_CC"
-])# _LT_LANG_RC_CONFIG
-
-
-# LT_PROG_GCJ
-# -----------
-AC_DEFUN([LT_PROG_GCJ],
-[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
- [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
- [AC_CHECK_TOOL(GCJ, gcj,)
- test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
- AC_SUBST(GCJFLAGS)])])[]dnl
-])
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
-
-
-# LT_PROG_RC
-# ----------
-AC_DEFUN([LT_PROG_RC],
-[AC_CHECK_TOOL(RC, windres,)
-])
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_RC], [])
-
-
-# _LT_DECL_EGREP
-# --------------
-# If we don't have a new enough Autoconf to choose the best grep
-# available, choose the one first in the user's PATH.
-m4_defun([_LT_DECL_EGREP],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_REQUIRE([AC_PROG_FGREP])dnl
-test -z "$GREP" && GREP=grep
-_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
-_LT_DECL([], [EGREP], [1], [An ERE matcher])
-_LT_DECL([], [FGREP], [1], [A literal string matcher])
-dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
-AC_SUBST([GREP])
-])
-
-
-# _LT_DECL_OBJDUMP
-# --------------
-# If we don't have a new enough Autoconf to choose the best objdump
-# available, choose the one first in the user's PATH.
-m4_defun([_LT_DECL_OBJDUMP],
-[AC_CHECK_TOOL(OBJDUMP, objdump, false)
-test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
-AC_SUBST([OBJDUMP])
-])
-
-
-# _LT_DECL_SED
-# ------------
-# Check for a fully-functional sed program, that truncates
-# as few characters as possible. Prefer GNU sed if found.
-m4_defun([_LT_DECL_SED],
-[AC_PROG_SED
-test -z "$SED" && SED=sed
-Xsed="$SED -e 1s/^X//"
-_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
-_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
- [Sed that helps us avoid accidentally triggering echo(1) options like -n])
-])# _LT_DECL_SED
-
-m4_ifndef([AC_PROG_SED], [
-# NOTE: This macro has been submitted for inclusion into #
-# GNU Autoconf as AC_PROG_SED. When it is available in #
-# a released version of Autoconf we should remove this #
-# macro and use it instead. #
-
-m4_defun([AC_PROG_SED],
-[AC_MSG_CHECKING([for a sed that does not truncate output])
-AC_CACHE_VAL(lt_cv_path_SED,
-[# Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for lt_ac_prog in sed gsed; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
- lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
- fi
- done
- done
-done
-IFS=$as_save_IFS
-lt_ac_max=0
-lt_ac_count=0
-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-# along with /bin/sed that truncates output.
-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
- test ! -f $lt_ac_sed && continue
- cat /dev/null > conftest.in
- lt_ac_count=0
- echo $ECHO_N "0123456789$ECHO_C" >conftest.in
- # Check for GNU sed and select it if it is found.
- if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
- lt_cv_path_SED=$lt_ac_sed
- break
- fi
- while true; do
- cat conftest.in conftest.in >conftest.tmp
- mv conftest.tmp conftest.in
- cp conftest.in conftest.nl
- echo >>conftest.nl
- $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
- cmp -s conftest.out conftest.nl || break
- # 10000 chars as input seems more than enough
- test $lt_ac_count -gt 10 && break
- lt_ac_count=`expr $lt_ac_count + 1`
- if test $lt_ac_count -gt $lt_ac_max; then
- lt_ac_max=$lt_ac_count
- lt_cv_path_SED=$lt_ac_sed
- fi
- done
-done
-])
-SED=$lt_cv_path_SED
-AC_SUBST([SED])
-AC_MSG_RESULT([$SED])
-])#AC_PROG_SED
-])#m4_ifndef
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_SED], [])
-
-
-# _LT_CHECK_SHELL_FEATURES
-# ------------------------
-# Find out whether the shell is Bourne or XSI compatible,
-# or has some other useful features.
-m4_defun([_LT_CHECK_SHELL_FEATURES],
-[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
- = c,a/b,, \
- && eval 'test $(( 1 + 1 )) -eq 2 \
- && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
- && xsi_shell=yes
-AC_MSG_RESULT([$xsi_shell])
-_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
-
-AC_MSG_CHECKING([whether the shell understands "+="])
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
- >/dev/null 2>&1 \
- && lt_shell_append=yes
-AC_MSG_RESULT([$lt_shell_append])
-_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- lt_unset=unset
-else
- lt_unset=false
-fi
-_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
-
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
- # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
- lt_SP2NL='tr \040 \012'
- lt_NL2SP='tr \015\012 \040\040'
- ;;
- *) # EBCDIC based system
- lt_SP2NL='tr \100 \n'
- lt_NL2SP='tr \r\n \100\100'
- ;;
-esac
-_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
-_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
-])# _LT_CHECK_SHELL_FEATURES
-
-
-# _LT_PROG_XSI_SHELLFNS
-# ---------------------
-# Bourne and XSI compatible variants of some useful shell functions.
-m4_defun([_LT_PROG_XSI_SHELLFNS],
-[case $xsi_shell in
- yes)
- cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
- case ${1} in
- */*) func_dirname_result="${1%/*}${2}" ;;
- * ) func_dirname_result="${3}" ;;
- esac
-}
-
-# func_basename file
-func_basename ()
-{
- func_basename_result="${1##*/}"
-}
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-# dirname: Compute the dirname of FILE. If nonempty,
-# add APPEND to the result, otherwise set result
-# to NONDIR_REPLACEMENT.
-# value returned in "$func_dirname_result"
-# basename: Compute filename of FILE.
-# value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
- case ${1} in
- */*) func_dirname_result="${1%/*}${2}" ;;
- * ) func_dirname_result="${3}" ;;
- esac
- func_basename_result="${1##*/}"
-}
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-func_stripname ()
-{
- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
- # positional parameters, so assign one to ordinary parameter first.
- func_stripname_result=${3}
- func_stripname_result=${func_stripname_result#"${1}"}
- func_stripname_result=${func_stripname_result%"${2}"}
-}
-
-# func_opt_split
-func_opt_split ()
-{
- func_opt_split_opt=${1%%=*}
- func_opt_split_arg=${1#*=}
-}
-
-# func_lo2o object
-func_lo2o ()
-{
- case ${1} in
- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
- *) func_lo2o_result=${1} ;;
- esac
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
- func_xform_result=${1%.*}.lo
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
- func_arith_result=$(( $[*] ))
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
- func_len_result=${#1}
-}
-
-_LT_EOF
- ;;
- *) # Bourne compatible functions.
- cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
- # Extract subdirectory from the argument.
- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
- if test "X$func_dirname_result" = "X${1}"; then
- func_dirname_result="${3}"
- else
- func_dirname_result="$func_dirname_result${2}"
- fi
-}
-
-# func_basename file
-func_basename ()
-{
- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-}
-
-dnl func_dirname_and_basename
-dnl A portable version of this function is already defined in general.m4sh
-dnl so there is no need for it here.
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
- case ${2} in
- .*) func_stripname_result=`$ECHO "X${3}" \
- | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
- *) func_stripname_result=`$ECHO "X${3}" \
- | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
- esac
-}
-
-# sed scripts:
-my_sed_long_opt='1s/^$-[[^=]]*$=.*/\1/;q'
-my_sed_long_arg='1s/^-[[^=]]*=//'
-
-# func_opt_split
-func_opt_split ()
-{
- func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
- func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
-}
-
-# func_lo2o object
-func_lo2o ()
-{
- func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
- func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
- func_arith_result=`expr "$[@]"`
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
-}
-
-_LT_EOF
-esac
-
-case $lt_shell_append in
- yes)
- cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
- eval "$[1]+=\$[2]"
-}
-_LT_EOF
- ;;
- *)
- cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
- eval "$[1]=\$$[1]\$[2]"
-}
-
-_LT_EOF
- ;;
- esac
-])
-
-# Helper functions for option handling. -*- Autoconf -*-
-#
-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-# Written by Gary V. Vaughan, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 6 ltoptions.m4
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
-
-
-# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
-# ------------------------------------------
-m4_define([_LT_MANGLE_OPTION],
-[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
-
-
-# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
-# ---------------------------------------
-# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
-# matching handler defined, dispatch to it. Other OPTION-NAMEs are
-# saved as a flag.
-m4_define([_LT_SET_OPTION],
-[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
-m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
- _LT_MANGLE_DEFUN([$1], [$2]),
- [m4_warning([Unknown $1 option `$2'])])[]dnl
-])
-
-
-# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
-# ------------------------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-m4_define([_LT_IF_OPTION],
-[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
-
-
-# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
-# -------------------------------------------------------
-# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
-# are set.
-m4_define([_LT_UNLESS_OPTIONS],
-[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-	 [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
-		 [m4_define([$0_found])])])[]dnl
-m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
-])[]dnl
-])
-
-
-# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
-# ----------------------------------------
-# OPTION-LIST is a space-separated list of Libtool options associated
-# with MACRO-NAME. If any OPTION has a matching handler declared with
-# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
-# the unknown option and exit.
-m4_defun([_LT_SET_OPTIONS],
-[# Set options
-m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
- [_LT_SET_OPTION([$1], _LT_Option)])
-
-m4_if([$1],[LT_INIT],[
- dnl
- dnl Simply set some default values (i.e off) if boolean options were not
- dnl specified:
- _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
- ])
- _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
- ])
- dnl
- dnl If no reference was made to various pairs of opposing options, then
- dnl we run the default mode handler for the pair. For example, if neither
- dnl `shared' nor `disable-shared' was passed, we enable building of shared
- dnl archives by default:
- _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
- _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
- _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
- _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
- 		 [_LT_ENABLE_FAST_INSTALL])
- ])
-])# _LT_SET_OPTIONS
-
-
-
-# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
-# -----------------------------------------
-m4_define([_LT_MANGLE_DEFUN],
-[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
-
-
-# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
-# -----------------------------------------------
-m4_define([LT_OPTION_DEFINE],
-[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
-])# LT_OPTION_DEFINE
-
-
-# dlopen
-# ------
-LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
-])
-
-AU_DEFUN([AC_LIBTOOL_DLOPEN],
-[_LT_SET_OPTION([LT_INIT], [dlopen])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `dlopen' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
-
-
-# win32-dll
-# ---------
-# Declare package support for building win32 dll's.
-LT_OPTION_DEFINE([LT_INIT], [win32-dll],
-[enable_win32_dll=yes
-
-case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
- AC_CHECK_TOOL(AS, as, false)
- AC_CHECK_TOOL(DLLTOOL, dlltool, false)
- AC_CHECK_TOOL(OBJDUMP, objdump, false)
- ;;
-esac
-
-test -z "$AS" && AS=as
-_LT_DECL([], [AS], [0], [Assembler program])dnl
-
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
-])# win32-dll
-
-AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-_LT_SET_OPTION([LT_INIT], [win32-dll])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `win32-dll' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
-
-
-# _LT_ENABLE_SHARED([DEFAULT])
-# ----------------------------
-# implement the --enable-shared flag, and supports the `shared' and
-# `disable-shared' LT_INIT options.
-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_SHARED],
-[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([shared],
- [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
-	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
- [p=${PACKAGE-default}
- case $enableval in
- yes) enable_shared=yes ;;
- no) enable_shared=no ;;
- *)
- enable_shared=no
- # Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
- for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	 enable_shared=yes
-	fi
- done
- IFS="$lt_save_ifs"
- ;;
- esac],
- [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
-
- _LT_DECL([build_libtool_libs], [enable_shared], [0],
-	[Whether or not to build shared libraries])
-])# _LT_ENABLE_SHARED
-
-LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
-
-# Old names:
-AC_DEFUN([AC_ENABLE_SHARED],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
-])
-
-AC_DEFUN([AC_DISABLE_SHARED],
-[_LT_SET_OPTION([LT_INIT], [disable-shared])
-])
-
-AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
-AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_ENABLE_SHARED], [])
-dnl AC_DEFUN([AM_DISABLE_SHARED], [])
-
-
-
-# _LT_ENABLE_STATIC([DEFAULT])
-# ----------------------------
-# implement the --enable-static flag, and support the `static' and
-# `disable-static' LT_INIT options.
-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_STATIC],
-[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([static],
- [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
-	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
- [p=${PACKAGE-default}
- case $enableval in
- yes) enable_static=yes ;;
- no) enable_static=no ;;
- *)
- enable_static=no
- # Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
- for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	 enable_static=yes
-	fi
- done
- IFS="$lt_save_ifs"
- ;;
- esac],
- [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
-
- _LT_DECL([build_old_libs], [enable_static], [0],
-	[Whether or not to build static libraries])
-])# _LT_ENABLE_STATIC
-
-LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
-
-# Old names:
-AC_DEFUN([AC_ENABLE_STATIC],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
-])
-
-AC_DEFUN([AC_DISABLE_STATIC],
-[_LT_SET_OPTION([LT_INIT], [disable-static])
-])
-
-AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
-AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_ENABLE_STATIC], [])
-dnl AC_DEFUN([AM_DISABLE_STATIC], [])
-
-
-
-# _LT_ENABLE_FAST_INSTALL([DEFAULT])
-# ----------------------------------
-# implement the --enable-fast-install flag, and support the `fast-install'
-# and `disable-fast-install' LT_INIT options.
-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_FAST_INSTALL],
-[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([fast-install],
- [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
- [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
- [p=${PACKAGE-default}
- case $enableval in
- yes) enable_fast_install=yes ;;
- no) enable_fast_install=no ;;
- *)
- enable_fast_install=no
- # Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
- for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	 enable_fast_install=yes
-	fi
- done
- IFS="$lt_save_ifs"
- ;;
- esac],
- [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
-
-_LT_DECL([fast_install], [enable_fast_install], [0],
-	 [Whether or not to optimize for fast installation])dnl
-])# _LT_ENABLE_FAST_INSTALL
-
-LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
-
-# Old names:
-AU_DEFUN([AC_ENABLE_FAST_INSTALL],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `fast-install' option into LT_INIT's first parameter.])
-])
-
-AU_DEFUN([AC_DISABLE_FAST_INSTALL],
-[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `disable-fast-install' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
-dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
-
-
-# _LT_WITH_PIC([MODE])
-# --------------------
-# implement the --with-pic flag, and support the `pic-only' and `no-pic'
-# LT_INIT options.
-# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
-m4_define([_LT_WITH_PIC],
-[AC_ARG_WITH([pic],
- [AS_HELP_STRING([--with-pic],
-	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
- [pic_mode="$withval"],
- [pic_mode=default])
-
-test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
-
-_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
-])# _LT_WITH_PIC
-
-LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
-LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
-
-# Old name:
-AU_DEFUN([AC_LIBTOOL_PICMODE],
-[_LT_SET_OPTION([LT_INIT], [pic-only])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `pic-only' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
-
-
-m4_define([_LTDL_MODE], [])
-LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
-		 [m4_define([_LTDL_MODE], [nonrecursive])])
-LT_OPTION_DEFINE([LTDL_INIT], [recursive],
-		 [m4_define([_LTDL_MODE], [recursive])])
-LT_OPTION_DEFINE([LTDL_INIT], [subproject],
-		 [m4_define([_LTDL_MODE], [subproject])])
-
-m4_define([_LTDL_TYPE], [])
-LT_OPTION_DEFINE([LTDL_INIT], [installable],
-		 [m4_define([_LTDL_TYPE], [installable])])
-LT_OPTION_DEFINE([LTDL_INIT], [convenience],
-		 [m4_define([_LTDL_TYPE], [convenience])])
-
-# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
-#
-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-# Written by Gary V. Vaughan, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 6 ltsugar.m4
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
-
-
-# lt_join(SEP, ARG1, [ARG2...])
-# -----------------------------
-# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
-# associated separator.
-# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
-# versions in m4sugar had bugs.
-m4_define([lt_join],
-[m4_if([$#], [1], [],
- [$#], [2], [[$2]],
- [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
-m4_define([_lt_join],
-[m4_if([$#$2], [2], [],
- [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
-
-
-# lt_car(LIST)
-# lt_cdr(LIST)
-# ------------
-# Manipulate m4 lists.
-# These macros are necessary as long as will still need to support
-# Autoconf-2.59 which quotes differently.
-m4_define([lt_car], [[$1]])
-m4_define([lt_cdr],
-[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
- [$#], 1, [],
- [m4_dquote(m4_shift($@))])])
-m4_define([lt_unquote], $1)
-
-
-# lt_append(MACRO-NAME, STRING, [SEPARATOR])
-# ------------------------------------------
-# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
-# Note that neither SEPARATOR nor STRING are expanded; they are appended
-# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
-# No SEPARATOR is output if MACRO-NAME was previously undefined (different
-# than defined and empty).
-#
-# This macro is needed until we can rely on Autoconf 2.62, since earlier
-# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
-m4_define([lt_append],
-[m4_define([$1],
-	 m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
-
-
-
-# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
-# ----------------------------------------------------------
-# Produce a SEP delimited list of all paired combinations of elements of
-# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list
-# has the form PREFIXmINFIXSUFFIXn.
-# Needed until we can rely on m4_combine added in Autoconf 2.62.
-m4_define([lt_combine],
-[m4_if(m4_eval([$# > 3]), [1],
- [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
-[[m4_foreach([_Lt_prefix], [$2],
-	 [m4_foreach([_Lt_suffix],
-		]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
-	[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
-
-
-# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
-# -----------------------------------------------------------------------
-# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
-# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
-m4_define([lt_if_append_uniq],
-[m4_ifdef([$1],
-	 [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
-		 [lt_append([$1], [$2], [$3])$4],
-		 [$5])],
-	 [lt_append([$1], [$2], [$3])$4])])
-
-
-# lt_dict_add(DICT, KEY, VALUE)
-# -----------------------------
-m4_define([lt_dict_add],
-[m4_define([$1($2)], [$3])])
-
-
-# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
-# --------------------------------------------
-m4_define([lt_dict_add_subkey],
-[m4_define([$1($2:$3)], [$4])])
-
-
-# lt_dict_fetch(DICT, KEY, [SUBKEY])
-# ----------------------------------
-m4_define([lt_dict_fetch],
-[m4_ifval([$3],
-	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
- m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
-
-
-# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
-# -----------------------------------------------------------------
-m4_define([lt_if_dict_fetch],
-[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
-	[$5],
- [$6])])
-
-
-# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
-# --------------------------------------------------------------
-m4_define([lt_dict_filter],
-[m4_if([$5], [], [],
- [lt_join(m4_quote(m4_default([$4], [[, ]])),
- lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
-		 [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
-])
-
-# ltversion.m4 -- version numbers			-*- Autoconf -*-
-#
-# Copyright (C) 2004 Free Software Foundation, Inc.
-# Written by Scott James Remnant, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# Generated from ltversion.in.
-
-# serial 3012 ltversion.m4
-# This file is part of GNU Libtool
-
-m4_define([LT_PACKAGE_VERSION], [2.2.6])
-m4_define([LT_PACKAGE_REVISION], [1.3012])
-
-AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.2.6'
-macro_revision='1.3012'
-_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
-_LT_DECL(, macro_revision, 0)
-])
-
-# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
-#
-# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
-# Written by Scott James Remnant, 2004.
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 4 lt~obsolete.m4
-
-# These exist entirely to fool aclocal when bootstrapping libtool.
-#
-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
-# which have later been changed to m4_define as they aren't part of the
-# exported API, or moved to Autoconf or Automake where they belong.
-#
-# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN
-# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
-# using a macro with the same name in our local m4/libtool.m4 it'll
-# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
-# and doesn't know about Autoconf macros at all.)
-#
-# So we provide this file, which has a silly filename so it's always
-# included after everything else. This provides aclocal with the
-# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
-# because those macros already exist, or will be overwritten later.
-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
-#
-# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
-# Yes, that means every name once taken will need to remain here until
-# we give up compatibility with versions before 1.7, at which point
-# we need to keep only those names which we still refer to.
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
-
-m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
-m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
-m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
-m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
-m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
-m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
-m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
-m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
-m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
-m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
-m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
-m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
-m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
-m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
-m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
-m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
-m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
-m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
-m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
-m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
-m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
-m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
-m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
-m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
-m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
-m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
-m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
-m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
-m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
-m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
-m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
-m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
-m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
-m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
-m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
-m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
-m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
-m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
-m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
-m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
-m4_ifndef([AC_LIBTOOL_RC],		[AC_DEFUN([AC_LIBTOOL_RC])])
-m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
-m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
-m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
-m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
-m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
-m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
-m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
-m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
-
-# nls.m4 serial 3 (gettext-0.15)
-dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
-
-AC_PREREQ(2.50)
-
-AC_DEFUN([AM_NLS],
-[
- AC_MSG_CHECKING([whether NLS is requested])
- dnl Default is enabled NLS
- AC_ARG_ENABLE(nls,
- [ --disable-nls do not use Native Language Support],
- USE_NLS=$enableval, USE_NLS=yes)
- AC_MSG_RESULT($USE_NLS)
- AC_SUBST(USE_NLS)
-])
-
-# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-# 
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=m4_default([$1], [0.9.0])
-	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
-		PKG_CONFIG=""
-	fi
-		
-fi[]dnl
-])# PKG_PROG_PKG_CONFIG
-
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists. Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-#
-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
-# this or PKG_CHECK_MODULES is called, or make sure to call
-# PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_EXISTS],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-if test -n "$PKG_CONFIG" && \
- AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
- m4_ifval([$2], [$2], [:])
-m4_ifvaln([$3], [else
- $3])dnl
-fi])
-
-
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
-m4_define([_PKG_CONFIG],
-[if test -n "$PKG_CONFIG"; then
- if test -n "$$1"; then
- pkg_cv_[]$1="$$1"
- else
- PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-			 [pkg_failed=yes])
- fi
-else
-	pkg_failed=untried
-fi[]dnl
-])# _PKG_CONFIG
-
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
-
-
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
-pkg_failed=no
-AC_MSG_CHECKING([for $1])
-
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
-
-if test $pkg_failed = yes; then
- _PKG_SHORT_ERRORS_SUPPORTED
- if test $_pkg_short_errors_supported = yes; then
-	 $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
- else 
-	 $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
- fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
-	ifelse([$4], , [AC_MSG_ERROR(dnl
-[Package requirements ($2) were not met:
-
-$$1_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-_PKG_TEXT
-])],
-		[AC_MSG_RESULT([no])
- $4])
-elif test $pkg_failed = untried; then
-	ifelse([$4], , [AC_MSG_FAILURE(dnl
-[The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-_PKG_TEXT
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
-		[$4])
-else
-	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
- AC_MSG_RESULT([yes])
-	ifelse([$3], , :, [$3])
-fi[]dnl
-])# PKG_CHECK_MODULES
-
-# po.m4 serial 15 (gettext-0.17)
-dnl Copyright (C) 1995-2007 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
-
-AC_PREREQ(2.50)
-
-dnl Checks for all prerequisites of the po subdirectory.
-AC_DEFUN([AM_PO_SUBDIRS],
-[
- AC_REQUIRE([AC_PROG_MAKE_SET])dnl
- AC_REQUIRE([AC_PROG_INSTALL])dnl
- AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
- AC_REQUIRE([AM_NLS])dnl
-
- dnl Release version of the gettext macros. This is used to ensure that
- dnl the gettext macros and po/Makefile.in.in are in sync.
- AC_SUBST([GETTEXT_MACRO_VERSION], [0.17])
-
- dnl Perform the following tests also if --disable-nls has been given,
- dnl because they are needed for "make dist" to work.
-
- dnl Search for GNU msgfmt in the PATH.
- dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
- dnl The second test excludes FreeBSD msgfmt.
- AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
- [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
- (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
- :)
- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-
- dnl Test whether it is GNU msgfmt >= 0.15.
-changequote(,)dnl
- case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
- '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
- *) MSGFMT_015=$MSGFMT ;;
- esac
-changequote([,])dnl
- AC_SUBST([MSGFMT_015])
-changequote(,)dnl
- case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
- '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
- *) GMSGFMT_015=$GMSGFMT ;;
- esac
-changequote([,])dnl
- AC_SUBST([GMSGFMT_015])
-
- dnl Search for GNU xgettext 0.12 or newer in the PATH.
- dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
- dnl The second test excludes FreeBSD xgettext.
- AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
- [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
- (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
- :)
- dnl Remove leftover from FreeBSD xgettext call.
- rm -f messages.po
-
- dnl Test whether it is GNU xgettext >= 0.15.
-changequote(,)dnl
- case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
- '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
- *) XGETTEXT_015=$XGETTEXT ;;
- esac
-changequote([,])dnl
- AC_SUBST([XGETTEXT_015])
-
- dnl Search for GNU msgmerge 0.11 or newer in the PATH.
- AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
- [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
-
- dnl Installation directories.
- dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we
- dnl have to define it here, so that it can be used in po/Makefile.
- test -n "$localedir" || localedir='${datadir}/locale'
- AC_SUBST([localedir])
-
- dnl Support for AM_XGETTEXT_OPTION.
- test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
- AC_SUBST([XGETTEXT_EXTRA_OPTIONS])
-
- AC_CONFIG_COMMANDS([po-directories], [[
- for ac_file in $CONFIG_FILES; do
- # Support "outfile[:infile[:infile...]]"
- case "$ac_file" in
- *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
- esac
- # PO directories have a Makefile.in generated from Makefile.in.in.
- case "$ac_file" in */Makefile.in)
- # Adjust a relative srcdir.
- ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
- ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
- ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
- # In autoconf-2.13 it is called $ac_given_srcdir.
- # In autoconf-2.50 it is called $srcdir.
- test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
- case "$ac_given_srcdir" in
- .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
- /*) top_srcdir="$ac_given_srcdir" ;;
- *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
- esac
- # Treat a directory as a PO directory if and only if it has a
- # POTFILES.in file. This allows packages to have multiple PO
- # directories under different names or in different locations.
- if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
- rm -f "$ac_dir/POTFILES"
- test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
- cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/$.*$ \\\\/\1/" > "$ac_dir/POTFILES"
- POMAKEFILEDEPS="POTFILES.in"
- # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
- # on $ac_dir but don't depend on user-specified configuration
- # parameters.
- if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
- # The LINGUAS file contains the set of available languages.
- if test -n "$OBSOLETE_ALL_LINGUAS"; then
- test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
- fi
- ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
- # Hide the ALL_LINGUAS assigment from automake < 1.5.
- eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
- POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
- else
- # The set of available languages was given in configure.in.
- # Hide the ALL_LINGUAS assigment from automake < 1.5.
- eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
- fi
- # Compute POFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
- # Compute UPDATEPOFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
- # Compute DUMMYPOFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
- # Compute GMOFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
- case "$ac_given_srcdir" in
- .) srcdirpre= ;;
- *) srcdirpre='$(srcdir)/' ;;
- esac
- POFILES=
- UPDATEPOFILES=
- DUMMYPOFILES=
- GMOFILES=
- for lang in $ALL_LINGUAS; do
- POFILES="$POFILES $srcdirpre$lang.po"
- UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
- DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
- GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
- done
- # CATALOGS depends on both $ac_dir and the user's LINGUAS
- # environment variable.
- INST_LINGUAS=
- if test -n "$ALL_LINGUAS"; then
- for presentlang in $ALL_LINGUAS; do
- useit=no
- if test "%UNSET%" != "$LINGUAS"; then
- desiredlanguages="$LINGUAS"
- else
- desiredlanguages="$ALL_LINGUAS"
- fi
- for desiredlang in $desiredlanguages; do
- # Use the presentlang catalog if desiredlang is
- # a. equal to presentlang, or
- # b. a variant of presentlang (because in this case,
- # presentlang can be used as a fallback for messages
- # which are not translated in the desiredlang catalog).
- case "$desiredlang" in
- "$presentlang"*) useit=yes;;
- esac
- done
- if test $useit = yes; then
- INST_LINGUAS="$INST_LINGUAS $presentlang"
- fi
- done
- fi
- CATALOGS=
- if test -n "$INST_LINGUAS"; then
- for lang in $INST_LINGUAS; do
- CATALOGS="$CATALOGS $lang.gmo"
- done
- fi
- test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
- sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
- for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
- if test -f "$f"; then
- case "$f" in
- *.orig | *.bak | *~) ;;
- *) cat "$f" >> "$ac_dir/Makefile" ;;
- esac
- fi
- done
- fi
- ;;
- esac
- done]],
- [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
- # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
- # from automake < 1.5.
- eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
- # Capture the value of LINGUAS because we need it to compute CATALOGS.
- LINGUAS="${LINGUAS-%UNSET%}"
- ])
-])
-
-dnl Postprocesses a Makefile in a directory containing PO files.
-AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
-[
- # When this code is run, in config.status, two variables have already been
- # set:
- # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in,
- # - LINGUAS is the value of the environment variable LINGUAS at configure
- # time.
-
-changequote(,)dnl
- # Adjust a relative srcdir.
- ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
- ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
- ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
- # In autoconf-2.13 it is called $ac_given_srcdir.
- # In autoconf-2.50 it is called $srcdir.
- test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
- case "$ac_given_srcdir" in
- .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
- /*) top_srcdir="$ac_given_srcdir" ;;
- *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
- esac
-
- # Find a way to echo strings without interpreting backslash.
- if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
- gt_echo='echo'
- else
- if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
- gt_echo='printf %s\n'
- else
- echo_func () {
- cat <<EOT
-$*
-EOT
- }
- gt_echo='echo_func'
- fi
- fi
-
- # A sed script that extracts the value of VARIABLE from a Makefile.
- sed_x_variable='
-# Test if the hold space is empty.
-x
-s/P/P/
-x
-ta
-# Yes it was empty. Look if we have the expected variable definition.
-/^[	 ]*VARIABLE[	 ]*=/{
- # Seen the first line of the variable definition.
- s/^[	 ]*VARIABLE[	 ]*=//
- ba
-}
-bd
-:a
-# Here we are processing a line from the variable definition.
-# Remove comment, more precisely replace it with a space.
-s/#.*$/ /
-# See if the line ends in a backslash.
-tb
-:b
-s/\\$//
-# Print the line, without the trailing backslash.
-p
-tc
-# There was no trailing backslash. The end of the variable definition is
-# reached. Clear the hold space.
-s/^.*$//
-x
-bd
-:c
-# A trailing backslash means that the variable definition continues in the
-# next line. Put a nonempty string into the hold space to indicate this.
-s/^.*$/P/
-x
-:d
-'
-changequote([,])dnl
-
- # Set POTFILES to the value of the Makefile variable POTFILES.
- sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`
- POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
- # Compute POTFILES_DEPS as
- # $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
- POTFILES_DEPS=
- for file in $POTFILES; do
- POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file"
- done
- POMAKEFILEDEPS=""
-
- if test -n "$OBSOLETE_ALL_LINGUAS"; then
- test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
- fi
- if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
- # The LINGUAS file contains the set of available languages.
- ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
- POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
- else
- # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
- sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
- ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
- fi
- # Hide the ALL_LINGUAS assigment from automake < 1.5.
- eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
- # Compute POFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
- # Compute UPDATEPOFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
- # Compute DUMMYPOFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
- # Compute GMOFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
- # Compute PROPERTIESFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties)
- # Compute CLASSFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class)
- # Compute QMFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
- # Compute MSGFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
- # Compute RESOURCESDLLFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll)
- case "$ac_given_srcdir" in
- .) srcdirpre= ;;
- *) srcdirpre='$(srcdir)/' ;;
- esac
- POFILES=
- UPDATEPOFILES=
- DUMMYPOFILES=
- GMOFILES=
- PROPERTIESFILES=
- CLASSFILES=
- QMFILES=
- MSGFILES=
- RESOURCESDLLFILES=
- for lang in $ALL_LINGUAS; do
- POFILES="$POFILES $srcdirpre$lang.po"
- UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
- DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
- GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
- PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties"
- CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class"
- QMFILES="$QMFILES $srcdirpre$lang.qm"
- frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
- MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
- frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
- RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
- done
- # CATALOGS depends on both $ac_dir and the user's LINGUAS
- # environment variable.
- INST_LINGUAS=
- if test -n "$ALL_LINGUAS"; then
- for presentlang in $ALL_LINGUAS; do
- useit=no
- if test "%UNSET%" != "$LINGUAS"; then
- desiredlanguages="$LINGUAS"
- else
- desiredlanguages="$ALL_LINGUAS"
- fi
- for desiredlang in $desiredlanguages; do
- # Use the presentlang catalog if desiredlang is
- # a. equal to presentlang, or
- # b. a variant of presentlang (because in this case,
- # presentlang can be used as a fallback for messages
- # which are not translated in the desiredlang catalog).
- case "$desiredlang" in
- "$presentlang"*) useit=yes;;
- esac
- done
- if test $useit = yes; then
- INST_LINGUAS="$INST_LINGUAS $presentlang"
- fi
- done
- fi
- CATALOGS=
- JAVACATALOGS=
- QTCATALOGS=
- TCLCATALOGS=
- CSHARPCATALOGS=
- if test -n "$INST_LINGUAS"; then
- for lang in $INST_LINGUAS; do
- CATALOGS="$CATALOGS $lang.gmo"
- JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties"
- QTCATALOGS="$QTCATALOGS $lang.qm"
- frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
- TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
- frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
- CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
- done
- fi
-
- sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
- if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
- # Add dependencies that cannot be formulated as a simple suffix rule.
- for lang in $ALL_LINGUAS; do
- frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
- cat >> "$ac_file.tmp" <<EOF
-$frobbedlang.msg: $lang.po
-	@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
-	\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
-EOF
- done
- fi
- if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
- # Add dependencies that cannot be formulated as a simple suffix rule.
- for lang in $ALL_LINGUAS; do
- frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
- cat >> "$ac_file.tmp" <<EOF
-$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
-	@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
-	\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
-EOF
- done
- fi
- if test -n "$POMAKEFILEDEPS"; then
- cat >> "$ac_file.tmp" <<EOF
-Makefile: $POMAKEFILEDEPS
-EOF
- fi
- mv "$ac_file.tmp" "$ac_file"
-])
-
-dnl Initializes the accumulator used by AM_XGETTEXT_OPTION.
-AC_DEFUN([AM_XGETTEXT_OPTION_INIT],
-[
- XGETTEXT_EXTRA_OPTIONS=
-])
-
-dnl Registers an option to be passed to xgettext in the po subdirectory.
-AC_DEFUN([AM_XGETTEXT_OPTION],
-[
- AC_REQUIRE([AM_XGETTEXT_OPTION_INIT])
- XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
-])
-
-# progtest.m4 serial 4 (gettext-0.14.2)
-dnl Copyright (C) 1996-2003, 2005 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl Ulrich Drepper <drepper@cygnus.com>, 1996.
-
-AC_PREREQ(2.50)
-
-# Search path for a program which passes the given test.
-
-dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN([AM_PATH_PROG_WITH_TEST],
-[
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
- else
- PATH_SEPARATOR=:
- fi
- rm -f conf$$.sh
-fi
-
-# Find out how to test for executable files. Don't use a zero-byte file,
-# as systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
- ac_executable_p="test -x"
-else
- ac_executable_p="test -f"
-fi
-rm -f conf$$.file
-
-# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=[$]2
-AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL(ac_cv_path_$1,
-[case "[$]$1" in
- [[\\/]]* | ?:[[\\/]]*)
- ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
- ;;
- *)
- ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
- for ac_dir in ifelse([$5], , $PATH, [$5]); do
- IFS="$ac_save_IFS"
- test -z "$ac_dir" && ac_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
- echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD
- if [$3]; then
- ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
- break 2
- fi
- fi
- done
- done
- IFS="$ac_save_IFS"
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-])dnl
- ;;
-esac])dnl
-$1="$ac_cv_path_$1"
-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
- AC_MSG_RESULT([$]$1)
-else
- AC_MSG_RESULT(no)
-fi
-AC_SUBST($1)dnl
-])
-
-# Configure paths for SDL
-# Sam Lantinga 9/21/99
-# stolen from Manish Singh
-# stolen back from Frank Belew
-# stolen from Manish Singh
-# Shamelessly stolen from Owen Taylor
-
-dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
-dnl
-AC_DEFUN([AM_PATH_SDL],
-[dnl 
-dnl Get the cflags and libraries from the sdl-config script
-dnl
-AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)],
- sdl_prefix="$withval", sdl_prefix="")
-AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
- sdl_exec_prefix="$withval", sdl_exec_prefix="")
-AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program],
-		 , enable_sdltest=yes)
-
- if test x$sdl_exec_prefix != x ; then
- sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix"
- if test x${SDL_CONFIG+set} != xset ; then
- SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
- fi
- fi
- if test x$sdl_prefix != x ; then
- sdl_config_args="$sdl_config_args --prefix=$sdl_prefix"
- if test x${SDL_CONFIG+set} != xset ; then
- SDL_CONFIG=$sdl_prefix/bin/sdl-config
- fi
- fi
-
- if test "x$prefix" != xNONE; then
- PATH="$prefix/bin:$prefix/usr/bin:$PATH"
- fi
- AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
- min_sdl_version=ifelse([$1], ,0.11.0,$1)
- AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
- no_sdl=""
- if test "$SDL_CONFIG" = "no" ; then
- no_sdl=yes
- else
- SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags`
- SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs`
-
- sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \
- sed 's/$[[0-9]]*$.$[[0-9]]*$.$[[0-9]]*$/\1/'`
- sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \
- sed 's/$[[0-9]]*$.$[[0-9]]*$.$[[0-9]]*$/\2/'`
- sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
- sed 's/$[[0-9]]*$.$[[0-9]]*$.$[[0-9]]*$/\3/'`
- if test "x$enable_sdltest" = "xyes" ; then
- ac_save_CFLAGS="$CFLAGS"
- ac_save_CXXFLAGS="$CXXFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $SDL_CFLAGS"
- CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
- LIBS="$LIBS $SDL_LIBS"
-dnl
-dnl Now check if the installed SDL is sufficiently new. (Also sanity
-dnl checks the results of sdl-config to some extent
-dnl
- rm -f conf.sdltest
- AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "SDL.h"
-
-char*
-my_strdup (char *str)
-{
- char *new_str;
- 
- if (str)
- {
- new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
- strcpy (new_str, str);
- }
- else
- new_str = NULL;
- 
- return new_str;
-}
-
-int main (int argc, char *argv[])
-{
- int major, minor, micro;
- char *tmp_version;
-
- /* This hangs on some systems (?)
- system ("touch conf.sdltest");
- */
- { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
-
- /* HP/UX 9 (%@#!) writes to sscanf strings */
- tmp_version = my_strdup("$min_sdl_version");
- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
- printf("%s, bad version string\n", "$min_sdl_version");
- exit(1);
- }
-
- if (($sdl_major_version > major) ||
- (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
- (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
- {
- return 0;
- }
- else
- {
- printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
- printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
- printf("*** best to upgrade to the required version.\n");
- printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
- printf("*** to point to the correct copy of sdl-config, and remove the file\n");
- printf("*** config.cache before re-running configure\n");
- return 1;
- }
-}
-
-],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
- CFLAGS="$ac_save_CFLAGS"
- CXXFLAGS="$ac_save_CXXFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- if test "x$no_sdl" = x ; then
- AC_MSG_RESULT(yes)
- ifelse([$2], , :, [$2]) 
- else
- AC_MSG_RESULT(no)
- if test "$SDL_CONFIG" = "no" ; then
- echo "*** The sdl-config script installed by SDL could not be found"
- echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
- echo "*** your path, or set the SDL_CONFIG environment variable to the"
- echo "*** full path to sdl-config."
- else
- if test -f conf.sdltest ; then
- :
- else
- echo "*** Could not run SDL test program, checking why..."
- CFLAGS="$CFLAGS $SDL_CFLAGS"
- CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
- LIBS="$LIBS $SDL_LIBS"
- AC_TRY_LINK([
-#include <stdio.h>
-#include "SDL.h"
-
-int main(int argc, char *argv[])
-{ return 0; }
-#undef main
-#define main K_and_R_C_main
-], [ return 0; ],
- [ echo "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding SDL or finding the wrong"
- echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
- echo "*** to the installed location Also, make sure you have run ldconfig if that"
- echo "*** is required on your system"
-	 echo "***"
- echo "*** If you have an old version installed, it is best to remove it, although"
- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
- [ echo "*** The test program failed to compile or link. See the file config.log for the"
- echo "*** exact error that occured. This usually means SDL was incorrectly installed"
- echo "*** or that you have moved SDL since it was installed. In the latter case, you"
- echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
- CFLAGS="$ac_save_CFLAGS"
- CXXFLAGS="$ac_save_CXXFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- SDL_CFLAGS=""
- SDL_LIBS=""
- ifelse([$3], , :, [$3])
- fi
- AC_SUBST(SDL_CFLAGS)
- AC_SUBST(SDL_LIBS)
- rm -f conf.sdltest
-])
-
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-# (This private macro should not be called outside this file.)
-AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.10'
-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.10.2], [],
- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-])
-
-# _AM_AUTOCONF_VERSION(VERSION)
-# -----------------------------
-# aclocal traces this macro to find the Autoconf version.
-# This is a private macro too. Using m4_define simplifies
-# the logic in aclocal, which can simply ignore this definition.
-m4_define([_AM_AUTOCONF_VERSION], [])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10.2])dnl
-m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-
-# Figure out how to run the assembler. -*- Autoconf -*-
-
-# Copyright (C) 2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 5
-
-# AM_PROG_AS
-# ----------
-AC_DEFUN([AM_PROG_AS],
-[# By default we simply use the C compiler to build assembly code.
-AC_REQUIRE([AC_PROG_CC])
-test "${CCAS+set}" = set || CCAS=$CC
-test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS
-AC_ARG_VAR([CCAS], [assembler compiler command (defaults to CC)])
-AC_ARG_VAR([CCASFLAGS], [assembler compiler flags (defaults to CFLAGS)])
-_AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl
-])
-
-# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory. The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run. This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-# fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-# fails if $ac_aux_dir is absolute,
-# fails when called from a subdirectory in a VPATH build with
-# a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir. In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
-# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*$.*$"`
-# and then we would define $MISSING as
-# MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH. The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# AM_CONDITIONAL -*- Autoconf -*-
-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])dnl
-AC_SUBST([$1_FALSE])dnl
-_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-if $2; then
- $1_TRUE=
- $1_FALSE='#'
-else
- $1_TRUE='#'
- $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
- AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 9
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery. Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
- [$1], CXX, [depcc="$CXX" am_compiler_list=],
- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
- [$1], UPC, [depcc="$UPC" am_compiler_list=],
- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
- [depcc="$$1" am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
- [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
- # We make a subdir and do the tests there. Otherwise we can end up
- # making bogus files that we don't know about and never remove. For
- # instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
- mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
- # using a relative directory.
- cp "$am_depcomp" conftest.dir
- cd conftest.dir
- # We will build objects and dependencies in a subdirectory because
- # it helps to detect inapplicable dependency modes. For instance
- # both Tru64's cc and ICC support -MD to output dependencies as a
- # side effect of compilation, but ICC will put the dependencies in
- # the current directory while Tru64 will put them in the object
- # directory.
- mkdir sub
-
- am_cv_$1_dependencies_compiler_type=none
- if test "$am_compiler_list" = ""; then
- am_compiler_list=`sed -n ['s/^#*$[a-zA-Z0-9]*$)$/\1/p'] < ./depcomp`
- fi
- for depmode in $am_compiler_list; do
- # Setup a source with many dependencies, because some compilers
- # like to wrap large dependency lists on column 80 (with \), and
- # we should not choose a depcomp mode which is confused by this.
- #
- # We need to recreate these files for each test, as the compiler may
- # overwrite some of them when testing with obscure command lines.
- # This happens at least with the AIX C compiler.
- : > sub/conftest.c
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
- case $depmode in
- nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
- if test "x$enable_dependency_tracking" = xyes; then
-	continue
- else
-	break
- fi
- ;;
- none) break ;;
- esac
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this.
- if depmode=$depmode \
- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
- >/dev/null 2>conftest.err &&
- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- # icc doesn't choke on unknown options, it will just issue warnings
- # or remarks (even with -Werror). So we grep stderr for any message
- # that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
- # icc: Command line warning: ignoring option '-M'; no argument required
- # The diagnosis changed in icc 8.0:
- # icc: Command line remark: option '-MP' not supported
- if (grep 'ignoring option' conftest.err ||
- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
- am_cv_$1_dependencies_compiler_type=$depmode
- break
- fi
- fi
- done
-
- cd ..
- rm -rf conftest.dir
-else
- am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
- test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[ --disable-dependency-tracking speeds up one-time build
- --enable-dependency-tracking do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" != xno; then
- am_depcomp="$ac_aux_dir/depcomp"
- AMDEPBACKSLASH='\'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-])
-
-# Generate code to set up dependency tracking. -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-#serial 4
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[# Autoconf 2.62 quotes --file arguments for eval, but not when files
-# are listed without --file. Let's play safe and only enable the eval
-# if we detect the quoting.
-case $CONFIG_FILES in
-*\'*) eval set x "$CONFIG_FILES" ;;
-*) set x $CONFIG_FILES ;;
-esac
-shift
-for mf
-do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote$.*(DEPDIR).*$$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`AS_DIRNAME(["$file"])`
- AS_MKDIR_P([$dirpart/$fdir])
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
-done
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled. FIXME. This creates each `.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
-# Do all the work for Automake. -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 13
-
-# This macro actually does too much. Some checks are only needed if
-# your package does certain things. But this isn't really a big deal.
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out. PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition. After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.60])dnl
-dnl Autoconf wants to disallow AM_ names. We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
- # is not polluted with repeated "-I."
- AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
- # test to see if srcdir already configured
- if test -f $srcdir/config.status; then
- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
- fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
- if (cygpath --version) >/dev/null 2>/dev/null; then
- CYGPATH_W='cygpath -w'
- else
- CYGPATH_W=echo
- fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
- [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-	 		 [_AM_PROG_TAR([v7])])])
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
- [_AM_DEPENDENCIES(CC)],
- [define([AC_PROG_CC],
- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
- [_AM_DEPENDENCIES(CXX)],
- [define([AC_PROG_CXX],
- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
- [_AM_DEPENDENCIES(OBJC)],
- [define([AC_PROG_OBJC],
- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
-])
-])
-
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated. The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_arg=$1
-_am_stamp_count=1
-for _am_header in $config_headers :; do
- case $_am_header in
- $_am_arg | $_am_arg:* )
- break ;;
- * )
- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
- esac
-done
-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
-AC_SUBST(install_sh)])
-
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot. For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
- am__leading_dot=.
-else
- am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
-# From Jim Meyering
-
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-AC_DEFUN([AM_MAINTAINER_MODE],
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
- dnl maintainer-mode is disabled by default
- AC_ARG_ENABLE(maintainer-mode,
-[ --enable-maintainer-mode enable make rules and dependencies not useful
-			 (and sometimes confusing) to the casual installer],
- USE_MAINTAINER_MODE=$enableval,
- USE_MAINTAINER_MODE=no)
- AC_MSG_RESULT([$USE_MAINTAINER_MODE])
- AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
- MAINT=$MAINTAINER_MODE_TRUE
- AC_SUBST(MAINT)dnl
-]
-)
-
-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-
-# Check to see how 'make' treats includes.	 -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
- am__include=include
- am__quote=
- _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
- am__include=.include
- am__quote="\""
- _am_result=BSD
- fi
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-
-# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 5
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([missing])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
- am_missing_run="$MISSING --run "
-else
- am_missing_run=
- AC_MSG_WARN([`missing' script is too old or missing])
-fi
-])
-
-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check for `mkdir -p'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
- [[\\/$]]* | ?:[[\\/]]*) ;;
- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
-
-# Helper functions for option handling. -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# ------------------------------
-# Set option NAME. Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-# Check to make sure that the build environment is sane. -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments. Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
- if test "$[*]" = "X"; then
- # -L didn't work.
- set X `ls -t $srcdir/configure conftest.file`
- fi
- rm -f conftest.file
- if test "$[*]" != "X $srcdir/configure conftest.file" \
- && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
-alias in your environment])
- fi
-
- test "$[2]" = conftest.file
- )
-then
- # Ok.
- :
-else
- AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_STRIP
-# ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries. This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'. However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
- AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-# Copyright (C) 2006 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
-# This macro is traced by Automake.
-AC_DEFUN([_AM_SUBST_NOTMAKE])
-
-# Check how to create a tarball. -*- Autoconf -*-
-
-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
-#
-# Substitute a variable $(am__tar) that is a command
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-# tardir=directory && $(am__tar) > result.tar
-#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-# $(am__untar) < result.tar
-AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
-m4_if([$1], [v7],
- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
- [m4_case([$1], [ustar],, [pax],,
- [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
- case $_am_tool in
- gnutar)
- for _am_tar in tar gnutar gtar;
- do
- AM_RUN_LOG([$_am_tar --version]) && break
- done
- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
- am__untar="$_am_tar -xf -"
- ;;
- plaintar)
- # Must skip GNU tar: if it does not support --format= it doesn't create
- # ustar tarball either.
- (tar --version) >/dev/null 2>&1 && continue
- am__tar='tar chf - "$$tardir"'
- am__tar_='tar chf - "$tardir"'
- am__untar='tar xf -'
- ;;
- pax)
- am__tar='pax -L -x $1 -w "$$tardir"'
- am__tar_='pax -L -x $1 -w "$tardir"'
- am__untar='pax -r'
- ;;
- cpio)
- am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
- am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
- am__untar='cpio -i -H $1 -d'
- ;;
- none)
- am__tar=false
- am__tar_=false
- am__untar=false
- ;;
- esac
-
- # If the value was cached, stop now. We just wanted to have am__tar
- # and am__untar set.
- test -n "${am_cv_prog_tar_$1}" && break
-
- # tar/untar a dummy directory, and stop if the command works
- rm -rf conftest.dir
- mkdir conftest.dir
- echo GrepMe > conftest.dir/file
- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
- rm -rf conftest.dir
- if test -s conftest.tar; then
- AM_RUN_LOG([$am__untar <conftest.tar])
- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
- fi
-done
-rm -rf conftest.dir
-
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
-

pcsxr-1.9.92.tar.bz2/compile Deleted

@@ -1,142 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
-
-scriptversion=2005-05-14.22
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-# Written by Tom Tromey <tromey@cygnus.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-case $1 in
- '')
- echo "$0: No command. Try \`$0 --help' for more information." 1>&2
- exit 1;
- ;;
- -h | --h*)
- cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand `-c -o'.
-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
- exit $?
- ;;
- -v | --v*)
- echo "compile $scriptversion"
- exit $?
- ;;
-esac
-
-ofile=
-cfile=
-eat=
-
-for arg
-do
- if test -n "$eat"; then
- eat=
- else
- case $1 in
- -o)
-	# configure might choose to run compile as `compile cc -o foo foo.c'.
-	# So we strip `-o arg' only if arg is an object.
-	eat=1
-	case $2 in
-	 *.o | *.obj)
-	 ofile=$2
-	 ;;
-	 *)
-	 set x "$@" -o "$2"
-	 shift
-	 ;;
-	esac
-	;;
- *.c)
-	cfile=$1
-	set x "$@" "$1"
-	shift
-	;;
- *)
-	set x "$@" "$1"
-	shift
-	;;
- esac
- fi
- shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
- # If no `-o' option was seen then we might have been invoked from a
- # pattern rule where we don't need one. That is ok -- this is a
- # normal compilation that the losing compiler can handle. If no
- # `.c' file was seen then we are probably linking. That is also
- # ok.
- exec "$@"
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use `[/.-]' here to ensure that we don't use the same name
-# that we are using for the .o file. Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
-while true; do
- if mkdir "$lockdir" >/dev/null 2>&1; then
- break
- fi
- sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir '$lockdir'; exit 1" 1 2 15
-
-# Run the compile.
-"$@"
-ret=$?
-
-if test -f "$cofile"; then
- mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
- mv "${cofile}bj" "$ofile"
-fi
-
-rmdir "$lockdir"
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:

pcsxr-1.9.92.tar.bz2/config.guess Deleted

@@ -1,1526 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-# Free Software Foundation, Inc.
-
-timestamp='2008-01-23'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>. Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub. If it succeeds, it prints the system name on stdout, and
-# exits with 0. Otherwise, it exits with 1.
-#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
- -h, --help print this help, then exit
- -t, --time-stamp print date of last modification, then exit
- -v, --version print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions. There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
- case $1 in
- --time-stamp | --time* | -t )
- echo "$timestamp" ; exit ;;
- --version | -v )
- echo "$version" ; exit ;;
- --help | --h* | -h )
- echo "$usage"; exit ;;
- -- ) # Stop option processing
- shift; break ;;
- - )	# Use stdin as input.
- break ;;
- -* )
- echo "$me: invalid option $1$help" >&2
- exit 1 ;;
- * )
- break ;;
- esac
-done
-
-if test $# != 0; then
- echo "$me: too many arguments$help" >&2
- exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,) echo "int x;" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	 if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-	 CC_FOR_BUILD="$c"; break ;
-	 fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	 CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*) CC_FOR_BUILD=$CC ;;
- ,*,*) CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format. This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name. We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	 /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	 armeb) machine=armeb-unknown ;;
-	 arm*) machine=arm-unknown ;;
-	 sh3el) machine=shl-unknown ;;
-	 sh3eb) machine=sh-unknown ;;
-	 sh5el) machine=sh5le-unknown ;;
-	 *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
-	 arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
-		then
-		 # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		 # Return netbsd for either. FIX?
-		 os=netbsd
-		else
-		 os=netbsdelf
-		fi
-		;;
-	 *)
-	 os=netbsd
-		;;
-	esac
-	# The OS release
-	# Debian GNU/NetBSD machines have a different userland, and
-	# thus, need a distinct triplet. However, they do not need
-	# kernel version information, so it can be replaced with a
-	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
-	 Debian*)
-		release='-gnu'
-		;;
-	 *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-		;;
-	esac
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
-	exit ;;
- *:OpenBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-	exit ;;
- *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit ;;
- *:SolidBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-	exit ;;
- macppc:MirBSD:*:*)
-	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
- *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
- alpha:OSF1:*:*)
-	case $UNAME_RELEASE in
-	*4.0)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-		;;
-	*5.*)
-	 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-		;;
-	esac
-	# According to Compaq, /usr/sbin/psrinfo has been available on
-	# OSF/1 and Tru64 systems produced since 1995. I hope that
-	# covers most systems running today. This code pipes the CPU
-	# types through head -n 1, so we only detect the type of CPU 0.
-	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha $.*$ processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
-	 "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	 "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	 "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
-	 "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
-	 "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
-	 "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
-	 "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
-	 "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
-	 "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
-	 "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
-	 "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
-	 "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
-	 "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
-	 "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
-	 "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
-	esac
-	# A Pn.n version is a patched version.
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
- Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit ;;
- 21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit ;;
- Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit ;;
- *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit ;;
- *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit ;;
- *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit ;;
- *:z/VM:*:*)
-	echo s390-ibm-zvmoe
-	exit ;;
- *:OS400:*:*)
- echo powerpc-ibm-os400
-	exit ;;
- arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit ;;
- arm:riscos:*:*|arm:RISCOS:*:*)
-	echo arm-unknown-riscos
-	exit ;;
- SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit ;;
- Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit ;;
- NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit ;;
- DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit ;;
- DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-	case `/usr/bin/uname -p` in
-	 sparc) echo sparc-icl-nx7; exit ;;
-	esac ;;
- sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
- sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
- i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
- sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6. Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
- sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	 Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit ;;
- sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit ;;
- sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	 sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	 sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit ;;
- aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit ;;
- # The situation for MiNT is a little confusing. The machine name
- # can be virtually everything (everything which is not
- # "atarist" or "atariste" at least should have a processor
- # > m68000). The system name ranges from "MiNT" over "FreeMiNT"
- # to the lowercase version "mint" (or "freemint"). Finally
- # the system name "TOS" denotes a system which is actually not
- # MiNT. But MiNT is downward compatible to TOS, so this should
- # be no problem.
- atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
- atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
- exit ;;
- *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
- milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
- echo m68k-milan-mint${UNAME_RELEASE}
- exit ;;
- hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
- echo m68k-hades-mint${UNAME_RELEASE}
- exit ;;
- *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
- echo m68k-unknown-mint${UNAME_RELEASE}
- exit ;;
- m68k:machten:*:*)
-	echo m68k-apple-machten${UNAME_RELEASE}
-	exit ;;
- powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit ;;
- RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit ;;
- RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit ;;
- VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit ;;
- 2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit ;;
- mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h> /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	 printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	 printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	 printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	 exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c &&
-	 dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/$[0-9]*$.*/\1/p'` &&
-	 SYSTEM_NAME=`$dummy $dummyarg` &&
-	 { echo "$SYSTEM_NAME"; exit; }
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit ;;
- Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit ;;
- Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit ;;
- Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit ;;
- Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit ;;
- m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit ;;
- m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit ;;
- m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit ;;
- AViiON:dgux:*:*)
- # DG/UX returns AViiON for all architectures
- UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	then
-	 if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	 [ ${TARGET_BINARY_INTERFACE}x = x ]
-	 then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	 else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	 fi
-	else
-	 echo i586-dg-dgux${UNAME_RELEASE}
-	fi
- 	exit ;;
- M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit ;;
- M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit ;;
- XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit ;;
- Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit ;;
- *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit ;;
- ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
-	exit ;; # Note that: echo "'`uname -s`'" gives 'AIX '
- i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit ;;
- ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit ;;
- *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-		then
-			echo "$SYSTEM_NAME"
-		else
-			echo rs6000-ibm-aix3.2.5
-		fi
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit ;;
- *:AIX:*:[456])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit ;;
- *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit ;;
- ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit ;;
- ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
-	exit ;; # report: romp-ibm BSD 4.3
- *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit ;;
- DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit ;;
- 9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit ;;
- hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit ;;
- 9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	 9000/31? ) HP_ARCH=m68000 ;;
-	 9000/[34]?? ) HP_ARCH=m68k ;;
-	 9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
-		 sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
- case "${sc_cpu_version}" in
- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
- 532) # CPU_PA_RISC2_0
- case "${sc_kernel_bits}" in
- 32) HP_ARCH="hppa2.0n" ;;
- 64) HP_ARCH="hppa2.0w" ;;
-			 '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
- esac ;;
- esac
-		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		 eval $set_cc_for_build
-		 sed 's/^ //' << EOF >$dummy.c
-
- #define _HPUX_SOURCE
- #include <stdlib.h>
- #include <unistd.h>
-
- int main ()
- {
- #if defined(_SC_KERNEL_BITS)
- long bits = sysconf(_SC_KERNEL_BITS);
- #endif
- long cpu = sysconf (_SC_CPU_VERSION);
-
- switch (cpu)
- 	{
- 	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
- 	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
- 	case CPU_PA_RISC2_0:
- #if defined(_SC_KERNEL_BITS)
- 	 switch (bits)
- 		{
- 		case 64: puts ("hppa2.0w"); break;
- 		case 32: puts ("hppa2.0n"); break;
- 		default: puts ("hppa2.0"); break;
- 		} break;
- #else /* !defined(_SC_KERNEL_BITS) */
- 	 puts ("hppa2.0"); break;
- #endif
- 	default: puts ("hppa1.0"); break;
- 	}
- exit (0);
- }
-EOF
-		 (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		 test -z "$HP_ARCH" && HP_ARCH=hppa
-		fi ;;
-	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
-	then
-	 eval $set_cc_for_build
-
-	 # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-	 # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
-	 # generating 64-bit code. GNU and HP use different nomenclature:
-	 #
-	 # $ CC_FOR_BUILD=cc ./config.guess
-	 # => hppa2.0w-hp-hpux11.23
-	 # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-	 # => hppa64-hp-hpux11.23
-
-	 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
-	 then
-		HP_ARCH="hppa2.0w"
-	 else
-		HP_ARCH="hppa64"
-	 fi
-	fi
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit ;;
- ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit ;;
- 3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	 long cpu = sysconf (_SC_CPU_VERSION);
-	 /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	 true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct
-	 results, however. */
-	 if (CPU_IS_PA_RISC (cpu))
-	 {
-	 switch (cpu)
-		{
-		 case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		 case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		 case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		 default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	 }
-	 else if (CPU_IS_HP_MC68K (cpu))
-	 puts ("m68k-hitachi-hiuxwe2");
-	 else puts ("unknown-hitachi-hiuxwe2");
-	 exit (0);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-		{ echo "$SYSTEM_NAME"; exit; }
-	echo unknown-hitachi-hiuxwe2
-	exit ;;
- 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit ;;
- 9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit ;;
- *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit ;;
- hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit ;;
- hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit ;;
- i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	 echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	 echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit ;;
- parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit ;;
- C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
- exit ;;
- C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
- exit ;;
- C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
- exit ;;
- C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
- exit ;;
- C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
- exit ;;
- CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
- CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*$[A-Z]90$/\1/' \
-	 -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	 -e 's/\.[^.]*$/.X/'
-	exit ;;
- CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
- CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
- CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
- *:UNICOS/mp:*:*)
-	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
- F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit ;;
- 5000:UNIX_System_V:4.*:*)
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
- i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit ;;
- sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
- *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
- *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
-	 pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	 amd64)
-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	 *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	esac
-	exit ;;
- i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit ;;
- *:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit ;;
- i*:windows32*:*)
- 	# uname -m includes "-pc" on this system.
- 	echo ${UNAME_MACHINE}-mingw32
-	exit ;;
- i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit ;;
- *:Interix*:[3456]*)
- 	case ${UNAME_MACHINE} in
-	 x86)
-		echo i586-pc-interix${UNAME_RELEASE}
-		exit ;;
-	 EM64T | authenticamd)
-		echo x86_64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	 IA64)
-		echo ia64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	esac ;;
- [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
-	exit ;;
- i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i586-pc-interix
-	exit ;;
- i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit ;;
- amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	echo x86_64-unknown-cygwin
-	exit ;;
- p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit ;;
- prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
- *:GNU:*:*)
-	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit ;;
- *:GNU/*:*:*)
-	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit ;;
- i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit ;;
- arm*:Linux:*:*)
-	eval $set_cc_for_build
-	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-	 | grep -q __ARM_EABI__
-	then
-	 echo ${UNAME_MACHINE}-unknown-linux-gnu
-	else
-	 echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-	fi
-	exit ;;
- avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
- cris:Linux:*:*)
-	echo cris-axis-linux-gnu
-	exit ;;
- crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
-	exit ;;
- frv:Linux:*:*)
- 	echo frv-unknown-linux-gnu
-	exit ;;
- ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
- m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
- m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
- mips:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	 /^CPU/{
-		s: ::g
-		p
-	 }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
- mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips64
-	#undef mips64el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	 /^CPU/{
-		s: ::g
-		p
-	 }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
- or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
-	exit ;;
- ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit ;;
- ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit ;;
- alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in
-	 EV5) UNAME_MACHINE=alphaev5 ;;
-	 EV56) UNAME_MACHINE=alphaev56 ;;
-	 PCA56) UNAME_MACHINE=alphapca56 ;;
-	 PCA57) UNAME_MACHINE=alphapca56 ;;
-	 EV6) UNAME_MACHINE=alphaev6 ;;
-	 EV67) UNAME_MACHINE=alphaev67 ;;
-	 EV68*) UNAME_MACHINE=alphaev68 ;;
- esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit ;;
- parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	 PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	 PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	 *) echo hppa-unknown-linux-gnu ;;
-	esac
-	exit ;;
- parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit ;;
- s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
-	exit ;;
- sh64*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
- sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
- sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
- vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
-	exit ;;
- x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
-	exit ;;
- xtensa*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
- i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				 s/[ 	][ 	]*/ /g
-				 s/.*supported targets: *//
-				 s/ .*//
-				 p'`
- case "$ld_supported_targets" in
-	 elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	 a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit ;;
-	 coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit ;;
-	 "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	# if __GLIBC__ >= 2
-	LIBC=gnu
-	# else
-	LIBC=gnulibc1
-	# endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	 /^LIBC/{
-		s: ::g
-		p
-	 }'`"
-	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-		exit
-	}
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-	;;
- i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit ;;
- i*86:UNIX_SV:4.2MP:2.*)
- # Unixware is an offshoot of SVR4, but it has its own version
- # number series starting with 2...
- # I am not positive that other SVR4 systems won't match this,
-	# I just have to hope. -- rms.
- # Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit ;;
- i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit ;;
- i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit ;;
- i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit ;;
- i*86:syllable:*:*)
-	echo ${UNAME_MACHINE}-pc-syllable
-	exit ;;
- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
- i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit ;;
- i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit ;;
- i*86:*:5:[678]*)
- 	# UnixWare 7.x, OpenUNIX and OpenServer 6.
-	case `/bin/uname -X | grep "^Machine"` in
-	 *486*)	 UNAME_MACHINE=i486 ;;
-	 *Pentium)	 UNAME_MACHINE=i586 ;;
-	 *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit ;;
- i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit ;;
- pc:*:*:*)
-	# Left here for compatibility:
- # uname -m prints for DJGPP always 'pc', but it prints nothing about
- # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
- exit ;;
- Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit ;;
- paragon:*:*:*)
-	echo i860-intel-osf1
-	exit ;;
- i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	 echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	 echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
-	fi
-	exit ;;
- mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit ;;
- mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit ;;
- M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit ;;
- M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
- 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	 && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	 && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
- 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && { echo i486-ncr-sysv4; exit; } ;;
- m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
- mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit ;;
- TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
- rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
- SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit ;;
- RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
- RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
- *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit ;;
- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
- # says <Richard.M.Bartel@ccMail.Census.GOV>
- echo i586-unisys-sysv4
- exit ;;
- *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit ;;
- *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit ;;
- i*86:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo ${UNAME_MACHINE}-stratus-vos
-	exit ;;
- *:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit ;;
- mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit ;;
- news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit ;;
- R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-	 echo mips-nec-sysv${UNAME_RELEASE}
-	else
-	 echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
- exit ;;
- BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit ;;
- BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit ;;
- BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit ;;
- SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit ;;
- SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit ;;
- SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
-	exit ;;
- SX-7:SUPER-UX:*:*)
-	echo sx7-nec-superux${UNAME_RELEASE}
-	exit ;;
- SX-8:SUPER-UX:*:*)
-	echo sx8-nec-superux${UNAME_RELEASE}
-	exit ;;
- SX-8R:SUPER-UX:*:*)
-	echo sx8r-nec-superux${UNAME_RELEASE}
-	exit ;;
- Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
- *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
- *:Darwin:*:*)
-	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	 unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit ;;
- *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
-		UNAME_PROCESSOR=i386
-		UNAME_MACHINE=pc
-	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit ;;
- *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit ;;
- NSE-?:NONSTOP_KERNEL:*:*)
-	echo nse-tandem-nsk${UNAME_RELEASE}
-	exit ;;
- NSR-?:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit ;;
- *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit ;;
- BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit ;;
- DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit ;;
- *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = "386"; then
-	 UNAME_MACHINE=i386
-	else
-	 UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit ;;
- *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit ;;
- *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit ;;
- KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit ;;
- XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit ;;
- *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit ;;
- *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit ;;
- SEI:*:*:SEIUX)
- echo mips-sei-seiux${UNAME_RELEASE}
-	exit ;;
- *:DragonFly:*:*)
-	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit ;;
- *:*VMS:*:*)
- 	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-	case "${UNAME_MACHINE}" in
-	 A*) echo alpha-dec-vms ; exit ;;
-	 I*) echo ia64-dec-vms ; exit ;;
-	 V*) echo vax-dec-vms ; exit ;;
-	esac ;;
- *:XENIX:*:SysV)
-	echo i386-pc-xenix
-	exit ;;
- i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-	exit ;;
- i*86:rdos:*:*)
-	echo ${UNAME_MACHINE}-pc-rdos
-	exit ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
- /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
- I don't know.... */
- printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
- printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
- "4"
-#else
-	 ""
-#endif
- ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
- printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
- printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
- int version;
- version=`(hostinfo | sed -n 's/.*NeXT Mach $[0-9]*$.*/\1/p') 2>/dev/null`;
- if (version < 4)
- printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
- else
- printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
- exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
- printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
- printf ("ns32k-encore-mach\n"); exit (0);
-#else
- printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
- printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
- printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
- printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
- struct utsname un;
-
- uname(&un);
-
- if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
- }
- if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
- }
- printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-# include <sys/param.h>
-# if defined (BSD)
-# if BSD == 43
- printf ("vax-dec-bsd4.3\n"); exit (0);
-# else
-# if BSD == 199006
- printf ("vax-dec-bsd4.3reno\n"); exit (0);
-# else
- printf ("vax-dec-bsd\n"); exit (0);
-# endif
-# endif
-# else
- printf ("vax-dec-bsd\n"); exit (0);
-# endif
-# else
- printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
- printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
- exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-	{ echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
- case `getsysinfo -f cpu_type` in
- c1*)
-	echo c1-convex-bsd
-	exit ;;
- c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
- c34*)
-	echo c34-convex-bsd
-	exit ;;
- c38*)
-	echo c38-convex-bsd
-	exit ;;
- c4*)
-	echo c4-convex-bsd
-	exit ;;
- esac
-fi
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
- http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-and
- http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo = `(hostinfo) 2>/dev/null`
-/bin/universe = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:

pcsxr-1.9.92.tar.bz2/config.rpath Deleted

@@ -1,666 +0,0 @@
-#! /bin/sh
-# Output a system dependent set of variables, describing how to set the
-# run time search path of shared libraries in an executable.
-#
-# Copyright 1996-2007 Free Software Foundation, Inc.
-# Taken from GNU libtool, 2001
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-#
-# The first argument passed to this file is the canonical host specification,
-# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or
-# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld
-# should be set by the caller.
-#
-# The set of defined variables is at the end of this script.
-
-# Known limitations:
-# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer
-# than 256 bytes, otherwise the compiler driver will dump core. The only
-# known workaround is to choose shorter directory names for the build
-# directory and/or the installation directory.
-
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-shrext=.so
-
-host="$1"
-host_cpu=`echo "$host" | sed 's/^$[^-]*$-$[^-]*$-$.*$$/\1/'`
-host_vendor=`echo "$host" | sed 's/^$[^-]*$-$[^-]*$-$.*$$/\2/'`
-host_os=`echo "$host" | sed 's/^$[^-]*$-$[^-]*$-$.*$$/\3/'`
-
-# Code taken from libtool.m4's _LT_CC_BASENAME.
-
-for cc_temp in $CC""; do
- case $cc_temp in
- compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
- distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
- \-*) ;;
- *) break;;
- esac
-done
-cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
-
-# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
-
-wl=
-if test "$GCC" = yes; then
- wl='-Wl,'
-else
- case "$host_os" in
- aix*)
- wl='-Wl,'
- ;;
- darwin*)
- case $cc_basename in
- xlc*)
- wl='-Wl,'
- ;;
- esac
- ;;
- mingw* | cygwin* | pw32* | os2*)
- ;;
- hpux9* | hpux10* | hpux11*)
- wl='-Wl,'
- ;;
- irix5* | irix6* | nonstopux*)
- wl='-Wl,'
- ;;
- newsos6)
- ;;
- linux* | k*bsd*-gnu)
- case $cc_basename in
- icc* | ecc*)
- wl='-Wl,'
- ;;
- pgcc | pgf77 | pgf90)
- wl='-Wl,'
- ;;
- ccc*)
- wl='-Wl,'
- ;;
- como)
- wl='-lopt='
- ;;
- *)
- case `$CC -V 2>&1 | sed 5q` in
- *Sun\ C*)
- wl='-Wl,'
- ;;
- esac
- ;;
- esac
- ;;
- osf3* | osf4* | osf5*)
- wl='-Wl,'
- ;;
- rdos*)
- ;;
- solaris*)
- wl='-Wl,'
- ;;
- sunos4*)
- wl='-Qoption ld '
- ;;
- sysv4 | sysv4.2uw2* | sysv4.3*)
- wl='-Wl,'
- ;;
- sysv4*MP*)
- ;;
- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
- wl='-Wl,'
- ;;
- unicos*)
- wl='-Wl,'
- ;;
- uts4*)
- ;;
- esac
-fi
-
-# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS.
-
-hardcode_libdir_flag_spec=
-hardcode_libdir_separator=
-hardcode_direct=no
-hardcode_minus_L=no
-
-case "$host_os" in
- cygwin* | mingw* | pw32*)
- # FIXME: the MSVC++ port hasn't been tested in a loooong time
- # When not using gcc, we currently assume that we are using
- # Microsoft Visual C++.
- if test "$GCC" != yes; then
- with_gnu_ld=no
- fi
- ;;
- interix*)
- # we just hope/assume this is gcc and not c89 (= MSVC++)
- with_gnu_ld=yes
- ;;
- openbsd*)
- with_gnu_ld=no
- ;;
-esac
-
-ld_shlibs=yes
-if test "$with_gnu_ld" = yes; then
- # Set some defaults for GNU ld with shared library support. These
- # are reset later if shared libraries are not supported. Putting them
- # here allows them to be overridden if necessary.
- # Unlike libtool, we use -rpath here, not --rpath, since the documented
- # option of GNU ld is called -rpath, not --rpath.
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
- case "$host_os" in
- aix3* | aix4* | aix5*)
- # On AIX/PPC, the GNU linker is very broken
- if test "$host_cpu" != ia64; then
- ld_shlibs=no
- fi
- ;;
- amigaos*)
- hardcode_libdir_flag_spec='-L$libdir'
- hardcode_minus_L=yes
- # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
- # that the semantics of dynamic libraries on AmigaOS, at least up
- # to version 4, is to share data among multiple programs linked
- # with the same dynamic library. Since this doesn't match the
- # behavior of shared libraries on other platforms, we cannot use
- # them.
- ld_shlibs=no
- ;;
- beos*)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- :
- else
- ld_shlibs=no
- fi
- ;;
- cygwin* | mingw* | pw32*)
- # hardcode_libdir_flag_spec is actually meaningless, as there is
- # no search path for DLLs.
- hardcode_libdir_flag_spec='-L$libdir'
- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- :
- else
- ld_shlibs=no
- fi
- ;;
- interix[3-9]*)
- hardcode_direct=no
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
- ;;
- gnu* | linux* | k*bsd*-gnu)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- :
- else
- ld_shlibs=no
- fi
- ;;
- netbsd*)
- ;;
- solaris*)
- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
- ld_shlibs=no
- elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- :
- else
- ld_shlibs=no
- fi
- ;;
- sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
- case `$LD -v 2>&1` in
- *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
- ld_shlibs=no
- ;;
- *)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
- else
- ld_shlibs=no
- fi
- ;;
- esac
- ;;
- sunos4*)
- hardcode_direct=yes
- ;;
- *)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- :
- else
- ld_shlibs=no
- fi
- ;;
- esac
- if test "$ld_shlibs" = no; then
- hardcode_libdir_flag_spec=
- fi
-else
- case "$host_os" in
- aix3*)
- # Note: this linker hardcodes the directories in LIBPATH if there
- # are no directories specified by -L.
- hardcode_minus_L=yes
- if test "$GCC" = yes; then
- # Neither direct hardcoding nor static linking is supported with a
- # broken collect2.
- hardcode_direct=unsupported
- fi
- ;;
- aix4* | aix5*)
- if test "$host_cpu" = ia64; then
- # On IA64, the linker does run time linking by default, so we don't
- # have to do anything special.
- aix_use_runtimelinking=no
- else
- aix_use_runtimelinking=no
- # Test if we are trying to use run time linking or normal
- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
- for ld_flag in $LDFLAGS; do
- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
- aix_use_runtimelinking=yes
- break
- fi
- done
- ;;
- esac
- fi
- hardcode_direct=yes
- hardcode_libdir_separator=':'
- if test "$GCC" = yes; then
- case $host_os in aix4.[012]|aix4.[012].*)
- collect2name=`${CC} -print-prog-name=collect2`
- if test -f "$collect2name" && \
- strings "$collect2name" | grep resolve_lib_name >/dev/null
- then
- # We have reworked collect2
- :
- else
- # We have old collect2
- hardcode_direct=unsupported
- hardcode_minus_L=yes
- hardcode_libdir_flag_spec='-L$libdir'
- hardcode_libdir_separator=
- fi
- ;;
- esac
- fi
- # Begin _LT_AC_SYS_LIBPATH_AIX.
- echo 'int main () { return 0; }' > conftest.c
- ${CC} ${LDFLAGS} conftest.c -o conftest
- aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }
-}'`
- if test -z "$aix_libpath"; then
- aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }
-}'`
- fi
- if test -z "$aix_libpath"; then
- aix_libpath="/usr/lib:/lib"
- fi
- rm -f conftest.c conftest
- # End _LT_AC_SYS_LIBPATH_AIX.
- if test "$aix_use_runtimelinking" = yes; then
- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
- else
- if test "$host_cpu" = ia64; then
- hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
- else
- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
- fi
- fi
- ;;
- amigaos*)
- hardcode_libdir_flag_spec='-L$libdir'
- hardcode_minus_L=yes
- # see comment about different semantics on the GNU ld section
- ld_shlibs=no
- ;;
- bsdi[45]*)
- ;;
- cygwin* | mingw* | pw32*)
- # When not using gcc, we currently assume that we are using
- # Microsoft Visual C++.
- # hardcode_libdir_flag_spec is actually meaningless, as there is
- # no search path for DLLs.
- hardcode_libdir_flag_spec=' '
- libext=lib
- ;;
- darwin* | rhapsody*)
- hardcode_direct=no
- if test "$GCC" = yes ; then
- :
- else
- case $cc_basename in
- xlc*)
- ;;
- *)
- ld_shlibs=no
- ;;
- esac
- fi
- ;;
- dgux*)
- hardcode_libdir_flag_spec='-L$libdir'
- ;;
- freebsd1*)
- ld_shlibs=no
- ;;
- freebsd2.2*)
- hardcode_libdir_flag_spec='-R$libdir'
- hardcode_direct=yes
- ;;
- freebsd2*)
- hardcode_direct=yes
- hardcode_minus_L=yes
- ;;
- freebsd* | dragonfly*)
- hardcode_libdir_flag_spec='-R$libdir'
- hardcode_direct=yes
- ;;
- hpux9*)
- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator=:
- hardcode_direct=yes
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- hardcode_minus_L=yes
- ;;
- hpux10*)
- if test "$with_gnu_ld" = no; then
- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator=:
- hardcode_direct=yes
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- hardcode_minus_L=yes
- fi
- ;;
- hpux11*)
- if test "$with_gnu_ld" = no; then
- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator=:
- case $host_cpu in
- hppa*64*|ia64*)
- hardcode_direct=no
- ;;
- *)
- hardcode_direct=yes
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- hardcode_minus_L=yes
- ;;
- esac
- fi
- ;;
- irix5* | irix6* | nonstopux*)
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
- hardcode_libdir_separator=:
- ;;
- netbsd*)
- hardcode_libdir_flag_spec='-R$libdir'
- hardcode_direct=yes
- ;;
- newsos6)
- hardcode_direct=yes
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
- hardcode_libdir_separator=:
- ;;
- openbsd*)
- if test -f /usr/libexec/ld.so; then
- hardcode_direct=yes
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
- else
- case "$host_os" in
- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
- hardcode_libdir_flag_spec='-R$libdir'
- ;;
- *)
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
- ;;
- esac
- fi
- else
- ld_shlibs=no
- fi
- ;;
- os2*)
- hardcode_libdir_flag_spec='-L$libdir'
- hardcode_minus_L=yes
- ;;
- osf3*)
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
- hardcode_libdir_separator=:
- ;;
- osf4* | osf5*)
- if test "$GCC" = yes; then
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
- else
- # Both cc and cxx compiler support -rpath directly
- hardcode_libdir_flag_spec='-rpath $libdir'
- fi
- hardcode_libdir_separator=:
- ;;
- solaris*)
- hardcode_libdir_flag_spec='-R$libdir'
- ;;
- sunos4*)
- hardcode_libdir_flag_spec='-L$libdir'
- hardcode_direct=yes
- hardcode_minus_L=yes
- ;;
- sysv4)
- case $host_vendor in
- sni)
- hardcode_direct=yes # is this really true???
- ;;
- siemens)
- hardcode_direct=no
- ;;
- motorola)
- hardcode_direct=no #Motorola manual says yes, but my tests say they lie
- ;;
- esac
- ;;
- sysv4.3*)
- ;;
- sysv4*MP*)
- if test -d /usr/nec; then
- ld_shlibs=yes
- fi
- ;;
- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
- ;;
- sysv5* | sco3.2v5* | sco5v6*)
- hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
- hardcode_libdir_separator=':'
- ;;
- uts4*)
- hardcode_libdir_flag_spec='-L$libdir'
- ;;
- *)
- ld_shlibs=no
- ;;
- esac
-fi
-
-# Check dynamic linker characteristics
-# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER.
-# Unlike libtool.m4, here we don't care about _all_ names of the library, but
-# only about the one the linker finds when passed -lNAME. This is the last
-# element of library_names_spec in libtool.m4, or possibly two of them if the
-# linker has special search rules.
-library_names_spec= # the last element of library_names_spec in libtool.m4
-libname_spec='lib$name'
-case "$host_os" in
- aix3*)
- library_names_spec='$libname.a'
- ;;
- aix4* | aix5*)
- library_names_spec='$libname$shrext'
- ;;
- amigaos*)
- library_names_spec='$libname.a'
- ;;
- beos*)
- library_names_spec='$libname$shrext'
- ;;
- bsdi[45]*)
- library_names_spec='$libname$shrext'
- ;;
- cygwin* | mingw* | pw32*)
- shrext=.dll
- library_names_spec='$libname.dll.a $libname.lib'
- ;;
- darwin* | rhapsody*)
- shrext=.dylib
- library_names_spec='$libname$shrext'
- ;;
- dgux*)
- library_names_spec='$libname$shrext'
- ;;
- freebsd1*)
- ;;
- freebsd* | dragonfly*)
- case "$host_os" in
- freebsd[123]*)
- library_names_spec='$libname$shrext$versuffix' ;;
- *)
- library_names_spec='$libname$shrext' ;;
- esac
- ;;
- gnu*)
- library_names_spec='$libname$shrext'
- ;;
- hpux9* | hpux10* | hpux11*)
- case $host_cpu in
- ia64*)
- shrext=.so
- ;;
- hppa*64*)
- shrext=.sl
- ;;
- *)
- shrext=.sl
- ;;
- esac
- library_names_spec='$libname$shrext'
- ;;
- interix[3-9]*)
- library_names_spec='$libname$shrext'
- ;;
- irix5* | irix6* | nonstopux*)
- library_names_spec='$libname$shrext'
- case "$host_os" in
- irix5* | nonstopux*)
- libsuff= shlibsuff=
- ;;
- *)
- case $LD in
- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;;
- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;;
- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;;
- *) libsuff= shlibsuff= ;;
- esac
- ;;
- esac
- ;;
- linux*oldld* | linux*aout* | linux*coff*)
- ;;
- linux* | k*bsd*-gnu)
- library_names_spec='$libname$shrext'
- ;;
- knetbsd*-gnu)
- library_names_spec='$libname$shrext'
- ;;
- netbsd*)
- library_names_spec='$libname$shrext'
- ;;
- newsos6)
- library_names_spec='$libname$shrext'
- ;;
- nto-qnx*)
- library_names_spec='$libname$shrext'
- ;;
- openbsd*)
- library_names_spec='$libname$shrext$versuffix'
- ;;
- os2*)
- libname_spec='$name'
- shrext=.dll
- library_names_spec='$libname.a'
- ;;
- osf3* | osf4* | osf5*)
- library_names_spec='$libname$shrext'
- ;;
- rdos*)
- ;;
- solaris*)
- library_names_spec='$libname$shrext'
- ;;
- sunos4*)
- library_names_spec='$libname$shrext$versuffix'
- ;;
- sysv4 | sysv4.3*)
- library_names_spec='$libname$shrext'
- ;;
- sysv4*MP*)
- library_names_spec='$libname$shrext'
- ;;
- sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- library_names_spec='$libname$shrext'
- ;;
- uts4*)
- library_names_spec='$libname$shrext'
- ;;
-esac
-
-sed_quote_subst='s/$["`$\\]$/\\\1/g'
-escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
-shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
-escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
-escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
-escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
-
-LC_ALL=C sed -e 's/^$[a-zA-Z0-9_]*$=/acl_cv_\1=/' <<EOF
-
-# How to pass a linker flag through the compiler.
-wl="$escaped_wl"
-
-# Static library suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally "so").
-shlibext="$shlibext"
-
-# Format of library name prefix.
-libname_spec="$escaped_libname_spec"
-
-# Library names that the linker finds when passed -lNAME.
-library_names_spec="$escaped_library_names_spec"
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator="$hardcode_libdir_separator"
-
-# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct="$hardcode_direct"
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L="$hardcode_minus_L"
-
-EOF

pcsxr-1.9.92.tar.bz2/config.sub Deleted

@@ -1,1658 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-# Free Software Foundation, Inc.
-
-timestamp='2008-01-16'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine. It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Please send patches to <config-patches@gnu.org>. Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support. The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
- $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
- -h, --help print this help, then exit
- -t, --time-stamp print date of last modification, then exit
- -v, --version print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions. There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
- case $1 in
- --time-stamp | --time* | -t )
- echo "$timestamp" ; exit ;;
- --version | -v )
- echo "$version" ; exit ;;
- --help | --h* | -h )
- echo "$usage"; exit ;;
- -- ) # Stop option processing
- shift; break ;;
- - )	# Use stdin as input.
- break ;;
- -* )
- echo "$me: invalid option $1$help"
- exit 1 ;;
-
- *local*)
- # First pass through any local machine types.
- echo $1
- exit ;;
-
- * )
- break ;;
- esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
- exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
- exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\2/'`
-case $maybe_os in
- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
- storm-chaos* | os2-emx* | rtmk-nova*)
- os=-$maybe_os
- basic_machine=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\1/'`
- ;;
- *)
- basic_machine=`echo $1 | sed 's/-[^-]*$//'`
- if [ $basic_machine != $1 ]
- then os=`echo $1 | sed 's/.*-/-/'`
- else os=; fi
- ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work. We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray)
-		os=
-		basic_machine=$1
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
- 	-chorusrdb)
- 		os=-chorusrdb
-		basic_machine=$1
- 		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco6)
-		os=-sco5v6
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-	| bfin \
-	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| fido | fr30 | frv \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
-	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
-	| mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| mt \
-	| msp430 \
-	| nios | nios2 \
-	| ns16k | ns32k \
-	| or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-	| pyramid \
-	| score \
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu | strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
-	| v850 | v850e \
-	| we32k \
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-	| z8k)
-		basic_machine=$basic_machine-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
-		# Motorola 68HC11/12.
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-	ms1)
-		basic_machine=mt-unknown
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	 basic_machine=$basic_machine-pc
-	 ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* | avr32-* \
-	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | craynv-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
-	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| m32c-* | m32r-* | m32rle-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mips64vr5900-* | mips64vr5900el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipstx39-* | mipstx39el-* \
-	| mmix-* \
-	| mt-* \
-	| msp430-* \
-	| nios-* | nios2-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-	| pyramid-* \
-	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tron-* \
-	| v850-* | v850e-* | vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa*-* \
-	| ymp-* \
-	| z8k-*)
-		;;
-	# Recognize the basic CPU types without company name, with glob match.
-	xtensa*)
-		basic_machine=$basic_machine-unknown
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
- 	abacus)
-		basic_machine=abacus-unknown
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	blackfin)
-		basic_machine=bfin-unknown
-		os=-linux
-		;;
-	blackfin-*)
-		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	craynv)
-		basic_machine=craynv-cray
-		os=-unicosmp
-		;;
-	cr16)
-		basic_machine=cr16-unknown
-		os=-elf
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	crisv32 | crisv32-* | etraxfs*)
-		basic_machine=crisv32-axis
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	crx)
-		basic_machine=crx-unknown
-		os=-elf
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	 | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-# I'm not sure what "Sysv32" means. Should this be sysv3.2?
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		 -irix*)
-			;;
-		 *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m68knommu)
-		basic_machine=m68k-unknown
-		os=-linux
-		;;
-	m68knommu-*)
-		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	mingw32)
-		basic_machine=i386-pc
-		os=-mingw32
-		;;
-	mingw32ce)
-		basic_machine=arm-unknown
-		os=-mingw32ce
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	ms1-*)
-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		 -nextstep* )
-			;;
-		 -ns2*)
-		 os=-nextstep2
-			;;
-		 *)
-		 os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	openrisc | openrisc-*)
-		basic_machine=or32-unknown
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	parisc)
-		basic_machine=hppa-unknown
-		os=-linux
-		;;
-	parisc-*)
-		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pc98)
-		basic_machine=i386-pc
-		;;
-	pc98-*)
-		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
-		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc)	basic_machine=powerpc-unknown
-		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rdos)
-		basic_machine=i386-pc
-		os=-rdos
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sde)
-		basic_machine=mipsisa32-sde
-		os=-elf
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sh5el)
-		basic_machine=sh5le-unknown
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
-	tile*)
-		basic_machine=tile-unknown
-		os=-linux-gnu
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types. It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	mmix)
-		basic_machine=mmix-knuth
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
-		basic_machine=sh-unknown
-		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-		basic_machine=sparc-sun
-		;;
-	cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
- # First match some system type aliases
- # that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	 | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	 | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	 | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	 | -aos* \
-	 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	 | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	 | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	 | -openbsd* | -solidbsd* \
-	 | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-	 | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	 | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	 | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	 | -chorusos* | -chorusrdb* \
-	 | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	 | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-	 | -uxpv* | -beos* | -mpeix* | -udk* \
-	 | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-	 | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	 | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	 | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	 | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	 | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	 | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		 x86-* | i*86-*)
-			;;
-		 *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto-qnx*)
-		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	 | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
-	 | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
- -os400*)
-		os=-os400
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-syllable*)
-		os=-syllable
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2 )
-		os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
- -tpf*)
-		os=-tpf
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
-		;;
-	-aros*)
-		os=-aros
-		;;
-	-kaos*)
-		os=-kaos
-		;;
-	-zvmoe)
-		os=-zvmoe
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system. Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
- score-*)
-		os=-elf
-		;;
- spu-*)
-		os=-elf
-		;;
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
- c4x-* | tic4x-*)
- 	os=-coff
-		;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-	pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
- mep-*)
-		os=-elf
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	or32-*)
-		os=-coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-haiku)
-		os=-haiku
-		;;
-	*-ibm)
-		os=-aix
-		;;
- 	*-knuth)
-		os=-mmixware
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-	*-gould)
-		os=-sysv
-		;;
-	*-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-	*-sgi)
-		os=-irix
-		;;
-	*-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer. We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-os400*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-tpf*)
-				vendor=ibm
-				;;
-			-vxsim* | -vxworks* | -windiss*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
-exit
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:

pcsxr-1.9.92.tar.bz2/configure Deleted

@@ -1,19356 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for pcsx 1.9.
-#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization. ##
-## --------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
-esac
-
-fi
-
-
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
- as_echo='printf %s\n'
- as_echo_n='printf %s'
-else
- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
- as_echo_n='/usr/ucb/echo -n'
- else
- as_echo_body='eval expr "X$1" : "X\$.*\$"'
- as_echo_n_body='eval
- arg=$1;
- case $arg in
- *"$as_nl"*)
-	expr "X$arg" : "X\$.*\$$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;
- esac;
- expr "X$arg" : "X\$.*\$" | tr -d "$as_nl"
- '
- export as_echo_n_body
- as_echo_n='sh -c $as_echo_n_body as_echo'
- fi
- export as_echo_body
- as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- PATH_SEPARATOR=:
- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
- PATH_SEPARATOR=';'
- }
-fi
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- as_unset=unset
-else
- as_unset=false
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order. Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are. Look in the path if we contain no directory separator.
-case $0 in
- *[\\/]* ) as_myself=$0 ;;
- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
-
- ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
- as_myself=$0
-fi
-if test ! -f "$as_myself"; then
- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- { (exit 1); exit 1; }
-fi
-
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# Required to use basename.
-if expr a : '$a$' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*$...$'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
- as_basename=basename
-else
- as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/$[^/][^/]*$/*$' \| \
-	 X"$0" : 'X$//$$' \| \
-	 X"$0" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X/"$0" |
- sed '/^.*\/$[^/][^/]*$\/*$/{
-	 s//\1/
-	 q
-	 }
-	 /^X\/$\/\/$$/{
-	 s//\1/
-	 q
-	 }
-	 /^X\/$\/$.*/{
-	 s//\1/
-	 q
-	 }
-	 s/.*/./; q'`
-
-# CDPATH.
-$as_unset CDPATH
-
-
-if test "x$CONFIG_SHELL" = x; then
- if (eval ":") 2>/dev/null; then
- as_have_required=yes
-else
- as_have_required=no
-fi
-
- if test $as_have_required = yes &&	 (eval ":
-(as_func_return () {
- (exit \$1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
-
-exitcode=0
-if as_func_success; then
- :
-else
- exitcode=1
- echo as_func_success failed.
-fi
-
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
- :
-else
- exitcode=1
- echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
- :
-else
- exitcode=1
- echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
- as_lineno_1=\$LINENO
- as_lineno_2=\$LINENO
- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
- :
-else
- as_candidate_shells=
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- case $as_dir in
-	 /*)
-	 for as_base in sh bash ksh sh5; do
-	 as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
-	 done;;
- esac
-done
-IFS=$as_save_IFS
-
-
- for as_shell in $as_candidate_shells $SHELL; do
-	 # Try only shells that exist, to save several forks.
-	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-_ASEOF
-}; then
- CONFIG_SHELL=$as_shell
-	 as_have_required=yes
-	 if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-(as_func_return () {
- (exit $1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
-
-exitcode=0
-if as_func_success; then
- :
-else
- exitcode=1
- echo as_func_success failed.
-fi
-
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
- :
-else
- exitcode=1
- echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = "$1" ); then
- :
-else
- exitcode=1
- echo positional parameters were not saved.
-fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-
-_ASEOF
-}; then
- break
-fi
-
-fi
-
- done
-
- if test "x$CONFIG_SHELL" != x; then
- for as_var in BASH_ENV ENV
-	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-	done
-	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
-
-
- if test $as_have_required = no; then
- echo This script requires a shell more modern than all the
- echo shells that I found on your system. Please install a
- echo modern shell, or manually run the script under such a
- echo shell if you do have one.
- { (exit 1); exit 1; }
-fi
-
-
-fi
-
-fi
-
-
-
-(eval "as_func_return () {
- (exit \$1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
-
-exitcode=0
-if as_func_success; then
- :
-else
- exitcode=1
- echo as_func_success failed.
-fi
-
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
- :
-else
- exitcode=1
- echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
- :
-else
- exitcode=1
- echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0") || {
- echo No shell found that supports shell functions.
- echo Please tell bug-autoconf@gnu.org about your system,
- echo including any error possibly output before this message.
- echo This can help us improve future autoconf versions.
- echo Configuration will now proceed without shell functions.
-}
-
-
-
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
- # uniformly replaced by the line number. The first 'sed' inserts a
- # line-number line after each line using $LINENO; the second 'sed'
- # does the real work. The second script uses 'N' to pair each
- # line-number line with the line containing $LINENO, and appends
- # trailing '-' during substitution so that $LINENO is not a special
- # case at line end.
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
- # scripts with optimization help from Paolo Bonzini. Blame Lee
- # E. McMahon (1931-1989) for sed's syntax. :-)
- sed -n '
- p
- /[$]LINENO/=
- ' <$as_myself |
- sed '
- s/[$]LINENO.*/&-/
- t lineno
- b
- :lineno
- N
- :loop
- s/[$]LINENO$[^'$as_cr_alnum'_].*\n$$.*$/\2\1\2/
- t loop
- s/-\n.*//
- ' >$as_me.lineno &&
- chmod +x "$as_me.lineno" ||
- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
- { (exit 1); exit 1; }; }
-
- # Don't try to exec as it changes $[0], causing all sort of problems
- # (the dirname of $[0] is not the place where we might find the
- # original and so on. Autoconf is especially sensitive to this).
- . "./$as_me.lineno"
- # Exit status is that of the last command.
- exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
- as_dirname=dirname
-else
- as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
- case `echo 'x\c'` in
- *c*) ECHO_T='	';;	# ECHO_T is single tab character.
- *) ECHO_C='\c';;
- esac;;
-*)
- ECHO_N='-n';;
-esac
-if expr a : '$a$' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*$...$'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
- rm -f conf$$.dir/conf$$.file
-else
- rm -f conf$$.dir
- mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
- if ln -s conf$$.file conf$$ 2>/dev/null; then
- as_ln_s='ln -s'
- # ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
- elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
- else
- as_ln_s='cp -p'
- fi
-else
- as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
-else
- test -d ./-p && rmdir ./-p
- as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
-	test -d "$1/.";
- else
-	case $1 in
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-	???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-
-
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-case X$lt_ECHO in
-X*--fallback-echo)
- # Remove one level of quotation (which was required for Make).
- ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
- ;;
-esac
-
-ECHO=${lt_ECHO-echo}
-if test "X$1" = X--no-reexec; then
- # Discard the --no-reexec flag, and continue.
- shift
-elif test "X$1" = X--fallback-echo; then
- # Avoid inline document here, it may be left over
- :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
- # Yippee, $ECHO works!
- :
-else
- # Restart under the correct shell.
- exec $SHELL "$0" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
- # used as fallback echo
- shift
- cat <<_LT_EOF
-$*
-_LT_EOF
- exit 0
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test -z "$lt_ECHO"; then
- if test "X${echo_test_string+set}" != Xset; then
- # find a string as large as possible, as long as the shell can cope with it
- for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
- if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
-	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
- then
- break
- fi
- done
- fi
-
- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- :
- else
- # The Solaris, AIX, and Digital Unix default echo programs unquote
- # backslashes. This makes it impossible to quote backslashes using
- # echo "$something" | sed 's/\\/\\\\/g'
- #
- # So, first we look for a working echo in the user's PATH.
-
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for dir in $PATH /usr/ucb; do
- IFS="$lt_save_ifs"
- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- ECHO="$dir/echo"
- break
- fi
- done
- IFS="$lt_save_ifs"
-
- if test "X$ECHO" = Xecho; then
- # We didn't find a better echo, so look for alternatives.
- if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- # This shell has a builtin print -r that does the trick.
- ECHO='print -r'
- elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
-	 test "X$CONFIG_SHELL" != X/bin/ksh; then
- # If we have ksh, try running configure again with it.
- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
- export ORIGINAL_CONFIG_SHELL
- CONFIG_SHELL=/bin/ksh
- export CONFIG_SHELL
- exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
- else
- # Try using printf.
- ECHO='printf %s\n'
- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-	 echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-	 test "X$echo_testing_string" = "X$echo_test_string"; then
-	 # Cool, printf works
-	 :
- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	 test "X$echo_testing_string" = 'X\t' &&
-	 echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	 test "X$echo_testing_string" = "X$echo_test_string"; then
-	 CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	 export CONFIG_SHELL
-	 SHELL="$CONFIG_SHELL"
-	 export SHELL
-	 ECHO="$CONFIG_SHELL $0 --fallback-echo"
- elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	 test "X$echo_testing_string" = 'X\t' &&
-	 echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	 test "X$echo_testing_string" = "X$echo_test_string"; then
-	 ECHO="$CONFIG_SHELL $0 --fallback-echo"
- else
-	 # maybe with a smaller string...
-	 prev=:
-
-	 for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
-	 if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
-	 then
-	 break
-	 fi
-	 prev="$cmd"
-	 done
-
-	 if test "$prev" != 'sed 50q "$0"'; then
-	 echo_test_string=`eval $prev`
-	 export echo_test_string
-	 exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
-	 else
-	 # Oops. We lost completely, so just stick with echo.
-	 ECHO=echo
-	 fi
- fi
- fi
- fi
- fi
-fi
-
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-lt_ECHO=$ECHO
-if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
- lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
-fi
-
-
-
-
-exec 7<&0 </dev/null 6>&1
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_clean_files=
-ac_config_libobj_dir=.
-LIBOBJS=
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Identity of this package.
-PACKAGE_NAME='pcsx'
-PACKAGE_TARNAME='pcsx'
-PACKAGE_VERSION='1.9'
-PACKAGE_STRING='pcsx 1.9'
-PACKAGE_BUGREPORT=''
-
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-# include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-gt_needs=
-ac_subst_vars='LTLIBOBJS
-LIBOBJS
-ARCH_PPC_FALSE
-ARCH_PPC_TRUE
-ARCH_X86_64_FALSE
-ARCH_X86_64_TRUE
-ARCH_X86_FALSE
-ARCH_X86_TRUE
-NASM
-X86_NASM_FALSE
-X86_NASM_TRUE
-PEOPSXGL
-LIBCDIO_LIBS
-LIBCDIO_CFLAGS
-USE_LIBCDIO_FALSE
-USE_LIBCDIO_TRUE
-SOUND_PULSEAUDIO_FALSE
-SOUND_PULSEAUDIO_TRUE
-SOUND_ALSA_FALSE
-SOUND_ALSA_TRUE
-PULSEAUDIO_LIBS
-PULSEAUDIO_CFLAGS
-ALSA_LIBS
-ALSA_CFLAGS
-SOUND_NULL_FALSE
-SOUND_NULL_TRUE
-SOUND_SDL_FALSE
-SOUND_SDL_TRUE
-SOUND_OSS_FALSE
-SOUND_OSS_TRUE
-SDL_LIBS
-SDL_CFLAGS
-SDL_CONFIG
-GLADE2_LIBS
-GLADE2_CFLAGS
-GTK2_LIBS
-GTK2_CFLAGS
-GLIB2_LIBS
-GLIB2_CFLAGS
-PKG_CONFIG
-GETTEXT_PACKAGE
-POSUB
-LTLIBINTL
-LIBINTL
-INTLLIBS
-LTLIBICONV
-LIBICONV
-INTL_MACOSX_LIBS
-XGETTEXT_EXTRA_OPTIONS
-MSGMERGE
-XGETTEXT_015
-XGETTEXT
-GMSGFMT_015
-MSGFMT_015
-GMSGFMT
-MSGFMT
-GETTEXT_MACRO_VERSION
-USE_NLS
-am__fastdepCCAS_FALSE
-am__fastdepCCAS_TRUE
-CCASDEPMODE
-CCASFLAGS
-CCAS
-CPP
-OTOOL64
-OTOOL
-LIPO
-NMEDIT
-DSYMUTIL
-lt_ECHO
-AR
-OBJDUMP
-LN_S
-NM
-ac_ct_DUMPBIN
-DUMPBIN
-LD
-FGREP
-EGREP
-GREP
-SED
-LIBTOOL
-RANLIB
-am__fastdepCC_FALSE
-am__fastdepCC_TRUE
-CCDEPMODE
-AMDEPBACKSLASH
-AMDEP_FALSE
-AMDEP_TRUE
-am__quote
-am__include
-DEPDIR
-OBJEXT
-EXEEXT
-ac_ct_CC
-CPPFLAGS
-LDFLAGS
-CFLAGS
-CC
-MAINT
-MAINTAINER_MODE_FALSE
-MAINTAINER_MODE_TRUE
-am__untar
-am__tar
-AMTAR
-am__leading_dot
-SET_MAKE
-AWK
-mkdir_p
-MKDIR_P
-INSTALL_STRIP_PROGRAM
-STRIP
-install_sh
-MAKEINFO
-AUTOHEADER
-AUTOMAKE
-AUTOCONF
-ACLOCAL
-VERSION
-PACKAGE
-CYGPATH_W
-am__isrc
-INSTALL_DATA
-INSTALL_SCRIPT
-INSTALL_PROGRAM
-target_os
-target_vendor
-target_cpu
-target
-host_os
-host_vendor
-host_cpu
-host
-build_os
-build_vendor
-build_cpu
-build
-target_alias
-host_alias
-build_alias
-LIBS
-ECHO_T
-ECHO_N
-ECHO_C
-DEFS
-mandir
-localedir
-libdir
-psdir
-pdfdir
-dvidir
-htmldir
-infodir
-docdir
-oldincludedir
-includedir
-localstatedir
-sharedstatedir
-sysconfdir
-datadir
-datarootdir
-libexecdir
-sbindir
-bindir
-program_transform_name
-prefix
-exec_prefix
-PACKAGE_BUGREPORT
-PACKAGE_STRING
-PACKAGE_VERSION
-PACKAGE_TARNAME
-PACKAGE_NAME
-PATH_SEPARATOR
-SHELL'
-ac_subst_files=''
-ac_user_opts='
-enable_option_checking
-enable_maintainer_mode
-enable_dependency_tracking
-enable_static
-enable_shared
-with_pic
-enable_fast_install
-with_gnu_ld
-enable_libtool_lock
-enable_nls
-enable_rpath
-with_libiconv_prefix
-with_libintl_prefix
-with_sdl_prefix
-with_sdl_exec_prefix
-enable_sdltest
-enable_sound
-enable_libcdio
-enable_opengl
-enable_dynarec
-'
- ac_precious_vars='build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CPP
-CCAS
-CCASFLAGS
-PKG_CONFIG
-GLIB2_CFLAGS
-GLIB2_LIBS
-GTK2_CFLAGS
-GTK2_LIBS
-GLADE2_CFLAGS
-GLADE2_LIBS
-ALSA_CFLAGS
-ALSA_LIBS
-PULSEAUDIO_CFLAGS
-PULSEAUDIO_LIBS
-LIBCDIO_CFLAGS
-LIBCDIO_LIBS'
-
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-ac_unrecognized_opts=
-ac_unrecognized_sep=
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
-
-ac_prev=
-ac_dashdash=
-for ac_option
-do
- # If the previous option needs an argument, assign it.
- if test -n "$ac_prev"; then
- eval $ac_prev=\$ac_option
- ac_prev=
- continue
- fi
-
- case $ac_option in
- *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=$.*$'` ;;
- *)	ac_optarg=yes ;;
- esac
-
- # Accept the important Cygnus configure options, so we can diagnose typos.
-
- case $ac_dashdash$ac_option in
- --)
- ac_dashdash=yes ;;
-
- -bindir | --bindir | --bindi | --bind | --bin | --bi)
- ac_prev=bindir ;;
- -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
- bindir=$ac_optarg ;;
-
- -build | --build | --buil | --bui | --bu)
- ac_prev=build_alias ;;
- -build=* | --build=* | --buil=* | --bui=* | --bu=*)
- build_alias=$ac_optarg ;;
-
- -cache-file | --cache-file | --cache-fil | --cache-fi \
- | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
- ac_prev=cache_file ;;
- -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
- | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
- cache_file=$ac_optarg ;;
-
- --config-cache | -C)
- cache_file=config.cache ;;
-
- -datadir | --datadir | --datadi | --datad)
- ac_prev=datadir ;;
- -datadir=* | --datadir=* | --datadi=* | --datad=*)
- datadir=$ac_optarg ;;
-
- -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
- | --dataroo | --dataro | --datar)
- ac_prev=datarootdir ;;
- -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
- | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
- datarootdir=$ac_optarg ;;
-
- -disable-* | --disable-*)
- ac_useropt=`expr "x$ac_option" : 'x-*disable-$.*$'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
- { (exit 1); exit 1; }; }
- ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
- case $ac_user_opts in
- *"
-"enable_$ac_useropt"
-"*) ;;
- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
- esac
- eval enable_$ac_useropt=no ;;
-
- -docdir | --docdir | --docdi | --doc | --do)
- ac_prev=docdir ;;
- -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
- docdir=$ac_optarg ;;
-
- -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
- ac_prev=dvidir ;;
- -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
- dvidir=$ac_optarg ;;
-
- -enable-* | --enable-*)
- ac_useropt=`expr "x$ac_option" : 'x-*enable-$[^=]*$'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
- { (exit 1); exit 1; }; }
- ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
- case $ac_user_opts in
- *"
-"enable_$ac_useropt"
-"*) ;;
- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
- esac
- eval enable_$ac_useropt=\$ac_optarg ;;
-
- -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
- | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
- | --exec | --exe | --ex)
- ac_prev=exec_prefix ;;
- -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
- | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
- | --exec=* | --exe=* | --ex=*)
- exec_prefix=$ac_optarg ;;
-
- -gas | --gas | --ga | --g)
- # Obsolete; use --with-gas.
- with_gas=yes ;;
-
- -help | --help | --hel | --he | -h)
- ac_init_help=long ;;
- -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
- ac_init_help=recursive ;;
- -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
- ac_init_help=short ;;
-
- -host | --host | --hos | --ho)
- ac_prev=host_alias ;;
- -host=* | --host=* | --hos=* | --ho=*)
- host_alias=$ac_optarg ;;
-
- -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
- ac_prev=htmldir ;;
- -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
- | --ht=*)
- htmldir=$ac_optarg ;;
-
- -includedir | --includedir | --includedi | --included | --include \
- | --includ | --inclu | --incl | --inc)
- ac_prev=includedir ;;
- -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
- | --includ=* | --inclu=* | --incl=* | --inc=*)
- includedir=$ac_optarg ;;
-
- -infodir | --infodir | --infodi | --infod | --info | --inf)
- ac_prev=infodir ;;
- -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
- infodir=$ac_optarg ;;
-
- -libdir | --libdir | --libdi | --libd)
- ac_prev=libdir ;;
- -libdir=* | --libdir=* | --libdi=* | --libd=*)
- libdir=$ac_optarg ;;
-
- -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
- | --libexe | --libex | --libe)
- ac_prev=libexecdir ;;
- -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
- | --libexe=* | --libex=* | --libe=*)
- libexecdir=$ac_optarg ;;
-
- -localedir | --localedir | --localedi | --localed | --locale)
- ac_prev=localedir ;;
- -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
- localedir=$ac_optarg ;;
-
- -localstatedir | --localstatedir | --localstatedi | --localstated \
- | --localstate | --localstat | --localsta | --localst | --locals)
- ac_prev=localstatedir ;;
- -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
- | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
- localstatedir=$ac_optarg ;;
-
- -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
- ac_prev=mandir ;;
- -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
- mandir=$ac_optarg ;;
-
- -nfp | --nfp | --nf)
- # Obsolete; use --without-fp.
- with_fp=no ;;
-
- -no-create | --no-create | --no-creat | --no-crea | --no-cre \
- | --no-cr | --no-c | -n)
- no_create=yes ;;
-
- -no-recursion | --no-recursion | --no-recursio | --no-recursi \
- | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
- no_recursion=yes ;;
-
- -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
- | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
- | --oldin | --oldi | --old | --ol | --o)
- ac_prev=oldincludedir ;;
- -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
- | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
- | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
- oldincludedir=$ac_optarg ;;
-
- -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
- ac_prev=prefix ;;
- -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
- prefix=$ac_optarg ;;
-
- -program-prefix | --program-prefix | --program-prefi | --program-pref \
- | --program-pre | --program-pr | --program-p)
- ac_prev=program_prefix ;;
- -program-prefix=* | --program-prefix=* | --program-prefi=* \
- | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
- program_prefix=$ac_optarg ;;
-
- -program-suffix | --program-suffix | --program-suffi | --program-suff \
- | --program-suf | --program-su | --program-s)
- ac_prev=program_suffix ;;
- -program-suffix=* | --program-suffix=* | --program-suffi=* \
- | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
- program_suffix=$ac_optarg ;;
-
- -program-transform-name | --program-transform-name \
- | --program-transform-nam | --program-transform-na \
- | --program-transform-n | --program-transform- \
- | --program-transform | --program-transfor \
- | --program-transfo | --program-transf \
- | --program-trans | --program-tran \
- | --progr-tra | --program-tr | --program-t)
- ac_prev=program_transform_name ;;
- -program-transform-name=* | --program-transform-name=* \
- | --program-transform-nam=* | --program-transform-na=* \
- | --program-transform-n=* | --program-transform-=* \
- | --program-transform=* | --program-transfor=* \
- | --program-transfo=* | --program-transf=* \
- | --program-trans=* | --program-tran=* \
- | --progr-tra=* | --program-tr=* | --program-t=*)
- program_transform_name=$ac_optarg ;;
-
- -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
- ac_prev=pdfdir ;;
- -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
- pdfdir=$ac_optarg ;;
-
- -psdir | --psdir | --psdi | --psd | --ps)
- ac_prev=psdir ;;
- -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
- psdir=$ac_optarg ;;
-
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil)
- silent=yes ;;
-
- -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
- ac_prev=sbindir ;;
- -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
- | --sbi=* | --sb=*)
- sbindir=$ac_optarg ;;
-
- -sharedstatedir | --sharedstatedir | --sharedstatedi \
- | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
- | --sharedst | --shareds | --shared | --share | --shar \
- | --sha | --sh)
- ac_prev=sharedstatedir ;;
- -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
- | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
- | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
- | --sha=* | --sh=*)
- sharedstatedir=$ac_optarg ;;
-
- -site | --site | --sit)
- ac_prev=site ;;
- -site=* | --site=* | --sit=*)
- site=$ac_optarg ;;
-
- -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
- ac_prev=srcdir ;;
- -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
- srcdir=$ac_optarg ;;
-
- -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
- | --syscon | --sysco | --sysc | --sys | --sy)
- ac_prev=sysconfdir ;;
- -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
- | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
- sysconfdir=$ac_optarg ;;
-
- -target | --target | --targe | --targ | --tar | --ta | --t)
- ac_prev=target_alias ;;
- -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
- target_alias=$ac_optarg ;;
-
- -v | -verbose | --verbose | --verbos | --verbo | --verb)
- verbose=yes ;;
-
- -version | --version | --versio | --versi | --vers | -V)
- ac_init_version=: ;;
-
- -with-* | --with-*)
- ac_useropt=`expr "x$ac_option" : 'x-*with-$[^=]*$'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
- { (exit 1); exit 1; }; }
- ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
- case $ac_user_opts in
- *"
-"with_$ac_useropt"
-"*) ;;
- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
- esac
- eval with_$ac_useropt=\$ac_optarg ;;
-
- -without-* | --without-*)
- ac_useropt=`expr "x$ac_option" : 'x-*without-$.*$'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
- { (exit 1); exit 1; }; }
- ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
- case $ac_user_opts in
- *"
-"with_$ac_useropt"
-"*) ;;
- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
- esac
- eval with_$ac_useropt=no ;;
-
- --x)
- # Obsolete; use --with-x.
- with_x=yes ;;
-
- -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
- | --x-incl | --x-inc | --x-in | --x-i)
- ac_prev=x_includes ;;
- -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
- | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
- x_includes=$ac_optarg ;;
-
- -x-libraries | --x-libraries | --x-librarie | --x-librari \
- | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
- ac_prev=x_libraries ;;
- -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
- | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
- x_libraries=$ac_optarg ;;
-
- -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; }
- ;;
-
- *=*)
- ac_envvar=`expr "x$ac_option" : 'x$[^=]*$='`
- # Reject names that are not valid shell variable names.
- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
- { (exit 1); exit 1; }; }
- eval $ac_envvar=\$ac_optarg
- export $ac_envvar ;;
-
- *)
- # FIXME: should be removed in autoconf 3.0.
- $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
- expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
- ;;
-
- esac
-done
-
-if test -n "$ac_prev"; then
- ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- { $as_echo "$as_me: error: missing argument to $ac_option" >&2
- { (exit 1); exit 1; }; }
-fi
-
-if test -n "$ac_unrecognized_opts"; then
- case $enable_option_checking in
- no) ;;
- fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
- { (exit 1); exit 1; }; } ;;
- *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
- esac
-fi
-
-# Check all directory arguments for consistency.
-for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-		datadir sysconfdir sharedstatedir localstatedir includedir \
-		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
-do
- eval ac_val=\$$ac_var
- # Remove trailing slashes.
- case $ac_val in
- */ )
- ac_val=`expr "X$ac_val" : 'X$.*[^/]$' \| "X$ac_val" : 'X$.*$'`
- eval $ac_var=\$ac_val;;
- esac
- # Be sure to have absolute directory names.
- case $ac_val in
- [\\/$]* | ?:[\\/]* ) continue;;
- NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
- esac
- { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; }
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
- if test "x$build_alias" = x; then
- cross_compiling=maybe
- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used." >&2
- elif test "x$build_alias" != "x$host_alias"; then
- cross_compiling=yes
- fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- { $as_echo "$as_me: error: working directory cannot be determined" >&2
- { (exit 1); exit 1; }; }
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
- { (exit 1); exit 1; }; }
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
- ac_srcdir_defaulted=yes
- # Try the directory containing this script, then the parent directory.
- ac_confdir=`$as_dirname -- "$as_myself" ||
-$as_expr X"$as_myself" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
-	 X"$as_myself" : 'X$//$[^/]' \| \
-	 X"$as_myself" : 'X$//$$' \| \
-	 X"$as_myself" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
- sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/\/$[^/].*/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/\/$$/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/$.*/{
-	 s//\1/
-	 q
-	 }
-	 s/.*/./; q'`
- srcdir=$ac_confdir
- if test ! -r "$srcdir/$ac_unique_file"; then
- srcdir=..
- fi
-else
- ac_srcdir_defaulted=no
-fi
-if test ! -r "$srcdir/$ac_unique_file"; then
- test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
- { (exit 1); exit 1; }; }
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
- { (exit 1); exit 1; }; }
-	pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
- srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X$.*[^/]$' \| "X$srcdir" : 'X$.*$'`;;
-esac
-for ac_var in $ac_precious_vars; do
- eval ac_env_${ac_var}_set=\${${ac_var}+set}
- eval ac_env_${ac_var}_value=\$${ac_var}
- eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
- eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
- # Omit some internal or obsolete options to make the list less imposing.
- # This message is too long to be a string in the A/UX 3.1 sh.
- cat <<_ACEOF
-\`configure' configures pcsx 1.9 to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE. See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
- -h, --help display this help and exit
- --help=short display options specific to this package
- --help=recursive display the short help of all the included packages
- -V, --version display version information and exit
- -q, --quiet, --silent do not print \`checking...' messages
- --cache-file=FILE cache test results in FILE [disabled]
- -C, --config-cache alias for \`--cache-file=config.cache'
- -n, --no-create do not create output files
- --srcdir=DIR find the sources in DIR [configure dir or \`..']
-
-Installation directories:
- --prefix=PREFIX install architecture-independent files in PREFIX
- [$ac_default_prefix]
- --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
- [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
- --bindir=DIR user executables [EPREFIX/bin]
- --sbindir=DIR system admin executables [EPREFIX/sbin]
- --libexecdir=DIR program executables [EPREFIX/libexec]
- --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
- --localstatedir=DIR modifiable single-machine data [PREFIX/var]
- --libdir=DIR object code libraries [EPREFIX/lib]
- --includedir=DIR C header files [PREFIX/include]
- --oldincludedir=DIR C header files for non-gcc [/usr/include]
- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
- --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
- --infodir=DIR info documentation [DATAROOTDIR/info]
- --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
- --mandir=DIR man documentation [DATAROOTDIR/man]
- --docdir=DIR documentation root [DATAROOTDIR/doc/pcsx]
- --htmldir=DIR html documentation [DOCDIR]
- --dvidir=DIR dvi documentation [DOCDIR]
- --pdfdir=DIR pdf documentation [DOCDIR]
- --psdir=DIR ps documentation [DOCDIR]
-_ACEOF
-
- cat <<\_ACEOF
-
-Program names:
- --program-prefix=PREFIX prepend PREFIX to installed program names
- --program-suffix=SUFFIX append SUFFIX to installed program names
- --program-transform-name=PROGRAM run sed PROGRAM on installed program names
-
-System types:
- --build=BUILD configure for building on BUILD [guessed]
- --host=HOST cross-compile to build programs to run on HOST [BUILD]
- --target=TARGET configure for building compilers for TARGET [HOST]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
- case $ac_init_help in
- short | recursive ) echo "Configuration of pcsx 1.9:";;
- esac
- cat <<\_ACEOF
-
-Optional Features:
- --disable-option-checking ignore unrecognized --enable/--with options
- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
- --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-maintainer-mode enable make rules and dependencies not useful
-			 (and sometimes confusing) to the casual installer
- --disable-dependency-tracking speeds up one-time build
- --enable-dependency-tracking do not reject slow dependency extractors
- --enable-static[=PKGS] build static libraries [default=no]
- --enable-shared[=PKGS] build shared libraries [default=yes]
- --enable-fast-install[=PKGS]
- optimize for fast installation [default=yes]
- --disable-libtool-lock avoid locking (might break parallel builds)
- --disable-nls do not use Native Language Support
- --disable-rpath do not hardcode runtime library paths
- --disable-sdltest Do not try to compile and run a test SDL program
- --enable-sound=... force selection of sound backend (alsa/null/oss/pulseaudio/sdl) (default: sdl)
- --enable-libcdio use GNU libcdio for CD-ROM support (default=no)
- --enable-opengl build OpenGL plugin (default=no)
- --enable-dynarec=... force selection of dynamic recompiler platform (auto/no/x86/x86_64/ppc) (default: auto)
-
-Optional Packages:
- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
- --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --with-pic try to use only PIC/non-PIC objects [default=use
- both]
- --with-gnu-ld assume the C compiler uses GNU ld [default=no]
- --with-gnu-ld assume the C compiler uses GNU ld default=no
- --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
- --without-libiconv-prefix don't search for libiconv in includedir and libdir
- --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib
- --without-libintl-prefix don't search for libintl in includedir and libdir
- --with-sdl-prefix=PFX Prefix where SDL is installed (optional)
- --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)
-
-Some influential environment variables:
- CC C compiler command
- CFLAGS C compiler flags
- LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
- nonstandard directory <lib dir>
- LIBS libraries to pass to the linker, e.g. -l<library>
- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
- you have headers in a nonstandard directory <include dir>
- CPP C preprocessor
- CCAS assembler compiler command (defaults to CC)
- CCASFLAGS assembler compiler flags (defaults to CFLAGS)
- PKG_CONFIG path to pkg-config utility
- GLIB2_CFLAGS
- C compiler flags for GLIB2, overriding pkg-config
- GLIB2_LIBS linker flags for GLIB2, overriding pkg-config
- GTK2_CFLAGS C compiler flags for GTK2, overriding pkg-config
- GTK2_LIBS linker flags for GTK2, overriding pkg-config
- GLADE2_CFLAGS
- C compiler flags for GLADE2, overriding pkg-config
- GLADE2_LIBS linker flags for GLADE2, overriding pkg-config
- ALSA_CFLAGS C compiler flags for ALSA, overriding pkg-config
- ALSA_LIBS linker flags for ALSA, overriding pkg-config
- PULSEAUDIO_CFLAGS
- C compiler flags for PULSEAUDIO, overriding pkg-config
- PULSEAUDIO_LIBS
- linker flags for PULSEAUDIO, overriding pkg-config
- LIBCDIO_CFLAGS
- C compiler flags for LIBCDIO, overriding pkg-config
- LIBCDIO_LIBS
- linker flags for LIBCDIO, overriding pkg-config
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-_ACEOF
-ac_status=$?
-fi
-
-if test "$ac_init_help" = "recursive"; then
- # If there are subdirs, report their specific --help.
- for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
- test -d "$ac_dir" ||
- { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
- continue
- ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
- # A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
- case $ac_top_builddir_sub in
- "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
- esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
- .) # We are building in place.
- ac_srcdir=.
- ac_top_srcdir=$ac_top_builddir_sub
- ac_abs_top_srcdir=$ac_pwd ;;
- [\\/]* | ?:[\\/]* ) # Absolute name.
- ac_srcdir=$srcdir$ac_dir_suffix;
- ac_top_srcdir=$srcdir
- ac_abs_top_srcdir=$srcdir ;;
- *) # Relative name.
- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_build_prefix$srcdir
- ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
- cd "$ac_dir" || { ac_status=$?; continue; }
- # Check for guested configure.
- if test -f "$ac_srcdir/configure.gnu"; then
- echo &&
- $SHELL "$ac_srcdir/configure.gnu" --help=recursive
- elif test -f "$ac_srcdir/configure"; then
- echo &&
- $SHELL "$ac_srcdir/configure" --help=recursive
- else
- $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
- fi || ac_status=$?
- cd "$ac_pwd" || { ac_status=$?; break; }
- done
-fi
-
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
- cat <<\_ACEOF
-pcsx configure 1.9
-generated by GNU Autoconf 2.63
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
- exit
-fi
-cat >config.log <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by pcsx $as_me 1.9, which was
-generated by GNU Autoconf 2.63. Invocation command line was
-
- $ $0 $@
-
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
-
-/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
-/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
-/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
-/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
-/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- $as_echo "PATH: $as_dir"
-done
-IFS=$as_save_IFS
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
- for ac_arg
- do
- case $ac_arg in
- -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil)
- continue ;;
- *\'*)
- ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
- esac
- case $ac_pass in
- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
- 2)
- ac_configure_args1="$ac_configure_args1 '$ac_arg'"
- if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
- else
-	case $ac_arg in
-	 *=* | --config-cache | -C | -disable-* | --disable-* \
-	 | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	 | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	 | -with-* | --with-* | -without-* | --without-* | --x)
-	 case "$ac_configure_args0 " in
-	 "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	 esac
-	 ;;
-	 -* ) ac_must_keep_next=true ;;
-	esac
- fi
- ac_configure_args="$ac_configure_args '$ac_arg'"
- ;;
- esac
- done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log. We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
- # Save into config.log some information that might help in debugging.
- {
- echo
-
- cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
- echo
- # The following way of writing the cache mishandles newlines in values,
-(
- for ac_var in `(set) 2>&1 | sed -n '\''s/^$[a-zA-Z_][a-zA-Z0-9_]*$=.*/\1/p'\''`; do
- eval ac_val=\$$ac_var
- case $ac_val in #(
- *${as_nl}*)
- case $ac_var in #(
- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
- esac
- case $ac_var in #(
- _ | IFS | as_nl) ;; #(
- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
- *) $as_unset $ac_var ;;
- esac ;;
- esac
- done
- (set) 2>&1 |
- case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
- *${as_nl}ac_space=\ *)
- sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	 s/^\$[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\$=\$.*\$/\\1='\''\\2'\''/p"
- ;; #(
- *)
- sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
- ;;
- esac |
- sort
-)
- echo
-
- cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
- echo
- for ac_var in $ac_subst_vars
- do
- eval ac_val=\$$ac_var
- case $ac_val in
- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
- esac
- $as_echo "$ac_var='\''$ac_val'\''"
- done | sort
- echo
-
- if test -n "$ac_subst_files"; then
- cat <<\_ASBOX
-## ------------------- ##
-## File substitutions. ##
-## ------------------- ##
-_ASBOX
- echo
- for ac_var in $ac_subst_files
- do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	$as_echo "$ac_var='\''$ac_val'\''"
- done | sort
- echo
- fi
-
- if test -s confdefs.h; then
- cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
- echo
- cat confdefs.h
- echo
- fi
- test "$ac_signal" != 0 &&
- $as_echo "$as_me: caught signal $ac_signal"
- $as_echo "$as_me: exit $exit_status"
- } >&5
- rm -f core *.core core.conftest.* &&
- rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
- exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
-if test -n "$CONFIG_SITE"; then
- ac_site_file1=$CONFIG_SITE
-elif test "x$prefix" != xNONE; then
- ac_site_file1=$prefix/share/config.site
- ac_site_file2=$prefix/etc/config.site
-else
- ac_site_file1=$ac_default_prefix/share/config.site
- ac_site_file2=$ac_default_prefix/etc/config.site
-fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
-do
- test "x$ac_site_file" = xNONE && continue
- if test -r "$ac_site_file"; then
- { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
- sed 's/^/| /' "$ac_site_file" >&5
- . "$ac_site_file"
- fi
-done
-
-if test -r "$cache_file"; then
- # Some versions of bash will fail to source /dev/null (special
- # files actually), so we avoid doing that.
- if test -f "$cache_file"; then
- { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
- case $cache_file in
- [\\/]* | ?:[\\/]* ) . "$cache_file";;
- *) . "./$cache_file";;
- esac
- fi
-else
- { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
- >$cache_file
-fi
-
-gt_needs="$gt_needs "
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
- eval ac_old_set=\$ac_cv_env_${ac_var}_set
- eval ac_new_set=\$ac_env_${ac_var}_set
- eval ac_old_val=\$ac_cv_env_${ac_var}_value
- eval ac_new_val=\$ac_env_${ac_var}_value
- case $ac_old_set,$ac_new_set in
- set,)
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
- ac_cache_corrupted=: ;;
- ,set)
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
- ac_cache_corrupted=: ;;
- ,);;
- *)
- if test "x$ac_old_val" != "x$ac_new_val"; then
-	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
-	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	 { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	 ac_cache_corrupted=:
-	else
-	 { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-	 eval $ac_var=\$ac_old_val
-	fi
-	{ $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5
-$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5
-$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
- fi;;
- esac
- # Pass precious variables to config.status.
- if test "$ac_new_set" = set; then
- case $ac_new_val in
- *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
- *) ac_arg=$ac_var=$ac_new_val ;;
- esac
- case " $ac_configure_args " in
- *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
- esac
- fi
-done
-if $ac_cache_corrupted; then
- { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
- { (exit 1); exit 1; }; }
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
- if test -f "$ac_dir/install-sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install-sh -c"
- break
- elif test -f "$ac_dir/install.sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install.sh -c"
- break
- elif test -f "$ac_dir/shtool"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/shtool install -c"
- break
- fi
-done
-if test -z "$ac_aux_dir"; then
- { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
- { (exit 1); exit 1; }; }
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-
-
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
- { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
- { (exit 1); exit 1; }; }
-
-{ $as_echo "$as_me:$LINENO: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
- ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
- { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
- { (exit 1); exit 1; }; }
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
- { (exit 1); exit 1; }; }
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-$as_echo "$as_me: error: invalid value of canonical build" >&2;}
- { (exit 1); exit 1; }; };;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:$LINENO: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test "x$host_alias" = x; then
- ac_cv_host=$ac_cv_build
-else
- ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
- { (exit 1); exit 1; }; }
-fi
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-$as_echo "$as_me: error: invalid value of canonical host" >&2;}
- { (exit 1); exit 1; }; };;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:$LINENO: checking target system type" >&5
-$as_echo_n "checking target system type... " >&6; }
-if test "${ac_cv_target+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test "x$target_alias" = x; then
- ac_cv_target=$ac_cv_host
-else
- ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
- { (exit 1); exit 1; }; }
-fi
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-$as_echo "$ac_cv_target" >&6; }
-case $ac_cv_target in
-*-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
-$as_echo "$as_me: error: invalid value of canonical target" >&2;}
- { (exit 1); exit 1; }; };;
-esac
-target=$ac_cv_target
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_target
-shift
-target_cpu=$1
-target_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-target_os=$*
-IFS=$ac_save_IFS
-case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
-
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-test -n "$target_alias" &&
- test "$program_prefix$program_suffix$program_transform_name" = \
- NONENONEs,x,x, &&
- program_prefix=${target_alias}-
-am__api_version='1.10'
-
-# Find a good install program. We prefer a C program (faster),
-# so one script is as good as another. But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
- ./ | .// | /cC/* | \
- /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
- /usr/ucb/* ) ;;
- *)
- # OSF1 and SCO ODT 3.0 have their own names for install.
- # Don't use installbsd from OSF since it installs stuff as root
- # by default.
- for ac_prog in ginstall scoinst install; do
- for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-	 if test $ac_prog = install &&
-	 grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	 # AIX install. It has an incompatible calling convention.
-	 :
-	 elif test $ac_prog = install &&
-	 grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	 # program-specific install script used by HP pwplus--don't use.
-	 :
-	 else
-	 rm -rf conftest.one conftest.two conftest.dir
-	 echo one > conftest.one
-	 echo two > conftest.two
-	 mkdir conftest.dir
-	 if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
-	 test -s conftest.one && test -s conftest.two &&
-	 test -s conftest.dir/conftest.one &&
-	 test -s conftest.dir/conftest.two
-	 then
-	 ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	 break 3
-	 fi
-	 fi
-	fi
- done
- done
- ;;
-esac
-
-done
-IFS=$as_save_IFS
-
-rm -rf conftest.one conftest.two conftest.dir
-
-fi
- if test "${ac_cv_path_install+set}" = set; then
- INSTALL=$ac_cv_path_install
- else
- # As a last resort, use the slow shell script. Don't cache a
- # value for INSTALL within a source directory, because that will
- # break other packages using the cache if that directory is
- # removed, or if the value is a relative name.
- INSTALL=$ac_install_sh
- fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-$as_echo_n "checking whether build environment is sane... " >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments. Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
- if test "$*" = "X"; then
- # -L didn't work.
- set X `ls -t $srcdir/configure conftest.file`
- fi
- rm -f conftest.file
- if test "$*" != "X $srcdir/configure conftest.file" \
- && test "$*" != "X conftest.file $srcdir/configure"; then
-
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
-alias in your environment" >&5
-$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
-alias in your environment" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
- test "$2" = conftest.file
- )
-then
- # Ok.
- :
-else
- { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-Check your system clock" >&5
-$as_echo "$as_me: error: newly created file is older than distributed files!
-Check your system clock" >&2;}
- { (exit 1); exit 1; }; }
-fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-test "$program_prefix" != NONE &&
- program_transform_name="s&^&$program_prefix&;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
- program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.
-# By default was `s,x,x', remove it if useless.
-ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
-program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
- am_missing_run="$MISSING --run "
-else
- am_missing_run=
- { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-fi
-
-{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
-$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
-if test -z "$MKDIR_P"; then
- if test "${ac_cv_path_mkdir+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_prog in mkdir gmkdir; do
-	 for ac_exec_ext in '' $ac_executable_extensions; do
-	 { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
-	 case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-	 'mkdir (GNU coreutils) '* | \
-	 'mkdir (coreutils) '* | \
-	 'mkdir (fileutils) '4.1*)
-	 ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
-	 break 3;;
-	 esac
-	 done
- done
-done
-IFS=$as_save_IFS
-
-fi
-
- if test "${ac_cv_path_mkdir+set}" = set; then
- MKDIR_P="$ac_cv_path_mkdir -p"
- else
- # As a last resort, use the slow shell script. Don't cache a
- # value for MKDIR_P within a source directory, because that will
- # break other packages using the cache if that directory is
- # removed, or if the value is a relative name.
- test -d ./--version && rmdir ./--version
- MKDIR_P="$ac_install_sh -d"
- fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
-$as_echo "$MKDIR_P" >&6; }
-
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
- [\\/$]* | ?:[\\/]*) ;;
- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
-for ac_prog in gawk mawk nawk awk
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$AWK"; then
- ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_AWK="$ac_prog"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
- { $as_echo "$as_me:$LINENO: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$AWK" && break
-done
-
-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
- *@@@%%%=?*=@@@%%%*)
- eval ac_cv_prog_make_${ac_make}_set=yes;;
- *)
- eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
- SET_MAKE=
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
- SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
- am__leading_dot=.
-else
- am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
- # is not polluted with repeated "-I."
- am__isrc=' -I$(srcdir)'
- # test to see if srcdir already configured
- if test -f $srcdir/config.status; then
- { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
- { (exit 1); exit 1; }; }
- fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
- if (cygpath --version) >/dev/null 2>/dev/null; then
- CYGPATH_W='cygpath -w'
- else
- CYGPATH_W=echo
- fi
-fi
-
-
-# Define the identity of the package.
- PACKAGE=pcsx
- VERSION=1.9
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
-
-# Some tools Automake needs.
-
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-
-
-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-
-
-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-
-
-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-
-
-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
-
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'. However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$STRIP"; then
- ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_STRIP="${ac_tool_prefix}strip"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
- ac_ct_STRIP=$STRIP
- # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_STRIP"; then
- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_STRIP="strip"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_ct_STRIP" = x; then
- STRIP=":"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- STRIP=$ac_ct_STRIP
- fi
-else
- STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
-# Always define AMTAR for backward compatibility.
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-
-
-
-
-
-{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
- # Check whether --enable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
- enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
-else
- USE_MAINTAINER_MODE=no
-fi
-
- { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-$as_echo "$USE_MAINTAINER_MODE" >&6; }
- if test $USE_MAINTAINER_MODE = yes; then
- MAINTAINER_MODE_TRUE=
- MAINTAINER_MODE_FALSE='#'
-else
- MAINTAINER_MODE_TRUE='#'
- MAINTAINER_MODE_FALSE=
-fi
-
- MAINT=$MAINTAINER_MODE_TRUE
-
-
-
-ac_config_headers="$ac_config_headers include/config.h:include/config.h.in"
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}gcc"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
- # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CC="gcc"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_ct_CC" = x; then
- CC=""
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- CC=$ac_ct_CC
- fi
-else
- CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}cc"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- fi
-fi
-if test -z "$CC"; then
- # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
- ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
- ac_prog_rejected=yes
- continue
- fi
- ac_cv_prog_CC="cc"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
- # We found a bogon in the path, so make sure we never use it.
- set dummy $ac_cv_prog_CC
- shift
- if test $# != 0; then
- # We chose a different compiler from the bogus one.
- # However, it has the same basename, so the bogon will be chosen
- # first if we set CC to just the basename; use the full file name.
- shift
- ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
- fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- for ac_prog in cl.exe
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$CC" && break
- done
-fi
-if test -z "$CC"; then
- ac_ct_CC=$CC
- for ac_prog in cl.exe
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CC="$ac_prog"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$ac_ct_CC" && break
-done
-
- if test "x$ac_ct_CC" = x; then
- CC=""
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- CC=$ac_ct_CC
- fi
-fi
-
-fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
-
-# Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compiler --version >&5") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compiler -v >&5") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compiler -V >&5") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-
-# The possible output files:
-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
-
-ac_rmfiles=
-for ac_file in $ac_files
-do
- case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
- * ) ac_rmfiles="$ac_rmfiles $ac_file";;
- esac
-done
-rm -f $ac_rmfiles
-
-if { (ac_try="$ac_link_default"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link_default") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile. We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
- test -f "$ac_file" || continue
- case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
-	;;
- [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
- *.* )
- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-	then :; else
-	 ac_cv_exeext=`expr "$ac_file" : '[^.]*$\..*$'`
-	fi
-	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
-	# argument, so we may need to know it at that point already.
-	# Even if this section looks crufty: it has the advantage of
-	# actually working.
-	break;;
- * )
-	break;;
- esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
-else
- ac_file=''
-fi
-
-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-if test -z "$ac_file"; then
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }; }
-fi
-
-ac_exeext=$ac_cv_exeext
-
-# Check that the compiler produces executables we can run. If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
- if { ac_try='./$ac_file'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- cross_compiling=no
- else
- if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
- else
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
- fi
- fi
-fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run. If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
- test -f "$ac_file" || continue
- case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
- *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*$\..*$'`
-	 break;;
- * ) break;;
- esac
-done
-else
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
-fi
-
-rm -f conftest$ac_cv_exeext
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- for ac_file in conftest.o conftest.obj conftest.*; do
- test -f "$ac_file" || continue;
- case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
- *) ac_cv_objext=`expr "$ac_file" : '.*\.$.*$'`
- break;;
- esac
-done
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
-fi
-
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-int
-main ()
-{
-#ifndef __GNUC__
- choke me
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_compiler_gnu=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_compiler_gnu=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
- GCC=yes
-else
- GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_save_c_werror_flag=$ac_c_werror_flag
- ac_c_werror_flag=yes
- ac_cv_prog_cc_g=no
- CFLAGS="-g"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_prog_cc_g=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	CFLAGS=""
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_prog_cc_g=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
- CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
- if test "$GCC" = yes; then
- CFLAGS="-g -O2"
- else
- CFLAGS="-g"
- fi
-else
- if test "$GCC" = yes; then
- CFLAGS="-O2"
- else
- CFLAGS=
- fi
-fi
-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
- char **p;
- int i;
-{
- return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
- char *s;
- va_list v;
- va_start (v,p);
- s = g (p, va_arg (v,int));
- va_end (v);
- return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
- function prototypes and stuff, but not '\xHH' hex character constants.
- These don't provoke an error unfortunately, instead are silently treated
- as 'x'. The following induces an error, until -std is added to get
- proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
- array size at least. It's necessary to write '\x00'==0 to get something
- that's true only with -std. */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
- inside strings and character constants. */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
- ;
- return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
- CC="$ac_save_CC $ac_arg"
- rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_prog_cc_c89=$ac_arg
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext
- test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
- x)
- { $as_echo "$as_me:$LINENO: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
- xno)
- { $as_echo "$as_me:$LINENO: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
- *)
- CC="$CC $ac_cv_prog_cc_c89"
- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-DEPDIR="${am__leading_dot}deps"
-
-ac_config_commands="$ac_config_commands depfiles"
-
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
- am__include=include
- am__quote=
- _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
- am__include=.include
- am__quote="\""
- _am_result=BSD
- fi
-fi
-
-
-{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then
- enableval=$enable_dependency_tracking;
-fi
-
-if test "x$enable_dependency_tracking" != xno; then
- am_depcomp="$ac_aux_dir/depcomp"
- AMDEPBACKSLASH='\'
-fi
- if test "x$enable_dependency_tracking" != xno; then
- AMDEP_TRUE=
- AMDEP_FALSE='#'
-else
- AMDEP_TRUE='#'
- AMDEP_FALSE=
-fi
-
-
-
-depcc="$CC" am_compiler_list=
-
-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
- # We make a subdir and do the tests there. Otherwise we can end up
- # making bogus files that we don't know about and never remove. For
- # instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
- mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
- # using a relative directory.
- cp "$am_depcomp" conftest.dir
- cd conftest.dir
- # We will build objects and dependencies in a subdirectory because
- # it helps to detect inapplicable dependency modes. For instance
- # both Tru64's cc and ICC support -MD to output dependencies as a
- # side effect of compilation, but ICC will put the dependencies in
- # the current directory while Tru64 will put them in the object
- # directory.
- mkdir sub
-
- am_cv_CC_dependencies_compiler_type=none
- if test "$am_compiler_list" = ""; then
- am_compiler_list=`sed -n 's/^#*$[a-zA-Z0-9]*$)$/\1/p' < ./depcomp`
- fi
- for depmode in $am_compiler_list; do
- # Setup a source with many dependencies, because some compilers
- # like to wrap large dependency lists on column 80 (with \), and
- # we should not choose a depcomp mode which is confused by this.
- #
- # We need to recreate these files for each test, as the compiler may
- # overwrite some of them when testing with obscure command lines.
- # This happens at least with the AIX C compiler.
- : > sub/conftest.c
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
- case $depmode in
- nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
- if test "x$enable_dependency_tracking" = xyes; then
-	continue
- else
-	break
- fi
- ;;
- none) break ;;
- esac
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this.
- if depmode=$depmode \
- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
- >/dev/null 2>conftest.err &&
- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- # icc doesn't choke on unknown options, it will just issue warnings
- # or remarks (even with -Werror). So we grep stderr for any message
- # that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
- # icc: Command line warning: ignoring option '-M'; no argument required
- # The diagnosis changed in icc 8.0:
- # icc: Command line remark: option '-MP' not supported
- if (grep 'ignoring option' conftest.err ||
- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
- am_cv_CC_dependencies_compiler_type=$depmode
- break
- fi
- fi
- done
-
- cd ..
- rm -rf conftest.dir
-else
- am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
- if
- test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
- am__fastdepCC_TRUE=
- am__fastdepCC_FALSE='#'
-else
- am__fastdepCC_TRUE='#'
- am__fastdepCC_FALSE=
-fi
-
-
-if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$RANLIB"; then
- ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
- { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
- ac_ct_RANLIB=$RANLIB
- # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_RANLIB"; then
- ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_RANLIB="ranlib"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-$as_echo "$ac_ct_RANLIB" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_ct_RANLIB" = x; then
- RANLIB=":"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- RANLIB=$ac_ct_RANLIB
- fi
-else
- RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-# Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then
- enableval=$enable_static; p=${PACKAGE-default}
- case $enableval in
- yes) enable_static=yes ;;
- no) enable_static=no ;;
- *)
- enable_static=no
- # Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
- for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	 enable_static=yes
-	fi
- done
- IFS="$lt_save_ifs"
- ;;
- esac
-else
- enable_static=no
-fi
-
-
-
-
-
-
-
-
-
-case `pwd` in
- *\ * | *\	*)
- { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
-esac
-
-
-
-macro_version='2.2.6'
-macro_revision='1.3012'
-
-
-
-
-
-
-
-
-
-
-
-
-
-ltmain="$ac_aux_dir/ltmain.sh"
-
-{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if test "${ac_cv_path_SED+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
- for ac_i in 1 2 3 4 5 6 7; do
- ac_script="$ac_script$as_nl$ac_script"
- done
- echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
- $as_unset ac_script || ac_script=
- if test -z "$SED"; then
- ac_path_SED_found=false
- # Loop through the user's path and test for each of PROGNAME-LIST
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_prog in sed gsed; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-# Check for GNU ac_path_SED and select it if it is found.
- # Check for GNU $ac_path_SED
-case `"$ac_path_SED" --version 2>&1` in
-*GNU*)
- ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
-*)
- ac_count=0
- $as_echo_n 0123456789 >"conftest.in"
- while :
- do
- cat "conftest.in" "conftest.in" >"conftest.tmp"
- mv "conftest.tmp" "conftest.in"
- cp "conftest.in" "conftest.nl"
- $as_echo '' >> "conftest.nl"
- "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- ac_count=`expr $ac_count + 1`
- if test $ac_count -gt ${ac_path_SED_max-0}; then
- # Best one so far, save it but keep looking for a better one
- ac_cv_path_SED="$ac_path_SED"
- ac_path_SED_max=$ac_count
- fi
- # 10*(2^10) chars as input seems more than enough
- test $ac_count -gt 10 && break
- done
- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
- $ac_path_SED_found && break 3
- done
- done
-done
-IFS=$as_save_IFS
- if test -z "$ac_cv_path_SED"; then
- { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5
-$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;}
- { (exit 1); exit 1; }; }
- fi
-else
- ac_cv_path_SED=$SED
-fi
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
-$as_echo "$ac_cv_path_SED" >&6; }
- SED="$ac_cv_path_SED"
- rm -f conftest.sed
-
-test -z "$SED" && SED=sed
-Xsed="$SED -e 1s/^X//"
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -z "$GREP"; then
- ac_path_GREP_found=false
- # Loop through the user's path and test for each of PROGNAME-LIST
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_prog in grep ggrep; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-# Check for GNU ac_path_GREP and select it if it is found.
- # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
- ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
- ac_count=0
- $as_echo_n 0123456789 >"conftest.in"
- while :
- do
- cat "conftest.in" "conftest.in" >"conftest.tmp"
- mv "conftest.tmp" "conftest.in"
- cp "conftest.in" "conftest.nl"
- $as_echo 'GREP' >> "conftest.nl"
- "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- ac_count=`expr $ac_count + 1`
- if test $ac_count -gt ${ac_path_GREP_max-0}; then
- # Best one so far, save it but keep looking for a better one
- ac_cv_path_GREP="$ac_path_GREP"
- ac_path_GREP_max=$ac_count
- fi
- # 10*(2^10) chars as input seems more than enough
- test $ac_count -gt 10 && break
- done
- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
- $ac_path_GREP_found && break 3
- done
- done
-done
-IFS=$as_save_IFS
- if test -z "$ac_cv_path_GREP"; then
- { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
- { (exit 1); exit 1; }; }
- fi
-else
- ac_cv_path_GREP=$GREP
-fi
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
- then ac_cv_path_EGREP="$GREP -E"
- else
- if test -z "$EGREP"; then
- ac_path_EGREP_found=false
- # Loop through the user's path and test for each of PROGNAME-LIST
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_prog in egrep; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
- # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
- ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
- ac_count=0
- $as_echo_n 0123456789 >"conftest.in"
- while :
- do
- cat "conftest.in" "conftest.in" >"conftest.tmp"
- mv "conftest.tmp" "conftest.in"
- cp "conftest.in" "conftest.nl"
- $as_echo 'EGREP' >> "conftest.nl"
- "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- ac_count=`expr $ac_count + 1`
- if test $ac_count -gt ${ac_path_EGREP_max-0}; then
- # Best one so far, save it but keep looking for a better one
- ac_cv_path_EGREP="$ac_path_EGREP"
- ac_path_EGREP_max=$ac_count
- fi
- # 10*(2^10) chars as input seems more than enough
- test $ac_count -gt 10 && break
- done
- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
- $ac_path_EGREP_found && break 3
- done
- done
-done
-IFS=$as_save_IFS
- if test -z "$ac_cv_path_EGREP"; then
- { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
- { (exit 1); exit 1; }; }
- fi
-else
- ac_cv_path_EGREP=$EGREP
-fi
-
- fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5
-$as_echo_n "checking for fgrep... " >&6; }
-if test "${ac_cv_path_FGREP+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
- then ac_cv_path_FGREP="$GREP -F"
- else
- if test -z "$FGREP"; then
- ac_path_FGREP_found=false
- # Loop through the user's path and test for each of PROGNAME-LIST
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_prog in fgrep; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
-# Check for GNU ac_path_FGREP and select it if it is found.
- # Check for GNU $ac_path_FGREP
-case `"$ac_path_FGREP" --version 2>&1` in
-*GNU*)
- ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
-*)
- ac_count=0
- $as_echo_n 0123456789 >"conftest.in"
- while :
- do
- cat "conftest.in" "conftest.in" >"conftest.tmp"
- mv "conftest.tmp" "conftest.in"
- cp "conftest.in" "conftest.nl"
- $as_echo 'FGREP' >> "conftest.nl"
- "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- ac_count=`expr $ac_count + 1`
- if test $ac_count -gt ${ac_path_FGREP_max-0}; then
- # Best one so far, save it but keep looking for a better one
- ac_cv_path_FGREP="$ac_path_FGREP"
- ac_path_FGREP_max=$ac_count
- fi
- # 10*(2^10) chars as input seems more than enough
- test $ac_count -gt 10 && break
- done
- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
- $ac_path_FGREP_found && break 3
- done
- done
-done
-IFS=$as_save_IFS
- if test -z "$ac_cv_path_FGREP"; then
- { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
- { (exit 1); exit 1; }; }
- fi
-else
- ac_cv_path_FGREP=$FGREP
-fi
-
- fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5
-$as_echo "$ac_cv_path_FGREP" >&6; }
- FGREP="$ac_cv_path_FGREP"
-
-
-test -z "$GREP" && GREP=grep
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
- withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else
- with_gnu_ld=no
-fi
-
-ac_prog=ld
-if test "$GCC" = yes; then
- # Check if gcc -print-prog-name=ld gives a path.
- { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-$as_echo_n "checking for ld used by $CC... " >&6; }
- case $host in
- *-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
- *)
- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
- esac
- case $ac_prog in
- # Accept absolute paths.
- [\\/]* | ?:[\\/]*)
- re_direlt='/[^/][^/]*/\.\./'
- # Canonicalize the pathname of ld
- ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
- while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
- done
- test -z "$LD" && LD="$ac_prog"
- ;;
- "")
- # If it fails, then pretend we aren't using GCC.
- ac_prog=ld
- ;;
- *)
- # If it is relative, then search for the first ld in PATH.
- with_gnu_ld=unknown
- ;;
- esac
-elif test "$with_gnu_ld" = yes; then
- { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
-else
- { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
-fi
-if test "${lt_cv_path_LD+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -z "$LD"; then
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for ac_dir in $PATH; do
- IFS="$lt_save_ifs"
- test -z "$ac_dir" && ac_dir=.
- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
- lt_cv_path_LD="$ac_dir/$ac_prog"
- # Check to see if the program is GNU ld. I'd rather use --version,
- # but apparently some variants of GNU ld only accept -v.
- # Break only if it was the GNU/non-GNU ld that we prefer.
- case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
-	;;
- *)
-	test "$with_gnu_ld" != yes && break
-	;;
- esac
- fi
- done
- IFS="$lt_save_ifs"
-else
- lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
-
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
- { $as_echo "$as_me:$LINENO: result: $LD" >&5
-$as_echo "$LD" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
- { (exit 1); exit 1; }; }
-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if test "${lt_cv_prog_gnu_ld+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- # I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
- lt_cv_prog_gnu_ld=yes
- ;;
-*)
- lt_cv_prog_gnu_ld=no
- ;;
-esac
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-$as_echo "$lt_cv_prog_gnu_ld" >&6; }
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
-$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
-if test "${lt_cv_path_NM+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$NM"; then
- # Let the user override the test.
- lt_cv_path_NM="$NM"
-else
- lt_nm_to_check="${ac_tool_prefix}nm"
- if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
- lt_nm_to_check="$lt_nm_to_check nm"
- fi
- for lt_tmp_nm in $lt_nm_to_check; do
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
- IFS="$lt_save_ifs"
- test -z "$ac_dir" && ac_dir=.
- tmp_nm="$ac_dir/$lt_tmp_nm"
- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-	# nm: unknown option "B" ignored
-	# Tru64's nm complains that /dev/null is an invalid object file
-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-	*/dev/null* | *'Invalid file or object type'*)
-	 lt_cv_path_NM="$tmp_nm -B"
-	 break
-	 ;;
-	*)
-	 case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	 */dev/null*)
-	 lt_cv_path_NM="$tmp_nm -p"
-	 break
-	 ;;
-	 *)
-	 lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	 continue # so that we can try to find one that supports BSD flags
-	 ;;
-	 esac
-	 ;;
-	esac
- fi
- done
- IFS="$lt_save_ifs"
- done
- : ${lt_cv_path_NM=no}
-fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
-$as_echo "$lt_cv_path_NM" >&6; }
-if test "$lt_cv_path_NM" != "no"; then
- NM="$lt_cv_path_NM"
-else
- # Didn't find any BSD compatible name lister, look for dumpbin.
- if test -n "$ac_tool_prefix"; then
- for ac_prog in "dumpbin -symbols" "link -dump -symbols"
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DUMPBIN+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$DUMPBIN"; then
- ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-DUMPBIN=$ac_cv_prog_DUMPBIN
-if test -n "$DUMPBIN"; then
- { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5
-$as_echo "$DUMPBIN" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$DUMPBIN" && break
- done
-fi
-if test -z "$DUMPBIN"; then
- ac_ct_DUMPBIN=$DUMPBIN
- for ac_prog in "dumpbin -symbols" "link -dump -symbols"
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_DUMPBIN"; then
- ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
-if test -n "$ac_ct_DUMPBIN"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
-$as_echo "$ac_ct_DUMPBIN" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$ac_ct_DUMPBIN" && break
-done
-
- if test "x$ac_ct_DUMPBIN" = x; then
- DUMPBIN=":"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- DUMPBIN=$ac_ct_DUMPBIN
- fi
-fi
-
-
- if test "$DUMPBIN" != ":"; then
- NM="$DUMPBIN"
- fi
-fi
-test -z "$NM" && NM=nm
-
-
-
-
-
-
-{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
-$as_echo_n "checking the name lister ($NM) interface... " >&6; }
-if test "${lt_cv_nm_interface+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- lt_cv_nm_interface="BSD nm"
- echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:4637: $ac_compile\"" >&5)
- (eval "$ac_compile" 2>conftest.err)
- cat conftest.err >&5
- (eval echo "\"\$as_me:4640: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
- (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
- cat conftest.err >&5
- (eval echo "\"\$as_me:4643: output\"" >&5)
- cat conftest.out >&5
- if $GREP 'External.*some_variable' conftest.out > /dev/null; then
- lt_cv_nm_interface="MS dumpbin"
- fi
- rm -f conftest*
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
-$as_echo "$lt_cv_nm_interface" >&6; }
-
-{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
-$as_echo_n "checking whether ln -s works... " >&6; }
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-$as_echo "no, using $LN_S" >&6; }
-fi
-
-# find the maximum length of command line arguments
-{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
-$as_echo_n "checking the maximum length of command line arguments... " >&6; }
-if test "${lt_cv_sys_max_cmd_len+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- i=0
- teststring="ABCD"
-
- case $build_os in
- msdosdjgpp*)
- # On DJGPP, this test can blow up pretty badly due to problems in libc
- # (any single argument exceeding 2000 bytes causes a buffer overrun
- # during glob expansion). Even if it were fixed, the result of this
- # check would be larger than it should be.
- lt_cv_sys_max_cmd_len=12288; # 12K is about right
- ;;
-
- gnu*)
- # Under GNU Hurd, this test is not required because there is
- # no limit to the length of command line arguments.
- # Libtool will interpret -1 as no limit whatsoever
- lt_cv_sys_max_cmd_len=-1;
- ;;
-
- cygwin* | mingw* | cegcc*)
- # On Win9x/ME, this test blows up -- it succeeds, but takes
- # about 5 minutes as the teststring grows exponentially.
- # Worse, since 9x/ME are not pre-emptively multitasking,
- # you end up with a "frozen" computer, even though with patience
- # the test eventually succeeds (with a max line length of 256k).
- # Instead, let's just punt: use the minimum linelength reported by
- # all of the supported platforms: 8192 (on NT/2K/XP).
- lt_cv_sys_max_cmd_len=8192;
- ;;
-
- amigaos*)
- # On AmigaOS with pdksh, this test takes hours, literally.
- # So we just punt and use a minimum line length of 8192.
- lt_cv_sys_max_cmd_len=8192;
- ;;
-
- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
- # This has been around since 386BSD, at least. Likely further.
- if test -x /sbin/sysctl; then
- lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
- elif test -x /usr/sbin/sysctl; then
- lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
- else
- lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
- fi
- # And add a safety zone
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
- ;;
-
- interix*)
- # We know the value 262144 and hardcode it with a safety zone (like BSD)
- lt_cv_sys_max_cmd_len=196608
- ;;
-
- osf*)
- # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
- # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
- # nice to cause kernel panics so lets avoid the loop below.
- # First set a reasonable default.
- lt_cv_sys_max_cmd_len=16384
- #
- if test -x /sbin/sysconfig; then
- case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
- *1*) lt_cv_sys_max_cmd_len=-1 ;;
- esac
- fi
- ;;
- sco3.2v5*)
- lt_cv_sys_max_cmd_len=102400
- ;;
- sysv5* | sco5v6* | sysv4.2uw2*)
- kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
- if test -n "$kargmax"; then
- lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[	 ]//'`
- else
- lt_cv_sys_max_cmd_len=32768
- fi
- ;;
- *)
- lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
- if test -n "$lt_cv_sys_max_cmd_len"; then
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
- else
- # Make teststring a little bigger before we do anything with it.
- # a 1K string should be a reasonable start.
- for i in 1 2 3 4 5 6 7 8 ; do
- teststring=$teststring$teststring
- done
- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
- # If test is not a shell built-in, we'll probably end up computing a
- # maximum length that is only half of the actual maximum length, but
- # we can't tell.
- while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
-	 = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
-	 test $i != 17 # 1/2 MB should be enough
- do
- i=`expr $i + 1`
- teststring=$teststring$teststring
- done
- # Only check the string length outside the loop.
- lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
- teststring=
- # Add a significant safety factor because C++ compilers can tack on
- # massive amounts of additional arguments before passing them to the
- # linker. It appears as though 1/2 is a usable value.
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
- fi
- ;;
- esac
-
-fi
-
-if test -n $lt_cv_sys_max_cmd_len ; then
- { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
-$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: none" >&5
-$as_echo "none" >&6; }
-fi
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-
-
-
-
-
-: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-
-{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
-$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
- = c,a/b,, \
- && eval 'test $(( 1 + 1 )) -eq 2 \
- && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
- && xsi_shell=yes
-{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5
-$as_echo "$xsi_shell" >&6; }
-
-
-{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
-$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
- >/dev/null 2>&1 \
- && lt_shell_append=yes
-{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5
-$as_echo "$lt_shell_append" >&6; }
-
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- lt_unset=unset
-else
- lt_unset=false
-fi
-
-
-
-
-
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
- # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
- lt_SP2NL='tr \040 \012'
- lt_NL2SP='tr \015\012 \040\040'
- ;;
- *) # EBCDIC based system
- lt_SP2NL='tr \100 \n'
- lt_NL2SP='tr \r\n \100\100'
- ;;
-esac
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
-$as_echo_n "checking for $LD option to reload object files... " >&6; }
-if test "${lt_cv_ld_reload_flag+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- lt_cv_ld_reload_flag='-r'
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
-$as_echo "$lt_cv_ld_reload_flag" >&6; }
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
- darwin*)
- if test "$GCC" = yes; then
- reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
- else
- reload_cmds='$LD$reload_flag -o $output$reload_objs'
- fi
- ;;
-esac
-
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
-set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OBJDUMP+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$OBJDUMP"; then
- ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-OBJDUMP=$ac_cv_prog_OBJDUMP
-if test -n "$OBJDUMP"; then
- { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
-$as_echo "$OBJDUMP" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OBJDUMP"; then
- ac_ct_OBJDUMP=$OBJDUMP
- # Extract the first word of "objdump", so it can be a program name with args.
-set dummy objdump; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_OBJDUMP"; then
- ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_OBJDUMP="objdump"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
-if test -n "$ac_ct_OBJDUMP"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
-$as_echo "$ac_ct_OBJDUMP" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_ct_OBJDUMP" = x; then
- OBJDUMP="false"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- OBJDUMP=$ac_ct_OBJDUMP
- fi
-else
- OBJDUMP="$ac_cv_prog_OBJDUMP"
-fi
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
-$as_echo_n "checking how to recognize dependent libraries... " >&6; }
-if test "${lt_cv_deplibs_check_method+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix[4-9]*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-beos*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-bsdi[45]*)
- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
- lt_cv_file_magic_cmd='/usr/bin/file -L'
- lt_cv_file_magic_test_file=/shlib/libc.so
- ;;
-
-cygwin*)
- # func_win32_libid is a shell function defined in ltmain.sh
- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
- lt_cv_file_magic_cmd='func_win32_libid'
- ;;
-
-mingw* | pw32*)
- # Base MSYS/MinGW do not provide the 'file' command needed by
- # func_win32_libid shell function, so use a weaker test based on 'objdump',
- # unless we find 'file', for example because we are cross-compiling.
- if ( file / ) >/dev/null 2>&1; then
- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
- lt_cv_file_magic_cmd='func_win32_libid'
- else
- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
- lt_cv_file_magic_cmd='$OBJDUMP -f'
- fi
- ;;
-
-cegcc)
- # use the weaker test based on 'objdump'. See mingw*.
- lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
- lt_cv_file_magic_cmd='$OBJDUMP -f'
- ;;
-
-darwin* | rhapsody*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-freebsd* | dragonfly*)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
- case $host_cpu in
- i*86 )
- # Not sure whether the presence of OpenBSD here was a mistake.
- # Let's accept both of them until this is cleared up.
- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
- lt_cv_file_magic_cmd=/usr/bin/file
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
- ;;
- esac
- else
- lt_cv_deplibs_check_method=pass_all
- fi
- ;;
-
-gnu*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-hpux10.20* | hpux11*)
- lt_cv_file_magic_cmd=/usr/bin/file
- case $host_cpu in
- ia64*)
- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
- lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
- ;;
- hppa*64*)
- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
- lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
- ;;
- *)
- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
- lt_cv_file_magic_test_file=/usr/lib/libc.sl
- ;;
- esac
- ;;
-
-interix[3-9]*)
- # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
- ;;
-
-irix5* | irix6* | nonstopux*)
- case $LD in
- *-32|*"-32 ") libmagic=32-bit;;
- *-n32|*"-n32 ") libmagic=N32;;
- *-64|*"-64 ") libmagic=64-bit;;
- *) libmagic=never-match;;
- esac
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
- else
- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
- fi
- ;;
-
-newos6*)
- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
- lt_cv_file_magic_cmd=/usr/bin/file
- lt_cv_file_magic_test_file=/usr/lib/libnls.so
- ;;
-
-*nto* | *qnx*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-openbsd*)
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
- else
- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
- fi
- ;;
-
-osf3* | osf4* | osf5*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-rdos*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-solaris*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-sysv4 | sysv4.3*)
- case $host_vendor in
- motorola)
- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
- ;;
- ncr)
- lt_cv_deplibs_check_method=pass_all
- ;;
- sequent)
- lt_cv_file_magic_cmd='/bin/file'
- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
- ;;
- sni)
- lt_cv_file_magic_cmd='/bin/file'
- lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
- lt_cv_file_magic_test_file=/lib/libc.so
- ;;
- siemens)
- lt_cv_deplibs_check_method=pass_all
- ;;
- pc)
- lt_cv_deplibs_check_method=pass_all
- ;;
- esac
- ;;
-
-tpf*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-esac
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
-$as_echo "$lt_cv_deplibs_check_method" >&6; }
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-
-
-
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AR+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$AR"; then
- ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_AR="${ac_tool_prefix}ar"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-AR=$ac_cv_prog_AR
-if test -n "$AR"; then
- { $as_echo "$as_me:$LINENO: result: $AR" >&5
-$as_echo "$AR" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_AR"; then
- ac_ct_AR=$AR
- # Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_AR"; then
- ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_AR="ar"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
-if test -n "$ac_ct_AR"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-$as_echo "$ac_ct_AR" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_ct_AR" = x; then
- AR="false"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- AR=$ac_ct_AR
- fi
-else
- AR="$ac_cv_prog_AR"
-fi
-
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-
-
-
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$STRIP"; then
- ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_STRIP="${ac_tool_prefix}strip"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
- ac_ct_STRIP=$STRIP
- # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_STRIP"; then
- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_STRIP="strip"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_ct_STRIP" = x; then
- STRIP=":"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- STRIP=$ac_ct_STRIP
- fi
-else
- STRIP="$ac_cv_prog_STRIP"
-fi
-
-test -z "$STRIP" && STRIP=:
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$RANLIB"; then
- ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
- { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
- ac_ct_RANLIB=$RANLIB
- # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_RANLIB"; then
- ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_RANLIB="ranlib"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-$as_echo "$ac_ct_RANLIB" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_ct_RANLIB" = x; then
- RANLIB=":"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- RANLIB=$ac_ct_RANLIB
- fi
-else
- RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-test -z "$RANLIB" && RANLIB=:
-
-
-
-
-
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
- case $host_os in
- openbsd*)
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
- ;;
- *)
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
- ;;
- esac
- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
-$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
-
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix. What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[BCDEGRST]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='$[_A-Za-z][_A-Za-z0-9]*$'
-
-# Define system-specific variables.
-case $host_os in
-aix*)
- symcode='[BCDT]'
- ;;
-cygwin* | mingw* | pw32* | cegcc*)
- symcode='[ABCDGISTW]'
- ;;
-hpux*)
- if test "$host_cpu" = ia64; then
- symcode='[ABCDEGRST]'
- fi
- ;;
-irix* | nonstopux*)
- symcode='[BCDEGRST]'
- ;;
-osf*)
- symcode='[BCDEGQRST]'
- ;;
-solaris*)
- symcode='[BDRT]'
- ;;
-sco3.2v5*)
- symcode='[DT]'
- ;;
-sysv4.2uw2*)
- symcode='[DT]'
- ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
- symcode='[ABDT]'
- ;;
-sysv4)
- symcode='[DFNSTU]'
- ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
- symcode='[ABCDGIRSTW]' ;;
-esac
-
-# Transform an extracted symbol line into a proper C declaration.
-# Some systems (esp. on ia64) link data and code symbols differently,
-# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern int \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: $[^ ]*$ $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* $[^ ]*$ $[^ ]*$$/ {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: $[^ ]*$ $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* $[^ ]*$ $lib[^ ]*$$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* $[^ ]*$ $[^ ]*$$/ {\"lib\2\", (void *) \&\2},/p'"
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
- opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
- ;;
-esac
-
-# Try without a prefix underscore, then with it.
-for ac_symprfx in "" "_"; do
-
- # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
- symxfrm="\\1 $ac_symprfx\\2 \\2"
-
- # Write the raw and C identifiers.
- if test "$lt_cv_nm_interface" = "MS dumpbin"; then
- # Fake it for dumpbin and say T for any non-static function
- # and D for any global variable.
- # Also find C++ and __fastcall symbols from MSVC++,
- # which start with @ or ?.
- lt_cv_sys_global_symbol_pipe="$AWK '"\
-" {last_section=section; section=\$ 3};"\
-" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-" \$ 0!~/External *\|/{next};"\
-" / 0+ UNDEF /{next}; / UNDEF $[^|]$*()/{next};"\
-" {if(hide[section]) next};"\
-" {f=0}; \$ 0~/.*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-" s[1]~/^[@?]/{print s[1], s[1]; next};"\
-" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
-" ' prfx=^$ac_symprfx"
- else
- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]$$symcode$symcode*$[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
- fi
-
- # Check to see that the pipe works correctly.
- pipe_works=no
-
- rm -f conftest*
- cat > conftest.$ac_ext <<_LT_EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(void);
-void nm_test_func(void){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-_LT_EOF
-
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- # Now try to grab the symbols.
- nlist=conftest.nm
- if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
- (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s "$nlist"; then
- # Try sorting and uniquifying the output.
- if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
- else
-	rm -f "$nlist"T
- fi
-
- # Make sure that we snagged all the symbols we need.
- if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
-	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
-	 cat <<_LT_EOF > conftest.$ac_ext
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-_LT_EOF
-	 # Now generate the symbol file.
-	 eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
-
-	 cat <<_LT_EOF >> conftest.$ac_ext
-
-/* The mapping between symbol names and symbols. */
-const struct {
- const char *name;
- void *address;
-}
-lt__PROGRAM__LTX_preloaded_symbols[] =
-{
- { "@PROGRAM@", (void *) 0 },
-_LT_EOF
-	 $SED "s/^$symcode$symcode* $.*$ $.*$$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-	 cat <<\_LT_EOF >> conftest.$ac_ext
- {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
- return lt__PROGRAM__LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-_LT_EOF
-	 # Now try linking the two files.
-	 mv conftest.$ac_objext conftstm.$ac_objext
-	 lt_save_LIBS="$LIBS"
-	 lt_save_CFLAGS="$CFLAGS"
-	 LIBS="conftstm.$ac_objext"
-	 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
-	 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext}; then
-	 pipe_works=yes
-	 fi
-	 LIBS="$lt_save_LIBS"
-	 CFLAGS="$lt_save_CFLAGS"
-	else
-	 echo "cannot find nm_test_func in $nlist" >&5
-	fi
- else
-	echo "cannot find nm_test_var in $nlist" >&5
- fi
- else
- echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
- fi
- else
- echo "$progname: failed program was:" >&5
- cat conftest.$ac_ext >&5
- fi
- rm -rf conftest* conftst*
-
- # Do not use the global_symbol_pipe unless it works.
- if test "$pipe_works" = yes; then
- break
- else
- lt_cv_sys_global_symbol_pipe=
- fi
-done
-
-fi
-
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
- lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
- { $as_echo "$as_me:$LINENO: result: failed" >&5
-$as_echo "failed" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: ok" >&5
-$as_echo "ok" >&6; }
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# Check whether --enable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then
- enableval=$enable_libtool_lock;
-fi
-
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
- # Find out which ABI we are using.
- echo 'int i;' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- case `/usr/bin/file conftest.$ac_objext` in
- *ELF-32*)
-	HPUX_IA64_MODE="32"
-	;;
- *ELF-64*)
-	HPUX_IA64_MODE="64"
-	;;
- esac
- fi
- rm -rf conftest*
- ;;
-*-*-irix6*)
- # Find out which ABI we are using.
- echo '#line 5849 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- if test "$lt_cv_prog_gnu_ld" = yes; then
- case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	 LD="${LD-ld} -melf32bsmip"
-	 ;;
-	*N32*)
-	 LD="${LD-ld} -melf32bmipn32"
-	 ;;
-	*64-bit*)
-	 LD="${LD-ld} -melf64bmip"
-	;;
- esac
- else
- case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	 LD="${LD-ld} -32"
-	 ;;
-	*N32*)
-	 LD="${LD-ld} -n32"
-	 ;;
-	*64-bit*)
-	 LD="${LD-ld} -64"
-	 ;;
- esac
- fi
- fi
- rm -rf conftest*
- ;;
-
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
- # Find out which ABI we are using.
- echo 'int i;' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- case `/usr/bin/file conftest.o` in
- *32-bit*)
-	case $host in
-	 x86_64-*kfreebsd*-gnu)
-	 LD="${LD-ld} -m elf_i386_fbsd"
-	 ;;
-	 x86_64-*linux*)
-	 LD="${LD-ld} -m elf_i386"
-	 ;;
-	 ppc64-*linux*|powerpc64-*linux*)
-	 LD="${LD-ld} -m elf32ppclinux"
-	 ;;
-	 s390x-*linux*)
-	 LD="${LD-ld} -m elf_s390"
-	 ;;
-	 sparc64-*linux*)
-	 LD="${LD-ld} -m elf32_sparc"
-	 ;;
-	esac
-	;;
- *64-bit*)
-	case $host in
-	 x86_64-*kfreebsd*-gnu)
-	 LD="${LD-ld} -m elf_x86_64_fbsd"
-	 ;;
-	 x86_64-*linux*)
-	 LD="${LD-ld} -m elf_x86_64"
-	 ;;
-	 ppc*-*linux*|powerpc*-*linux*)
-	 LD="${LD-ld} -m elf64ppc"
-	 ;;
-	 s390*-*linux*|s390*-*tpf*)
-	 LD="${LD-ld} -m elf64_s390"
-	 ;;
-	 sparc*-*linux*)
-	 LD="${LD-ld} -m elf64_sparc"
-	 ;;
-	esac
-	;;
- esac
- fi
- rm -rf conftest*
- ;;
-
-*-*-sco3.2v5*)
- # On SCO OpenServer 5, we need -belf to get full-featured binaries.
- SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -belf"
- { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
-$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-if test "${lt_cv_cc_needs_belf+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
- }; then
- lt_cv_cc_needs_belf=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	lt_cv_cc_needs_belf=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
-$as_echo "$lt_cv_cc_needs_belf" >&6; }
- if test x"$lt_cv_cc_needs_belf" != x"yes"; then
- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
- CFLAGS="$SAVE_CFLAGS"
- fi
- ;;
-sparc*-*solaris*)
- # Find out which ABI we are using.
- echo 'int i;' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- case `/usr/bin/file conftest.o` in
- *64-bit*)
- case $lt_cv_prog_gnu_ld in
- yes*) LD="${LD-ld} -m elf64_sparc" ;;
- *)
-	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-	 LD="${LD-ld} -64"
-	fi
-	;;
- esac
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
-esac
-
-need_locks="$enable_libtool_lock"
-
-
- case $host_os in
- rhapsody* | darwin*)
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$DSYMUTIL"; then
- ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-DSYMUTIL=$ac_cv_prog_DSYMUTIL
-if test -n "$DSYMUTIL"; then
- { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
-$as_echo "$DSYMUTIL" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_DSYMUTIL"; then
- ac_ct_DSYMUTIL=$DSYMUTIL
- # Extract the first word of "dsymutil", so it can be a program name with args.
-set dummy dsymutil; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_DSYMUTIL"; then
- ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
-if test -n "$ac_ct_DSYMUTIL"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
-$as_echo "$ac_ct_DSYMUTIL" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_ct_DSYMUTIL" = x; then
- DSYMUTIL=":"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- DSYMUTIL=$ac_ct_DSYMUTIL
- fi
-else
- DSYMUTIL="$ac_cv_prog_DSYMUTIL"
-fi
-
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
-set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_NMEDIT+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$NMEDIT"; then
- ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-NMEDIT=$ac_cv_prog_NMEDIT
-if test -n "$NMEDIT"; then
- { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5
-$as_echo "$NMEDIT" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_NMEDIT"; then
- ac_ct_NMEDIT=$NMEDIT
- # Extract the first word of "nmedit", so it can be a program name with args.
-set dummy nmedit; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_NMEDIT"; then
- ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_NMEDIT="nmedit"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
-if test -n "$ac_ct_NMEDIT"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
-$as_echo "$ac_ct_NMEDIT" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_ct_NMEDIT" = x; then
- NMEDIT=":"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- NMEDIT=$ac_ct_NMEDIT
- fi
-else
- NMEDIT="$ac_cv_prog_NMEDIT"
-fi
-
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
-set dummy ${ac_tool_prefix}lipo; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_LIPO+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$LIPO"; then
- ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-LIPO=$ac_cv_prog_LIPO
-if test -n "$LIPO"; then
- { $as_echo "$as_me:$LINENO: result: $LIPO" >&5
-$as_echo "$LIPO" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_LIPO"; then
- ac_ct_LIPO=$LIPO
- # Extract the first word of "lipo", so it can be a program name with args.
-set dummy lipo; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_LIPO"; then
- ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_LIPO="lipo"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
-if test -n "$ac_ct_LIPO"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
-$as_echo "$ac_ct_LIPO" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_ct_LIPO" = x; then
- LIPO=":"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- LIPO=$ac_ct_LIPO
- fi
-else
- LIPO="$ac_cv_prog_LIPO"
-fi
-
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}otool; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OTOOL+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$OTOOL"; then
- ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-OTOOL=$ac_cv_prog_OTOOL
-if test -n "$OTOOL"; then
- { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5
-$as_echo "$OTOOL" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OTOOL"; then
- ac_ct_OTOOL=$OTOOL
- # Extract the first word of "otool", so it can be a program name with args.
-set dummy otool; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_OTOOL"; then
- ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_OTOOL="otool"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
-if test -n "$ac_ct_OTOOL"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
-$as_echo "$ac_ct_OTOOL" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_ct_OTOOL" = x; then
- OTOOL=":"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- OTOOL=$ac_ct_OTOOL
- fi
-else
- OTOOL="$ac_cv_prog_OTOOL"
-fi
-
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
-set dummy ${ac_tool_prefix}otool64; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OTOOL64+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$OTOOL64"; then
- ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-OTOOL64=$ac_cv_prog_OTOOL64
-if test -n "$OTOOL64"; then
- { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5
-$as_echo "$OTOOL64" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OTOOL64"; then
- ac_ct_OTOOL64=$OTOOL64
- # Extract the first word of "otool64", so it can be a program name with args.
-set dummy otool64; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_OTOOL64"; then
- ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_OTOOL64="otool64"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
-if test -n "$ac_ct_OTOOL64"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
-$as_echo "$ac_ct_OTOOL64" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_ct_OTOOL64" = x; then
- OTOOL64=":"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- OTOOL64=$ac_ct_OTOOL64
- fi
-else
- OTOOL64="$ac_cv_prog_OTOOL64"
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
-$as_echo_n "checking for -single_module linker flag... " >&6; }
-if test "${lt_cv_apple_cc_single_mod+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- lt_cv_apple_cc_single_mod=no
- if test -z "${LT_MULTI_MODULE}"; then
-	# By default we will add the -single_module flag. You can override
-	# by either setting the environment variable LT_MULTI_MODULE
-	# non-empty at configure time, or by adding -multi_module to the
-	# link flags.
-	rm -rf libconftest.dylib*
-	echo "int foo(void){return 1;}" > conftest.c
-	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
--dynamiclib -Wl,-single_module conftest.c" >&5
-	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-	 -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
- _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
-	 lt_cv_apple_cc_single_mod=yes
-	else
-	 cat conftest.err >&5
-	fi
-	rm -rf libconftest.dylib*
-	rm -f conftest.*
- fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
-$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
- { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
-$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- lt_cv_ld_exported_symbols_list=no
- save_LDFLAGS=$LDFLAGS
- echo "_main" > conftest.sym
- LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
- }; then
- lt_cv_ld_exported_symbols_list=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	lt_cv_ld_exported_symbols_list=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-	LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
-$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
- case $host_os in
- rhapsody* | darwin1.[012])
- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
- darwin1.*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
- darwin*) # darwin 5.x on
- # if running on 10.5 or later, the deployment target defaults
- # to the OS version, if on x86, and 10.4, the deployment
- # target defaults to 10.4. Don't you love it?
- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
-	 _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-	10.[012]*)
-	 _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-	10.*)
-	 _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
- esac
- ;;
- esac
- if test "$lt_cv_apple_cc_single_mod" = "yes"; then
- _lt_dar_single_mod='$single_module'
- fi
- if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
- _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
- else
- _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
- if test "$DSYMUTIL" != ":"; then
- _lt_dsymutil='~$DSYMUTIL $lib || :'
- else
- _lt_dsymutil=
- fi
- ;;
- esac
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
- CPP=
-fi
-if test -z "$CPP"; then
- if test "${ac_cv_prog_CPP+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- # Double quotes because CPP needs to be expanded
- for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
- do
- ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- # <limits.h> exists even on freestanding compilers.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		 Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- }; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- # Broken: fails on valid input.
-continue
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
- # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- }; then
- # Broken: success on invalid input.
-continue
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
- break
-fi
-
- done
- ac_cv_prog_CPP=$CPP
-
-fi
- CPP=$ac_cv_prog_CPP
-else
- ac_cv_prog_CPP=$CPP
-fi
-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- # <limits.h> exists even on freestanding compilers.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		 Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- }; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- # Broken: fails on valid input.
-continue
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
- # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- }; then
- # Broken: success on invalid input.
-continue
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
- :
-else
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_header_stdc=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_header_stdc=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "memchr" >/dev/null 2>&1; then
- :
-else
- ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "free" >/dev/null 2>&1; then
- :
-else
- ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
- if test "$cross_compiling" = yes; then
- :
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		 (('a' <= (c) && (c) <= 'i') \
-		 || ('j' <= (c) && (c) <= 'r') \
-		 || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
- int i;
- for (i = 0; i < 256; i++)
- if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
- return 2;
- return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_header_stdc=no
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		 inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- eval "$as_ac_Header=yes"
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	 { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-for ac_header in dlfcn.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- eval "$as_ac_Header=yes"
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	 { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-# Set options
-
-
-
- enable_dlopen=no
-
-
- enable_win32_dll=no
-
-
- # Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then
- enableval=$enable_shared; p=${PACKAGE-default}
- case $enableval in
- yes) enable_shared=yes ;;
- no) enable_shared=no ;;
- *)
- enable_shared=no
- # Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
- for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	 enable_shared=yes
-	fi
- done
- IFS="$lt_save_ifs"
- ;;
- esac
-else
- enable_shared=yes
-fi
-
-
-
-
-
-
-
-
-
-
-
-# Check whether --with-pic was given.
-if test "${with_pic+set}" = set; then
- withval=$with_pic; pic_mode="$withval"
-else
- pic_mode=default
-fi
-
-
-test -z "$pic_mode" && pic_mode=default
-
-
-
-
-
-
-
- # Check whether --enable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then
- enableval=$enable_fast_install; p=${PACKAGE-default}
- case $enableval in
- yes) enable_fast_install=yes ;;
- no) enable_fast_install=no ;;
- *)
- enable_fast_install=no
- # Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
- for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	 enable_fast_install=yes
-	fi
- done
- IFS="$lt_save_ifs"
- ;;
- esac
-else
- enable_fast_install=yes
-fi
-
-
-
-
-
-
-
-
-
-
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-test -z "$LN_S" && LN_S="ln -s"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-if test -n "${ZSH_VERSION+set}" ; then
- setopt NO_GLOB_SUBST
-fi
-
-{ $as_echo "$as_me:$LINENO: checking for objdir" >&5
-$as_echo_n "checking for objdir... " >&6; }
-if test "${lt_cv_objdir+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
- lt_cv_objdir=.libs
-else
- # MS-DOS does not allow filenames that begin with a dot.
- lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
-$as_echo "$lt_cv_objdir" >&6; }
-objdir=$lt_cv_objdir
-
-
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define LT_OBJDIR "$lt_cv_objdir/"
-_ACEOF
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-case $host_os in
-aix3*)
- # AIX sometimes has problems with the GCC collect2 program. For some
- # reason, if we set the COLLECT_NAMES environment variable, the problems
- # vanish in a puff of smoke.
- if test "X${COLLECT_NAMES+set}" != Xset; then
- COLLECT_NAMES=
- export COLLECT_NAMES
- fi
- ;;
-esac
-
-# Sed substitution that helps us do robust quoting. It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='s/$["`$\\]$/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/$["`\\]$/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-# Global variables:
-ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$LD" && LD=ld
-test -z "$ac_objext" && ac_objext=o
-
-for cc_temp in $compiler""; do
- case $cc_temp in
- compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
- distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
- \-*) ;;
- *) break;;
- esac
-done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
-
-# Only perform the check for file, if the check method requires it
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-case $deplibs_check_method in
-file_magic*)
- if test "$file_magic_cmd" = '$MAGIC_CMD'; then
- { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
-$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- case $MAGIC_CMD in
-[\\/*] | ?:[\\/]*)
- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
- ;;
-*)
- lt_save_MAGIC_CMD="$MAGIC_CMD"
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
- for ac_dir in $ac_dummy; do
- IFS="$lt_save_ifs"
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/${ac_tool_prefix}file; then
- lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
- if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	 file_magic_regex=`expr "$deplibs_check_method" : "file_magic $.*$"`
-	 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	 if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	 $EGREP "$file_magic_regex" > /dev/null; then
-	 :
-	 else
-	 cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such. This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem. Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-	 fi ;;
-	esac
- fi
- break
- fi
- done
- IFS="$lt_save_ifs"
- MAGIC_CMD="$lt_save_MAGIC_CMD"
- ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-
-
-if test -z "$lt_cv_path_MAGIC_CMD"; then
- if test -n "$ac_tool_prefix"; then
- { $as_echo "$as_me:$LINENO: checking for file" >&5
-$as_echo_n "checking for file... " >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- case $MAGIC_CMD in
-[\\/*] | ?:[\\/]*)
- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
- ;;
-*)
- lt_save_MAGIC_CMD="$MAGIC_CMD"
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
- for ac_dir in $ac_dummy; do
- IFS="$lt_save_ifs"
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/file; then
- lt_cv_path_MAGIC_CMD="$ac_dir/file"
- if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	 file_magic_regex=`expr "$deplibs_check_method" : "file_magic $.*$"`
-	 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	 if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	 $EGREP "$file_magic_regex" > /dev/null; then
-	 :
-	 else
-	 cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such. This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem. Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-	 fi ;;
-	esac
- fi
- break
- fi
- done
- IFS="$lt_save_ifs"
- MAGIC_CMD="$lt_save_MAGIC_CMD"
- ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- else
- MAGIC_CMD=:
- fi
-fi
-
- fi
- ;;
-esac
-
-# Use C for the default configuration in the libtool script
-
-lt_save_CC="$CC"
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-objext=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
-
-
-
-
-
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-# Save the default compiler, since it gets overwritten when the other
-# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
-compiler_DEFAULT=$CC
-
-# save warnings/boilerplate of simple test code
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$RM conftest*
-
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$RM -r conftest*
-
-
-if test -n "$compiler"; then
-
-lt_prog_compiler_no_builtin_flag=
-
-if test "$GCC" = yes; then
- lt_prog_compiler_no_builtin_flag=' -fno-builtin'
-
- { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- lt_cv_prog_compiler_rtti_exceptions=no
- ac_outfile=conftest.$ac_objext
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="-fno-rtti -fno-exceptions"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
- # Note that $ac_compile itself does not contain backslashes and begins
- # with a dollar sign (not a hyphen), so the echo should work correctly.
- # The option is referenced via a variable to avoid confusing sed.
- lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7672: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
- echo "$as_me:7676: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
- lt_cv_prog_compiler_rtti_exceptions=yes
- fi
- fi
- $RM conftest*
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-
-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
- lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-else
- :
-fi
-
-fi
-
-
-
-
-
-
- lt_prog_compiler_wl=
-lt_prog_compiler_pic=
-lt_prog_compiler_static=
-
-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-
- if test "$GCC" = yes; then
- lt_prog_compiler_wl='-Wl,'
- lt_prog_compiler_static='-static'
-
- case $host_os in
- aix*)
- # All AIX code is PIC.
- if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static='-Bstatic'
- fi
- ;;
-
- amigaos*)
- case $host_cpu in
- powerpc)
- # see comment about AmigaOS4 .so support
- lt_prog_compiler_pic='-fPIC'
- ;;
- m68k)
- # FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
- lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
- ;;
- esac
- ;;
-
- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
- # PIC is the default for these OSes.
- ;;
-
- mingw* | cygwin* | pw32* | os2* | cegcc*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- # Although the cygwin gcc ignores -fPIC, still need this for old-style
- # (--disable-auto-import) libraries
- lt_prog_compiler_pic='-DDLL_EXPORT'
- ;;
-
- darwin* | rhapsody*)
- # PIC is the default on this platform
- # Common symbols not allowed in MH_DYLIB files
- lt_prog_compiler_pic='-fno-common'
- ;;
-
- hpux*)
- # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
- # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
- # sets the default TLS model and affects inlining.
- case $host_cpu in
- hppa*64*)
-	# +Z the default
-	;;
- *)
-	lt_prog_compiler_pic='-fPIC'
-	;;
- esac
- ;;
-
- interix[3-9]*)
- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
- # Instead, we relocate shared libraries at runtime.
- ;;
-
- msdosdjgpp*)
- # Just because we use GCC doesn't mean we suddenly get shared libraries
- # on systems that don't support them.
- lt_prog_compiler_can_build_shared=no
- enable_shared=no
- ;;
-
- *nto* | *qnx*)
- # QNX uses GNU C++, but need to define -shared option too, otherwise
- # it will coredump.
- lt_prog_compiler_pic='-fPIC -shared'
- ;;
-
- sysv4*MP*)
- if test -d /usr/nec; then
-	lt_prog_compiler_pic=-Kconform_pic
- fi
- ;;
-
- *)
- lt_prog_compiler_pic='-fPIC'
- ;;
- esac
- else
- # PORTME Check for flag to pass linker flags through the system compiler.
- case $host_os in
- aix*)
- lt_prog_compiler_wl='-Wl,'
- if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static='-Bstatic'
- else
-	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
- fi
- ;;
-
- mingw* | cygwin* | pw32* | os2* | cegcc*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- lt_prog_compiler_pic='-DDLL_EXPORT'
- ;;
-
- hpux9* | hpux10* | hpux11*)
- lt_prog_compiler_wl='-Wl,'
- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
- # not for PA HP-UX.
- case $host_cpu in
- hppa*64*|ia64*)
-	# +Z the default
-	;;
- *)
-	lt_prog_compiler_pic='+Z'
-	;;
- esac
- # Is there a better lt_prog_compiler_static that works with the bundled CC?
- lt_prog_compiler_static='${wl}-a ${wl}archive'
- ;;
-
- irix5* | irix6* | nonstopux*)
- lt_prog_compiler_wl='-Wl,'
- # PIC (with -KPIC) is the default.
- lt_prog_compiler_static='-non_shared'
- ;;
-
- linux* | k*bsd*-gnu)
- case $cc_basename in
- # old Intel for x86_64 which still supported -KPIC.
- ecc*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-KPIC'
-	lt_prog_compiler_static='-static'
- ;;
- # icc used to be incompatible with GCC.
- # ICC 10 doesn't accept -KPIC any more.
- icc* | ifort*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-fPIC'
-	lt_prog_compiler_static='-static'
- ;;
- # Lahey Fortran 8.1.
- lf95*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='--shared'
-	lt_prog_compiler_static='--static'
-	;;
- pgcc* | pgf77* | pgf90* | pgf95*)
- # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-fpic'
-	lt_prog_compiler_static='-Bstatic'
- ;;
- ccc*)
- lt_prog_compiler_wl='-Wl,'
- # All Alpha code is PIC.
- lt_prog_compiler_static='-non_shared'
- ;;
- xl*)
-	# IBM XL C 8.0/Fortran 10.1 on PPC
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-qpic'
-	lt_prog_compiler_static='-qstaticlink'
-	;;
- *)
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)
-	 # Sun C 5.9
-	 lt_prog_compiler_pic='-KPIC'
-	 lt_prog_compiler_static='-Bstatic'
-	 lt_prog_compiler_wl='-Wl,'
-	 ;;
-	*Sun\ F*)
-	 # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	 lt_prog_compiler_pic='-KPIC'
-	 lt_prog_compiler_static='-Bstatic'
-	 lt_prog_compiler_wl=''
-	 ;;
-	esac
-	;;
- esac
- ;;
-
- newsos6)
- lt_prog_compiler_pic='-KPIC'
- lt_prog_compiler_static='-Bstatic'
- ;;
-
- *nto* | *qnx*)
- # QNX uses GNU C++, but need to define -shared option too, otherwise
- # it will coredump.
- lt_prog_compiler_pic='-fPIC -shared'
- ;;
-
- osf3* | osf4* | osf5*)
- lt_prog_compiler_wl='-Wl,'
- # All OSF/1 code is PIC.
- lt_prog_compiler_static='-non_shared'
- ;;
-
- rdos*)
- lt_prog_compiler_static='-non_shared'
- ;;
-
- solaris*)
- lt_prog_compiler_pic='-KPIC'
- lt_prog_compiler_static='-Bstatic'
- case $cc_basename in
- f77* | f90* | f95*)
-	lt_prog_compiler_wl='-Qoption ld ';;
- *)
-	lt_prog_compiler_wl='-Wl,';;
- esac
- ;;
-
- sunos4*)
- lt_prog_compiler_wl='-Qoption ld '
- lt_prog_compiler_pic='-PIC'
- lt_prog_compiler_static='-Bstatic'
- ;;
-
- sysv4 | sysv4.2uw2* | sysv4.3*)
- lt_prog_compiler_wl='-Wl,'
- lt_prog_compiler_pic='-KPIC'
- lt_prog_compiler_static='-Bstatic'
- ;;
-
- sysv4*MP*)
- if test -d /usr/nec ;then
-	lt_prog_compiler_pic='-Kconform_pic'
-	lt_prog_compiler_static='-Bstatic'
- fi
- ;;
-
- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
- lt_prog_compiler_wl='-Wl,'
- lt_prog_compiler_pic='-KPIC'
- lt_prog_compiler_static='-Bstatic'
- ;;
-
- unicos*)
- lt_prog_compiler_wl='-Wl,'
- lt_prog_compiler_can_build_shared=no
- ;;
-
- uts4*)
- lt_prog_compiler_pic='-pic'
- lt_prog_compiler_static='-Bstatic'
- ;;
-
- *)
- lt_prog_compiler_can_build_shared=no
- ;;
- esac
- fi
-
-case $host_os in
- # For platforms which do not support PIC, -DPIC is meaningless:
- *djgpp*)
- lt_prog_compiler_pic=
- ;;
- *)
- lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
- ;;
-esac
-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
-$as_echo "$lt_prog_compiler_pic" >&6; }
-
-
-
-
-
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic"; then
- { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- lt_cv_prog_compiler_pic_works=no
- ac_outfile=conftest.$ac_objext
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
- # Note that $ac_compile itself does not contain backslashes and begins
- # with a dollar sign (not a hyphen), so the echo should work correctly.
- # The option is referenced via a variable to avoid confusing sed.
- lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8011: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
- echo "$as_me:8015: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
- lt_cv_prog_compiler_pic_works=yes
- fi
- fi
- $RM conftest*
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
-$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
-
-if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
- case $lt_prog_compiler_pic in
- "" | " "*) ;;
- *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
- esac
-else
- lt_prog_compiler_pic=
- lt_prog_compiler_can_build_shared=no
-fi
-
-fi
-
-
-
-
-
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if test "${lt_cv_prog_compiler_static_works+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- lt_cv_prog_compiler_static_works=no
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
- echo "$lt_simple_link_test_code" > conftest.$ac_ext
- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
- # The linker can only warn and ignore the option if not recognized
- # So say no if there are warnings
- if test -s conftest.err; then
- # Append any errors to the config.log.
- cat conftest.err 1>&5
- $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if diff conftest.exp conftest.er2 >/dev/null; then
- lt_cv_prog_compiler_static_works=yes
- fi
- else
- lt_cv_prog_compiler_static_works=yes
- fi
- fi
- $RM -r conftest*
- LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
-$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
-
-if test x"$lt_cv_prog_compiler_static_works" = xyes; then
- :
-else
- lt_prog_compiler_static=
-fi
-
-
-
-
-
-
-
- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- lt_cv_prog_compiler_c_o=no
- $RM -r conftest 2>/dev/null
- mkdir conftest
- cd conftest
- mkdir out
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- lt_compiler_flag="-o out/conftest2.$ac_objext"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
- # Note that $ac_compile itself does not contain backslashes and begins
- # with a dollar sign (not a hyphen), so the echo should work correctly.
- lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8116: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
- echo "$as_me:8120: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
- $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
- if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
- lt_cv_prog_compiler_c_o=yes
- fi
- fi
- chmod u+w . 2>&5
- $RM conftest*
- # SGI C++ compiler will create directory out/ii_files/ for
- # template instantiation
- test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
- $RM out/* && rmdir out
- cd ..
- $RM -r conftest
- $RM conftest*
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-
-
-
-
-
-
- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- lt_cv_prog_compiler_c_o=no
- $RM -r conftest 2>/dev/null
- mkdir conftest
- cd conftest
- mkdir out
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- lt_compiler_flag="-o out/conftest2.$ac_objext"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
- # Note that $ac_compile itself does not contain backslashes and begins
- # with a dollar sign (not a hyphen), so the echo should work correctly.
- lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8171: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
- echo "$as_me:8175: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
- $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
- if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
- lt_cv_prog_compiler_c_o=yes
- fi
- fi
- chmod u+w . 2>&5
- $RM conftest*
- # SGI C++ compiler will create directory out/ii_files/ for
- # template instantiation
- test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
- $RM out/* && rmdir out
- cd ..
- $RM -r conftest
- $RM conftest*
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-
-
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
- # do not overwrite the value of need_locks provided by the user
- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-$as_echo_n "checking if we can lock with hard links... " >&6; }
- hard_links=yes
- $RM conftest*
- ln conftest.a conftest.b 2>/dev/null && hard_links=no
- touch conftest.a
- ln conftest.a conftest.b 2>&5 || hard_links=no
- ln conftest.a conftest.b 2>/dev/null && hard_links=no
- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
-$as_echo "$hard_links" >&6; }
- if test "$hard_links" = no; then
- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
- need_locks=warn
- fi
-else
- need_locks=no
-fi
-
-
-
-
-
-
- { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-
- runpath_var=
- allow_undefined_flag=
- always_export_symbols=no
- archive_cmds=
- archive_expsym_cmds=
- compiler_needs_object=no
- enable_shared_with_static_runtimes=no
- export_dynamic_flag_spec=
- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- hardcode_automatic=no
- hardcode_direct=no
- hardcode_direct_absolute=no
- hardcode_libdir_flag_spec=
- hardcode_libdir_flag_spec_ld=
- hardcode_libdir_separator=
- hardcode_minus_L=no
- hardcode_shlibpath_var=unsupported
- inherit_rpath=no
- link_all_deplibs=unknown
- module_cmds=
- module_expsym_cmds=
- old_archive_from_new_cmds=
- old_archive_from_expsyms_cmds=
- thread_safe_flag_spec=
- whole_archive_flag_spec=
- # include_expsyms should be a list of space-separated symbols to be *always*
- # included in the symbol list
- include_expsyms=
- # exclude_expsyms can be an extended regexp of symbols to exclude
- # it will be wrapped by ` (' and `)$', so one must not match beginning or
- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
- # as well as any symbol that contains `d'.
- exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
- # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
- # platforms (ab)use it in PIC code, but their linkers get confused if
- # the symbol is explicitly referenced. Since portable code cannot
- # rely on this symbol name, it's probably fine to never include it in
- # preloaded symbol tables.
- # Exclude shared library initialization/finalization symbols.
- extract_expsyms_cmds=
-
- case $host_os in
- cygwin* | mingw* | pw32* | cegcc*)
- # FIXME: the MSVC++ port hasn't been tested in a loooong time
- # When not using gcc, we currently assume that we are using
- # Microsoft Visual C++.
- if test "$GCC" != yes; then
- with_gnu_ld=no
- fi
- ;;
- interix*)
- # we just hope/assume this is gcc and not c89 (= MSVC++)
- with_gnu_ld=yes
- ;;
- openbsd*)
- with_gnu_ld=no
- ;;
- esac
-
- ld_shlibs=yes
- if test "$with_gnu_ld" = yes; then
- # If archive_cmds runs LD, not CC, wlarc should be empty
- wlarc='${wl}'
-
- # Set some defaults for GNU ld with shared library support. These
- # are reset later if shared libraries are not supported. Putting them
- # here allows them to be overridden if necessary.
- runpath_var=LD_RUN_PATH
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
- export_dynamic_flag_spec='${wl}--export-dynamic'
- # ancient GNU ld didn't support --whole-archive et. al.
- if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
- whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
- else
- whole_archive_flag_spec=
- fi
- supports_anon_versioning=no
- case `$LD -v 2>&1` in
- *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
- *\ 2.11.*) ;; # other 2.11 versions
- *) supports_anon_versioning=yes ;;
- esac
-
- # See if GNU ld supports shared libraries.
- case $host_os in
- aix[3-9]*)
- # On AIX/PPC, the GNU linker is very broken
- if test "$host_cpu" != ia64; then
-	ld_shlibs=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support. If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-_LT_EOF
- fi
- ;;
-
- amigaos*)
- case $host_cpu in
- powerpc)
- # see comment about AmigaOS4 .so support
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds=''
- ;;
- m68k)
- archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
- hardcode_libdir_flag_spec='-L$libdir'
- hardcode_minus_L=yes
- ;;
- esac
- ;;
-
- beos*)
- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	allow_undefined_flag=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined. This deserves some investigation. FIXME
-	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- else
-	ld_shlibs=no
- fi
- ;;
-
- cygwin* | mingw* | pw32* | cegcc*)
- # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
- # as there is no search path for DLLs.
- hardcode_libdir_flag_spec='-L$libdir'
- allow_undefined_flag=unsupported
- always_export_symbols=no
- enable_shared_with_static_runtimes=yes
- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]$[^ ]*$/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-
- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	 cp $export_symbols $output_objdir/$soname.def;
-	else
-	 echo EXPORTS > $output_objdir/$soname.def;
-	 cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- else
-	ld_shlibs=no
- fi
- ;;
-
- interix[3-9]*)
- hardcode_direct=no
- hardcode_shlibpath_var=no
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
- export_dynamic_flag_spec='${wl}-E'
- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
- # Instead, shared libraries are loaded at an image base (0x10000000 by
- # default) and relocated if they conflict, which is a slow very memory
- # consuming and fragmenting process. To avoid this, we pick a random,
- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
- # time. Moving up from 0x10000000 also allows more sbrk(2) space.
- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- ;;
-
- gnu* | linux* | tpf* | k*bsd*-gnu)
- tmp_diet=no
- if test "$host_os" = linux-dietlibc; then
-	case $cc_basename in
-	 diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
-	esac
- fi
- if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-	 && test "$tmp_diet" = no
- then
-	tmp_addflag=
-	tmp_sharedflag='-shared'
-	case $cc_basename,$host_cpu in
- pgcc*)				# Portland Group C compiler
-	 whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-	 tmp_addflag=' $pic_flag'
-	 ;;
-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-	 whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-	 tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
-	 tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	 tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	 tmp_addflag=' -nofor_main' ;;
-	lf95*)				# Lahey Fortran 8.1
-	 whole_archive_flag_spec=
-	 tmp_sharedflag='--shared' ;;
-	xl[cC]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
-	 tmp_sharedflag='-qmkshrobj'
-	 tmp_addflag= ;;
-	esac
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)			# Sun C 5.9
-	 whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-	 compiler_needs_object=yes
-	 tmp_sharedflag='-G' ;;
-	*Sun\ F*)			# Sun Fortran 8.3
-	 tmp_sharedflag='-G' ;;
-	esac
-	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
- if test "x$supports_anon_versioning" = xyes; then
- archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-	 cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
-	 echo "local: *; };" >> $output_objdir/$libname.ver~
-	 $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- fi
-
-	case $cc_basename in
-	xlf*)
-	 # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-	 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-	 hardcode_libdir_flag_spec=
-	 hardcode_libdir_flag_spec_ld='-rpath $libdir'
-	 archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
-	 if test "x$supports_anon_versioning" = xyes; then
-	 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-	 cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
-	 echo "local: *; };" >> $output_objdir/$libname.ver~
-	 $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-	 fi
-	 ;;
-	esac
- else
- ld_shlibs=no
- fi
- ;;
-
- netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
- else
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- fi
- ;;
-
- solaris*)
- if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-	ld_shlibs=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems. Therefore, libtool
-*** is disabling shared libraries support. We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer. Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
- elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- else
-	ld_shlibs=no
- fi
- ;;
-
- sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
- case `$LD -v 2>&1` in
- *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-	ld_shlibs=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems. Therefore, libtool
-*** is disabling shared libraries support. We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-	;;
-	*)
-	 # For security reasons, it is highly recommended that you always
-	 # use absolute paths for naming shared libraries, and exclude the
-	 # DT_RUNPATH tag from executables and libraries. But doing so
-	 # requires that you compile everything twice, which is a pain.
-	 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-	 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	 else
-	 ld_shlibs=no
-	 fi
-	;;
- esac
- ;;
-
- sunos4*)
- archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- wlarc=
- hardcode_direct=yes
- hardcode_shlibpath_var=no
- ;;
-
- *)
- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- else
-	ld_shlibs=no
- fi
- ;;
- esac
-
- if test "$ld_shlibs" = no; then
- runpath_var=
- hardcode_libdir_flag_spec=
- export_dynamic_flag_spec=
- whole_archive_flag_spec=
- fi
- else
- # PORTME fill in a description of your system's linker (not GNU ld)
- case $host_os in
- aix3*)
- allow_undefined_flag=unsupported
- always_export_symbols=yes
- archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
- # Note: this linker hardcodes the directories in LIBPATH if there
- # are no directories specified by -L.
- hardcode_minus_L=yes
- if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	hardcode_direct=unsupported
- fi
- ;;
-
- aix[4-9]*)
- if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
- else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	 export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	else
-	 export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
-	 for ld_flag in $LDFLAGS; do
-	 if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-	 aix_use_runtimelinking=yes
-	 break
-	 fi
-	 done
-	 ;;
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
- fi
-
- # When large executables or shared objects are built, AIX ld can
- # have problems creating the table of contents. If linking a library
- # or program results in "error TOC overflow" add -mminimal-toc to
- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
- archive_cmds=''
- hardcode_direct=yes
- hardcode_direct_absolute=yes
- hardcode_libdir_separator=':'
- link_all_deplibs=yes
- file_list_spec='${wl}-f,'
-
- if test "$GCC" = yes; then
-	case $host_os in aix4.[012]|aix4.[012].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	 collect2name=`${CC} -print-prog-name=collect2`
-	 if test -f "$collect2name" &&
-	 strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	 then
-	 # We have reworked collect2
-	 :
-	 else
-	 # We have old collect2
-	 hardcode_direct=unsupported
-	 # It fails to find uninstalled libraries when the uninstalled
-	 # path is not listed in the libpath. Setting hardcode_minus_L
-	 # to unsupported forces relinking
-	 hardcode_minus_L=yes
-	 hardcode_libdir_flag_spec='-L$libdir'
-	 hardcode_libdir_separator=
-	 fi
-	 ;;
-	esac
-	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	 shared_flag="$shared_flag "'${wl}-G'
-	fi
-	link_all_deplibs=no
- else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	 shared_flag='-G'
-	else
-	 if test "$aix_use_runtimelinking" = yes; then
-	 shared_flag='${wl}-G'
-	 else
-	 shared_flag='${wl}-bM:SRE'
-	 fi
-	fi
- fi
-
- export_dynamic_flag_spec='${wl}-bexpall'
- # It seems that -bexpall does not export symbols beginning with
- # underscore (_), so it is better to generate a list of symbols to export.
- always_export_symbols=yes
- if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	allow_undefined_flag='-berok'
- # Determine the default libpath from the value encoded in an
- # empty executable.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
- }; then
-
-lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
-	/^0/ {
-	 s/^0 *$.*$$/\1/
-	 p
-	}
- }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
- archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
- else
-	if test "$host_cpu" = ia64; then
-	 hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-	 allow_undefined_flag="-z nodefs"
-	 archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an
-	 # empty executable.
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
- }; then
-
-lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
-	/^0/ {
-	 s/^0 *$.*$$/\1/
-	 p
-	}
- }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-	 # Warning - without using the other run time loading flags,
-	 # -berok will link without error, but may produce a broken library.
-	 no_undefined_flag=' ${wl}-bernotok'
-	 allow_undefined_flag=' ${wl}-berok'
-	 # Exported symbols can be pulled into shared objects from archives
-	 whole_archive_flag_spec='$convenience'
-	 archive_cmds_need_lc=yes
-	 # This is similar to how AIX traditionally builds its shared libraries.
-	 archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
- fi
- ;;
-
- amigaos*)
- case $host_cpu in
- powerpc)
- # see comment about AmigaOS4 .so support
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds=''
- ;;
- m68k)
- archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
- hardcode_libdir_flag_spec='-L$libdir'
- hardcode_minus_L=yes
- ;;
- esac
- ;;
-
- bsdi[45]*)
- export_dynamic_flag_spec=-rdynamic
- ;;
-
- cygwin* | mingw* | pw32* | cegcc*)
- # When not using gcc, we currently assume that we are using
- # Microsoft Visual C++.
- # hardcode_libdir_flag_spec is actually meaningless, as there is
- # no search path for DLLs.
- hardcode_libdir_flag_spec=' '
- allow_undefined_flag=unsupported
- # Tell ltmain to make .lib files, not .a files.
- libext=lib
- # Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
- # FIXME: Setting linknames here is a bad hack.
- archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
- # The linker will automatically build a .lib file if we build a DLL.
- old_archive_from_new_cmds='true'
- # FIXME: Should let the user specify the lib program.
- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
- fix_srcfile_path='`cygpath -w "$srcfile"`'
- enable_shared_with_static_runtimes=yes
- ;;
-
- darwin* | rhapsody*)
-
-
- archive_cmds_need_lc=no
- hardcode_direct=no
- hardcode_automatic=yes
- hardcode_shlibpath_var=unsupported
- whole_archive_flag_spec=''
- link_all_deplibs=yes
- allow_undefined_flag="$_lt_dar_allow_undefined"
- case $cc_basename in
- ifort*) _lt_dar_can_shared=yes ;;
- *) _lt_dar_can_shared=$GCC ;;
- esac
- if test "$_lt_dar_can_shared" = "yes"; then
- output_verbose_link_cmd=echo
- archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
- module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
- module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-
- else
- ld_shlibs=no
- fi
-
- ;;
-
- dgux*)
- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec='-L$libdir'
- hardcode_shlibpath_var=no
- ;;
-
- freebsd1*)
- ld_shlibs=no
- ;;
-
- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
- # support. Future versions do this automatically, but an explicit c++rt0.o
- # does not break anything, and helps significantly (at the cost of a little
- # extra space).
- freebsd2.2*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
- hardcode_libdir_flag_spec='-R$libdir'
- hardcode_direct=yes
- hardcode_shlibpath_var=no
- ;;
-
- # Unfortunately, older versions of FreeBSD 2 do not have this feature.
- freebsd2*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- hardcode_direct=yes
- hardcode_minus_L=yes
- hardcode_shlibpath_var=no
- ;;
-
- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | dragonfly*)
- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec='-R$libdir'
- hardcode_direct=yes
- hardcode_shlibpath_var=no
- ;;
-
- hpux9*)
- if test "$GCC" = yes; then
-	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
- else
-	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
- fi
- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator=:
- hardcode_direct=yes
-
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- hardcode_minus_L=yes
- export_dynamic_flag_spec='${wl}-E'
- ;;
-
- hpux10*)
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- else
-	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
- fi
- if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
-	hardcode_libdir_separator=:
-	hardcode_direct=yes
-	hardcode_direct_absolute=yes
-	export_dynamic_flag_spec='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L=yes
- fi
- ;;
-
- hpux11*)
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	 ;;
-	ia64*)
-	 archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	 ;;
-	*)
-	 archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	 ;;
-	esac
- else
-	case $host_cpu in
-	hppa*64*)
-	 archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	 ;;
-	ia64*)
-	 archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	 ;;
-	*)
-	 archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	 ;;
-	esac
- fi
- if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	 hardcode_direct=no
-	 hardcode_shlibpath_var=no
-	 ;;
-	*)
-	 hardcode_direct=yes
-	 hardcode_direct_absolute=yes
-	 export_dynamic_flag_spec='${wl}-E'
-
-	 # hardcode_minus_L: Not really in the search PATH,
-	 # but as the default location of the library.
-	 hardcode_minus_L=yes
-	 ;;
-	esac
- fi
- ;;
-
- irix5* | irix6* | nonstopux*)
- if test "$GCC" = yes; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	# Try to use the -exported_symbol ld option, if it does not
-	# work, assume that -exports_file does not work either and
-	# implicitly export all symbols.
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
- cat >conftest.$ac_ext <<_ACEOF
-int foo(void) {}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
- }; then
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LDFLAGS="$save_LDFLAGS"
- else
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
- fi
- archive_cmds_need_lc='no'
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
- hardcode_libdir_separator=:
- inherit_rpath=yes
- link_all_deplibs=yes
- ;;
-
- netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
- else
-	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
- fi
- hardcode_libdir_flag_spec='-R$libdir'
- hardcode_direct=yes
- hardcode_shlibpath_var=no
- ;;
-
- newsos6)
- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_direct=yes
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
- hardcode_libdir_separator=:
- hardcode_shlibpath_var=no
- ;;
-
- *nto* | *qnx*)
- ;;
-
- openbsd*)
- if test -f /usr/libexec/ld.so; then
-	hardcode_direct=yes
-	hardcode_shlibpath_var=no
-	hardcode_direct_absolute=yes
-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	 archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	 archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	 hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	 export_dynamic_flag_spec='${wl}-E'
-	else
-	 case $host_os in
-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	 archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	 hardcode_libdir_flag_spec='-R$libdir'
-	 ;;
-	 *)
-	 archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	 hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	 ;;
-	 esac
-	fi
- else
-	ld_shlibs=no
- fi
- ;;
-
- os2*)
- hardcode_libdir_flag_spec='-L$libdir'
- hardcode_minus_L=yes
- allow_undefined_flag=unsupported
- archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
- old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
- ;;
-
- osf3*)
- if test "$GCC" = yes; then
-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- else
-	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
- fi
- archive_cmds_need_lc='no'
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
- hardcode_libdir_separator=:
- ;;
-
- osf4* | osf5*)	# as osf3* with the addition of -msym flag
- if test "$GCC" = yes; then
-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
- else
-	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	hardcode_libdir_flag_spec='-rpath $libdir'
- fi
- archive_cmds_need_lc='no'
- hardcode_libdir_separator=:
- ;;
-
- solaris*)
- no_undefined_flag=' -z defs'
- if test "$GCC" = yes; then
-	wlarc='${wl}'
-	archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	 $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
- else
-	case `$CC -V 2>&1` in
-	*"Compilers 5.0"*)
-	 wlarc=''
-	 archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	 $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
-	 ;;
-	*)
-	 wlarc='${wl}'
-	 archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-	 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	 $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-	 ;;
-	esac
- fi
- hardcode_libdir_flag_spec='-R$libdir'
- hardcode_shlibpath_var=no
- case $host_os in
- solaris2.[0-5] | solaris2.[0-5].*) ;;
- *)
-	# The compiler driver will combine and reorder linker options,
-	# but understands `-z linker_flag'. GCC discards it without `$wl',
-	# but is careful enough not to reorder.
-	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test "$GCC" = yes; then
-	 whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	else
-	 whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
-	fi
-	;;
- esac
- link_all_deplibs=yes
- ;;
-
- sunos4*)
- if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
- else
-	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
- fi
- hardcode_libdir_flag_spec='-L$libdir'
- hardcode_direct=yes
- hardcode_minus_L=yes
- hardcode_shlibpath_var=no
- ;;
-
- sysv4)
- case $host_vendor in
-	sni)
-	 archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	 hardcode_direct=yes # is this really true???
-	;;
-	siemens)
-	 ## LD is ld it makes a PLAMLIB
-	 ## CC just makes a GrossModule.
-	 archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	 reload_cmds='$CC -r -o $output$reload_objs'
-	 hardcode_direct=no
- ;;
-	motorola)
-	 archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	 hardcode_direct=no #Motorola manual says yes, but my tests say they lie
-	;;
- esac
- runpath_var='LD_RUN_PATH'
- hardcode_shlibpath_var=no
- ;;
-
- sysv4.3*)
- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_shlibpath_var=no
- export_dynamic_flag_spec='-Bexport'
- ;;
-
- sysv4*MP*)
- if test -d /usr/nec; then
-	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	hardcode_shlibpath_var=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	ld_shlibs=yes
- fi
- ;;
-
- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
- no_undefined_flag='${wl}-z,text'
- archive_cmds_need_lc=no
- hardcode_shlibpath_var=no
- runpath_var='LD_RUN_PATH'
-
- if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- else
-	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- fi
- ;;
-
- sysv5* | sco3.2v5* | sco5v6*)
- # Note: We can NOT use -z defs as we might desire, because we do not
- # link with -lc, and that would cause any symbols used from libc to
- # always be unresolved, which means just about no library would
- # ever link correctly. If we're not using GNU ld we use -z text
- # though, which does catch some bad symbols but isn't as heavy-handed
- # as -z defs.
- no_undefined_flag='${wl}-z,text'
- allow_undefined_flag='${wl}-z,nodefs'
- archive_cmds_need_lc=no
- hardcode_shlibpath_var=no
- hardcode_libdir_flag_spec='${wl}-R,$libdir'
- hardcode_libdir_separator=':'
- link_all_deplibs=yes
- export_dynamic_flag_spec='${wl}-Bexport'
- runpath_var='LD_RUN_PATH'
-
- if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- else
-	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- fi
- ;;
-
- uts4*)
- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec='-L$libdir'
- hardcode_shlibpath_var=no
- ;;
-
- *)
- ld_shlibs=no
- ;;
- esac
-
- if test x$host_vendor = xsni; then
- case $host in
- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	export_dynamic_flag_spec='${wl}-Blargedynsym'
-	;;
- esac
- fi
- fi
-
-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
-$as_echo "$ld_shlibs" >&6; }
-test "$ld_shlibs" = no && can_build_shared=no
-
-with_gnu_ld=$with_gnu_ld
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc" in
-x|xyes)
- # Assume -lc should be added
- archive_cmds_need_lc=yes
-
- if test "$enable_shared" = yes && test "$GCC" = yes; then
- case $archive_cmds in
- *'~'*)
- # FIXME: we may have to deal with multi-command sequences.
- ;;
- '$CC '*)
- # Test whether the compiler implicitly links with -lc since on some
- # systems, -lgcc has to come before -lc. If gcc already passes -lc
- # to ld, don't add -lc before -lgcc.
- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
- $RM conftest*
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } 2>conftest.err; then
- soname=conftest
- lib=conftest
- libobjs=conftest.$ac_objext
- deplibs=
- wl=$lt_prog_compiler_wl
-	pic_flag=$lt_prog_compiler_pic
- compiler_flags=-v
- linker_flags=-v
- verstring=
- output_objdir=.
- libname=conftest
- lt_save_allow_undefined_flag=$allow_undefined_flag
- allow_undefined_flag=
- if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
- (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
- then
-	 archive_cmds_need_lc=no
- else
-	 archive_cmds_need_lc=yes
- fi
- allow_undefined_flag=$lt_save_allow_undefined_flag
- else
- cat conftest.err 1>&5
- fi
- $RM conftest*
- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
-$as_echo "$archive_cmds_need_lc" >&6; }
- ;;
- esac
- fi
- ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-$as_echo_n "checking dynamic linker characteristics... " >&6; }
-
-if test "$GCC" = yes; then
- case $host_os in
- darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
- *) lt_awk_arg="/^libraries:/" ;;
- esac
- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
- # if the path contains ";" then we assume it to be the separator
- # otherwise default to the standard path separator (i.e. ":") - it is
- # assumed that no part of a normal pathname contains ";" but that should
- # okay in the real world where ";" in dirpaths is itself problematic.
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
- else
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
- # Ok, now we have the path, separated by spaces, we can step through it
- # and add multilib dir if necessary.
- lt_tmp_lt_search_path_spec=
- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
- for lt_sys_path in $lt_search_path_spec; do
- if test -d "$lt_sys_path/$lt_multi_os_dir"; then
- lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
- else
- test -d "$lt_sys_path" && \
-	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
- fi
- done
- lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
-BEGIN {RS=" "; FS="/|\n";} {
- lt_foo="";
- lt_count=0;
- for (lt_i = NF; lt_i > 0; lt_i--) {
- if ($lt_i != "" && $lt_i != ".") {
- if ($lt_i == "..") {
- lt_count++;
- } else {
- if (lt_count == 0) {
- lt_foo="/" $lt_i lt_foo;
- } else {
- lt_count--;
- }
- }
- }
- }
- if (lt_foo != "") { lt_freq[lt_foo]++; }
- if (lt_freq[lt_foo] == 1) { print lt_foo; }
-}'`
- sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
-else
- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
- shlibpath_var=LIBPATH
-
- # AIX 3 has no versioning support, so we append a major version to the name.
- soname_spec='${libname}${release}${shared_ext}$major'
- ;;
-
-aix[4-9]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- hardcode_into_libs=yes
- if test "$host_cpu" = ia64; then
- # AIX 5 supports IA64
- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- else
- # With GCC up to 2.95.x, collect2 would create an import file
- # for dependence libraries. The import file would start with
- # the line `#! .'. This would cause the generated library to
- # depend on `.', always an invalid library. This was fixed in
- # development snapshots of GCC prior to 3.0.
- case $host_os in
- aix4 | aix4.[01] | aix4.[01].*)
- if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	 echo ' yes '
-	 echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
-	:
- else
-	can_build_shared=no
- fi
- ;;
- esac
- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
- # soname into executable. Probably we can add versioning support to
- # collect2, so additional links can be useful in future.
- if test "$aix_use_runtimelinking" = yes; then
- # If using run time linking (on AIX 4.2 or later) use lib<name>.so
- # instead of lib<name>.a to let people know that these are not
- # typical AIX shared libraries.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- else
- # We preserve .a as extension for shared libraries through AIX4.2
- # and later when we are not doing run time linking.
- library_names_spec='${libname}${release}.a $libname.a'
- soname_spec='${libname}${release}${shared_ext}$major'
- fi
- shlibpath_var=LIBPATH
- fi
- ;;
-
-amigaos*)
- case $host_cpu in
- powerpc)
- # Since July 2007 AmigaOS4 officially supports .so libraries.
- # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- ;;
- m68k)
- library_names_spec='$libname.ixlibrary $libname.a'
- # Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/$[^/]*$\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
- ;;
- esac
- ;;
-
-beos*)
- library_names_spec='${libname}${shared_ext}'
- dynamic_linker="$host_os ld.so"
- shlibpath_var=LIBRARY_PATH
- ;;
-
-bsdi[45]*)
- version_type=linux
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
- sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
- # the default ld.so.conf also contains /usr/contrib/lib and
- # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
- # libtool to hard-code these into programs
- ;;
-
-cygwin* | mingw* | pw32* | cegcc*)
- version_type=windows
- shrext_cmds=".dll"
- need_version=no
- need_lib_prefix=no
-
- case $GCC,$host_os in
- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
- library_names_spec='$libname.dll.a'
- # DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
- dldir=$destdir/`dirname \$dlpath`~
- test -d \$dldir || mkdir -p \$dldir~
- $install_prog $dir/$dlname \$dldir/$dlname~
- chmod a+x \$dldir/$dlname~
- if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
- eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
- fi'
- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
- dlpath=$dir/\$dldll~
- $RM \$dlpath'
- shlibpath_overrides_runpath=yes
-
- case $host_os in
- cygwin*)
- # Cygwin DLLs use 'cyg' prefix rather than 'lib'
- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
- ;;
- mingw* | cegcc*)
- # MinGW DLLs use traditional 'lib' prefix
- soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
- # It is most probably a Windows format PATH printed by
- # mingw gcc, but we are running on Cygwin. Gcc prints its search
- # path with ; separators, and with drive letters. We can handle the
- # drive letters (cygwin fileutils understands them), so leave them,
- # especially as we might pass files found there to a mingw objdump,
- # which wouldn't understand a cygwinified path. Ahh.
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
- else
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
- ;;
- pw32*)
- # pw32 DLLs use 'pw' prefix rather than 'lib'
- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- ;;
- esac
- ;;
-
- *)
- library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
- ;;
- esac
- dynamic_linker='Win32 ld.exe'
- # FIXME: first we should search . and the directory the executable is in
- shlibpath_var=PATH
- ;;
-
-darwin* | rhapsody*)
- dynamic_linker="$host_os dyld"
- version_type=darwin
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
- soname_spec='${libname}${release}${major}$shared_ext'
- shlibpath_overrides_runpath=yes
- shlibpath_var=DYLD_LIBRARY_PATH
- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-
- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
- ;;
-
-dgux*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-
-freebsd1*)
- dynamic_linker=no
- ;;
-
-freebsd* | dragonfly*)
- # DragonFly does not have aout. When/if they implement a new
- # versioning mechanism, adjust this.
- if test -x /usr/bin/objformat; then
- objformat=`/usr/bin/objformat`
- else
- case $host_os in
- freebsd[123]*) objformat=aout ;;
- *) objformat=elf ;;
- esac
- fi
- version_type=freebsd-$objformat
- case $version_type in
- freebsd-elf*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- need_version=no
- need_lib_prefix=no
- ;;
- freebsd-*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
- need_version=yes
- ;;
- esac
- shlibpath_var=LD_LIBRARY_PATH
- case $host_os in
- freebsd2*)
- shlibpath_overrides_runpath=yes
- ;;
- freebsd3.[01]* | freebsdelf3.[01]*)
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
- freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
- freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
- *) # from 4.6 on, and DragonFly
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
- esac
- ;;
-
-gnu*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- hardcode_into_libs=yes
- ;;
-
-hpux9* | hpux10* | hpux11*)
- # Give a soname corresponding to the major version so that dld.sl refuses to
- # link against other versions.
- version_type=sunos
- need_lib_prefix=no
- need_version=no
- case $host_cpu in
- ia64*)
- shrext_cmds='.so'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.so"
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- if test "X$HPUX_IA64_MODE" = X32; then
- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
- else
- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
- fi
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- hppa*64*)
- shrext_cmds='.sl'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- *)
- shrext_cmds='.sl'
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=SHLIB_PATH
- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- ;;
- esac
- # HP-UX runs *really* slowly unless shared libraries are mode 555.
- postinstall_cmds='chmod 555 $lib'
- ;;
-
-interix[3-9]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-
-irix5* | irix6* | nonstopux*)
- case $host_os in
- nonstopux*) version_type=nonstopux ;;
- *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
- esac
- need_lib_prefix=no
- need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
- case $host_os in
- irix5* | nonstopux*)
- libsuff= shlibsuff=
- ;;
- *)
- case $LD in # libtool.m4 will add one of these switches to LD
- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
- libsuff= shlibsuff= libmagic=32-bit;;
- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
- libsuff=32 shlibsuff=N32 libmagic=N32;;
- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
- libsuff=64 shlibsuff=64 libmagic=64-bit;;
- *) libsuff= shlibsuff= libmagic=never-match;;
- esac
- ;;
- esac
- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
- shlibpath_overrides_runpath=no
- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
- hardcode_into_libs=yes
- ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
- dynamic_linker=no
- ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- # Some binutils ld are patched to set DT_RUNPATH
- save_LDFLAGS=$LDFLAGS
- save_libdir=$libdir
- eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
- LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
- }; then
- if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
- shlibpath_overrides_runpath=yes
-fi
-
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LDFLAGS=$save_LDFLAGS
- libdir=$save_libdir
-
- # This implies no fast_install, which is unacceptable.
- # Some rework will be needed to allow for fast_install
- # before this can be enabled.
- hardcode_into_libs=yes
-
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
- fi
-
- # We used to test for /lib/ld.so.1 and disable shared libraries on
- # powerpc, because MkLinux only supported shared libraries with the
- # GNU dynamic linker. Since this was broken with cross compilers,
- # most powerpc-linux boxes support dynamic linking these days and
- # people can always --disable-shared, the test was removed, and we
- # assume the GNU/Linux dynamic linker is in use.
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
-netbsd*)
- version_type=sunos
- need_lib_prefix=no
- need_version=no
- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- dynamic_linker='NetBSD (a.out) ld.so'
- else
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- dynamic_linker='NetBSD ld.elf_so'
- fi
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
-
-newsos6)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- ;;
-
-*nto* | *qnx*)
- version_type=qnx
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='ldqnx.so'
- ;;
-
-openbsd*)
- version_type=sunos
- sys_lib_dlsearch_path_spec="/usr/lib"
- need_lib_prefix=no
- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
- case $host_os in
- openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
- *)				need_version=no ;;
- esac
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- case $host_os in
- openbsd2.[89] | openbsd2.[89].*)
-	shlibpath_overrides_runpath=no
-	;;
- *)
-	shlibpath_overrides_runpath=yes
-	;;
- esac
- else
- shlibpath_overrides_runpath=yes
- fi
- ;;
-
-os2*)
- libname_spec='$name'
- shrext_cmds=".dll"
- need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
- dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
- ;;
-
-osf3* | osf4* | osf5*)
- version_type=osf
- need_lib_prefix=no
- need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
- ;;
-
-rdos*)
- dynamic_linker=no
- ;;
-
-solaris*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- # ldd complains unless libraries are executable
- postinstall_cmds='chmod +x $lib'
- ;;
-
-sunos4*)
- version_type=sunos
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- fi
- need_version=yes
- ;;
-
-sysv4 | sysv4.3*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- case $host_vendor in
- sni)
- shlibpath_overrides_runpath=no
- need_lib_prefix=no
- runpath_var=LD_RUN_PATH
- ;;
- siemens)
- need_lib_prefix=no
- ;;
- motorola)
- need_lib_prefix=no
- need_version=no
- shlibpath_overrides_runpath=no
- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
- ;;
- esac
- ;;
-
-sysv4*MP*)
- if test -d /usr/nec ;then
- version_type=linux
- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
- soname_spec='$libname${shared_ext}.$major'
- shlibpath_var=LD_LIBRARY_PATH
- fi
- ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- version_type=freebsd-elf
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- if test "$with_gnu_ld" = yes; then
- sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
- else
- sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
- case $host_os in
- sco3.2v5*)
- sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
- esac
- fi
- sys_lib_dlsearch_path_spec='/usr/lib'
- ;;
-
-tpf*)
- # TPF is a cross-target only. Preferred cross-host = GNU/Linux.
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-
-uts4*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-
-*)
- dynamic_linker=no
- ;;
-esac
-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-$as_echo "$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
- sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
-hardcode_action=
-if test -n "$hardcode_libdir_flag_spec" ||
- test -n "$runpath_var" ||
- test "X$hardcode_automatic" = "Xyes" ; then
-
- # We can hardcode non-existent directories.
- if test "$hardcode_direct" != no &&
- # If the only mechanism to avoid hardcoding is shlibpath_var, we
- # have to relink, otherwise we might link with an installed library
- # when we should be linking with a yet-to-be-installed one
- ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
- test "$hardcode_minus_L" != no; then
- # Linking always hardcodes the temporary library directory.
- hardcode_action=relink
- else
- # We can link without hardcoding, and we can hardcode nonexisting dirs.
- hardcode_action=immediate
- fi
-else
- # We cannot hardcode anything, or else we can only hardcode existing
- # directories.
- hardcode_action=unsupported
-fi
-{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
-$as_echo "$hardcode_action" >&6; }
-
-if test "$hardcode_action" = relink ||
- test "$inherit_rpath" = yes; then
- # Fast installation is not supported
- enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
- test "$enable_shared" = no; then
- # Fast installation is not necessary
- enable_fast_install=needless
-fi
-
-
-
-
-
-
- if test "x$enable_dlopen" != xyes; then
- enable_dlopen=unknown
- enable_dlopen_self=unknown
- enable_dlopen_self_static=unknown
-else
- lt_cv_dlopen=no
- lt_cv_dlopen_libs=
-
- case $host_os in
- beos*)
- lt_cv_dlopen="load_add_on"
- lt_cv_dlopen_libs=
- lt_cv_dlopen_self=yes
- ;;
-
- mingw* | pw32* | cegcc*)
- lt_cv_dlopen="LoadLibrary"
- lt_cv_dlopen_libs=
- ;;
-
- cygwin*)
- lt_cv_dlopen="dlopen"
- lt_cv_dlopen_libs=
- ;;
-
- darwin*)
- # if libdl is installed we need to link against it
- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
- }; then
- ac_cv_lib_dl_dlopen=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dl_dlopen=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-
- lt_cv_dlopen="dyld"
- lt_cv_dlopen_libs=
- lt_cv_dlopen_self=yes
-
-fi
-
- ;;
-
- *)
- { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
-$as_echo_n "checking for shl_load... " >&6; }
-if test "${ac_cv_func_shl_load+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define shl_load innocuous_shl_load
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char shl_load (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef shl_load
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_shl_load || defined __stub___shl_load
-choke me
-#endif
-
-int
-main ()
-{
-return shl_load ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
- }; then
- ac_cv_func_shl_load=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_shl_load=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-$as_echo "$ac_cv_func_shl_load" >&6; }
-if test "x$ac_cv_func_shl_load" = x""yes; then
- lt_cv_dlopen="shl_load"
-else
- { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-$as_echo_n "checking for shl_load in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load ();
-int
-main ()
-{
-return shl_load ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
- }; then
- ac_cv_lib_dld_shl_load=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dld_shl_load=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
-else
- { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
-$as_echo_n "checking for dlopen... " >&6; }
-if test "${ac_cv_func_dlopen+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define dlopen innocuous_dlopen
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char dlopen (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef dlopen
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_dlopen || defined __stub___dlopen
-choke me
-#endif
-
-int
-main ()
-{
-return dlopen ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
- }; then
- ac_cv_func_dlopen=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_dlopen=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-$as_echo "$ac_cv_func_dlopen" >&6; }
-if test "x$ac_cv_func_dlopen" = x""yes; then
- lt_cv_dlopen="dlopen"
-else
- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
- }; then
- ac_cv_lib_dl_dlopen=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dl_dlopen=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
- { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-$as_echo_n "checking for dlopen in -lsvld... " >&6; }
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
- }; then
- ac_cv_lib_svld_dlopen=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_svld_dlopen=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-else
- { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-$as_echo_n "checking for dld_link in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dld_link ();
-int
-main ()
-{
-return dld_link ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
- }; then
- ac_cv_lib_dld_dld_link=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dld_dld_link=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then
- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
- ;;
- esac
-
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
- else
- enable_dlopen=no
- fi
-
- case $lt_cv_dlopen in
- dlopen)
- save_CPPFLAGS="$CPPFLAGS"
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
- save_LDFLAGS="$LDFLAGS"
- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
- save_LIBS="$LIBS"
- LIBS="$lt_cv_dlopen_libs $LIBS"
-
- { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-$as_echo_n "checking whether a program can dlopen itself... " >&6; }
-if test "${lt_cv_dlopen_self+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- 	 if test "$cross_compiling" = yes; then :
- lt_cv_dlopen_self=cross
-else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
-#line 10984 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-# ifdef DL_GLOBAL
-# define LT_DLGLOBAL		DL_GLOBAL
-# else
-# define LT_DLGLOBAL		0
-# endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-# ifdef RTLD_LAZY
-# define LT_DLLAZY_OR_NOW		RTLD_LAZY
-# else
-# ifdef DL_LAZY
-# define LT_DLLAZY_OR_NOW		DL_LAZY
-# else
-# ifdef RTLD_NOW
-# define LT_DLLAZY_OR_NOW	RTLD_NOW
-# else
-# ifdef DL_NOW
-# define LT_DLLAZY_OR_NOW	DL_NOW
-# else
-# define LT_DLLAZY_OR_NOW	0
-# endif
-# endif
-# endif
-# endif
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
-
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
- else
- puts (dlerror ());
-
- return status;
-}
-_LT_EOF
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
- (./conftest; exit; ) >&5 2>/dev/null
- lt_status=$?
- case x$lt_status in
- x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
- x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
- x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
- esac
- else :
- # compilation failed
- lt_cv_dlopen_self=no
- fi
-fi
-rm -fr conftest*
-
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-$as_echo "$lt_cv_dlopen_self" >&6; }
-
- if test "x$lt_cv_dlopen_self" = xyes; then
- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
- { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
-if test "${lt_cv_dlopen_self_static+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- 	 if test "$cross_compiling" = yes; then :
- lt_cv_dlopen_self_static=cross
-else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
-#line 11080 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-# ifdef DL_GLOBAL
-# define LT_DLGLOBAL		DL_GLOBAL
-# else
-# define LT_DLGLOBAL		0
-# endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-# ifdef RTLD_LAZY
-# define LT_DLLAZY_OR_NOW		RTLD_LAZY
-# else
-# ifdef DL_LAZY
-# define LT_DLLAZY_OR_NOW		DL_LAZY
-# else
-# ifdef RTLD_NOW
-# define LT_DLLAZY_OR_NOW	RTLD_NOW
-# else
-# ifdef DL_NOW
-# define LT_DLLAZY_OR_NOW	DL_NOW
-# else
-# define LT_DLLAZY_OR_NOW	0
-# endif
-# endif
-# endif
-# endif
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
-
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
- else
- puts (dlerror ());
-
- return status;
-}
-_LT_EOF
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
- (./conftest; exit; ) >&5 2>/dev/null
- lt_status=$?
- case x$lt_status in
- x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
- x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
- x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
- esac
- else :
- # compilation failed
- lt_cv_dlopen_self_static=no
- fi
-fi
-rm -fr conftest*
-
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-$as_echo "$lt_cv_dlopen_self_static" >&6; }
- fi
-
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
- ;;
- esac
-
- case $lt_cv_dlopen_self in
- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
- *) enable_dlopen_self=unknown ;;
- esac
-
- case $lt_cv_dlopen_self_static in
- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
- *) enable_dlopen_self_static=unknown ;;
- esac
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-striplib=
-old_striplib=
-{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-$as_echo_n "checking whether stripping libraries is possible... " >&6; }
-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
- test -z "$striplib" && striplib="$STRIP --strip-unneeded"
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-# FIXME - insert some real tests, host_os isn't really good enough
- case $host_os in
- darwin*)
- if test -n "$STRIP" ; then
- striplib="$STRIP -x"
- old_striplib="$STRIP -S"
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
- else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
- fi
- ;;
- *)
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
- ;;
- esac
-fi
-
-
-
-
-
-
-
-
-
-
-
-
- # Report which library types will actually be built
- { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-$as_echo_n "checking if libtool supports shared libraries... " >&6; }
- { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
-$as_echo "$can_build_shared" >&6; }
-
- { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-$as_echo_n "checking whether to build shared libraries... " >&6; }
- test "$can_build_shared" = "no" && enable_shared=no
-
- # On AIX, shared libraries and static libraries use the same namespace, and
- # are all built from PIC.
- case $host_os in
- aix3*)
- test "$enable_shared" = yes && enable_static=no
- if test -n "$RANLIB"; then
- archive_cmds="$archive_cmds~\$RANLIB \$lib"
- postinstall_cmds='$RANLIB $lib'
- fi
- ;;
-
- aix[4-9]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
- fi
- ;;
- esac
- { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
-$as_echo "$enable_shared" >&6; }
-
- { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-$as_echo_n "checking whether to build static libraries... " >&6; }
- # Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
- { $as_echo "$as_me:$LINENO: result: $enable_static" >&5
-$as_echo "$enable_static" >&6; }
-
-
-
-
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC="$lt_save_CC"
-
-
-
-
-
-
-
-
-
-
-
-
-
- ac_config_commands="$ac_config_commands libtool"
-
-
-
-
-# Only expand once:
-
-
-# Find a good install program. We prefer a C program (faster),
-# so one script is as good as another. But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
- ./ | .// | /cC/* | \
- /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
- /usr/ucb/* ) ;;
- *)
- # OSF1 and SCO ODT 3.0 have their own names for install.
- # Don't use installbsd from OSF since it installs stuff as root
- # by default.
- for ac_prog in ginstall scoinst install; do
- for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-	 if test $ac_prog = install &&
-	 grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	 # AIX install. It has an incompatible calling convention.
-	 :
-	 elif test $ac_prog = install &&
-	 grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	 # program-specific install script used by HP pwplus--don't use.
-	 :
-	 else
-	 rm -rf conftest.one conftest.two conftest.dir
-	 echo one > conftest.one
-	 echo two > conftest.two
-	 mkdir conftest.dir
-	 if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
-	 test -s conftest.one && test -s conftest.two &&
-	 test -s conftest.dir/conftest.one &&
-	 test -s conftest.dir/conftest.two
-	 then
-	 ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	 break 3
-	 fi
-	 fi
-	fi
- done
- done
- ;;
-esac
-
-done
-IFS=$as_save_IFS
-
-rm -rf conftest.one conftest.two conftest.dir
-
-fi
- if test "${ac_cv_path_install+set}" = set; then
- INSTALL=$ac_cv_path_install
- else
- # As a last resort, use the slow shell script. Don't cache a
- # value for INSTALL within a source directory, because that will
- # break other packages using the cache if that directory is
- # removed, or if the value is a relative name.
- INSTALL=$ac_install_sh
- fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_header_stdc=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_header_stdc=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "memchr" >/dev/null 2>&1; then
- :
-else
- ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "free" >/dev/null 2>&1; then
- :
-else
- ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
- if test "$cross_compiling" = yes; then
- :
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		 (('a' <= (c) && (c) <= 'i') \
-		 || ('j' <= (c) && (c) <= 'r') \
-		 || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
- int i;
- for (i = 0; i < 256; i++)
- if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
- return 2;
- return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_header_stdc=no
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
-
-fi
-
-# By default we simply use the C compiler to build assembly code.
-
-test "${CCAS+set}" = set || CCAS=$CC
-test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS
-
-
-
-depcc="$CCAS" am_compiler_list=
-
-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CCAS_dependencies_compiler_type+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
- # We make a subdir and do the tests there. Otherwise we can end up
- # making bogus files that we don't know about and never remove. For
- # instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
- mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
- # using a relative directory.
- cp "$am_depcomp" conftest.dir
- cd conftest.dir
- # We will build objects and dependencies in a subdirectory because
- # it helps to detect inapplicable dependency modes. For instance
- # both Tru64's cc and ICC support -MD to output dependencies as a
- # side effect of compilation, but ICC will put the dependencies in
- # the current directory while Tru64 will put them in the object
- # directory.
- mkdir sub
-
- am_cv_CCAS_dependencies_compiler_type=none
- if test "$am_compiler_list" = ""; then
- am_compiler_list=`sed -n 's/^#*$[a-zA-Z0-9]*$)$/\1/p' < ./depcomp`
- fi
- for depmode in $am_compiler_list; do
- # Setup a source with many dependencies, because some compilers
- # like to wrap large dependency lists on column 80 (with \), and
- # we should not choose a depcomp mode which is confused by this.
- #
- # We need to recreate these files for each test, as the compiler may
- # overwrite some of them when testing with obscure command lines.
- # This happens at least with the AIX C compiler.
- : > sub/conftest.c
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
- case $depmode in
- nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
- if test "x$enable_dependency_tracking" = xyes; then
-	continue
- else
-	break
- fi
- ;;
- none) break ;;
- esac
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this.
- if depmode=$depmode \
- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
- >/dev/null 2>conftest.err &&
- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- # icc doesn't choke on unknown options, it will just issue warnings
- # or remarks (even with -Werror). So we grep stderr for any message
- # that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
- # icc: Command line warning: ignoring option '-M'; no argument required
- # The diagnosis changed in icc 8.0:
- # icc: Command line remark: option '-MP' not supported
- if (grep 'ignoring option' conftest.err ||
- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
- am_cv_CCAS_dependencies_compiler_type=$depmode
- break
- fi
- fi
- done
-
- cd ..
- rm -rf conftest.dir
-else
- am_cv_CCAS_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_CCAS_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CCAS_dependencies_compiler_type" >&6; }
-CCASDEPMODE=depmode=$am_cv_CCAS_dependencies_compiler_type
-
- if
- test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_CCAS_dependencies_compiler_type" = gcc3; then
- am__fastdepCCAS_TRUE=
- am__fastdepCCAS_FALSE='#'
-else
- am__fastdepCCAS_TRUE='#'
- am__fastdepCCAS_FALSE=
-fi
-
-
-
-
- { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5
-$as_echo_n "checking whether NLS is requested... " >&6; }
- # Check whether --enable-nls was given.
-if test "${enable_nls+set}" = set; then
- enableval=$enable_nls; USE_NLS=$enableval
-else
- USE_NLS=yes
-fi
-
- { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5
-$as_echo "$USE_NLS" >&6; }
-
-
-
-
- GETTEXT_MACRO_VERSION=0.17
-
-
-
-
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
- else
- PATH_SEPARATOR=:
- fi
- rm -f conf$$.sh
-fi
-
-# Find out how to test for executable files. Don't use a zero-byte file,
-# as systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
- ac_executable_p="test -x"
-else
- ac_executable_p="test -f"
-fi
-rm -f conf$$.file
-
-# Extract the first word of "msgfmt", so it can be a program name with args.
-set dummy msgfmt; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGFMT+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- case "$MSGFMT" in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
- ;;
- *)
- ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
- for ac_dir in $PATH; do
- IFS="$ac_save_IFS"
- test -z "$ac_dir" && ac_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
- echo "$as_me: trying $ac_dir/$ac_word..." >&5
- if $ac_dir/$ac_word --statistics /dev/null >&5 2>&1 &&
- (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
- ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext"
- break 2
- fi
- fi
- done
- done
- IFS="$ac_save_IFS"
- test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
- ;;
-esac
-fi
-MSGFMT="$ac_cv_path_MSGFMT"
-if test "$MSGFMT" != ":"; then
- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
-$as_echo "$MSGFMT" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- # Extract the first word of "gmsgfmt", so it can be a program name with args.
-set dummy gmsgfmt; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GMSGFMT+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- case $GMSGFMT in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
- ;;
-esac
-fi
-GMSGFMT=$ac_cv_path_GMSGFMT
-if test -n "$GMSGFMT"; then
- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-$as_echo "$GMSGFMT" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
- case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
- '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
- *) MSGFMT_015=$MSGFMT ;;
- esac
-
- case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
- '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
- *) GMSGFMT_015=$GMSGFMT ;;
- esac
-
-
-
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
- else
- PATH_SEPARATOR=:
- fi
- rm -f conf$$.sh
-fi
-
-# Find out how to test for executable files. Don't use a zero-byte file,
-# as systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
- ac_executable_p="test -x"
-else
- ac_executable_p="test -f"
-fi
-rm -f conf$$.file
-
-# Extract the first word of "xgettext", so it can be a program name with args.
-set dummy xgettext; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_XGETTEXT+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- case "$XGETTEXT" in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
- ;;
- *)
- ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
- for ac_dir in $PATH; do
- IFS="$ac_save_IFS"
- test -z "$ac_dir" && ac_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
- echo "$as_me: trying $ac_dir/$ac_word..." >&5
- if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&5 2>&1 &&
- (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
- ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext"
- break 2
- fi
- fi
- done
- done
- IFS="$ac_save_IFS"
- test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
- ;;
-esac
-fi
-XGETTEXT="$ac_cv_path_XGETTEXT"
-if test "$XGETTEXT" != ":"; then
- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-$as_echo "$XGETTEXT" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- rm -f messages.po
-
- case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
- '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
- *) XGETTEXT_015=$XGETTEXT ;;
- esac
-
-
-
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
- else
- PATH_SEPARATOR=:
- fi
- rm -f conf$$.sh
-fi
-
-# Find out how to test for executable files. Don't use a zero-byte file,
-# as systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
- ac_executable_p="test -x"
-else
- ac_executable_p="test -f"
-fi
-rm -f conf$$.file
-
-# Extract the first word of "msgmerge", so it can be a program name with args.
-set dummy msgmerge; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGMERGE+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- case "$MSGMERGE" in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
- ;;
- *)
- ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
- for ac_dir in $PATH; do
- IFS="$ac_save_IFS"
- test -z "$ac_dir" && ac_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
- echo "$as_me: trying $ac_dir/$ac_word..." >&5
- if $ac_dir/$ac_word --update -q /dev/null /dev/null >&5 2>&1; then
- ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext"
- break 2
- fi
- fi
- done
- done
- IFS="$ac_save_IFS"
- test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":"
- ;;
-esac
-fi
-MSGMERGE="$ac_cv_path_MSGMERGE"
-if test "$MSGMERGE" != ":"; then
- { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5
-$as_echo "$MSGMERGE" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$localedir" || localedir='${datadir}/locale'
-
-
- test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
-
-
- ac_config_commands="$ac_config_commands po-directories"
-
-
-
- if test "X$prefix" = "XNONE"; then
- acl_final_prefix="$ac_default_prefix"
- else
- acl_final_prefix="$prefix"
- fi
- if test "X$exec_prefix" = "XNONE"; then
- acl_final_exec_prefix='${prefix}'
- else
- acl_final_exec_prefix="$exec_prefix"
- fi
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
- prefix="$acl_save_prefix"
-
-
-# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
- withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else
- with_gnu_ld=no
-fi
-
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
- else
- PATH_SEPARATOR=:
- fi
- rm -f conf$$.sh
-fi
-ac_prog=ld
-if test "$GCC" = yes; then
- # Check if gcc -print-prog-name=ld gives a path.
- { $as_echo "$as_me:$LINENO: checking for ld used by GCC" >&5
-$as_echo_n "checking for ld used by GCC... " >&6; }
- case $host in
- *-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
- *)
- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
- esac
- case $ac_prog in
- # Accept absolute paths.
- [\\/]* | [A-Za-z]:[\\/]*)
- re_direlt='/[^/][^/]*/\.\./'
- # Canonicalize the path of ld
- ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
- done
- test -z "$LD" && LD="$ac_prog"
- ;;
- "")
- # If it fails, then pretend we aren't using GCC.
- ac_prog=ld
- ;;
- *)
- # If it is relative, then search for the first ld in PATH.
- with_gnu_ld=unknown
- ;;
- esac
-elif test "$with_gnu_ld" = yes; then
- { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
-else
- { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
-fi
-if test "${acl_cv_path_LD+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -z "$LD"; then
- IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
- for ac_dir in $PATH; do
- test -z "$ac_dir" && ac_dir=.
- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
- acl_cv_path_LD="$ac_dir/$ac_prog"
- # Check to see if the program is GNU ld. I'd rather use --version,
- # but apparently some GNU ld's only accept -v.
- # Break only if it was the GNU/non-GNU ld that we prefer.
- case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
- *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break ;;
- *)
-	test "$with_gnu_ld" != yes && break ;;
- esac
- fi
- done
- IFS="$ac_save_ifs"
-else
- acl_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
-
-LD="$acl_cv_path_LD"
-if test -n "$LD"; then
- { $as_echo "$as_me:$LINENO: result: $LD" >&5
-$as_echo "$LD" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
- { (exit 1); exit 1; }; }
-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if test "${acl_cv_prog_gnu_ld+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
- acl_cv_prog_gnu_ld=yes ;;
-*)
- acl_cv_prog_gnu_ld=no ;;
-esac
-fi
-{ $as_echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
-$as_echo "$acl_cv_prog_gnu_ld" >&6; }
-with_gnu_ld=$acl_cv_prog_gnu_ld
-
-
-
-
- { $as_echo "$as_me:$LINENO: checking for shared library run path origin" >&5
-$as_echo_n "checking for shared library run path origin... " >&6; }
-if test "${acl_cv_rpath+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
-
- CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
- ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
- . ./conftest.sh
- rm -f ./conftest.sh
- acl_cv_rpath=done
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
-$as_echo "$acl_cv_rpath" >&6; }
- wl="$acl_cv_wl"
- acl_libext="$acl_cv_libext"
- acl_shlibext="$acl_cv_shlibext"
- acl_libname_spec="$acl_cv_libname_spec"
- acl_library_names_spec="$acl_cv_library_names_spec"
- acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
- acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
- acl_hardcode_direct="$acl_cv_hardcode_direct"
- acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
- # Check whether --enable-rpath was given.
-if test "${enable_rpath+set}" = set; then
- enableval=$enable_rpath; :
-else
- enable_rpath=yes
-fi
-
-
-
- acl_libdirstem=lib
- searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
- if test -n "$searchpath"; then
- acl_save_IFS="${IFS= 	}"; IFS=":"
- for searchdir in $searchpath; do
- if test -d "$searchdir"; then
- case "$searchdir" in
- */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
- *) searchdir=`cd "$searchdir" && pwd`
- case "$searchdir" in
- */lib64 ) acl_libdirstem=lib64 ;;
- esac ;;
- esac
- fi
- done
- IFS="$acl_save_IFS"
- fi
-
-
-
-
-
-
-
-
-
- use_additional=yes
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
-
- eval additional_includedir=\"$includedir\"
- eval additional_libdir=\"$libdir\"
-
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
-
-# Check whether --with-libiconv-prefix was given.
-if test "${with_libiconv_prefix+set}" = set; then
- withval=$with_libiconv_prefix;
- if test "X$withval" = "Xno"; then
- use_additional=no
- else
- if test "X$withval" = "X"; then
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
-
- eval additional_includedir=\"$includedir\"
- eval additional_libdir=\"$libdir\"
-
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- else
- additional_includedir="$withval/include"
- additional_libdir="$withval/$acl_libdirstem"
- fi
- fi
-
-fi
-
- LIBICONV=
- LTLIBICONV=
- INCICONV=
- LIBICONV_PREFIX=
- rpathdirs=
- ltrpathdirs=
- names_already_handled=
- names_next_round='iconv '
- while test -n "$names_next_round"; do
- names_this_round="$names_next_round"
- names_next_round=
- for name in $names_this_round; do
- already_handled=
- for n in $names_already_handled; do
- if test "$n" = "$name"; then
- already_handled=yes
- break
- fi
- done
- if test -z "$already_handled"; then
- names_already_handled="$names_already_handled $name"
- uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
- eval value=\"\$HAVE_LIB$uppername\"
- if test -n "$value"; then
- if test "$value" = yes; then
- eval value=\"\$LIB$uppername\"
- test -z "$value" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value"
- eval value=\"\$LTLIB$uppername\"
- test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$value"
- else
- :
- fi
- else
- found_dir=
- found_la=
- found_so=
- found_a=
- eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
- if test -n "$acl_shlibext"; then
- shrext=".$acl_shlibext" # typically: shrext=.so
- else
- shrext=
- fi
- if test $use_additional = yes; then
- dir="$additional_libdir"
- if test -n "$acl_shlibext"; then
- if test -f "$dir/$libname$shrext"; then
- found_dir="$dir"
- found_so="$dir/$libname$shrext"
- else
- if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
- ver=`(cd "$dir" && \
- for f in "$libname$shrext".*; do echo "$f"; done \
- | sed -e "s,^$libname$shrext\\\\.,," \
- | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
- | sed 1q ) 2>/dev/null`
- if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
- found_dir="$dir"
- found_so="$dir/$libname$shrext.$ver"
- fi
- else
- eval library_names=\"$acl_library_names_spec\"
- for f in $library_names; do
- if test -f "$dir/$f"; then
- found_dir="$dir"
- found_so="$dir/$f"
- break
- fi
- done
- fi
- fi
- fi
- if test "X$found_dir" = "X"; then
- if test -f "$dir/$libname.$acl_libext"; then
- found_dir="$dir"
- found_a="$dir/$libname.$acl_libext"
- fi
- fi
- if test "X$found_dir" != "X"; then
- if test -f "$dir/$libname.la"; then
- found_la="$dir/$libname.la"
- fi
- fi
- fi
- if test "X$found_dir" = "X"; then
- for x in $LDFLAGS $LTLIBICONV; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- case "$x" in
- -L*)
- dir=`echo "X$x" | sed -e 's/^X-L//'`
- if test -n "$acl_shlibext"; then
- if test -f "$dir/$libname$shrext"; then
- found_dir="$dir"
- found_so="$dir/$libname$shrext"
- else
- if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
- ver=`(cd "$dir" && \
- for f in "$libname$shrext".*; do echo "$f"; done \
- | sed -e "s,^$libname$shrext\\\\.,," \
- | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
- | sed 1q ) 2>/dev/null`
- if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
- found_dir="$dir"
- found_so="$dir/$libname$shrext.$ver"
- fi
- else
- eval library_names=\"$acl_library_names_spec\"
- for f in $library_names; do
- if test -f "$dir/$f"; then
- found_dir="$dir"
- found_so="$dir/$f"
- break
- fi
- done
- fi
- fi
- fi
- if test "X$found_dir" = "X"; then
- if test -f "$dir/$libname.$acl_libext"; then
- found_dir="$dir"
- found_a="$dir/$libname.$acl_libext"
- fi
- fi
- if test "X$found_dir" != "X"; then
- if test -f "$dir/$libname.la"; then
- found_la="$dir/$libname.la"
- fi
- fi
- ;;
- esac
- if test "X$found_dir" != "X"; then
- break
- fi
- done
- fi
- if test "X$found_dir" != "X"; then
- LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name"
- if test "X$found_so" != "X"; then
- if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
- LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
- else
- haveit=
- for x in $ltrpathdirs; do
- if test "X$x" = "X$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- ltrpathdirs="$ltrpathdirs $found_dir"
- fi
- if test "$acl_hardcode_direct" = yes; then
- LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
- else
- if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
- LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
- haveit=
- for x in $rpathdirs; do
- if test "X$x" = "X$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- rpathdirs="$rpathdirs $found_dir"
- fi
- else
- haveit=
- for x in $LDFLAGS $LIBICONV; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- if test "X$x" = "X-L$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
- fi
- if test "$acl_hardcode_minus_L" != no; then
- LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
- else
- LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
- fi
- fi
- fi
- fi
- else
- if test "X$found_a" != "X"; then
- LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a"
- else
- LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name"
- fi
- fi
- additional_includedir=
- case "$found_dir" in
- */$acl_libdirstem | */$acl_libdirstem/)
- basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
- LIBICONV_PREFIX="$basedir"
- additional_includedir="$basedir/include"
- ;;
- esac
- if test "X$additional_includedir" != "X"; then
- if test "X$additional_includedir" != "X/usr/include"; then
- haveit=
- if test "X$additional_includedir" = "X/usr/local/include"; then
- if test -n "$GCC"; then
- case $host_os in
- linux* | gnu* | k*bsd*-gnu) haveit=yes;;
- esac
- fi
- fi
- if test -z "$haveit"; then
- for x in $CPPFLAGS $INCICONV; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- if test "X$x" = "X-I$additional_includedir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test -d "$additional_includedir"; then
- INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir"
- fi
- fi
- fi
- fi
- fi
- if test -n "$found_la"; then
- save_libdir="$libdir"
- case "$found_la" in
- */* | *\\*) . "$found_la" ;;
- *) . "./$found_la" ;;
- esac
- libdir="$save_libdir"
- for dep in $dependency_libs; do
- case "$dep" in
- -L*)
- additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
- if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
- haveit=
- if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
- if test -n "$GCC"; then
- case $host_os in
- linux* | gnu* | k*bsd*-gnu) haveit=yes;;
- esac
- fi
- fi
- if test -z "$haveit"; then
- haveit=
- for x in $LDFLAGS $LIBICONV; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- if test "X$x" = "X-L$additional_libdir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test -d "$additional_libdir"; then
- LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir"
- fi
- fi
- haveit=
- for x in $LDFLAGS $LTLIBICONV; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- if test "X$x" = "X-L$additional_libdir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test -d "$additional_libdir"; then
- LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir"
- fi
- fi
- fi
- fi
- ;;
- -R*)
- dir=`echo "X$dep" | sed -e 's/^X-R//'`
- if test "$enable_rpath" != no; then
- haveit=
- for x in $rpathdirs; do
- if test "X$x" = "X$dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- rpathdirs="$rpathdirs $dir"
- fi
- haveit=
- for x in $ltrpathdirs; do
- if test "X$x" = "X$dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- ltrpathdirs="$ltrpathdirs $dir"
- fi
- fi
- ;;
- -l*)
- names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
- ;;
- *.la)
- names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
- ;;
- *)
- LIBICONV="${LIBICONV}${LIBICONV:+ }$dep"
- LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep"
- ;;
- esac
- done
- fi
- else
- LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
- LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name"
- fi
- fi
- fi
- done
- done
- if test "X$rpathdirs" != "X"; then
- if test -n "$acl_hardcode_libdir_separator"; then
- alldirs=
- for found_dir in $rpathdirs; do
- alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
- done
- acl_save_libdir="$libdir"
- libdir="$alldirs"
- eval flag=\"$acl_hardcode_libdir_flag_spec\"
- libdir="$acl_save_libdir"
- LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
- else
- for found_dir in $rpathdirs; do
- acl_save_libdir="$libdir"
- libdir="$found_dir"
- eval flag=\"$acl_hardcode_libdir_flag_spec\"
- libdir="$acl_save_libdir"
- LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
- done
- fi
- fi
- if test "X$ltrpathdirs" != "X"; then
- for found_dir in $ltrpathdirs; do
- LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir"
- done
- fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- { $as_echo "$as_me:$LINENO: checking for CFPreferencesCopyAppValue" >&5
-$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; }
-if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- gt_save_LIBS="$LIBS"
- LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <CoreFoundation/CFPreferences.h>
-int
-main ()
-{
-CFPreferencesCopyAppValue(NULL, NULL)
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
- }; then
- gt_cv_func_CFPreferencesCopyAppValue=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	gt_cv_func_CFPreferencesCopyAppValue=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS="$gt_save_LIBS"
-fi
-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
-$as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
- if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CFPREFERENCESCOPYAPPVALUE 1
-_ACEOF
-
- fi
- { $as_echo "$as_me:$LINENO: checking for CFLocaleCopyCurrent" >&5
-$as_echo_n "checking for CFLocaleCopyCurrent... " >&6; }
-if test "${gt_cv_func_CFLocaleCopyCurrent+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- gt_save_LIBS="$LIBS"
- LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <CoreFoundation/CFLocale.h>
-int
-main ()
-{
-CFLocaleCopyCurrent();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
- }; then
- gt_cv_func_CFLocaleCopyCurrent=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	gt_cv_func_CFLocaleCopyCurrent=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS="$gt_save_LIBS"
-fi
-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
-$as_echo "$gt_cv_func_CFLocaleCopyCurrent" >&6; }
- if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CFLOCALECOPYCURRENT 1
-_ACEOF
-
- fi
- INTL_MACOSX_LIBS=
- if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
- INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
- fi
-
-
-
-
-
-
- LIBINTL=
- LTLIBINTL=
- POSUB=
-
- case " $gt_needs " in
- *" need-formatstring-macros "*) gt_api_version=3 ;;
- *" need-ngettext "*) gt_api_version=2 ;;
- *) gt_api_version=1 ;;
- esac
- gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
- gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
-
- if test "$USE_NLS" = "yes"; then
- gt_use_preinstalled_gnugettext=no
-
-
- if test $gt_api_version -ge 3; then
- gt_revision_test_code='
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-'
- else
- gt_revision_test_code=
- fi
- if test $gt_api_version -ge 2; then
- gt_expression_test_code=' + * ngettext ("", "", 0)'
- else
- gt_expression_test_code=
- fi
-
- { $as_echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5
-$as_echo_n "checking for GNU gettext in libc... " >&6; }
-if { as_var=$gt_func_gnugettext_libc; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <libintl.h>
-$gt_revision_test_code
-extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;
-int
-main ()
-{
-bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
- }; then
- eval "$gt_func_gnugettext_libc=yes"
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$gt_func_gnugettext_libc=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$gt_func_gnugettext_libc'}
-		 $as_echo "$as_val"'`
-	 { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
- if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
-
-
-
-
-
- am_save_CPPFLAGS="$CPPFLAGS"
-
- for element in $INCICONV; do
- haveit=
- for x in $CPPFLAGS; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- if test "X$x" = "X$element"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
- fi
- done
-
-
- { $as_echo "$as_me:$LINENO: checking for iconv" >&5
-$as_echo_n "checking for iconv... " >&6; }
-if test "${am_cv_func_iconv+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
-
- am_cv_func_iconv="no, consider installing GNU libiconv"
- am_cv_lib_iconv=no
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stdlib.h>
-#include <iconv.h>
-int
-main ()
-{
-iconv_t cd = iconv_open("","");
- iconv(cd,NULL,NULL,NULL,NULL);
- iconv_close(cd);
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
- }; then
- am_cv_func_iconv=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test "$am_cv_func_iconv" != yes; then
- am_save_LIBS="$LIBS"
- LIBS="$LIBS $LIBICONV"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stdlib.h>
-#include <iconv.h>
-int
-main ()
-{
-iconv_t cd = iconv_open("","");
- iconv(cd,NULL,NULL,NULL,NULL);
- iconv_close(cd);
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
- }; then
- am_cv_lib_iconv=yes
- am_cv_func_iconv=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS="$am_save_LIBS"
- fi
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
-$as_echo "$am_cv_func_iconv" >&6; }
- if test "$am_cv_func_iconv" = yes; then
- { $as_echo "$as_me:$LINENO: checking for working iconv" >&5
-$as_echo_n "checking for working iconv... " >&6; }
-if test "${am_cv_func_iconv_works+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
-
- am_save_LIBS="$LIBS"
- if test $am_cv_lib_iconv = yes; then
- LIBS="$LIBS $LIBICONV"
- fi
- if test "$cross_compiling" = yes; then
- case "$host_os" in
- aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
- *) am_cv_func_iconv_works="guessing yes" ;;
- esac
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#include <iconv.h>
-#include <string.h>
-int main ()
-{
- /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
- returns. */
- {
- iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
- if (cd_utf8_to_88591 != (iconv_t)(-1))
- {
- static const char input[] = "\342\202\254"; /* EURO SIGN */
- char buf[10];
- const char *inptr = input;
- size_t inbytesleft = strlen (input);
- char *outptr = buf;
- size_t outbytesleft = sizeof (buf);
- size_t res = iconv (cd_utf8_to_88591,
- (char **) &inptr, &inbytesleft,
- &outptr, &outbytesleft);
- if (res == 0)
- return 1;
- }
- }
-#if 0 /* This bug could be worked around by the caller. */
- /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */
- {
- iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
- if (cd_88591_to_utf8 != (iconv_t)(-1))
- {
- static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
- char buf[50];
- const char *inptr = input;
- size_t inbytesleft = strlen (input);
- char *outptr = buf;
- size_t outbytesleft = sizeof (buf);
- size_t res = iconv (cd_88591_to_utf8,
- (char **) &inptr, &inbytesleft,
- &outptr, &outbytesleft);
- if ((int)res > 0)
- return 1;
- }
- }
-#endif
- /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
- provided. */
- if (/* Try standardized names. */
- iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
- /* Try IRIX, OSF/1 names. */
- && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
- /* Try AIX names. */
- && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
- /* Try HP-UX names. */
- && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
- return 1;
- return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- am_cv_func_iconv_works=yes
-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-am_cv_func_iconv_works=no
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
- LIBS="$am_save_LIBS"
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_func_iconv_works" >&5
-$as_echo "$am_cv_func_iconv_works" >&6; }
- case "$am_cv_func_iconv_works" in
- *no) am_func_iconv=no am_cv_lib_iconv=no ;;
- *) am_func_iconv=yes ;;
- esac
- else
- am_func_iconv=no am_cv_lib_iconv=no
- fi
- if test "$am_func_iconv" = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ICONV 1
-_ACEOF
-
- fi
- if test "$am_cv_lib_iconv" = yes; then
- { $as_echo "$as_me:$LINENO: checking how to link with libiconv" >&5
-$as_echo_n "checking how to link with libiconv... " >&6; }
- { $as_echo "$as_me:$LINENO: result: $LIBICONV" >&5
-$as_echo "$LIBICONV" >&6; }
- else
- CPPFLAGS="$am_save_CPPFLAGS"
- LIBICONV=
- LTLIBICONV=
- fi
-
-
-
-
-
-
-
-
- use_additional=yes
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
-
- eval additional_includedir=\"$includedir\"
- eval additional_libdir=\"$libdir\"
-
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
-
-# Check whether --with-libintl-prefix was given.
-if test "${with_libintl_prefix+set}" = set; then
- withval=$with_libintl_prefix;
- if test "X$withval" = "Xno"; then
- use_additional=no
- else
- if test "X$withval" = "X"; then
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
-
- eval additional_includedir=\"$includedir\"
- eval additional_libdir=\"$libdir\"
-
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- else
- additional_includedir="$withval/include"
- additional_libdir="$withval/$acl_libdirstem"
- fi
- fi
-
-fi
-
- LIBINTL=
- LTLIBINTL=
- INCINTL=
- LIBINTL_PREFIX=
- rpathdirs=
- ltrpathdirs=
- names_already_handled=
- names_next_round='intl '
- while test -n "$names_next_round"; do
- names_this_round="$names_next_round"
- names_next_round=
- for name in $names_this_round; do
- already_handled=
- for n in $names_already_handled; do
- if test "$n" = "$name"; then
- already_handled=yes
- break
- fi
- done
- if test -z "$already_handled"; then
- names_already_handled="$names_already_handled $name"
- uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
- eval value=\"\$HAVE_LIB$uppername\"
- if test -n "$value"; then
- if test "$value" = yes; then
- eval value=\"\$LIB$uppername\"
- test -z "$value" || LIBINTL="${LIBINTL}${LIBINTL:+ }$value"
- eval value=\"\$LTLIB$uppername\"
- test -z "$value" || LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$value"
- else
- :
- fi
- else
- found_dir=
- found_la=
- found_so=
- found_a=
- eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
- if test -n "$acl_shlibext"; then
- shrext=".$acl_shlibext" # typically: shrext=.so
- else
- shrext=
- fi
- if test $use_additional = yes; then
- dir="$additional_libdir"
- if test -n "$acl_shlibext"; then
- if test -f "$dir/$libname$shrext"; then
- found_dir="$dir"
- found_so="$dir/$libname$shrext"
- else
- if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
- ver=`(cd "$dir" && \
- for f in "$libname$shrext".*; do echo "$f"; done \
- | sed -e "s,^$libname$shrext\\\\.,," \
- | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
- | sed 1q ) 2>/dev/null`
- if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
- found_dir="$dir"
- found_so="$dir/$libname$shrext.$ver"
- fi
- else
- eval library_names=\"$acl_library_names_spec\"
- for f in $library_names; do
- if test -f "$dir/$f"; then
- found_dir="$dir"
- found_so="$dir/$f"
- break
- fi
- done
- fi
- fi
- fi
- if test "X$found_dir" = "X"; then
- if test -f "$dir/$libname.$acl_libext"; then
- found_dir="$dir"
- found_a="$dir/$libname.$acl_libext"
- fi
- fi
- if test "X$found_dir" != "X"; then
- if test -f "$dir/$libname.la"; then
- found_la="$dir/$libname.la"
- fi
- fi
- fi
- if test "X$found_dir" = "X"; then
- for x in $LDFLAGS $LTLIBINTL; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- case "$x" in
- -L*)
- dir=`echo "X$x" | sed -e 's/^X-L//'`
- if test -n "$acl_shlibext"; then
- if test -f "$dir/$libname$shrext"; then
- found_dir="$dir"
- found_so="$dir/$libname$shrext"
- else
- if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
- ver=`(cd "$dir" && \
- for f in "$libname$shrext".*; do echo "$f"; done \
- | sed -e "s,^$libname$shrext\\\\.,," \
- | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
- | sed 1q ) 2>/dev/null`
- if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
- found_dir="$dir"
- found_so="$dir/$libname$shrext.$ver"
- fi
- else
- eval library_names=\"$acl_library_names_spec\"
- for f in $library_names; do
- if test -f "$dir/$f"; then
- found_dir="$dir"
- found_so="$dir/$f"
- break
- fi
- done
- fi
- fi
- fi
- if test "X$found_dir" = "X"; then
- if test -f "$dir/$libname.$acl_libext"; then
- found_dir="$dir"
- found_a="$dir/$libname.$acl_libext"
- fi
- fi
- if test "X$found_dir" != "X"; then
- if test -f "$dir/$libname.la"; then
- found_la="$dir/$libname.la"
- fi
- fi
- ;;
- esac
- if test "X$found_dir" != "X"; then
- break
- fi
- done
- fi
- if test "X$found_dir" != "X"; then
- LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name"
- if test "X$found_so" != "X"; then
- if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
- LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
- else
- haveit=
- for x in $ltrpathdirs; do
- if test "X$x" = "X$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- ltrpathdirs="$ltrpathdirs $found_dir"
- fi
- if test "$acl_hardcode_direct" = yes; then
- LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
- else
- if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
- LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
- haveit=
- for x in $rpathdirs; do
- if test "X$x" = "X$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- rpathdirs="$rpathdirs $found_dir"
- fi
- else
- haveit=
- for x in $LDFLAGS $LIBINTL; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- if test "X$x" = "X-L$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir"
- fi
- if test "$acl_hardcode_minus_L" != no; then
- LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
- else
- LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
- fi
- fi
- fi
- fi
- else
- if test "X$found_a" != "X"; then
- LIBINTL="${LIBINTL}${LIBINTL:+ }$found_a"
- else
- LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir -l$name"
- fi
- fi
- additional_includedir=
- case "$found_dir" in
- */$acl_libdirstem | */$acl_libdirstem/)
- basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
- LIBINTL_PREFIX="$basedir"
- additional_includedir="$basedir/include"
- ;;
- esac
- if test "X$additional_includedir" != "X"; then
- if test "X$additional_includedir" != "X/usr/include"; then
- haveit=
- if test "X$additional_includedir" = "X/usr/local/include"; then
- if test -n "$GCC"; then
- case $host_os in
- linux* | gnu* | k*bsd*-gnu) haveit=yes;;
- esac
- fi
- fi
- if test -z "$haveit"; then
- for x in $CPPFLAGS $INCINTL; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- if test "X$x" = "X-I$additional_includedir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test -d "$additional_includedir"; then
- INCINTL="${INCINTL}${INCINTL:+ }-I$additional_includedir"
- fi
- fi
- fi
- fi
- fi
- if test -n "$found_la"; then
- save_libdir="$libdir"
- case "$found_la" in
- */* | *\\*) . "$found_la" ;;
- *) . "./$found_la" ;;
- esac
- libdir="$save_libdir"
- for dep in $dependency_libs; do
- case "$dep" in
- -L*)
- additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
- if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
- haveit=
- if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
- if test -n "$GCC"; then
- case $host_os in
- linux* | gnu* | k*bsd*-gnu) haveit=yes;;
- esac
- fi
- fi
- if test -z "$haveit"; then
- haveit=
- for x in $LDFLAGS $LIBINTL; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- if test "X$x" = "X-L$additional_libdir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test -d "$additional_libdir"; then
- LIBINTL="${LIBINTL}${LIBINTL:+ }-L$additional_libdir"
- fi
- fi
- haveit=
- for x in $LDFLAGS $LTLIBINTL; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- if test "X$x" = "X-L$additional_libdir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test -d "$additional_libdir"; then
- LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$additional_libdir"
- fi
- fi
- fi
- fi
- ;;
- -R*)
- dir=`echo "X$dep" | sed -e 's/^X-R//'`
- if test "$enable_rpath" != no; then
- haveit=
- for x in $rpathdirs; do
- if test "X$x" = "X$dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- rpathdirs="$rpathdirs $dir"
- fi
- haveit=
- for x in $ltrpathdirs; do
- if test "X$x" = "X$dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- ltrpathdirs="$ltrpathdirs $dir"
- fi
- fi
- ;;
- -l*)
- names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
- ;;
- *.la)
- names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
- ;;
- *)
- LIBINTL="${LIBINTL}${LIBINTL:+ }$dep"
- LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$dep"
- ;;
- esac
- done
- fi
- else
- LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
- LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-l$name"
- fi
- fi
- fi
- done
- done
- if test "X$rpathdirs" != "X"; then
- if test -n "$acl_hardcode_libdir_separator"; then
- alldirs=
- for found_dir in $rpathdirs; do
- alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
- done
- acl_save_libdir="$libdir"
- libdir="$alldirs"
- eval flag=\"$acl_hardcode_libdir_flag_spec\"
- libdir="$acl_save_libdir"
- LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
- else
- for found_dir in $rpathdirs; do
- acl_save_libdir="$libdir"
- libdir="$found_dir"
- eval flag=\"$acl_hardcode_libdir_flag_spec\"
- libdir="$acl_save_libdir"
- LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
- done
- fi
- fi
- if test "X$ltrpathdirs" != "X"; then
- for found_dir in $ltrpathdirs; do
- LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir"
- done
- fi
-
- { $as_echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5
-$as_echo_n "checking for GNU gettext in libintl... " >&6; }
-if { as_var=$gt_func_gnugettext_libintl; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
- gt_save_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $INCINTL"
- gt_save_LIBS="$LIBS"
- LIBS="$LIBS $LIBINTL"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <libintl.h>
-$gt_revision_test_code
-extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias (const char *);
-int
-main ()
-{
-bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
- }; then
- eval "$gt_func_gnugettext_libintl=yes"
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$gt_func_gnugettext_libintl=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
- LIBS="$LIBS $LIBICONV"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <libintl.h>
-$gt_revision_test_code
-extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias (const char *);
-int
-main ()
-{
-bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
- }; then
- LIBINTL="$LIBINTL $LIBICONV"
- LTLIBINTL="$LTLIBINTL $LTLIBICONV"
- eval "$gt_func_gnugettext_libintl=yes"
-
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
- CPPFLAGS="$gt_save_CPPFLAGS"
- LIBS="$gt_save_LIBS"
-fi
-ac_res=`eval 'as_val=${'$gt_func_gnugettext_libintl'}
-		 $as_echo "$as_val"'`
-	 { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- fi
-
- if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
- || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
- && test "$PACKAGE" != gettext-runtime \
- && test "$PACKAGE" != gettext-tools; }; then
- gt_use_preinstalled_gnugettext=yes
- else
- LIBINTL=
- LTLIBINTL=
- INCINTL=
- fi
-
-
-
- if test -n "$INTL_MACOSX_LIBS"; then
- if test "$gt_use_preinstalled_gnugettext" = "yes" \
- || test "$nls_cv_use_gnu_gettext" = "yes"; then
- LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
- LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
- fi
- fi
-
- if test "$gt_use_preinstalled_gnugettext" = "yes" \
- || test "$nls_cv_use_gnu_gettext" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define ENABLE_NLS 1
-_ACEOF
-
- else
- USE_NLS=no
- fi
- fi
-
- { $as_echo "$as_me:$LINENO: checking whether to use NLS" >&5
-$as_echo_n "checking whether to use NLS... " >&6; }
- { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5
-$as_echo "$USE_NLS" >&6; }
- if test "$USE_NLS" = "yes"; then
- { $as_echo "$as_me:$LINENO: checking where the gettext function comes from" >&5
-$as_echo_n "checking where the gettext function comes from... " >&6; }
- if test "$gt_use_preinstalled_gnugettext" = "yes"; then
- if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
- gt_source="external libintl"
- else
- gt_source="libc"
- fi
- else
- gt_source="included intl directory"
- fi
- { $as_echo "$as_me:$LINENO: result: $gt_source" >&5
-$as_echo "$gt_source" >&6; }
- fi
-
- if test "$USE_NLS" = "yes"; then
-
- if test "$gt_use_preinstalled_gnugettext" = "yes"; then
- if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
- { $as_echo "$as_me:$LINENO: checking how to link with libintl" >&5
-$as_echo_n "checking how to link with libintl... " >&6; }
- { $as_echo "$as_me:$LINENO: result: $LIBINTL" >&5
-$as_echo "$LIBINTL" >&6; }
-
- for element in $INCINTL; do
- haveit=
- for x in $CPPFLAGS; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- if test "X$x" = "X$element"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
- fi
- done
-
- fi
-
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GETTEXT 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DCGETTEXT 1
-_ACEOF
-
- fi
-
- POSUB=po
- fi
-
-
-
- INTLLIBS="$LIBINTL"
-
-
-
-
-
-
-
-GETTEXT_PACKAGE=pcsx
-
-
-cat >>confdefs.h <<_ACEOF
-#define GETTEXT_PACKAGE "${GETTEXT_PACKAGE}"
-_ACEOF
-
-
-
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- case $PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_path_PKG_CONFIG"; then
- ac_pt_PKG_CONFIG=$PKG_CONFIG
- # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- case $ac_pt_PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-if test -n "$ac_pt_PKG_CONFIG"; then
- { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_pt_PKG_CONFIG" = x; then
- PKG_CONFIG=""
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- PKG_CONFIG=$ac_pt_PKG_CONFIG
- fi
-else
- PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-fi
-
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=0.9.0
-	{ $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		{ $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-	else
-		{ $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-		PKG_CONFIG=""
-	fi
-
-fi
-
-pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for GLIB2" >&5
-$as_echo_n "checking for GLIB2... " >&6; }
-
-if test -n "$PKG_CONFIG"; then
- if test -n "$GLIB2_CFLAGS"; then
- pkg_cv_GLIB2_CFLAGS="$GLIB2_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_GLIB2_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$GLIB2_LIBS"; then
- pkg_cv_GLIB2_LIBS="$GLIB2_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_GLIB2_LIBS=`$PKG_CONFIG --libs "glib-2.0" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- fi
-else
-	pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
-	 GLIB2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0"`
- else
-	 GLIB2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0"`
- fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GLIB2_PKG_ERRORS" >&5
-
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
- { { $as_echo "$as_me:$LINENO: error: *** glib2 not found!" >&5
-$as_echo "$as_me: error: *** glib2 not found!" >&2;}
- { (exit 1); exit 1; }; }
-elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:$LINENO: error: *** glib2 not found!" >&5
-$as_echo "$as_me: error: *** glib2 not found!" >&2;}
- { (exit 1); exit 1; }; }
-else
-	GLIB2_CFLAGS=$pkg_cv_GLIB2_CFLAGS
-	GLIB2_LIBS=$pkg_cv_GLIB2_LIBS
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-	:
-fi
-
-pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for GTK2" >&5
-$as_echo_n "checking for GTK2... " >&6; }
-
-if test -n "$PKG_CONFIG"; then
- if test -n "$GTK2_CFLAGS"; then
- pkg_cv_GTK2_CFLAGS="$GTK2_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$GTK2_LIBS"; then
- pkg_cv_GTK2_LIBS="$GTK2_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_GTK2_LIBS=`$PKG_CONFIG --libs "gtk+-2.0" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- fi
-else
-	pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
-	 GTK2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0"`
- else
-	 GTK2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0"`
- fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GTK2_PKG_ERRORS" >&5
-
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
- { { $as_echo "$as_me:$LINENO: error: *** libgtk2 not found!" >&5
-$as_echo "$as_me: error: *** libgtk2 not found!" >&2;}
- { (exit 1); exit 1; }; }
-elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:$LINENO: error: *** libgtk2 not found!" >&5
-$as_echo "$as_me: error: *** libgtk2 not found!" >&2;}
- { (exit 1); exit 1; }; }
-else
-	GTK2_CFLAGS=$pkg_cv_GTK2_CFLAGS
-	GTK2_LIBS=$pkg_cv_GTK2_LIBS
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-	:
-fi
-
-pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for GLADE2" >&5
-$as_echo_n "checking for GLADE2... " >&6; }
-
-if test -n "$PKG_CONFIG"; then
- if test -n "$GLADE2_CFLAGS"; then
- pkg_cv_GLADE2_CFLAGS="$GLADE2_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libglade-2.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "libglade-2.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_GLADE2_CFLAGS=`$PKG_CONFIG --cflags "libglade-2.0" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$GLADE2_LIBS"; then
- pkg_cv_GLADE2_LIBS="$GLADE2_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libglade-2.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "libglade-2.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_GLADE2_LIBS=`$PKG_CONFIG --libs "libglade-2.0" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- fi
-else
-	pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
-	 GLADE2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libglade-2.0"`
- else
-	 GLADE2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libglade-2.0"`
- fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GLADE2_PKG_ERRORS" >&5
-
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
- { { $as_echo "$as_me:$LINENO: error: *** libglade2 not found!" >&5
-$as_echo "$as_me: error: *** libglade2 not found!" >&2;}
- { (exit 1); exit 1; }; }
-elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:$LINENO: error: *** libglade2 not found!" >&5
-$as_echo "$as_me: error: *** libglade2 not found!" >&2;}
- { (exit 1); exit 1; }; }
-else
-	GLADE2_CFLAGS=$pkg_cv_GLADE2_CFLAGS
-	GLADE2_LIBS=$pkg_cv_GLADE2_LIBS
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-	:
-fi
-
-
-# Check whether --with-sdl-prefix was given.
-if test "${with_sdl_prefix+set}" = set; then
- withval=$with_sdl_prefix; sdl_prefix="$withval"
-else
- sdl_prefix=""
-fi
-
-
-# Check whether --with-sdl-exec-prefix was given.
-if test "${with_sdl_exec_prefix+set}" = set; then
- withval=$with_sdl_exec_prefix; sdl_exec_prefix="$withval"
-else
- sdl_exec_prefix=""
-fi
-
-# Check whether --enable-sdltest was given.
-if test "${enable_sdltest+set}" = set; then
- enableval=$enable_sdltest;
-else
- enable_sdltest=yes
-fi
-
-
- if test x$sdl_exec_prefix != x ; then
- sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix"
- if test x${SDL_CONFIG+set} != xset ; then
- SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
- fi
- fi
- if test x$sdl_prefix != x ; then
- sdl_config_args="$sdl_config_args --prefix=$sdl_prefix"
- if test x${SDL_CONFIG+set} != xset ; then
- SDL_CONFIG=$sdl_prefix/bin/sdl-config
- fi
- fi
-
- if test "x$prefix" != xNONE; then
- PATH="$prefix/bin:$prefix/usr/bin:$PATH"
- fi
- # Extract the first word of "sdl-config", so it can be a program name with args.
-set dummy sdl-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_SDL_CONFIG+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- case $SDL_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_SDL_CONFIG="$SDL_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_SDL_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_SDL_CONFIG" && ac_cv_path_SDL_CONFIG="no"
- ;;
-esac
-fi
-SDL_CONFIG=$ac_cv_path_SDL_CONFIG
-if test -n "$SDL_CONFIG"; then
- { $as_echo "$as_me:$LINENO: result: $SDL_CONFIG" >&5
-$as_echo "$SDL_CONFIG" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- min_sdl_version=1.2.0
- { $as_echo "$as_me:$LINENO: checking for SDL - version >= $min_sdl_version" >&5
-$as_echo_n "checking for SDL - version >= $min_sdl_version... " >&6; }
- no_sdl=""
- if test "$SDL_CONFIG" = "no" ; then
- no_sdl=yes
- else
- SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags`
- SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs`
-
- sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \
- sed 's/$[0-9]*$.$[0-9]*$.$[0-9]*$/\1/'`
- sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \
- sed 's/$[0-9]*$.$[0-9]*$.$[0-9]*$/\2/'`
- sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
- sed 's/$[0-9]*$.$[0-9]*$.$[0-9]*$/\3/'`
- if test "x$enable_sdltest" = "xyes" ; then
- ac_save_CFLAGS="$CFLAGS"
- ac_save_CXXFLAGS="$CXXFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $SDL_CFLAGS"
- CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
- LIBS="$LIBS $SDL_LIBS"
- rm -f conf.sdltest
- if test "$cross_compiling" = yes; then
- echo $ac_n "cross compiling; assumed OK... $ac_c"
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "SDL.h"
-
-char*
-my_strdup (char *str)
-{
- char *new_str;
-
- if (str)
- {
- new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
- strcpy (new_str, str);
- }
- else
- new_str = NULL;
-
- return new_str;
-}
-
-int main (int argc, char *argv[])
-{
- int major, minor, micro;
- char *tmp_version;
-
- /* This hangs on some systems (?)
- system ("touch conf.sdltest");
- */
- { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
-
- /* HP/UX 9 (%@#!) writes to sscanf strings */
- tmp_version = my_strdup("$min_sdl_version");
- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
- printf("%s, bad version string\n", "$min_sdl_version");
- exit(1);
- }
-
- if (($sdl_major_version > major) ||
- (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
- (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
- {
- return 0;
- }
- else
- {
- printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
- printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
- printf("*** best to upgrade to the required version.\n");
- printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
- printf("*** to point to the correct copy of sdl-config, and remove the file\n");
- printf("*** config.cache before re-running configure\n");
- return 1;
- }
-}
-
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-no_sdl=yes
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
- CFLAGS="$ac_save_CFLAGS"
- CXXFLAGS="$ac_save_CXXFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- if test "x$no_sdl" = x ; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
- :
- else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
- if test "$SDL_CONFIG" = "no" ; then
- echo "*** The sdl-config script installed by SDL could not be found"
- echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
- echo "*** your path, or set the SDL_CONFIG environment variable to the"
- echo "*** full path to sdl-config."
- else
- if test -f conf.sdltest ; then
- :
- else
- echo "*** Could not run SDL test program, checking why..."
- CFLAGS="$CFLAGS $SDL_CFLAGS"
- CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
- LIBS="$LIBS $SDL_LIBS"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-#include <stdio.h>
-#include "SDL.h"
-
-int main(int argc, char *argv[])
-{ return 0; }
-#undef main
-#define main K_and_R_C_main
-
-int
-main ()
-{
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
- }; then
- echo "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding SDL or finding the wrong"
- echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
- echo "*** to the installed location Also, make sure you have run ldconfig if that"
- echo "*** is required on your system"
-	 echo "***"
- echo "*** If you have an old version installed, it is best to remove it, although"
- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	 echo "*** The test program failed to compile or link. See the file config.log for the"
- echo "*** exact error that occured. This usually means SDL was incorrectly installed"
- echo "*** or that you have moved SDL since it was installed. In the latter case, you"
- echo "*** may want to edit the sdl-config script: $SDL_CONFIG"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- CFLAGS="$ac_save_CFLAGS"
- CXXFLAGS="$ac_save_CXXFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- SDL_CFLAGS=""
- SDL_LIBS=""
- { { $as_echo "$as_me:$LINENO: error: *** SDL not found!" >&5
-$as_echo "$as_me: error: *** SDL not found!" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
-
- rm -f conf.sdltest
-
-
-
-
-
-
-
-
-
-ac_config_files="$ac_config_files Makefile data/Makefile doc/Makefile libpcsxcore/Makefile gui/Makefile plugins/dfinput/Makefile plugins/dfsound/Makefile plugins/dfxvideo/Makefile plugins/dfcdrom/Makefile plugins/dfnet/Makefile pixmaps/Makefile po/Makefile.in"
-
-
-{ $as_echo "$as_me:$LINENO: checking for dlsym in -ldl" >&5
-$as_echo_n "checking for dlsym in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlsym+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlsym ();
-int
-main ()
-{
-return dlsym ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
- }; then
- ac_cv_lib_dl_dlsym=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dl_dlsym=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlsym" >&5
-$as_echo "$ac_cv_lib_dl_dlsym" >&6; }
-if test "x$ac_cv_lib_dl_dlsym" = x""yes; then
- LDFLAGS="$LDFLAGS -ldl"
-fi
-
-{ $as_echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
-$as_echo_n "checking for socket in -lsocket... " >&6; }
-if test "${ac_cv_lib_socket_socket+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsocket $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char socket ();
-int
-main ()
-{
-return socket ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
- }; then
- ac_cv_lib_socket_socket=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_socket_socket=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
-$as_echo "$ac_cv_lib_socket_socket" >&6; }
-if test "x$ac_cv_lib_socket_socket" = x""yes; then
- LDFLAGS="$LDFLAGS -lsocket"
-fi
-
-{ $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
-$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
-if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lnsl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char gethostbyname ();
-int
-main ()
-{
-return gethostbyname ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
- }; then
- ac_cv_lib_nsl_gethostbyname=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_nsl_gethostbyname=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
-$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
-if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then
- LDFLAGS="$LDFLAGS -lnsl"
-fi
-
-{ $as_echo "$as_me:$LINENO: checking for umem_alloc in -lumem" >&5
-$as_echo_n "checking for umem_alloc in -lumem... " >&6; }
-if test "${ac_cv_lib_umem_umem_alloc+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lumem $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char umem_alloc ();
-int
-main ()
-{
-return umem_alloc ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
- }; then
- ac_cv_lib_umem_umem_alloc=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_umem_umem_alloc=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_umem_umem_alloc" >&5
-$as_echo "$ac_cv_lib_umem_umem_alloc" >&6; }
-if test "x$ac_cv_lib_umem_umem_alloc" = x""yes; then
- LDFLAGS="$LDFLAGS -lumem"
-fi
-
-
- if false; then
- SOUND_OSS_TRUE=
- SOUND_OSS_FALSE='#'
-else
- SOUND_OSS_TRUE='#'
- SOUND_OSS_FALSE=
-fi
-
- if false; then
- SOUND_SDL_TRUE=
- SOUND_SDL_FALSE='#'
-else
- SOUND_SDL_TRUE='#'
- SOUND_SDL_FALSE=
-fi
-
- if false; then
- SOUND_NULL_TRUE=
- SOUND_NULL_FALSE='#'
-else
- SOUND_NULL_TRUE='#'
- SOUND_NULL_FALSE=
-fi
-
-
-
-# Check whether --enable-sound was given.
-if test "${enable_sound+set}" = set; then
- enableval=$enable_sound; SOUND="$enableval"
-else
- SOUND="sdl"
-fi
-
-
-if test "x$SOUND" = xalsa; then
-
-pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for ALSA" >&5
-$as_echo_n "checking for ALSA... " >&6; }
-
-if test -n "$PKG_CONFIG"; then
- if test -n "$ALSA_CFLAGS"; then
- pkg_cv_ALSA_CFLAGS="$ALSA_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"alsa >= 1.0.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "alsa >= 1.0.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_ALSA_CFLAGS=`$PKG_CONFIG --cflags "alsa >= 1.0.0" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$ALSA_LIBS"; then
- pkg_cv_ALSA_LIBS="$ALSA_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"alsa >= 1.0.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "alsa >= 1.0.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_ALSA_LIBS=`$PKG_CONFIG --libs "alsa >= 1.0.0" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- fi
-else
-	pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
-	 ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "alsa >= 1.0.0"`
- else
-	 ALSA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "alsa >= 1.0.0"`
- fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$ALSA_PKG_ERRORS" >&5
-
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
- have_alsa=no
-elif test $pkg_failed = untried; then
-	have_alsa=no
-else
-	ALSA_CFLAGS=$pkg_cv_ALSA_CFLAGS
-	ALSA_LIBS=$pkg_cv_ALSA_LIBS
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-	have_alsa=yes
-fi
-elif test "x$SOUND" = xpulseaudio; then
-
-pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for PULSEAUDIO" >&5
-$as_echo_n "checking for PULSEAUDIO... " >&6; }
-
-if test -n "$PKG_CONFIG"; then
- if test -n "$PULSEAUDIO_CFLAGS"; then
- pkg_cv_PULSEAUDIO_CFLAGS="$PULSEAUDIO_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpulse >= 0.9.16\"") >&5
- ($PKG_CONFIG --exists --print-errors "libpulse >= 0.9.16") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_PULSEAUDIO_CFLAGS=`$PKG_CONFIG --cflags "libpulse >= 0.9.16" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$PULSEAUDIO_LIBS"; then
- pkg_cv_PULSEAUDIO_LIBS="$PULSEAUDIO_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpulse >= 0.9.16\"") >&5
- ($PKG_CONFIG --exists --print-errors "libpulse >= 0.9.16") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_PULSEAUDIO_LIBS=`$PKG_CONFIG --libs "libpulse >= 0.9.16" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- fi
-else
-	pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
-	 PULSEAUDIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libpulse >= 0.9.16"`
- else
-	 PULSEAUDIO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libpulse >= 0.9.16"`
- fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$PULSEAUDIO_PKG_ERRORS" >&5
-
-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (libpulse >= 0.9.16) were not met:
-
-$PULSEAUDIO_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables PULSEAUDIO_CFLAGS
-and PULSEAUDIO_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements (libpulse >= 0.9.16) were not met:
-
-$PULSEAUDIO_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables PULSEAUDIO_CFLAGS
-and PULSEAUDIO_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&2;}
- { (exit 1); exit 1; }; }
-elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables PULSEAUDIO_CFLAGS
-and PULSEAUDIO_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables PULSEAUDIO_CFLAGS
-and PULSEAUDIO_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
-else
-	PULSEAUDIO_CFLAGS=$pkg_cv_PULSEAUDIO_CFLAGS
-	PULSEAUDIO_LIBS=$pkg_cv_PULSEAUDIO_LIBS
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-	have_pulseaudio=yes
-fi
-elif test "x$SOUND" = xoss; then
-	if test "${ac_cv_header_sys_soundcard_h+set}" = set; then
- { $as_echo "$as_me:$LINENO: checking for sys/soundcard.h" >&5
-$as_echo_n "checking for sys/soundcard.h... " >&6; }
-if test "${ac_cv_header_sys_soundcard_h+set}" = set; then
- $as_echo_n "(cached) " >&6
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_soundcard_h" >&5
-$as_echo "$ac_cv_header_sys_soundcard_h" >&6; }
-else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking sys/soundcard.h usability" >&5
-$as_echo_n "checking sys/soundcard.h usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <sys/soundcard.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking sys/soundcard.h presence" >&5
-$as_echo_n "checking sys/soundcard.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <sys/soundcard.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: sys/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: sys/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: sys/soundcard.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: sys/soundcard.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: sys/soundcard.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: sys/soundcard.h: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: sys/soundcard.h: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: sys/soundcard.h: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: sys/soundcard.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: sys/soundcard.h: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: sys/soundcard.h: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: sys/soundcard.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: sys/soundcard.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: sys/soundcard.h: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: sys/soundcard.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: sys/soundcard.h: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for sys/soundcard.h" >&5
-$as_echo_n "checking for sys/soundcard.h... " >&6; }
-if test "${ac_cv_header_sys_soundcard_h+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_cv_header_sys_soundcard_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_soundcard_h" >&5
-$as_echo "$ac_cv_header_sys_soundcard_h" >&6; }
-
-fi
-if test "x$ac_cv_header_sys_soundcard_h" = x""yes; then
- have_oss=yes
-else
- have_oss=no
-fi
-
-
-	if test "x$have_oss" = xno; then
-		{ { $as_echo "$as_me:$LINENO: error: sys/soundcard.h not found!" >&5
-$as_echo "$as_me: error: sys/soundcard.h not found!" >&2;}
- { (exit 1); exit 1; }; }
-	else
-		 if true; then
- SOUND_OSS_TRUE=
- SOUND_OSS_FALSE='#'
-else
- SOUND_OSS_TRUE='#'
- SOUND_OSS_FALSE=
-fi
-
-	fi
-elif test "x$SOUND" = xno; then
-	 if true; then
- SOUND_NULL_TRUE=
- SOUND_NULL_FALSE='#'
-else
- SOUND_NULL_TRUE='#'
- SOUND_NULL_FALSE=
-fi
-
-elif test "x$SOUND" = xnull; then
-	 if true; then
- SOUND_NULL_TRUE=
- SOUND_NULL_FALSE='#'
-else
- SOUND_NULL_TRUE='#'
- SOUND_NULL_FALSE=
-fi
-
-else
-	 if true; then
- SOUND_SDL_TRUE=
- SOUND_SDL_FALSE='#'
-else
- SOUND_SDL_TRUE='#'
- SOUND_SDL_FALSE=
-fi
-
-fi
-
- if test "x$have_alsa" = xyes; then
- SOUND_ALSA_TRUE=
- SOUND_ALSA_FALSE='#'
-else
- SOUND_ALSA_TRUE='#'
- SOUND_ALSA_FALSE=
-fi
-
-
- if test "x$have_pulseaudio" = xyes; then
- SOUND_PULSEAUDIO_TRUE=
- SOUND_PULSEAUDIO_FALSE='#'
-else
- SOUND_PULSEAUDIO_TRUE='#'
- SOUND_PULSEAUDIO_FALSE=
-fi
-
-
-
-
-if test "${ac_cv_header_zlib_h+set}" = set; then
- { $as_echo "$as_me:$LINENO: checking for zlib.h" >&5
-$as_echo_n "checking for zlib.h... " >&6; }
-if test "${ac_cv_header_zlib_h+set}" = set; then
- $as_echo_n "(cached) " >&6
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
-$as_echo "$ac_cv_header_zlib_h" >&6; }
-else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking zlib.h usability" >&5
-$as_echo_n "checking zlib.h usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <zlib.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking zlib.h presence" >&5
-$as_echo_n "checking zlib.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <zlib.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: zlib.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: zlib.h: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: zlib.h: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: zlib.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: zlib.h: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for zlib.h" >&5
-$as_echo_n "checking for zlib.h... " >&6; }
-if test "${ac_cv_header_zlib_h+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_cv_header_zlib_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
-$as_echo "$ac_cv_header_zlib_h" >&6; }
-
-fi
-if test "x$ac_cv_header_zlib_h" = x""yes; then
- have_zlib=yes
-else
- have_zlib=no
-fi
-
-
-if test "x$have_zlib" = xno; then
-	{ { $as_echo "$as_me:$LINENO: error: unable to find libz headers" >&5
-$as_echo "$as_me: error: unable to find libz headers" >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test "${ac_cv_header_X11_extensions_Xv_h+set}" = set; then
- { $as_echo "$as_me:$LINENO: checking for X11/extensions/Xv.h" >&5
-$as_echo_n "checking for X11/extensions/Xv.h... " >&6; }
-if test "${ac_cv_header_X11_extensions_Xv_h+set}" = set; then
- $as_echo_n "(cached) " >&6
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xv_h" >&5
-$as_echo "$ac_cv_header_X11_extensions_Xv_h" >&6; }
-else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking X11/extensions/Xv.h usability" >&5
-$as_echo_n "checking X11/extensions/Xv.h usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <X11/extensions/Xv.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking X11/extensions/Xv.h presence" >&5
-$as_echo_n "checking X11/extensions/Xv.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <X11/extensions/Xv.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xv.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: X11/extensions/Xv.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xv.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: X11/extensions/Xv.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xv.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: X11/extensions/Xv.h: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xv.h: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: X11/extensions/Xv.h: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xv.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: X11/extensions/Xv.h: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xv.h: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: X11/extensions/Xv.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xv.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: X11/extensions/Xv.h: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/Xv.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: X11/extensions/Xv.h: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for X11/extensions/Xv.h" >&5
-$as_echo_n "checking for X11/extensions/Xv.h... " >&6; }
-if test "${ac_cv_header_X11_extensions_Xv_h+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_cv_header_X11_extensions_Xv_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xv_h" >&5
-$as_echo "$ac_cv_header_X11_extensions_Xv_h" >&6; }
-
-fi
-if test "x$ac_cv_header_X11_extensions_Xv_h" = x""yes; then
- have_xv=yes
-else
- have_xv=no
-fi
-
-
-if test "x$have_xv" = xno; then
-	{ { $as_echo "$as_me:$LINENO: error: unable to find xv headers" >&5
-$as_echo "$as_me: error: unable to find xv headers" >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test "${ac_cv_header_X11_extensions_XTest_h+set}" = set; then
- { $as_echo "$as_me:$LINENO: checking for X11/extensions/XTest.h" >&5
-$as_echo_n "checking for X11/extensions/XTest.h... " >&6; }
-if test "${ac_cv_header_X11_extensions_XTest_h+set}" = set; then
- $as_echo_n "(cached) " >&6
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XTest_h" >&5
-$as_echo "$ac_cv_header_X11_extensions_XTest_h" >&6; }
-else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking X11/extensions/XTest.h usability" >&5
-$as_echo_n "checking X11/extensions/XTest.h usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <X11/extensions/XTest.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking X11/extensions/XTest.h presence" >&5
-$as_echo_n "checking X11/extensions/XTest.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <X11/extensions/XTest.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/XTest.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: X11/extensions/XTest.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/XTest.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: X11/extensions/XTest.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/XTest.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: X11/extensions/XTest.h: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/XTest.h: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: X11/extensions/XTest.h: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/XTest.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: X11/extensions/XTest.h: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/XTest.h: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: X11/extensions/XTest.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/XTest.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: X11/extensions/XTest.h: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: X11/extensions/XTest.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: X11/extensions/XTest.h: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for X11/extensions/XTest.h" >&5
-$as_echo_n "checking for X11/extensions/XTest.h... " >&6; }
-if test "${ac_cv_header_X11_extensions_XTest_h+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_cv_header_X11_extensions_XTest_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XTest_h" >&5
-$as_echo "$ac_cv_header_X11_extensions_XTest_h" >&6; }
-
-fi
-if test "x$ac_cv_header_X11_extensions_XTest_h" = x""yes; then
- have_xtest=yes
-else
- have_xtest=no
-fi
-
-
-if test "x$have_xtest" = xno; then
-	{ { $as_echo "$as_me:$LINENO: error: unable to find xtest headers" >&5
-$as_echo "$as_me: error: unable to find xtest headers" >&2;}
- { (exit 1); exit 1; }; }
-fi
-
- if false; then
- USE_LIBCDIO_TRUE=
- USE_LIBCDIO_FALSE='#'
-else
- USE_LIBCDIO_TRUE='#'
- USE_LIBCDIO_FALSE=
-fi
-
-
-# Check whether --enable-libcdio was given.
-if test "${enable_libcdio+set}" = set; then
- enableval=$enable_libcdio; BUILD_LIBCDIO="$enableval"
-else
- BUILD_LIBCDIO="no"
-fi
-
-
-if test "$BUILD_LIBCDIO" = "yes"; then
-
-pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for LIBCDIO" >&5
-$as_echo_n "checking for LIBCDIO... " >&6; }
-
-if test -n "$PKG_CONFIG"; then
- if test -n "$LIBCDIO_CFLAGS"; then
- pkg_cv_LIBCDIO_CFLAGS="$LIBCDIO_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libcdio\"") >&5
- ($PKG_CONFIG --exists --print-errors "libcdio") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_LIBCDIO_CFLAGS=`$PKG_CONFIG --cflags "libcdio" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$LIBCDIO_LIBS"; then
- pkg_cv_LIBCDIO_LIBS="$LIBCDIO_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libcdio\"") >&5
- ($PKG_CONFIG --exists --print-errors "libcdio") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_LIBCDIO_LIBS=`$PKG_CONFIG --libs "libcdio" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- fi
-else
-	pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
-	 LIBCDIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libcdio"`
- else
-	 LIBCDIO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libcdio"`
- fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBCDIO_PKG_ERRORS" >&5
-
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
- { { $as_echo "$as_me:$LINENO: error: *** libcdio not found!" >&5
-$as_echo "$as_me: error: *** libcdio not found!" >&2;}
- { (exit 1); exit 1; }; }
-elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:$LINENO: error: *** libcdio not found!" >&5
-$as_echo "$as_me: error: *** libcdio not found!" >&2;}
- { (exit 1); exit 1; }; }
-else
-	LIBCDIO_CFLAGS=$pkg_cv_LIBCDIO_CFLAGS
-	LIBCDIO_LIBS=$pkg_cv_LIBCDIO_LIBS
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-	:
-fi
-	 if true; then
- USE_LIBCDIO_TRUE=
- USE_LIBCDIO_FALSE='#'
-else
- USE_LIBCDIO_TRUE='#'
- USE_LIBCDIO_FALSE=
-fi
-
-fi
-
-
-
-
-# Check whether --enable-opengl was given.
-if test "${enable_opengl+set}" = set; then
- enableval=$enable_opengl; BUILD_OPENGL="$enableval"
-else
- BUILD_OPENGL="no"
-fi
-
-
-PEOPSXGL=""
-
-if test "$BUILD_OPENGL" = "yes"; then
-	if test "${ac_cv_header_GL_gl_h+set}" = set; then
- { $as_echo "$as_me:$LINENO: checking for GL/gl.h" >&5
-$as_echo_n "checking for GL/gl.h... " >&6; }
-if test "${ac_cv_header_GL_gl_h+set}" = set; then
- $as_echo_n "(cached) " >&6
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5
-$as_echo "$ac_cv_header_GL_gl_h" >&6; }
-else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking GL/gl.h usability" >&5
-$as_echo_n "checking GL/gl.h usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <GL/gl.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking GL/gl.h presence" >&5
-$as_echo_n "checking GL/gl.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <GL/gl.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: GL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: GL/gl.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: GL/gl.h: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: GL/gl.h: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: GL/gl.h: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: GL/gl.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: GL/gl.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: GL/gl.h: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for GL/gl.h" >&5
-$as_echo_n "checking for GL/gl.h... " >&6; }
-if test "${ac_cv_header_GL_gl_h+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_cv_header_GL_gl_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5
-$as_echo "$ac_cv_header_GL_gl_h" >&6; }
-
-fi
-if test "x$ac_cv_header_GL_gl_h" = x""yes; then
- have_gl=yes
-else
- have_gl=no
-fi
-
-
-	if test "x$have_gl" = xno; then
-		{ { $as_echo "$as_me:$LINENO: error: unable to find OpenGL headers" >&5
-$as_echo "$as_me: error: unable to find OpenGL headers" >&2;}
- { (exit 1); exit 1; }; }
-	fi
-	if test "${ac_cv_header_GL_glx_h+set}" = set; then
- { $as_echo "$as_me:$LINENO: checking for GL/glx.h" >&5
-$as_echo_n "checking for GL/glx.h... " >&6; }
-if test "${ac_cv_header_GL_glx_h+set}" = set; then
- $as_echo_n "(cached) " >&6
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_GL_glx_h" >&5
-$as_echo "$ac_cv_header_GL_glx_h" >&6; }
-else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking GL/glx.h usability" >&5
-$as_echo_n "checking GL/glx.h usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <GL/glx.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking GL/glx.h presence" >&5
-$as_echo_n "checking GL/glx.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <GL/glx.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: GL/glx.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: GL/glx.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: GL/glx.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: GL/glx.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: GL/glx.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: GL/glx.h: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: GL/glx.h: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: GL/glx.h: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: GL/glx.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: GL/glx.h: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: GL/glx.h: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: GL/glx.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: GL/glx.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: GL/glx.h: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: GL/glx.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: GL/glx.h: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for GL/glx.h" >&5
-$as_echo_n "checking for GL/glx.h... " >&6; }
-if test "${ac_cv_header_GL_glx_h+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_cv_header_GL_glx_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_GL_glx_h" >&5
-$as_echo "$ac_cv_header_GL_glx_h" >&6; }
-
-fi
-if test "x$ac_cv_header_GL_glx_h" = x""yes; then
- have_glx=yes
-else
- have_glx=no
-fi
-
-
-	if test "x$have_glx" = xno; then
-		{ { $as_echo "$as_me:$LINENO: error: unable to find GLX headers" >&5
-$as_echo "$as_me: error: unable to find GLX headers" >&2;}
- { (exit 1); exit 1; }; }
-	fi
-	{ $as_echo "$as_me:$LINENO: checking for X11/extensions/xf86vmode.h" >&5
-$as_echo_n "checking for X11/extensions/xf86vmode.h... " >&6; }
-if test "${ac_cv_header_X11_extensions_xf86vmode_h+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <GL/gl.h>
-	#include <GL/glx.h>
-
-
-#include <X11/extensions/xf86vmode.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_header_X11_extensions_xf86vmode_h=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_header_X11_extensions_xf86vmode_h=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xf86vmode_h" >&5
-$as_echo "$ac_cv_header_X11_extensions_xf86vmode_h" >&6; }
-if test "x$ac_cv_header_X11_extensions_xf86vmode_h" = x""yes; then
- have_vmode=yes
-else
- have_vmode=no
-fi
-
-
-	if test "x$have_vmode" = xno; then
-		{ { $as_echo "$as_me:$LINENO: error: unable to find xf86vmode headers" >&5
-$as_echo "$as_me: error: unable to find xf86vmode headers" >&2;}
- { (exit 1); exit 1; }; }
-	fi
-	PEOPSXGL="plugins/peopsxgl"
-
-	ac_config_files="$ac_config_files plugins/peopsxgl/Makefile"
-
-fi
-
- if false; then
- X86_NASM_TRUE=
- X86_NASM_FALSE='#'
-else
- X86_NASM_TRUE='#'
- X86_NASM_FALSE=
-fi
-
-
-if expr x"$target_cpu" : 'xi.86' > /dev/null; then
-	if expr x"$target_os" : 'x.*linux.*' > /dev/null; then
-		# Extract the first word of "nasm", so it can be a program name with args.
-set dummy nasm; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_NASM+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- case $NASM in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_NASM="$NASM" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_NASM="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_NASM" && ac_cv_path_NASM="missing"
- ;;
-esac
-fi
-NASM=$ac_cv_path_NASM
-if test -n "$NASM"; then
- { $as_echo "$as_me:$LINENO: result: $NASM" >&5
-$as_echo "$NASM" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-		if test "$NASM" = "missing"; then
-			{ $as_echo "$as_me:$LINENO: WARNING: unable to find nasm, needed to build dfx11video" >&5
-$as_echo "$as_me: WARNING: unable to find nasm, needed to build dfx11video" >&2;}
-			 if false; then
- X86_NASM_TRUE=
- X86_NASM_FALSE='#'
-else
- X86_NASM_TRUE='#'
- X86_NASM_FALSE=
-fi
-
-		else
-			 if true; then
- X86_NASM_TRUE=
- X86_NASM_FALSE='#'
-else
- X86_NASM_TRUE='#'
- X86_NASM_FALSE=
-fi
-
-		fi
-	fi
-fi
-
- if false; then
- ARCH_X86_TRUE=
- ARCH_X86_FALSE='#'
-else
- ARCH_X86_TRUE='#'
- ARCH_X86_FALSE=
-fi
-
- if false; then
- ARCH_X86_64_TRUE=
- ARCH_X86_64_FALSE='#'
-else
- ARCH_X86_64_TRUE='#'
- ARCH_X86_64_FALSE=
-fi
-
- if false; then
- ARCH_PPC_TRUE=
- ARCH_PPC_FALSE='#'
-else
- ARCH_PPC_TRUE='#'
- ARCH_PPC_FALSE=
-fi
-
-
-# Check whether --enable-dynarec was given.
-if test "${enable_dynarec+set}" = set; then
- enableval=$enable_dynarec; DYNAREC="$enableval"
-else
- DYNAREC="auto"
-fi
-
-
-if test "x$DYNAREC" = xauto; then
-	DYNARECSEL="auto"
-else if test "x$DYNAREC" = xx86; then
-	DYNARECSEL="x86"
-else if test "x$DYNAREC" = xx86_64; then
-	DYNARECSEL="x86_64"
-else if test "x$DYNAREC" = xppc; then
-	DYNARECSEL="ppc"
-else if test "x$DYNAREC" = xno; then
-	DYNARECSEL="no"
-else
-	{ $as_echo "$as_me:$LINENO: WARNING: Dynamic Recompiler \"$DYNAREC\" not found. Autodetecting..." >&5
-$as_echo "$as_me: WARNING: Dynamic Recompiler \"$DYNAREC\" not found. Autodetecting..." >&2;}
-	DYNARECSEL="auto"
-fi
-fi
-fi
-fi
-fi
-
-if test "x$DYNARECSEL" = xauto; then
-	if expr x"$target_cpu" : 'xi.86' > /dev/null; then
-		DYNARECSEL="x86"
-	fi
-
-	if expr x"$target_cpu" : 'xx86_64' > /dev/null; then
-		DYNARECSEL="x86_64"
-	fi
-
-	if expr x"$target_cpu" : 'xpowerpc' > /dev/null; then
-		DYNARECSEL="ppc"
-	fi
-fi
-
-if test "x$DYNARECSEL" = xno; then
-
-cat >>confdefs.h <<\_ACEOF
-#define NOPSXREC 1
-_ACEOF
-
-fi
-
-if test "x$DYNARECSEL" = xx86; then
-
-cat >>confdefs.h <<\_ACEOF
-#define __i386__ 1
-_ACEOF
-
- if true; then
- ARCH_X86_TRUE=
- ARCH_X86_FALSE='#'
-else
- ARCH_X86_TRUE='#'
- ARCH_X86_FALSE=
-fi
-
-
-	{ $as_echo "$as_me:$LINENO: result: Dynamic Recompiler selected: x86" >&5
-$as_echo "Dynamic Recompiler selected: x86" >&6; }
-fi
-
-if test "x$DYNARECSEL" = xx86_64; then
-
-cat >>confdefs.h <<\_ACEOF
-#define __x86_64__ 1
-_ACEOF
-
- if true; then
- ARCH_X86_64_TRUE=
- ARCH_X86_64_FALSE='#'
-else
- ARCH_X86_64_TRUE='#'
- ARCH_X86_64_FALSE=
-fi
-
-			{ $as_echo "$as_me:$LINENO: result: Dynamic Recompiler selected: x86_64" >&5
-$as_echo "Dynamic Recompiler selected: x86_64" >&6; }
-fi
-
-if test "x$DYNARECSEL" = xppc; then
-
-cat >>confdefs.h <<\_ACEOF
-#define __ppc__ 1
-_ACEOF
-
- if true; then
- ARCH_PPC_TRUE=
- ARCH_PPC_FALSE='#'
-else
- ARCH_PPC_TRUE='#'
- ARCH_PPC_FALSE=
-fi
-
-	{ $as_echo "$as_me:$LINENO: result: Dynamic Recompiler selected: ppc" >&5
-$as_echo "Dynamic Recompiler selected: ppc" >&6; }
-fi
-
-
- { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if test "${ac_cv_c_bigendian+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_cv_c_bigendian=unknown
- # See if we're dealing with a universal compiler.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#ifndef __APPLE_CC__
-	 not a universal capable compiler
-	 #endif
-	 typedef int dummy;
-
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-
-	# Check for potential -arch flags. It is not universal unless
-	# there are some -arch flags. Note that *ppc* also matches
-	# ppc64. This check is also rather less than ideal.
-	case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in #(
-	 *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;;
-	esac
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- if test $ac_cv_c_bigendian = unknown; then
- # See if sys/param.h defines the BYTE_ORDER macro.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <sys/types.h>
-	 #include <sys/param.h>
-
-int
-main ()
-{
-#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
-		 && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
-		 && LITTLE_ENDIAN)
-	 bogus endian macros
-	 #endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- # It does; now see whether it defined to BIG_ENDIAN or not.
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <sys/types.h>
-		#include <sys/param.h>
-
-int
-main ()
-{
-#if BYTE_ORDER != BIG_ENDIAN
-		 not big endian
-		#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_c_bigendian=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_c_bigendian=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- if test $ac_cv_c_bigendian = unknown; then
- # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <limits.h>
-
-int
-main ()
-{
-#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
-	 bogus endian macros
-	 #endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- # It does; now see whether it defined to _BIG_ENDIAN or not.
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <limits.h>
-
-int
-main ()
-{
-#ifndef _BIG_ENDIAN
-		 not big endian
-		#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_c_bigendian=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_c_bigendian=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- if test $ac_cv_c_bigendian = unknown; then
- # Compile a test program.
- if test "$cross_compiling" = yes; then
- # Try to guess by grepping values from an object file.
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-short int ascii_mm[] =
-		 { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-		short int ascii_ii[] =
-		 { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-		int use_ascii (int i) {
-		 return ascii_mm[i] + ascii_ii[i];
-		}
-		short int ebcdic_ii[] =
-		 { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-		short int ebcdic_mm[] =
-		 { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-		int use_ebcdic (int i) {
-		 return ebcdic_mm[i] + ebcdic_ii[i];
-		}
-		extern int foo;
-
-int
-main ()
-{
-return use_ascii (foo) == use_ebcdic (foo);
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
-	 ac_cv_c_bigendian=yes
-	 fi
-	 if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-	 if test "$ac_cv_c_bigendian" = unknown; then
-		ac_cv_c_bigendian=no
-	 else
-		# finding both strings is unlikely to happen, but who knows?
-		ac_cv_c_bigendian=unknown
-	 fi
-	 fi
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-
-	 /* Are we little or big endian? From Harbison&Steele. */
-	 union
-	 {
-	 long int l;
-	 char c[sizeof (long int)];
-	 } u;
-	 u.l = 1;
-	 return u.c[sizeof (long int) - 1] == 1;
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_c_bigendian=no
-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_c_bigendian=yes
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
- fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-$as_echo "$ac_cv_c_bigendian" >&6; }
- case $ac_cv_c_bigendian in #(
- yes)
-
-cat >>confdefs.h <<\_ACEOF
-#define __BIGENDIAN__ /**/
-_ACEOF
-;; #(
- no)
- ;; #(
- universal)
-
-cat >>confdefs.h <<\_ACEOF
-#define AC_APPLE_UNIVERSAL_BUILD 1
-_ACEOF
-
- ;; #(
- *)
- { { $as_echo "$as_me:$LINENO: error: unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" >&5
-$as_echo "$as_me: error: unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
- { (exit 1); exit 1; }; } ;;
- esac
-
-
-
-cat >>confdefs.h <<\_ACEOF
-#define __LINUX__ 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define MAXPATHLEN 4096
-_ACEOF
-
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems. If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
- for ac_var in `(set) 2>&1 | sed -n 's/^$[a-zA-Z_][a-zA-Z0-9_]*$=.*/\1/p'`; do
- eval ac_val=\$$ac_var
- case $ac_val in #(
- *${as_nl}*)
- case $ac_var in #(
- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
- esac
- case $ac_var in #(
- _ | IFS | as_nl) ;; #(
- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
- *) $as_unset $ac_var ;;
- esac ;;
- esac
- done
-
- (set) 2>&1 |
- case $as_nl`(ac_space=' '; set) 2>&1` in #(
- *${as_nl}ac_space=\ *)
- # `set' does not quote correctly, so add quotes (double-quote
- # substitution turns \\\\ into \\, and sed turns \\ into \).
- sed -n \
-	"s/'/'\\\\''/g;
-	 s/^\$[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\$=\$.*\$/\\1='\\2'/p"
- ;; #(
- *)
- # `set' quotes correctly as required by POSIX, so do not add quotes.
- sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
- ;;
- esac |
- sort
-) |
- sed '
- /^ac_cv_env_/b end
- t clear
- :clear
- s/^$[^=]*$=$.*[{}].*$$/test "${\1+set}" = set || &/
- t end
- s/^$[^=]*$=$.*$$/\1=${\1=\2}/
- :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
- if test -w "$cache_file"; then
- test "x$cache_file" != "x/dev/null" &&
- { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
- cat confcache >$cache_file
- else
- { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
- fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-DEFS=-DHAVE_CONFIG_H
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
- # 1. Remove the extension, and $U if already installed.
- ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
- ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
- # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
- # will be set to the directory where LIBOBJS objects are built.
- ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
- ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCCAS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"am__fastdepCCAS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${SOUND_OSS_TRUE}" && test -z "${SOUND_OSS_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"SOUND_OSS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"SOUND_OSS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${SOUND_SDL_TRUE}" && test -z "${SOUND_SDL_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"SOUND_SDL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"SOUND_SDL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${SOUND_NULL_TRUE}" && test -z "${SOUND_NULL_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"SOUND_NULL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"SOUND_NULL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${SOUND_OSS_TRUE}" && test -z "${SOUND_OSS_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"SOUND_OSS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"SOUND_OSS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${SOUND_NULL_TRUE}" && test -z "${SOUND_NULL_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"SOUND_NULL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"SOUND_NULL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${SOUND_NULL_TRUE}" && test -z "${SOUND_NULL_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"SOUND_NULL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"SOUND_NULL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${SOUND_SDL_TRUE}" && test -z "${SOUND_SDL_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"SOUND_SDL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"SOUND_SDL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${SOUND_ALSA_TRUE}" && test -z "${SOUND_ALSA_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"SOUND_ALSA\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"SOUND_ALSA\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${SOUND_PULSEAUDIO_TRUE}" && test -z "${SOUND_PULSEAUDIO_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"SOUND_PULSEAUDIO\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"SOUND_PULSEAUDIO\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${USE_LIBCDIO_TRUE}" && test -z "${USE_LIBCDIO_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_LIBCDIO\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"USE_LIBCDIO\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${USE_LIBCDIO_TRUE}" && test -z "${USE_LIBCDIO_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_LIBCDIO\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"USE_LIBCDIO\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${X86_NASM_TRUE}" && test -z "${X86_NASM_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"X86_NASM\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"X86_NASM\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${X86_NASM_TRUE}" && test -z "${X86_NASM_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"X86_NASM\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"X86_NASM\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${X86_NASM_TRUE}" && test -z "${X86_NASM_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"X86_NASM\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"X86_NASM\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${ARCH_X86_TRUE}" && test -z "${ARCH_X86_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"ARCH_X86\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"ARCH_X86\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${ARCH_X86_64_TRUE}" && test -z "${ARCH_X86_64_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"ARCH_X86_64\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"ARCH_X86_64\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${ARCH_PPC_TRUE}" && test -z "${ARCH_PPC_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"ARCH_PPC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"ARCH_PPC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${ARCH_X86_TRUE}" && test -z "${ARCH_X86_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"ARCH_X86\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"ARCH_X86\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${ARCH_X86_64_TRUE}" && test -z "${ARCH_X86_64_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"ARCH_X86_64\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"ARCH_X86_64\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${ARCH_PPC_TRUE}" && test -z "${ARCH_PPC_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"ARCH_PPC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"ARCH_PPC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-
-
-: ${CONFIG_STATUS=./config.status}
-ac_write_fail=0
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-## --------------------- ##
-## M4sh Initialization. ##
-## --------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
-esac
-
-fi
-
-
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
- as_echo='printf %s\n'
- as_echo_n='printf %s'
-else
- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
- as_echo_n='/usr/ucb/echo -n'
- else
- as_echo_body='eval expr "X$1" : "X\$.*\$"'
- as_echo_n_body='eval
- arg=$1;
- case $arg in
- *"$as_nl"*)
-	expr "X$arg" : "X\$.*\$$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;
- esac;
- expr "X$arg" : "X\$.*\$" | tr -d "$as_nl"
- '
- export as_echo_n_body
- as_echo_n='sh -c $as_echo_n_body as_echo'
- fi
- export as_echo_body
- as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- PATH_SEPARATOR=:
- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
- PATH_SEPARATOR=';'
- }
-fi
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- as_unset=unset
-else
- as_unset=false
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order. Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are. Look in the path if we contain no directory separator.
-case $0 in
- *[\\/]* ) as_myself=$0 ;;
- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
-
- ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
- as_myself=$0
-fi
-if test ! -f "$as_myself"; then
- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- { (exit 1); exit 1; }
-fi
-
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# Required to use basename.
-if expr a : '$a$' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*$...$'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
- as_basename=basename
-else
- as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/$[^/][^/]*$/*$' \| \
-	 X"$0" : 'X$//$$' \| \
-	 X"$0" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X/"$0" |
- sed '/^.*\/$[^/][^/]*$\/*$/{
-	 s//\1/
-	 q
-	 }
-	 /^X\/$\/\/$$/{
-	 s//\1/
-	 q
-	 }
-	 /^X\/$\/$.*/{
-	 s//\1/
-	 q
-	 }
-	 s/.*/./; q'`
-
-# CDPATH.
-$as_unset CDPATH
-
-
-
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
- # uniformly replaced by the line number. The first 'sed' inserts a
- # line-number line after each line using $LINENO; the second 'sed'
- # does the real work. The second script uses 'N' to pair each
- # line-number line with the line containing $LINENO, and appends
- # trailing '-' during substitution so that $LINENO is not a special
- # case at line end.
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
- # scripts with optimization help from Paolo Bonzini. Blame Lee
- # E. McMahon (1931-1989) for sed's syntax. :-)
- sed -n '
- p
- /[$]LINENO/=
- ' <$as_myself |
- sed '
- s/[$]LINENO.*/&-/
- t lineno
- b
- :lineno
- N
- :loop
- s/[$]LINENO$[^'$as_cr_alnum'_].*\n$$.*$/\2\1\2/
- t loop
- s/-\n.*//
- ' >$as_me.lineno &&
- chmod +x "$as_me.lineno" ||
- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
- { (exit 1); exit 1; }; }
-
- # Don't try to exec as it changes $[0], causing all sort of problems
- # (the dirname of $[0] is not the place where we might find the
- # original and so on. Autoconf is especially sensitive to this).
- . "./$as_me.lineno"
- # Exit status is that of the last command.
- exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
- as_dirname=dirname
-else
- as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
- case `echo 'x\c'` in
- *c*) ECHO_T='	';;	# ECHO_T is single tab character.
- *) ECHO_C='\c';;
- esac;;
-*)
- ECHO_N='-n';;
-esac
-if expr a : '$a$' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*$...$'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
- rm -f conf$$.dir/conf$$.file
-else
- rm -f conf$$.dir
- mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
- if ln -s conf$$.file conf$$ 2>/dev/null; then
- as_ln_s='ln -s'
- # ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
- elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
- else
- as_ln_s='cp -p'
- fi
-else
- as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
-else
- test -d ./-p && rmdir ./-p
- as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
-	test -d "$1/.";
- else
-	case $1 in
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-	???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-exec 6>&1
-
-# Save the log message, to keep $[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by pcsx $as_me 1.9, which was
-generated by GNU Autoconf 2.63. Invocation command line was
-
- CONFIG_FILES = $CONFIG_FILES
- CONFIG_HEADERS = $CONFIG_HEADERS
- CONFIG_LINKS = $CONFIG_LINKS
- CONFIG_COMMANDS = $CONFIG_COMMANDS
- $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-_ACEOF
-
-case $ac_config_files in *"
-"*) set x $ac_config_files; shift; ac_config_files=$*;;
-esac
-
-case $ac_config_headers in *"
-"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
-esac
-
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-# Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
-config_commands="$ac_config_commands"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTION]... [FILE]...
-
- -h, --help print this help, then exit
- -V, --version print version number and configuration settings, then exit
- -q, --quiet, --silent
- do not print progress messages
- -d, --debug don't remove temporary files
- --recheck update $as_me by reconfiguring in the same conditions
- --file=FILE[:TEMPLATE]
- instantiate the configuration file FILE
- --header=FILE[:TEMPLATE]
- instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Configuration commands:
-$config_commands
-
-Report bugs to <bug-autoconf@gnu.org>."
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_version="\\
-pcsx config.status 1.9
-configured by $0, generated by GNU Autoconf 2.63,
- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2008 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-INSTALL='$INSTALL'
-MKDIR_P='$MKDIR_P'
-AWK='$AWK'
-test -n "\$AWK" || AWK=awk
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# The default lists apply if the user does not specify any file.
-ac_need_defaults=:
-while test $# != 0
-do
- case $1 in
- --*=*)
- ac_option=`expr "X$1" : 'X$[^=]*$='`
- ac_optarg=`expr "X$1" : 'X[^=]*=$.*$'`
- ac_shift=:
- ;;
- *)
- ac_option=$1
- ac_optarg=$2
- ac_shift=shift
- ;;
- esac
-
- case $ac_option in
- # Handling of the options.
- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
- ac_cs_recheck=: ;;
- --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
- $as_echo "$ac_cs_version"; exit ;;
- --debug | --debu | --deb | --de | --d | -d )
- debug=: ;;
- --file | --fil | --fi | --f )
- $ac_shift
- case $ac_optarg in
- *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
- esac
- CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
- ac_need_defaults=false;;
- --header | --heade | --head | --hea )
- $ac_shift
- case $ac_optarg in
- *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
- esac
- CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
- ac_need_defaults=false;;
- --he | --h)
- # Conflict between --help and --header
- { $as_echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; };;
- --help | --hel | -h )
- $as_echo "$ac_cs_usage"; exit ;;
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil | --si | --s)
- ac_cs_silent=: ;;
-
- # This is an error.
- -*) { $as_echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; } ;;
-
- *) ac_config_targets="$ac_config_targets $1"
- ac_need_defaults=false ;;
-
- esac
- shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
- exec 6>/dev/null
- ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-if \$ac_cs_recheck; then
- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
- shift
- \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
- CONFIG_SHELL='$SHELL'
- export CONFIG_SHELL
- exec "\$@"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-exec 5>>config.log
-{
- echo
- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
- $as_echo "$ac_log"
-} >&5
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-#
-# INIT-COMMANDS
-#
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-sed_quote_subst='$sed_quote_subst'
-double_quote_subst='$double_quote_subst'
-delay_variable_subst='$delay_variable_subst'
-enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
-macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
-macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
-enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
-pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
-enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
-host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
-host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
-host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
-build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
-build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
-build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
-SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
-Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
-GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
-EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
-FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
-LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
-NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
-LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
-max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
-ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
-exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
-lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
-lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
-lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
-reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
-reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
-deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
-file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
-AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
-AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
-STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
-RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
-old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
-CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
-compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
-GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
-objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
-SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
-ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
-MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
-need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
-DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
-NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
-LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
-OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
-OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
-libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
-shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
-export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
-allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
-no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
-inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
-link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
-fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
-always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
-export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
-include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
-prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
-variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
-need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
-need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
-version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
-runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
-libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
-library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
-soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
-postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
-sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
-sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
-old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
-striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
-
-LTCC='$LTCC'
-LTCFLAGS='$LTCFLAGS'
-compiler='$compiler_DEFAULT'
-
-# Quote evaled strings.
-for var in SED \
-GREP \
-EGREP \
-FGREP \
-LD \
-NM \
-LN_S \
-lt_SP2NL \
-lt_NL2SP \
-reload_flag \
-OBJDUMP \
-deplibs_check_method \
-file_magic_cmd \
-AR \
-AR_FLAGS \
-STRIP \
-RANLIB \
-CC \
-CFLAGS \
-compiler \
-lt_cv_sys_global_symbol_pipe \
-lt_cv_sys_global_symbol_to_cdecl \
-lt_cv_sys_global_symbol_to_c_name_address \
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
-SHELL \
-ECHO \
-lt_prog_compiler_no_builtin_flag \
-lt_prog_compiler_wl \
-lt_prog_compiler_pic \
-lt_prog_compiler_static \
-lt_cv_prog_compiler_c_o \
-need_locks \
-DSYMUTIL \
-NMEDIT \
-LIPO \
-OTOOL \
-OTOOL64 \
-shrext_cmds \
-export_dynamic_flag_spec \
-whole_archive_flag_spec \
-compiler_needs_object \
-with_gnu_ld \
-allow_undefined_flag \
-no_undefined_flag \
-hardcode_libdir_flag_spec \
-hardcode_libdir_flag_spec_ld \
-hardcode_libdir_separator \
-fix_srcfile_path \
-exclude_expsyms \
-include_expsyms \
-file_list_spec \
-variables_saved_for_relink \
-libname_spec \
-library_names_spec \
-soname_spec \
-finish_eval \
-old_striplib \
-striplib; do
- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
- *[\\\\\\\`\\"\\\$]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
- ;;
- *)
- eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
- ;;
- esac
-done
-
-# Double-quote double-evaled strings.
-for var in reload_cmds \
-old_postinstall_cmds \
-old_postuninstall_cmds \
-old_archive_cmds \
-extract_expsyms_cmds \
-old_archive_from_new_cmds \
-old_archive_from_expsyms_cmds \
-archive_cmds \
-archive_expsym_cmds \
-module_cmds \
-module_expsym_cmds \
-export_symbols_cmds \
-prelink_cmds \
-postinstall_cmds \
-postuninstall_cmds \
-finish_cmds \
-sys_lib_search_path_spec \
-sys_lib_dlsearch_path_spec; do
- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
- *[\\\\\\\`\\"\\\$]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
- ;;
- *)
- eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
- ;;
- esac
-done
-
-# Fix-up fallback echo if it was mangled by the above quoting rules.
-case \$lt_ECHO in
-*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
- ;;
-esac
-
-ac_aux_dir='$ac_aux_dir'
-xsi_shell='$xsi_shell'
-lt_shell_append='$lt_shell_append'
-
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
- setopt NO_GLOB_SUBST
-fi
-
-
- PACKAGE='$PACKAGE'
- VERSION='$VERSION'
- TIMESTAMP='$TIMESTAMP'
- RM='$RM'
- ofile='$ofile'
-
-
-
-# Capture the value of obsolete ALL_LINGUAS because we need it to compute
- # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
- # from automake < 1.5.
- eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
- # Capture the value of LINGUAS because we need it to compute CATALOGS.
- LINGUAS="${LINGUAS-%UNSET%}"
-
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
- case $ac_config_target in
- "include/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/config.h:include/config.h.in" ;;
- "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
- "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
- "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;;
- "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
- "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
- "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
- "libpcsxcore/Makefile") CONFIG_FILES="$CONFIG_FILES libpcsxcore/Makefile" ;;
- "gui/Makefile") CONFIG_FILES="$CONFIG_FILES gui/Makefile" ;;
- "plugins/dfinput/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/dfinput/Makefile" ;;
- "plugins/dfsound/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/dfsound/Makefile" ;;
- "plugins/dfxvideo/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/dfxvideo/Makefile" ;;
- "plugins/dfcdrom/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/dfcdrom/Makefile" ;;
- "plugins/dfnet/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/dfnet/Makefile" ;;
- "pixmaps/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/Makefile" ;;
- "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
- "plugins/peopsxgl/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/peopsxgl/Makefile" ;;
-
- *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
- { (exit 1); exit 1; }; };;
- esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used. Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
- test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
- test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
- test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-
-# Have a temporary directory for convenience. Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
- tmp=
- trap 'exit_status=$?
- { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-' 0
- trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-
-{
- tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
- test -n "$tmp" && test -d "$tmp"
-} ||
-{
- tmp=./conf$$-$RANDOM
- (umask 077 && mkdir "$tmp")
-} ||
-{
- $as_echo "$as_me: cannot create a temporary directory in ." >&2
- { (exit 1); exit 1; }
-}
-
-# Set up the scripts for CONFIG_FILES section.
-# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
-if test -n "$CONFIG_FILES"; then
-
-
-ac_cr='
'
-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
- ac_cs_awk_cr='\\r'
-else
- ac_cs_awk_cr=$ac_cr
-fi
-
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
-_ACEOF
-
-
-{
- echo "cat >conf$$subs.awk <<_ACEOF" &&
- echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
- echo "_ACEOF"
-} >conf$$subs.sh ||
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
- . ./conf$$subs.sh ||
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
-
- ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
- if test $ac_delim_n = $ac_delim_num; then
- break
- elif $ac_last_try; then
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
- else
- ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
- fi
-done
-rm -f conf$$subs.sh
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
-_ACEOF
-sed -n '
-h
-s/^/S["/; s/!.*/"]=/
-p
-g
-s/^[^!]*!//
-:repl
-t repl
-s/'"$ac_delim"'$//
-t delim
-:nl
-h
-s/$.\{148\}$.*/\1/
-t more1
-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
-p
-n
-b repl
-:more1
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t nl
-:delim
-h
-s/$.\{148\}$.*/\1/
-t more2
-s/["\\]/\\&/g; s/^/"/; s/$/"/
-p
-b
-:more2
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t delim
-' <conf$$subs.awk | sed '
-/^[^""]/{
- N
- s/\n//
-}
-' >>$CONFIG_STATUS || ac_write_fail=1
-rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
- for (key in S) S_is_set[key] = 1
- FS = "&#x7;"
-
-}
-{
- line = $ 0
- nfields = split(line, field, "@")
- substed = 0
- len = length(field[1])
- for (i = 2; i < nfields; i++) {
- key = field[i]
- keylen = length(key)
- if (S_is_set[key]) {
- value = S[key]
- line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
- len += length(value) + length(field[++i])
- substed = 1
- } else
- len += 1 + keylen
- }
-
- print line
-}
-
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
- sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-else
- cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
- || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
-$as_echo "$as_me: error: could not setup config files machinery" >&2;}
- { (exit 1); exit 1; }; }
-_ACEOF
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
- ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^$[^=]*=[	 ]*$:*/\1/
-s/:*$//
-s/^[^=]*=[	 ]*$//
-}'
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-fi # test -n "$CONFIG_FILES"
-
-# Set up the scripts for CONFIG_HEADERS section.
-# No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with `./config.status Makefile'.
-if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
-BEGIN {
-_ACEOF
-
-# Transform confdefs.h into an awk script `defines.awk', embedded as
-# here-document in config.status, that substitutes the proper values into
-# config.h.in to produce config.h.
-
-# Create a delimiter string that does not exist in confdefs.h, to ease
-# handling of long lines.
-ac_delim='%!_!# '
-for ac_last_try in false false :; do
- ac_t=`sed -n "/$ac_delim/p" confdefs.h`
- if test -z "$ac_t"; then
- break
- elif $ac_last_try; then
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
- { (exit 1); exit 1; }; }
- else
- ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
- fi
-done
-
-# For the awk script, D is an array of macro values keyed by name,
-# likewise P contains macro parameters if any. Preserve backslash
-# newline sequences.
-
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-sed -n '
-s/.\{148\}/&'"$ac_delim"'/g
-t rset
-:rset
-s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
-t def
-d
-:def
-s/\\$//
-t bsnl
-s/["\\]/\\&/g
-s/^ $'"$ac_word_re"'$$([^()]*)$[	 ]*$.*$/P["\1"]="\2"\
-D["\1"]=" \3"/p
-s/^ $'"$ac_word_re"'$[	 ]*$.*$/D["\1"]=" \2"/p
-d
-:bsnl
-s/["\\]/\\&/g
-s/^ $'"$ac_word_re"'$$([^()]*)$[	 ]*$.*$/P["\1"]="\2"\
-D["\1"]=" \3\\\\\\n"\\/p
-t cont
-s/^ $'"$ac_word_re"'$[	 ]*$.*$/D["\1"]=" \2\\\\\\n"\\/p
-t cont
-d
-:cont
-n
-s/.\{148\}/&'"$ac_delim"'/g
-t clear
-:clear
-s/\\$//
-t bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/"/p
-d
-:bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
-b cont
-' <confdefs.h | sed '
-s/'"$ac_delim"'/"\\\
-"/g' >>$CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- for (key in D) D_is_set[key] = 1
- FS = "&#x7;"
-}
-/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
- line = \$ 0
- split(line, arg, " ")
- if (arg[1] == "#") {
- defundef = arg[2]
- mac1 = arg[3]
- } else {
- defundef = substr(arg[1], 2)
- mac1 = arg[2]
- }
- split(mac1, mac2, "(") #)
- macro = mac2[1]
- prefix = substr(line, 1, index(line, defundef) - 1)
- if (D_is_set[macro]) {
- # Preserve the white space surrounding the "#".
- print prefix "define", macro P[macro] D[macro]
- next
- } else {
- # Replace #undef with comments. This is necessary, for example,
- # in the case of _POSIX_SOURCE, which is predefined and required
- # on some systems where configure will not decide to define it.
- if (defundef == "undef") {
- print "/*", prefix defundef, macro, "*/"
- next
- }
- }
-}
-{ print }
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
-$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
- { (exit 1); exit 1; }; }
-fi # test -n "$CONFIG_HEADERS"
-
-
-eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS"
-shift
-for ac_tag
-do
- case $ac_tag in
- :[FHLC]) ac_mode=$ac_tag; continue;;
- esac
- case $ac_mode$ac_tag in
- :[FHL]*:*);;
- :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
- { (exit 1); exit 1; }; };;
- :[FH]-) ac_tag=-:-;;
- :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
- esac
- ac_save_IFS=$IFS
- IFS=:
- set x $ac_tag
- IFS=$ac_save_IFS
- shift
- ac_file=$1
- shift
-
- case $ac_mode in
- :L) ac_source=$1;;
- :[FH])
- ac_file_inputs=
- for ac_f
- do
- case $ac_f in
- -) ac_f="$tmp/stdin";;
- *) # Look for the file first in the build tree, then in the source tree
-	 # (if the path is not absolute). The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
-	 test -f "$ac_f" ||
-	 case $ac_f in
-	 [\\/$]*) false;;
-	 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-	 esac ||
-	 { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
- { (exit 1); exit 1; }; };;
- esac
- case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
- ac_file_inputs="$ac_file_inputs '$ac_f'"
- done
-
- # Let's still pretend it is `configure' which instantiates (i.e., don't
- # use $as_me), people would be surprised to read:
- # /* config.h. Generated by config.status. */
- configure_input='Generated from '`
-	 $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
-	`' by configure.'
- if test x"$ac_file" != x-; then
- configure_input="$ac_file. $configure_input"
- { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
- fi
- # Neutralize special characters interpreted by sed in replacement strings.
- case $configure_input in #(
- *\&* | *\|* | *\\* )
- ac_sed_conf_input=`$as_echo "$configure_input" |
- sed 's/[\\\\&|]/\\\\&/g'`;; #(
- *) ac_sed_conf_input=$configure_input;;
- esac
-
- case $ac_tag in
- *:-:* | *:-) cat >"$tmp/stdin" \
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
- { (exit 1); exit 1; }; } ;;
- esac
- ;;
- esac
-
- ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X$//$[^/]' \| \
-	 X"$ac_file" : 'X$//$$' \| \
-	 X"$ac_file" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
- sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/\/$[^/].*/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/\/$$/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/$.*/{
-	 s//\1/
-	 q
-	 }
-	 s/.*/./; q'`
- { as_dir="$ac_dir"
- case $as_dir in #(
- -*) as_dir=./$as_dir;;
- esac
- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
- as_dirs=
- while :; do
- case $as_dir in #(
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
- *) as_qdir=$as_dir;;
- esac
- as_dirs="'$as_qdir' $as_dirs"
- as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X$//$[^/]' \| \
-	 X"$as_dir" : 'X$//$$' \| \
-	 X"$as_dir" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
- sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/\/$[^/].*/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/\/$$/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/$.*/{
-	 s//\1/
-	 q
-	 }
-	 s/.*/./; q'`
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
- ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
- # A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
- case $ac_top_builddir_sub in
- "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
- esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
- .) # We are building in place.
- ac_srcdir=.
- ac_top_srcdir=$ac_top_builddir_sub
- ac_abs_top_srcdir=$ac_pwd ;;
- [\\/]* | ?:[\\/]* ) # Absolute name.
- ac_srcdir=$srcdir$ac_dir_suffix;
- ac_top_srcdir=$srcdir
- ac_abs_top_srcdir=$srcdir ;;
- *) # Relative name.
- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_build_prefix$srcdir
- ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
- case $ac_mode in
- :F)
- #
- # CONFIG_FILE
- #
-
- case $INSTALL in
- [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
- *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
- esac
- ac_MKDIR_P=$MKDIR_P
- case $MKDIR_P in
- [\\/$]* | ?:[\\/]* ) ;;
- */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
- esac
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-
-ac_sed_dataroot='
-/datarootdir/ {
- p
- q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p
-'
-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
- { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- ac_datarootdir_hack='
- s&@datadir@&$datadir&g
- s&@docdir@&$docdir&g
- s&@infodir@&$infodir&g
- s&@localedir@&$localedir&g
- s&@mandir@&$mandir&g
- s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
-_ACEOF
-
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_sed_extra="$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s|@configure_input@|$ac_sed_conf_input|;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@top_build_prefix@&$ac_top_build_prefix&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-s&@INSTALL@&$ac_INSTALL&;t t
-s&@MKDIR_P@&$ac_MKDIR_P&;t t
-$ac_datarootdir_hack
-"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
- { (exit 1); exit 1; }; }
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
- { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
- { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
- { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined." >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined." >&2;}
-
- rm -f "$tmp/stdin"
- case $ac_file in
- -) cat "$tmp/out" && rm -f "$tmp/out";;
- *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
- esac \
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
- { (exit 1); exit 1; }; }
- ;;
- :H)
- #
- # CONFIG_HEADER
- #
- if test x"$ac_file" != x-; then
- {
- $as_echo "/* $configure_input */" \
- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
- } >"$tmp/config.h" \
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
- { (exit 1); exit 1; }; }
- if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
- { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
- else
- rm -f "$ac_file"
- mv "$tmp/config.h" "$ac_file" \
-	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
- { (exit 1); exit 1; }; }
- fi
- else
- $as_echo "/* $configure_input */" \
- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
- || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
-$as_echo "$as_me: error: could not create -" >&2;}
- { (exit 1); exit 1; }; }
- fi
-# Compute "$ac_file"'s index in $config_headers.
-_am_arg="$ac_file"
-_am_stamp_count=1
-for _am_header in $config_headers :; do
- case $_am_header in
- $_am_arg | $_am_arg:* )
- break ;;
- * )
- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
- esac
-done
-echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
-$as_expr X"$_am_arg" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
-	 X"$_am_arg" : 'X$//$[^/]' \| \
-	 X"$_am_arg" : 'X$//$$' \| \
-	 X"$_am_arg" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$_am_arg" |
- sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/\/$[^/].*/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/\/$$/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/$.*/{
-	 s//\1/
-	 q
-	 }
-	 s/.*/./; q'`/stamp-h$_am_stamp_count
- ;;
-
- :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
-$as_echo "$as_me: executing $ac_file commands" >&6;}
- ;;
- esac
-
-
- case $ac_file$ac_mode in
- "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files
-# are listed without --file. Let's play safe and only enable the eval
-# if we detect the quoting.
-case $CONFIG_FILES in
-*\'*) eval set x "$CONFIG_FILES" ;;
-*) set x $CONFIG_FILES ;;
-esac
-shift
-for mf
-do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X$//$[^/]' \| \
-	 X"$mf" : 'X$//$$' \| \
-	 X"$mf" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$mf" |
- sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/\/$[^/].*/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/\/$$/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/$.*/{
-	 s//\1/
-	 q
-	 }
-	 s/.*/./; q'`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote$.*(DEPDIR).*$$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X$//$[^/]' \| \
-	 X"$file" : 'X$//$$' \| \
-	 X"$file" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$file" |
- sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/\/$[^/].*/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/\/$$/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/$.*/{
-	 s//\1/
-	 q
-	 }
-	 s/.*/./; q'`
- { as_dir=$dirpart/$fdir
- case $as_dir in #(
- -*) as_dir=./$as_dir;;
- esac
- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
- as_dirs=
- while :; do
- case $as_dir in #(
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
- *) as_qdir=$as_dir;;
- esac
- as_dirs="'$as_qdir' $as_dirs"
- as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X$//$[^/]' \| \
-	 X"$as_dir" : 'X$//$$' \| \
-	 X"$as_dir" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
- sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/\/$[^/].*/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/\/$$/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/$.*/{
-	 s//\1/
-	 q
-	 }
-	 s/.*/./; q'`
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
-done
- ;;
- "libtool":C)
-
- # See if we are running on zsh, and set the options which allow our
- # commands through without removal of \ escapes.
- if test -n "${ZSH_VERSION+set}" ; then
- setopt NO_GLOB_SUBST
- fi
-
- cfgfile="${ofile}T"
- trap "$RM \"$cfgfile\"; exit 1" 1 2 15
- $RM "$cfgfile"
-
- cat <<_LT_EOF >> "$cfgfile"
-#! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008 Free Software Foundation, Inc.
-# Written by Gordon Matzigkeit, 1996
-#
-# This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING. If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-# The names of the tagged configurations supported by this script.
-available_tags=""
-
-# ### BEGIN LIBTOOL CONFIG
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Which release of libtool.m4 was used?
-macro_version=$macro_version
-macro_revision=$macro_revision
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# What type of objects to build.
-pic_mode=$pic_mode
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# A sed program that does not truncate output.
-SED=$lt_SED
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="\$SED -e 1s/^X//"
-
-# A grep program that handles long lines.
-GREP=$lt_GREP
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# A literal string matcher.
-FGREP=$lt_FGREP
-
-# A BSD- or MS-compatible name lister.
-NM=$lt_NM
-
-# Whether we need soft or hard links.
-LN_S=$lt_LN_S
-
-# What is the maximum length of a command?
-max_cmd_len=$max_cmd_len
-
-# Object file suffix (normally "o").
-objext=$ac_objext
-
-# Executable file suffix (normally "").
-exeext=$exeext
-
-# whether the shell understands "unset".
-lt_unset=$lt_unset
-
-# turn spaces into newlines.
-SP2NL=$lt_lt_SP2NL
-
-# turn newlines into spaces.
-NL2SP=$lt_lt_NL2SP
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# An object symbol dumper.
-OBJDUMP=$lt_OBJDUMP
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == "file_magic".
-file_magic_cmd=$lt_file_magic_cmd
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A symbol stripping program.
-STRIP=$lt_STRIP
-
-# Commands used to install an old-style archive.
-RANLIB=$lt_RANLIB
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# A C compiler.
-LTCC=$lt_CC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_CFLAGS
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration.
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair.
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# Transform the output of nm in a C name address pair when lib prefix is needed.
-global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# An echo program that does not interpret backslashes.
-ECHO=$lt_ECHO
-
-# Used to examine libraries when file_magic_cmd begins with "file".
-MAGIC_CMD=$MAGIC_CMD
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
-DSYMUTIL=$lt_DSYMUTIL
-
-# Tool to change global to local symbols on Mac OS X.
-NMEDIT=$lt_NMEDIT
-
-# Tool to manipulate fat objects and archives on Mac OS X.
-LIPO=$lt_LIPO
-
-# ldd/readelf like tool for Mach-O binaries on Mac OS X.
-OTOOL=$lt_OTOOL
-
-# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
-OTOOL64=$lt_OTOOL64
-
-# Old archive suffix (normally "a").
-libext=$libext
-
-# Shared library suffix (normally ".so").
-shrext_cmds=$lt_shrext_cmds
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at link time.
-variables_saved_for_relink=$lt_variables_saved_for_relink
-
-# Do we need the "lib" prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Library versioning type.
-version_type=$version_type
-
-# Shared library runtime path variable.
-runpath_var=$runpath_var
-
-# Shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names. First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Command to use after installation of a shared archive.
-postinstall_cmds=$lt_postinstall_cmds
-
-# Command to use after uninstallation of a shared archive.
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# As "finish_cmds", except a single script fragment to be evaled but
-# not shown.
-finish_eval=$lt_finish_eval
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Compile-time system search path for libraries.
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries.
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-
-# The linker used to build libraries.
-LD=$lt_LD
-
-# Commands used to build an old-style archive.
-old_archive_cmds=$lt_old_archive_cmds
-
-# A language specific compiler.
-CC=$lt_compiler
-
-# Is the compiler the GNU compiler?
-with_gcc=$GCC
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc
-
-# Whether or not to disallow shared libs when runtime libs are static.
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec
-
-# Whether the compiler copes with passing no objects directly.
-compiler_needs_object=$lt_compiler_needs_object
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
-
-# Commands used to build a shared archive.
-archive_cmds=$lt_archive_cmds
-archive_expsym_cmds=$lt_archive_expsym_cmds
-
-# Commands used to build a loadable module if different from building
-# a shared archive.
-module_cmds=$lt_module_cmds
-module_expsym_cmds=$lt_module_expsym_cmds
-
-# Whether we are building with GNU ld or not.
-with_gnu_ld=$lt_with_gnu_ld
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag
-
-# Flag that enforces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-
-# If ld is used when linking, flag to hardcode \$libdir into a binary
-# during linking. This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
-
-# Whether we need a single "-rpath" flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator
-
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-# DIR into the resulting binary.
-hardcode_direct=$hardcode_direct
-
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-# DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
-# library is relocated.
-hardcode_direct_absolute=$hardcode_direct_absolute
-
-# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-# into the resulting binary.
-hardcode_minus_L=$hardcode_minus_L
-
-# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-# into the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var
-
-# Set to "yes" if building a shared library automatically hardcodes DIR
-# into the library and all subsequent libraries and executables linked
-# against it.
-hardcode_automatic=$hardcode_automatic
-
-# Set to yes if linker adds runtime paths of dependent libraries
-# to runtime path list.
-inherit_rpath=$inherit_rpath
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path
-
-# Set to "yes" if exported symbols are required.
-always_export_symbols=$always_export_symbols
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms
-
-# Commands necessary for linking programs (against libraries) with templates.
-prelink_cmds=$lt_prelink_cmds
-
-# Specify filename containing input files.
-file_list_spec=$lt_file_list_spec
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action
-
-# ### END LIBTOOL CONFIG
-
-_LT_EOF
-
- case $host_os in
- aix3*)
- cat <<\_LT_EOF >> "$cfgfile"
-# AIX sometimes has problems with the GCC collect2 program. For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
- COLLECT_NAMES=
- export COLLECT_NAMES
-fi
-_LT_EOF
- ;;
- esac
-
-
-ltmain="$ac_aux_dir/ltmain.sh"
-
-
- # We use sed instead of cat because bash on DJGPP gets confused if
- # if finds mixed CR/LF and LF-only lines. Since sed operates in
- # text mode, it properly converts lines to CR/LF. This bash problem
- # is reportedly fixed, but why not run on old versions too?
- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
- || (rm -f "$cfgfile"; exit 1)
-
- case $xsi_shell in
- yes)
- cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
- case ${1} in
- */*) func_dirname_result="${1%/*}${2}" ;;
- * ) func_dirname_result="${3}" ;;
- esac
-}
-
-# func_basename file
-func_basename ()
-{
- func_basename_result="${1##*/}"
-}
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-# dirname: Compute the dirname of FILE. If nonempty,
-# add APPEND to the result, otherwise set result
-# to NONDIR_REPLACEMENT.
-# value returned in "$func_dirname_result"
-# basename: Compute filename of FILE.
-# value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
- case ${1} in
- */*) func_dirname_result="${1%/*}${2}" ;;
- * ) func_dirname_result="${3}" ;;
- esac
- func_basename_result="${1##*/}"
-}
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-func_stripname ()
-{
- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
- # positional parameters, so assign one to ordinary parameter first.
- func_stripname_result=${3}
- func_stripname_result=${func_stripname_result#"${1}"}
- func_stripname_result=${func_stripname_result%"${2}"}
-}
-
-# func_opt_split
-func_opt_split ()
-{
- func_opt_split_opt=${1%%=*}
- func_opt_split_arg=${1#*=}
-}
-
-# func_lo2o object
-func_lo2o ()
-{
- case ${1} in
- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
- *) func_lo2o_result=${1} ;;
- esac
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
- func_xform_result=${1%.*}.lo
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
- func_arith_result=$(( $* ))
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
- func_len_result=${#1}
-}
-
-_LT_EOF
- ;;
- *) # Bourne compatible functions.
- cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
- # Extract subdirectory from the argument.
- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
- if test "X$func_dirname_result" = "X${1}"; then
- func_dirname_result="${3}"
- else
- func_dirname_result="$func_dirname_result${2}"
- fi
-}
-
-# func_basename file
-func_basename ()
-{
- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-}
-
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
- case ${2} in
- .*) func_stripname_result=`$ECHO "X${3}" \
- | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
- *) func_stripname_result=`$ECHO "X${3}" \
- | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
- esac
-}
-
-# sed scripts:
-my_sed_long_opt='1s/^$-[^=]*$=.*/\1/;q'
-my_sed_long_arg='1s/^-[^=]*=//'
-
-# func_opt_split
-func_opt_split ()
-{
- func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
- func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
-}
-
-# func_lo2o object
-func_lo2o ()
-{
- func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
- func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
- func_arith_result=`expr "$@"`
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
-}
-
-_LT_EOF
-esac
-
-case $lt_shell_append in
- yes)
- cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
- eval "$1+=\$2"
-}
-_LT_EOF
- ;;
- *)
- cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
- eval "$1=\$$1\$2"
-}
-
-_LT_EOF
- ;;
- esac
-
-
- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
- || (rm -f "$cfgfile"; exit 1)
-
- mv -f "$cfgfile" "$ofile" ||
- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
- chmod +x "$ofile"
-
- ;;
- "po-directories":C)
- for ac_file in $CONFIG_FILES; do
- # Support "outfile[:infile[:infile...]]"
- case "$ac_file" in
- *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
- esac
- # PO directories have a Makefile.in generated from Makefile.in.in.
- case "$ac_file" in */Makefile.in)
- # Adjust a relative srcdir.
- ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
- ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
- ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
- # In autoconf-2.13 it is called $ac_given_srcdir.
- # In autoconf-2.50 it is called $srcdir.
- test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
- case "$ac_given_srcdir" in
- .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
- /*) top_srcdir="$ac_given_srcdir" ;;
- *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
- esac
- # Treat a directory as a PO directory if and only if it has a
- # POTFILES.in file. This allows packages to have multiple PO
- # directories under different names or in different locations.
- if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
- rm -f "$ac_dir/POTFILES"
- test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
- cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/$.*$ \\\\/\1/" > "$ac_dir/POTFILES"
- POMAKEFILEDEPS="POTFILES.in"
- # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
- # on $ac_dir but don't depend on user-specified configuration
- # parameters.
- if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
- # The LINGUAS file contains the set of available languages.
- if test -n "$OBSOLETE_ALL_LINGUAS"; then
- test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
- fi
- ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
- # Hide the ALL_LINGUAS assigment from automake < 1.5.
- eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
- POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
- else
- # The set of available languages was given in configure.in.
- # Hide the ALL_LINGUAS assigment from automake < 1.5.
- eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
- fi
- # Compute POFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
- # Compute UPDATEPOFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
- # Compute DUMMYPOFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
- # Compute GMOFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
- case "$ac_given_srcdir" in
- .) srcdirpre= ;;
- *) srcdirpre='$(srcdir)/' ;;
- esac
- POFILES=
- UPDATEPOFILES=
- DUMMYPOFILES=
- GMOFILES=
- for lang in $ALL_LINGUAS; do
- POFILES="$POFILES $srcdirpre$lang.po"
- UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
- DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
- GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
- done
- # CATALOGS depends on both $ac_dir and the user's LINGUAS
- # environment variable.
- INST_LINGUAS=
- if test -n "$ALL_LINGUAS"; then
- for presentlang in $ALL_LINGUAS; do
- useit=no
- if test "%UNSET%" != "$LINGUAS"; then
- desiredlanguages="$LINGUAS"
- else
- desiredlanguages="$ALL_LINGUAS"
- fi
- for desiredlang in $desiredlanguages; do
- # Use the presentlang catalog if desiredlang is
- # a. equal to presentlang, or
- # b. a variant of presentlang (because in this case,
- # presentlang can be used as a fallback for messages
- # which are not translated in the desiredlang catalog).
- case "$desiredlang" in
- "$presentlang"*) useit=yes;;
- esac
- done
- if test $useit = yes; then
- INST_LINGUAS="$INST_LINGUAS $presentlang"
- fi
- done
- fi
- CATALOGS=
- if test -n "$INST_LINGUAS"; then
- for lang in $INST_LINGUAS; do
- CATALOGS="$CATALOGS $lang.gmo"
- done
- fi
- test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
- sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
- for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
- if test -f "$f"; then
- case "$f" in
- *.orig | *.bak | *~) ;;
- *) cat "$f" >> "$ac_dir/Makefile" ;;
- esac
- fi
- done
- fi
- ;;
- esac
- done ;;
-
- esac
-done # for ac_tag
-
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-test $ac_write_fail = 0 ||
- { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded. So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status. When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
- ac_cs_success=:
- ac_config_status_args=
- test "$silent" = yes &&
- ac_config_status_args="$ac_config_status_args --quiet"
- exec 5>/dev/null
- $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
- exec 5>>config.log
- # Use ||, not &&, to avoid exiting from the if with $? = 1, which
- # would make configure fail if this is the last instruction.
- $ac_cs_success || { (exit 1); exit 1; }
-fi
-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
- { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
-fi
-

pcsxr-1.9.92.tar.bz2/data/Makefile.in Deleted

@@ -1,424 +0,0 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-subdir = data
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(gladedir)"
-desktopDATA_INSTALL = $(INSTALL_DATA)
-gladeDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(desktop_DATA) $(glade_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCAS = @CCAS@
-CCASDEPMODE = @CCASDEPMODE@
-CCASFLAGS = @CCASFLAGS@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GLADE2_CFLAGS = @GLADE2_CFLAGS@
-GLADE2_LIBS = @GLADE2_LIBS@
-GLIB2_CFLAGS = @GLIB2_CFLAGS@
-GLIB2_LIBS = @GLIB2_LIBS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK2_CFLAGS = @GTK2_CFLAGS@
-GTK2_LIBS = @GTK2_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
-LIBCDIO_LIBS = @LIBCDIO_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NASM = @NASM@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PEOPSXGL = @PEOPSXGL@
-PKG_CONFIG = @PKG_CONFIG@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_CONFIG = @SDL_CONFIG@
-SDL_LIBS = @SDL_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-glade_DATA = pcsx.glade2
-gladedir = $(datadir)/pcsx
-desktopdir = $(datadir)/applications
-desktop_DATA = pcsx.desktop
-EXTRA_DIST = $(glade_DATA) pcsx.desktop
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  data/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  data/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-desktopDATA: $(desktop_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
-	@list='$(desktop_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(desktopDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(desktopdir)/$$f'"; \
-	  $(desktopDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(desktopdir)/$$f"; \
-	done
-
-uninstall-desktopDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(desktop_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(desktopdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(desktopdir)/$$f"; \
-	done
-install-gladeDATA: $(glade_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)"
-	@list='$(glade_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \
-	  $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \
-	done
-
-uninstall-gladeDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(glade_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(gladedir)/$$f"; \
-	done
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(gladedir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am: install-desktopDATA install-gladeDATA
-
-install-dvi: install-dvi-am
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-info: install-info-am
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-desktopDATA uninstall-gladeDATA
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-desktopDATA install-dvi \
-	install-dvi-am install-exec install-exec-am install-gladeDATA \
-	install-html install-html-am install-info install-info-am \
-	install-man install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am uninstall uninstall-am uninstall-desktopDATA \
-	uninstall-gladeDATA
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

pcsxr-1.9.92.tar.bz2/data/pcsx.desktop Deleted

pcsxr-1.9.92.tar.bz2/data/pcsx.glade2 Deleted

@@ -1,3376 +0,0 @@
-<?xml version="1.0"?>
-<glade-interface>
- 
- 
- <widget class="GtkWindow" id="MainWindow">
- <property name="visible">True</property>
- <property name="title" translatable="yes">PCSX</property>
- <property name="resizable">False</property>
- <property name="window_position">center</property>
- <property name="icon_name">pcsx-icon.png</property>
- <signal name="destroy" handler="OnDestroy"/>
- <child>
- <widget class="GtkVBox" id="vbox18">
- <property name="visible">True</property>
- <child>
- <widget class="GtkMenuBar" id="menubar1">
- <property name="visible">True</property>
- <child>
- <widget class="GtkMenuItem" id="item1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_File</property>
- <property name="use_underline">True</property>
- <child>
- <widget class="GtkMenu" id="item1_menu">
- <child>
- <widget class="GtkImageMenuItem" id="RunCd">
- <property name="label" translatable="yes">Run _CD</property>
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- <property name="use_stock">False</property>
- <signal name="activate" handler="OnFile_RunCd"/>
- <accelerator key="O" signal="activate" modifiers="GDK_CONTROL_MASK"/>
- <child internal-child="image">
- <widget class="GtkImage" id="image2">
- <property name="visible">True</property>
- <property name="xalign">0.49000000953674316</property>
- <property name="stock">gtk-cdrom</property>
- <property name="icon-size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="RunImage">
- <property name="label" translatable="yes">Run _ISO...</property>
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- <property name="use_stock">False</property>
- <signal name="activate" handler="OnFile_RunImage"/>
- <accelerator key="I" signal="activate" modifiers="GDK_CONTROL_MASK"/>
- <child internal-child="image">
- <widget class="GtkImage" id="image3">
- <property name="visible">True</property>
- <property name="stock">gtk-open</property>
- <property name="icon-size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="RunBios">
- <property name="label" translatable="yes">Run _BIOS</property>
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- <property name="use_stock">False</property>
- <signal name="activate" handler="OnFile_RunBios"/>
- <accelerator key="B" signal="activate" modifiers="GDK_CONTROL_MASK"/>
- <child internal-child="image">
- <widget class="GtkImage" id="image4">
- <property name="visible">True</property>
- <property name="stock">gtk-convert</property>
- <property name="icon-size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="RunExe">
- <property name="label" translatable="yes">Run _EXE...</property>
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- <property name="use_stock">False</property>
- <signal name="activate" handler="OnFile_RunExe"/>
- <accelerator key="E" signal="activate" modifiers="GDK_CONTROL_MASK"/>
- <child internal-child="image">
- <widget class="GtkImage" id="image5">
- <property name="visible">True</property>
- <property name="stock">gtk-execute</property>
- <property name="icon-size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkSeparatorMenuItem" id="separator5">
- <property name="visible">True</property>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="exit2">
- <property name="label" translatable="yes">E_xit</property>
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- <property name="use_stock">False</property>
- <signal name="activate" handler="OnFile_Exit"/>
- <accelerator key="Q" signal="activate" modifiers="GDK_CONTROL_MASK"/>
- <child internal-child="image">
- <widget class="GtkImage" id="image25">
- <property name="visible">True</property>
- <property name="stock">gtk-quit</property>
- <property name="icon-size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem" id="emulator1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Emulator</property>
- <property name="use_underline">True</property>
- <child>
- <widget class="GtkMenu" id="emulator1_menu">
- <child>
- <widget class="GtkImageMenuItem" id="run1">
- <property name="label" translatable="yes">_Continue</property>
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- <property name="use_stock">False</property>
- <signal name="activate" handler="OnEmu_Run"/>
- <accelerator key="c" signal="activate" modifiers="GDK_CONTROL_MASK"/>
- <child internal-child="image">
- <widget class="GtkImage" id="image6">
- <property name="visible">True</property>
- <property name="stock">gtk-go-forward</property>
- <property name="icon-size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="reset1">
- <property name="label" translatable="yes">_Reset</property>
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- <property name="use_stock">False</property>
- <signal name="activate" handler="OnEmu_Reset"/>
- <accelerator key="r" signal="activate" modifiers="GDK_CONTROL_MASK"/>
- <child internal-child="image">
- <widget class="GtkImage" id="image7">
- <property name="visible">True</property>
- <property name="stock">gtk-refresh</property>
- <property name="icon-size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkSeparatorMenuItem" id="separator2">
- <property name="visible">True</property>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="SwitchImage">
- <property name="label" translatable="yes">S_witch ISO...</property>
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- <property name="use_stock">False</property>
- <signal name="activate" handler="OnEmu_SwitchImage"/>
- <accelerator key="W" signal="activate" modifiers="GDK_CONTROL_MASK"/>
- <child internal-child="image">
- <widget class="GtkImage" id="image8">
- <property name="visible">True</property>
- <property name="stock">gtk-open</property>
- <property name="icon-size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkSeparatorMenuItem" id="separator1">
- <property name="visible">True</property>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="save1">
- <property name="label" translatable="yes">_Save State</property>
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- <property name="use_stock">False</property>
- <child>
- <widget class="GtkMenu" id="save1_menu">
- <child>
- <widget class="GtkMenuItem" id="GtkMenuItem_SaveSlot1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Slot _1</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="OnStates_Save1"/>
- <accelerator key="1" signal="activate" modifiers="GDK_CONTROL_MASK"/>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem" id="GtkMenuItem_SaveSlot2">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Slot _2</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="OnStates_Save2"/>
- <accelerator key="2" signal="activate" modifiers="GDK_CONTROL_MASK"/>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem" id="GtkMenuItem_SaveSlot3">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Slot _3</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="OnStates_Save3"/>
- <accelerator key="3" signal="activate" modifiers="GDK_CONTROL_MASK"/>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem" id="GtkMenuItem_SaveSlot4">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Slot _4</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="OnStates_Save4"/>
- <accelerator key="4" signal="activate" modifiers="GDK_CONTROL_MASK"/>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem" id="GtkMenuItem_SaveSlot5">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Slot _5</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="OnStates_Save5"/>
- <accelerator key="5" signal="activate" modifiers="GDK_CONTROL_MASK"/>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="other2">
- <property name="label" translatable="yes">_Other...</property>
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- <property name="use_stock">False</property>
- <signal name="activate" handler="OnStates_SaveOther"/>
- <accelerator key="0" signal="activate" modifiers="GDK_CONTROL_MASK"/>
- <child internal-child="image">
- <widget class="GtkImage" id="image19">
- <property name="visible">True</property>
- <property name="stock">gtk-save-as</property>
- <property name="icon-size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child internal-child="image">
- <widget class="GtkImage" id="image9">
- <property name="visible">True</property>
- <property name="stock">gtk-save-as</property>
- <property name="icon-size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="load1">
- <property name="label" translatable="yes">_Load State</property>
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- <property name="use_stock">False</property>
- <child>
- <widget class="GtkMenu" id="load1_menu">
- <child>
- <widget class="GtkMenuItem" id="GtkMenuItem_LoadSlot1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Slot _1</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="OnStates_Load1"/>
- <accelerator key="1" signal="activate" modifiers="GDK_MOD1_MASK"/>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem" id="GtkMenuItem_LoadSlot2">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Slot _2</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="OnStates_Load2"/>
- <accelerator key="2" signal="activate" modifiers="GDK_MOD1_MASK"/>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem" id="GtkMenuItem_LoadSlot3">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Slot _3</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="OnStates_Load3"/>
- <accelerator key="3" signal="activate" modifiers="GDK_MOD1_MASK"/>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem" id="GtkMenuItem_LoadSlot4">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Slot _4</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="OnStates_Load4"/>
- <accelerator key="4" signal="activate" modifiers="GDK_MOD1_MASK"/>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem" id="GtkMenuItem_LoadSlot5">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Slot _5</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="OnStates_Load5"/>
- <accelerator key="5" signal="activate" modifiers="GDK_MOD1_MASK"/>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="other1">
- <property name="label" translatable="yes">_Other...</property>
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- <property name="use_stock">False</property>
- <signal name="activate" handler="OnStates_LoadOther"/>
- <accelerator key="0" signal="activate" modifiers="GDK_MOD1_MASK"/>
- <child internal-child="image">
- <widget class="GtkImage" id="image20">
- <property name="visible">True</property>
- <property name="stock">gtk-open</property>
- <property name="icon-size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child internal-child="image">
- <widget class="GtkImage" id="image10">
- <property name="visible">True</property>
- <property name="stock">gtk-revert-to-saved</property>
- <property name="icon-size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem" id="configuration1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Configuration</property>
- <property name="use_underline">True</property>
- <child>
- <widget class="GtkMenu" id="configuration1_menu">
- <child>
- <widget class="GtkImageMenuItem" id="plugins_bios">
- <property name="label" translatable="yes">_Plugins &amp; BIOS...</property>
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- <property name="use_stock">False</property>
- <signal name="activate" handler="ConfigurePlugins"/>
- <accelerator key="P" signal="activate" modifiers="GDK_CONTROL_MASK"/>
- <child internal-child="image">
- <widget class="GtkImage" id="image11">
- <property name="visible">True</property>
- <property name="stock">gtk-preferences</property>
- <property name="icon-size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkSeparatorMenuItem" id="separator6">
- <property name="visible">True</property>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="graphics1">
- <property name="label" translatable="yes">_Graphics...</property>
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- <property name="use_stock">False</property>
- <child internal-child="image">
- <widget class="GtkImage" id="image21">
- <property name="visible">True</property>
- <property name="stock">gtk-select-color</property>
- <property name="icon-size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="sound1">
- <property name="label" translatable="yes">_Sound...</property>
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- <property name="use_stock">False</property>
- <child internal-child="image">
- <widget class="GtkImage" id="image22">
- <property name="visible">True</property>
- <property name="stock">gtk-convert</property>
- <property name="icon-size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="cdrom1">
- <property name="label" translatable="yes">CD-_ROM...</property>
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- <property name="use_stock">False</property>
- <child internal-child="image">
- <widget class="GtkImage" id="image23">
- <property name="visible">True</property>
- <property name="stock">gtk-cdrom</property>
- <property name="icon-size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="pad1">
- <property name="label" translatable="yes">C_ontrollers...</property>
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- <property name="use_stock">False</property>
- <child internal-child="image">
- <widget class="GtkImage" id="image24">
- <property name="visible">True</property>
- <property name="stock">gtk-execute</property>
- <property name="icon-size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkSeparatorMenuItem" id="separator7">
- <property name="visible">True</property>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="cpu1">
- <property name="label" translatable="yes">_CPU...</property>
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- <property name="use_stock">False</property>
- <signal name="activate" handler="OnConf_Cpu"/>
- <child internal-child="image">
- <widget class="GtkImage" id="image12">
- <property name="visible">True</property>
- <property name="stock">gtk-properties</property>
- <property name="icon-size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="memory_cards1">
- <property name="label" translatable="yes">_Memory Cards...</property>
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- <property name="use_stock">False</property>
- <signal name="activate" handler="OnConf_Mcds"/>
- <accelerator key="M" signal="activate" modifiers="GDK_CONTROL_MASK"/>
- <child internal-child="image">
- <widget class="GtkImage" id="image13">
- <property name="visible">True</property>
- <property name="stock">gtk-floppy</property>
- <property name="icon-size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="net1">
- <property name="label" translatable="yes">_Netplay...</property>
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- <property name="use_stock">False</property>
- <signal name="activate" handler="OnConf_Net"/>
- <child internal-child="image">
- <widget class="GtkImage" id="image14">
- <property name="visible">True</property>
- <property name="stock">gtk-properties</property>
- <property name="icon-size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkSeparatorMenuItem" id="separator3">
- <property name="visible">True</property>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="cheat1">
- <property name="label" translatable="yes">Chea_t</property>
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- <property name="use_stock">False</property>
- <child>
- <widget class="GtkMenu" id="menu1">
- <property name="visible">True</property>
- <child>
- <widget class="GtkImageMenuItem" id="browse1">
- <property name="label" translatable="yes">_Browse...</property>
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- <property name="use_stock">False</property>
- <child internal-child="image">
- <widget class="GtkImage" id="image16">
- <property name="visible">True</property>
- <property name="stock">gtk-index</property>
- <property name="icon-size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="search1">
- <property name="label" translatable="yes">_Search...</property>
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- <property name="use_stock">False</property>
- <child internal-child="image">
- <widget class="GtkImage" id="image17">
- <property name="visible">True</property>
- <property name="stock">gtk-find</property>
- <property name="icon-size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child internal-child="image">
- <widget class="GtkImage" id="image15">
- <property name="visible">True</property>
- <property name="stock">gtk-indent</property>
- <property name="icon-size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="memorydump1">
- <property name="label" translatable="yes">Memory _Dump</property>
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- <property name="use_stock">False</property>
- <child internal-child="image">
- <widget class="GtkImage" id="image34">
- <property name="visible">True</property>
- <property name="stock">gtk-revert-to-saved</property>
- <property name="icon-size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem" id="help1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Help</property>
- <property name="use_underline">True</property>
- <child>
- <widget class="GtkMenu" id="help1_menu">
- <child>
- <widget class="GtkImageMenuItem" id="about_pcsx1">
- <property name="label" translatable="yes">_About PCSX...</property>
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- <property name="use_stock">False</property>
- <signal name="activate" handler="OnHelp_About"/>
- <child internal-child="image">
- <widget class="GtkImage" id="image18">
- <property name="visible">True</property>
- <property name="stock">gtk-about</property>
- <property name="icon-size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkToolbar" id="toolbar1">
- <property name="visible">True</property>
- <property name="toolbar_style">icons</property>
- <property name="icon_size_set">True</property>
- <child>
- <widget class="GtkToolButton" id="toolbutton_runcd">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Run CD</property>
- <property name="label" translatable="yes">Run CD</property>
- <property name="use_underline">True</property>
- <property name="stock_id">gtk-cdrom</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <widget class="GtkToolButton" id="toolbutton_runimage">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Run ISO Image</property>
- <property name="label" translatable="yes">Run ISO...</property>
- <property name="use_underline">True</property>
- <property name="stock_id">gtk-open</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <widget class="GtkSeparatorToolItem" id="toolbutton3">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <widget class="GtkToolButton" id="toolbutton_run">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Continue Emulation</property>
- <property name="label" translatable="yes">Continue...</property>
- <property name="use_underline">True</property>
- <property name="stock_id">gtk-go-forward</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <widget class="GtkToolButton" id="toolbutton_switchimage">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Switch ISO Image</property>
- <property name="label" translatable="yes">Switch ISO...</property>
- <property name="use_underline">True</property>
- <property name="stock_id">gtk-undo</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <widget class="GtkSeparatorToolItem" id="toolbutton4">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <widget class="GtkToolButton" id="toolbutton_memcards">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Configure Memory Cards</property>
- <property name="label" translatable="yes">Memcards...</property>
- <property name="use_underline">True</property>
- <property name="stock_id">gtk-floppy</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <widget class="GtkToolButton" id="toolbutton_graphics">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Configure Graphics</property>
- <property name="label" translatable="yes">Graphics...</property>
- <property name="use_underline">True</property>
- <property name="stock_id">gtk-select-color</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <widget class="GtkToolButton" id="toolbutton_sound">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Configure Sound</property>
- <property name="label" translatable="yes">Sound...</property>
- <property name="use_underline">True</property>
- <property name="stock_id">gtk-convert</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <widget class="GtkToolButton" id="toolbutton_cdrom">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Configure CD-ROM</property>
- <property name="label" translatable="yes">CD-ROM...</property>
- <property name="use_underline">True</property>
- <property name="stock_id">gtk-cdrom</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <widget class="GtkToolButton" id="toolbutton_controllers">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Configure Controllers</property>
- <property name="label" translatable="yes">Controllers...</property>
- <property name="use_underline">True</property>
- <property name="stock_id">gtk-execute</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkImage" id="image160">
- <property name="width_request">354</property>
- <property name="height_request">174</property>
- <property name="visible">True</property>
- <property name="pixbuf">pcsx.jpg</property>
- </widget>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkStatusbar" id="statusbar">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <property name="has_resize_grip">False</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <widget class="GtkDialog" id="ConfDlg">
- <property name="visible">True</property>
- <property name="title" translatable="yes">Configure PCSX</property>
- <property name="resizable">False</property>
- <property name="modal">True</property>
- <property name="type_hint">dialog</property>
- <child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox4">
- <property name="visible">True</property>
- <child>
- <widget class="GtkVBox" id="vbox28">
- <property name="visible">True</property>
- <property name="border_width">4</property>
- <property name="spacing">3</property>
- <child>
- <widget class="GtkFrame" id="frame17">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <child>
- <widget class="GtkAlignment" id="alignment38">
- <property name="visible">True</property>
- <property name="border_width">7</property>
- <child>
- <widget class="GtkTable" id="table4">
- <property name="visible">True</property>
- <property name="n_rows">6</property>
- <property name="n_columns">5</property>
- <property name="column_spacing">3</property>
- <property name="row_spacing">3</property>
- <child>
- <widget class="GtkImage" id="image337">
- <property name="visible">True</property>
- <property name="stock">gtk-select-color</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkImage" id="image342">
- <property name="visible">True</property>
- <property name="icon_name">gtk-find</property>
- </widget>
- <packing>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkImage" id="image341">
- <property name="visible">True</property>
- <property name="stock">gtk-cdrom</property>
- </widget>
- <packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkImage" id="image340">
- <property name="visible">True</property>
- <property name="stock">gtk-connect</property>
- </widget>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkImage" id="image339">
- <property name="visible">True</property>
- <property name="stock">gtk-connect</property>
- </widget>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkImage" id="image338">
- <property name="visible">True</property>
- <property name="stock">gtk-convert</property>
- </widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkFileChooserButton" id="GtkFileChooser_Plugin">
- <property name="visible">True</property>
- <property name="action">select-folder</property>
- <property name="title" translatable="yes">Select Folder to Search</property>
- <signal name="current_folder_changed" handler="OnConfConf_PluginPath"/>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">5</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label89">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Search in:</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="btn_ConfGpu">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <signal name="clicked" handler="OnConfConf_GpuConf"/>
- <child>
- <widget class="GtkImage" id="image321">
- <property name="visible">True</property>
- <property name="stock">gtk-preferences</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBox" id="GtkCombo_Cdr">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBox" id="GtkCombo_Pad2">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBox" id="GtkCombo_Pad1">
- <property name="visible">True</property>
- <accessibility>
- <atkrelation type="flows-to" target="btn_ConfPad1"/>
- <atkrelation type="flows-from" target="btn_AboutSpu"/>
- </accessibility>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBox" id="GtkCombo_Spu">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBox" id="GtkCombo_Gpu">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="btn_AboutSpu">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <signal name="clicked" handler="OnConfConf_SpuConf"/>
- <child>
- <widget class="GtkImage" id="image318">
- <property name="visible">True</property>
- <property name="stock">gtk-info</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="left_attach">4</property>
- <property name="right_attach">5</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="btn_AboutPad1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <signal name="clicked" handler="OnConfConf_Pad1About"/>
- <child>
- <widget class="GtkImage" id="image319">
- <property name="visible">True</property>
- <property name="stock">gtk-info</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="left_attach">4</property>
- <property name="right_attach">5</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="btn_AboutPad2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <signal name="clicked" handler="OnConfConf_Pad2About"/>
- <child>
- <widget class="GtkImage" id="image320">
- <property name="visible">True</property>
- <property name="stock">gtk-info</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="left_attach">4</property>
- <property name="right_attach">5</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="btn_AboutCdr">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <signal name="clicked" handler="OnConfConf_CdrAbout"/>
- <child>
- <widget class="GtkImage" id="image311">
- <property name="visible">True</property>
- <property name="stock">gtk-info</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="left_attach">4</property>
- <property name="right_attach">5</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="btn_ConfCdr">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <signal name="clicked" handler="OnConfConf_CdrConf"/>
- <child>
- <widget class="GtkImage" id="image310">
- <property name="visible">True</property>
- <property name="stock">gtk-preferences</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="btn_ConfPad2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <signal name="clicked" handler="OnConfConf_Pad2Conf"/>
- <child>
- <widget class="GtkImage" id="image317">
- <property name="visible">True</property>
- <property name="stock">gtk-preferences</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="btn_ConfPad1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <signal name="clicked" handler="OnConfConf_Pad1Conf"/>
- <child>
- <widget class="GtkImage" id="image316">
- <property name="visible">True</property>
- <property name="stock">gtk-preferences</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="btn_ConfSpu">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <signal name="clicked" handler="OnConfConf_SpuConf"/>
- <child>
- <widget class="GtkImage" id="image315">
- <property name="visible">True</property>
- <property name="stock">gtk-preferences</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label95">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Graphics:</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label96">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Sound:</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label85">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Controller 1: </property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label87">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Controller 2:</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label91">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">CD-ROM:</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="btn_AboutGpu">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <signal name="clicked" handler="OnConfConf_GpuAbout"/>
- <child>
- <widget class="GtkImage" id="image313">
- <property name="visible">True</property>
- <property name="stock">gtk-info</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="left_attach">4</property>
- <property name="right_attach">5</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label97">
- <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Plugins&lt;/b&gt;</property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkFrame" id="frame18">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <child>
- <widget class="GtkAlignment" id="alignment39">
- <property name="visible">True</property>
- <property name="border_width">7</property>
- <child>
- <widget class="GtkHBox" id="hbox53">
- <property name="visible">True</property>
- <property name="spacing">3</property>
- <child>
- <widget class="GtkImage" id="image343">
- <property name="visible">True</property>
- <property name="stock">gtk-execute</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBox" id="GtkCombo_Bios">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkFileChooserButton" id="GtkFileChooser_Bios">
- <property name="visible">True</property>
- <property name="action">select-folder</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label98">
- <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;BIOS&lt;/b&gt;</property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">6</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area4">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <widget class="GtkButton" id="btn_ConfClose">
- <property name="label">gtk-close</property>
- <property name="response_id">-6</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <widget class="GtkDialog" id="CpuDlg">
- <property name="visible">True</property>
- <property name="title" translatable="yes">Configure CPU</property>
- <property name="resizable">False</property>
- <property name="modal">True</property>
- <property name="type_hint">dialog</property>
- <child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox1">
- <property name="visible">True</property>
- <child>
- <widget class="GtkVBox" id="vbox25">
- <property name="visible">True</property>
- <child>
- <widget class="GtkFrame" id="frame15">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <property name="label_xalign">0</property>
- <child>
- <widget class="GtkVBox" id="vbox26">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <child>
- <widget class="GtkTable" id="table3">
- <property name="visible">True</property>
- <property name="n_rows">4</property>
- <property name="n_columns">2</property>
- <child>
- <widget class="GtkCheckButton" id="GtkCheckButton_Dbg">
- <property name="label" translatable="yes">Enable Debugger</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="GtkCheckButton_SpuIrq">
- <property name="label" translatable="yes">SPU IRQ Always Enabled</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="GtkCheckButton_Mdec">
- <property name="label" translatable="yes">Black &amp; White Movies</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="GtkCheckButton_PsxOut">
- <property name="label" translatable="yes">Enable Console Output</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="GtkCheckButton_Cpu">
- <property name="label" translatable="yes">Enable Interpreter CPU</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="GtkCheckButton_Sio">
- <property name="label" translatable="yes">SIO IRQ Always Enabled</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="GtkCheckButton_CDDA">
- <property name="label" translatable="yes">Disable CD Audio</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="GtkCheckButton_Xa">
- <property name="label" translatable="yes">Disable XA Decoding</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="GtkCheckButton_RCntFix">
- <property name="label" translatable="yes">Parasite Eve 2, Vandal Hearts 1/2 Fix</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="GtkCheckButton_VSyncWA">
- <property name="label" translatable="yes">InuYasha Sengoku Battle Fix</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label66">
- <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Options&lt;/b&gt;</property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkFrame" id="frame16">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <property name="label_xalign">0</property>
- <child>
- <widget class="GtkHBox" id="hbox49">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <property name="spacing">83</property>
- <child>
- <widget class="GtkCheckButton" id="GtkCheckButton_PsxAuto">
- <property name="label" translatable="yes">Autodetect</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="OnCPU_PSXAutoToggled" handler="on_GtkCheckButton_PsxAuto_toggled"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBox" id="GtkCombo_PsxType">
- <property name="visible">True</property>
- <property name="items" translatable="yes">NTSC
-PAL</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label68">
- <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;System Type&lt;/b&gt;</property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area1">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <widget class="GtkButton" id="closebutton1">
- <property name="label">gtk-close</property>
- <property name="response_id">-6</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <widget class="GtkDialog" id="NetDlg">
- <property name="visible">True</property>
- <property name="title" translatable="yes">Configure NetPlay</property>
- <property name="resizable">False</property>
- <property name="modal">True</property>
- <property name="type_hint">dialog</property>
- <signal name="destroy" handler="OnNet_Cancel"/>
- <child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox2">
- <property name="visible">True</property>
- <child>
- <widget class="GtkVBox" id="vbox27">
- <property name="visible">True</property>
- <child>
- <widget class="GtkFrame" id="frame19">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <property name="label_xalign">0</property>
- <child>
- <widget class="GtkAlignment" id="alignment40">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <child>
- <widget class="GtkHBox" id="hbox68">
- <property name="visible">True</property>
- <property name="spacing">3</property>
- <child>
- <widget class="GtkImage" id="image344">
- <property name="visible">True</property>
- <property name="stock">gtk-network</property>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBox" id="GtkCombo_Net">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="btn_ConfNet">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <signal name="clicked" handler="OnNet_Conf"/>
- <child>
- <widget class="GtkImage" id="image335">
- <property name="visible">True</property>
- <property name="stock">gtk-preferences</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="btn_AboutNet">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <signal name="clicked" handler="OnNet_About"/>
- <child>
- <widget class="GtkImage" id="image336">
- <property name="visible">True</property>
- <property name="stock">gtk-info</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label99">
- <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;NetPlay&lt;/b&gt;</property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area2">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <widget class="GtkButton" id="closebutton2">
- <property name="label">gtk-close</property>
- <property name="response_id">-6</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <widget class="GtkDialog" id="McdsDlg">
- <property name="visible">True</property>
- <property name="title" translatable="yes">Configure Memory Cards</property>
- <property name="modal">True</property>
- <property name="default_width">688</property>
- <property name="default_height">400</property>
- <property name="type_hint">dialog</property>
- <child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox3">
- <property name="visible">True</property>
- <child>
- <widget class="GtkHBox" id="hbox54">
- <property name="visible">True</property>
- <child>
- <widget class="GtkFrame" id="frame1">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <property name="label_xalign">0</property>
- <child>
- <widget class="GtkVBox" id="vbox31">
- <property name="visible">True</property>
- <property name="border_width">6</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">in</property>
- <child>
- <widget class="GtkTreeView" id="GtkCList_McdList1">
- <property name="width_request">265</property>
- <property name="height_request">400</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHButtonBox" id="hbuttonbox19">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <property name="spacing">5</property>
- <child>
- <widget class="GtkButton" id="GtkButton_New1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <signal name="clicked" handler="OnMcd_Reload1"/>
- <child>
- <widget class="GtkAlignment" id="alignment1">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <widget class="GtkHBox" id="hbox57">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkImage" id="image324">
- <property name="visible">True</property>
- <property name="stock">gtk-new</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">New</property>
- <property name="use_underline">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="GtkButton_Format1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <signal name="clicked" handler="OnMcd_Format" object="1"/>
- <child>
- <widget class="GtkAlignment" id="alignment50">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <widget class="GtkHBox" id="hbox70">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkImage" id="image346">
- <property name="visible">True</property>
- <property name="stock">gtk-clear</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label111">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Format</property>
- <property name="use_underline">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="GtkButton_Delete1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked" handler="OnMcd_Delete1"/>
- <child>
- <widget class="GtkAlignment" id="alignment45">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <widget class="GtkHBox" id="hbox63">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkImage" id="image330">
- <property name="visible">True</property>
- <property name="stock">gtk-delete</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label105">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Un/Delete</property>
- <property name="use_underline">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="Mcd1Button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <child>
- <widget class="GtkHBox" id="hbox2">
- <property name="visible">True</property>
- <property name="spacing">3</property>
- <child>
- <widget class="GtkImage" id="image30">
- <property name="visible">True</property>
- <property name="stock">gtk-floppy</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="Mcd1Label">
- <property name="visible">True</property>
- <property name="label">Loading...</property>
- <property name="ellipsize">middle</property>
- <property name="single_line_mode">True</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVSeparator" id="vseparator1">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkImage" id="image31">
- <property name="visible">True</property>
- <property name="stock">gtk-open</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox58">
- <property name="visible">True</property>
- <child>
- <widget class="GtkLabel" id="label100">
- <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Memory Card 1&lt;/b&gt;</property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">4</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkAlignment" id="alignment51">
- <property name="visible">True</property>
- <property name="top_padding">27</property>
- <property name="bottom_padding">132</property>
- <child>
- <widget class="GtkVButtonBox" id="vbuttonbox2">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <property name="layout_style">spread</property>
- <child>
- <widget class="GtkButton" id="GtkButton_CopyTo2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <signal name="clicked" handler="OnMcd_CopyTo2"/>
- <child>
- <widget class="GtkAlignment" id="alignment41">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <widget class="GtkHBox" id="hbox59">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkImage" id="image326">
- <property name="visible">True</property>
- <property name="stock">gtk-go-forward</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label101">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Copy</property>
- <property name="use_underline">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="GtkButton_CopyTo1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <signal name="clicked" handler="OnMcd_CopyTo1"/>
- <child>
- <widget class="GtkAlignment" id="alignment42">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <widget class="GtkHBox" id="hbox60">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkImage" id="image327">
- <property name="visible">True</property>
- <property name="stock">gtk-go-back</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label102">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Copy</property>
- <property name="use_underline">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkFrame" id="frame2">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <property name="label_xalign">0</property>
- <child>
- <widget class="GtkVBox" id="vbox32">
- <property name="visible">True</property>
- <property name="border_width">6</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">in</property>
- <child>
- <widget class="GtkTreeView" id="GtkCList_McdList2">
- <property name="width_request">265</property>
- <property name="height_request">400</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHButtonBox" id="hbuttonbox20">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <property name="spacing">5</property>
- <child>
- <widget class="GtkButton" id="GtkButton_New2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <signal name="clicked" handler="OnMcd_Reload2"/>
- <child>
- <widget class="GtkAlignment" id="alignment48">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <widget class="GtkHBox" id="hbox66">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkImage" id="image333">
- <property name="visible">True</property>
- <property name="stock">gtk-new</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label108">
- <property name="visible">True</property>
- <property name="label" translatable="yes">New</property>
- <property name="use_underline">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="GtkButton_Format2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <signal name="clicked" handler="OnMcd_Format" object="2"/>
- <child>
- <widget class="GtkAlignment" id="alignment49">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <widget class="GtkHBox" id="hbox69">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkImage" id="image345">
- <property name="visible">True</property>
- <property name="stock">gtk-clear</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label110">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Format</property>
- <property name="use_underline">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="GtkButton_Delete2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked" handler="OnMcd_Delete2"/>
- <child>
- <widget class="GtkAlignment" id="alignment44">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <widget class="GtkHBox" id="hbox62">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkImage" id="image329">
- <property name="visible">True</property>
- <property name="stock">gtk-delete</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label104">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Un/Delete</property>
- <property name="use_underline">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="Mcd2Button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <child>
- <widget class="GtkHBox" id="hbox3">
- <property name="visible">True</property>
- <property name="spacing">3</property>
- <child>
- <widget class="GtkImage" id="image32">
- <property name="visible">True</property>
- <property name="stock">gtk-floppy</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="Mcd2Label">
- <property name="visible">True</property>
- <property name="label">Loading...</property>
- <property name="ellipsize">middle</property>
- <property name="single_line_mode">True</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVSeparator" id="vseparator2">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkImage" id="image33">
- <property name="visible">True</property>
- <property name="stock">gtk-open</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox67">
- <property name="visible">True</property>
- <child>
- <widget class="GtkLabel" id="label109">
- <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Memory Card 2&lt;/b&gt;</property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">4</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area3">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <widget class="GtkButton" id="McdClose">
- <property name="label">gtk-close</property>
- <property name="response_id">-5</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <widget class="GtkDialog" id="CheatListDlg">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <property name="title" translatable="yes">Edit Cheat Codes</property>
- <property name="resizable">False</property>
- <property name="modal">True</property>
- <property name="window_position">center</property>
- <property name="type_hint">dialog</property>
- <child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox7">
- <property name="visible">True</property>
- <child>
- <widget class="GtkVBox" id="vbox1">
- <property name="visible">True</property>
- <property name="spacing">15</property>
- <child>
- <widget class="GtkFrame" id="frame3">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="border_width">5</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="window_placement_set">True</property>
- <property name="shadow_type">etched-in</property>
- <child>
- <widget class="GtkTreeView" id="GtkCList_Cheat">
- <property name="width_request">500</property>
- <property name="height_request">255</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label5">
- <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Cheat Codes&lt;/b&gt;</property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox1">
- <property name="visible">True</property>
- <property name="spacing">10</property>
- <child>
- <widget class="GtkButton" id="editbutton1">
- <property name="label">gtk-edit</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="delbutton1">
- <property name="label">gtk-delete</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="addbutton1">
- <property name="label">gtk-add</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="loadbutton1">
- <property name="label">gtk-open</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="savebutton1">
- <property name="label">gtk-save-as</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">10</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area7">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <widget class="GtkButton" id="closbutton1">
- <property name="label">gtk-close</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <widget class="GtkDialog" id="CheatSearchDlg">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <property name="title" translatable="yes">Cheat Search</property>
- <property name="resizable">False</property>
- <property name="modal">True</property>
- <property name="window_position">center</property>
- <property name="type_hint">dialog</property>
- <child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox8">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkFrame" id="frame4">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <child>
- <widget class="GtkAlignment" id="alignment23">
- <property name="visible">True</property>
- <property name="bottom_padding">12</property>
- <property name="left_padding">12</property>
- <property name="right_padding">12</property>
- <child>
- <widget class="GtkVBox" id="vbox2">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkTable" id="table1">
- <property name="visible">True</property>
- <property name="n_rows">3</property>
- <property name="n_columns">4</property>
- <property name="column_spacing">10</property>
- <property name="row_spacing">10</property>
- <child>
- <widget class="GtkComboBox" id="combo_datatype">
- <property name="visible">True</property>
- <property name="items" translatable="yes">8-bit
-16-bit
-32-bit</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label6">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Search For:</property>
- </widget>
- <packing>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label7">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Data Type:</property>
- </widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label8">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Value:</property>
- </widget>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label9">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Data Base:</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBox" id="combo_searchfor">
- <property name="visible">True</property>
- <property name="items" translatable="yes">Equal Value
-Not Equal Value
-Range
-Increased By
-Decreased By
-Increased
-Decreased
-Different
-No Change</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkEntry" id="entry_value">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBox" id="combo_database">
- <property name="visible">True</property>
- <property name="items" translatable="yes">Decimal
-Hexadecimal</property>
- </widget>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label_valueto">
- <property name="visible">True</property>
- <property name="label" translatable="yes">To:</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- </packing>
- </child>
- <child>
- <widget class="GtkEntry" id="entry_valueto">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- </widget>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox4">
- <property name="visible">True</property>
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">never</property>
- <property name="shadow_type">etched-in</property>
- <child>
- <widget class="GtkTreeView" id="GtkCList_Result">
- <property name="width_request">450</property>
- <property name="height_request">250</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="headers_clickable">False</property>
- <property name="show_expanders">False</property>
- <property name="enable_grid_lines">vertical</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVButtonBox" id="vbuttonbox1">
- <property name="visible">True</property>
- <property name="spacing">20</property>
- <property name="layout_style">start</property>
- <child>
- <widget class="GtkButton" id="btn_freeze">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <child>
- <widget class="GtkHBox" id="hbox7">
- <property name="visible">True</property>
- <child>
- <widget class="GtkImage" id="image1">
- <property name="visible">True</property>
- <property name="stock">gtk-ok</property>
- <property name="icon-size">1</property>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label13">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Freeze</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="btn_modify">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <child>
- <widget class="GtkHBox" id="hbox8">
- <property name="visible">True</property>
- <child>
- <widget class="GtkImage" id="image26">
- <property name="visible">True</property>
- <property name="stock">gtk-edit</property>
- <property name="icon-size">1</property>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label14">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Modify</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="btn_copy">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <child>
- <widget class="GtkHBox" id="hbox9">
- <property name="visible">True</property>
- <child>
- <widget class="GtkImage" id="image27">
- <property name="visible">True</property>
- <property name="stock">gtk-paste</property>
- <property name="icon-size">1</property>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label15">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Copy</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">10</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label_resultsfound">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes">label_resultsfound</property>
- <property name="single_line_mode">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHButtonBox" id="hbuttonbox1">
- <property name="visible">True</property>
- <property name="spacing">20</property>
- <property name="layout_style">center</property>
- <child>
- <widget class="GtkButton" id="btn_start">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <child>
- <widget class="GtkHBox" id="hbox5">
- <property name="visible">True</property>
- <child>
- <widget class="GtkImage" id="image28">
- <property name="visible">True</property>
- <property name="stock">gtk-ok</property>
- <property name="icon-size">1</property>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label11">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Search</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="btn_restart">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <child>
- <widget class="GtkHBox" id="hbox6">
- <property name="visible">True</property>
- <child>
- <widget class="GtkImage" id="image29">
- <property name="visible">True</property>
- <property name="stock">gtk-undo</property>
- <property name="icon-size">1</property>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label12">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Restart</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Cheat Search&lt;/b&gt;</property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area8">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <widget class="GtkButton" id="closebutton">
- <property name="label">gtk-close</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <widget class="GtkDialog" id="MemViewDlg">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <property name="title" translatable="yes">Memory Dump</property>
- <property name="resizable">False</property>
- <property name="modal">True</property>
- <property name="window_position">center</property>
- <property name="type_hint">dialog</property>
- <property name="has_separator">False</property>
- <child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox9">
- <property name="visible">True</property>
- <property name="spacing">5</property>
- <child>
- <widget class="GtkHBox" id="hbox10">
- <property name="visible">True</property>
- <property name="spacing">13</property>
- <child>
- <widget class="GtkHBox" id="hbox11">
- <property name="visible">True</property>
- <property name="spacing">10</property>
- <child>
- <widget class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Address (Hexadecimal):</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkEntry" id="entry_address">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">&#x2022;</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">5</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="btn_go">
- <property name="label">gtk-jump-to</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">5</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow5">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">never</property>
- <property name="shadow_type">etched-in</property>
- <child>
- <widget class="GtkTreeView" id="GtkCList_MemView">
- <property name="width_request">580</property>
- <property name="height_request">380</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hover_selection">True</property>
- <property name="enable_grid_lines">horizontal</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHButtonBox" id="hbuttonbox2">
- <property name="visible">True</property>
- <property name="spacing">20</property>
- <property name="layout_style">center</property>
- <child>
- <widget class="GtkButton" id="btn_dump">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <child>
- <widget class="GtkHBox" id="hbox12">
- <property name="visible">True</property>
- <child>
- <widget class="GtkImage" id="image35">
- <property name="visible">True</property>
- <property name="stock">gtk-save-as</property>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Raw Dump...</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="btn_patch">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <child>
- <widget class="GtkHBox" id="hbox13">
- <property name="visible">True</property>
- <child>
- <widget class="GtkImage" id="image36">
- <property name="visible">True</property>
- <property name="stock">gtk-edit</property>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label10">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Patch Memory...</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area9">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <widget class="GtkButton" id="memview_close">
- <property name="label">gtk-close</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
-</glade-interface>

pcsxr-1.9.92.tar.bz2/debian Deleted

pcsxr-1.9.92.tar.bz2/debian/control Deleted

@@ -1,20 +0,0 @@
-Source: pcsxr
-Section: otherosfs
-Priority: extra
-Maintainer: Wei Mingzhi <whistler@openoffice.org>
-Build-Depends: debhelper (>= 5), libgtk2.0-dev, libglade2-dev, zlib1g-dev | libz-dev, libxv-dev, libxtst-dev, nasm, libgl1-mesa-dev, libxxf86vm-dev, libsdl1.2-dev
-Standards-Version: 3.7.3
-
-Package: pcsxr
-Architecture: any
-Depends: ${shlibs:Depends}
-Replaces: pcsx, pcsx-bin, pcsx-i18n, psemu-drive-cdrmooby, psemu-input-omnijoy, psemu-input-padjoy, psemu-sound-alsa, psemu-sound-oss, psemu-video-x11, pcsx-df
-Conflicts: pcsx (<= 1:1.699df-rc3-1), pcsx-bin (<= 1:1.699df-rc3-1), pcsx-i18n (<= 1:1.699df-rc3-1), pcsx-df (<= 1:1.999)
-Description: Sony PlayStation emulator -- binary
- PCSX is an advanced PlayStation (PSX) emulator, which uses a plugin 
- architecture to provide full support for all components of the PSX.
- It has full emulation support for gamepads, videos, sound, memory cards,
- and other important PSX components, and is able to play many games
- without problems.
- .
- This package provides the main PCSX binary, library, and support files.

pcsxr-1.9.92.tar.bz2/debian/copyright Deleted

@@ -1,61 +0,0 @@
-This package was debianized by Wei Mingzhi <whistler@openoffice.org> on
-Fri, 16 Jan 2009 13:32:52 +0800.
-
-It was downloaded from <http://www.codeplex.com/pcsxr>
-
-Upstream Authors:
-	PCSX-Reloaded:
-		Wei Mingzhi <weimingzhi@gmail.com>
-	PCSX-df:
-		Stephen Chao <stephen@digitalnexus.org>
-		Ryan Schultz <schultz.ryan@gmail.com>
-		Andrew Burton <adb@iinet.net.au>
-		Stefan Sikora <hoshy@schrauberstube.de>
-		Marcus Comstedt <marcus@mc.pp.se>
-	PCSX Team
-		Linuzappz <linuzappz@pcsx.net>
-		Shadow <shadow@pcsx.net>
-		Pete Bernett <psswitch@online.de>
-		NoComp <NoComp@mailcity.com>
-		Nik3d
-		Akumax <akumax@pcsx.net>
-
-Copyright:	(C) 2008-2009 Wei Mingzhi
-		(C) 2005-2007 Ryan Schultz
-		(C) 2005-2007 Andrew Burton
-		(C) 2007 Stephen Chao
-		(C) 2007 Stefan Sikora
-		(C) 1999-2003 Pcsx Team
- 	(C) 1998 Vision Thing
-
-License:
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA
- 02111-1307 USA.
-
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
-The file 'PSEmu_Plugin_Defs.h' is released to the public domain, contrary
-to its headers. This is an excerpt from a forum, by Pete Bernert (who wrote
-many of the plugins and was a PCSX contributor):
-
-"The "PSEmu Plugin Def.h" header file is very old (1998) and (as you
-have noticed) contains just a few basic defines. When PSemu Pro died in
-early 1999, and new psx emus showed up, the Vision Thing crew allowed
-free usage/enhancements of the interface. Sure, nobody ever updated the
-header file to state something new, but Duddie gave his agreement, as
-well as Kazz with his XA audio defines (used in the spu plugin
-interface). So, there is nothing to worry about using the headers."

pcsxr-1.9.92.tar.bz2/debian/pcsxr.menu Deleted

pcsxr-1.9.92.tar.bz2/debian/rules Deleted

@@ -1,75 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-
-#export DH_VERBOSE=1
-
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2 -fomit-frame-pointer
-endif
-
-CONFIGURE_PARAM = \
-	--host=$(DEB_HOST_GNU_TYPE) \
-	--build=$(DEB_BUILD_GNU_TYPE) \
-	--prefix=/usr \
-	--bindir=/usr/games \
-	--mandir=\$${prefix}/share/man \
-	--infodir=\$${prefix}/share/info \
-	--enable-opengl
-
-config.status: configure
-	dh_testdir
-	CFLAGS="$(CFLAGS)" ./configure $(CONFIGURE_PARAM)
-
-build: build-stamp
-
-build-stamp: config.status
-	dh_testdir
-	$(MAKE)
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-
-	[ ! -f Makefile ] || make distclean
-
-	dh_clean config.status config.log po/stamp-po
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_installdirs
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/pcsxr
-	# Remove useless files
-	rm -f $(CURDIR)/debian/pcsxr/usr/lib/games/psemu/*.la
-
-binary-indep: build install
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_installmenu
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_makeshlibs
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install

pcsxr-1.9.92.tar.bz2/depcomp Deleted

@@ -1,589 +0,0 @@
-#! /bin/sh
-# depcomp - compile a program generating dependencies as side-effects
-
-scriptversion=2007-03-29.01
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software
-# Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-
-case $1 in
- '')
- echo "$0: No command. Try \`$0 --help' for more information." 1>&2
- exit 1;
- ;;
- -h | --h*)
- cat <<\EOF
-Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-
-Run PROGRAMS ARGS to compile a file, generating dependencies
-as side-effects.
-
-Environment variables:
- depmode Dependency tracking mode.
- source Source file read by `PROGRAMS ARGS'.
- object Object file output by `PROGRAMS ARGS'.
- DEPDIR directory where to store dependencies.
- depfile Dependency file to output.
- tmpdepfile Temporary file to use when outputing dependencies.
- libtool Whether libtool is used (yes/no).
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
- exit $?
- ;;
- -v | --v*)
- echo "depcomp $scriptversion"
- exit $?
- ;;
-esac
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
- echo "depcomp: Variables source, object and depmode must be set" 1>&2
- exit 1
-fi
-
-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-depfile=${depfile-`echo "$object" |
- sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.$[^.]*$$|.P\1|;s|Pobj$|Po|'`}
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.$[^.]*$$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags. We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write. Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
- # HP compiler uses -M and no extra arg.
- gccflag=-M
- depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
- # This is just like dashmstdout with a different argument.
- dashmflag=-xM
- depmode=dashmstdout
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want. Yay! Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff. Hmm.
-## Unfortunately, FreeBSD c89 acceptance of flags depends upon
-## the command line argument order; so add the flags where they
-## appear in depend2.am. Note that the slowdown incurred here
-## affects only configure: in makefiles, %FASTDEP% shortcuts this.
- for arg
- do
- case $arg in
- -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
- *) set fnord "$@" "$arg" ;;
- esac
- shift # fnord
- shift # $arg
- done
- "$@"
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile"
- exit $stat
- fi
- mv "$tmpdepfile" "$depfile"
- ;;
-
-gcc)
-## There are various ways to get dependency output from gcc. Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-## up in a subdir. Having to rename by hand is ugly.
-## (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-## -MM, not -M (despite what the docs say).
-## - Using -M directly means running the compiler twice (even worse
-## than renaming).
- if test -z "$gccflag"; then
- gccflag=-MD,
- fi
- "$@" -Wp,"$gccflag$tmpdepfile"
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile"
- exit $stat
- fi
- rm -f "$depfile"
- echo "$object : \\" > "$depfile"
- alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
- sed -e 's/^[^:]*: / /' \
- -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header). We avoid this by adding
-## dummy dependencies for each header file. Too bad gcc doesn't do
-## this for us directly.
- tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'. On the theory
-## that the space means something, we add a space to the output as
-## well.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly. Breaking it into two sed invocations is a workaround.
- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
-hp)
- # This case exists only to let depend.m4 do its work. It works by
- # looking at the text of this script. This case will never be run,
- # since it is checked for above.
- exit 1
- ;;
-
-sgi)
- if test "$libtool" = yes; then
- "$@" "-Wp,-MDupdate,$tmpdepfile"
- else
- "$@" -MDupdate "$tmpdepfile"
- fi
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile"
- exit $stat
- fi
- rm -f "$depfile"
-
- if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files
- echo "$object : \\" > "$depfile"
-
- # Clip off the initial element (the dependent). Don't try to be
- # clever and replace this with sed code, as IRIX sed won't handle
- # lines with more than a fixed number of characters (4096 in
- # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines;
- # the IRIX cc adds comments like `#:fec' to the end of the
- # dependency line.
- tr ' ' '
-' < "$tmpdepfile" \
- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
- tr '
-' ' ' >> $depfile
- echo >> $depfile
-
- # The second pass generates a dummy entry for each header file.
- tr ' ' '
-' < "$tmpdepfile" \
- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
- >> $depfile
- else
- # The sourcefile does not contain any dependencies, so just
- # store a dummy comment line, to avoid errors with the Makefile
- # "include basename.Plo" scheme.
- echo "#dummy" > "$depfile"
- fi
- rm -f "$tmpdepfile"
- ;;
-
-aix)
- # The C for AIX Compiler uses -M and outputs the dependencies
- # in a .u file. In older versions, this file always lives in the
- # current directory. Also, the AIX compiler puts `$object:' at the
- # start of each line; $object doesn't have directory information.
- # Version 6 uses the directory in both cases.
- dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
- test "x$dir" = "x$object" && dir=
- base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
- if test "$libtool" = yes; then
- tmpdepfile1=$dir$base.u
- tmpdepfile2=$base.u
- tmpdepfile3=$dir.libs/$base.u
- "$@" -Wc,-M
- else
- tmpdepfile1=$dir$base.u
- tmpdepfile2=$dir$base.u
- tmpdepfile3=$dir$base.u
- "$@" -M
- fi
- stat=$?
-
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
- exit $stat
- fi
-
- for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
- do
- test -f "$tmpdepfile" && break
- done
- if test -f "$tmpdepfile"; then
- # Each line is of the form `foo.o: dependent.h'.
- # Do two passes, one to just change these to
- # `$object: dependent.h' and one to simply `dependent.h:'.
- sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
- # That's a tab and a space in the [].
- sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
- else
- # The sourcefile does not contain any dependencies, so just
- # store a dummy comment line, to avoid errors with the Makefile
- # "include basename.Plo" scheme.
- echo "#dummy" > "$depfile"
- fi
- rm -f "$tmpdepfile"
- ;;
-
-icc)
- # Intel's C compiler understands `-MD -MF file'. However on
- # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
- # ICC 7.0 will fill foo.d with something like
- # foo.o: sub/foo.c
- # foo.o: sub/foo.h
- # which is wrong. We want:
- # sub/foo.o: sub/foo.c
- # sub/foo.o: sub/foo.h
- # sub/foo.c:
- # sub/foo.h:
- # ICC 7.1 will output
- # foo.o: sub/foo.c sub/foo.h
- # and will wrap long lines using \ :
- # foo.o: sub/foo.c ... \
- # sub/foo.h ... \
- # ...
-
- "$@" -MD -MF "$tmpdepfile"
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile"
- exit $stat
- fi
- rm -f "$depfile"
- # Each line is of the form `foo.o: dependent.h',
- # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
- # Do two passes, one to just change these to
- # `$object: dependent.h' and one to simply `dependent.h:'.
- sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
- # Some versions of the HPUX 10.20 sed can't process this invocation
- # correctly. Breaking it into two sed invocations is a workaround.
- sed 's,^[^:]*: $.*$$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
- sed -e 's/$/ :/' >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
-hp2)
- # The "hp" stanza above does not work with aCC (C++) and HP's ia64
- # compilers, which have integrated preprocessors. The correct option
- # to use with these is +Maked; it writes dependencies to a file named
- # 'foo.d', which lands next to the object file, wherever that
- # happens to be.
- # Much of this is similar to the tru64 case; see comments there.
- dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
- test "x$dir" = "x$object" && dir=
- base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
- if test "$libtool" = yes; then
- tmpdepfile1=$dir$base.d
- tmpdepfile2=$dir.libs/$base.d
- "$@" -Wc,+Maked
- else
- tmpdepfile1=$dir$base.d
- tmpdepfile2=$dir$base.d
- "$@" +Maked
- fi
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile1" "$tmpdepfile2"
- exit $stat
- fi
-
- for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
- do
- test -f "$tmpdepfile" && break
- done
- if test -f "$tmpdepfile"; then
- sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
- # Add `dependent.h:' lines.
- sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
- else
- echo "#dummy" > "$depfile"
- fi
- rm -f "$tmpdepfile" "$tmpdepfile2"
- ;;
-
-tru64)
- # The Tru64 compiler uses -MD to generate dependencies as a side
- # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
- # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
- # dependencies in `foo.d' instead, so we check for that too.
- # Subdirectories are respected.
- dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
- test "x$dir" = "x$object" && dir=
- base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
- if test "$libtool" = yes; then
- # With Tru64 cc, shared objects can also be used to make a
- # static library. This mechanism is used in libtool 1.4 series to
- # handle both shared and static libraries in a single compilation.
- # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
- #
- # With libtool 1.5 this exception was removed, and libtool now
- # generates 2 separate objects for the 2 libraries. These two
- # compilations output dependencies in $dir.libs/$base.o.d and
- # in $dir$base.o.d. We have to check for both files, because
- # one of the two compilations can be disabled. We should prefer
- # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
- # automatically cleaned when .libs/ is deleted, while ignoring
- # the former would cause a distcleancheck panic.
- tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4
- tmpdepfile2=$dir$base.o.d # libtool 1.5
- tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5
- tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504
- "$@" -Wc,-MD
- else
- tmpdepfile1=$dir$base.o.d
- tmpdepfile2=$dir$base.d
- tmpdepfile3=$dir$base.d
- tmpdepfile4=$dir$base.d
- "$@" -MD
- fi
-
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
- exit $stat
- fi
-
- for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
- do
- test -f "$tmpdepfile" && break
- done
- if test -f "$tmpdepfile"; then
- sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
- # That's a tab and a space in the [].
- sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
- else
- echo "#dummy" > "$depfile"
- fi
- rm -f "$tmpdepfile"
- ;;
-
-#nosideeffect)
- # This comment above is used by automake to tell side-effect
- # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
- # Important note: in order to support this mode, a compiler *must*
- # always write the preprocessed file to stdout, regardless of -o.
- "$@" || exit $?
-
- # Remove the call to Libtool.
- if test "$libtool" = yes; then
- while test $1 != '--mode=compile'; do
- shift
- done
- shift
- fi
-
- # Remove `-o $object'.
- IFS=" "
- for arg
- do
- case $arg in
- -o)
- shift
- ;;
- $object)
- shift
- ;;
- *)
- set fnord "$@" "$arg"
- shift # fnord
- shift # $arg
- ;;
- esac
- done
-
- test -z "$dashmflag" && dashmflag=-M
- # Require at least two characters before searching for `:'
- # in the target name. This is to cope with DOS-style filenames:
- # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
- "$@" $dashmflag |
- sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
- rm -f "$depfile"
- cat < "$tmpdepfile" > "$depfile"
- tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly. Breaking it into two sed invocations is a workaround.
- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
-dashXmstdout)
- # This case only exists to satisfy depend.m4. It is never actually
- # run, as this mode is specially recognized in the preamble.
- exit 1
- ;;
-
-makedepend)
- "$@" || exit $?
- # Remove any Libtool call
- if test "$libtool" = yes; then
- while test $1 != '--mode=compile'; do
- shift
- done
- shift
- fi
- # X makedepend
- shift
- cleared=no
- for arg in "$@"; do
- case $cleared in
- no)
- set ""; shift
- cleared=yes ;;
- esac
- case "$arg" in
- -D*|-I*)
- set fnord "$@" "$arg"; shift ;;
- # Strip any option that makedepend may not understand. Remove
- # the object too, otherwise makedepend will parse it as a source file.
- -*|$object)
- ;;
- *)
- set fnord "$@" "$arg"; shift ;;
- esac
- done
- obj_suffix="`echo $object | sed 's/^.*\././'`"
- touch "$tmpdepfile"
- ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
- rm -f "$depfile"
- cat < "$tmpdepfile" > "$depfile"
- sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly. Breaking it into two sed invocations is a workaround.
- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
- rm -f "$tmpdepfile" "$tmpdepfile".bak
- ;;
-
-cpp)
- # Important note: in order to support this mode, a compiler *must*
- # always write the preprocessed file to stdout.
- "$@" || exit $?
-
- # Remove the call to Libtool.
- if test "$libtool" = yes; then
- while test $1 != '--mode=compile'; do
- shift
- done
- shift
- fi
-
- # Remove `-o $object'.
- IFS=" "
- for arg
- do
- case $arg in
- -o)
- shift
- ;;
- $object)
- shift
- ;;
- *)
- set fnord "$@" "$arg"
- shift # fnord
- shift # $arg
- ;;
- esac
- done
-
- "$@" -E |
- sed -n -e '/^# [0-9][0-9]* "$[^"]*$".*/ s:: \1 \\:p' \
- -e '/^#line [0-9][0-9]* "$[^"]*$".*/ s:: \1 \\:p' |
- sed '$ s: \\$::' > "$tmpdepfile"
- rm -f "$depfile"
- echo "$object : \\" > "$depfile"
- cat < "$tmpdepfile" >> "$depfile"
- sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
-msvisualcpp)
- # Important note: in order to support this mode, a compiler *must*
- # always write the preprocessed file to stdout, regardless of -o,
- # because we must use -o when running libtool.
- "$@" || exit $?
- IFS=" "
- for arg
- do
- case "$arg" in
- "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-	set fnord "$@"
-	shift
-	shift
-	;;
- *)
-	set fnord "$@" "$arg"
-	shift
-	shift
-	;;
- esac
- done
- "$@" -E |
- sed -n '/^#line [0-9][0-9]* "$[^"]*$"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
- rm -f "$depfile"
- echo "$object : \\" > "$depfile"
- . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^$.*$$/ s::	\1 \\:p' >> "$depfile"
- echo "	" >> "$depfile"
- . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^$.*$$/ s::\1\::p' >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
-none)
- exec "$@"
- ;;
-
-*)
- echo "Unknown depmode $depmode" 1>&2
- exit 1
- ;;
-esac
-
-exit 0
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:

pcsxr-1.9.92.tar.bz2/doc/Makefile.in Deleted

@@ -1,426 +0,0 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-subdir = doc
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-man1dir = $(mandir)/man1
-am__installdirs = "$(DESTDIR)$(man1dir)"
-NROFF = nroff
-MANS = $(man_MANS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCAS = @CCAS@
-CCASDEPMODE = @CCASDEPMODE@
-CCASFLAGS = @CCASFLAGS@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GLADE2_CFLAGS = @GLADE2_CFLAGS@
-GLADE2_LIBS = @GLADE2_LIBS@
-GLIB2_CFLAGS = @GLIB2_CFLAGS@
-GLIB2_LIBS = @GLIB2_LIBS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK2_CFLAGS = @GTK2_CFLAGS@
-GTK2_LIBS = @GTK2_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
-LIBCDIO_LIBS = @LIBCDIO_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NASM = @NASM@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PEOPSXGL = @PEOPSXGL@
-PKG_CONFIG = @PKG_CONFIG@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_CONFIG = @SDL_CONFIG@
-SDL_LIBS = @SDL_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-EXTRA_DIST = keys.txt tweaks.txt
-man_MANS = pcsx.1
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  doc/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-man1: $(man1_MANS) $(man_MANS)
-	@$(NORMAL_INSTALL)
-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-	for i in $$l2; do \
-	  case "$$i" in \
-	    *.1*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
-	for i in $$list; do \
-	  if test -f $$i; then file=$$i; \
-	  else file=$(srcdir)/$$i; fi; \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    1*) ;; \
-	    *) ext='1' ;; \
-	  esac; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
-	done
-uninstall-man1:
-	@$(NORMAL_UNINSTALL)
-	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-	for i in $$l2; do \
-	  case "$$i" in \
-	    *.1*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
-	for i in $$list; do \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    1*) ;; \
-	    *) ext='1' ;; \
-	  esac; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
-	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
-	done
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(MANS)
-installdirs:
-	for dir in "$(DESTDIR)$(man1dir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am: install-man
-
-install-dvi: install-dvi-am
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-info: install-info-am
-
-install-man: install-man1
-
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-man
-
-uninstall-man: uninstall-man1
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-man1 \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-man uninstall-man1
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

pcsxr-1.9.92.tar.bz2/doc/pcsx.1 Deleted

pcsxr-1.9.92.tar.bz2/gui/Gtk2Gui.c Deleted

@@ -1,944 +0,0 @@
-/* Pcsx - Pc Psx Emulator
- * Copyright (C) 1999-2002 Pcsx Team
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <dirent.h>
-#include <dlfcn.h>
-#include <sys/stat.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtk.h>
-#include <glade/glade.h>
-#include <signal.h>
-#include <sys/time.h>
-#include <regex.h>
-
-#include "Linux.h"
-
-#include "../libpcsxcore/plugins.h"
-#include "../libpcsxcore/cheat.h"
-
-#include "MemcardDlg.h"
-#include "ConfDlg.h"
-#include "DebugMemory.h"
-#include "AboutDlg.h"
-
-// Functions Callbacks
-void OnFile_RunCd();
-void OnFile_RunBios();
-void OnFile_RunExe();
-void OnFile_RunImage();
-void OnEmu_Run();
-void OnEmu_Reset();
-void OnEmu_SwitchImage();
-void OnHelp_Help();
-void OnHelp_About();
-void OnDestroy();
-void OnFile_Exit();
-
-void on_states_load(GtkWidget *widget, gpointer user_data);
-void on_states_load_other();
-void on_states_save(GtkWidget *widget, gpointer user_data);
-void on_states_save_other();
-
-GtkWidget *Window = NULL;
-
-int destroy = 0;
-
-#define MAX_SLOTS 5
-
-/* TODO - If MAX_SLOTS changes, need to find a way to automatically set all positions */
-int Slots[MAX_SLOTS] = { -1, -1, -1, -1, -1 };
-
-void ResetMenuSlots(GladeXML *xml) {
-	GtkWidget *widget;
-	gchar *str;
-	int i;
-
-	if (CdromId[0] == '\0') {
-		// disable state saving/loading if no CD is loaded
-		for (i = 0; i < MAX_SLOTS; i++) {
-			str = g_strdup_printf("GtkMenuItem_SaveSlot%d", i+1);
-			widget = glade_xml_get_widget(xml, str);
-			g_free(str);
-
-			gtk_widget_set_sensitive(widget, FALSE);
-
-			str = g_strdup_printf("GtkMenuItem_LoadSlot%d", i+1);
-			widget = glade_xml_get_widget(xml, str);
-			g_free(str);
-
-			gtk_widget_set_sensitive(widget, FALSE);
-		}
-
-		// also disable certain menu/toolbar items
-		widget = glade_xml_get_widget(xml, "other1");
-		gtk_widget_set_sensitive(widget, FALSE);
-		widget = glade_xml_get_widget(xml, "other2");
-		gtk_widget_set_sensitive(widget, FALSE);
-		widget = glade_xml_get_widget(xml, "run1");
-		gtk_widget_set_sensitive(widget, FALSE);
-		widget = glade_xml_get_widget(xml, "reset1");
-		gtk_widget_set_sensitive(widget, FALSE);
-		widget = glade_xml_get_widget(xml, "search1");
-		gtk_widget_set_sensitive(widget, FALSE);
-		widget = glade_xml_get_widget(xml, "SwitchImage");
-		gtk_widget_set_sensitive(widget, FALSE);
-		widget = glade_xml_get_widget(xml, "memorydump1");
-		gtk_widget_set_sensitive(widget, FALSE);
-		widget = glade_xml_get_widget(xml, "toolbutton_run");
-		gtk_widget_set_sensitive(widget, FALSE);
-		widget = glade_xml_get_widget(xml, "toolbutton_switchimage");
-		gtk_widget_set_sensitive(widget, FALSE);
-
-		widget = glade_xml_get_widget(xml, "statusbar");
-		gtk_statusbar_pop(GTK_STATUSBAR(widget), 1);
-		gtk_statusbar_push(GTK_STATUSBAR(widget), 1, _("Ready"));
-	}
-	else {
-		for (i = 0; i < MAX_SLOTS; i++) {
-			str = g_strdup_printf("GtkMenuItem_LoadSlot%d", i+1);
-			widget = glade_xml_get_widget (xml, str);
-			g_free (str);
-
-			if (Slots[i] == -1) 
-				gtk_widget_set_sensitive(widget, FALSE);
-			else
-				gtk_widget_set_sensitive(widget, TRUE);
-		}
-
-		widget = glade_xml_get_widget(xml, "plugins_bios");
-		gtk_widget_set_sensitive(widget, FALSE);
-		widget = glade_xml_get_widget(xml, "graphics1");
-		gtk_widget_set_sensitive(widget, FALSE);
-		widget = glade_xml_get_widget(xml, "sound1");
-		gtk_widget_set_sensitive(widget, FALSE);
-		widget = glade_xml_get_widget(xml, "cdrom1");
-		gtk_widget_set_sensitive(widget, FALSE);
-		widget = glade_xml_get_widget(xml, "pad1");
-		gtk_widget_set_sensitive(widget, FALSE);
-		widget = glade_xml_get_widget(xml, "net1");
-		gtk_widget_set_sensitive(widget, FALSE);
-		widget = glade_xml_get_widget(xml, "SwitchImage");
-		gtk_widget_set_sensitive(widget, UsingIso());
-		widget = glade_xml_get_widget(xml, "toolbutton_switchimage");
-		gtk_widget_set_sensitive(widget, UsingIso());
-		widget = glade_xml_get_widget(xml, "toolbutton_graphics");
-		gtk_widget_set_sensitive(widget, FALSE);
-		widget = glade_xml_get_widget(xml, "toolbutton_sound");
-		gtk_widget_set_sensitive(widget, FALSE);
-		widget = glade_xml_get_widget(xml, "toolbutton_cdrom");
-		gtk_widget_set_sensitive(widget, FALSE);
-		widget = glade_xml_get_widget(xml, "toolbutton_controllers");
-		gtk_widget_set_sensitive(widget, FALSE);
-
-		widget = glade_xml_get_widget(xml, "statusbar");
-		gtk_statusbar_pop(GTK_STATUSBAR(widget), 1);
-		gtk_statusbar_push(GTK_STATUSBAR(widget), 1, _("Emulation Paused."));
-	}
-}
-
-int match(const char *string, char *pattern) {
-	int status;
-	regex_t re;
-
-	if (regcomp(&re, pattern, REG_EXTENDED | REG_NOSUB) != 0) {
-		return 0;
-	}
-	status = regexec(&re, string, (size_t) 0, NULL, 0);
-	regfree(&re);
-	if (status != 0) {
-		return 0;
-	}
-
-	return 1;
-}
-
-gchar* get_state_filename(int i) {
-	gchar *state_filename;
-	char SStateFile[64];
-	char trimlabel[33];
-	int j;
-
-	strncpy(trimlabel, CdromLabel, 32);
-	trimlabel[32] = 0;
-	for (j = 31; j >= 0; j--)
-		if (trimlabel[j] == ' ')
-			trimlabel[j] = 0;
-		else
-			continue;
-
-	sprintf(SStateFile, "%.32s-%.9s.%3.3d", trimlabel, CdromId, i);
-	state_filename = g_build_filename (getenv("HOME"), STATES_DIR, SStateFile, NULL);
-
-	return state_filename;
-}
-
-void UpdateMenuSlots() {
-	gchar *str;
-	int i;
-
-	for (i = 0; i < MAX_SLOTS; i++) {
-		str = get_state_filename (i);
-		Slots[i] = CheckState(str);
-		g_free (str);
-	}
-}
-
-void StartGui() {
-	GladeXML *xml;
-	GtkWidget *widget;
-
-	/* If a plugin fails, the Window is not NULL, but is not initialised,
-	 so the following causes a segfault
-	if (Window != NULL) {
-		gtk_window_present (GTK_WINDOW (Window));
-		return;
-	}*/
-
-	xml = glade_xml_new(PACKAGE_DATA_DIR "pcsx.glade2", "MainWindow", NULL);
-
-	if (!xml) {
-		g_warning("We could not load the interface!");
-		return;
-	}
-
-	Window = glade_xml_get_widget(xml, "MainWindow");
-	gtk_window_set_title(GTK_WINDOW(Window), "PCSX");
-	gtk_window_set_icon_from_file(GTK_WINDOW(Window), PIXMAPDIR "pcsx-icon.png", NULL);
-	gtk_window_set_default_icon_from_file(PIXMAPDIR "pcsx-icon.png", NULL);
-	ResetMenuSlots(xml);
-
-	// Set up callbacks
-	g_signal_connect_data(GTK_OBJECT(Window), "delete-event",
-			GTK_SIGNAL_FUNC(OnDestroy), xml, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
-
-	// File menu
-	widget = glade_xml_get_widget(xml, "RunCd");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(OnFile_RunCd), NULL, NULL, G_CONNECT_AFTER);
-
-	widget = glade_xml_get_widget(xml, "RunBios");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(OnFile_RunBios), NULL, NULL, G_CONNECT_AFTER);
-
-	widget = glade_xml_get_widget(xml, "RunExe");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(OnFile_RunExe), NULL, NULL, G_CONNECT_AFTER);
-
-	widget = glade_xml_get_widget(xml, "RunImage");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(OnFile_RunImage), NULL, NULL, G_CONNECT_AFTER);
-
-	widget = glade_xml_get_widget(xml, "exit2");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(OnFile_Exit), NULL, NULL, G_CONNECT_AFTER);
-
-	// States
-	widget = glade_xml_get_widget(xml, "GtkMenuItem_LoadSlot1");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(on_states_load), (gpointer) 0, NULL, G_CONNECT_AFTER);
-	widget = glade_xml_get_widget(xml, "GtkMenuItem_LoadSlot2");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(on_states_load), (gpointer) 1, NULL, G_CONNECT_AFTER);
-	widget = glade_xml_get_widget(xml, "GtkMenuItem_LoadSlot3");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(on_states_load), (gpointer) 2, NULL, G_CONNECT_AFTER);
-	widget = glade_xml_get_widget(xml, "GtkMenuItem_LoadSlot4");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(on_states_load), (gpointer) 3, NULL, G_CONNECT_AFTER);
-	widget = glade_xml_get_widget(xml, "GtkMenuItem_LoadSlot5");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(on_states_load), (gpointer) 4, NULL, G_CONNECT_AFTER);	
-	widget = glade_xml_get_widget(xml, "other1");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(on_states_load_other), NULL, NULL, G_CONNECT_AFTER);			
-
-	widget = glade_xml_get_widget(xml, "GtkMenuItem_SaveSlot1");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(on_states_save), (gpointer) 0, NULL, G_CONNECT_AFTER);
-	widget = glade_xml_get_widget(xml, "GtkMenuItem_SaveSlot2");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(on_states_save), (gpointer) 1, NULL, G_CONNECT_AFTER);
-	widget = glade_xml_get_widget(xml, "GtkMenuItem_SaveSlot3");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(on_states_save), (gpointer) 2, NULL, G_CONNECT_AFTER);
-	widget = glade_xml_get_widget(xml, "GtkMenuItem_SaveSlot4");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(on_states_save), (gpointer) 3, NULL, G_CONNECT_AFTER);
-	widget = glade_xml_get_widget(xml, "GtkMenuItem_SaveSlot5");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(on_states_save), (gpointer) 4, NULL, G_CONNECT_AFTER);	
-	widget = glade_xml_get_widget(xml, "other2");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(on_states_save_other), NULL, NULL, G_CONNECT_AFTER);
-
-	// Emulation menu
-	widget = glade_xml_get_widget(xml, "run1");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(OnEmu_Run), NULL, NULL, G_CONNECT_AFTER);
-	widget = glade_xml_get_widget(xml, "reset1");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(OnEmu_Reset), NULL, NULL, G_CONNECT_AFTER);
-	widget = glade_xml_get_widget(xml, "SwitchImage");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(OnEmu_SwitchImage), NULL, NULL, G_CONNECT_AFTER);
-
-	// Configuration menu
-	widget = glade_xml_get_widget(xml, "plugins_bios");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(ConfigurePlugins), NULL, NULL, G_CONNECT_AFTER);
-	widget = glade_xml_get_widget(xml, "graphics1");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(OnConf_Graphics), NULL, NULL, G_CONNECT_AFTER);
-	widget = glade_xml_get_widget(xml, "sound1");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(OnConf_Sound), NULL, NULL, G_CONNECT_AFTER);
-	widget = glade_xml_get_widget(xml, "cdrom1");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(OnConf_CdRom), NULL, NULL, G_CONNECT_AFTER);
-	widget = glade_xml_get_widget(xml, "pad1");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(OnConf_Pad), NULL, NULL, G_CONNECT_AFTER);
-	widget = glade_xml_get_widget(xml, "cpu1");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(OnConf_Cpu), NULL, NULL, G_CONNECT_AFTER);
-	widget = glade_xml_get_widget(xml, "memory_cards1");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(OnConf_Mcds), NULL, NULL, G_CONNECT_AFTER);
-	widget = glade_xml_get_widget(xml, "net1");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(OnConf_Net), NULL, NULL, G_CONNECT_AFTER);
-	widget = glade_xml_get_widget(xml, "memorydump1");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(RunDebugMemoryDialog), NULL, NULL, G_CONNECT_AFTER);
-
-	// Cheat menu
-	widget = glade_xml_get_widget(xml, "browse1");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(RunCheatListDialog), NULL, NULL, G_CONNECT_AFTER);
-	widget = glade_xml_get_widget(xml, "search1");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(RunCheatSearchDialog), NULL, NULL, G_CONNECT_AFTER);
-
-	// Help menu
-	widget = glade_xml_get_widget(xml, "about_pcsx1");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(OnHelp_About), NULL, NULL, G_CONNECT_AFTER);
-
-	// Toolbar
-	widget = glade_xml_get_widget(xml, "toolbutton_runcd");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnFile_RunCd), NULL, NULL, G_CONNECT_AFTER);
-
-	widget = glade_xml_get_widget(xml, "toolbutton_runimage");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnFile_RunImage), NULL, NULL, G_CONNECT_AFTER);
-
-	widget = glade_xml_get_widget(xml, "toolbutton_run");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnEmu_Run), NULL, NULL, G_CONNECT_AFTER);
-
-	widget = glade_xml_get_widget(xml, "toolbutton_switchimage");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnEmu_SwitchImage), NULL, NULL, G_CONNECT_AFTER);
-
-	widget = glade_xml_get_widget(xml, "toolbutton_memcards");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnConf_Mcds), NULL, NULL, G_CONNECT_AFTER);
-
-	widget = glade_xml_get_widget(xml, "toolbutton_graphics");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnConf_Graphics), NULL, NULL, G_CONNECT_AFTER);
-
-	widget = glade_xml_get_widget(xml, "toolbutton_sound");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnConf_Sound), NULL, NULL, G_CONNECT_AFTER);
-
-	widget = glade_xml_get_widget(xml, "toolbutton_cdrom");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnConf_CdRom), NULL, NULL, G_CONNECT_AFTER);
-
-	widget = glade_xml_get_widget(xml, "toolbutton_controllers");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnConf_Pad), NULL, NULL, G_CONNECT_AFTER);
-
-	gtk_main();
-}
-
-void OnDestroy() {
-	if (!destroy) OnFile_Exit();
-}
-
-void destroy_main_window () {
-	destroy = 1;
-	gtk_widget_destroy(Window);
-	Window = NULL;
-	destroy = 0;
-	gtk_main_quit();
-	while (gtk_events_pending()) gtk_main_iteration();
-}
-
-void OnFile_RunExe() {
-	GtkWidget *file_chooser;
-
-	if (plugins_configured() == FALSE) {
-		ConfigurePlugins();
-	} else {
-		file_chooser = gtk_file_chooser_dialog_new(_("Select PSX EXE File"),
-			NULL, GTK_FILE_CHOOSER_ACTION_OPEN,
-			GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-			GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL);
-
-		// Add file filters
-		GtkFileFilter *exefilter = gtk_file_filter_new ();
-		gtk_file_filter_add_pattern (exefilter, "*.exe");
-		gtk_file_filter_add_pattern (exefilter, "*.psx");
-		gtk_file_filter_add_pattern (exefilter, "*.cpe");
-		gtk_file_filter_add_pattern (exefilter, "*.EXE");
-		gtk_file_filter_add_pattern (exefilter, "*.PSX");
-		gtk_file_filter_add_pattern (exefilter, "*.CPE");
-		gtk_file_filter_set_name (exefilter, _("PlayStation Executable Files"));
-		gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (file_chooser), exefilter);
-		GtkFileFilter *allfilter = gtk_file_filter_new ();
-		gtk_file_filter_add_pattern (allfilter, "*");
-		gtk_file_filter_set_name (allfilter, _("All Files"));
-		gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (file_chooser), allfilter);
-
-		// Set this to the config object and retain it - maybe LastUsedDir
-		gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(file_chooser), getenv("HOME"));
-
-		if (gtk_dialog_run(GTK_DIALOG(file_chooser)) == GTK_RESPONSE_ACCEPT) {
-			gchar *file;
-
-			/* TODO Need to validate the file */
-
-			file = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(file_chooser));
-
-			gtk_widget_destroy (file_chooser);
-			destroy_main_window();
-
-			SetIsoFile(NULL);
-			LoadPlugins();
-			NetOpened = FALSE;
-
-			if (OpenPlugins() == -1) {
-				g_free(file);
-				SysRunGui();
-			} else {
-				SysReset();
-
-				if (Load(file) == 0) {
-					g_free(file);
-					psxCpu->Execute();
-				} else {
-					g_free(file);
-					ClosePlugins();
-					SysErrorMessage(_("Not a valid PSX file"), _("The file does not appear to be a valid Playstation executable"));
-					SysRunGui();
-				}
-			}
-		} else
-			gtk_widget_destroy(file_chooser);
-	}
-}
-
-void OnFile_RunCd() {
-	if (plugins_configured() == FALSE) { 
-		ConfigurePlugins();
-		return;
-	}
-
-	destroy_main_window();
-
-	SetIsoFile(NULL);
-	LoadPlugins();
-	NetOpened = FALSE;
-
-	if (OpenPlugins() == -1) {
-		SysRunGui();
-		return;
-	}
-
-	SysReset();
-
-	if (CheckCdrom() == -1) {
-		/* Only check the CD if we are starting the console with a CD */
-		ClosePlugins();
-		SysErrorMessage (_("CD ROM failed"), _("The CD does not appear to be a valid Playstation CD"));
-		SysRunGui();
-		return;
-	}
-
-	// Read main executable directly from CDRom and start it
-	if (LoadCdrom() == -1) {
-		ClosePlugins();
-		SysErrorMessage(_("Could not load CD-ROM!"), _("The CD-ROM could not be loaded"));
-		SysRunGui();
-	}
-
-	psxCpu->Execute();
-}
-
-void OnFile_RunBios() {
-	if (plugins_configured() == FALSE) { 
-		ConfigurePlugins();
-		return;
-	}
-
-	if (strcmp(Config.Bios, "HLE") == 0) {
-		SysErrorMessage (_("Could not run BIOS"), _("Running BIOS is not supported with Internal HLE BIOS."));
-		return;
-	}
-
-	destroy_main_window();
-
-	SetIsoFile(NULL);
-	LoadPlugins();
-	NetOpened = FALSE;
-
-	if (OpenPlugins() == -1) {
-		SysRunGui();
-		return;
-	}
-
-	SysReset();
-
-	CdromId[0] = '\0';
-	CdromLabel[0] = '\0';
-
-	psxCpu->Execute();
-}
-
-static gchar *Open_Iso_Proc() {
-	GtkWidget *chooser;
-	gchar *filename;
-	GtkFileFilter *psxfilter, *allfilter;
-	static char current_folder[MAXPATHLEN] = "";
-
-	chooser = gtk_file_chooser_dialog_new (_("Open PSX Disc Image File"),
-		NULL, GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-		GTK_STOCK_OK, GTK_RESPONSE_OK,
-		NULL);
-
-	if (current_folder[0] == '\0') {
-		strcpy(current_folder, getenv("HOME"));
-	}
-
-	gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER (chooser), current_folder);
-
-	psxfilter = gtk_file_filter_new();
-	gtk_file_filter_add_pattern(psxfilter, "*.bin");
-	gtk_file_filter_add_pattern(psxfilter, "*.img");
-	gtk_file_filter_add_pattern(psxfilter, "*.mdf");
-	gtk_file_filter_add_pattern(psxfilter, "*.iso");
-	gtk_file_filter_add_pattern(psxfilter, "*.BIN");
-	gtk_file_filter_add_pattern(psxfilter, "*.IMG");
-	gtk_file_filter_add_pattern(psxfilter, "*.MDF");
-	gtk_file_filter_add_pattern(psxfilter, "*.ISO");
-	gtk_file_filter_set_name(psxfilter, _("PSX Image Files (*.bin, *.img, *.mdf, *.iso)"));
-	gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (chooser), psxfilter);
-
-	allfilter = gtk_file_filter_new();
-	gtk_file_filter_add_pattern(allfilter, "*");
-	gtk_file_filter_set_name(allfilter, _("All Files"));
-	gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (chooser), allfilter);
-
-	if (gtk_dialog_run(GTK_DIALOG(chooser)) == GTK_RESPONSE_OK) {
-		gchar *path = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(chooser));
-		strcpy(current_folder, path);
-		g_free(path);
-		filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER (chooser));
-		gtk_widget_destroy(GTK_WIDGET(chooser));
-		while (gtk_events_pending()) gtk_main_iteration();
-		return filename;
-	} else {
-		gtk_widget_destroy (GTK_WIDGET(chooser));
-		while (gtk_events_pending()) gtk_main_iteration();
-		return NULL;
-	}
-}
-
-void OnFile_RunImage() {
-	gchar *filename;
-
-	if (plugins_configured() == FALSE) { 
-		ConfigurePlugins();
-		return;
-	}
-
-	filename = Open_Iso_Proc();
-	if (filename == NULL) {
-		return;
-	}
-
-	destroy_main_window();
-
-	SetIsoFile(filename);
-	g_free(filename);
-
-	LoadPlugins();
-	NetOpened = FALSE;
-
-	if (OpenPlugins() == -1) {
-		SysRunGui();
-		return;
-	}
-
-	SysReset();
-
-	if (CheckCdrom() == -1) {
-		// Only check the CD if we are starting the console with a CD
-		ClosePlugins();
-		SysErrorMessage (_("CD ROM failed"), _("The CD does not appear to be a valid Playstation CD"));
-		SysRunGui();
-		return;
-	}
-
-	// Read main executable directly from CDRom and start it
-	if (LoadCdrom() == -1) {
-		ClosePlugins();
-		SysErrorMessage(_("Could not load CD-ROM!"), _("The CD-ROM could not be loaded"));
-		SysRunGui();
-	}
-
-	psxCpu->Execute();
-}
-
-void OnEmu_Run() {
-	if (plugins_configured() == FALSE) { 
-		ConfigurePlugins();
-		return;
-	}
-
-	destroy_main_window();
-
-	if (OpenPlugins() == -1) {
-		SysRunGui();
-		return;
-	}
-
-	CheatSearchBackupMemory();
-	psxCpu->Execute();
-}
-
-void OnEmu_Reset() {
-	if (plugins_configured() == FALSE) { 
-		ConfigurePlugins();
-		return;
-	}
-
-	destroy_main_window();
-
-	if (OpenPlugins() == -1) {
-		SysRunGui();
-		return;
-	}
-
-	SysReset();
-
-	if (CheckCdrom() != -1) {
-		LoadCdrom();
-	}
-
-	psxCpu->Execute();
-}
-
-void OnEmu_SwitchImage() {
-	gchar *filename;
-
-	if (plugins_configured() == FALSE) { 
-		ConfigurePlugins();
-		return;
-	}
-
-	filename = Open_Iso_Proc();
-	if (filename == NULL) {
-		return;
-	}
-
-	destroy_main_window();
-
-	SetIsoFile(filename);
-	g_free(filename);
-
-	if (OpenPlugins() == -1) {
-		SysRunGui();
-		return;
-	}
-
-	SetCdOpenCaseTime(time(NULL) + 2);
-
-	CheatSearchBackupMemory();
-	psxCpu->Execute();
-}
-
-void OnFile_Exit() {
-	DIR *dir;
-	struct dirent *ent;
-	void *Handle;
-	gchar *plugin = NULL;
-	gchar *dotdir;
-
-	dotdir = g_build_filename(getenv("HOME"), PLUGINS_DIR, NULL);
-
-	// with this the problem with plugins that are linked with the pthread
-	// library is solved
-
-	dir = opendir(dotdir);
-	if (dir != NULL) {
-		while ((ent = readdir(dir)) != NULL) {
-			plugin = g_build_filename(dotdir, ent->d_name, NULL);
-
-			if (strstr(plugin, ".so") == NULL && strstr(plugin, ".dylib") == NULL)
-				continue;
-			Handle = dlopen(plugin, RTLD_NOW);
-			if (Handle == NULL)
-				continue;
-
-			g_free(plugin);
-		}
-	}
-	g_free(dotdir);
-
-	bind_textdomain_codeset(PACKAGE_NAME, "");
-	if (UseGui)
-		gtk_main_quit();
-	SysClose();
-	if (UseGui)
-		gtk_exit (0);
-	else
-		exit(0);
-}
-
-void state_load(gchar *state_filename) {
-	int ret;
-	char Text[MAXPATHLEN + 20];
-	FILE *fp;
-
-	// check if the state file actually exists
-	fp = fopen(state_filename, "rb");
-	if (fp == NULL) {
-		// file does not exist
-		return;
-	}
-
-	fclose(fp);
-
-	// If the window exists, then we are loading the state from within
-	// within the PCSX GUI. We need to initialise the plugins first
-	if (Window) {
-		destroy_main_window();
-
-		if (OpenPlugins() == -1) {
-			SysRunGui();
-			return;
-		}
-	}
-
-	ret = CheckState(state_filename);
-
-	if (ret == 0) {
-		SysReset();
-		ret = LoadState(state_filename);
-	}
-
-	if (ret == 0) {
-		// Check the CD-ROM is valid
-		if (CheckCdrom() == -1) {
-			ClosePlugins();
-			SysRunGui();
-			return;
-		}
-
-		sprintf(Text, _("Loaded state %s."), state_filename);
-		GPU_displayText(Text);
-	} else {
-		sprintf(Text, _("Error loading state %s!"), state_filename);
-		GPU_displayText(Text);
-	}
-}
-
-void state_save(gchar *state_filename) {
-	char Text[MAXPATHLEN + 20];
-
-	GPU_updateLace();
-
-	if (SaveState(state_filename) == 0)
-		sprintf(Text, _("Saved state %s."), state_filename);
-	else
-		sprintf(Text, _("Error saving state %s!"), state_filename);
-
-	GPU_displayText(Text);
-}
-
-void on_states_load (GtkWidget *widget, gpointer user_data) {
-	gchar *state_filename;
-	gint state = (int)user_data;
-
-	state_filename = get_state_filename(state);
-
-	state_load(state_filename);
-
-	g_free(state_filename);
-
-	psxCpu->Execute();
-}
-
-void on_states_save (GtkWidget *widget, gpointer user_data) {
-	gchar *state_filename;
-	gint state = (int)user_data;
-
-	state_filename = get_state_filename(state);
-
-	state_save(state_filename);
-
-	g_free(state_filename);
-}
-
-void on_states_load_other() {
-	GtkWidget *file_chooser;
-	gchar *SStateFile;
-
-	SStateFile = g_strconcat(getenv("HOME"), STATES_DIR, NULL);
-
-	file_chooser = gtk_file_chooser_dialog_new(_("Select State File"), NULL, GTK_FILE_CHOOSER_ACTION_OPEN,
-		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-		GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
-		NULL);
-	gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER (file_chooser), SStateFile);
-	g_free(SStateFile);
-
-	if (gtk_dialog_run(GTK_DIALOG(file_chooser)) == GTK_RESPONSE_ACCEPT) {
-		gchar *filename;
-
-		filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(file_chooser));
-		gtk_widget_destroy(file_chooser);
-
-		state_load(filename);
-
-		g_free(filename);
-
-		psxCpu->Execute();
-	} else
-		gtk_widget_destroy(file_chooser);
-} 
-
-void on_states_save_other() {
-	GtkWidget *file_chooser;
-	gchar *SStateFile;
-
-	SStateFile = g_strconcat (getenv("HOME"), STATES_DIR, NULL);
-
-	file_chooser = gtk_file_chooser_dialog_new(_("Select State File"),
-			NULL, GTK_FILE_CHOOSER_ACTION_SAVE,
-			GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-			GTK_STOCK_SAVE, GTK_RESPONSE_OK,
-			NULL);
-	gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(file_chooser), SStateFile);
-	g_free(SStateFile);
-
-	if (gtk_dialog_run (GTK_DIALOG(file_chooser)) == GTK_RESPONSE_OK) {
-		gchar *filename;
-
-		filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER (file_chooser));
-		gtk_widget_destroy(file_chooser);
-
-		state_save(filename);
-
-		g_free(filename);
-	}
-	else
-		gtk_widget_destroy(file_chooser);
-} 
-
-void OnHelp_About(GtkWidget *widget, gpointer user_data) {
-	RunAboutDialog();
-}
-
-void SysMessage(const char *fmt, ...) {
-	GtkWidget *Txt, *MsgDlg;
-	va_list list;
-	char msg[512];
-
-	va_start(list, fmt);
-	vsprintf(msg, fmt, list);
-	va_end(list);
-
-	if (msg[strlen(msg) - 1] == '\n')
-		msg[strlen(msg) - 1] = 0;
-
-	if (!UseGui) {
-		fprintf(stderr, "%s\n", msg);
-		return;
-	}
-
-	MsgDlg = gtk_dialog_new_with_buttons(_("Notice"), NULL,
-		GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_OK, GTK_RESPONSE_NONE, NULL);
-
-	gtk_window_set_position (GTK_WINDOW(MsgDlg), GTK_WIN_POS_CENTER);
-
-	Txt = gtk_label_new (msg);
-	gtk_label_set_line_wrap(GTK_LABEL(Txt), TRUE);
-	gtk_container_add (GTK_CONTAINER (GTK_DIALOG(MsgDlg)->vbox), Txt);
-
-	gtk_widget_show (Txt);
-	gtk_widget_show_all (MsgDlg);
-	gtk_dialog_run (GTK_DIALOG(MsgDlg));
-	gtk_widget_destroy (MsgDlg);
-}
-
-void SysErrorMessage(gchar *primary, gchar *secondary) {
-	GtkWidget *message_dialog;	
-	if (!UseGui)
-		printf ("%s - %s\n", primary, secondary);
-	else {
-		message_dialog = gtk_message_dialog_new(NULL,
-				GTK_DIALOG_MODAL,
-				GTK_MESSAGE_ERROR,
-				GTK_BUTTONS_CLOSE,
-				primary,
-				NULL);
-		gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(message_dialog),
-				secondary);
-
-		gtk_dialog_run(GTK_DIALOG(message_dialog));
-		gtk_widget_destroy(message_dialog);
-	}
-}
-
-void SysInfoMessage(gchar *primary, gchar *secondary) {
-	GtkWidget *message_dialog;	
-	if (!UseGui)
-		printf ("%s - %s\n", primary, secondary);
-	else {
-		message_dialog = gtk_message_dialog_new(NULL,
-				GTK_DIALOG_MODAL,
-				GTK_MESSAGE_INFO,
-				GTK_BUTTONS_CLOSE,
-				primary,
-				NULL);
-		gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(message_dialog),
-				secondary);
-
-		gtk_dialog_run(GTK_DIALOG(message_dialog));
-		gtk_widget_destroy(message_dialog);
-	}
-}

pcsxr-1.9.92.tar.bz2/gui/Makefile.in Deleted

@@ -1,538 +0,0 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-bin_PROGRAMS = pcsx$(EXEEXT)
-subdir = gui
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)"
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS)
-am_pcsx_OBJECTS = LnxMain.$(OBJEXT) Plugin.$(OBJEXT) Config.$(OBJEXT) \
-	Gtk2Gui.$(OBJEXT) MemcardDlg.$(OBJEXT) ConfDlg.$(OBJEXT) \
-	Cheat.$(OBJEXT) DebugMemory.$(OBJEXT) AboutDlg.$(OBJEXT)
-pcsx_OBJECTS = $(am_pcsx_OBJECTS)
-am__DEPENDENCIES_1 =
-pcsx_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	../libpcsxcore/libpcsxcore.a
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(pcsx_SOURCES)
-DIST_SOURCES = $(pcsx_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCAS = @CCAS@
-CCASDEPMODE = @CCASDEPMODE@
-CCASFLAGS = @CCASFLAGS@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GLADE2_CFLAGS = @GLADE2_CFLAGS@
-GLADE2_LIBS = @GLADE2_LIBS@
-GLIB2_CFLAGS = @GLIB2_CFLAGS@
-GLIB2_LIBS = @GLIB2_LIBS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK2_CFLAGS = @GTK2_CFLAGS@
-GTK2_LIBS = @GTK2_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
-LIBCDIO_LIBS = @LIBCDIO_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NASM = @NASM@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PEOPSXGL = @PEOPSXGL@
-PKG_CONFIG = @PKG_CONFIG@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_CONFIG = @SDL_CONFIG@
-SDL_LIBS = @SDL_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-INCLUDES = -DPACKAGE_DATA_DIR=\"${datadir}/pcsx/\" \
-	-DPIXMAPDIR=\"${datadir}/pixmaps/\" \
-	-DLOCALE_DIR=\"${datadir}/locale/\" \
-	$(GTK2_CFLAGS) $(GLADE2_CFLAGS) \
-	-I$(top_srcdir)/libpcsxcore -I$(top_srcdir)/include \
-	-DPSEMU_DATA_DIR=\"${datadir}/psemu\" \
-	-DDEF_PLUGIN_DIR=\"${libdir}/games/psemu\"
-
-pcsx_SOURCES = \
-	LnxMain.c	\
-	Plugin.c	\
-	Config.c	\
-	Gtk2Gui.c	\
-	MemcardDlg.c	\
-	ConfDlg.c	\
-	Cheat.c		\
-	DebugMemory.c	\
-	AboutDlg.c
-
-pcsx_LDADD = \
-	$(GTK2_LIBS) $(GLADE2_LIBS) -lpthread -lz -lm -lXext -lXtst \
-	../libpcsxcore/libpcsxcore.a
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
-	@for dep in $?; do \
-	 case '$(am__configure_deps)' in \
-	 *$$dep*) \
-	 ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	 && { if test -f $@; then exit 0; else break; fi; }; \
-	 exit 1;; \
-	 esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gui/Makefile'; \
-	cd $(top_srcdir) && \
-	 $(AUTOMAKE) --gnu gui/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	 *config.status*) \
-	 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	 *) \
-	 echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	 p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	 if test -f $$p \
-	 || test -f $$p1 \
-	 ; then \
-	 f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	 echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	 $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-	 else :; fi; \
-	done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	 f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	 echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	 rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	done
-
-clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	 f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	 echo " rm -f $$p $$f"; \
-	 rm -f $$p $$f ; \
-	done
-pcsx$(EXEEXT): $(pcsx_OBJECTS) $(pcsx_DEPENDENCIES) 
-	@rm -f pcsx$(EXEEXT)
-	$(LINK) $(pcsx_OBJECTS) $(pcsx_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AboutDlg.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Cheat.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ConfDlg.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Config.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DebugMemory.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Gtk2Gui.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LnxMain.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MemcardDlg.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Plugin.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	 done | \
-	 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	 END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	 done | \
-	 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	 END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	 test -n "$$unique" || unique=$$empty_fix; \
-	 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	 $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	 done | \
-	 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	 END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	 $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	 && cd $(top_srcdir) \
-	 && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	 dist_files=`for file in $$list; do echo $$file; done | \
-	 sed -e "s|^$$srcdirstrip/||;t" \
-	 -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	 */*) $(MKDIR_P) `echo "$$dist_files" | \
-			 sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			 sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	 if test -d $$d/$$file; then \
-	 dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	 cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	 fi; \
-	 cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	 else \
-	 test -f $(distdir)/$$file \
-	 || cp -p $$d/$$file $(distdir)/$$file \
-	 || exit 1; \
-	 fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(PROGRAMS)
-installdirs:
-	for dir in "$(DESTDIR)$(bindir)"; do \
-	 test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	 `test -z '$(STRIP)' || \
-	 echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-exec-am: install-binPROGRAMS
-
-install-html: install-html-am
-
-install-info: install-info-am
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libtool ctags distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-binPROGRAMS
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

pcsxr-1.9.92.tar.bz2/include/config.h.in Deleted

@@ -1,120 +0,0 @@
-/* include/config.h.in. Generated from configure.ac by autoheader. */
-
-/* Define if building universal (internal helper macro) */
-#undef AC_APPLE_UNIVERSAL_BUILD
-
-/* Define to 1 if translation of program messages to the user's native
- language is requested. */
-#undef ENABLE_NLS
-
-/* gettext domain */
-#undef GETTEXT_PACKAGE
-
-/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
- CoreFoundation framework. */
-#undef HAVE_CFLOCALECOPYCURRENT
-
-/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
- the CoreFoundation framework. */
-#undef HAVE_CFPREFERENCESCOPYAPPVALUE
-
-/* Define if the GNU dcgettext() function is already present or preinstalled.
- */
-#undef HAVE_DCGETTEXT
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define if the GNU gettext() function is already present or preinstalled. */
-#undef HAVE_GETTEXT
-
-/* Define if you have the iconv() function and it works. */
-#undef HAVE_ICONV
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
- */
-#undef LT_OBJDIR
-
-/* Define to the maximum length of any path. */
-#undef MAXPATHLEN
-
-/* Define if we are compiling without dynamic recompiler. */
-#undef NOPSXREC
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#undef VERSION
-
-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
- significant byte first (like Motorola and SPARC, unlike Intel). */
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-# define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifndef WORDS_BIGENDIAN
-# undef WORDS_BIGENDIAN
-# endif
-#endif
-
-/* define on a big endian system */
-#undef __BIGENDIAN__
-
-/* Define if building on a GNU/Linux system. */
-#undef __LINUX__
-
-/* Define if we are compiling for x86 architectures. */
-#undef __i386__
-
-/* Define if we are compiling for powerpc architectures. */
-#undef __ppc__
-
-/* Define if we are compiling for x86_64 architectures. */
-#undef __x86_64__

pcsxr-1.9.92.tar.bz2/install-sh Deleted

@@ -1,519 +0,0 @@
-#!/bin/sh
-# install - install a program, script, or datafile
-
-scriptversion=2006-12-25.00
-
-# This originates from X11R5 (mit/util/scripts/install.sh), which was
-# later released in X11R6 (xc/config/util/install.sh) with the
-# following copyright and license.
-#
-# Copyright (C) 1994 X Consortium
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the X Consortium shall not
-# be used in advertising or otherwise to promote the sale, use or other deal-
-# ings in this Software without prior written authorization from the X Consor-
-# tium.
-#
-#
-# FSF changes to this file are in the public domain.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.
-
-nl='
-'
-IFS=" ""	$nl"
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit=${DOITPROG-}
-if test -z "$doit"; then
-  doit_exec=exec
-else
-  doit_exec=$doit
-fi
-
-# Put in absolute file names if you don't have them in your path;
-# or use environment vars.
-
-chgrpprog=${CHGRPPROG-chgrp}
-chmodprog=${CHMODPROG-chmod}
-chownprog=${CHOWNPROG-chown}
-cmpprog=${CMPPROG-cmp}
-cpprog=${CPPROG-cp}
-mkdirprog=${MKDIRPROG-mkdir}
-mvprog=${MVPROG-mv}
-rmprog=${RMPROG-rm}
-stripprog=${STRIPPROG-strip}
-
-posix_glob='?'
-initialize_posix_glob='
-  test "$posix_glob" != "?" || {
-    if (set -f) 2>/dev/null; then
-      posix_glob=
-    else
-      posix_glob=:
-    fi
-  }
-'
-
-posix_mkdir=
-
-# Desired mode of installed file.
-mode=0755
-
-chgrpcmd=
-chmodcmd=$chmodprog
-chowncmd=
-mvcmd=$mvprog
-rmcmd="$rmprog -f"
-stripcmd=
-
-src=
-dst=
-dir_arg=
-dst_arg=
-
-copy_on_change=false
-no_target_directory=
-
-usage="\
-Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-   or: $0 [OPTION]... SRCFILES... DIRECTORY
-   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-   or: $0 [OPTION]... -d DIRECTORIES...
-
-In the 1st form, copy SRCFILE to DSTFILE.
-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-In the 4th, create DIRECTORIES.
-
-Options:
-     --help     display this help and exit.
-     --version  display version info and exit.
-
-  -c            (ignored)
-  -C            install only if different (preserve the last data modification time)
-  -d            create directories instead of installing files.
-  -g GROUP      $chgrpprog installed files to GROUP.
-  -m MODE       $chmodprog installed files to MODE.
-  -o USER       $chownprog installed files to USER.
-  -s            $stripprog installed files.
-  -t DIRECTORY  install into DIRECTORY.
-  -T            report an error if DSTFILE is a directory.
-
-Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
-  RMPROG STRIPPROG
-"
-
-while test $# -ne 0; do
-  case $1 in
-    -c) ;;
-
-    -C) copy_on_change=true;;
-
-    -d) dir_arg=true;;
-
-    -g) chgrpcmd="$chgrpprog $2"
-	shift;;
-
-    --help) echo "$usage"; exit $?;;
-
-    -m) mode=$2
-	case $mode in
-	  *' '* | *'	'* | *'
-'*	  | *'*'* | *'?'* | *'['*)
-	    echo "$0: invalid mode: $mode" >&2
-	    exit 1;;
-	esac
-	shift;;
-
-    -o) chowncmd="$chownprog $2"
-	shift;;
-
-    -s) stripcmd=$stripprog;;
-
-    -t) dst_arg=$2
-	shift;;
-
-    -T) no_target_directory=true;;
-
-    --version) echo "$0 $scriptversion"; exit $?;;
-
-    --)	shift
-	break;;
-
-    -*)	echo "$0: invalid option: $1" >&2
-	exit 1;;
-
-    *)  break;;
-  esac
-  shift
-done
-
-if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
-  # When -d is used, all remaining arguments are directories to create.
-  # When -t is used, the destination is already specified.
-  # Otherwise, the last argument is the destination.  Remove it from $@.
-  for arg
-  do
-    if test -n "$dst_arg"; then
-      # $@ is not empty: it contains at least $arg.
-      set fnord "$@" "$dst_arg"
-      shift # fnord
-    fi
-    shift # arg
-    dst_arg=$arg
-  done
-fi
-
-if test $# -eq 0; then
-  if test -z "$dir_arg"; then
-    echo "$0: no input file specified." >&2
-    exit 1
-  fi
-  # It's OK to call `install-sh -d' without argument.
-  # This can happen when creating conditional directories.
-  exit 0
-fi
-
-if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
-
-  # Set umask so as not to create temps with too-generous modes.
-  # However, 'strip' requires both read and write access to temps.
-  case $mode in
-    # Optimize common cases.
-    *644) cp_umask=133;;
-    *755) cp_umask=22;;
-
-    *[0-7])
-      if test -z "$stripcmd"; then
-	u_plus_rw=
-      else
-	u_plus_rw='% 200'
-      fi
-      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
-    *)
-      if test -z "$stripcmd"; then
-	u_plus_rw=
-      else
-	u_plus_rw=,u+rw
-      fi
-      cp_umask=$mode$u_plus_rw;;
-  esac
-fi
-
-for src
-do
-  # Protect names starting with `-'.
-  case $src in
-    -*) src=./$src;;
-  esac
-
-  if test -n "$dir_arg"; then
-    dst=$src
-    dstdir=$dst
-    test -d "$dstdir"
-    dstdir_status=$?
-  else
-
-    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
-    # might cause directories to be created, which would be especially bad
-    # if $src (and thus $dsttmp) contains '*'.
-    if test ! -f "$src" && test ! -d "$src"; then
-      echo "$0: $src does not exist." >&2
-      exit 1
-    fi
-
-    if test -z "$dst_arg"; then
-      echo "$0: no destination specified." >&2
-      exit 1
-    fi
-
-    dst=$dst_arg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst;;
-    esac
-
-    # If destination is a directory, append the input filename; won't work
-    # if double slashes aren't ignored.
-    if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
-	echo "$0: $dst_arg: Is a directory" >&2
-	exit 1
-      fi
-      dstdir=$dst
-      dst=$dstdir/`basename "$src"`
-      dstdir_status=0
-    else
-      # Prefer dirname, but fall back on a substitute if dirname fails.
-      dstdir=`
-	(dirname "$dst") 2>/dev/null ||
-	expr X"$dst" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
-	     X"$dst" : 'X$//$[^/]' \| \
-	     X"$dst" : 'X$//$$' \| \
-	     X"$dst" : 'X$/$' \| . 2>/dev/null ||
-	echo X"$dst" |
-	    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{
-		   s//\1/
-		   q
-		 }
-		 /^X$\/\/$[^/].*/{
-		   s//\1/
-		   q
-		 }
-		 /^X$\/\/$$/{
-		   s//\1/
-		   q
-		 }
-		 /^X$\/$.*/{
-		   s//\1/
-		   q
-		 }
-		 s/.*/./; q'
-      `
-
-      test -d "$dstdir"
-      dstdir_status=$?
-    fi
-  fi
-
-  obsolete_mkdir_used=false
-
-  if test $dstdir_status != 0; then
-    case $posix_mkdir in
-      '')
-	# Create intermediate dirs using mode 755 as modified by the umask.
-	# This is like FreeBSD 'install' as of 1997-10-28.
-	umask=`umask`
-	case $stripcmd.$umask in
-	  # Optimize common cases.
-	  *[2367][2367]) mkdir_umask=$umask;;
-	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-
-	  *[0-7])
-	    mkdir_umask=`expr $umask + 22 \
-	      - $umask % 100 % 40 + $umask % 20 \
-	      - $umask % 10 % 4 + $umask % 2
-	    `;;
-	  *) mkdir_umask=$umask,go-w;;
-	esac
-
-	# With -d, create the new directory with the user-specified mode.
-	# Otherwise, rely on $mkdir_umask.
-	if test -n "$dir_arg"; then
-	  mkdir_mode=-m$mode
-	else
-	  mkdir_mode=
-	fi
-
-	posix_mkdir=false
-	case $umask in
-	  *[123567][0-7][0-7])
-	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
-	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-	    ;;
-	  *)
-	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-
-	    if (umask $mkdir_umask &&
-		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-	    then
-	      if test -z "$dir_arg" || {
-		   # Check for POSIX incompatibilities with -m.
-		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writeable bit of parent directory when it shouldn't.
-		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
-		   case $ls_ld_tmpdir in
-		     d????-?r-*) different_mode=700;;
-		     d????-?--*) different_mode=755;;
-		     *) false;;
-		   esac &&
-		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-		   }
-		 }
-	      then posix_mkdir=:
-	      fi
-	      rmdir "$tmpdir/d" "$tmpdir"
-	    else
-	      # Remove any dirs left behind by ancient mkdir implementations.
-	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-	    fi
-	    trap '' 0;;
-	esac;;
-    esac
-
-    if
-      $posix_mkdir && (
-	umask $mkdir_umask &&
-	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
-      )
-    then :
-    else
-
-      # The umask is ridiculous, or mkdir does not conform to POSIX,
-      # or it failed possibly due to a race condition.  Create the
-      # directory the slow way, step by step, checking for races as we go.
-
-      case $dstdir in
-	/*) prefix='/';;
-	-*) prefix='./';;
-	*)  prefix='';;
-      esac
-
-      eval "$initialize_posix_glob"
-
-      oIFS=$IFS
-      IFS=/
-      $posix_glob set -f
-      set fnord $dstdir
-      shift
-      $posix_glob set +f
-      IFS=$oIFS
-
-      prefixes=
-
-      for d
-      do
-	test -z "$d" && continue
-
-	prefix=$prefix$d
-	if test -d "$prefix"; then
-	  prefixes=
-	else
-	  if $posix_mkdir; then
-	    (umask=$mkdir_umask &&
-	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-	    # Don't fail if two instances are running concurrently.
-	    test -d "$prefix" || exit 1
-	  else
-	    case $prefix in
-	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-	      *) qprefix=$prefix;;
-	    esac
-	    prefixes="$prefixes '$qprefix'"
-	  fi
-	fi
-	prefix=$prefix/
-      done
-
-      if test -n "$prefixes"; then
-	# Don't fail if two instances are running concurrently.
-	(umask $mkdir_umask &&
-	 eval "\$doit_exec \$mkdirprog $prefixes") ||
-	  test -d "$dstdir" || exit 1
-	obsolete_mkdir_used=true
-      fi
-    fi
-  fi
-
-  if test -n "$dir_arg"; then
-    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
-      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
-  else
-
-    # Make a couple of temp file names in the proper directory.
-    dsttmp=$dstdir/_inst.$$_
-    rmtmp=$dstdir/_rm.$$_
-
-    # Trap to clean up those temp files at exit.
-    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-
-    # Copy the file name to the temp name.
-    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
-
-    # and set any options; do chmod last to preserve setuid bits.
-    #
-    # If any of these fail, we abort the whole thing.  If we want to
-    # ignore errors from any of these, just make sure not to ignore
-    # errors from the above "$doit $cpprog $src $dsttmp" command.
-    #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
-    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
-    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-
-    # If -C, don't bother to copy if it wouldn't change the file.
-    if $copy_on_change &&
-       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
-       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
-
-       eval "$initialize_posix_glob" &&
-       $posix_glob set -f &&
-       set X $old && old=:$2:$4:$5:$6 &&
-       set X $new && new=:$2:$4:$5:$6 &&
-       $posix_glob set +f &&
-
-       test "$old" = "$new" &&
-       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
-    then
-      rm -f "$dsttmp"
-    else
-      # Rename the file to the real destination.
-      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
-
-      # The rename failed, perhaps because mv can't rename something else
-      # to itself, or perhaps because mv is so ancient that it does not
-      # support -f.
-      {
-	# Now remove or move aside any old file at destination location.
-	# We try this two ways since rm can't unlink itself on some
-	# systems and the destination file might be busy for other
-	# reasons.  In this case, the final cleanup might fail but the new
-	# file should still install successfully.
-	{
-	  test ! -f "$dst" ||
-	  $doit $rmcmd -f "$dst" 2>/dev/null ||
-	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-	  } ||
-	  { echo "$0: cannot unlink or rename $dst" >&2
-	    (exit 1); exit 1
-	  }
-	} &&
-
-	# Now rename the file to the real destination.
-	$doit $mvcmd "$dsttmp" "$dst"
-      }
-    fi || exit 1
-
-    trap '' 0
-  fi
-done
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:

pcsxr-1.9.92.tar.bz2/libpcsxcore/Makefile.in Deleted

@@ -1,1174 +0,0 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-@ARCH_X86_64_TRUE@am__append_1 = \
-@ARCH_X86_64_TRUE@	$(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c	\
-@ARCH_X86_64_TRUE@	$(top_builddir)/libpcsxcore/ix86_64/ix86-64.c	\
-@ARCH_X86_64_TRUE@	$(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c	\
-@ARCH_X86_64_TRUE@	$(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c	\
-@ARCH_X86_64_TRUE@	$(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c	\
-@ARCH_X86_64_TRUE@	$(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c	\
-@ARCH_X86_64_TRUE@	$(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c	\
-@ARCH_X86_64_TRUE@	$(top_builddir)/libpcsxcore/
-
-@ARCH_X86_64_FALSE@@ARCH_X86_TRUE@am__append_2 = \
-@ARCH_X86_64_FALSE@@ARCH_X86_TRUE@	$(top_builddir)/libpcsxcore/ix86/iR3000A.c	\
-@ARCH_X86_64_FALSE@@ARCH_X86_TRUE@	$(top_builddir)/libpcsxcore/ix86/ix86.c	\
-@ARCH_X86_64_FALSE@@ARCH_X86_TRUE@	$(top_builddir)/libpcsxcore/
-
-@ARCH_PPC_TRUE@am__append_3 = \
-@ARCH_PPC_TRUE@	$(top_builddir)/libpcsxcore/ppc/pR3000A.c	\
-@ARCH_PPC_TRUE@	$(top_builddir)/libpcsxcore/ppc/ppc.c	\
-@ARCH_PPC_TRUE@	$(top_builddir)/libpcsxcore/ppc/reguse.c	\
-@ARCH_PPC_TRUE@	$(top_builddir)/libpcsxcore/ppc/pasm.s	\
-@ARCH_PPC_TRUE@	$(top_builddir)/libpcsxcore/
-
-subdir = libpcsxcore
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-ARFLAGS = cru
-libpcsxcore_a_AR = $(AR) $(ARFLAGS)
-libpcsxcore_a_LIBADD =
-am__libpcsxcore_a_SOURCES_DIST = \
-	$(top_builddir)/libpcsxcore/psxbios.c \
-	$(top_builddir)/libpcsxcore/cdrom.c \
-	$(top_builddir)/libpcsxcore/psxcounters.c \
-	$(top_builddir)/libpcsxcore/psxdma.c \
-	$(top_builddir)/libpcsxcore/disr3000a.c \
-	$(top_builddir)/libpcsxcore/spu.c \
-	$(top_builddir)/libpcsxcore/sio.c \
-	$(top_builddir)/libpcsxcore/psxhw.c \
-	$(top_builddir)/libpcsxcore/mdec.c \
-	$(top_builddir)/libpcsxcore/psxmem.c \
-	$(top_builddir)/libpcsxcore/misc.c \
-	$(top_builddir)/libpcsxcore/plugins.c \
-	$(top_builddir)/libpcsxcore/decode_xa.c \
-	$(top_builddir)/libpcsxcore/r3000a.c \
-	$(top_builddir)/libpcsxcore/psxinterpreter.c \
-	$(top_builddir)/libpcsxcore/gte.c \
-	$(top_builddir)/libpcsxcore/psxhle.c \
-	$(top_builddir)/libpcsxcore/cdrom.h \
-	$(top_builddir)/libpcsxcore/coff.h \
-	$(top_builddir)/libpcsxcore/debug.c \
-	$(top_builddir)/libpcsxcore/debug.h \
-	$(top_builddir)/libpcsxcore/decode_xa.h \
-	$(top_builddir)/libpcsxcore/gte.h \
-	$(top_builddir)/libpcsxcore/gte_divider.h \
-	$(top_builddir)/libpcsxcore/mdec.h \
-	$(top_builddir)/libpcsxcore/misc.h \
-	$(top_builddir)/libpcsxcore/plugins.h \
-	$(top_builddir)/libpcsxcore/psemu_plugin_defs.h \
-	$(top_builddir)/libpcsxcore/psxbios.h \
-	$(top_builddir)/libpcsxcore/psxcommon.c \
-	$(top_builddir)/libpcsxcore/psxcommon.h \
-	$(top_builddir)/libpcsxcore/psxcounters.h \
-	$(top_builddir)/libpcsxcore/psxdma.h \
-	$(top_builddir)/libpcsxcore/psxhle.h \
-	$(top_builddir)/libpcsxcore/psxhw.h \
-	$(top_builddir)/libpcsxcore/psxmem.h \
-	$(top_builddir)/libpcsxcore/r3000a.h \
-	$(top_builddir)/libpcsxcore/sio.h \
-	$(top_builddir)/libpcsxcore/sjisfont.h \
-	$(top_builddir)/libpcsxcore/spu.h \
-	$(top_builddir)/libpcsxcore/system.h \
-	$(top_builddir)/libpcsxcore/cdriso.c \
-	$(top_builddir)/libpcsxcore/cdriso.h \
-	$(top_builddir)/libpcsxcore/cheat.c \
-	$(top_builddir)/libpcsxcore/cheat.h \
-	$(top_builddir)/libpcsxcore/socket.c \
-	$(top_builddir)/libpcsxcore/socket.h \
-	$(top_builddir)/libpcsxcore/ppf.c \
-	$(top_builddir)/libpcsxcore/ppf.h \
-	$(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c \
-	$(top_builddir)/libpcsxcore/ix86_64/ix86-64.c \
-	$(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c \
-	$(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c \
-	$(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c \
-	$(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c \
-	$(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c \
-	$(top_builddir)/libpcsxcore/ \
-	$(top_builddir)/libpcsxcore/ix86/iR3000A.c \
-	$(top_builddir)/libpcsxcore/ix86/ix86.c \
-	$(top_builddir)/libpcsxcore/ppc/pR3000A.c \
-	$(top_builddir)/libpcsxcore/ppc/ppc.c \
-	$(top_builddir)/libpcsxcore/ppc/reguse.c \
-	$(top_builddir)/libpcsxcore/ppc/pasm.s
-@ARCH_X86_64_TRUE@am__objects_1 = iR3000A-64.$(OBJEXT) \
-@ARCH_X86_64_TRUE@	ix86-64.$(OBJEXT) ix86_cpudetect.$(OBJEXT) \
-@ARCH_X86_64_TRUE@	ix86_fpu.$(OBJEXT) ix86_3dnow.$(OBJEXT) \
-@ARCH_X86_64_TRUE@	ix86_mmx.$(OBJEXT) ix86_sse.$(OBJEXT)
-@ARCH_X86_64_FALSE@@ARCH_X86_TRUE@am__objects_2 = iR3000A.$(OBJEXT) \
-@ARCH_X86_64_FALSE@@ARCH_X86_TRUE@	ix86.$(OBJEXT)
-@ARCH_PPC_TRUE@am__objects_3 = pR3000A.$(OBJEXT) ppc.$(OBJEXT) \
-@ARCH_PPC_TRUE@	reguse.$(OBJEXT) libpcsxcore_a-pasm.$(OBJEXT)
-am_libpcsxcore_a_OBJECTS = psxbios.$(OBJEXT) cdrom.$(OBJEXT) \
-	psxcounters.$(OBJEXT) psxdma.$(OBJEXT) disr3000a.$(OBJEXT) \
-	spu.$(OBJEXT) sio.$(OBJEXT) psxhw.$(OBJEXT) mdec.$(OBJEXT) \
-	psxmem.$(OBJEXT) misc.$(OBJEXT) plugins.$(OBJEXT) \
-	decode_xa.$(OBJEXT) r3000a.$(OBJEXT) psxinterpreter.$(OBJEXT) \
-	gte.$(OBJEXT) psxhle.$(OBJEXT) debug.$(OBJEXT) \
-	psxcommon.$(OBJEXT) cdriso.$(OBJEXT) cheat.$(OBJEXT) \
-	socket.$(OBJEXT) ppf.$(OBJEXT) $(am__objects_1) \
-	$(am__objects_2) $(am__objects_3)
-libpcsxcore_a_OBJECTS = $(am_libpcsxcore_a_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
-LTCCASCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
-SOURCES = $(libpcsxcore_a_SOURCES)
-DIST_SOURCES = $(am__libpcsxcore_a_SOURCES_DIST)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCAS = @CCAS@
-CCASDEPMODE = @CCASDEPMODE@
-CCASFLAGS = @CCASFLAGS@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GLADE2_CFLAGS = @GLADE2_CFLAGS@
-GLADE2_LIBS = @GLADE2_LIBS@
-GLIB2_CFLAGS = @GLIB2_CFLAGS@
-GLIB2_LIBS = @GLIB2_LIBS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK2_CFLAGS = @GTK2_CFLAGS@
-GTK2_LIBS = @GTK2_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
-LIBCDIO_LIBS = @LIBCDIO_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NASM = @NASM@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PEOPSXGL = @PEOPSXGL@
-PKG_CONFIG = @PKG_CONFIG@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_CONFIG = @SDL_CONFIG@
-SDL_LIBS = @SDL_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-INCLUDES = -DLOCALE_DIR=\"${datadir}/locale/\" \
-	-I$(top_srcdir)/include
-
-noinst_LIBRARIES = libpcsxcore.a
-libpcsxcore_a_SOURCES = $(top_builddir)/libpcsxcore/psxbios.c \
-	$(top_builddir)/libpcsxcore/cdrom.c \
-	$(top_builddir)/libpcsxcore/psxcounters.c \
-	$(top_builddir)/libpcsxcore/psxdma.c \
-	$(top_builddir)/libpcsxcore/disr3000a.c \
-	$(top_builddir)/libpcsxcore/spu.c \
-	$(top_builddir)/libpcsxcore/sio.c \
-	$(top_builddir)/libpcsxcore/psxhw.c \
-	$(top_builddir)/libpcsxcore/mdec.c \
-	$(top_builddir)/libpcsxcore/psxmem.c \
-	$(top_builddir)/libpcsxcore/misc.c \
-	$(top_builddir)/libpcsxcore/plugins.c \
-	$(top_builddir)/libpcsxcore/decode_xa.c \
-	$(top_builddir)/libpcsxcore/r3000a.c \
-	$(top_builddir)/libpcsxcore/psxinterpreter.c \
-	$(top_builddir)/libpcsxcore/gte.c \
-	$(top_builddir)/libpcsxcore/psxhle.c \
-	$(top_builddir)/libpcsxcore/cdrom.h \
-	$(top_builddir)/libpcsxcore/coff.h \
-	$(top_builddir)/libpcsxcore/debug.c \
-	$(top_builddir)/libpcsxcore/debug.h \
-	$(top_builddir)/libpcsxcore/decode_xa.h \
-	$(top_builddir)/libpcsxcore/gte.h \
-	$(top_builddir)/libpcsxcore/gte_divider.h \
-	$(top_builddir)/libpcsxcore/mdec.h \
-	$(top_builddir)/libpcsxcore/misc.h \
-	$(top_builddir)/libpcsxcore/plugins.h \
-	$(top_builddir)/libpcsxcore/psemu_plugin_defs.h \
-	$(top_builddir)/libpcsxcore/psxbios.h \
-	$(top_builddir)/libpcsxcore/psxcommon.c \
-	$(top_builddir)/libpcsxcore/psxcommon.h \
-	$(top_builddir)/libpcsxcore/psxcounters.h \
-	$(top_builddir)/libpcsxcore/psxdma.h \
-	$(top_builddir)/libpcsxcore/psxhle.h \
-	$(top_builddir)/libpcsxcore/psxhw.h \
-	$(top_builddir)/libpcsxcore/psxmem.h \
-	$(top_builddir)/libpcsxcore/r3000a.h \
-	$(top_builddir)/libpcsxcore/sio.h \
-	$(top_builddir)/libpcsxcore/sjisfont.h \
-	$(top_builddir)/libpcsxcore/spu.h \
-	$(top_builddir)/libpcsxcore/system.h \
-	$(top_builddir)/libpcsxcore/cdriso.c \
-	$(top_builddir)/libpcsxcore/cdriso.h \
-	$(top_builddir)/libpcsxcore/cheat.c \
-	$(top_builddir)/libpcsxcore/cheat.h \
-	$(top_builddir)/libpcsxcore/socket.c \
-	$(top_builddir)/libpcsxcore/socket.h \
-	$(top_builddir)/libpcsxcore/ppf.c \
-	$(top_builddir)/libpcsxcore/ppf.h $(am__append_1) \
-	$(am__append_2) $(am__append_3)
-@ARCH_PPC_TRUE@libpcsxcore_a_CCASFLAGS = -x assembler-with-cpp -mregnames
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
-	@for dep in $?; do \
-	 case '$(am__configure_deps)' in \
-	 *$$dep*) \
-	 ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	 && { if test -f $@; then exit 0; else break; fi; }; \
-	 exit 1;; \
-	 esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libpcsxcore/Makefile'; \
-	cd $(top_srcdir) && \
-	 $(AUTOMAKE) --gnu libpcsxcore/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	 *config.status*) \
-	 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	 *) \
-	 echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libpcsxcore.a: $(libpcsxcore_a_OBJECTS) $(libpcsxcore_a_DEPENDENCIES) 
-	-rm -f libpcsxcore.a
-	$(libpcsxcore_a_AR) libpcsxcore.a $(libpcsxcore_a_OBJECTS) $(libpcsxcore_a_LIBADD)
-	$(RANLIB) libpcsxcore.a
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdriso.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdrom.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cheat.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/debug.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/decode_xa.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/disr3000a.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gte.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iR3000A-64.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iR3000A.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ix86-64.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ix86.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ix86_3dnow.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ix86_cpudetect.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ix86_fpu.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ix86_mmx.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ix86_sse.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mdec.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pR3000A.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugins.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppf.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psxbios.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psxcommon.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psxcounters.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psxdma.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psxhle.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psxhw.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psxinterpreter.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psxmem.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/r3000a.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reguse.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sio.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/socket.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spu.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-psxbios.o: $(top_builddir)/libpcsxcore/psxbios.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxbios.o -MD -MP -MF $(DEPDIR)/psxbios.Tpo -c -o psxbios.o `test -f '$(top_builddir)/libpcsxcore/psxbios.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxbios.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/psxbios.Tpo $(DEPDIR)/psxbios.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/psxbios.c' object='psxbios.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxbios.o `test -f '$(top_builddir)/libpcsxcore/psxbios.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxbios.c
-
-psxbios.obj: $(top_builddir)/libpcsxcore/psxbios.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxbios.obj -MD -MP -MF $(DEPDIR)/psxbios.Tpo -c -o psxbios.obj `if test -f '$(top_builddir)/libpcsxcore/psxbios.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/psxbios.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/psxbios.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/psxbios.Tpo $(DEPDIR)/psxbios.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/psxbios.c' object='psxbios.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxbios.obj `if test -f '$(top_builddir)/libpcsxcore/psxbios.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/psxbios.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/psxbios.c'; fi`
-
-cdrom.o: $(top_builddir)/libpcsxcore/cdrom.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cdrom.o -MD -MP -MF $(DEPDIR)/cdrom.Tpo -c -o cdrom.o `test -f '$(top_builddir)/libpcsxcore/cdrom.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/cdrom.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/cdrom.Tpo $(DEPDIR)/cdrom.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/cdrom.c' object='cdrom.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cdrom.o `test -f '$(top_builddir)/libpcsxcore/cdrom.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/cdrom.c
-
-cdrom.obj: $(top_builddir)/libpcsxcore/cdrom.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cdrom.obj -MD -MP -MF $(DEPDIR)/cdrom.Tpo -c -o cdrom.obj `if test -f '$(top_builddir)/libpcsxcore/cdrom.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/cdrom.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/cdrom.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/cdrom.Tpo $(DEPDIR)/cdrom.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/cdrom.c' object='cdrom.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cdrom.obj `if test -f '$(top_builddir)/libpcsxcore/cdrom.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/cdrom.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/cdrom.c'; fi`
-
-psxcounters.o: $(top_builddir)/libpcsxcore/psxcounters.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxcounters.o -MD -MP -MF $(DEPDIR)/psxcounters.Tpo -c -o psxcounters.o `test -f '$(top_builddir)/libpcsxcore/psxcounters.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxcounters.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/psxcounters.Tpo $(DEPDIR)/psxcounters.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/psxcounters.c' object='psxcounters.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxcounters.o `test -f '$(top_builddir)/libpcsxcore/psxcounters.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxcounters.c
-
-psxcounters.obj: $(top_builddir)/libpcsxcore/psxcounters.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxcounters.obj -MD -MP -MF $(DEPDIR)/psxcounters.Tpo -c -o psxcounters.obj `if test -f '$(top_builddir)/libpcsxcore/psxcounters.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/psxcounters.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/psxcounters.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/psxcounters.Tpo $(DEPDIR)/psxcounters.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/psxcounters.c' object='psxcounters.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxcounters.obj `if test -f '$(top_builddir)/libpcsxcore/psxcounters.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/psxcounters.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/psxcounters.c'; fi`
-
-psxdma.o: $(top_builddir)/libpcsxcore/psxdma.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxdma.o -MD -MP -MF $(DEPDIR)/psxdma.Tpo -c -o psxdma.o `test -f '$(top_builddir)/libpcsxcore/psxdma.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxdma.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/psxdma.Tpo $(DEPDIR)/psxdma.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/psxdma.c' object='psxdma.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxdma.o `test -f '$(top_builddir)/libpcsxcore/psxdma.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxdma.c
-
-psxdma.obj: $(top_builddir)/libpcsxcore/psxdma.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxdma.obj -MD -MP -MF $(DEPDIR)/psxdma.Tpo -c -o psxdma.obj `if test -f '$(top_builddir)/libpcsxcore/psxdma.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/psxdma.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/psxdma.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/psxdma.Tpo $(DEPDIR)/psxdma.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/psxdma.c' object='psxdma.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxdma.obj `if test -f '$(top_builddir)/libpcsxcore/psxdma.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/psxdma.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/psxdma.c'; fi`
-
-disr3000a.o: $(top_builddir)/libpcsxcore/disr3000a.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT disr3000a.o -MD -MP -MF $(DEPDIR)/disr3000a.Tpo -c -o disr3000a.o `test -f '$(top_builddir)/libpcsxcore/disr3000a.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/disr3000a.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/disr3000a.Tpo $(DEPDIR)/disr3000a.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/disr3000a.c' object='disr3000a.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o disr3000a.o `test -f '$(top_builddir)/libpcsxcore/disr3000a.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/disr3000a.c
-
-disr3000a.obj: $(top_builddir)/libpcsxcore/disr3000a.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT disr3000a.obj -MD -MP -MF $(DEPDIR)/disr3000a.Tpo -c -o disr3000a.obj `if test -f '$(top_builddir)/libpcsxcore/disr3000a.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/disr3000a.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/disr3000a.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/disr3000a.Tpo $(DEPDIR)/disr3000a.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/disr3000a.c' object='disr3000a.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o disr3000a.obj `if test -f '$(top_builddir)/libpcsxcore/disr3000a.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/disr3000a.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/disr3000a.c'; fi`
-
-spu.o: $(top_builddir)/libpcsxcore/spu.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT spu.o -MD -MP -MF $(DEPDIR)/spu.Tpo -c -o spu.o `test -f '$(top_builddir)/libpcsxcore/spu.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/spu.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/spu.Tpo $(DEPDIR)/spu.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/spu.c' object='spu.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o spu.o `test -f '$(top_builddir)/libpcsxcore/spu.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/spu.c
-
-spu.obj: $(top_builddir)/libpcsxcore/spu.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT spu.obj -MD -MP -MF $(DEPDIR)/spu.Tpo -c -o spu.obj `if test -f '$(top_builddir)/libpcsxcore/spu.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/spu.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/spu.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/spu.Tpo $(DEPDIR)/spu.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/spu.c' object='spu.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o spu.obj `if test -f '$(top_builddir)/libpcsxcore/spu.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/spu.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/spu.c'; fi`
-
-sio.o: $(top_builddir)/libpcsxcore/sio.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sio.o -MD -MP -MF $(DEPDIR)/sio.Tpo -c -o sio.o `test -f '$(top_builddir)/libpcsxcore/sio.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/sio.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/sio.Tpo $(DEPDIR)/sio.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/sio.c' object='sio.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sio.o `test -f '$(top_builddir)/libpcsxcore/sio.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/sio.c
-
-sio.obj: $(top_builddir)/libpcsxcore/sio.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sio.obj -MD -MP -MF $(DEPDIR)/sio.Tpo -c -o sio.obj `if test -f '$(top_builddir)/libpcsxcore/sio.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/sio.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/sio.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/sio.Tpo $(DEPDIR)/sio.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/sio.c' object='sio.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sio.obj `if test -f '$(top_builddir)/libpcsxcore/sio.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/sio.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/sio.c'; fi`
-
-psxhw.o: $(top_builddir)/libpcsxcore/psxhw.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxhw.o -MD -MP -MF $(DEPDIR)/psxhw.Tpo -c -o psxhw.o `test -f '$(top_builddir)/libpcsxcore/psxhw.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxhw.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/psxhw.Tpo $(DEPDIR)/psxhw.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/psxhw.c' object='psxhw.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxhw.o `test -f '$(top_builddir)/libpcsxcore/psxhw.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxhw.c
-
-psxhw.obj: $(top_builddir)/libpcsxcore/psxhw.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxhw.obj -MD -MP -MF $(DEPDIR)/psxhw.Tpo -c -o psxhw.obj `if test -f '$(top_builddir)/libpcsxcore/psxhw.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/psxhw.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/psxhw.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/psxhw.Tpo $(DEPDIR)/psxhw.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/psxhw.c' object='psxhw.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxhw.obj `if test -f '$(top_builddir)/libpcsxcore/psxhw.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/psxhw.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/psxhw.c'; fi`
-
-mdec.o: $(top_builddir)/libpcsxcore/mdec.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mdec.o -MD -MP -MF $(DEPDIR)/mdec.Tpo -c -o mdec.o `test -f '$(top_builddir)/libpcsxcore/mdec.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/mdec.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mdec.Tpo $(DEPDIR)/mdec.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/mdec.c' object='mdec.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mdec.o `test -f '$(top_builddir)/libpcsxcore/mdec.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/mdec.c
-
-mdec.obj: $(top_builddir)/libpcsxcore/mdec.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mdec.obj -MD -MP -MF $(DEPDIR)/mdec.Tpo -c -o mdec.obj `if test -f '$(top_builddir)/libpcsxcore/mdec.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/mdec.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/mdec.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/mdec.Tpo $(DEPDIR)/mdec.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/mdec.c' object='mdec.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mdec.obj `if test -f '$(top_builddir)/libpcsxcore/mdec.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/mdec.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/mdec.c'; fi`
-
-psxmem.o: $(top_builddir)/libpcsxcore/psxmem.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxmem.o -MD -MP -MF $(DEPDIR)/psxmem.Tpo -c -o psxmem.o `test -f '$(top_builddir)/libpcsxcore/psxmem.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxmem.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/psxmem.Tpo $(DEPDIR)/psxmem.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/psxmem.c' object='psxmem.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxmem.o `test -f '$(top_builddir)/libpcsxcore/psxmem.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxmem.c
-
-psxmem.obj: $(top_builddir)/libpcsxcore/psxmem.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxmem.obj -MD -MP -MF $(DEPDIR)/psxmem.Tpo -c -o psxmem.obj `if test -f '$(top_builddir)/libpcsxcore/psxmem.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/psxmem.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/psxmem.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/psxmem.Tpo $(DEPDIR)/psxmem.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/psxmem.c' object='psxmem.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxmem.obj `if test -f '$(top_builddir)/libpcsxcore/psxmem.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/psxmem.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/psxmem.c'; fi`
-
-misc.o: $(top_builddir)/libpcsxcore/misc.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT misc.o -MD -MP -MF $(DEPDIR)/misc.Tpo -c -o misc.o `test -f '$(top_builddir)/libpcsxcore/misc.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/misc.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/misc.c' object='misc.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o misc.o `test -f '$(top_builddir)/libpcsxcore/misc.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/misc.c
-
-misc.obj: $(top_builddir)/libpcsxcore/misc.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT misc.obj -MD -MP -MF $(DEPDIR)/misc.Tpo -c -o misc.obj `if test -f '$(top_builddir)/libpcsxcore/misc.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/misc.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/misc.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/misc.Tpo $(DEPDIR)/misc.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/misc.c' object='misc.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o misc.obj `if test -f '$(top_builddir)/libpcsxcore/misc.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/misc.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/misc.c'; fi`
-
-plugins.o: $(top_builddir)/libpcsxcore/plugins.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT plugins.o -MD -MP -MF $(DEPDIR)/plugins.Tpo -c -o plugins.o `test -f '$(top_builddir)/libpcsxcore/plugins.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/plugins.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/plugins.Tpo $(DEPDIR)/plugins.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/plugins.c' object='plugins.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o plugins.o `test -f '$(top_builddir)/libpcsxcore/plugins.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/plugins.c
-
-plugins.obj: $(top_builddir)/libpcsxcore/plugins.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT plugins.obj -MD -MP -MF $(DEPDIR)/plugins.Tpo -c -o plugins.obj `if test -f '$(top_builddir)/libpcsxcore/plugins.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/plugins.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/plugins.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/plugins.Tpo $(DEPDIR)/plugins.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/plugins.c' object='plugins.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o plugins.obj `if test -f '$(top_builddir)/libpcsxcore/plugins.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/plugins.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/plugins.c'; fi`
-
-decode_xa.o: $(top_builddir)/libpcsxcore/decode_xa.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT decode_xa.o -MD -MP -MF $(DEPDIR)/decode_xa.Tpo -c -o decode_xa.o `test -f '$(top_builddir)/libpcsxcore/decode_xa.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/decode_xa.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/decode_xa.Tpo $(DEPDIR)/decode_xa.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/decode_xa.c' object='decode_xa.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o decode_xa.o `test -f '$(top_builddir)/libpcsxcore/decode_xa.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/decode_xa.c
-
-decode_xa.obj: $(top_builddir)/libpcsxcore/decode_xa.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT decode_xa.obj -MD -MP -MF $(DEPDIR)/decode_xa.Tpo -c -o decode_xa.obj `if test -f '$(top_builddir)/libpcsxcore/decode_xa.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/decode_xa.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/decode_xa.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/decode_xa.Tpo $(DEPDIR)/decode_xa.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/decode_xa.c' object='decode_xa.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o decode_xa.obj `if test -f '$(top_builddir)/libpcsxcore/decode_xa.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/decode_xa.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/decode_xa.c'; fi`
-
-r3000a.o: $(top_builddir)/libpcsxcore/r3000a.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT r3000a.o -MD -MP -MF $(DEPDIR)/r3000a.Tpo -c -o r3000a.o `test -f '$(top_builddir)/libpcsxcore/r3000a.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/r3000a.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/r3000a.Tpo $(DEPDIR)/r3000a.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/r3000a.c' object='r3000a.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o r3000a.o `test -f '$(top_builddir)/libpcsxcore/r3000a.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/r3000a.c
-
-r3000a.obj: $(top_builddir)/libpcsxcore/r3000a.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT r3000a.obj -MD -MP -MF $(DEPDIR)/r3000a.Tpo -c -o r3000a.obj `if test -f '$(top_builddir)/libpcsxcore/r3000a.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/r3000a.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/r3000a.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/r3000a.Tpo $(DEPDIR)/r3000a.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/r3000a.c' object='r3000a.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o r3000a.obj `if test -f '$(top_builddir)/libpcsxcore/r3000a.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/r3000a.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/r3000a.c'; fi`
-
-psxinterpreter.o: $(top_builddir)/libpcsxcore/psxinterpreter.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxinterpreter.o -MD -MP -MF $(DEPDIR)/psxinterpreter.Tpo -c -o psxinterpreter.o `test -f '$(top_builddir)/libpcsxcore/psxinterpreter.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxinterpreter.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/psxinterpreter.Tpo $(DEPDIR)/psxinterpreter.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/psxinterpreter.c' object='psxinterpreter.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxinterpreter.o `test -f '$(top_builddir)/libpcsxcore/psxinterpreter.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxinterpreter.c
-
-psxinterpreter.obj: $(top_builddir)/libpcsxcore/psxinterpreter.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxinterpreter.obj -MD -MP -MF $(DEPDIR)/psxinterpreter.Tpo -c -o psxinterpreter.obj `if test -f '$(top_builddir)/libpcsxcore/psxinterpreter.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/psxinterpreter.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/psxinterpreter.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/psxinterpreter.Tpo $(DEPDIR)/psxinterpreter.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/psxinterpreter.c' object='psxinterpreter.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxinterpreter.obj `if test -f '$(top_builddir)/libpcsxcore/psxinterpreter.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/psxinterpreter.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/psxinterpreter.c'; fi`
-
-gte.o: $(top_builddir)/libpcsxcore/gte.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gte.o -MD -MP -MF $(DEPDIR)/gte.Tpo -c -o gte.o `test -f '$(top_builddir)/libpcsxcore/gte.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/gte.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gte.Tpo $(DEPDIR)/gte.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/gte.c' object='gte.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gte.o `test -f '$(top_builddir)/libpcsxcore/gte.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/gte.c
-
-gte.obj: $(top_builddir)/libpcsxcore/gte.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gte.obj -MD -MP -MF $(DEPDIR)/gte.Tpo -c -o gte.obj `if test -f '$(top_builddir)/libpcsxcore/gte.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/gte.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/gte.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/gte.Tpo $(DEPDIR)/gte.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/gte.c' object='gte.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gte.obj `if test -f '$(top_builddir)/libpcsxcore/gte.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/gte.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/gte.c'; fi`
-
-psxhle.o: $(top_builddir)/libpcsxcore/psxhle.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxhle.o -MD -MP -MF $(DEPDIR)/psxhle.Tpo -c -o psxhle.o `test -f '$(top_builddir)/libpcsxcore/psxhle.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxhle.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/psxhle.Tpo $(DEPDIR)/psxhle.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/psxhle.c' object='psxhle.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxhle.o `test -f '$(top_builddir)/libpcsxcore/psxhle.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxhle.c
-
-psxhle.obj: $(top_builddir)/libpcsxcore/psxhle.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxhle.obj -MD -MP -MF $(DEPDIR)/psxhle.Tpo -c -o psxhle.obj `if test -f '$(top_builddir)/libpcsxcore/psxhle.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/psxhle.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/psxhle.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/psxhle.Tpo $(DEPDIR)/psxhle.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/psxhle.c' object='psxhle.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxhle.obj `if test -f '$(top_builddir)/libpcsxcore/psxhle.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/psxhle.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/psxhle.c'; fi`
-
-debug.o: $(top_builddir)/libpcsxcore/debug.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT debug.o -MD -MP -MF $(DEPDIR)/debug.Tpo -c -o debug.o `test -f '$(top_builddir)/libpcsxcore/debug.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/debug.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/debug.Tpo $(DEPDIR)/debug.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/debug.c' object='debug.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o debug.o `test -f '$(top_builddir)/libpcsxcore/debug.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/debug.c
-
-debug.obj: $(top_builddir)/libpcsxcore/debug.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT debug.obj -MD -MP -MF $(DEPDIR)/debug.Tpo -c -o debug.obj `if test -f '$(top_builddir)/libpcsxcore/debug.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/debug.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/debug.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/debug.Tpo $(DEPDIR)/debug.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/debug.c' object='debug.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o debug.obj `if test -f '$(top_builddir)/libpcsxcore/debug.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/debug.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/debug.c'; fi`
-
-psxcommon.o: $(top_builddir)/libpcsxcore/psxcommon.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxcommon.o -MD -MP -MF $(DEPDIR)/psxcommon.Tpo -c -o psxcommon.o `test -f '$(top_builddir)/libpcsxcore/psxcommon.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxcommon.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/psxcommon.Tpo $(DEPDIR)/psxcommon.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/psxcommon.c' object='psxcommon.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxcommon.o `test -f '$(top_builddir)/libpcsxcore/psxcommon.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/psxcommon.c
-
-psxcommon.obj: $(top_builddir)/libpcsxcore/psxcommon.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psxcommon.obj -MD -MP -MF $(DEPDIR)/psxcommon.Tpo -c -o psxcommon.obj `if test -f '$(top_builddir)/libpcsxcore/psxcommon.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/psxcommon.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/psxcommon.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/psxcommon.Tpo $(DEPDIR)/psxcommon.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/psxcommon.c' object='psxcommon.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psxcommon.obj `if test -f '$(top_builddir)/libpcsxcore/psxcommon.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/psxcommon.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/psxcommon.c'; fi`
-
-cdriso.o: $(top_builddir)/libpcsxcore/cdriso.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cdriso.o -MD -MP -MF $(DEPDIR)/cdriso.Tpo -c -o cdriso.o `test -f '$(top_builddir)/libpcsxcore/cdriso.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/cdriso.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/cdriso.Tpo $(DEPDIR)/cdriso.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/cdriso.c' object='cdriso.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cdriso.o `test -f '$(top_builddir)/libpcsxcore/cdriso.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/cdriso.c
-
-cdriso.obj: $(top_builddir)/libpcsxcore/cdriso.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cdriso.obj -MD -MP -MF $(DEPDIR)/cdriso.Tpo -c -o cdriso.obj `if test -f '$(top_builddir)/libpcsxcore/cdriso.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/cdriso.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/cdriso.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/cdriso.Tpo $(DEPDIR)/cdriso.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/cdriso.c' object='cdriso.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cdriso.obj `if test -f '$(top_builddir)/libpcsxcore/cdriso.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/cdriso.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/cdriso.c'; fi`
-
-cheat.o: $(top_builddir)/libpcsxcore/cheat.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cheat.o -MD -MP -MF $(DEPDIR)/cheat.Tpo -c -o cheat.o `test -f '$(top_builddir)/libpcsxcore/cheat.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/cheat.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/cheat.Tpo $(DEPDIR)/cheat.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/cheat.c' object='cheat.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cheat.o `test -f '$(top_builddir)/libpcsxcore/cheat.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/cheat.c
-
-cheat.obj: $(top_builddir)/libpcsxcore/cheat.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cheat.obj -MD -MP -MF $(DEPDIR)/cheat.Tpo -c -o cheat.obj `if test -f '$(top_builddir)/libpcsxcore/cheat.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/cheat.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/cheat.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/cheat.Tpo $(DEPDIR)/cheat.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/cheat.c' object='cheat.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cheat.obj `if test -f '$(top_builddir)/libpcsxcore/cheat.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/cheat.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/cheat.c'; fi`
-
-socket.o: $(top_builddir)/libpcsxcore/socket.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT socket.o -MD -MP -MF $(DEPDIR)/socket.Tpo -c -o socket.o `test -f '$(top_builddir)/libpcsxcore/socket.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/socket.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/socket.Tpo $(DEPDIR)/socket.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/socket.c' object='socket.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o socket.o `test -f '$(top_builddir)/libpcsxcore/socket.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/socket.c
-
-socket.obj: $(top_builddir)/libpcsxcore/socket.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT socket.obj -MD -MP -MF $(DEPDIR)/socket.Tpo -c -o socket.obj `if test -f '$(top_builddir)/libpcsxcore/socket.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/socket.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/socket.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/socket.Tpo $(DEPDIR)/socket.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/socket.c' object='socket.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o socket.obj `if test -f '$(top_builddir)/libpcsxcore/socket.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/socket.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/socket.c'; fi`
-
-ppf.o: $(top_builddir)/libpcsxcore/ppf.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ppf.o -MD -MP -MF $(DEPDIR)/ppf.Tpo -c -o ppf.o `test -f '$(top_builddir)/libpcsxcore/ppf.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ppf.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/ppf.Tpo $(DEPDIR)/ppf.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ppf.c' object='ppf.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ppf.o `test -f '$(top_builddir)/libpcsxcore/ppf.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ppf.c
-
-ppf.obj: $(top_builddir)/libpcsxcore/ppf.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ppf.obj -MD -MP -MF $(DEPDIR)/ppf.Tpo -c -o ppf.obj `if test -f '$(top_builddir)/libpcsxcore/ppf.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ppf.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ppf.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/ppf.Tpo $(DEPDIR)/ppf.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ppf.c' object='ppf.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ppf.obj `if test -f '$(top_builddir)/libpcsxcore/ppf.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ppf.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ppf.c'; fi`
-
-iR3000A-64.o: $(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iR3000A-64.o -MD -MP -MF $(DEPDIR)/iR3000A-64.Tpo -c -o iR3000A-64.o `test -f '$(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/iR3000A-64.Tpo $(DEPDIR)/iR3000A-64.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c' object='iR3000A-64.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iR3000A-64.o `test -f '$(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c
-
-iR3000A-64.obj: $(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iR3000A-64.obj -MD -MP -MF $(DEPDIR)/iR3000A-64.Tpo -c -o iR3000A-64.obj `if test -f '$(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/iR3000A-64.Tpo $(DEPDIR)/iR3000A-64.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c' object='iR3000A-64.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iR3000A-64.obj `if test -f '$(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c'; fi`
-
-ix86-64.o: $(top_builddir)/libpcsxcore/ix86_64/ix86-64.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86-64.o -MD -MP -MF $(DEPDIR)/ix86-64.Tpo -c -o ix86-64.o `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86-64.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86-64.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/ix86-64.Tpo $(DEPDIR)/ix86-64.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ix86_64/ix86-64.c' object='ix86-64.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86-64.o `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86-64.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86-64.c
-
-ix86-64.obj: $(top_builddir)/libpcsxcore/ix86_64/ix86-64.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86-64.obj -MD -MP -MF $(DEPDIR)/ix86-64.Tpo -c -o ix86-64.obj `if test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86-64.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ix86_64/ix86-64.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ix86_64/ix86-64.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/ix86-64.Tpo $(DEPDIR)/ix86-64.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ix86_64/ix86-64.c' object='ix86-64.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86-64.obj `if test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86-64.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ix86_64/ix86-64.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ix86_64/ix86-64.c'; fi`
-
-ix86_cpudetect.o: $(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86_cpudetect.o -MD -MP -MF $(DEPDIR)/ix86_cpudetect.Tpo -c -o ix86_cpudetect.o `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/ix86_cpudetect.Tpo $(DEPDIR)/ix86_cpudetect.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c' object='ix86_cpudetect.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86_cpudetect.o `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c
-
-ix86_cpudetect.obj: $(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86_cpudetect.obj -MD -MP -MF $(DEPDIR)/ix86_cpudetect.Tpo -c -o ix86_cpudetect.obj `if test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/ix86_cpudetect.Tpo $(DEPDIR)/ix86_cpudetect.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c' object='ix86_cpudetect.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86_cpudetect.obj `if test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c'; fi`
-
-ix86_fpu.o: $(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86_fpu.o -MD -MP -MF $(DEPDIR)/ix86_fpu.Tpo -c -o ix86_fpu.o `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/ix86_fpu.Tpo $(DEPDIR)/ix86_fpu.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c' object='ix86_fpu.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86_fpu.o `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c
-
-ix86_fpu.obj: $(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86_fpu.obj -MD -MP -MF $(DEPDIR)/ix86_fpu.Tpo -c -o ix86_fpu.obj `if test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/ix86_fpu.Tpo $(DEPDIR)/ix86_fpu.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c' object='ix86_fpu.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86_fpu.obj `if test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ix86_64/ix86_fpu.c'; fi`
-
-ix86_3dnow.o: $(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86_3dnow.o -MD -MP -MF $(DEPDIR)/ix86_3dnow.Tpo -c -o ix86_3dnow.o `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/ix86_3dnow.Tpo $(DEPDIR)/ix86_3dnow.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c' object='ix86_3dnow.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86_3dnow.o `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c
-
-ix86_3dnow.obj: $(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86_3dnow.obj -MD -MP -MF $(DEPDIR)/ix86_3dnow.Tpo -c -o ix86_3dnow.obj `if test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/ix86_3dnow.Tpo $(DEPDIR)/ix86_3dnow.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c' object='ix86_3dnow.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86_3dnow.obj `if test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ix86_64/ix86_3dnow.c'; fi`
-
-ix86_mmx.o: $(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86_mmx.o -MD -MP -MF $(DEPDIR)/ix86_mmx.Tpo -c -o ix86_mmx.o `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/ix86_mmx.Tpo $(DEPDIR)/ix86_mmx.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c' object='ix86_mmx.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86_mmx.o `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c
-
-ix86_mmx.obj: $(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86_mmx.obj -MD -MP -MF $(DEPDIR)/ix86_mmx.Tpo -c -o ix86_mmx.obj `if test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/ix86_mmx.Tpo $(DEPDIR)/ix86_mmx.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c' object='ix86_mmx.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86_mmx.obj `if test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ix86_64/ix86_mmx.c'; fi`
-
-ix86_sse.o: $(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86_sse.o -MD -MP -MF $(DEPDIR)/ix86_sse.Tpo -c -o ix86_sse.o `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/ix86_sse.Tpo $(DEPDIR)/ix86_sse.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c' object='ix86_sse.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86_sse.o `test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c
-
-ix86_sse.obj: $(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86_sse.obj -MD -MP -MF $(DEPDIR)/ix86_sse.Tpo -c -o ix86_sse.obj `if test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/ix86_sse.Tpo $(DEPDIR)/ix86_sse.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c' object='ix86_sse.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86_sse.obj `if test -f '$(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ix86_64/ix86_sse.c'; fi`
-
-iR3000A.o: $(top_builddir)/libpcsxcore/ix86/iR3000A.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iR3000A.o -MD -MP -MF $(DEPDIR)/iR3000A.Tpo -c -o iR3000A.o `test -f '$(top_builddir)/libpcsxcore/ix86/iR3000A.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86/iR3000A.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/iR3000A.Tpo $(DEPDIR)/iR3000A.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ix86/iR3000A.c' object='iR3000A.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iR3000A.o `test -f '$(top_builddir)/libpcsxcore/ix86/iR3000A.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86/iR3000A.c
-
-iR3000A.obj: $(top_builddir)/libpcsxcore/ix86/iR3000A.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iR3000A.obj -MD -MP -MF $(DEPDIR)/iR3000A.Tpo -c -o iR3000A.obj `if test -f '$(top_builddir)/libpcsxcore/ix86/iR3000A.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ix86/iR3000A.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ix86/iR3000A.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/iR3000A.Tpo $(DEPDIR)/iR3000A.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ix86/iR3000A.c' object='iR3000A.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iR3000A.obj `if test -f '$(top_builddir)/libpcsxcore/ix86/iR3000A.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ix86/iR3000A.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ix86/iR3000A.c'; fi`
-
-ix86.o: $(top_builddir)/libpcsxcore/ix86/ix86.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86.o -MD -MP -MF $(DEPDIR)/ix86.Tpo -c -o ix86.o `test -f '$(top_builddir)/libpcsxcore/ix86/ix86.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86/ix86.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/ix86.Tpo $(DEPDIR)/ix86.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ix86/ix86.c' object='ix86.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86.o `test -f '$(top_builddir)/libpcsxcore/ix86/ix86.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86/ix86.c
-
-ix86.obj: $(top_builddir)/libpcsxcore/ix86/ix86.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ix86.obj -MD -MP -MF $(DEPDIR)/ix86.Tpo -c -o ix86.obj `if test -f '$(top_builddir)/libpcsxcore/ix86/ix86.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ix86/ix86.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ix86/ix86.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/ix86.Tpo $(DEPDIR)/ix86.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ix86/ix86.c' object='ix86.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ix86.obj `if test -f '$(top_builddir)/libpcsxcore/ix86/ix86.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ix86/ix86.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ix86/ix86.c'; fi`
-
-pR3000A.o: $(top_builddir)/libpcsxcore/ppc/pR3000A.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pR3000A.o -MD -MP -MF $(DEPDIR)/pR3000A.Tpo -c -o pR3000A.o `test -f '$(top_builddir)/libpcsxcore/ppc/pR3000A.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ppc/pR3000A.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/pR3000A.Tpo $(DEPDIR)/pR3000A.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ppc/pR3000A.c' object='pR3000A.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pR3000A.o `test -f '$(top_builddir)/libpcsxcore/ppc/pR3000A.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ppc/pR3000A.c
-
-pR3000A.obj: $(top_builddir)/libpcsxcore/ppc/pR3000A.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pR3000A.obj -MD -MP -MF $(DEPDIR)/pR3000A.Tpo -c -o pR3000A.obj `if test -f '$(top_builddir)/libpcsxcore/ppc/pR3000A.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ppc/pR3000A.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ppc/pR3000A.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/pR3000A.Tpo $(DEPDIR)/pR3000A.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ppc/pR3000A.c' object='pR3000A.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pR3000A.obj `if test -f '$(top_builddir)/libpcsxcore/ppc/pR3000A.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ppc/pR3000A.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ppc/pR3000A.c'; fi`
-
-ppc.o: $(top_builddir)/libpcsxcore/ppc/ppc.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ppc.o -MD -MP -MF $(DEPDIR)/ppc.Tpo -c -o ppc.o `test -f '$(top_builddir)/libpcsxcore/ppc/ppc.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ppc/ppc.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/ppc.Tpo $(DEPDIR)/ppc.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ppc/ppc.c' object='ppc.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ppc.o `test -f '$(top_builddir)/libpcsxcore/ppc/ppc.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ppc/ppc.c
-
-ppc.obj: $(top_builddir)/libpcsxcore/ppc/ppc.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ppc.obj -MD -MP -MF $(DEPDIR)/ppc.Tpo -c -o ppc.obj `if test -f '$(top_builddir)/libpcsxcore/ppc/ppc.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ppc/ppc.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ppc/ppc.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/ppc.Tpo $(DEPDIR)/ppc.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ppc/ppc.c' object='ppc.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ppc.obj `if test -f '$(top_builddir)/libpcsxcore/ppc/ppc.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ppc/ppc.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ppc/ppc.c'; fi`
-
-reguse.o: $(top_builddir)/libpcsxcore/ppc/reguse.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT reguse.o -MD -MP -MF $(DEPDIR)/reguse.Tpo -c -o reguse.o `test -f '$(top_builddir)/libpcsxcore/ppc/reguse.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ppc/reguse.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/reguse.Tpo $(DEPDIR)/reguse.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ppc/reguse.c' object='reguse.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o reguse.o `test -f '$(top_builddir)/libpcsxcore/ppc/reguse.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ppc/reguse.c
-
-reguse.obj: $(top_builddir)/libpcsxcore/ppc/reguse.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT reguse.obj -MD -MP -MF $(DEPDIR)/reguse.Tpo -c -o reguse.obj `if test -f '$(top_builddir)/libpcsxcore/ppc/reguse.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ppc/reguse.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ppc/reguse.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/reguse.Tpo $(DEPDIR)/reguse.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_builddir)/libpcsxcore/ppc/reguse.c' object='reguse.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o reguse.obj `if test -f '$(top_builddir)/libpcsxcore/ppc/reguse.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ppc/reguse.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ppc/reguse.c'; fi`
-
-.s.o:
-	$(CCASCOMPILE) -c -o $@ $<
-
-.s.obj:
-	$(CCASCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.s.lo:
-	$(LTCCASCOMPILE) -c -o $@ $<
-
-libpcsxcore_a-pasm.o: $(top_builddir)/libpcsxcore/ppc/pasm.s
-	$(CCAS) $(libpcsxcore_a_CCASFLAGS) $(CCASFLAGS) -c -o libpcsxcore_a-pasm.o `test -f '$(top_builddir)/libpcsxcore/ppc/pasm.s' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ppc/pasm.s
-
-libpcsxcore_a-pasm.obj: $(top_builddir)/libpcsxcore/ppc/pasm.s
-	$(CCAS) $(libpcsxcore_a_CCASFLAGS) $(CCASFLAGS) -c -o libpcsxcore_a-pasm.obj `if test -f '$(top_builddir)/libpcsxcore/ppc/pasm.s'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ppc/pasm.s'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ppc/pasm.s'; fi`
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	 done | \
-	 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	 END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	 done | \
-	 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	 END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	 test -n "$$unique" || unique=$$empty_fix; \
-	 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	 $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	 done | \
-	 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	 END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	 $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	 && cd $(top_srcdir) \
-	 && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	 dist_files=`for file in $$list; do echo $$file; done | \
-	 sed -e "s|^$$srcdirstrip/||;t" \
-	 -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	 */*) $(MKDIR_P) `echo "$$dist_files" | \
-			 sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			 sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	 if test -d $$d/$$file; then \
-	 dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	 cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	 fi; \
-	 cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	 else \
-	 test -f $(distdir)/$$file \
-	 || cp -p $$d/$$file $(distdir)/$$file \
-	 || exit 1; \
-	 fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LIBRARIES)
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	 `test -z '$(STRIP)' || \
-	 echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-info: install-info-am
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

pcsxr-1.9.92.tar.bz2/ltmain.sh Deleted

@@ -1,8412 +0,0 @@
-# Generated from ltmain.m4sh.
-
-# ltmain.sh (GNU libtool) 2.2.6
-# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
-# This is free software; see the source for copying conditions. There is NO
-# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-# GNU Libtool is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING. If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html,
-# or obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-# Usage: $progname [OPTION]... [MODE-ARG]...
-#
-# Provide generalized library-building support services.
-#
-# --config show all configuration variables
-# --debug enable verbose shell tracing
-# -n, --dry-run display commands without modifying any files
-# --features display basic configuration information and exit
-# --mode=MODE use operation mode MODE
-# --preserve-dup-deps don't remove duplicate dependency libraries
-# --quiet, --silent don't print informational messages
-# --tag=TAG use configuration variables from tag TAG
-# -v, --verbose print informational messages (default)
-# --version print version information
-# -h, --help print short or long help message
-#
-# MODE must be one of the following:
-#
-# clean remove files from the build directory
-# compile compile a source file into a libtool object
-# execute automatically set library path, then run a program
-# finish complete the installation of libtool libraries
-# install install libraries or executables
-# link create a library or an executable
-# uninstall remove libraries from an installed directory
-#
-# MODE-ARGS vary depending on the MODE.
-# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
-#
-# When reporting a bug, please describe a test case to reproduce it and
-# include the following information:
-#
-# host-triplet:	$host
-# shell:		$SHELL
-# compiler:		$LTCC
-# compiler flags:		$LTCFLAGS
-# linker:		$LD (gnu? $with_gnu_ld)
-# $progname:		(GNU libtool) 2.2.6 Debian-2.2.6a-1
-# automake:		$automake_version
-# autoconf:		$autoconf_version
-#
-# Report bugs to <bug-libtool@gnu.org>.
-
-PROGRAM=ltmain.sh
-PACKAGE=libtool
-VERSION="2.2.6 Debian-2.2.6a-1"
-TIMESTAMP=""
-package_revision=1.3012
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-else
- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# NLS nuisances: We save the old values to restore during execute mode.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
-lt_user_locale=
-lt_safe_locale=
-for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-do
- eval "if test \"\${$lt_var+set}\" = set; then
- save_$lt_var=\$$lt_var
- $lt_var=C
-	 export $lt_var
-	 lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
-	 lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
-	fi"
-done
-
-$lt_unset CDPATH
-
-
-
-
-
-: ${CP="cp -f"}
-: ${ECHO="echo"}
-: ${EGREP="/bin/grep -E"}
-: ${FGREP="/bin/grep -F"}
-: ${GREP="/bin/grep"}
-: ${LN_S="ln -s"}
-: ${MAKE="make"}
-: ${MKDIR="mkdir"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-: ${SED="/bin/sed"}
-: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
-: ${Xsed="$SED -e 1s/^X//"}
-
-# Global variables:
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing.
-EXIT_SKIP=77	 # $? = 77 is used to indicate a skipped test to automake.
-
-exit_status=$EXIT_SUCCESS
-
-# Make sure IFS has a sensible default
-lt_nl='
-'
-IFS=" 	$lt_nl"
-
-dirname="s,/[^/]*$,,"
-basename="s,^.*/,,"
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-# dirname: Compute the dirname of FILE. If nonempty,
-# add APPEND to the result, otherwise set result
-# to NONDIR_REPLACEMENT.
-# value returned in "$func_dirname_result"
-# basename: Compute filename of FILE.
-# value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
- # Extract subdirectory from the argument.
- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
- if test "X$func_dirname_result" = "X${1}"; then
- func_dirname_result="${3}"
- else
- func_dirname_result="$func_dirname_result${2}"
- fi
- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-}
-
-# Generated shell functions inserted here.
-
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
-
-# The name of this program:
-# In the unlikely event $progname began with a '-', it would play havoc with
-# func_echo (imagine progname=-n), so we prepend ./ in that case:
-func_dirname_and_basename "$progpath"
-progname=$func_basename_result
-case $progname in
- -*) progname=./$progname ;;
-esac
-
-# Make sure we have an absolute path for reexecution:
-case $progpath in
- [\\/]*|[A-Za-z]:\\*) ;;
- *[\\/]*)
- progdir=$func_dirname_result
- progdir=`cd "$progdir" && pwd`
- progpath="$progdir/$progname"
- ;;
- *)
- save_IFS="$IFS"
- IFS=:
- for progdir in $PATH; do
- IFS="$save_IFS"
- test -x "$progdir/$progname" && break
- done
- IFS="$save_IFS"
- test -n "$progdir" || progdir=`pwd`
- progpath="$progdir/$progname"
- ;;
-esac
-
-# Sed substitution that helps us do robust quoting. It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed="${SED}"' -e 1s/^X//'
-sed_quote_subst='s/$[`"$\\]$/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/$["`\\]$/\\\1/g'
-
-# Re-`\' parameter expansions in output of double_quote_subst that were
-# `\'-ed in input to the same. If an odd number of `\' preceded a '$'
-# in input to double_quote_subst, that '$' was protected from expansion.
-# Since each input `\' is now two `\'s, look for any number of runs of
-# four `\'s followed by two `\'s and then a '$'. `\' that '$'.
-bs='\\'
-bs2='\\\\'
-bs4='\\\\\\\\'
-dollar='\$'
-sed_double_backslash="\
- s/$bs4/&\\
-/g
- s/^$bs2$dollar/$bs&/
- s/\$[^$bs]\$$bs2$dollar/\\1$bs2$bs$dollar/g
- s/\n//g"
-
-# Standard options:
-opt_dry_run=false
-opt_help=false
-opt_quiet=false
-opt_verbose=false
-opt_warning=:
-
-# func_echo arg...
-# Echo program name prefixed message, along with the current mode
-# name if it has been set yet.
-func_echo ()
-{
- $ECHO "$progname${mode+: }$mode: $*"
-}
-
-# func_verbose arg...
-# Echo program name prefixed message in verbose mode only.
-func_verbose ()
-{
- $opt_verbose && func_echo ${1+"$@"}
-
- # A bug in bash halts the script if the last line of a function
- # fails when set -e is in force, so we need another command to
- # work around that:
- :
-}
-
-# func_error arg...
-# Echo program name prefixed message to standard error.
-func_error ()
-{
- $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
-}
-
-# func_warning arg...
-# Echo program name prefixed warning message to standard error.
-func_warning ()
-{
- $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
-
- # bash bug again:
- :
-}
-
-# func_fatal_error arg...
-# Echo program name prefixed message to standard error, and exit.
-func_fatal_error ()
-{
- func_error ${1+"$@"}
- exit $EXIT_FAILURE
-}
-
-# func_fatal_help arg...
-# Echo program name prefixed message to standard error, followed by
-# a help hint, and exit.
-func_fatal_help ()
-{
- func_error ${1+"$@"}
- func_fatal_error "$help"
-}
-help="Try \`$progname --help' for more information." ## default
-
-
-# func_grep expression filename
-# Check whether EXPRESSION matches any line of FILENAME, without output.
-func_grep ()
-{
- $GREP "$1" "$2" >/dev/null 2>&1
-}
-
-
-# func_mkdir_p directory-path
-# Make sure the entire path to DIRECTORY-PATH is available.
-func_mkdir_p ()
-{
- my_directory_path="$1"
- my_dir_list=
-
- if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
-
- # Protect directory names starting with `-'
- case $my_directory_path in
- -*) my_directory_path="./$my_directory_path" ;;
- esac
-
- # While some portion of DIR does not yet exist...
- while test ! -d "$my_directory_path"; do
- # ...make a list in topmost first order. Use a colon delimited
-	# list incase some portion of path contains whitespace.
- my_dir_list="$my_directory_path:$my_dir_list"
-
- # If the last portion added has no slash in it, the list is done
- case $my_directory_path in */*) ;; *) break ;; esac
-
- # ...otherwise throw away the child directory and loop
- my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
- done
- my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
-
- save_mkdir_p_IFS="$IFS"; IFS=':'
- for my_dir in $my_dir_list; do
-	IFS="$save_mkdir_p_IFS"
- # mkdir can fail with a `File exist' error if two processes
- # try to create one of the directories concurrently. Don't
- # stop in that case!
- $MKDIR "$my_dir" 2>/dev/null || :
- done
- IFS="$save_mkdir_p_IFS"
-
- # Bail out if we (or some other process) failed to create a directory.
- test -d "$my_directory_path" || \
- func_fatal_error "Failed to create \`$1'"
- fi
-}
-
-
-# func_mktempdir [string]
-# Make a temporary directory that won't clash with other running
-# libtool processes, and avoids race conditions if possible. If
-# given, STRING is the basename for that directory.
-func_mktempdir ()
-{
- my_template="${TMPDIR-/tmp}/${1-$progname}"
-
- if test "$opt_dry_run" = ":"; then
- # Return a directory name, but don't create it in dry-run mode
- my_tmpdir="${my_template}-$$"
- else
-
- # If mktemp works, use that first and foremost
- my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
-
- if test ! -d "$my_tmpdir"; then
- # Failing that, at least try and use $RANDOM to avoid a race
- my_tmpdir="${my_template}-${RANDOM-0}$$"
-
- save_mktempdir_umask=`umask`
- umask 0077
- $MKDIR "$my_tmpdir"
- umask $save_mktempdir_umask
- fi
-
- # If we're not in dry-run mode, bomb out on failure
- test -d "$my_tmpdir" || \
- func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
- fi
-
- $ECHO "X$my_tmpdir" | $Xsed
-}
-
-
-# func_quote_for_eval arg
-# Aesthetically quote ARG to be evaled later.
-# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
-# is double-quoted, suitable for a subsequent eval, whereas
-# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
-# which are still active within double quotes backslashified.
-func_quote_for_eval ()
-{
- case $1 in
- *[\\\`\"\$]*)
-	func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
- *)
- func_quote_for_eval_unquoted_result="$1" ;;
- esac
-
- case $func_quote_for_eval_unquoted_result in
- # Double-quote args containing shell metacharacters to delay
- # word splitting, command substitution and and variable
- # expansion for a subsequent eval.
- # Many Bourne shells cannot handle close brackets correctly
- # in scan sets, so we specify it separately.
- *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
- func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
- ;;
- *)
- func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
- esac
-}
-
-
-# func_quote_for_expand arg
-# Aesthetically quote ARG to be evaled later; same as above,
-# but do not quote variable references.
-func_quote_for_expand ()
-{
- case $1 in
- *[\\\`\"]*)
-	my_arg=`$ECHO "X$1" | $Xsed \
-	 -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
- *)
- my_arg="$1" ;;
- esac
-
- case $my_arg in
- # Double-quote args containing shell metacharacters to delay
- # word splitting and command substitution for a subsequent eval.
- # Many Bourne shells cannot handle close brackets correctly
- # in scan sets, so we specify it separately.
- *[\[\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
- my_arg="\"$my_arg\""
- ;;
- esac
-
- func_quote_for_expand_result="$my_arg"
-}
-
-
-# func_show_eval cmd [fail_exp]
-# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is
-# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP
-# is given, then evaluate it.
-func_show_eval ()
-{
- my_cmd="$1"
- my_fail_exp="${2-:}"
-
- ${opt_silent-false} || {
- func_quote_for_expand "$my_cmd"
- eval "func_echo $func_quote_for_expand_result"
- }
-
- if ${opt_dry_run-false}; then :; else
- eval "$my_cmd"
- my_status=$?
- if test "$my_status" -eq 0; then :; else
-	eval "(exit $my_status); $my_fail_exp"
- fi
- fi
-}
-
-
-# func_show_eval_locale cmd [fail_exp]
-# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is
-# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP
-# is given, then evaluate it. Use the saved locale for evaluation.
-func_show_eval_locale ()
-{
- my_cmd="$1"
- my_fail_exp="${2-:}"
-
- ${opt_silent-false} || {
- func_quote_for_expand "$my_cmd"
- eval "func_echo $func_quote_for_expand_result"
- }
-
- if ${opt_dry_run-false}; then :; else
- eval "$lt_user_locale
-	 $my_cmd"
- my_status=$?
- eval "$lt_safe_locale"
- if test "$my_status" -eq 0; then :; else
-	eval "(exit $my_status); $my_fail_exp"
- fi
- fi
-}
-
-
-
-
-
-# func_version
-# Echo version message to standard output and exit.
-func_version ()
-{
- $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
- s/^# //
-	s/^# *$//
- s/$(C)$[ 0-9,-]*$ [1-9][0-9]*$/\1\2/
- p
- }' < "$progpath"
- exit $?
-}
-
-# func_usage
-# Echo short help message to standard output and exit.
-func_usage ()
-{
- $SED -n '/^# Usage:/,/# -h/ {
- s/^# //
-	s/^# *$//
-	s/\$progname/'$progname'/
-	p
- }' < "$progpath"
- $ECHO
- $ECHO "run \`$progname --help | more' for full usage"
- exit $?
-}
-
-# func_help
-# Echo long help message to standard output and exit.
-func_help ()
-{
- $SED -n '/^# Usage:/,/# Report bugs to/ {
- s/^# //
-	s/^# *$//
-	s*\$progname*'$progname'*
-	s*\$host*'"$host"'*
-	s*\$SHELL*'"$SHELL"'*
-	s*\$LTCC*'"$LTCC"'*
-	s*\$LTCFLAGS*'"$LTCFLAGS"'*
-	s*\$LD*'"$LD"'*
-	s/\$with_gnu_ld/'"$with_gnu_ld"'/
-	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
-	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
-	p
- }' < "$progpath"
- exit $?
-}
-
-# func_missing_arg argname
-# Echo program name prefixed message to standard error and set global
-# exit_cmd.
-func_missing_arg ()
-{
- func_error "missing argument for $1"
- exit_cmd=exit
-}
-
-exit_cmd=:
-
-
-
-
-
-# Check that we have a working $ECHO.
-if test "X$1" = X--no-reexec; then
- # Discard the --no-reexec flag, and continue.
- shift
-elif test "X$1" = X--fallback-echo; then
- # Avoid inline document here, it may be left over
- :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
- # Yippee, $ECHO works!
- :
-else
- # Restart under the correct shell, and then maybe $ECHO will work.
- exec $SHELL "$progpath" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
- # used as fallback echo
- shift
- cat <<EOF
-$*
-EOF
- exit $EXIT_SUCCESS
-fi
-
-magic="%%%MAGIC variable%%%"
-magic_exe="%%%MAGIC EXE variable%%%"
-
-# Global variables.
-# $mode is unset
-nonopt=
-execute_dlfiles=
-preserve_args=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-extracted_archives=
-extracted_serial=0
-
-opt_dry_run=false
-opt_duplicate_deps=false
-opt_silent=false
-opt_debug=:
-
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end. This prevents here-documents from being
-# left over by shells.
-exec_cmd=
-
-# func_fatal_configuration arg...
-# Echo program name prefixed message to standard error, followed by
-# a configuration failure hint, and exit.
-func_fatal_configuration ()
-{
- func_error ${1+"$@"}
- func_error "See the $PACKAGE documentation for more information."
- func_fatal_error "Fatal configuration error."
-}
-
-
-# func_config
-# Display the configuration for all the tags in this script.
-func_config ()
-{
- re_begincf='^# ### BEGIN LIBTOOL'
- re_endcf='^# ### END LIBTOOL'
-
- # Default configuration.
- $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
-
- # Now print the configurations for the tags.
- for tagname in $taglist; do
- $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
- done
-
- exit $?
-}
-
-# func_features
-# Display the features supported by this script.
-func_features ()
-{
- $ECHO "host: $host"
- if test "$build_libtool_libs" = yes; then
- $ECHO "enable shared libraries"
- else
- $ECHO "disable shared libraries"
- fi
- if test "$build_old_libs" = yes; then
- $ECHO "enable static libraries"
- else
- $ECHO "disable static libraries"
- fi
-
- exit $?
-}
-
-# func_enable_tag tagname
-# Verify that TAGNAME is valid, and either flag an error and exit, or
-# enable the TAGNAME tag. We also add TAGNAME to the global $taglist
-# variable here.
-func_enable_tag ()
-{
- # Global variable:
- tagname="$1"
-
- re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
- re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
- sed_extractcf="/$re_begincf/,/$re_endcf/p"
-
- # Validate tagname.
- case $tagname in
- *[!-_A-Za-z0-9,/]*)
- func_fatal_error "invalid tag name: $tagname"
- ;;
- esac
-
- # Don't test for the "default" C tag, as we know it's
- # there but not specially marked.
- case $tagname in
- CC) ;;
- *)
- if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
-	taglist="$taglist $tagname"
-
-	# Evaluate the configuration. Be careful to quote the path
-	# and the sed script, to avoid splitting on whitespace, but
-	# also don't use non-portable quotes within backquotes within
-	# quotes we have to do it in 2 steps:
-	extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
-	eval "$extractedcf"
- else
-	func_error "ignoring unknown tag $tagname"
- fi
- ;;
- esac
-}
-
-# Parse options once, thoroughly. This comes as soon as possible in
-# the script to make things like `libtool --version' happen quickly.
-{
-
- # Shorthand for --mode=foo, only valid as the first argument
- case $1 in
- clean|clea|cle|cl)
- shift; set dummy --mode clean ${1+"$@"}; shift
- ;;
- compile|compil|compi|comp|com|co|c)
- shift; set dummy --mode compile ${1+"$@"}; shift
- ;;
- execute|execut|execu|exec|exe|ex|e)
- shift; set dummy --mode execute ${1+"$@"}; shift
- ;;
- finish|finis|fini|fin|fi|f)
- shift; set dummy --mode finish ${1+"$@"}; shift
- ;;
- install|instal|insta|inst|ins|in|i)
- shift; set dummy --mode install ${1+"$@"}; shift
- ;;
- link|lin|li|l)
- shift; set dummy --mode link ${1+"$@"}; shift
- ;;
- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
- shift; set dummy --mode uninstall ${1+"$@"}; shift
- ;;
- esac
-
- # Parse non-mode specific arguments:
- while test "$#" -gt 0; do
- opt="$1"
- shift
-
- case $opt in
- --config)		func_config					;;
-
- --debug)		preserve_args="$preserve_args $opt"
-			func_echo "enabling shell trace mode"
-			opt_debug='set -x'
-			$opt_debug
-			;;
-
- -dlopen)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-			execute_dlfiles="$execute_dlfiles $1"
-			shift
-			;;
-
- --dry-run | -n)	opt_dry_run=:					;;
- --features) func_features					;;
- --finish)		mode="finish"					;;
-
- --mode)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-			case $1 in
-			 # Valid mode arguments:
-			 clean)	;;
-			 compile)	;;
-			 execute)	;;
-			 finish)	;;
-			 install)	;;
-			 link)		;;
-			 relink)	;;
-			 uninstall)	;;
-
-			 # Catch anything else as an error
-			 *) func_error "invalid argument for $opt"
-			 exit_cmd=exit
-			 break
-			 ;;
-		 esac
-
-			mode="$1"
-			shift
-			;;
-
- --preserve-dup-deps)
-			opt_duplicate_deps=:				;;
-
- --quiet|--silent)	preserve_args="$preserve_args $opt"
-			opt_silent=:
-			;;
-
- --verbose| -v)	preserve_args="$preserve_args $opt"
-			opt_silent=false
-			;;
-
- --tag)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-			preserve_args="$preserve_args $opt $1"
-			func_enable_tag "$1"	# tagname is set here
-			shift
-			;;
-
- # Separate optargs to long options:
- -dlopen=*|--mode=*|--tag=*)
-			func_opt_split "$opt"
-			set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
-			shift
-			;;
-
- -\?|-h)		func_usage					;;
- --help)		opt_help=:					;;
- --version)	func_version					;;
-
- -*)		func_fatal_help "unrecognized option \`$opt'"	;;
-
- *)		nonopt="$opt"
-			break
-			;;
- esac
- done
-
-
- case $host in
- *cygwin* | *mingw* | *pw32* | *cegcc*)
- # don't eliminate duplications in $postdeps and $predeps
- opt_duplicate_compiler_generated_deps=:
- ;;
- *)
- opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
- ;;
- esac
-
- # Having warned about all mis-specified options, bail out if
- # anything was wrong.
- $exit_cmd $EXIT_FAILURE
-}
-
-# func_check_version_match
-# Ensure that we are using m4 macros, and libtool script from the same
-# release of libtool.
-func_check_version_match ()
-{
- if test "$package_revision" != "$macro_revision"; then
- if test "$VERSION" != "$macro_version"; then
- if test -z "$macro_version"; then
- cat >&2 <<_LT_EOF
-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from an older release.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
- else
- cat >&2 <<_LT_EOF
-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
- fi
- else
- cat >&2 <<_LT_EOF
-$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
-$progname: but the definition of this LT_INIT comes from revision $macro_revision.
-$progname: You should recreate aclocal.m4 with macros from revision $package_revision
-$progname: of $PACKAGE $VERSION and run autoconf again.
-_LT_EOF
- fi
-
- exit $EXIT_MISMATCH
- fi
-}
-
-
-## ----------- ##
-## Main. ##
-## ----------- ##
-
-$opt_help || {
- # Sanity checks first:
- func_check_version_match
-
- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
- func_fatal_configuration "not configured to build any kind of library"
- fi
-
- test -z "$mode" && func_fatal_error "error: you must specify a MODE."
-
-
- # Darwin sucks
- eval std_shrext=\"$shrext_cmds\"
-
-
- # Only execute mode is allowed to have -dlopen flags.
- if test -n "$execute_dlfiles" && test "$mode" != execute; then
- func_error "unrecognized option \`-dlopen'"
- $ECHO "$help" 1>&2
- exit $EXIT_FAILURE
- fi
-
- # Change the help message to a mode-specific one.
- generic_help="$help"
- help="Try \`$progname --help --mode=$mode' for more information."
-}
-
-
-# func_lalib_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_lalib_p ()
-{
- test -f "$1" &&
- $SED -e 4q "$1" 2>/dev/null \
- | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
-}
-
-# func_lalib_unsafe_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
-# This function implements the same check as func_lalib_p without
-# resorting to external programs. To this end, it redirects stdin and
-# closes it afterwards, without saving the original file descriptor.
-# As a safety measure, use it only where a negative result would be
-# fatal anyway. Works if `file' does not exist.
-func_lalib_unsafe_p ()
-{
- lalib_p=no
- if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then
-	for lalib_p_l in 1 2 3 4
-	do
-	 read lalib_p_line
-	 case "$lalib_p_line" in
-		\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
-	 esac
-	done
-	exec 0<&5 5<&-
- fi
- test "$lalib_p" = yes
-}
-
-# func_ltwrapper_script_p file
-# True iff FILE is a libtool wrapper script
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_ltwrapper_script_p ()
-{
- func_lalib_p "$1"
-}
-
-# func_ltwrapper_executable_p file
-# True iff FILE is a libtool wrapper executable
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_ltwrapper_executable_p ()
-{
- func_ltwrapper_exec_suffix=
- case $1 in
- *.exe) ;;
- *) func_ltwrapper_exec_suffix=.exe ;;
- esac
- $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1
-}
-
-# func_ltwrapper_scriptname file
-# Assumes file is an ltwrapper_executable
-# uses $file to determine the appropriate filename for a
-# temporary ltwrapper_script.
-func_ltwrapper_scriptname ()
-{
- func_ltwrapper_scriptname_result=""
- if func_ltwrapper_executable_p "$1"; then
-	func_dirname_and_basename "$1" "" "."
-	func_stripname '' '.exe' "$func_basename_result"
-	func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
- fi
-}
-
-# func_ltwrapper_p file
-# True iff FILE is a libtool wrapper script or wrapper executable
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_ltwrapper_p ()
-{
- func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1"
-}
-
-
-# func_execute_cmds commands fail_cmd
-# Execute tilde-delimited COMMANDS.
-# If FAIL_CMD is given, eval that upon failure.
-# FAIL_CMD may read-access the current command in variable CMD!
-func_execute_cmds ()
-{
- $opt_debug
- save_ifs=$IFS; IFS='~'
- for cmd in $1; do
- IFS=$save_ifs
- eval cmd=\"$cmd\"
- func_show_eval "$cmd" "${2-:}"
- done
- IFS=$save_ifs
-}
-
-
-# func_source file
-# Source FILE, adding directory component if necessary.
-# Note that it is not necessary on cygwin/mingw to append a dot to
-# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
-# behavior happens only for exec(3), not for open(2)! Also, sourcing
-# `FILE.' does not work on cygwin managed mounts.
-func_source ()
-{
- $opt_debug
- case $1 in
- */* | *\\*)	. "$1" ;;
- *)		. "./$1" ;;
- esac
-}
-
-
-# func_infer_tag arg
-# Infer tagged configuration to use if any are available and
-# if one wasn't chosen via the "--tag" command line option.
-# Only attempt this if the compiler in the base compile
-# command doesn't match the default compiler.
-# arg is usually of the form 'gcc ...'
-func_infer_tag ()
-{
- $opt_debug
- if test -n "$available_tags" && test -z "$tagname"; then
- CC_quoted=
- for arg in $CC; do
- func_quote_for_eval "$arg"
-	CC_quoted="$CC_quoted $func_quote_for_eval_result"
- done
- case $@ in
- # Blanks in the command may have been stripped by the calling shell,
- # but not from the CC environment variable when configure was run.
- " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
- # Blanks at the start of $base_compile will cause this to fail
- # if we don't check for them as well.
- *)
-	for z in $available_tags; do
-	 if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
-	 # Evaluate the configuration.
-	 eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
-	 CC_quoted=
-	 for arg in $CC; do
-	 # Double-quote args containing other shell metacharacters.
-	 func_quote_for_eval "$arg"
-	 CC_quoted="$CC_quoted $func_quote_for_eval_result"
-	 done
-	 case "$@ " in
-	 " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
-	 # The compiler in the base compile command matches
-	 # the one in the tagged configuration.
-	 # Assume this is the tagged configuration we want.
-	 tagname=$z
-	 break
-	 ;;
-	 esac
-	 fi
-	done
-	# If $tagname still isn't set, then no tagged configuration
-	# was found and let the user know that the "--tag" command
-	# line option must be used.
-	if test -z "$tagname"; then
-	 func_echo "unable to infer tagged configuration"
-	 func_fatal_error "specify a tag with \`--tag'"
-#	else
-#	 func_verbose "using $tagname tagged configuration"
-	fi
-	;;
- esac
- fi
-}
-
-
-
-# func_write_libtool_object output_name pic_name nonpic_name
-# Create a libtool object file (analogous to a ".la" file),
-# but don't create it if we're doing a dry run.
-func_write_libtool_object ()
-{
- write_libobj=${1}
- if test "$build_libtool_libs" = yes; then
- write_lobj=\'${2}\'
- else
- write_lobj=none
- fi
-
- if test "$build_old_libs" = yes; then
- write_oldobj=\'${3}\'
- else
- write_oldobj=none
- fi
-
- $opt_dry_run || {
- cat >${write_libobj}T <<EOF
-# $write_libobj - a libtool object file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object=$write_lobj
-
-# Name of the non-PIC object
-non_pic_object=$write_oldobj
-
-EOF
- $MV "${write_libobj}T" "${write_libobj}"
- }
-}
-
-# func_mode_compile arg...
-func_mode_compile ()
-{
- $opt_debug
- # Get the compilation command and the source file.
- base_compile=
- srcfile="$nonopt" # always keep a non-empty value in "srcfile"
- suppress_opt=yes
- suppress_output=
- arg_mode=normal
- libobj=
- later=
- pie_flag=
-
- for arg
- do
- case $arg_mode in
- arg )
-	# do not "continue". Instead, add this to base_compile
-	lastarg="$arg"
-	arg_mode=normal
-	;;
-
- target )
-	libobj="$arg"
-	arg_mode=normal
-	continue
-	;;
-
- normal )
-	# Accept any command-line options.
-	case $arg in
-	-o)
-	 test -n "$libobj" && \
-	 func_fatal_error "you cannot specify \`-o' more than once"
-	 arg_mode=target
-	 continue
-	 ;;
-
-	-pie | -fpie | -fPIE)
- pie_flag="$pie_flag $arg"
-	 continue
-	 ;;
-
-	-shared | -static | -prefer-pic | -prefer-non-pic)
-	 later="$later $arg"
-	 continue
-	 ;;
-
-	-no-suppress)
-	 suppress_opt=no
-	 continue
-	 ;;
-
-	-Xcompiler)
-	 arg_mode=arg # the next one goes into the "base_compile" arg list
-	 continue # The current "srcfile" will either be retained or
-	 ;; # replaced later. I would guess that would be a bug.
-
-	-Wc,*)
-	 func_stripname '-Wc,' '' "$arg"
-	 args=$func_stripname_result
-	 lastarg=
-	 save_ifs="$IFS"; IFS=','
-	 for arg in $args; do
-	 IFS="$save_ifs"
-	 func_quote_for_eval "$arg"
-	 lastarg="$lastarg $func_quote_for_eval_result"
-	 done
-	 IFS="$save_ifs"
-	 func_stripname ' ' '' "$lastarg"
-	 lastarg=$func_stripname_result
-
-	 # Add the arguments to base_compile.
-	 base_compile="$base_compile $lastarg"
-	 continue
-	 ;;
-
-	*)
-	 # Accept the current argument as the source file.
-	 # The previous "srcfile" becomes the current argument.
-	 #
-	 lastarg="$srcfile"
-	 srcfile="$arg"
-	 ;;
-	esac # case $arg
-	;;
- esac # case $arg_mode
-
- # Aesthetically quote the previous argument.
- func_quote_for_eval "$lastarg"
- base_compile="$base_compile $func_quote_for_eval_result"
- done # for arg
-
- case $arg_mode in
- arg)
- func_fatal_error "you must specify an argument for -Xcompile"
- ;;
- target)
- func_fatal_error "you must specify a target with \`-o'"
- ;;
- *)
- # Get the name of the library object.
- test -z "$libobj" && {
-	func_basename "$srcfile"
-	libobj="$func_basename_result"
- }
- ;;
- esac
-
- # Recognize several different file suffixes.
- # If the user specifies -o file.o, it is replaced with file.lo
- case $libobj in
- *.[cCFSifmso] | \
- *.ada | *.adb | *.ads | *.asm | \
- *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
- *.[fF][09]? | *.for | *.java | *.obj | *.sx)
- func_xform "$libobj"
- libobj=$func_xform_result
- ;;
- esac
-
- case $libobj in
- *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
- *)
- func_fatal_error "cannot determine name of library object from \`$libobj'"
- ;;
- esac
-
- func_infer_tag $base_compile
-
- for arg in $later; do
- case $arg in
- -shared)
-	test "$build_libtool_libs" != yes && \
-	 func_fatal_configuration "can not build a shared library"
-	build_old_libs=no
-	continue
-	;;
-
- -static)
-	build_libtool_libs=no
-	build_old_libs=yes
-	continue
-	;;
-
- -prefer-pic)
-	pic_mode=yes
-	continue
-	;;
-
- -prefer-non-pic)
-	pic_mode=no
-	continue
-	;;
- esac
- done
-
- func_quote_for_eval "$libobj"
- test "X$libobj" != "X$func_quote_for_eval_result" \
- && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"'	 &()|`$[]' \
- && func_warning "libobj name \`$libobj' may not contain shell special characters."
- func_dirname_and_basename "$obj" "/" ""
- objname="$func_basename_result"
- xdir="$func_dirname_result"
- lobj=${xdir}$objdir/$objname
-
- test -z "$base_compile" && \
- func_fatal_help "you must specify a compilation command"
-
- # Delete any leftover library objects.
- if test "$build_old_libs" = yes; then
- removelist="$obj $lobj $libobj ${libobj}T"
- else
- removelist="$lobj $libobj ${libobj}T"
- fi
-
- # On Cygwin there's no "real" PIC flag so we must build both object types
- case $host_os in
- cygwin* | mingw* | pw32* | os2* | cegcc*)
- pic_mode=default
- ;;
- esac
- if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
- # non-PIC code in shared libraries is not supported
- pic_mode=default
- fi
-
- # Calculate the filename of the output object if compiler does
- # not support -o with -c
- if test "$compiler_c_o" = no; then
- output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
- lockfile="$output_obj.lock"
- else
- output_obj=
- need_locks=no
- lockfile=
- fi
-
- # Lock this critical section if it is needed
- # We use this script file to make the link, it avoids creating a new file
- if test "$need_locks" = yes; then
- until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
-	func_echo "Waiting for $lockfile to be removed"
-	sleep 2
- done
- elif test "$need_locks" = warn; then
- if test -f "$lockfile"; then
-	$ECHO "\
-*** ERROR, $lockfile exists and contains:
-`cat $lockfile 2>/dev/null`
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together. If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$opt_dry_run || $RM $removelist
-	exit $EXIT_FAILURE
- fi
- removelist="$removelist $output_obj"
- $ECHO "$srcfile" > "$lockfile"
- fi
-
- $opt_dry_run || $RM $removelist
- removelist="$removelist $lockfile"
- trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
-
- if test -n "$fix_srcfile_path"; then
- eval srcfile=\"$fix_srcfile_path\"
- fi
- func_quote_for_eval "$srcfile"
- qsrcfile=$func_quote_for_eval_result
-
- # Only build a PIC object if we are building libtool libraries.
- if test "$build_libtool_libs" = yes; then
- # Without this assignment, base_compile gets emptied.
- fbsd_hideous_sh_bug=$base_compile
-
- if test "$pic_mode" != no; then
-	command="$base_compile $qsrcfile $pic_flag"
- else
-	# Don't build PIC code
-	command="$base_compile $qsrcfile"
- fi
-
- func_mkdir_p "$xdir$objdir"
-
- if test -z "$output_obj"; then
-	# Place PIC objects in $objdir
-	command="$command -o $lobj"
- fi
-
- func_show_eval_locale "$command"	\
- 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
-
- if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$ECHO "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together. If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$opt_dry_run || $RM $removelist
-	exit $EXIT_FAILURE
- fi
-
- # Just move the object if needed, then go on to compile the next one
- if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
-	func_show_eval '$MV "$output_obj" "$lobj"' \
-	 'error=$?; $opt_dry_run || $RM $removelist; exit $error'
- fi
-
- # Allow error messages only from the first compilation.
- if test "$suppress_opt" = yes; then
-	suppress_output=' >/dev/null 2>&1'
- fi
- fi
-
- # Only build a position-dependent object if we build old libraries.
- if test "$build_old_libs" = yes; then
- if test "$pic_mode" != yes; then
-	# Don't build PIC code
-	command="$base_compile $qsrcfile$pie_flag"
- else
-	command="$base_compile $qsrcfile $pic_flag"
- fi
- if test "$compiler_c_o" = yes; then
-	command="$command -o $obj"
- fi
-
- # Suppress compiler output if we already did a PIC compilation.
- command="$command$suppress_output"
- func_show_eval_locale "$command" \
- '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
-
- if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$ECHO "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together. If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$opt_dry_run || $RM $removelist
-	exit $EXIT_FAILURE
- fi
-
- # Just move the object if needed
- if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
-	func_show_eval '$MV "$output_obj" "$obj"' \
-	 'error=$?; $opt_dry_run || $RM $removelist; exit $error'
- fi
- fi
-
- $opt_dry_run || {
- func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
-
- # Unlock the critical section if it was locked
- if test "$need_locks" != no; then
-	removelist=$lockfile
- $RM "$lockfile"
- fi
- }
-
- exit $EXIT_SUCCESS
-}
-
-$opt_help || {
-test "$mode" = compile && func_mode_compile ${1+"$@"}
-}
-
-func_mode_help ()
-{
- # We need to display help for each of the modes.
- case $mode in
- "")
- # Generic help is extracted from the usage comments
- # at the start of this file.
- func_help
- ;;
-
- clean)
- $ECHO \
-"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
-
-Remove files from the build directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, object or program, all the files associated
-with it are deleted. Otherwise, only FILE itself is deleted using RM."
- ;;
-
- compile)
- $ECHO \
-"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
-
-Compile a source file into a libtool library object.
-
-This mode accepts the following additional options:
-
- -o OUTPUT-FILE set the output file name to OUTPUT-FILE
- -no-suppress do not suppress compiler output for multiple passes
- -prefer-pic try to building PIC objects only
- -prefer-non-pic try to building non-PIC objects only
- -shared do not build a \`.o' file suitable for static linking
- -static only build a \`.o' file suitable for static linking
-
-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
-from the given SOURCEFILE.
-
-The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'."
- ;;
-
- execute)
- $ECHO \
-"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
-
-Automatically set library path, then run a program.
-
-This mode accepts the following additional options:
-
- -dlopen FILE add the directory containing FILE to the library path
-
-This mode sets the library path environment variable according to \`-dlopen'
-flags.
-
-If any of the ARGS are libtool executable wrappers, then they are translated
-into their corresponding uninstalled binary, and any of their required library
-directories are added to the library path.
-
-Then, COMMAND is executed, with ARGS as arguments."
- ;;
-
- finish)
- $ECHO \
-"Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
-
-Complete the installation of libtool libraries.
-
-Each LIBDIR is a directory that contains libtool libraries.
-
-The commands that this mode executes may require superuser privileges. Use
-the \`--dry-run' option if you just want to see what would be executed."
- ;;
-
- install)
- $ECHO \
-"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
-
-Install executables or libraries.
-
-INSTALL-COMMAND is the installation command. The first component should be
-either the \`install' or \`cp' program.
-
-The following components of INSTALL-COMMAND are treated specially:
-
- -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation
-
-The rest of the components are interpreted as arguments to that command (only
-BSD-compatible install options are recognized)."
- ;;
-
- link)
- $ECHO \
-"Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
-
-Link object files or libraries together to form another library, or to
-create an executable program.
-
-LINK-COMMAND is a command using the C compiler that you would use to create
-a program from several object files.
-
-The following components of LINK-COMMAND are treated specially:
-
- -all-static do not do any dynamic linking at all
- -avoid-version do not add a version suffix if possible
- -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime
- -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
- -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
- -export-symbols SYMFILE
- try to export only the symbols listed in SYMFILE
- -export-symbols-regex REGEX
- try to export only the symbols matching REGEX
- -LLIBDIR search LIBDIR for required installed libraries
- -lNAME OUTPUT-FILE requires the installed library libNAME
- -module build a library that can dlopened
- -no-fast-install disable the fast-install mode
- -no-install link a not-installable executable
- -no-undefined declare that a library does not refer to external symbols
- -o OUTPUT-FILE create OUTPUT-FILE from the specified objects
- -objectlist FILE Use a list of object files found in FILE to specify objects
- -precious-files-regex REGEX
- don't remove output files matching REGEX
- -release RELEASE specify package release information
- -rpath LIBDIR the created library will eventually be installed in LIBDIR
- -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
- -shared only do dynamic linking of libtool libraries
- -shrext SUFFIX override the standard shared library file extension
- -static do not do any dynamic linking of uninstalled libtool libraries
- -static-libtool-libs
- do not do any dynamic linking of libtool libraries
- -version-info CURRENT[:REVISION[:AGE]]
- specify library version info [each variable defaults to 0]
- -weak LIBNAME declare that the target provides the LIBNAME interface
-
-All other options (arguments beginning with \`-') are ignored.
-
-Every other argument is treated as a filename. Files ending in \`.la' are
-treated as uninstalled libtool libraries, other files are standard or library
-object files.
-
-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-only library objects (\`.lo' files) may be specified, and \`-rpath' is
-required, except when creating a convenience library.
-
-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-using \`ar' and \`ranlib', or on Windows using \`lib'.
-
-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
-is created, otherwise an executable program is created."
- ;;
-
- uninstall)
- $ECHO \
-"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
-
-Remove libraries from an installation directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, all the files associated with it are deleted.
-Otherwise, only FILE itself is deleted using RM."
- ;;
-
- *)
- func_fatal_help "invalid operation mode \`$mode'"
- ;;
- esac
-
- $ECHO
- $ECHO "Try \`$progname --help' for more information about other modes."
-
- exit $?
-}
-
- # Now that we've collected a possible --mode arg, show help if necessary
- $opt_help && func_mode_help
-
-
-# func_mode_execute arg...
-func_mode_execute ()
-{
- $opt_debug
- # The first argument is the command name.
- cmd="$nonopt"
- test -z "$cmd" && \
- func_fatal_help "you must specify a COMMAND"
-
- # Handle -dlopen flags immediately.
- for file in $execute_dlfiles; do
- test -f "$file" \
-	|| func_fatal_help "\`$file' is not a file"
-
- dir=
- case $file in
- *.la)
-	# Check to see that this really is a libtool archive.
-	func_lalib_unsafe_p "$file" \
-	 || func_fatal_help "\`$lib' is not a valid libtool archive"
-
-	# Read the libtool library.
-	dlname=
-	library_names=
-	func_source "$file"
-
-	# Skip this library if it cannot be dlopened.
-	if test -z "$dlname"; then
-	 # Warn if it was a shared library.
-	 test -n "$library_names" && \
-	 func_warning "\`$file' was not linked with \`-export-dynamic'"
-	 continue
-	fi
-
-	func_dirname "$file" "" "."
-	dir="$func_dirname_result"
-
-	if test -f "$dir/$objdir/$dlname"; then
-	 dir="$dir/$objdir"
-	else
-	 if test ! -f "$dir/$dlname"; then
-	 func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
-	 fi
-	fi
-	;;
-
- *.lo)
-	# Just add the directory containing the .lo file.
-	func_dirname "$file" "" "."
-	dir="$func_dirname_result"
-	;;
-
- *)
-	func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
-	continue
-	;;
- esac
-
- # Get the absolute pathname.
- absdir=`cd "$dir" && pwd`
- test -n "$absdir" && dir="$absdir"
-
- # Now add the directory to shlibpath_var.
- if eval "test -z \"\$$shlibpath_var\""; then
-	eval "$shlibpath_var=\"\$dir\""
- else
-	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
- fi
- done
-
- # This variable tells wrapper scripts just to set shlibpath_var
- # rather than running their programs.
- libtool_execute_magic="$magic"
-
- # Check if any of the arguments is a wrapper script.
- args=
- for file
- do
- case $file in
- -*) ;;
- *)
-	# Do a test to see if this is really a libtool program.
-	if func_ltwrapper_script_p "$file"; then
-	 func_source "$file"
-	 # Transform arg to wrapped name.
-	 file="$progdir/$program"
-	elif func_ltwrapper_executable_p "$file"; then
-	 func_ltwrapper_scriptname "$file"
-	 func_source "$func_ltwrapper_scriptname_result"
-	 # Transform arg to wrapped name.
-	 file="$progdir/$program"
-	fi
-	;;
- esac
- # Quote arguments (to preserve shell metacharacters).
- func_quote_for_eval "$file"
- args="$args $func_quote_for_eval_result"
- done
-
- if test "X$opt_dry_run" = Xfalse; then
- if test -n "$shlibpath_var"; then
-	# Export the shlibpath_var.
-	eval "export $shlibpath_var"
- fi
-
- # Restore saved environment variables
- for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
- do
-	eval "if test \"\${save_$lt_var+set}\" = set; then
- $lt_var=\$save_$lt_var; export $lt_var
-	 else
-		$lt_unset $lt_var
-	 fi"
- done
-
- # Now prepare to actually exec the command.
- exec_cmd="\$cmd$args"
- else
- # Display what would be done.
- if test -n "$shlibpath_var"; then
-	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
-	$ECHO "export $shlibpath_var"
- fi
- $ECHO "$cmd$args"
- exit $EXIT_SUCCESS
- fi
-}
-
-test "$mode" = execute && func_mode_execute ${1+"$@"}
-
-
-# func_mode_finish arg...
-func_mode_finish ()
-{
- $opt_debug
- libdirs="$nonopt"
- admincmds=
-
- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
- for dir
- do
-	libdirs="$libdirs $dir"
- done
-
- for libdir in $libdirs; do
-	if test -n "$finish_cmds"; then
-	 # Do each command in the finish commands.
-	 func_execute_cmds "$finish_cmds" 'admincmds="$admincmds
-'"$cmd"'"'
-	fi
-	if test -n "$finish_eval"; then
-	 # Do the single finish_eval.
-	 eval cmds=\"$finish_eval\"
-	 $opt_dry_run || eval "$cmds" || admincmds="$admincmds
- $cmds"
-	fi
- done
- fi
-
- # Exit here if they wanted silent mode.
- $opt_silent && exit $EXIT_SUCCESS
-
- $ECHO "X----------------------------------------------------------------------" | $Xsed
- $ECHO "Libraries have been installed in:"
- for libdir in $libdirs; do
- $ECHO " $libdir"
- done
- $ECHO
- $ECHO "If you ever happen to want to link against installed libraries"
- $ECHO "in a given directory, LIBDIR, you must either use libtool, and"
- $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"
- $ECHO "flag during linking and do at least one of the following:"
- if test -n "$shlibpath_var"; then
- $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable"
- $ECHO " during execution"
- fi
- if test -n "$runpath_var"; then
- $ECHO " - add LIBDIR to the \`$runpath_var' environment variable"
- $ECHO " during linking"
- fi
- if test -n "$hardcode_libdir_flag_spec"; then
- libdir=LIBDIR
- eval flag=\"$hardcode_libdir_flag_spec\"
-
- $ECHO " - use the \`$flag' linker flag"
- fi
- if test -n "$admincmds"; then
- $ECHO " - have your system administrator run these commands:$admincmds"
- fi
- if test -f /etc/ld.so.conf; then
- $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- fi
- $ECHO
-
- $ECHO "See any operating system documentation about shared libraries for"
- case $host in
- solaris2.[6789]|solaris2.1[0-9])
- $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"
-	$ECHO "pages."
-	;;
- *)
- $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
- ;;
- esac
- $ECHO "X----------------------------------------------------------------------" | $Xsed
- exit $EXIT_SUCCESS
-}
-
-test "$mode" = finish && func_mode_finish ${1+"$@"}
-
-
-# func_mode_install arg...
-func_mode_install ()
-{
- $opt_debug
- # There may be an optional sh(1) argument at the beginning of
- # install_prog (especially on Windows NT).
- if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
- # Allow the use of GNU shtool's install command.
- $ECHO "X$nonopt" | $GREP shtool >/dev/null; then
- # Aesthetically quote it.
- func_quote_for_eval "$nonopt"
- install_prog="$func_quote_for_eval_result "
- arg=$1
- shift
- else
- install_prog=
- arg=$nonopt
- fi
-
- # The real first argument should be the name of the installation program.
- # Aesthetically quote it.
- func_quote_for_eval "$arg"
- install_prog="$install_prog$func_quote_for_eval_result"
-
- # We need to accept at least all the BSD install flags.
- dest=
- files=
- opts=
- prev=
- install_type=
- isdir=no
- stripme=
- for arg
- do
- if test -n "$dest"; then
-	files="$files $dest"
-	dest=$arg
-	continue
- fi
-
- case $arg in
- -d) isdir=yes ;;
- -f)
-	case " $install_prog " in
-	*[\\\ /]cp\ *) ;;
-	*) prev=$arg ;;
-	esac
-	;;
- -g | -m | -o)
-	prev=$arg
-	;;
- -s)
-	stripme=" -s"
-	continue
-	;;
- -*)
-	;;
- *)
-	# If the previous option needed an argument, then skip it.
-	if test -n "$prev"; then
-	 prev=
-	else
-	 dest=$arg
-	 continue
-	fi
-	;;
- esac
-
- # Aesthetically quote the argument.
- func_quote_for_eval "$arg"
- install_prog="$install_prog $func_quote_for_eval_result"
- done
-
- test -z "$install_prog" && \
- func_fatal_help "you must specify an install program"
-
- test -n "$prev" && \
- func_fatal_help "the \`$prev' option requires an argument"
-
- if test -z "$files"; then
- if test -z "$dest"; then
-	func_fatal_help "no file or destination specified"
- else
-	func_fatal_help "you must specify a destination"
- fi
- fi
-
- # Strip any trailing slash from the destination.
- func_stripname '' '/' "$dest"
- dest=$func_stripname_result
-
- # Check to see that the destination is a directory.
- test -d "$dest" && isdir=yes
- if test "$isdir" = yes; then
- destdir="$dest"
- destname=
- else
- func_dirname_and_basename "$dest" "" "."
- destdir="$func_dirname_result"
- destname="$func_basename_result"
-
- # Not a directory, so check to see that there is only one file specified.
- set dummy $files; shift
- test "$#" -gt 1 && \
-	func_fatal_help "\`$dest' is not a directory"
- fi
- case $destdir in
- [\\/]* | [A-Za-z]:[\\/]*) ;;
- *)
- for file in $files; do
-	case $file in
-	*.lo) ;;
-	*)
-	 func_fatal_help "\`$destdir' must be an absolute directory name"
-	 ;;
-	esac
- done
- ;;
- esac
-
- # This variable tells wrapper scripts just to set variables rather
- # than running their programs.
- libtool_install_magic="$magic"
-
- staticlibs=
- future_libdirs=
- current_libdirs=
- for file in $files; do
-
- # Do each installation.
- case $file in
- *.$libext)
-	# Do the static libraries later.
-	staticlibs="$staticlibs $file"
-	;;
-
- *.la)
-	# Check to see that this really is a libtool archive.
-	func_lalib_unsafe_p "$file" \
-	 || func_fatal_help "\`$file' is not a valid libtool archive"
-
-	library_names=
-	old_library=
-	relink_command=
-	func_source "$file"
-
-	# Add the libdir to current_libdirs if it is the destination.
-	if test "X$destdir" = "X$libdir"; then
-	 case "$current_libdirs " in
-	 *" $libdir "*) ;;
-	 *) current_libdirs="$current_libdirs $libdir" ;;
-	 esac
-	else
-	 # Note the libdir as a future libdir.
-	 case "$future_libdirs " in
-	 *" $libdir "*) ;;
-	 *) future_libdirs="$future_libdirs $libdir" ;;
-	 esac
-	fi
-
-	func_dirname "$file" "/" ""
-	dir="$func_dirname_result"
-	dir="$dir$objdir"
-
-	if test -n "$relink_command"; then
-	 # Determine the prefix the user has applied to our future dir.
-	 inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
-
-	 # Don't allow the user to place us outside of our expected
-	 # location b/c this prevents finding dependent libraries that
-	 # are installed to the same prefix.
-	 # At present, this check doesn't affect windows .dll's that
-	 # are installed into $libdir/../bin (currently, that works fine)
-	 # but it's something to keep an eye on.
-	 test "$inst_prefix_dir" = "$destdir" && \
-	 func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
-
-	 if test -n "$inst_prefix_dir"; then
-	 # Stick the inst_prefix_dir data into the link command.
-	 relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-	 else
-	 relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`
-	 fi
-
-	 func_warning "relinking \`$file'"
-	 func_show_eval "$relink_command" \
-	 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
-	fi
-
-	# See the names of the shared library.
-	set dummy $library_names; shift
-	if test -n "$1"; then
-	 realname="$1"
-	 shift
-
-	 srcname="$realname"
-	 test -n "$relink_command" && srcname="$realname"T
-
-	 # Install the shared library and build the symlinks.
-	 func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \
-	 'exit $?'
-	 tstripme="$stripme"
-	 case $host_os in
-	 cygwin* | mingw* | pw32* | cegcc*)
-	 case $realname in
-	 *.dll.a)
-	 tstripme=""
-	 ;;
-	 esac
-	 ;;
-	 esac
-	 if test -n "$tstripme" && test -n "$striplib"; then
-	 func_show_eval "$striplib $destdir/$realname" 'exit $?'
-	 fi
-
-	 if test "$#" -gt 0; then
-	 # Delete the old symlinks, and create new ones.
-	 # Try `ln -sf' first, because the `ln' binary might depend on
-	 # the symlink we replace! Solaris /bin/ln does not understand -f,
-	 # so we also need to try rm && ln -s.
-	 for linkname
-	 do
-	 test "$linkname" != "$realname" \
-		&& func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })"
-	 done
-	 fi
-
-	 # Do each command in the postinstall commands.
-	 lib="$destdir/$realname"
-	 func_execute_cmds "$postinstall_cmds" 'exit $?'
-	fi
-
-	# Install the pseudo-library for information purposes.
-	func_basename "$file"
-	name="$func_basename_result"
-	instname="$dir/$name"i
-	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
-
-	# Maybe install the static library, too.
-	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-	;;
-
- *.lo)
-	# Install (i.e. copy) a libtool object.
-
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	 destfile="$destdir/$destname"
-	else
-	 func_basename "$file"
-	 destfile="$func_basename_result"
-	 destfile="$destdir/$destfile"
-	fi
-
-	# Deduce the name of the destination old-style object file.
-	case $destfile in
-	*.lo)
-	 func_lo2o "$destfile"
-	 staticdest=$func_lo2o_result
-	 ;;
-	*.$objext)
-	 staticdest="$destfile"
-	 destfile=
-	 ;;
-	*)
-	 func_fatal_help "cannot copy a libtool object to \`$destfile'"
-	 ;;
-	esac
-
-	# Install the libtool object if requested.
-	test -n "$destfile" && \
-	 func_show_eval "$install_prog $file $destfile" 'exit $?'
-
-	# Install the old object if enabled.
-	if test "$build_old_libs" = yes; then
-	 # Deduce the name of the old-style object file.
-	 func_lo2o "$file"
-	 staticobj=$func_lo2o_result
-	 func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?'
-	fi
-	exit $EXIT_SUCCESS
-	;;
-
- *)
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	 destfile="$destdir/$destname"
-	else
-	 func_basename "$file"
-	 destfile="$func_basename_result"
-	 destfile="$destdir/$destfile"
-	fi
-
-	# If the file is missing, and there is a .exe on the end, strip it
-	# because it is most likely a libtool script we actually want to
-	# install
-	stripped_ext=""
-	case $file in
-	 *.exe)
-	 if test ! -f "$file"; then
-	 func_stripname '' '.exe' "$file"
-	 file=$func_stripname_result
-	 stripped_ext=".exe"
-	 fi
-	 ;;
-	esac
-
-	# Do a test to see if this is really a libtool program.
-	case $host in
-	*cygwin* | *mingw*)
-	 if func_ltwrapper_executable_p "$file"; then
-	 func_ltwrapper_scriptname "$file"
-	 wrapper=$func_ltwrapper_scriptname_result
-	 else
-	 func_stripname '' '.exe' "$file"
-	 wrapper=$func_stripname_result
-	 fi
-	 ;;
-	*)
-	 wrapper=$file
-	 ;;
-	esac
-	if func_ltwrapper_script_p "$wrapper"; then
-	 notinst_deplibs=
-	 relink_command=
-
-	 func_source "$wrapper"
-
-	 # Check the variables that should have been set.
-	 test -z "$generated_by_libtool_version" && \
-	 func_fatal_error "invalid libtool wrapper script \`$wrapper'"
-
-	 finalize=yes
-	 for lib in $notinst_deplibs; do
-	 # Check to see that each library is installed.
-	 libdir=
-	 if test -f "$lib"; then
-	 func_source "$lib"
-	 fi
-	 libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
-	 if test -n "$libdir" && test ! -f "$libfile"; then
-	 func_warning "\`$lib' has not been installed in \`$libdir'"
-	 finalize=no
-	 fi
-	 done
-
-	 relink_command=
-	 func_source "$wrapper"
-
-	 outputname=
-	 if test "$fast_install" = no && test -n "$relink_command"; then
-	 $opt_dry_run || {
-	 if test "$finalize" = yes; then
-	 tmpdir=`func_mktempdir`
-		func_basename "$file$stripped_ext"
-		file="$func_basename_result"
-	 outputname="$tmpdir/$file"
-	 # Replace the output file specification.
-	 relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
-
-	 $opt_silent || {
-	 func_quote_for_expand "$relink_command"
-		 eval "func_echo $func_quote_for_expand_result"
-	 }
-	 if eval "$relink_command"; then :
-	 else
-		 func_error "error: relink \`$file' with the above command before installing it"
-		 $opt_dry_run || ${RM}r "$tmpdir"
-		 continue
-	 fi
-	 file="$outputname"
-	 else
-	 func_warning "cannot relink \`$file'"
-	 fi
-	 }
-	 else
-	 # Install the binary that we compiled earlier.
-	 file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%$[^/]*$$%$objdir/\1%"`
-	 fi
-	fi
-
-	# remove .exe since cygwin /usr/bin/install will append another
-	# one anyway
-	case $install_prog,$host in
-	*/usr/bin/install*,*cygwin*)
-	 case $file:$destfile in
-	 *.exe:*.exe)
-	 # this is ok
-	 ;;
-	 *.exe:*)
-	 destfile=$destfile.exe
-	 ;;
-	 *:*.exe)
-	 func_stripname '' '.exe' "$destfile"
-	 destfile=$func_stripname_result
-	 ;;
-	 esac
-	 ;;
-	esac
-	func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'
-	$opt_dry_run || if test -n "$outputname"; then
-	 ${RM}r "$tmpdir"
-	fi
-	;;
- esac
- done
-
- for file in $staticlibs; do
- func_basename "$file"
- name="$func_basename_result"
-
- # Set up the ranlib parameters.
- oldlib="$destdir/$name"
-
- func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
-
- if test -n "$stripme" && test -n "$old_striplib"; then
-	func_show_eval "$old_striplib $oldlib" 'exit $?'
- fi
-
- # Do each command in the postinstall commands.
- func_execute_cmds "$old_postinstall_cmds" 'exit $?'
- done
-
- test -n "$future_libdirs" && \
- func_warning "remember to run \`$progname --finish$future_libdirs'"
-
- if test -n "$current_libdirs"; then
- # Maybe just do a dry run.
- $opt_dry_run && current_libdirs=" -n$current_libdirs"
- exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
- else
- exit $EXIT_SUCCESS
- fi
-}
-
-test "$mode" = install && func_mode_install ${1+"$@"}
-
-
-# func_generate_dlsyms outputname originator pic_p
-# Extract symbols from dlprefiles and create ${outputname}S.o with
-# a dlpreopen symbol table.
-func_generate_dlsyms ()
-{
- $opt_debug
- my_outputname="$1"
- my_originator="$2"
- my_pic_p="${3-no}"
- my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
- my_dlsyms=
-
- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
- if test -n "$NM" && test -n "$global_symbol_pipe"; then
-	my_dlsyms="${my_outputname}S.c"
- else
-	func_error "not configured to extract global symbols from dlpreopened files"
- fi
- fi
-
- if test -n "$my_dlsyms"; then
- case $my_dlsyms in
- "") ;;
- *.c)
-	# Discover the nlist of each of the dlfiles.
-	nlist="$output_objdir/${my_outputname}.nm"
-
-	func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
-
-	# Parse the name list into a source file.
-	func_verbose "creating $output_objdir/$my_dlsyms"
-
-	$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
-/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
-/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
-
-#ifdef __cplusplus
-extern \"C\" {
-#endif
-
-/* External symbol declarations for the compiler. */\
-"
-
-	if test "$dlself" = yes; then
-	 func_verbose "generating symbol list for \`$output'"
-
-	 $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
-
-	 # Add our own program objects to the symbol list.
-	 progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	 for progfile in $progfiles; do
-	 func_verbose "extracting global C symbols from \`$progfile'"
-	 $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
-	 done
-
-	 if test -n "$exclude_expsyms"; then
-	 $opt_dry_run || {
-	 eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
-	 eval '$MV "$nlist"T "$nlist"'
-	 }
-	 fi
-
-	 if test -n "$export_symbols_regex"; then
-	 $opt_dry_run || {
-	 eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
-	 eval '$MV "$nlist"T "$nlist"'
-	 }
-	 fi
-
-	 # Prepare the list of exported symbols
-	 if test -z "$export_symbols"; then
-	 export_symbols="$output_objdir/$outputname.exp"
-	 $opt_dry_run || {
-	 $RM $export_symbols
-	 eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* $.*$$/\1/p' "'< "$nlist" > "$export_symbols"'
-	 case $host in
-	 *cygwin* | *mingw* | *cegcc* )
- eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
- eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
-	 ;;
-	 esac
-	 }
-	 else
-	 $opt_dry_run || {
-	 eval "${SED} -e 's/$[].[*^$]$/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
-	 eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
-	 eval '$MV "$nlist"T "$nlist"'
-	 case $host in
-	 *cygwin | *mingw* | *cegcc* )
-	 eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-	 eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
-	 ;;
-	 esac
-	 }
-	 fi
-	fi
-
-	for dlprefile in $dlprefiles; do
-	 func_verbose "extracting global C symbols from \`$dlprefile'"
-	 func_basename "$dlprefile"
-	 name="$func_basename_result"
-	 $opt_dry_run || {
-	 eval '$ECHO ": $name " >> "$nlist"'
-	 eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
-	 }
-	done
-
-	$opt_dry_run || {
-	 # Make sure we have at least an empty file.
-	 test -f "$nlist" || : > "$nlist"
-
-	 if test -n "$exclude_expsyms"; then
-	 $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
-	 $MV "$nlist"T "$nlist"
-	 fi
-
-	 # Try sorting and uniquifying the output.
-	 if $GREP -v "^: " < "$nlist" |
-	 if sort -k 3 </dev/null >/dev/null 2>&1; then
-		sort -k 3
-	 else
-		sort +2
-	 fi |
-	 uniq > "$nlist"S; then
-	 :
-	 else
-	 $GREP -v "^: " < "$nlist" > "$nlist"S
-	 fi
-
-	 if test -f "$nlist"S; then
-	 eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
-	 else
-	 $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms"
-	 fi
-
-	 $ECHO >> "$output_objdir/$my_dlsyms" "\
-
-/* The mapping between symbol names and symbols. */
-typedef struct {
- const char *name;
- void *address;
-} lt_dlsymlist;
-"
-	 case $host in
-	 *cygwin* | *mingw* | *cegcc* )
-	 $ECHO >> "$output_objdir/$my_dlsyms" "\
-/* DATA imports from DLLs on WIN32 con't be const, because
- runtime relocations are performed -- see ld's documentation
- on pseudo-relocs. */"
-	 lt_dlsym_const= ;;
-	 *osf5*)
-	 echo >> "$output_objdir/$my_dlsyms" "\
-/* This system does not cope well with relocations in const data */"
-	 lt_dlsym_const= ;;
-	 *)
-	 lt_dlsym_const=const ;;
-	 esac
-
-	 $ECHO >> "$output_objdir/$my_dlsyms" "\
-extern $lt_dlsym_const lt_dlsymlist
-lt_${my_prefix}_LTX_preloaded_symbols[];
-$lt_dlsym_const lt_dlsymlist
-lt_${my_prefix}_LTX_preloaded_symbols[] =
-{\
- { \"$my_originator\", (void *) 0 },"
-
-	 case $need_lib_prefix in
-	 no)
-	 eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms"
-	 ;;
-	 *)
-	 eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
-	 ;;
-	 esac
-	 $ECHO >> "$output_objdir/$my_dlsyms" "\
- {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
- return lt_${my_prefix}_LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif\
-"
-	} # !$opt_dry_run
-
-	pic_flag_for_symtable=
-	case "$compile_command " in
-	*" -static "*) ;;
-	*)
-	 case $host in
-	 # compiling the symbol table file with pic_flag works around
-	 # a FreeBSD bug that causes programs to crash when -lm is
-	 # linked before any other PIC object. But we must not use
-	 # pic_flag when linking with -static. The problem exists in
-	 # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	 *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
-	 pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
-	 *-*-hpux*)
-	 pic_flag_for_symtable=" $pic_flag" ;;
-	 *)
-	 if test "X$my_pic_p" != Xno; then
-	 pic_flag_for_symtable=" $pic_flag"
-	 fi
-	 ;;
-	 esac
-	 ;;
-	esac
-	symtab_cflags=
-	for arg in $LTCFLAGS; do
-	 case $arg in
-	 -pie | -fpie | -fPIE) ;;
-	 *) symtab_cflags="$symtab_cflags $arg" ;;
-	 esac
-	done
-
-	# Now compile the dynamic symbol file.
-	func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
-
-	# Clean up the generated files.
-	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
-
-	# Transform the symbol file into the correct name.
-	symfileobj="$output_objdir/${my_outputname}S.$objext"
-	case $host in
-	*cygwin* | *mingw* | *cegcc* )
-	 if test -f "$output_objdir/$my_outputname.def"; then
-	 compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-	 finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-	 else
-	 compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-	 finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-	 fi
-	 ;;
-	*)
-	 compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-	 finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-	 ;;
-	esac
-	;;
- *)
-	func_fatal_error "unknown suffix for \`$my_dlsyms'"
-	;;
- esac
- else
- # We keep going just in case the user didn't refer to
- # lt_preloaded_symbols. The linker will fail if global_symbol_pipe
- # really was required.
-
- # Nullify the symbol file.
- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
- fi
-}
-
-# func_win32_libid arg
-# return the library type of file 'arg'
-#
-# Need a lot of goo to handle *both* DLLs and import libs
-# Has to be a shell function in order to 'eat' the argument
-# that is supplied when $file_magic_command is called.
-func_win32_libid ()
-{
- $opt_debug
- win32_libid_type="unknown"
- win32_fileres=`file -L $1 2>/dev/null`
- case $win32_fileres in
- *ar\ archive\ import\ library*) # definitely import
- win32_libid_type="x86 archive import"
- ;;
- *ar\ archive*) # could be an import, or static
- if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
- $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
- win32_nmres=`eval $NM -f posix -A $1 |
-	$SED -n -e '
-	 1,100{
-		/ I /{
-		 s,.*,import,
-		 p
-		 q
-		}
-	 }'`
- case $win32_nmres in
- import*) win32_libid_type="x86 archive import";;
- *) win32_libid_type="x86 archive static";;
- esac
- fi
- ;;
- *DLL*)
- win32_libid_type="x86 DLL"
- ;;
- *executable*) # but shell scripts are "executable" too...
- case $win32_fileres in
- *MS\ Windows\ PE\ Intel*)
- win32_libid_type="x86 DLL"
- ;;
- esac
- ;;
- esac
- $ECHO "$win32_libid_type"
-}
-
-
-
-# func_extract_an_archive dir oldlib
-func_extract_an_archive ()
-{
- $opt_debug
- f_ex_an_ar_dir="$1"; shift
- f_ex_an_ar_oldlib="$1"
- func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?'
- if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
- :
- else
- func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
- fi
-}
-
-
-# func_extract_archives gentop oldlib ...
-func_extract_archives ()
-{
- $opt_debug
- my_gentop="$1"; shift
- my_oldlibs=${1+"$@"}
- my_oldobjs=""
- my_xlib=""
- my_xabs=""
- my_xdir=""
-
- for my_xlib in $my_oldlibs; do
- # Extract the objects.
- case $my_xlib in
-	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
-	*) my_xabs=`pwd`"/$my_xlib" ;;
- esac
- func_basename "$my_xlib"
- my_xlib="$func_basename_result"
- my_xlib_u=$my_xlib
- while :; do
- case " $extracted_archives " in
-	*" $my_xlib_u "*)
-	 func_arith $extracted_serial + 1
-	 extracted_serial=$func_arith_result
-	 my_xlib_u=lt$extracted_serial-$my_xlib ;;
-	*) break ;;
-	esac
- done
- extracted_archives="$extracted_archives $my_xlib_u"
- my_xdir="$my_gentop/$my_xlib_u"
-
- func_mkdir_p "$my_xdir"
-
- case $host in
- *-darwin*)
-	func_verbose "Extracting $my_xabs"
-	# Do not bother doing anything if just a dry run
-	$opt_dry_run || {
-	 darwin_orig_dir=`pwd`
-	 cd $my_xdir || exit $?
-	 darwin_archive=$my_xabs
-	 darwin_curdir=`pwd`
-	 darwin_base_archive=`basename "$darwin_archive"`
-	 darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
-	 if test -n "$darwin_arches"; then
-	 darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
-	 darwin_arch=
-	 func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
-	 for darwin_arch in $darwin_arches ; do
-	 func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	 $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
-	 cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	 func_extract_an_archive "`pwd`" "${darwin_base_archive}"
-	 cd "$darwin_curdir"
-	 $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
-	 done # $darwin_arches
- ## Okay now we've a bunch of thin objects, gotta fatten them up :)
-	 darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
-	 darwin_file=
-	 darwin_files=
-	 for darwin_file in $darwin_filelist; do
-	 darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
-	 $LIPO -create -output "$darwin_file" $darwin_files
-	 done # $darwin_filelist
-	 $RM -rf unfat-$$
-	 cd "$darwin_orig_dir"
-	 else
-	 cd $darwin_orig_dir
-	 func_extract_an_archive "$my_xdir" "$my_xabs"
-	 fi # $darwin_arches
-	} # !$opt_dry_run
-	;;
- *)
- func_extract_an_archive "$my_xdir" "$my_xabs"
-	;;
- esac
- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
- done
-
- func_extract_archives_result="$my_oldobjs"
-}
-
-
-
-# func_emit_wrapper_part1 [arg=no]
-#
-# Emit the first part of a libtool wrapper script on stdout.
-# For more information, see the description associated with
-# func_emit_wrapper(), below.
-func_emit_wrapper_part1 ()
-{
-	func_emit_wrapper_part1_arg1=no
-	if test -n "$1" ; then
-	 func_emit_wrapper_part1_arg1=$1
-	fi
-
-	$ECHO "\
-#! $SHELL
-
-# $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-#
-# The $output program cannot be directly executed until all the libtool
-# libraries that it depends on are installed.
-#
-# This wrapper script should never be moved out of the build directory.
-# If it is, it will not operate correctly.
-
-# Sed substitution that helps us do robust quoting. It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='${SED} -e 1s/^X//'
-sed_quote_subst='$sed_quote_subst'
-
-# Be Bourne compatible
-if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '\${1+\"\$@\"}'='\"\$@\"'
- setopt NO_GLOB_SUBST
-else
- case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
-fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-relink_command=\"$relink_command\"
-
-# This environment variable determines our operation mode.
-if test \"\$libtool_install_magic\" = \"$magic\"; then
- # install mode needs the following variables:
- generated_by_libtool_version='$macro_version'
- notinst_deplibs='$notinst_deplibs'
-else
- # When we are sourced in execute mode, \$file and \$ECHO are already set.
- if test \"\$libtool_execute_magic\" != \"$magic\"; then
- ECHO=\"$qecho\"
- file=\"\$0\"
- # Make sure echo works.
- if test \"X\$1\" = X--no-reexec; then
- # Discard the --no-reexec flag, and continue.
- shift
- elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then
- # Yippee, \$ECHO works!
- :
- else
- # Restart under the correct shell, and then maybe \$ECHO will work.
- exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
- fi
- fi\
-"
-	$ECHO "\
-
- # Find the directory that this script lives in.
- thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
- test \"x\$thisdir\" = \"x\$file\" && thisdir=.
-
- # Follow symbolic links until we get to the real thisdir.
- file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
- while test -n \"\$file\"; do
- destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
-
- # If there was a directory component, then change thisdir.
- if test \"x\$destdir\" != \"x\$file\"; then
- case \"\$destdir\" in
- [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
- *) thisdir=\"\$thisdir/\$destdir\" ;;
- esac
- fi
-
- file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
- file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
- done
-"
-}
-# end: func_emit_wrapper_part1
-
-# func_emit_wrapper_part2 [arg=no]
-#
-# Emit the second part of a libtool wrapper script on stdout.
-# For more information, see the description associated with
-# func_emit_wrapper(), below.
-func_emit_wrapper_part2 ()
-{
-	func_emit_wrapper_part2_arg1=no
-	if test -n "$1" ; then
-	 func_emit_wrapper_part2_arg1=$1
-	fi
-
-	$ECHO "\
-
- # Usually 'no', except on cygwin/mingw when embedded into
- # the cwrapper.
- WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1
- if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
- # special case for '.'
- if test \"\$thisdir\" = \".\"; then
- thisdir=\`pwd\`
- fi
- # remove .libs from thisdir
- case \"\$thisdir\" in
- *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;
- $objdir ) thisdir=. ;;
- esac
- fi
-
- # Try to get the absolute directory name.
- absdir=\`cd \"\$thisdir\" && pwd\`
- test -n \"\$absdir\" && thisdir=\"\$absdir\"
-"
-
-	if test "$fast_install" = yes; then
-	 $ECHO "\
- program=lt-'$outputname'$exeext
- progdir=\"\$thisdir/$objdir\"
-
- if test ! -f \"\$progdir/\$program\" ||
- { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
- test \"X\$file\" != \"X\$progdir/\$program\"; }; then
-
- file=\"\$\$-\$program\"
-
- if test ! -d \"\$progdir\"; then
- $MKDIR \"\$progdir\"
- else
- $RM \"\$progdir/\$file\"
- fi"
-
-	 $ECHO "\
-
- # relink executable if necessary
- if test -n \"\$relink_command\"; then
- if relink_command_output=\`eval \$relink_command 2>&1\`; then :
- else
-	$ECHO \"\$relink_command_output\" >&2
-	$RM \"\$progdir/\$file\"
-	exit 1
- fi
- fi
-
- $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
- { $RM \"\$progdir/\$program\";
- $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; }
- $RM \"\$progdir/\$file\"
- fi"
-	else
-	 $ECHO "\
- program='$outputname'
- progdir=\"\$thisdir/$objdir\"
-"
-	fi
-
-	$ECHO "\
-
- if test -f \"\$progdir/\$program\"; then"
-
-	# Export our shlibpath_var if we have one.
-	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-	 $ECHO "\
- # Add our own library path to $shlibpath_var
- $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
-
- # Some systems cannot cope with colon-terminated $shlibpath_var
- # The second colon is a workaround for a bug in BeOS R4 sed
- $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
-
- export $shlibpath_var
-"
-	fi
-
-	# fixup the dll searchpath if we need to.
-	if test -n "$dllsearchpath"; then
-	 $ECHO "\
- # Add the dll search path components to the executable PATH
- PATH=$dllsearchpath:\$PATH
-"
-	fi
-
-	$ECHO "\
- if test \"\$libtool_execute_magic\" != \"$magic\"; then
- # Run the actual program with our arguments.
-"
-	case $host in
-	# Backslashes separate directories on plain windows
-	*-*-mingw | *-*-os2* | *-cegcc*)
-	 $ECHO "\
- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-"
-	 ;;
-
-	*)
-	 $ECHO "\
- exec \"\$progdir/\$program\" \${1+\"\$@\"}
-"
-	 ;;
-	esac
-	$ECHO "\
- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
- exit 1
- fi
- else
- # The program doesn't exist.
- \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
- \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
- $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
- exit 1
- fi
-fi\
-"
-}
-# end: func_emit_wrapper_part2
-
-
-# func_emit_wrapper [arg=no]
-#
-# Emit a libtool wrapper script on stdout.
-# Don't directly open a file because we may want to
-# incorporate the script contents within a cygwin/mingw
-# wrapper executable. Must ONLY be called from within
-# func_mode_link because it depends on a number of variables
-# set therein.
-#
-# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
-# variable will take. If 'yes', then the emitted script
-# will assume that the directory in which it is stored is
-# the $objdir directory. This is a cygwin/mingw-specific
-# behavior.
-func_emit_wrapper ()
-{
-	func_emit_wrapper_arg1=no
-	if test -n "$1" ; then
-	 func_emit_wrapper_arg1=$1
-	fi
-
-	# split this up so that func_emit_cwrapperexe_src
-	# can call each part independently.
-	func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"
-	func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"
-}
-
-
-# func_to_host_path arg
-#
-# Convert paths to host format when used with build tools.
-# Intended for use with "native" mingw (where libtool itself
-# is running under the msys shell), or in the following cross-
-# build environments:
-# $build $host
-# mingw (msys) mingw [e.g. native]
-# cygwin mingw
-# *nix + wine mingw
-# where wine is equipped with the `winepath' executable.
-# In the native mingw case, the (msys) shell automatically
-# converts paths for any non-msys applications it launches,
-# but that facility isn't available from inside the cwrapper.
-# Similar accommodations are necessary for $host mingw and
-# $build cygwin. Calling this function does no harm for other
-# $host/$build combinations not listed above.
-#
-# ARG is the path (on $build) that should be converted to
-# the proper representation for $host. The result is stored
-# in $func_to_host_path_result.
-func_to_host_path ()
-{
- func_to_host_path_result="$1"
- if test -n "$1" ; then
- case $host in
- *mingw* )
- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
- case $build in
- *mingw* ) # actually, msys
- # awkward: cmd appends spaces to result
- lt_sed_strip_trailing_spaces="s/[ ]*\$//"
- func_to_host_path_tmp1=`( cmd //c echo "$1" |\
- $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
- $SED -e "$lt_sed_naive_backslashify"`
- ;;
- *cygwin* )
- func_to_host_path_tmp1=`cygpath -w "$1"`
- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
- $SED -e "$lt_sed_naive_backslashify"`
- ;;
- * )
- # Unfortunately, winepath does not exit with a non-zero
- # error code, so we are forced to check the contents of
- # stdout. On the other hand, if the command is not
- # found, the shell will set an exit code of 127 and print
- # *an error message* to stdout. So we must check for both
- # error code of zero AND non-empty stdout, which explains
- # the odd construction:
- func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
- if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
- $SED -e "$lt_sed_naive_backslashify"`
- else
- # Allow warning below.
- func_to_host_path_result=""
- fi
- ;;
- esac
- if test -z "$func_to_host_path_result" ; then
- func_error "Could not determine host path corresponding to"
- func_error " '$1'"
- func_error "Continuing, but uninstalled executables may not work."
- # Fallback:
- func_to_host_path_result="$1"
- fi
- ;;
- esac
- fi
-}
-# end: func_to_host_path
-
-# func_to_host_pathlist arg
-#
-# Convert pathlists to host format when used with build tools.
-# See func_to_host_path(), above. This function supports the
-# following $build/$host combinations (but does no harm for
-# combinations not listed here):
-# $build $host
-# mingw (msys) mingw [e.g. native]
-# cygwin mingw
-# *nix + wine mingw
-#
-# Path separators are also converted from $build format to
-# $host format. If ARG begins or ends with a path separator
-# character, it is preserved (but converted to $host format)
-# on output.
-#
-# ARG is a pathlist (on $build) that should be converted to
-# the proper representation on $host. The result is stored
-# in $func_to_host_pathlist_result.
-func_to_host_pathlist ()
-{
- func_to_host_pathlist_result="$1"
- if test -n "$1" ; then
- case $host in
- *mingw* )
- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
- # Remove leading and trailing path separator characters from
- # ARG. msys behavior is inconsistent here, cygpath turns them
- # into '.;' and ';.', and winepath ignores them completely.
- func_to_host_pathlist_tmp2="$1"
- # Once set for this call, this variable should not be
- # reassigned. It is used in tha fallback case.
- func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\
- $SED -e 's|^:*||' -e 's|:*$||'`
- case $build in
- *mingw* ) # Actually, msys.
- # Awkward: cmd appends spaces to result.
- lt_sed_strip_trailing_spaces="s/[ ]*\$//"
- func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\
- $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
- $SED -e "$lt_sed_naive_backslashify"`
- ;;
- *cygwin* )
- func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
- $SED -e "$lt_sed_naive_backslashify"`
- ;;
- * )
- # unfortunately, winepath doesn't convert pathlists
- func_to_host_pathlist_result=""
- func_to_host_pathlist_oldIFS=$IFS
- IFS=:
- for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
- IFS=$func_to_host_pathlist_oldIFS
- if test -n "$func_to_host_pathlist_f" ; then
- func_to_host_path "$func_to_host_pathlist_f"
- if test -n "$func_to_host_path_result" ; then
- if test -z "$func_to_host_pathlist_result" ; then
- func_to_host_pathlist_result="$func_to_host_path_result"
- else
- func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"
- fi
- fi
- fi
- IFS=:
- done
- IFS=$func_to_host_pathlist_oldIFS
- ;;
- esac
- if test -z "$func_to_host_pathlist_result" ; then
- func_error "Could not determine the host path(s) corresponding to"
- func_error " '$1'"
- func_error "Continuing, but uninstalled executables may not work."
- # Fallback. This may break if $1 contains DOS-style drive
- # specifications. The fix is not to complicate the expression
- # below, but for the user to provide a working wine installation
- # with winepath so that path translation in the cross-to-mingw
- # case works properly.
- lt_replace_pathsep_nix_to_dos="s|:|;|g"
- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
- $SED -e "$lt_replace_pathsep_nix_to_dos"`
- fi
- # Now, add the leading and trailing path separators back
- case "$1" in
- :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
- ;;
- esac
- case "$1" in
- *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"
- ;;
- esac
- ;;
- esac
- fi
-}
-# end: func_to_host_pathlist
-
-# func_emit_cwrapperexe_src
-# emit the source code for a wrapper executable on stdout
-# Must ONLY be called from within func_mode_link because
-# it depends on a number of variable set therein.
-func_emit_cwrapperexe_src ()
-{
-	cat <<EOF
-
-/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
- Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-
- The $output program cannot be directly executed until all the libtool
- libraries that it depends on are installed.
-
- This wrapper executable should never be moved out of the build directory.
- If it is, it will not operate correctly.
-
- Currently, it simply execs the wrapper *script* "$SHELL $output",
- but could eventually absorb all of the scripts functionality and
- exec $objdir/$outputname directly.
-*/
-EOF
-	 cat <<"EOF"
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef _MSC_VER
-# include <direct.h>
-# include <process.h>
-# include <io.h>
-# define setmode _setmode
-#else
-# include <unistd.h>
-# include <stdint.h>
-# ifdef __CYGWIN__
-# include <io.h>
-# define HAVE_SETENV
-# ifdef __STRICT_ANSI__
-char *realpath (const char *, char *);
-int putenv (char *);
-int setenv (const char *, const char *, int);
-# endif
-# endif
-#endif
-#include <malloc.h>
-#include <stdarg.h>
-#include <assert.h>
-#include <string.h>
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-
-#if defined(PATH_MAX)
-# define LT_PATHMAX PATH_MAX
-#elif defined(MAXPATHLEN)
-# define LT_PATHMAX MAXPATHLEN
-#else
-# define LT_PATHMAX 1024
-#endif
-
-#ifndef S_IXOTH
-# define S_IXOTH 0
-#endif
-#ifndef S_IXGRP
-# define S_IXGRP 0
-#endif
-
-#ifdef _MSC_VER
-# define S_IXUSR _S_IEXEC
-# define stat _stat
-# ifndef _INTPTR_T_DEFINED
-# define intptr_t int
-# endif
-#endif
-
-#ifndef DIR_SEPARATOR
-# define DIR_SEPARATOR '/'
-# define PATH_SEPARATOR ':'
-#endif
-
-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
- defined (__OS2__)
-# define HAVE_DOS_BASED_FILE_SYSTEM
-# define FOPEN_WB "wb"
-# ifndef DIR_SEPARATOR_2
-# define DIR_SEPARATOR_2 '\\'
-# endif
-# ifndef PATH_SEPARATOR_2
-# define PATH_SEPARATOR_2 ';'
-# endif
-#endif
-
-#ifndef DIR_SEPARATOR_2
-# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
-#else /* DIR_SEPARATOR_2 */
-# define IS_DIR_SEPARATOR(ch) \
-	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
-#endif /* DIR_SEPARATOR_2 */
-
-#ifndef PATH_SEPARATOR_2
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
-#else /* PATH_SEPARATOR_2 */
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
-#endif /* PATH_SEPARATOR_2 */
-
-#ifdef __CYGWIN__
-# define FOPEN_WB "wb"
-#endif
-
-#ifndef FOPEN_WB
-# define FOPEN_WB "w"
-#endif
-#ifndef _O_BINARY
-# define _O_BINARY 0
-#endif
-
-#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type)))
-#define XFREE(stale) do { \
- if (stale) { free ((void *) stale); stale = 0; } \
-} while (0)
-
-#undef LTWRAPPER_DEBUGPRINTF
-#if defined DEBUGWRAPPER
-# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
-static void
-ltwrapper_debugprintf (const char *fmt, ...)
-{
- va_list args;
- va_start (args, fmt);
- (void) vfprintf (stderr, fmt, args);
- va_end (args);
-}
-#else
-# define LTWRAPPER_DEBUGPRINTF(args)
-#endif
-
-const char *program_name = NULL;
-
-void *xmalloc (size_t num);
-char *xstrdup (const char *string);
-const char *base_name (const char *name);
-char *find_executable (const char *wrapper);
-char *chase_symlinks (const char *pathspec);
-int make_executable (const char *path);
-int check_executable (const char *path);
-char *strendzap (char *str, const char *pat);
-void lt_fatal (const char *message, ...);
-void lt_setenv (const char *name, const char *value);
-char *lt_extend_str (const char *orig_value, const char *add, int to_end);
-void lt_opt_process_env_set (const char *arg);
-void lt_opt_process_env_prepend (const char *arg);
-void lt_opt_process_env_append (const char *arg);
-int lt_split_name_value (const char *arg, char** name, char** value);
-void lt_update_exe_path (const char *name, const char *value);
-void lt_update_lib_path (const char *name, const char *value);
-
-static const char *script_text_part1 =
-EOF
-
-	 func_emit_wrapper_part1 yes |
-	 $SED -e 's/$[\\"]$/\\\1/g' \
-	 -e 's/^/ "/' -e 's/$/\\n"/'
-	 echo ";"
-	 cat <<EOF
-
-static const char *script_text_part2 =
-EOF
-	 func_emit_wrapper_part2 yes |
-	 $SED -e 's/$[\\"]$/\\\1/g' \
-	 -e 's/^/ "/' -e 's/$/\\n"/'
-	 echo ";"
-
-	 cat <<EOF
-const char * MAGIC_EXE = "$magic_exe";
-const char * LIB_PATH_VARNAME = "$shlibpath_var";
-EOF
-
-	 if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
- func_to_host_pathlist "$temp_rpath"
-	 cat <<EOF
-const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result";
-EOF
-	 else
-	 cat <<"EOF"
-const char * LIB_PATH_VALUE = "";
-EOF
-	 fi
-
-	 if test -n "$dllsearchpath"; then
- func_to_host_pathlist "$dllsearchpath:"
-	 cat <<EOF
-const char * EXE_PATH_VARNAME = "PATH";
-const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result";
-EOF
-	 else
-	 cat <<"EOF"
-const char * EXE_PATH_VARNAME = "";
-const char * EXE_PATH_VALUE = "";
-EOF
-	 fi
-
-	 if test "$fast_install" = yes; then
-	 cat <<EOF
-const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
-EOF
-	 else
-	 cat <<EOF
-const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */
-EOF
-	 fi
-
-
-	 cat <<"EOF"
-
-#define LTWRAPPER_OPTION_PREFIX "--lt-"
-#define LTWRAPPER_OPTION_PREFIX_LENGTH 5
-
-static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH;
-static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
-
-static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script";
-
-static const size_t env_set_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;
-static const char *env_set_opt = LTWRAPPER_OPTION_PREFIX "env-set";
- /* argument is putenv-style "foo=bar", value of foo is set to bar */
-
-static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;
-static const char *env_prepend_opt = LTWRAPPER_OPTION_PREFIX "env-prepend";
- /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */
-
-static const size_t env_append_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;
-static const char *env_append_opt = LTWRAPPER_OPTION_PREFIX "env-append";
- /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */
-
-int
-main (int argc, char *argv[])
-{
- char **newargz;
- int newargc;
- char *tmp_pathspec;
- char *actual_cwrapper_path;
- char *actual_cwrapper_name;
- char *target_name;
- char *lt_argv_zero;
- intptr_t rval = 127;
-
- int i;
-
- program_name = (char *) xstrdup (base_name (argv[0]));
- LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0]));
- LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
-
- /* very simple arg parsing; don't want to rely on getopt */
- for (i = 1; i < argc; i++)
- {
- if (strcmp (argv[i], dumpscript_opt) == 0)
-	{
-EOF
-	 case "$host" in
-	 *mingw* | *cygwin* )
-		# make stdout use "unix" line endings
-		echo " setmode(1,_O_BINARY);"
-		;;
-	 esac
-
-	 cat <<"EOF"
-	 printf ("%s", script_text_part1);
-	 printf ("%s", script_text_part2);
-	 return 0;
-	}
- }
-
- newargz = XMALLOC (char *, argc + 1);
- tmp_pathspec = find_executable (argv[0]);
- if (tmp_pathspec == NULL)
- lt_fatal ("Couldn't find %s", argv[0]);
- LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
-			 tmp_pathspec));
-
- actual_cwrapper_path = chase_symlinks (tmp_pathspec);
- LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
-			 actual_cwrapper_path));
- XFREE (tmp_pathspec);
-
- actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
- strendzap (actual_cwrapper_path, actual_cwrapper_name);
-
- /* wrapper name transforms */
- strendzap (actual_cwrapper_name, ".exe");
- tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1);
- XFREE (actual_cwrapper_name);
- actual_cwrapper_name = tmp_pathspec;
- tmp_pathspec = 0;
-
- /* target_name transforms -- use actual target program name; might have lt- prefix */
- target_name = xstrdup (base_name (TARGET_PROGRAM_NAME));
- strendzap (target_name, ".exe");
- tmp_pathspec = lt_extend_str (target_name, ".exe", 1);
- XFREE (target_name);
- target_name = tmp_pathspec;
- tmp_pathspec = 0;
-
- LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
-			 target_name));
-EOF
-
-	 cat <<EOF
- newargz[0] =
- XMALLOC (char, (strlen (actual_cwrapper_path) +
-		 strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1));
- strcpy (newargz[0], actual_cwrapper_path);
- strcat (newargz[0], "$objdir");
- strcat (newargz[0], "/");
-EOF
-
-	 cat <<"EOF"
- /* stop here, and copy so we don't have to do this twice */
- tmp_pathspec = xstrdup (newargz[0]);
-
- /* do NOT want the lt- prefix here, so use actual_cwrapper_name */
- strcat (newargz[0], actual_cwrapper_name);
-
- /* DO want the lt- prefix here if it exists, so use target_name */
- lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);
- XFREE (tmp_pathspec);
- tmp_pathspec = NULL;
-EOF
-
-	 case $host_os in
-	 mingw*)
-	 cat <<"EOF"
- {
- char* p;
- while ((p = strchr (newargz[0], '\\')) != NULL)
- {
-	*p = '/';
- }
- while ((p = strchr (lt_argv_zero, '\\')) != NULL)
- {
-	*p = '/';
- }
- }
-EOF
-	 ;;
-	 esac
-
-	 cat <<"EOF"
- XFREE (target_name);
- XFREE (actual_cwrapper_path);
- XFREE (actual_cwrapper_name);
-
- lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
- lt_setenv ("DUALCASE", "1"); /* for MSK sh */
- lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
- lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
-
- newargc=0;
- for (i = 1; i < argc; i++)
- {
- if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)
- {
- if (argv[i][env_set_opt_len] == '=')
- {
- const char *p = argv[i] + env_set_opt_len + 1;
- lt_opt_process_env_set (p);
- }
- else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)
- {
- lt_opt_process_env_set (argv[++i]); /* don't copy */
- }
- else
- lt_fatal ("%s missing required argument", env_set_opt);
- continue;
- }
- if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)
- {
- if (argv[i][env_prepend_opt_len] == '=')
- {
- const char *p = argv[i] + env_prepend_opt_len + 1;
- lt_opt_process_env_prepend (p);
- }
- else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)
- {
- lt_opt_process_env_prepend (argv[++i]); /* don't copy */
- }
- else
- lt_fatal ("%s missing required argument", env_prepend_opt);
- continue;
- }
- if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)
- {
- if (argv[i][env_append_opt_len] == '=')
- {
- const char *p = argv[i] + env_append_opt_len + 1;
- lt_opt_process_env_append (p);
- }
- else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)
- {
- lt_opt_process_env_append (argv[++i]); /* don't copy */
- }
- else
- lt_fatal ("%s missing required argument", env_append_opt);
- continue;
- }
- if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
- {
- /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
- namespace, but it is not one of the ones we know about and
- have already dealt with, above (inluding dump-script), then
- report an error. Otherwise, targets might begin to believe
- they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
- namespace. The first time any user complains about this, we'll
- need to make LTWRAPPER_OPTION_PREFIX a configure-time option
- or a configure.ac-settable value.
- */
- lt_fatal ("Unrecognized option in %s namespace: '%s'",
- ltwrapper_option_prefix, argv[i]);
- }
- /* otherwise ... */
- newargz[++newargc] = xstrdup (argv[i]);
- }
- newargz[++newargc] = NULL;
-
- LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
- for (i = 0; i < newargc; i++)
- {
- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
- }
-
-EOF
-
-	 case $host_os in
-	 mingw*)
-		cat <<"EOF"
- /* execv doesn't actually work on mingw as expected on unix */
- rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
- if (rval == -1)
- {
- /* failed to start process */
- LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
- return 127;
- }
- return rval;
-EOF
-		;;
-	 *)
-		cat <<"EOF"
- execv (lt_argv_zero, newargz);
- return rval; /* =127, but avoids unused variable warning */
-EOF
-		;;
-	 esac
-
-	 cat <<"EOF"
-}
-
-void *
-xmalloc (size_t num)
-{
- void *p = (void *) malloc (num);
- if (!p)
- lt_fatal ("Memory exhausted");
-
- return p;
-}
-
-char *
-xstrdup (const char *string)
-{
- return string ? strcpy ((char *) xmalloc (strlen (string) + 1),
-			 string) : NULL;
-}
-
-const char *
-base_name (const char *name)
-{
- const char *base;
-
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
- /* Skip over the disk name in MSDOS pathnames. */
- if (isalpha ((unsigned char) name[0]) && name[1] == ':')
- name += 2;
-#endif
-
- for (base = name; *name; name++)
- if (IS_DIR_SEPARATOR (*name))
- base = name + 1;
- return base;
-}
-
-int
-check_executable (const char *path)
-{
- struct stat st;
-
- LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n",
-			 path ? (*path ? path : "EMPTY!") : "NULL!"));
- if ((!path) || (!*path))
- return 0;
-
- if ((stat (path, &st) >= 0)
- && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
- return 1;
- else
- return 0;
-}
-
-int
-make_executable (const char *path)
-{
- int rval = 0;
- struct stat st;
-
- LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n",
-			 path ? (*path ? path : "EMPTY!") : "NULL!"));
- if ((!path) || (!*path))
- return 0;
-
- if (stat (path, &st) >= 0)
- {
- rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR);
- }
- return rval;
-}
-
-/* Searches for the full path of the wrapper. Returns
- newly allocated full path name if found, NULL otherwise
- Does not chase symlinks, even on platforms that support them.
-*/
-char *
-find_executable (const char *wrapper)
-{
- int has_slash = 0;
- const char *p;
- const char *p_next;
- /* static buffer for getcwd */
- char tmp[LT_PATHMAX + 1];
- int tmp_len;
- char *concat_name;
-
- LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n",
-			 wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
-
- if ((wrapper == NULL) || (*wrapper == '\0'))
- return NULL;
-
- /* Absolute path? */
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
- if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
- {
- concat_name = xstrdup (wrapper);
- if (check_executable (concat_name))
-	return concat_name;
- XFREE (concat_name);
- }
- else
- {
-#endif
- if (IS_DIR_SEPARATOR (wrapper[0]))
-	{
-	 concat_name = xstrdup (wrapper);
-	 if (check_executable (concat_name))
-	 return concat_name;
-	 XFREE (concat_name);
-	}
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
- }
-#endif
-
- for (p = wrapper; *p; p++)
- if (*p == '/')
- {
-	has_slash = 1;
-	break;
- }
- if (!has_slash)
- {
- /* no slashes; search PATH */
- const char *path = getenv ("PATH");
- if (path != NULL)
-	{
-	 for (p = path; *p; p = p_next)
-	 {
-	 const char *q;
-	 size_t p_len;
-	 for (q = p; *q; q++)
-		if (IS_PATH_SEPARATOR (*q))
-		 break;
-	 p_len = q - p;
-	 p_next = (*q == '\0' ? q : q + 1);
-	 if (p_len == 0)
-		{
-		 /* empty path: current directory */
-		 if (getcwd (tmp, LT_PATHMAX) == NULL)
-		 lt_fatal ("getcwd failed");
-		 tmp_len = strlen (tmp);
-		 concat_name =
-		 XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-		 memcpy (concat_name, tmp, tmp_len);
-		 concat_name[tmp_len] = '/';
-		 strcpy (concat_name + tmp_len + 1, wrapper);
-		}
-	 else
-		{
-		 concat_name =
-		 XMALLOC (char, p_len + 1 + strlen (wrapper) + 1);
-		 memcpy (concat_name, p, p_len);
-		 concat_name[p_len] = '/';
-		 strcpy (concat_name + p_len + 1, wrapper);
-		}
-	 if (check_executable (concat_name))
-		return concat_name;
-	 XFREE (concat_name);
-	 }
-	}
- /* not found in PATH; assume curdir */
- }
- /* Relative path | not found in path: prepend cwd */
- if (getcwd (tmp, LT_PATHMAX) == NULL)
- lt_fatal ("getcwd failed");
- tmp_len = strlen (tmp);
- concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
- memcpy (concat_name, tmp, tmp_len);
- concat_name[tmp_len] = '/';
- strcpy (concat_name + tmp_len + 1, wrapper);
-
- if (check_executable (concat_name))
- return concat_name;
- XFREE (concat_name);
- return NULL;
-}
-
-char *
-chase_symlinks (const char *pathspec)
-{
-#ifndef S_ISLNK
- return xstrdup (pathspec);
-#else
- char buf[LT_PATHMAX];
- struct stat s;
- char *tmp_pathspec = xstrdup (pathspec);
- char *p;
- int has_symlinks = 0;
- while (strlen (tmp_pathspec) && !has_symlinks)
- {
- LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
-			 tmp_pathspec));
- if (lstat (tmp_pathspec, &s) == 0)
-	{
-	 if (S_ISLNK (s.st_mode) != 0)
-	 {
-	 has_symlinks = 1;
-	 break;
-	 }
-
-	 /* search backwards for last DIR_SEPARATOR */
-	 p = tmp_pathspec + strlen (tmp_pathspec) - 1;
-	 while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
-	 p--;
-	 if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
-	 {
-	 /* no more DIR_SEPARATORS left */
-	 break;
-	 }
-	 *p = '\0';
-	}
- else
-	{
-	 char *errstr = strerror (errno);
-	 lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
-	}
- }
- XFREE (tmp_pathspec);
-
- if (!has_symlinks)
- {
- return xstrdup (pathspec);
- }
-
- tmp_pathspec = realpath (pathspec, buf);
- if (tmp_pathspec == 0)
- {
- lt_fatal ("Could not follow symlinks for %s", pathspec);
- }
- return xstrdup (tmp_pathspec);
-#endif
-}
-
-char *
-strendzap (char *str, const char *pat)
-{
- size_t len, patlen;
-
- assert (str != NULL);
- assert (pat != NULL);
-
- len = strlen (str);
- patlen = strlen (pat);
-
- if (patlen <= len)
- {
- str += len - patlen;
- if (strcmp (str, pat) == 0)
-	*str = '\0';
- }
- return str;
-}
-
-static void
-lt_error_core (int exit_status, const char *mode,
-	 const char *message, va_list ap)
-{
- fprintf (stderr, "%s: %s: ", program_name, mode);
- vfprintf (stderr, message, ap);
- fprintf (stderr, ".\n");
-
- if (exit_status >= 0)
- exit (exit_status);
-}
-
-void
-lt_fatal (const char *message, ...)
-{
- va_list ap;
- va_start (ap, message);
- lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
- va_end (ap);
-}
-
-void
-lt_setenv (const char *name, const char *value)
-{
- LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
- (name ? name : "<NULL>"),
- (value ? value : "<NULL>")));
- {
-#ifdef HAVE_SETENV
- /* always make a copy, for consistency with !HAVE_SETENV */
- char *str = xstrdup (value);
- setenv (name, str, 1);
-#else
- int len = strlen (name) + 1 + strlen (value) + 1;
- char *str = XMALLOC (char, len);
- sprintf (str, "%s=%s", name, value);
- if (putenv (str) != EXIT_SUCCESS)
- {
- XFREE (str);
- }
-#endif
- }
-}
-
-char *
-lt_extend_str (const char *orig_value, const char *add, int to_end)
-{
- char *new_value;
- if (orig_value && *orig_value)
- {
- int orig_value_len = strlen (orig_value);
- int add_len = strlen (add);
- new_value = XMALLOC (char, add_len + orig_value_len + 1);
- if (to_end)
- {
- strcpy (new_value, orig_value);
- strcpy (new_value + orig_value_len, add);
- }
- else
- {
- strcpy (new_value, add);
- strcpy (new_value + add_len, orig_value);
- }
- }
- else
- {
- new_value = xstrdup (add);
- }
- return new_value;
-}
-
-int
-lt_split_name_value (const char *arg, char** name, char** value)
-{
- const char *p;
- int len;
- if (!arg || !*arg)
- return 1;
-
- p = strchr (arg, (int)'=');
-
- if (!p)
- return 1;
-
- *value = xstrdup (++p);
-
- len = strlen (arg) - strlen (*value);
- *name = XMALLOC (char, len);
- strncpy (*name, arg, len-1);
- (*name)[len - 1] = '\0';
-
- return 0;
-}
-
-void
-lt_opt_process_env_set (const char *arg)
-{
- char *name = NULL;
- char *value = NULL;
-
- if (lt_split_name_value (arg, &name, &value) != 0)
- {
- XFREE (name);
- XFREE (value);
- lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);
- }
-
- lt_setenv (name, value);
- XFREE (name);
- XFREE (value);
-}
-
-void
-lt_opt_process_env_prepend (const char *arg)
-{
- char *name = NULL;
- char *value = NULL;
- char *new_value = NULL;
-
- if (lt_split_name_value (arg, &name, &value) != 0)
- {
- XFREE (name);
- XFREE (value);
- lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);
- }
-
- new_value = lt_extend_str (getenv (name), value, 0);
- lt_setenv (name, new_value);
- XFREE (new_value);
- XFREE (name);
- XFREE (value);
-}
-
-void
-lt_opt_process_env_append (const char *arg)
-{
- char *name = NULL;
- char *value = NULL;
- char *new_value = NULL;
-
- if (lt_split_name_value (arg, &name, &value) != 0)
- {
- XFREE (name);
- XFREE (value);
- lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);
- }
-
- new_value = lt_extend_str (getenv (name), value, 1);
- lt_setenv (name, new_value);
- XFREE (new_value);
- XFREE (name);
- XFREE (value);
-}
-
-void
-lt_update_exe_path (const char *name, const char *value)
-{
- LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
- (name ? name : "<NULL>"),
- (value ? value : "<NULL>")));
-
- if (name && *name && value && *value)
- {
- char *new_value = lt_extend_str (getenv (name), value, 0);
- /* some systems can't cope with a ':'-terminated path #' */
- int len = strlen (new_value);
- while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
- {
- new_value[len-1] = '\0';
- }
- lt_setenv (name, new_value);
- XFREE (new_value);
- }
-}
-
-void
-lt_update_lib_path (const char *name, const char *value)
-{
- LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
- (name ? name : "<NULL>"),
- (value ? value : "<NULL>")));
-
- if (name && *name && value && *value)
- {
- char *new_value = lt_extend_str (getenv (name), value, 0);
- lt_setenv (name, new_value);
- XFREE (new_value);
- }
-}
-
-
-EOF
-}
-# end: func_emit_cwrapperexe_src
-
-# func_mode_link arg...
-func_mode_link ()
-{
- $opt_debug
- case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
- # It is impossible to link a dll without this setting, and
- # we shouldn't force the makefile maintainer to figure out
- # which system we are compiling for in order to pass an extra
- # flag for every libtool invocation.
- # allow_undefined=no
-
- # FIXME: Unfortunately, there are problems with the above when trying
- # to make a dll which has undefined symbols, in which case not
- # even a static library is built. For now, we need to specify
- # -no-undefined on the libtool link line when we can be certain
- # that all symbols are satisfied, otherwise we get a static library.
- allow_undefined=yes
- ;;
- *)
- allow_undefined=yes
- ;;
- esac
- libtool_args=$nonopt
- base_compile="$nonopt $@"
- compile_command=$nonopt
- finalize_command=$nonopt
-
- compile_rpath=
- finalize_rpath=
- compile_shlibpath=
- finalize_shlibpath=
- convenience=
- old_convenience=
- deplibs=
- old_deplibs=
- compiler_flags=
- linker_flags=
- dllsearchpath=
- lib_search_path=`pwd`
- inst_prefix_dir=
- new_inherited_linker_flags=
-
- avoid_version=no
- dlfiles=
- dlprefiles=
- dlself=no
- export_dynamic=no
- export_symbols=
- export_symbols_regex=
- generated=
- libobjs=
- ltlibs=
- module=no
- no_install=no
- objs=
- non_pic_objects=
- precious_files_regex=
- prefer_static_libs=no
- preload=no
- prev=
- prevarg=
- release=
- rpath=
- xrpath=
- perm_rpath=
- temp_rpath=
- thread_safe=no
- vinfo=
- vinfo_number=no
- weak_libs=
- single_module="${wl}-single_module"
- func_infer_tag $base_compile
-
- # We need to know -static, to get the right output filenames.
- for arg
- do
- case $arg in
- -shared)
-	test "$build_libtool_libs" != yes && \
-	 func_fatal_configuration "can not build a shared library"
-	build_old_libs=no
-	break
-	;;
- -all-static | -static | -static-libtool-libs)
-	case $arg in
-	-all-static)
-	 if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
-	 func_warning "complete static linking is impossible in this configuration"
-	 fi
-	 if test -n "$link_static_flag"; then
-	 dlopen_self=$dlopen_self_static
-	 fi
-	 prefer_static_libs=yes
-	 ;;
-	-static)
-	 if test -z "$pic_flag" && test -n "$link_static_flag"; then
-	 dlopen_self=$dlopen_self_static
-	 fi
-	 prefer_static_libs=built
-	 ;;
-	-static-libtool-libs)
-	 if test -z "$pic_flag" && test -n "$link_static_flag"; then
-	 dlopen_self=$dlopen_self_static
-	 fi
-	 prefer_static_libs=yes
-	 ;;
-	esac
-	build_libtool_libs=no
-	build_old_libs=yes
-	break
-	;;
- esac
- done
-
- # See if our shared archives depend on static archives.
- test -n "$old_archive_from_new_cmds" && build_old_libs=yes
-
- # Go through the arguments, transforming them on the way.
- while test "$#" -gt 0; do
- arg="$1"
- shift
- func_quote_for_eval "$arg"
- qarg=$func_quote_for_eval_unquoted_result
- func_append libtool_args " $func_quote_for_eval_result"
-
- # If the previous option needs an argument, assign it.
- if test -n "$prev"; then
-	case $prev in
-	output)
-	 func_append compile_command " @OUTPUT@"
-	 func_append finalize_command " @OUTPUT@"
-	 ;;
-	esac
-
-	case $prev in
-	dlfiles|dlprefiles)
-	 if test "$preload" = no; then
-	 # Add the symbol object into the linking commands.
-	 func_append compile_command " @SYMFILE@"
-	 func_append finalize_command " @SYMFILE@"
-	 preload=yes
-	 fi
-	 case $arg in
-	 *.la | *.lo) ;; # We handle these cases below.
-	 force)
-	 if test "$dlself" = no; then
-	 dlself=needless
-	 export_dynamic=yes
-	 fi
-	 prev=
-	 continue
-	 ;;
-	 self)
-	 if test "$prev" = dlprefiles; then
-	 dlself=yes
-	 elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
-	 dlself=yes
-	 else
-	 dlself=needless
-	 export_dynamic=yes
-	 fi
-	 prev=
-	 continue
-	 ;;
-	 *)
-	 if test "$prev" = dlfiles; then
-	 dlfiles="$dlfiles $arg"
-	 else
-	 dlprefiles="$dlprefiles $arg"
-	 fi
-	 prev=
-	 continue
-	 ;;
-	 esac
-	 ;;
-	expsyms)
-	 export_symbols="$arg"
-	 test -f "$arg" \
-	 || func_fatal_error "symbol file \`$arg' does not exist"
-	 prev=
-	 continue
-	 ;;
-	expsyms_regex)
-	 export_symbols_regex="$arg"
-	 prev=
-	 continue
-	 ;;
-	framework)
-	 case $host in
-	 *-*-darwin*)
-	 case "$deplibs " in
-		*" $qarg.ltframework "*) ;;
-		*) deplibs="$deplibs $qarg.ltframework" # this is fixed later
-		 ;;
-	 esac
-	 ;;
-	 esac
-	 prev=
-	 continue
-	 ;;
-	inst_prefix)
-	 inst_prefix_dir="$arg"
-	 prev=
-	 continue
-	 ;;
-	objectlist)
-	 if test -f "$arg"; then
-	 save_arg=$arg
-	 moreargs=
-	 for fil in `cat "$save_arg"`
-	 do
-#	 moreargs="$moreargs $fil"
-	 arg=$fil
-	 # A libtool-controlled object.
-
-	 # Check to see that this really is a libtool object.
-	 if func_lalib_unsafe_p "$arg"; then
-		pic_object=
-		non_pic_object=
-
-		# Read the .lo file
-		func_source "$arg"
-
-		if test -z "$pic_object" ||
-		 test -z "$non_pic_object" ||
-		 test "$pic_object" = none &&
-		 test "$non_pic_object" = none; then
-		 func_fatal_error "cannot find name of object for \`$arg'"
-		fi
-
-		# Extract subdirectory from the argument.
-		func_dirname "$arg" "/" ""
-		xdir="$func_dirname_result"
-
-		if test "$pic_object" != none; then
-		 # Prepend the subdirectory the object is found in.
-		 pic_object="$xdir$pic_object"
-
-		 if test "$prev" = dlfiles; then
-		 if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		 dlfiles="$dlfiles $pic_object"
-		 prev=
-		 continue
-		 else
-		 # If libtool objects are unsupported, then we need to preload.
-		 prev=dlprefiles
-		 fi
-		 fi
-
-		 # CHECK ME: I think I busted this. -Ossama
-		 if test "$prev" = dlprefiles; then
-		 # Preload the old-style object.
-		 dlprefiles="$dlprefiles $pic_object"
-		 prev=
-		 fi
-
-		 # A PIC object.
-		 func_append libobjs " $pic_object"
-		 arg="$pic_object"
-		fi
-
-		# Non-PIC object.
-		if test "$non_pic_object" != none; then
-		 # Prepend the subdirectory the object is found in.
-		 non_pic_object="$xdir$non_pic_object"
-
-		 # A standard non-PIC object
-		 func_append non_pic_objects " $non_pic_object"
-		 if test -z "$pic_object" || test "$pic_object" = none ; then
-		 arg="$non_pic_object"
-		 fi
-		else
-		 # If the PIC object exists, use it instead.
-		 # $xdir was prepended to $pic_object above.
-		 non_pic_object="$pic_object"
-		 func_append non_pic_objects " $non_pic_object"
-		fi
-	 else
-		# Only an error if not doing a dry-run.
-		if $opt_dry_run; then
-		 # Extract subdirectory from the argument.
-		 func_dirname "$arg" "/" ""
-		 xdir="$func_dirname_result"
-
-		 func_lo2o "$arg"
-		 pic_object=$xdir$objdir/$func_lo2o_result
-		 non_pic_object=$xdir$func_lo2o_result
-		 func_append libobjs " $pic_object"
-		 func_append non_pic_objects " $non_pic_object"
-	 else
-		 func_fatal_error "\`$arg' is not a valid libtool object"
-		fi
-	 fi
-	 done
-	 else
-	 func_fatal_error "link input file \`$arg' does not exist"
-	 fi
-	 arg=$save_arg
-	 prev=
-	 continue
-	 ;;
-	precious_regex)
-	 precious_files_regex="$arg"
-	 prev=
-	 continue
-	 ;;
-	release)
-	 release="-$arg"
-	 prev=
-	 continue
-	 ;;
-	rpath | xrpath)
-	 # We need an absolute path.
-	 case $arg in
-	 [\\/]* | [A-Za-z]:[\\/]*) ;;
-	 *)
-	 func_fatal_error "only absolute run-paths are allowed"
-	 ;;
-	 esac
-	 if test "$prev" = rpath; then
-	 case "$rpath " in
-	 *" $arg "*) ;;
-	 *) rpath="$rpath $arg" ;;
-	 esac
-	 else
-	 case "$xrpath " in
-	 *" $arg "*) ;;
-	 *) xrpath="$xrpath $arg" ;;
-	 esac
-	 fi
-	 prev=
-	 continue
-	 ;;
-	shrext)
-	 shrext_cmds="$arg"
-	 prev=
-	 continue
-	 ;;
-	weak)
-	 weak_libs="$weak_libs $arg"
-	 prev=
-	 continue
-	 ;;
-	xcclinker)
-	 linker_flags="$linker_flags $qarg"
-	 compiler_flags="$compiler_flags $qarg"
-	 prev=
-	 func_append compile_command " $qarg"
-	 func_append finalize_command " $qarg"
-	 continue
-	 ;;
-	xcompiler)
-	 compiler_flags="$compiler_flags $qarg"
-	 prev=
-	 func_append compile_command " $qarg"
-	 func_append finalize_command " $qarg"
-	 continue
-	 ;;
-	xlinker)
-	 linker_flags="$linker_flags $qarg"
-	 compiler_flags="$compiler_flags $wl$qarg"
-	 prev=
-	 func_append compile_command " $wl$qarg"
-	 func_append finalize_command " $wl$qarg"
-	 continue
-	 ;;
-	*)
-	 eval "$prev=\"\$arg\""
-	 prev=
-	 continue
-	 ;;
-	esac
- fi # test -n "$prev"
-
- prevarg="$arg"
-
- case $arg in
- -all-static)
-	if test -n "$link_static_flag"; then
-	 # See comment for -static flag below, for more details.
-	 func_append compile_command " $link_static_flag"
-	 func_append finalize_command " $link_static_flag"
-	fi
-	continue
-	;;
-
- -allow-undefined)
-	# FIXME: remove this flag sometime in the future.
-	func_fatal_error "\`-allow-undefined' must not be used because it is the default"
-	;;
-
- -avoid-version)
-	avoid_version=yes
-	continue
-	;;
-
- -dlopen)
-	prev=dlfiles
-	continue
-	;;
-
- -dlpreopen)
-	prev=dlprefiles
-	continue
-	;;
-
- -export-dynamic)
-	export_dynamic=yes
-	continue
-	;;
-
- -export-symbols | -export-symbols-regex)
-	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	 func_fatal_error "more than one -exported-symbols argument is not allowed"
-	fi
-	if test "X$arg" = "X-export-symbols"; then
-	 prev=expsyms
-	else
-	 prev=expsyms_regex
-	fi
-	continue
-	;;
-
- -framework)
-	prev=framework
-	continue
-	;;
-
- -inst-prefix-dir)
-	prev=inst_prefix
-	continue
-	;;
-
- # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
- # so, if we see these flags be careful not to treat them like -L
- -L[A-Z][A-Z]*:*)
-	case $with_gcc/$host in
-	no/*-*-irix* | /*-*-irix*)
-	 func_append compile_command " $arg"
-	 func_append finalize_command " $arg"
-	 ;;
-	esac
-	continue
-	;;
-
- -L*)
-	func_stripname '-L' '' "$arg"
-	dir=$func_stripname_result
-	if test -z "$dir"; then
-	 if test "$#" -gt 0; then
-	 func_fatal_error "require no space between \`-L' and \`$1'"
-	 else
-	 func_fatal_error "need path for \`-L' option"
-	 fi
-	fi
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	 absdir=`cd "$dir" && pwd`
-	 test -z "$absdir" && \
-	 func_fatal_error "cannot determine absolute directory name of \`$dir'"
-	 dir="$absdir"
-	 ;;
-	esac
-	case "$deplibs " in
-	*" -L$dir "*) ;;
-	*)
-	 deplibs="$deplibs -L$dir"
-	 lib_search_path="$lib_search_path $dir"
-	 ;;
-	esac
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-	 testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
-	 case :$dllsearchpath: in
-	 *":$dir:"*) ;;
-	 ::) dllsearchpath=$dir;;
-	 *) dllsearchpath="$dllsearchpath:$dir";;
-	 esac
-	 case :$dllsearchpath: in
-	 *":$testbindir:"*) ;;
-	 ::) dllsearchpath=$testbindir;;
-	 *) dllsearchpath="$dllsearchpath:$testbindir";;
-	 esac
-	 ;;
-	esac
-	continue
-	;;
-
- -l*)
-	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
-	 case $host in
-	 *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
-	 # These systems don't actually have a C or math library (as such)
-	 continue
-	 ;;
-	 *-*-os2*)
-	 # These systems don't actually have a C library (as such)
-	 test "X$arg" = "X-lc" && continue
-	 ;;
-	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	 # Do not include libc due to us having libc/libc_r.
-	 test "X$arg" = "X-lc" && continue
-	 ;;
-	 *-*-rhapsody* | *-*-darwin1.[012])
-	 # Rhapsody C and math libraries are in the System framework
-	 deplibs="$deplibs System.ltframework"
-	 continue
-	 ;;
-	 *-*-sco3.2v5* | *-*-sco5v6*)
-	 # Causes problems with __ctype
-	 test "X$arg" = "X-lc" && continue
-	 ;;
-	 *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-	 # Compiler inserts libc in the correct place for threads to work
-	 test "X$arg" = "X-lc" && continue
-	 ;;
-	 esac
-	elif test "X$arg" = "X-lc_r"; then
-	 case $host in
-	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	 # Do not include libc_r directly, use -pthread flag.
-	 continue
-	 ;;
-	 esac
-	fi
-	deplibs="$deplibs $arg"
-	continue
-	;;
-
- -module)
-	module=yes
-	continue
-	;;
-
- # Tru64 UNIX uses -model [arg] to determine the layout of C++
- # classes, name mangling, and exception handling.
- # Darwin uses the -arch flag to determine output architecture.
- -model|-arch|-isysroot)
-	compiler_flags="$compiler_flags $arg"
-	func_append compile_command " $arg"
-	func_append finalize_command " $arg"
-	prev=xcompiler
-	continue
-	;;
-
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
-	compiler_flags="$compiler_flags $arg"
-	func_append compile_command " $arg"
-	func_append finalize_command " $arg"
-	case "$new_inherited_linker_flags " in
-	 *" $arg "*) ;;
-	 * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
-	esac
-	continue
-	;;
-
- -multi_module)
-	single_module="${wl}-multi_module"
-	continue
-	;;
-
- -no-fast-install)
-	fast_install=no
-	continue
-	;;
-
- -no-install)
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
-	 # The PATH hackery in wrapper scripts is required on Windows
-	 # and Darwin in order for the loader to find any dlls it needs.
-	 func_warning "\`-no-install' is ignored for $host"
-	 func_warning "assuming \`-no-fast-install' instead"
-	 fast_install=no
-	 ;;
-	*) no_install=yes ;;
-	esac
-	continue
-	;;
-
- -no-undefined)
-	allow_undefined=no
-	continue
-	;;
-
- -objectlist)
-	prev=objectlist
-	continue
-	;;
-
- -o) prev=output ;;
-
- -precious-files-regex)
-	prev=precious_regex
-	continue
-	;;
-
- -release)
-	prev=release
-	continue
-	;;
-
- -rpath)
-	prev=rpath
-	continue
-	;;
-
- -R)
-	prev=xrpath
-	continue
-	;;
-
- -R*)
-	func_stripname '-R' '' "$arg"
-	dir=$func_stripname_result
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	 func_fatal_error "only absolute run-paths are allowed"
-	 ;;
-	esac
-	case "$xrpath " in
-	*" $dir "*) ;;
-	*) xrpath="$xrpath $dir" ;;
-	esac
-	continue
-	;;
-
- -shared)
-	# The effects of -shared are defined in a previous loop.
-	continue
-	;;
-
- -shrext)
-	prev=shrext
-	continue
-	;;
-
- -static | -static-libtool-libs)
-	# The effects of -static are defined in a previous loop.
-	# We used to do the same as -all-static on platforms that
-	# didn't have a PIC flag, but the assumption that the effects
-	# would be equivalent was wrong. It would break on at least
-	# Digital Unix and AIX.
-	continue
-	;;
-
- -thread-safe)
-	thread_safe=yes
-	continue
-	;;
-
- -version-info)
-	prev=vinfo
-	continue
-	;;
-
- -version-number)
-	prev=vinfo
-	vinfo_number=yes
-	continue
-	;;
-
- -weak)
- prev=weak
-	continue
-	;;
-
- -Wc,*)
-	func_stripname '-Wc,' '' "$arg"
-	args=$func_stripname_result
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	 IFS="$save_ifs"
- func_quote_for_eval "$flag"
-	 arg="$arg $wl$func_quote_for_eval_result"
-	 compiler_flags="$compiler_flags $func_quote_for_eval_result"
-	done
-	IFS="$save_ifs"
-	func_stripname ' ' '' "$arg"
-	arg=$func_stripname_result
-	;;
-
- -Wl,*)
-	func_stripname '-Wl,' '' "$arg"
-	args=$func_stripname_result
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	 IFS="$save_ifs"
- func_quote_for_eval "$flag"
-	 arg="$arg $wl$func_quote_for_eval_result"
-	 compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
-	 linker_flags="$linker_flags $func_quote_for_eval_result"
-	done
-	IFS="$save_ifs"
-	func_stripname ' ' '' "$arg"
-	arg=$func_stripname_result
-	;;
-
- -Xcompiler)
-	prev=xcompiler
-	continue
-	;;
-
- -Xlinker)
-	prev=xlinker
-	continue
-	;;
-
- -XCClinker)
-	prev=xcclinker
-	continue
-	;;
-
- # -msg_* for osf cc
- -msg_*)
-	func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
-	;;
-
- # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
- # -r[0-9][0-9]* specifies the processor on the SGI compiler
- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
- # +DA*, +DD* enable 64-bit mode on the HP compiler
- # -q* pass through compiler args for the IBM compiler
- # -m*, -t[45]*, -txscale* pass through architecture-specific
- # compiler args for GCC
- # -F/path gives path to uninstalled frameworks, gcc on darwin
- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
- # @file GCC response files
- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
- func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
- func_append compile_command " $arg"
- func_append finalize_command " $arg"
- compiler_flags="$compiler_flags $arg"
- continue
- ;;
-
- # Some other compiler flag.
- -* | +*)
- func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
-	;;
-
- *.$objext)
-	# A standard object.
-	objs="$objs $arg"
-	;;
-
- *.lo)
-	# A libtool-controlled object.
-
-	# Check to see that this really is a libtool object.
-	if func_lalib_unsafe_p "$arg"; then
-	 pic_object=
-	 non_pic_object=
-
-	 # Read the .lo file
-	 func_source "$arg"
-
-	 if test -z "$pic_object" ||
-	 test -z "$non_pic_object" ||
-	 test "$pic_object" = none &&
-	 test "$non_pic_object" = none; then
-	 func_fatal_error "cannot find name of object for \`$arg'"
-	 fi
-
-	 # Extract subdirectory from the argument.
-	 func_dirname "$arg" "/" ""
-	 xdir="$func_dirname_result"
-
-	 if test "$pic_object" != none; then
-	 # Prepend the subdirectory the object is found in.
-	 pic_object="$xdir$pic_object"
-
-	 if test "$prev" = dlfiles; then
-	 if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		dlfiles="$dlfiles $pic_object"
-		prev=
-		continue
-	 else
-		# If libtool objects are unsupported, then we need to preload.
-		prev=dlprefiles
-	 fi
-	 fi
-
-	 # CHECK ME: I think I busted this. -Ossama
-	 if test "$prev" = dlprefiles; then
-	 # Preload the old-style object.
-	 dlprefiles="$dlprefiles $pic_object"
-	 prev=
-	 fi
-
-	 # A PIC object.
-	 func_append libobjs " $pic_object"
-	 arg="$pic_object"
-	 fi
-
-	 # Non-PIC object.
-	 if test "$non_pic_object" != none; then
-	 # Prepend the subdirectory the object is found in.
-	 non_pic_object="$xdir$non_pic_object"
-
-	 # A standard non-PIC object
-	 func_append non_pic_objects " $non_pic_object"
-	 if test -z "$pic_object" || test "$pic_object" = none ; then
-	 arg="$non_pic_object"
-	 fi
-	 else
-	 # If the PIC object exists, use it instead.
-	 # $xdir was prepended to $pic_object above.
-	 non_pic_object="$pic_object"
-	 func_append non_pic_objects " $non_pic_object"
-	 fi
-	else
-	 # Only an error if not doing a dry-run.
-	 if $opt_dry_run; then
-	 # Extract subdirectory from the argument.
-	 func_dirname "$arg" "/" ""
-	 xdir="$func_dirname_result"
-
-	 func_lo2o "$arg"
-	 pic_object=$xdir$objdir/$func_lo2o_result
-	 non_pic_object=$xdir$func_lo2o_result
-	 func_append libobjs " $pic_object"
-	 func_append non_pic_objects " $non_pic_object"
-	 else
-	 func_fatal_error "\`$arg' is not a valid libtool object"
-	 fi
-	fi
-	;;
-
- *.$libext)
-	# An archive.
-	deplibs="$deplibs $arg"
-	old_deplibs="$old_deplibs $arg"
-	continue
-	;;
-
- *.la)
-	# A libtool-controlled library.
-
-	if test "$prev" = dlfiles; then
-	 # This library was specified with -dlopen.
-	 dlfiles="$dlfiles $arg"
-	 prev=
-	elif test "$prev" = dlprefiles; then
-	 # The library was specified with -dlpreopen.
-	 dlprefiles="$dlprefiles $arg"
-	 prev=
-	else
-	 deplibs="$deplibs $arg"
-	fi
-	continue
-	;;
-
- # Some other compiler argument.
- *)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
-	;;
- esac # arg
-
- # Now actually substitute the argument into the commands.
- if test -n "$arg"; then
-	func_append compile_command " $arg"
-	func_append finalize_command " $arg"
- fi
- done # argument parsing loop
-
- test -n "$prev" && \
- func_fatal_help "the \`$prevarg' option requires an argument"
-
- if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
- eval arg=\"$export_dynamic_flag_spec\"
- func_append compile_command " $arg"
- func_append finalize_command " $arg"
- fi
-
- oldlibs=
- # calculate the name of the file, without its directory
- func_basename "$output"
- outputname="$func_basename_result"
- libobjs_save="$libobjs"
-
- if test -n "$shlibpath_var"; then
- # get the directories listed in $shlibpath_var
- eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
- else
- shlib_search_path=
- fi
- eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
- eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
-
- func_dirname "$output" "/" ""
- output_objdir="$func_dirname_result$objdir"
- # Create the object directory.
- func_mkdir_p "$output_objdir"
-
- # Determine the type of output
- case $output in
- "")
- func_fatal_help "you must specify an output file"
- ;;
- *.$libext) linkmode=oldlib ;;
- *.lo | *.$objext) linkmode=obj ;;
- *.la) linkmode=lib ;;
- *) linkmode=prog ;; # Anything else should be a program.
- esac
-
- specialdeplibs=
-
- libs=
- # Find all interdependent deplibs by searching for libraries
- # that are linked more than once (e.g. -la -lb -la)
- for deplib in $deplibs; do
- if $opt_duplicate_deps ; then
-	case "$libs " in
-	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	esac
- fi
- libs="$libs $deplib"
- done
-
- if test "$linkmode" = lib; then
- libs="$predeps $libs $compiler_lib_search_path $postdeps"
-
- # Compute libraries that are listed more than once in $predeps
- # $postdeps and mark them as special (i.e., whose duplicates are
- # not to be eliminated).
- pre_post_deps=
- if $opt_duplicate_compiler_generated_deps; then
-	for pre_post_dep in $predeps $postdeps; do
-	 case "$pre_post_deps " in
-	 *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
-	 esac
-	 pre_post_deps="$pre_post_deps $pre_post_dep"
-	done
- fi
- pre_post_deps=
- fi
-
- deplibs=
- newdependency_libs=
- newlib_search_path=
- need_relink=no # whether we're linking any uninstalled libtool libraries
- notinst_deplibs= # not-installed libtool libraries
- notinst_path= # paths that contain not-installed libtool libraries
-
- case $linkmode in
- lib)
-	passes="conv dlpreopen link"
-	for file in $dlfiles $dlprefiles; do
-	 case $file in
-	 *.la) ;;
-	 *)
-	 func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
-	 ;;
-	 esac
-	done
-	;;
- prog)
-	compile_deplibs=
-	finalize_deplibs=
-	alldeplibs=no
-	newdlfiles=
-	newdlprefiles=
-	passes="conv scan dlopen dlpreopen link"
-	;;
- *) passes="conv"
-	;;
- esac
-
- for pass in $passes; do
- # The preopen pass in lib mode reverses $deplibs; put it back here
- # so that -L comes before libs that need it for instance...
- if test "$linkmode,$pass" = "lib,link"; then
-	## FIXME: Find the place where the list is rebuilt in the wrong
-	## order, and fix it there properly
- tmp_deplibs=
-	for deplib in $deplibs; do
-	 tmp_deplibs="$deplib $tmp_deplibs"
-	done
-	deplibs="$tmp_deplibs"
- fi
-
- if test "$linkmode,$pass" = "lib,link" ||
-	 test "$linkmode,$pass" = "prog,scan"; then
-	libs="$deplibs"
-	deplibs=
- fi
- if test "$linkmode" = prog; then
-	case $pass in
-	dlopen) libs="$dlfiles" ;;
-	dlpreopen) libs="$dlprefiles" ;;
-	link)
-	 libs="$deplibs %DEPLIBS%"
-	 test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
-	 ;;
-	esac
- fi
- if test "$linkmode,$pass" = "lib,dlpreopen"; then
-	# Collect and forward deplibs of preopened libtool libs
-	for lib in $dlprefiles; do
-	 # Ignore non-libtool-libs
-	 dependency_libs=
-	 case $lib in
-	 *.la)	func_source "$lib" ;;
-	 esac
-
-	 # Collect preopened libtool deplibs, except any this library
-	 # has declared as weak libs
-	 for deplib in $dependency_libs; do
- deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`
-	 case " $weak_libs " in
-	 *" $deplib_base "*) ;;
-	 *) deplibs="$deplibs $deplib" ;;
-	 esac
-	 done
-	done
-	libs="$dlprefiles"
- fi
- if test "$pass" = dlopen; then
-	# Collect dlpreopened libraries
-	save_deplibs="$deplibs"
-	deplibs=
- fi
-
- for deplib in $libs; do
-	lib=
-	found=no
-	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
-	 if test "$linkmode,$pass" = "prog,link"; then
-	 compile_deplibs="$deplib $compile_deplibs"
-	 finalize_deplibs="$deplib $finalize_deplibs"
-	 else
-	 compiler_flags="$compiler_flags $deplib"
-	 if test "$linkmode" = lib ; then
-		case "$new_inherited_linker_flags " in
-		 *" $deplib "*) ;;
-		 * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
-		esac
-	 fi
-	 fi
-	 continue
-	 ;;
-	-l*)
-	 if test "$linkmode" != lib && test "$linkmode" != prog; then
-	 func_warning "\`-l' is ignored for archives/objects"
-	 continue
-	 fi
-	 func_stripname '-l' '' "$deplib"
-	 name=$func_stripname_result
-	 if test "$linkmode" = lib; then
-	 searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
-	 else
-	 searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
-	 fi
-	 for searchdir in $searchdirs; do
-	 for search_ext in .la $std_shrext .so .a; do
-	 # Search the libtool library
-	 lib="$searchdir/lib${name}${search_ext}"
-	 if test -f "$lib"; then
-		if test "$search_ext" = ".la"; then
-		 found=yes
-		else
-		 found=no
-		fi
-		break 2
-	 fi
-	 done
-	 done
-	 if test "$found" != yes; then
-	 # deplib doesn't seem to be a libtool library
-	 if test "$linkmode,$pass" = "prog,link"; then
-	 compile_deplibs="$deplib $compile_deplibs"
-	 finalize_deplibs="$deplib $finalize_deplibs"
-	 else
-	 deplibs="$deplib $deplibs"
-	 test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-	 fi
-	 continue
-	 else # deplib is a libtool library
-	 # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
-	 # We need to do some special things here, and not later.
-	 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	 case " $predeps $postdeps " in
-	 *" $deplib "*)
-		if func_lalib_p "$lib"; then
-		 library_names=
-		 old_library=
-		 func_source "$lib"
-		 for l in $old_library $library_names; do
-		 ll="$l"
-		 done
-		 if test "X$ll" = "X$old_library" ; then # only static version available
-		 found=no
-		 func_dirname "$lib" "" "."
-		 ladir="$func_dirname_result"
-		 lib=$ladir/$old_library
-		 if test "$linkmode,$pass" = "prog,link"; then
-		 compile_deplibs="$deplib $compile_deplibs"
-		 finalize_deplibs="$deplib $finalize_deplibs"
-		 else
-		 deplibs="$deplib $deplibs"
-		 test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-		 fi
-		 continue
-		 fi
-		fi
-		;;
-	 *) ;;
-	 esac
-	 fi
-	 fi
-	 ;; # -l
-	*.ltframework)
-	 if test "$linkmode,$pass" = "prog,link"; then
-	 compile_deplibs="$deplib $compile_deplibs"
-	 finalize_deplibs="$deplib $finalize_deplibs"
-	 else
-	 deplibs="$deplib $deplibs"
-	 if test "$linkmode" = lib ; then
-		case "$new_inherited_linker_flags " in
-		 *" $deplib "*) ;;
-		 * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
-		esac
-	 fi
-	 fi
-	 continue
-	 ;;
-	-L*)
-	 case $linkmode in
-	 lib)
-	 deplibs="$deplib $deplibs"
-	 test "$pass" = conv && continue
-	 newdependency_libs="$deplib $newdependency_libs"
-	 func_stripname '-L' '' "$deplib"
-	 newlib_search_path="$newlib_search_path $func_stripname_result"
-	 ;;
-	 prog)
-	 if test "$pass" = conv; then
-	 deplibs="$deplib $deplibs"
-	 continue
-	 fi
-	 if test "$pass" = scan; then
-	 deplibs="$deplib $deplibs"
-	 else
-	 compile_deplibs="$deplib $compile_deplibs"
-	 finalize_deplibs="$deplib $finalize_deplibs"
-	 fi
-	 func_stripname '-L' '' "$deplib"
-	 newlib_search_path="$newlib_search_path $func_stripname_result"
-	 ;;
-	 *)
-	 func_warning "\`-L' is ignored for archives/objects"
-	 ;;
-	 esac # linkmode
-	 continue
-	 ;; # -L
-	-R*)
-	 if test "$pass" = link; then
-	 func_stripname '-R' '' "$deplib"
-	 dir=$func_stripname_result
-	 # Make sure the xrpath contains only unique directories.
-	 case "$xrpath " in
-	 *" $dir "*) ;;
-	 *) xrpath="$xrpath $dir" ;;
-	 esac
-	 fi
-	 deplibs="$deplib $deplibs"
-	 continue
-	 ;;
-	*.la) lib="$deplib" ;;
-	*.$libext)
-	 if test "$pass" = conv; then
-	 deplibs="$deplib $deplibs"
-	 continue
-	 fi
-	 case $linkmode in
-	 lib)
-	 # Linking convenience modules into shared libraries is allowed,
-	 # but linking other static libraries is non-portable.
-	 case " $dlpreconveniencelibs " in
-	 *" $deplib "*) ;;
-	 *)
-	 valid_a_lib=no
-	 case $deplibs_check_method in
-		match_pattern*)
-		 set dummy $deplibs_check_method; shift
-		 match_pattern_regex=`expr "$deplibs_check_method" : "$1 $.*$"`
-		 if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \
-		 | $EGREP "$match_pattern_regex" > /dev/null; then
-		 valid_a_lib=yes
-		 fi
-		;;
-		pass_all)
-		 valid_a_lib=yes
-		;;
-	 esac
-	 if test "$valid_a_lib" != yes; then
-		$ECHO
-		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
-		$ECHO "*** I have the capability to make that library automatically link in when"
-		$ECHO "*** you link to this library. But I can only do this if you have a"
-		$ECHO "*** shared version of the library, which you do not appear to have"
-		$ECHO "*** because the file extensions .$libext of this argument makes me believe"
-		$ECHO "*** that it is just a static archive that I should not use here."
-	 else
-		$ECHO
-		$ECHO "*** Warning: Linking the shared library $output against the"
-		$ECHO "*** static library $deplib is not portable!"
-		deplibs="$deplib $deplibs"
-	 fi
-	 ;;
-	 esac
-	 continue
-	 ;;
-	 prog)
-	 if test "$pass" != link; then
-	 deplibs="$deplib $deplibs"
-	 else
-	 compile_deplibs="$deplib $compile_deplibs"
-	 finalize_deplibs="$deplib $finalize_deplibs"
-	 fi
-	 continue
-	 ;;
-	 esac # linkmode
-	 ;; # *.$libext
-	*.lo | *.$objext)
-	 if test "$pass" = conv; then
-	 deplibs="$deplib $deplibs"
-	 elif test "$linkmode" = prog; then
-	 if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-	 # If there is no dlopen support or we're linking statically,
-	 # we need to preload.
-	 newdlprefiles="$newdlprefiles $deplib"
-	 compile_deplibs="$deplib $compile_deplibs"
-	 finalize_deplibs="$deplib $finalize_deplibs"
-	 else
-	 newdlfiles="$newdlfiles $deplib"
-	 fi
-	 fi
-	 continue
-	 ;;
-	%DEPLIBS%)
-	 alldeplibs=yes
-	 continue
-	 ;;
-	esac # case $deplib
-
-	if test "$found" = yes || test -f "$lib"; then :
-	else
-	 func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
-	fi
-
-	# Check to see that this really is a libtool archive.
-	func_lalib_unsafe_p "$lib" \
-	 || func_fatal_error "\`$lib' is not a valid libtool archive"
-
-	func_dirname "$lib" "" "."
-	ladir="$func_dirname_result"
-
-	dlname=
-	dlopen=
-	dlpreopen=
-	libdir=
-	library_names=
-	old_library=
-	inherited_linker_flags=
-	# If the library was installed with an old release of libtool,
-	# it will not redefine variables installed, or shouldnotlink
-	installed=yes
-	shouldnotlink=no
-	avoidtemprpath=
-
-
-	# Read the .la file
-	func_source "$lib"
-
-	# Convert "-framework foo" to "foo.ltframework"
-	if test -n "$inherited_linker_flags"; then
-	 tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework $[^ $]*$/\1.ltframework/g'`
-	 for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
-	 case " $new_inherited_linker_flags " in
-	 *" $tmp_inherited_linker_flag "*) ;;
-	 *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
-	 esac
-	 done
-	fi
-	dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% $[^ $]*$.ltframework% -framework \1%g'`
-	if test "$linkmode,$pass" = "lib,link" ||
-	 test "$linkmode,$pass" = "prog,scan" ||
-	 { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-	 test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
-	 test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
-	fi
-
-	if test "$pass" = conv; then
-	 # Only check for convenience libraries
-	 deplibs="$lib $deplibs"
-	 if test -z "$libdir"; then
-	 if test -z "$old_library"; then
-	 func_fatal_error "cannot find name of link library for \`$lib'"
-	 fi
-	 # It is a libtool convenience library, so add in its objects.
-	 convenience="$convenience $ladir/$objdir/$old_library"
-	 old_convenience="$old_convenience $ladir/$objdir/$old_library"
-	 elif test "$linkmode" != prog && test "$linkmode" != lib; then
-	 func_fatal_error "\`$lib' is not a convenience library"
-	 fi
-	 tmp_libs=
-	 for deplib in $dependency_libs; do
-	 deplibs="$deplib $deplibs"
-	 if $opt_duplicate_deps ; then
-	 case "$tmp_libs " in
-	 *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	 esac
-	 fi
-	 tmp_libs="$tmp_libs $deplib"
-	 done
-	 continue
-	fi # $pass = conv
-
-
-	# Get the name of the library we link against.
-	linklib=
-	for l in $old_library $library_names; do
-	 linklib="$l"
-	done
-	if test -z "$linklib"; then
-	 func_fatal_error "cannot find name of link library for \`$lib'"
-	fi
-
-	# This library was specified with -dlopen.
-	if test "$pass" = dlopen; then
-	 if test -z "$libdir"; then
-	 func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
-	 fi
-	 if test -z "$dlname" ||
-	 test "$dlopen_support" != yes ||
-	 test "$build_libtool_libs" = no; then
-	 # If there is no dlname, no dlopen support or we're linking
-	 # statically, we need to preload. We also need to preload any
-	 # dependent libraries so libltdl's deplib preloader doesn't
-	 # bomb out in the load deplibs phase.
-	 dlprefiles="$dlprefiles $lib $dependency_libs"
-	 else
-	 newdlfiles="$newdlfiles $lib"
-	 fi
-	 continue
-	fi # $pass = dlopen
-
-	# We need an absolute path.
-	case $ladir in
-	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
-	*)
-	 abs_ladir=`cd "$ladir" && pwd`
-	 if test -z "$abs_ladir"; then
-	 func_warning "cannot determine absolute directory name of \`$ladir'"
-	 func_warning "passing it literally to the linker, although it might fail"
-	 abs_ladir="$ladir"
-	 fi
-	 ;;
-	esac
-	func_basename "$lib"
-	laname="$func_basename_result"
-
-	# Find the relevant object directory and library name.
-	if test "X$installed" = Xyes; then
-	 if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	 func_warning "library \`$lib' was moved."
-	 dir="$ladir"
-	 absdir="$abs_ladir"
-	 libdir="$abs_ladir"
-	 else
-	 dir="$libdir"
-	 absdir="$libdir"
-	 fi
-	 test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
-	else
-	 if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	 dir="$ladir"
-	 absdir="$abs_ladir"
-	 # Remove this search path later
-	 notinst_path="$notinst_path $abs_ladir"
-	 else
-	 dir="$ladir/$objdir"
-	 absdir="$abs_ladir/$objdir"
-	 # Remove this search path later
-	 notinst_path="$notinst_path $abs_ladir"
-	 fi
-	fi # $installed = yes
-	func_stripname 'lib' '.la' "$laname"
-	name=$func_stripname_result
-
-	# This library was specified with -dlpreopen.
-	if test "$pass" = dlpreopen; then
-	 if test -z "$libdir" && test "$linkmode" = prog; then
-	 func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
-	 fi
-	 # Prefer using a static library (so that no silly _DYNAMIC symbols
-	 # are required to link).
-	 if test -n "$old_library"; then
-	 newdlprefiles="$newdlprefiles $dir/$old_library"
-	 # Keep a list of preopened convenience libraries to check
-	 # that they are being used correctly in the link pass.
-	 test -z "$libdir" && \
-		dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
-	 # Otherwise, use the dlname, so that lt_dlopen finds it.
-	 elif test -n "$dlname"; then
-	 newdlprefiles="$newdlprefiles $dir/$dlname"
-	 else
-	 newdlprefiles="$newdlprefiles $dir/$linklib"
-	 fi
-	fi # $pass = dlpreopen
-
-	if test -z "$libdir"; then
-	 # Link the convenience library
-	 if test "$linkmode" = lib; then
-	 deplibs="$dir/$old_library $deplibs"
-	 elif test "$linkmode,$pass" = "prog,link"; then
-	 compile_deplibs="$dir/$old_library $compile_deplibs"
-	 finalize_deplibs="$dir/$old_library $finalize_deplibs"
-	 else
-	 deplibs="$lib $deplibs" # used for prog,scan pass
-	 fi
-	 continue
-	fi
-
-
-	if test "$linkmode" = prog && test "$pass" != link; then
-	 newlib_search_path="$newlib_search_path $ladir"
-	 deplibs="$lib $deplibs"
-
-	 linkalldeplibs=no
-	 if test "$link_all_deplibs" != no || test -z "$library_names" ||
-	 test "$build_libtool_libs" = no; then
-	 linkalldeplibs=yes
-	 fi
-
-	 tmp_libs=
-	 for deplib in $dependency_libs; do
-	 case $deplib in
-	 -L*) func_stripname '-L' '' "$deplib"
-	 newlib_search_path="$newlib_search_path $func_stripname_result"
-		 ;;
-	 esac
-	 # Need to link against all dependency_libs?
-	 if test "$linkalldeplibs" = yes; then
-	 deplibs="$deplib $deplibs"
-	 else
-	 # Need to hardcode shared library paths
-	 # or/and link against static libraries
-	 newdependency_libs="$deplib $newdependency_libs"
-	 fi
-	 if $opt_duplicate_deps ; then
-	 case "$tmp_libs " in
-	 *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	 esac
-	 fi
-	 tmp_libs="$tmp_libs $deplib"
-	 done # for deplib
-	 continue
-	fi # $linkmode = prog...
-
-	if test "$linkmode,$pass" = "prog,link"; then
-	 if test -n "$library_names" &&
-	 { { test "$prefer_static_libs" = no ||
-	 test "$prefer_static_libs,$installed" = "built,yes"; } ||
-	 test -z "$old_library"; }; then
-	 # We need to hardcode the library path
-	 if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
-	 # Make sure the rpath contains only unique directories.
-	 case "$temp_rpath:" in
-	 *"$absdir:"*) ;;
-	 *) temp_rpath="$temp_rpath$absdir:" ;;
-	 esac
-	 fi
-
-	 # Hardcode the library path.
-	 # Skip directories that are in the system default run-time
-	 # search path.
-	 case " $sys_lib_dlsearch_path " in
-	 *" $absdir "*) ;;
-	 *)
-	 case "$compile_rpath " in
-	 *" $absdir "*) ;;
-	 *) compile_rpath="$compile_rpath $absdir"
-	 esac
-	 ;;
-	 esac
-	 case " $sys_lib_dlsearch_path " in
-	 *" $libdir "*) ;;
-	 *)
-	 case "$finalize_rpath " in
-	 *" $libdir "*) ;;
-	 *) finalize_rpath="$finalize_rpath $libdir"
-	 esac
-	 ;;
-	 esac
-	 fi # $linkmode,$pass = prog,link...
-
-	 if test "$alldeplibs" = yes &&
-	 { test "$deplibs_check_method" = pass_all ||
-	 { test "$build_libtool_libs" = yes &&
-		 test -n "$library_names"; }; }; then
-	 # We only need to search for static libraries
-	 continue
-	 fi
-	fi
-
-	link_static=no # Whether the deplib will be linked statically
-	use_static_libs=$prefer_static_libs
-	if test "$use_static_libs" = built && test "$installed" = yes; then
-	 use_static_libs=no
-	fi
-	if test -n "$library_names" &&
-	 { test "$use_static_libs" = no || test -z "$old_library"; }; then
-	 case $host in
-	 *cygwin* | *mingw* | *cegcc*)
-	 # No point in relinking DLLs because paths are not encoded
-	 notinst_deplibs="$notinst_deplibs $lib"
-	 need_relink=no
-	 ;;
-	 *)
-	 if test "$installed" = no; then
-	 notinst_deplibs="$notinst_deplibs $lib"
-	 need_relink=yes
-	 fi
-	 ;;
-	 esac
-	 # This is a shared library
-
-	 # Warn about portability, can't link against -module's on some
-	 # systems (darwin). Don't bleat about dlopened modules though!
-	 dlopenmodule=""
-	 for dlpremoduletest in $dlprefiles; do
-	 if test "X$dlpremoduletest" = "X$lib"; then
-	 dlopenmodule="$dlpremoduletest"
-	 break
-	 fi
-	 done
-	 if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
-	 $ECHO
-	 if test "$linkmode" = prog; then
-	 $ECHO "*** Warning: Linking the executable $output against the loadable module"
-	 else
-	 $ECHO "*** Warning: Linking the shared library $output against the loadable module"
-	 fi
-	 $ECHO "*** $linklib is not portable!"
-	 fi
-	 if test "$linkmode" = lib &&
-	 test "$hardcode_into_libs" = yes; then
-	 # Hardcode the library path.
-	 # Skip directories that are in the system default run-time
-	 # search path.
-	 case " $sys_lib_dlsearch_path " in
-	 *" $absdir "*) ;;
-	 *)
-	 case "$compile_rpath " in
-	 *" $absdir "*) ;;
-	 *) compile_rpath="$compile_rpath $absdir"
-	 esac
-	 ;;
-	 esac
-	 case " $sys_lib_dlsearch_path " in
-	 *" $libdir "*) ;;
-	 *)
-	 case "$finalize_rpath " in
-	 *" $libdir "*) ;;
-	 *) finalize_rpath="$finalize_rpath $libdir"
-	 esac
-	 ;;
-	 esac
-	 fi
-
-	 if test -n "$old_archive_from_expsyms_cmds"; then
-	 # figure out the soname
-	 set dummy $library_names
-	 shift
-	 realname="$1"
-	 shift
-	 libname=`eval "\\$ECHO \"$libname_spec\""`
-	 # use dlname if we got it. it's perfectly good, no?
-	 if test -n "$dlname"; then
-	 soname="$dlname"
-	 elif test -n "$soname_spec"; then
-	 # bleh windows
-	 case $host in
-	 *cygwin* | mingw* | *cegcc*)
-	 func_arith $current - $age
-		major=$func_arith_result
-		versuffix="-$major"
-		;;
-	 esac
-	 eval soname=\"$soname_spec\"
-	 else
-	 soname="$realname"
-	 fi
-
-	 # Make a new name for the extract_expsyms_cmds to use
-	 soroot="$soname"
-	 func_basename "$soroot"
-	 soname="$func_basename_result"
-	 func_stripname 'lib' '.dll' "$soname"
-	 newlib=libimp-$func_stripname_result.a
-
-	 # If the library has no export list, then create one now
-	 if test -f "$output_objdir/$soname-def"; then :
-	 else
-	 func_verbose "extracting exported symbol list from \`$soname'"
-	 func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
-	 fi
-
-	 # Create $newlib
-	 if test -f "$output_objdir/$newlib"; then :; else
-	 func_verbose "generating import library for \`$soname'"
-	 func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
-	 fi
-	 # make sure the library variables are pointing to the new library
-	 dir=$output_objdir
-	 linklib=$newlib
-	 fi # test -n "$old_archive_from_expsyms_cmds"
-
-	 if test "$linkmode" = prog || test "$mode" != relink; then
-	 add_shlibpath=
-	 add_dir=
-	 add=
-	 lib_linked=yes
-	 case $hardcode_action in
-	 immediate | unsupported)
-	 if test "$hardcode_direct" = no; then
-		add="$dir/$linklib"
-		case $host in
-		 *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
-		 *-*-sysv4*uw2*) add_dir="-L$dir" ;;
-		 *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
-		 *-*-unixware7*) add_dir="-L$dir" ;;
-		 *-*-darwin* )
-		 # if the lib is a (non-dlopened) module then we can not
-		 # link against it, someone is ignoring the earlier warnings
-		 if /usr/bin/file -L $add 2> /dev/null |
-			 $GREP ": [^:]* bundle" >/dev/null ; then
-		 if test "X$dlopenmodule" != "X$lib"; then
-			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
-			if test -z "$old_library" ; then
-			 $ECHO
-			 $ECHO "*** And there doesn't seem to be a static archive available"
-			 $ECHO "*** The link will probably fail, sorry"
-			else
-			 add="$dir/$old_library"
-			fi
-		 elif test -n "$old_library"; then
-			add="$dir/$old_library"
-		 fi
-		 fi
-		esac
-	 elif test "$hardcode_minus_L" = no; then
-		case $host in
-		*-*-sunos*) add_shlibpath="$dir" ;;
-		esac
-		add_dir="-L$dir"
-		add="-l$name"
-	 elif test "$hardcode_shlibpath_var" = no; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	 else
-		lib_linked=no
-	 fi
-	 ;;
-	 relink)
-	 if test "$hardcode_direct" = yes &&
-	 test "$hardcode_direct_absolute" = no; then
-		add="$dir/$linklib"
-	 elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
-		# Try looking first in the location we're being installed to.
-		if test -n "$inst_prefix_dir"; then
-		 case $libdir in
-		 [\\/]*)
-		 add_dir="$add_dir -L$inst_prefix_dir$libdir"
-		 ;;
-		 esac
-		fi
-		add="-l$name"
-	 elif test "$hardcode_shlibpath_var" = yes; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	 else
-		lib_linked=no
-	 fi
-	 ;;
-	 *) lib_linked=no ;;
-	 esac
-
-	 if test "$lib_linked" != yes; then
-	 func_fatal_configuration "unsupported hardcode properties"
-	 fi
-
-	 if test -n "$add_shlibpath"; then
-	 case :$compile_shlibpath: in
-	 *":$add_shlibpath:"*) ;;
-	 *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
-	 esac
-	 fi
-	 if test "$linkmode" = prog; then
-	 test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
-	 test -n "$add" && compile_deplibs="$add $compile_deplibs"
-	 else
-	 test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	 test -n "$add" && deplibs="$add $deplibs"
-	 if test "$hardcode_direct" != yes &&
-		 test "$hardcode_minus_L" != yes &&
-		 test "$hardcode_shlibpath_var" = yes; then
-		case :$finalize_shlibpath: in
-		*":$libdir:"*) ;;
-		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-		esac
-	 fi
-	 fi
-	 fi
-
-	 if test "$linkmode" = prog || test "$mode" = relink; then
-	 add_shlibpath=
-	 add_dir=
-	 add=
-	 # Finalize command for both is simple: just hardcode it.
-	 if test "$hardcode_direct" = yes &&
-	 test "$hardcode_direct_absolute" = no; then
-	 add="$libdir/$linklib"
-	 elif test "$hardcode_minus_L" = yes; then
-	 add_dir="-L$libdir"
-	 add="-l$name"
-	 elif test "$hardcode_shlibpath_var" = yes; then
-	 case :$finalize_shlibpath: in
-	 *":$libdir:"*) ;;
-	 *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-	 esac
-	 add="-l$name"
-	 elif test "$hardcode_automatic" = yes; then
-	 if test -n "$inst_prefix_dir" &&
-		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
-		add="$inst_prefix_dir$libdir/$linklib"
-	 else
-		add="$libdir/$linklib"
-	 fi
-	 else
-	 # We cannot seem to hardcode it, guess we'll fake it.
-	 add_dir="-L$libdir"
-	 # Try looking first in the location we're being installed to.
-	 if test -n "$inst_prefix_dir"; then
-		case $libdir in
-		 [\\/]*)
-		 add_dir="$add_dir -L$inst_prefix_dir$libdir"
-		 ;;
-		esac
-	 fi
-	 add="-l$name"
-	 fi
-
-	 if test "$linkmode" = prog; then
-	 test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
-	 test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
-	 else
-	 test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	 test -n "$add" && deplibs="$add $deplibs"
-	 fi
-	 fi
-	elif test "$linkmode" = prog; then
-	 # Here we assume that one of hardcode_direct or hardcode_minus_L
-	 # is not unsupported. This is valid on all known static and
-	 # shared platforms.
-	 if test "$hardcode_direct" != unsupported; then
-	 test -n "$old_library" && linklib="$old_library"
-	 compile_deplibs="$dir/$linklib $compile_deplibs"
-	 finalize_deplibs="$dir/$linklib $finalize_deplibs"
-	 else
-	 compile_deplibs="-l$name -L$dir $compile_deplibs"
-	 finalize_deplibs="-l$name -L$dir $finalize_deplibs"
-	 fi
-	elif test "$build_libtool_libs" = yes; then
-	 # Not a shared library
-	 if test "$deplibs_check_method" != pass_all; then
-	 # We're trying link a shared library against a static one
-	 # but the system doesn't support it.
-
-	 # Just print a warning and add the library to dependency_libs so
-	 # that the program can be linked against the static library.
-	 $ECHO
-	 $ECHO "*** Warning: This system can not link to static lib archive $lib."
-	 $ECHO "*** I have the capability to make that library automatically link in when"
-	 $ECHO "*** you link to this library. But I can only do this if you have a"
-	 $ECHO "*** shared version of the library, which you do not appear to have."
-	 if test "$module" = yes; then
-	 $ECHO "*** But as you try to build a module library, libtool will still create "
-	 $ECHO "*** a static module, that should work as long as the dlopening application"
-	 $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime."
-	 if test -z "$global_symbol_pipe"; then
-		$ECHO
-		$ECHO "*** However, this would only work if libtool was able to extract symbol"
-		$ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
-		$ECHO "*** not find such a program. So, this module is probably useless."
-		$ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
-	 fi
-	 if test "$build_old_libs" = no; then
-		build_libtool_libs=module
-		build_old_libs=yes
-	 else
-		build_libtool_libs=no
-	 fi
-	 fi
-	 else
-	 deplibs="$dir/$old_library $deplibs"
-	 link_static=yes
-	 fi
-	fi # link shared/static library?
-
-	if test "$linkmode" = lib; then
-	 if test -n "$dependency_libs" &&
-	 { test "$hardcode_into_libs" != yes ||
-	 test "$build_old_libs" = yes ||
-	 test "$link_static" = yes; }; then
-	 # Extract -R from dependency_libs
-	 temp_deplibs=
-	 for libdir in $dependency_libs; do
-	 case $libdir in
-	 -R*) func_stripname '-R' '' "$libdir"
-	 temp_xrpath=$func_stripname_result
-		 case " $xrpath " in
-		 *" $temp_xrpath "*) ;;
-		 *) xrpath="$xrpath $temp_xrpath";;
-		 esac;;
-	 *) temp_deplibs="$temp_deplibs $libdir";;
-	 esac
-	 done
-	 dependency_libs="$temp_deplibs"
-	 fi
-
-	 newlib_search_path="$newlib_search_path $absdir"
-	 # Link against this library
-	 test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
-	 # ... and its dependency_libs
-	 tmp_libs=
-	 for deplib in $dependency_libs; do
-	 newdependency_libs="$deplib $newdependency_libs"
-	 if $opt_duplicate_deps ; then
-	 case "$tmp_libs " in
-	 *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	 esac
-	 fi
-	 tmp_libs="$tmp_libs $deplib"
-	 done
-
-	 if test "$link_all_deplibs" != no; then
-	 # Add the search paths of all dependency libraries
-	 for deplib in $dependency_libs; do
-	 case $deplib in
-	 -L*) path="$deplib" ;;
-	 *.la)
-	 func_dirname "$deplib" "" "."
-		dir="$func_dirname_result"
-		# We need an absolute path.
-		case $dir in
-		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
-		*)
-		 absdir=`cd "$dir" && pwd`
-		 if test -z "$absdir"; then
-		 func_warning "cannot determine absolute directory name of \`$dir'"
-		 absdir="$dir"
-		 fi
-		 ;;
-		esac
-		if $GREP "^installed=no" $deplib > /dev/null; then
-		case $host in
-		*-*-darwin*)
-		 depdepl=
-		 eval deplibrary_names=`${SED} -n -e 's/^library_names=$.*$$/\1/p' $deplib`
-		 if test -n "$deplibrary_names" ; then
-		 for tmp in $deplibrary_names ; do
-		 depdepl=$tmp
-		 done
-		 if test -f "$absdir/$objdir/$depdepl" ; then
-		 depdepl="$absdir/$objdir/$depdepl"
-		 darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
- if test -z "$darwin_install_name"; then
- darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
- fi
-		 compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
-		 linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
-		 path=
-		 fi
-		 fi
-		 ;;
-		*)
-		 path="-L$absdir/$objdir"
-		 ;;
-		esac
-		else
-		 eval libdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $deplib`
-		 test -z "$libdir" && \
-		 func_fatal_error "\`$deplib' is not a valid libtool archive"
-		 test "$absdir" != "$libdir" && \
-		 func_warning "\`$deplib' seems to be moved"
-
-		 path="-L$absdir"
-		fi
-		;;
-	 esac
-	 case " $deplibs " in
-	 *" $path "*) ;;
-	 *) deplibs="$path $deplibs" ;;
-	 esac
-	 done
-	 fi # link_all_deplibs != no
-	fi # linkmode = lib
- done # for deplib in $libs
- if test "$pass" = link; then
-	if test "$linkmode" = "prog"; then
-	 compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
-	 finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
-	else
-	 compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% $[^ $]*$.ltframework% -framework \1%g'`
-	fi
- fi
- dependency_libs="$newdependency_libs"
- if test "$pass" = dlpreopen; then
-	# Link the dlpreopened libraries before other libraries
-	for deplib in $save_deplibs; do
-	 deplibs="$deplib $deplibs"
-	done
- fi
- if test "$pass" != dlopen; then
-	if test "$pass" != conv; then
-	 # Make sure lib_search_path contains only unique directories.
-	 lib_search_path=
-	 for dir in $newlib_search_path; do
-	 case "$lib_search_path " in
-	 *" $dir "*) ;;
-	 *) lib_search_path="$lib_search_path $dir" ;;
-	 esac
-	 done
-	 newlib_search_path=
-	fi
-
-	if test "$linkmode,$pass" != "prog,link"; then
-	 vars="deplibs"
-	else
-	 vars="compile_deplibs finalize_deplibs"
-	fi
-	for var in $vars dependency_libs; do
-	 # Add libraries to $var in reverse order
-	 eval tmp_libs=\"\$$var\"
-	 new_libs=
-	 for deplib in $tmp_libs; do
-	 # FIXME: Pedantically, this is the right thing to do, so
-	 # that some nasty dependency loop isn't accidentally
-	 # broken:
-	 #new_libs="$deplib $new_libs"
-	 # Pragmatically, this seems to cause very few problems in
-	 # practice:
-	 case $deplib in
-	 -L*) new_libs="$deplib $new_libs" ;;
-	 -R*) ;;
-	 *)
-	 # And here is the reason: when a library appears more
-	 # than once as an explicit dependence of a library, or
-	 # is implicitly linked in more than once by the
-	 # compiler, it is considered special, and multiple
-	 # occurrences thereof are not removed. Compare this
-	 # with having the same library being listed as a
-	 # dependency of multiple other libraries: in this case,
-	 # we know (pedantically, we assume) the library does not
-	 # need to be listed more than once, so we keep only the
-	 # last copy. This is not always right, but it is rare
-	 # enough that we require users that really mean to play
-	 # such unportable linking tricks to link the library
-	 # using -Wl,-lname, so that libtool does not consider it
-	 # for duplicate removal.
-	 case " $specialdeplibs " in
-	 *" $deplib "*) new_libs="$deplib $new_libs" ;;
-	 *)
-		case " $new_libs " in
-		*" $deplib "*) ;;
-		*) new_libs="$deplib $new_libs" ;;
-		esac
-		;;
-	 esac
-	 ;;
-	 esac
-	 done
-	 tmp_libs=
-	 for deplib in $new_libs; do
-	 case $deplib in
-	 -L*)
-	 case " $tmp_libs " in
-	 *" $deplib "*) ;;
-	 *) tmp_libs="$tmp_libs $deplib" ;;
-	 esac
-	 ;;
-	 *) tmp_libs="$tmp_libs $deplib" ;;
-	 esac
-	 done
-	 eval $var=\"$tmp_libs\"
-	done # for var
- fi
- # Last step: remove runtime libs from dependency_libs
- # (they stay in deplibs)
- tmp_libs=
- for i in $dependency_libs ; do
-	case " $predeps $postdeps $compiler_lib_search_path " in
-	*" $i "*)
-	 i=""
-	 ;;
-	esac
-	if test -n "$i" ; then
-	 tmp_libs="$tmp_libs $i"
-	fi
- done
- dependency_libs=$tmp_libs
- done # for pass
- if test "$linkmode" = prog; then
- dlfiles="$newdlfiles"
- fi
- if test "$linkmode" = prog || test "$linkmode" = lib; then
- dlprefiles="$newdlprefiles"
- fi
-
- case $linkmode in
- oldlib)
- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	func_warning "\`-dlopen' is ignored for archives"
- fi
-
- case " $deplibs" in
- *\ -l* | *\ -L*)
-	func_warning "\`-l' and \`-L' are ignored for archives" ;;
- esac
-
- test -n "$rpath" && \
-	func_warning "\`-rpath' is ignored for archives"
-
- test -n "$xrpath" && \
-	func_warning "\`-R' is ignored for archives"
-
- test -n "$vinfo" && \
-	func_warning "\`-version-info/-version-number' is ignored for archives"
-
- test -n "$release" && \
-	func_warning "\`-release' is ignored for archives"
-
- test -n "$export_symbols$export_symbols_regex" && \
-	func_warning "\`-export-symbols' is ignored for archives"
-
- # Now set the variables for building old libraries.
- build_libtool_libs=no
- oldlibs="$output"
- objs="$objs$old_deplibs"
- ;;
-
- lib)
- # Make sure we only generate libraries of the form `libNAME.la'.
- case $outputname in
- lib*)
-	func_stripname 'lib' '.la' "$outputname"
-	name=$func_stripname_result
-	eval shared_ext=\"$shrext_cmds\"
-	eval libname=\"$libname_spec\"
-	;;
- *)
-	test "$module" = no && \
-	 func_fatal_help "libtool library \`$output' must begin with \`lib'"
-
-	if test "$need_lib_prefix" != no; then
-	 # Add the "lib" prefix for modules if required
-	 func_stripname '' '.la' "$outputname"
-	 name=$func_stripname_result
-	 eval shared_ext=\"$shrext_cmds\"
-	 eval libname=\"$libname_spec\"
-	else
-	 func_stripname '' '.la' "$outputname"
-	 libname=$func_stripname_result
-	fi
-	;;
- esac
-
- if test -n "$objs"; then
-	if test "$deplibs_check_method" != pass_all; then
-	 func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
-	else
-	 $ECHO
-	 $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
-	 $ECHO "*** objects $objs is not portable!"
-	 libobjs="$libobjs $objs"
-	fi
- fi
-
- test "$dlself" != no && \
-	func_warning "\`-dlopen self' is ignored for libtool libraries"
-
- set dummy $rpath
- shift
- test "$#" -gt 1 && \
-	func_warning "ignoring multiple \`-rpath's for a libtool library"
-
- install_libdir="$1"
-
- oldlibs=
- if test -z "$rpath"; then
-	if test "$build_libtool_libs" = yes; then
-	 # Building a libtool convenience library.
-	 # Some compilers have problems with a `.al' extension so
-	 # convenience libraries should have the same extension an
-	 # archive normally would.
-	 oldlibs="$output_objdir/$libname.$libext $oldlibs"
-	 build_libtool_libs=convenience
-	 build_old_libs=yes
-	fi
-
-	test -n "$vinfo" && \
-	 func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
-
-	test -n "$release" && \
-	 func_warning "\`-release' is ignored for convenience libraries"
- else
-
-	# Parse the version information argument.
-	save_ifs="$IFS"; IFS=':'
-	set dummy $vinfo 0 0 0
-	shift
-	IFS="$save_ifs"
-
-	test -n "$7" && \
-	 func_fatal_help "too many parameters to \`-version-info'"
-
-	# convert absolute version numbers to libtool ages
-	# this retains compatibility with .la files and attempts
-	# to make the code below a bit more comprehensible
-
-	case $vinfo_number in
-	yes)
-	 number_major="$1"
-	 number_minor="$2"
-	 number_revision="$3"
-	 #
-	 # There are really only two kinds -- those that
-	 # use the current revision as the major version
-	 # and those that subtract age and use age as
-	 # a minor version. But, then there is irix
-	 # which has an extra 1 added just for fun
-	 #
-	 case $version_type in
-	 darwin|linux|osf|windows|none)
-	 func_arith $number_major + $number_minor
-	 current=$func_arith_result
-	 age="$number_minor"
-	 revision="$number_revision"
-	 ;;
-	 freebsd-aout|freebsd-elf|sunos)
-	 current="$number_major"
-	 revision="$number_minor"
-	 age="0"
-	 ;;
-	 irix|nonstopux)
-	 func_arith $number_major + $number_minor
-	 current=$func_arith_result
-	 age="$number_minor"
-	 revision="$number_minor"
-	 lt_irix_increment=no
-	 ;;
-	 *)
-	 func_fatal_configuration "$modename: unknown library version type \`$version_type'"
-	 ;;
-	 esac
-	 ;;
-	no)
-	 current="$1"
-	 revision="$2"
-	 age="$3"
-	 ;;
-	esac
-
-	# Check that each of the things are valid numbers.
-	case $current in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	 func_error "CURRENT \`$current' must be a nonnegative integer"
-	 func_fatal_error "\`$vinfo' is not valid version information"
-	 ;;
-	esac
-
-	case $revision in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	 func_error "REVISION \`$revision' must be a nonnegative integer"
-	 func_fatal_error "\`$vinfo' is not valid version information"
-	 ;;
-	esac
-
-	case $age in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	 func_error "AGE \`$age' must be a nonnegative integer"
-	 func_fatal_error "\`$vinfo' is not valid version information"
-	 ;;
-	esac
-
-	if test "$age" -gt "$current"; then
-	 func_error "AGE \`$age' is greater than the current interface number \`$current'"
-	 func_fatal_error "\`$vinfo' is not valid version information"
-	fi
-
-	# Calculate the version variables.
-	major=
-	versuffix=
-	verstring=
-	case $version_type in
-	none) ;;
-
-	darwin)
-	 # Like Linux, but with the current version available in
-	 # verstring for coding it into the library header
-	 func_arith $current - $age
-	 major=.$func_arith_result
-	 versuffix="$major.$age.$revision"
-	 # Darwin ld doesn't like 0 for these options...
-	 func_arith $current + 1
-	 minor_current=$func_arith_result
-	 xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
-	 verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-	 ;;
-
-	freebsd-aout)
-	 major=".$current"
-	 versuffix=".$current.$revision";
-	 ;;
-
-	freebsd-elf)
-	 major=".$current"
-	 versuffix=".$current"
-	 ;;
-
-	irix | nonstopux)
-	 if test "X$lt_irix_increment" = "Xno"; then
-	 func_arith $current - $age
-	 else
-	 func_arith $current - $age + 1
-	 fi
-	 major=$func_arith_result
-
-	 case $version_type in
-	 nonstopux) verstring_prefix=nonstopux ;;
-	 *) verstring_prefix=sgi ;;
-	 esac
-	 verstring="$verstring_prefix$major.$revision"
-
-	 # Add in all the interfaces that we are compatible with.
-	 loop=$revision
-	 while test "$loop" -ne 0; do
-	 func_arith $revision - $loop
-	 iface=$func_arith_result
-	 func_arith $loop - 1
-	 loop=$func_arith_result
-	 verstring="$verstring_prefix$major.$iface:$verstring"
-	 done
-
-	 # Before this point, $major must not contain `.'.
-	 major=.$major
-	 versuffix="$major.$revision"
-	 ;;
-
-	linux)
-	 func_arith $current - $age
-	 major=.$func_arith_result
-	 versuffix="$major.$age.$revision"
-	 ;;
-
-	osf)
-	 func_arith $current - $age
-	 major=.$func_arith_result
-	 versuffix=".$current.$age.$revision"
-	 verstring="$current.$age.$revision"
-
-	 # Add in all the interfaces that we are compatible with.
-	 loop=$age
-	 while test "$loop" -ne 0; do
-	 func_arith $current - $loop
-	 iface=$func_arith_result
-	 func_arith $loop - 1
-	 loop=$func_arith_result
-	 verstring="$verstring:${iface}.0"
-	 done
-
-	 # Make executables depend on our current version.
-	 verstring="$verstring:${current}.0"
-	 ;;
-
-	qnx)
-	 major=".$current"
-	 versuffix=".$current"
-	 ;;
-
-	sunos)
-	 major=".$current"
-	 versuffix=".$current.$revision"
-	 ;;
-
-	windows)
-	 # Use '-' rather than '.', since we only want one
-	 # extension on DOS 8.3 filesystems.
-	 func_arith $current - $age
-	 major=$func_arith_result
-	 versuffix="-$major"
-	 ;;
-
-	*)
-	 func_fatal_configuration "unknown library version type \`$version_type'"
-	 ;;
-	esac
-
-	# Clear the version info if we defaulted, and they specified a release.
-	if test -z "$vinfo" && test -n "$release"; then
-	 major=
-	 case $version_type in
-	 darwin)
-	 # we can't check for "0.0" in archive_cmds due to quoting
-	 # problems, so we reset it completely
-	 verstring=
-	 ;;
-	 *)
-	 verstring="0.0"
-	 ;;
-	 esac
-	 if test "$need_version" = no; then
-	 versuffix=
-	 else
-	 versuffix=".0.0"
-	 fi
-	fi
-
-	# Remove version info from name if versioning should be avoided
-	if test "$avoid_version" = yes && test "$need_version" = no; then
-	 major=
-	 versuffix=
-	 verstring=""
-	fi
-
-	# Check to see if the archive will have undefined symbols.
-	if test "$allow_undefined" = yes; then
-	 if test "$allow_undefined_flag" = unsupported; then
-	 func_warning "undefined symbols not allowed in $host shared libraries"
-	 build_libtool_libs=no
-	 build_old_libs=yes
-	 fi
-	else
-	 # Don't allow undefined symbols.
-	 allow_undefined_flag="$no_undefined_flag"
-	fi
-
- fi
-
- func_generate_dlsyms "$libname" "$libname" "yes"
- libobjs="$libobjs $symfileobj"
- test "X$libobjs" = "X " && libobjs=
-
- if test "$mode" != relink; then
-	# Remove our outputs, but don't remove object files since they
-	# may have been created when compiling PIC objects.
-	removelist=
-	tempremovelist=`$ECHO "$output_objdir/*"`
-	for p in $tempremovelist; do
-	 case $p in
-	 *.$objext | *.gcno)
-	 ;;
-	 $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
-	 if test "X$precious_files_regex" != "X"; then
-		 if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
-		 then
-		 continue
-		 fi
-	 fi
-	 removelist="$removelist $p"
-	 ;;
-	 *) ;;
-	 esac
-	done
-	test -n "$removelist" && \
-	 func_show_eval "${RM}r \$removelist"
- fi
-
- # Now set the variables for building old libraries.
- if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
-	oldlibs="$oldlibs $output_objdir/$libname.$libext"
-
-	# Transform .lo files to .o files.
-	oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
- fi
-
- # Eliminate all temporary directories.
- #for path in $notinst_path; do
- #	lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"`
- #	deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"`
- #	dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"`
- #done
-
- if test -n "$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	temp_xrpath=
-	for libdir in $xrpath; do
-	 temp_xrpath="$temp_xrpath -R$libdir"
-	 case "$finalize_rpath " in
-	 *" $libdir "*) ;;
-	 *) finalize_rpath="$finalize_rpath $libdir" ;;
-	 esac
-	done
-	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
-	 dependency_libs="$temp_xrpath $dependency_libs"
-	fi
- fi
-
- # Make sure dlfiles contains only unique files that won't be dlpreopened
- old_dlfiles="$dlfiles"
- dlfiles=
- for lib in $old_dlfiles; do
-	case " $dlprefiles $dlfiles " in
-	*" $lib "*) ;;
-	*) dlfiles="$dlfiles $lib" ;;
-	esac
- done
-
- # Make sure dlprefiles contains only unique files
- old_dlprefiles="$dlprefiles"
- dlprefiles=
- for lib in $old_dlprefiles; do
-	case "$dlprefiles " in
-	*" $lib "*) ;;
-	*) dlprefiles="$dlprefiles $lib" ;;
-	esac
- done
-
- if test "$build_libtool_libs" = yes; then
-	if test -n "$rpath"; then
-	 case $host in
-	 *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
-	 # these systems don't actually have a c library (as such)!
-	 ;;
-	 *-*-rhapsody* | *-*-darwin1.[012])
-	 # Rhapsody C library is in the System framework
-	 deplibs="$deplibs System.ltframework"
-	 ;;
-	 *-*-netbsd*)
-	 # Don't link with libc until the a.out ld.so is fixed.
-	 ;;
-	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	 # Do not include libc due to us having libc/libc_r.
-	 ;;
-	 *-*-sco3.2v5* | *-*-sco5v6*)
-	 # Causes problems with __ctype
-	 ;;
-	 *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-	 # Compiler inserts libc in the correct place for threads to work
-	 ;;
-	 *)
-	 # Add libc to deplibs on all other systems if necessary.
-	 if test "$build_libtool_need_lc" = "yes"; then
-	 deplibs="$deplibs -lc"
-	 fi
-	 ;;
-	 esac
-	fi
-
-	# Transform deplibs into only deplibs that can be linked in shared.
-	name_save=$name
-	libname_save=$libname
-	release_save=$release
-	versuffix_save=$versuffix
-	major_save=$major
-	# I'm not sure if I'm treating the release correctly. I think
-	# release should show up in the -l (ie -lgmp5) so we don't want to
-	# add it in twice. Is that correct?
-	release=""
-	versuffix=""
-	major=""
-	newdeplibs=
-	droppeddeps=no
-	case $deplibs_check_method in
-	pass_all)
-	 # Don't check for shared/static. Everything works.
-	 # This might be a little naive. We might want to check
-	 # whether the library exists or not. But this is on
-	 # osf3 & osf4 and I'm not really sure... Just
-	 # implementing what was already the behavior.
-	 newdeplibs=$deplibs
-	 ;;
-	test_compile)
-	 # This code stresses the "libraries are programs" paradigm to its
-	 # limits. Maybe even breaks it. We compile a program, linking it
-	 # against the deplibs as a proxy for the library. Then we can check
-	 # whether they linked in statically or dynamically with ldd.
-	 $opt_dry_run || $RM conftest.c
-	 cat > conftest.c <<EOF
-	 int main() { return 0; }
-EOF
-	 $opt_dry_run || $RM conftest
-	 if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
-	 ldd_output=`ldd conftest`
-	 for i in $deplibs; do
-	 case $i in
-	 -l*)
-		func_stripname -l '' "$i"
-		name=$func_stripname_result
-		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		 case " $predeps $postdeps " in
-		 *" $i "*)
-		 newdeplibs="$newdeplibs $i"
-		 i=""
-		 ;;
-		 esac
-		fi
-		if test -n "$i" ; then
-		 libname=`eval "\\$ECHO \"$libname_spec\""`
-		 deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
-		 set dummy $deplib_matches; shift
-		 deplib_match=$1
-		 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		 newdeplibs="$newdeplibs $i"
-		 else
-		 droppeddeps=yes
-		 $ECHO
-		 $ECHO "*** Warning: dynamic linker does not accept needed library $i."
-		 $ECHO "*** I have the capability to make that library automatically link in when"
-		 $ECHO "*** you link to this library. But I can only do this if you have a"
-		 $ECHO "*** shared version of the library, which I believe you do not have"
-		 $ECHO "*** because a test_compile did reveal that the linker did not use it for"
-		 $ECHO "*** its dynamic dependency list that programs get resolved with at runtime."
-		 fi
-		fi
-		;;
-	 *)
-		newdeplibs="$newdeplibs $i"
-		;;
-	 esac
-	 done
-	 else
-	 # Error occurred in the first compile. Let's try to salvage
-	 # the situation: Compile a separate program for each library.
-	 for i in $deplibs; do
-	 case $i in
-	 -l*)
-		func_stripname -l '' "$i"
-		name=$func_stripname_result
-		$opt_dry_run || $RM conftest
-		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
-		 ldd_output=`ldd conftest`
-		 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		 case " $predeps $postdeps " in
-		 *" $i "*)
-		 newdeplibs="$newdeplibs $i"
-		 i=""
-		 ;;
-		 esac
-		 fi
-		 if test -n "$i" ; then
-		 libname=`eval "\\$ECHO \"$libname_spec\""`
-		 deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
-		 set dummy $deplib_matches; shift
-		 deplib_match=$1
-		 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		 newdeplibs="$newdeplibs $i"
-		 else
-		 droppeddeps=yes
-		 $ECHO
-		 $ECHO "*** Warning: dynamic linker does not accept needed library $i."
-		 $ECHO "*** I have the capability to make that library automatically link in when"
-		 $ECHO "*** you link to this library. But I can only do this if you have a"
-		 $ECHO "*** shared version of the library, which you do not appear to have"
-		 $ECHO "*** because a test_compile did reveal that the linker did not use this one"
-		 $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime."
-		 fi
-		 fi
-		else
-		 droppeddeps=yes
-		 $ECHO
-		 $ECHO "*** Warning! Library $i is needed by this library but I was not able to"
-		 $ECHO "*** make it link in! You will probably need to install it or some"
-		 $ECHO "*** library that it depends on before this library will be fully"
-		 $ECHO "*** functional. Installing it before continuing would be even better."
-		fi
-		;;
-	 *)
-		newdeplibs="$newdeplibs $i"
-		;;
-	 esac
-	 done
-	 fi
-	 ;;
-	file_magic*)
-	 set dummy $deplibs_check_method; shift
-	 file_magic_regex=`expr "$deplibs_check_method" : "$1 $.*$"`
-	 for a_deplib in $deplibs; do
-	 case $a_deplib in
-	 -l*)
-	 func_stripname -l '' "$a_deplib"
-	 name=$func_stripname_result
-	 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		 newdeplibs="$newdeplibs $a_deplib"
-		 a_deplib=""
-		 ;;
-		esac
-	 fi
-	 if test -n "$a_deplib" ; then
-		libname=`eval "\\$ECHO \"$libname_spec\""`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		 potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		 for potent_lib in $potential_libs; do
-		 # Follow soft links.
-		 if ls -lLd "$potent_lib" 2>/dev/null |
-			 $GREP " -> " >/dev/null; then
-			continue
-		 fi
-		 # The statement above tries to avoid entering an
-		 # endless loop below, in case of cyclic links.
-		 # We might still enter an endless loop, since a link
-		 # loop can be closed while we follow links,
-		 # but so what?
-		 potlib="$potent_lib"
-		 while test -h "$potlib" 2>/dev/null; do
-			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
-			case $potliblink in
-			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-			*) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
-			esac
-		 done
-		 if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
-			 $SED -e 10q |
-			 $EGREP "$file_magic_regex" > /dev/null; then
-			newdeplibs="$newdeplibs $a_deplib"
-			a_deplib=""
-			break 2
-		 fi
-		 done
-		done
-	 fi
-	 if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		$ECHO
-		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-		$ECHO "*** I have the capability to make that library automatically link in when"
-		$ECHO "*** you link to this library. But I can only do this if you have a"
-		$ECHO "*** shared version of the library, which you do not appear to have"
-		$ECHO "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		 $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
-		else
-		 $ECHO "*** with $libname and none of the candidates passed a file format test"
-		 $ECHO "*** using a file magic. Last file checked: $potlib"
-		fi
-	 fi
-	 ;;
-	 *)
-	 # Add a -L argument.
-	 newdeplibs="$newdeplibs $a_deplib"
-	 ;;
-	 esac
-	 done # Gone through all deplibs.
-	 ;;
-	match_pattern*)
-	 set dummy $deplibs_check_method; shift
-	 match_pattern_regex=`expr "$deplibs_check_method" : "$1 $.*$"`
-	 for a_deplib in $deplibs; do
-	 case $a_deplib in
-	 -l*)
-	 func_stripname -l '' "$a_deplib"
-	 name=$func_stripname_result
-	 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		 newdeplibs="$newdeplibs $a_deplib"
-		 a_deplib=""
-		 ;;
-		esac
-	 fi
-	 if test -n "$a_deplib" ; then
-		libname=`eval "\\$ECHO \"$libname_spec\""`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		 potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		 for potent_lib in $potential_libs; do
-		 potlib="$potent_lib" # see symlink-check above in file_magic test
-		 if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \
-		 $EGREP "$match_pattern_regex" > /dev/null; then
-		 newdeplibs="$newdeplibs $a_deplib"
-		 a_deplib=""
-		 break 2
-		 fi
-		 done
-		done
-	 fi
-	 if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		$ECHO
-		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-		$ECHO "*** I have the capability to make that library automatically link in when"
-		$ECHO "*** you link to this library. But I can only do this if you have a"
-		$ECHO "*** shared version of the library, which you do not appear to have"
-		$ECHO "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		 $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
-		else
-		 $ECHO "*** with $libname and none of the candidates passed a file format test"
-		 $ECHO "*** using a regex pattern. Last file checked: $potlib"
-		fi
-	 fi
-	 ;;
-	 *)
-	 # Add a -L argument.
-	 newdeplibs="$newdeplibs $a_deplib"
-	 ;;
-	 esac
-	 done # Gone through all deplibs.
-	 ;;
-	none | unknown | *)
-	 newdeplibs=""
-	 tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \
-	 -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
-	 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	 for i in $predeps $postdeps ; do
-	 # can't use Xsed below, because $i might contain '/'
-	 tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"`
-	 done
-	 fi
-	 if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[	 ]//g' |
-	 $GREP . >/dev/null; then
-	 $ECHO
-	 if test "X$deplibs_check_method" = "Xnone"; then
-	 $ECHO "*** Warning: inter-library dependencies are not supported in this platform."
-	 else
-	 $ECHO "*** Warning: inter-library dependencies are not known to be supported."
-	 fi
-	 $ECHO "*** All declared inter-library dependencies are being dropped."
-	 droppeddeps=yes
-	 fi
-	 ;;
-	esac
-	versuffix=$versuffix_save
-	major=$major_save
-	release=$release_save
-	libname=$libname_save
-	name=$name_save
-
-	case $host in
-	*-*-rhapsody* | *-*-darwin1.[012])
-	 # On Rhapsody replace the C library with the System framework
-	 newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
-	 ;;
-	esac
-
-	if test "$droppeddeps" = yes; then
-	 if test "$module" = yes; then
-	 $ECHO
-	 $ECHO "*** Warning: libtool could not satisfy all declared inter-library"
-	 $ECHO "*** dependencies of module $libname. Therefore, libtool will create"
-	 $ECHO "*** a static module, that should work as long as the dlopening"
-	 $ECHO "*** application is linked with the -dlopen flag."
-	 if test -z "$global_symbol_pipe"; then
-	 $ECHO
-	 $ECHO "*** However, this would only work if libtool was able to extract symbol"
-	 $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
-	 $ECHO "*** not find such a program. So, this module is probably useless."
-	 $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
-	 fi
-	 if test "$build_old_libs" = no; then
-	 oldlibs="$output_objdir/$libname.$libext"
-	 build_libtool_libs=module
-	 build_old_libs=yes
-	 else
-	 build_libtool_libs=no
-	 fi
-	 else
-	 $ECHO "*** The inter-library dependencies that have been dropped here will be"
-	 $ECHO "*** automatically added whenever a program is linked with this library"
-	 $ECHO "*** or is declared to -dlopen it."
-
-	 if test "$allow_undefined" = no; then
-	 $ECHO
-	 $ECHO "*** Since this library must not contain undefined symbols,"
-	 $ECHO "*** because either the platform does not support them or"
-	 $ECHO "*** it was explicitly requested with -no-undefined,"
-	 $ECHO "*** libtool will only create a static version of it."
-	 if test "$build_old_libs" = no; then
-		oldlibs="$output_objdir/$libname.$libext"
-		build_libtool_libs=module
-		build_old_libs=yes
-	 else
-		build_libtool_libs=no
-	 fi
-	 fi
-	 fi
-	fi
-	# Done checking deplibs!
-	deplibs=$newdeplibs
- fi
- # Time to change all our "foo.ltframework" stuff back to "-framework foo"
- case $host in
-	*-*-darwin*)
-	 newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% $[^ $]*$.ltframework% -framework \1%g'`
-	 new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% $[^ $]*$.ltframework% -framework \1%g'`
-	 deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% $[^ $]*$.ltframework% -framework \1%g'`
-	 ;;
- esac
-
- # move library search paths that coincide with paths to not yet
- # installed libraries to the beginning of the library search list
- new_libs=
- for path in $notinst_path; do
-	case " $new_libs " in
-	*" -L$path/$objdir "*) ;;
-	*)
-	 case " $deplibs " in
-	 *" -L$path/$objdir "*)
-	 new_libs="$new_libs -L$path/$objdir" ;;
-	 esac
-	 ;;
-	esac
- done
- for deplib in $deplibs; do
-	case $deplib in
-	-L*)
-	 case " $new_libs " in
-	 *" $deplib "*) ;;
-	 *) new_libs="$new_libs $deplib" ;;
-	 esac
-	 ;;
-	*) new_libs="$new_libs $deplib" ;;
-	esac
- done
- deplibs="$new_libs"
-
- # All the library-specific variables (install_libdir is set above).
- library_names=
- old_library=
- dlname=
-
- # Test again, we may have decided not to build it any more
- if test "$build_libtool_libs" = yes; then
-	if test "$hardcode_into_libs" = yes; then
-	 # Hardcode the library paths
-	 hardcode_libdirs=
-	 dep_rpath=
-	 rpath="$finalize_rpath"
-	 test "$mode" != relink && rpath="$compile_rpath$rpath"
-	 for libdir in $rpath; do
-	 if test -n "$hardcode_libdir_flag_spec"; then
-	 if test -n "$hardcode_libdir_separator"; then
-		if test -z "$hardcode_libdirs"; then
-		 hardcode_libdirs="$libdir"
-		else
-		 # Just accumulate the unique libdirs.
-		 case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-		 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		 ;;
-		 *)
-		 hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		 ;;
-		 esac
-		fi
-	 else
-		eval flag=\"$hardcode_libdir_flag_spec\"
-		dep_rpath="$dep_rpath $flag"
-	 fi
-	 elif test -n "$runpath_var"; then
-	 case "$perm_rpath " in
-	 *" $libdir "*) ;;
-	 *) perm_rpath="$perm_rpath $libdir" ;;
-	 esac
-	 fi
-	 done
-	 # Substitute the hardcoded libdirs into the rpath.
-	 if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	 libdir="$hardcode_libdirs"
-	 if test -n "$hardcode_libdir_flag_spec_ld"; then
-	 eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-	 else
-	 eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	 fi
-	 fi
-	 if test -n "$runpath_var" && test -n "$perm_rpath"; then
-	 # We should set the runpath_var.
-	 rpath=
-	 for dir in $perm_rpath; do
-	 rpath="$rpath$dir:"
-	 done
-	 eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
-	 fi
-	 test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
-	fi
-
-	shlibpath="$finalize_shlibpath"
-	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
-	if test -n "$shlibpath"; then
-	 eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
-	fi
-
-	# Get the real and link names of the library.
-	eval shared_ext=\"$shrext_cmds\"
-	eval library_names=\"$library_names_spec\"
-	set dummy $library_names
-	shift
-	realname="$1"
-	shift
-
-	if test -n "$soname_spec"; then
-	 eval soname=\"$soname_spec\"
-	else
-	 soname="$realname"
-	fi
-	if test -z "$dlname"; then
-	 dlname=$soname
-	fi
-
-	lib="$output_objdir/$realname"
-	linknames=
-	for link
-	do
-	 linknames="$linknames $link"
-	done
-
-	# Use standard objects if they are pic
-	test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	test "X$libobjs" = "X " && libobjs=
-
-	delfiles=
-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	 $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
-	 export_symbols="$output_objdir/$libname.uexp"
-	 delfiles="$delfiles $export_symbols"
-	fi
-
-	orig_export_symbols=
-	case $host_os in
-	cygwin* | mingw* | cegcc*)
-	 if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
-	 # exporting using user supplied symfile
-	 if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
-	 # and it's NOT already a .def file. Must figure out
-	 # which of the given symbols are data symbols and tag
-	 # them as such. So, trigger use of export_symbols_cmds.
-	 # export_symbols gets reassigned inside the "prepare
-	 # the list of exported symbols" if statement, so the
-	 # include_expsyms logic still works.
-	 orig_export_symbols="$export_symbols"
-	 export_symbols=
-	 always_export_symbols=yes
-	 fi
-	 fi
-	 ;;
-	esac
-
-	# Prepare the list of exported symbols
-	if test -z "$export_symbols"; then
-	 if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
-	 func_verbose "generating symbol list for \`$libname.la'"
-	 export_symbols="$output_objdir/$libname.exp"
-	 $opt_dry_run || $RM $export_symbols
-	 cmds=$export_symbols_cmds
-	 save_ifs="$IFS"; IFS='~'
-	 for cmd in $cmds; do
-	 IFS="$save_ifs"
-	 eval cmd=\"$cmd\"
-	 func_len " $cmd"
-	 len=$func_len_result
-	 if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-		func_show_eval "$cmd" 'exit $?'
-		skipped_export=false
-	 else
-		# The command line is too long to execute in one step.
-		func_verbose "using reloadable object file for export list..."
-		skipped_export=:
-		# Break out early, otherwise skipped_export may be
-		# set to false by a later but shorter cmd.
-		break
-	 fi
-	 done
-	 IFS="$save_ifs"
-	 if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
-	 func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	 func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
-	 fi
-	 fi
-	fi
-
-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	 tmp_export_symbols="$export_symbols"
-	 test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
-	 $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
-	fi
-
-	if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
-	 # The given exports_symbols file has to be filtered, so filter it.
-	 func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
-	 # FIXME: $output_objdir/$libname.filter potentially contains lots of
-	 # 's' commands which not all seds can handle. GNU sed should be fine
-	 # though. Also, the filter scales superlinearly with the number of
-	 # global variables. join(1) would be nice here, but unfortunately
-	 # isn't a blessed tool.
-	 $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,$.*$$[ \,].*$,s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-	 delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
-	 export_symbols=$output_objdir/$libname.def
-	 $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
-	fi
-
-	tmp_deplibs=
-	for test_deplib in $deplibs; do
-	 case " $convenience " in
-	 *" $test_deplib "*) ;;
-	 *)
-	 tmp_deplibs="$tmp_deplibs $test_deplib"
-	 ;;
-	 esac
-	done
-	deplibs="$tmp_deplibs"
-
-	if test -n "$convenience"; then
-	 if test -n "$whole_archive_flag_spec" &&
-	 test "$compiler_needs_object" = yes &&
-	 test -z "$libobjs"; then
-	 # extract the archives, so we have objects to list.
-	 # TODO: could optimize this to just extract one archive.
-	 whole_archive_flag_spec=
-	 fi
-	 if test -n "$whole_archive_flag_spec"; then
-	 save_libobjs=$libobjs
-	 eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	 test "X$libobjs" = "X " && libobjs=
-	 else
-	 gentop="$output_objdir/${outputname}x"
-	 generated="$generated $gentop"
-
-	 func_extract_archives $gentop $convenience
-	 libobjs="$libobjs $func_extract_archives_result"
-	 test "X$libobjs" = "X " && libobjs=
-	 fi
-	fi
-
-	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
-	 eval flag=\"$thread_safe_flag_spec\"
-	 linker_flags="$linker_flags $flag"
-	fi
-
-	# Make a backup of the uninstalled library when relinking
-	if test "$mode" = relink; then
-	 $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
-	fi
-
-	# Do each of the archive commands.
-	if test "$module" = yes && test -n "$module_cmds" ; then
-	 if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	 eval test_cmds=\"$module_expsym_cmds\"
-	 cmds=$module_expsym_cmds
-	 else
-	 eval test_cmds=\"$module_cmds\"
-	 cmds=$module_cmds
-	 fi
-	else
-	 if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	 eval test_cmds=\"$archive_expsym_cmds\"
-	 cmds=$archive_expsym_cmds
-	 else
-	 eval test_cmds=\"$archive_cmds\"
-	 cmds=$archive_cmds
-	 fi
-	fi
-
-	if test "X$skipped_export" != "X:" &&
-	 func_len " $test_cmds" &&
-	 len=$func_len_result &&
-	 test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	 :
-	else
-	 # The command line is too long to link in one step, link piecewise
-	 # or, if using GNU ld and skipped_export is not :, use a linker
-	 # script.
-
-	 # Save the value of $output and $libobjs because we want to
-	 # use them later. If we have whole_archive_flag_spec, we
-	 # want to use save_libobjs as it was before
-	 # whole_archive_flag_spec was expanded, because we can't
-	 # assume the linker understands whole_archive_flag_spec.
-	 # This may have to be revisited, in case too many
-	 # convenience libraries get linked in and end up exceeding
-	 # the spec.
-	 if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
-	 save_libobjs=$libobjs
-	 fi
-	 save_output=$output
-	 output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
-
-	 # Clear the reloadable object creation command queue and
-	 # initialize k to one.
-	 test_cmds=
-	 concat_cmds=
-	 objlist=
-	 last_robj=
-	 k=1
-
-	 if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
-	 output=${output_objdir}/${output_la}.lnkscript
-	 func_verbose "creating GNU ld script: $output"
-	 $ECHO 'INPUT (' > $output
-	 for obj in $save_libobjs
-	 do
-	 $ECHO "$obj" >> $output
-	 done
-	 $ECHO ')' >> $output
-	 delfiles="$delfiles $output"
-	 elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
-	 output=${output_objdir}/${output_la}.lnk
-	 func_verbose "creating linker input file list: $output"
-	 : > $output
-	 set x $save_libobjs
-	 shift
-	 firstobj=
-	 if test "$compiler_needs_object" = yes; then
-	 firstobj="$1 "
-	 shift
-	 fi
-	 for obj
-	 do
-	 $ECHO "$obj" >> $output
-	 done
-	 delfiles="$delfiles $output"
-	 output=$firstobj\"$file_list_spec$output\"
-	 else
-	 if test -n "$save_libobjs"; then
-	 func_verbose "creating reloadable object files..."
-	 output=$output_objdir/$output_la-${k}.$objext
-	 eval test_cmds=\"$reload_cmds\"
-	 func_len " $test_cmds"
-	 len0=$func_len_result
-	 len=$len0
-
-	 # Loop over the list of objects to be linked.
-	 for obj in $save_libobjs
-	 do
-		func_len " $obj"
-		func_arith $len + $func_len_result
-		len=$func_arith_result
-		if test "X$objlist" = X ||
-		 test "$len" -lt "$max_cmd_len"; then
-		 func_append objlist " $obj"
-		else
-		 # The command $test_cmds is almost too long, add a
-		 # command to the queue.
-		 if test "$k" -eq 1 ; then
-		 # The first file doesn't have a previous command to add.
-		 eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
-		 else
-		 # All subsequent reloadable object files will link in
-		 # the last one created.
-		 eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\"
-		 fi
-		 last_robj=$output_objdir/$output_la-${k}.$objext
-		 func_arith $k + 1
-		 k=$func_arith_result
-		 output=$output_objdir/$output_la-${k}.$objext
-		 objlist=$obj
-		 func_len " $last_robj"
-		 func_arith $len0 + $func_len_result
-		 len=$func_arith_result
-		fi
-	 done
-	 # Handle the remaining objects by creating one last
-	 # reloadable object file. All subsequent reloadable object
-	 # files will link in the last one created.
-	 test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	 eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
-	 if test -n "$last_robj"; then
-	 eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
-	 fi
-	 delfiles="$delfiles $output"
-
-	 else
-	 output=
-	 fi
-
-	 if ${skipped_export-false}; then
-	 func_verbose "generating symbol list for \`$libname.la'"
-	 export_symbols="$output_objdir/$libname.exp"
-	 $opt_dry_run || $RM $export_symbols
-	 libobjs=$output
-	 # Append the command to create the export file.
-	 test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	 eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
-	 if test -n "$last_robj"; then
-		eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
-	 fi
-	 fi
-
-	 test -n "$save_libobjs" &&
-	 func_verbose "creating a temporary reloadable object file: $output"
-
-	 # Loop through the commands generated above and execute them.
-	 save_ifs="$IFS"; IFS='~'
-	 for cmd in $concat_cmds; do
-	 IFS="$save_ifs"
-	 $opt_silent || {
-		 func_quote_for_expand "$cmd"
-		 eval "func_echo $func_quote_for_expand_result"
-	 }
-	 $opt_dry_run || eval "$cmd" || {
-		lt_exit=$?
-
-		# Restore the uninstalled library and exit
-		if test "$mode" = relink; then
-		 ( cd "$output_objdir" && \
-		 $RM "${realname}T" && \
-		 $MV "${realname}U" "$realname" )
-		fi
-
-		exit $lt_exit
-	 }
-	 done
-	 IFS="$save_ifs"
-
-	 if test -n "$export_symbols_regex" && ${skipped_export-false}; then
-	 func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	 func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
-	 fi
-	 fi
-
- if ${skipped_export-false}; then
-	 if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	 tmp_export_symbols="$export_symbols"
-	 test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
-	 $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
-	 fi
-
-	 if test -n "$orig_export_symbols"; then
-	 # The given exports_symbols file has to be filtered, so filter it.
-	 func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
-	 # FIXME: $output_objdir/$libname.filter potentially contains lots of
-	 # 's' commands which not all seds can handle. GNU sed should be fine
-	 # though. Also, the filter scales superlinearly with the number of
-	 # global variables. join(1) would be nice here, but unfortunately
-	 # isn't a blessed tool.
-	 $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,$.*$$[ \,].*$,s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-	 delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
-	 export_symbols=$output_objdir/$libname.def
-	 $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
-	 fi
-	 fi
-
-	 libobjs=$output
-	 # Restore the value of output.
-	 output=$save_output
-
-	 if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
-	 eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	 test "X$libobjs" = "X " && libobjs=
-	 fi
-	 # Expand the library linking commands again to reset the
-	 # value of $libobjs for piecewise linking.
-
-	 # Do each of the archive commands.
-	 if test "$module" = yes && test -n "$module_cmds" ; then
-	 if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	 cmds=$module_expsym_cmds
-	 else
-	 cmds=$module_cmds
-	 fi
-	 else
-	 if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	 cmds=$archive_expsym_cmds
-	 else
-	 cmds=$archive_cmds
-	 fi
-	 fi
-	fi
-
-	if test -n "$delfiles"; then
-	 # Append the command to remove temporary files to $cmds.
-	 eval cmds=\"\$cmds~\$RM $delfiles\"
-	fi
-
-	# Add any objects from preloaded convenience libraries
-	if test -n "$dlprefiles"; then
-	 gentop="$output_objdir/${outputname}x"
-	 generated="$generated $gentop"
-
-	 func_extract_archives $gentop $dlprefiles
-	 libobjs="$libobjs $func_extract_archives_result"
-	 test "X$libobjs" = "X " && libobjs=
-	fi
-
-	save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	 IFS="$save_ifs"
-	 eval cmd=\"$cmd\"
-	 $opt_silent || {
-	 func_quote_for_expand "$cmd"
-	 eval "func_echo $func_quote_for_expand_result"
-	 }
-	 $opt_dry_run || eval "$cmd" || {
-	 lt_exit=$?
-
-	 # Restore the uninstalled library and exit
-	 if test "$mode" = relink; then
-	 ( cd "$output_objdir" && \
-	 $RM "${realname}T" && \
-		$MV "${realname}U" "$realname" )
-	 fi
-
-	 exit $lt_exit
-	 }
-	done
-	IFS="$save_ifs"
-
-	# Restore the uninstalled library and exit
-	if test "$mode" = relink; then
-	 $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
-
-	 if test -n "$convenience"; then
-	 if test -z "$whole_archive_flag_spec"; then
-	 func_show_eval '${RM}r "$gentop"'
-	 fi
-	 fi
-
-	 exit $EXIT_SUCCESS
-	fi
-
-	# Create links to the real library.
-	for linkname in $linknames; do
-	 if test "$realname" != "$linkname"; then
-	 func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?'
-	 fi
-	done
-
-	# If -module or -export-dynamic was specified, set the dlname.
-	if test "$module" = yes || test "$export_dynamic" = yes; then
-	 # On all known operating systems, these are identical.
-	 dlname="$soname"
-	fi
- fi
- ;;
-
- obj)
- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	func_warning "\`-dlopen' is ignored for objects"
- fi
-
- case " $deplibs" in
- *\ -l* | *\ -L*)
-	func_warning "\`-l' and \`-L' are ignored for objects" ;;
- esac
-
- test -n "$rpath" && \
-	func_warning "\`-rpath' is ignored for objects"
-
- test -n "$xrpath" && \
-	func_warning "\`-R' is ignored for objects"
-
- test -n "$vinfo" && \
-	func_warning "\`-version-info' is ignored for objects"
-
- test -n "$release" && \
-	func_warning "\`-release' is ignored for objects"
-
- case $output in
- *.lo)
-	test -n "$objs$old_deplibs" && \
-	 func_fatal_error "cannot build library object \`$output' from non-libtool objects"
-
-	libobj=$output
-	func_lo2o "$libobj"
-	obj=$func_lo2o_result
-	;;
- *)
-	libobj=
-	obj="$output"
-	;;
- esac
-
- # Delete the old objects.
- $opt_dry_run || $RM $obj $libobj
-
- # Objects from convenience libraries. This assumes
- # single-version convenience libraries. Whenever we create
- # different ones for PIC/non-PIC, this we'll have to duplicate
- # the extraction.
- reload_conv_objs=
- gentop=
- # reload_cmds runs $LD directly, so let us get rid of
- # -Wl from whole_archive_flag_spec and hope we can get by with
- # turning comma into space..
- wl=
-
- if test -n "$convenience"; then
-	if test -n "$whole_archive_flag_spec"; then
-	 eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-	 reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
-	else
-	 gentop="$output_objdir/${obj}x"
-	 generated="$generated $gentop"
-
-	 func_extract_archives $gentop $convenience
-	 reload_conv_objs="$reload_objs $func_extract_archives_result"
-	fi
- fi
-
- # Create the old-style object.
- reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
-
- output="$obj"
- func_execute_cmds "$reload_cmds" 'exit $?'
-
- # Exit if we aren't doing a library object file.
- if test -z "$libobj"; then
-	if test -n "$gentop"; then
-	 func_show_eval '${RM}r "$gentop"'
-	fi
-
-	exit $EXIT_SUCCESS
- fi
-
- if test "$build_libtool_libs" != yes; then
-	if test -n "$gentop"; then
-	 func_show_eval '${RM}r "$gentop"'
-	fi
-
-	# Create an invalid libtool object if no PIC, so that we don't
-	# accidentally link it into a program.
-	# $show "echo timestamp > $libobj"
-	# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
-	exit $EXIT_SUCCESS
- fi
-
- if test -n "$pic_flag" || test "$pic_mode" != default; then
-	# Only do commands if we really have different PIC objects.
-	reload_objs="$libobjs $reload_conv_objs"
-	output="$libobj"
-	func_execute_cmds "$reload_cmds" 'exit $?'
- fi
-
- if test -n "$gentop"; then
-	func_show_eval '${RM}r "$gentop"'
- fi
-
- exit $EXIT_SUCCESS
- ;;
-
- prog)
- case $host in
-	*cygwin*) func_stripname '' '.exe' "$output"
-	 output=$func_stripname_result.exe;;
- esac
- test -n "$vinfo" && \
-	func_warning "\`-version-info' is ignored for programs"
-
- test -n "$release" && \
-	func_warning "\`-release' is ignored for programs"
-
- test "$preload" = yes \
- && test "$dlopen_support" = unknown \
-	&& test "$dlopen_self" = unknown \
-	&& test "$dlopen_self_static" = unknown && \
-	 func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support."
-
- case $host in
- *-*-rhapsody* | *-*-darwin1.[012])
-	# On Rhapsody replace the C library is the System framework
-	compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
-	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
-	;;
- esac
-
- case $host in
- *-*-darwin*)
-	# Don't allow lazy linking, it breaks C++ global constructors
-	# But is supposedly fixed on 10.4 or later (yay!).
-	if test "$tagname" = CXX ; then
-	 case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
-	 10.[0123])
-	 compile_command="$compile_command ${wl}-bind_at_load"
-	 finalize_command="$finalize_command ${wl}-bind_at_load"
-	 ;;
-	 esac
-	fi
-	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
-	compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% $[^ $]*$.ltframework% -framework \1%g'`
-	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% $[^ $]*$.ltframework% -framework \1%g'`
-	;;
- esac
-
-
- # move library search paths that coincide with paths to not yet
- # installed libraries to the beginning of the library search list
- new_libs=
- for path in $notinst_path; do
-	case " $new_libs " in
-	*" -L$path/$objdir "*) ;;
-	*)
-	 case " $compile_deplibs " in
-	 *" -L$path/$objdir "*)
-	 new_libs="$new_libs -L$path/$objdir" ;;
-	 esac
-	 ;;
-	esac
- done
- for deplib in $compile_deplibs; do
-	case $deplib in
-	-L*)
-	 case " $new_libs " in
-	 *" $deplib "*) ;;
-	 *) new_libs="$new_libs $deplib" ;;
-	 esac
-	 ;;
-	*) new_libs="$new_libs $deplib" ;;
-	esac
- done
- compile_deplibs="$new_libs"
-
-
- compile_command="$compile_command $compile_deplibs"
- finalize_command="$finalize_command $finalize_deplibs"
-
- if test -n "$rpath$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	for libdir in $rpath $xrpath; do
-	 # This is the magic to use -rpath.
-	 case "$finalize_rpath " in
-	 *" $libdir "*) ;;
-	 *) finalize_rpath="$finalize_rpath $libdir" ;;
-	 esac
-	done
- fi
-
- # Now hardcode the library paths
- rpath=
- hardcode_libdirs=
- for libdir in $compile_rpath $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	 if test -n "$hardcode_libdir_separator"; then
-	 if test -z "$hardcode_libdirs"; then
-	 hardcode_libdirs="$libdir"
-	 else
-	 # Just accumulate the unique libdirs.
-	 case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	 *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		;;
-	 esac
-	 fi
-	 else
-	 eval flag=\"$hardcode_libdir_flag_spec\"
-	 rpath="$rpath $flag"
-	 fi
-	elif test -n "$runpath_var"; then
-	 case "$perm_rpath " in
-	 *" $libdir "*) ;;
-	 *) perm_rpath="$perm_rpath $libdir" ;;
-	 esac
-	fi
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-	 testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
-	 case :$dllsearchpath: in
-	 *":$libdir:"*) ;;
-	 ::) dllsearchpath=$libdir;;
-	 *) dllsearchpath="$dllsearchpath:$libdir";;
-	 esac
-	 case :$dllsearchpath: in
-	 *":$testbindir:"*) ;;
-	 ::) dllsearchpath=$testbindir;;
-	 *) dllsearchpath="$dllsearchpath:$testbindir";;
-	 esac
-	 ;;
-	esac
- done
- # Substitute the hardcoded libdirs into the rpath.
- if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
- fi
- compile_rpath="$rpath"
-
- rpath=
- hardcode_libdirs=
- for libdir in $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	 if test -n "$hardcode_libdir_separator"; then
-	 if test -z "$hardcode_libdirs"; then
-	 hardcode_libdirs="$libdir"
-	 else
-	 # Just accumulate the unique libdirs.
-	 case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	 *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		;;
-	 esac
-	 fi
-	 else
-	 eval flag=\"$hardcode_libdir_flag_spec\"
-	 rpath="$rpath $flag"
-	 fi
-	elif test -n "$runpath_var"; then
-	 case "$finalize_perm_rpath " in
-	 *" $libdir "*) ;;
-	 *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
-	 esac
-	fi
- done
- # Substitute the hardcoded libdirs into the rpath.
- if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
- fi
- finalize_rpath="$rpath"
-
- if test -n "$libobjs" && test "$build_old_libs" = yes; then
-	# Transform all the library objects into standard objects.
-	compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
- fi
-
- func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
-
- # template prelinking step
- if test -n "$prelink_cmds"; then
-	func_execute_cmds "$prelink_cmds" 'exit $?'
- fi
-
- wrappers_required=yes
- case $host in
- *cygwin* | *mingw* )
- if test "$build_libtool_libs" != yes; then
- wrappers_required=no
- fi
- ;;
- *cegcc)
- # Disable wrappers for cegcc, we are cross compiling anyway.
- wrappers_required=no
- ;;
- *)
- if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
- wrappers_required=no
- fi
- ;;
- esac
- if test "$wrappers_required" = no; then
-	# Replace the output file specification.
-	compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-	link_command="$compile_command$compile_rpath"
-
-	# We have no uninstalled library dependencies, so finalize right now.
-	exit_status=0
-	func_show_eval "$link_command" 'exit_status=$?'
-
-	# Delete the generated files.
-	if test -f "$output_objdir/${outputname}S.${objext}"; then
-	 func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
-	fi
-
-	exit $exit_status
- fi
-
- if test -n "$compile_shlibpath$finalize_shlibpath"; then
-	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
- fi
- if test -n "$finalize_shlibpath"; then
-	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
- fi
-
- compile_var=
- finalize_var=
- if test -n "$runpath_var"; then
-	if test -n "$perm_rpath"; then
-	 # We should set the runpath_var.
-	 rpath=
-	 for dir in $perm_rpath; do
-	 rpath="$rpath$dir:"
-	 done
-	 compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-	if test -n "$finalize_perm_rpath"; then
-	 # We should set the runpath_var.
-	 rpath=
-	 for dir in $finalize_perm_rpath; do
-	 rpath="$rpath$dir:"
-	 done
-	 finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
- fi
-
- if test "$no_install" = yes; then
-	# We don't need to create a wrapper script.
-	link_command="$compile_var$compile_command$compile_rpath"
-	# Replace the output file specification.
-	link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-	# Delete the old output file.
-	$opt_dry_run || $RM $output
-	# Link the executable and exit
-	func_show_eval "$link_command" 'exit $?'
-	exit $EXIT_SUCCESS
- fi
-
- if test "$hardcode_action" = relink; then
-	# Fast installation is not supported
-	link_command="$compile_var$compile_command$compile_rpath"
-	relink_command="$finalize_var$finalize_command$finalize_rpath"
-
-	func_warning "this platform does not like uninstalled shared libraries"
-	func_warning "\`$output' will be relinked during installation"
- else
-	if test "$fast_install" != no; then
-	 link_command="$finalize_var$compile_command$finalize_rpath"
-	 if test "$fast_install" = yes; then
-	 relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
-	 else
-	 # fast_install is set to needless
-	 relink_command=
-	 fi
-	else
-	 link_command="$compile_var$compile_command$compile_rpath"
-	 relink_command="$finalize_var$finalize_command$finalize_rpath"
-	fi
- fi
-
- # Replace the output file specification.
- link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
-
- # Delete the old output files.
- $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
-
- func_show_eval "$link_command" 'exit $?'
-
- # Now create the wrapper script.
- func_verbose "creating $output"
-
- # Quote the relink command for shipping.
- if test -n "$relink_command"; then
-	# Preserve any variables that may affect compiler behavior
-	for var in $variables_saved_for_relink; do
-	 if eval test -z \"\${$var+set}\"; then
-	 relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
-	 elif eval var_value=\$$var; test -z "$var_value"; then
-	 relink_command="$var=; export $var; $relink_command"
-	 else
-	 func_quote_for_eval "$var_value"
-	 relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
-	 fi
-	done
-	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
- fi
-
- # Quote $ECHO for shipping.
- if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then
-	case $progpath in
-	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
-	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
-	esac
-	qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"`
- else
-	qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"`
- fi
-
- # Only actually do things if not in dry run mode.
- $opt_dry_run || {
-	# win32 will think the script is a binary if it has
-	# a .exe suffix, so we strip it off here.
-	case $output in
-	 *.exe) func_stripname '' '.exe' "$output"
-	 output=$func_stripname_result ;;
-	esac
-	# test for cygwin because mv fails w/o .exe extensions
-	case $host in
-	 *cygwin*)
-	 exeext=.exe
-	 func_stripname '' '.exe' "$outputname"
-	 outputname=$func_stripname_result ;;
-	 *) exeext= ;;
-	esac
-	case $host in
-	 *cygwin* | *mingw* )
-	 func_dirname_and_basename "$output" "" "."
-	 output_name=$func_basename_result
-	 output_path=$func_dirname_result
-	 cwrappersource="$output_path/$objdir/lt-$output_name.c"
-	 cwrapper="$output_path/$output_name.exe"
-	 $RM $cwrappersource $cwrapper
-	 trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
-
-	 func_emit_cwrapperexe_src > $cwrappersource
-
-	 # The wrapper executable is built using the $host compiler,
-	 # because it contains $host paths and files. If cross-
-	 # compiling, it, like the target executable, must be
-	 # executed on the $host or under an emulation environment.
-	 $opt_dry_run || {
-	 $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
-	 $STRIP $cwrapper
-	 }
-
-	 # Now, create the wrapper script for func_source use:
-	 func_ltwrapper_scriptname $cwrapper
-	 $RM $func_ltwrapper_scriptname_result
-	 trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
-	 $opt_dry_run || {
-	 # note: this script will not be executed, so do not chmod.
-	 if test "x$build" = "x$host" ; then
-		$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
-	 else
-		func_emit_wrapper no > $func_ltwrapper_scriptname_result
-	 fi
-	 }
-	 ;;
-	 * )
-	 $RM $output
-	 trap "$RM $output; exit $EXIT_FAILURE" 1 2 15
-
-	 func_emit_wrapper no > $output
-	 chmod +x $output
-	 ;;
-	esac
- }
- exit $EXIT_SUCCESS
- ;;
- esac
-
- # See if we need to build an old-fashioned archive.
- for oldlib in $oldlibs; do
-
- if test "$build_libtool_libs" = convenience; then
-	oldobjs="$libobjs_save $symfileobj"
-	addlibs="$convenience"
-	build_libtool_libs=no
- else
-	if test "$build_libtool_libs" = module; then
-	 oldobjs="$libobjs_save"
-	 build_libtool_libs=no
-	else
-	 oldobjs="$old_deplibs $non_pic_objects"
-	 if test "$preload" = yes && test -f "$symfileobj"; then
-	 oldobjs="$oldobjs $symfileobj"
-	 fi
-	fi
-	addlibs="$old_convenience"
- fi
-
- if test -n "$addlibs"; then
-	gentop="$output_objdir/${outputname}x"
-	generated="$generated $gentop"
-
-	func_extract_archives $gentop $addlibs
-	oldobjs="$oldobjs $func_extract_archives_result"
- fi
-
- # Do each command in the archive commands.
- if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-	cmds=$old_archive_from_new_cmds
- else
-
-	# Add any objects from preloaded convenience libraries
-	if test -n "$dlprefiles"; then
-	 gentop="$output_objdir/${outputname}x"
-	 generated="$generated $gentop"
-
-	 func_extract_archives $gentop $dlprefiles
-	 oldobjs="$oldobjs $func_extract_archives_result"
-	fi
-
-	# POSIX demands no paths to be encoded in archives. We have
-	# to avoid creating archives with duplicate basenames if we
-	# might have to extract them afterwards, e.g., when creating a
-	# static archive out of a convenience library, or when linking
-	# the entirety of a libtool archive into another (currently
-	# not supported by libtool).
-	if (for obj in $oldobjs
-	 do
-	 func_basename "$obj"
-	 $ECHO "$func_basename_result"
-	 done | sort | sort -uc >/dev/null 2>&1); then
-	 :
-	else
-	 $ECHO "copying selected object files to avoid basename conflicts..."
-	 gentop="$output_objdir/${outputname}x"
-	 generated="$generated $gentop"
-	 func_mkdir_p "$gentop"
-	 save_oldobjs=$oldobjs
-	 oldobjs=
-	 counter=1
-	 for obj in $save_oldobjs
-	 do
-	 func_basename "$obj"
-	 objbase="$func_basename_result"
-	 case " $oldobjs " in
-	 " ") oldobjs=$obj ;;
-	 *[\ /]"$objbase "*)
-	 while :; do
-		# Make sure we don't pick an alternate name that also
-		# overlaps.
-		newobj=lt$counter-$objbase
-		func_arith $counter + 1
-		counter=$func_arith_result
-		case " $oldobjs " in
-		*[\ /]"$newobj "*) ;;
-		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
-		esac
-	 done
-	 func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-	 oldobjs="$oldobjs $gentop/$newobj"
-	 ;;
-	 *) oldobjs="$oldobjs $obj" ;;
-	 esac
-	 done
-	fi
-	eval cmds=\"$old_archive_cmds\"
-
-	func_len " $cmds"
-	len=$func_len_result
-	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	 cmds=$old_archive_cmds
-	else
-	 # the command line is too long to link in one step, link in parts
-	 func_verbose "using piecewise archive linking..."
-	 save_RANLIB=$RANLIB
-	 RANLIB=:
-	 objlist=
-	 concat_cmds=
-	 save_oldobjs=$oldobjs
-	 oldobjs=
-	 # Is there a better way of finding the last object in the list?
-	 for obj in $save_oldobjs
-	 do
-	 last_oldobj=$obj
-	 done
-	 eval test_cmds=\"$old_archive_cmds\"
-	 func_len " $test_cmds"
-	 len0=$func_len_result
-	 len=$len0
-	 for obj in $save_oldobjs
-	 do
-	 func_len " $obj"
-	 func_arith $len + $func_len_result
-	 len=$func_arith_result
-	 func_append objlist " $obj"
-	 if test "$len" -lt "$max_cmd_len"; then
-	 :
-	 else
-	 # the above command should be used before it gets too long
-	 oldobjs=$objlist
-	 if test "$obj" = "$last_oldobj" ; then
-		RANLIB=$save_RANLIB
-	 fi
-	 test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	 eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
-	 objlist=
-	 len=$len0
-	 fi
-	 done
-	 RANLIB=$save_RANLIB
-	 oldobjs=$objlist
-	 if test "X$oldobjs" = "X" ; then
-	 eval cmds=\"\$concat_cmds\"
-	 else
-	 eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
-	 fi
-	fi
- fi
- func_execute_cmds "$cmds" 'exit $?'
- done
-
- test -n "$generated" && \
- func_show_eval "${RM}r$generated"
-
- # Now create the libtool archive.
- case $output in
- *.la)
- old_library=
- test "$build_old_libs" = yes && old_library="$libname.$libext"
- func_verbose "creating $output"
-
- # Preserve any variables that may affect compiler behavior
- for var in $variables_saved_for_relink; do
-	if eval test -z \"\${$var+set}\"; then
-	 relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
-	elif eval var_value=\$$var; test -z "$var_value"; then
-	 relink_command="$var=; export $var; $relink_command"
-	else
-	 func_quote_for_eval "$var_value"
-	 relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
-	fi
- done
- # Quote the link command for shipping.
- relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
- relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
- if test "$hardcode_automatic" = yes ; then
-	relink_command=
- fi
-
- # Only create the output if not a dry run.
- $opt_dry_run || {
-	for installed in no yes; do
-	 if test "$installed" = yes; then
-	 if test -z "$install_libdir"; then
-	 break
-	 fi
-	 output="$output_objdir/$outputname"i
-	 # Replace all uninstalled libtool libraries with the installed ones
-	 newdependency_libs=
-	 for deplib in $dependency_libs; do
-	 case $deplib in
-	 *.la)
-		func_basename "$deplib"
-		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $deplib`
-		test -z "$libdir" && \
-		 func_fatal_error "\`$deplib' is not a valid libtool archive"
-		newdependency_libs="$newdependency_libs $libdir/$name"
-		;;
-	 *) newdependency_libs="$newdependency_libs $deplib" ;;
-	 esac
-	 done
-	 dependency_libs="$newdependency_libs"
-	 newdlfiles=
-
-	 for lib in $dlfiles; do
-	 case $lib in
-	 *.la)
-	 func_basename "$lib"
-		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $lib`
-		test -z "$libdir" && \
-		 func_fatal_error "\`$lib' is not a valid libtool archive"
-		newdlfiles="$newdlfiles $libdir/$name"
-		;;
-	 *) newdlfiles="$newdlfiles $lib" ;;
-	 esac
-	 done
-	 dlfiles="$newdlfiles"
-	 newdlprefiles=
-	 for lib in $dlprefiles; do
-	 case $lib in
-	 *.la)
-		# Only pass preopened files to the pseudo-archive (for
-		# eventual linking with the app. that links it) if we
-		# didn't already link the preopened objects directly into
-		# the library:
-		func_basename "$lib"
-		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $lib`
-		test -z "$libdir" && \
-		 func_fatal_error "\`$lib' is not a valid libtool archive"
-		newdlprefiles="$newdlprefiles $libdir/$name"
-		;;
-	 esac
-	 done
-	 dlprefiles="$newdlprefiles"
-	 else
-	 newdlfiles=
-	 for lib in $dlfiles; do
-	 case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	 esac
-	 newdlfiles="$newdlfiles $abs"
-	 done
-	 dlfiles="$newdlfiles"
-	 newdlprefiles=
-	 for lib in $dlprefiles; do
-	 case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	 esac
-	 newdlprefiles="$newdlprefiles $abs"
-	 done
-	 dlprefiles="$newdlprefiles"
-	 fi
-	 $RM $output
-	 # place dlname in correct position for cygwin
-	 tdlname=$dlname
-	 case $host,$output,$installed,$module,$dlname in
-	 *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
-	 esac
-	 $ECHO > $output "\
-# $outputname - a libtool library file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='$tdlname'
-
-# Names of this library.
-library_names='$library_names'
-
-# The name of the static archive.
-old_library='$old_library'
-
-# Linker flags that can not go in dependency_libs.
-inherited_linker_flags='$new_inherited_linker_flags'
-
-# Libraries that this one depends upon.
-dependency_libs='$dependency_libs'
-
-# Names of additional weak libraries provided by this library
-weak_library_names='$weak_libs'
-
-# Version information for $libname.
-current=$current
-age=$age
-revision=$revision
-
-# Is this an already installed library?
-installed=$installed
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=$module
-
-# Files to dlopen/dlpreopen
-dlopen='$dlfiles'
-dlpreopen='$dlprefiles'
-
-# Directory that this library needs to be installed in:
-libdir='$install_libdir'"
-	 if test "$installed" = no && test "$need_relink" = yes; then
-	 $ECHO >> $output "\
-relink_command=\"$relink_command\""
-	 fi
-	done
- }
-
- # Do a symbolic link so that the libtool archive can be found in
- # LD_LIBRARY_PATH before the program is installed.
- func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
- ;;
- esac
- exit $EXIT_SUCCESS
-}
-
-{ test "$mode" = link || test "$mode" = relink; } &&
- func_mode_link ${1+"$@"}
-
-
-# func_mode_uninstall arg...
-func_mode_uninstall ()
-{
- $opt_debug
- RM="$nonopt"
- files=
- rmforce=
- exit_status=0
-
- # This variable tells wrapper scripts just to set variables rather
- # than running their programs.
- libtool_install_magic="$magic"
-
- for arg
- do
- case $arg in
- -f) RM="$RM $arg"; rmforce=yes ;;
- -*) RM="$RM $arg" ;;
- *) files="$files $arg" ;;
- esac
- done
-
- test -z "$RM" && \
- func_fatal_help "you must specify an RM program"
-
- rmdirs=
-
- origobjdir="$objdir"
- for file in $files; do
- func_dirname "$file" "" "."
- dir="$func_dirname_result"
- if test "X$dir" = X.; then
-	objdir="$origobjdir"
- else
-	objdir="$dir/$origobjdir"
- fi
- func_basename "$file"
- name="$func_basename_result"
- test "$mode" = uninstall && objdir="$dir"
-
- # Remember objdir for removal later, being careful to avoid duplicates
- if test "$mode" = clean; then
-	case " $rmdirs " in
-	 *" $objdir "*) ;;
-	 *) rmdirs="$rmdirs $objdir" ;;
-	esac
- fi
-
- # Don't error if the file doesn't exist and rm -f was used.
- if { test -L "$file"; } >/dev/null 2>&1 ||
-	 { test -h "$file"; } >/dev/null 2>&1 ||
-	 test -f "$file"; then
-	:
- elif test -d "$file"; then
-	exit_status=1
-	continue
- elif test "$rmforce" = yes; then
-	continue
- fi
-
- rmfiles="$file"
-
- case $name in
- *.la)
-	# Possibly a libtool archive, so verify it.
-	if func_lalib_p "$file"; then
-	 func_source $dir/$name
-
-	 # Delete the libtool libraries and symlinks.
-	 for n in $library_names; do
-	 rmfiles="$rmfiles $objdir/$n"
-	 done
-	 test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
-
-	 case "$mode" in
-	 clean)
-	 case " $library_names " in
-	 # " " in the beginning catches empty $dlname
-	 *" $dlname "*) ;;
-	 *) rmfiles="$rmfiles $objdir/$dlname" ;;
-	 esac
-	 test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
-	 ;;
-	 uninstall)
-	 if test -n "$library_names"; then
-	 # Do each command in the postuninstall commands.
-	 func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
-	 fi
-
-	 if test -n "$old_library"; then
-	 # Do each command in the old_postuninstall commands.
-	 func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
-	 fi
-	 # FIXME: should reinstall the best remaining shared library.
-	 ;;
-	 esac
-	fi
-	;;
-
- *.lo)
-	# Possibly a libtool object, so verify it.
-	if func_lalib_p "$file"; then
-
-	 # Read the .lo file
-	 func_source $dir/$name
-
-	 # Add PIC object to the list of files to remove.
-	 if test -n "$pic_object" &&
-	 test "$pic_object" != none; then
-	 rmfiles="$rmfiles $dir/$pic_object"
-	 fi
-
-	 # Add non-PIC object to the list of files to remove.
-	 if test -n "$non_pic_object" &&
-	 test "$non_pic_object" != none; then
-	 rmfiles="$rmfiles $dir/$non_pic_object"
-	 fi
-	fi
-	;;
-
- *)
-	if test "$mode" = clean ; then
-	 noexename=$name
-	 case $file in
-	 *.exe)
-	 func_stripname '' '.exe' "$file"
-	 file=$func_stripname_result
-	 func_stripname '' '.exe' "$name"
-	 noexename=$func_stripname_result
-	 # $file with .exe has already been added to rmfiles,
-	 # add $file without .exe
-	 rmfiles="$rmfiles $file"
-	 ;;
-	 esac
-	 # Do a test to see if this is a libtool program.
-	 if func_ltwrapper_p "$file"; then
-	 if func_ltwrapper_executable_p "$file"; then
-	 func_ltwrapper_scriptname "$file"
-	 relink_command=
-	 func_source $func_ltwrapper_scriptname_result
-	 rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
-	 else
-	 relink_command=
-	 func_source $dir/$noexename
-	 fi
-
-	 # note $name still contains .exe if it was in $file originally
-	 # as does the version of $file that was added into $rmfiles
-	 rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
-	 if test "$fast_install" = yes && test -n "$relink_command"; then
-	 rmfiles="$rmfiles $objdir/lt-$name"
-	 fi
-	 if test "X$noexename" != "X$name" ; then
-	 rmfiles="$rmfiles $objdir/lt-${noexename}.c"
-	 fi
-	 fi
-	fi
-	;;
- esac
- func_show_eval "$RM $rmfiles" 'exit_status=1'
- done
- objdir="$origobjdir"
-
- # Try to remove the ${objdir}s in the directories where we deleted files
- for dir in $rmdirs; do
- if test -d "$dir"; then
-	func_show_eval "rmdir $dir >/dev/null 2>&1"
- fi
- done
-
- exit $exit_status
-}
-
-{ test "$mode" = uninstall || test "$mode" = clean; } &&
- func_mode_uninstall ${1+"$@"}
-
-test -z "$mode" && {
- help="$generic_help"
- func_fatal_help "you must specify a MODE"
-}
-
-test -z "$exec_cmd" && \
- func_fatal_help "invalid operation mode \`$mode'"
-
-if test -n "$exec_cmd"; then
- eval exec "$exec_cmd"
- exit $EXIT_FAILURE
-fi
-
-exit $exit_status
-
-
-# The TAGs below are defined such that we never get into a situation
-# in which we disable both kinds of libraries. Given conflicting
-# choices, we go for a static library, that is the most portable,
-# since we can't tell whether shared libraries were disabled because
-# the user asked for that or because the platform doesn't support
-# them. This is particularly important on AIX, because we don't
-# support having both static and shared libraries enabled at the same
-# time on that platform, so we default to a shared-only configuration.
-# If a disable-shared tag is given, we'll fallback to a static-only
-# configuration. But we'll never go from static-only to shared-only.
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-build_libtool_libs=no
-build_old_libs=yes
-# ### END LIBTOOL TAG CONFIG: disable-shared
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-static
-build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
-# ### END LIBTOOL TAG CONFIG: disable-static
-
-# Local Variables:
-# mode:shell-script
-# sh-indentation:2
-# End:
-# vi:sw=2
-

pcsxr-1.9.92.tar.bz2/macosx/English.lproj/AddPluginSheet.nib Deleted

pcsxr-1.9.92.tar.bz2/macosx/English.lproj/AddPluginSheet.nib/classes.nib Deleted

pcsxr-1.9.92.tar.bz2/macosx/English.lproj/AddPluginSheet.nib/info.nib Deleted

pcsxr-1.9.92.tar.bz2/macosx/English.lproj/AddPluginSheet.nib/keyedobjects.nib Deleted

pcsxr-1.9.92.tar.bz2/macosx/English.lproj/Configuration.nib Deleted

pcsxr-1.9.92.tar.bz2/macosx/English.lproj/Configuration.nib/classes.nib Deleted

@@ -1,49 +0,0 @@
-{
-    IBClasses = (
-        {
-            ACTIONS = {
-                mcdChangeClicked = id; 
-                mcdNewClicked = id; 
-                setCheckbox = id; 
-                setCheckboxInverse = id; 
-                setVideoType = id; 
-            }; 
-            CLASS = ConfigurationController; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {
-                autoVTypeCell = id; 
-                bwMdecCell = id; 
-                cdromPlugin = PluginController; 
-                consoleOutputCell = id; 
-                graphicsPlugin = PluginController; 
-                mcd1Label = NSTextField; 
-                mcd2Label = NSTextField; 
-                noCDAudioCell = id; 
-                noXaAudioCell = id; 
-                padPlugin = PluginController; 
-                rCountFixCell = id; 
-                sioIrqAlwaysCell = id; 
-                soundPlugin = PluginController; 
-                spuIrqAlwaysCell = id; 
-                usesDynarecCell = id; 
-                usesHleCell = id; 
-                vSyncWAFixCell = id; 
-                vTypePALCell = id; 
-            }; 
-            SUPERCLASS = NSWindowController; 
-        }, 
-        {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
-        {
-            ACTIONS = {doAbout = id; doConfigure = id; selectPlugin = id; }; 
-            CLASS = PluginController; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {
-                aboutButton = NSButton; 
-                configureButton = NSButton; 
-                pluginMenu = NSPopUpButton; 
-            }; 
-            SUPERCLASS = NSObject; 
-        }
-    ); 
-    IBVersion = 1; 
-}
\ No newline at end of file

pcsxr-1.9.92.tar.bz2/macosx/English.lproj/Configuration.nib/info.nib Deleted

pcsxr-1.9.92.tar.bz2/macosx/English.lproj/Configuration.nib/objects.nib Deleted

pcsxr-1.9.92.tar.bz2/macosx/English.lproj/PCSX.nib Deleted

pcsxr-1.9.92.tar.bz2/macosx/English.lproj/PCSX.nib/classes.nib Deleted

pcsxr-1.9.92.tar.bz2/macosx/English.lproj/PCSX.nib/info.nib Deleted

pcsxr-1.9.92.tar.bz2/macosx/English.lproj/PCSX.nib/objects.nib Deleted

pcsxr-1.9.92.tar.bz2/macosx/Pcsx.xcodeproj Deleted

pcsxr-1.9.92.tar.bz2/macosx/Pcsx.xcodeproj/project.pbxproj Deleted

@@ -1,934 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 42;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		2B143D06078A2CBD00AF745A /* PCSX.icns in Resources */ = {isa = PBXBuildFile; fileRef = 2B143D01078A2CBD00AF745A /* PCSX.icns */; };
-		2B143D07078A2CBD00AF745A /* pcsxfreeze.icns in Resources */ = {isa = PBXBuildFile; fileRef = 2B143D02078A2CBD00AF745A /* pcsxfreeze.icns */; };
-		2B143D08078A2CBD00AF745A /* pcsxmemcard.icns in Resources */ = {isa = PBXBuildFile; fileRef = 2B143D03078A2CBD00AF745A /* pcsxmemcard.icns */; };
-		2B143D09078A2CBD00AF745A /* psxbios.icns in Resources */ = {isa = PBXBuildFile; fileRef = 2B143D04078A2CBD00AF745A /* psxbios.icns */; };
-		2B143D0A078A2CBD00AF745A /* psxplugin.icns in Resources */ = {isa = PBXBuildFile; fileRef = 2B143D05078A2CBD00AF745A /* psxplugin.icns */; };
-		2B3E356C06937D1C00763C7D /* PcsxPluginDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = 2B3E356A06937D1C00763C7D /* PcsxPluginDocument.h */; };
-		2B3E356D06937D1C00763C7D /* PcsxPluginDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B3E356B06937D1C00763C7D /* PcsxPluginDocument.m */; };
-		2B3E35BC069384D100763C7D /* AddPluginSheet.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2B3E35BA069384D100763C7D /* AddPluginSheet.nib */; };
-		2B400D910789F58A00BA271E /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B02C04304E145D000880C5B /* Carbon.framework */; };
-		2B4DE99105FF9307003EFEF0 /* PluginController.h in Headers */ = {isa = PBXBuildFile; fileRef = 2B4DE98D05FF9307003EFEF0 /* PluginController.h */; };
-		2B4DE99205FF9307003EFEF0 /* PluginController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B4DE98E05FF9307003EFEF0 /* PluginController.m */; };
-		2BB3D69D05427FE200831ACB /* PcsxController.h in Headers */ = {isa = PBXBuildFile; fileRef = 2B75FD3C051C56D200D12034 /* PcsxController.h */; };
-		2BB3D69E05427FE200831ACB /* ConfigurationController.h in Headers */ = {isa = PBXBuildFile; fileRef = 2B75FD4A051C8A7400D12034 /* ConfigurationController.h */; };
-		2BB3D69F05427FE200831ACB /* PluginList.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BBB1126051DC00500B84448 /* PluginList.h */; };
-		2BB3D6A005427FE200831ACB /* EmuThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BBB1791051E113B00B84448 /* EmuThread.h */; };
-		2BB3D6A105427FE200831ACB /* PcsxPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BA44360052DB2EA00E21DDD /* PcsxPlugin.h */; };
-		2BB3D6A305427FE200831ACB /* Configuration.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2BA178B00514CE260026D74D /* Configuration.nib */; };
-		2BB3D6A405427FE200831ACB /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2BA178B20514CE260026D74D /* InfoPlist.strings */; };
-		2BB3D6A505427FE200831ACB /* PCSX.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2BA178B40514CE260026D74D /* PCSX.nib */; };
-		2BB3D6A705427FE200831ACB /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 2BBB1786051E0D9700B84448 /* Credits.rtf */; };
-		2BB3D6BE05427FE200831ACB /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 2BA178A505148D9D0026D74D /* main.m */; };
-		2BB3D6BF05427FE200831ACB /* PcsxController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B75FD3D051C56D200D12034 /* PcsxController.m */; };
-		2BB3D6C005427FE200831ACB /* ConfigurationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B75FD4B051C8A7400D12034 /* ConfigurationController.m */; };
-		2BB3D6C105427FE200831ACB /* PluginList.m in Sources */ = {isa = PBXBuildFile; fileRef = 2BBB1127051DC00500B84448 /* PluginList.m */; };
-		2BB3D6C205427FE200831ACB /* EmuThread.m in Sources */ = {isa = PBXBuildFile; fileRef = 2BBB1792051E113B00B84448 /* EmuThread.m */; };
-		2BB3D6C305427FE200831ACB /* Plugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BBB17DA051E4D0F00B84448 /* Plugin.c */; };
-		2BB3D6C405427FE200831ACB /* PcsxPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 2BA44361052DB2EA00E21DDD /* PcsxPlugin.m */; };
-		2BB3D6C605427FE200831ACB /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2BC4786204C7FD3600CAB520 /* Cocoa.framework */; };
-		2BB3D6C705427FE200831ACB /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B6E8AAE04C832040017A3B1 /* System.framework */; };
-		2BB3D6C805427FE200831ACB /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B6E8AB404C8327C0017A3B1 /* IOKit.framework */; };
-		712FD1E81093096F00575A92 /* debug.c in Sources */ = {isa = PBXBuildFile; fileRef = 712FD1E51093096F00575A92 /* debug.c */; };
-		712FD1E91093096F00575A92 /* socket.c in Sources */ = {isa = PBXBuildFile; fileRef = 712FD1E61093096F00575A92 /* socket.c */; };
-		712FD1EA1093096F00575A92 /* socket.h in Headers */ = {isa = PBXBuildFile; fileRef = 712FD1E71093096F00575A92 /* socket.h */; };
-		713B530E110B75650002F164 /* ppf.c in Sources */ = {isa = PBXBuildFile; fileRef = 713B530C110B75650002F164 /* ppf.c */; };
-		713B530F110B75650002F164 /* ppf.h in Headers */ = {isa = PBXBuildFile; fileRef = 713B530D110B75650002F164 /* ppf.h */; };
-		713CB2E411FC49DA0033B6A8 /* DFCdrom.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 71F93F6C11FB8E9D007A5A7C /* DFCdrom.psxplugin */; };
-		7161C2820FDED6D000225F97 /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 7161C2810FDED6D000225F97 /* config.h */; };
-		7161C2980FDED75300225F97 /* ExtendedKeys.h in Headers */ = {isa = PBXBuildFile; fileRef = 7161C2970FDED75300225F97 /* ExtendedKeys.h */; };
-		719594B111AEFE8C004AD686 /* gte_divider.h in Headers */ = {isa = PBXBuildFile; fileRef = 719594AF11AEFE8C004AD686 /* gte_divider.h */; };
-		719594B211AEFE8C004AD686 /* psxcommon.c in Sources */ = {isa = PBXBuildFile; fileRef = 719594B011AEFE8C004AD686 /* psxcommon.c */; };
-		71AD2DF410C3575300365243 /* PeopsSPU.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 71AD2DD110C356FD00365243 /* PeopsSPU.psxplugin */; };
-		71AD2DF510C3575C00365243 /* PeopsSoftGL.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 71AD2DDC10C3570900365243 /* PeopsSoftGL.psxplugin */; };
-		71F2C0881200B6B000322AD9 /* DFInput.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 71F2C0861200B69B00322AD9 /* DFInput.psxplugin */; };
-		71F4C5890FDED12800529849 /* cdriso.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5600FDED12800529849 /* cdriso.c */; };
-		71F4C58A0FDED12800529849 /* cdriso.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C5610FDED12800529849 /* cdriso.h */; };
-		71F4C58B0FDED12800529849 /* cdrom.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5620FDED12800529849 /* cdrom.c */; };
-		71F4C58C0FDED12800529849 /* cdrom.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C5630FDED12800529849 /* cdrom.h */; };
-		71F4C58D0FDED12800529849 /* cheat.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5640FDED12800529849 /* cheat.c */; };
-		71F4C58E0FDED12800529849 /* cheat.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C5650FDED12800529849 /* cheat.h */; };
-		71F4C58F0FDED12800529849 /* coff.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C5660FDED12800529849 /* coff.h */; };
-		71F4C5900FDED12800529849 /* debug.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C5670FDED12800529849 /* debug.h */; };
-		71F4C5910FDED12800529849 /* decode_xa.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5680FDED12800529849 /* decode_xa.c */; };
-		71F4C5920FDED12800529849 /* decode_xa.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C5690FDED12800529849 /* decode_xa.h */; };
-		71F4C5930FDED12800529849 /* disr3000a.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C56A0FDED12800529849 /* disr3000a.c */; };
-		71F4C5940FDED12800529849 /* gte.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C56B0FDED12800529849 /* gte.c */; };
-		71F4C5950FDED12800529849 /* gte.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C56C0FDED12800529849 /* gte.h */; };
-		71F4C5960FDED12800529849 /* mdec.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C56D0FDED12800529849 /* mdec.c */; };
-		71F4C5970FDED12800529849 /* mdec.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C56E0FDED12800529849 /* mdec.h */; };
-		71F4C5980FDED12800529849 /* misc.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C56F0FDED12800529849 /* misc.c */; };
-		71F4C5990FDED12800529849 /* misc.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C5700FDED12800529849 /* misc.h */; };
-		71F4C59A0FDED12800529849 /* plugins.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5710FDED12800529849 /* plugins.c */; };
-		71F4C59B0FDED12800529849 /* plugins.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C5720FDED12800529849 /* plugins.h */; };
-		71F4C59C0FDED12800529849 /* psemu_plugin_defs.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C5730FDED12800529849 /* psemu_plugin_defs.h */; };
-		71F4C59D0FDED12800529849 /* psxbios.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5740FDED12800529849 /* psxbios.c */; };
-		71F4C59E0FDED12800529849 /* psxbios.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C5750FDED12800529849 /* psxbios.h */; };
-		71F4C59F0FDED12800529849 /* psxcommon.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C5760FDED12800529849 /* psxcommon.h */; };
-		71F4C5A00FDED12800529849 /* psxcounters.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5770FDED12800529849 /* psxcounters.c */; };
-		71F4C5A10FDED12800529849 /* psxcounters.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C5780FDED12800529849 /* psxcounters.h */; };
-		71F4C5A20FDED12800529849 /* psxdma.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5790FDED12800529849 /* psxdma.c */; };
-		71F4C5A30FDED12800529849 /* psxdma.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C57A0FDED12800529849 /* psxdma.h */; };
-		71F4C5A40FDED12800529849 /* psxhle.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C57B0FDED12800529849 /* psxhle.c */; };
-		71F4C5A50FDED12800529849 /* psxhle.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C57C0FDED12800529849 /* psxhle.h */; };
-		71F4C5A60FDED12800529849 /* psxhw.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C57D0FDED12800529849 /* psxhw.c */; };
-		71F4C5A70FDED12800529849 /* psxhw.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C57E0FDED12800529849 /* psxhw.h */; };
-		71F4C5A80FDED12800529849 /* psxinterpreter.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C57F0FDED12800529849 /* psxinterpreter.c */; };
-		71F4C5A90FDED12800529849 /* psxmem.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5800FDED12800529849 /* psxmem.c */; };
-		71F4C5AA0FDED12800529849 /* psxmem.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C5810FDED12800529849 /* psxmem.h */; };
-		71F4C5AB0FDED12800529849 /* r3000a.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5820FDED12800529849 /* r3000a.c */; };
-		71F4C5AC0FDED12800529849 /* r3000a.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C5830FDED12800529849 /* r3000a.h */; };
-		71F4C5AD0FDED12800529849 /* sio.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5840FDED12800529849 /* sio.c */; };
-		71F4C5AE0FDED12800529849 /* sio.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C5850FDED12800529849 /* sio.h */; };
-		71F4C5AF0FDED12800529849 /* spu.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5860FDED12800529849 /* spu.c */; };
-		71F4C5B00FDED12800529849 /* spu.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C5870FDED12800529849 /* spu.h */; };
-		71F4C5B10FDED12800529849 /* system.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C5880FDED12800529849 /* system.h */; };
-		71F4C5B80FDED16D00529849 /* iGte.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C5B40FDED16D00529849 /* iGte.h */; };
-		71F4C5B90FDED16D00529849 /* iR3000A.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5B50FDED16D00529849 /* iR3000A.c */; };
-		71F4C5BA0FDED16D00529849 /* ix86.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5B60FDED16D00529849 /* ix86.c */; };
-		71F4C5BB0FDED16D00529849 /* ix86.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F4C5B70FDED16D00529849 /* ix86.h */; };
-		71F703A711B3A673007DD5C5 /* sjisfont.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F703A611B3A673007DD5C5 /* sjisfont.h */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXBuildRule section */
-		2BB3D6D005427FE200831ACB /* PBXBuildRule */ = {
-			isa = PBXBuildRule;
-			compilerSpec = com.apple.compilers.gcc;
-			fileType = sourcecode.c;
-			isEditable = 1;
-			outputFiles = (
-			);
-		};
-		2BD707B705559AE300CB5D9B /* PBXBuildRule */ = {
-			isa = PBXBuildRule;
-			compilerSpec = com.apple.compilers.gcc;
-			filePatterns = pasm.s;
-			fileType = sourcecode.asm;
-			isEditable = 1;
-			outputFiles = (
-				"$(DERIVED_FILES_DIR)/$(INPUT_FILE_BASE).o",
-			);
-			script = "as -o $(DERIVED_FILES_DIR)/$(INPUT_FILE_BASE).o $(INPUT_FILE_PATH)";
-		};
-/* End PBXBuildRule section */
-
-/* Begin PBXContainerItemProxy section */
-		713CB2DD11FC49720033B6A8 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 71F93F6311FB8E9D007A5A7C /* DFCdrom.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = 8D57630D048677EA00EA77CD;
-			remoteInfo = DFCdrom;
-		};
-		71AD2DD010C356FD00365243 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 71AD2DC710C356FD00365243 /* PeopsSPU.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 8D576316048677EA00EA77CD;
-			remoteInfo = PeopsSPU;
-		};
-		71AD2DDB10C3570900365243 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 71AD2DD210C3570900365243 /* PeopsSoftGPU.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 2BAF50930632BB1A00DB9A16;
-			remoteInfo = gpuPeopsSoftGL;
-		};
-		71AD2DE810C3572200365243 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 71AD2DC710C356FD00365243 /* PeopsSPU.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = 8D57630D048677EA00EA77CD;
-			remoteInfo = PeopsSPU;
-		};
-		71AD2DEA10C3572500365243 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 71AD2DD210C3570900365243 /* PeopsSoftGPU.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = 2BAF50920632BB1A00DB9A16;
-			remoteInfo = gpuPeopsSoftGL;
-		};
-		71F2C0851200B69B00322AD9 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 71F2C07E1200B69B00322AD9 /* DFInput.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 8D576316048677EA00EA77CD;
-			remoteInfo = DFInput;
-		};
-		71F2C0BB1200B75100322AD9 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 71F2C07E1200B69B00322AD9 /* DFInput.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = 8D57630D048677EA00EA77CD;
-			remoteInfo = DFInput;
-		};
-		71F93F6B11FB8E9D007A5A7C /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 71F93F6311FB8E9D007A5A7C /* DFCdrom.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 8D576316048677EA00EA77CD;
-			remoteInfo = DFCdrom;
-		};
-/* End PBXContainerItemProxy section */
-
-/* Begin PBXCopyFilesBuildPhase section */
-		71AD2DF010C3573400365243 /* Copy PlugIns */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 13;
-			files = (
-				71F2C0881200B6B000322AD9 /* DFInput.psxplugin in Copy PlugIns */,
-				713CB2E411FC49DA0033B6A8 /* DFCdrom.psxplugin in Copy PlugIns */,
-				71AD2DF510C3575C00365243 /* PeopsSoftGL.psxplugin in Copy PlugIns */,
-				71AD2DF410C3575300365243 /* PeopsSPU.psxplugin in Copy PlugIns */,
-			);
-			name = "Copy PlugIns";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXCopyFilesBuildPhase section */
-
-/* Begin PBXFileReference section */
-		2B02C04304E145D000880C5B /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
-		2B143D01078A2CBD00AF745A /* PCSX.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = PCSX.icns; sourceTree = "<group>"; };
-		2B143D02078A2CBD00AF745A /* pcsxfreeze.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = pcsxfreeze.icns; sourceTree = "<group>"; };
-		2B143D03078A2CBD00AF745A /* pcsxmemcard.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = pcsxmemcard.icns; sourceTree = "<group>"; };
-		2B143D04078A2CBD00AF745A /* psxbios.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = psxbios.icns; sourceTree = "<group>"; };
-		2B143D05078A2CBD00AF745A /* psxplugin.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = psxplugin.icns; sourceTree = "<group>"; };
-		2B2189D204D96C7A00179945 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
-		2B3E356A06937D1C00763C7D /* PcsxPluginDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PcsxPluginDocument.h; sourceTree = "<group>"; };
-		2B3E356B06937D1C00763C7D /* PcsxPluginDocument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PcsxPluginDocument.m; sourceTree = "<group>"; };
-		2B3E35BB069384D100763C7D /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = AddPluginSheet.nib; sourceTree = "<group>"; };
-		2B4DE98D05FF9307003EFEF0 /* PluginController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PluginController.h; sourceTree = "<group>"; };
-		2B4DE98E05FF9307003EFEF0 /* PluginController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = PluginController.m; sourceTree = "<group>"; };
-		2B690C760635C65C00CDA575 /* ExceptionHandling.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ExceptionHandling.framework; path = /System/Library/Frameworks/ExceptionHandling.framework; sourceTree = "<absolute>"; };
-		2B6E8AAE04C832040017A3B1 /* System.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = System.framework; path = /System/Library/Frameworks/System.framework; sourceTree = "<absolute>"; };
-		2B6E8AB404C8327C0017A3B1 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
-		2B75FD3C051C56D200D12034 /* PcsxController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PcsxController.h; sourceTree = "<group>"; };
-		2B75FD3D051C56D200D12034 /* PcsxController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = PcsxController.m; sourceTree = "<group>"; };
-		2B75FD4A051C8A7400D12034 /* ConfigurationController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ConfigurationController.h; sourceTree = "<group>"; };
-		2B75FD4B051C8A7400D12034 /* ConfigurationController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ConfigurationController.m; sourceTree = "<group>"; };
-		2B976C00074C14B4007C050A /* Kernel.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Kernel.framework; path = /System/Library/Frameworks/Kernel.framework; sourceTree = "<absolute>"; };
-		2BA178A505148D9D0026D74D /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
-		2BA178B10514CE260026D74D /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = Configuration.nib; sourceTree = "<group>"; };
-		2BA178B30514CE260026D74D /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = InfoPlist.strings; sourceTree = "<group>"; };
-		2BA178B50514CE260026D74D /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = PCSX.nib; sourceTree = "<group>"; };
-		2BA44360052DB2EA00E21DDD /* PcsxPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PcsxPlugin.h; sourceTree = "<group>"; };
-		2BA44361052DB2EA00E21DDD /* PcsxPlugin.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = PcsxPlugin.m; sourceTree = "<group>"; tabWidth = 4; usesTabs = 0; };
-		2BB3D6CF05427FE200831ACB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = Info.plist; sourceTree = "<group>"; };
-		2BB3D6D105427FE200831ACB /* PCSX.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = PCSX.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		2BBB1126051DC00500B84448 /* PluginList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginList.h; sourceTree = "<group>"; };
-		2BBB1127051DC00500B84448 /* PluginList.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PluginList.m; sourceTree = "<group>"; };
-		2BBB1787051E0D9700B84448 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = Credits.rtf; sourceTree = "<group>"; };
-		2BBB1791051E113B00B84448 /* EmuThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EmuThread.h; sourceTree = "<group>"; };
-		2BBB1792051E113B00B84448 /* EmuThread.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EmuThread.m; sourceTree = "<group>"; };
-		2BBB17DA051E4D0F00B84448 /* Plugin.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = Plugin.c; sourceTree = SOURCE_ROOT; };
-		2BC4786204C7FD3600CAB520 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
-		712FD1E51093096F00575A92 /* debug.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = debug.c; path = ../libpcsxcore/debug.c; sourceTree = SOURCE_ROOT; };
-		712FD1E61093096F00575A92 /* socket.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = socket.c; path = ../libpcsxcore/socket.c; sourceTree = SOURCE_ROOT; };
-		712FD1E71093096F00575A92 /* socket.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = socket.h; path = ../libpcsxcore/socket.h; sourceTree = SOURCE_ROOT; };
-		713B530C110B75650002F164 /* ppf.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = ppf.c; path = ../libpcsxcore/ppf.c; sourceTree = SOURCE_ROOT; };
-		713B530D110B75650002F164 /* ppf.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = ppf.h; path = ../libpcsxcore/ppf.h; sourceTree = SOURCE_ROOT; };
-		7161C2810FDED6D000225F97 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
-		7161C2970FDED75300225F97 /* ExtendedKeys.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExtendedKeys.h; sourceTree = "<group>"; };
-		719594AF11AEFE8C004AD686 /* gte_divider.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = gte_divider.h; path = ../libpcsxcore/gte_divider.h; sourceTree = SOURCE_ROOT; };
-		719594B011AEFE8C004AD686 /* psxcommon.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = psxcommon.c; path = ../libpcsxcore/psxcommon.c; sourceTree = SOURCE_ROOT; };
-		71AD2DC710C356FD00365243 /* PeopsSPU.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = PeopsSPU.xcodeproj; path = plugins/DFSound/PeopsSPU.xcodeproj; sourceTree = SOURCE_ROOT; };
-		71AD2DD210C3570900365243 /* PeopsSoftGPU.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = PeopsSoftGPU.xcodeproj; path = plugins/DFXVideo/PeopsSoftGPU.xcodeproj; sourceTree = SOURCE_ROOT; };
-		71F2C07E1200B69B00322AD9 /* DFInput.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = DFInput.xcodeproj; path = plugins/DFInput/DFInput.xcodeproj; sourceTree = "<group>"; };
-		71F4C5600FDED12800529849 /* cdriso.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cdriso.c; path = ../libpcsxcore/cdriso.c; sourceTree = SOURCE_ROOT; };
-		71F4C5610FDED12800529849 /* cdriso.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cdriso.h; path = ../libpcsxcore/cdriso.h; sourceTree = SOURCE_ROOT; };
-		71F4C5620FDED12800529849 /* cdrom.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cdrom.c; path = ../libpcsxcore/cdrom.c; sourceTree = SOURCE_ROOT; };
-		71F4C5630FDED12800529849 /* cdrom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cdrom.h; path = ../libpcsxcore/cdrom.h; sourceTree = SOURCE_ROOT; };
-		71F4C5640FDED12800529849 /* cheat.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cheat.c; path = ../libpcsxcore/cheat.c; sourceTree = SOURCE_ROOT; };
-		71F4C5650FDED12800529849 /* cheat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cheat.h; path = ../libpcsxcore/cheat.h; sourceTree = SOURCE_ROOT; };
-		71F4C5660FDED12800529849 /* coff.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = coff.h; path = ../libpcsxcore/coff.h; sourceTree = SOURCE_ROOT; };
-		71F4C5670FDED12800529849 /* debug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = debug.h; path = ../libpcsxcore/debug.h; sourceTree = SOURCE_ROOT; };
-		71F4C5680FDED12800529849 /* decode_xa.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = decode_xa.c; path = ../libpcsxcore/decode_xa.c; sourceTree = SOURCE_ROOT; };
-		71F4C5690FDED12800529849 /* decode_xa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = decode_xa.h; path = ../libpcsxcore/decode_xa.h; sourceTree = SOURCE_ROOT; };
-		71F4C56A0FDED12800529849 /* disr3000a.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = disr3000a.c; path = ../libpcsxcore/disr3000a.c; sourceTree = SOURCE_ROOT; };
-		71F4C56B0FDED12800529849 /* gte.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = gte.c; path = ../libpcsxcore/gte.c; sourceTree = SOURCE_ROOT; };
-		71F4C56C0FDED12800529849 /* gte.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gte.h; path = ../libpcsxcore/gte.h; sourceTree = SOURCE_ROOT; };
-		71F4C56D0FDED12800529849 /* mdec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mdec.c; path = ../libpcsxcore/mdec.c; sourceTree = SOURCE_ROOT; };
-		71F4C56E0FDED12800529849 /* mdec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mdec.h; path = ../libpcsxcore/mdec.h; sourceTree = SOURCE_ROOT; };
-		71F4C56F0FDED12800529849 /* misc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = misc.c; path = ../libpcsxcore/misc.c; sourceTree = SOURCE_ROOT; };
-		71F4C5700FDED12800529849 /* misc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = misc.h; path = ../libpcsxcore/misc.h; sourceTree = SOURCE_ROOT; };
-		71F4C5710FDED12800529849 /* plugins.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = plugins.c; path = ../libpcsxcore/plugins.c; sourceTree = SOURCE_ROOT; };
-		71F4C5720FDED12800529849 /* plugins.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = plugins.h; path = ../libpcsxcore/plugins.h; sourceTree = SOURCE_ROOT; };
-		71F4C5730FDED12800529849 /* psemu_plugin_defs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = psemu_plugin_defs.h; path = ../libpcsxcore/psemu_plugin_defs.h; sourceTree = SOURCE_ROOT; };
-		71F4C5740FDED12800529849 /* psxbios.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = psxbios.c; path = ../libpcsxcore/psxbios.c; sourceTree = SOURCE_ROOT; };
-		71F4C5750FDED12800529849 /* psxbios.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = psxbios.h; path = ../libpcsxcore/psxbios.h; sourceTree = SOURCE_ROOT; };
-		71F4C5760FDED12800529849 /* psxcommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = psxcommon.h; path = ../libpcsxcore/psxcommon.h; sourceTree = SOURCE_ROOT; };
-		71F4C5770FDED12800529849 /* psxcounters.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = psxcounters.c; path = ../libpcsxcore/psxcounters.c; sourceTree = SOURCE_ROOT; };
-		71F4C5780FDED12800529849 /* psxcounters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = psxcounters.h; path = ../libpcsxcore/psxcounters.h; sourceTree = SOURCE_ROOT; };
-		71F4C5790FDED12800529849 /* psxdma.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = psxdma.c; path = ../libpcsxcore/psxdma.c; sourceTree = SOURCE_ROOT; };
-		71F4C57A0FDED12800529849 /* psxdma.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = psxdma.h; path = ../libpcsxcore/psxdma.h; sourceTree = SOURCE_ROOT; };
-		71F4C57B0FDED12800529849 /* psxhle.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = psxhle.c; path = ../libpcsxcore/psxhle.c; sourceTree = SOURCE_ROOT; };
-		71F4C57C0FDED12800529849 /* psxhle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = psxhle.h; path = ../libpcsxcore/psxhle.h; sourceTree = SOURCE_ROOT; };
-		71F4C57D0FDED12800529849 /* psxhw.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = psxhw.c; path = ../libpcsxcore/psxhw.c; sourceTree = SOURCE_ROOT; };
-		71F4C57E0FDED12800529849 /* psxhw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = psxhw.h; path = ../libpcsxcore/psxhw.h; sourceTree = SOURCE_ROOT; };
-		71F4C57F0FDED12800529849 /* psxinterpreter.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = psxinterpreter.c; path = ../libpcsxcore/psxinterpreter.c; sourceTree = SOURCE_ROOT; };
-		71F4C5800FDED12800529849 /* psxmem.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = psxmem.c; path = ../libpcsxcore/psxmem.c; sourceTree = SOURCE_ROOT; };
-		71F4C5810FDED12800529849 /* psxmem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = psxmem.h; path = ../libpcsxcore/psxmem.h; sourceTree = SOURCE_ROOT; };
-		71F4C5820FDED12800529849 /* r3000a.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = r3000a.c; path = ../libpcsxcore/r3000a.c; sourceTree = SOURCE_ROOT; };
-		71F4C5830FDED12800529849 /* r3000a.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = r3000a.h; path = ../libpcsxcore/r3000a.h; sourceTree = SOURCE_ROOT; };
-		71F4C5840FDED12800529849 /* sio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sio.c; path = ../libpcsxcore/sio.c; sourceTree = SOURCE_ROOT; };
-		71F4C5850FDED12800529849 /* sio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sio.h; path = ../libpcsxcore/sio.h; sourceTree = SOURCE_ROOT; };
-		71F4C5860FDED12800529849 /* spu.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = spu.c; path = ../libpcsxcore/spu.c; sourceTree = SOURCE_ROOT; };
-		71F4C5870FDED12800529849 /* spu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = spu.h; path = ../libpcsxcore/spu.h; sourceTree = SOURCE_ROOT; };
-		71F4C5880FDED12800529849 /* system.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = system.h; path = ../libpcsxcore/system.h; sourceTree = SOURCE_ROOT; };
-		71F4C5B40FDED16D00529849 /* iGte.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iGte.h; path = ../libpcsxcore/ix86/iGte.h; sourceTree = SOURCE_ROOT; };
-		71F4C5B50FDED16D00529849 /* iR3000A.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = iR3000A.c; path = ../libpcsxcore/ix86/iR3000A.c; sourceTree = SOURCE_ROOT; };
-		71F4C5B60FDED16D00529849 /* ix86.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ix86.c; path = ../libpcsxcore/ix86/ix86.c; sourceTree = SOURCE_ROOT; };
-		71F4C5B70FDED16D00529849 /* ix86.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ix86.h; path = ../libpcsxcore/ix86/ix86.h; sourceTree = SOURCE_ROOT; };
-		71F703A611B3A673007DD5C5 /* sjisfont.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = sjisfont.h; path = ../libpcsxcore/sjisfont.h; sourceTree = SOURCE_ROOT; };
-		71F93F6311FB8E9D007A5A7C /* DFCdrom.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = DFCdrom.xcodeproj; path = plugins/DFCdrom/DFCdrom.xcodeproj; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		2BB3D6C505427FE200831ACB /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				2BB3D6C605427FE200831ACB /* Cocoa.framework in Frameworks */,
-				2BB3D6C705427FE200831ACB /* System.framework in Frameworks */,
-				2BB3D6C805427FE200831ACB /* IOKit.framework in Frameworks */,
-				2B400D910789F58A00BA271E /* Carbon.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		0249A662FF388D9811CA2CEA /* External Frameworks and Libraries */ = {
-			isa = PBXGroup;
-			children = (
-				2B976C00074C14B4007C050A /* Kernel.framework */,
-				2B02C04304E145D000880C5B /* Carbon.framework */,
-				2BC4786204C7FD3600CAB520 /* Cocoa.framework */,
-				2B6E8AAE04C832040017A3B1 /* System.framework */,
-				2B6E8AB404C8327C0017A3B1 /* IOKit.framework */,
-				2B2189D204D96C7A00179945 /* CoreFoundation.framework */,
-				2B690C760635C65C00CDA575 /* ExceptionHandling.framework */,
-			);
-			name = "External Frameworks and Libraries";
-			sourceTree = "<group>";
-		};
-		08FB7794FE84155DC02AAC07 /* Pcsx */ = {
-			isa = PBXGroup;
-			children = (
-				08FB7795FE84155DC02AAC07 /* Source */,
-				0249A662FF388D9811CA2CEA /* External Frameworks and Libraries */,
-				1AB674ADFE9D54B511CA2CBB /* Products */,
-				2BB3D6CF05427FE200831ACB /* Info.plist */,
-			);
-			name = Pcsx;
-			sourceTree = "<group>";
-		};
-		08FB7795FE84155DC02AAC07 /* Source */ = {
-			isa = PBXGroup;
-			children = (
-				2BCE23B204C6B52C007C2DA3 /* libpcsxcore */,
-				2BC4787804C7FDBD00CAB520 /* MacOSX */,
-			);
-			name = Source;
-			sourceTree = "<group>";
-		};
-		1AB674ADFE9D54B511CA2CBB /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				2BBD6C1D04C893F500A83E33 /* PlugIns */,
-				2BB3D6D105427FE200831ACB /* PCSX.app */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		2B143D00078A2CBD00AF745A /* icons */ = {
-			isa = PBXGroup;
-			children = (
-				2B143D01078A2CBD00AF745A /* PCSX.icns */,
-				2B143D02078A2CBD00AF745A /* pcsxfreeze.icns */,
-				2B143D03078A2CBD00AF745A /* pcsxmemcard.icns */,
-				2B143D04078A2CBD00AF745A /* psxbios.icns */,
-				2B143D05078A2CBD00AF745A /* psxplugin.icns */,
-			);
-			path = icons;
-			sourceTree = "<group>";
-		};
-		2BA178AD0514CE260026D74D /* English.lproj */ = {
-			isa = PBXGroup;
-			children = (
-				2BBB1786051E0D9700B84448 /* Credits.rtf */,
-				2BA178B00514CE260026D74D /* Configuration.nib */,
-				2BA178B20514CE260026D74D /* InfoPlist.strings */,
-				2BA178B40514CE260026D74D /* PCSX.nib */,
-				2B3E35BA069384D100763C7D /* AddPluginSheet.nib */,
-			);
-			path = English.lproj;
-			sourceTree = "<group>";
-		};
-		2BBD6C1D04C893F500A83E33 /* PlugIns */ = {
-			isa = PBXGroup;
-			children = (
-				71F2C07E1200B69B00322AD9 /* DFInput.xcodeproj */,
-				71F93F6311FB8E9D007A5A7C /* DFCdrom.xcodeproj */,
-				71AD2DD210C3570900365243 /* PeopsSoftGPU.xcodeproj */,
-				71AD2DC710C356FD00365243 /* PeopsSPU.xcodeproj */,
-			);
-			name = PlugIns;
-			sourceTree = "<group>";
-		};
-		2BC4787804C7FDBD00CAB520 /* MacOSX */ = {
-			isa = PBXGroup;
-			children = (
-				2BA178AD0514CE260026D74D /* English.lproj */,
-				2B143D00078A2CBD00AF745A /* icons */,
-				7161C2810FDED6D000225F97 /* config.h */,
-				2BA178A505148D9D0026D74D /* main.m */,
-				2BBB17DA051E4D0F00B84448 /* Plugin.c */,
-				2B75FD3C051C56D200D12034 /* PcsxController.h */,
-				2B75FD3D051C56D200D12034 /* PcsxController.m */,
-				2B75FD4A051C8A7400D12034 /* ConfigurationController.h */,
-				2B75FD4B051C8A7400D12034 /* ConfigurationController.m */,
-				2B4DE98D05FF9307003EFEF0 /* PluginController.h */,
-				2B4DE98E05FF9307003EFEF0 /* PluginController.m */,
-				2BBB1791051E113B00B84448 /* EmuThread.h */,
-				2BBB1792051E113B00B84448 /* EmuThread.m */,
-				7161C2970FDED75300225F97 /* ExtendedKeys.h */,
-				2BBB1126051DC00500B84448 /* PluginList.h */,
-				2BBB1127051DC00500B84448 /* PluginList.m */,
-				2BA44360052DB2EA00E21DDD /* PcsxPlugin.h */,
-				2BA44361052DB2EA00E21DDD /* PcsxPlugin.m */,
-				2B3E356A06937D1C00763C7D /* PcsxPluginDocument.h */,
-				2B3E356B06937D1C00763C7D /* PcsxPluginDocument.m */,
-			);
-			name = MacOSX;
-			sourceTree = "<group>";
-		};
-		2BCE23B204C6B52C007C2DA3 /* libpcsxcore */ = {
-			isa = PBXGroup;
-			children = (
-				71F4C5B30FDED15800529849 /* ix86 */,
-				71F4C5600FDED12800529849 /* cdriso.c */,
-				71F4C5610FDED12800529849 /* cdriso.h */,
-				71F4C5620FDED12800529849 /* cdrom.c */,
-				71F4C5630FDED12800529849 /* cdrom.h */,
-				71F4C5640FDED12800529849 /* cheat.c */,
-				71F4C5650FDED12800529849 /* cheat.h */,
-				71F4C5660FDED12800529849 /* coff.h */,
-				712FD1E51093096F00575A92 /* debug.c */,
-				71F4C5670FDED12800529849 /* debug.h */,
-				71F4C5680FDED12800529849 /* decode_xa.c */,
-				71F4C5690FDED12800529849 /* decode_xa.h */,
-				71F4C56A0FDED12800529849 /* disr3000a.c */,
-				71F4C56B0FDED12800529849 /* gte.c */,
-				71F4C56C0FDED12800529849 /* gte.h */,
-				719594AF11AEFE8C004AD686 /* gte_divider.h */,
-				71F4C56D0FDED12800529849 /* mdec.c */,
-				71F4C56E0FDED12800529849 /* mdec.h */,
-				71F4C56F0FDED12800529849 /* misc.c */,
-				71F4C5700FDED12800529849 /* misc.h */,
-				71F4C5710FDED12800529849 /* plugins.c */,
-				71F4C5720FDED12800529849 /* plugins.h */,
-				713B530C110B75650002F164 /* ppf.c */,
-				713B530D110B75650002F164 /* ppf.h */,
-				71F4C5730FDED12800529849 /* psemu_plugin_defs.h */,
-				71F4C5740FDED12800529849 /* psxbios.c */,
-				71F4C5750FDED12800529849 /* psxbios.h */,
-				719594B011AEFE8C004AD686 /* psxcommon.c */,
-				71F4C5760FDED12800529849 /* psxcommon.h */,
-				71F4C5770FDED12800529849 /* psxcounters.c */,
-				71F4C5780FDED12800529849 /* psxcounters.h */,
-				71F4C5790FDED12800529849 /* psxdma.c */,
-				71F4C57A0FDED12800529849 /* psxdma.h */,
-				71F4C57B0FDED12800529849 /* psxhle.c */,
-				71F4C57C0FDED12800529849 /* psxhle.h */,
-				71F4C57D0FDED12800529849 /* psxhw.c */,
-				71F4C57E0FDED12800529849 /* psxhw.h */,
-				71F4C57F0FDED12800529849 /* psxinterpreter.c */,
-				71F4C5800FDED12800529849 /* psxmem.c */,
-				71F4C5810FDED12800529849 /* psxmem.h */,
-				71F4C5820FDED12800529849 /* r3000a.c */,
-				71F4C5830FDED12800529849 /* r3000a.h */,
-				71F4C5840FDED12800529849 /* sio.c */,
-				71F4C5850FDED12800529849 /* sio.h */,
-				71F703A611B3A673007DD5C5 /* sjisfont.h */,
-				712FD1E61093096F00575A92 /* socket.c */,
-				712FD1E71093096F00575A92 /* socket.h */,
-				71F4C5860FDED12800529849 /* spu.c */,
-				71F4C5870FDED12800529849 /* spu.h */,
-				71F4C5880FDED12800529849 /* system.h */,
-			);
-			name = libpcsxcore;
-			sourceTree = "<group>";
-		};
-		71AD2DCD10C356FD00365243 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				71AD2DD110C356FD00365243 /* PeopsSPU.psxplugin */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		71AD2DD810C3570900365243 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				71AD2DDC10C3570900365243 /* PeopsSoftGL.psxplugin */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		71F2C07F1200B69B00322AD9 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				71F2C0861200B69B00322AD9 /* DFInput.psxplugin */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		71F4C5B30FDED15800529849 /* ix86 */ = {
-			isa = PBXGroup;
-			children = (
-				71F4C5B40FDED16D00529849 /* iGte.h */,
-				71F4C5B50FDED16D00529849 /* iR3000A.c */,
-				71F4C5B60FDED16D00529849 /* ix86.c */,
-				71F4C5B70FDED16D00529849 /* ix86.h */,
-			);
-			name = ix86;
-			sourceTree = "<group>";
-		};
-		71F93F6411FB8E9D007A5A7C /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				71F93F6C11FB8E9D007A5A7C /* DFCdrom.psxplugin */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXHeadersBuildPhase section */
-		2BB3D68305427FE200831ACB /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				2BB3D69D05427FE200831ACB /* PcsxController.h in Headers */,
-				2BB3D69E05427FE200831ACB /* ConfigurationController.h in Headers */,
-				2BB3D69F05427FE200831ACB /* PluginList.h in Headers */,
-				2BB3D6A005427FE200831ACB /* EmuThread.h in Headers */,
-				2BB3D6A105427FE200831ACB /* PcsxPlugin.h in Headers */,
-				2B4DE99105FF9307003EFEF0 /* PluginController.h in Headers */,
-				2B3E356C06937D1C00763C7D /* PcsxPluginDocument.h in Headers */,
-				71F4C58A0FDED12800529849 /* cdriso.h in Headers */,
-				71F4C58C0FDED12800529849 /* cdrom.h in Headers */,
-				71F4C58E0FDED12800529849 /* cheat.h in Headers */,
-				71F4C58F0FDED12800529849 /* coff.h in Headers */,
-				71F4C5900FDED12800529849 /* debug.h in Headers */,
-				71F4C5920FDED12800529849 /* decode_xa.h in Headers */,
-				71F4C5950FDED12800529849 /* gte.h in Headers */,
-				71F4C5970FDED12800529849 /* mdec.h in Headers */,
-				71F4C5990FDED12800529849 /* misc.h in Headers */,
-				71F4C59B0FDED12800529849 /* plugins.h in Headers */,
-				71F4C59C0FDED12800529849 /* psemu_plugin_defs.h in Headers */,
-				71F4C59E0FDED12800529849 /* psxbios.h in Headers */,
-				71F4C59F0FDED12800529849 /* psxcommon.h in Headers */,
-				71F4C5A10FDED12800529849 /* psxcounters.h in Headers */,
-				71F4C5A30FDED12800529849 /* psxdma.h in Headers */,
-				71F4C5A50FDED12800529849 /* psxhle.h in Headers */,
-				71F4C5A70FDED12800529849 /* psxhw.h in Headers */,
-				71F4C5AA0FDED12800529849 /* psxmem.h in Headers */,
-				71F4C5AC0FDED12800529849 /* r3000a.h in Headers */,
-				71F4C5AE0FDED12800529849 /* sio.h in Headers */,
-				71F4C5B00FDED12800529849 /* spu.h in Headers */,
-				71F4C5B10FDED12800529849 /* system.h in Headers */,
-				71F4C5B80FDED16D00529849 /* iGte.h in Headers */,
-				71F4C5BB0FDED16D00529849 /* ix86.h in Headers */,
-				7161C2820FDED6D000225F97 /* config.h in Headers */,
-				7161C2980FDED75300225F97 /* ExtendedKeys.h in Headers */,
-				712FD1EA1093096F00575A92 /* socket.h in Headers */,
-				713B530F110B75650002F164 /* ppf.h in Headers */,
-				719594B111AEFE8C004AD686 /* gte_divider.h in Headers */,
-				71F703A711B3A673007DD5C5 /* sjisfont.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXHeadersBuildPhase section */
-
-/* Begin PBXNativeTarget section */
-		2BB3D68205427FE200831ACB /* PCSX */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 71F353F30FD98DFE00CBEC28 /* Build configuration list for PBXNativeTarget "PCSX" */;
-			buildPhases = (
-				2BB3D68305427FE200831ACB /* Headers */,
-				2BB3D6A205427FE200831ACB /* Resources */,
-				2BB3D6A805427FE200831ACB /* Sources */,
-				2BB3D6C505427FE200831ACB /* Frameworks */,
-				2BB3D6CD05427FE200831ACB /* Rez */,
-				71AD2DF010C3573400365243 /* Copy PlugIns */,
-			);
-			buildRules = (
-				2BD707B705559AE300CB5D9B /* PBXBuildRule */,
-				2BB3D6D005427FE200831ACB /* PBXBuildRule */,
-			);
-			dependencies = (
-				71AD2DE910C3572200365243 /* PBXTargetDependency */,
-				71AD2DEB10C3572500365243 /* PBXTargetDependency */,
-				713CB2DE11FC49720033B6A8 /* PBXTargetDependency */,
-				71F2C0BC1200B75100322AD9 /* PBXTargetDependency */,
-			);
-			name = PCSX;
-			productInstallPath = "$(USER_APPS_DIR)";
-			productName = "Pcsx-MacOSX";
-			productReference = 2BB3D6D105427FE200831ACB /* PCSX.app */;
-			productType = "com.apple.product-type.application";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		08FB7793FE84155DC02AAC07 /* Project object */ = {
-			isa = PBXProject;
-			buildConfigurationList = 71F353F80FD98DFE00CBEC28 /* Build configuration list for PBXProject "Pcsx" */;
-			hasScannedForEncodings = 1;
-			mainGroup = 08FB7794FE84155DC02AAC07 /* Pcsx */;
-			projectDirPath = "";
-			projectReferences = (
-				{
-					ProductGroup = 71F93F6411FB8E9D007A5A7C /* Products */;
-					ProjectRef = 71F93F6311FB8E9D007A5A7C /* DFCdrom.xcodeproj */;
-				},
-				{
-					ProductGroup = 71F2C07F1200B69B00322AD9 /* Products */;
-					ProjectRef = 71F2C07E1200B69B00322AD9 /* DFInput.xcodeproj */;
-				},
-				{
-					ProductGroup = 71AD2DD810C3570900365243 /* Products */;
-					ProjectRef = 71AD2DD210C3570900365243 /* PeopsSoftGPU.xcodeproj */;
-				},
-				{
-					ProductGroup = 71AD2DCD10C356FD00365243 /* Products */;
-					ProjectRef = 71AD2DC710C356FD00365243 /* PeopsSPU.xcodeproj */;
-				},
-			);
-			targets = (
-				2BB3D68205427FE200831ACB /* PCSX */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXReferenceProxy section */
-		71AD2DD110C356FD00365243 /* PeopsSPU.psxplugin */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.cfbundle;
-			path = PeopsSPU.psxplugin;
-			remoteRef = 71AD2DD010C356FD00365243 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		71AD2DDC10C3570900365243 /* PeopsSoftGL.psxplugin */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.cfbundle;
-			path = PeopsSoftGL.psxplugin;
-			remoteRef = 71AD2DDB10C3570900365243 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		71F2C0861200B69B00322AD9 /* DFInput.psxplugin */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.cfbundle;
-			path = DFInput.psxplugin;
-			remoteRef = 71F2C0851200B69B00322AD9 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		71F93F6C11FB8E9D007A5A7C /* DFCdrom.psxplugin */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.cfbundle;
-			path = DFCdrom.psxplugin;
-			remoteRef = 71F93F6B11FB8E9D007A5A7C /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-/* End PBXReferenceProxy section */
-
-/* Begin PBXResourcesBuildPhase section */
-		2BB3D6A205427FE200831ACB /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				2BB3D6A305427FE200831ACB /* Configuration.nib in Resources */,
-				2BB3D6A405427FE200831ACB /* InfoPlist.strings in Resources */,
-				2BB3D6A505427FE200831ACB /* PCSX.nib in Resources */,
-				2BB3D6A705427FE200831ACB /* Credits.rtf in Resources */,
-				2B3E35BC069384D100763C7D /* AddPluginSheet.nib in Resources */,
-				2B143D06078A2CBD00AF745A /* PCSX.icns in Resources */,
-				2B143D07078A2CBD00AF745A /* pcsxfreeze.icns in Resources */,
-				2B143D08078A2CBD00AF745A /* pcsxmemcard.icns in Resources */,
-				2B143D09078A2CBD00AF745A /* psxbios.icns in Resources */,
-				2B143D0A078A2CBD00AF745A /* psxplugin.icns in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXRezBuildPhase section */
-		2BB3D6CD05427FE200831ACB /* Rez */ = {
-			isa = PBXRezBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXRezBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		2BB3D6A805427FE200831ACB /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				2BB3D6BE05427FE200831ACB /* main.m in Sources */,
-				2BB3D6BF05427FE200831ACB /* PcsxController.m in Sources */,
-				2BB3D6C005427FE200831ACB /* ConfigurationController.m in Sources */,
-				2BB3D6C105427FE200831ACB /* PluginList.m in Sources */,
-				2BB3D6C205427FE200831ACB /* EmuThread.m in Sources */,
-				2BB3D6C305427FE200831ACB /* Plugin.c in Sources */,
-				2BB3D6C405427FE200831ACB /* PcsxPlugin.m in Sources */,
-				2B4DE99205FF9307003EFEF0 /* PluginController.m in Sources */,
-				2B3E356D06937D1C00763C7D /* PcsxPluginDocument.m in Sources */,
-				71F4C5890FDED12800529849 /* cdriso.c in Sources */,
-				71F4C58B0FDED12800529849 /* cdrom.c in Sources */,
-				71F4C58D0FDED12800529849 /* cheat.c in Sources */,
-				71F4C5910FDED12800529849 /* decode_xa.c in Sources */,
-				71F4C5930FDED12800529849 /* disr3000a.c in Sources */,
-				71F4C5940FDED12800529849 /* gte.c in Sources */,
-				71F4C5960FDED12800529849 /* mdec.c in Sources */,
-				71F4C5980FDED12800529849 /* misc.c in Sources */,
-				71F4C59A0FDED12800529849 /* plugins.c in Sources */,
-				71F4C59D0FDED12800529849 /* psxbios.c in Sources */,
-				71F4C5A00FDED12800529849 /* psxcounters.c in Sources */,
-				71F4C5A20FDED12800529849 /* psxdma.c in Sources */,
-				71F4C5A40FDED12800529849 /* psxhle.c in Sources */,
-				71F4C5A60FDED12800529849 /* psxhw.c in Sources */,
-				71F4C5A80FDED12800529849 /* psxinterpreter.c in Sources */,
-				71F4C5A90FDED12800529849 /* psxmem.c in Sources */,
-				71F4C5AB0FDED12800529849 /* r3000a.c in Sources */,
-				71F4C5AD0FDED12800529849 /* sio.c in Sources */,
-				71F4C5AF0FDED12800529849 /* spu.c in Sources */,
-				71F4C5B90FDED16D00529849 /* iR3000A.c in Sources */,
-				71F4C5BA0FDED16D00529849 /* ix86.c in Sources */,
-				712FD1E81093096F00575A92 /* debug.c in Sources */,
-				712FD1E91093096F00575A92 /* socket.c in Sources */,
-				713B530E110B75650002F164 /* ppf.c in Sources */,
-				719594B211AEFE8C004AD686 /* psxcommon.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXTargetDependency section */
-		713CB2DE11FC49720033B6A8 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = DFCdrom;
-			targetProxy = 713CB2DD11FC49720033B6A8 /* PBXContainerItemProxy */;
-		};
-		71AD2DE910C3572200365243 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = PeopsSPU;
-			targetProxy = 71AD2DE810C3572200365243 /* PBXContainerItemProxy */;
-		};
-		71AD2DEB10C3572500365243 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = gpuPeopsSoftGL;
-			targetProxy = 71AD2DEA10C3572500365243 /* PBXContainerItemProxy */;
-		};
-		71F2C0BC1200B75100322AD9 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = DFInput;
-			targetProxy = 71F2C0BB1200B75100322AD9 /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
-/* Begin PBXVariantGroup section */
-		2B3E35BA069384D100763C7D /* AddPluginSheet.nib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				2B3E35BB069384D100763C7D /* English */,
-			);
-			name = AddPluginSheet.nib;
-			sourceTree = "<group>";
-		};
-		2BA178B00514CE260026D74D /* Configuration.nib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				2BA178B10514CE260026D74D /* English */,
-			);
-			name = Configuration.nib;
-			sourceTree = "<group>";
-		};
-		2BA178B20514CE260026D74D /* InfoPlist.strings */ = {
-			isa = PBXVariantGroup;
-			children = (
-				2BA178B30514CE260026D74D /* English */,
-			);
-			name = InfoPlist.strings;
-			sourceTree = "<group>";
-		};
-		2BA178B40514CE260026D74D /* PCSX.nib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				2BA178B50514CE260026D74D /* English */,
-			);
-			name = PCSX.nib;
-			sourceTree = "<group>";
-		};
-		2BBB1786051E0D9700B84448 /* Credits.rtf */ = {
-			isa = PBXVariantGroup;
-			children = (
-				2BBB1787051E0D9700B84448 /* English */,
-			);
-			name = Credits.rtf;
-			sourceTree = "<group>";
-		};
-/* End PBXVariantGroup section */
-
-/* Begin XCBuildConfiguration section */
-		71F353F40FD98DFE00CBEC28 /* Development */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-				DEBUGGING_SYMBOLS = YES;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_ASM_KEYWORD = YES;
-				GCC_ENABLE_CPP_EXCEPTIONS = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-				GCC_MODEL_TUNING = G3;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1)",
-					__MACOSX__,
-				);
-				GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1 = "PCSX_VERSION=\\\"1.5\\\" XA_HACK=1";
-				GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
-				GCC_WARN_UNKNOWN_PRAGMAS = NO;
-				INFOPLIST_FILE = Info.plist;
-				OTHER_CFLAGS = (
-					"-fomit-frame-pointer",
-					"-funroll-loops",
-					"-falign-loops=16",
-				);
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = PCSX;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = "-Wmost";
-				WRAPPER_EXTENSION = app;
-				ZERO_LINK = NO;
-			};
-			name = Development;
-		};
-		71F353F50FD98DFE00CBEC28 /* Deployment */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = YES;
-				DEBUGGING_SYMBOLS = NO;
-				GCC_DYNAMIC_NO_PIC = YES;
-				GCC_ENABLE_ASM_KEYWORD = YES;
-				GCC_ENABLE_CPP_EXCEPTIONS = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_MODEL_CPU = "";
-				GCC_MODEL_TUNING = "";
-				GCC_OPTIMIZATION_LEVEL = s;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1)",
-					__MACOSX__,
-				);
-				GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1 = "PCSX_VERSION=\\\"1.5\\\" XA_HACK=1";
-				GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
-				GCC_WARN_UNKNOWN_PRAGMAS = NO;
-				INFOPLIST_FILE = Info.plist;
-				OTHER_CFLAGS = (
-					"-fomit-frame-pointer",
-					"-funroll-loops",
-					"-falign-loops=16",
-				);
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = PCSX;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = "-Wmost";
-				WRAPPER_EXTENSION = app;
-				ZERO_LINK = NO;
-			};
-			name = Deployment;
-		};
-		71F353F90FD98DFE00CBEC28 /* Development */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = i386;
-				GCC_MODEL_TUNING = "";
-				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				HEADER_SEARCH_PATHS = (
-					../include,
-					../libpcsxcore,
-					../macosx,
-				);
-				OTHER_LDFLAGS = (
-					"-lz",
-					"-lSystemStubs",
-				);
-			};
-			name = Development;
-		};
-		71F353FA0FD98DFE00CBEC28 /* Deployment */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = i386;
-				GCC_DYNAMIC_NO_PIC = YES;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
-				GCC_MODEL_TUNING = "";
-				GCC_OPTIMIZATION_LEVEL = 2;
-				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
-				GCC_UNROLL_LOOPS = YES;
-				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				HEADER_SEARCH_PATHS = (
-					../include,
-					../libpcsxcore,
-					../macosx,
-				);
-				OTHER_CFLAGS = "-fomit-frame-pointer";
-				OTHER_LDFLAGS = (
-					"-lz",
-					"-lSystemStubs",
-				);
-			};
-			name = Deployment;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		71F353F30FD98DFE00CBEC28 /* Build configuration list for PBXNativeTarget "PCSX" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				71F353F40FD98DFE00CBEC28 /* Development */,
-				71F353F50FD98DFE00CBEC28 /* Deployment */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Development;
-		};
-		71F353F80FD98DFE00CBEC28 /* Build configuration list for PBXProject "Pcsx" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				71F353F90FD98DFE00CBEC28 /* Development */,
-				71F353FA0FD98DFE00CBEC28 /* Deployment */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Development;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 08FB7793FE84155DC02AAC07 /* Project object */;
-}

pcsxr-1.9.92.tar.bz2/macosx/PcsxController.h Deleted

pcsxr-1.9.92.tar.bz2/macosx/PcsxController.m Deleted

@@ -1,425 +0,0 @@
-#import <Cocoa/Cocoa.h>
-#import "PcsxController.h"
-#import "ConfigurationController.h"
-#import "EmuThread.h"
-#include "psxcommon.h"
-#include "plugins.h"
-#include "misc.h"
-#include "ExtendedKeys.h"
-
-NSDictionary *prefStringKeys;
-NSDictionary *prefByteKeys;
-NSMutableArray *biosList;
-NSString *saveStatePath;
-
-@implementation PcsxController
-
-- (IBAction)ejectCD:(id)sender
-{
-	NSMutableString *deviceName;
-	NSTask *ejectTask;
-	NSRange rdiskRange;
-
-	BOOL wasPaused = [EmuThread pauseSafe];
-
-	/* close connection to current cd */
-	if ([EmuThread active])
-		CDR_close();
-
-	// switch to another ISO if using internal image reader, otherwise eject the CD
-	if (UsingIso()) {
-		NSOpenPanel* openDlg = [NSOpenPanel openPanel];
-
-		[openDlg setCanChooseFiles:YES];
-		[openDlg setCanChooseDirectories:NO];
-
-		if ([openDlg runModal] == NSOKButton) {
-			NSArray* files = [openDlg filenames];
-			SetCdOpenCaseTime(time(NULL) + 2);
-			SetIsoFile((const char *)[[files objectAtIndex:0] fileSystemRepresentation]);
-		}
-	} else {
-		if (CDR_getDriveLetter() != nil) {
-			deviceName = [NSMutableString stringWithCString:CDR_getDriveLetter()];
-
-			// delete the 'r' in 'rdisk'
-			rdiskRange = [deviceName rangeOfString:@"rdisk"];
-			if (rdiskRange.length != 0) {
-				rdiskRange.length = 1;
-				[deviceName deleteCharactersInRange:rdiskRange];
-			}
-			// execute hdiutil to eject the device
-			ejectTask = [NSTask launchedTaskWithLaunchPath:@"/usr/bin/hdiutil" arguments:[NSArray arrayWithObjects:@"eject", deviceName, nil]];
-			[ejectTask waitUntilExit];
-		}
-	}
-
-	/* and open new cd */
-	if ([EmuThread active])
-		CDR_open();
-
-	if (!wasPaused) {
-		[EmuThread resume];
-	}
-}
-
-- (IBAction)pause:(id)sender
-{
- if ([EmuThread isPaused]) {
- //[sender setState:NSOffState];
- [EmuThread resume];
- }
- else {
- //[sender setState:NSOnState];
- [EmuThread pause];
- }
-}
-
-- (IBAction)preferences:(id)sender
-{
-	/* load the nib if it hasn't yet */
-	if (preferenceWindow == nil) {
-		if (preferencesController == nil) {
-			preferencesController = [[ConfigurationController alloc] initWithWindowNibName:@"Configuration"];
-		}
-		preferenceWindow = [preferencesController window];
-	}
-
-	/* show the window */
-	[preferenceWindow makeKeyAndOrderFront:self];
-	[preferencesController showWindow:self];
-}
-
-- (IBAction)reset:(id)sender
-{
- [EmuThread reset];
-}
-
-- (IBAction)runCD:(id)sender
-{
-	SetIsoFile(NULL);
-	[EmuThread run];
-}
-
-- (IBAction)runIso:(id)sender
-{
-	NSOpenPanel* openDlg = [NSOpenPanel openPanel];
-
-	[openDlg setCanChooseFiles:YES];
-	[openDlg setCanChooseDirectories:NO];
-
-	if ([openDlg runModalForDirectory:nil file:nil] == NSOKButton) {
-		NSArray* files = [openDlg filenames];
-		SetIsoFile((const char *)[[files objectAtIndex:0] fileSystemRepresentation]);
-		[EmuThread run];
- }
-}
-
-- (IBAction)runBios:(id)sender
-{
-	SetIsoFile(NULL);
-	[EmuThread runBios];
-}
-
-- (IBAction)freeze:(id)sender
-{
-	int num = [sender tag];
-	NSString *path = [NSString stringWithFormat:@"%@/%s-%3.3d.pcsxstate", saveStatePath, CdromId, num];
-
-	[EmuThread freezeAt:path which:num-1];
-}
-
-- (IBAction)defrost:(id)sender
-{
-	NSString *path = [NSString stringWithFormat:@"%@/%s-%3.3d.pcsxstate", saveStatePath, CdromId, [sender tag]];
-	[EmuThread defrostAt:path];
-}
-
-- (IBAction)fullscreen:(id)sender
-{
-	GPU_keypressed(GPU_FULLSCREEN_KEY);
-}
-
-- (BOOL)validateMenuItem:(id <NSMenuItem>)menuItem
-{
-	if ([menuItem action] == @selector(pause:)) {
-		[menuItem setState:([EmuThread isPaused] ? NSOnState : NSOffState)];
-	}
-
-	if ([menuItem action] == @selector(pause:) || [menuItem action] == @selector(fullscreen:))
-		return [EmuThread active];
-
-	if ([menuItem action] == @selector(reset:) || [menuItem action] == @selector(ejectCD:) ||
-		 [menuItem action] == @selector(freeze:))
-		return [EmuThread active] && ![EmuThread isRunBios];
-
-	if ([menuItem action] == @selector(runCD:) || [menuItem action] == @selector(runIso:) ||
-		 [menuItem action] == @selector(runBios:)) {
-		if (preferenceWindow != nil)
-			if ([preferenceWindow isVisible])
-				return NO;
-
-		if ([menuItem action] == @selector(runBios:) && strcmp(Config.Bios, "HLE") == 0)
-			return NO;
-
-		return ![EmuThread active];
-	}
-
-	if ([menuItem action] == @selector(defrost:)) {
-		if (![EmuThread active] || [EmuThread isRunBios])
-			return NO;
-
-		NSString *path = [NSString stringWithFormat:@"%@/%s-%3.3d.pcsxstate", saveStatePath, CdromId, [menuItem tag]];
-		return (CheckState((char *)[path fileSystemRepresentation]) == 0);
-	}
-
-	if ([menuItem action] == @selector(preferences:))
-		return ![EmuThread active];
-
-	return YES;
-}
-
-- (void)applicationWillResignActive:(NSNotification *)aNotification
-{
-	wasPausedBeforeBGSwitch = [EmuThread isPaused];
-
-	if (sleepInBackground) {
-		 [EmuThread pause];
-	}
-}
-
-- (void)applicationDidBecomeActive:(NSNotification *)aNotification
-{
-	if (sleepInBackground && !wasPausedBeforeBGSwitch) {
-		[EmuThread resume];
-	}
-}
-
-- (void)awakeFromNib
-{
-	pluginList = [[PluginList alloc] init];
-	if (![pluginList configured] /*!Config.Gpu[0] || !Config.Spu[0] || !Config.Pad1[0] || !Config.Cdr[0]*/) {
-		// configure plugins
-		[self preferences:nil];
-
-		NSRunCriticalAlertPanel(NSLocalizedString(@"Missing plugins!", nil),
-				NSLocalizedString(@"Pcsx is missing one or more critical plugins. You will need to install these in order to play games.", nil), 
-				nil, nil, nil);
-	}
-
-	if (![PcsxController biosAvailable]) {
-		NSRunInformationalAlertPanel(NSLocalizedString(@"Missing BIOS!", nil),
-				NSLocalizedString(@"Pcsx wasn't able to locate any Playstation BIOS ROM files. This means that it will run in BIOS simulation mode which is less stable and compatible than using a real Playstation BIOS.\n"
-										@"If you have a BIOS available, please copy it to\n~/Library/Application Support/Pcsx/Bios/", nil), 
-				nil, nil, nil);
-	}
-
-	sleepInBackground = YES;
-}
-
-- (void)dealloc
-{
-	[pluginList release];
-	[super dealloc];
-}
-
-+ (void)setConfigFromDefaults
-{
-	NSEnumerator *enumerator;
-	const char *str;
-	NSString *key;
-	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-
-	/*
-	enumerator = [prefStringKeys keyEnumerator];
-	while ((key = [enumerator nextObject])) {
-		str = [[defaults stringForKey:key] fileSystemRepresentation];
-		char *dst = (char *)[[prefStringKeys objectForKey:key] pointerValue];
-		if (str != nil && dst != nil) strncpy(dst, str, 255);
-	}*/
-
-	enumerator = [prefByteKeys keyEnumerator];
-	while ((key = [enumerator nextObject])) {
-		u8 *dst = (u8 *)[[prefByteKeys objectForKey:key] pointerValue];
-		if (dst != nil) *dst = [defaults integerForKey:key];
-	}
-
-	// special cases
-	//str = [[defaults stringForKey:@"PluginPAD"] fileSystemRepresentation];
-	//if (str != nil) strncpy(Config.Pad2, str, 255);
-
-	str = [[defaults stringForKey:@"Bios"] fileSystemRepresentation];
-	if (str) {
-		NSString *path = [defaults stringForKey:@"Bios"];
-		int index = [biosList indexOfObject:path];
-
-		if (-1 == index) {
-			[biosList insertObject:path atIndex:0];
-		} else if (0 < index) {
-			[biosList exchangeObjectAtIndex:index withObjectAtIndex:0];
-		}
-	}
-
-	str = [[defaults stringForKey:@"Mcd1"] fileSystemRepresentation];
-	if (str) strncpy(Config.Mcd1, str, MAXPATHLEN);
-
-	str = [[defaults stringForKey:@"Mcd2"] fileSystemRepresentation];
-	if (str) strncpy(Config.Mcd2, str, MAXPATHLEN);
-
-	if ([defaults boolForKey:@"UseHLE"] || 0 == [biosList count]) {
-		strcpy(Config.Bios, "HLE");
-	} else {
-		str = [(NSString *)[biosList objectAtIndex:0] fileSystemRepresentation];
-		if (str != nil) strncpy(Config.Bios, str, MAXPATHLEN);
-		else strcpy(Config.Bios, "HLE");
-	}
-
-	// FIXME: hack
-	strcpy(Config.Net, "Disabled");
-}
-
-+ (void)setDefaultFromConfig:(NSString *)defaultKey
-{
-	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-
-	char *str = (char *)[[prefStringKeys objectForKey:defaultKey] pointerValue];
-	if (str) {
-		[defaults setObject:[NSString stringWithCString:str] forKey:defaultKey];
-		return;
-	}
-
-	u8 *val = (u8 *)[[prefByteKeys objectForKey:defaultKey] pointerValue];
-	if (val) {
-		[defaults setInteger:*val forKey:defaultKey];
-		return;
-	}
-}
-
-+ (BOOL)biosAvailable
-{
-	return ([biosList count] > 0);
-}
-
-// called when class is initialized
-+ (void)initialize
-{
-	NSString *path;
-	const char *str;
-	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-	NSDictionary *appDefaults = [NSDictionary dictionaryWithObjectsAndKeys:
-		@"Disabled", @"PluginNET",
-		[NSNumber numberWithInt:1], @"NoDynarec",
-		[NSNumber numberWithInt:1], @"AutoDetectVideoType",
-		[NSNumber numberWithInt:0], @"UseHLE",
-		nil];
-
-	[defaults registerDefaults:appDefaults];
-
-	prefStringKeys = [[NSDictionary alloc] initWithObjectsAndKeys:
-		[NSValue valueWithPointer:Config.Gpu], @"PluginGPU",
-		[NSValue valueWithPointer:Config.Spu], @"PluginSPU",
-		[NSValue valueWithPointer:Config.Pad1], @"PluginPAD",
-		[NSValue valueWithPointer:Config.Cdr], @"PluginCDR",
-		[NSValue valueWithPointer:Config.Net], @"PluginNET",
-		[NSValue valueWithPointer:Config.Mcd1], @"Mcd1",
-		[NSValue valueWithPointer:Config.Mcd2], @"Mcd2",
-		nil];
-
-	prefByteKeys = [[NSDictionary alloc] initWithObjectsAndKeys:
-		[NSValue valueWithPointer:&Config.Xa], @"NoXaAudio",
-		[NSValue valueWithPointer:&Config.Sio], @"SioIrqAlways",
-		[NSValue valueWithPointer:&Config.Mdec], @"BlackAndWhiteMDECVideo",
-		[NSValue valueWithPointer:&Config.PsxAuto], @"AutoDetectVideoType",
-		[NSValue valueWithPointer:&Config.PsxType], @"VideoTypePAL",
-		[NSValue valueWithPointer:&Config.Cdda], @"NoCDAudio",
-		[NSValue valueWithPointer:&Config.Cpu], @"NoDynarec",
-		[NSValue valueWithPointer:&Config.PsxOut], @"ConsoleOutput",
-		[NSValue valueWithPointer:&Config.SpuIrq], @"SpuIrqAlways",
-		[NSValue valueWithPointer:&Config.RCntFix], @"RootCounterFix",
-		[NSValue valueWithPointer:&Config.VSyncWA], @"VideoSyncWAFix",
-		nil];
-
-	// setup application support paths
-	NSArray *libPaths = NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSUserDomainMask, YES);
-	if ([libPaths count] > 0) {
-		NSString *path;
-		BOOL dir;
-
-		// create them if needed
-		NSFileManager *dfm = [NSFileManager defaultManager];
-		NSString *supportPath = [NSString stringWithFormat:@"%@/Application Support", [libPaths objectAtIndex:0]];
-		if (![dfm fileExistsAtPath:supportPath isDirectory:&dir])
-			[dfm createDirectoryAtPath:supportPath attributes:nil];
-
-		path = [NSString stringWithFormat:@"%@/Pcsx", supportPath];
-		if (![dfm fileExistsAtPath:path isDirectory:&dir])
-			[dfm createDirectoryAtPath:path attributes:nil];
-
-		path = [NSString stringWithFormat:@"%@/Pcsx/Bios", supportPath];
-		if (![dfm fileExistsAtPath:path isDirectory:&dir])
-			[dfm createDirectoryAtPath:path attributes:nil];
-
-		path = [NSString stringWithFormat:@"%@/Pcsx/Memory Cards", supportPath];
-		if (![dfm fileExistsAtPath:path isDirectory:&dir])
-			[dfm createDirectoryAtPath:path attributes:nil];
-
-		path = [NSString stringWithFormat:@"%@/Pcsx/Patches", supportPath];
-		if (![dfm fileExistsAtPath:path isDirectory:&dir])
-			[dfm createDirectoryAtPath:path attributes:nil];
-
-		saveStatePath = [[NSString stringWithFormat:@"%@/Pcsx/Save States", supportPath] retain];
-		if (![dfm fileExistsAtPath:saveStatePath isDirectory:&dir])
-			[dfm createDirectoryAtPath:saveStatePath attributes:nil];
-
-		path = [NSString stringWithFormat:@"%@/Pcsx/Memory Cards/Mcd001.mcr", supportPath];
-		str = [path fileSystemRepresentation];
-		if (str != nil) strncpy(Config.Mcd1, str, 255);
-
-		path = [NSString stringWithFormat:@"%@/Pcsx/Memory Cards/Mcd002.mcr", supportPath];
-		str = [path fileSystemRepresentation];
-		if (str != nil) strncpy(Config.Mcd2, str, 255);
-
-		path = [NSString stringWithFormat:@"%@/Pcsx/Bios/", supportPath];
-		str = [path fileSystemRepresentation];
-		if (str != nil) strncpy(Config.BiosDir, str, 255);
-
-		path = [NSString stringWithFormat:@"%@/Pcsx/Patches/", supportPath];
-		str = [path fileSystemRepresentation];
-		if (str != nil) strncpy(Config.PatchesDir, str, 255);
-	} else {
-		strcpy(Config.BiosDir, "Bios/");
-		strcpy(Config.PatchesDir, "Patches/");
-
-		saveStatePath = @"sstates";
-		[saveStatePath retain];
-	}
-
-	// set plugin path
-	path = [[[NSBundle mainBundle] builtInPlugInsPath] stringByAppendingString:@"/"];
-	str = [path fileSystemRepresentation];
-	if (str != nil) strncpy(Config.PluginsDir, str, 255);
-
-	// locate a bios
-	biosList = [[NSMutableArray alloc] init];
-	NSFileManager *manager = [NSFileManager defaultManager];
-	NSArray *bioses = [manager directoryContentsAtPath:[NSString stringWithCString:Config.BiosDir]];
-	if (bioses) {
-		int i;
-		for (i = 0; i < [bioses count]; i++) {
-			NSString *file = [bioses objectAtIndex:i];
-			NSDictionary *attrib = [manager fileAttributesAtPath:[NSString stringWithFormat:@"%s%@", Config.BiosDir, file] traverseLink:YES];
-
-			if ([[attrib fileType] isEqualToString:NSFileTypeRegular]) {
-				unsigned long long size = [attrib fileSize];
-				if (([attrib fileSize] % (256 * 1024)) == 0 && size > 0) {
-					[biosList addObject:file];
-				}
-			}
-		}
-	}
-
-	[PcsxController setConfigFromDefaults];
-}
-
-
-@end

pcsxr-1.9.92.tar.bz2/macosx/PcsxPlugin.h Deleted

pcsxr-1.9.92.tar.bz2/macosx/PcsxPlugin.m Deleted

@@ -1,303 +0,0 @@
-//
-// PcsxPlugin.m
-// Pcsx
-//
-// Created by Gil Pedersen on Fri Oct 03 2003.
-// Copyright (c) 2003 __MyCompanyName__. All rights reserved.
-//
-
-#import <Cocoa/Cocoa.h>
-#import "PcsxPlugin.h"
-#include "psxcommon.h"
-#include "plugins.h"
-
-@implementation PcsxPlugin
-
-+ (NSString *)getPrefixForType:(int)aType
-{
- switch (aType) {
- case PSE_LT_GPU: return @"GPU";
- case PSE_LT_CDR: return @"CDR";
- case PSE_LT_SPU: return @"SPU";
- case PSE_LT_PAD: return @"PAD";
- case PSE_LT_NET: return @"NET";
- }
- 
- return @"";
-}
-
-+ (NSString *)getDefaultKeyForType:(int)aType
-{
- //return @"Plugin" [PcsxPlugin getPrefixForType:aType];
- switch (aType) {
- case PSE_LT_GPU: return @"PluginGPU";
- case PSE_LT_CDR: return @"PluginCDR";
- case PSE_LT_SPU: return @"PluginSPU";
- case PSE_LT_PAD: return @"PluginPAD";
- case PSE_LT_NET: return @"PluginNET";
- }
- 
- return @"";
-}
-
-+ (char **)getConfigEntriesForType:(int)aType
-{
-	static char *gpu[2] = {(char *)&Config.Gpu, NULL};
-	static char *cdr[2] = {(char *)&Config.Cdr, NULL};
-	static char *spu[2] = {(char *)&Config.Spu, NULL};
-	static char *pad[3] = {(char *)&Config.Pad1, (char *)&Config.Pad2, NULL};
-	static char *net[2] = {(char *)&Config.Net, NULL};
-
- switch (aType) {
- case PSE_LT_GPU: return (char **)gpu;
- case PSE_LT_CDR: return (char **)cdr;
- case PSE_LT_SPU: return (char **)spu;
- case PSE_LT_PAD: return (char **)pad;
- case PSE_LT_NET: return (char **)net;
- }
-
- return nil;
-}
-
-- (id)initWithPath:(NSString *)aPath 
-{
- if (!(self = [super init])) {
- return nil;
- }
- 
- PSEgetLibType PSE_getLibType = NULL;
- PSEgetLibVersion PSE_getLibVersion = NULL;
- PSEgetLibName PSE_getLibName = NULL;
- 
- pluginRef = nil;
- name = nil;
- path = [aPath retain];
- NSString *fullPath = [[NSString stringWithCString:Config.PluginsDir] stringByAppendingPathComponent:path];
- 
- pluginRef = SysLoadLibrary([fullPath fileSystemRepresentation]);
- if (pluginRef == nil) {
- [self release];
- return nil;
- }
- 
- // TODO: add support for plugins with multiple functionalities???
- PSE_getLibType = (PSEgetLibType) SysLoadSym(pluginRef, "PSEgetLibType");
- if (SysLibError() != nil) {
- if (([path rangeOfString: @"gpu" options:NSCaseInsensitiveSearch]).length != 0)
- type = PSE_LT_GPU;
- else if (([path rangeOfString: @"cdr" options:NSCaseInsensitiveSearch]).length != 0)
- type = PSE_LT_CDR;
- else if (([path rangeOfString: @"spu" options:NSCaseInsensitiveSearch]).length != 0)
- type = PSE_LT_SPU;
- else if (([path rangeOfString: @"pad" options:NSCaseInsensitiveSearch]).length != 0)
- type = PSE_LT_PAD;
- else {
- [self release];
- return nil;
- }
- } else {
- type = (int)PSE_getLibType();
- if (type != PSE_LT_GPU && type != PSE_LT_CDR && type != PSE_LT_SPU && type != PSE_LT_PAD) {
- [self release];
- return nil;
- }
- }
- 
- PSE_getLibName = (PSEgetLibName) SysLoadSym(pluginRef, "PSEgetLibName");
- if (SysLibError() == nil) {
- name = [[NSString alloc] initWithCString:PSE_getLibName()];
- }
- 
- PSE_getLibVersion = (PSEgetLibVersion) SysLoadSym(pluginRef, "PSEgetLibVersion");
- if (SysLibError() == nil) {
- version = PSE_getLibVersion();
- }
- else {
- version = -1;
- }
- 
- // save the current modification date
- NSDictionary *fattrs = [[NSFileManager defaultManager] fileAttributesAtPath:fullPath traverseLink:YES];
- modDate = [[fattrs fileModificationDate] retain];
- 
- active = 0;
- 
- return self;
-}
-
-- (void)dealloc
-{
- int i;
- 
- // shutdown if we had previously been inited
- for (i=0; i<32; i++) {
- if (active & (1 << i)) {
- [self shutdownAs:(1 << i)];
- }
- }
- 
- if (pluginRef) SysCloseLibrary(pluginRef);
- 
- [path release];
- [name release];
- 
- [super dealloc];
-}
-
-- (void)runCommand:(id)arg
-{
- NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
- NSString *funcName = [arg objectAtIndex:0];
- long (*func)(void);
- 
- func = SysLoadSym(pluginRef, [funcName lossyCString]);
- if (SysLibError() == nil) {
- func();
- } else {
- NSBeep();
- }
- 
- [arg release];
- [pool release];
- return;
-}
-
-- (long)initAs:(int)aType
-{
- char symbol[255];
- long (*init)(void);
- long (*initArg)(long arg);
- int res = PSE_ERR_FATAL;
- 
- if ((active & aType) == aType) {
- return 0;
- }
-
- sprintf(symbol, "%sinit", [[PcsxPlugin getPrefixForType:aType] lossyCString]);
- init = initArg = SysLoadSym(pluginRef, symbol);
- if (SysLibError() == nil) {
- if (aType != PSE_LT_PAD)
- res = init();
- else
- res = initArg(1|2);
- }
- 
- if (0 == res) {
- active |= aType;
- } else {
- NSRunCriticalAlertPanel(NSLocalizedString(@"Plugin Initialization Failed!", nil),
- [NSString stringWithFormat:NSLocalizedString(@"Pcsx failed to initialize the selected %s plugin (error=%i).\nThe plugin might not work with your system.", nil), [PcsxPlugin getPrefixForType:aType], res], 
-			nil, nil, nil);
- }
- 
- return res;
-}
-
-- (long)shutdownAs:(int)aType
-{
- char symbol[255];
- long (*shutdown)(void);
-
- sprintf(symbol, "%sshutdown", [[PcsxPlugin getPrefixForType:aType] lossyCString]);
- shutdown = SysLoadSym(pluginRef, symbol);
- if (SysLibError() == nil) {
- active &= ~aType;
- return shutdown();
- }
- 
- return PSE_ERR_FATAL;
-}
-
-- (BOOL)hasAboutAs:(int)aType
-{
- char symbol[255];
-
- sprintf(symbol, "%sabout", [[PcsxPlugin getPrefixForType:aType] lossyCString]);
- SysLoadSym(pluginRef, symbol);
- 
- return (SysLibError() == nil);
-}
-
-- (BOOL)hasConfigureAs:(int)aType
-{
- char symbol[255];
-
- sprintf(symbol, "%sconfigure", [[PcsxPlugin getPrefixForType:aType] lossyCString]);
- SysLoadSym(pluginRef, symbol);
- 
- return (SysLibError() == nil);
-}
-
-- (void)aboutAs:(int)aType
-{
- NSArray *arg;
- char symbol[255];
-
- sprintf(symbol, "%sabout", [[PcsxPlugin getPrefixForType:aType] lossyCString]);
- arg = [[NSArray alloc] initWithObjects:[NSString stringWithCString:symbol], 
- [NSNumber numberWithInt:0], nil];
- 
- // detach a new thread
- [NSThread detachNewThreadSelector:@selector(runCommand:) toTarget:self 
- withObject:arg];
-}
-
-- (void)configureAs:(int)aType
-{
- NSArray *arg;
- char symbol[255];
- 
- sprintf(symbol, "%sconfigure", [[PcsxPlugin getPrefixForType:aType] lossyCString]);
- arg = [[NSArray alloc] initWithObjects:[NSString stringWithCString:symbol], 
- [NSNumber numberWithInt:1], nil];
- 
- // detach a new thread
- [NSThread detachNewThreadSelector:@selector(runCommand:) toTarget:self 
- withObject:arg];
-}
-
-- (NSString *)getDisplayVersion
-{
- if (version == -1)
- return @"";
- 
-	 return [NSString stringWithFormat:@"v%ld.%ld.%ld", version>>16,(version>>8)&0xff,version&0xff];
-}
-
-- (int)getType
-{
- return type;
-}
-
-- (NSString *)path
-{
-	return path;
-}
-
-- (unsigned)hash
-{
- return [path hash];
-}
-
-- (NSString *)description
-{
- if (name == nil)
- return [path lastPathComponent];
- 
- return [NSString stringWithFormat:@"%@ %@ [%@]", name, [self getDisplayVersion], [path lastPathComponent]];
-}
-
-// the plugin will check if it's still valid and return the status
-- (BOOL)verifyOK
-{
- // check that the file is still there with the same modification date
- NSFileManager *dfm = [NSFileManager defaultManager];
- NSString *fullPath = [[NSString stringWithCString:Config.PluginsDir] stringByAppendingPathComponent:path];
- if (![dfm fileExistsAtPath:fullPath])
- return NO;
- 
- NSDictionary *fattrs = [dfm fileAttributesAtPath:fullPath traverseLink:YES];
- return [[fattrs fileModificationDate] isEqualToDate:modDate];
-}
-
-@end

pcsxr-1.9.92.tar.bz2/macosx/PcsxPluginDocument.h Deleted

pcsxr-1.9.92.tar.bz2/macosx/PcsxPluginDocument.m Deleted

@@ -1,95 +0,0 @@
-//
-//  PcsxPluginDocument.m
-//  Pcsx
-//
-//  Created by Gil Pedersen on Thu Jul 01 2004.
-//  Copyright (c) 2004 __MyCompanyName__. All rights reserved.
-//
-
-#import "PcsxPluginDocument.h"
-
-
-@implementation PcsxPluginDocument
-
-- (BOOL)showAddPluginSheet:(NSWindow *)window forName:(NSString *)name
-// User has asked to see the custom display. Display it.
-{
-	if (!addPluginSheet)
-		[NSBundle loadNibNamed:@"AddPluginSheet" owner:self];
-	
-	[pluginName setObjectValue:name];
-	
-	[NSApp beginSheet:addPluginSheet
-			modalForWindow:window
-			modalDelegate:nil
-			didEndSelector:nil
-			contextInfo:nil];
-	[NSApp runModalForWindow:addPluginSheet];
-	// Sheet is up here.
-	[NSApp endSheet:addPluginSheet];
-	[addPluginSheet orderOut:self];
-	
-	return moveOK;
-}
-
-- (IBAction)closeAddPluginSheet:(id)sender
-{
-	if ([[sender keyEquivalent] isEqualToString:@"\r"]) {
-		moveOK = YES;
-	} else {
-		moveOK = NO;
-	}
-	[NSApp stopModal];
-}
-
-- (BOOL)loadDataRepresentation:(NSData *)docData ofType:(NSString *)docType
-{
-	//NSLog(@"loadDataRepresentation");
-	return NO;
-}
-
-- (BOOL)loadFileWrapperRepresentation:(NSFileWrapper *)wrapper ofType:(NSString *)docType
-{
-	if ([self showAddPluginSheet:nil forName:[wrapper filename]]) {
-		NSString *dst = [NSString stringWithFormat:@"%@/%@", 
-				[[NSBundle mainBundle] builtInPlugInsPath],
-				[wrapper filename]];
-		
-		if ([wrapper writeToFile:dst atomically:NO updateFilenames:NO]) {
-			[[NSWorkspace sharedWorkspace] noteFileSystemChanged:[[NSBundle mainBundle] builtInPlugInsPath]];
-			NSRunInformationalAlertPanel(NSLocalizedString(@"Installation Succesfull", nil),
-					NSLocalizedString(@"The installation of the specified plugin was succesfull. In order to use it, please restart the application.", nil), 
-					nil, nil, nil);
-		} else {
-			NSRunAlertPanel(NSLocalizedString(@"Installation Failed!", nil),
-					NSLocalizedString(@"The installation of the specified plugin failed. Please try again, or make a manual install.", nil), 
-					nil, nil, nil);
-		}
-	}
-	
-	// Tell the NSDocument that we can't handle the file, since we are already done with it
-	return NO;
-}
-
-- (id)openDocumentWithContentsOfFile:(NSString *)fileName display:(BOOL)flag
-{
-    
-    return nil;
-}
-
-- (NSString *)windowNibName {
-    // Implement this to return a nib to load OR implement -makeWindowControllers to manually create your controllers.
-    return @"PcsxPluginDocument";
-}
-
-- (NSData *)dataRepresentationOfType:(NSString *)type {
-    // Implement to provide a persistent data representation of your document OR remove this and implement the file-wrapper or file path based save methods.
-    return nil;
-}
-/*
-- (BOOL)loadDataRepresentation:(NSData *)data ofType:(NSString *)type {
-    // Implement to load a persistent data representation of your document OR remove this and implement the file-wrapper or file path based load methods.
-    return YES;
-}*/
-
-@end

pcsxr-1.9.92.tar.bz2/macosx/icons/PCSX.icns Deleted

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFCdrom/DFCdrom.xcodeproj Deleted

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFCdrom/DFCdrom.xcodeproj/project.pbxproj Deleted

@@ -1,360 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 42;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		2BD707180555997500CB5D9B /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2BD707170555997500CB5D9B /* IOKit.framework */; };
-		713DB2E811F113C30001BDD4 /* cdr.c in Sources */ = {isa = PBXBuildFile; fileRef = 713DB2E311F113C30001BDD4 /* cdr.c */; };
-		713DB2E911F113C30001BDD4 /* cdr.h in Headers */ = {isa = PBXBuildFile; fileRef = 713DB2E411F113C30001BDD4 /* cdr.h */; };
-		713DB2EB11F113C30001BDD4 /* util.c in Sources */ = {isa = PBXBuildFile; fileRef = 713DB2E611F113C30001BDD4 /* util.c */; };
-		71F3C32811F3CD0B007B9F12 /* cdr-macosx.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F3C32411F3CD0B007B9F12 /* cdr-macosx.c */; };
-		71F3C32911F3CD0B007B9F12 /* cfg.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F3C32511F3CD0B007B9F12 /* cfg.c */; };
-		71F3C32A11F3CD0B007B9F12 /* PluginConfigController.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F3C32611F3CD0B007B9F12 /* PluginConfigController.h */; };
-		71F3C32B11F3CD0B007B9F12 /* PluginConfigController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71F3C32711F3CD0B007B9F12 /* PluginConfigController.m */; };
-		71F3C38611F3CFED007B9F12 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 71F3C38511F3CFED007B9F12 /* AppKit.framework */; };
-		71F3C38811F3CFF7007B9F12 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 71F3C38711F3CFF7007B9F12 /* Carbon.framework */; };
-		71F3C47A11F3D108007B9F12 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 71F3C47811F3D108007B9F12 /* Credits.rtf */; };
-		71F3C49D11F3D2B3007B9F12 /* DFCdromPluginConfig.nib in Resources */ = {isa = PBXBuildFile; fileRef = 71F3C49B11F3D2B3007B9F12 /* DFCdromPluginConfig.nib */; };
-		8D576314048677EA00EA77CD /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */; };
-		8D5B49A804867FD3000E48DA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8D5B49A704867FD3000E48DA /* InfoPlist.strings */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXFileReference section */
-		089C167EFE841241C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
-		2BD707170555997500CB5D9B /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
-		713DB2E311F113C30001BDD4 /* cdr.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = cdr.c; path = ../../../plugins/dfcdrom/cdr.c; sourceTree = SOURCE_ROOT; };
-		713DB2E411F113C30001BDD4 /* cdr.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = cdr.h; path = ../../../plugins/dfcdrom/cdr.h; sourceTree = SOURCE_ROOT; };
-		713DB2E611F113C30001BDD4 /* util.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = util.c; path = ../../../plugins/dfcdrom/util.c; sourceTree = SOURCE_ROOT; };
-		71F3C32411F3CD0B007B9F12 /* cdr-macosx.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = "cdr-macosx.c"; path = "macsrc/cdr-macosx.c"; sourceTree = "<group>"; };
-		71F3C32511F3CD0B007B9F12 /* cfg.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = cfg.c; path = macsrc/cfg.c; sourceTree = "<group>"; };
-		71F3C32611F3CD0B007B9F12 /* PluginConfigController.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = PluginConfigController.h; path = macsrc/PluginConfigController.h; sourceTree = "<group>"; };
-		71F3C32711F3CD0B007B9F12 /* PluginConfigController.m */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.objc; name = PluginConfigController.m; path = macsrc/PluginConfigController.m; sourceTree = "<group>"; };
-		71F3C38511F3CFED007B9F12 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
-		71F3C38711F3CFF7007B9F12 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
-		71F3C47911F3D108007B9F12 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = English.lproj/Credits.rtf; sourceTree = "<group>"; };
-		71F3C49C11F3D2B3007B9F12 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/DFCdromPluginConfig.nib; sourceTree = "<group>"; };
-		8D576316048677EA00EA77CD /* DFCdrom.psxplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DFCdrom.psxplugin; sourceTree = BUILT_PRODUCTS_DIR; };
-		8D576317048677EA00EA77CD /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		8D576313048677EA00EA77CD /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				8D576314048677EA00EA77CD /* CoreFoundation.framework in Frameworks */,
-				2BD707180555997500CB5D9B /* IOKit.framework in Frameworks */,
-				71F3C38611F3CFED007B9F12 /* AppKit.framework in Frameworks */,
-				71F3C38811F3CFF7007B9F12 /* Carbon.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		089C166AFE841209C02AAC07 /* CdrDevMac */ = {
-			isa = PBXGroup;
-			children = (
-				08FB77AFFE84173DC02AAC07 /* Source Files */,
-				089C167CFE841241C02AAC07 /* Resources */,
-				089C1671FE841209C02AAC07 /* External Frameworks and Libraries */,
-				19C28FB6FE9D52B211CA2CBB /* Products */,
-			);
-			name = CdrDevMac;
-			sourceTree = "<group>";
-		};
-		089C1671FE841209C02AAC07 /* External Frameworks and Libraries */ = {
-			isa = PBXGroup;
-			children = (
-				71F3C38511F3CFED007B9F12 /* AppKit.framework */,
-				71F3C38711F3CFF7007B9F12 /* Carbon.framework */,
-				0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */,
-				2BD707170555997500CB5D9B /* IOKit.framework */,
-			);
-			name = "External Frameworks and Libraries";
-			sourceTree = "<group>";
-		};
-		089C167CFE841241C02AAC07 /* Resources */ = {
-			isa = PBXGroup;
-			children = (
-				71F3C49B11F3D2B3007B9F12 /* DFCdromPluginConfig.nib */,
-				71F3C47811F3D108007B9F12 /* Credits.rtf */,
-				8D576317048677EA00EA77CD /* Info.plist */,
-				8D5B49A704867FD3000E48DA /* InfoPlist.strings */,
-			);
-			name = Resources;
-			sourceTree = "<group>";
-		};
-		08FB77AFFE84173DC02AAC07 /* Source Files */ = {
-			isa = PBXGroup;
-			children = (
-				71F3C32111F3CCEF007B9F12 /* macsrc */,
-				71F3C30911F3CC22007B9F12 /* src */,
-			);
-			name = "Source Files";
-			sourceTree = "<group>";
-		};
-		19C28FB6FE9D52B211CA2CBB /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				8D576316048677EA00EA77CD /* DFCdrom.psxplugin */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		71F3C30911F3CC22007B9F12 /* src */ = {
-			isa = PBXGroup;
-			children = (
-				713DB2E311F113C30001BDD4 /* cdr.c */,
-				713DB2E411F113C30001BDD4 /* cdr.h */,
-				713DB2E611F113C30001BDD4 /* util.c */,
-			);
-			name = src;
-			sourceTree = "<group>";
-		};
-		71F3C32111F3CCEF007B9F12 /* macsrc */ = {
-			isa = PBXGroup;
-			children = (
-				71F3C32411F3CD0B007B9F12 /* cdr-macosx.c */,
-				71F3C32511F3CD0B007B9F12 /* cfg.c */,
-				71F3C32611F3CD0B007B9F12 /* PluginConfigController.h */,
-				71F3C32711F3CD0B007B9F12 /* PluginConfigController.m */,
-			);
-			name = macsrc;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXHeadersBuildPhase section */
-		8D57630E048677EA00EA77CD /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				713DB2E911F113C30001BDD4 /* cdr.h in Headers */,
-				71F3C32A11F3CD0B007B9F12 /* PluginConfigController.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXHeadersBuildPhase section */
-
-/* Begin PBXNativeTarget section */
-		8D57630D048677EA00EA77CD /* DFCdrom */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 710735990FDEED75004AD098 /* Build configuration list for PBXNativeTarget "DFCdrom" */;
-			buildPhases = (
-				8D57630E048677EA00EA77CD /* Headers */,
-				8D57630F048677EA00EA77CD /* Resources */,
-				8D576311048677EA00EA77CD /* Sources */,
-				8D576313048677EA00EA77CD /* Frameworks */,
-				8D576315048677EA00EA77CD /* Rez */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = DFCdrom;
-			productInstallPath = "$(HOME)/Library/Bundles";
-			productName = CdrDevMac;
-			productReference = 8D576316048677EA00EA77CD /* DFCdrom.psxplugin */;
-			productType = "com.apple.product-type.bundle";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		089C1669FE841209C02AAC07 /* Project object */ = {
-			isa = PBXProject;
-			buildConfigurationList = 7107359E0FDEED75004AD098 /* Build configuration list for PBXProject "DFCdrom" */;
-			hasScannedForEncodings = 1;
-			mainGroup = 089C166AFE841209C02AAC07 /* CdrDevMac */;
-			projectDirPath = "";
-			targets = (
-				8D57630D048677EA00EA77CD /* DFCdrom */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
-		8D57630F048677EA00EA77CD /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				8D5B49A804867FD3000E48DA /* InfoPlist.strings in Resources */,
-				71F3C47A11F3D108007B9F12 /* Credits.rtf in Resources */,
-				71F3C49D11F3D2B3007B9F12 /* DFCdromPluginConfig.nib in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXRezBuildPhase section */
-		8D576315048677EA00EA77CD /* Rez */ = {
-			isa = PBXRezBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXRezBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		8D576311048677EA00EA77CD /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				713DB2E811F113C30001BDD4 /* cdr.c in Sources */,
-				713DB2EB11F113C30001BDD4 /* util.c in Sources */,
-				71F3C32811F3CD0B007B9F12 /* cdr-macosx.c in Sources */,
-				71F3C32911F3CD0B007B9F12 /* cfg.c in Sources */,
-				71F3C32B11F3CD0B007B9F12 /* PluginConfigController.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXVariantGroup section */
-		71F3C47811F3D108007B9F12 /* Credits.rtf */ = {
-			isa = PBXVariantGroup;
-			children = (
-				71F3C47911F3D108007B9F12 /* English */,
-			);
-			name = Credits.rtf;
-			sourceTree = "<group>";
-		};
-		71F3C49B11F3D2B3007B9F12 /* DFCdromPluginConfig.nib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				71F3C49C11F3D2B3007B9F12 /* English */,
-			);
-			name = DFCdromPluginConfig.nib;
-			sourceTree = "<group>";
-		};
-		8D5B49A704867FD3000E48DA /* InfoPlist.strings */ = {
-			isa = PBXVariantGroup;
-			children = (
-				089C167EFE841241C02AAC07 /* English */,
-			);
-			name = InfoPlist.strings;
-			sourceTree = "<group>";
-		};
-/* End PBXVariantGroup section */
-
-/* Begin XCBuildConfiguration section */
-		7107359A0FDEED75004AD098 /* Development */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-				GCC_MODEL_TUNING = "";
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PRECOMPILE_PREFIX_HEADER = NO;
-				GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
-				GCC_WARN_UNKNOWN_PRAGMAS = NO;
-				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
-				LIBRARY_STYLE = BUNDLE;
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = "";
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = DFCdrom;
-				SECTORDER_FLAGS = "";
-				SYMROOT = ../../build;
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = psxplugin;
-			};
-			name = Development;
-		};
-		7107359B0FDEED75004AD098 /* Deployment */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = YES;
-				DEBUGGING_SYMBOLS = NO;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_MODEL_TUNING = "";
-				GCC_OPTIMIZATION_LEVEL = s;
-				GCC_PRECOMPILE_PREFIX_HEADER = NO;
-				GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
-				GCC_WARN_UNKNOWN_PRAGMAS = NO;
-				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
-				LIBRARY_STYLE = BUNDLE;
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = "";
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = DFCdrom;
-				SECTORDER_FLAGS = "";
-				SYMROOT = ../../build;
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = psxplugin;
-				ZERO_LINK = NO;
-			};
-			name = Deployment;
-		};
-		7107359F0FDEED75004AD098 /* Development */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				GCC_MODEL_TUNING = "";
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = "_MACOSX=1";
-				HEADER_SEARCH_PATHS = (
-					../../../libpcsxcore,
-					../..,
-					../../../plugins/dfcdrom,
-				);
-				STRIP_INSTALLED_PRODUCT = NO;
-			};
-			name = Development;
-		};
-		710735A00FDEED75004AD098 /* Deployment */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				GCC_MODEL_TUNING = "";
-				GCC_PREPROCESSOR_DEFINITIONS = "_MACOSX=1";
-				HEADER_SEARCH_PATHS = (
-					../../../libpcsxcore,
-					../..,
-					../../../plugins/dfcdrom,
-				);
-			};
-			name = Deployment;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		710735990FDEED75004AD098 /* Build configuration list for PBXNativeTarget "DFCdrom" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				7107359A0FDEED75004AD098 /* Development */,
-				7107359B0FDEED75004AD098 /* Deployment */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Development;
-		};
-		7107359E0FDEED75004AD098 /* Build configuration list for PBXProject "DFCdrom" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				7107359F0FDEED75004AD098 /* Development */,
-				710735A00FDEED75004AD098 /* Deployment */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Development;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 089C1669FE841209C02AAC07 /* Project object */;
-}

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFCdrom/English.lproj/DFCdromPluginConfig.nib Deleted

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFCdrom/English.lproj/DFCdromPluginConfig.nib/classes.nib Deleted

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFCdrom/English.lproj/DFCdromPluginConfig.nib/info.nib Deleted

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFCdrom/English.lproj/DFCdromPluginConfig.nib/keyedobjects.nib Deleted

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/DFInput.xcodeproj Deleted

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/DFInput.xcodeproj/project.pbxproj Deleted

@@ -1,569 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 42;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		2B679862069193F300E2BD4F /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B679860069193F300E2BD4F /* Cocoa.framework */; };
-		2B679863069193F300E2BD4F /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B679861069193F300E2BD4F /* IOKit.framework */; };
-		71054DC51204A20900AC2CCB /* begin_code.h in Headers */ = {isa = PBXBuildFile; fileRef = 71054DA11204A20900AC2CCB /* begin_code.h */; };
-		71054DC61204A20900AC2CCB /* close_code.h in Headers */ = {isa = PBXBuildFile; fileRef = 71054DA21204A20900AC2CCB /* close_code.h */; };
-		71054DC71204A20900AC2CCB /* SDL.h in Headers */ = {isa = PBXBuildFile; fileRef = 71054DA31204A20900AC2CCB /* SDL.h */; };
-		71054DC81204A20900AC2CCB /* SDL_assert.h in Headers */ = {isa = PBXBuildFile; fileRef = 71054DA41204A20900AC2CCB /* SDL_assert.h */; };
-		71054DC91204A20900AC2CCB /* SDL_config.h in Headers */ = {isa = PBXBuildFile; fileRef = 71054DA51204A20900AC2CCB /* SDL_config.h */; };
-		71054DCA1204A20900AC2CCB /* SDL_endian.h in Headers */ = {isa = PBXBuildFile; fileRef = 71054DA61204A20900AC2CCB /* SDL_endian.h */; };
-		71054DCB1204A20900AC2CCB /* SDL_error.h in Headers */ = {isa = PBXBuildFile; fileRef = 71054DA71204A20900AC2CCB /* SDL_error.h */; };
-		71054DCC1204A20900AC2CCB /* SDL_haptic.h in Headers */ = {isa = PBXBuildFile; fileRef = 71054DA81204A20900AC2CCB /* SDL_haptic.h */; };
-		71054DCD1204A20900AC2CCB /* SDL_joystick.h in Headers */ = {isa = PBXBuildFile; fileRef = 71054DA91204A20900AC2CCB /* SDL_joystick.h */; };
-		71054DCE1204A20900AC2CCB /* SDL_main.h in Headers */ = {isa = PBXBuildFile; fileRef = 71054DAA1204A20900AC2CCB /* SDL_main.h */; };
-		71054DD01204A20900AC2CCB /* SDL_platform.h in Headers */ = {isa = PBXBuildFile; fileRef = 71054DAC1204A20900AC2CCB /* SDL_platform.h */; };
-		71054DD31204A20900AC2CCB /* SDL_stdinc.h in Headers */ = {isa = PBXBuildFile; fileRef = 71054DAF1204A20900AC2CCB /* SDL_stdinc.h */; };
-		71054DD61204A20900AC2CCB /* SDL_syshaptic.c in Sources */ = {isa = PBXBuildFile; fileRef = 71054DB51204A20900AC2CCB /* SDL_syshaptic.c */; };
-		71054DD71204A20900AC2CCB /* SDL_haptic.c in Sources */ = {isa = PBXBuildFile; fileRef = 71054DB61204A20900AC2CCB /* SDL_haptic.c */; };
-		71054DD81204A20900AC2CCB /* SDL_haptic_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 71054DB71204A20900AC2CCB /* SDL_haptic_c.h */; };
-		71054DD91204A20900AC2CCB /* SDL_syshaptic.h in Headers */ = {isa = PBXBuildFile; fileRef = 71054DB81204A20900AC2CCB /* SDL_syshaptic.h */; };
-		71054DDA1204A20900AC2CCB /* SDL_sysjoystick.c in Sources */ = {isa = PBXBuildFile; fileRef = 71054DBB1204A20900AC2CCB /* SDL_sysjoystick.c */; };
-		71054DDB1204A20900AC2CCB /* SDL_sysjoystick_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 71054DBC1204A20900AC2CCB /* SDL_sysjoystick_c.h */; };
-		71054DDC1204A20900AC2CCB /* SDL_joystick.c in Sources */ = {isa = PBXBuildFile; fileRef = 71054DBD1204A20900AC2CCB /* SDL_joystick.c */; };
-		71054DDD1204A20900AC2CCB /* SDL_joystick_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 71054DBE1204A20900AC2CCB /* SDL_joystick_c.h */; };
-		71054DDE1204A20900AC2CCB /* SDL_sysjoystick.h in Headers */ = {isa = PBXBuildFile; fileRef = 71054DBF1204A20900AC2CCB /* SDL_sysjoystick.h */; };
-		71054DDF1204A20900AC2CCB /* SDL.c in Sources */ = {isa = PBXBuildFile; fileRef = 71054DC01204A20900AC2CCB /* SDL.c */; };
-		71054DE21204A20900AC2CCB /* SDL_error.c in Sources */ = {isa = PBXBuildFile; fileRef = 71054DC31204A20900AC2CCB /* SDL_error.c */; };
-		71054DE31204A20900AC2CCB /* SDL_error_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 71054DC41204A20900AC2CCB /* SDL_error_c.h */; };
-		71054E211204A49F00AC2CCB /* ForceFeedback.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 71054E201204A49F00AC2CCB /* ForceFeedback.framework */; };
-		7136F1DA1200E163001973D9 /* ControllerList.h in Headers */ = {isa = PBXBuildFile; fileRef = 71E861A411FF75AC001C1826 /* ControllerList.h */; };
-		7136F1DB1200E163001973D9 /* ControllerList.m in Sources */ = {isa = PBXBuildFile; fileRef = 71E861A511FF75AC001C1826 /* ControllerList.m */; };
-		7136F1DC1200E164001973D9 /* MappingCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 71E861A811FF75AC001C1826 /* MappingCell.h */; };
-		7136F1DD1200E164001973D9 /* MappingCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 71E861A911FF75AC001C1826 /* MappingCell.m */; };
-		7136F1DE1200E165001973D9 /* PadController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71E861AB11FF75AC001C1826 /* PadController.m */; };
-		7136F1DF1200E165001973D9 /* PadController.h in Headers */ = {isa = PBXBuildFile; fileRef = 71E861AA11FF75AC001C1826 /* PadController.h */; };
-		7136F51A12011BB4001973D9 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 7136F51812011BB4001973D9 /* Credits.rtf */; };
-		714FA82E11FC822A00517F47 /* analog.c in Sources */ = {isa = PBXBuildFile; fileRef = 714FA82A11FC822A00517F47 /* analog.c */; };
-		714FA82F11FC822A00517F47 /* pad.c in Sources */ = {isa = PBXBuildFile; fileRef = 714FA82B11FC822A00517F47 /* pad.c */; };
-		714FA83011FC822A00517F47 /* pad.h in Headers */ = {isa = PBXBuildFile; fileRef = 714FA82C11FC822A00517F47 /* pad.h */; };
-		714FA83111FC822A00517F47 /* sdljoy.c in Sources */ = {isa = PBXBuildFile; fileRef = 714FA82D11FC822A00517F47 /* sdljoy.c */; };
-		714FA8A011FC846800517F47 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 714FA89F11FC846800517F47 /* Carbon.framework */; };
-		714FA8FA11FC863500517F47 /* cfg.c in Sources */ = {isa = PBXBuildFile; fileRef = 714FA8F811FC863500517F47 /* cfg.c */; };
-		714FA8FB11FC863500517F47 /* xkb.c in Sources */ = {isa = PBXBuildFile; fileRef = 714FA8F911FC863500517F47 /* xkb.c */; };
-		7192EAAE1200D54500038B92 /* cfg.h in Headers */ = {isa = PBXBuildFile; fileRef = 7192EAAB1200D54500038B92 /* cfg.h */; };
-		71E861B611FF75AC001C1826 /* PadView.h in Headers */ = {isa = PBXBuildFile; fileRef = 71E861AC11FF75AC001C1826 /* PadView.h */; };
-		71E861B711FF75AC001C1826 /* PadView.m in Sources */ = {isa = PBXBuildFile; fileRef = 71E861AD11FF75AC001C1826 /* PadView.m */; };
-		71E861BC11FF75BA001C1826 /* NetPcsxHIDInputPluginMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = 71E861BA11FF75BA001C1826 /* NetPcsxHIDInputPluginMain.nib */; };
-		8D576314048677EA00EA77CD /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */; };
-		8D5B49A804867FD3000E48DA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8D5B49A704867FD3000E48DA /* InfoPlist.strings */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXFileReference section */
-		089C167EFE841241C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
-		2B679860069193F300E2BD4F /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
-		2B679861069193F300E2BD4F /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
-		71054DA11204A20900AC2CCB /* begin_code.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; path = begin_code.h; sourceTree = "<group>"; };
-		71054DA21204A20900AC2CCB /* close_code.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; path = close_code.h; sourceTree = "<group>"; };
-		71054DA31204A20900AC2CCB /* SDL.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; path = SDL.h; sourceTree = "<group>"; };
-		71054DA41204A20900AC2CCB /* SDL_assert.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; path = SDL_assert.h; sourceTree = "<group>"; };
-		71054DA51204A20900AC2CCB /* SDL_config.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; path = SDL_config.h; sourceTree = "<group>"; };
-		71054DA61204A20900AC2CCB /* SDL_endian.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; path = SDL_endian.h; sourceTree = "<group>"; };
-		71054DA71204A20900AC2CCB /* SDL_error.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; path = SDL_error.h; sourceTree = "<group>"; };
-		71054DA81204A20900AC2CCB /* SDL_haptic.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; path = SDL_haptic.h; sourceTree = "<group>"; };
-		71054DA91204A20900AC2CCB /* SDL_joystick.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; path = SDL_joystick.h; sourceTree = "<group>"; };
-		71054DAA1204A20900AC2CCB /* SDL_main.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; path = SDL_main.h; sourceTree = "<group>"; };
-		71054DAC1204A20900AC2CCB /* SDL_platform.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; path = SDL_platform.h; sourceTree = "<group>"; };
-		71054DAF1204A20900AC2CCB /* SDL_stdinc.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; path = SDL_stdinc.h; sourceTree = "<group>"; };
-		71054DB51204A20900AC2CCB /* SDL_syshaptic.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; path = SDL_syshaptic.c; sourceTree = "<group>"; };
-		71054DB61204A20900AC2CCB /* SDL_haptic.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; path = SDL_haptic.c; sourceTree = "<group>"; };
-		71054DB71204A20900AC2CCB /* SDL_haptic_c.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; path = SDL_haptic_c.h; sourceTree = "<group>"; };
-		71054DB81204A20900AC2CCB /* SDL_syshaptic.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; path = SDL_syshaptic.h; sourceTree = "<group>"; };
-		71054DBB1204A20900AC2CCB /* SDL_sysjoystick.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; path = SDL_sysjoystick.c; sourceTree = "<group>"; };
-		71054DBC1204A20900AC2CCB /* SDL_sysjoystick_c.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; path = SDL_sysjoystick_c.h; sourceTree = "<group>"; };
-		71054DBD1204A20900AC2CCB /* SDL_joystick.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; path = SDL_joystick.c; sourceTree = "<group>"; };
-		71054DBE1204A20900AC2CCB /* SDL_joystick_c.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; path = SDL_joystick_c.h; sourceTree = "<group>"; };
-		71054DBF1204A20900AC2CCB /* SDL_sysjoystick.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; path = SDL_sysjoystick.h; sourceTree = "<group>"; };
-		71054DC01204A20900AC2CCB /* SDL.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; path = SDL.c; sourceTree = "<group>"; };
-		71054DC31204A20900AC2CCB /* SDL_error.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; path = SDL_error.c; sourceTree = "<group>"; };
-		71054DC41204A20900AC2CCB /* SDL_error_c.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; path = SDL_error_c.h; sourceTree = "<group>"; };
-		71054E201204A49F00AC2CCB /* ForceFeedback.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ForceFeedback.framework; path = /System/Library/Frameworks/ForceFeedback.framework; sourceTree = "<absolute>"; };
-		7136F51912011BB4001973D9 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = English.lproj/Credits.rtf; sourceTree = "<group>"; };
-		714FA82A11FC822A00517F47 /* analog.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = analog.c; path = ../../../plugins/dfinput/analog.c; sourceTree = SOURCE_ROOT; };
-		714FA82B11FC822A00517F47 /* pad.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = pad.c; path = ../../../plugins/dfinput/pad.c; sourceTree = SOURCE_ROOT; };
-		714FA82C11FC822A00517F47 /* pad.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = pad.h; path = ../../../plugins/dfinput/pad.h; sourceTree = SOURCE_ROOT; };
-		714FA82D11FC822A00517F47 /* sdljoy.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = sdljoy.c; path = ../../../plugins/dfinput/sdljoy.c; sourceTree = SOURCE_ROOT; };
-		714FA89F11FC846800517F47 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
-		714FA8F811FC863500517F47 /* cfg.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = cfg.c; path = macsrc/cfg.c; sourceTree = "<group>"; };
-		714FA8F911FC863500517F47 /* xkb.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = xkb.c; path = macsrc/xkb.c; sourceTree = "<group>"; };
-		7192EAAB1200D54500038B92 /* cfg.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = cfg.h; path = macsrc/cfg.h; sourceTree = "<group>"; };
-		71E861A411FF75AC001C1826 /* ControllerList.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = ControllerList.h; path = macsrc/ControllerList.h; sourceTree = "<group>"; };
-		71E861A511FF75AC001C1826 /* ControllerList.m */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.objc; name = ControllerList.m; path = macsrc/ControllerList.m; sourceTree = "<group>"; };
-		71E861A811FF75AC001C1826 /* MappingCell.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = MappingCell.h; path = macsrc/MappingCell.h; sourceTree = "<group>"; };
-		71E861A911FF75AC001C1826 /* MappingCell.m */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.objc; name = MappingCell.m; path = macsrc/MappingCell.m; sourceTree = "<group>"; };
-		71E861AA11FF75AC001C1826 /* PadController.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = PadController.h; path = macsrc/PadController.h; sourceTree = "<group>"; };
-		71E861AB11FF75AC001C1826 /* PadController.m */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.objc; name = PadController.m; path = macsrc/PadController.m; sourceTree = "<group>"; };
-		71E861AC11FF75AC001C1826 /* PadView.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = PadView.h; path = macsrc/PadView.h; sourceTree = "<group>"; };
-		71E861AD11FF75AC001C1826 /* PadView.m */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.objc; name = PadView.m; path = macsrc/PadView.m; sourceTree = "<group>"; };
-		71E861BB11FF75BA001C1826 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/NetPcsxHIDInputPluginMain.nib; sourceTree = "<group>"; };
-		8D576316048677EA00EA77CD /* DFInput.psxplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DFInput.psxplugin; sourceTree = BUILT_PRODUCTS_DIR; };
-		8D576317048677EA00EA77CD /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		8D576313048677EA00EA77CD /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				8D576314048677EA00EA77CD /* CoreFoundation.framework in Frameworks */,
-				2B679862069193F300E2BD4F /* Cocoa.framework in Frameworks */,
-				2B679863069193F300E2BD4F /* IOKit.framework in Frameworks */,
-				714FA8A011FC846800517F47 /* Carbon.framework in Frameworks */,
-				71054E211204A49F00AC2CCB /* ForceFeedback.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		089C166AFE841209C02AAC07 /* DFInput */ = {
-			isa = PBXGroup;
-			children = (
-				714FA82911FC820D00517F47 /* macsrc */,
-				714FA82811FC820900517F47 /* src */,
-				71054D9F1204A20900AC2CCB /* SDL */,
-				089C167CFE841241C02AAC07 /* Resources */,
-				089C1671FE841209C02AAC07 /* External Frameworks and Libraries */,
-				19C28FB6FE9D52B211CA2CBB /* Products */,
-			);
-			name = DFInput;
-			sourceTree = "<group>";
-		};
-		089C1671FE841209C02AAC07 /* External Frameworks and Libraries */ = {
-			isa = PBXGroup;
-			children = (
-				71054E201204A49F00AC2CCB /* ForceFeedback.framework */,
-				714FA89F11FC846800517F47 /* Carbon.framework */,
-				2B679860069193F300E2BD4F /* Cocoa.framework */,
-				2B679861069193F300E2BD4F /* IOKit.framework */,
-				0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */,
-			);
-			name = "External Frameworks and Libraries";
-			sourceTree = "<group>";
-		};
-		089C167CFE841241C02AAC07 /* Resources */ = {
-			isa = PBXGroup;
-			children = (
-				7136F51812011BB4001973D9 /* Credits.rtf */,
-				71E861BA11FF75BA001C1826 /* NetPcsxHIDInputPluginMain.nib */,
-				8D576317048677EA00EA77CD /* Info.plist */,
-				8D5B49A704867FD3000E48DA /* InfoPlist.strings */,
-			);
-			name = Resources;
-			sourceTree = "<group>";
-		};
-		19C28FB6FE9D52B211CA2CBB /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				8D576316048677EA00EA77CD /* DFInput.psxplugin */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		71054D9F1204A20900AC2CCB /* SDL */ = {
-			isa = PBXGroup;
-			children = (
-				71054DA01204A20900AC2CCB /* include */,
-				71054DB21204A20900AC2CCB /* src */,
-			);
-			path = SDL;
-			sourceTree = "<group>";
-		};
-		71054DA01204A20900AC2CCB /* include */ = {
-			isa = PBXGroup;
-			children = (
-				71054DA11204A20900AC2CCB /* begin_code.h */,
-				71054DA21204A20900AC2CCB /* close_code.h */,
-				71054DA31204A20900AC2CCB /* SDL.h */,
-				71054DA41204A20900AC2CCB /* SDL_assert.h */,
-				71054DA51204A20900AC2CCB /* SDL_config.h */,
-				71054DA61204A20900AC2CCB /* SDL_endian.h */,
-				71054DA71204A20900AC2CCB /* SDL_error.h */,
-				71054DA81204A20900AC2CCB /* SDL_haptic.h */,
-				71054DA91204A20900AC2CCB /* SDL_joystick.h */,
-				71054DAA1204A20900AC2CCB /* SDL_main.h */,
-				71054DAC1204A20900AC2CCB /* SDL_platform.h */,
-				71054DAF1204A20900AC2CCB /* SDL_stdinc.h */,
-			);
-			path = include;
-			sourceTree = "<group>";
-		};
-		71054DB21204A20900AC2CCB /* src */ = {
-			isa = PBXGroup;
-			children = (
-				71054DB31204A20900AC2CCB /* haptic */,
-				71054DB91204A20900AC2CCB /* joystick */,
-				71054DC01204A20900AC2CCB /* SDL.c */,
-				71054DC31204A20900AC2CCB /* SDL_error.c */,
-				71054DC41204A20900AC2CCB /* SDL_error_c.h */,
-			);
-			path = src;
-			sourceTree = "<group>";
-		};
-		71054DB31204A20900AC2CCB /* haptic */ = {
-			isa = PBXGroup;
-			children = (
-				71054DB41204A20900AC2CCB /* darwin */,
-				71054DB61204A20900AC2CCB /* SDL_haptic.c */,
-				71054DB71204A20900AC2CCB /* SDL_haptic_c.h */,
-				71054DB81204A20900AC2CCB /* SDL_syshaptic.h */,
-			);
-			path = haptic;
-			sourceTree = "<group>";
-		};
-		71054DB41204A20900AC2CCB /* darwin */ = {
-			isa = PBXGroup;
-			children = (
-				71054DB51204A20900AC2CCB /* SDL_syshaptic.c */,
-			);
-			path = darwin;
-			sourceTree = "<group>";
-		};
-		71054DB91204A20900AC2CCB /* joystick */ = {
-			isa = PBXGroup;
-			children = (
-				71054DBA1204A20900AC2CCB /* darwin */,
-				71054DBD1204A20900AC2CCB /* SDL_joystick.c */,
-				71054DBE1204A20900AC2CCB /* SDL_joystick_c.h */,
-				71054DBF1204A20900AC2CCB /* SDL_sysjoystick.h */,
-			);
-			path = joystick;
-			sourceTree = "<group>";
-		};
-		71054DBA1204A20900AC2CCB /* darwin */ = {
-			isa = PBXGroup;
-			children = (
-				71054DBB1204A20900AC2CCB /* SDL_sysjoystick.c */,
-				71054DBC1204A20900AC2CCB /* SDL_sysjoystick_c.h */,
-			);
-			path = darwin;
-			sourceTree = "<group>";
-		};
-		714FA82811FC820900517F47 /* src */ = {
-			isa = PBXGroup;
-			children = (
-				714FA82A11FC822A00517F47 /* analog.c */,
-				714FA82B11FC822A00517F47 /* pad.c */,
-				714FA82C11FC822A00517F47 /* pad.h */,
-				714FA82D11FC822A00517F47 /* sdljoy.c */,
-			);
-			name = src;
-			sourceTree = "<group>";
-		};
-		714FA82911FC820D00517F47 /* macsrc */ = {
-			isa = PBXGroup;
-			children = (
-				71E861A411FF75AC001C1826 /* ControllerList.h */,
-				71E861A511FF75AC001C1826 /* ControllerList.m */,
-				71E861A811FF75AC001C1826 /* MappingCell.h */,
-				71E861A911FF75AC001C1826 /* MappingCell.m */,
-				71E861AA11FF75AC001C1826 /* PadController.h */,
-				71E861AB11FF75AC001C1826 /* PadController.m */,
-				71E861AC11FF75AC001C1826 /* PadView.h */,
-				71E861AD11FF75AC001C1826 /* PadView.m */,
-				714FA8F811FC863500517F47 /* cfg.c */,
-				7192EAAB1200D54500038B92 /* cfg.h */,
-				714FA8F911FC863500517F47 /* xkb.c */,
-			);
-			name = macsrc;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXHeadersBuildPhase section */
-		8D57630E048677EA00EA77CD /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				714FA83011FC822A00517F47 /* pad.h in Headers */,
-				71E861B611FF75AC001C1826 /* PadView.h in Headers */,
-				7192EAAE1200D54500038B92 /* cfg.h in Headers */,
-				7136F1DA1200E163001973D9 /* ControllerList.h in Headers */,
-				7136F1DC1200E164001973D9 /* MappingCell.h in Headers */,
-				7136F1DF1200E165001973D9 /* PadController.h in Headers */,
-				71054DC51204A20900AC2CCB /* begin_code.h in Headers */,
-				71054DC61204A20900AC2CCB /* close_code.h in Headers */,
-				71054DC71204A20900AC2CCB /* SDL.h in Headers */,
-				71054DC81204A20900AC2CCB /* SDL_assert.h in Headers */,
-				71054DC91204A20900AC2CCB /* SDL_config.h in Headers */,
-				71054DCA1204A20900AC2CCB /* SDL_endian.h in Headers */,
-				71054DCB1204A20900AC2CCB /* SDL_error.h in Headers */,
-				71054DCC1204A20900AC2CCB /* SDL_haptic.h in Headers */,
-				71054DCD1204A20900AC2CCB /* SDL_joystick.h in Headers */,
-				71054DCE1204A20900AC2CCB /* SDL_main.h in Headers */,
-				71054DD01204A20900AC2CCB /* SDL_platform.h in Headers */,
-				71054DD31204A20900AC2CCB /* SDL_stdinc.h in Headers */,
-				71054DD81204A20900AC2CCB /* SDL_haptic_c.h in Headers */,
-				71054DD91204A20900AC2CCB /* SDL_syshaptic.h in Headers */,
-				71054DDB1204A20900AC2CCB /* SDL_sysjoystick_c.h in Headers */,
-				71054DDD1204A20900AC2CCB /* SDL_joystick_c.h in Headers */,
-				71054DDE1204A20900AC2CCB /* SDL_sysjoystick.h in Headers */,
-				71054DE31204A20900AC2CCB /* SDL_error_c.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXHeadersBuildPhase section */
-
-/* Begin PBXNativeTarget section */
-		8D57630D048677EA00EA77CD /* DFInput */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 71155B0C0FDFA2DE00EC0BC5 /* Build configuration list for PBXNativeTarget "DFInput" */;
-			buildPhases = (
-				8D57630E048677EA00EA77CD /* Headers */,
-				8D57630F048677EA00EA77CD /* Resources */,
-				8D576311048677EA00EA77CD /* Sources */,
-				8D576313048677EA00EA77CD /* Frameworks */,
-				8D576315048677EA00EA77CD /* Rez */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = DFInput;
-			productInstallPath = "$(HOME)/Library/Bundles";
-			productName = DFInput;
-			productReference = 8D576316048677EA00EA77CD /* DFInput.psxplugin */;
-			productType = "com.apple.product-type.bundle";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		089C1669FE841209C02AAC07 /* Project object */ = {
-			isa = PBXProject;
-			buildConfigurationList = 71155B110FDFA2DE00EC0BC5 /* Build configuration list for PBXProject "DFInput" */;
-			hasScannedForEncodings = 1;
-			mainGroup = 089C166AFE841209C02AAC07 /* DFInput */;
-			projectDirPath = "";
-			targets = (
-				8D57630D048677EA00EA77CD /* DFInput */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
-		8D57630F048677EA00EA77CD /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				8D5B49A804867FD3000E48DA /* InfoPlist.strings in Resources */,
-				71E861BC11FF75BA001C1826 /* NetPcsxHIDInputPluginMain.nib in Resources */,
-				7136F51A12011BB4001973D9 /* Credits.rtf in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXRezBuildPhase section */
-		8D576315048677EA00EA77CD /* Rez */ = {
-			isa = PBXRezBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXRezBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		8D576311048677EA00EA77CD /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				714FA82E11FC822A00517F47 /* analog.c in Sources */,
-				714FA82F11FC822A00517F47 /* pad.c in Sources */,
-				714FA83111FC822A00517F47 /* sdljoy.c in Sources */,
-				714FA8FA11FC863500517F47 /* cfg.c in Sources */,
-				714FA8FB11FC863500517F47 /* xkb.c in Sources */,
-				71E861B711FF75AC001C1826 /* PadView.m in Sources */,
-				7136F1DB1200E163001973D9 /* ControllerList.m in Sources */,
-				7136F1DD1200E164001973D9 /* MappingCell.m in Sources */,
-				7136F1DE1200E165001973D9 /* PadController.m in Sources */,
-				71054DD61204A20900AC2CCB /* SDL_syshaptic.c in Sources */,
-				71054DD71204A20900AC2CCB /* SDL_haptic.c in Sources */,
-				71054DDA1204A20900AC2CCB /* SDL_sysjoystick.c in Sources */,
-				71054DDC1204A20900AC2CCB /* SDL_joystick.c in Sources */,
-				71054DDF1204A20900AC2CCB /* SDL.c in Sources */,
-				71054DE21204A20900AC2CCB /* SDL_error.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXVariantGroup section */
-		7136F51812011BB4001973D9 /* Credits.rtf */ = {
-			isa = PBXVariantGroup;
-			children = (
-				7136F51912011BB4001973D9 /* English */,
-			);
-			name = Credits.rtf;
-			sourceTree = "<group>";
-		};
-		71E861BA11FF75BA001C1826 /* NetPcsxHIDInputPluginMain.nib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				71E861BB11FF75BA001C1826 /* English */,
-			);
-			name = NetPcsxHIDInputPluginMain.nib;
-			sourceTree = "<group>";
-		};
-		8D5B49A704867FD3000E48DA /* InfoPlist.strings */ = {
-			isa = PBXVariantGroup;
-			children = (
-				089C167EFE841241C02AAC07 /* English */,
-			);
-			name = InfoPlist.strings;
-			sourceTree = "<group>";
-		};
-/* End PBXVariantGroup section */
-
-/* Begin XCBuildConfiguration section */
-		71155B0D0FDFA2DE00EC0BC5 /* Development */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-				DEBUGGING_SYMBOLS = YES;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-				GCC_MODEL_TUNING = "";
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PRECOMPILE_PREFIX_HEADER = NO;
-				GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
-				GCC_WARN_UNKNOWN_PRAGMAS = NO;
-				HEADER_SEARCH_PATHS = (
-					../../../libpcsxcore,
-					../HID,
-					Utilities,
-					Source,
-					./HID,
-					Utilities,
-					Source,
-				);
-				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
-				LIBRARY_SEARCH_PATHS = .;
-				LIBRARY_STYLE = BUNDLE;
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = "";
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = DFInput;
-				SECTORDER_FLAGS = "";
-				SYMROOT = ../../build;
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = psxplugin;
-			};
-			name = Development;
-		};
-		71155B0E0FDFA2DE00EC0BC5 /* Deployment */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = YES;
-				DEBUGGING_SYMBOLS = NO;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_MODEL_TUNING = "";
-				GCC_OPTIMIZATION_LEVEL = s;
-				GCC_PRECOMPILE_PREFIX_HEADER = NO;
-				GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
-				GCC_WARN_UNKNOWN_PRAGMAS = NO;
-				HEADER_SEARCH_PATHS = (
-					../../../libpcsxcore,
-					../HID,
-					Utilities,
-					Source,
-					./HID,
-					Utilities,
-					Source,
-				);
-				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
-				LIBRARY_SEARCH_PATHS = .;
-				LIBRARY_STYLE = BUNDLE;
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = "";
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = DFInput;
-				SECTORDER_FLAGS = "";
-				SYMROOT = ../../build;
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = psxplugin;
-				ZERO_LINK = NO;
-			};
-			name = Deployment;
-		};
-		71155B120FDFA2DE00EC0BC5 /* Development */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				GCC_MODEL_TUNING = "";
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = "_MACOSX=1";
-				HEADER_SEARCH_PATHS = (
-					../../../libpcsxcore,
-					../..,
-					../../../plugins/dfinput,
-					../../../plugins/dfinput,
-					../../../../plugins/dfinput,
-					./SDL,
-					./SDL/include,
-				);
-				STRIP_INSTALLED_PRODUCT = NO;
-			};
-			name = Development;
-		};
-		71155B130FDFA2DE00EC0BC5 /* Deployment */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_PREPROCESSOR_DEFINITIONS = "_MACOSX=1";
-				HEADER_SEARCH_PATHS = (
-					../../../libpcsxcore,
-					../..,
-					../../../plugins/dfinput,
-					../../../../plugins/dfinput,
-					./SDL,
-					./SDL/include,
-					../include,
-				);
-			};
-			name = Deployment;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		71155B0C0FDFA2DE00EC0BC5 /* Build configuration list for PBXNativeTarget "DFInput" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				71155B0D0FDFA2DE00EC0BC5 /* Development */,
-				71155B0E0FDFA2DE00EC0BC5 /* Deployment */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Development;
-		};
-		71155B110FDFA2DE00EC0BC5 /* Build configuration list for PBXProject "DFInput" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				71155B120FDFA2DE00EC0BC5 /* Development */,
-				71155B130FDFA2DE00EC0BC5 /* Deployment */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Development;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 089C1669FE841209C02AAC07 /* Project object */;
-}

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/English.lproj/NetPcsxHIDInputPluginMain.nib Deleted

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/English.lproj/NetPcsxHIDInputPluginMain.nib/classes.nib Deleted

@@ -1,33 +0,0 @@
-{
-    IBClasses = (
-        {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
-        {
-            CLASS = NetPcsxHIDInputPluginMappingCell; 
-            LANGUAGE = ObjC; 
-            SUPERCLASS = NSTextFieldCell; 
-        }, 
-        {
-            ACTIONS = {cancel = id; ok = id; setKey = id; }; 
-            CLASS = NetPcsxHIDInputPluginPadController; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {
-                controllerView = NetPcsxHIDInputPluginPadView; 
-                controllerView1 = id; 
-                controllerView2 = id; 
-            }; 
-            SUPERCLASS = NSWindowController; 
-        }, 
-        {
-            ACTIONS = {setDevice = id; setType = id; }; 
-            CLASS = NetPcsxHIDInputPluginPadView; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {
-                deviceMenu = NSPopUpButton; 
-                tableView = NSTableView; 
-                typeMenu = NSPopUpButton; 
-            }; 
-            SUPERCLASS = NSView; 
-        }
-    ); 
-    IBVersion = 1; 
-}
\ No newline at end of file

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/English.lproj/NetPcsxHIDInputPluginMain.nib/info.nib Deleted

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/English.lproj/NetPcsxHIDInputPluginMain.nib/keyedobjects.nib Deleted

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/SDL Deleted

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/SDL/include Deleted

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/SDL/include/SDL.h Deleted

@@ -1,151 +0,0 @@
-/*
- SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2010 Sam Lantinga
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- Sam Lantinga
- slouken@libsdl.org
-*/
-// 7/31/2010 Wei Mingzhi
-// Removed everything unrated to Mac OS X Joystick support
-
-/**
- * \file SDL.h
- * 
- * Main include header for the SDL library
- */
-
-/**
- * \mainpage Simple DirectMedia Layer (SDL)
- * 
- * http://www.libsdl.org/
- * 
- * \section intro_sec Introduction
- * 
- * This is the Simple DirectMedia Layer, a general API that provides low
- * level access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL,
- * and 2D framebuffer across multiple platforms.
- * 
- * The current version supports Windows, Windows CE, Mac OS X, Linux,
- * FreeBSD, NetBSD, OpenBSD, BSD/OS, Solaris, and QNX. The code contains
- * support for other operating systems but those are not officially supported. 
- * 
- * SDL is written in C, but works with C++ natively, and has bindings to
- * several other languages, including Ada, C#, Eiffel, Erlang, Euphoria,
- * Guile, Haskell, Java, Lisp, Lua, ML, Objective C, Pascal, Perl, PHP,
- * Pike, Pliant, Python, Ruby, and Smalltalk.
- * 
- * This library is distributed under GNU LGPL version 2, which can be
- * found in the file "COPYING". This license allows you to use SDL
- * freely in commercial programs as long as you link with the dynamic
- * library.
- * 
- * The best way to learn how to use SDL is to check out the header files in
- * the "include" subdirectory and the programs in the "test" subdirectory.
- * The header files and test programs are well commented and always up to date.
- * More documentation is available in HTML format in "docs/index.html", and
- * a documentation wiki is available online at:
- * 	http://www.libsdl.org/cgi/docwiki.cgi
- * 
- * The test programs in the "test" subdirectory are in the public domain.
- * 
- * Frequently asked questions are answered online:
- * 	http://www.libsdl.org/faq.php
- * 
- * If you need help with the library, or just want to discuss SDL related
- * issues, you can join the developers mailing list:
- * 	http://www.libsdl.org/mailing-list.php
- * 
- * Enjoy!
- * 	Sam Lantinga				(slouken@libsdl.org)
- */
-
-#ifndef _SDL_H
-#define _SDL_H
-
-#include "SDL_main.h"
-#include "SDL_stdinc.h"
-#include "SDL_endian.h"
-#include "SDL_error.h"
-
-#ifndef SDL_IGNORE
-#define SDL_IGNORE 0
-#endif
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-extern "C" {
-/* *INDENT-ON* */
-#endif
-
-/* As of version 0.5, SDL is loaded dynamically into the application */
-
-/**
- * \name SDL_INIT_*
- * 
- * These are the flags which may be passed to SDL_Init(). You should
- * specify the subsystems which you will be using in your application.
- */
-/*@{*/
-#define SDL_INIT_JOYSTICK 0x00000200
-#define SDL_INIT_HAPTIC 0x00001000
-#define SDL_INIT_NOPARACHUTE 0x00100000 /**< Don't catch fatal signals */
-#define SDL_INIT_EVERYTHING 0x0000FFFF
-/*@}*/
-
-/**
- * This function loads the SDL dynamically linked library and initializes 
- * the subsystems specified by \c flags (and those satisfying dependencies).
- * Unless the ::SDL_INIT_NOPARACHUTE flag is set, it will install cleanup
- * signal handlers for some commonly ignored fatal signals (like SIGSEGV).
- */
-extern DECLSPEC int SDLCALL SDL_Init(Uint32 flags);
-
-/**
- * This function initializes specific SDL subsystems
- */
-extern DECLSPEC int SDLCALL SDL_InitSubSystem(Uint32 flags);
-
-/**
- * This function cleans up specific SDL subsystems
- */
-extern DECLSPEC void SDLCALL SDL_QuitSubSystem(Uint32 flags);
-
-/**
- * This function returns mask of the specified subsystems which have
- * been initialized.
- * 
- * If \c flags is 0, it returns a mask of all initialized subsystems.
- */
-extern DECLSPEC Uint32 SDLCALL SDL_WasInit(Uint32 flags);
-
-/**
- * This function cleans up all initialized subsystems and unloads the
- * dynamically linked library. You should call it upon all exit conditions.
- */
-extern DECLSPEC void SDLCALL SDL_Quit(void);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-}
-/* *INDENT-ON* */
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_H */

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/SDL/include/SDL_config.h Deleted

@@ -1,313 +0,0 @@
-/* include/SDL_config.h. Generated from SDL_config.h.in by configure. */
-/*
- SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2009 Sam Lantinga
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- Sam Lantinga
- slouken@libsdl.org
-*/
-
-#ifndef _SDL_config_h
-#define _SDL_config_h
-
-/**
- * \file SDL_config.h.in
- *
- * This is a set of defines to configure the SDL features
- */
-
-/* General platform specific identifiers */
-#include "SDL_platform.h"
-
-/* Make sure that this isn't included by Visual C++ */
-#ifdef _MSC_VER
-#error You should copy include/SDL_config.h.default to include/SDL_config.h
-#endif
-
-/* C language features */
-/* #undef const */
-/* #undef inline */
-/* #undef volatile */
-
-/* C datatypes */
-#if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H)
-/* #undef size_t */
-/* #undef int8_t */
-/* #undef uint8_t */
-/* #undef int16_t */
-/* #undef uint16_t */
-/* #undef int32_t */
-/* #undef uint32_t */
-/* #undef int64_t */
-/* #undef uint64_t */
-/* #undef uintptr_t */
-#endif /* !_STDINT_H_ && !HAVE_STDINT_H */
-
-#define SIZEOF_VOIDP 4
-#define SDL_HAS_64BIT_TYPE 1
-
-/* Comment this if you want to build without any C library requirements */
-#define HAVE_LIBC 1
-#if HAVE_LIBC
-
-/* Useful headers */
-#define HAVE_ALLOCA_H 1
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_STDIO_H 1
-#define STDC_HEADERS 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STDARG_H 1
-/* #undef HAVE_MALLOC_H */
-#define HAVE_MEMORY_H 1
-#define HAVE_STRING_H 1
-#define HAVE_STRINGS_H 1
-#define HAVE_INTTYPES_H 1
-#define HAVE_STDINT_H 1
-#define HAVE_CTYPE_H 1
-#define HAVE_MATH_H 1
-#define HAVE_ICONV_H 1
-#define HAVE_SIGNAL_H 1
-/* #undef HAVE_ALTIVEC_H */
-
-/* C library functions */
-#define HAVE_MALLOC 1
-#define HAVE_CALLOC 1
-#define HAVE_REALLOC 1
-#define HAVE_FREE 1
-#define HAVE_ALLOCA 1
-#ifndef _WIN32 /* Don't use C runtime versions of these on Windows */
-#define HAVE_GETENV 1
-#define HAVE_SETENV 1
-#define HAVE_PUTENV 1
-#define HAVE_UNSETENV 1
-#endif
-#define HAVE_QSORT 1
-#define HAVE_ABS 1
-#define HAVE_BCOPY 1
-#define HAVE_MEMSET 1
-#define HAVE_MEMCPY 1
-#define HAVE_MEMMOVE 1
-#define HAVE_MEMCMP 1
-#define HAVE_STRLEN 1
-#define HAVE_STRLCPY 1
-#define HAVE_STRLCAT 1
-#define HAVE_STRDUP 1
-/* #undef HAVE__STRREV */
-/* #undef HAVE__STRUPR */
-/* #undef HAVE__STRLWR */
-/* #undef HAVE_INDEX */
-/* #undef HAVE_RINDEX */
-#define HAVE_STRCHR 1
-#define HAVE_STRRCHR 1
-#define HAVE_STRSTR 1
-/* #undef HAVE_ITOA */
-/* #undef HAVE__LTOA */
-/* #undef HAVE__UITOA */
-/* #undef HAVE__ULTOA */
-#define HAVE_STRTOL 1
-#define HAVE_STRTOUL 1
-/* #undef HAVE__I64TOA */
-/* #undef HAVE__UI64TOA */
-#define HAVE_STRTOLL 1
-#define HAVE_STRTOULL 1
-#define HAVE_STRTOD 1
-#define HAVE_ATOI 1
-#define HAVE_ATOF 1
-#define HAVE_STRCMP 1
-#define HAVE_STRNCMP 1
-/* #undef HAVE__STRICMP */
-#define HAVE_STRCASECMP 1
-/* #undef HAVE__STRNICMP */
-#define HAVE_STRNCASECMP 1
-#define HAVE_SSCANF 1
-#define HAVE_SNPRINTF 1
-#define HAVE_VSNPRINTF 1
-#define HAVE_M_PI 
-#define HAVE_CEIL 1
-#define HAVE_COPYSIGN 1
-#define HAVE_COS 1
-#define HAVE_COSF 1
-#define HAVE_FABS 1
-#define HAVE_FLOOR 1
-#define HAVE_LOG 1
-#define HAVE_POW 1
-#define HAVE_SCALBN 1
-#define HAVE_SIN 1
-#define HAVE_SINF 1
-#define HAVE_SQRT 1
-#define HAVE_SIGACTION 1
-#define HAVE_SETJMP 1
-#define HAVE_NANOSLEEP 1
-#define HAVE_SYSCONF 1
-#define HAVE_SYSCTLBYNAME 1
-/* #undef HAVE_CLOCK_GETTIME */
-/* #undef HAVE_GETPAGESIZE */
-#define HAVE_MPROTECT 1
-
-#else
-/* We may need some replacement for stdarg.h here */
-#include <stdarg.h>
-#endif /* HAVE_LIBC */
-
-/* SDL internal assertion support */
-/* #undef SDL_DEFAULT_ASSERT_LEVEL */
-
-/* Allow disabling of core subsystems */
-#define SDL_AUDIO_DISABLED 1
-#define SDL_CPUINFO_DISABLED 1
-#define SDL_EVENTS_DISABLED 1
-#define SDL_FILE_DISABLED 1
-/* #undef SDL_JOYSTICK_DISABLED */
-/* #undef SDL_HAPTIC_DISABLED */
-#define SDL_LOADSO_DISABLED 1
-#define SDL_THREADS_DISABLED 1
-#define SDL_TIMERS_DISABLED 1
-#define SDL_VIDEO_DISABLED 1
-#define SDL_POWER_DISABLED 1
-
-/* Enable various audio drivers */
-/* #undef SDL_AUDIO_DRIVER_ALSA */
-/* #undef SDL_AUDIO_DRIVER_ALSA_DYNAMIC */
-/* #undef SDL_AUDIO_DRIVER_ARTS */
-/* #undef SDL_AUDIO_DRIVER_ARTS_DYNAMIC */
-/* #undef SDL_AUDIO_DRIVER_PULSEAUDIO */
-/* #undef SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC */
-/* #undef SDL_AUDIO_DRIVER_BEOSAUDIO */
-/* #undef SDL_AUDIO_DRIVER_BSD */
-/* #undef SDL_AUDIO_DRIVER_COREAUDIO */
-/* #undef SDL_AUDIO_DRIVER_DISK */
-/* #undef SDL_AUDIO_DRIVER_DUMMY */
-/* #undef SDL_AUDIO_DRIVER_DMEDIA */
-/* #undef SDL_AUDIO_DRIVER_DSOUND */
-/* #undef SDL_AUDIO_DRIVER_ESD */
-/* #undef SDL_AUDIO_DRIVER_ESD_DYNAMIC */
-/* #undef SDL_AUDIO_DRIVER_MMEAUDIO */
-/* #undef SDL_AUDIO_DRIVER_NAS */
-/* #undef SDL_AUDIO_DRIVER_NAS_DYNAMIC */
-/* #undef SDL_AUDIO_DRIVER_NDS */
-/* #undef SDL_AUDIO_DRIVER_OSS */
-/* #undef SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H */
-/* #undef SDL_AUDIO_DRIVER_PAUDIO */
-/* #undef SDL_AUDIO_DRIVER_QSA */
-/* #undef SDL_AUDIO_DRIVER_SUNAUDIO */
-/* #undef SDL_AUDIO_DRIVER_WINWAVEOUT */
-/* #undef SDL_AUDIO_DRIVER_FUSIONSOUND */
-/* #undef SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC */
-
-/* Enable various input drivers */
-/* #undef SDL_INPUT_LINUXEV */
-/* #undef SDL_INPUT_TSLIB */
-/* #undef SDL_JOYSTICK_BEOS */
-/* #undef SDL_JOYSTICK_DINPUT */
-/* #undef SDL_JOYSTICK_DUMMY */
-#define SDL_JOYSTICK_IOKIT 1
-/* #undef SDL_JOYSTICK_LINUX */
-/* #undef SDL_JOYSTICK_NDS */
-/* #undef SDL_JOYSTICK_RISCOS */
-/* #undef SDL_JOYSTICK_WINMM */
-/* #undef SDL_JOYSTICK_USBHID */
-/* #undef SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H */
-/* #undef SDL_HAPTIC_DUMMY */
-/* #undef SDL_HAPTIC_LINUX */
-#define SDL_HAPTIC_IOKIT 1
-/* #undef SDL_HAPTIC_DINPUT */
-
-/* Enable various shared object loading systems */
-/* #undef SDL_LOADSO_BEOS */
-/* #undef SDL_LOADSO_DLCOMPAT */
-/* #undef SDL_LOADSO_DLOPEN */
-/* #undef SDL_LOADSO_DUMMY */
-/* #undef SDL_LOADSO_LDG */
-/* #undef SDL_LOADSO_WIN32 */
-
-/* Enable various threading systems */
-/* #undef SDL_THREAD_BEOS */
-/* #undef SDL_THREAD_NDS */
-/* #undef SDL_THREAD_PTHREAD */
-/* #undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX */
-/* #undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP */
-/* #undef SDL_THREAD_SPROC */
-/* #undef SDL_THREAD_WIN32 */
-
-/* Enable various timer systems */
-/* #undef SDL_TIMER_BEOS */
-/* #undef SDL_TIMER_DUMMY */
-/* #undef SDL_TIMER_NDS */
-/* #undef SDL_TIMER_RISCOS */
-/* #undef SDL_TIMER_UNIX */
-/* #undef SDL_TIMER_WIN32 */
-/* #undef SDL_TIMER_WINCE */
-
-/* Enable various video drivers */
-/* #undef SDL_VIDEO_DRIVER_BWINDOW */
-/* #undef SDL_VIDEO_DRIVER_COCOA */
-/* #undef SDL_VIDEO_DRIVER_DIRECTFB */
-/* #undef SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC */
-#define SDL_VIDEO_DRIVER_DUMMY 1
-/* #undef SDL_VIDEO_DRIVER_FBCON */
-/* #undef SDL_VIDEO_DRIVER_NDS */
-/* #undef SDL_VIDEO_DRIVER_PHOTON */
-/* #undef SDL_VIDEO_DRIVER_QNXGF */
-/* #undef SDL_VIDEO_DRIVER_PS3 */
-/* #undef SDL_VIDEO_DRIVER_RISCOS */
-/* #undef SDL_VIDEO_DRIVER_SVGALIB */
-/* #undef SDL_VIDEO_DRIVER_WIN32 */
-/* #undef SDL_VIDEO_DRIVER_X11 */
-/* #undef SDL_VIDEO_DRIVER_X11_DYNAMIC */
-/* #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT */
-/* #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR */
-/* #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER */
-/* #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT */
-/* #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XSS */
-/* #undef SDL_VIDEO_DRIVER_X11_VIDMODE */
-/* #undef SDL_VIDEO_DRIVER_X11_XINERAMA */
-/* #undef SDL_VIDEO_DRIVER_X11_XRANDR */
-/* #undef SDL_VIDEO_DRIVER_X11_XINPUT */
-/* #undef SDL_VIDEO_DRIVER_X11_SCRNSAVER */
-/* #undef SDL_VIDEO_DRIVER_X11_XV */
-
-/* #undef SDL_VIDEO_RENDER_D3D */
-/* #undef SDL_VIDEO_RENDER_GDI */
-/* #undef SDL_VIDEO_RENDER_OGL */
-/* #undef SDL_VIDEO_RENDER_OGL_ES */
-/* #undef SDL_VIDEO_RENDER_X11 */
-/* #undef SDL_VIDEO_RENDER_GAPI */
-/* #undef SDL_VIDEO_RENDER_DDRAW */
-
-/* Enable OpenGL support */
-/* #undef SDL_VIDEO_OPENGL */
-/* #undef SDL_VIDEO_OPENGL_ES */
-/* #undef SDL_VIDEO_OPENGL_BGL */
-/* #undef SDL_VIDEO_OPENGL_CGL */
-/* #undef SDL_VIDEO_OPENGL_GLX */
-/* #undef SDL_VIDEO_OPENGL_WGL */
-/* #undef SDL_VIDEO_OPENGL_OSMESA */
-/* #undef SDL_VIDEO_OPENGL_OSMESA_DYNAMIC */
-
-/* Enable system power support */
-/* #undef SDL_POWER_LINUX */
-/* #undef SDL_POWER_WINDOWS */
-/* #undef SDL_POWER_MACOSX */
-/* #undef SDL_POWER_BEOS */
-/* #undef SDL_POWER_NINTENDODS */
-/* #undef SDL_POWER_HARDWIRED */
-
-/* Enable assembly routines */
-/* #undef SDL_ASSEMBLY_ROUTINES */
-/* #undef SDL_ALTIVEC_BLITTERS */
-
-#endif /* _SDL_config_h */

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/SDL/include/SDL_endian.h Deleted

@@ -1,258 +0,0 @@
-/*
- SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2010 Sam Lantinga
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- Sam Lantinga
- slouken@libsdl.org
-*/
-
-/**
- * \file SDL_endian.h
- * 
- * Functions for reading and writing endian-specific values
- */
-
-#ifndef _SDL_endian_h
-#define _SDL_endian_h
-
-#include "SDL_stdinc.h"
-
-/**
- * \name The two types of endianness
- */
-/*@{*/
-#define SDL_LIL_ENDIAN	1234
-#define SDL_BIG_ENDIAN	4321
-/*@}*/
-
-#ifndef SDL_BYTEORDER /* Not defined in SDL_config.h? */
-#ifdef __linux__
-#include <endian.h>
-#define SDL_BYTEORDER __BYTE_ORDER
-#else /* __linux __ */
-#if defined(__hppa__) || \
- defined(__m68k__) || defined(mc68000) || defined(_M_M68K) || \
- (defined(__MIPS__) && defined(__MISPEB__)) || \
- defined(__ppc__) || defined(__POWERPC__) || defined(_M_PPC) || \
- defined(__sparc__)
-#define SDL_BYTEORDER	SDL_BIG_ENDIAN
-#else
-#define SDL_BYTEORDER	SDL_LIL_ENDIAN
-#endif
-#endif /* __linux __ */
-#endif /* !SDL_BYTEORDER */
-
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-extern "C" {
-/* *INDENT-ON* */
-#endif
-
-/**
- * \file SDL_endian.h
- * 
- * Uses inline functions for compilers that support them, and static
- * functions for those that do not. Because these functions become
- * static for compilers that do not support inline functions, this
- * header should only be included in files that actually use them.
- */
-#if defined(__GNUC__) && defined(__i386__) && \
- !(__GNUC__ == 2 && __GNUC_MINOR__ == 95 /* broken gcc version */)
-static __inline__ Uint16
-SDL_Swap16(Uint16 x)
-{
- __asm__("xchgb %b0,%h0": "=q"(x):"0"(x));
- return x;
-}
-#elif defined(__GNUC__) && defined(__x86_64__)
-static __inline__ Uint16
-SDL_Swap16(Uint16 x)
-{
- __asm__("xchgb %b0,%h0": "=Q"(x):"0"(x));
- return x;
-}
-#elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__))
-static __inline__ Uint16
-SDL_Swap16(Uint16 x)
-{
- Uint16 result;
-
- __asm__("rlwimi %0,%2,8,16,23": "=&r"(result):"0"(x >> 8), "r"(x));
- return result;
-}
-#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__)) && !defined(__mcoldfire__)
-static __inline__ Uint16
-SDL_Swap16(Uint16 x)
-{
- __asm__("rorw #8,%0": "=d"(x): "0"(x):"cc");
- return x;
-}
-#else
-static __inline__ Uint16
-SDL_Swap16(Uint16 x)
-{
- return SDL_static_cast(Uint16, ((x << 8) | (x >> 8)));
-}
-#endif
-
-#if defined(__GNUC__) && defined(__i386__)
-static __inline__ Uint32
-SDL_Swap32(Uint32 x)
-{
- __asm__("bswap %0": "=r"(x):"0"(x));
- return x;
-}
-#elif defined(__GNUC__) && defined(__x86_64__)
-static __inline__ Uint32
-SDL_Swap32(Uint32 x)
-{
- __asm__("bswapl %0": "=r"(x):"0"(x));
- return x;
-}
-#elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__))
-static __inline__ Uint32
-SDL_Swap32(Uint32 x)
-{
- Uint32 result;
-
- __asm__("rlwimi %0,%2,24,16,23": "=&r"(result):"0"(x >> 24), "r"(x));
- __asm__("rlwimi %0,%2,8,8,15": "=&r"(result):"0"(result), "r"(x));
- __asm__("rlwimi %0,%2,24,0,7": "=&r"(result):"0"(result), "r"(x));
- return result;
-}
-#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__)) && !defined(__mcoldfire__)
-static __inline__ Uint32
-SDL_Swap32(Uint32 x)
-{
- __asm__("rorw #8,%0\n\tswap %0\n\trorw #8,%0": "=d"(x): "0"(x):"cc");
- return x;
-}
-#else
-static __inline__ Uint32
-SDL_Swap32(Uint32 x)
-{
- return SDL_static_cast(Uint32, ((x << 24) | ((x << 8) & 0x00FF0000) |
- ((x >> 8) & 0x0000FF00) | (x >> 24)));
-}
-#endif
-
-#ifdef SDL_HAS_64BIT_TYPE
-#if defined(__GNUC__) && defined(__i386__)
-static __inline__ Uint64
-SDL_Swap64(Uint64 x)
-{
- union
- {
- struct
- {
- Uint32 a, b;
- } s;
- Uint64 u;
- } v;
- v.u = x;
- __asm__("bswapl %0 ; bswapl %1 ; xchgl %0,%1": "=r"(v.s.a), "=r"(v.s.b):"0"(v.s.a),
- "1"(v.s.
- b));
- return v.u;
-}
-#elif defined(__GNUC__) && defined(__x86_64__)
-static __inline__ Uint64
-SDL_Swap64(Uint64 x)
-{
- __asm__("bswapq %0": "=r"(x):"0"(x));
- return x;
-}
-#else
-static __inline__ Uint64
-SDL_Swap64(Uint64 x)
-{
- Uint32 hi, lo;
-
- /* Separate into high and low 32-bit values and swap them */
- lo = SDL_static_cast(Uint32, x & 0xFFFFFFFF);
- x >>= 32;
- hi = SDL_static_cast(Uint32, x & 0xFFFFFFFF);
- x = SDL_Swap32(lo);
- x <<= 32;
- x |= SDL_Swap32(hi);
- return (x);
-}
-#endif
-#else
-/**
- * This is mainly to keep compilers from complaining in SDL code.
- * If there is no real 64-bit datatype, then compilers will complain about
- * the fake 64-bit datatype that SDL provides when it compiles user code.
- */
-#define SDL_Swap64(X)	(X)
-#endif /* SDL_HAS_64BIT_TYPE */
-
-
-static __inline__ float
-SDL_SwapFloat(float x)
-{
- union
- {
- float f;
- Uint32 ui32;
- } swapper;
- swapper.f = x;
- swapper.ui32 = SDL_Swap32(swapper.ui32);
- return swapper.f;
-}
-
-
-/**
- * \name Swap to native
- * Byteswap item from the specified endianness to the native endianness.
- */
-/*@{*/
-#if SDL_BYTEORDER == SDL_LIL_ENDIAN
-#define SDL_SwapLE16(X)	(X)
-#define SDL_SwapLE32(X)	(X)
-#define SDL_SwapLE64(X)	(X)
-#define SDL_SwapFloatLE(X)	(X)
-#define SDL_SwapBE16(X)	SDL_Swap16(X)
-#define SDL_SwapBE32(X)	SDL_Swap32(X)
-#define SDL_SwapBE64(X)	SDL_Swap64(X)
-#define SDL_SwapFloatBE(X)	SDL_SwapFloat(X)
-#else
-#define SDL_SwapLE16(X)	SDL_Swap16(X)
-#define SDL_SwapLE32(X)	SDL_Swap32(X)
-#define SDL_SwapLE64(X)	SDL_Swap64(X)
-#define SDL_SwapFloatLE(X)	SDL_SwapFloat(X)
-#define SDL_SwapBE16(X)	(X)
-#define SDL_SwapBE32(X)	(X)
-#define SDL_SwapBE64(X)	(X)
-#define SDL_SwapFloatBE(X)	(X)
-#endif
-/*@}*//*Swap to native*/
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-}
-/* *INDENT-ON* */
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_endian_h */
-
-/* vi: set ts=4 sw=4 expandtab: */

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/SDL/include/SDL_error.h Deleted

@@ -1,78 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2010 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/**
- *  \file SDL_error.h
- *  
- *  Simple error message routines for SDL.
- */
-
-#ifndef _SDL_error_h
-#define _SDL_error_h
-
-#include "SDL_stdinc.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-extern "C" {
-/* *INDENT-ON* */
-#endif
-
-/* Public functions */
-extern DECLSPEC void SDLCALL SDL_SetError(const char *fmt, ...);
-extern DECLSPEC char *SDLCALL SDL_GetError(void);
-extern DECLSPEC void SDLCALL SDL_ClearError(void);
-
-/**
- *  \name Internal error functions
- *  
- *  \internal 
- *  Private error message function - used internally.
- */
-/*@{*/
-#define SDL_OutOfMemory()	SDL_Error(SDL_ENOMEM)
-#define SDL_Unsupported()	SDL_Error(SDL_UNSUPPORTED)
-typedef enum
-{
-    SDL_ENOMEM,
-    SDL_EFREAD,
-    SDL_EFWRITE,
-    SDL_EFSEEK,
-    SDL_UNSUPPORTED,
-    SDL_LASTERROR
-} SDL_errorcode;
-extern DECLSPEC void SDLCALL SDL_Error(SDL_errorcode code);
-/*@}*//*Internal error functions*/
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-}
-/* *INDENT-ON* */
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_error_h */
-
-/* vi: set ts=4 sw=4 expandtab: */

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/SDL/include/SDL_haptic.h Deleted

@@ -1,1123 +0,0 @@
-/*
- SDL - Simple DirectMedia Layer
- Copyright (C) 2008 Edgar Simo
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- Sam Lantinga
- slouken@libsdl.org
-*/
-
-/**
- * \file SDL_haptic.h
- * 
- * \brief The SDL Haptic subsystem allows you to control haptic (force feedback)
- * devices.
- * 
- * The basic usage is as follows:
- * - Initialize the Subsystem (::SDL_INIT_HAPTIC).
- * - Open a Haptic Device.
- * - SDL_HapticOpen() to open from index.
- * - SDL_HapticOpenFromJoystick() to open from an existing joystick.
- * - Create an effect (::SDL_HapticEffect).
- * - Upload the effect with SDL_HapticNewEffect().
- * - Run the effect with SDL_HapticRunEffect().
- * - (optional) Free the effect with SDL_HapticDestroyEffect().
- * - Close the haptic device with SDL_HapticClose().
- *
- * \par Example:
- * \code
- * int test_haptic( SDL_Joystick * joystick ) {
- * SDL_Haptic *haptic;
- * SDL_HapticEffect effect;
- * int effect_id;
- *
- * // Open the device
- * haptic = SDL_HapticOpenFromJoystick( joystick );
- * if (haptic == NULL) return -1; // Most likely joystick isn't haptic
- *
- * // See if it can do sine waves
- * if ((SDL_HapticQuery(haptic) & SDL_HAPTIC_SINE)==0) {
- * SDL_HapticClose(haptic); // No sine effect
- * return -1;
- * }
- *
- * // Create the effect
- * memset( &effect, 0, sizeof(SDL_HapticEffect) ); // 0 is safe default
- * effect.type = SDL_HAPTIC_SINE;
- * effect.periodic.direction.type = SDL_HAPTIC_POLAR; // Polar coordinates
- * effect.periodic.direction.dir[0] = 18000; // Force comes from south
- * effect.periodic.period = 1000; // 1000 ms
- * effect.periodic.magnitude = 20000; // 20000/32767 strength
- * effect.periodic.length = 5000; // 5 seconds long
- * effect.periodic.attack_length = 1000; // Takes 1 second to get max strength
- * effect.periodic.fade_length = 1000; // Takes 1 second to fade away
- *
- * // Upload the effect
- * effect_id = SDL_HapticNewEffect( haptic, &effect );
- *
- * // Test the effect
- * SDL_HapticRunEffect( haptic, effect_id, 1 );
- * SDL_Delay( 5000); // Wait for the effect to finish
- *
- * // We destroy the effect, although closing the device also does this
- * SDL_HapticDestroyEffect( haptic, effect_id );
- *
- * // Close the device
- * SDL_HapticClose(haptic);
- *
- * return 0; // Success
- * }
- * \endcode
- * \author Edgar Simo Serra
- */
-
-#ifndef _SDL_haptic_h
-#define _SDL_haptic_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_joystick.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-extern "C" {
- /* *INDENT-ON* */ 
-#endif /* __cplusplus */
-
-/**
- * \typedef SDL_Haptic
- * 
- * \brief The haptic structure used to identify an SDL haptic.
- * 
- * \sa SDL_HapticOpen
- * \sa SDL_HapticOpenFromJoystick
- * \sa SDL_HapticClose
- */
-struct _SDL_Haptic;
-typedef struct _SDL_Haptic SDL_Haptic;
-
-
-/**
- * \name Haptic features
- * 
- * Different haptic features a device can have.
- */
-/*@{*/
-
-/**
- * \name Haptic effects
- */
-/*@{*/
-
-/**
- * \brief Constant effect supported.
- *
- * Constant haptic effect.
- * 
- * \sa SDL_HapticCondition
- */
-#define SDL_HAPTIC_CONSTANT (1<<0)
-
-/**
- * \brief Sine wave effect supported.
- * 
- * Periodic haptic effect that simulates sine waves.
- * 
- * \sa SDL_HapticPeriodic
- */
-#define SDL_HAPTIC_SINE (1<<1)
-
-/**
- * \brief Square wave effect supported.
- * 
- * Periodic haptic effect that simulates square waves.
- * 
- * \sa SDL_HapticPeriodic
- */
-#define SDL_HAPTIC_SQUARE (1<<2)
-
-/**
- * \brief Triangle wave effect supported.
- * 
- * Periodic haptic effect that simulates triangular waves.
- * 
- * \sa SDL_HapticPeriodic
- */
-#define SDL_HAPTIC_TRIANGLE (1<<3)
-
-/**
- * \brief Sawtoothup wave effect supported.
- * 
- * Periodic haptic effect that simulates saw tooth up waves.
- * 
- * \sa SDL_HapticPeriodic
- */
-#define SDL_HAPTIC_SAWTOOTHUP (1<<4)
-
-/**
- * \brief Sawtoothdown wave effect supported.
- * 
- * Periodic haptic effect that simulates saw tooth down waves.
- * 
- * \sa SDL_HapticPeriodic
- */
-#define SDL_HAPTIC_SAWTOOTHDOWN (1<<5)
-
-/**
- * \brief Ramp effect supported.
- * 
- * Ramp haptic effect.
- * 
- * \sa SDL_HapticRamp
- */
-#define SDL_HAPTIC_RAMP (1<<6)
-
-/**
- * \brief Spring effect supported - uses axes position.
- * 
- * Condition haptic effect that simulates a spring. Effect is based on the
- * axes position.
- *
- * \sa SDL_HapticCondition
- */
-#define SDL_HAPTIC_SPRING (1<<7)
-
-/**
- * \brief Damper effect supported - uses axes velocity.
- * 
- * Condition haptic effect that simulates dampening. Effect is based on the
- * axes velocity.
- * 
- * \sa SDL_HapticCondition
- */
-#define SDL_HAPTIC_DAMPER (1<<8)
-
-/**
- * \brief Inertia effect supported - uses axes acceleration.
- * 
- * Condition haptic effect that simulates inertia. Effect is based on the axes
- * acceleration.
- *
- * \sa SDL_HapticCondition
- */
-#define SDL_HAPTIC_INERTIA (1<<9)
-
-/**
- * \brief Friction effect supported - uses axes movement.
- * 
- * Condition haptic effect that simulates friction. Effect is based on the 
- * axes movement.
- * 
- * \sa SDL_HapticCondition
- */
-#define SDL_HAPTIC_FRICTION (1<<10)
-
-/**
- * \brief Custom effect is supported.
- * 
- * User defined custom haptic effect.
- */
-#define SDL_HAPTIC_CUSTOM (1<<11)
-
-/*@}*//*Haptic effects*/
-
-/* These last few are features the device has, not effects */
-
-/**
- * \brief Device can set global gain.
- * 
- * Device supports setting the global gain.
- * 
- * \sa SDL_HapticSetGain
- */
-#define SDL_HAPTIC_GAIN (1<<12)
-
-/**
- * \brief Device can set autocenter.
- * 
- * Device supports setting autocenter.
- * 
- * \sa SDL_HapticSetAutocenter
- */
-#define SDL_HAPTIC_AUTOCENTER (1<<13)
-
-/**
- * \brief Device can be queried for effect status.
- * 
- * Device can be queried for effect status.
- * 
- * \sa SDL_HapticGetEffectStatus
- */
-#define SDL_HAPTIC_STATUS (1<<14)
-
-/**
- * \brief Device can be paused.
- * 
- * \sa SDL_HapticPause
- * \sa SDL_HapticUnpause
- */
-#define SDL_HAPTIC_PAUSE (1<<15)
-
-
-/**
- * \name Direction encodings
- */
-/*@{*/
-
-/**
- * \brief Uses polar coordinates for the direction.
- * 
- * \sa SDL_HapticDirection
- */
-#define SDL_HAPTIC_POLAR 0
-
-/**
- * \brief Uses cartesian coordinates for the direction.
- * 
- * \sa SDL_HapticDirection
- */
-#define SDL_HAPTIC_CARTESIAN 1
-
-/**
- * \brief Uses spherical coordinates for the direction.
- * 
- * \sa SDL_HapticDirection
- */
-#define SDL_HAPTIC_SPHERICAL 2
-
-/*@}*//*Direction encodings*/
-
-/*@}*//*Haptic features*/
-
-/*
- * Misc defines.
- */
-
-/**
- * \brief Used to play a device an infinite number of times.
- *
- * \sa SDL_HapticRunEffect
- */
-#define SDL_HAPTIC_INFINITY 4294967295U
-
-
-/**
- * \brief Structure that represents a haptic direction.
- * 
- * Directions can be specified by:
- * - ::SDL_HAPTIC_POLAR : Specified by polar coordinates.
- * - ::SDL_HAPTIC_CARTESIAN : Specified by cartesian coordinates.
- * - ::SDL_HAPTIC_SPHERICAL : Specified by spherical coordinates.
- *
- * Cardinal directions of the haptic device are relative to the positioning
- * of the device. North is considered to be away from the user.
- *
- * The following diagram represents the cardinal directions:
- * \verbatim
- .--.
- |__| .-------.
- |=.| |.-----.|
- |--| || ||
- | | |'-----'|
- |__|~')_____('
- [ COMPUTER ]
- 
- 
- North (0,-1)
- ^
- |
- |
- (1,0) West <----[ HAPTIC ]----> East (-1,0)
- |
- |
- v
- South (0,1)
- 
- 
- [ USER ]
- \|||/
- (o o)
- ---ooO-(_)-Ooo---
- \endverbatim
- * 
- * If type is ::SDL_HAPTIC_POLAR, direction is encoded by hundredths of a 
- * degree starting north and turning clockwise. ::SDL_HAPTIC_POLAR only uses
- * the first \c dir parameter. The cardinal directions would be:
- * - North: 0 (0 degrees)
- * - East: 9000 (90 degrees)
- * - South: 18000 (180 degrees)
- * - West: 27000 (270 degrees)
- * 
- * If type is ::SDL_HAPTIC_CARTESIAN, direction is encoded by three positions
- * (X axis, Y axis and Z axis (with 3 axes)). ::SDL_HAPTIC_CARTESIAN uses
- * the first three \c dir parameters. The cardinal directions would be:
- * - North: 0,-1, 0
- * - East: -1, 0, 0
- * - South: 0, 1, 0
- * - West: 1, 0, 0
- * 
- * The Z axis represents the height of the effect if supported, otherwise
- * it's unused. In cartesian encoding (1, 2) would be the same as (2, 4), you
- * can use any multiple you want, only the direction matters.
- * 
- * If type is ::SDL_HAPTIC_SPHERICAL, direction is encoded by two rotations.
- * The first two \c dir parameters are used. The \c dir parameters are as 
- * follows (all values are in hundredths of degrees):
- * - Degrees from (1, 0) rotated towards (0, 1).
- * - Degrees towards (0, 0, 1) (device needs at least 3 axes).
- *
- *
- * Example of force coming from the south with all encodings (force coming
- * from the south means the user will have to pull the stick to counteract):
- * \code
- * SDL_HapticDirection direction;
- * 
- * // Cartesian directions
- * direction.type = SDL_HAPTIC_CARTESIAN; // Using cartesian direction encoding.
- * direction.dir[0] = 0; // X position
- * direction.dir[1] = 1; // Y position
- * // Assuming the device has 2 axes, we don't need to specify third parameter.
- * 
- * // Polar directions
- * direction.type = SDL_HAPTIC_POLAR; // We'll be using polar direction encoding.
- * direction.dir[0] = 18000; // Polar only uses first parameter
- * 
- * // Spherical coordinates
- * direction.type = SDL_HAPTIC_SPHERICAL; // Spherical encoding
- * direction.dir[0] = 9000; // Since we only have two axes we don't need more parameters.
- * \endcode
- *
- * \sa SDL_HAPTIC_POLAR
- * \sa SDL_HAPTIC_CARTESIAN
- * \sa SDL_HAPTIC_SPHERICAL
- * \sa SDL_HapticEffect
- * \sa SDL_HapticNumAxes
- */
-typedef struct SDL_HapticDirection
-{
- Uint8 type; /**< The type of encoding. */
- Sint32 dir[3]; /**< The encoded direction. */
-} SDL_HapticDirection;
-
-
-/**
- * \brief A structure containing a template for a Constant effect.
- * 
- * The struct is exclusive to the ::SDL_HAPTIC_CONSTANT effect.
- * 
- * A constant effect applies a constant force in the specified direction
- * to the joystick.
- * 
- * \sa SDL_HAPTIC_CONSTANT
- * \sa SDL_HapticEffect
- */
-typedef struct SDL_HapticConstant
-{
- /* Header */
- Uint16 type; /**< ::SDL_HAPTIC_CONSTANT */
- SDL_HapticDirection direction; /**< Direction of the effect. */
-
- /* Replay */
- Uint32 length; /**< Duration of the effect. */
- Uint16 delay; /**< Delay before starting the effect. */
-
- /* Trigger */
- Uint16 button; /**< Button that triggers the effect. */
- Uint16 interval; /**< How soon it can be triggered again after button. */
-
- /* Constant */
- Sint16 level; /**< Strength of the constant effect. */
-
- /* Envelope */
- Uint16 attack_length; /**< Duration of the attack. */
- Uint16 attack_level; /**< Level at the start of the attack. */
- Uint16 fade_length; /**< Duration of the fade. */
- Uint16 fade_level; /**< Level at the end of the fade. */
-} SDL_HapticConstant;
-
-/**
- * \brief A structure containing a template for a Periodic effect.
- * 
- * The struct handles the following effects:
- * - ::SDL_HAPTIC_SINE
- * - ::SDL_HAPTIC_SQUARE
- * - ::SDL_HAPTIC_TRIANGLE
- * - ::SDL_HAPTIC_SAWTOOTHUP
- * - ::SDL_HAPTIC_SAWTOOTHDOWN
- * 
- * A periodic effect consists in a wave-shaped effect that repeats itself
- * over time. The type determines the shape of the wave and the parameters
- * determine the dimensions of the wave.
- * 
- * Phase is given by hundredth of a cyle meaning that giving the phase a value
- * of 9000 will displace it 25% of it's period. Here are sample values:
- * - 0: No phase displacement.
- * - 9000: Displaced 25% of it's period.
- * - 18000: Displaced 50% of it's period.
- * - 27000: Displaced 75% of it's period.
- * - 36000: Displaced 100% of it's period, same as 0, but 0 is preffered.
- *
- * Examples:
- * \verbatim
- SDL_HAPTIC_SINE
- __ __ __ __
- / \ / \ / \ /
- / \__/ \__/ \__/
- 
- SDL_HAPTIC_SQUARE
- __ __ __ __ __
- | | | | | | | | | |
- | |__| |__| |__| |__| |
- 
- SDL_HAPTIC_TRIANGLE
- /\ /\ /\ /\ /\
- / \ / \ / \ / \ /
- / \/ \/ \/ \/
- 
- SDL_HAPTIC_SAWTOOTHUP
- /| /| /| /| /| /| /|
- / | / | / | / | / | / | / |
- / |/ |/ |/ |/ |/ |/ |
- 
- SDL_HAPTIC_SAWTOOTHDOWN
- \ |\ |\ |\ |\ |\ |\ |
- \ | \ | \ | \ | \ | \ | \ |
- \| \| \| \| \| \| \|
- \endverbatim
- * 
- * \sa SDL_HAPTIC_SINE
- * \sa SDL_HAPTIC_SQUARE
- * \sa SDL_HAPTIC_TRIANGLE
- * \sa SDL_HAPTIC_SAWTOOTHUP
- * \sa SDL_HAPTIC_SAWTOOTHDOWN
- * \sa SDL_HapticEffect
- */
-typedef struct SDL_HapticPeriodic
-{
- /* Header */
- Uint16 type; /**< ::SDL_HAPTIC_SINE, ::SDL_HAPTIC_SQUARE,
- ::SDL_HAPTIC_TRIANGLE, ::SDL_HAPTIC_SAWTOOTHUP or
- ::SDL_HAPTIC_SAWTOOTHDOWN */
- SDL_HapticDirection direction; /**< Direction of the effect. */
-
- /* Replay */
- Uint32 length; /**< Duration of the effect. */
- Uint16 delay; /**< Delay before starting the effect. */
-
- /* Trigger */
- Uint16 button; /**< Button that triggers the effect. */
- Uint16 interval; /**< How soon it can be triggered again after button. */
-
- /* Periodic */
- Uint16 period; /**< Period of the wave. */
- Sint16 magnitude; /**< Peak value. */
- Sint16 offset; /**< Mean value of the wave. */
- Uint16 phase; /**< Horizontal shift given by hundredth of a cycle. */
-
- /* Envelope */
- Uint16 attack_length; /**< Duration of the attack. */
- Uint16 attack_level; /**< Level at the start of the attack. */
- Uint16 fade_length; /**< Duration of the fade. */
- Uint16 fade_level; /**< Level at the end of the fade. */
-} SDL_HapticPeriodic;
-
-/**
- * \brief A structure containing a template for a Condition effect.
- * 
- * The struct handles the following effects:
- * - ::SDL_HAPTIC_SPRING: Effect based on axes position.
- * - ::SDL_HAPTIC_DAMPER: Effect based on axes velocity.
- * - ::SDL_HAPTIC_INERTIA: Effect based on axes acceleration.
- * - ::SDL_HAPTIC_FRICTION: Effect based on axes movement.
- * 
- * Direction is handled by condition internals instead of a direction member.
- * The condition effect specific members have three parameters. The first
- * refers to the X axis, the second refers to the Y axis and the third
- * refers to the Z axis. The right terms refer to the positive side of the
- * axis and the left terms refer to the negative side of the axis. Please 
- * refer to the ::SDL_HapticDirection diagram for which side is positive and
- * which is negative.
- * 
- * \sa SDL_HapticDirection
- * \sa SDL_HAPTIC_SPRING
- * \sa SDL_HAPTIC_DAMPER
- * \sa SDL_HAPTIC_INERTIA
- * \sa SDL_HAPTIC_FRICTION
- * \sa SDL_HapticEffect
- */
-typedef struct SDL_HapticCondition
-{
- /* Header */
- Uint16 type; /**< ::SDL_HAPTIC_SPRING, ::SDL_HAPTIC_DAMPER,
- ::SDL_HAPTIC_INERTIA or ::SDL_HAPTIC_FRICTION */
- SDL_HapticDirection direction; /**< Direction of the effect - Not used ATM. */
-
- /* Replay */
- Uint32 length; /**< Duration of the effect. */
- Uint16 delay; /**< Delay before starting the effect. */
-
- /* Trigger */
- Uint16 button; /**< Button that triggers the effect. */
- Uint16 interval; /**< How soon it can be triggered again after button. */
-
- /* Condition */
- Uint16 right_sat[3]; /**< Level when joystick is to the positive side. */
- Uint16 left_sat[3]; /**< Level when joystick is to the negative side. */
- Sint16 right_coeff[3]; /**< How fast to increase the force towards the positive side. */
- Sint16 left_coeff[3]; /**< How fast to increase the force towards the negative side. */
- Uint16 deadband[3]; /**< Size of the dead zone. */
- Sint16 center[3]; /**< Position of the dead zone. */
-} SDL_HapticCondition;
-
-/**
- * \brief A structure containing a template for a Ramp effect.
- * 
- * This struct is exclusively for the ::SDL_HAPTIC_RAMP effect.
- * 
- * The ramp effect starts at start strength and ends at end strength.
- * It augments in linear fashion. If you use attack and fade with a ramp
- * they effects get added to the ramp effect making the effect become
- * quadratic instead of linear.
- * 
- * \sa SDL_HAPTIC_RAMP
- * \sa SDL_HapticEffect
- */
-typedef struct SDL_HapticRamp
-{
- /* Header */
- Uint16 type; /**< ::SDL_HAPTIC_RAMP */
- SDL_HapticDirection direction; /**< Direction of the effect. */
-
- /* Replay */
- Uint32 length; /**< Duration of the effect. */
- Uint16 delay; /**< Delay before starting the effect. */
-
- /* Trigger */
- Uint16 button; /**< Button that triggers the effect. */
- Uint16 interval; /**< How soon it can be triggered again after button. */
-
- /* Ramp */
- Sint16 start; /**< Beginning strength level. */
- Sint16 end; /**< Ending strength level. */
-
- /* Envelope */
- Uint16 attack_length; /**< Duration of the attack. */
- Uint16 attack_level; /**< Level at the start of the attack. */
- Uint16 fade_length; /**< Duration of the fade. */
- Uint16 fade_level; /**< Level at the end of the fade. */
-} SDL_HapticRamp;
-
-/**
- * \brief A structure containing a template for the ::SDL_HAPTIC_CUSTOM effect.
- * 
- * A custom force feedback effect is much like a periodic effect, where the
- * application can define it's exact shape. You will have to allocate the
- * data yourself. Data should consist of channels * samples Uint16 samples.
- * 
- * If channels is one, the effect is rotated using the defined direction.
- * Otherwise it uses the samples in data for the different axes.
- * 
- * \sa SDL_HAPTIC_CUSTOM
- * \sa SDL_HapticEffect
- */
-typedef struct SDL_HapticCustom
-{
- /* Header */
- Uint16 type; /**< ::SDL_HAPTIC_CUSTOM */
- SDL_HapticDirection direction; /**< Direction of the effect. */
-
- /* Replay */
- Uint32 length; /**< Duration of the effect. */
- Uint16 delay; /**< Delay before starting the effect. */
-
- /* Trigger */
- Uint16 button; /**< Button that triggers the effect. */
- Uint16 interval; /**< How soon it can be triggered again after button. */
-
- /* Custom */
- Uint8 channels; /**< Axes to use, minimum of one. */
- Uint16 period; /**< Sample periods. */
- Uint16 samples; /**< Amount of samples. */
- Uint16 *data; /**< Should contain channels*samples items. */
-
- /* Envelope */
- Uint16 attack_length; /**< Duration of the attack. */
- Uint16 attack_level; /**< Level at the start of the attack. */
- Uint16 fade_length; /**< Duration of the fade. */
- Uint16 fade_level; /**< Level at the end of the fade. */
-} SDL_HapticCustom;
-
-/**
- * \brief The generic template for any haptic effect.
- * 
- * All values max at 32767 (0x7FFF). Signed values also can be negative.
- * Time values unless specified otherwise are in milliseconds.
- * 
- * You can also pass ::SDL_HAPTIC_INFINITY to length instead of a 0-32767 
- * value. Neither delay, interval, attack_length nor fade_length support 
- * ::SDL_HAPTIC_INFINITY. Fade will also not be used since effect never ends.
- * 
- * Additionally, the ::SDL_HAPTIC_RAMP effect does not support a duration of
- * ::SDL_HAPTIC_INFINITY.
- * 
- * Button triggers may not be supported on all devices, it is advised to not
- * use them if possible. Buttons start at index 1 instead of index 0 like
- * they joystick.
- * 
- * If both attack_length and fade_level are 0, the envelope is not used,
- * otherwise both values are used.
- * 
- * Common parts:
- * \code
- * // Replay - All effects have this
- * Uint32 length; // Duration of effect (ms).
- * Uint16 delay; // Delay before starting effect.
- * 
- * // Trigger - All effects have this
- * Uint16 button; // Button that triggers effect.
- * Uint16 interval; // How soon before effect can be triggered again.
- * 
- * // Envelope - All effects except condition effects have this
- * Uint16 attack_length; // Duration of the attack (ms).
- * Uint16 attack_level; // Level at the start of the attack.
- * Uint16 fade_length; // Duration of the fade out (ms).
- * Uint16 fade_level; // Level at the end of the fade.
- * \endcode
- *
- *
- * Here we have an example of a constant effect evolution in time:
- * \verbatim
- Strength
- ^
- |
- | effect level --> _________________
- | / \
- | / \
- | / \
- | / \ 
- | attack_level --> | \
- | | | <--- fade_level
- |
- +--------------------------------------------------> Time
- [--] [---]
- attack_length fade_length
- 
- [------------------][-----------------------]
- delay length
- \endverbatim
- * 
- * Note either the attack_level or the fade_level may be above the actual
- * effect level.
- *
- * \sa SDL_HapticConstant
- * \sa SDL_HapticPeriodic
- * \sa SDL_HapticCondition
- * \sa SDL_HapticRamp
- * \sa SDL_HapticCustom
- */
-typedef union SDL_HapticEffect
-{
- /* Common for all force feedback effects */
- Uint16 type; /**< Effect type. */
- SDL_HapticConstant constant; /**< Constant effect. */
- SDL_HapticPeriodic periodic; /**< Periodic effect. */
- SDL_HapticCondition condition; /**< Condition effect. */
- SDL_HapticRamp ramp; /**< Ramp effect. */
- SDL_HapticCustom custom; /**< Custom effect. */
-} SDL_HapticEffect;
-
-
-/* Function prototypes */
-/**
- * \brief Count the number of joysticks attached to the system.
- * 
- * \return Number of haptic devices detected on the system.
- */
-extern DECLSPEC int SDLCALL SDL_NumHaptics(void);
-
-/**
- * \brief Get the implementation dependent name of a Haptic device.
- * 
- * This can be called before any joysticks are opened.
- * If no name can be found, this function returns NULL.
- * 
- * \param device_index Index of the device to get it's name.
- * \return Name of the device or NULL on error.
- *
- * \sa SDL_NumHaptics
- */
-extern DECLSPEC const char *SDLCALL SDL_HapticName(int device_index);
-
-/**
- * \brief Opens a Haptic device for usage.
- * 
- * The index passed as an argument refers to the N'th Haptic device on this 
- * system.
- *
- * When opening a haptic device, it's gain will be set to maximum and
- * autocenter will be disabled. To modify these values use
- * SDL_HapticSetGain() and SDL_HapticSetAutocenter().
- *
- * \param device_index Index of the device to open.
- * \return Device identifier or NULL on error.
- *
- * \sa SDL_HapticIndex
- * \sa SDL_HapticOpenFromMouse
- * \sa SDL_HapticOpenFromJoystick
- * \sa SDL_HapticClose
- * \sa SDL_HapticSetGain
- * \sa SDL_HapticSetAutocenter
- * \sa SDL_HapticPause
- * \sa SDL_HapticStopAll
- */
-extern DECLSPEC SDL_Haptic *SDLCALL SDL_HapticOpen(int device_index);
-
-/**
- * \brief Checks if the haptic device at index has been opened.
- * 
- * \param device_index Index to check to see if it has been opened.
- * \return 1 if it has been opened or 0 if it hasn't.
- * 
- * \sa SDL_HapticOpen
- * \sa SDL_HapticIndex
- */
-extern DECLSPEC int SDLCALL SDL_HapticOpened(int device_index);
-
-/**
- * \brief Gets the index of a haptic device.
- * 
- * \param haptic Haptic device to get the index of.
- * \return The index of the haptic device or -1 on error.
- * 
- * \sa SDL_HapticOpen
- * \sa SDL_HapticOpened
- */
-extern DECLSPEC int SDLCALL SDL_HapticIndex(SDL_Haptic * haptic);
-
-/**
- * \brief Gets whether or not the current mouse has haptic capabilities.
- * 
- * \return SDL_TRUE if the mouse is haptic, SDL_FALSE if it isn't.
- * 
- * \sa SDL_HapticOpenFromMouse
- */
-extern DECLSPEC int SDLCALL SDL_MouseIsHaptic(void);
-
-/**
- * \brief Tries to open a haptic device from the current mouse.
- * 
- * \return The haptic device identifier or NULL on error.
- * 
- * \sa SDL_MouseIsHaptic
- * \sa SDL_HapticOpen
- */
-extern DECLSPEC SDL_Haptic *SDLCALL SDL_HapticOpenFromMouse(void);
-
-/**
- * \brief Checks to see if a joystick has haptic features.
- * 
- * \param joystick Joystick to test for haptic capabilities.
- * \return 1 if the joystick is haptic, 0 if it isn't
- * or -1 if an error ocurred.
- * 
- * \sa SDL_HapticOpenFromJoystick
- */
-extern DECLSPEC int SDLCALL SDL_JoystickIsHaptic(SDL_Joystick * joystick);
-
-/**
- * \brief Opens a Haptic device for usage from a Joystick device.
- * 
- * You must still close the haptic device seperately. It will not be closed 
- * with the joystick.
- * 
- * When opening from a joystick you should first close the haptic device before
- * closing the joystick device. If not, on some implementations the haptic
- * device will also get unallocated and you'll be unable to use force feedback
- * on that device.
- * 
- * \param joystick Joystick to create a haptic device from.
- * \return A valid haptic device identifier on success or NULL on error.
- * 
- * \sa SDL_HapticOpen
- * \sa SDL_HapticClose
- */
-extern DECLSPEC SDL_Haptic *SDLCALL SDL_HapticOpenFromJoystick(SDL_Joystick *
- joystick);
-
-/**
- * \brief Closes a Haptic device previously opened with SDL_HapticOpen().
- * 
- * \param haptic Haptic device to close.
- */
-extern DECLSPEC void SDLCALL SDL_HapticClose(SDL_Haptic * haptic);
-
-/**
- * \brief Returns the number of effects a haptic device can store.
- * 
- * On some platforms this isn't fully supported, and therefore is an
- * aproximation. Always check to see if your created effect was actually
- * created and do not rely solely on SDL_HapticNumEffects().
- * 
- * \param haptic The haptic device to query effect max.
- * \return The number of effects the haptic device can store or
- * -1 on error.
- * 
- * \sa SDL_HapticNumEffectsPlaying
- * \sa SDL_HapticQuery
- */
-extern DECLSPEC int SDLCALL SDL_HapticNumEffects(SDL_Haptic * haptic);
-
-/**
- * \brief Returns the number of effects a haptic device can play at the same 
- * time.
- * 
- * This is not supported on all platforms, but will always return a value. 
- * Added here for the sake of completness.
- * 
- * \param haptic The haptic device to query maximum playing effects.
- * \return The number of effects the haptic device can play at the same time
- * or -1 on error.
- *
- * \sa SDL_HapticNumEffects
- * \sa SDL_HapticQuery
- */
-extern DECLSPEC int SDLCALL SDL_HapticNumEffectsPlaying(SDL_Haptic * haptic);
-
-/**
- * \brief Gets the haptic devices supported features in bitwise matter.
- * 
- * Example: 
- * \code
- * if (SDL_HapticQueryEffects(haptic) & SDL_HAPTIC_CONSTANT) {
- * printf("We have constant haptic effect!");
- * }
- * \endcode
- * 
- * \param haptic The haptic device to query.
- * \return Haptic features in bitwise manner (OR'd).
- * 
- * \sa SDL_HapticNumEffects
- * \sa SDL_HapticEffectSupported
- */
-extern DECLSPEC unsigned int SDLCALL SDL_HapticQuery(SDL_Haptic * haptic);
-
-
-/**
- * \brief Gets the number of haptic axes the device has.
- * 
- * \sa SDL_HapticDirection
- */
-extern DECLSPEC int SDLCALL SDL_HapticNumAxes(SDL_Haptic * haptic);
-
-/**
- * \brief Checks to see if effect is supported by haptic.
- * 
- * \param haptic Haptic device to check on.
- * \param effect Effect to check to see if it is supported.
- * \return 1 if effect is supported, 0 if it isn't or -1 on error.
- * 
- * \sa SDL_HapticQuery
- * \sa SDL_HapticNewEffect
- */
-extern DECLSPEC int SDLCALL SDL_HapticEffectSupported(SDL_Haptic * haptic,
- SDL_HapticEffect *
- effect);
-
-/**
- * \brief Creates a new haptic effect on the device.
- * 
- * \param haptic Haptic device to create the effect on.
- * \param effect Properties of the effect to create.
- * \return The id of the effect on success or -1 on error.
- * 
- * \sa SDL_HapticUpdateEffect
- * \sa SDL_HapticRunEffect
- * \sa SDL_HapticDestroyEffect
- */
-extern DECLSPEC int SDLCALL SDL_HapticNewEffect(SDL_Haptic * haptic,
- SDL_HapticEffect * effect);
-
-/**
- * \brief Updates the properties of an effect.
- * 
- * Can be used dynamically, although behaviour when dynamically changing
- * direction may be strange. Specifically the effect may reupload itself
- * and start playing from the start. You cannot change the type either when
- * running SDL_HapticUpdateEffect().
- * 
- * \param haptic Haptic device that has the effect.
- * \param effect Effect to update.
- * \param data New effect properties to use.
- * \return The id of the effect on success or -1 on error.
- * 
- * \sa SDL_HapticNewEffect
- * \sa SDL_HapticRunEffect
- * \sa SDL_HapticDestroyEffect
- */
-extern DECLSPEC int SDLCALL SDL_HapticUpdateEffect(SDL_Haptic * haptic,
- int effect,
- SDL_HapticEffect * data);
-
-/**
- * \brief Runs the haptic effect on it's assosciated haptic device.
- * 
- * If iterations are ::SDL_HAPTIC_INFINITY, it'll run the effect over and over
- * repeating the envelope (attack and fade) every time. If you only want the
- * effect to last forever, set ::SDL_HAPTIC_INFINITY in the effect's length
- * parameter.
- * 
- * \param haptic Haptic device to run the effect on.
- * \param effect Identifier of the haptic effect to run.
- * \param iterations Number of iterations to run the effect. Use
- * ::SDL_HAPTIC_INFINITY for infinity.
- * \return 0 on success or -1 on error.
- * 
- * \sa SDL_HapticStopEffect
- * \sa SDL_HapticDestroyEffect
- * \sa SDL_HapticGetEffectStatus
- */
-extern DECLSPEC int SDLCALL SDL_HapticRunEffect(SDL_Haptic * haptic,
- int effect,
- Uint32 iterations);
-
-/**
- * \brief Stops the haptic effect on it's assosciated haptic device.
- * 
- * \param haptic Haptic device to stop the effect on.
- * \param effect Identifier of the effect to stop.
- * \return 0 on success or -1 on error.
- * 
- * \sa SDL_HapticRunEffect
- * \sa SDL_HapticDestroyEffect
- */
-extern DECLSPEC int SDLCALL SDL_HapticStopEffect(SDL_Haptic * haptic,
- int effect);
-
-/**
- * \brief Destroys a haptic effect on the device.
- * 
- * This will stop the effect if it's running. Effects are automatically 
- * destroyed when the device is closed.
- * 
- * \param haptic Device to destroy the effect on.
- * \param effect Identifier of the effect to destroy.
- * 
- * \sa SDL_HapticNewEffect
- */
-extern DECLSPEC void SDLCALL SDL_HapticDestroyEffect(SDL_Haptic * haptic,
- int effect);
-
-/**
- * \brief Gets the status of the current effect on the haptic device.
- * 
- * Device must support the ::SDL_HAPTIC_STATUS feature.
- * 
- * \param haptic Haptic device to query the effect status on.
- * \param effect Identifier of the effect to query it's status.
- * \return 0 if it isn't playing, ::SDL_HAPTIC_PLAYING if it is playing
- * or -1 on error.
- * 
- * \sa SDL_HapticRunEffect
- * \sa SDL_HapticStopEffect
- */
-extern DECLSPEC int SDLCALL SDL_HapticGetEffectStatus(SDL_Haptic * haptic,
- int effect);
-
-/**
- * \brief Sets the global gain of the device.
- * 
- * Device must support the ::SDL_HAPTIC_GAIN feature.
- * 
- * The user may specify the maxmimum gain by setting the environment variable
- * ::SDL_HAPTIC_GAIN_MAX which should be between 0 and 100. All calls to
- * SDL_HapticSetGain() will scale linearly using ::SDL_HAPTIC_GAIN_MAX as the
- * maximum.
- * 
- * \param haptic Haptic device to set the gain on.
- * \param gain Value to set the gain to, should be between 0 and 100.
- * \return 0 on success or -1 on error.
- * 
- * \sa SDL_HapticQuery
- */
-extern DECLSPEC int SDLCALL SDL_HapticSetGain(SDL_Haptic * haptic, int gain);
-
-/**
- * \brief Sets the global autocenter of the device.
- * 
- * Autocenter should be between 0 and 100. Setting it to 0 will disable 
- * autocentering.
- *
- * Device must support the ::SDL_HAPTIC_AUTOCENTER feature.
- *
- * \param haptic Haptic device to set autocentering on.
- * \param autocenter Value to set autocenter to, 0 disables autocentering.
- * \return 0 on success or -1 on error.
- * 
- * \sa SDL_HapticQuery
- */
-extern DECLSPEC int SDLCALL SDL_HapticSetAutocenter(SDL_Haptic * haptic,
- int autocenter);
-
-/**
- * \brief Pauses a haptic device.
- * 
- * Device must support the ::SDL_HAPTIC_PAUSE feature. Call 
- * SDL_HapticUnpause() to resume playback.
- * 
- * Do not modify the effects nor add new ones while the device is paused.
- * That can cause all sorts of weird errors.
- * 
- * \param haptic Haptic device to pause.
- * \return 0 on success or -1 on error.
- * 
- * \sa SDL_HapticUnpause
- */
-extern DECLSPEC int SDLCALL SDL_HapticPause(SDL_Haptic * haptic);
-
-/**
- * \brief Unpauses a haptic device.
- * 
- * Call to unpause after SDL_HapticPause().
- * 
- * \param haptic Haptic device to pause.
- * \return 0 on success or -1 on error.
- * 
- * \sa SDL_HapticPause
- */
-extern DECLSPEC int SDLCALL SDL_HapticUnpause(SDL_Haptic * haptic);
-
-/**
- * \brief Stops all the currently playing effects on a haptic device.
- * 
- * \param haptic Haptic device to stop.
- * \return 0 on success or -1 on error.
- */
-extern DECLSPEC int SDLCALL SDL_HapticStopAll(SDL_Haptic * haptic);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-}
-/* *INDENT-ON* */
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_haptic_h */
-
-/* vi: set ts=4 sw=4 expandtab: */

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/SDL/include/SDL_joystick.h Deleted

@@ -1,209 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2010 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/**
- *  \file SDL_joystick.h
- *  
- *  Include file for SDL joystick event handling
- */
-
-#ifndef _SDL_joystick_h
-#define _SDL_joystick_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-extern "C" {
-/* *INDENT-ON* */
-#endif
-
-/**
- *  \file SDL_joystick.h
- *
- *  In order to use these functions, SDL_Init() must have been called
- *  with the ::SDL_INIT_JOYSTICK flag.  This causes SDL to scan the system
- *  for joysticks, and load appropriate drivers.
- */
-
-/* The joystick structure used to identify an SDL joystick */
-struct _SDL_Joystick;
-typedef struct _SDL_Joystick SDL_Joystick;
-
-
-/* Function prototypes */
-/**
- *  Count the number of joysticks attached to the system
- */
-extern DECLSPEC int SDLCALL SDL_NumJoysticks(void);
-
-/**
- *  Get the implementation dependent name of a joystick.
- *  This can be called before any joysticks are opened.
- *  If no name can be found, this function returns NULL.
- */
-extern DECLSPEC const char *SDLCALL SDL_JoystickName(int device_index);
-
-/**
- *  Open a joystick for use.  
- *  The index passed as an argument refers tothe N'th joystick on the system.  
- *  This index is the value which will identify this joystick in future joystick
- *  events.
- *  
- *  \return A joystick identifier, or NULL if an error occurred.
- */
-extern DECLSPEC SDL_Joystick *SDLCALL SDL_JoystickOpen(int device_index);
-
-/**
- *  Returns 1 if the joystick has been opened, or 0 if it has not.
- */
-extern DECLSPEC int SDLCALL SDL_JoystickOpened(int device_index);
-
-/**
- *  Get the device index of an opened joystick.
- */
-extern DECLSPEC int SDLCALL SDL_JoystickIndex(SDL_Joystick * joystick);
-
-/**
- *  Get the number of general axis controls on a joystick.
- */
-extern DECLSPEC int SDLCALL SDL_JoystickNumAxes(SDL_Joystick * joystick);
-
-/**
- *  Get the number of trackballs on a joystick.
- *  
- *  Joystick trackballs have only relative motion events associated
- *  with them and their state cannot be polled.
- */
-extern DECLSPEC int SDLCALL SDL_JoystickNumBalls(SDL_Joystick * joystick);
-
-/**
- *  Get the number of POV hats on a joystick.
- */
-extern DECLSPEC int SDLCALL SDL_JoystickNumHats(SDL_Joystick * joystick);
-
-/**
- *  Get the number of buttons on a joystick.
- */
-extern DECLSPEC int SDLCALL SDL_JoystickNumButtons(SDL_Joystick * joystick);
-
-/**
- *  Update the current state of the open joysticks.
- *  
- *  This is called automatically by the event loop if any joystick
- *  events are enabled.
- */
-extern DECLSPEC void SDLCALL SDL_JoystickUpdate(void);
-
-/**
- *  Enable/disable joystick event polling.
- *  
- *  If joystick events are disabled, you must call SDL_JoystickUpdate()
- *  yourself and check the state of the joystick when you want joystick
- *  information.
- *  
- *  The state can be one of ::SDL_QUERY, ::SDL_ENABLE or ::SDL_IGNORE.
- */
-extern DECLSPEC int SDLCALL SDL_JoystickEventState(int state);
-
-/**
- *  Get the current state of an axis control on a joystick.
- *  
- *  The state is a value ranging from -32768 to 32767.
- *  
- *  The axis indices start at index 0.
- */
-extern DECLSPEC Sint16 SDLCALL SDL_JoystickGetAxis(SDL_Joystick * joystick,
-                                                   int axis);
-
-/**
- *  \name Hat positions
- */
-/*@{*/
-#define SDL_HAT_CENTERED	0x00
-#define SDL_HAT_UP		0x01
-#define SDL_HAT_RIGHT		0x02
-#define SDL_HAT_DOWN		0x04
-#define SDL_HAT_LEFT		0x08
-#define SDL_HAT_RIGHTUP		(SDL_HAT_RIGHT|SDL_HAT_UP)
-#define SDL_HAT_RIGHTDOWN	(SDL_HAT_RIGHT|SDL_HAT_DOWN)
-#define SDL_HAT_LEFTUP		(SDL_HAT_LEFT|SDL_HAT_UP)
-#define SDL_HAT_LEFTDOWN	(SDL_HAT_LEFT|SDL_HAT_DOWN)
-/*@}*/
-
-/**
- *  Get the current state of a POV hat on a joystick.
- *
- *  The hat indices start at index 0.
- *  
- *  \return The return value is one of the following positions:
- *           - ::SDL_HAT_CENTERED
- *           - ::SDL_HAT_UP
- *           - ::SDL_HAT_RIGHT
- *           - ::SDL_HAT_DOWN
- *           - ::SDL_HAT_LEFT
- *           - ::SDL_HAT_RIGHTUP
- *           - ::SDL_HAT_RIGHTDOWN
- *           - ::SDL_HAT_LEFTUP
- *           - ::SDL_HAT_LEFTDOWN
- */
-extern DECLSPEC Uint8 SDLCALL SDL_JoystickGetHat(SDL_Joystick * joystick,
-                                                 int hat);
-
-/**
- *  Get the ball axis change since the last poll.
- *  
- *  \return 0, or -1 if you passed it invalid parameters.
- *  
- *  The ball indices start at index 0.
- */
-extern DECLSPEC int SDLCALL SDL_JoystickGetBall(SDL_Joystick * joystick,
-                                                int ball, int *dx, int *dy);
-
-/**
- *  Get the current state of a button on a joystick.
- *  
- *  The button indices start at index 0.
- */
-extern DECLSPEC Uint8 SDLCALL SDL_JoystickGetButton(SDL_Joystick * joystick,
-                                                    int button);
-
-/**
- *  Close a joystick previously opened with SDL_JoystickOpen().
- */
-extern DECLSPEC void SDLCALL SDL_JoystickClose(SDL_Joystick * joystick);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-}
-/* *INDENT-ON* */
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_joystick_h */
-
-/* vi: set ts=4 sw=4 expandtab: */

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/SDL/include/SDL_main.h Deleted

@@ -1,96 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2010 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifndef _SDL_main_h
-#define _SDL_main_h
-
-#include "SDL_stdinc.h"
-
-/**
- *  \file SDL_main.h
- *  
- *  Redefine main() on some platforms so that it is called by SDL.
- */
-
-#if defined(__WIN32__) || \
-    (defined(__MWERKS__) && !defined(__BEOS__)) || \
-    defined(__SYMBIAN32__) || defined(__IPHONEOS__)
-
-#ifdef __cplusplus
-#define C_LINKAGE	"C"
-#else
-#define C_LINKAGE
-#endif /* __cplusplus */
-
-/**
- *  \file SDL_main.h
- *
- *  The application's main() function must be called with C linkage,
- *  and should be declared like this:
- *  \code
- *  #ifdef __cplusplus
- *  extern "C"
- *  #endif
- *  int main(int argc, char *argv[])
- *  {
- *  }
- *  \endcode
- */
-
-#define main	SDL_main
-
-/**
- *  The prototype for the application's main() function
- */
-extern C_LINKAGE int SDL_main(int argc, char *argv[]);
-
-
-/* From the SDL library code -- needed for registering the app on Win32 */
-#ifdef __WIN32__
-
-#include "begin_code.h"
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-extern "C" {
-/* *INDENT-ON* */
-#endif
-
-/**
- *  This can be called to set the application class at startup
- */
-extern DECLSPEC int SDLCALL SDL_RegisterApp(char *name, Uint32 style,
-                                            void *hInst);
-extern DECLSPEC void SDLCALL SDL_UnregisterApp(void);
-
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-}
-/* *INDENT-ON* */
-#endif
-#include "close_code.h"
-#endif
-
-#endif /* Need to redefine main()? */
-
-#endif /* _SDL_main_h */
-
-/* vi: set ts=4 sw=4 expandtab: */

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/SDL/include/SDL_platform.h Deleted

@@ -1,154 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2010 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/**
- *  \file SDL_platform.h
- *  
- *  Try to get a standard set of platform defines.
- */
-
-#ifndef _SDL_platform_h
-#define _SDL_platform_h
-
-#if defined(_AIX)
-#undef __AIX__
-#define __AIX__		1
-#endif
-#if defined(__BEOS__)
-#undef __BEOS__
-#define __BEOS__	1
-#endif
-#if defined(__HAIKU__)
-#undef __HAIKU__
-#define __HAIKU__	1
-#endif
-#if defined(bsdi) || defined(__bsdi) || defined(__bsdi__)
-#undef __BSDI__
-#define __BSDI__	1
-#endif
-#if defined(_arch_dreamcast)
-#undef __DREAMCAST__
-#define __DREAMCAST__	1
-#endif
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
-#undef __FREEBSD__
-#define __FREEBSD__	1
-#endif
-#if defined(hpux) || defined(__hpux) || defined(__hpux__)
-#undef __HPUX__
-#define __HPUX__	1
-#endif
-#if defined(sgi) || defined(__sgi) || defined(__sgi__) || defined(_SGI_SOURCE)
-#undef __IRIX__
-#define __IRIX__	1
-#endif
-#if defined(linux) || defined(__linux) || defined(__linux__)
-#undef __LINUX__
-#define __LINUX__	1
-#endif
-
-#if defined(__APPLE__)
-/* lets us know what version of Mac OS X we're compiling on */
-#include "AvailabilityMacros.h"
-#ifdef MAC_OS_X_VERSION_10_3
-#include "TargetConditionals.h" /* this header is in 10.3 or later */
-#if TARGET_OS_IPHONE
-/* if compiling for iPhone */
-#undef __IPHONEOS__
-#define __IPHONEOS__ 1
-#undef __MACOSX__
-#else
-/* if not compiling for iPhone */
-#undef __MACOSX__
-#define __MACOSX__	1
-#endif /* TARGET_OS_IPHONE */
-#else
-/* if earlier verion of Mac OS X than version 10.3 */
-#undef __MACOSX__
-#define __MACOSX__	1
-#endif
-
-#endif /* defined(__APPLE__) */
-
-#if defined(__NetBSD__)
-#undef __NETBSD__
-#define __NETBSD__	1
-#endif
-#if defined(__OpenBSD__)
-#undef __OPENBSD__
-#define __OPENBSD__	1
-#endif
-#if defined(__OS2__)
-#undef __OS2__
-#define __OS2__		1
-#endif
-#if defined(osf) || defined(__osf) || defined(__osf__) || defined(_OSF_SOURCE)
-#undef __OSF__
-#define __OSF__		1
-#endif
-#if defined(__QNXNTO__)
-#undef __QNXNTO__
-#define __QNXNTO__	1
-#endif
-#if defined(riscos) || defined(__riscos) || defined(__riscos__)
-#undef __RISCOS__
-#define __RISCOS__	1
-#endif
-#if defined(__SVR4)
-#undef __SOLARIS__
-#define __SOLARIS__	1
-#endif
-#if defined(WIN32) || defined(_WIN32)
-#undef __WIN32__
-#define __WIN32__	1
-#endif
-
-#if defined(__NDS__)
-#undef __NINTENDODS__
-#define __NINTENDODS__	1
-#endif
-
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-extern "C" {
-/* *INDENT-ON* */
-#endif
-
-/**
- *  \brief Gets the name of the platform.
- */
-extern DECLSPEC const char * SDLCALL SDL_GetPlatform (void);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-}
-/* *INDENT-ON* */
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_platform_h */
-
-/* vi: set ts=4 sw=4 expandtab: */

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/SDL/include/SDL_stdinc.h Deleted

@@ -1,792 +0,0 @@
-/*
- SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2010 Sam Lantinga
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- Sam Lantinga
- slouken@libsdl.org
-*/
-
-/**
- * \file SDL_stdinc.h
- * 
- * This is a general header that includes C language support.
- */
-
-#ifndef _SDL_stdinc_h
-#define _SDL_stdinc_h
-
-#include "SDL_config.h"
-
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_STDIO_H
-#include <stdio.h>
-#endif
-#if defined(STDC_HEADERS)
-# include <stdlib.h>
-# include <stddef.h>
-# include <stdarg.h>
-#else
-# if defined(HAVE_STDLIB_H)
-# include <stdlib.h>
-# elif defined(HAVE_MALLOC_H)
-# include <malloc.h>
-# endif
-# if defined(HAVE_STDDEF_H)
-# include <stddef.h>
-# endif
-# if defined(HAVE_STDARG_H)
-# include <stdarg.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined(STDC_HEADERS) && defined(HAVE_MEMORY_H)
-# include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#if defined(HAVE_INTTYPES_H)
-# include <inttypes.h>
-#elif defined(HAVE_STDINT_H)
-# include <stdint.h>
-#endif
-#ifdef HAVE_CTYPE_H
-# include <ctype.h>
-#endif
-#ifdef HAVE_MATH_H
-# include <math.h>
-#endif
-#if defined(HAVE_ICONV) && defined(HAVE_ICONV_H)
-# include <iconv.h>
-#endif
-
-/**
- * The number of elements in an array.
- */
-#define SDL_arraysize(array)	(sizeof(array)/sizeof(array[0]))
-#define SDL_TABLESIZE(table)	SDL_arraysize(table)
-
-/**
- * \name Cast operators
- * 
- * Use proper C++ casts when compiled as C++ to be compatible with the option
- * -Wold-style-cast of GCC (and -Werror=old-style-cast in GCC 4.2 and above).
- */
-/*@{*/
-#ifdef __cplusplus
-#define SDL_reinterpret_cast(type, expression) reinterpret_cast<type>(expression)
-#define SDL_static_cast(type, expression) static_cast<type>(expression)
-#else
-#define SDL_reinterpret_cast(type, expression) ((type)(expression))
-#define SDL_static_cast(type, expression) ((type)(expression))
-#endif
-/*@}*//*Cast operators*/
-
-/* Define a four character code as a Uint32 */
-#define SDL_FOURCC(A, B, C, D) \
- ((SDL_static_cast(Uint32, SDL_static_cast(Uint8, (A))) << 0) | \
- (SDL_static_cast(Uint32, SDL_static_cast(Uint8, (B))) << 8) | \
- (SDL_static_cast(Uint32, SDL_static_cast(Uint8, (C))) << 16) | \
- (SDL_static_cast(Uint32, SDL_static_cast(Uint8, (D))) << 24))
-
-/**
- * \name Basic data types
- */
-/*@{*/
-
-typedef enum
-{
- SDL_FALSE = 0,
- SDL_TRUE = 1
-} SDL_bool;
-
-/**
- * \brief A signed 8-bit integer type.
- */
-typedef int8_t Sint8;
-/**
- * \brief An unsigned 8-bit integer type.
- */
-typedef uint8_t Uint8;
-/**
- * \brief A signed 16-bit integer type.
- */
-typedef int16_t Sint16;
-/**
- * \brief An unsigned 16-bit integer type.
- */
-typedef uint16_t Uint16;
-/**
- * \brief A signed 32-bit integer type.
- */
-typedef int32_t Sint32;
-/**
- * \brief An unsigned 32-bit integer type.
- */
-typedef uint32_t Uint32;
-
-#ifdef SDL_HAS_64BIT_TYPE
-/**
- * \brief A signed 64-bit integer type.
- * \warning On platforms without any sort of 64-bit datatype, this is equivalent to Sint32!
- */
-typedef int64_t Sint64;
-/**
- * \brief An unsigned 64-bit integer type.
- * \warning On platforms without any sort of 64-bit datatype, this is equivalent to Uint32!
- */
-typedef uint64_t Uint64;
-#else
-/* This is really just a hack to prevent the compiler from complaining */
-typedef Sint32 Sint64;
-typedef Uint32 Uint64;
-#endif
-
-/*@}*//*Basic data types*/
-
-
-#define SDL_COMPILE_TIME_ASSERT(name, x) \
- typedef int SDL_dummy_ ## name[(x) * 2 - 1]
-/** \cond */
-#ifndef DOXYGEN_SHOULD_IGNORE_THIS
-SDL_COMPILE_TIME_ASSERT(uint8, sizeof(Uint8) == 1);
-SDL_COMPILE_TIME_ASSERT(sint8, sizeof(Sint8) == 1);
-SDL_COMPILE_TIME_ASSERT(uint16, sizeof(Uint16) == 2);
-SDL_COMPILE_TIME_ASSERT(sint16, sizeof(Sint16) == 2);
-SDL_COMPILE_TIME_ASSERT(uint32, sizeof(Uint32) == 4);
-SDL_COMPILE_TIME_ASSERT(sint32, sizeof(Sint32) == 4);
-#ifndef __NINTENDODS__ /* TODO: figure out why the following happens:
- include/SDL_stdinc.h:150: error: size of array 'SDL_dummy_uint64' is negative
- include/SDL_stdinc.h:151: error: size of array 'SDL_dummy_sint64' is negative */
-SDL_COMPILE_TIME_ASSERT(uint64, sizeof(Uint64) == 8);
-SDL_COMPILE_TIME_ASSERT(sint64, sizeof(Sint64) == 8);
-#endif
-#endif /* DOXYGEN_SHOULD_IGNORE_THIS */
-/** \endcond */
-
-/* Check to make sure enums are the size of ints, for structure packing.
- For both Watcom C/C++ and Borland C/C++ the compiler option that makes
- enums having the size of an int must be enabled.
- This is "-b" for Borland C/C++ and "-ei" for Watcom C/C++ (v11).
-*/
-/* Enable enums always int in CodeWarrior (for MPW use "-enum int") */
-#ifdef __MWERKS__
-#pragma enumsalwaysint on
-#endif
-
-/** \cond */
-#ifndef DOXYGEN_SHOULD_IGNORE_THIS
-#ifndef __NINTENDODS__ /* TODO: include/SDL_stdinc.h:174: error: size of array 'SDL_dummy_enum' is negative */
-typedef enum
-{
- DUMMY_ENUM_VALUE
-} SDL_DUMMY_ENUM;
-
-SDL_COMPILE_TIME_ASSERT(enum, sizeof(SDL_DUMMY_ENUM) == sizeof(int));
-#endif
-#endif /* DOXYGEN_SHOULD_IGNORE_THIS */
-/** \endcond */
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-extern "C" {
-/* *INDENT-ON* */
-#endif
-
-#ifdef HAVE_MALLOC
-#define SDL_malloc	malloc
-#else
-extern DECLSPEC void *SDLCALL SDL_malloc(size_t size);
-#endif
-
-#ifdef HAVE_CALLOC
-#define SDL_calloc	calloc
-#else
-extern DECLSPEC void *SDLCALL SDL_calloc(size_t nmemb, size_t size);
-#endif
-
-#ifdef HAVE_REALLOC
-#define SDL_realloc	realloc
-#else
-extern DECLSPEC void *SDLCALL SDL_realloc(void *mem, size_t size);
-#endif
-
-#ifdef HAVE_FREE
-#define SDL_free	free
-#else
-extern DECLSPEC void SDLCALL SDL_free(void *mem);
-#endif
-
-#if defined(HAVE_ALLOCA) && !defined(alloca)
-# if defined(HAVE_ALLOCA_H)
-# include <alloca.h>
-# elif defined(__GNUC__)
-# define alloca __builtin_alloca
-# elif defined(_MSC_VER)
-# include <malloc.h>
-# define alloca _alloca
-# elif defined(__WATCOMC__)
-# include <malloc.h>
-# elif defined(__BORLANDC__)
-# include <malloc.h>
-# elif defined(__DMC__)
-# include <stdlib.h>
-# elif defined(__AIX__)
-#pragma alloca
-# elif defined(__MRC__)
-void *alloca(unsigned);
-# else
-char *alloca();
-# endif
-#endif
-#ifdef HAVE_ALLOCA
-#define SDL_stack_alloc(type, count) (type*)alloca(sizeof(type)*(count))
-#define SDL_stack_free(data)
-#else
-#define SDL_stack_alloc(type, count) (type*)SDL_malloc(sizeof(type)*(count))
-#define SDL_stack_free(data) SDL_free(data)
-#endif
-
-#ifdef HAVE_GETENV
-#define SDL_getenv	getenv
-#else
-extern DECLSPEC char *SDLCALL SDL_getenv(const char *name);
-#endif
-
-/* SDL_putenv() has moved to SDL_compat. */
-#ifdef HAVE_SETENV
-#define SDL_setenv	setenv
-#else
-extern DECLSPEC int SDLCALL SDL_setenv(const char *name, const char *value,
- int overwrite);
-#endif
-
-#ifdef HAVE_QSORT
-#define SDL_qsort	qsort
-#else
-extern DECLSPEC void SDLCALL SDL_qsort(void *base, size_t nmemb, size_t size,
- int (*compare) (const void *,
- const void *));
-#endif
-
-#ifdef HAVE_ABS
-#define SDL_abs		abs
-#else
-#define SDL_abs(X)	((X) < 0 ? -(X) : (X))
-#endif
-
-#define SDL_min(x, y)	(((x) < (y)) ? (x) : (y))
-#define SDL_max(x, y)	(((x) > (y)) ? (x) : (y))
-
-#ifdef HAVE_CTYPE_H
-#define SDL_isdigit(X) isdigit(X)
-#define SDL_isspace(X) isspace(X)
-#define SDL_toupper(X) toupper(X)
-#define SDL_tolower(X) tolower(X)
-#else
-#define SDL_isdigit(X) (((X) >= '0') && ((X) <= '9'))
-#define SDL_isspace(X) (((X) == ' ') || ((X) == '\t') || ((X) == '\r') || ((X) == '\n'))
-#define SDL_toupper(X) (((X) >= 'a') && ((X) <= 'z') ? ('A'+((X)-'a')) : (X))
-#define SDL_tolower(X) (((X) >= 'A') && ((X) <= 'Z') ? ('a'+((X)-'A')) : (X))
-#endif
-
-#ifdef HAVE_MEMSET
-#define SDL_memset memset
-#else
-extern DECLSPEC void *SDLCALL SDL_memset(void *dst, int c, size_t len);
-#endif
-#define SDL_zero(x)	SDL_memset(&(x), 0, sizeof((x)))
-#define SDL_zerop(x)	SDL_memset((x), 0, sizeof(*(x)))
-
-#if defined(__GNUC__) && defined(i386)
-#define SDL_memset4(dst, val, len)				\
-do {								\
-	int u0, u1, u2;						\
-	__asm__ __volatile__ (					\
-		"cld\n\t"					\
-		"rep ; stosl\n\t"				\
-		: "=&D" (u0), "=&a" (u1), "=&c" (u2)		\
-		: "0" (dst), "1" (val), "2" (SDL_static_cast(Uint32, len))	\
-		: "memory" );					\
-} while(0)
-#endif
-#ifndef SDL_memset4
-#define SDL_memset4(dst, val, len)		\
-do {						\
-	unsigned _count = (len);		\
-	unsigned _n = (_count + 3) / 4;		\
-	Uint32 *_p = SDL_static_cast(Uint32 *, dst);		\
-	Uint32 _val = (val);			\
-	if (len == 0) break;			\
- switch (_count % 4) {			\
- case 0: do { *_p++ = _val;		\
- case 3: *_p++ = _val;		\
- case 2: *_p++ = _val;		\
- case 1: *_p++ = _val;		\
-		} while ( --_n );		\
-	}					\
-} while(0)
-#endif
-
-/* We can count on memcpy existing on Mac OS X and being well-tuned. */
-#if defined(__MACH__) && defined(__APPLE__)
-#define SDL_memcpy(dst, src, len) memcpy(dst, src, len)
-#elif defined(__GNUC__) && defined(i386)
-#define SDL_memcpy(dst, src, len)					 \
-do {									 \
-	int u0, u1, u2;						 	 \
-	__asm__ __volatile__ (						 \
-		"cld\n\t"						 \
-		"rep ; movsl\n\t"					 \
-		"testb $2,%b4\n\t"					 \
-		"je 1f\n\t"						 \
-		"movsw\n"						 \
-		"1:\ttestb $1,%b4\n\t"					 \
-		"je 2f\n\t"						 \
-		"movsb\n"						 \
-		"2:"							 \
-		: "=&c" (u0), "=&D" (u1), "=&S" (u2)			 \
-		: "0" (SDL_static_cast(unsigned, len)/4), "q" (len), "1" (dst),"2" (src) \
-		: "memory" );						 \
-} while(0)
-#endif
-#ifndef SDL_memcpy
-#ifdef HAVE_MEMCPY
-#define SDL_memcpy memcpy
-#elif defined(HAVE_BCOPY)
-#define SDL_memcpy(d, s, n)	bcopy((s), (d), (n))
-#else
-extern DECLSPEC void *SDLCALL SDL_memcpy(void *dst, const void *src,
- size_t len);
-#endif
-#endif
-
-/* We can count on memcpy existing on Mac OS X and being well-tuned. */
-#if defined(__MACH__) && defined(__APPLE__)
-#define SDL_memcpy4(dst, src, len) memcpy(dst, src, (len)*4)
-#elif defined(__GNUC__) && defined(i386)
-#define SDL_memcpy4(dst, src, len)				\
-do {								\
-	int ecx, edi, esi;					\
-	__asm__ __volatile__ (					\
-		"cld\n\t"					\
-		"rep ; movsl"					\
-		: "=&c" (ecx), "=&D" (edi), "=&S" (esi)		\
-		: "0" (SDL_static_cast(unsigned, len)), "1" (dst), "2" (src)	\
-		: "memory" );					\
-} while(0)
-#endif
-#ifndef SDL_memcpy4
-#define SDL_memcpy4(dst, src, len)	SDL_memcpy(dst, src, (len) << 2)
-#endif
-
-#if defined(__GNUC__) && defined(i386)
-#define SDL_revcpy(dst, src, len)			\
-do {							\
-	int u0, u1, u2;					\
-	char *dstp = SDL_static_cast(char *, dst);			\
-	char *srcp = SDL_static_cast(char *, src);			\
-	int n = (len);					\
-	if ( n >= 4 ) {					\
-	__asm__ __volatile__ (				\
-		"std\n\t"				\
-		"rep ; movsl\n\t"			\
-		"cld\n\t"				\
-		: "=&c" (u0), "=&D" (u1), "=&S" (u2)	\
-		: "0" (n >> 2),				\
-		 "1" (dstp+(n-4)), "2" (srcp+(n-4))	\
-		: "memory" );				\
-	}						\
-	switch (n & 3) {				\
-		case 3: dstp[2] = srcp[2];		\
-		case 2: dstp[1] = srcp[1];		\
-		case 1: dstp[0] = srcp[0];		\
-			break;				\
-		default:				\
-			break;				\
-	}						\
-} while(0)
-#endif
-#ifndef SDL_revcpy
-extern DECLSPEC void *SDLCALL SDL_revcpy(void *dst, const void *src,
- size_t len);
-#endif
-
-#ifdef HAVE_MEMMOVE
-#define SDL_memmove memmove
-#elif defined(HAVE_BCOPY)
-#define SDL_memmove(d, s, n)	bcopy((s), (d), (n))
-#else
-#define SDL_memmove(dst, src, len)			\
-do {							\
-	if ( dst < src ) {				\
-		SDL_memcpy(dst, src, len);		\
-	} else {					\
-		SDL_revcpy(dst, src, len);		\
-	}						\
-} while(0)
-#endif
-
-#ifdef HAVE_MEMCMP
-#define SDL_memcmp memcmp
-#else
-extern DECLSPEC int SDLCALL SDL_memcmp(const void *s1, const void *s2,
- size_t len);
-#endif
-
-#ifdef HAVE_STRLEN
-#define SDL_strlen strlen
-#else
-extern DECLSPEC size_t SDLCALL SDL_strlen(const char *string);
-#endif
-
-#ifdef HAVE_WCSLEN
-#define SDL_wcslen wcslen
-#else
-#if !defined(wchar_t) && defined(__NINTENDODS__)
-#define wchar_t short /* TODO: figure out why libnds doesn't have this */
-#endif
-extern DECLSPEC size_t SDLCALL SDL_wcslen(const wchar_t * string);
-#endif
-
-#ifdef HAVE_STRLCPY
-#define SDL_strlcpy strlcpy
-#else
-extern DECLSPEC size_t SDLCALL SDL_strlcpy(char *dst, const char *src,
- size_t maxlen);
-#endif
-
-#ifdef HAVE_STRLCAT
-#define SDL_strlcat strlcat
-#else
-extern DECLSPEC size_t SDLCALL SDL_strlcat(char *dst, const char *src,
- size_t maxlen);
-#endif
-
-#ifdef HAVE_STRDUP
-#define SDL_strdup strdup
-#else
-extern DECLSPEC char *SDLCALL SDL_strdup(const char *string);
-#endif
-
-#ifdef HAVE__STRREV
-#define SDL_strrev _strrev
-#else
-extern DECLSPEC char *SDLCALL SDL_strrev(char *string);
-#endif
-
-#ifdef HAVE__STRUPR
-#define SDL_strupr _strupr
-#else
-extern DECLSPEC char *SDLCALL SDL_strupr(char *string);
-#endif
-
-#ifdef HAVE__STRLWR
-#define SDL_strlwr _strlwr
-#else
-extern DECLSPEC char *SDLCALL SDL_strlwr(char *string);
-#endif
-
-#ifdef HAVE_STRCHR
-#define SDL_strchr strchr
-#elif defined(HAVE_INDEX)
-#define SDL_strchr index
-#else
-extern DECLSPEC char *SDLCALL SDL_strchr(const char *string, int c);
-#endif
-
-#ifdef HAVE_STRRCHR
-#define SDL_strrchr strrchr
-#elif defined(HAVE_RINDEX)
-#define SDL_strrchr rindex
-#else
-extern DECLSPEC char *SDLCALL SDL_strrchr(const char *string, int c);
-#endif
-
-#ifdef HAVE_STRSTR
-#define SDL_strstr strstr
-#else
-extern DECLSPEC char *SDLCALL SDL_strstr(const char *haystack,
- const char *needle);
-#endif
-
-#ifdef HAVE_ITOA
-#define SDL_itoa itoa
-#else
-#define SDL_itoa(value, string, radix)	SDL_ltoa((long)value, string, radix)
-#endif
-
-#ifdef HAVE__LTOA
-#define SDL_ltoa _ltoa
-#else
-extern DECLSPEC char *SDLCALL SDL_ltoa(long value, char *string, int radix);
-#endif
-
-#ifdef HAVE__UITOA
-#define SDL_uitoa _uitoa
-#else
-#define SDL_uitoa(value, string, radix)	SDL_ultoa((long)value, string, radix)
-#endif
-
-#ifdef HAVE__ULTOA
-#define SDL_ultoa _ultoa
-#else
-extern DECLSPEC char *SDLCALL SDL_ultoa(unsigned long value, char *string,
- int radix);
-#endif
-
-#ifdef HAVE_STRTOL
-#define SDL_strtol strtol
-#else
-extern DECLSPEC long SDLCALL SDL_strtol(const char *string, char **endp,
- int base);
-#endif
-
-#ifdef HAVE_STRTOUL
-#define SDL_strtoul strtoul
-#else
-extern DECLSPEC unsigned long SDLCALL SDL_strtoul(const char *string,
- char **endp, int base);
-#endif
-
-#ifdef SDL_HAS_64BIT_TYPE
-
-#ifdef HAVE__I64TOA
-#define SDL_lltoa _i64toa
-#else
-extern DECLSPEC char *SDLCALL SDL_lltoa(Sint64 value, char *string,
- int radix);
-#endif
-
-#ifdef HAVE__UI64TOA
-#define SDL_ulltoa _ui64toa
-#else
-extern DECLSPEC char *SDLCALL SDL_ulltoa(Uint64 value, char *string,
- int radix);
-#endif
-
-#ifdef HAVE_STRTOLL
-#define SDL_strtoll strtoll
-#else
-extern DECLSPEC Sint64 SDLCALL SDL_strtoll(const char *string, char **endp,
- int base);
-#endif
-
-#ifdef HAVE_STRTOULL
-#define SDL_strtoull strtoull
-#else
-extern DECLSPEC Uint64 SDLCALL SDL_strtoull(const char *string, char **endp,
- int base);
-#endif
-
-#endif /* SDL_HAS_64BIT_TYPE */
-
-#ifdef HAVE_STRTOD
-#define SDL_strtod strtod
-#else
-extern DECLSPEC double SDLCALL SDL_strtod(const char *string, char **endp);
-#endif
-
-#ifdef HAVE_ATOI
-#define SDL_atoi atoi
-#else
-#define SDL_atoi(X) SDL_strtol(X, NULL, 0)
-#endif
-
-#ifdef HAVE_ATOF
-#define SDL_atof atof
-#else
-#define SDL_atof(X) SDL_strtod(X, NULL)
-#endif
-
-#ifdef HAVE_STRCMP
-#define SDL_strcmp strcmp
-#else
-extern DECLSPEC int SDLCALL SDL_strcmp(const char *str1, const char *str2);
-#endif
-
-#ifdef HAVE_STRNCMP
-#define SDL_strncmp strncmp
-#else
-extern DECLSPEC int SDLCALL SDL_strncmp(const char *str1, const char *str2,
- size_t maxlen);
-#endif
-
-#ifdef HAVE_STRCASECMP
-#define SDL_strcasecmp strcasecmp
-#elif defined(HAVE__STRICMP)
-#define SDL_strcasecmp _stricmp
-#else
-extern DECLSPEC int SDLCALL SDL_strcasecmp(const char *str1,
- const char *str2);
-#endif
-
-#ifdef HAVE_STRNCASECMP
-#define SDL_strncasecmp strncasecmp
-#elif defined(HAVE__STRNICMP)
-#define SDL_strncasecmp _strnicmp
-#else
-extern DECLSPEC int SDLCALL SDL_strncasecmp(const char *str1,
- const char *str2, size_t maxlen);
-#endif
-
-#ifdef HAVE_SSCANF
-#define SDL_sscanf sscanf
-#else
-extern DECLSPEC int SDLCALL SDL_sscanf(const char *text, const char *fmt,
- ...);
-#endif
-
-#ifdef HAVE_SNPRINTF
-#define SDL_snprintf snprintf
-#else
-extern DECLSPEC int SDLCALL SDL_snprintf(char *text, size_t maxlen,
- const char *fmt, ...);
-#endif
-
-#ifdef HAVE_VSNPRINTF
-#define SDL_vsnprintf vsnprintf
-#else
-extern DECLSPEC int SDLCALL SDL_vsnprintf(char *text, size_t maxlen,
- const char *fmt, va_list ap);
-#endif
-
-#ifndef HAVE_M_PI
-#define M_PI 3.14159265358979323846264338327950288 /* pi */
-#endif
-
-#ifdef HAVE_CEIL
-#define SDL_ceil ceil
-#else
-#define SDL_ceil(x) ((double)(int)((x)+0.5))
-#endif
-
-#ifdef HAVE_COPYSIGN
-#define SDL_copysign copysign
-#else
-extern DECLSPEC double SDLCALL SDL_copysign(double x, double y);
-#endif
-
-#ifdef HAVE_COS
-#define SDL_cos cos
-#else
-extern DECLSPEC double SDLCALL SDL_cos(double x);
-#endif
-
-#ifdef HAVE_COSF
-#define SDL_cosf cosf
-#else
-#define SDL_cosf(x) (float)SDL_cos((double)x)
-#endif
-
-#ifdef HAVE_FABS
-#define SDL_fabs fabs
-#else
-extern DECLSPEC double SDLCALL SDL_fabs(double x);
-#endif
-
-#ifdef HAVE_FLOOR
-#define SDL_floor floor
-#else
-extern DECLSPEC double SDLCALL SDL_floor(double x);
-#endif
-
-#ifdef HAVE_LOG
-#define SDL_log log
-#else
-extern DECLSPEC double SDLCALL SDL_log(double x);
-#endif
-
-#ifdef HAVE_POW
-#define SDL_pow pow
-#else
-extern DECLSPEC double SDLCALL SDL_pow(double x, double y);
-#endif
-
-#ifdef HAVE_SCALBN
-#define SDL_scalbn scalbn
-#else
-extern DECLSPEC double SDLCALL SDL_scalbn(double x, int n);
-#endif
-
-#ifdef HAVE_SIN
-#define SDL_sin sin
-#else
-extern DECLSPEC double SDLCALL SDL_sin(double x);
-#endif
-
-#ifdef HAVE_SINF
-#define SDL_sinf sinf
-#else
-#define SDL_sinf(x) (float)SDL_sin((double)x)
-#endif
-
-#ifdef HAVE_SQRT
-#define SDL_sqrt sqrt
-#else
-extern DECLSPEC double SDLCALL SDL_sqrt(double x);
-#endif
-
-/* The SDL implementation of iconv() returns these error codes */
-#define SDL_ICONV_ERROR		(size_t)-1
-#define SDL_ICONV_E2BIG		(size_t)-2
-#define SDL_ICONV_EILSEQ	(size_t)-3
-#define SDL_ICONV_EINVAL	(size_t)-4
-
-#if defined(HAVE_ICONV) && defined(HAVE_ICONV_H)
-#define SDL_iconv_t iconv_t
-#define SDL_iconv_open iconv_open
-#define SDL_iconv_close iconv_close
-#else
-typedef struct _SDL_iconv_t *SDL_iconv_t;
-extern DECLSPEC SDL_iconv_t SDLCALL SDL_iconv_open(const char *tocode,
- const char *fromcode);
-extern DECLSPEC int SDLCALL SDL_iconv_close(SDL_iconv_t cd);
-#endif
-extern DECLSPEC size_t SDLCALL SDL_iconv(SDL_iconv_t cd, const char **inbuf,
- size_t * inbytesleft, char **outbuf,
- size_t * outbytesleft);
-/**
- * This function converts a string between encodings in one pass, returning a
- * string that must be freed with SDL_free() or NULL on error.
- */
-extern DECLSPEC char *SDLCALL SDL_iconv_string(const char *tocode,
- const char *fromcode,
- const char *inbuf,
- size_t inbytesleft);
-#define SDL_iconv_utf8_locale(S)	SDL_iconv_string("", "UTF-8", S, SDL_strlen(S)+1)
-#define SDL_iconv_utf8_ucs2(S)		(Uint16 *)SDL_iconv_string("UCS-2", "UTF-8", S, SDL_strlen(S)+1)
-#define SDL_iconv_utf8_ucs4(S)		(Uint32 *)SDL_iconv_string("UCS-4", "UTF-8", S, SDL_strlen(S)+1)
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-}
-/* *INDENT-ON* */
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_stdinc_h */
-
-/* vi: set ts=4 sw=4 expandtab: */

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/SDL/include/begin_code.h Deleted

@@ -1,136 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2010 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/**
- *  \file begin_code.h
- *
- *  This file sets things up for C dynamic library function definitions,
- *  static inlined functions, and structures aligned at 4-byte alignment.
- *  If you don't like ugly C preprocessor code, don't look at this file. :)
- */
-
-/* This shouldn't be nested -- included it around code only. */
-#ifdef _begin_code_h
-#error Nested inclusion of begin_code.h
-#endif
-#define _begin_code_h
-
-/* Some compilers use a special export keyword */
-#ifndef DECLSPEC
-# if defined(__BEOS__) || defined(__HAIKU__)
-#  if defined(__GNUC__)
-#   define DECLSPEC	__declspec(dllexport)
-#  else
-#   define DECLSPEC	__declspec(export)
-#  endif
-# elif defined(__WIN32__)
-#  ifdef __BORLANDC__
-#   ifdef BUILD_SDL
-#    define DECLSPEC
-#   else
-#    define DECLSPEC	__declspec(dllimport)
-#   endif
-#  else
-#   define DECLSPEC	__declspec(dllexport)
-#  endif
-# else
-#  if defined(__GNUC__) && __GNUC__ >= 4
-#   define DECLSPEC	__attribute__ ((visibility("default")))
-#  else
-#   define DECLSPEC
-#  endif
-# endif
-#endif
-
-/* By default SDL uses the C calling convention */
-#ifndef SDLCALL
-#if defined(__WIN32__) && !defined(__GNUC__)
-#define SDLCALL __cdecl
-#else
-#define SDLCALL
-#endif
-#endif /* SDLCALL */
-
-/* Removed DECLSPEC on Symbian OS because SDL cannot be a DLL in EPOC */
-#ifdef __SYMBIAN32__
-#undef DECLSPEC
-#define DECLSPEC
-#endif /* __SYMBIAN32__ */
-
-/* Force structure packing at 4 byte alignment.
-   This is necessary if the header is included in code which has structure
-   packing set to an alternate value, say for loading structures from disk.
-   The packing is reset to the previous value in close_code.h
- */
-#if defined(_MSC_VER) || defined(__MWERKS__) || defined(__BORLANDC__)
-#ifdef _MSC_VER
-#pragma warning(disable: 4103)
-#endif
-#ifdef __BORLANDC__
-#pragma nopackwarning
-#endif
-#pragma pack(push,4)
-#endif /* Compiler needs structure packing set */
-
-/* Set up compiler-specific options for inlining functions */
-#ifndef SDL_INLINE_OKAY
-#ifdef __GNUC__
-#define SDL_INLINE_OKAY
-#else
-/* Add any special compiler-specific cases here */
-#if defined(_MSC_VER) || defined(__BORLANDC__) || \
-    defined(__DMC__) || defined(__SC__) || \
-    defined(__WATCOMC__) || defined(__LCC__) || \
-    defined(__DECC)
-#ifndef __inline__
-#define __inline__	__inline
-#endif
-#define SDL_INLINE_OKAY
-#else
-#if !defined(__MRC__) && !defined(_SGI_SOURCE)
-#ifndef __inline__
-#define __inline__ inline
-#endif
-#define SDL_INLINE_OKAY
-#endif /* Not a funky compiler */
-#endif /* Visual C++ */
-#endif /* GNU C */
-#endif /* SDL_INLINE_OKAY */
-
-/* If inlining isn't supported, remove "__inline__", turning static
-   inlined functions into static functions (resulting in code bloat
-   in all files which include the offending header files)
-*/
-#ifndef SDL_INLINE_OKAY
-#define __inline__
-#endif
-
-/* Apparently this is needed by several Windows compilers */
-#if !defined(__MACH__)
-#ifndef NULL
-#ifdef __cplusplus
-#define NULL 0
-#else
-#define NULL ((void *)0)
-#endif
-#endif /* NULL */
-#endif /* ! Mac OS X - breaks precompiled headers */

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/SDL/include/close_code.h Deleted

@@ -1,38 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2010 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/**
- *  \file close_code.h
- *  
- *  This file reverses the effects of begin_code.h and should be included
- *  after you finish any function and structure declarations in your headers
- */
-
-#undef _begin_code_h
-
-/* Reset structure packing at previous byte alignment */
-#if defined(_MSC_VER) || defined(__MWERKS__) || defined(__WATCOMC__)  || defined(__BORLANDC__)
-#ifdef __BORLANDC__
-#pragma nopackwarning
-#endif
-#pragma pack(pop)
-#endif /* Compiler needs structure packing set */

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/SDL/src Deleted

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/SDL/src/SDL.c Deleted

@@ -1,101 +0,0 @@
-/*
- SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2010 Sam Lantinga
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- Sam Lantinga
- slouken@libsdl.org
-*/
-// 7/31/2010 Wei Mingzhi
-// Removed everything unrated to Mac OS X Joystick support
-
-#include "SDL_config.h"
-
-/* Initialization code for SDL */
-
-#include "SDL.h"
-#include "haptic/SDL_haptic_c.h"
-#include "joystick/SDL_joystick_c.h"
-
-/* The initialized subsystems */
-static Uint32 SDL_initialized = 0;
-
-int
-SDL_InitSubSystem(Uint32 flags)
-{
- /* Initialize the joystick subsystem */
- if ((flags & SDL_INIT_JOYSTICK) && !(SDL_initialized & SDL_INIT_JOYSTICK)) {
- if (SDL_JoystickInit() < 0) {
- return (-1);
- }
- SDL_initialized |= SDL_INIT_JOYSTICK;
- }
-
- /* Initialize the haptic subsystem */
- if ((flags & SDL_INIT_HAPTIC) && !(SDL_initialized & SDL_INIT_HAPTIC)) {
- if (SDL_HapticInit() < 0) {
- return (-1);
- }
- SDL_initialized |= SDL_INIT_HAPTIC;
- }
-
- return (0);
-}
-
-int
-SDL_Init(Uint32 flags)
-{
- /* Clear the error message */
- SDL_ClearError();
-
- /* Initialize the desired subsystems */
- if (SDL_InitSubSystem(flags) < 0) {
- return (-1);
- }
-
- return (0);
-}
-
-void
-SDL_QuitSubSystem(Uint32 flags)
-{
- /* Shut down requested initialized subsystems */
- if ((flags & SDL_initialized & SDL_INIT_JOYSTICK)) {
- SDL_JoystickQuit();
- SDL_initialized &= ~SDL_INIT_JOYSTICK;
- }
-
- if ((flags & SDL_initialized & SDL_INIT_HAPTIC)) {
- SDL_HapticQuit();
- SDL_initialized &= ~SDL_INIT_HAPTIC;
- }
-}
-
-Uint32
-SDL_WasInit(Uint32 flags)
-{
- if (!flags) {
- flags = SDL_INIT_EVERYTHING;
- }
- return (SDL_initialized & flags);
-}
-
-void
-SDL_Quit(void)
-{
- /* Quit all subsystems */
- SDL_QuitSubSystem(SDL_INIT_EVERYTHING);
-}

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/SDL/src/SDL_error.c Deleted

@@ -1,259 +0,0 @@
-/*
- SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2010 Sam Lantinga
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- Sam Lantinga
- slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-/* Simple error handling in SDL */
-
-#include "SDL_error.h"
-#include "SDL_error_c.h"
-
-/* Routine to get the thread-specific error variable */
-#if SDL_THREADS_DISABLED
-/* !!! FIXME: what does this comment mean? Victim of Search and Replace? */
-/* The SDL_arraysize(The ),default (non-thread-safe) global error variable */
-static SDL_error SDL_global_error;
-#define SDL_GetErrBuf()	(&SDL_global_error)
-#else
-extern SDL_error *SDL_GetErrBuf(void);
-#endif /* SDL_THREADS_DISABLED */
-
-#define SDL_ERRBUFIZE	1024
-
-/* Private functions */
-
-static const char *
-SDL_LookupString(const char *key)
-{
- /* FIXME: Add code to lookup key in language string hash-table */
- return key;
-}
-
-/* Public functions */
-
-void
-SDL_SetError(const char *fmt, ...)
-{
- va_list ap;
- SDL_error *error;
-
- /* Copy in the key, mark error as valid */
- error = SDL_GetErrBuf();
- error->error = 1;
- SDL_strlcpy((char *) error->key, fmt, sizeof(error->key));
-
- va_start(ap, fmt);
- error->argc = 0;
- while (*fmt) {
- if (*fmt++ == '%') {
- while (*fmt == '.' || (*fmt >= '0' && *fmt <= '9')) {
- ++fmt;
- }
- switch (*fmt++) {
- case 0: /* Malformed format string.. */
- --fmt;
- break;
- case 'c':
- case 'i':
- case 'd':
- case 'u':
- case 'o':
- case 'x':
- case 'X':
- error->args[error->argc++].value_i = va_arg(ap, int);
- break;
- case 'f':
- error->args[error->argc++].value_f = va_arg(ap, double);
- break;
- case 'p':
- error->args[error->argc++].value_ptr = va_arg(ap, void *);
- break;
- case 's':
- {
- int i = error->argc;
- const char *str = va_arg(ap, const char *);
- if (str == NULL)
- str = "(null)";
- SDL_strlcpy((char *) error->args[i].buf, str,
- ERR_MAX_STRLEN);
- error->argc++;
- }
- break;
- default:
- break;
- }
- if (error->argc >= ERR_MAX_ARGS) {
- break;
- }
- }
- }
- va_end(ap);
-
- /* If we are in debug mode, print out an error message */
-#ifdef DEBUG_ERROR
- fprintf(stderr, "SDL_SetError: %s\n", SDL_GetError());
-#endif
-}
-
-/* This function has a bit more overhead than most error functions
- so that it supports internationalization and thread-safe errors.
-*/
-static char *
-SDL_GetErrorMsg(char *errstr, unsigned int maxlen)
-{
- SDL_error *error;
-
- /* Clear the error string */
- *errstr = '\0';
- --maxlen;
-
- /* Get the thread-safe error, and print it out */
- error = SDL_GetErrBuf();
- if (error->error) {
- const char *fmt;
- char *msg = errstr;
- int len;
- int argi;
-
- fmt = SDL_LookupString(error->key);
- argi = 0;
- while (*fmt && (maxlen > 0)) {
- if (*fmt == '%') {
- char tmp[32], *spot = tmp;
- *spot++ = *fmt++;
- while ((*fmt == '.' || (*fmt >= '0' && *fmt <= '9'))
- && spot < (tmp + SDL_arraysize(tmp) - 2)) {
- *spot++ = *fmt++;
- }
- *spot++ = *fmt++;
- *spot++ = '\0';
- switch (spot[-2]) {
- case '%':
- *msg++ = '%';
- maxlen -= 1;
- break;
- case 'c':
- case 'i':
- case 'd':
- case 'u':
- case 'o':
- case 'x':
- case 'X':
- len =
- SDL_snprintf(msg, maxlen, tmp,
- error->args[argi++].value_i);
- msg += len;
- maxlen -= len;
- break;
- case 'f':
- len =
- SDL_snprintf(msg, maxlen, tmp,
- error->args[argi++].value_f);
- msg += len;
- maxlen -= len;
- break;
- case 'p':
- len =
- SDL_snprintf(msg, maxlen, tmp,
- error->args[argi++].value_ptr);
- msg += len;
- maxlen -= len;
- break;
- case 's':
- len =
- SDL_snprintf(msg, maxlen, tmp,
- SDL_LookupString(error->args[argi++].
- buf));
- msg += len;
- maxlen -= len;
- break;
- }
- } else {
- *msg++ = *fmt++;
- maxlen -= 1;
- }
- }
- *msg = 0; /* NULL terminate the string */
- }
- return (errstr);
-}
-
-/* Available for backwards compatibility */
-char *
-SDL_GetError(void)
-{
- static char errmsg[SDL_ERRBUFIZE];
-
- return ((char *) SDL_GetErrorMsg(errmsg, SDL_ERRBUFIZE));
-}
-
-void
-SDL_ClearError(void)
-{
- SDL_error *error;
-
- error = SDL_GetErrBuf();
- error->error = 0;
-}
-
-/* Very common errors go here */
-void
-SDL_Error(SDL_errorcode code)
-{
- switch (code) {
- case SDL_ENOMEM:
- SDL_SetError("Out of memory");
- break;
- case SDL_EFREAD:
- SDL_SetError("Error reading from datastream");
- break;
- case SDL_EFWRITE:
- SDL_SetError("Error writing to datastream");
- break;
- case SDL_EFSEEK:
- SDL_SetError("Error seeking in datastream");
- break;
- case SDL_UNSUPPORTED:
- SDL_SetError("That operation is not supported");
- break;
- default:
- SDL_SetError("Unknown SDL error");
- break;
- }
-}
-
-#ifdef TEST_ERROR
-int
-main(int argc, char *argv[])
-{
- char buffer[BUFSIZ + 1];
-
- SDL_SetError("Hi there!");
- printf("Error 1: %s\n", SDL_GetError());
- SDL_ClearError();
- SDL_memset(buffer, '1', BUFSIZ);
- buffer[BUFSIZ] = 0;
- SDL_SetError("This is the error: %s (%f)", buffer, 1.0);
- printf("Error 2: %s\n", SDL_GetError());
- exit(0);
-}
-#endif
-/* vi: set ts=4 sw=4 expandtab: */

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/SDL/src/SDL_error_c.h Deleted

@@ -1,62 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2010 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-/* This file defines a structure that carries language-independent
-   error messages
-*/
-
-#ifndef _SDL_error_c_h
-#define _SDL_error_c_h
-
-#define ERR_MAX_STRLEN	128
-#define ERR_MAX_ARGS	5
-
-typedef struct SDL_error
-{
-    /* This is a numeric value corresponding to the current error */
-    int error;
-
-    /* This is a key used to index into a language hashtable containing
-       internationalized versions of the SDL error messages.  If the key
-       is not in the hashtable, or no hashtable is available, the key is
-       used directly as an error message format string.
-     */
-    char key[ERR_MAX_STRLEN];
-
-    /* These are the arguments for the error functions */
-    int argc;
-    union
-    {
-        void *value_ptr;
-#if 0                           /* What is a character anyway?  (UNICODE issues) */
-        unsigned char value_c;
-#endif
-        int value_i;
-        double value_f;
-        char buf[ERR_MAX_STRLEN];
-    } args[ERR_MAX_ARGS];
-} SDL_error;
-
-#endif /* _SDL_error_c_h */
-
-/* vi: set ts=4 sw=4 expandtab: */

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/SDL/src/haptic Deleted

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/SDL/src/haptic/SDL_haptic.c Deleted

@@ -1,708 +0,0 @@
-/*
- SDL - Simple DirectMedia Layer
- Copyright (C) 2008 Edgar Simo
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- Sam Lantinga
- slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-#include "SDL_syshaptic.h"
-#include "SDL_haptic_c.h"
-#include "../joystick/SDL_joystick_c.h" /* For SDL_PrivateJoystickValid */
-
-
-Uint8 SDL_numhaptics = 0;
-SDL_Haptic **SDL_haptics = NULL;
-
-
-/*
- * Initializes the Haptic devices.
- */
-int
-SDL_HapticInit(void)
-{
- int arraylen;
- int status;
-
- SDL_numhaptics = 0;
- status = SDL_SYS_HapticInit();
- if (status >= 0) {
- arraylen = (status + 1) * sizeof(*SDL_haptics);
- SDL_haptics = (SDL_Haptic **) SDL_malloc(arraylen);
- if (SDL_haptics == NULL) { /* Out of memory. */
- SDL_numhaptics = 0;
- } else {
- SDL_memset(SDL_haptics, 0, arraylen);
- SDL_numhaptics = status;
- }
- status = 0;
- }
-
- return status;
-}
-
-
-/*
- * Checks to see if the haptic device is valid
- */
-static int
-ValidHaptic(SDL_Haptic * haptic)
-{
- int i;
- int valid;
-
- valid = 0;
- if (haptic != NULL) {
- for (i = 0; i < SDL_numhaptics; i++) {
- if (SDL_haptics[i] == haptic) {
- valid = 1;
- break;
- }
- }
- }
-
- /* Create the error here. */
- if (valid == 0) {
- SDL_SetError("Haptic: Invalid haptic device identifier");
- }
-
- return valid;
-}
-
-
-/*
- * Returns the number of available devices.
- */
-int
-SDL_NumHaptics(void)
-{
- return SDL_numhaptics;
-}
-
-
-/*
- * Gets the name of a Haptic device by index.
- */
-const char *
-SDL_HapticName(int device_index)
-{
- if ((device_index < 0) || (device_index >= SDL_numhaptics)) {
- SDL_SetError("Haptic: There are %d haptic devices available",
- SDL_numhaptics);
- return NULL;
- }
- return SDL_SYS_HapticName(device_index);
-}
-
-
-/*
- * Opens a Haptic device.
- */
-SDL_Haptic *
-SDL_HapticOpen(int device_index)
-{
- int i;
- SDL_Haptic *haptic;
-
- if ((device_index < 0) || (device_index >= SDL_numhaptics)) {
- SDL_SetError("Haptic: There are %d haptic devices available",
- SDL_numhaptics);
- return NULL;
- }
-
- /* If the haptic is already open, return it */
- for (i = 0; SDL_haptics[i]; i++) {
- if (device_index == SDL_haptics[i]->index) {
- haptic = SDL_haptics[i];
- ++haptic->ref_count;
- return haptic;
- }
- }
-
- /* Create the haptic device */
- haptic = (SDL_Haptic *) SDL_malloc((sizeof *haptic));
- if (haptic == NULL) {
- SDL_OutOfMemory();
- return NULL;
- }
-
- /* Initialize the haptic device */
- SDL_memset(haptic, 0, (sizeof *haptic));
- haptic->index = device_index;
- if (SDL_SYS_HapticOpen(haptic) < 0) {
- SDL_free(haptic);
- return NULL;
- }
-
- /* Disable autocenter and set gain to max. */
- if (haptic->supported & SDL_HAPTIC_GAIN)
- SDL_HapticSetGain(haptic, 100);
- if (haptic->supported & SDL_HAPTIC_AUTOCENTER)
- SDL_HapticSetAutocenter(haptic, 0);
-
- /* Add haptic to list */
- ++haptic->ref_count;
- for (i = 0; SDL_haptics[i]; i++)
- /* Skip to next haptic */ ;
- SDL_haptics[i] = haptic;
-
- return haptic;
-}
-
-
-/*
- * Returns 1 if the device has been opened.
- */
-int
-SDL_HapticOpened(int device_index)
-{
- int i, opened;
-
- opened = 0;
- for (i = 0; SDL_haptics[i]; i++) {
- if (SDL_haptics[i]->index == (Uint8) device_index) {
- opened = 1;
- break;
- }
- }
- return opened;
-}
-
-
-/*
- * Returns the index to a haptic device.
- */
-int
-SDL_HapticIndex(SDL_Haptic * haptic)
-{
- if (!ValidHaptic(haptic)) {
- return -1;
- }
-
- return haptic->index;
-}
-
-
-/*
- * Returns SDL_TRUE if mouse is haptic, SDL_FALSE if it isn't.
- */
-int
-SDL_MouseIsHaptic(void)
-{
- if (SDL_SYS_HapticMouse() < 0)
- return SDL_FALSE;
- return SDL_TRUE;
-}
-
-
-/*
- * Returns the haptic device if mouse is haptic or NULL elsewise.
- */
-SDL_Haptic *
-SDL_HapticOpenFromMouse(void)
-{
- int device_index;
-
- device_index = SDL_SYS_HapticMouse();
-
- if (device_index < 0) {
- SDL_SetError("Haptic: Mouse isn't a haptic device.");
- return NULL;
- }
-
- return SDL_HapticOpen(device_index);
-}
-
-
-/*
- * Returns SDL_TRUE if joystick has haptic features.
- */
-int
-SDL_JoystickIsHaptic(SDL_Joystick * joystick)
-{
- int ret;
-
- /* Must be a valid joystick */
- if (!SDL_PrivateJoystickValid(&joystick)) {
- return -1;
- }
-
- ret = SDL_SYS_JoystickIsHaptic(joystick);
-
- if (ret > 0)
- return SDL_TRUE;
- else if (ret == 0)
- return SDL_FALSE;
- else
- return -1;
-}
-
-
-/*
- * Opens a haptic device from a joystick.
- */
-SDL_Haptic *
-SDL_HapticOpenFromJoystick(SDL_Joystick * joystick)
-{
- int i;
- SDL_Haptic *haptic;
-
- /* Must be a valid joystick */
- if (!SDL_PrivateJoystickValid(&joystick)) {
- SDL_SetError("Haptic: Joystick isn't valid.");
- return NULL;
- }
-
- /* Joystick must be haptic */
- if (SDL_SYS_JoystickIsHaptic(joystick) <= 0) {
- SDL_SetError("Haptic: Joystick isn't a haptic device.");
- return NULL;
- }
-
- /* Check to see if joystick's haptic is already open */
- for (i = 0; SDL_haptics[i]; i++) {
- if (SDL_SYS_JoystickSameHaptic(SDL_haptics[i], joystick)) {
- haptic = SDL_haptics[i];
- ++haptic->ref_count;
- return haptic;
- }
- }
-
- /* Create the haptic device */
- haptic = (SDL_Haptic *) SDL_malloc((sizeof *haptic));
- if (haptic == NULL) {
- SDL_OutOfMemory();
- return NULL;
- }
-
- /* Initialize the haptic device */
- SDL_memset(haptic, 0, sizeof(SDL_Haptic));
- if (SDL_SYS_HapticOpenFromJoystick(haptic, joystick) < 0) {
- SDL_free(haptic);
- return NULL;
- }
-
- /* Add haptic to list */
- ++haptic->ref_count;
- for (i = 0; SDL_haptics[i]; i++)
- /* Skip to next haptic */ ;
- SDL_haptics[i] = haptic;
-
- return haptic;
-}
-
-
-/*
- * Closes a SDL_Haptic device.
- */
-void
-SDL_HapticClose(SDL_Haptic * haptic)
-{
- int i;
-
- /* Must be valid */
- if (!ValidHaptic(haptic)) {
- return;
- }
-
- /* Check if it's still in use */
- if (--haptic->ref_count < 0) {
- return;
- }
-
- /* Close it, properly removing effects if needed */
- for (i = 0; i < haptic->neffects; i++) {
- if (haptic->effects[i].hweffect != NULL) {
- SDL_HapticDestroyEffect(haptic, i);
- }
- }
- SDL_SYS_HapticClose(haptic);
-
- /* Remove from the list */
- for (i = 0; SDL_haptics[i]; ++i) {
- if (haptic == SDL_haptics[i]) {
- SDL_haptics[i] = NULL;
- SDL_memcpy(&SDL_haptics[i], &SDL_haptics[i + 1],
- (SDL_numhaptics - i) * sizeof(haptic));
- break;
- }
- }
-
- /* Free */
- SDL_free(haptic);
-}
-
-/*
- * Cleans up after the subsystem.
- */
-void
-SDL_HapticQuit(void)
-{
- SDL_SYS_HapticQuit();
- if (SDL_haptics != NULL) {
- SDL_free(SDL_haptics);
- SDL_haptics = NULL;
- }
- SDL_numhaptics = 0;
-}
-
-/*
- * Returns the number of effects a haptic device has.
- */
-int
-SDL_HapticNumEffects(SDL_Haptic * haptic)
-{
- if (!ValidHaptic(haptic)) {
- return -1;
- }
-
- return haptic->neffects;
-}
-
-
-/*
- * Returns the number of effects a haptic device can play.
- */
-int
-SDL_HapticNumEffectsPlaying(SDL_Haptic * haptic)
-{
- if (!ValidHaptic(haptic)) {
- return -1;
- }
-
- return haptic->nplaying;
-}
-
-
-/*
- * Returns supported effects by the device.
- */
-unsigned int
-SDL_HapticQuery(SDL_Haptic * haptic)
-{
- if (!ValidHaptic(haptic)) {
- return -1;
- }
-
- return haptic->supported;
-}
-
-
-/*
- * Returns the number of axis on the device.
- */
-int
-SDL_HapticNumAxes(SDL_Haptic * haptic)
-{
- if (!ValidHaptic(haptic)) {
- return -1;
- }
-
- return haptic->naxes;
-}
-
-/*
- * Checks to see if the device can support the effect.
- */
-int
-SDL_HapticEffectSupported(SDL_Haptic * haptic, SDL_HapticEffect * effect)
-{
- if (!ValidHaptic(haptic)) {
- return -1;
- }
-
- if ((haptic->supported & effect->type) != 0)
- return SDL_TRUE;
- return SDL_FALSE;
-}
-
-/*
- * Creates a new haptic effect.
- */
-int
-SDL_HapticNewEffect(SDL_Haptic * haptic, SDL_HapticEffect * effect)
-{
- int i;
-
- /* Check for device validity. */
- if (!ValidHaptic(haptic)) {
- return -1;
- }
-
- /* Check to see if effect is supported */
- if (SDL_HapticEffectSupported(haptic, effect) == SDL_FALSE) {
- SDL_SetError("Haptic: Effect not supported by haptic device.");
- return -1;
- }
-
- /* See if there's a free slot */
- for (i = 0; i < haptic->neffects; i++) {
- if (haptic->effects[i].hweffect == NULL) {
-
- /* Now let the backend create the real effect */
- if (SDL_SYS_HapticNewEffect(haptic, &haptic->effects[i], effect)
- != 0) {
- return -1; /* Backend failed to create effect */
- }
-
- SDL_memcpy(&haptic->effects[i].effect, effect,
- sizeof(SDL_HapticEffect));
- return i;
- }
- }
-
- SDL_SetError("Haptic: Device has no free space left.");
- return -1;
-}
-
-/*
- * Checks to see if an effect is valid.
- */
-static int
-ValidEffect(SDL_Haptic * haptic, int effect)
-{
- if ((effect < 0) || (effect >= haptic->neffects)) {
- SDL_SetError("Haptic: Invalid effect identifier.");
- return 0;
- }
- return 1;
-}
-
-/*
- * Updates an effect.
- */
-int
-SDL_HapticUpdateEffect(SDL_Haptic * haptic, int effect,
- SDL_HapticEffect * data)
-{
- if (!ValidHaptic(haptic) || !ValidEffect(haptic, effect)) {
- return -1;
- }
-
- /* Can't change type dynamically. */
- if (data->type != haptic->effects[effect].effect.type) {
- SDL_SetError("Haptic: Updating effect type is illegal.");
- return -1;
- }
-
- /* Updates the effect */
- if (SDL_SYS_HapticUpdateEffect(haptic, &haptic->effects[effect], data) <
- 0) {
- return -1;
- }
-
- SDL_memcpy(&haptic->effects[effect].effect, data,
- sizeof(SDL_HapticEffect));
- return 0;
-}
-
-
-/*
- * Runs the haptic effect on the device.
- */
-int
-SDL_HapticRunEffect(SDL_Haptic * haptic, int effect, Uint32 iterations)
-{
- if (!ValidHaptic(haptic) || !ValidEffect(haptic, effect)) {
- return -1;
- }
-
- /* Run the effect */
- if (SDL_SYS_HapticRunEffect(haptic, &haptic->effects[effect], iterations)
- < 0) {
- return -1;
- }
-
- return 0;
-}
-
-/*
- * Stops the haptic effect on the device.
- */
-int
-SDL_HapticStopEffect(SDL_Haptic * haptic, int effect)
-{
- if (!ValidHaptic(haptic) || !ValidEffect(haptic, effect)) {
- return -1;
- }
-
- /* Stop the effect */
- if (SDL_SYS_HapticStopEffect(haptic, &haptic->effects[effect]) < 0) {
- return -1;
- }
-
- return 0;
-}
-
-/*
- * Gets rid of a haptic effect.
- */
-void
-SDL_HapticDestroyEffect(SDL_Haptic * haptic, int effect)
-{
- if (!ValidHaptic(haptic) || !ValidEffect(haptic, effect)) {
- return;
- }
-
- /* Not allocated */
- if (haptic->effects[effect].hweffect == NULL) {
- return;
- }
-
- SDL_SYS_HapticDestroyEffect(haptic, &haptic->effects[effect]);
-}
-
-/*
- * Gets the status of a haptic effect.
- */
-int
-SDL_HapticGetEffectStatus(SDL_Haptic * haptic, int effect)
-{
- if (!ValidHaptic(haptic) || !ValidEffect(haptic, effect)) {
- return -1;
- }
-
- if ((haptic->supported & SDL_HAPTIC_STATUS) == 0) {
- SDL_SetError("Haptic: Device does not support status queries.");
- return -1;
- }
-
- return SDL_SYS_HapticGetEffectStatus(haptic, &haptic->effects[effect]);
-}
-
-/*
- * Sets the global gain of the device.
- */
-int
-SDL_HapticSetGain(SDL_Haptic * haptic, int gain)
-{
- const char *env;
- int real_gain, max_gain;
-
- if (!ValidHaptic(haptic)) {
- return -1;
- }
-
- if ((haptic->supported & SDL_HAPTIC_GAIN) == 0) {
- SDL_SetError("Haptic: Device does not support setting gain.");
- return -1;
- }
-
- if ((gain < 0) || (gain > 100)) {
- SDL_SetError("Haptic: Gain must be between 0 and 100.");
- return -1;
- }
-
- /* We use the envvar to get the maximum gain. */
- env = SDL_getenv("SDL_HAPTIC_GAIN_MAX");
- if (env != NULL) {
- max_gain = SDL_atoi(env);
-
- /* Check for sanity. */
- if (max_gain < 0)
- max_gain = 0;
- else if (max_gain > 100)
- max_gain = 100;
-
- /* We'll scale it linearly with SDL_HAPTIC_GAIN_MAX */
- real_gain = (gain * max_gain) / 100;
- } else {
- real_gain = gain;
- }
-
- if (SDL_SYS_HapticSetGain(haptic, real_gain) < 0) {
- return -1;
- }
-
- return 0;
-}
-
-/*
- * Makes the device autocenter, 0 disables.
- */
-int
-SDL_HapticSetAutocenter(SDL_Haptic * haptic, int autocenter)
-{
- if (!ValidHaptic(haptic)) {
- return -1;
- }
-
- if ((haptic->supported & SDL_HAPTIC_AUTOCENTER) == 0) {
- SDL_SetError("Haptic: Device does not support setting autocenter.");
- return -1;
- }
-
- if ((autocenter < 0) || (autocenter > 100)) {
- SDL_SetError("Haptic: Autocenter must be between 0 and 100.");
- return -1;
- }
-
- if (SDL_SYS_HapticSetAutocenter(haptic, autocenter) < 0) {
- return -1;
- }
-
- return 0;
-}
-
-/*
- * Pauses the haptic device.
- */
-int
-SDL_HapticPause(SDL_Haptic * haptic)
-{
- if (!ValidHaptic(haptic)) {
- return -1;
- }
-
- if ((haptic->supported & SDL_HAPTIC_PAUSE) == 0) {
- SDL_SetError("Haptic: Device does not support setting pausing.");
- return -1;
- }
-
- return SDL_SYS_HapticPause(haptic);
-}
-
-/*
- * Unpauses the haptic device.
- */
-int
-SDL_HapticUnpause(SDL_Haptic * haptic)
-{
- if (!ValidHaptic(haptic)) {
- return -1;
- }
-
- if ((haptic->supported & SDL_HAPTIC_PAUSE) == 0) {
- return 0; /* Not going to be paused, so we pretend it's unpaused. */
- }
-
- return SDL_SYS_HapticUnpause(haptic);
-}
-
-/*
- * Stops all the currently playing effects.
- */
-int
-SDL_HapticStopAll(SDL_Haptic * haptic)
-{
- if (!ValidHaptic(haptic)) {
- return -1;
- }
-
- return SDL_SYS_HapticStopAll(haptic);
-}

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/SDL/src/haptic/SDL_haptic_c.h Deleted

@@ -1,26 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2010 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-extern int SDL_HapticInit(void);
-extern void SDL_HapticQuit(void);
-
-/* vi: set ts=4 sw=4 expandtab: */

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/SDL/src/haptic/SDL_syshaptic.h Deleted

@@ -1,201 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 2008 Edgar Simo
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#include "SDL_config.h"
-
-#include "SDL_haptic.h"
-
-
-/*
- * Number of haptic devices on the system.
- */
-extern Uint8 SDL_numhaptics;
-
-
-struct haptic_effect
-{
-    SDL_HapticEffect effect;    /* The current event */
-    struct haptic_hweffect *hweffect;   /* The hardware behind the event */
-};
-
-/*
- * The real SDL_Haptic struct.
- */
-struct _SDL_Haptic
-{
-    Uint8 index;                /* Stores index it is attached to */
-
-    struct haptic_effect *effects;      /* Allocated effects */
-    int neffects;               /* Maximum amount of effects */
-    int nplaying;               /* Maximum amount of effects to play at the same time */
-    unsigned int supported;     /* Supported effects */
-    int naxes;                  /* Number of axes on the device. */
-
-    struct haptic_hwdata *hwdata;       /* Driver dependent */
-    int ref_count;              /* Count for multiple opens */
-};
-
-/* 
- * Scans the system for haptic devices.
- *
- * Returns 0 on success, -1 on error.
- */
-extern int SDL_SYS_HapticInit(void);
-
-/*
- * Gets the device dependent name of the haptic device
- */
-extern const char *SDL_SYS_HapticName(int index);
-
-/*
- * Opens the haptic device for usage.  The haptic device should have
- * the index value set previously.
- *
- * Returns 0 on success, -1 on error.
- */
-extern int SDL_SYS_HapticOpen(SDL_Haptic * haptic);
-
-/*
- * Returns the index of the haptic core pointer or -1 if none is found.
- */
-int SDL_SYS_HapticMouse(void);
-
-/*
- * Checks to see if the joystick has haptic capabilities.
- *
- * Returns >0 if haptic capabilities are detected, 0 if haptic
- * capabilities aren't detected and -1 on error.
- */
-extern int SDL_SYS_JoystickIsHaptic(SDL_Joystick * joystick);
-
-/*
- * Opens the haptic device for usage using the same device as
- * the joystick.
- *
- * Returns 0 on success, -1 on error.
- */
-extern int SDL_SYS_HapticOpenFromJoystick(SDL_Haptic * haptic,
-                                          SDL_Joystick * joystick);
-/*
- * Checks to see if haptic device and joystick device are the same.
- *
- * Returns 1 if they are the same, 0 if they aren't.
- */
-extern int SDL_SYS_JoystickSameHaptic(SDL_Haptic * haptic,
-                                      SDL_Joystick * joystick);
-
-/*
- * Closes a haptic device after usage.
- */
-extern void SDL_SYS_HapticClose(SDL_Haptic * haptic);
-
-/*
- * Performs a cleanup on the haptic subsystem.
- */
-extern void SDL_SYS_HapticQuit(void);
-
-/*
- * Creates a new haptic effect on the haptic device using base
- * as a template for the effect.
- *
- * Returns 0 on success, -1 on error.
- */
-extern int SDL_SYS_HapticNewEffect(SDL_Haptic * haptic,
-                                   struct haptic_effect *effect,
-                                   SDL_HapticEffect * base);
-
-/*
- * Updates the haptic effect on the haptic device using data
- * as a template.
- *
- * Returns 0 on success, -1 on error.
- */
-extern int SDL_SYS_HapticUpdateEffect(SDL_Haptic * haptic,
-                                      struct haptic_effect *effect,
-                                      SDL_HapticEffect * data);
-
-/*
- * Runs the effect on the haptic device.
- *
- * Returns 0 on success, -1 on error.
- */
-extern int SDL_SYS_HapticRunEffect(SDL_Haptic * haptic,
-                                   struct haptic_effect *effect,
-                                   Uint32 iterations);
-
-/*
- * Stops the effect on the haptic device.
- *
- * Returns 0 on success, -1 on error.
- */
-extern int SDL_SYS_HapticStopEffect(SDL_Haptic * haptic,
-                                    struct haptic_effect *effect);
-
-/*
- * Cleanups up the effect on the haptic device.
- */
-extern void SDL_SYS_HapticDestroyEffect(SDL_Haptic * haptic,
-                                        struct haptic_effect *effect);
-
-/*
- * Queries the device for the status of effect.
- *
- * Returns 0 if device is stopped, >0 if device is playing and
- * -1 on error.
- */
-extern int SDL_SYS_HapticGetEffectStatus(SDL_Haptic * haptic,
-                                         struct haptic_effect *effect);
-
-/*
- * Sets the global gain of the haptic device.
- *
- * Returns 0 on success, -1 on error.
- */
-extern int SDL_SYS_HapticSetGain(SDL_Haptic * haptic, int gain);
-
-/*
- * Sets the autocenter feature of the haptic device.
- *
- * Returns 0 on success, -1 on error.
- */
-extern int SDL_SYS_HapticSetAutocenter(SDL_Haptic * haptic, int autocenter);
-
-/*
- * Pauses the haptic device.
- *
- * Returns 0 on success, -1 on error.
- */
-extern int SDL_SYS_HapticPause(SDL_Haptic * haptic);
-
-/*
- * Unpauses the haptic device.
- *
- * Returns 0 on success, -1 on error.
- */
-extern int SDL_SYS_HapticUnpause(SDL_Haptic * haptic);
-
-/*
- * Stops all the currently playing haptic effects on the device.
- *
- * Returns 0 on success, -1 on error.
- */
-extern int SDL_SYS_HapticStopAll(SDL_Haptic * haptic);

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/SDL/src/haptic/darwin Deleted

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/SDL/src/haptic/darwin/SDL_syshaptic.c Deleted

@@ -1,1321 +0,0 @@
-/*
- SDL - Simple DirectMedia Layer
- Copyright (C) 2008 Edgar Simo
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- Sam Lantinga
- slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-#ifdef SDL_HAPTIC_IOKIT
-
-#include "SDL_haptic.h"
-#include "../SDL_syshaptic.h"
-#include "SDL_joystick.h"
-#include "../../joystick/SDL_sysjoystick.h" /* For the real SDL_Joystick */
-#include "../../joystick/darwin/SDL_sysjoystick_c.h" /* For joystick hwdata */
-
-#include <IOKit/IOKitLib.h>
-#include <IOKit/hid/IOHIDKeys.h>
-#include <IOKit/hid/IOHIDUsageTables.h>
-#include <ForceFeedback/ForceFeedback.h>
-#include <ForceFeedback/ForceFeedbackConstants.h>
-
-#ifndef IO_OBJECT_NULL
-#define IO_OBJECT_NULL	((io_service_t)0)
-#endif
-
-#define MAX_HAPTICS 32
-
-
-/*
- * List of available haptic devices.
- */
-static struct
-{
- char name[256]; /* Name of the device. */
-
- io_service_t dev; /* Node we use to create the device. */
- SDL_Haptic *haptic; /* Haptic currently assosciated with it. */
-
- /* Usage pages for determining if it's a mouse or not. */
- long usage;
- long usagePage;
-} SDL_hapticlist[MAX_HAPTICS];
-
-
-/*
- * Haptic system hardware data.
- */
-struct haptic_hwdata
-{
- FFDeviceObjectReference device; /* Hardware device. */
- UInt8 axes[3];
-};
-
-
-/*
- * Haptic system effect data.
- */
-struct haptic_hweffect
-{
- FFEffectObjectReference ref; /* Reference. */
- struct FFEFFECT effect; /* Hardware effect. */
-};
-
-/*
- * Prototypes.
- */
-static void SDL_SYS_HapticFreeFFEFFECT(FFEFFECT * effect, int type);
-static int HIDGetDeviceProduct(io_service_t dev, char *name);
-
-
-/* 
- * Like strerror but for force feedback errors.
- */
-static const char *
-FFStrError(HRESULT err)
-{
- switch (err) {
- case FFERR_DEVICEFULL:
- return "device full";
- /* This should be valid, but for some reason isn't defined... */
- /*case FFERR_DEVICENOTREG:
- return "device not registered"; */
- case FFERR_DEVICEPAUSED:
- return "device paused";
- case FFERR_DEVICERELEASED:
- return "device released";
- case FFERR_EFFECTPLAYING:
- return "effect playing";
- case FFERR_EFFECTTYPEMISMATCH:
- return "effect type mismatch";
- case FFERR_EFFECTTYPENOTSUPPORTED:
- return "effect type not supported";
- case FFERR_GENERIC:
- return "undetermined error";
- case FFERR_HASEFFECTS:
- return "device has effects";
- case FFERR_INCOMPLETEEFFECT:
- return "incomplete effect";
- case FFERR_INTERNAL:
- return "internal fault";
- case FFERR_INVALIDDOWNLOADID:
- return "invalid download id";
- case FFERR_INVALIDPARAM:
- return "invalid parameter";
- case FFERR_MOREDATA:
- return "more data";
- case FFERR_NOINTERFACE:
- return "interface not supported";
- case FFERR_NOTDOWNLOADED:
- return "effect is not downloaded";
- case FFERR_NOTINITIALIZED:
- return "object has not been initialized";
- case FFERR_OUTOFMEMORY:
- return "out of memory";
- case FFERR_UNPLUGGED:
- return "device is unplugged";
- case FFERR_UNSUPPORTED:
- return "function call unsupported";
- case FFERR_UNSUPPORTEDAXIS:
- return "axis unsupported";
-
- default:
- return "unknown error";
- }
-}
-
-
-/*
- * Initializes the haptic subsystem.
- */
-int
-SDL_SYS_HapticInit(void)
-{
- int numhaptics;
- IOReturn result;
- io_iterator_t iter;
- CFDictionaryRef match;
- io_service_t device;
- CFMutableDictionaryRef hidProperties;
- CFTypeRef refCF;
-
- /* Clear all the memory. */
- SDL_memset(SDL_hapticlist, 0, sizeof(SDL_hapticlist));
-
- /* Get HID devices. */
- match = IOServiceMatching(kIOHIDDeviceKey);
- if (match == NULL) {
- SDL_SetError("Haptic: Failed to get IOServiceMatching.");
- return -1;
- }
-
- /* Now search I/O Registry for matching devices. */
- result = IOServiceGetMatchingServices(kIOMasterPortDefault, match, &iter);
- if (result != kIOReturnSuccess) {
- SDL_SetError("Haptic: Couldn't create a HID object iterator.");
- return -1;
- }
- /* IOServiceGetMatchingServices consumes dictionary. */
-
- if (!IOIteratorIsValid(iter)) { /* No iterator. */
- numhaptics = 0;
- return 0;
- }
-
- numhaptics = 0;
- while ((device = IOIteratorNext(iter)) != IO_OBJECT_NULL) {
-
- /* Check for force feedback. */
- if (FFIsForceFeedback(device) == FF_OK) {
-
- /* Set basic device data. */
- HIDGetDeviceProduct(device, SDL_hapticlist[numhaptics].name);
- SDL_hapticlist[numhaptics].dev = device;
- SDL_hapticlist[numhaptics].haptic = NULL;
-
- /* Set usage pages. */
- hidProperties = 0;
- refCF = 0;
- result = IORegistryEntryCreateCFProperties(device,
- &hidProperties,
- kCFAllocatorDefault,
- kNilOptions);
- if ((result == KERN_SUCCESS) && hidProperties) {
- refCF =
- CFDictionaryGetValue(hidProperties,
- CFSTR(kIOHIDPrimaryUsagePageKey));
- if (refCF) {
- if (!CFNumberGetValue(refCF, kCFNumberLongType,
- &SDL_hapticlist[numhaptics].
- usagePage))
- SDL_SetError
- ("Haptic: Recieving device's usage page.");
- refCF =
- CFDictionaryGetValue(hidProperties,
- CFSTR(kIOHIDPrimaryUsageKey));
- if (refCF) {
- if (!CFNumberGetValue(refCF, kCFNumberLongType,
- &SDL_hapticlist[numhaptics].
- usage))
- SDL_SetError("Haptic: Recieving device's usage.");
- }
- }
- CFRelease(hidProperties);
- }
-
- /* Device has been added. */
- numhaptics++;
- } else { /* Free the unused device. */
- IOObjectRelease(device);
- }
-
- /* Reached haptic limit. */
- if (numhaptics >= MAX_HAPTICS)
- break;
- }
- IOObjectRelease(iter);
-
- return numhaptics;
-}
-
-
-/*
- * Return the name of a haptic device, does not need to be opened.
- */
-const char *
-SDL_SYS_HapticName(int index)
-{
- return SDL_hapticlist[index].name;
-}
-
-/*
- * Gets the device's product name.
- */
-static int
-HIDGetDeviceProduct(io_service_t dev, char *name)
-{
- CFMutableDictionaryRef hidProperties, usbProperties;
- io_registry_entry_t parent1, parent2;
- kern_return_t ret;
-
- hidProperties = usbProperties = 0;
-
- ret = IORegistryEntryCreateCFProperties(dev, &hidProperties,
- kCFAllocatorDefault, kNilOptions);
- if ((ret != KERN_SUCCESS) || !hidProperties) {
- SDL_SetError("Haptic: Unable to create CFProperties.");
- return -1;
- }
-
- /* Mac OS X currently is not mirroring all USB properties to HID page so need to look at USB device page also
- * get dictionary for usb properties: step up two levels and get CF dictionary for USB properties
- */
- if ((KERN_SUCCESS ==
- IORegistryEntryGetParentEntry(dev, kIOServicePlane, &parent1))
- && (KERN_SUCCESS ==
- IORegistryEntryGetParentEntry(parent1, kIOServicePlane, &parent2))
- && (KERN_SUCCESS ==
- IORegistryEntryCreateCFProperties(parent2, &usbProperties,
- kCFAllocatorDefault,
- kNilOptions))) {
- if (usbProperties) {
- CFTypeRef refCF = 0;
- /* get device info
- * try hid dictionary first, if fail then go to usb dictionary
- */
-
-
- /* Get product name */
- refCF =
- CFDictionaryGetValue(hidProperties, CFSTR(kIOHIDProductKey));
- if (!refCF)
- refCF =
- CFDictionaryGetValue(usbProperties,
- CFSTR("USB Product Name"));
- if (refCF) {
- if (!CFStringGetCString(refCF, name, 256,
- CFStringGetSystemEncoding())) {
- SDL_SetError
- ("Haptic: CFStringGetCString error retrieving pDevice->product.");
- return -1;
- }
- }
-
- CFRelease(usbProperties);
- } else {
- SDL_SetError
- ("Haptic: IORegistryEntryCreateCFProperties failed to create usbProperties.");
- return -1;
- }
-
- /* Release stuff. */
- if (kIOReturnSuccess != IOObjectRelease(parent2)) {
- SDL_SetError("Haptic: IOObjectRelease error with parent2.");
- }
- if (kIOReturnSuccess != IOObjectRelease(parent1)) {
- SDL_SetError("Haptic: IOObjectRelease error with parent1.");
- }
- } else {
- SDL_SetError("Haptic: Error getting registry entries.");
- return -1;
- }
-
- return 0;
-}
-
-
-#define FF_TEST(ff, s) \
-if (features.supportedEffects & (ff)) supported |= (s)
-/*
- * Gets supported features.
- */
-static unsigned int
-GetSupportedFeatures(SDL_Haptic * haptic)
-{
- HRESULT ret;
- FFDeviceObjectReference device;
- FFCAPABILITIES features;
- unsigned int supported;
- Uint32 val;
-
- device = haptic->hwdata->device;
-
- ret = FFDeviceGetForceFeedbackCapabilities(device, &features);
- if (ret != FF_OK) {
- SDL_SetError("Haptic: Unable to get device's supported features.");
- return -1;
- }
-
- supported = 0;
-
- /* Get maximum effects. */
- haptic->neffects = features.storageCapacity;
- haptic->nplaying = features.playbackCapacity;
-
- /* Test for effects. */
- FF_TEST(FFCAP_ET_CONSTANTFORCE, SDL_HAPTIC_CONSTANT);
- FF_TEST(FFCAP_ET_RAMPFORCE, SDL_HAPTIC_RAMP);
- FF_TEST(FFCAP_ET_SQUARE, SDL_HAPTIC_SQUARE);
- FF_TEST(FFCAP_ET_SINE, SDL_HAPTIC_SINE);
- FF_TEST(FFCAP_ET_TRIANGLE, SDL_HAPTIC_TRIANGLE);
- FF_TEST(FFCAP_ET_SAWTOOTHUP, SDL_HAPTIC_SAWTOOTHUP);
- FF_TEST(FFCAP_ET_SAWTOOTHDOWN, SDL_HAPTIC_SAWTOOTHDOWN);
- FF_TEST(FFCAP_ET_SPRING, SDL_HAPTIC_SPRING);
- FF_TEST(FFCAP_ET_DAMPER, SDL_HAPTIC_DAMPER);
- FF_TEST(FFCAP_ET_INERTIA, SDL_HAPTIC_INERTIA);
- FF_TEST(FFCAP_ET_FRICTION, SDL_HAPTIC_FRICTION);
- FF_TEST(FFCAP_ET_CUSTOMFORCE, SDL_HAPTIC_CUSTOM);
-
- /* Check if supports gain. */
- ret = FFDeviceGetForceFeedbackProperty(device, FFPROP_FFGAIN,
- &val, sizeof(val));
- if (ret == FF_OK)
- supported |= SDL_HAPTIC_GAIN;
- else if (ret != FFERR_UNSUPPORTED) {
- SDL_SetError("Haptic: Unable to get if device supports gain: %s.",
- FFStrError(ret));
- return -1;
- }
-
- /* Checks if supports autocenter. */
- ret = FFDeviceGetForceFeedbackProperty(device, FFPROP_AUTOCENTER,
- &val, sizeof(val));
- if (ret == FF_OK)
- supported |= SDL_HAPTIC_AUTOCENTER;
- else if (ret != FFERR_UNSUPPORTED) {
- SDL_SetError
- ("Haptic: Unable to get if device supports autocenter: %s.",
- FFStrError(ret));
- return -1;
- }
-
- /* Check for axes, we have an artificial limit on axes */
- haptic->naxes = ((features.numFfAxes) > 3) ? 3 : features.numFfAxes;
- /* Actually store the axes we want to use */
- SDL_memcpy(haptic->hwdata->axes, features.ffAxes,
- haptic->naxes * sizeof(Uint8));
-
- /* Always supported features. */
- supported |= SDL_HAPTIC_STATUS | SDL_HAPTIC_PAUSE;
-
- haptic->supported = supported;
- return 0;;
-}
-
-
-/*
- * Opens the haptic device from the file descriptor.
- */
-static int
-SDL_SYS_HapticOpenFromService(SDL_Haptic * haptic, io_service_t service)
-{
- HRESULT ret;
- int ret2;
-
- /* Allocate the hwdata */
- haptic->hwdata = (struct haptic_hwdata *)
- SDL_malloc(sizeof(*haptic->hwdata));
- if (haptic->hwdata == NULL) {
- SDL_OutOfMemory();
- goto creat_err;
- }
- SDL_memset(haptic->hwdata, 0, sizeof(*haptic->hwdata));
-
- /* Open the device */
- ret = FFCreateDevice(service, &haptic->hwdata->device);
- if (ret != FF_OK) {
- SDL_SetError("Haptic: Unable to create device from service: %s.",
- FFStrError(ret));
- goto creat_err;
- }
-
- /* Get supported features. */
- ret2 = GetSupportedFeatures(haptic);
- if (haptic->supported < 0) {
- goto open_err;
- }
-
-
- /* Reset and then enable actuators. */
- ret = FFDeviceSendForceFeedbackCommand(haptic->hwdata->device,
- FFSFFC_RESET);
- if (ret != FF_OK) {
- SDL_SetError("Haptic: Unable to reset device: %s.", FFStrError(ret));
- goto open_err;
- }
- ret = FFDeviceSendForceFeedbackCommand(haptic->hwdata->device,
- FFSFFC_SETACTUATORSON);
- if (ret != FF_OK) {
- SDL_SetError("Haptic: Unable to enable actuators: %s.",
- FFStrError(ret));
- goto open_err;
- }
-
-
- /* Allocate effects memory. */
- haptic->effects = (struct haptic_effect *)
- SDL_malloc(sizeof(struct haptic_effect) * haptic->neffects);
- if (haptic->effects == NULL) {
- SDL_OutOfMemory();
- goto open_err;
- }
- /* Clear the memory */
- SDL_memset(haptic->effects, 0,
- sizeof(struct haptic_effect) * haptic->neffects);
-
- return 0;
-
- /* Error handling */
- open_err:
- FFReleaseDevice(haptic->hwdata->device);
- creat_err:
- if (haptic->hwdata != NULL) {
- free(haptic->hwdata);
- haptic->hwdata = NULL;
- }
- return -1;
-
-}
-
-
-/*
- * Opens a haptic device for usage.
- */
-int
-SDL_SYS_HapticOpen(SDL_Haptic * haptic)
-{
- return SDL_SYS_HapticOpenFromService(haptic,
- SDL_hapticlist[haptic->index].dev);
-}
-
-
-/*
- * Opens a haptic device from first mouse it finds for usage.
- */
-int
-SDL_SYS_HapticMouse(void)
-{
- int i;
-
- for (i = 0; i < SDL_numhaptics; i++) {
- if ((SDL_hapticlist[i].usagePage == kHIDPage_GenericDesktop) &&
- (SDL_hapticlist[i].usage == kHIDUsage_GD_Mouse))
- return i;
- }
-
- return -1;
-}
-
-
-/*
- * Checks to see if a joystick has haptic features.
- */
-int
-SDL_SYS_JoystickIsHaptic(SDL_Joystick * joystick)
-{
- if (joystick->hwdata->ffservice != 0)
- return SDL_TRUE;
- return SDL_FALSE;
-}
-
-
-/*
- * Checks to see if the haptic device and joystick and in reality the same.
- */
-int
-SDL_SYS_JoystickSameHaptic(SDL_Haptic * haptic, SDL_Joystick * joystick)
-{
- if (IOObjectIsEqualTo((io_object_t) haptic->hwdata->device,
- joystick->hwdata->ffservice))
- return 1;
- return 0;
-}
-
-
-/*
- * Opens a SDL_Haptic from a SDL_Joystick.
- */
-int
-SDL_SYS_HapticOpenFromJoystick(SDL_Haptic * haptic, SDL_Joystick * joystick)
-{
- return SDL_SYS_HapticOpenFromService(haptic, joystick->hwdata->ffservice);
-}
-
-
-/*
- * Closes the haptic device.
- */
-void
-SDL_SYS_HapticClose(SDL_Haptic * haptic)
-{
- if (haptic->hwdata) {
-
- /* Free Effects. */
- SDL_free(haptic->effects);
- haptic->effects = NULL;
- haptic->neffects = 0;
-
- /* Clean up */
- FFReleaseDevice(haptic->hwdata->device);
-
- /* Free */
- SDL_free(haptic->hwdata);
- haptic->hwdata = NULL;
- }
-}
-
-
-/* 
- * Clean up after system specific haptic stuff
- */
-void
-SDL_SYS_HapticQuit(void)
-{
- int i;
-
- for (i = 0; i < SDL_numhaptics; i++) {
- /* Opened and not closed haptics are leaked, this is on purpose.
- * Close your haptic devices after usage. */
-
- /* Free the io_service_t */
- IOObjectRelease(SDL_hapticlist[i].dev);
- }
-}
-
-
-/*
- * Converts an SDL trigger button to an FFEFFECT trigger button.
- */
-static DWORD
-FFGetTriggerButton(Uint16 button)
-{
- DWORD dwTriggerButton;
-
- dwTriggerButton = FFEB_NOTRIGGER;
-
- if (button != 0) {
- dwTriggerButton = FFJOFS_BUTTON(button - 1);
- }
-
- return dwTriggerButton;
-}
-
-
-/*
- * Sets the direction.
- */
-static int
-SDL_SYS_SetDirection(FFEFFECT * effect, SDL_HapticDirection * dir, int naxes)
-{
- LONG *rglDir;
-
- /* Handle no axes a part. */
- if (naxes == 0) {
- effect->dwFlags |= FFEFF_SPHERICAL; /* Set as default. */
- effect->rglDirection = NULL;
- return 0;
- }
-
- /* Has axes. */
- rglDir = SDL_malloc(sizeof(LONG) * naxes);
- if (rglDir == NULL) {
- SDL_OutOfMemory();
- return -1;
- }
- SDL_memset(rglDir, 0, sizeof(LONG) * naxes);
- effect->rglDirection = rglDir;
-
- switch (dir->type) {
- case SDL_HAPTIC_POLAR:
- effect->dwFlags |= FFEFF_POLAR;
- rglDir[0] = dir->dir[0];
- return 0;
- case SDL_HAPTIC_CARTESIAN:
- effect->dwFlags |= FFEFF_CARTESIAN;
- rglDir[0] = dir->dir[0];
- if (naxes > 1)
- rglDir[1] = dir->dir[1];
- if (naxes > 2)
- rglDir[2] = dir->dir[2];
- return 0;
- case SDL_HAPTIC_SPHERICAL:
- effect->dwFlags |= FFEFF_SPHERICAL;
- rglDir[0] = dir->dir[0];
- if (naxes > 1)
- rglDir[1] = dir->dir[1];
- if (naxes > 2)
- rglDir[2] = dir->dir[2];
- return 0;
-
- default:
- SDL_SetError("Haptic: Unknown direction type.");
- return -1;
- }
-}
-
-
-/* Clamps and converts. */
-#define CCONVERT(x) (((x) > 0x7FFF) ? 10000 : ((x)*10000) / 0x7FFF)
-/* Just converts. */
-#define CONVERT(x) (((x)*10000) / 0x7FFF)
-/*
- * Creates the FFEFFECT from a SDL_HapticEffect.
- */
-static int
-SDL_SYS_ToFFEFFECT(SDL_Haptic * haptic, FFEFFECT * dest,
- SDL_HapticEffect * src)
-{
- int i;
- FFCONSTANTFORCE *constant;
- FFPERIODIC *periodic;
- FFCONDITION *condition; /* Actually an array of conditions - one per axis. */
- FFRAMPFORCE *ramp;
- FFCUSTOMFORCE *custom;
- FFENVELOPE *envelope;
- SDL_HapticConstant *hap_constant;
- SDL_HapticPeriodic *hap_periodic;
- SDL_HapticCondition *hap_condition;
- SDL_HapticRamp *hap_ramp;
- SDL_HapticCustom *hap_custom;
- DWORD *axes;
-
- /* Set global stuff. */
- SDL_memset(dest, 0, sizeof(FFEFFECT));
- dest->dwSize = sizeof(FFEFFECT); /* Set the structure size. */
- dest->dwSamplePeriod = 0; /* Not used by us. */
- dest->dwGain = 10000; /* Gain is set globally, not locally. */
- dest->dwFlags = FFEFF_OBJECTOFFSETS; /* Seems obligatory. */
-
- /* Envelope. */
- envelope = SDL_malloc(sizeof(FFENVELOPE));
- if (envelope == NULL) {
- SDL_OutOfMemory();
- return -1;
- }
- SDL_memset(envelope, 0, sizeof(FFENVELOPE));
- dest->lpEnvelope = envelope;
- envelope->dwSize = sizeof(FFENVELOPE); /* Always should be this. */
-
- /* Axes. */
- dest->cAxes = haptic->naxes;
- if (dest->cAxes > 0) {
- axes = SDL_malloc(sizeof(DWORD) * dest->cAxes);
- if (axes == NULL) {
- SDL_OutOfMemory();
- return -1;
- }
- axes[0] = haptic->hwdata->axes[0]; /* Always at least one axis. */
- if (dest->cAxes > 1) {
- axes[1] = haptic->hwdata->axes[1];
- }
- if (dest->cAxes > 2) {
- axes[2] = haptic->hwdata->axes[2];
- }
- dest->rgdwAxes = axes;
- }
-
-
- /* The big type handling switch, even bigger then linux's version. */
- switch (src->type) {
- case SDL_HAPTIC_CONSTANT:
- hap_constant = &src->constant;
- constant = SDL_malloc(sizeof(FFCONSTANTFORCE));
- if (constant == NULL) {
- SDL_OutOfMemory();
- return -1;
- }
- SDL_memset(constant, 0, sizeof(FFCONSTANTFORCE));
-
- /* Specifics */
- constant->lMagnitude = CONVERT(hap_constant->level);
- dest->cbTypeSpecificParams = sizeof(FFCONSTANTFORCE);
- dest->lpvTypeSpecificParams = constant;
-
- /* Generics */
- dest->dwDuration = hap_constant->length * 1000; /* In microseconds. */
- dest->dwTriggerButton = FFGetTriggerButton(hap_constant->button);
- dest->dwTriggerRepeatInterval = hap_constant->interval;
- dest->dwStartDelay = hap_constant->delay * 1000; /* In microseconds. */
-
- /* Direction. */
- if (SDL_SYS_SetDirection(dest, &hap_constant->direction, dest->cAxes)
- < 0) {
- return -1;
- }
-
- /* Envelope */
- if ((hap_constant->attack_length == 0)
- && (hap_constant->fade_length == 0)) {
- SDL_free(envelope);
- dest->lpEnvelope = NULL;
- } else {
- envelope->dwAttackLevel = CCONVERT(hap_constant->attack_level);
- envelope->dwAttackTime = hap_constant->attack_length * 1000;
- envelope->dwFadeLevel = CCONVERT(hap_constant->fade_level);
- envelope->dwFadeTime = hap_constant->fade_length * 1000;
- }
-
- break;
-
- case SDL_HAPTIC_SINE:
- case SDL_HAPTIC_SQUARE:
- case SDL_HAPTIC_TRIANGLE:
- case SDL_HAPTIC_SAWTOOTHUP:
- case SDL_HAPTIC_SAWTOOTHDOWN:
- hap_periodic = &src->periodic;
- periodic = SDL_malloc(sizeof(FFPERIODIC));
- if (periodic == NULL) {
- SDL_OutOfMemory();
- return -1;
- }
- SDL_memset(periodic, 0, sizeof(FFPERIODIC));
-
- /* Specifics */
- periodic->dwMagnitude = CONVERT(hap_periodic->magnitude);
- periodic->lOffset = CONVERT(hap_periodic->offset);
- periodic->dwPhase = hap_periodic->phase;
- periodic->dwPeriod = hap_periodic->period * 1000;
- dest->cbTypeSpecificParams = sizeof(FFPERIODIC);
- dest->lpvTypeSpecificParams = periodic;
-
- /* Generics */
- dest->dwDuration = hap_periodic->length * 1000; /* In microseconds. */
- dest->dwTriggerButton = FFGetTriggerButton(hap_periodic->button);
- dest->dwTriggerRepeatInterval = hap_periodic->interval;
- dest->dwStartDelay = hap_periodic->delay * 1000; /* In microseconds. */
-
- /* Direction. */
- if (SDL_SYS_SetDirection(dest, &hap_periodic->direction, dest->cAxes)
- < 0) {
- return -1;
- }
-
- /* Envelope */
- if ((hap_periodic->attack_length == 0)
- && (hap_periodic->fade_length == 0)) {
- SDL_free(envelope);
- dest->lpEnvelope = NULL;
- } else {
- envelope->dwAttackLevel = CCONVERT(hap_periodic->attack_level);
- envelope->dwAttackTime = hap_periodic->attack_length * 1000;
- envelope->dwFadeLevel = CCONVERT(hap_periodic->fade_level);
- envelope->dwFadeTime = hap_periodic->fade_length * 1000;
- }
-
- break;
-
- case SDL_HAPTIC_SPRING:
- case SDL_HAPTIC_DAMPER:
- case SDL_HAPTIC_INERTIA:
- case SDL_HAPTIC_FRICTION:
- hap_condition = &src->condition;
- condition = SDL_malloc(sizeof(FFCONDITION) * dest->cAxes);
- if (condition == NULL) {
- SDL_OutOfMemory();
- return -1;
- }
- SDL_memset(condition, 0, sizeof(FFCONDITION));
-
- /* Specifics */
- for (i = 0; i < dest->cAxes; i++) {
- condition[i].lOffset = CONVERT(hap_condition->center[i]);
- condition[i].lPositiveCoefficient =
- CONVERT(hap_condition->right_coeff[i]);
- condition[i].lNegativeCoefficient =
- CONVERT(hap_condition->left_coeff[i]);
- condition[i].dwPositiveSaturation =
- CCONVERT(hap_condition->right_sat[i]);
- condition[i].dwNegativeSaturation =
- CCONVERT(hap_condition->left_sat[i]);
- condition[i].lDeadBand = CCONVERT(hap_condition->deadband[i]);
- }
- dest->cbTypeSpecificParams = sizeof(FFCONDITION) * dest->cAxes;
- dest->lpvTypeSpecificParams = condition;
-
- /* Generics */
- dest->dwDuration = hap_condition->length * 1000; /* In microseconds. */
- dest->dwTriggerButton = FFGetTriggerButton(hap_condition->button);
- dest->dwTriggerRepeatInterval = hap_condition->interval;
- dest->dwStartDelay = hap_condition->delay * 1000; /* In microseconds. */
-
- /* Direction. */
- if (SDL_SYS_SetDirection(dest, &hap_condition->direction, dest->cAxes)
- < 0) {
- return -1;
- }
-
- /* Envelope - Not actually supported by most CONDITION implementations. */
- SDL_free(dest->lpEnvelope);
- dest->lpEnvelope = NULL;
-
- break;
-
- case SDL_HAPTIC_RAMP:
- hap_ramp = &src->ramp;
- ramp = SDL_malloc(sizeof(FFRAMPFORCE));
- if (ramp == NULL) {
- SDL_OutOfMemory();
- return -1;
- }
- SDL_memset(ramp, 0, sizeof(FFRAMPFORCE));
-
- /* Specifics */
- ramp->lStart = CONVERT(hap_ramp->start);
- ramp->lEnd = CONVERT(hap_ramp->end);
- dest->cbTypeSpecificParams = sizeof(FFRAMPFORCE);
- dest->lpvTypeSpecificParams = ramp;
-
- /* Generics */
- dest->dwDuration = hap_ramp->length * 1000; /* In microseconds. */
- dest->dwTriggerButton = FFGetTriggerButton(hap_ramp->button);
- dest->dwTriggerRepeatInterval = hap_ramp->interval;
- dest->dwStartDelay = hap_ramp->delay * 1000; /* In microseconds. */
-
- /* Direction. */
- if (SDL_SYS_SetDirection(dest, &hap_ramp->direction, dest->cAxes) < 0) {
- return -1;
- }
-
- /* Envelope */
- if ((hap_ramp->attack_length == 0) && (hap_ramp->fade_length == 0)) {
- SDL_free(envelope);
- dest->lpEnvelope = NULL;
- } else {
- envelope->dwAttackLevel = CCONVERT(hap_ramp->attack_level);
- envelope->dwAttackTime = hap_ramp->attack_length * 1000;
- envelope->dwFadeLevel = CCONVERT(hap_ramp->fade_level);
- envelope->dwFadeTime = hap_ramp->fade_length * 1000;
- }
-
- break;
-
- case SDL_HAPTIC_CUSTOM:
- hap_custom = &src->custom;
- custom = SDL_malloc(sizeof(FFCUSTOMFORCE));
- if (custom == NULL) {
- SDL_OutOfMemory();
- return -1;
- }
- SDL_memset(custom, 0, sizeof(FFCUSTOMFORCE));
-
- /* Specifics */
- custom->cChannels = hap_custom->channels;
- custom->dwSamplePeriod = hap_custom->period * 1000;
- custom->cSamples = hap_custom->samples;
- custom->rglForceData =
- SDL_malloc(sizeof(LONG) * custom->cSamples * custom->cChannels);
- for (i = 0; i < hap_custom->samples * hap_custom->channels; i++) { /* Copy data. */
- custom->rglForceData[i] = CCONVERT(hap_custom->data[i]);
- }
- dest->cbTypeSpecificParams = sizeof(FFCUSTOMFORCE);
- dest->lpvTypeSpecificParams = custom;
-
- /* Generics */
- dest->dwDuration = hap_custom->length * 1000; /* In microseconds. */
- dest->dwTriggerButton = FFGetTriggerButton(hap_custom->button);
- dest->dwTriggerRepeatInterval = hap_custom->interval;
- dest->dwStartDelay = hap_custom->delay * 1000; /* In microseconds. */
-
- /* Direction. */
- if (SDL_SYS_SetDirection(dest, &hap_custom->direction, dest->cAxes) <
- 0) {
- return -1;
- }
-
- /* Envelope */
- if ((hap_custom->attack_length == 0)
- && (hap_custom->fade_length == 0)) {
- SDL_free(envelope);
- dest->lpEnvelope = NULL;
- } else {
- envelope->dwAttackLevel = CCONVERT(hap_custom->attack_level);
- envelope->dwAttackTime = hap_custom->attack_length * 1000;
- envelope->dwFadeLevel = CCONVERT(hap_custom->fade_level);
- envelope->dwFadeTime = hap_custom->fade_length * 1000;
- }
-
- break;
-
-
- default:
- SDL_SetError("Haptic: Unknown effect type.");
- return -1;
- }
-
- return 0;
-}
-
-
-/*
- * Frees an FFEFFECT allocated by SDL_SYS_ToFFEFFECT.
- */
-static void
-SDL_SYS_HapticFreeFFEFFECT(FFEFFECT * effect, int type)
-{
- FFCUSTOMFORCE *custom;
-
- if (effect->lpEnvelope != NULL) {
- SDL_free(effect->lpEnvelope);
- effect->lpEnvelope = NULL;
- }
- if (effect->rgdwAxes != NULL) {
- SDL_free(effect->rgdwAxes);
- effect->rgdwAxes = NULL;
- }
- if (effect->lpvTypeSpecificParams != NULL) {
- if (type == SDL_HAPTIC_CUSTOM) { /* Must free the custom data. */
- custom = (FFCUSTOMFORCE *) effect->lpvTypeSpecificParams;
- SDL_free(custom->rglForceData);
- custom->rglForceData = NULL;
- }
- SDL_free(effect->lpvTypeSpecificParams);
- effect->lpvTypeSpecificParams = NULL;
- }
- if (effect->rglDirection != NULL) {
- SDL_free(effect->rglDirection);
- effect->rglDirection = NULL;
- }
-}
-
-
-/*
- * Gets the effect type from the generic SDL haptic effect wrapper.
- */
-CFUUIDRef
-SDL_SYS_HapticEffectType(Uint16 type)
-{
- switch (type) {
- case SDL_HAPTIC_CONSTANT:
- return kFFEffectType_ConstantForce_ID;
-
- case SDL_HAPTIC_RAMP:
- return kFFEffectType_RampForce_ID;
-
- case SDL_HAPTIC_SQUARE:
- return kFFEffectType_Square_ID;
-
- case SDL_HAPTIC_SINE:
- return kFFEffectType_Sine_ID;
-
- case SDL_HAPTIC_TRIANGLE:
- return kFFEffectType_Triangle_ID;
-
- case SDL_HAPTIC_SAWTOOTHUP:
- return kFFEffectType_SawtoothUp_ID;
-
- case SDL_HAPTIC_SAWTOOTHDOWN:
- return kFFEffectType_SawtoothDown_ID;
-
- case SDL_HAPTIC_SPRING:
- return kFFEffectType_Spring_ID;
-
- case SDL_HAPTIC_DAMPER:
- return kFFEffectType_Damper_ID;
-
- case SDL_HAPTIC_INERTIA:
- return kFFEffectType_Inertia_ID;
-
- case SDL_HAPTIC_FRICTION:
- return kFFEffectType_Friction_ID;
-
- case SDL_HAPTIC_CUSTOM:
- return kFFEffectType_CustomForce_ID;
-
- default:
- SDL_SetError("Haptic: Unknown effect type.");
- return NULL;
- }
-}
-
-
-/*
- * Creates a new haptic effect.
- */
-int
-SDL_SYS_HapticNewEffect(SDL_Haptic * haptic, struct haptic_effect *effect,
- SDL_HapticEffect * base)
-{
- HRESULT ret;
- CFUUIDRef type;
-
- /* Alloc the effect. */
- effect->hweffect = (struct haptic_hweffect *)
- SDL_malloc(sizeof(struct haptic_hweffect));
- if (effect->hweffect == NULL) {
- SDL_OutOfMemory();
- goto err_hweffect;
- }
-
- /* Get the type. */
- type = SDL_SYS_HapticEffectType(base->type);
- if (type == NULL) {
- goto err_hweffect;
- }
-
- /* Get the effect. */
- if (SDL_SYS_ToFFEFFECT(haptic, &effect->hweffect->effect, base) < 0) {
- goto err_effectdone;
- }
-
- /* Create the actual effect. */
- ret = FFDeviceCreateEffect(haptic->hwdata->device, type,
- &effect->hweffect->effect,
- &effect->hweffect->ref);
- if (ret != FF_OK) {
- SDL_SetError("Haptic: Unable to create effect: %s.", FFStrError(ret));
- goto err_effectdone;
- }
-
- return 0;
-
- err_effectdone:
- SDL_SYS_HapticFreeFFEFFECT(&effect->hweffect->effect, base->type);
- err_hweffect:
- if (effect->hweffect != NULL) {
- SDL_free(effect->hweffect);
- effect->hweffect = NULL;
- }
- return -1;
-}
-
-
-/*
- * Updates an effect.
- */
-int
-SDL_SYS_HapticUpdateEffect(SDL_Haptic * haptic,
- struct haptic_effect *effect,
- SDL_HapticEffect * data)
-{
- HRESULT ret;
- FFEffectParameterFlag flags;
- FFEFFECT temp;
-
- /* Get the effect. */
- SDL_memset(&temp, 0, sizeof(FFEFFECT));
- if (SDL_SYS_ToFFEFFECT(haptic, &temp, data) < 0) {
- goto err_update;
- }
-
- /* Set the flags. Might be worthwhile to diff temp with loaded effect and
- * only change those parameters. */
- flags = FFEP_DIRECTION |
- FFEP_DURATION |
- FFEP_ENVELOPE |
- FFEP_STARTDELAY |
- FFEP_TRIGGERBUTTON |
- FFEP_TRIGGERREPEATINTERVAL | FFEP_TYPESPECIFICPARAMS;
-
- /* Create the actual effect. */
- ret = FFEffectSetParameters(effect->hweffect->ref, &temp, flags);
- if (ret != FF_OK) {
- SDL_SetError("Haptic: Unable to update effect: %s.", FFStrError(ret));
- goto err_update;
- }
-
- /* Copy it over. */
- SDL_SYS_HapticFreeFFEFFECT(&effect->hweffect->effect, data->type);
- SDL_memcpy(&effect->hweffect->effect, &temp, sizeof(FFEFFECT));
-
- return 0;
-
- err_update:
- SDL_SYS_HapticFreeFFEFFECT(&temp, data->type);
- return -1;
-}
-
-
-/*
- * Runs an effect.
- */
-int
-SDL_SYS_HapticRunEffect(SDL_Haptic * haptic, struct haptic_effect *effect,
- Uint32 iterations)
-{
- HRESULT ret;
- Uint32 iter;
-
- /* Check if it's infinite. */
- if (iterations == SDL_HAPTIC_INFINITY) {
- iter = FF_INFINITE;
- } else
- iter = iterations;
-
- /* Run the effect. */
- ret = FFEffectStart(effect->hweffect->ref, iter, 0);
- if (ret != FF_OK) {
- SDL_SetError("Haptic: Unable to run the effect: %s.",
- FFStrError(ret));
- return -1;
- }
-
- return 0;
-}
-
-
-/*
- * Stops an effect.
- */
-int
-SDL_SYS_HapticStopEffect(SDL_Haptic * haptic, struct haptic_effect *effect)
-{
- HRESULT ret;
-
- ret = FFEffectStop(effect->hweffect->ref);
- if (ret != FF_OK) {
- SDL_SetError("Haptic: Unable to stop the effect: %s.",
- FFStrError(ret));
- return -1;
- }
-
- return 0;
-}
-
-
-/*
- * Frees the effect.
- */
-void
-SDL_SYS_HapticDestroyEffect(SDL_Haptic * haptic, struct haptic_effect *effect)
-{
- HRESULT ret;
-
- ret =
- FFDeviceReleaseEffect(haptic->hwdata->device, effect->hweffect->ref);
- if (ret != FF_OK) {
- SDL_SetError("Haptic: Error removing the effect from the device: %s.",
- FFStrError(ret));
- }
- SDL_SYS_HapticFreeFFEFFECT(&effect->hweffect->effect,
- effect->effect.type);
- SDL_free(effect->hweffect);
- effect->hweffect = NULL;
-}
-
-
-/*
- * Gets the status of a haptic effect.
- */
-int
-SDL_SYS_HapticGetEffectStatus(SDL_Haptic * haptic,
- struct haptic_effect *effect)
-{
- HRESULT ret;
- FFEffectStatusFlag status;
-
- ret = FFEffectGetEffectStatus(effect->hweffect->ref, &status);
- if (ret != FF_OK) {
- SDL_SetError("Haptic: Unable to get effect status: %s.",
- FFStrError(ret));
- return -1;
- }
-
- if (status == 0)
- return SDL_FALSE;
- return SDL_TRUE; /* Assume it's playing or emulated. */
-}
-
-
-/*
- * Sets the gain.
- */
-int
-SDL_SYS_HapticSetGain(SDL_Haptic * haptic, int gain)
-{
- HRESULT ret;
- Uint32 val;
-
- val = gain * 100; /* Mac OS X uses 0 to 10,000 */
- ret =
- FFDeviceSetForceFeedbackProperty(haptic->hwdata->device,
- FFPROP_FFGAIN, &val);
- if (ret != FF_OK) {
- SDL_SetError("Haptic: Error setting gain: %s.", FFStrError(ret));
- return -1;
- }
-
- return 0;
-}
-
-
-/*
- * Sets the autocentering.
- */
-int
-SDL_SYS_HapticSetAutocenter(SDL_Haptic * haptic, int autocenter)
-{
- HRESULT ret;
- Uint32 val;
-
- /* Mac OS X only has 0 (off) and 1 (on) */
- if (autocenter == 0)
- val = 0;
- else
- val = 1;
-
- ret = FFDeviceSetForceFeedbackProperty(haptic->hwdata->device,
- FFPROP_AUTOCENTER, &val);
- if (ret != FF_OK) {
- SDL_SetError("Haptic: Error setting autocenter: %s.",
- FFStrError(ret));
- return -1;
- }
-
- return 0;
-}
-
-
-/*
- * Pauses the device.
- */
-int
-SDL_SYS_HapticPause(SDL_Haptic * haptic)
-{
- HRESULT ret;
-
- ret = FFDeviceSendForceFeedbackCommand(haptic->hwdata->device,
- FFSFFC_PAUSE);
- if (ret != FF_OK) {
- SDL_SetError("Haptic: Error pausing device: %s.", FFStrError(ret));
- return -1;
- }
-
- return 0;
-}
-
-
-/*
- * Unpauses the device.
- */
-int
-SDL_SYS_HapticUnpause(SDL_Haptic * haptic)
-{
- HRESULT ret;
-
- ret = FFDeviceSendForceFeedbackCommand(haptic->hwdata->device,
- FFSFFC_CONTINUE);
- if (ret != FF_OK) {
- SDL_SetError("Haptic: Error pausing device: %s.", FFStrError(ret));
- return -1;
- }
-
- return 0;
-}
-
-
-/*
- * Stops all currently playing effects.
- */
-int
-SDL_SYS_HapticStopAll(SDL_Haptic * haptic)
-{
- HRESULT ret;
-
- ret = FFDeviceSendForceFeedbackCommand(haptic->hwdata->device,
- FFSFFC_STOPALL);
- if (ret != FF_OK) {
- SDL_SetError("Haptic: Error stopping device: %s.", FFStrError(ret));
- return -1;
- }
-
- return 0;
-}
-
-
-#endif /* SDL_HAPTIC_IOKIT */

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/SDL/src/joystick Deleted

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/SDL/src/joystick/SDL_joystick.c Deleted

@@ -1,503 +0,0 @@
-/*
- SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2010 Sam Lantinga
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- Sam Lantinga
- slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-/* This is the joystick API for Simple DirectMedia Layer */
-#include "SDL.h"
-#include "SDL_sysjoystick.h"
-#include "SDL_joystick_c.h"
-
-/* This is used for Quake III Arena */
-#define SDL_Lock_EventThread()
-#define SDL_Unlock_EventThread()
-
-Uint8 SDL_numjoysticks = 0;
-SDL_Joystick **SDL_joysticks = NULL;
-static SDL_Joystick *default_joystick = NULL;
-
-int
-SDL_JoystickInit(void)
-{
- int arraylen;
- int status;
-
- SDL_numjoysticks = 0;
- status = SDL_SYS_JoystickInit();
- if (status >= 0) {
- arraylen = (status + 1) * sizeof(*SDL_joysticks);
- SDL_joysticks = (SDL_Joystick **) SDL_malloc(arraylen);
- if (SDL_joysticks == NULL) {
- SDL_numjoysticks = 0;
- } else {
- SDL_memset(SDL_joysticks, 0, arraylen);
- SDL_numjoysticks = status;
- }
- status = 0;
- }
- default_joystick = NULL;
- return (status);
-}
-
-/*
- * Count the number of joysticks attached to the system
- */
-int
-SDL_NumJoysticks(void)
-{
- return SDL_numjoysticks;
-}
-
-/*
- * Get the implementation dependent name of a joystick
- */
-const char *
-SDL_JoystickName(int device_index)
-{
- if ((device_index < 0) || (device_index >= SDL_numjoysticks)) {
- SDL_SetError("There are %d joysticks available", SDL_numjoysticks);
- return (NULL);
- }
- return (SDL_SYS_JoystickName(device_index));
-}
-
-/*
- * Open a joystick for use - the index passed as an argument refers to
- * the N'th joystick on the system. This index is the value which will
- * identify this joystick in future joystick events.
- *
- * This function returns a joystick identifier, or NULL if an error occurred.
- */
-SDL_Joystick *
-SDL_JoystickOpen(int device_index)
-{
- int i;
- SDL_Joystick *joystick;
-
- if ((device_index < 0) || (device_index >= SDL_numjoysticks)) {
- SDL_SetError("There are %d joysticks available", SDL_numjoysticks);
- return (NULL);
- }
-
- /* If the joystick is already open, return it */
- for (i = 0; SDL_joysticks[i]; ++i) {
- if (device_index == SDL_joysticks[i]->index) {
- joystick = SDL_joysticks[i];
- ++joystick->ref_count;
- return (joystick);
- }
- }
-
- /* Create and initialize the joystick */
- joystick = (SDL_Joystick *) SDL_malloc((sizeof *joystick));
- if (joystick == NULL) {
- SDL_OutOfMemory();
- return NULL;
- }
-
- SDL_memset(joystick, 0, (sizeof *joystick));
- joystick->index = device_index;
- if (SDL_SYS_JoystickOpen(joystick) < 0) {
- SDL_free(joystick);
- return NULL;
- }
- if (joystick->naxes > 0) {
- joystick->axes = (Sint16 *) SDL_malloc
- (joystick->naxes * sizeof(Sint16));
- }
- if (joystick->nhats > 0) {
- joystick->hats = (Uint8 *) SDL_malloc
- (joystick->nhats * sizeof(Uint8));
- }
- if (joystick->nballs > 0) {
- joystick->balls = (struct balldelta *) SDL_malloc
- (joystick->nballs * sizeof(*joystick->balls));
- }
- if (joystick->nbuttons > 0) {
- joystick->buttons = (Uint8 *) SDL_malloc
- (joystick->nbuttons * sizeof(Uint8));
- }
- if (((joystick->naxes > 0) && !joystick->axes)
- || ((joystick->nhats > 0) && !joystick->hats)
- || ((joystick->nballs > 0) && !joystick->balls)
- || ((joystick->nbuttons > 0) && !joystick->buttons)) {
- SDL_OutOfMemory();
- SDL_JoystickClose(joystick);
- return NULL;
- }
- if (joystick->axes) {
- SDL_memset(joystick->axes, 0, joystick->naxes * sizeof(Sint16));
- }
- if (joystick->hats) {
- SDL_memset(joystick->hats, 0, joystick->nhats * sizeof(Uint8));
- }
- if (joystick->balls) {
- SDL_memset(joystick->balls, 0,
- joystick->nballs * sizeof(*joystick->balls));
- }
- if (joystick->buttons) {
- SDL_memset(joystick->buttons, 0, joystick->nbuttons * sizeof(Uint8));
- }
-
- /* Add joystick to list */
- ++joystick->ref_count;
- SDL_Lock_EventThread();
- for (i = 0; SDL_joysticks[i]; ++i)
- /* Skip to next joystick */ ;
- SDL_joysticks[i] = joystick;
- SDL_Unlock_EventThread();
-
- return (joystick);
-}
-
-/*
- * Returns 1 if the joystick has been opened, or 0 if it has not.
- */
-int
-SDL_JoystickOpened(int device_index)
-{
- int i, opened;
-
- opened = 0;
- for (i = 0; SDL_joysticks[i]; ++i) {
- if (SDL_joysticks[i]->index == (Uint8) device_index) {
- opened = 1;
- break;
- }
- }
- return (opened);
-}
-
-
-/*
- * Checks to make sure the joystick is valid.
- */
-int
-SDL_PrivateJoystickValid(SDL_Joystick ** joystick)
-{
- int valid;
-
- if (*joystick == NULL) {
- *joystick = default_joystick;
- }
- if (*joystick == NULL) {
- SDL_SetError("Joystick hasn't been opened yet");
- valid = 0;
- } else {
- valid = 1;
- }
- return valid;
-}
-
-/*
- * Get the device index of an opened joystick.
- */
-int
-SDL_JoystickIndex(SDL_Joystick * joystick)
-{
- if (!SDL_PrivateJoystickValid(&joystick)) {
- return (-1);
- }
- return (joystick->index);
-}
-
-/*
- * Get the number of multi-dimensional axis controls on a joystick
- */
-int
-SDL_JoystickNumAxes(SDL_Joystick * joystick)
-{
- if (!SDL_PrivateJoystickValid(&joystick)) {
- return (-1);
- }
- return (joystick->naxes);
-}
-
-/*
- * Get the number of hats on a joystick
- */
-int
-SDL_JoystickNumHats(SDL_Joystick * joystick)
-{
- if (!SDL_PrivateJoystickValid(&joystick)) {
- return (-1);
- }
- return (joystick->nhats);
-}
-
-/*
- * Get the number of trackballs on a joystick
- */
-int
-SDL_JoystickNumBalls(SDL_Joystick * joystick)
-{
- if (!SDL_PrivateJoystickValid(&joystick)) {
- return (-1);
- }
- return (joystick->nballs);
-}
-
-/*
- * Get the number of buttons on a joystick
- */
-int
-SDL_JoystickNumButtons(SDL_Joystick * joystick)
-{
- if (!SDL_PrivateJoystickValid(&joystick)) {
- return (-1);
- }
- return (joystick->nbuttons);
-}
-
-/*
- * Get the current state of an axis control on a joystick
- */
-Sint16
-SDL_JoystickGetAxis(SDL_Joystick * joystick, int axis)
-{
- Sint16 state;
-
- if (!SDL_PrivateJoystickValid(&joystick)) {
- return (0);
- }
- if (axis < joystick->naxes) {
- state = joystick->axes[axis];
- } else {
- SDL_SetError("Joystick only has %d axes", joystick->naxes);
- state = 0;
- }
- return (state);
-}
-
-/*
- * Get the current state of a hat on a joystick
- */
-Uint8
-SDL_JoystickGetHat(SDL_Joystick * joystick, int hat)
-{
- Uint8 state;
-
- if (!SDL_PrivateJoystickValid(&joystick)) {
- return (0);
- }
- if (hat < joystick->nhats) {
- state = joystick->hats[hat];
- } else {
- SDL_SetError("Joystick only has %d hats", joystick->nhats);
- state = 0;
- }
- return (state);
-}
-
-/*
- * Get the ball axis change since the last poll
- */
-int
-SDL_JoystickGetBall(SDL_Joystick * joystick, int ball, int *dx, int *dy)
-{
- int retval;
-
- if (!SDL_PrivateJoystickValid(&joystick)) {
- return (-1);
- }
-
- retval = 0;
- if (ball < joystick->nballs) {
- if (dx) {
- *dx = joystick->balls[ball].dx;
- }
- if (dy) {
- *dy = joystick->balls[ball].dy;
- }
- joystick->balls[ball].dx = 0;
- joystick->balls[ball].dy = 0;
- } else {
- SDL_SetError("Joystick only has %d balls", joystick->nballs);
- retval = -1;
- }
- return (retval);
-}
-
-/*
- * Get the current state of a button on a joystick
- */
-Uint8
-SDL_JoystickGetButton(SDL_Joystick * joystick, int button)
-{
- Uint8 state;
-
- if (!SDL_PrivateJoystickValid(&joystick)) {
- return (0);
- }
- if (button < joystick->nbuttons) {
- state = joystick->buttons[button];
- } else {
- SDL_SetError("Joystick only has %d buttons", joystick->nbuttons);
- state = 0;
- }
- return (state);
-}
-
-/*
- * Close a joystick previously opened with SDL_JoystickOpen()
- */
-void
-SDL_JoystickClose(SDL_Joystick * joystick)
-{
- int i;
-
- if (!SDL_PrivateJoystickValid(&joystick)) {
- return;
- }
-
- /* First decrement ref count */
- if (--joystick->ref_count > 0) {
- return;
- }
-
- /* Lock the event queue - prevent joystick polling */
- SDL_Lock_EventThread();
-
- if (joystick == default_joystick) {
- default_joystick = NULL;
- }
- SDL_SYS_JoystickClose(joystick);
-
- /* Remove joystick from list */
- for (i = 0; SDL_joysticks[i]; ++i) {
- if (joystick == SDL_joysticks[i]) {
- SDL_memmove(&SDL_joysticks[i], &SDL_joysticks[i + 1],
- (SDL_numjoysticks - i) * sizeof(joystick));
- break;
- }
- }
-
- /* Let the event thread keep running */
- SDL_Unlock_EventThread();
-
- /* Free the data associated with this joystick */
- if (joystick->axes) {
- SDL_free(joystick->axes);
- }
- if (joystick->hats) {
- SDL_free(joystick->hats);
- }
- if (joystick->balls) {
- SDL_free(joystick->balls);
- }
- if (joystick->buttons) {
- SDL_free(joystick->buttons);
- }
- SDL_free(joystick);
-}
-
-void
-SDL_JoystickQuit(void)
-{
- /* Stop the event polling */
- SDL_Lock_EventThread();
- SDL_numjoysticks = 0;
- SDL_Unlock_EventThread();
-
- /* Quit the joystick setup */
- SDL_SYS_JoystickQuit();
- if (SDL_joysticks) {
- SDL_free(SDL_joysticks);
- SDL_joysticks = NULL;
- }
-}
-
-
-/* These are global for SDL_sysjoystick.c and SDL_events.c */
-
-int
-SDL_PrivateJoystickAxis(SDL_Joystick * joystick, Uint8 axis, Sint16 value)
-{
- int posted;
-
- /* Update internal joystick state */
- joystick->axes[axis] = value;
-
- /* Post the event, if desired */
- posted = 0;
-
- return (posted);
-}
-
-int
-SDL_PrivateJoystickHat(SDL_Joystick * joystick, Uint8 hat, Uint8 value)
-{
- int posted;
-
- /* Update internal joystick state */
- joystick->hats[hat] = value;
-
- /* Post the event, if desired */
- posted = 0;
-
- return (posted);
-}
-
-int
-SDL_PrivateJoystickBall(SDL_Joystick * joystick, Uint8 ball,
- Sint16 xrel, Sint16 yrel)
-{
- int posted;
-
- /* Update internal mouse state */
- joystick->balls[ball].dx += xrel;
- joystick->balls[ball].dy += yrel;
-
- /* Post the event, if desired */
- posted = 0;
-
- return (posted);
-}
-
-int
-SDL_PrivateJoystickButton(SDL_Joystick * joystick, Uint8 button, Uint8 state)
-{
- int posted;
-
- /* Update internal joystick state */
- joystick->buttons[button] = state;
-
- /* Post the event, if desired */
- posted = 0;
-
- return (posted);
-}
-
-void
-SDL_JoystickUpdate(void)
-{
- int i;
-
- for (i = 0; SDL_joysticks[i]; ++i) {
- SDL_SYS_JoystickUpdate(SDL_joysticks[i]);
- }
-}
-
-int
-SDL_JoystickEventState(int state)
-{
- return SDL_IGNORE;
-}

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/SDL/src/joystick/SDL_joystick_c.h Deleted

@@ -1,47 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2010 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-/* Useful functions and variables from SDL_joystick.c */
-#include "SDL_joystick.h"
-
-/* The number of available joysticks on the system */
-extern Uint8 SDL_numjoysticks;
-
-/* Initialization and shutdown functions */
-extern int SDL_JoystickInit(void);
-extern void SDL_JoystickQuit(void);
-
-/* Internal event queueing functions */
-extern int SDL_PrivateJoystickAxis(SDL_Joystick * joystick,
-                                   Uint8 axis, Sint16 value);
-extern int SDL_PrivateJoystickBall(SDL_Joystick * joystick,
-                                   Uint8 ball, Sint16 xrel, Sint16 yrel);
-extern int SDL_PrivateJoystickHat(SDL_Joystick * joystick,
-                                  Uint8 hat, Uint8 value);
-extern int SDL_PrivateJoystickButton(SDL_Joystick * joystick,
-                                     Uint8 button, Uint8 state);
-
-/* Internal sanity checking functions */
-extern int SDL_PrivateJoystickValid(SDL_Joystick ** joystick);
-
-/* vi: set ts=4 sw=4 expandtab: */

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/SDL/src/joystick/SDL_sysjoystick.h Deleted

@@ -1,85 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2010 Sam Lantinga
-
-    This library is SDL_free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-/* This is the system specific header for the SDL joystick API */
-
-#include "SDL_joystick.h"
-
-/* The SDL joystick structure */
-struct _SDL_Joystick
-{
-    Uint8 index;                /* Device index */
-    const char *name;           /* Joystick name - system dependent */
-
-    int naxes;                  /* Number of axis controls on the joystick */
-    Sint16 *axes;               /* Current axis states */
-
-    int nhats;                  /* Number of hats on the joystick */
-    Uint8 *hats;                /* Current hat states */
-
-    int nballs;                 /* Number of trackballs on the joystick */
-    struct balldelta
-    {
-        int dx;
-        int dy;
-    } *balls;                   /* Current ball motion deltas */
-
-    int nbuttons;               /* Number of buttons on the joystick */
-    Uint8 *buttons;             /* Current button states */
-
-    struct joystick_hwdata *hwdata;     /* Driver dependent information */
-
-    int ref_count;              /* Reference count for multiple opens */
-};
-
-/* Function to scan the system for joysticks.
- * Joystick 0 should be the system default joystick.
- * This function should return the number of available joysticks, or -1
- * on an unrecoverable fatal error.
- */
-extern int SDL_SYS_JoystickInit(void);
-
-/* Function to get the device-dependent name of a joystick */
-extern const char *SDL_SYS_JoystickName(int index);
-
-/* Function to open a joystick for use.
-   The joystick to open is specified by the index field of the joystick.
-   This should fill the nbuttons and naxes fields of the joystick structure.
-   It returns 0, or -1 if there is an error.
- */
-extern int SDL_SYS_JoystickOpen(SDL_Joystick * joystick);
-
-/* Function to update the state of a joystick - called as a device poll.
- * This function shouldn't update the joystick structure directly,
- * but instead should call SDL_PrivateJoystick*() to deliver events
- * and update joystick device state.
- */
-extern void SDL_SYS_JoystickUpdate(SDL_Joystick * joystick);
-
-/* Function to close a joystick after use */
-extern void SDL_SYS_JoystickClose(SDL_Joystick * joystick);
-
-/* Function to perform any system-specific joystick related cleanup */
-extern void SDL_SYS_JoystickQuit(void);
-
-/* vi: set ts=4 sw=4 expandtab: */

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/SDL/src/joystick/darwin Deleted

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/SDL/src/joystick/darwin/SDL_sysjoystick.c Deleted

@@ -1,847 +0,0 @@
-/*
- SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2010 Sam Lantinga
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- Sam Lantinga
- slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-#ifdef SDL_JOYSTICK_IOKIT
-
-/* SDL joystick driver for Darwin / Mac OS X, based on the IOKit HID API */
-/* Written 2001 by Max Horn */
-
-#include <unistd.h>
-#include <ctype.h>
-#include <sysexits.h>
-#include <mach/mach.h>
-#include <mach/mach_error.h>
-#include <IOKit/IOKitLib.h>
-#include <IOKit/IOCFPlugIn.h>
-#ifdef MACOS_10_0_4
-#include <IOKit/hidsystem/IOHIDUsageTables.h>
-#else
-/* The header was moved here in Mac OS X 10.1 */
-#include <Kernel/IOKit/hidsystem/IOHIDUsageTables.h>
-#endif
-#include <IOKit/hid/IOHIDLib.h>
-#include <IOKit/hid/IOHIDKeys.h>
-#include <CoreFoundation/CoreFoundation.h>
-#include <Carbon/Carbon.h> /* for NewPtrClear, DisposePtr */
-
-/* For force feedback testing. */
-#include <ForceFeedback/ForceFeedback.h>
-#include <ForceFeedback/ForceFeedbackConstants.h>
-
-#include "SDL_joystick.h"
-#include "../SDL_sysjoystick.h"
-#include "../SDL_joystick_c.h"
-#include "SDL_sysjoystick_c.h"
-
-
-/* Linked list of all available devices */
-static recDevice *gpDeviceList = NULL;
-
-
-static void
-HIDReportErrorNum(char *strError, long numError)
-{
- SDL_SetError(strError);
-}
-
-static void HIDGetCollectionElements(CFMutableDictionaryRef deviceProperties,
- recDevice * pDevice);
-
-/* returns current value for element, polling element
- * will return 0 on error conditions which should be accounted for by application
- */
-
-static SInt32
-HIDGetElementValue(recDevice * pDevice, recElement * pElement)
-{
- IOReturn result = kIOReturnSuccess;
- IOHIDEventStruct hidEvent;
- hidEvent.value = 0;
-
- if (NULL != pDevice && NULL != pElement && NULL != pDevice->interface) {
- result =
- (*(pDevice->interface))->getElementValue(pDevice->interface,
- pElement->cookie,
- &hidEvent);
- if (kIOReturnSuccess == result) {
- /* record min and max for auto calibration */
- if (hidEvent.value < pElement->minReport)
- pElement->minReport = hidEvent.value;
- if (hidEvent.value > pElement->maxReport)
- pElement->maxReport = hidEvent.value;
- }
- }
-
- /* auto user scale */
- return hidEvent.value;
-}
-
-static SInt32
-HIDScaledCalibratedValue(recDevice * pDevice, recElement * pElement,
- long min, long max)
-{
- float deviceScale = max - min;
- float readScale = pElement->maxReport - pElement->minReport;
- SInt32 value = HIDGetElementValue(pDevice, pElement);
- if (readScale == 0)
- return value; /* no scaling at all */
- else
- return ((value - pElement->minReport) * deviceScale / readScale) +
- min;
-}
-
-
-static void
-HIDRemovalCallback(void *target, IOReturn result, void *refcon, void *sender)
-{
- recDevice *device = (recDevice *) refcon;
- device->removed = 1;
- device->uncentered = 1;
-}
-
-
-
-/* Create and open an interface to device, required prior to extracting values or building queues.
- * Note: appliction now owns the device and must close and release it prior to exiting
- */
-
-static IOReturn
-HIDCreateOpenDeviceInterface(io_object_t hidDevice, recDevice * pDevice)
-{
- IOReturn result = kIOReturnSuccess;
- HRESULT plugInResult = S_OK;
- SInt32 score = 0;
- IOCFPlugInInterface **ppPlugInInterface = NULL;
-
- if (NULL == pDevice->interface) {
- result =
- IOCreatePlugInInterfaceForService(hidDevice,
- kIOHIDDeviceUserClientTypeID,
- kIOCFPlugInInterfaceID,
- &ppPlugInInterface, &score);
- if (kIOReturnSuccess == result) {
- /* Call a method of the intermediate plug-in to create the device interface */
- plugInResult =
- (*ppPlugInInterface)->QueryInterface(ppPlugInInterface,
- CFUUIDGetUUIDBytes
- (kIOHIDDeviceInterfaceID),
- (void *)
- &(pDevice->interface));
- if (S_OK != plugInResult)
- HIDReportErrorNum
- ("CouldnÕt query HID class device interface from plugInInterface",
- plugInResult);
- (*ppPlugInInterface)->Release(ppPlugInInterface);
- } else
- HIDReportErrorNum
- ("Failed to create **plugInInterface via IOCreatePlugInInterfaceForService.",
- result);
- }
- if (NULL != pDevice->interface) {
- result = (*(pDevice->interface))->open(pDevice->interface, 0);
- if (kIOReturnSuccess != result)
- HIDReportErrorNum
- ("Failed to open pDevice->interface via open.", result);
- else
- (*(pDevice->interface))->setRemovalCallback(pDevice->interface,
- HIDRemovalCallback,
- pDevice, pDevice);
-
- }
- return result;
-}
-
-/* Closes and releases interface to device, should be done prior to exting application
- * Note: will have no affect if device or interface do not exist
- * application will "own" the device if interface is not closed
- * (device may have to be plug and re-plugged in different location to get it working again without a restart)
- */
-
-static IOReturn
-HIDCloseReleaseInterface(recDevice * pDevice)
-{
- IOReturn result = kIOReturnSuccess;
-
- if ((NULL != pDevice) && (NULL != pDevice->interface)) {
- /* close the interface */
- result = (*(pDevice->interface))->close(pDevice->interface);
- if (kIOReturnNotOpen == result) {
- /* do nothing as device was not opened, thus can't be closed */
- } else if (kIOReturnSuccess != result)
- HIDReportErrorNum("Failed to close IOHIDDeviceInterface.",
- result);
- /* release the interface */
- result = (*(pDevice->interface))->Release(pDevice->interface);
- if (kIOReturnSuccess != result)
- HIDReportErrorNum("Failed to release IOHIDDeviceInterface.",
- result);
- pDevice->interface = NULL;
- }
- return result;
-}
-
-/* extracts actual specific element information from each element CF dictionary entry */
-
-static void
-HIDGetElementInfo(CFTypeRef refElement, recElement * pElement)
-{
- long number;
- CFTypeRef refType;
-
- refType = CFDictionaryGetValue(refElement, CFSTR(kIOHIDElementCookieKey));
- if (refType && CFNumberGetValue(refType, kCFNumberLongType, &number))
- pElement->cookie = (IOHIDElementCookie) number;
- refType = CFDictionaryGetValue(refElement, CFSTR(kIOHIDElementMinKey));
- if (refType && CFNumberGetValue(refType, kCFNumberLongType, &number))
- pElement->minReport = pElement->min = number;
- pElement->maxReport = pElement->min;
- refType = CFDictionaryGetValue(refElement, CFSTR(kIOHIDElementMaxKey));
- if (refType && CFNumberGetValue(refType, kCFNumberLongType, &number))
- pElement->maxReport = pElement->max = number;
-/*
-	TODO: maybe should handle the following stuff somehow?
-
-	refType = CFDictionaryGetValue (refElement, CFSTR(kIOHIDElementScaledMinKey));
-	if (refType && CFNumberGetValue (refType, kCFNumberLongType, &number))
-		pElement->scaledMin = number;
-	refType = CFDictionaryGetValue (refElement, CFSTR(kIOHIDElementScaledMaxKey));
-	if (refType && CFNumberGetValue (refType, kCFNumberLongType, &number))
-		pElement->scaledMax = number;
-	refType = CFDictionaryGetValue (refElement, CFSTR(kIOHIDElementSizeKey));
-	if (refType && CFNumberGetValue (refType, kCFNumberLongType, &number))
-		pElement->size = number;
-	refType = CFDictionaryGetValue (refElement, CFSTR(kIOHIDElementIsRelativeKey));
-	if (refType)
-		pElement->relative = CFBooleanGetValue (refType);
-	refType = CFDictionaryGetValue (refElement, CFSTR(kIOHIDElementIsWrappingKey));
-	if (refType)
-		pElement->wrapping = CFBooleanGetValue (refType);
-	refType = CFDictionaryGetValue (refElement, CFSTR(kIOHIDElementIsNonLinearKey));
-	if (refType)
-		pElement->nonLinear = CFBooleanGetValue (refType);
-	refType = CFDictionaryGetValue (refElement, CFSTR(kIOHIDElementHasPreferedStateKey));
-	if (refType)
-		pElement->preferredState = CFBooleanGetValue (refType);
-	refType = CFDictionaryGetValue (refElement, CFSTR(kIOHIDElementHasNullStateKey));
-	if (refType)
-		pElement->nullState = CFBooleanGetValue (refType);
-*/
-}
-
-/* examines CF dictionary vlaue in device element hierarchy to determine if it is element of interest or a collection of more elements
- * if element of interest allocate storage, add to list and retrieve element specific info
- * if collection then pass on to deconstruction collection into additional individual elements
- */
-
-static void
-HIDAddElement(CFTypeRef refElement, recDevice * pDevice)
-{
- recElement *element = NULL;
- recElement **headElement = NULL;
- long elementType, usagePage, usage;
- CFTypeRef refElementType =
- CFDictionaryGetValue(refElement, CFSTR(kIOHIDElementTypeKey));
- CFTypeRef refUsagePage =
- CFDictionaryGetValue(refElement, CFSTR(kIOHIDElementUsagePageKey));
- CFTypeRef refUsage =
- CFDictionaryGetValue(refElement, CFSTR(kIOHIDElementUsageKey));
-
-
- if ((refElementType)
- &&
- (CFNumberGetValue(refElementType, kCFNumberLongType, &elementType))) {
- /* look at types of interest */
- if ((elementType == kIOHIDElementTypeInput_Misc)
- || (elementType == kIOHIDElementTypeInput_Button)
- || (elementType == kIOHIDElementTypeInput_Axis)) {
- if (refUsagePage
- && CFNumberGetValue(refUsagePage, kCFNumberLongType,
- &usagePage) && refUsage
- && CFNumberGetValue(refUsage, kCFNumberLongType, &usage)) {
- switch (usagePage) { /* only interested in kHIDPage_GenericDesktop and kHIDPage_Button */
- case kHIDPage_GenericDesktop:
- {
- switch (usage) { /* look at usage to determine function */
- case kHIDUsage_GD_X:
- case kHIDUsage_GD_Y:
- case kHIDUsage_GD_Z:
- case kHIDUsage_GD_Rx:
- case kHIDUsage_GD_Ry:
- case kHIDUsage_GD_Rz:
- case kHIDUsage_GD_Slider:
- case kHIDUsage_GD_Dial:
- case kHIDUsage_GD_Wheel:
- element = (recElement *)
- NewPtrClear(sizeof(recElement));
- if (element) {
- pDevice->axes++;
- headElement = &(pDevice->firstAxis);
- }
- break;
- case kHIDUsage_GD_Hatswitch:
- element = (recElement *)
- NewPtrClear(sizeof(recElement));
- if (element) {
- pDevice->hats++;
- headElement = &(pDevice->firstHat);
- }
- break;
- }
- }
- break;
- case kHIDPage_Button:
- element = (recElement *)
- NewPtrClear(sizeof(recElement));
- if (element) {
- pDevice->buttons++;
- headElement = &(pDevice->firstButton);
- }
- break;
- default:
- break;
- }
- }
- } else if (kIOHIDElementTypeCollection == elementType)
- HIDGetCollectionElements((CFMutableDictionaryRef) refElement,
- pDevice);
- }
-
- if (element && headElement) { /* add to list */
- recElement *elementPrevious = NULL;
- recElement *elementCurrent = *headElement;
- while (elementCurrent && usage >= elementCurrent->usage) {
- elementPrevious = elementCurrent;
- elementCurrent = elementCurrent->pNext;
- }
- if (elementPrevious) {
- elementPrevious->pNext = element;
- } else {
- *headElement = element;
- }
- element->usagePage = usagePage;
- element->usage = usage;
- element->pNext = elementCurrent;
- HIDGetElementInfo(refElement, element);
- pDevice->elements++;
- }
-}
-
-/* collects information from each array member in device element list (each array memeber = element) */
-
-static void
-HIDGetElementsCFArrayHandler(const void *value, void *parameter)
-{
- if (CFGetTypeID(value) == CFDictionaryGetTypeID())
- HIDAddElement((CFTypeRef) value, (recDevice *) parameter);
-}
-
-/* handles retrieval of element information from arrays of elements in device IO registry information */
-
-static void
-HIDGetElements(CFTypeRef refElementCurrent, recDevice * pDevice)
-{
- CFTypeID type = CFGetTypeID(refElementCurrent);
- if (type == CFArrayGetTypeID()) { /* if element is an array */
- CFRange range = { 0, CFArrayGetCount(refElementCurrent) };
- /* CountElementsCFArrayHandler called for each array member */
- CFArrayApplyFunction(refElementCurrent, range,
- HIDGetElementsCFArrayHandler, pDevice);
- }
-}
-
-/* handles extracting element information from element collection CF types
- * used from top level element decoding and hierarchy deconstruction to flatten device element list
- */
-
-static void
-HIDGetCollectionElements(CFMutableDictionaryRef deviceProperties,
- recDevice * pDevice)
-{
- CFTypeRef refElementTop =
- CFDictionaryGetValue(deviceProperties, CFSTR(kIOHIDElementKey));
- if (refElementTop)
- HIDGetElements(refElementTop, pDevice);
-}
-
-/* use top level element usage page and usage to discern device usage page and usage setting appropriate vlaues in device record */
-
-static void
-HIDTopLevelElementHandler(const void *value, void *parameter)
-{
- CFTypeRef refCF = 0;
- if (CFGetTypeID(value) != CFDictionaryGetTypeID())
- return;
- refCF = CFDictionaryGetValue(value, CFSTR(kIOHIDElementUsagePageKey));
- if (!CFNumberGetValue
- (refCF, kCFNumberLongType, &((recDevice *) parameter)->usagePage))
- SDL_SetError("CFNumberGetValue error retrieving pDevice->usagePage.");
- refCF = CFDictionaryGetValue(value, CFSTR(kIOHIDElementUsageKey));
- if (!CFNumberGetValue
- (refCF, kCFNumberLongType, &((recDevice *) parameter)->usage))
- SDL_SetError("CFNumberGetValue error retrieving pDevice->usage.");
-}
-
-/* extracts device info from CF dictionary records in IO registry */
-
-static void
-HIDGetDeviceInfo(io_object_t hidDevice, CFMutableDictionaryRef hidProperties,
- recDevice * pDevice)
-{
- CFMutableDictionaryRef usbProperties = 0;
- io_registry_entry_t parent1, parent2;
-
- /* Mac OS X currently is not mirroring all USB properties to HID page so need to look at USB device page also
- * get dictionary for usb properties: step up two levels and get CF dictionary for USB properties
- */
- if ((KERN_SUCCESS ==
- IORegistryEntryGetParentEntry(hidDevice, kIOServicePlane, &parent1))
- && (KERN_SUCCESS ==
- IORegistryEntryGetParentEntry(parent1, kIOServicePlane, &parent2))
- && (KERN_SUCCESS ==
- IORegistryEntryCreateCFProperties(parent2, &usbProperties,
- kCFAllocatorDefault,
- kNilOptions))) {
- if (usbProperties) {
- CFTypeRef refCF = 0;
- /* get device info
- * try hid dictionary first, if fail then go to usb dictionary
- */
-
-
- /* get product name */
- refCF =
- CFDictionaryGetValue(hidProperties, CFSTR(kIOHIDProductKey));
- if (!refCF)
- refCF =
- CFDictionaryGetValue(usbProperties,
- CFSTR("USB Product Name"));
- if (refCF) {
- if (!CFStringGetCString
- (refCF, pDevice->product, 256,
- CFStringGetSystemEncoding()))
- SDL_SetError
- ("CFStringGetCString error retrieving pDevice->product.");
- }
-
- /* get usage page and usage */
- refCF =
- CFDictionaryGetValue(hidProperties,
- CFSTR(kIOHIDPrimaryUsagePageKey));
- if (refCF) {
- if (!CFNumberGetValue
- (refCF, kCFNumberLongType, &pDevice->usagePage))
- SDL_SetError
- ("CFNumberGetValue error retrieving pDevice->usagePage.");
- refCF =
- CFDictionaryGetValue(hidProperties,
- CFSTR(kIOHIDPrimaryUsageKey));
- if (refCF)
- if (!CFNumberGetValue
- (refCF, kCFNumberLongType, &pDevice->usage))
- SDL_SetError
- ("CFNumberGetValue error retrieving pDevice->usage.");
- }
-
- if (NULL == refCF) { /* get top level element HID usage page or usage */
- /* use top level element instead */
- CFTypeRef refCFTopElement = 0;
- refCFTopElement =
- CFDictionaryGetValue(hidProperties,
- CFSTR(kIOHIDElementKey));
- {
- /* refCFTopElement points to an array of element dictionaries */
- CFRange range = { 0, CFArrayGetCount(refCFTopElement) };
- CFArrayApplyFunction(refCFTopElement, range,
- HIDTopLevelElementHandler, pDevice);
- }
- }
-
- CFRelease(usbProperties);
- } else
- SDL_SetError
- ("IORegistryEntryCreateCFProperties failed to create usbProperties.");
-
- if (kIOReturnSuccess != IOObjectRelease(parent2))
- SDL_SetError("IOObjectRelease error with parent2.");
- if (kIOReturnSuccess != IOObjectRelease(parent1))
- SDL_SetError("IOObjectRelease error with parent1.");
- }
-}
-
-
-static recDevice *
-HIDBuildDevice(io_object_t hidDevice)
-{
- recDevice *pDevice = (recDevice *) NewPtrClear(sizeof(recDevice));
- if (pDevice) {
- /* get dictionary for HID properties */
- CFMutableDictionaryRef hidProperties = 0;
- kern_return_t result =
- IORegistryEntryCreateCFProperties(hidDevice, &hidProperties,
- kCFAllocatorDefault,
- kNilOptions);
- if ((result == KERN_SUCCESS) && hidProperties) {
- /* create device interface */
- result = HIDCreateOpenDeviceInterface(hidDevice, pDevice);
- if (kIOReturnSuccess == result) {
- HIDGetDeviceInfo(hidDevice, hidProperties, pDevice); /* hidDevice used to find parents in registry tree */
- HIDGetCollectionElements(hidProperties, pDevice);
- } else {
- DisposePtr((Ptr) pDevice);
- pDevice = NULL;
- }
- CFRelease(hidProperties);
- } else {
- DisposePtr((Ptr) pDevice);
- pDevice = NULL;
- }
- }
- return pDevice;
-}
-
-/* disposes of the element list associated with a device and the memory associated with the list
- */
-
-static void
-HIDDisposeElementList(recElement ** elementList)
-{
- recElement *pElement = *elementList;
- while (pElement) {
- recElement *pElementNext = pElement->pNext;
- DisposePtr((Ptr) pElement);
- pElement = pElementNext;
- }
- *elementList = NULL;
-}
-
-/* disposes of a single device, closing and releaseing interface, freeing memory fro device and elements, setting device pointer to NULL
- * all your device no longer belong to us... (i.e., you do not 'own' the device anymore)
- */
-
-static recDevice *
-HIDDisposeDevice(recDevice ** ppDevice)
-{
- kern_return_t result = KERN_SUCCESS;
- recDevice *pDeviceNext = NULL;
- if (*ppDevice) {
- /* save next device prior to disposing of this device */
- pDeviceNext = (*ppDevice)->pNext;
-
- /* free posible io_service_t */
- if ((*ppDevice)->ffservice) {
- IOObjectRelease((*ppDevice)->ffservice);
- (*ppDevice)->ffservice = 0;
- }
-
- /* free element lists */
- HIDDisposeElementList(&(*ppDevice)->firstAxis);
- HIDDisposeElementList(&(*ppDevice)->firstButton);
- HIDDisposeElementList(&(*ppDevice)->firstHat);
-
- result = HIDCloseReleaseInterface(*ppDevice); /* function sanity checks interface value (now application does not own device) */
- if (kIOReturnSuccess != result)
- HIDReportErrorNum
- ("HIDCloseReleaseInterface failed when trying to dipose device.",
- result);
- DisposePtr((Ptr) * ppDevice);
- *ppDevice = NULL;
- }
- return pDeviceNext;
-}
-
-
-/* Function to scan the system for joysticks.
- * Joystick 0 should be the system default joystick.
- * This function should return the number of available joysticks, or -1
- * on an unrecoverable fatal error.
- */
-int
-SDL_SYS_JoystickInit(void)
-{
- IOReturn result = kIOReturnSuccess;
- mach_port_t masterPort = 0;
- io_iterator_t hidObjectIterator = 0;
- CFMutableDictionaryRef hidMatchDictionary = NULL;
- recDevice *device, *lastDevice;
- io_object_t ioHIDDeviceObject = 0;
-
- SDL_numjoysticks = 0;
-
- if (gpDeviceList) {
- SDL_SetError("Joystick: Device list already inited.");
- return -1;
- }
-
- result = IOMasterPort(bootstrap_port, &masterPort);
- if (kIOReturnSuccess != result) {
- SDL_SetError("Joystick: IOMasterPort error with bootstrap_port.");
- return -1;
- }
-
- /* Set up a matching dictionary to search I/O Registry by class name for all HID class devices. */
- hidMatchDictionary = IOServiceMatching(kIOHIDDeviceKey);
- if (hidMatchDictionary) {
- /* Add key for device type (joystick, in this case) to refine the matching dictionary. */
-
- /* NOTE: we now perform this filtering later
- UInt32 usagePage = kHIDPage_GenericDesktop;
- UInt32 usage = kHIDUsage_GD_Joystick;
- CFNumberRef refUsage = NULL, refUsagePage = NULL;
-
- refUsage = CFNumberCreate (kCFAllocatorDefault, kCFNumberIntType, &usage);
- CFDictionarySetValue (hidMatchDictionary, CFSTR (kIOHIDPrimaryUsageKey), refUsage);
- refUsagePage = CFNumberCreate (kCFAllocatorDefault, kCFNumberIntType, &usagePage);
- CFDictionarySetValue (hidMatchDictionary, CFSTR (kIOHIDPrimaryUsagePageKey), refUsagePage);
- */
- } else {
- SDL_SetError
- ("Joystick: Failed to get HID CFMutableDictionaryRef via IOServiceMatching.");
- return -1;
- }
-
- /*/ Now search I/O Registry for matching devices. */
- result =
- IOServiceGetMatchingServices(masterPort, hidMatchDictionary,
- &hidObjectIterator);
- /* Check for errors */
- if (kIOReturnSuccess != result) {
- SDL_SetError("Joystick: Couldn't create a HID object iterator.");
- return -1;
- }
- if (!hidObjectIterator) { /* there are no joysticks */
- gpDeviceList = NULL;
- SDL_numjoysticks = 0;
- return 0;
- }
- /* IOServiceGetMatchingServices consumes a reference to the dictionary, so we don't need to release the dictionary ref. */
-
- /* build flat linked list of devices from device iterator */
-
- gpDeviceList = lastDevice = NULL;
-
- while ((ioHIDDeviceObject = IOIteratorNext(hidObjectIterator))) {
- /* build a device record */
- device = HIDBuildDevice(ioHIDDeviceObject);
- if (!device)
- continue;
-
- /* Filter device list to non-keyboard/mouse stuff */
- if ((device->usagePage != kHIDPage_GenericDesktop) ||
- ((device->usage != kHIDUsage_GD_Joystick &&
- device->usage != kHIDUsage_GD_GamePad &&
- device->usage != kHIDUsage_GD_MultiAxisController))) {
-
- /* release memory for the device */
- HIDDisposeDevice(&device);
- DisposePtr((Ptr) device);
- continue;
- }
-
- /* We have to do some storage of the io_service_t for
- * SDL_HapticOpenFromJoystick */
- if (FFIsForceFeedback(ioHIDDeviceObject) == FF_OK) {
- device->ffservice = ioHIDDeviceObject;
- } else {
- device->ffservice = 0;
- }
-
- /* Add device to the end of the list */
- if (lastDevice)
- lastDevice->pNext = device;
- else
- gpDeviceList = device;
- lastDevice = device;
- }
- result = IOObjectRelease(hidObjectIterator); /* release the iterator */
-
- /* Count the total number of devices we found */
- device = gpDeviceList;
- while (device) {
- SDL_numjoysticks++;
- device = device->pNext;
- }
-
- return SDL_numjoysticks;
-}
-
-/* Function to get the device-dependent name of a joystick */
-const char *
-SDL_SYS_JoystickName(int index)
-{
- recDevice *device = gpDeviceList;
-
- for (; index > 0; index--)
- device = device->pNext;
-
- return device->product;
-}
-
-/* Function to open a joystick for use.
- * The joystick to open is specified by the index field of the joystick.
- * This should fill the nbuttons and naxes fields of the joystick structure.
- * It returns 0, or -1 if there is an error.
- */
-int
-SDL_SYS_JoystickOpen(SDL_Joystick * joystick)
-{
- recDevice *device = gpDeviceList;
- int index;
-
- for (index = joystick->index; index > 0; index--)
- device = device->pNext;
-
- joystick->hwdata = device;
- joystick->name = device->product;
-
- joystick->naxes = device->axes;
- joystick->nhats = device->hats;
- joystick->nballs = 0;
- joystick->nbuttons = device->buttons;
-
- return 0;
-}
-
-/* Function to update the state of a joystick - called as a device poll.
- * This function shouldn't update the joystick structure directly,
- * but instead should call SDL_PrivateJoystick*() to deliver events
- * and update joystick device state.
- */
-void
-SDL_SYS_JoystickUpdate(SDL_Joystick * joystick)
-{
- recDevice *device = joystick->hwdata;
- recElement *element;
- SInt32 value, range;
- int i;
-
- if (device->removed) { /* device was unplugged; ignore it. */
- if (device->uncentered) {
- device->uncentered = 0;
-
- /* Tell the app that everything is centered/unpressed... */
- for (i = 0; i < device->axes; i++)
- SDL_PrivateJoystickAxis(joystick, i, 0);
-
- for (i = 0; i < device->buttons; i++)
- SDL_PrivateJoystickButton(joystick, i, 0);
-
- for (i = 0; i < device->hats; i++)
- SDL_PrivateJoystickHat(joystick, i, SDL_HAT_CENTERED);
- }
-
- return;
- }
-
- element = device->firstAxis;
- i = 0;
- while (element) {
- value = HIDScaledCalibratedValue(device, element, -32768, 32767);
- if (value != joystick->axes[i])
- SDL_PrivateJoystickAxis(joystick, i, value);
- element = element->pNext;
- ++i;
- }
-
- element = device->firstButton;
- i = 0;
- while (element) {
- value = HIDGetElementValue(device, element);
- if (value > 1) /* handle pressure-sensitive buttons */
- value = 1;
- if (value != joystick->buttons[i])
- SDL_PrivateJoystickButton(joystick, i, value);
- element = element->pNext;
- ++i;
- }
-
- element = device->firstHat;
- i = 0;
- while (element) {
- Uint8 pos = 0;
-
- range = (element->max - element->min + 1);
- value = HIDGetElementValue(device, element) - element->min;
- if (range == 4) /* 4 position hatswitch - scale up value */
- value *= 2;
- else if (range != 8) /* Neither a 4 nor 8 positions - fall back to default position (centered) */
- value = -1;
- switch (value) {
- case 0:
- pos = SDL_HAT_UP;
- break;
- case 1:
- pos = SDL_HAT_RIGHTUP;
- break;
- case 2:
- pos = SDL_HAT_RIGHT;
- break;
- case 3:
- pos = SDL_HAT_RIGHTDOWN;
- break;
- case 4:
- pos = SDL_HAT_DOWN;
- break;
- case 5:
- pos = SDL_HAT_LEFTDOWN;
- break;
- case 6:
- pos = SDL_HAT_LEFT;
- break;
- case 7:
- pos = SDL_HAT_LEFTUP;
- break;
- default:
- /* Every other value is mapped to center. We do that because some
- * joysticks use 8 and some 15 for this value, and apparently
- * there are even more variants out there - so we try to be generous.
- */
- pos = SDL_HAT_CENTERED;
- break;
- }
- if (pos != joystick->hats[i])
- SDL_PrivateJoystickHat(joystick, i, pos);
- element = element->pNext;
- ++i;
- }
-
- return;
-}
-
-/* Function to close a joystick after use */
-void
-SDL_SYS_JoystickClose(SDL_Joystick * joystick)
-{
- /* Should we do anything here? */
- return;
-}
-
-/* Function to perform any system-specific joystick related cleanup */
-void
-SDL_SYS_JoystickQuit(void)
-{
- while (NULL != gpDeviceList)
- gpDeviceList = HIDDisposeDevice(&gpDeviceList);
-}
-
-#endif /* SDL_JOYSTICK_IOKIT */
-/* vi: set ts=4 sw=4 expandtab: */

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/SDL/src/joystick/darwin/SDL_sysjoystick_c.h Deleted

@@ -1,88 +0,0 @@
-/*
- SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2010 Sam Lantinga
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- Sam Lantinga
- slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-#ifndef SDL_JOYSTICK_IOKIT_H
-
-
-#if MAC_OS_X_VERSION_MIN_REQUIRED == 1030
-#include "10.3.9-FIX/IOHIDLib.h"
-#else
-#include <IOKit/hid/IOHIDLib.h>
-#endif
-#include <IOKit/hid/IOHIDKeys.h>
-
-
-struct recElement
-{
- IOHIDElementCookie cookie; /* unique value which identifies element, will NOT change */
- long usagePage, usage; /* HID usage */
- long min; /* reported min value possible */
- long max; /* reported max value possible */
-#if 0
- /* TODO: maybe should handle the following stuff somehow? */
-
- long scaledMin; /* reported scaled min value possible */
- long scaledMax; /* reported scaled max value possible */
- long size; /* size in bits of data return from element */
- Boolean relative; /* are reports relative to last report (deltas) */
- Boolean wrapping; /* does element wrap around (one value higher than max is min) */
- Boolean nonLinear; /* are the values reported non-linear relative to element movement */
- Boolean preferredState; /* does element have a preferred state (such as a button) */
- Boolean nullState; /* does element have null state */
-#endif /* 0 */
-
- /* runtime variables used for auto-calibration */
- long minReport; /* min returned value */
- long maxReport; /* max returned value */
-
- struct recElement *pNext; /* next element in list */
-};
-typedef struct recElement recElement;
-
-struct joystick_hwdata
-{
- io_service_t ffservice; /* Interface for force feedback, 0 = no ff */
- IOHIDDeviceInterface **interface; /* interface to device, NULL = no interface */
-
- char product[256]; /* name of product */
- long usage; /* usage page from IOUSBHID Parser.h which defines general usage */
- long usagePage; /* usage within above page from IOUSBHID Parser.h which defines specific usage */
-
- long axes; /* number of axis (calculated, not reported by device) */
- long buttons; /* number of buttons (calculated, not reported by device) */
- long hats; /* number of hat switches (calculated, not reported by device) */
- long elements; /* number of total elements (shouldbe total of above) (calculated, not reported by device) */
-
- recElement *firstAxis;
- recElement *firstButton;
- recElement *firstHat;
-
- int removed;
- int uncentered;
-
- struct joystick_hwdata *pNext; /* next device */
-};
-typedef struct joystick_hwdata recDevice;
-
-
-#endif /* SDL_JOYSTICK_IOKIT_H */

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFSound/English.lproj Deleted

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFSound/English.lproj/Credits.rtf Deleted

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFSound/English.lproj/InfoPlist.strings Deleted

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFSound/English.lproj/NetSfPeopsSpuPluginMain.nib Deleted

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFSound/English.lproj/NetSfPeopsSpuPluginMain.nib/classes.nib Deleted

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFSound/English.lproj/NetSfPeopsSpuPluginMain.nib/info.nib Deleted

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFSound/English.lproj/NetSfPeopsSpuPluginMain.nib/keyedobjects.nib Deleted

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFSound/Info.plist Deleted

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFSound/PeopsSPU.xcodeproj Deleted

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFSound/PeopsSPU.xcodeproj/project.pbxproj Deleted

@@ -1,343 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 42;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		2B4F9962077B042E004E36BA /* NetSfPeopsSpuPluginMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2B4F9961077B042E004E36BA /* NetSfPeopsSpuPluginMain.nib */; };
-		2B4F99F9077B0CE4004E36BA /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 2B4F99F7077B0CE4004E36BA /* Credits.rtf */; };
-		2B7B2B94072D9BE6007F0C35 /* PluginController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B7B2B92072D9BE6007F0C35 /* PluginController.m */; };
-		2B7B2BD1072DAE5D007F0C35 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B7B2BD0072DAE5D007F0C35 /* AppKit.framework */; };
-		2B7B2BE9072DB1B6007F0C35 /* NamedSlider.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B7B2BE7072DB1B6007F0C35 /* NamedSlider.m */; };
-		2BE18A00077EED7F008688C9 /* macosx.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BFF7EFC0715D16A0061278A /* macosx.c */; };
-		2BFF7F3E0715D2E00061278A /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2BFF7F3D0715D2E00061278A /* Carbon.framework */; };
-		71E4E7AB109DC529003BB7AC /* dma.c in Sources */ = {isa = PBXBuildFile; fileRef = 71E4E797109DC529003BB7AC /* dma.c */; };
-		71E4E7AC109DC529003BB7AC /* freeze.c in Sources */ = {isa = PBXBuildFile; fileRef = 71E4E79B109DC529003BB7AC /* freeze.c */; };
-		71E4E7AE109DC529003BB7AC /* registers.c in Sources */ = {isa = PBXBuildFile; fileRef = 71E4E79F109DC529003BB7AC /* registers.c */; };
-		71E4E7B0109DC529003BB7AC /* spu.c in Sources */ = {isa = PBXBuildFile; fileRef = 71E4E7A4109DC529003BB7AC /* spu.c */; };
-		71E4E7B1109DC529003BB7AC /* xa.c in Sources */ = {isa = PBXBuildFile; fileRef = 71E4E7A7109DC529003BB7AC /* xa.c */; };
-		8D576314048677EA00EA77CD /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */; };
-		8D5B49A804867FD3000E48DA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8D5B49A704867FD3000E48DA /* InfoPlist.strings */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXFileReference section */
-		089C167EFE841241C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
-		2B4F99F8077B0CE4004E36BA /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = English.lproj/Credits.rtf; sourceTree = "<group>"; };
-		2B6DA89307200A9A009F6FED /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/NetSfPeopsSpuPluginMain.nib; sourceTree = "<group>"; };
-		2B7B2B91072D9BE6007F0C35 /* PluginController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PluginController.h; path = macsrc/PluginController.h; sourceTree = "<group>"; };
-		2B7B2B92072D9BE6007F0C35 /* PluginController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PluginController.m; path = macsrc/PluginController.m; sourceTree = "<group>"; };
-		2B7B2BD0072DAE5D007F0C35 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
-		2B7B2BE6072DB1B6007F0C35 /* NamedSlider.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = NamedSlider.h; path = macsrc/NamedSlider.h; sourceTree = "<group>"; };
-		2B7B2BE7072DB1B6007F0C35 /* NamedSlider.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = NamedSlider.m; path = macsrc/NamedSlider.m; sourceTree = "<group>"; };
-		2BFF7EFC0715D16A0061278A /* macosx.c */ = {isa = PBXFileReference; fileEncoding = 12; lastKnownFileType = sourcecode.c.c; name = macosx.c; path = src/macosx.c; sourceTree = "<group>"; };
-		2BFF7F3D0715D2E00061278A /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
-		71E4E793109DC529003BB7AC /* adsr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = adsr.c; path = ../../../plugins/dfsound/adsr.c; sourceTree = SOURCE_ROOT; };
-		71E4E794109DC529003BB7AC /* adsr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = adsr.h; path = ../../../plugins/dfsound/adsr.h; sourceTree = SOURCE_ROOT; };
-		71E4E796109DC529003BB7AC /* cfg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cfg.h; path = ../../../plugins/dfsound/cfg.h; sourceTree = SOURCE_ROOT; };
-		71E4E797109DC529003BB7AC /* dma.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dma.c; path = ../../../plugins/dfsound/dma.c; sourceTree = SOURCE_ROOT; };
-		71E4E798109DC529003BB7AC /* dma.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dma.h; path = ../../../plugins/dfsound/dma.h; sourceTree = SOURCE_ROOT; };
-		71E4E799109DC529003BB7AC /* dsoundoss.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dsoundoss.h; path = ../../../plugins/dfsound/dsoundoss.h; sourceTree = SOURCE_ROOT; };
-		71E4E79A109DC529003BB7AC /* externals.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = externals.h; path = ../../../plugins/dfsound/externals.h; sourceTree = SOURCE_ROOT; };
-		71E4E79B109DC529003BB7AC /* freeze.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = freeze.c; path = ../../../plugins/dfsound/freeze.c; sourceTree = SOURCE_ROOT; };
-		71E4E79C109DC529003BB7AC /* gauss_i.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gauss_i.h; path = ../../../plugins/dfsound/gauss_i.h; sourceTree = SOURCE_ROOT; };
-		71E4E79E109DC529003BB7AC /* psemuxa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = psemuxa.h; path = ../../../plugins/dfsound/psemuxa.h; sourceTree = SOURCE_ROOT; };
-		71E4E79F109DC529003BB7AC /* registers.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = registers.c; path = ../../../plugins/dfsound/registers.c; sourceTree = SOURCE_ROOT; };
-		71E4E7A0109DC529003BB7AC /* registers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = registers.h; path = ../../../plugins/dfsound/registers.h; sourceTree = SOURCE_ROOT; };
-		71E4E7A1109DC529003BB7AC /* regs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = regs.h; path = ../../../plugins/dfsound/regs.h; sourceTree = SOURCE_ROOT; };
-		71E4E7A2109DC529003BB7AC /* reverb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = reverb.c; path = ../../../plugins/dfsound/reverb.c; sourceTree = SOURCE_ROOT; };
-		71E4E7A3109DC529003BB7AC /* reverb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = reverb.h; path = ../../../plugins/dfsound/reverb.h; sourceTree = SOURCE_ROOT; };
-		71E4E7A4109DC529003BB7AC /* spu.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = spu.c; path = ../../../plugins/dfsound/spu.c; sourceTree = SOURCE_ROOT; };
-		71E4E7A5109DC529003BB7AC /* spu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = spu.h; path = ../../../plugins/dfsound/spu.h; sourceTree = SOURCE_ROOT; };
-		71E4E7A6109DC529003BB7AC /* stdafx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = stdafx.h; path = ../../../plugins/dfsound/stdafx.h; sourceTree = SOURCE_ROOT; };
-		71E4E7A7109DC529003BB7AC /* xa.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = xa.c; path = ../../../plugins/dfsound/xa.c; sourceTree = SOURCE_ROOT; };
-		71E4E7A8109DC529003BB7AC /* xa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = xa.h; path = ../../../plugins/dfsound/xa.h; sourceTree = SOURCE_ROOT; };
-		8D576316048677EA00EA77CD /* PeopsSPU.psxplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PeopsSPU.psxplugin; sourceTree = BUILT_PRODUCTS_DIR; };
-		8D576317048677EA00EA77CD /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		8D576313048677EA00EA77CD /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				8D576314048677EA00EA77CD /* CoreFoundation.framework in Frameworks */,
-				2BFF7F3E0715D2E00061278A /* Carbon.framework in Frameworks */,
-				2B7B2BD1072DAE5D007F0C35 /* AppKit.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		089C166AFE841209C02AAC07 /* PSX Plugin */ = {
-			isa = PBXGroup;
-			children = (
-				08FB77AFFE84173DC02AAC07 /* Source */,
-				2B7B2B8E072D9BD6007F0C35 /* Classes */,
-				089C167CFE841241C02AAC07 /* Resources */,
-				089C1671FE841209C02AAC07 /* External Frameworks and Libraries */,
-				19C28FB6FE9D52B211CA2CBB /* Products */,
-			);
-			name = "PSX Plugin";
-			sourceTree = "<group>";
-		};
-		089C1671FE841209C02AAC07 /* External Frameworks and Libraries */ = {
-			isa = PBXGroup;
-			children = (
-				2B7B2BD0072DAE5D007F0C35 /* AppKit.framework */,
-				2BFF7F3D0715D2E00061278A /* Carbon.framework */,
-				0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */,
-			);
-			name = "External Frameworks and Libraries";
-			sourceTree = "<group>";
-		};
-		089C167CFE841241C02AAC07 /* Resources */ = {
-			isa = PBXGroup;
-			children = (
-				8D576317048677EA00EA77CD /* Info.plist */,
-				2B4F99F7077B0CE4004E36BA /* Credits.rtf */,
-				8D5B49A704867FD3000E48DA /* InfoPlist.strings */,
-				2B4F9961077B042E004E36BA /* NetSfPeopsSpuPluginMain.nib */,
-			);
-			name = Resources;
-			sourceTree = "<group>";
-		};
-		08FB77AFFE84173DC02AAC07 /* Source */ = {
-			isa = PBXGroup;
-			children = (
-				71E4E793109DC529003BB7AC /* adsr.c */,
-				71E4E794109DC529003BB7AC /* adsr.h */,
-				71E4E796109DC529003BB7AC /* cfg.h */,
-				71E4E797109DC529003BB7AC /* dma.c */,
-				71E4E798109DC529003BB7AC /* dma.h */,
-				71E4E799109DC529003BB7AC /* dsoundoss.h */,
-				71E4E79A109DC529003BB7AC /* externals.h */,
-				71E4E79B109DC529003BB7AC /* freeze.c */,
-				71E4E79C109DC529003BB7AC /* gauss_i.h */,
-				71E4E79E109DC529003BB7AC /* psemuxa.h */,
-				71E4E79F109DC529003BB7AC /* registers.c */,
-				71E4E7A0109DC529003BB7AC /* registers.h */,
-				71E4E7A1109DC529003BB7AC /* regs.h */,
-				71E4E7A2109DC529003BB7AC /* reverb.c */,
-				71E4E7A3109DC529003BB7AC /* reverb.h */,
-				71E4E7A4109DC529003BB7AC /* spu.c */,
-				71E4E7A5109DC529003BB7AC /* spu.h */,
-				71E4E7A6109DC529003BB7AC /* stdafx.h */,
-				71E4E7A7109DC529003BB7AC /* xa.c */,
-				71E4E7A8109DC529003BB7AC /* xa.h */,
-				2BFF7EFC0715D16A0061278A /* macosx.c */,
-			);
-			name = Source;
-			sourceTree = "<group>";
-		};
-		19C28FB6FE9D52B211CA2CBB /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				8D576316048677EA00EA77CD /* PeopsSPU.psxplugin */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		2B7B2B8E072D9BD6007F0C35 /* Classes */ = {
-			isa = PBXGroup;
-			children = (
-				2B7B2B91072D9BE6007F0C35 /* PluginController.h */,
-				2B7B2B92072D9BE6007F0C35 /* PluginController.m */,
-				2B7B2BE6072DB1B6007F0C35 /* NamedSlider.h */,
-				2B7B2BE7072DB1B6007F0C35 /* NamedSlider.m */,
-			);
-			name = Classes;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-		8D57630D048677EA00EA77CD /* PeopsSPU */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 71155B260FDFA2EB00EC0BC5 /* Build configuration list for PBXNativeTarget "PeopsSPU" */;
-			buildPhases = (
-				8D57630F048677EA00EA77CD /* Resources */,
-				8D576311048677EA00EA77CD /* Sources */,
-				8D576313048677EA00EA77CD /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = PeopsSPU;
-			productInstallPath = "$(HOME)/Library/Bundles";
-			productName = "PSX Plugin";
-			productReference = 8D576316048677EA00EA77CD /* PeopsSPU.psxplugin */;
-			productType = "com.apple.product-type.bundle";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		089C1669FE841209C02AAC07 /* Project object */ = {
-			isa = PBXProject;
-			buildConfigurationList = 71155B2B0FDFA2EB00EC0BC5 /* Build configuration list for PBXProject "PeopsSPU" */;
-			hasScannedForEncodings = 1;
-			mainGroup = 089C166AFE841209C02AAC07 /* PSX Plugin */;
-			projectDirPath = "";
-			targets = (
-				8D57630D048677EA00EA77CD /* PeopsSPU */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
-		8D57630F048677EA00EA77CD /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				8D5B49A804867FD3000E48DA /* InfoPlist.strings in Resources */,
-				2B4F9962077B042E004E36BA /* NetSfPeopsSpuPluginMain.nib in Resources */,
-				2B4F99F9077B0CE4004E36BA /* Credits.rtf in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		8D576311048677EA00EA77CD /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				2B7B2B94072D9BE6007F0C35 /* PluginController.m in Sources */,
-				2B7B2BE9072DB1B6007F0C35 /* NamedSlider.m in Sources */,
-				2BE18A00077EED7F008688C9 /* macosx.c in Sources */,
-				71E4E7AB109DC529003BB7AC /* dma.c in Sources */,
-				71E4E7AC109DC529003BB7AC /* freeze.c in Sources */,
-				71E4E7AE109DC529003BB7AC /* registers.c in Sources */,
-				71E4E7B0109DC529003BB7AC /* spu.c in Sources */,
-				71E4E7B1109DC529003BB7AC /* xa.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXVariantGroup section */
-		2B4F9961077B042E004E36BA /* NetSfPeopsSpuPluginMain.nib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				2B6DA89307200A9A009F6FED /* English */,
-			);
-			name = NetSfPeopsSpuPluginMain.nib;
-			sourceTree = "<group>";
-		};
-		2B4F99F7077B0CE4004E36BA /* Credits.rtf */ = {
-			isa = PBXVariantGroup;
-			children = (
-				2B4F99F8077B0CE4004E36BA /* English */,
-			);
-			name = Credits.rtf;
-			sourceTree = "<group>";
-		};
-		8D5B49A704867FD3000E48DA /* InfoPlist.strings */ = {
-			isa = PBXVariantGroup;
-			children = (
-				089C167EFE841241C02AAC07 /* English */,
-			);
-			name = InfoPlist.strings;
-			sourceTree = "<group>";
-		};
-/* End PBXVariantGroup section */
-
-/* Begin XCBuildConfiguration section */
-		71155B270FDFA2EB00EC0BC5 /* Development */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-				GCC_MODEL_TUNING = "";
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					_MACOSX,
-					USEMACOSX,
-				);
-				HEADER_SEARCH_PATHS = (
-					src/,
-					../../../plugins/dfsound,
-				);
-				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
-				LIBRARY_STYLE = BUNDLE;
-				OTHER_CFLAGS = "-DUSEMACOSX=1";
-				PRODUCT_NAME = PeopsSPU;
-				SYMROOT = ../../build;
-				WRAPPER_EXTENSION = psxplugin;
-				ZERO_LINK = NO;
-			};
-			name = Development;
-		};
-		71155B290FDFA2EB00EC0BC5 /* Deployment */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = YES;
-				DEBUGGING_SYMBOLS = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_MODEL_TUNING = "";
-				GCC_OPTIMIZATION_LEVEL = s;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					_MACOSX,
-					USEMACOSX,
-				);
-				HEADER_SEARCH_PATHS = (
-					src/,
-					../../../plugins/dfsound,
-				);
-				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
-				LIBRARY_STYLE = BUNDLE;
-				OTHER_CFLAGS = "";
-				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
-				PRODUCT_NAME = PeopsSPU;
-				SYMROOT = ../../build;
-				WRAPPER_EXTENSION = psxplugin;
-				ZERO_LINK = NO;
-			};
-			name = Deployment;
-		};
-		71155B2C0FDFA2EB00EC0BC5 /* Development */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-			};
-			name = Development;
-		};
-		71155B2E0FDFA2EB00EC0BC5 /* Deployment */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-			};
-			name = Deployment;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		71155B260FDFA2EB00EC0BC5 /* Build configuration list for PBXNativeTarget "PeopsSPU" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				71155B270FDFA2EB00EC0BC5 /* Development */,
-				71155B290FDFA2EB00EC0BC5 /* Deployment */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Development;
-		};
-		71155B2B0FDFA2EB00EC0BC5 /* Build configuration list for PBXProject "PeopsSPU" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				71155B2C0FDFA2EB00EC0BC5 /* Development */,
-				71155B2E0FDFA2EB00EC0BC5 /* Deployment */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Development;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 089C1669FE841209C02AAC07 /* Project object */;
-}

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFSound/src Deleted

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFSound/src/macosx.c Deleted

@@ -1,203 +0,0 @@
-/***************************************************************************
- macosx.c - description
- -------------------
- begin : Wed May 15 2002
- copyright : (C) 2002 by Pete Bernert
- email : BlackDove@addcom.de
- ***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. See also the license.txt file for *
- * additional informations. *
- * *
- ***************************************************************************/
-
-#include "stdafx.h"
-
-#define _IN_MACOSX
-
-#ifdef _MACOSX
-
-#include <Carbon/Carbon.h>
-#include "externals.h"
-
-#define kMaxSoundBuffers	20
-
-//static int				macBufferSize = 2, macBufferCount = 36;
-//static float			macSoundPitch = 1.0;
-static long			 macSoundVolume = 100;
-volatile int			soundBufferAt = -1, soundPlayAt = -1, soundQueued = 0;
-char			*soundBuffer[kMaxSoundBuffers+1], *emptyBuffer;
-SndChannelPtr	sndChannel;
-//ExtSoundHeader	sndHeader;
-CmpSoundHeader	sndHeader;
-SndCallBackUPP	callBackUPP;
-static int bufferIndex;
-
-////////////////////////////////////////////////////////////////////////
-// small linux time helper... only used for watchdog
-////////////////////////////////////////////////////////////////////////
-
-unsigned long timeGetTime()
-{
- struct timeval tv;
- gettimeofday(&tv, 0); // well, maybe there are better ways
- return tv.tv_sec * 1000 + tv.tv_usec/1000; // to do that, but at least it works
-}
-
-pascal void MacProcessSound(SndChannelPtr chan, SndCommand *cmd)
-{
-	#pragma unused (chan, cmd)
-
-	if (soundQueued <= 0)
-		sndHeader.samplePtr = emptyBuffer;
-	else
-	{
-		sndHeader.samplePtr = soundBuffer[soundPlayAt];
- soundPlayAt++;
-		if (soundPlayAt >= kMaxSoundBuffers/*macBufferCount*/)
-			soundPlayAt = 0;
-		soundQueued--;
-	}
-	
-	SndCommand buffer = { bufferCmd, 0, (long) &sndHeader };
-	SndDoImmediate(sndChannel, &buffer);
-
-	SndCommand callback = { callBackCmd, 0, 0 };
-	SndDoCommand(sndChannel, &callback, true);
-}
-
-////////////////////////////////////////////////////////////////////////
-// SETUP SOUND
-////////////////////////////////////////////////////////////////////////
-
-static int buffer_size;
-void SetupSound(void)
-{
-	int	count;
-	
- callBackUPP = NewSndCallBackUPP(MacProcessSound);
- 
-	if (sndChannel)
-	{
-		SndDisposeChannel(sndChannel, true);
-		sndChannel = nil;
-	}
- 
- buffer_size = 1;
- while (buffer_size < (44100 / 60))
- buffer_size <<= 1;
-	
- 	memset(&sndHeader, 0, sizeof(sndHeader));
-	sndHeader.numChannels = (iDisStereo ? 1 : 2);
-	sndHeader.sampleRate = 44100 << 16;
-	sndHeader.encode = cmpSH;
-	sndHeader.baseFrequency = kMiddleC;
-	sndHeader.numFrames = buffer_size;
-	sndHeader.sampleSize = 16;
-#ifdef __POWERPC__
- sndHeader.format = k16BitBigEndianFormat;
-#else
- sndHeader.format = k16BitLittleEndianFormat;
-#endif
- sndHeader.compressionID = fixedCompression;
- 
-	if (soundBufferAt != -1)
-	{
- free(soundBuffer[0]);
-		free(emptyBuffer);
-	}
- 
- soundBuffer[0] = (char *) calloc(buffer_size << 2, kMaxSoundBuffers);
-	for (count = 1; count <= kMaxSoundBuffers; count++)
-		soundBuffer[count] = soundBuffer[count-1] + (buffer_size << 2);
-	emptyBuffer = (char *) calloc(buffer_size << 2, 1);
-	
-	soundBufferAt = soundPlayAt = soundQueued = 0;
- bufferIndex = 0;
-	
-	SndNewChannel(&sndChannel, sampledSynth, initStereo, callBackUPP);
-
-	SndCommand	sndcmd;
-	UInt32		volume;
-	
-	volume = (UInt32) (256.0 * (float) macSoundVolume / 100.0);
-	
-	sndcmd.cmd = volumeCmd;
- sndcmd.param1 = 0;
- sndcmd.param2 = (volume << 16) | volume;
- SndDoCommand(sndChannel, &sndcmd, true);
-
- sndcmd.cmd = callBackCmd;
- sndcmd.param1 = 0;
- sndcmd.param2 = 0;	
-	SndDoCommand(sndChannel, &sndcmd, true);
-}
-
-////////////////////////////////////////////////////////////////////////
-// REMOVE SOUND
-////////////////////////////////////////////////////////////////////////
-
-void RemoveSound(void)
-{
- DisposeSndCallBackUPP(callBackUPP);
-}
-
-////////////////////////////////////////////////////////////////////////
-// GET BYTES BUFFERED
-////////////////////////////////////////////////////////////////////////
-
-unsigned long SoundGetBytesBuffered(void)
-{
-	int bytes;
-	int playAt = soundPlayAt;
-	
- if (soundBufferAt < playAt) {
- bytes = (soundBuffer[kMaxSoundBuffers]-soundBuffer[playAt])+
- (soundBuffer[soundBufferAt]-soundBuffer[0]);
- } else {
-		bytes = soundBuffer[soundBufferAt]-soundBuffer[playAt];
-	}
-	//printf("sb=%i\n", bytes);
-	
-//	if (bytes < SOUNDSIZE/2)
-//		return 0;
-	
-	return bytes;
-}
-
-////////////////////////////////////////////////////////////////////////
-// FEED SOUND DATA
-////////////////////////////////////////////////////////////////////////
-
-void SoundFeedStreamData(unsigned char* pSound,long lBytes)
-{
- int rem;
- 
- if (lBytes > (buffer_size<<2)*kMaxSoundBuffers) {
- printf("sound feed overflow!\n");
- return;
- }
-
- rem = soundBuffer[kMaxSoundBuffers]-(soundBuffer[soundBufferAt]+bufferIndex);
- if (lBytes > rem) {
- memcpy(soundBuffer[soundBufferAt]+bufferIndex, pSound, rem);
- lBytes -= rem; pSound += rem;
- soundQueued += kMaxSoundBuffers-soundBufferAt;
- soundBufferAt = 0; bufferIndex = 0;
- }
- memcpy(soundBuffer[soundBufferAt]+bufferIndex, pSound, lBytes);
- soundBufferAt += (lBytes+bufferIndex)/(buffer_size<<2);
- soundQueued += (lBytes+bufferIndex)/(buffer_size<<2);
- bufferIndex = (lBytes+bufferIndex)%(buffer_size<<2);
- 
- if (soundQueued >= kMaxSoundBuffers) {
- printf("sound buffer overflow!\n");
- }
-}
-
-#endif

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFXVideo/English.lproj/NetSfPeopsSoftGPUConfig.nib Deleted

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFXVideo/English.lproj/NetSfPeopsSoftGPUConfig.nib/classes.nib Deleted

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFXVideo/English.lproj/NetSfPeopsSoftGPUConfig.nib/info.nib Deleted

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFXVideo/English.lproj/NetSfPeopsSoftGPUConfig.nib/keyedobjects.nib Deleted

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFXVideo/NetSfPeopsSoftGPUInterface.nib Deleted

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFXVideo/NetSfPeopsSoftGPUInterface.nib/classes.nib Deleted

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFXVideo/NetSfPeopsSoftGPUInterface.nib/info.nib Deleted

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFXVideo/NetSfPeopsSoftGPUInterface.nib/keyedobjects.nib Deleted

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFXVideo/PeopsSoftGPU.xcodeproj Deleted

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFXVideo/PeopsSoftGPU.xcodeproj/project.pbxproj Deleted

@@ -1,416 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 42;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		2B038C07069183300082466B /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2B038C05069183300082466B /* InfoPlist.strings */; };
-		2B038D2306918AA80082466B /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 2B038D2206918AA80082466B /* Info.plist */; };
-		2B143C79078A0C6700AF745A /* PluginWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = 2B957EAE0635DFE400543905 /* PluginWindow.h */; };
-		2B57868206BE7B3700BBA288 /* ExtendedKeys.h in Headers */ = {isa = PBXBuildFile; fileRef = 2B57868106BE7B3700BBA288 /* ExtendedKeys.h */; };
-		2B957EB10635DFE400543905 /* PluginWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B957EAF0635DFE400543905 /* PluginWindow.m */; };
-		2B959DC106342C22000F2A2D /* drawgl.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B3E5D64062B2CC1001D796E /* drawgl.m */; };
-		2B959DC406342C23000F2A2D /* PluginGLView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BAF4FC90632967A00DB9A16 /* PluginGLView.h */; };
-		2B959DCD06342C24000F2A2D /* PluginGLView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2BAF4FCA0632967A00DB9A16 /* PluginGLView.m */; };
-		2B959DD006342C25000F2A2D /* PluginWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = 2B3E5DF0062B36FB001D796E /* PluginWindowController.h */; };
-		2B959DD506342C25000F2A2D /* PluginWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B3E5DF1062B36FB001D796E /* PluginWindowController.m */; };
-		2B959DE106342C31000F2A2D /* NetSfPeopsSoftGPUInterface.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2B3E5DED062B36A0001D796E /* NetSfPeopsSoftGPUInterface.nib */; };
-		2B959E4406342D32000F2A2D /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B959E4306342D32000F2A2D /* OpenGL.framework */; };
-		2BB260A80777462E00F6854C /* PluginConfigController.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BB260A60777462E00F6854C /* PluginConfigController.h */; };
-		2BB260A90777462E00F6854C /* PluginConfigController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2BB260A70777462E00F6854C /* PluginConfigController.m */; };
-		2BD2E769077AF53E00657C69 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 2BD2E767077AF53E00657C69 /* Credits.rtf */; };
-		2BD2E829077AFC2C00657C69 /* NetSfPeopsSoftGPUConfig.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2BD2E828077AFC2C00657C69 /* NetSfPeopsSoftGPUConfig.nib */; };
-		2BD7C777076E1FAB000F05ED /* GLUT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B51949E06B3D2D200744730 /* GLUT.framework */; };
-		71E9EC06109F24E700E98D1D /* fps.c in Sources */ = {isa = PBXBuildFile; fileRef = 71E9EBF4109F24E600E98D1D /* fps.c */; };
-		71E9EC08109F24E700E98D1D /* gpu.c in Sources */ = {isa = PBXBuildFile; fileRef = 71E9EBF6109F24E600E98D1D /* gpu.c */; };
-		71E9EC0B109F24E700E98D1D /* key.c in Sources */ = {isa = PBXBuildFile; fileRef = 71E9EBF9109F24E600E98D1D /* key.c */; };
-		71E9EC0D109F24E700E98D1D /* menu.c in Sources */ = {isa = PBXBuildFile; fileRef = 71E9EBFB109F24E600E98D1D /* menu.c */; };
-		71E9EC0F109F24E700E98D1D /* prim.c in Sources */ = {isa = PBXBuildFile; fileRef = 71E9EBFD109F24E700E98D1D /* prim.c */; };
-		71E9EC11109F24E700E98D1D /* soft.c in Sources */ = {isa = PBXBuildFile; fileRef = 71E9EBFF109F24E700E98D1D /* soft.c */; };
-		71E9EC14109F24E700E98D1D /* zn.c in Sources */ = {isa = PBXBuildFile; fileRef = 71E9EC02109F24E700E98D1D /* zn.c */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXFileReference section */
-		2B038C06069183300082466B /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		2B038D2206918AA80082466B /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = Info.plist; sourceTree = "<group>"; };
-		2B371FBB0773859200B1DC0B /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/NetSfPeopsSoftGPUConfig.nib; sourceTree = "<group>"; };
-		2B3E5D64062B2CC1001D796E /* drawgl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = drawgl.m; path = macsrc/drawgl.m; sourceTree = SOURCE_ROOT; };
-		2B3E5DED062B36A0001D796E /* NetSfPeopsSoftGPUInterface.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; path = NetSfPeopsSoftGPUInterface.nib; sourceTree = "<group>"; };
-		2B3E5DF0062B36FB001D796E /* PluginWindowController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PluginWindowController.h; path = macsrc/PluginWindowController.h; sourceTree = SOURCE_ROOT; };
-		2B3E5DF1062B36FB001D796E /* PluginWindowController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PluginWindowController.m; path = macsrc/PluginWindowController.m; sourceTree = SOURCE_ROOT; };
-		2B51949E06B3D2D200744730 /* GLUT.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLUT.framework; path = /System/Library/Frameworks/GLUT.framework; sourceTree = "<absolute>"; };
-		2B57868106BE7B3700BBA288 /* ExtendedKeys.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ExtendedKeys.h; path = macsrc/ExtendedKeys.h; sourceTree = SOURCE_ROOT; };
-		2B957EAE0635DFE400543905 /* PluginWindow.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PluginWindow.h; path = macsrc/PluginWindow.h; sourceTree = SOURCE_ROOT; };
-		2B957EAF0635DFE400543905 /* PluginWindow.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PluginWindow.m; path = macsrc/PluginWindow.m; sourceTree = SOURCE_ROOT; };
-		2B959E4306342D32000F2A2D /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
-		2BAF4FC90632967A00DB9A16 /* PluginGLView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PluginGLView.h; path = macsrc/PluginGLView.h; sourceTree = SOURCE_ROOT; };
-		2BAF4FCA0632967A00DB9A16 /* PluginGLView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PluginGLView.m; path = macsrc/PluginGLView.m; sourceTree = SOURCE_ROOT; };
-		2BAF50930632BB1A00DB9A16 /* PeopsSoftGL.psxplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PeopsSoftGL.psxplugin; sourceTree = BUILT_PRODUCTS_DIR; };
-		2BB260A60777462E00F6854C /* PluginConfigController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PluginConfigController.h; path = macsrc/PluginConfigController.h; sourceTree = SOURCE_ROOT; };
-		2BB260A70777462E00F6854C /* PluginConfigController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PluginConfigController.m; path = macsrc/PluginConfigController.m; sourceTree = SOURCE_ROOT; };
-		2BD2E768077AF53E00657C69 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = English.lproj/Credits.rtf; sourceTree = "<group>"; };
-		71E9EBF1109F24E600E98D1D /* cfg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cfg.h; path = ../../../plugins/dfxvideo/cfg.h; sourceTree = SOURCE_ROOT; };
-		71E9EBF2109F24E600E98D1D /* draw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = draw.h; path = ../../../plugins/dfxvideo/draw.h; sourceTree = SOURCE_ROOT; };
-		71E9EBF3109F24E600E98D1D /* externals.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = externals.h; path = ../../../plugins/dfxvideo/externals.h; sourceTree = SOURCE_ROOT; };
-		71E9EBF4109F24E600E98D1D /* fps.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = fps.c; path = ../../../plugins/dfxvideo/fps.c; sourceTree = SOURCE_ROOT; };
-		71E9EBF5109F24E600E98D1D /* fps.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = fps.h; path = ../../../plugins/dfxvideo/fps.h; sourceTree = SOURCE_ROOT; };
-		71E9EBF6109F24E600E98D1D /* gpu.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = gpu.c; path = ../../../plugins/dfxvideo/gpu.c; sourceTree = SOURCE_ROOT; };
-		71E9EBF7109F24E600E98D1D /* gpu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gpu.h; path = ../../../plugins/dfxvideo/gpu.h; sourceTree = SOURCE_ROOT; };
-		71E9EBF8109F24E600E98D1D /* interp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../plugins/dfxvideo/interp.h; sourceTree = SOURCE_ROOT; };
-		71E9EBF9109F24E600E98D1D /* key.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = key.c; path = ../../../plugins/dfxvideo/key.c; sourceTree = SOURCE_ROOT; };
-		71E9EBFA109F24E600E98D1D /* key.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = key.h; path = ../../../plugins/dfxvideo/key.h; sourceTree = SOURCE_ROOT; };
-		71E9EBFB109F24E600E98D1D /* menu.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = menu.c; path = ../../../plugins/dfxvideo/menu.c; sourceTree = SOURCE_ROOT; };
-		71E9EBFC109F24E700E98D1D /* menu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = menu.h; path = ../../../plugins/dfxvideo/menu.h; sourceTree = SOURCE_ROOT; };
-		71E9EBFD109F24E700E98D1D /* prim.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = prim.c; path = ../../../plugins/dfxvideo/prim.c; sourceTree = SOURCE_ROOT; };
-		71E9EBFE109F24E700E98D1D /* prim.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = prim.h; path = ../../../plugins/dfxvideo/prim.h; sourceTree = SOURCE_ROOT; };
-		71E9EBFF109F24E700E98D1D /* soft.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = soft.c; path = ../../../plugins/dfxvideo/soft.c; sourceTree = SOURCE_ROOT; };
-		71E9EC00109F24E700E98D1D /* soft.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = soft.h; path = ../../../plugins/dfxvideo/soft.h; sourceTree = SOURCE_ROOT; };
-		71E9EC01109F24E700E98D1D /* swap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = swap.h; path = ../../../plugins/dfxvideo/swap.h; sourceTree = SOURCE_ROOT; };
-		71E9EC02109F24E700E98D1D /* zn.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = zn.c; path = ../../../plugins/dfxvideo/zn.c; sourceTree = SOURCE_ROOT; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		2BAF50910632BB1A00DB9A16 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				2B959E4406342D32000F2A2D /* OpenGL.framework in Frameworks */,
-				2BD7C777076E1FAB000F05ED /* GLUT.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		2B3E59FF062AAC1A001D796E = {
-			isa = PBXGroup;
-			children = (
-				71E9EBF0109F24B600E98D1D /* src */,
-				2BD2E2F40779F50B00657C69 /* macsrc */,
-				2BD2E818077AFB9F00657C69 /* English.lproj */,
-				2B3E5DED062B36A0001D796E /* NetSfPeopsSoftGPUInterface.nib */,
-				2B038D2206918AA80082466B /* Info.plist */,
-				2B3E5A0B062AAC34001D796E /* Frameworks */,
-				2B3E5A46062AACF3001D796E /* Products */,
-			);
-			sourceTree = "<group>";
-		};
-		2B3E5A0B062AAC34001D796E /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				2B959E4306342D32000F2A2D /* OpenGL.framework */,
-				2B51949E06B3D2D200744730 /* GLUT.framework */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
-		2B3E5A46062AACF3001D796E /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				2BAF50930632BB1A00DB9A16 /* PeopsSoftGL.psxplugin */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		2BD2E2F40779F50B00657C69 /* macsrc */ = {
-			isa = PBXGroup;
-			children = (
-				2BB260A60777462E00F6854C /* PluginConfigController.h */,
-				2BB260A70777462E00F6854C /* PluginConfigController.m */,
-				2B3E5DF0062B36FB001D796E /* PluginWindowController.h */,
-				2B3E5DF1062B36FB001D796E /* PluginWindowController.m */,
-				2B957EAE0635DFE400543905 /* PluginWindow.h */,
-				2B957EAF0635DFE400543905 /* PluginWindow.m */,
-				2BAF4FC90632967A00DB9A16 /* PluginGLView.h */,
-				2BAF4FCA0632967A00DB9A16 /* PluginGLView.m */,
-				2B3E5D64062B2CC1001D796E /* drawgl.m */,
-				2B57868106BE7B3700BBA288 /* ExtendedKeys.h */,
-			);
-			name = macsrc;
-			sourceTree = "<group>";
-		};
-		2BD2E818077AFB9F00657C69 /* English.lproj */ = {
-			isa = PBXGroup;
-			children = (
-				2BD2E828077AFC2C00657C69 /* NetSfPeopsSoftGPUConfig.nib */,
-				2BD2E767077AF53E00657C69 /* Credits.rtf */,
-				2B038C05069183300082466B /* InfoPlist.strings */,
-			);
-			name = English.lproj;
-			sourceTree = "<group>";
-		};
-		71E9EBF0109F24B600E98D1D /* src */ = {
-			isa = PBXGroup;
-			children = (
-				71E9EBF1109F24E600E98D1D /* cfg.h */,
-				71E9EBF2109F24E600E98D1D /* draw.h */,
-				71E9EBF3109F24E600E98D1D /* externals.h */,
-				71E9EBF4109F24E600E98D1D /* fps.c */,
-				71E9EBF5109F24E600E98D1D /* fps.h */,
-				71E9EBF6109F24E600E98D1D /* gpu.c */,
-				71E9EBF7109F24E600E98D1D /* gpu.h */,
-				71E9EBF8109F24E600E98D1D /* interp.h */,
-				71E9EBF9109F24E600E98D1D /* key.c */,
-				71E9EBFA109F24E600E98D1D /* key.h */,
-				71E9EBFB109F24E600E98D1D /* menu.c */,
-				71E9EBFC109F24E700E98D1D /* menu.h */,
-				71E9EBFD109F24E700E98D1D /* prim.c */,
-				71E9EBFE109F24E700E98D1D /* prim.h */,
-				71E9EBFF109F24E700E98D1D /* soft.c */,
-				71E9EC00109F24E700E98D1D /* soft.h */,
-				71E9EC01109F24E700E98D1D /* swap.h */,
-				71E9EC02109F24E700E98D1D /* zn.c */,
-			);
-			name = src;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXHeadersBuildPhase section */
-		2BAF508E0632BB1A00DB9A16 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				2B959DC406342C23000F2A2D /* PluginGLView.h in Headers */,
-				2B959DD006342C25000F2A2D /* PluginWindowController.h in Headers */,
-				2B57868206BE7B3700BBA288 /* ExtendedKeys.h in Headers */,
-				2BB260A80777462E00F6854C /* PluginConfigController.h in Headers */,
-				2B143C79078A0C6700AF745A /* PluginWindow.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXHeadersBuildPhase section */
-
-/* Begin PBXNativeTarget section */
-		2BAF50920632BB1A00DB9A16 /* gpuPeopsSoftGL */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 7170842C0FDFD328004F3EB4 /* Build configuration list for PBXNativeTarget "gpuPeopsSoftGL" */;
-			buildPhases = (
-				2BAF508E0632BB1A00DB9A16 /* Headers */,
-				2BAF508F0632BB1A00DB9A16 /* Resources */,
-				2BAF50900632BB1A00DB9A16 /* Sources */,
-				2BAF50910632BB1A00DB9A16 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = gpuPeopsSoftGL;
-			productName = gpuPeopsSoftGL;
-			productReference = 2BAF50930632BB1A00DB9A16 /* PeopsSoftGL.psxplugin */;
-			productType = "com.apple.product-type.bundle";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		2B3E5A03062AAC1A001D796E /* Project object */ = {
-			isa = PBXProject;
-			buildConfigurationList = 717084310FDFD328004F3EB4 /* Build configuration list for PBXProject "PeopsSoftGPU" */;
-			hasScannedForEncodings = 1;
-			mainGroup = 2B3E59FF062AAC1A001D796E;
-			productRefGroup = 2B3E5A46062AACF3001D796E /* Products */;
-			projectDirPath = "";
-			targets = (
-				2BAF50920632BB1A00DB9A16 /* gpuPeopsSoftGL */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
-		2BAF508F0632BB1A00DB9A16 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				2B959DE106342C31000F2A2D /* NetSfPeopsSoftGPUInterface.nib in Resources */,
-				2B038C07069183300082466B /* InfoPlist.strings in Resources */,
-				2B038D2306918AA80082466B /* Info.plist in Resources */,
-				2BD2E829077AFC2C00657C69 /* NetSfPeopsSoftGPUConfig.nib in Resources */,
-				2BD2E769077AF53E00657C69 /* Credits.rtf in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		2BAF50900632BB1A00DB9A16 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				2B959DC106342C22000F2A2D /* drawgl.m in Sources */,
-				2B959DCD06342C24000F2A2D /* PluginGLView.m in Sources */,
-				2B959DD506342C25000F2A2D /* PluginWindowController.m in Sources */,
-				2B957EB10635DFE400543905 /* PluginWindow.m in Sources */,
-				2BB260A90777462E00F6854C /* PluginConfigController.m in Sources */,
-				71E9EC06109F24E700E98D1D /* fps.c in Sources */,
-				71E9EC08109F24E700E98D1D /* gpu.c in Sources */,
-				71E9EC0B109F24E700E98D1D /* key.c in Sources */,
-				71E9EC0D109F24E700E98D1D /* menu.c in Sources */,
-				71E9EC0F109F24E700E98D1D /* prim.c in Sources */,
-				71E9EC11109F24E700E98D1D /* soft.c in Sources */,
-				71E9EC14109F24E700E98D1D /* zn.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXVariantGroup section */
-		2B038C05069183300082466B /* InfoPlist.strings */ = {
-			isa = PBXVariantGroup;
-			children = (
-				2B038C06069183300082466B /* English */,
-			);
-			name = InfoPlist.strings;
-			sourceTree = "<group>";
-		};
-		2BD2E767077AF53E00657C69 /* Credits.rtf */ = {
-			isa = PBXVariantGroup;
-			children = (
-				2BD2E768077AF53E00657C69 /* English */,
-			);
-			name = Credits.rtf;
-			sourceTree = "<group>";
-		};
-		2BD2E828077AFC2C00657C69 /* NetSfPeopsSoftGPUConfig.nib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				2B371FBB0773859200B1DC0B /* English */,
-			);
-			name = NetSfPeopsSoftGPUConfig.nib;
-			sourceTree = "<group>";
-		};
-/* End PBXVariantGroup section */
-
-/* Begin XCBuildConfiguration section */
-		7170842D0FDFD328004F3EB4 /* Development */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-				DEBUGGING_SYMBOLS = YES;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-				GCC_MODEL_TUNING = "";
-				GCC_OPTIMIZATION_LEVEL = 1;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "";
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					_MACGL,
-					_DARWIN,
-				);
-				GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
-				GCC_WARN_UNKNOWN_PRAGMAS = NO;
-				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
-				LIBRARY_STYLE = BUNDLE;
-				OPTIMIZATION_CFLAGS = "-finline-functions -finline-limit=1600 -fomit-frame-pointer -fno-exceptions -funroll-loops -falign-loops=16 -ffast-math";
-				OTHER_CFLAGS = "-finline-functions";
-				OTHER_LDFLAGS = (
-					"-framework",
-					Foundation,
-					"-framework",
-					AppKit,
-				);
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = PeopsSoftGL;
-				SECTORDER_FLAGS = "";
-				SYMROOT = ../../build;
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = psxplugin;
-			};
-			name = Development;
-		};
-		7170842E0FDFD328004F3EB4 /* Deployment */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = YES;
-				DEBUGGING_SYMBOLS = NO;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_MODEL_TUNING = "";
-				GCC_OPTIMIZATION_LEVEL = 3;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "";
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					_MACGL,
-					_DARWIN,
-				);
-				GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
-				GCC_WARN_UNKNOWN_PRAGMAS = NO;
-				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
-				LIBRARY_STYLE = BUNDLE;
-				OPTIMIZATION_CFLAGS = "-finline-functions -finline-limit=1600 -fomit-frame-pointer -fno-exceptions -funroll-loops -falign-loops=16 -ffast-math";
-				OTHER_LDFLAGS = (
-					"-framework",
-					Foundation,
-					"-framework",
-					AppKit,
-				);
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = PeopsSoftGL;
-				SECTORDER_FLAGS = "";
-				SYMROOT = ../../build;
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = psxplugin;
-				ZERO_LINK = NO;
-			};
-			name = Deployment;
-		};
-		717084320FDFD328004F3EB4 /* Development */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				GCC_MODEL_TUNING = "";
-				HEADER_SEARCH_PATHS = (
-					../../../plugins/dfxvideo,
-					../../../libpcsxcore,
-				);
-			};
-			name = Development;
-		};
-		717084330FDFD328004F3EB4 /* Deployment */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				GCC_MODEL_TUNING = "";
-				HEADER_SEARCH_PATHS = (
-					../../../plugins/dfxvideo,
-					../../../libpcsxcore,
-				);
-			};
-			name = Deployment;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		7170842C0FDFD328004F3EB4 /* Build configuration list for PBXNativeTarget "gpuPeopsSoftGL" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				7170842D0FDFD328004F3EB4 /* Development */,
-				7170842E0FDFD328004F3EB4 /* Deployment */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Development;
-		};
-		717084310FDFD328004F3EB4 /* Build configuration list for PBXProject "PeopsSoftGPU" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				717084320FDFD328004F3EB4 /* Development */,
-				717084330FDFD328004F3EB4 /* Deployment */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Development;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 2B3E5A03062AAC1A001D796E /* Project object */;
-}

pcsxr-1.9.92.tar.bz2/missing Deleted

@@ -1,367 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-
-scriptversion=2006-05-10.23
-
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
- echo 1>&2 "Try \`$0 --help' for more information"
- exit 1
-fi
-
-run=:
-sed_output='s/.* --output[ =]$[^ ]*$.*/\1/p'
-sed_minuso='s/.* -o $[^ ]*$.*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
- configure_ac=configure.ac
-else
- configure_ac=configure.in
-fi
-
-msg="missing on your system"
-
-case $1 in
---run)
- # Try to run requested program, and just exit if it succeeds.
- run=
- shift
- "$@" && exit 0
- # Exit code 63 means version mismatch. This often happens
- # when the user try to use an ancient version of a tool on
- # a file that requires a minimum version. In this case we
- # we should proceed has if the program had been absent, or
- # if --run hadn't been passed.
- if test $? = 63; then
- run=:
- msg="probably too old"
- fi
- ;;
-
- -h|--h|--he|--hel|--help)
- echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
- -h, --help display this help and exit
- -v, --version output version information and exit
- --run try to run the given command, and emulate it if it fails
-
-Supported PROGRAM values:
- aclocal touch file \`aclocal.m4'
- autoconf touch file \`configure'
- autoheader touch file \`config.h.in'
- autom4te touch the output file, or create a stub one
- automake touch all \`Makefile.in' files
- bison create \`y.tab.[ch]', if possible, from existing .[ch]
- flex create \`lex.yy.c', if possible, from existing .c
- help2man touch the output file
- lex create \`lex.yy.c', if possible, from existing .c
- makeinfo touch the output file
- tar try tar, gnutar, gtar, then tar without non-portable flags
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]
-
-Send bug reports to <bug-automake@gnu.org>."
- exit $?
- ;;
-
- -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
- echo "missing $scriptversion (GNU Automake)"
- exit $?
- ;;
-
- -*)
- echo 1>&2 "$0: Unknown \`$1' option"
- echo 1>&2 "Try \`$0 --help' for more information"
- exit 1
- ;;
-
-esac
-
-# Now exit if we have it, but it failed. Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).
-case $1 in
- lex|yacc)
- # Not GNU programs, they don't have --version.
- ;;
-
- tar)
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- exit 1
- fi
- ;;
-
- *)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- # Could not run --version or --help. This is probably someone
- # running `$TOOL --version' or `$TOOL --help' to check whether
- # $TOOL exists and not knowing $TOOL uses missing.
- exit 1
- fi
- ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $1 in
- aclocal*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acinclude.m4' or \`${configure_ac}'. You might want
- to install the \`Automake' and \`Perl' packages. Grab them from
- any GNU archive site."
- touch aclocal.m4
- ;;
-
- autoconf)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`${configure_ac}'. You might want to install the
- \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
- archive site."
- touch configure
- ;;
-
- autoheader)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acconfig.h' or \`${configure_ac}'. You might want
- to install the \`Autoconf' and \`GNU m4' packages. Grab them
- from any GNU archive site."
- files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER($[^)]*$).*/\1/p' ${configure_ac}`
- test -z "$files" && files="config.h"
- touch_files=
- for f in $files; do
- case $f in
- *:*) touch_files="$touch_files "`echo "$f" |
-				 sed -e 's/^[^:]*://' -e 's/:.*//'`;;
- *) touch_files="$touch_files $f.in";;
- esac
- done
- touch $touch_files
- ;;
-
- automake*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
- You might want to install the \`Automake' and \`Perl' packages.
- Grab them from any GNU archive site."
- find . -type f -name Makefile.am -print |
-	 sed 's/\.am$/.in/' |
-	 while read f; do touch "$f"; done
- ;;
-
- autom4te)
- echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
- You might have modified some files without having the
- proper tools for further handling them.
- You can get \`$1' as part of \`Autoconf' from any GNU
- archive site."
-
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
-	touch $file
- else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "# $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
- fi
- ;;
-
- bison|yacc)
- echo 1>&2 "\
-WARNING: \`$1' $msg. You should only need it if
- you modified a \`.y' file. You may need the \`Bison' package
- in order for those modifications to take effect. You can get
- \`Bison' from any GNU archive site."
- rm -f y.tab.c y.tab.h
- if test $# -ne 1; then
- eval LASTARG="\${$#}"
-	case $LASTARG in
-	*.y)
-	 SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	 if test -f "$SRCFILE"; then
-	 cp "$SRCFILE" y.tab.c
-	 fi
-	 SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	 if test -f "$SRCFILE"; then
-	 cp "$SRCFILE" y.tab.h
-	 fi
-	 ;;
-	esac
- fi
- if test ! -f y.tab.h; then
-	echo >y.tab.h
- fi
- if test ! -f y.tab.c; then
-	echo 'main() { return 0; }' >y.tab.c
- fi
- ;;
-
- lex|flex)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.l' file. You may need the \`Flex' package
- in order for those modifications to take effect. You can get
- \`Flex' from any GNU archive site."
- rm -f lex.yy.c
- if test $# -ne 1; then
- eval LASTARG="\${$#}"
-	case $LASTARG in
-	*.l)
-	 SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	 if test -f "$SRCFILE"; then
-	 cp "$SRCFILE" lex.yy.c
-	 fi
-	 ;;
-	esac
- fi
- if test ! -f lex.yy.c; then
-	echo 'main() { return 0; }' >lex.yy.c
- fi
- ;;
-
- help2man)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
-	 you modified a dependency of a manual page. You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect. You can get \`Help2man' from any GNU archive site."
-
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
-	touch $file
- else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit 1
- fi
- ;;
-
- makeinfo)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.texi' or \`.texinfo' file, or any other file
- indirectly affecting the aspect of the manual. The spurious
- call might also be the consequence of using a buggy \`make' (AIX,
- DU, IRIX). You might want to install the \`Texinfo' package or
- the \`GNU make' package. Grab either from any GNU archive site."
- # The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -z "$file"; then
- # ... or it is the one specified with @setfilename ...
- infile=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'`
- file=`sed -n '
-	/^@setfilename/{
-	 s/.* $[^ ]*$ *$/\1/
-	 p
-	 q
-	}' $infile`
- # ... or it is derived from the source name (dir/f.texi becomes f.info)
- test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
- fi
- # If the file does not exist, the user really needs makeinfo;
- # let's fail without touching anything.
- test -f $file || exit 1
- touch $file
- ;;
-
- tar)
- shift
-
- # We have already tried tar in the generic part.
- # Look for gnutar/gtar before invocation to avoid ugly error
- # messages.
- if (gnutar --version > /dev/null 2>&1); then
- gnutar "$@" && exit 0
- fi
- if (gtar --version > /dev/null 2>&1); then
- gtar "$@" && exit 0
- fi
- firstarg="$1"
- if shift; then
-	case $firstarg in
-	*o*)
-	 firstarg=`echo "$firstarg" | sed s/o//`
-	 tar "$firstarg" "$@" && exit 0
-	 ;;
-	esac
-	case $firstarg in
-	*h*)
-	 firstarg=`echo "$firstarg" | sed s/h//`
-	 tar "$firstarg" "$@" && exit 0
-	 ;;
-	esac
- fi
-
- echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
- You may want to install GNU tar or Free paxutils, or check the
- command line arguments."
- exit 1
- ;;
-
- *)
- echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
- You might have modified some files without having the
- proper tools for further handling them. Check the \`README' file,
- it often tells you about the needed prerequisites for installing
- this package. You may also peek at any GNU archive site, in case
- some other package would contain this missing \`$1' program."
- exit 1
- ;;
-esac
-
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:

pcsxr-1.9.92.tar.bz2/mkinstalldirs Deleted

@@ -1,161 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-
-scriptversion=2006-05-11.19
-
-# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain.
-#
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-nl='
-'
-IFS=" ""	$nl"
-errstatus=0
-dirmode=
-
-usage="\
-Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
-
-Create each directory DIR (with mode MODE, if specified), including all
-leading file name components.
-
-Report bugs to <bug-automake@gnu.org>."
-
-# process command line arguments
-while test $# -gt 0 ; do
- case $1 in
- -h | --help | --h*) # -h for help
- echo "$usage"
- exit $?
- ;;
- -m) # -m PERM arg
- shift
- test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
- dirmode=$1
- shift
- ;;
- --version)
- echo "$0 $scriptversion"
- exit $?
- ;;
- --) # stop option processing
- shift
- break
- ;;
- -*) # unknown option
- echo "$usage" 1>&2
- exit 1
- ;;
- *) # first non-opt arg
- break
- ;;
- esac
-done
-
-for file
-do
- if test -d "$file"; then
- shift
- else
- break
- fi
-done
-
-case $# in
- 0) exit 0 ;;
-esac
-
-# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
-# mkdir -p a/c at the same time, both will detect that a is missing,
-# one will create a, then the other will try to create a and die with
-# a "File exists" error. This is a problem when calling mkinstalldirs
-# from a parallel make. We use --version in the probe to restrict
-# ourselves to GNU mkdir, which is thread-safe.
-case $dirmode in
- '')
- if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
- echo "mkdir -p -- $*"
- exec mkdir -p -- "$@"
- else
- # On NextStep and OpenStep, the `mkdir' command does not
- # recognize any option. It will interpret all options as
- # directories to create, and then abort because `.' already
- # exists.
- test -d ./-p && rmdir ./-p
- test -d ./--version && rmdir ./--version
- fi
- ;;
- *)
- if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
- test ! -d ./--version; then
- echo "mkdir -m $dirmode -p -- $*"
- exec mkdir -m "$dirmode" -p -- "$@"
- else
- # Clean up after NextStep and OpenStep mkdir.
- for d in ./-m ./-p ./--version "./$dirmode";
- do
- test -d $d && rmdir $d
- done
- fi
- ;;
-esac
-
-for file
-do
- case $file in
- /*) pathcomp=/ ;;
- *) pathcomp= ;;
- esac
- oIFS=$IFS
- IFS=/
- set fnord $file
- shift
- IFS=$oIFS
-
- for d
- do
- test "x$d" = x && continue
-
- pathcomp=$pathcomp$d
- case $pathcomp in
- -*) pathcomp=./$pathcomp ;;
- esac
-
- if test ! -d "$pathcomp"; then
- echo "mkdir $pathcomp"
-
- mkdir "$pathcomp" || lasterr=$?
-
- if test ! -d "$pathcomp"; then
-	errstatus=$lasterr
- else
-	if test ! -z "$dirmode"; then
-	 echo "chmod $dirmode $pathcomp"
-	 lasterr=
-	 chmod "$dirmode" "$pathcomp" || lasterr=$?
-
-	 if test ! -z "$lasterr"; then
-	 errstatus=$lasterr
-	 fi
-	fi
- fi
- fi
-
- pathcomp=$pathcomp/
- done
-done
-
-exit $errstatus
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:

pcsxr-1.9.92.tar.bz2/pixmaps/Makefile.in Deleted

@@ -1,424 +0,0 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-subdir = pixmaps
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(icondir)" "$(DESTDIR)$(pixmapdir)"
-iconDATA_INSTALL = $(INSTALL_DATA)
-pixmapDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(icon_DATA) $(pixmap_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCAS = @CCAS@
-CCASDEPMODE = @CCASDEPMODE@
-CCASFLAGS = @CCASFLAGS@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GLADE2_CFLAGS = @GLADE2_CFLAGS@
-GLADE2_LIBS = @GLADE2_LIBS@
-GLIB2_CFLAGS = @GLIB2_CFLAGS@
-GLIB2_LIBS = @GLIB2_LIBS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK2_CFLAGS = @GTK2_CFLAGS@
-GTK2_LIBS = @GTK2_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
-LIBCDIO_LIBS = @LIBCDIO_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NASM = @NASM@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PEOPSXGL = @PEOPSXGL@
-PKG_CONFIG = @PKG_CONFIG@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_CONFIG = @SDL_CONFIG@
-SDL_LIBS = @SDL_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-pixmapdir = "$(datadir)/pcsx"
-pixmap_DATA = pcsx.jpg
-icondir = "$(datadir)/pixmaps"
-icon_DATA = pcsx-icon.png
-EXTRA_DIST = pcsx.jpg pcsx-icon.png
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  pixmaps/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  pixmaps/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-iconDATA: $(icon_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
-	@list='$(icon_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \
-	  $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \
-	done
-
-uninstall-iconDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(icon_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(icondir)/$$f"; \
-	done
-install-pixmapDATA: $(pixmap_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(pixmapdir)" || $(MKDIR_P) "$(DESTDIR)$(pixmapdir)"
-	@list='$(pixmap_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(pixmapDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pixmapdir)/$$f'"; \
-	  $(pixmapDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pixmapdir)/$$f"; \
-	done
-
-uninstall-pixmapDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(pixmap_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(pixmapdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(pixmapdir)/$$f"; \
-	done
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(icondir)" "$(DESTDIR)$(pixmapdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am: install-iconDATA install-pixmapDATA
-
-install-dvi: install-dvi-am
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-info: install-info-am
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-iconDATA uninstall-pixmapDATA
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-iconDATA install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pixmapDATA install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am uninstall uninstall-am uninstall-iconDATA \
-	uninstall-pixmapDATA
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

pcsxr-1.9.92.tar.bz2/pixmaps/pcsx-icon.png Deleted

pcsxr-1.9.92.tar.bz2/pixmaps/pcsx.jpg Deleted

pcsxr-1.9.92.tar.bz2/plugins/dfcdrom/Makefile.in Deleted

@@ -1,665 +0,0 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-@USE_LIBCDIO_TRUE@am__append_1 = -DUSE_LIBCDIO=1 $(LIBCDIO_CFLAGS)
-@USE_LIBCDIO_TRUE@am__append_2 = $(LIBCDIO_LIBS)
-bin_PROGRAMS = cfgDFCdrom$(EXEEXT)
-subdir = plugins/dfcdrom
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
-	"$(DESTDIR)$(gladedir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(lib_LTLIBRARIES)
-libDFCdrom_la_LIBADD =
-am_libDFCdrom_la_OBJECTS = libDFCdrom_la-cdr.lo libDFCdrom_la-cfg.lo \
-	libDFCdrom_la-cdr-linux.lo libDFCdrom_la-cdr-null.lo \
-	libDFCdrom_la-cdr-libcdio.lo libDFCdrom_la-util.lo
-libDFCdrom_la_OBJECTS = $(am_libDFCdrom_la_OBJECTS)
-libDFCdrom_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libDFCdrom_la_CFLAGS) \
-	$(CFLAGS) $(libDFCdrom_la_LDFLAGS) $(LDFLAGS) -o $@
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS)
-am_cfgDFCdrom_OBJECTS = main.$(OBJEXT)
-cfgDFCdrom_OBJECTS = $(am_cfgDFCdrom_OBJECTS)
-am__DEPENDENCIES_1 =
-cfgDFCdrom_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(libDFCdrom_la_SOURCES) $(cfgDFCdrom_SOURCES)
-DIST_SOURCES = $(libDFCdrom_la_SOURCES) $(cfgDFCdrom_SOURCES)
-gladeDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(glade_DATA)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCAS = @CCAS@
-CCASDEPMODE = @CCASDEPMODE@
-CCASFLAGS = @CCASFLAGS@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GLADE2_CFLAGS = @GLADE2_CFLAGS@
-GLADE2_LIBS = @GLADE2_LIBS@
-GLIB2_CFLAGS = @GLIB2_CFLAGS@
-GLIB2_LIBS = @GLIB2_LIBS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK2_CFLAGS = @GTK2_CFLAGS@
-GTK2_LIBS = @GTK2_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
-LIBCDIO_LIBS = @LIBCDIO_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NASM = @NASM@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PEOPSXGL = @PEOPSXGL@
-PKG_CONFIG = @PKG_CONFIG@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_CONFIG = @SDL_CONFIG@
-SDL_LIBS = @SDL_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @libdir@/games/psemu/
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@/games/psemu/
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-lib_LTLIBRARIES = libDFCdrom.la
-libDFCdrom_la_SOURCES = \
-	cdr.c \
-	cdr.h \
-	cfg.c \
-	cdr-linux.c \
-	cdr-null.c \
-	cdr-libcdio.c \
-	util.c
-
-libDFCdrom_la_CFLAGS = $(am__append_1)
-libDFCdrom_la_LDFLAGS = -module -avoid-version -lpthread \
-	$(am__append_2)
-INCLUDES = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \
-	-DLOCALE_DIR=\"${datadir}/locale/\" \
-	-DDATADIR=\"${datadir}/psemu/\" \
-	$(GTK2_CFLAGS) $(GLADE2_CFLAGS) \
-	-I../../libpcsxcore -I../../include
-
-cfgDFCdrom_SOURCES = cdrcfg-0.1df/main.c
-cfgDFCdrom_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS)
-glade_DATA = cdrcfg-0.1df/dfcdrom.glade2
-gladedir = $(datadir)/psemu/
-EXTRA_DIST = $(glade_DATA)
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
-	@for dep in $?; do \
-	 case '$(am__configure_deps)' in \
-	 *$$dep*) \
-	 ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	 && { if test -f $@; then exit 0; else break; fi; }; \
-	 exit 1;; \
-	 esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/dfcdrom/Makefile'; \
-	cd $(top_srcdir) && \
-	 $(AUTOMAKE) --gnu plugins/dfcdrom/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	 *config.status*) \
-	 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	 *) \
-	 echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	 if test -f $$p; then \
-	 f=$(am__strip_dir) \
-	 echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	 $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
-	 else :; fi; \
-	done
-
-uninstall-libLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	 p=$(am__strip_dir) \
-	 echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	 $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
-	done
-
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	 dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	 test "$$dir" != "$$p" || dir=.; \
-	 echo "rm -f \"$${dir}/so_locations\""; \
-	 rm -f "$${dir}/so_locations"; \
-	done
-libDFCdrom.la: $(libDFCdrom_la_OBJECTS) $(libDFCdrom_la_DEPENDENCIES) 
-	$(libDFCdrom_la_LINK) -rpath $(libdir) $(libDFCdrom_la_OBJECTS) $(libDFCdrom_la_LIBADD) $(LIBS)
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	 p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	 if test -f $$p \
-	 || test -f $$p1 \
-	 ; then \
-	 f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	 echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	 $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-	 else :; fi; \
-	done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	 f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	 echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	 rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	done
-
-clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	 f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	 echo " rm -f $$p $$f"; \
-	 rm -f $$p $$f ; \
-	done
-cfgDFCdrom$(EXEEXT): $(cfgDFCdrom_OBJECTS) $(cfgDFCdrom_DEPENDENCIES) 
-	@rm -f cfgDFCdrom$(EXEEXT)
-	$(LINK) $(cfgDFCdrom_OBJECTS) $(cfgDFCdrom_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDFCdrom_la-cdr-libcdio.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDFCdrom_la-cdr-linux.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDFCdrom_la-cdr-null.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDFCdrom_la-cdr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDFCdrom_la-cfg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDFCdrom_la-util.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-libDFCdrom_la-cdr.lo: cdr.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDFCdrom_la_CFLAGS) $(CFLAGS) -MT libDFCdrom_la-cdr.lo -MD -MP -MF $(DEPDIR)/libDFCdrom_la-cdr.Tpo -c -o libDFCdrom_la-cdr.lo `test -f 'cdr.c' || echo '$(srcdir)/'`cdr.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libDFCdrom_la-cdr.Tpo $(DEPDIR)/libDFCdrom_la-cdr.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cdr.c' object='libDFCdrom_la-cdr.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDFCdrom_la_CFLAGS) $(CFLAGS) -c -o libDFCdrom_la-cdr.lo `test -f 'cdr.c' || echo '$(srcdir)/'`cdr.c
-
-libDFCdrom_la-cfg.lo: cfg.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDFCdrom_la_CFLAGS) $(CFLAGS) -MT libDFCdrom_la-cfg.lo -MD -MP -MF $(DEPDIR)/libDFCdrom_la-cfg.Tpo -c -o libDFCdrom_la-cfg.lo `test -f 'cfg.c' || echo '$(srcdir)/'`cfg.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libDFCdrom_la-cfg.Tpo $(DEPDIR)/libDFCdrom_la-cfg.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cfg.c' object='libDFCdrom_la-cfg.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDFCdrom_la_CFLAGS) $(CFLAGS) -c -o libDFCdrom_la-cfg.lo `test -f 'cfg.c' || echo '$(srcdir)/'`cfg.c
-
-libDFCdrom_la-cdr-linux.lo: cdr-linux.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDFCdrom_la_CFLAGS) $(CFLAGS) -MT libDFCdrom_la-cdr-linux.lo -MD -MP -MF $(DEPDIR)/libDFCdrom_la-cdr-linux.Tpo -c -o libDFCdrom_la-cdr-linux.lo `test -f 'cdr-linux.c' || echo '$(srcdir)/'`cdr-linux.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libDFCdrom_la-cdr-linux.Tpo $(DEPDIR)/libDFCdrom_la-cdr-linux.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cdr-linux.c' object='libDFCdrom_la-cdr-linux.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDFCdrom_la_CFLAGS) $(CFLAGS) -c -o libDFCdrom_la-cdr-linux.lo `test -f 'cdr-linux.c' || echo '$(srcdir)/'`cdr-linux.c
-
-libDFCdrom_la-cdr-null.lo: cdr-null.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDFCdrom_la_CFLAGS) $(CFLAGS) -MT libDFCdrom_la-cdr-null.lo -MD -MP -MF $(DEPDIR)/libDFCdrom_la-cdr-null.Tpo -c -o libDFCdrom_la-cdr-null.lo `test -f 'cdr-null.c' || echo '$(srcdir)/'`cdr-null.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libDFCdrom_la-cdr-null.Tpo $(DEPDIR)/libDFCdrom_la-cdr-null.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cdr-null.c' object='libDFCdrom_la-cdr-null.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDFCdrom_la_CFLAGS) $(CFLAGS) -c -o libDFCdrom_la-cdr-null.lo `test -f 'cdr-null.c' || echo '$(srcdir)/'`cdr-null.c
-
-libDFCdrom_la-cdr-libcdio.lo: cdr-libcdio.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDFCdrom_la_CFLAGS) $(CFLAGS) -MT libDFCdrom_la-cdr-libcdio.lo -MD -MP -MF $(DEPDIR)/libDFCdrom_la-cdr-libcdio.Tpo -c -o libDFCdrom_la-cdr-libcdio.lo `test -f 'cdr-libcdio.c' || echo '$(srcdir)/'`cdr-libcdio.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libDFCdrom_la-cdr-libcdio.Tpo $(DEPDIR)/libDFCdrom_la-cdr-libcdio.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cdr-libcdio.c' object='libDFCdrom_la-cdr-libcdio.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDFCdrom_la_CFLAGS) $(CFLAGS) -c -o libDFCdrom_la-cdr-libcdio.lo `test -f 'cdr-libcdio.c' || echo '$(srcdir)/'`cdr-libcdio.c
-
-libDFCdrom_la-util.lo: util.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDFCdrom_la_CFLAGS) $(CFLAGS) -MT libDFCdrom_la-util.lo -MD -MP -MF $(DEPDIR)/libDFCdrom_la-util.Tpo -c -o libDFCdrom_la-util.lo `test -f 'util.c' || echo '$(srcdir)/'`util.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libDFCdrom_la-util.Tpo $(DEPDIR)/libDFCdrom_la-util.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='util.c' object='libDFCdrom_la-util.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDFCdrom_la_CFLAGS) $(CFLAGS) -c -o libDFCdrom_la-util.lo `test -f 'util.c' || echo '$(srcdir)/'`util.c
-
-main.o: cdrcfg-0.1df/main.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT main.o -MD -MP -MF $(DEPDIR)/main.Tpo -c -o main.o `test -f 'cdrcfg-0.1df/main.c' || echo '$(srcdir)/'`cdrcfg-0.1df/main.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/main.Tpo $(DEPDIR)/main.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cdrcfg-0.1df/main.c' object='main.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o main.o `test -f 'cdrcfg-0.1df/main.c' || echo '$(srcdir)/'`cdrcfg-0.1df/main.c
-
-main.obj: cdrcfg-0.1df/main.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT main.obj -MD -MP -MF $(DEPDIR)/main.Tpo -c -o main.obj `if test -f 'cdrcfg-0.1df/main.c'; then $(CYGPATH_W) 'cdrcfg-0.1df/main.c'; else $(CYGPATH_W) '$(srcdir)/cdrcfg-0.1df/main.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/main.Tpo $(DEPDIR)/main.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cdrcfg-0.1df/main.c' object='main.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o main.obj `if test -f 'cdrcfg-0.1df/main.c'; then $(CYGPATH_W) 'cdrcfg-0.1df/main.c'; else $(CYGPATH_W) '$(srcdir)/cdrcfg-0.1df/main.c'; fi`
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-gladeDATA: $(glade_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)"
-	@list='$(glade_DATA)'; for p in $$list; do \
-	 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	 f=$(am__strip_dir) \
-	 echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \
-	 $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \
-	done
-
-uninstall-gladeDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(glade_DATA)'; for p in $$list; do \
-	 f=$(am__strip_dir) \
-	 echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \
-	 rm -f "$(DESTDIR)$(gladedir)/$$f"; \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	 done | \
-	 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	 END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	 done | \
-	 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	 END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	 test -n "$$unique" || unique=$$empty_fix; \
-	 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	 $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	 done | \
-	 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	 END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	 $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	 && cd $(top_srcdir) \
-	 && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	 dist_files=`for file in $$list; do echo $$file; done | \
-	 sed -e "s|^$$srcdirstrip/||;t" \
-	 -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	 */*) $(MKDIR_P) `echo "$$dist_files" | \
-			 sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			 sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	 if test -d $$d/$$file; then \
-	 dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	 cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	 fi; \
-	 cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	 else \
-	 test -f $(distdir)/$$file \
-	 || cp -p $$d/$$file $(distdir)/$$file \
-	 || exit 1; \
-	 fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA)
-install-binPROGRAMS: install-libLTLIBRARIES
-
-installdirs:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(gladedir)"; do \
-	 test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	 `test -z '$(STRIP)' || \
-	 echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
-	clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am: install-gladeDATA
-
-install-dvi: install-dvi-am
-
-install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
-
-install-html: install-html-am
-
-install-info: install-info-am
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS uninstall-gladeDATA \
-	uninstall-libLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libLTLIBRARIES clean-libtool ctags \
-	distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-gladeDATA install-html \
-	install-html-am install-info install-info-am \
-	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-gladeDATA uninstall-libLTLIBRARIES
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

pcsxr-1.9.92.tar.bz2/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2 Deleted

@@ -1,324 +0,0 @@
-<?xml version="1.0"?>
-<glade-interface>
- 
- 
- <widget class="GtkDialog" id="CfgWnd">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <property name="title" translatable="yes">CDR configuration</property>
- <property name="modal">True</property>
- <property name="window_position">center</property>
- <property name="type_hint">normal</property>
- <property name="has_separator">False</property>
- <signal name="show" handler="on_cfg_dialog_show"/>
- <child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox1">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <widget class="GtkVBox" id="vbox1">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <widget class="GtkFrame" id="frame1">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <child>
- <widget class="GtkHBox" id="hbox5">
- <property name="visible">True</property>
- <property name="border_width">10</property>
- <child>
- <widget class="GtkComboBoxEntry" id="cddev_comboboxentry">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Choose your CD-ROM device or type its path if it's not listed</property>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="cdr_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Select CD-ROM device</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkFrame" id="frame2">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <child>
- <widget class="GtkVBox" id="vbox2">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <widget class="GtkHBox" id="hbox1">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <child>
- <widget class="GtkLabel" id="readmode_label">
- <property name="visible">True</property>
- <property name="xpad">5</property>
- <property name="ypad">5</property>
- <property name="label" translatable="yes">Select read mode:</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBox" id="readmode_combobox">
- <property name="visible">True</property>
- <property name="items" translatable="yes">Normal (No Cache)
-Threaded - Faster (With Cache)</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHSeparator" id="hseparator1">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox2">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <property name="spacing">5</property>
- <child>
- <widget class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Cache Size (Def. 64):</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkSpinButton" id="spinCacheSize">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">32 32 2048 1 16 0</property>
- <property name="climb_rate">1</property>
- <property name="numeric">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHSeparator" id="hseparator2">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox4">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <property name="spacing">5</property>
- <child>
- <widget class="GtkLabel" id="label7">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Spindown Time:</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBox" id="comboSpinDown">
- <property name="visible">True</property>
- <property name="items" translatable="yes">Default
-125ms
-250ms
-500ms
-1s
-2s
-4s
-8s
-16s
-32s
-1min
-2min
-4min
-8min
-16min
-32min</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHSeparator" id="hseparator3">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">5</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox3">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <property name="spacing">5</property>
- <child>
- <widget class="GtkLabel" id="label5">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Cdrom Speed (Def. 0 = MAX):</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkSpinButton" id="spinCdrSpeed">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">0 0 100 1 4 0</property>
- <property name="climb_rate">1</property>
- <property name="numeric">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">6</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHSeparator" id="cfg_hseparator">
- <property name="visible">True</property>
- <accessibility>
- <atkproperty name="AtkObject::accessible-name" translatable="yes">hseparator</atkproperty>
- </accessibility>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">7</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="subQ_button">
- <property name="label" translatable="yes">Enable subchannel read</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="border_width">10</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">8</property>
- </packing>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="options_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Options</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="cfg_dialog-action_area">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <widget class="GtkButton" id="cfg_closebutton">
- <property name="label">gtk-close</property>
- <property name="response_id">-6</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- <signal name="clicked" handler="on_cfg_cancelbutton_clicked"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
-</glade-interface>

pcsxr-1.9.92.tar.bz2/plugins/dfinput/Makefile.in Deleted

@@ -1,600 +0,0 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-bin_PROGRAMS = cfgDFInput$(EXEEXT)
-subdir = plugins/dfinput
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
-	"$(DESTDIR)$(gladedir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(lib_LTLIBRARIES)
-libDFInput_la_LIBADD =
-am_libDFInput_la_OBJECTS = cfg.lo pad.lo sdljoy.lo xkb.lo analog.lo
-libDFInput_la_OBJECTS = $(am_libDFInput_la_OBJECTS)
-libDFInput_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(libDFInput_la_LDFLAGS) $(LDFLAGS) -o $@
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS)
-am_cfgDFInput_OBJECTS = cfg-gtk2.$(OBJEXT)
-cfgDFInput_OBJECTS = $(am_cfgDFInput_OBJECTS)
-am__DEPENDENCIES_1 =
-cfgDFInput_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-cfgDFInput_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(cfgDFInput_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(libDFInput_la_SOURCES) $(cfgDFInput_SOURCES)
-DIST_SOURCES = $(libDFInput_la_SOURCES) $(cfgDFInput_SOURCES)
-gladeDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(glade_DATA)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCAS = @CCAS@
-CCASDEPMODE = @CCASDEPMODE@
-CCASFLAGS = @CCASFLAGS@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GLADE2_CFLAGS = @GLADE2_CFLAGS@
-GLADE2_LIBS = @GLADE2_LIBS@
-GLIB2_CFLAGS = @GLIB2_CFLAGS@
-GLIB2_LIBS = @GLIB2_LIBS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK2_CFLAGS = @GTK2_CFLAGS@
-GTK2_LIBS = @GTK2_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
-LIBCDIO_LIBS = @LIBCDIO_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NASM = @NASM@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PEOPSXGL = @PEOPSXGL@
-PKG_CONFIG = @PKG_CONFIG@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_CONFIG = @SDL_CONFIG@
-SDL_LIBS = @SDL_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @libdir@/games/psemu/
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@/games/psemu/
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-lib_LTLIBRARIES = libDFInput.la
-libDFInput_la_SOURCES = cfg.c pad.c pad.h sdljoy.c xkb.c analog.c
-libDFInput_la_LDFLAGS = -module -avoid-version -lpthread -lX11 \
-	`$(SDL_CONFIG) --libs` -L/usr/X11R6/lib64 -L/usr/X11R6/lib
-
-INCLUDES = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \
-	-DLOCALE_DIR=\"${datadir}/locale/\" \
-	-DDATADIR=\"${datadir}/psemu/\" \
-	$(GTK2_CFLAGS) $(GLADE2_CFLAGS) -I/usr/X11R6/include \
-	-I../../include -I../../libpcsxcore $(SDL_CFLAGS)
-
-cfgDFInput_SOURCES = cfg-gtk2.c pad.h
-cfgDFInput_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS)
-cfgDFInput_LDFLAGS = $(SDL_LIBS) -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
-glade_DATA = dfinput.glade2
-gladedir = $(datadir)/psemu/
-EXTRA_DIST = $(glade_DATA)
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
-	@for dep in $?; do \
-	 case '$(am__configure_deps)' in \
-	 *$$dep*) \
-	 ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	 && { if test -f $@; then exit 0; else break; fi; }; \
-	 exit 1;; \
-	 esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/dfinput/Makefile'; \
-	cd $(top_srcdir) && \
-	 $(AUTOMAKE) --gnu plugins/dfinput/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	 *config.status*) \
-	 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	 *) \
-	 echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	 if test -f $$p; then \
-	 f=$(am__strip_dir) \
-	 echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	 $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
-	 else :; fi; \
-	done
-
-uninstall-libLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	 p=$(am__strip_dir) \
-	 echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	 $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
-	done
-
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	 dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	 test "$$dir" != "$$p" || dir=.; \
-	 echo "rm -f \"$${dir}/so_locations\""; \
-	 rm -f "$${dir}/so_locations"; \
-	done
-libDFInput.la: $(libDFInput_la_OBJECTS) $(libDFInput_la_DEPENDENCIES) 
-	$(libDFInput_la_LINK) -rpath $(libdir) $(libDFInput_la_OBJECTS) $(libDFInput_la_LIBADD) $(LIBS)
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	 p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	 if test -f $$p \
-	 || test -f $$p1 \
-	 ; then \
-	 f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	 echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	 $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-	 else :; fi; \
-	done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	 f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	 echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	 rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	done
-
-clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	 f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	 echo " rm -f $$p $$f"; \
-	 rm -f $$p $$f ; \
-	done
-cfgDFInput$(EXEEXT): $(cfgDFInput_OBJECTS) $(cfgDFInput_DEPENDENCIES) 
-	@rm -f cfgDFInput$(EXEEXT)
-	$(cfgDFInput_LINK) $(cfgDFInput_OBJECTS) $(cfgDFInput_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/analog.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfg-gtk2.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pad.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sdljoy.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xkb.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-gladeDATA: $(glade_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)"
-	@list='$(glade_DATA)'; for p in $$list; do \
-	 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	 f=$(am__strip_dir) \
-	 echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \
-	 $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \
-	done
-
-uninstall-gladeDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(glade_DATA)'; for p in $$list; do \
-	 f=$(am__strip_dir) \
-	 echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \
-	 rm -f "$(DESTDIR)$(gladedir)/$$f"; \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	 done | \
-	 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	 END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	 done | \
-	 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	 END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	 test -n "$$unique" || unique=$$empty_fix; \
-	 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	 $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	 done | \
-	 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	 END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	 $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	 && cd $(top_srcdir) \
-	 && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	 dist_files=`for file in $$list; do echo $$file; done | \
-	 sed -e "s|^$$srcdirstrip/||;t" \
-	 -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	 */*) $(MKDIR_P) `echo "$$dist_files" | \
-			 sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			 sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	 if test -d $$d/$$file; then \
-	 dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	 cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	 fi; \
-	 cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	 else \
-	 test -f $(distdir)/$$file \
-	 || cp -p $$d/$$file $(distdir)/$$file \
-	 || exit 1; \
-	 fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA)
-install-binPROGRAMS: install-libLTLIBRARIES
-
-installdirs:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(gladedir)"; do \
-	 test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	 `test -z '$(STRIP)' || \
-	 echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
-	clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am: install-gladeDATA
-
-install-dvi: install-dvi-am
-
-install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
-
-install-html: install-html-am
-
-install-info: install-info-am
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS uninstall-gladeDATA \
-	uninstall-libLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libLTLIBRARIES clean-libtool ctags \
-	distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-gladeDATA install-html \
-	install-html-am install-info install-info-am \
-	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-gladeDATA uninstall-libLTLIBRARIES
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

pcsxr-1.9.92.tar.bz2/plugins/dfinput/cfg-gtk2.c Deleted

@@ -1,738 +0,0 @@
-/*
- * Copyright (c) 2009, Wei Mingzhi <whistler@openoffice.org>.
- * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses>.
- */
-
-#include "cfg.c"
-
-#include <time.h>
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-#include <glade/glade.h>
-
-GtkWidget *MainWindow;
-
-const int DPad[DKEY_TOTAL] = {
-	DKEY_UP,
-	DKEY_DOWN,
-	DKEY_LEFT,
-	DKEY_RIGHT,
-	DKEY_CROSS,
-	DKEY_CIRCLE,
-	DKEY_SQUARE,
-	DKEY_TRIANGLE,
-	DKEY_L1,
-	DKEY_R1,
-	DKEY_L2,
-	DKEY_R2,
-	DKEY_SELECT,
-	DKEY_START,
-	DKEY_L3,
-	DKEY_R3
-};
-
-const char *DPadText[DKEY_TOTAL] = {
-	N_("D-Pad Up"),
-	N_("D-Pad Down"),
-	N_("D-Pad Left"),
-	N_("D-Pad Right"),
-	N_("Cross"),
-	N_("Circle"),
-	N_("Square"),
-	N_("Triangle"),
-	N_("L1"),
-	N_("R1"),
-	N_("L2"),
-	N_("R2"),
-	N_("Select"),
-	N_("Start"),
-	N_("L3"),
-	N_("R3")
-};
-
-const char *AnalogText[] = {
-	N_("L-Stick Right"),
-	N_("L-Stick Left"),
-	N_("L-Stick Down"),
-	N_("L-Stick Up"),
-	N_("R-Stick Right"),
-	N_("R-Stick Left"),
-	N_("R-Stick Down"),
-	N_("R-Stick Up")
-};
-
-static int GetSelectedKeyIndex(int padnum) {
-	GladeXML			*xml;
-	GtkTreeSelection	*selection;
-	GtkTreeIter			iter;
-	GtkTreeModel		*model;
-	GtkTreePath			*path;
-	gboolean			selected;
-	int					i;
-
-	xml = glade_get_widget_tree(MainWindow);
-
-	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(glade_xml_get_widget(xml, padnum == 0 ? "treeview1" : "treeview2")));
-	selected = gtk_tree_selection_get_selected(selection, &model, &iter);
-
-	if (!selected) {
-		return -1;
-	}
-
-	path = gtk_tree_model_get_path(model, &iter);
-	i = *gtk_tree_path_get_indices(path);
-	gtk_tree_path_free(path);
-
-	return i;
-}
-
-static void GetKeyDescription(char *buf, int joynum, int key) {
-	const char *hatname[16] = {_("Centered"), _("Up"), _("Right"), _("Rightup"),
-		_("Down"), "", _("Rightdown"), "", _("Left"), _("Leftup"), "", "",
-		_("Leftdown"), "", "", ""};
-
-	switch (g.cfg.PadDef[joynum].KeyDef[key].JoyEvType) {
-		case BUTTON:
-			sprintf(buf, _("Joystick: Button %d"), g.cfg.PadDef[joynum].KeyDef[key].J.Button);
-			break;
-
-		case AXIS:
-			sprintf(buf, _("Joystick: Axis %d%c"), abs(g.cfg.PadDef[joynum].KeyDef[key].J.Axis) - 1,
-				g.cfg.PadDef[joynum].KeyDef[key].J.Axis > 0 ? '+' : '-');
-			break;
-
-		case HAT:
-			sprintf(buf, _("Joystick: Hat %d %s"), (g.cfg.PadDef[joynum].KeyDef[key].J.Hat >> 8),
-				hatname[g.cfg.PadDef[joynum].KeyDef[key].J.Hat & 0x0F]);
-			break;
-
-		case NONE:
-		default:
-			buf[0] = '\0';
-			break;
-	}
-
-	if (g.cfg.PadDef[joynum].KeyDef[key].Key != 0) {
-		if (buf[0] != '\0') {
-			strcat(buf, " / ");
-		}
-
-		strcat(buf, _("Keyboard:"));
-		strcat(buf, " ");
-		strcat(buf, XKeysymToString(g.cfg.PadDef[joynum].KeyDef[key].Key));
-	} else if (buf[0] == '\0') {
-		strcpy(buf, _("(Not Set)"));
-	}
-}
-
-static void GetAnalogDescription(char *buf, int joynum, int analognum, int dir) {
-	const char *hatname[16] = {_("Centered"), _("Up"), _("Right"), _("Rightup"),
-		_("Down"), "", _("Rightdown"), "", _("Left"), _("Leftup"), "", "",
-		_("Leftdown"), "", "", ""};
-
-	switch (g.cfg.PadDef[joynum].AnalogDef[analognum][dir].JoyEvType) {
-		case BUTTON:
-			sprintf(buf, _("Joystick: Button %d"), g.cfg.PadDef[joynum].AnalogDef[analognum][dir].J.Button);
-			break;
-
-		case AXIS:
-			sprintf(buf, _("Joystick: Axis %d%c"), abs(g.cfg.PadDef[joynum].AnalogDef[analognum][dir].J.Axis) - 1,
-				g.cfg.PadDef[joynum].AnalogDef[analognum][dir].J.Axis > 0 ? '+' : '-');
-			break;
-
-		case HAT:
-			sprintf(buf, _("Joystick: Hat %d %s"), (g.cfg.PadDef[joynum].AnalogDef[analognum][dir].J.Hat >> 8),
-				hatname[g.cfg.PadDef[joynum].AnalogDef[analognum][dir].J.Hat & 0x0F]);
-			break;
-
-		case NONE:
-		default:
-			buf[0] = '\0';
-			break;
-	}
-
-	if (g.cfg.PadDef[joynum].AnalogDef[analognum][dir].Key != 0) {
-		if (buf[0] != '\0') {
-			strcat(buf, " / ");
-		}
-
-		strcat(buf, _("Keyboard:"));
-		strcat(buf, " ");
-		strcat(buf, XKeysymToString(g.cfg.PadDef[joynum].AnalogDef[analognum][dir].Key));
-	} else if (buf[0] == '\0') {
-		strcpy(buf, _("(Not Set)"));
-	}
-}
-
-static void UpdateKeyList() {
-	const char *widgetname[2] = {"treeview1", "treeview2"};
-
-	GladeXML *xml;
-	GtkWidget *widget;
-	GtkListStore *store;
-	GtkTreeIter iter;
-	int i, j;
-	char buf[256];
-
-	xml = glade_get_widget_tree(MainWindow);
-
-	for (i = 0; i < 2; i++) {
-		int total;
-
-		if (g.cfg.PadDef[i].Type == PSE_PAD_TYPE_ANALOGPAD) {
-			total = DKEY_TOTAL;
-		} else {
-			total = DKEY_TOTAL - 2;
-		}
-
-		widget = glade_xml_get_widget(xml, widgetname[i]);
-
-		store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_STRING);
-
-		for (j = 0; j < total; j++) {
-			gtk_list_store_append(store, &iter);
-			GetKeyDescription(buf, i, DPad[j]);
-			gtk_list_store_set(store, &iter, 0, _(DPadText[j]), 1, buf, -1);
-		}
-
-		if (g.cfg.PadDef[i].Type == PSE_PAD_TYPE_ANALOGPAD) {
-			for (j = 0; j < 8; j++) {
-				gtk_list_store_append(store, &iter);
-				GetAnalogDescription(buf, i, j / 4, j % 4);
-				gtk_list_store_set(store, &iter, 0, _(AnalogText[j]), 1, buf, -1);
-			}
-		}
-
-		gtk_tree_view_set_model(GTK_TREE_VIEW(widget), GTK_TREE_MODEL(store));
-		g_object_unref(G_OBJECT(store));
-		gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(widget), TRUE);
-		gtk_widget_show(widget);
-	}
-}
-
-static void UpdateKey() {
-	const char *widgetname[2] = {"treeview1", "treeview2"};
-	int i, index;
-	GladeXML *xml;
-	GtkWidget *widget;
-	GtkTreeModel *model;
-	GtkTreeIter iter;
-	GValue value = {0, };
-	char buf[256];
-
-	xml = glade_get_widget_tree(MainWindow);
-
-	for (i = 0; i < 2; i++) {
-		index = GetSelectedKeyIndex(i);
-		if (index == -1) continue;
-
-		widget = glade_xml_get_widget(xml, widgetname[i]);
-		gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)), &model, &iter);
-
-		if (index < DKEY_TOTAL) {
-			GetKeyDescription(buf, i, DPad[index]);
-		} else {
-			GetAnalogDescription(buf, i, (index - DKEY_TOTAL) / 4, (index - DKEY_TOTAL) % 4);
-		}
-
-		g_value_init(&value, G_TYPE_STRING);
-		g_value_set_string(&value, buf);
-		gtk_list_store_set_value(GTK_LIST_STORE(model), &iter, 1, &value);
-	}
-}
-
-static void OnConfigExit(GtkWidget *widget, gpointer user_data) {
-	SavePADConfig();
-
-	gtk_widget_destroy(widget);
-	SDL_Quit();
-
-	gtk_exit(0);
-}
-
-static void TreeSelectionChanged(GtkTreeSelection *selection, gpointer user_data) {
-	GladeXML *xml;
-	GtkTreeIter iter;
-	GtkTreeModel *model;
-	GtkTreePath *path;
-
-	gboolean selected;
-	int i;
-
-	selected = gtk_tree_selection_get_selected(selection, &model, &iter);
-
-	if (selected) {
-		path = gtk_tree_model_get_path(model, &iter);
-		i = *gtk_tree_path_get_indices(path);
-		gtk_tree_path_free(path);
-
-		// If a row was selected, and the row is not blank, we can now enable
-		// some of the disabled widgets
-		xml = glade_get_widget_tree(MainWindow);
-
-		if ((int)user_data == 0) {
-			gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "btnchange1")), TRUE);
-			gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "btnreset1")), TRUE);
-		} else {
-			gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "btnchange2")), TRUE);
-			gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "btnreset2")), TRUE);
-		}
-	} else {
-		xml = glade_get_widget_tree(MainWindow);
-
-		if ((int)user_data == 0) {
-			gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "btnchange1")), FALSE);
-			gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "btnreset1")), FALSE);
-		} else {
-			gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "btnchange2")), FALSE);
-			gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "btnreset2")), FALSE);
-		}
-	}
-}
-
-static void OnDeviceChanged(GtkWidget *widget, gpointer user_data) {
-	int n = (int)user_data, current = gtk_combo_box_get_active(GTK_COMBO_BOX(widget));
-	current--;
-	g.cfg.PadDef[n].DevNum = current;
-}
-
-static void OnTypeChanged(GtkWidget *widget, gpointer user_data) {
-	int n = (int)user_data, current = gtk_combo_box_get_active(GTK_COMBO_BOX(widget));
-	g.cfg.PadDef[n].Type = (current == 0 ? PSE_PAD_TYPE_STANDARD : PSE_PAD_TYPE_ANALOGPAD);
-
-	UpdateKeyList();
-}
-
-static void OnThreadedToggled(GtkWidget *widget, gpointer user_data) {
-	g.cfg.Threaded = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
-}
-
-static void ReadDKeyEvent(int padnum, int key) {
-	SDL_Joystick *js;
-	time_t t;
-	GdkEvent *ge;
-	int i;
-	Sint16 axis, numAxes = 0, InitAxisPos[256], PrevAxisPos[256];
-
-	if (g.cfg.PadDef[padnum].DevNum >= 0) {
-		js = SDL_JoystickOpen(g.cfg.PadDef[padnum].DevNum);
-		SDL_JoystickEventState(SDL_IGNORE);
-
-		SDL_JoystickUpdate();
-
-		numAxes = SDL_JoystickNumAxes(js);
-		if (numAxes > 256) numAxes = 256;
-
-		for (i = 0; i < numAxes; i++) {
-			InitAxisPos[i] = PrevAxisPos[i] = SDL_JoystickGetAxis(js, i);
-		}
-	} else {
-		js = NULL;
-	}
-
-	t = time(NULL);
-
-	while (time(NULL) < t + 10) {
-		// check joystick events
-		if (js != NULL) {
-			SDL_JoystickUpdate();
-
-			for (i = 0; i < SDL_JoystickNumButtons(js); i++) {
-				if (SDL_JoystickGetButton(js, i)) {
-					g.cfg.PadDef[padnum].KeyDef[key].JoyEvType = BUTTON;
-					g.cfg.PadDef[padnum].KeyDef[key].J.Button = i;
-					goto end;
-				}
-			}
-
-			for (i = 0; i < numAxes; i++) {
-				axis = SDL_JoystickGetAxis(js, i);
-				if (abs(axis) > 16383 && (abs(axis - InitAxisPos[i]) > 4096 || abs(axis - PrevAxisPos[i]) > 4096)) {
-					g.cfg.PadDef[padnum].KeyDef[key].JoyEvType = AXIS;
-					g.cfg.PadDef[padnum].KeyDef[key].J.Axis = (i + 1) * (axis > 0 ? 1 : -1);
-					goto end;
-				}
-				PrevAxisPos[i] = axis;
-			}
-
-			for (i = 0; i < SDL_JoystickNumHats(js); i++) {
-				axis = SDL_JoystickGetHat(js, i);
-				if (axis != SDL_HAT_CENTERED) {
-					g.cfg.PadDef[padnum].KeyDef[key].JoyEvType = HAT;
-
-					if (axis & SDL_HAT_UP) {
-						g.cfg.PadDef[padnum].KeyDef[key].J.Hat = ((i << 8) | SDL_HAT_UP);
-					} else if (axis & SDL_HAT_DOWN) {
-						g.cfg.PadDef[padnum].KeyDef[key].J.Hat = ((i << 8) | SDL_HAT_DOWN);
-					} else if (axis & SDL_HAT_LEFT) {
-						g.cfg.PadDef[padnum].KeyDef[key].J.Hat = ((i << 8) | SDL_HAT_LEFT);
-					} else if (axis & SDL_HAT_RIGHT) {
-						g.cfg.PadDef[padnum].KeyDef[key].J.Hat = ((i << 8) | SDL_HAT_RIGHT);
-					}
-
-					goto end;
-				}
-			}
-		}
-
-		// check keyboard events
-		while ((ge = gdk_event_get()) != NULL) {
-			if (ge->type == GDK_KEY_PRESS) {
-				if (ge->key.keyval != XK_Escape) {
-					g.cfg.PadDef[padnum].KeyDef[key].Key = ge->key.keyval;
-				}
-				gdk_event_free(ge);
-				goto end;
-			}
-			gdk_event_free(ge);
-		}
-
-		usleep(5000);
-	}
-
-end:
-	if (js != NULL) {
-		SDL_JoystickClose(js);
-	}
-}
-
-static void ReadAnalogEvent(int padnum, int analognum, int analogdir) {
-	SDL_Joystick *js;
-	time_t t;
-	GdkEvent *ge;
-	int i;
-	Sint16 axis, numAxes = 0, InitAxisPos[256], PrevAxisPos[256];
-
-	if (g.cfg.PadDef[padnum].DevNum >= 0) {
-		js = SDL_JoystickOpen(g.cfg.PadDef[padnum].DevNum);
-		SDL_JoystickEventState(SDL_IGNORE);
-
-		SDL_JoystickUpdate();
-
-		numAxes = SDL_JoystickNumAxes(js);
-		if (numAxes > 256) numAxes = 256;
-
-		for (i = 0; i < SDL_JoystickNumAxes(js); i++) {
-			InitAxisPos[i] = PrevAxisPos[i] = SDL_JoystickGetAxis(js, i);
-		}
-	} else {
-		js = NULL;
-	}
-
-	t = time(NULL);
-
-	while (time(NULL) < t + 10) {
-		// check joystick events
-		if (js != NULL) {
-			SDL_JoystickUpdate();
-
-			for (i = 0; i < SDL_JoystickNumButtons(js); i++) {
-				if (SDL_JoystickGetButton(js, i)) {
-					g.cfg.PadDef[padnum].AnalogDef[analognum][analogdir].JoyEvType = BUTTON;
-					g.cfg.PadDef[padnum].AnalogDef[analognum][analogdir].J.Button = i;
-					goto end;
-				}
-			}
-
-			for (i = 0; i < numAxes; i++) {
-				axis = SDL_JoystickGetAxis(js, i);
-				if (abs(axis) > 16383 && (abs(axis - InitAxisPos[i]) > 4096 || abs(axis - PrevAxisPos[i]) > 4096)) {
-					g.cfg.PadDef[padnum].AnalogDef[analognum][analogdir].JoyEvType = AXIS;
-					g.cfg.PadDef[padnum].AnalogDef[analognum][analogdir].J.Axis = (i + 1) * (axis > 0 ? 1 : -1);
-					goto end;
-				}
-				PrevAxisPos[i] = axis;
-			}
-
-			for (i = 0; i < SDL_JoystickNumHats(js); i++) {
-				axis = SDL_JoystickGetHat(js, i);
-				if (axis != SDL_HAT_CENTERED) {
-					g.cfg.PadDef[padnum].AnalogDef[analognum][analogdir].JoyEvType = HAT;
-
-					if (axis & SDL_HAT_UP) {
-						g.cfg.PadDef[padnum].AnalogDef[analognum][analogdir].J.Hat = ((i << 8) | SDL_HAT_UP);
-					} else if (axis & SDL_HAT_DOWN) {
-						g.cfg.PadDef[padnum].AnalogDef[analognum][analogdir].J.Hat = ((i << 8) | SDL_HAT_DOWN);
-					} else if (axis & SDL_HAT_LEFT) {
-						g.cfg.PadDef[padnum].AnalogDef[analognum][analogdir].J.Hat = ((i << 8) | SDL_HAT_LEFT);
-					} else if (axis & SDL_HAT_RIGHT) {
-						g.cfg.PadDef[padnum].AnalogDef[analognum][analogdir].J.Hat = ((i << 8) | SDL_HAT_RIGHT);
-					}
-
-					goto end;
-				}
-			}
-		}
-
-		// check keyboard events
-		while ((ge = gdk_event_get()) != NULL) {
-			if (ge->type == GDK_KEY_PRESS) {
-				if (ge->key.keyval != XK_Escape) {
-					g.cfg.PadDef[padnum].AnalogDef[analognum][analogdir].Key = ge->key.keyval;
-				}
-				gdk_event_free(ge);
-				goto end;
-			}
-			gdk_event_free(ge);
-		}
-
-		usleep(5000);
-	}
-
-end:
-	if (js != NULL) {
-		SDL_JoystickClose(js);
-	}
-}
-
-static void OnChangeClicked(GtkWidget *widget, gpointer user_data) {
-	int pad = (int)user_data;
-	int index = GetSelectedKeyIndex(pad);
-
-	if (index == -1) return;
-
-	if (index < DKEY_TOTAL) {
-		ReadDKeyEvent(pad, DPad[index]);
-	} else {
-		index -= DKEY_TOTAL;
-		ReadAnalogEvent(pad, index / 4, index % 4);
-	}
-
-	UpdateKey();
-}
-
-static void OnResetClicked(GtkWidget *widget, gpointer user_data) {
-	int pad = (int)user_data;
-	int index = GetSelectedKeyIndex(pad);
-
-	if (index == -1) return;
-
-	if (index < DKEY_TOTAL) {
-		g.cfg.PadDef[pad].KeyDef[DPad[index]].Key = 0;
-		g.cfg.PadDef[pad].KeyDef[DPad[index]].JoyEvType = NONE;
-		g.cfg.PadDef[pad].KeyDef[DPad[index]].J.Button = 0;
-	} else {
-		index -= DKEY_TOTAL;
-		g.cfg.PadDef[pad].AnalogDef[index / 4][index % 4].Key = 0;
-		g.cfg.PadDef[pad].AnalogDef[index / 4][index % 4].JoyEvType = NONE;
-		g.cfg.PadDef[pad].AnalogDef[index / 4][index % 4].J.Button = 0;
-	}
-
-	UpdateKey();
-}
-
-static void PopulateDevList() {
-	const char *widgetname[2] = {"combodev1", "combodev2"};
-	int i, j, n;
-	GtkWidget *widget;
-	GladeXML *xml;
-	GtkTreeIter iter;
-	GtkListStore *store;
-	GtkCellRenderer *renderer;
-	char buf[256];
-
-	xml = glade_get_widget_tree(MainWindow);
-
-	for (i = 0; i < 2; i++) {
-		widget = glade_xml_get_widget(xml, widgetname[i]);
-
-		renderer = gtk_cell_renderer_text_new();
-		gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(widget), renderer, FALSE);
-		gtk_cell_layout_add_attribute(GTK_CELL_LAYOUT(widget), renderer, "text", 0);
-
-		store = gtk_list_store_new(1, G_TYPE_STRING);
-
-		gtk_list_store_append(store, &iter);
-		gtk_list_store_set(store, &iter, 0, _("None"), -1);
-
-		n = SDL_NumJoysticks();
-		for (j = 0; j < n; j++) {
-			sprintf(buf, "%d: %s", j + 1, SDL_JoystickName(j));
-			gtk_list_store_append(store, &iter);
-			gtk_list_store_set(store, &iter, 0, buf, -1);
-		}
-
-		gtk_combo_box_set_model(GTK_COMBO_BOX(widget), GTK_TREE_MODEL(store));
-
-		n = g.cfg.PadDef[i].DevNum + 1;
-		if (n > SDL_NumJoysticks()) {
-			n = 0;
-			g.cfg.PadDef[i].DevNum = -1;
-		}
-
-		gtk_combo_box_set_active(GTK_COMBO_BOX(widget), n);
-	}
-}
-
-long PADconfigure() {
-	GladeXML *xml;
-	GtkWidget *widget;
-	GtkTreeSelection *treesel;
-	GtkTreeViewColumn *column;
-	GtkCellRenderer *renderer;
-
-	if (SDL_Init(SDL_INIT_JOYSTICK) == -1) {
-		fprintf(stderr, "Failed to initialize SDL!\n");
-		return -1;
-	}
-
-	LoadPADConfig();
-
-	xml = glade_xml_new(DATADIR "dfinput.glade2", "CfgWnd", NULL);
-	if (xml == NULL) {
-		g_warning("We could not load the interface!");
-		return -1;
-	}
-
-	MainWindow = glade_xml_get_widget(xml, "CfgWnd");
-	gtk_window_set_title(GTK_WINDOW(MainWindow), _("Gamepad/Keyboard Input Configuration"));
-
-	widget = glade_xml_get_widget(xml, "treeview1");
-
-	// column for key
-	renderer = gtk_cell_renderer_text_new();
-	column = gtk_tree_view_column_new_with_attributes(_("Key"),
-		renderer, "text", 0, NULL);
-	gtk_tree_view_append_column(GTK_TREE_VIEW(widget), column);
-
-	// column for button
-	renderer = gtk_cell_renderer_text_new();
-	column = gtk_tree_view_column_new_with_attributes(_("Button"),
-		renderer, "text", 1, NULL);
-	gtk_tree_view_append_column(GTK_TREE_VIEW(widget), column);
-
-	treesel = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget));
-	gtk_tree_selection_set_mode(treesel, GTK_SELECTION_SINGLE);
-
-	g_signal_connect_data(G_OBJECT(treesel), "changed",
-		G_CALLBACK(TreeSelectionChanged), (gpointer)0, NULL, G_CONNECT_AFTER);
-
-	widget = glade_xml_get_widget(xml, "treeview2");
-
-	// column for key
-	renderer = gtk_cell_renderer_text_new();
-	column = gtk_tree_view_column_new_with_attributes(_("Key"),
-		renderer, "text", 0, NULL);
-	gtk_tree_view_append_column(GTK_TREE_VIEW(widget), column);
-
-	// column for button
-	renderer = gtk_cell_renderer_text_new();
-	column = gtk_tree_view_column_new_with_attributes(_("Button"),
-		renderer, "text", 1, NULL);
-	gtk_tree_view_append_column(GTK_TREE_VIEW(widget), column);
-
-	treesel = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget));
-	gtk_tree_selection_set_mode(treesel, GTK_SELECTION_SINGLE);
-
-	g_signal_connect_data(G_OBJECT(treesel), "changed",
-		G_CALLBACK(TreeSelectionChanged), (gpointer)1, NULL, G_CONNECT_AFTER);
-
-	widget = glade_xml_get_widget(xml, "CfgWnd");
-	g_signal_connect_data(GTK_OBJECT(widget), "delete_event",
-		GTK_SIGNAL_FUNC(OnConfigExit), NULL, NULL, G_CONNECT_AFTER);
-
-	widget = glade_xml_get_widget(xml, "btnclose");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		GTK_SIGNAL_FUNC(OnConfigExit), NULL, NULL, G_CONNECT_AFTER);
-
-	PopulateDevList();
-	UpdateKeyList();
-
-	widget = glade_xml_get_widget(xml, "checkmt");
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), g.cfg.Threaded);
-	g_signal_connect_data(GTK_OBJECT(widget), "toggled",
-		GTK_SIGNAL_FUNC(OnThreadedToggled), NULL, NULL, G_CONNECT_AFTER);
-
-	widget = glade_xml_get_widget(xml, "combodev1");
-	g_signal_connect_data(GTK_OBJECT(widget), "changed",
-		GTK_SIGNAL_FUNC(OnDeviceChanged), (gpointer)0, NULL, G_CONNECT_AFTER);
-
-	widget = glade_xml_get_widget(xml, "combodev2");
-	g_signal_connect_data(GTK_OBJECT(widget), "changed",
-		GTK_SIGNAL_FUNC(OnDeviceChanged), (gpointer)1, NULL, G_CONNECT_AFTER);
-
-	widget = glade_xml_get_widget(xml, "combotype1");
-	gtk_combo_box_set_active(GTK_COMBO_BOX(widget),
-		g.cfg.PadDef[0].Type == PSE_PAD_TYPE_ANALOGPAD ? 1 : 0);
-	g_signal_connect_data(GTK_OBJECT(widget), "changed",
-		GTK_SIGNAL_FUNC(OnTypeChanged), (gpointer)0, NULL, G_CONNECT_AFTER);
-
-	widget = glade_xml_get_widget(xml, "combotype2");
-	gtk_combo_box_set_active(GTK_COMBO_BOX(widget),
-		g.cfg.PadDef[1].Type == PSE_PAD_TYPE_ANALOGPAD ? 1 : 0);
-	g_signal_connect_data(GTK_OBJECT(widget), "changed",
-		GTK_SIGNAL_FUNC(OnTypeChanged), (gpointer)1, NULL, G_CONNECT_AFTER);
-
-	widget = glade_xml_get_widget(xml, "btnchange1");
-	gtk_widget_set_sensitive(widget, FALSE);
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		GTK_SIGNAL_FUNC(OnChangeClicked), (gpointer)0, NULL, G_CONNECT_AFTER);
-
-	widget = glade_xml_get_widget(xml, "btnreset1");
-	gtk_widget_set_sensitive(widget, FALSE);
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		GTK_SIGNAL_FUNC(OnResetClicked), (gpointer)0, NULL, G_CONNECT_AFTER);
-
-	widget = glade_xml_get_widget(xml, "btnchange2");
-	gtk_widget_set_sensitive(widget, FALSE);
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		GTK_SIGNAL_FUNC(OnChangeClicked), (gpointer)1, NULL, G_CONNECT_AFTER);
-
-	widget = glade_xml_get_widget(xml, "btnreset2");
-	gtk_widget_set_sensitive(widget, FALSE);
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		GTK_SIGNAL_FUNC(OnResetClicked), (gpointer)1, NULL, G_CONNECT_AFTER);
-
-	gtk_widget_show(MainWindow);
-	gtk_main();
-
-	return 0;
-}
-
-void PADabout() {
-	const char *authors[]= {"Wei Mingzhi <weimingzhi@gmail.com>", NULL};
-	GtkWidget *widget;
-
-	widget = gtk_about_dialog_new();
-	gtk_about_dialog_set_name(GTK_ABOUT_DIALOG(widget), "Gamepad/Keyboard Input");
-	gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(widget), "1.1");
-	gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(widget), authors);
-	gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(widget), "http://www.codeplex.com/pcsxr/");
-
-	gtk_dialog_run(GTK_DIALOG(widget));
-	gtk_widget_destroy(widget);
-}
-
-int main(int argc, char *argv[]) {
-#ifdef ENABLE_NLS
-	setlocale(LC_ALL, "");
-	bindtextdomain(GETTEXT_PACKAGE, LOCALE_DIR);
-	bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
-	textdomain(GETTEXT_PACKAGE);
-#endif
-
-	gtk_set_locale();
-	gtk_init(&argc, &argv);
-
-	if (argc > 1 && !strcmp(argv[1], "-about")) {
-		PADabout();
-	} else {
-		PADconfigure();
-	}
-
-	gtk_exit(0);
-	return 0;
-}

pcsxr-1.9.92.tar.bz2/plugins/dfinput/dfinput.glade2 Deleted

@@ -1,489 +0,0 @@
-<?xml version="1.0"?>
-<glade-interface>
- 
- 
- <widget class="GtkDialog" id="CfgWnd">
- <property name="border_width">5</property>
- <property name="resizable">False</property>
- <property name="window_position">center</property>
- <property name="type_hint">normal</property>
- <property name="has_separator">False</property>
- <child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox1">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkNotebook" id="notebook1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <child>
- <widget class="GtkVBox" id="vbox1">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkHButtonBox" id="hbuttonbox1">
- <property name="visible">True</property>
- <child>
- <widget class="GtkHBox" id="hbox6">
- <property name="visible">True</property>
- <property name="spacing">10</property>
- <child>
- <widget class="GtkLabel" id="label10">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Device:</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBox" id="combodev1">
- <property name="width_request">150</property>
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox5">
- <property name="visible">True</property>
- <property name="spacing">10</property>
- <child>
- <widget class="GtkLabel" id="label5">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Type:</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBox" id="combotype1">
- <property name="width_request">200</property>
- <property name="visible">True</property>
- <property name="items" translatable="yes">Digital Pad
-Analog Pad</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="border_width">5</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="window_placement_set">True</property>
- <property name="shadow_type">etched-in</property>
- <child>
- <widget class="GtkTreeView" id="treeview1">
- <property name="width_request">500</property>
- <property name="height_request">275</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHButtonBox" id="hbuttonbox2">
- <property name="visible">True</property>
- <property name="spacing">20</property>
- <property name="layout_style">center</property>
- <child>
- <widget class="GtkButton" id="btnchange1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <child>
- <widget class="GtkHBox" id="hbox1">
- <property name="visible">True</property>
- <child>
- <widget class="GtkImage" id="image1">
- <property name="visible">True</property>
- <property name="stock">gtk-edit</property>
- <property name="icon-size">1</property>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Change</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="btnreset1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <child>
- <widget class="GtkHBox" id="hbox2">
- <property name="visible">True</property>
- <child>
- <widget class="GtkImage" id="image2">
- <property name="visible">True</property>
- <property name="stock">gtk-undo</property>
- <property name="icon-size">1</property>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label6">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Reset</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Controller 1</property>
- </widget>
- <packing>
- <property name="tab_fill">False</property>
- <property name="type">tab</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox2">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkHButtonBox" id="hbuttonbox4">
- <property name="visible">True</property>
- <child>
- <widget class="GtkHBox" id="hbox8">
- <property name="visible">True</property>
- <property name="spacing">10</property>
- <child>
- <widget class="GtkLabel" id="label11">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Device:</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBox" id="combodev2">
- <property name="width_request">150</property>
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox7">
- <property name="visible">True</property>
- <property name="spacing">10</property>
- <child>
- <widget class="GtkLabel" id="label7">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Type:</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBox" id="combotype2">
- <property name="width_request">200</property>
- <property name="visible">True</property>
- <property name="items" translatable="yes">Digital Pad
-Analog Pad</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="border_width">5</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="window_placement_set">True</property>
- <property name="shadow_type">etched-in</property>
- <child>
- <widget class="GtkTreeView" id="treeview2">
- <property name="width_request">500</property>
- <property name="height_request">275</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHButtonBox" id="hbuttonbox3">
- <property name="visible">True</property>
- <property name="spacing">20</property>
- <property name="layout_style">center</property>
- <child>
- <widget class="GtkButton" id="btnchange2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <child>
- <widget class="GtkHBox" id="hbox3">
- <property name="visible">True</property>
- <child>
- <widget class="GtkImage" id="image3">
- <property name="visible">True</property>
- <property name="stock">gtk-edit</property>
- <property name="icon-size">1</property>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label8">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Change</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="btnreset2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <child>
- <widget class="GtkHBox" id="hbox4">
- <property name="visible">True</property>
- <child>
- <widget class="GtkImage" id="image4">
- <property name="visible">True</property>
- <property name="stock">gtk-undo</property>
- <property name="icon-size">1</property>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label9">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Reset</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Controller 2</property>
- </widget>
- <packing>
- <property name="position">1</property>
- <property name="tab_fill">False</property>
- <property name="type">tab</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox3">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">20</property>
- <child>
- <widget class="GtkCheckButton" id="checkmt">
- <property name="label" translatable="yes">Multi-Threaded (Recommended)</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">16</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Options</property>
- </widget>
- <packing>
- <property name="position">2</property>
- <property name="tab_fill">False</property>
- <property name="type">tab</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area1">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <widget class="GtkButton" id="btnclose">
- <property name="label">gtk-close</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
-</glade-interface>

pcsxr-1.9.92.tar.bz2/plugins/dfnet/Makefile.in Deleted

@@ -1,592 +0,0 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-bin_PROGRAMS = cfgDFNet$(EXEEXT)
-subdir = plugins/dfnet
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
-	"$(DESTDIR)$(gladedir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(lib_LTLIBRARIES)
-libDFNet_la_LIBADD =
-am_libDFNet_la_OBJECTS = dfnet.lo unix.lo cfg.lo
-libDFNet_la_OBJECTS = $(am_libDFNet_la_OBJECTS)
-libDFNet_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(libDFNet_la_LDFLAGS) $(LDFLAGS) -o $@
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS)
-am_cfgDFNet_OBJECTS = gui.$(OBJEXT)
-cfgDFNet_OBJECTS = $(am_cfgDFNet_OBJECTS)
-am__DEPENDENCIES_1 =
-cfgDFNet_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(libDFNet_la_SOURCES) $(cfgDFNet_SOURCES)
-DIST_SOURCES = $(libDFNet_la_SOURCES) $(cfgDFNet_SOURCES)
-gladeDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(glade_DATA)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCAS = @CCAS@
-CCASDEPMODE = @CCASDEPMODE@
-CCASFLAGS = @CCASFLAGS@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GLADE2_CFLAGS = @GLADE2_CFLAGS@
-GLADE2_LIBS = @GLADE2_LIBS@
-GLIB2_CFLAGS = @GLIB2_CFLAGS@
-GLIB2_LIBS = @GLIB2_LIBS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK2_CFLAGS = @GTK2_CFLAGS@
-GTK2_LIBS = @GTK2_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
-LIBCDIO_LIBS = @LIBCDIO_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NASM = @NASM@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PEOPSXGL = @PEOPSXGL@
-PKG_CONFIG = @PKG_CONFIG@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_CONFIG = @SDL_CONFIG@
-SDL_LIBS = @SDL_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @libdir@/games/psemu/
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@/games/psemu/
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-lib_LTLIBRARIES = libDFNet.la
-libDFNet_la_SOURCES = dfnet.c unix.c cfg.c
-libDFNet_la_LDFLAGS = -module -avoid-version
-INCLUDES = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \
-	-DLOCALE_DIR=\"${datadir}/locale/\" \
-	-DDATADIR=\"${datadir}/psemu/\" \
-	$(GTK2_CFLAGS) $(GLADE2_CFLAGS) \
-	-I../../libpcsxcore -I../../include
-
-cfgDFNet_SOURCES = gui.c
-cfgDFNet_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS)
-glade_DATA = dfnet.glade2
-gladedir = $(datadir)/psemu/
-EXTRA_DIST = $(glade_DATA)
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
-	@for dep in $?; do \
-	 case '$(am__configure_deps)' in \
-	 *$$dep*) \
-	 ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	 && { if test -f $@; then exit 0; else break; fi; }; \
-	 exit 1;; \
-	 esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/dfnet/Makefile'; \
-	cd $(top_srcdir) && \
-	 $(AUTOMAKE) --gnu plugins/dfnet/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	 *config.status*) \
-	 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	 *) \
-	 echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	 if test -f $$p; then \
-	 f=$(am__strip_dir) \
-	 echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	 $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
-	 else :; fi; \
-	done
-
-uninstall-libLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	 p=$(am__strip_dir) \
-	 echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	 $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
-	done
-
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	 dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	 test "$$dir" != "$$p" || dir=.; \
-	 echo "rm -f \"$${dir}/so_locations\""; \
-	 rm -f "$${dir}/so_locations"; \
-	done
-libDFNet.la: $(libDFNet_la_OBJECTS) $(libDFNet_la_DEPENDENCIES) 
-	$(libDFNet_la_LINK) -rpath $(libdir) $(libDFNet_la_OBJECTS) $(libDFNet_la_LIBADD) $(LIBS)
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	 p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	 if test -f $$p \
-	 || test -f $$p1 \
-	 ; then \
-	 f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	 echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	 $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-	 else :; fi; \
-	done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	 f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	 echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	 rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	done
-
-clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	 f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	 echo " rm -f $$p $$f"; \
-	 rm -f $$p $$f ; \
-	done
-cfgDFNet$(EXEEXT): $(cfgDFNet_OBJECTS) $(cfgDFNet_DEPENDENCIES) 
-	@rm -f cfgDFNet$(EXEEXT)
-	$(LINK) $(cfgDFNet_OBJECTS) $(cfgDFNet_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dfnet.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unix.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-gladeDATA: $(glade_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)"
-	@list='$(glade_DATA)'; for p in $$list; do \
-	 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	 f=$(am__strip_dir) \
-	 echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \
-	 $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \
-	done
-
-uninstall-gladeDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(glade_DATA)'; for p in $$list; do \
-	 f=$(am__strip_dir) \
-	 echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \
-	 rm -f "$(DESTDIR)$(gladedir)/$$f"; \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	 done | \
-	 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	 END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	 done | \
-	 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	 END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	 test -n "$$unique" || unique=$$empty_fix; \
-	 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	 $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	 done | \
-	 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	 END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	 $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	 && cd $(top_srcdir) \
-	 && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	 dist_files=`for file in $$list; do echo $$file; done | \
-	 sed -e "s|^$$srcdirstrip/||;t" \
-	 -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	 */*) $(MKDIR_P) `echo "$$dist_files" | \
-			 sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			 sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	 if test -d $$d/$$file; then \
-	 dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	 cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	 fi; \
-	 cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	 else \
-	 test -f $(distdir)/$$file \
-	 || cp -p $$d/$$file $(distdir)/$$file \
-	 || exit 1; \
-	 fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA)
-install-binPROGRAMS: install-libLTLIBRARIES
-
-installdirs:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(gladedir)"; do \
-	 test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	 `test -z '$(STRIP)' || \
-	 echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
-	clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am: install-gladeDATA
-
-install-dvi: install-dvi-am
-
-install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
-
-install-html: install-html-am
-
-install-info: install-info-am
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS uninstall-gladeDATA \
-	uninstall-libLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libLTLIBRARIES clean-libtool ctags \
-	distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-gladeDATA install-html \
-	install-html-am install-info install-info-am \
-	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-gladeDATA uninstall-libLTLIBRARIES
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

pcsxr-1.9.92.tar.bz2/plugins/dfnet/dfnet.glade2 Deleted

@@ -1,265 +0,0 @@
-<?xml version="1.0"?>
-<glade-interface>
- 
- 
- <widget class="GtkDialog" id="dlgStart">
- <property name="border_width">5</property>
- <property name="resizable">False</property>
- <property name="modal">True</property>
- <property name="window_position">center</property>
- <property name="type_hint">normal</property>
- <property name="has_separator">False</property>
- <child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox1">
- <property name="visible">True</property>
- <property name="spacing">5</property>
- <child>
- <widget class="GtkVBox" id="vbox1">
- <property name="visible">True</property>
- <property name="spacing">12</property>
- <child>
- <widget class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Select here if you'll be Server (Player1) or Client (Player2).
-
-If you select Server you must Copy your IP address to the Clipboard and paste if (Ctrl+V) wherever the Client can see it.
-
-If you selected Client please enter the IP address the Server gave to you in the IP Address Control.</property>
- <property name="wrap">True</property>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkTable" id="table1">
- <property name="visible">True</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">8</property>
- <property name="row_spacing">12</property>
- <child>
- <widget class="GtkButton" id="btnCopyIP">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <child>
- <widget class="GtkHBox" id="hbox2">
- <property name="visible">True</property>
- <child>
- <widget class="GtkImage" id="image1">
- <property name="visible">True</property>
- <property name="stock">gtk-copy</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Copy PC IP to Clipboard</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkEntry" id="tbServerIP">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="max_length">15</property>
- <property name="invisible_char">&#x25CF;</property>
- <signal name="activate" handler="on_tbServerIP_activate"/>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkRadioButton" id="rbServer">
- <property name="label" translatable="yes">Server (Player1)</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- </widget>
- </child>
- <child>
- <widget class="GtkRadioButton" id="rbClient">
- <property name="label" translatable="yes">Client (Player2)</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">rbServer</property>
- </widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">2</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox2">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Do not change if not necessary (remember it must be changed on both sides).</property>
- <property name="wrap">True</property>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox1">
- <property name="visible">True</property>
- <child>
- <widget class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Port Number</property>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkEntry" id="tbPort">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="max_length">5</property>
- <property name="invisible_char">&#x25CF;</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area1">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <widget class="GtkButton" id="btnStart">
- <property name="response_id">-5</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <child>
- <widget class="GtkHBox" id="hbox3">
- <property name="visible">True</property>
- <child>
- <widget class="GtkImage" id="image2">
- <property name="visible">True</property>
- <property name="stock">gtk-network</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label5">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Start Game</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="btnOffline">
- <property name="response_id">-6</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <child>
- <widget class="GtkHBox" id="hbox4">
- <property name="visible">True</property>
- <child>
- <widget class="GtkImage" id="image3">
- <property name="visible">True</property>
- <property name="stock">gtk-no</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label6">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Play Offline</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
-</glade-interface>

pcsxr-1.9.92.tar.bz2/plugins/dfsound/Makefile.in Deleted

@@ -1,711 +0,0 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-@SOUND_ALSA_TRUE@am__append_1 = alsa.c
-@SOUND_ALSA_TRUE@am__append_2 = -DUSEALSA=1
-@SOUND_ALSA_TRUE@am__append_3 = $(ALSA_LIBS)
-@SOUND_OSS_TRUE@am__append_4 = oss.c
-@SOUND_OSS_TRUE@am__append_5 = -DUSEOSS=1
-@SOUND_PULSEAUDIO_TRUE@am__append_6 = pulseaudio.c
-@SOUND_PULSEAUDIO_TRUE@am__append_7 = -DUSEPULSEAUDIO=1 $(PULSEAUDIO_CFLAGS)
-@SOUND_PULSEAUDIO_TRUE@am__append_8 = $(PULSEAUDIO_LIBS)
-@SOUND_SDL_TRUE@am__append_9 = sdl.c
-@SOUND_SDL_TRUE@am__append_10 = -DUSESDL=1 $(SDL_CFLAGS)
-@SOUND_SDL_TRUE@am__append_11 = $(SDL_LIBS)
-@SOUND_NULL_TRUE@am__append_12 = nullsnd.c
-@SOUND_NULL_TRUE@am__append_13 = -DUSENULL=1
-bin_PROGRAMS = cfgDFSound$(EXEEXT)
-subdir = plugins/dfsound
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
-	"$(DESTDIR)$(gladedir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(lib_LTLIBRARIES)
-libDFSound_la_LIBADD =
-am__libDFSound_la_SOURCES_DIST = spu.c cfg.c dma.c freeze.c \
-	registers.c alsa.c oss.c pulseaudio.c sdl.c nullsnd.c
-@SOUND_ALSA_TRUE@am__objects_1 = libDFSound_la-alsa.lo
-@SOUND_OSS_TRUE@am__objects_2 = libDFSound_la-oss.lo
-@SOUND_PULSEAUDIO_TRUE@am__objects_3 = libDFSound_la-pulseaudio.lo
-@SOUND_SDL_TRUE@am__objects_4 = libDFSound_la-sdl.lo
-@SOUND_NULL_TRUE@am__objects_5 = libDFSound_la-nullsnd.lo
-am_libDFSound_la_OBJECTS = libDFSound_la-spu.lo libDFSound_la-cfg.lo \
-	libDFSound_la-dma.lo libDFSound_la-freeze.lo \
-	libDFSound_la-registers.lo $(am__objects_1) $(am__objects_2) \
-	$(am__objects_3) $(am__objects_4) $(am__objects_5)
-libDFSound_la_OBJECTS = $(am_libDFSound_la_OBJECTS)
-libDFSound_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libDFSound_la_CFLAGS) \
-	$(CFLAGS) $(libDFSound_la_LDFLAGS) $(LDFLAGS) -o $@
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS)
-am_cfgDFSound_OBJECTS = main.$(OBJEXT)
-cfgDFSound_OBJECTS = $(am_cfgDFSound_OBJECTS)
-am__DEPENDENCIES_1 =
-cfgDFSound_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(libDFSound_la_SOURCES) $(cfgDFSound_SOURCES)
-DIST_SOURCES = $(am__libDFSound_la_SOURCES_DIST) $(cfgDFSound_SOURCES)
-gladeDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(glade_DATA)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCAS = @CCAS@
-CCASDEPMODE = @CCASDEPMODE@
-CCASFLAGS = @CCASFLAGS@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GLADE2_CFLAGS = @GLADE2_CFLAGS@
-GLADE2_LIBS = @GLADE2_LIBS@
-GLIB2_CFLAGS = @GLIB2_CFLAGS@
-GLIB2_LIBS = @GLIB2_LIBS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK2_CFLAGS = @GTK2_CFLAGS@
-GTK2_LIBS = @GTK2_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
-LIBCDIO_LIBS = @LIBCDIO_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NASM = @NASM@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PEOPSXGL = @PEOPSXGL@
-PKG_CONFIG = @PKG_CONFIG@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_CONFIG = @SDL_CONFIG@
-SDL_LIBS = @SDL_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @libdir@/games/psemu/
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@/games/psemu/
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-INCLUDES = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \
-	-DLOCALE_DIR=\"${datadir}/locale/\" \
-	-DDATADIR=\"${datadir}/psemu/\" \
-	$(GTK2_CFLAGS) $(GLADE2_CFLAGS) \
-	-I../../include
-
-lib_LTLIBRARIES = libDFSound.la
-libDFSound_la_SOURCES = spu.c cfg.c dma.c freeze.c registers.c \
-	$(am__append_1) $(am__append_4) $(am__append_6) \
-	$(am__append_9) $(am__append_12)
-libDFSound_la_CFLAGS = $(am__append_2) $(am__append_5) $(am__append_7) \
-	$(am__append_10) $(am__append_13)
-libDFSound_la_LDFLAGS = -module -avoid-version -lpthread -lm \
-	$(am__append_3) $(am__append_8) $(am__append_11)
-cfgDFSound_SOURCES = spucfg-0.1df/main.c
-cfgDFSound_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS)
-glade_DATA = spucfg-0.1df/dfsound.glade2
-gladedir = $(datadir)/psemu/
-EXTRA_DIST = $(glade_DATA)
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
-	@for dep in $?; do \
-	 case '$(am__configure_deps)' in \
-	 *$$dep*) \
-	 ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	 && { if test -f $@; then exit 0; else break; fi; }; \
-	 exit 1;; \
-	 esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/dfsound/Makefile'; \
-	cd $(top_srcdir) && \
-	 $(AUTOMAKE) --gnu plugins/dfsound/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	 *config.status*) \
-	 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	 *) \
-	 echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	 if test -f $$p; then \
-	 f=$(am__strip_dir) \
-	 echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	 $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
-	 else :; fi; \
-	done
-
-uninstall-libLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	 p=$(am__strip_dir) \
-	 echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	 $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
-	done
-
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	 dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	 test "$$dir" != "$$p" || dir=.; \
-	 echo "rm -f \"$${dir}/so_locations\""; \
-	 rm -f "$${dir}/so_locations"; \
-	done
-libDFSound.la: $(libDFSound_la_OBJECTS) $(libDFSound_la_DEPENDENCIES) 
-	$(libDFSound_la_LINK) -rpath $(libdir) $(libDFSound_la_OBJECTS) $(libDFSound_la_LIBADD) $(LIBS)
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	 p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	 if test -f $$p \
-	 || test -f $$p1 \
-	 ; then \
-	 f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	 echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	 $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-	 else :; fi; \
-	done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	 f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	 echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	 rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	done
-
-clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	 f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	 echo " rm -f $$p $$f"; \
-	 rm -f $$p $$f ; \
-	done
-cfgDFSound$(EXEEXT): $(cfgDFSound_OBJECTS) $(cfgDFSound_DEPENDENCIES) 
-	@rm -f cfgDFSound$(EXEEXT)
-	$(LINK) $(cfgDFSound_OBJECTS) $(cfgDFSound_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDFSound_la-alsa.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDFSound_la-cfg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDFSound_la-dma.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDFSound_la-freeze.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDFSound_la-nullsnd.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDFSound_la-oss.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDFSound_la-pulseaudio.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDFSound_la-registers.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDFSound_la-sdl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDFSound_la-spu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-libDFSound_la-spu.lo: spu.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDFSound_la_CFLAGS) $(CFLAGS) -MT libDFSound_la-spu.lo -MD -MP -MF $(DEPDIR)/libDFSound_la-spu.Tpo -c -o libDFSound_la-spu.lo `test -f 'spu.c' || echo '$(srcdir)/'`spu.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libDFSound_la-spu.Tpo $(DEPDIR)/libDFSound_la-spu.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='spu.c' object='libDFSound_la-spu.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDFSound_la_CFLAGS) $(CFLAGS) -c -o libDFSound_la-spu.lo `test -f 'spu.c' || echo '$(srcdir)/'`spu.c
-
-libDFSound_la-cfg.lo: cfg.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDFSound_la_CFLAGS) $(CFLAGS) -MT libDFSound_la-cfg.lo -MD -MP -MF $(DEPDIR)/libDFSound_la-cfg.Tpo -c -o libDFSound_la-cfg.lo `test -f 'cfg.c' || echo '$(srcdir)/'`cfg.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libDFSound_la-cfg.Tpo $(DEPDIR)/libDFSound_la-cfg.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cfg.c' object='libDFSound_la-cfg.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDFSound_la_CFLAGS) $(CFLAGS) -c -o libDFSound_la-cfg.lo `test -f 'cfg.c' || echo '$(srcdir)/'`cfg.c
-
-libDFSound_la-dma.lo: dma.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDFSound_la_CFLAGS) $(CFLAGS) -MT libDFSound_la-dma.lo -MD -MP -MF $(DEPDIR)/libDFSound_la-dma.Tpo -c -o libDFSound_la-dma.lo `test -f 'dma.c' || echo '$(srcdir)/'`dma.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libDFSound_la-dma.Tpo $(DEPDIR)/libDFSound_la-dma.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dma.c' object='libDFSound_la-dma.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDFSound_la_CFLAGS) $(CFLAGS) -c -o libDFSound_la-dma.lo `test -f 'dma.c' || echo '$(srcdir)/'`dma.c
-
-libDFSound_la-freeze.lo: freeze.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDFSound_la_CFLAGS) $(CFLAGS) -MT libDFSound_la-freeze.lo -MD -MP -MF $(DEPDIR)/libDFSound_la-freeze.Tpo -c -o libDFSound_la-freeze.lo `test -f 'freeze.c' || echo '$(srcdir)/'`freeze.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libDFSound_la-freeze.Tpo $(DEPDIR)/libDFSound_la-freeze.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='freeze.c' object='libDFSound_la-freeze.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDFSound_la_CFLAGS) $(CFLAGS) -c -o libDFSound_la-freeze.lo `test -f 'freeze.c' || echo '$(srcdir)/'`freeze.c
-
-libDFSound_la-registers.lo: registers.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDFSound_la_CFLAGS) $(CFLAGS) -MT libDFSound_la-registers.lo -MD -MP -MF $(DEPDIR)/libDFSound_la-registers.Tpo -c -o libDFSound_la-registers.lo `test -f 'registers.c' || echo '$(srcdir)/'`registers.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libDFSound_la-registers.Tpo $(DEPDIR)/libDFSound_la-registers.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='registers.c' object='libDFSound_la-registers.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDFSound_la_CFLAGS) $(CFLAGS) -c -o libDFSound_la-registers.lo `test -f 'registers.c' || echo '$(srcdir)/'`registers.c
-
-libDFSound_la-alsa.lo: alsa.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDFSound_la_CFLAGS) $(CFLAGS) -MT libDFSound_la-alsa.lo -MD -MP -MF $(DEPDIR)/libDFSound_la-alsa.Tpo -c -o libDFSound_la-alsa.lo `test -f 'alsa.c' || echo '$(srcdir)/'`alsa.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libDFSound_la-alsa.Tpo $(DEPDIR)/libDFSound_la-alsa.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='alsa.c' object='libDFSound_la-alsa.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDFSound_la_CFLAGS) $(CFLAGS) -c -o libDFSound_la-alsa.lo `test -f 'alsa.c' || echo '$(srcdir)/'`alsa.c
-
-libDFSound_la-oss.lo: oss.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDFSound_la_CFLAGS) $(CFLAGS) -MT libDFSound_la-oss.lo -MD -MP -MF $(DEPDIR)/libDFSound_la-oss.Tpo -c -o libDFSound_la-oss.lo `test -f 'oss.c' || echo '$(srcdir)/'`oss.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libDFSound_la-oss.Tpo $(DEPDIR)/libDFSound_la-oss.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='oss.c' object='libDFSound_la-oss.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDFSound_la_CFLAGS) $(CFLAGS) -c -o libDFSound_la-oss.lo `test -f 'oss.c' || echo '$(srcdir)/'`oss.c
-
-libDFSound_la-pulseaudio.lo: pulseaudio.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDFSound_la_CFLAGS) $(CFLAGS) -MT libDFSound_la-pulseaudio.lo -MD -MP -MF $(DEPDIR)/libDFSound_la-pulseaudio.Tpo -c -o libDFSound_la-pulseaudio.lo `test -f 'pulseaudio.c' || echo '$(srcdir)/'`pulseaudio.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libDFSound_la-pulseaudio.Tpo $(DEPDIR)/libDFSound_la-pulseaudio.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pulseaudio.c' object='libDFSound_la-pulseaudio.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDFSound_la_CFLAGS) $(CFLAGS) -c -o libDFSound_la-pulseaudio.lo `test -f 'pulseaudio.c' || echo '$(srcdir)/'`pulseaudio.c
-
-libDFSound_la-sdl.lo: sdl.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDFSound_la_CFLAGS) $(CFLAGS) -MT libDFSound_la-sdl.lo -MD -MP -MF $(DEPDIR)/libDFSound_la-sdl.Tpo -c -o libDFSound_la-sdl.lo `test -f 'sdl.c' || echo '$(srcdir)/'`sdl.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libDFSound_la-sdl.Tpo $(DEPDIR)/libDFSound_la-sdl.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='sdl.c' object='libDFSound_la-sdl.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDFSound_la_CFLAGS) $(CFLAGS) -c -o libDFSound_la-sdl.lo `test -f 'sdl.c' || echo '$(srcdir)/'`sdl.c
-
-libDFSound_la-nullsnd.lo: nullsnd.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDFSound_la_CFLAGS) $(CFLAGS) -MT libDFSound_la-nullsnd.lo -MD -MP -MF $(DEPDIR)/libDFSound_la-nullsnd.Tpo -c -o libDFSound_la-nullsnd.lo `test -f 'nullsnd.c' || echo '$(srcdir)/'`nullsnd.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libDFSound_la-nullsnd.Tpo $(DEPDIR)/libDFSound_la-nullsnd.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='nullsnd.c' object='libDFSound_la-nullsnd.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDFSound_la_CFLAGS) $(CFLAGS) -c -o libDFSound_la-nullsnd.lo `test -f 'nullsnd.c' || echo '$(srcdir)/'`nullsnd.c
-
-main.o: spucfg-0.1df/main.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT main.o -MD -MP -MF $(DEPDIR)/main.Tpo -c -o main.o `test -f 'spucfg-0.1df/main.c' || echo '$(srcdir)/'`spucfg-0.1df/main.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/main.Tpo $(DEPDIR)/main.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='spucfg-0.1df/main.c' object='main.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o main.o `test -f 'spucfg-0.1df/main.c' || echo '$(srcdir)/'`spucfg-0.1df/main.c
-
-main.obj: spucfg-0.1df/main.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT main.obj -MD -MP -MF $(DEPDIR)/main.Tpo -c -o main.obj `if test -f 'spucfg-0.1df/main.c'; then $(CYGPATH_W) 'spucfg-0.1df/main.c'; else $(CYGPATH_W) '$(srcdir)/spucfg-0.1df/main.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/main.Tpo $(DEPDIR)/main.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='spucfg-0.1df/main.c' object='main.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o main.obj `if test -f 'spucfg-0.1df/main.c'; then $(CYGPATH_W) 'spucfg-0.1df/main.c'; else $(CYGPATH_W) '$(srcdir)/spucfg-0.1df/main.c'; fi`
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-gladeDATA: $(glade_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)"
-	@list='$(glade_DATA)'; for p in $$list; do \
-	 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	 f=$(am__strip_dir) \
-	 echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \
-	 $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \
-	done
-
-uninstall-gladeDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(glade_DATA)'; for p in $$list; do \
-	 f=$(am__strip_dir) \
-	 echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \
-	 rm -f "$(DESTDIR)$(gladedir)/$$f"; \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	 done | \
-	 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	 END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	 done | \
-	 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	 END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	 test -n "$$unique" || unique=$$empty_fix; \
-	 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	 $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	 done | \
-	 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	 END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	 $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	 && cd $(top_srcdir) \
-	 && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	 dist_files=`for file in $$list; do echo $$file; done | \
-	 sed -e "s|^$$srcdirstrip/||;t" \
-	 -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	 */*) $(MKDIR_P) `echo "$$dist_files" | \
-			 sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			 sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	 if test -d $$d/$$file; then \
-	 dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	 cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	 fi; \
-	 cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	 else \
-	 test -f $(distdir)/$$file \
-	 || cp -p $$d/$$file $(distdir)/$$file \
-	 || exit 1; \
-	 fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA)
-install-binPROGRAMS: install-libLTLIBRARIES
-
-installdirs:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(gladedir)"; do \
-	 test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	 `test -z '$(STRIP)' || \
-	 echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
-	clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am: install-gladeDATA
-
-install-dvi: install-dvi-am
-
-install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
-
-install-html: install-html-am
-
-install-info: install-info-am
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS uninstall-gladeDATA \
-	uninstall-libLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libLTLIBRARIES clean-libtool ctags \
-	distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-gladeDATA install-html \
-	install-html-am install-info install-info-am \
-	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-gladeDATA uninstall-libLTLIBRARIES
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

pcsxr-1.9.92.tar.bz2/plugins/dfsound/spucfg-0.1df/dfsound.glade2 Deleted

@@ -1,308 +0,0 @@
-<?xml version="1.0"?>
-<glade-interface>
- 
- 
- <widget class="GtkWindow" id="CfgWnd">
- <property name="visible">True</property>
- <property name="border_width">10</property>
- <property name="title" translatable="yes">Configure Sound</property>
- <property name="resizable">False</property>
- <property name="modal">True</property>
- <property name="window_position">center</property>
- <property name="type_hint">dialog</property>
- <signal name="destroy" handler="on_CfgWnd_destroy"/>
- <child>
- <widget class="GtkVBox" id="vbox1">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkFrame" id="frame1">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <child>
- <widget class="GtkAlignment" id="alignment4">
- <property name="visible">True</property>
- <property name="top_padding">6</property>
- <property name="bottom_padding">6</property>
- <property name="left_padding">12</property>
- <property name="right_padding">12</property>
- <child>
- <widget class="GtkTable" id="table1">
- <property name="visible">True</property>
- <property name="border_width">6</property>
- <property name="n_rows">3</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">6</property>
- <property name="row_spacing">6</property>
- <child>
- <widget class="GtkLabel" id="label1v">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Volume:</property>
- <property name="justify">right</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label9">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Interpolation:</property>
- <property name="justify">right</property>
- </widget>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label8">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Reverb:</property>
- <property name="justify">right</property>
- </widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBox" id="cbVolume2">
- <property name="visible">True</property>
- <property name="items" translatable="yes">Low
-Medium
-Loud
-Loudest</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBox" id="cbReverb2">
- <property name="visible">True</property>
- <property name="items" translatable="yes">Off
-Simple
-Playstation</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBox" id="cbInterpolation2">
- <property name="visible">True</property>
- <property name="items" translatable="yes">None
-Simple
-Gaussian
-Cubic</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label10">
- <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;General&lt;/b&gt;</property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkFrame" id="frame2">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <child>
- <widget class="GtkAlignment" id="alignment2">
- <property name="visible">True</property>
- <property name="top_padding">6</property>
- <property name="bottom_padding">6</property>
- <property name="left_padding">12</property>
- <property name="right_padding">12</property>
- <child>
- <widget class="GtkVBox" id="vbox3">
- <property name="visible">True</property>
- <property name="border_width">6</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkCheckButton" id="chkXASpeed">
- <property name="label" translatable="yes">Adjust XA speed</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">Choose this if XA music is played too quickly.</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label11">
- <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;XA Music&lt;/b&gt;</property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkFrame" id="frame3">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <child>
- <widget class="GtkAlignment" id="alignment3">
- <property name="visible">True</property>
- <property name="top_padding">6</property>
- <property name="bottom_padding">6</property>
- <property name="left_padding">12</property>
- <property name="right_padding">12</property>
- <child>
- <widget class="GtkVBox" id="vbox4">
- <property name="visible">True</property>
- <property name="border_width">6</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkCheckButton" id="chkHiCompat">
- <property name="label" translatable="yes">High compatibility mode</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">Use the asynchronous SPU interface.</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="chkIRQWait">
- <property name="label" translatable="yes">SPU IRQ Wait</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">Wait for CPU; only useful for some games.</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="chkDisStereo">
- <property name="label" translatable="yes">Single channel sound</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">Play only one channel for a performance boost.</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label12">
- <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Compatibility&lt;/b&gt;</property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHButtonBox" id="hbuttonbox1">
- <property name="visible">True</property>
- <property name="spacing">12</property>
- <property name="layout_style">end</property>
- <child>
- <widget class="GtkButton" id="btn_close">
- <property name="label">gtk-close</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">3</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
-</glade-interface>

pcsxr-1.9.92.tar.bz2/plugins/dfxvideo/Makefile.in Deleted

@@ -1,626 +0,0 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-@X86_NASM_TRUE@am__append_1 = i386.asm
-@X86_NASM_TRUE@am__append_2 = -DUSE_NASM=1
-bin_PROGRAMS = cfgDFXVideo$(EXEEXT)
-subdir = plugins/dfxvideo
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
-	"$(DESTDIR)$(gladedir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(lib_LTLIBRARIES)
-libDFXVideo_la_LIBADD =
-am__libDFXVideo_la_SOURCES_DIST = gpu.c cfg.c draw.c fps.c key.c \
-	menu.c prim.c soft.c zn.c i386.asm
-@X86_NASM_TRUE@am__objects_1 = i386.lo
-am_libDFXVideo_la_OBJECTS = gpu.lo cfg.lo draw.lo fps.lo key.lo \
-	menu.lo prim.lo soft.lo zn.lo $(am__objects_1)
-libDFXVideo_la_OBJECTS = $(am_libDFXVideo_la_OBJECTS)
-libDFXVideo_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(libDFXVideo_la_LDFLAGS) $(LDFLAGS) -o $@
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS)
-am_cfgDFXVideo_OBJECTS = main.$(OBJEXT)
-cfgDFXVideo_OBJECTS = $(am_cfgDFXVideo_OBJECTS)
-am__DEPENDENCIES_1 =
-cfgDFXVideo_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(libDFXVideo_la_SOURCES) $(cfgDFXVideo_SOURCES)
-DIST_SOURCES = $(am__libDFXVideo_la_SOURCES_DIST) \
-	$(cfgDFXVideo_SOURCES)
-gladeDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(glade_DATA)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCAS = @CCAS@
-CCASDEPMODE = @CCASDEPMODE@
-CCASFLAGS = @CCASFLAGS@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GLADE2_CFLAGS = @GLADE2_CFLAGS@
-GLADE2_LIBS = @GLADE2_LIBS@
-GLIB2_CFLAGS = @GLIB2_CFLAGS@
-GLIB2_LIBS = @GLIB2_LIBS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK2_CFLAGS = @GTK2_CFLAGS@
-GTK2_LIBS = @GTK2_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
-LIBCDIO_LIBS = @LIBCDIO_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NASM = @NASM@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PEOPSXGL = @PEOPSXGL@
-PKG_CONFIG = @PKG_CONFIG@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_CONFIG = @SDL_CONFIG@
-SDL_LIBS = @SDL_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @libdir@/games/psemu/
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@/games/psemu/
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-STRIP_FPIC = sh $(top_srcdir)/strip_fPIC.sh
-SUFFIXES = .asm
-INCLUDES = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \
-	-DLOCALE_DIR=\"${datadir}/locale/\" \
-	-DDATADIR=\"${datadir}/psemu/\" $(GTK2_CFLAGS) \
-	$(GLADE2_CFLAGS) -I/usr/X11R6/include -I../../libpcsxcore \
-	-I../../include $(am__append_2)
-lib_LTLIBRARIES = libDFXVideo.la
-libDFXVideo_la_SOURCES = gpu.c cfg.c draw.c fps.c key.c menu.c prim.c \
-	soft.c zn.c $(am__append_1)
-libDFXVideo_la_LDFLAGS = -module -avoid-version -L/usr/X11R6/lib64 \
-	-L/usr/X11R6/lib -lX11 -lXv -lXext -lm
-cfgDFXVideo_SOURCES = gpucfg-0.1df/main.c
-cfgDFXVideo_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS) -L/usr/X11R6/lib -lXext
-glade_DATA = gpucfg-0.1df/dfxvideo.glade2
-gladedir = $(datadir)/psemu/
-EXTRA_DIST = $(glade_DATA)
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .asm .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
-	@for dep in $?; do \
-	 case '$(am__configure_deps)' in \
-	 *$$dep*) \
-	 ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	 && { if test -f $@; then exit 0; else break; fi; }; \
-	 exit 1;; \
-	 esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/dfxvideo/Makefile'; \
-	cd $(top_srcdir) && \
-	 $(AUTOMAKE) --gnu plugins/dfxvideo/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	 *config.status*) \
-	 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	 *) \
-	 echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	 if test -f $$p; then \
-	 f=$(am__strip_dir) \
-	 echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	 $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
-	 else :; fi; \
-	done
-
-uninstall-libLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	 p=$(am__strip_dir) \
-	 echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	 $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
-	done
-
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	 dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	 test "$$dir" != "$$p" || dir=.; \
-	 echo "rm -f \"$${dir}/so_locations\""; \
-	 rm -f "$${dir}/so_locations"; \
-	done
-libDFXVideo.la: $(libDFXVideo_la_OBJECTS) $(libDFXVideo_la_DEPENDENCIES) 
-	$(libDFXVideo_la_LINK) -rpath $(libdir) $(libDFXVideo_la_OBJECTS) $(libDFXVideo_la_LIBADD) $(LIBS)
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	 p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	 if test -f $$p \
-	 || test -f $$p1 \
-	 ; then \
-	 f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	 echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	 $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-	 else :; fi; \
-	done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	 f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	 echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	 rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	done
-
-clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	 f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	 echo " rm -f $$p $$f"; \
-	 rm -f $$p $$f ; \
-	done
-cfgDFXVideo$(EXEEXT): $(cfgDFXVideo_OBJECTS) $(cfgDFXVideo_DEPENDENCIES) 
-	@rm -f cfgDFXVideo$(EXEEXT)
-	$(LINK) $(cfgDFXVideo_OBJECTS) $(cfgDFXVideo_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/draw.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fps.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/key.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/menu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prim.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soft.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zn.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-main.o: gpucfg-0.1df/main.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT main.o -MD -MP -MF $(DEPDIR)/main.Tpo -c -o main.o `test -f 'gpucfg-0.1df/main.c' || echo '$(srcdir)/'`gpucfg-0.1df/main.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/main.Tpo $(DEPDIR)/main.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gpucfg-0.1df/main.c' object='main.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o main.o `test -f 'gpucfg-0.1df/main.c' || echo '$(srcdir)/'`gpucfg-0.1df/main.c
-
-main.obj: gpucfg-0.1df/main.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT main.obj -MD -MP -MF $(DEPDIR)/main.Tpo -c -o main.obj `if test -f 'gpucfg-0.1df/main.c'; then $(CYGPATH_W) 'gpucfg-0.1df/main.c'; else $(CYGPATH_W) '$(srcdir)/gpucfg-0.1df/main.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/main.Tpo $(DEPDIR)/main.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gpucfg-0.1df/main.c' object='main.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o main.obj `if test -f 'gpucfg-0.1df/main.c'; then $(CYGPATH_W) 'gpucfg-0.1df/main.c'; else $(CYGPATH_W) '$(srcdir)/gpucfg-0.1df/main.c'; fi`
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-gladeDATA: $(glade_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)"
-	@list='$(glade_DATA)'; for p in $$list; do \
-	 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	 f=$(am__strip_dir) \
-	 echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \
-	 $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \
-	done
-
-uninstall-gladeDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(glade_DATA)'; for p in $$list; do \
-	 f=$(am__strip_dir) \
-	 echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \
-	 rm -f "$(DESTDIR)$(gladedir)/$$f"; \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	 done | \
-	 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	 END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	 done | \
-	 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	 END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	 test -n "$$unique" || unique=$$empty_fix; \
-	 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	 $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	 done | \
-	 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	 END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	 $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	 && cd $(top_srcdir) \
-	 && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	 dist_files=`for file in $$list; do echo $$file; done | \
-	 sed -e "s|^$$srcdirstrip/||;t" \
-	 -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	 */*) $(MKDIR_P) `echo "$$dist_files" | \
-			 sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			 sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	 if test -d $$d/$$file; then \
-	 dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	 cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	 fi; \
-	 cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	 else \
-	 test -f $(distdir)/$$file \
-	 || cp -p $$d/$$file $(distdir)/$$file \
-	 || exit 1; \
-	 fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA)
-install-binPROGRAMS: install-libLTLIBRARIES
-
-installdirs:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(gladedir)"; do \
-	 test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	 `test -z '$(STRIP)' || \
-	 echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
-	clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am: install-gladeDATA
-
-install-dvi: install-dvi-am
-
-install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
-
-install-html: install-html-am
-
-install-info: install-info-am
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS uninstall-gladeDATA \
-	uninstall-libLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libLTLIBRARIES clean-libtool ctags \
-	distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-gladeDATA install-html \
-	install-html-am install-info install-info-am \
-	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-gladeDATA uninstall-libLTLIBRARIES
-
-
-.asm.lo:
-	$(LIBTOOL) --tag=CC --mode=compile \
-	$(STRIP_FPIC) $(NASM) -f elf -d ELF -I${srcdir}/ $<
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

pcsxr-1.9.92.tar.bz2/plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2 Deleted

@@ -1,625 +0,0 @@
-<?xml version="1.0"?>
-<glade-interface>
- 
- 
- <widget class="GtkWindow" id="CfgWnd">
- <property name="visible">True</property>
- <property name="border_width">10</property>
- <property name="title" translatable="yes">Configure X11 Video</property>
- <property name="resizable">False</property>
- <property name="modal">True</property>
- <property name="window_position">center</property>
- <property name="type_hint">dialog</property>
- <signal name="destroy" handler="on_CfgWnd_destroy"/>
- <child>
- <widget class="GtkVBox" id="vbox1">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkFrame" id="frame1">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <child>
- <widget class="GtkAlignment" id="alignment4">
- <property name="visible">True</property>
- <property name="top_padding">6</property>
- <property name="bottom_padding">6</property>
- <property name="left_padding">12</property>
- <property name="right_padding">12</property>
- <child>
- <widget class="GtkVBox" id="vbox7">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <widget class="GtkTable" id="table1">
- <property name="visible">True</property>
- <property name="n_rows">3</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">30</property>
- <property name="row_spacing">6</property>
- <child>
- <widget class="GtkLabel" id="label14">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Initial Window Size:</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label15">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Stretching:</property>
- </widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label16">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Dithering:</property>
- </widget>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBox" id="stretchCombo2">
- <property name="visible">True</property>
- <property name="active">0</property>
- <property name="items" translatable="yes">0: None
-1: 2xSai
-2: 2xSuperSai
-3: SuperEagle
-4: Scale2x
-5: Scale3x
-6: HQ2X
-7: HQ3X</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBox" id="ditherCombo2">
- <property name="visible">True</property>
- <property name="active">1</property>
- <property name="items" translatable="yes">0: Off (fastest)
-1: Game dependant
-2: Always</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox2">
- <property name="visible">True</property>
- <property name="spacing">10</property>
- <child>
- <widget class="GtkComboBox" id="resCombo2">
- <property name="visible">True</property>
- <property name="active">2</property>
- <property name="items" translatable="yes">320x240
-640x480
-800x600
-1024x768
-1152x864
-1280x1024
-1600x1200</property>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="checkFullscreen">
- <property name="label" translatable="yes">Fullscreen</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Toggle windowed/fullscreen mode.</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox1">
- <property name="visible">True</property>
- <child>
- <widget class="GtkCheckButton" id="maintain43">
- <property name="label" translatable="yes">Maintain 4:3 Aspect Ratio</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label10">
- <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Screen&lt;/b&gt;</property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkFrame" id="frame2">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <child>
- <widget class="GtkAlignment" id="alignment2">
- <property name="visible">True</property>
- <property name="top_padding">6</property>
- <property name="bottom_padding">6</property>
- <property name="left_padding">12</property>
- <property name="right_padding">12</property>
- <child>
- <widget class="GtkVBox" id="vbox3">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <widget class="GtkCheckButton" id="checkShowFPS">
- <property name="label" translatable="yes">Show FPS</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">Toggle whether the FPS will be shown.</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="checkFrameSkip">
- <property name="label" translatable="yes">Enable frame skipping</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">Skip frames when rendering.</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkTable" id="table2">
- <property name="visible">True</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">12</property>
- <child>
- <widget class="GtkCheckButton" id="checkSetFPS">
- <property name="label" translatable="yes">Set FPS</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">Enable this if games display too quickly.</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkEntry" id="entryFPS">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="width_chars">4</property>
- <property name="text" translatable="yes">200.0</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="checkAutoFPSLimit">
- <property name="label" translatable="yes">Autodetect FPS limit</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="has_tooltip">True</property>
- <property name="use_underline">True</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label11">
- <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Framerate&lt;/b&gt;</property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkFrame" id="frame3">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <child>
- <widget class="GtkAlignment" id="alignment3">
- <property name="visible">True</property>
- <property name="top_padding">6</property>
- <property name="bottom_padding">6</property>
- <property name="left_padding">12</property>
- <property name="right_padding">12</property>
- <child>
- <widget class="GtkVBox" id="vbox4">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <widget class="GtkCheckButton" id="checkUseFixes">
- <property name="label" translatable="yes">Use game fixes</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkAlignment" id="alignment5">
- <property name="visible">True</property>
- <property name="left_padding">19</property>
- <child>
- <widget class="GtkTable" id="table_fixes">
- <property name="visible">True</property>
- <property name="n_rows">6</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">16</property>
- <child>
- <widget class="GtkCheckButton" id="checkFix5">
- <property name="label" translatable="yes">Disable CPU Saving</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">For precise framerate</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="checkFix1">
- <property name="label" translatable="yes">Odd/even bit hack</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">Chrono Cross</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="checkFix6">
- <property name="label" translatable="yes">PC FPS calculation</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">Better FPS limit in some</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="checkFix2">
- <property name="label" translatable="yes">Expand screen width</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">Capcom fighting games</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="checkFix3">
- <property name="label" translatable="yes">Ignore brightness color</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">Black screens in Lunar</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="checkFix4">
- <property name="label" translatable="yes">Disable coordinate check</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">Compatibility mode</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="checkFix7">
- <property name="label" translatable="yes">Lazy screen update</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Pandemonium 2</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="checkFix8">
- <property name="label" translatable="yes">Old frame skipping</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Skip every second frame</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="checkFix9">
- <property name="label" translatable="yes">Repeated flat tex triangles</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Needed by Dark Forces</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="checkFix10">
- <property name="label" translatable="yes">Draw quads with triangles</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">better g-colors, worse textures</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="checkFix11">
- <property name="label" translatable="yes">Fake 'gpu busy' states</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Toggle busy flags after drawing</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label12">
- <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Compatibility&lt;/b&gt;</property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHButtonBox" id="hbuttonbox1">
- <property name="visible">True</property>
- <property name="spacing">12</property>
- <property name="layout_style">end</property>
- <child>
- <widget class="GtkButton" id="btn_close">
- <property name="label">gtk-close</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">3</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
-</glade-interface>

pcsxr-1.9.92.tar.bz2/plugins/peopsxgl/Makefile.in Deleted

@@ -1,643 +0,0 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-bin_PROGRAMS = cfgpeopsxgl$(EXEEXT)
-subdir = plugins/peopsxgl
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/config.h
-CONFIG_CLEAN_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(lib_LTLIBRARIES)
-libpeopsxgl_la_LIBADD =
-am_libpeopsxgl_la_OBJECTS = cfg.lo draw.lo fps.lo gpu.lo key.lo \
-	menu.lo prim.lo soft.lo texture.lo
-libpeopsxgl_la_OBJECTS = $(am_libpeopsxgl_la_OBJECTS)
-libpeopsxgl_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(libpeopsxgl_la_LDFLAGS) $(LDFLAGS) -o $@
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS)
-am_cfgpeopsxgl_OBJECTS = main.$(OBJEXT) callbacks.$(OBJEXT) \
-	interface.$(OBJEXT) support.$(OBJEXT)
-cfgpeopsxgl_OBJECTS = $(am_cfgpeopsxgl_OBJECTS)
-am__DEPENDENCIES_1 =
-cfgpeopsxgl_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(libpeopsxgl_la_SOURCES) $(cfgpeopsxgl_SOURCES)
-DIST_SOURCES = $(libpeopsxgl_la_SOURCES) $(cfgpeopsxgl_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCAS = @CCAS@
-CCASDEPMODE = @CCASDEPMODE@
-CCASFLAGS = @CCASFLAGS@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GLADE2_CFLAGS = @GLADE2_CFLAGS@
-GLADE2_LIBS = @GLADE2_LIBS@
-GLIB2_CFLAGS = @GLIB2_CFLAGS@
-GLIB2_LIBS = @GLIB2_LIBS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GTK2_CFLAGS = @GTK2_CFLAGS@
-GTK2_LIBS = @GTK2_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
-LIBCDIO_LIBS = @LIBCDIO_LIBS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NASM = @NASM@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PEOPSXGL = @PEOPSXGL@
-PKG_CONFIG = @PKG_CONFIG@
-POSUB = @POSUB@
-PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
-PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_CONFIG = @SDL_CONFIG@
-SDL_LIBS = @SDL_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @libdir@/games/psemu/
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@/games/psemu/
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-INCLUDES = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \
-	-DLOCALE_DIR=\"${datadir}/locale/\" \
-	-DDATADIR=\"${datadir}/psemu/\" \
-	$(GTK2_CFLAGS) $(GLADE2_CFLAGS) -I/usr/X11R6/include \
-	-I../../libpcsxcore -I../../include -fPIC
-
-lib_LTLIBRARIES = libpeopsxgl.la
-libpeopsxgl_la_SOURCES = cfg.c draw.c fps.c gpu.c key.c menu.c \
-	prim.c soft.c texture.c
-
-libpeopsxgl_la_LDFLAGS = -module -avoid-version \
-	-L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11 -lXxf86vm -lGL -lm
-
-cfgpeopsxgl_SOURCES = gpucfg/main.c gpucfg/callbacks.c gpucfg/interface.c \
-	gpucfg/support.c
-
-cfgpeopsxgl_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS)
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
-	@for dep in $?; do \
-	 case '$(am__configure_deps)' in \
-	 *$$dep*) \
-	 ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	 && { if test -f $@; then exit 0; else break; fi; }; \
-	 exit 1;; \
-	 esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/peopsxgl/Makefile'; \
-	cd $(top_srcdir) && \
-	 $(AUTOMAKE) --gnu plugins/peopsxgl/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	 *config.status*) \
-	 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	 *) \
-	 echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	 if test -f $$p; then \
-	 f=$(am__strip_dir) \
-	 echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	 $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
-	 else :; fi; \
-	done
-
-uninstall-libLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	 p=$(am__strip_dir) \
-	 echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	 $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
-	done
-
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	 dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	 test "$$dir" != "$$p" || dir=.; \
-	 echo "rm -f \"$${dir}/so_locations\""; \
-	 rm -f "$${dir}/so_locations"; \
-	done
-libpeopsxgl.la: $(libpeopsxgl_la_OBJECTS) $(libpeopsxgl_la_DEPENDENCIES) 
-	$(libpeopsxgl_la_LINK) -rpath $(libdir) $(libpeopsxgl_la_OBJECTS) $(libpeopsxgl_la_LIBADD) $(LIBS)
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	 p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	 if test -f $$p \
-	 || test -f $$p1 \
-	 ; then \
-	 f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	 echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	 $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-	 else :; fi; \
-	done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	 f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	 echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	 rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	done
-
-clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	 f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	 echo " rm -f $$p $$f"; \
-	 rm -f $$p $$f ; \
-	done
-cfgpeopsxgl$(EXEEXT): $(cfgpeopsxgl_OBJECTS) $(cfgpeopsxgl_DEPENDENCIES) 
-	@rm -f cfgpeopsxgl$(EXEEXT)
-	$(LINK) $(cfgpeopsxgl_OBJECTS) $(cfgpeopsxgl_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/callbacks.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/draw.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fps.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/interface.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/key.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/menu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prim.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soft.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/support.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/texture.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-main.o: gpucfg/main.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT main.o -MD -MP -MF $(DEPDIR)/main.Tpo -c -o main.o `test -f 'gpucfg/main.c' || echo '$(srcdir)/'`gpucfg/main.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/main.Tpo $(DEPDIR)/main.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gpucfg/main.c' object='main.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o main.o `test -f 'gpucfg/main.c' || echo '$(srcdir)/'`gpucfg/main.c
-
-main.obj: gpucfg/main.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT main.obj -MD -MP -MF $(DEPDIR)/main.Tpo -c -o main.obj `if test -f 'gpucfg/main.c'; then $(CYGPATH_W) 'gpucfg/main.c'; else $(CYGPATH_W) '$(srcdir)/gpucfg/main.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/main.Tpo $(DEPDIR)/main.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gpucfg/main.c' object='main.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o main.obj `if test -f 'gpucfg/main.c'; then $(CYGPATH_W) 'gpucfg/main.c'; else $(CYGPATH_W) '$(srcdir)/gpucfg/main.c'; fi`
-
-callbacks.o: gpucfg/callbacks.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT callbacks.o -MD -MP -MF $(DEPDIR)/callbacks.Tpo -c -o callbacks.o `test -f 'gpucfg/callbacks.c' || echo '$(srcdir)/'`gpucfg/callbacks.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/callbacks.Tpo $(DEPDIR)/callbacks.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gpucfg/callbacks.c' object='callbacks.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o callbacks.o `test -f 'gpucfg/callbacks.c' || echo '$(srcdir)/'`gpucfg/callbacks.c
-
-callbacks.obj: gpucfg/callbacks.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT callbacks.obj -MD -MP -MF $(DEPDIR)/callbacks.Tpo -c -o callbacks.obj `if test -f 'gpucfg/callbacks.c'; then $(CYGPATH_W) 'gpucfg/callbacks.c'; else $(CYGPATH_W) '$(srcdir)/gpucfg/callbacks.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/callbacks.Tpo $(DEPDIR)/callbacks.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gpucfg/callbacks.c' object='callbacks.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o callbacks.obj `if test -f 'gpucfg/callbacks.c'; then $(CYGPATH_W) 'gpucfg/callbacks.c'; else $(CYGPATH_W) '$(srcdir)/gpucfg/callbacks.c'; fi`
-
-interface.o: gpucfg/interface.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT interface.o -MD -MP -MF $(DEPDIR)/interface.Tpo -c -o interface.o `test -f 'gpucfg/interface.c' || echo '$(srcdir)/'`gpucfg/interface.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/interface.Tpo $(DEPDIR)/interface.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gpucfg/interface.c' object='interface.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o interface.o `test -f 'gpucfg/interface.c' || echo '$(srcdir)/'`gpucfg/interface.c
-
-interface.obj: gpucfg/interface.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT interface.obj -MD -MP -MF $(DEPDIR)/interface.Tpo -c -o interface.obj `if test -f 'gpucfg/interface.c'; then $(CYGPATH_W) 'gpucfg/interface.c'; else $(CYGPATH_W) '$(srcdir)/gpucfg/interface.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/interface.Tpo $(DEPDIR)/interface.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gpucfg/interface.c' object='interface.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o interface.obj `if test -f 'gpucfg/interface.c'; then $(CYGPATH_W) 'gpucfg/interface.c'; else $(CYGPATH_W) '$(srcdir)/gpucfg/interface.c'; fi`
-
-support.o: gpucfg/support.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT support.o -MD -MP -MF $(DEPDIR)/support.Tpo -c -o support.o `test -f 'gpucfg/support.c' || echo '$(srcdir)/'`gpucfg/support.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/support.Tpo $(DEPDIR)/support.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gpucfg/support.c' object='support.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o support.o `test -f 'gpucfg/support.c' || echo '$(srcdir)/'`gpucfg/support.c
-
-support.obj: gpucfg/support.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT support.obj -MD -MP -MF $(DEPDIR)/support.Tpo -c -o support.obj `if test -f 'gpucfg/support.c'; then $(CYGPATH_W) 'gpucfg/support.c'; else $(CYGPATH_W) '$(srcdir)/gpucfg/support.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/support.Tpo $(DEPDIR)/support.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gpucfg/support.c' object='support.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o support.obj `if test -f 'gpucfg/support.c'; then $(CYGPATH_W) 'gpucfg/support.c'; else $(CYGPATH_W) '$(srcdir)/gpucfg/support.c'; fi`
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	 done | \
-	 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	 END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	 done | \
-	 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	 END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	 test -n "$$unique" || unique=$$empty_fix; \
-	 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	 $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	 done | \
-	 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	 END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	 $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	 && cd $(top_srcdir) \
-	 && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	 dist_files=`for file in $$list; do echo $$file; done | \
-	 sed -e "s|^$$srcdirstrip/||;t" \
-	 -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	 */*) $(MKDIR_P) `echo "$$dist_files" | \
-			 sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			 sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	 if test -d $$d/$$file; then \
-	 dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	 cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	 fi; \
-	 cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	 else \
-	 test -f $(distdir)/$$file \
-	 || cp -p $$d/$$file $(distdir)/$$file \
-	 || exit 1; \
-	 fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS)
-install-binPROGRAMS: install-libLTLIBRARIES
-
-installdirs:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"; do \
-	 test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	 `test -z '$(STRIP)' || \
-	 echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
-	clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
-
-install-html: install-html-am
-
-install-info: install-info-am
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS uninstall-libLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libLTLIBRARIES clean-libtool ctags \
-	distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-libLTLIBRARIES \
-	install-man install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-binPROGRAMS uninstall-libLTLIBRARIES
-
-
-#glade_DATA = gpucfg-0.1df/peopsxgl.glade2
-#gladedir = $(datadir)/psemu/
-#EXTRA_DIST = $(glade_DATA)
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

pcsxr-1.9.92.tar.bz2/plugins/peopsxgl/gpucfg/callbacks.c Deleted

@@ -1,51 +0,0 @@
-#include "config.h"
-
-#include <gtk/gtk.h>
-
-#include "callbacks.h"
-#include "interface.h"
-#include "support.h"
-#include <stdio.h>
-#include <stdlib.h>
-
-void SaveConfig(void);
-
-void
-on_btnSave_clicked (GtkButton *button,
- gpointer user_data)
-{
- SaveConfig();
- exit(0);
-}
-
-
-void
-on_CfgWnd_destroy (GtkObject *object,
- gpointer user_data)
-{
- exit(0);
-}
-
-
-void
-on_btnCancel_clicked (GtkButton *button,
- gpointer user_data)
-{
- exit(0);
-}
-
-
-void
-on_AboutWnd_destroy (GtkObject *object,
- gpointer user_data)
-{
- exit(0);
-}
-
-
-void
-on_bntAClose_clicked (GtkButton *button,
- gpointer user_data)
-{
- exit(0);
-}

pcsxr-1.9.92.tar.bz2/plugins/peopsxgl/gpucfg/callbacks.h Deleted

pcsxr-1.9.92.tar.bz2/plugins/peopsxgl/gpucfg/interface.c Deleted

@@ -1,896 +0,0 @@
-#include "config.h"
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <string.h>
-
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtk.h>
-
-#include "callbacks.h"
-#include "interface.h"
-#include "support.h"
-
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#include <locale.h>
-#define _(x) gettext(x)
-#else
-#define _(x) (x)
-#endif
-
-GtkWidget*
-create_CfgWnd (void)
-{
- GtkWidget *CfgWnd;
- GtkWidget *fixed1;
- GtkWidget *btnSave;
- GtkWidget *frmTextures;
- GtkWidget *fixed3;
- GtkWidget *edtMaxTex;
- GtkWidget *label5;
- GtkWidget *cmbQuality;
- GList *cmbQuality_items = NULL;
- GtkWidget *combo_entry2;
- GtkWidget *label7;
- GtkWidget *cmbFilter;
- GList *cmbFilter_items = NULL;
- GtkWidget *combo_entry3;
- GtkWidget *label6;
- GtkWidget *label23;
- GtkWidget *cmbHiresTex;
- GList *cmbHiresTex_items = NULL;
- GtkWidget *combo_entry7;
- GtkWidget *frmWindow;
- GtkWidget *fixed2;
- GtkWidget *edtXSize;
- GtkWidget *edtYSize;
- GtkWidget *label2;
- GtkWidget *label3;
- GtkWidget *chkKeepRatio;
- GtkWidget *chkFullScreen;
- GtkWidget *chkDither;
- GtkWidget *btnCancel;
- GtkWidget *frmFPS;
- GtkWidget *fixed4;
- GtkWidget *edtFPSlim;
- GtkWidget *label8;
- GSList *fixed4_group = NULL;
- GtkWidget *rdbLimMan;
- GtkWidget *chkShowFPS;
- GtkWidget *chkFPSLimit;
- GtkWidget *rdbLimAuto;
- GtkWidget *chkFPSSkip;
- GtkWidget *frmCompat;
- GtkWidget *fixed5;
- GtkWidget *chkABlend;
- GtkWidget *label10;
- GtkWidget *label9;
- GtkWidget *label22;
- GtkWidget *chkOpaque;
- GtkWidget *chkMaskBit;
- GtkWidget *cmbOffscreen;
- GList *cmbOffscreen_items = NULL;
- GtkWidget *combo_entry4;
- GtkWidget *cmbFrameTex;
- GList *cmbFrameTex_items = NULL;
- GtkWidget *combo_entry5;
- GtkWidget *cmbFrameAcc;
- GList *cmbFrameAcc_items = NULL;
- GtkWidget *combo_entry6;
- GtkWidget *frmFixes;
- GtkWidget *fixed7;
- GtkWidget *chkFix3;
- GtkWidget *chkFix4;
- GtkWidget *chkFix5;
- GtkWidget *chkGameFixes;
- GtkWidget *chkFix2;
- GtkWidget *chkFix1;
- GtkWidget *chkFix7;
- GtkWidget *chkFix0;
- GtkWidget *chkFix6;
- GtkWidget *chkFix8;
- GtkWidget *chkFix9;
- GtkWidget *chkFix10;
- GtkWidget *chkFix11;
- GtkWidget *chkFix12;
- GtkWidget *chkFix13;
- GtkWidget *chkFix14;
- GtkWidget *chkFix15;
- GtkWidget *chkFix17;
- GtkWidget *chkFix16;
- GtkWidget *frmMisc;
- GtkWidget *fixed6;
- GtkWidget *edtScanBlend;
- GtkWidget *chkScanlines;
- GtkWidget *label11;
- GtkWidget *chkBlur;
- GtkWidget *chkExtensions;
- GtkWidget *chkAntiA;
- GtkWidget *chkLinemode;
- GtkWidget *chkFastMdec;
- GtkWidget *chk15bitMdec;
-
- CfgWnd = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- gtk_object_set_data (GTK_OBJECT (CfgWnd), "CfgWnd", CfgWnd);
- gtk_container_set_border_width (GTK_CONTAINER (CfgWnd), 8);
- gtk_window_set_title (GTK_WINDOW (CfgWnd), _("OpenGL Driver configuration"));
- gtk_window_set_position (GTK_WINDOW (CfgWnd), GTK_WIN_POS_CENTER);
- gtk_window_set_modal (GTK_WINDOW (CfgWnd), TRUE);
- gtk_window_set_policy (GTK_WINDOW (CfgWnd), FALSE, FALSE, FALSE);
-
- fixed1 = gtk_fixed_new ();
- gtk_widget_ref (fixed1);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "fixed1", fixed1,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (fixed1);
- gtk_container_add (GTK_CONTAINER (CfgWnd), fixed1);
-
- btnSave = gtk_button_new_with_label (_("OK"));
- gtk_widget_ref (btnSave);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "btnSave", btnSave,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (btnSave);
- gtk_fixed_put (GTK_FIXED (fixed1), btnSave, 134, 552);
- gtk_widget_set_usize (btnSave, 160, 24);
-
- frmTextures = gtk_frame_new (_("Textures"));
- gtk_widget_ref (frmTextures);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "frmTextures", frmTextures,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (frmTextures);
- gtk_fixed_put (GTK_FIXED (fixed1), frmTextures, 372, 0);
- gtk_widget_set_usize (frmTextures, 364, 136);
-
- fixed3 = gtk_fixed_new ();
- gtk_widget_ref (fixed3);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "fixed3", fixed3,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (fixed3);
- gtk_container_add (GTK_CONTAINER (frmTextures), fixed3);
-
- edtMaxTex = gtk_entry_new ();
- gtk_widget_ref (edtMaxTex);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "edtMaxTex", edtMaxTex,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (edtMaxTex);
- gtk_fixed_put (GTK_FIXED (fixed3), edtMaxTex, 278, 80);
- gtk_widget_set_usize (edtMaxTex, 66, 24);
-
- label5 = gtk_label_new (_("Quality:"));
- gtk_widget_ref (label5);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "label5", label5,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (label5);
- gtk_fixed_put (GTK_FIXED (fixed3), label5, 8, 0);
- gtk_widget_set_usize (label5, 64, 24);
-
- cmbQuality = gtk_combo_new ();
- gtk_widget_ref (cmbQuality);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "cmbQuality", cmbQuality,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (cmbQuality);
- gtk_fixed_put (GTK_FIXED (fixed3), cmbQuality, 80, 0);
- gtk_widget_set_usize (cmbQuality, 264, 24);
- gtk_combo_set_value_in_list (GTK_COMBO (cmbQuality), TRUE, FALSE);
- gtk_combo_set_use_arrows_always (GTK_COMBO (cmbQuality), TRUE);
- cmbQuality_items = g_list_append (cmbQuality_items, (gpointer) _("0: don't care - Use driver's default textures"));
- cmbQuality_items = g_list_append (cmbQuality_items, (gpointer) _("1: 4444 - Fast, but less colorful"));
- cmbQuality_items = g_list_append (cmbQuality_items, (gpointer) _("2: 5551 - Nice colors, bad transparency"));
- cmbQuality_items = g_list_append (cmbQuality_items, (gpointer) _("3: 8888 - Best colors, more ram needed"));
- cmbQuality_items = g_list_append (cmbQuality_items, (gpointer) _("4: BGR8888 - Faster on some cards"));
- gtk_combo_set_popdown_strings (GTK_COMBO (cmbQuality), cmbQuality_items);
- g_list_free (cmbQuality_items);
-
- combo_entry2 = GTK_COMBO (cmbQuality)->entry;
- gtk_widget_ref (combo_entry2);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "combo_entry2", combo_entry2,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (combo_entry2);
- gtk_entry_set_text (GTK_ENTRY (combo_entry2), _("0: don't care - Use driver's default textures"));
-
- label7 = gtk_label_new (_("VRam size in MBytes (0..1024, 0=auto):"));
- gtk_widget_ref (label7);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "label7", label7,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (label7);
- gtk_fixed_put (GTK_FIXED (fixed3), label7, 8, 80);
- gtk_widget_set_usize (label7, 260, 24);
-
- cmbFilter = gtk_combo_new ();
- gtk_widget_ref (cmbFilter);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "cmbFilter", cmbFilter,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (cmbFilter);
- gtk_fixed_put (GTK_FIXED (fixed3), cmbFilter, 80, 24);
- gtk_widget_set_usize (cmbFilter, 264, 24);
- gtk_combo_set_value_in_list (GTK_COMBO (cmbFilter), TRUE, FALSE);
- gtk_combo_set_use_arrows_always (GTK_COMBO (cmbFilter), TRUE);
- cmbFilter_items = g_list_append (cmbFilter_items, (gpointer) _("0: None"));
- cmbFilter_items = g_list_append (cmbFilter_items, (gpointer) _("1: Standard - Glitches will happen"));
- cmbFilter_items = g_list_append (cmbFilter_items, (gpointer) _("2: Extended - No black borders"));
- cmbFilter_items = g_list_append (cmbFilter_items, (gpointer) _("3: Standard without sprites - unfiltered 2D"));
- cmbFilter_items = g_list_append (cmbFilter_items, (gpointer) _("4: Extended without sprites - unfiltered 2D"));
- cmbFilter_items = g_list_append (cmbFilter_items, (gpointer) _("5: Standard + smoothed sprites"));
- cmbFilter_items = g_list_append (cmbFilter_items, (gpointer) _("6: Extended + smoothed sprites"));
- gtk_combo_set_popdown_strings (GTK_COMBO (cmbFilter), cmbFilter_items);
- g_list_free (cmbFilter_items);
-
- combo_entry3 = GTK_COMBO (cmbFilter)->entry;
- gtk_widget_ref (combo_entry3);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "combo_entry3", combo_entry3,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (combo_entry3);
- gtk_entry_set_text (GTK_ENTRY (combo_entry3), _("0: None"));
-
- label6 = gtk_label_new (_("Filtering:"));
- gtk_widget_ref (label6);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "label6", label6,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (label6);
- gtk_fixed_put (GTK_FIXED (fixed3), label6, 8, 24);
- gtk_widget_set_usize (label6, 64, 24);
-
- label23 = gtk_label_new (_("HiRes Tex:"));
- gtk_widget_ref (label23);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "label23", label23,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (label23);
- gtk_fixed_put (GTK_FIXED (fixed3), label23, 8, 48);
- gtk_widget_set_usize (label23, 64, 24);
-
- cmbHiresTex = gtk_combo_new ();
- gtk_widget_ref (cmbHiresTex);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "cmbHiresTex", cmbHiresTex,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (cmbHiresTex);
- gtk_fixed_put (GTK_FIXED (fixed3), cmbHiresTex, 80, 48);
- gtk_widget_set_usize (cmbHiresTex, 264, 22);
- gtk_combo_set_value_in_list (GTK_COMBO (cmbHiresTex), TRUE, FALSE);
- gtk_combo_set_use_arrows_always (GTK_COMBO (cmbHiresTex), TRUE);
- cmbHiresTex_items = g_list_append (cmbHiresTex_items, (gpointer) _("0: None (standard)"));
- cmbHiresTex_items = g_list_append (cmbHiresTex_items, (gpointer) _("1: 2xSaI (much vram needed)"));
- cmbHiresTex_items = g_list_append (cmbHiresTex_items, (gpointer) _("2: Scaled (needs tex filtering)"));
- gtk_combo_set_popdown_strings (GTK_COMBO (cmbHiresTex), cmbHiresTex_items);
- g_list_free (cmbHiresTex_items);
-
- combo_entry7 = GTK_COMBO (cmbHiresTex)->entry;
- gtk_widget_ref (combo_entry7);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "combo_entry7", combo_entry7,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (combo_entry7);
- gtk_entry_set_text (GTK_ENTRY (combo_entry7), _("0: None (standard)"));
-
- frmWindow = gtk_frame_new (_("Window options"));
- gtk_widget_ref (frmWindow);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "frmWindow", frmWindow,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (frmWindow);
- gtk_fixed_put (GTK_FIXED (fixed1), frmWindow, 0, 0);
- gtk_widget_set_usize (frmWindow, 364, 136);
-
- fixed2 = gtk_fixed_new ();
- gtk_widget_ref (fixed2);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "fixed2", fixed2,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (fixed2);
- gtk_container_add (GTK_CONTAINER (frmWindow), fixed2);
-
- edtXSize = gtk_entry_new_with_max_length (5);
- gtk_widget_ref (edtXSize);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "edtXSize", edtXSize,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (edtXSize);
- gtk_fixed_put (GTK_FIXED (fixed2), edtXSize, 56, 0);
- gtk_widget_set_usize (edtXSize, 72, 24);
-
- edtYSize = gtk_entry_new ();
- gtk_widget_ref (edtYSize);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "edtYSize", edtYSize,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (edtYSize);
- gtk_fixed_put (GTK_FIXED (fixed2), edtYSize, 56, 32);
- gtk_widget_set_usize (edtYSize, 72, 24);
-
- label2 = gtk_label_new (_("Width:"));
- gtk_widget_ref (label2);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "label2", label2,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (label2);
- gtk_fixed_put (GTK_FIXED (fixed2), label2, 8, 0);
- gtk_widget_set_usize (label2, 48, 24);
- gtk_label_set_justify (GTK_LABEL (label2), GTK_JUSTIFY_RIGHT);
-
- label3 = gtk_label_new (_("Height:"));
- gtk_widget_ref (label3);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "label3", label3,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (label3);
- gtk_fixed_put (GTK_FIXED (fixed2), label3, 8, 32);
- gtk_widget_set_usize (label3, 48, 24);
- gtk_label_set_justify (GTK_LABEL (label3), GTK_JUSTIFY_RIGHT);
-
- chkKeepRatio = gtk_check_button_new_with_label (_("Keep psx aspect ratio"));
- gtk_widget_ref (chkKeepRatio);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "chkKeepRatio", chkKeepRatio,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (chkKeepRatio);
- gtk_fixed_put (GTK_FIXED (fixed2), chkKeepRatio, 8, 88);
- gtk_widget_set_usize (chkKeepRatio, 280, 24);
-
- chkFullScreen = gtk_check_button_new_with_label (_("Fullscreen"));
- gtk_widget_ref (chkFullScreen);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "chkFullScreen", chkFullScreen,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (chkFullScreen);
- gtk_fixed_put (GTK_FIXED (fixed2), chkFullScreen, 196, 0);
- gtk_widget_set_usize (chkFullScreen, 125, 24);
-
- chkDither = gtk_check_button_new_with_label (_("Dithering"));
- gtk_widget_ref (chkDither);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "chkDither", chkDither,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (chkDither);
- gtk_fixed_put (GTK_FIXED (fixed2), chkDither, 8, 64);
- gtk_widget_set_usize (chkDither, 280, 24);
-
- btnCancel = gtk_button_new_with_label (_("Cancel"));
- gtk_widget_ref (btnCancel);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "btnCancel", btnCancel,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (btnCancel);
- gtk_fixed_put (GTK_FIXED (fixed1), btnCancel, 430, 552);
- gtk_widget_set_usize (btnCancel, 160, 24);
-
- frmFPS = gtk_frame_new (_("Framerate"));
- gtk_widget_ref (frmFPS);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "frmFPS", frmFPS,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (frmFPS);
- gtk_fixed_put (GTK_FIXED (fixed1), frmFPS, 0, 136);
- gtk_widget_set_usize (frmFPS, 364, 176);
-
- fixed4 = gtk_fixed_new ();
- gtk_widget_ref (fixed4);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "fixed4", fixed4,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (fixed4);
- gtk_container_add (GTK_CONTAINER (frmFPS), fixed4);
-
- edtFPSlim = gtk_entry_new ();
- gtk_widget_ref (edtFPSlim);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "edtFPSlim", edtFPSlim,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (edtFPSlim);
- gtk_fixed_put (GTK_FIXED (fixed4), edtFPSlim, 175, 104);
- gtk_widget_set_usize (edtFPSlim, 72, 24);
-
- label8 = gtk_label_new (_("FPS"));
- gtk_widget_ref (label8);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "label8", label8,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (label8);
- gtk_fixed_put (GTK_FIXED (fixed4), label8, 250, 104);
- gtk_widget_set_usize (label8, 40, 24);
-
- rdbLimMan = gtk_radio_button_new_with_label (fixed4_group, _("FPS limit manual"));
- fixed4_group = gtk_radio_button_group (GTK_RADIO_BUTTON (rdbLimMan));
- gtk_widget_ref (rdbLimMan);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "rdbLimMan", rdbLimMan,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (rdbLimMan);
- gtk_fixed_put (GTK_FIXED (fixed4), rdbLimMan, 32, 104);
- gtk_widget_set_usize (rdbLimMan, 140, 24);
-
- chkShowFPS = gtk_check_button_new_with_label (_("Show FPS display on startup"));
- gtk_widget_ref (chkShowFPS);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "chkShowFPS", chkShowFPS,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (chkShowFPS);
- gtk_fixed_put (GTK_FIXED (fixed4), chkShowFPS, 8, 0);
- gtk_widget_set_usize (chkShowFPS, 280, 24);
-
- chkFPSLimit = gtk_check_button_new_with_label (_("Use FPS limit"));
- gtk_widget_ref (chkFPSLimit);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "chkFPSLimit", chkFPSLimit,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (chkFPSLimit);
- gtk_fixed_put (GTK_FIXED (fixed4), chkFPSLimit, 8, 24);
- gtk_widget_set_usize (chkFPSLimit, 280, 24);
-
- rdbLimAuto = gtk_radio_button_new_with_label (fixed4_group, _("FPS limit auto-detection"));
- fixed4_group = gtk_radio_button_group (GTK_RADIO_BUTTON (rdbLimAuto));
- gtk_widget_ref (rdbLimAuto);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "rdbLimAuto", rdbLimAuto,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (rdbLimAuto);
- gtk_fixed_put (GTK_FIXED (fixed4), rdbLimAuto, 32, 80);
- gtk_widget_set_usize (rdbLimAuto, 200, 24);
-
- chkFPSSkip = gtk_check_button_new_with_label (_("Use Frame skipping"));
- gtk_widget_ref (chkFPSSkip);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "chkFPSSkip", chkFPSSkip,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (chkFPSSkip);
- gtk_fixed_put (GTK_FIXED (fixed4), chkFPSSkip, 8, 48);
- gtk_widget_set_usize (chkFPSSkip, 280, 24);
-
- frmCompat = gtk_frame_new (_("Compatibility"));
- gtk_widget_ref (frmCompat);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "frmCompat", frmCompat,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (frmCompat);
- gtk_fixed_put (GTK_FIXED (fixed1), frmCompat, 372, 136);
- gtk_widget_set_usize (frmCompat, 364, 176);
-
- fixed5 = gtk_fixed_new ();
- gtk_widget_ref (fixed5);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "fixed5", fixed5,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (fixed5);
- gtk_container_add (GTK_CONTAINER (frmCompat), fixed5);
-
- chkABlend = gtk_check_button_new_with_label (_("Advanced blending (Accurate psx color emulation)"));
- gtk_widget_ref (chkABlend);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "chkABlend", chkABlend,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (chkABlend);
- gtk_fixed_put (GTK_FIXED (fixed5), chkABlend, 8, 128);
- gtk_widget_set_usize (chkABlend, 366, 24);
-
- label10 = gtk_label_new (_("Framebuffer textures:"));
- gtk_widget_ref (label10);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "label10", label10,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (label10);
- gtk_fixed_put (GTK_FIXED (fixed5), label10, 0, 24);
- gtk_widget_set_usize (label10, 136, 24);
-
- label9 = gtk_label_new (_("Offscreen Drawing:"));
- gtk_widget_ref (label9);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "label9", label9,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (label9);
- gtk_fixed_put (GTK_FIXED (fixed5), label9, 0, 0);
- gtk_widget_set_usize (label9, 136, 24);
-
- label22 = gtk_label_new (_("Framebuffer access:"));
- gtk_widget_ref (label22);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "label22", label22,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (label22);
- gtk_fixed_put (GTK_FIXED (fixed5), label22, 0, 48);
- gtk_widget_set_usize (label22, 136, 24);
-
- chkOpaque = gtk_check_button_new_with_label (_("Alpha Multipass (correct opaque texture areas)"));
- gtk_widget_ref (chkOpaque);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "chkOpaque", chkOpaque,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (chkOpaque);
- gtk_fixed_put (GTK_FIXED (fixed5), chkOpaque, 8, 104);
- gtk_widget_set_usize (chkOpaque, 366, 24);
-
- chkMaskBit = gtk_check_button_new_with_label (_("Mask bit detection (needed by a few games, zbuffer)"));
- gtk_widget_ref (chkMaskBit);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "chkMaskBit", chkMaskBit,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (chkMaskBit);
- gtk_fixed_put (GTK_FIXED (fixed5), chkMaskBit, 8, 80);
- gtk_widget_set_usize (chkMaskBit, 366, 24);
-
- cmbOffscreen = gtk_combo_new ();
- gtk_widget_ref (cmbOffscreen);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "cmbOffscreen", cmbOffscreen,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (cmbOffscreen);
- gtk_fixed_put (GTK_FIXED (fixed5), cmbOffscreen, 136, 0);
- gtk_widget_set_usize (cmbOffscreen, 208, 24);
- gtk_combo_set_value_in_list (GTK_COMBO (cmbOffscreen), TRUE, FALSE);
- gtk_combo_set_use_arrows_always (GTK_COMBO (cmbOffscreen), TRUE);
- cmbOffscreen_items = g_list_append (cmbOffscreen_items, (gpointer) _("0: None - Fastest, most glitches"));
- cmbOffscreen_items = g_list_append (cmbOffscreen_items, (gpointer) _("1: Minimum - Missing screens"));
- cmbOffscreen_items = g_list_append (cmbOffscreen_items, (gpointer) _("2: Standard - OK for most games"));
- cmbOffscreen_items = g_list_append (cmbOffscreen_items, (gpointer) _("3: Enhanced - Shows more stuff"));
- cmbOffscreen_items = g_list_append (cmbOffscreen_items, (gpointer) _("4: Extended - Causing garbage"));
- gtk_combo_set_popdown_strings (GTK_COMBO (cmbOffscreen), cmbOffscreen_items);
- g_list_free (cmbOffscreen_items);
-
- combo_entry4 = GTK_COMBO (cmbOffscreen)->entry;
- gtk_widget_ref (combo_entry4);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "combo_entry4", combo_entry4,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (combo_entry4);
- gtk_entry_set_text (GTK_ENTRY (combo_entry4), _("0: None - Fastest, most glitches"));
-
- cmbFrameTex = gtk_combo_new ();
- gtk_widget_ref (cmbFrameTex);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "cmbFrameTex", cmbFrameTex,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (cmbFrameTex);
- gtk_fixed_put (GTK_FIXED (fixed5), cmbFrameTex, 136, 24);
- gtk_widget_set_usize (cmbFrameTex, 208, 24);
- gtk_combo_set_value_in_list (GTK_COMBO (cmbFrameTex), TRUE, FALSE);
- gtk_combo_set_use_arrows_always (GTK_COMBO (cmbFrameTex), TRUE);
- cmbFrameTex_items = g_list_append (cmbFrameTex_items, (gpointer) _("0: Emulated vram - Needs FVP"));
- cmbFrameTex_items = g_list_append (cmbFrameTex_items, (gpointer) _("1: Black - Fast, no effects"));
- cmbFrameTex_items = g_list_append (cmbFrameTex_items, (gpointer) _("2: Gfx card buffer - Can be slow"));
- cmbFrameTex_items = g_list_append (cmbFrameTex_items, (gpointer) _("3: Gfx card & soft - slow"));
- gtk_combo_set_popdown_strings (GTK_COMBO (cmbFrameTex), cmbFrameTex_items);
- g_list_free (cmbFrameTex_items);
-
- combo_entry5 = GTK_COMBO (cmbFrameTex)->entry;
- gtk_widget_ref (combo_entry5);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "combo_entry5", combo_entry5,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (combo_entry5);
- gtk_entry_set_text (GTK_ENTRY (combo_entry5), _("0: Emulated vram - Needs FVP"));
-
- cmbFrameAcc = gtk_combo_new ();
- gtk_widget_ref (cmbFrameAcc);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "cmbFrameAcc", cmbFrameAcc,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (cmbFrameAcc);
- gtk_fixed_put (GTK_FIXED (fixed5), cmbFrameAcc, 136, 48);
- gtk_widget_set_usize (cmbFrameAcc, 208, 22);
- gtk_combo_set_value_in_list (GTK_COMBO (cmbFrameAcc), TRUE, FALSE);
- gtk_combo_set_use_arrows_always (GTK_COMBO (cmbFrameAcc), TRUE);
- cmbFrameAcc_items = g_list_append (cmbFrameAcc_items, (gpointer) _("0: Emulated vram - ok most times"));
- cmbFrameAcc_items = g_list_append (cmbFrameAcc_items, (gpointer) _("1: Gfx card buffer reads"));
- cmbFrameAcc_items = g_list_append (cmbFrameAcc_items, (gpointer) _("2: Gfx card buffer moves"));
- cmbFrameAcc_items = g_list_append (cmbFrameAcc_items, (gpointer) _("3: Gfx buffer reads & moves"));
- cmbFrameAcc_items = g_list_append (cmbFrameAcc_items, (gpointer) _("4: Full Software (FVP)"));
- gtk_combo_set_popdown_strings (GTK_COMBO (cmbFrameAcc), cmbFrameAcc_items);
- g_list_free (cmbFrameAcc_items);
-
- combo_entry6 = GTK_COMBO (cmbFrameAcc)->entry;
- gtk_widget_ref (combo_entry6);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "combo_entry6", combo_entry6,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (combo_entry6);
- gtk_entry_set_text (GTK_ENTRY (combo_entry6), _("0: Emulated vram - ok most times"));
-
- frmFixes = gtk_frame_new (_("Special game fixes"));
- gtk_widget_ref (frmFixes);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "frmFixes", frmFixes,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (frmFixes);
- gtk_fixed_put (GTK_FIXED (fixed1), frmFixes, 372, 312);
- gtk_widget_set_usize (frmFixes, 364, 232);
-
- fixed7 = gtk_fixed_new ();
- gtk_widget_ref (fixed7);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "fixed7", fixed7,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (fixed7);
- gtk_container_add (GTK_CONTAINER (frmFixes), fixed7);
-
- chkGameFixes = gtk_check_button_new_with_label (_("Use game fixes"));
- gtk_widget_ref (chkGameFixes);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "chkGameFixes", chkGameFixes,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (chkGameFixes);
- gtk_fixed_put (GTK_FIXED (fixed7), chkGameFixes, 8, 0);
- gtk_widget_set_usize (chkGameFixes, 336, 24);
-
- chkFix0 = gtk_check_button_new_with_label (_("Battle cursor (FF7)"));
- gtk_widget_ref (chkFix0);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "chkFix0", chkFix0,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (chkFix0);
- gtk_fixed_put (GTK_FIXED (fixed7), chkFix0, 8, 24);
- gtk_widget_set_usize (chkFix0, 196, 20);
-
- chkFix1 = gtk_check_button_new_with_label (_("Direct FB updates"));
- gtk_widget_ref (chkFix1);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "chkFix1", chkFix1,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (chkFix1);
- gtk_fixed_put (GTK_FIXED (fixed7), chkFix1, 8, 44);
- gtk_widget_set_usize (chkFix1, 196, 20);
-
- chkFix2 = gtk_check_button_new_with_label (_("Black brightness (Lunar)"));
- gtk_widget_ref (chkFix2);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "chkFix2", chkFix2,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (chkFix2);
- gtk_fixed_put (GTK_FIXED (fixed7), chkFix2, 8, 64);
- gtk_widget_set_usize (chkFix2, 196, 20);
-
- chkFix3 = gtk_check_button_new_with_label (_("Swap front detection"));
- gtk_widget_ref (chkFix3);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "chkFix3", chkFix3,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (chkFix3);
- gtk_fixed_put (GTK_FIXED (fixed7), chkFix3, 8, 84);
- gtk_widget_set_usize (chkFix3, 196, 20);
-
- chkFix4 = gtk_check_button_new_with_label (_("Disable coord check"));
- gtk_widget_ref (chkFix4);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "chkFix4", chkFix4,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (chkFix4);
- gtk_fixed_put (GTK_FIXED (fixed7), chkFix4, 8, 104);
- gtk_widget_set_usize (chkFix4, 196, 20);
-
- chkFix5 = gtk_check_button_new_with_label (_("No blue glitches (LoD)"));
- gtk_widget_ref (chkFix5);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "chkFix5", chkFix5,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (chkFix5);
- gtk_fixed_put (GTK_FIXED (fixed7), chkFix5, 8, 124);
- gtk_widget_set_usize (chkFix5, 196, 20);
-
- chkFix6 = gtk_check_button_new_with_label (_("Soft FB access"));
- gtk_widget_ref (chkFix6);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "chkFix6", chkFix6,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (chkFix6);
- gtk_fixed_put (GTK_FIXED (fixed7), chkFix6, 8, 144);
- gtk_widget_set_usize (chkFix6, 196, 20);
-
- chkFix7 = gtk_check_button_new_with_label (_("PC fps calculation"));
- gtk_widget_ref (chkFix7);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "chkFix7", chkFix7,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (chkFix7);
- gtk_fixed_put (GTK_FIXED (fixed7), chkFix7, 8, 164);
- gtk_widget_set_usize (chkFix7, 196, 20);
-
- chkFix8 = gtk_check_button_new_with_label (_("Old frame skipping"));
- gtk_widget_ref (chkFix8);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "chkFix8", chkFix8,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (chkFix8);
- gtk_fixed_put (GTK_FIXED (fixed7), chkFix8, 8, 184);
- gtk_widget_set_usize (chkFix8, 196, 20);
-
- chkFix9 = gtk_check_button_new_with_label (_("Yellow rect (FF9)"));
- gtk_widget_ref (chkFix9);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "chkFix9", chkFix9,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (chkFix9);
- gtk_fixed_put (GTK_FIXED (fixed7), chkFix9, 194, 24);
- gtk_widget_set_usize (chkFix9, 196, 20);
-
- chkFix10 = gtk_check_button_new_with_label (_("No subtr. blending"));
- gtk_widget_ref (chkFix10);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "chkFix10", chkFix10,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (chkFix10);
- gtk_fixed_put (GTK_FIXED (fixed7), chkFix10, 194, 44);
- gtk_widget_set_usize (chkFix10, 196, 20);
-
- chkFix11 = gtk_check_button_new_with_label (_("Lazy upload (DW7)"));
- gtk_widget_ref (chkFix11);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "chkFix11", chkFix11,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (chkFix11);
- gtk_fixed_put (GTK_FIXED (fixed7), chkFix11, 194, 64);
- gtk_widget_set_usize (chkFix11, 196, 20);
-
- chkFix12 = gtk_check_button_new_with_label (_("Odd/even hack"));
- gtk_widget_ref (chkFix12);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "chkFix12", chkFix12,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (chkFix12);
- gtk_fixed_put (GTK_FIXED (fixed7), chkFix12, 194, 84);
- gtk_widget_set_usize (chkFix12, 196, 20);
-
- chkFix13 = gtk_check_button_new_with_label (_("Adjust screen width"));
- gtk_widget_ref (chkFix13);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "chkFix13", chkFix13,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (chkFix13);
- gtk_fixed_put (GTK_FIXED (fixed7), chkFix13, 194, 104);
- gtk_widget_set_usize (chkFix13, 196, 20);
-
- chkFix14 = gtk_check_button_new_with_label (_("Old texture filtering"));
- gtk_widget_ref (chkFix14);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "chkFix14", chkFix14,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (chkFix14);
- gtk_fixed_put (GTK_FIXED (fixed7), chkFix14, 194, 124);
- gtk_widget_set_usize (chkFix14, 196, 20);
-
- chkFix15 = gtk_check_button_new_with_label (_("Additional uploads"));
- gtk_widget_ref (chkFix15);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "chkFix15", chkFix15,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (chkFix15);
- gtk_fixed_put (GTK_FIXED (fixed7), chkFix15, 194, 144);
- gtk_widget_set_usize (chkFix15, 196, 20);
-
- chkFix16 = gtk_check_button_new_with_label (_("unused"));
- gtk_widget_ref (chkFix16);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "chkFix16", chkFix16,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (chkFix16);
- gtk_fixed_put (GTK_FIXED (fixed7), chkFix16, 194, 164);
- gtk_widget_set_usize (chkFix16, 196, 20);
-
- chkFix17 = gtk_check_button_new_with_label (_("Fake 'gpu busy'"));
- gtk_widget_ref (chkFix17);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "chkFix17", chkFix17,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (chkFix17);
- gtk_fixed_put (GTK_FIXED (fixed7), chkFix17, 194, 184);
- gtk_widget_set_usize (chkFix17, 196, 20);
-
- frmMisc = gtk_frame_new (_("Misc"));
- gtk_widget_ref (frmMisc);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "frmMisc", frmMisc,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (frmMisc);
- gtk_fixed_put (GTK_FIXED (fixed1), frmMisc, 0, 312);
- gtk_widget_set_usize (frmMisc, 364, 232);
-
- fixed6 = gtk_fixed_new ();
- gtk_widget_ref (fixed6);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "fixed6", fixed6,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (fixed6);
- gtk_container_add (GTK_CONTAINER (frmMisc), fixed6);
-
- edtScanBlend = gtk_entry_new ();
- gtk_widget_ref (edtScanBlend);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "edtScanBlend", edtScanBlend,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (edtScanBlend);
- gtk_fixed_put (GTK_FIXED (fixed6), edtScanBlend, 285, 0);
- gtk_widget_set_usize (edtScanBlend, 54, 22);
-
- chkScanlines = gtk_check_button_new_with_label (_("Scanlines"));
- gtk_widget_ref (chkScanlines);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "chkScanlines", chkScanlines,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (chkScanlines);
- gtk_fixed_put (GTK_FIXED (fixed6), chkScanlines, 8, 0);
- gtk_widget_set_usize (chkScanlines, 100, 24);
-
- label11 = gtk_label_new (_("Blending (0..255, -1=dot):"));
- gtk_widget_ref (label11);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "label11", label11,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (label11);
- gtk_fixed_put (GTK_FIXED (fixed6), label11, 108, 0);
- gtk_widget_set_usize (label11, 164, 24);
-
- chkBlur = gtk_check_button_new_with_label (_("Screen smoothing (can be slow or unsupported)"));
- gtk_widget_ref (chkBlur);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "chkBlur", chkBlur,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (chkBlur);
- gtk_fixed_put (GTK_FIXED (fixed6), chkBlur, 8, 132);
- gtk_widget_set_usize (chkBlur, 350, 20);
-
- chkExtensions = gtk_check_button_new_with_label (_("Use OpenGL extensions (recommended)"));
- gtk_widget_ref (chkExtensions);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "chkExtensions", chkExtensions,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (chkExtensions);
- gtk_fixed_put (GTK_FIXED (fixed6), chkExtensions, 8, 112);
- gtk_widget_set_usize (chkExtensions, 350, 20);
-
- chkAntiA = gtk_check_button_new_with_label (_("Polygon anti-aliasing (slow with most cards)"));
- gtk_widget_ref (chkAntiA);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "chkAntiA", chkAntiA,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (chkAntiA);
- gtk_fixed_put (GTK_FIXED (fixed6), chkAntiA, 8, 92);
- gtk_widget_set_usize (chkAntiA, 350, 20);
-
- chkLinemode = gtk_check_button_new_with_label (_("Line mode (polygons will not get filled)"));
- gtk_widget_ref (chkLinemode);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "chkLinemode", chkLinemode,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (chkLinemode);
- gtk_fixed_put (GTK_FIXED (fixed6), chkLinemode, 8, 72);
- gtk_widget_set_usize (chkLinemode, 350, 20);
-
- chk15bitMdec = gtk_check_button_new_with_label (_("Force 15 bit framebuffer updates (faster movies)"));
- gtk_widget_ref (chk15bitMdec);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "chk15bitMdec", chk15bitMdec,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (chk15bitMdec);
- gtk_fixed_put (GTK_FIXED (fixed6), chk15bitMdec, 8, 52);
- gtk_widget_set_usize (chk15bitMdec, 350, 20);
-
- chkFastMdec = gtk_check_button_new_with_label (_("Unfiltered MDECs (small movie speedup)"));
- gtk_widget_ref (chkFastMdec);
- gtk_object_set_data_full (GTK_OBJECT (CfgWnd), "chkFastMdec", chkFastMdec,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (chkFastMdec);
- gtk_fixed_put (GTK_FIXED (fixed6), chkFastMdec, 8, 32);
- gtk_widget_set_usize (chkFastMdec, 350, 20);
-
- gtk_signal_connect (GTK_OBJECT (CfgWnd), "destroy",
- GTK_SIGNAL_FUNC (on_CfgWnd_destroy), NULL);
- gtk_signal_connect (GTK_OBJECT (btnSave), "clicked",
- GTK_SIGNAL_FUNC (on_btnSave_clicked), NULL);
- gtk_signal_connect (GTK_OBJECT (btnCancel), "clicked",
- GTK_SIGNAL_FUNC (on_btnCancel_clicked), NULL);
-
- return CfgWnd;
-}
-
-GtkWidget*
-create_AboutWnd (void)
-{
- GtkWidget *AboutWnd;
- GtkWidget *fixed8;
- GtkWidget *bntAClose;
- GtkWidget *label13;
- GtkWidget *label15;
- GtkWidget *label21;
- GtkWidget *label19;
-
- AboutWnd = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- gtk_object_set_data (GTK_OBJECT (AboutWnd), "AboutWnd", AboutWnd);
- gtk_container_set_border_width (GTK_CONTAINER (AboutWnd), 12);
- gtk_window_set_title (GTK_WINDOW (AboutWnd), _("About"));
- gtk_window_set_position (GTK_WINDOW (AboutWnd), GTK_WIN_POS_CENTER);
- gtk_window_set_modal (GTK_WINDOW (AboutWnd), TRUE);
- gtk_window_set_policy (GTK_WINDOW (AboutWnd), FALSE, FALSE, FALSE);
-
- fixed8 = gtk_fixed_new ();
- gtk_widget_ref (fixed8);
- gtk_object_set_data_full (GTK_OBJECT (AboutWnd), "fixed8", fixed8,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (fixed8);
- gtk_container_add (GTK_CONTAINER (AboutWnd), fixed8);
-
- bntAClose = gtk_button_new_with_label (_("OK"));
- gtk_widget_ref (bntAClose);
- gtk_object_set_data_full (GTK_OBJECT (AboutWnd), "bntAClose", bntAClose,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (bntAClose);
- gtk_fixed_put (GTK_FIXED (fixed8), bntAClose, 136, 184);
- gtk_widget_set_uposition (bntAClose, 136, 184);
- gtk_widget_set_usize (bntAClose, 88, 24);
-
- label13 = gtk_label_new (_("Adapted from P.E.Op.S OpenGL GPU by Pete Bernert"));
- gtk_widget_ref (label13);
- gtk_object_set_data_full (GTK_OBJECT (AboutWnd), "label13", label13,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (label13);
- gtk_fixed_put (GTK_FIXED (fixed8), label13, 0, 8);
- gtk_widget_set_uposition (label13, 0, 8);
- gtk_widget_set_usize (label13, 360, 16);
-
- label15 = gtk_label_new (_("Homepage: http://www.pbernert.com"));
- gtk_widget_ref (label15);
- gtk_object_set_data_full (GTK_OBJECT (AboutWnd), "label15", label15,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (label15);
- gtk_fixed_put (GTK_FIXED (fixed8), label15, 0, 40);
- gtk_widget_set_uposition (label15, 0, 40);
- gtk_widget_set_usize (label15, 360, 16);
-
- label21 = gtk_label_new ("Compile date: " __DATE__);
- gtk_widget_ref (label21);
- gtk_object_set_data_full (GTK_OBJECT (AboutWnd), "label21", label21,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (label21);
- gtk_fixed_put (GTK_FIXED (fixed8), label21, 0, 136);
- gtk_widget_set_uposition (label21, 0, 136);
- gtk_widget_set_usize (label21, 360, 16);
-
- label19 = gtk_label_new (_("Version: 1.78"));
- gtk_widget_ref (label19);
- gtk_object_set_data_full (GTK_OBJECT (AboutWnd), "label19", label19,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (label19);
- gtk_fixed_put (GTK_FIXED (fixed8), label19, 0, 104);
- gtk_widget_set_uposition (label19, 0, 104);
- gtk_widget_set_usize (label19, 360, 16);
-
- gtk_signal_connect (GTK_OBJECT (AboutWnd), "destroy",
- GTK_SIGNAL_FUNC (on_AboutWnd_destroy),
- NULL);
- gtk_signal_connect (GTK_OBJECT (bntAClose), "clicked",
- GTK_SIGNAL_FUNC (on_bntAClose_clicked),
- NULL);
-
- return AboutWnd;
-}

pcsxr-1.9.92.tar.bz2/plugins/peopsxgl/gpucfg/interface.h Deleted

pcsxr-1.9.92.tar.bz2/plugins/peopsxgl/gpucfg/support.c Deleted

@@ -1,155 +0,0 @@
-#include "config.h"
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <string.h>
-
-#include <gtk/gtk.h>
-
-#include "support.h"
-
-/* This is an internally used function to check if a pixmap file exists. */
-static gchar* check_file_exists (const gchar *directory,
- const gchar *filename);
-
-/* This is an internally used function to create pixmaps. */
-static GtkWidget* create_dummy_pixmap (GtkWidget *widget);
-
-GtkWidget*
-lookup_widget (GtkWidget *widget,
- const gchar *widget_name)
-{
- GtkWidget *parent, *found_widget;
-
- for (;;)
- {
- if (GTK_IS_MENU (widget))
- parent = gtk_menu_get_attach_widget (GTK_MENU (widget));
- else
- parent = widget->parent;
- if (parent == NULL)
- break;
- widget = parent;
- }
-
- found_widget = (GtkWidget*) gtk_object_get_data (GTK_OBJECT (widget),
- widget_name);
- if (!found_widget)
- g_warning ("Widget not found: %s", widget_name);
- return found_widget;
-}
-
-/* This is a dummy pixmap we use when a pixmap can't be found. */
-static char *dummy_pixmap_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"1 1 1 1",
-" c None",
-/* pixels */
-" "
-};
-
-/* This is an internally used function to create pixmaps. */
-static GtkWidget*
-create_dummy_pixmap (GtkWidget *widget)
-{
- GdkColormap *colormap;
- GdkPixmap *gdkpixmap;
- GdkBitmap *mask;
- GtkWidget *pixmap;
-
- colormap = gtk_widget_get_colormap (widget);
- gdkpixmap = gdk_pixmap_colormap_create_from_xpm_d (NULL, colormap, &mask,
- NULL, dummy_pixmap_xpm);
- if (gdkpixmap == NULL)
- g_error ("Couldn't create replacement pixmap.");
- pixmap = gtk_pixmap_new (gdkpixmap, mask);
- gdk_pixmap_unref (gdkpixmap);
- gdk_bitmap_unref (mask);
- return pixmap;
-}
-
-static GList *pixmaps_directories = NULL;
-
-/* Use this function to set the directory containing installed pixmaps. */
-void
-add_pixmap_directory (const gchar *directory)
-{
- pixmaps_directories = g_list_prepend (pixmaps_directories,
- g_strdup (directory));
-}
-
-/* This is an internally used function to create pixmaps. */
-GtkWidget*
-create_pixmap (GtkWidget *widget,
- const gchar *filename)
-{
- gchar *found_filename = NULL;
- GdkColormap *colormap;
- GdkPixmap *gdkpixmap;
- GdkBitmap *mask;
- GtkWidget *pixmap;
- GList *elem;
-
- if (!filename || !filename[0])
- return create_dummy_pixmap (widget);
-
- /* We first try any pixmaps directories set by the application. */
- elem = pixmaps_directories;
- while (elem)
- {
- found_filename = check_file_exists ((gchar*)elem->data, filename);
- if (found_filename)
- break;
- elem = elem->next;
- }
-
- /* If we haven't found the pixmap, try the source directory. */
- if (!found_filename)
- {
- found_filename = check_file_exists ("../pixmaps", filename);
- }
-
- if (!found_filename)
- {
- g_warning ("Couldn't find pixmap file: %s", filename);
- return create_dummy_pixmap (widget);
- }
-
- colormap = gtk_widget_get_colormap (widget);
- gdkpixmap = gdk_pixmap_colormap_create_from_xpm (NULL, colormap, &mask,
- NULL, found_filename);
- if (gdkpixmap == NULL)
- {
- g_warning ("Error loading pixmap file: %s", found_filename);
- g_free (found_filename);
- return create_dummy_pixmap (widget);
- }
- g_free (found_filename);
- pixmap = gtk_pixmap_new (gdkpixmap, mask);
- gdk_pixmap_unref (gdkpixmap);
- gdk_bitmap_unref (mask);
- return pixmap;
-}
-
-/* This is an internally used function to check if a pixmap file exists. */
-gchar*
-check_file_exists (const gchar *directory,
- const gchar *filename)
-{
- gchar *full_filename;
- struct stat s;
- gint status;
-
- full_filename = (gchar*) g_malloc (strlen (directory) + 1
- + strlen (filename) + 1);
- strcpy (full_filename, directory);
- strcat (full_filename, G_DIR_SEPARATOR_S);
- strcat (full_filename, filename);
-
- status = stat (full_filename, &s);
- if (status == 0 && S_ISREG (s.st_mode))
- return full_filename;
- g_free (full_filename);
- return NULL;
-}

pcsxr-1.9.92.tar.bz2/plugins/peopsxgl/gpucfg/support.h Deleted

@@ -1,38 +0,0 @@
-/*
- * DO NOT EDIT THIS FILE - it is generated by Glade.
- */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <gtk/gtk.h>
-
-/*
- * Public Functions.
- */
-
-/*
- * This function returns a widget in a component created by Glade.
- * Call it with the toplevel widget in the component (i.e. a window/dialog),
- * or alternatively any widget in the component, and the name of the widget
- * you want returned.
- */
-GtkWidget* lookup_widget (GtkWidget *widget,
- const gchar *widget_name);
-
-/* get_widget() is deprecated. Use lookup_widget instead. */
-#define get_widget lookup_widget
-
-/* Use this function to set the directory containing installed pixmaps. */
-void add_pixmap_directory (const gchar *directory);
-
-
-/*
- * Private Functions.
- */
-
-/* This is used to create the pixmaps in the interface. */
-GtkWidget* create_pixmap (GtkWidget *widget,
- const gchar *filename);
-

pcsxr-1.9.92.tar.bz2/po/Rules-quot Deleted

@@ -1,47 +0,0 @@
-# Special Makefile rules for English message catalogs with quotation marks.
-
-DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot
-
-.SUFFIXES: .insert-header .po-update-en
-
-en@quot.po-create:
-	$(MAKE) en@quot.po-update
-en@boldquot.po-create:
-	$(MAKE) en@boldquot.po-update
-
-en@quot.po-update: en@quot.po-update-en
-en@boldquot.po-update: en@boldquot.po-update-en
-
-.insert-header.po-update-en:
-	@lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \
-	if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
-	tmpdir=`pwd`; \
-	echo "$$lang:"; \
-	ll=`echo $$lang | sed -e 's/@.*//'`; \
-	LC_ALL=C; export LC_ALL; \
-	cd $(srcdir); \
-	if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
-	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
-	    rm -f $$tmpdir/$$lang.new.po; \
-	  else \
-	    if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
-	      :; \
-	    else \
-	      echo "creation of $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
-	      exit 1; \
-	    fi; \
-	  fi; \
-	else \
-	  echo "creation of $$lang.po failed!" 1>&2; \
-	  rm -f $$tmpdir/$$lang.new.po; \
-	fi
-
-en@quot.insert-header: insert-header.sin
-	sed -e '/^#/d' -e 's/HEADER/en@quot.header/g' $(srcdir)/insert-header.sin > en@quot.insert-header
-
-en@boldquot.insert-header: insert-header.sin
-	sed -e '/^#/d' -e 's/HEADER/en@boldquot.header/g' $(srcdir)/insert-header.sin > en@boldquot.insert-header
-
-mostlyclean: mostlyclean-quot
-mostlyclean-quot:
-	rm -f *.insert-header

pcsxr-1.9.92.tar.bz2/po/boldquot.sed Deleted

pcsxr-1.9.92.tar.bz2/po/en@boldquot.header Deleted

@@ -1,25 +0,0 @@
-# All this catalog "translates" are quotation characters.
-# The msgids must be ASCII and therefore cannot contain real quotation
-# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
-# and double quote (0x22). These substitutes look strange; see
-# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
-#
-# This catalog translates grave accent (0x60) and apostrophe (0x27) to
-# left single quotation mark (U+2018) and right single quotation mark (U+2019).
-# It also translates pairs of apostrophe (0x27) to
-# left single quotation mark (U+2018) and right single quotation mark (U+2019)
-# and pairs of quotation mark (0x22) to
-# left double quotation mark (U+201C) and right double quotation mark (U+201D).
-#
-# When output to an UTF-8 terminal, the quotation characters appear perfectly.
-# When output to an ISO-8859-1 terminal, the single quotation marks are
-# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
-# grave/acute accent (by libiconv), and the double quotation marks are
-# transliterated to 0x22.
-# When output to an ASCII terminal, the single quotation marks are
-# transliterated to apostrophes, and the double quotation marks are
-# transliterated to 0x22.
-#
-# This catalog furthermore displays the text between the quotation marks in
-# bold face, assuming the VT100/XTerm escape sequences.
-#

pcsxr-1.9.92.tar.bz2/po/en@quot.header Deleted

@@ -1,22 +0,0 @@
-# All this catalog "translates" are quotation characters.
-# The msgids must be ASCII and therefore cannot contain real quotation
-# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
-# and double quote (0x22). These substitutes look strange; see
-# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
-#
-# This catalog translates grave accent (0x60) and apostrophe (0x27) to
-# left single quotation mark (U+2018) and right single quotation mark (U+2019).
-# It also translates pairs of apostrophe (0x27) to
-# left single quotation mark (U+2018) and right single quotation mark (U+2019)
-# and pairs of quotation mark (0x22) to
-# left double quotation mark (U+201C) and right double quotation mark (U+201D).
-#
-# When output to an UTF-8 terminal, the quotation characters appear perfectly.
-# When output to an ISO-8859-1 terminal, the single quotation marks are
-# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
-# grave/acute accent (by libiconv), and the double quotation marks are
-# transliterated to 0x22.
-# When output to an ASCII terminal, the single quotation marks are
-# transliterated to apostrophes, and the double quotation marks are
-# transliterated to 0x22.
-#

pcsxr-1.9.92.tar.bz2/po/insert-header.sin Deleted

pcsxr-1.9.92.tar.bz2/po/it.gmo Deleted

pcsxr-1.9.92.tar.bz2/po/pcsx.pot Deleted

@@ -1,2950 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-10 14:04+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../win32/gui/AboutDlg.c:26
-msgid ""
-"PCSX - A PlayStation Emulator\n"
-"\n"
-"Original Authors:\n"
-"main coder: linuzappz\n"
-"co-coders: shadow\n"
-"ex-coders: Nocomp, Pete Bernett, nik3d\n"
-"Webmaster: AkumaX"
-msgstr ""
-
-#: ../win32/gui/AboutDlg.c:35
-msgid ""
-"PCSX-df Authors:\n"
-"Ryan Schultz, Andrew Burton, Stephen Chao,\n"
-"Marcus Comstedt, Stefan Sikora\n"
-"\n"
-"PCSX-Reloaded By:\n"
-"Blade_Arma, Wei Mingzhi, et al.\n"
-"\n"
-"http://pcsxr.codeplex.com/"
-msgstr ""
-
-#: ../win32/gui/AboutDlg.c:46 ../plugins/peopsxgl/gpucfg/interface.c:831
-msgid "About"
-msgstr ""
-
-#: ../win32/gui/AboutDlg.c:48 ../win32/gui/AboutDlg.c:52
-#: ../win32/gui/CheatDlg.c:69 ../win32/gui/CheatDlg.c:119
-#: ../win32/gui/ConfigurePlugins.c:483 ../win32/gui/ConfigurePlugins.c:614
-#: ../win32/gui/WndMain.c:974 ../win32/gui/WndMain.c:1210
-#: ../plugins/peopsxgl/gpucfg/interface.c:130
-#: ../plugins/peopsxgl/gpucfg/interface.c:843
-msgid "OK"
-msgstr ""
-
-#: ../win32/gui/AboutDlg.c:49
-msgid "PCSX EMU\n"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
-#: ../win32/gui/CheatDlg.c:270
-msgid "Yes"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
-#: ../win32/gui/CheatDlg.c:270
-msgid "No"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:66 ../gui/Cheat.c:194
-msgid "Edit Cheat"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:67 ../win32/gui/CheatDlg.c:117 ../gui/Cheat.c:636
-msgid "Description:"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:68 ../win32/gui/CheatDlg.c:118 ../gui/Cheat.c:125
-#: ../gui/Cheat.c:211
-msgid "Cheat Code:"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:70 ../win32/gui/CheatDlg.c:120
-#: ../win32/gui/ConfigurePlugins.c:484 ../win32/gui/ConfigurePlugins.c:615
-#: ../win32/gui/WndMain.c:975 ../win32/gui/WndMain.c:1211
-#: ../plugins/peopsxgl/gpucfg/interface.c:338
-msgid "Cancel"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:91 ../win32/gui/CheatDlg.c:132 ../gui/Cheat.c:155
-#: ../gui/Cheat.c:251
-msgid "Invalid cheat code!"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:116 ../gui/Cheat.c:109
-msgid "Add New Cheat"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:166 ../data/pcsx.glade2:2534
-msgid "Edit Cheat Codes"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:168
-msgid "&Add Code"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:169
-msgid "&Edit Code"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:170
-msgid "&Remove Code"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:171
-msgid "&Enable/Disable"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:172
-msgid "&Load..."
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:173
-msgid "&Save As..."
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:174
-msgid "&Close"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:185 ../gui/Cheat.c:413
-msgid "Description"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:190
-msgid "Enabled"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:282 ../win32/gui/CheatDlg.c:311
-msgid "PCSX Cheat Code Files"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:402
-msgid "Equal Value"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:403
-msgid "Not Equal Value"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:404
-msgid "Range"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:407
-msgid "Increased By"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:408
-msgid "Decreased By"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:409
-msgid "Increased"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:410
-msgid "Decreased"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:411
-msgid "Different"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:412
-msgid "No Change"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:448 ../gui/Cheat.c:585
-msgid "Enter the values and start your search."
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:453
-msgid "No addresses found."
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:457 ../gui/Cheat.c:543
-msgid "Too many addresses found."
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:466 ../gui/Cheat.c:552
-#, c-format
-msgid "%.8X Current: %u (%.2X), Previous: %u (%.2X)"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:471 ../gui/Cheat.c:557
-#, c-format
-msgid "%.8X Current: %u (%.4X), Previous: %u (%.4X)"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:476 ../gui/Cheat.c:562
-#, c-format
-msgid "%.8X Current: %u (%.8X), Previous: %u (%.8X)"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:492 ../gui/Cheat.c:577
-#, c-format
-msgid "Founded Addresses: %d"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:504 ../data/pcsx.glade2:2930
-msgid "Freeze"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:505 ../win32/gui/CheatDlg.c:596
-msgid "Address:"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:506 ../win32/gui/CheatDlg.c:597
-#: ../win32/gui/CheatDlg.c:682 ../gui/Cheat.c:647 ../data/pcsx.glade2:2773
-msgid "Value:"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:566
-#, c-format
-msgid "Freeze %.8X"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:595 ../data/pcsx.glade2:2966
-msgid "Modify"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:678 ../gui/Cheat.c:1129 ../data/pcsx.glade2:2703
-msgid "Cheat Search"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:680 ../data/pcsx.glade2:2751
-msgid "Search For:"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:681 ../data/pcsx.glade2:2761
-msgid "Data Type:"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:683 ../data/pcsx.glade2:2785
-msgid "Data Base:"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:684 ../data/pcsx.glade2:2845
-msgid "To:"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:685
-msgid "&Freeze"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:686
-msgid "&Modify"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:687
-msgid "&Copy"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:688
-msgid "&Search"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:689
-msgid "&New Search"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:690
-msgid "C&lose"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:692
-msgid "8-bit"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:693
-msgid "16-bit"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:694
-msgid "32-bit"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:695
-msgid "Decimal"
-msgstr ""
-
-#: ../win32/gui/CheatDlg.c:696
-msgid "Hexadecimal"
-msgstr ""
-
-#: ../win32/gui/ConfigurePlugins.c:219
-msgid "Simulate Psx Bios"
-msgstr ""
-
-#: ../win32/gui/ConfigurePlugins.c:305
-msgid "Configuration not OK!"
-msgstr ""
-
-#: ../win32/gui/ConfigurePlugins.c:305 ../gui/Cheat.c:155 ../gui/Cheat.c:251
-#: ../gui/LnxMain.c:418
-msgid "Error"
-msgstr ""
-
-#: ../win32/gui/ConfigurePlugins.c:406
-msgid "This plugin reports that should work correctly"
-msgstr ""
-
-#: ../win32/gui/ConfigurePlugins.c:407
-msgid "This plugin reports that should not work correctly"
-msgstr ""
-
-#: ../win32/gui/ConfigurePlugins.c:463
-msgid "Select Plugins Directory"
-msgstr ""
-
-#: ../win32/gui/ConfigurePlugins.c:472
-msgid "Select Bios Directory"
-msgstr ""
-
-#: ../win32/gui/ConfigurePlugins.c:481
-msgid "Configuration"
-msgstr ""
-
-#: ../win32/gui/ConfigurePlugins.c:485
-msgid "Graphics"
-msgstr ""
-
-#: ../win32/gui/ConfigurePlugins.c:486
-msgid "First Controller"
-msgstr ""
-
-#: ../win32/gui/ConfigurePlugins.c:487
-msgid "Second Controller"
-msgstr ""
-
-#: ../win32/gui/ConfigurePlugins.c:488
-msgid "Sound"
-msgstr ""
-
-#: ../win32/gui/ConfigurePlugins.c:489
-msgid "Cdrom"
-msgstr ""
-
-#: ../win32/gui/ConfigurePlugins.c:490
-msgid "Bios"
-msgstr ""
-
-#: ../win32/gui/ConfigurePlugins.c:491
-msgid "Set Bios Directory"
-msgstr ""
-
-#: ../win32/gui/ConfigurePlugins.c:492
-msgid "Set Plugins Directory"
-msgstr ""
-
-#: ../win32/gui/ConfigurePlugins.c:493 ../win32/gui/ConfigurePlugins.c:496
-#: ../win32/gui/ConfigurePlugins.c:499 ../win32/gui/ConfigurePlugins.c:502
-#: ../win32/gui/ConfigurePlugins.c:505 ../win32/gui/ConfigurePlugins.c:617
-msgid "Configure..."
-msgstr ""
-
-#: ../win32/gui/ConfigurePlugins.c:494 ../win32/gui/ConfigurePlugins.c:497
-#: ../win32/gui/ConfigurePlugins.c:500 ../win32/gui/ConfigurePlugins.c:503
-#: ../win32/gui/ConfigurePlugins.c:506 ../win32/gui/ConfigurePlugins.c:618
-msgid "Test..."
-msgstr ""
-
-#: ../win32/gui/ConfigurePlugins.c:495 ../win32/gui/ConfigurePlugins.c:498
-#: ../win32/gui/ConfigurePlugins.c:501 ../win32/gui/ConfigurePlugins.c:504
-#: ../win32/gui/ConfigurePlugins.c:507 ../win32/gui/ConfigurePlugins.c:619
-msgid "About..."
-msgstr ""
-
-#: ../win32/gui/ConfigurePlugins.c:612
-msgid "NetPlay Configuration"
-msgstr ""
-
-#: ../win32/gui/ConfigurePlugins.c:616 ../plugins/dfnet/gui.c:31
-#: ../plugins/dfnet/gui.c:112
-msgid "NetPlay"
-msgstr ""
-
-#: ../win32/gui/ConfigurePlugins.c:620
-msgid ""
-"Note: The NetPlay Plugin Directory should be the same as the other Plugins."
-msgstr ""
-
-#: ../win32/gui/plugin.c:90 ../win32/gui/WndMain.c:281
-#, c-format
-msgid "*PCSX*: Saved State %d"
-msgstr ""
-
-#: ../win32/gui/plugin.c:91 ../win32/gui/WndMain.c:282
-#, c-format
-msgid "*PCSX*: Error Saving State %d"
-msgstr ""
-
-#: ../win32/gui/plugin.c:107 ../win32/gui/WndMain.c:259
-#, c-format
-msgid "*PCSX*: Loaded State %d"
-msgstr ""
-
-#: ../win32/gui/plugin.c:108 ../win32/gui/WndMain.c:260
-#, c-format
-msgid "*PCSX*: Error Loading State %d"
-msgstr ""
-
-#: ../win32/gui/plugin.c:119
-#, c-format
-msgid "*PCSX*: Sio Irq Always Enabled"
-msgstr ""
-
-#: ../win32/gui/plugin.c:120
-#, c-format
-msgid "*PCSX*: Sio Irq Not Always Enabled"
-msgstr ""
-
-#: ../win32/gui/plugin.c:127
-#, c-format
-msgid "*PCSX*: Black&White Mdecs Only Enabled"
-msgstr ""
-
-#: ../win32/gui/plugin.c:128
-#, c-format
-msgid "*PCSX*: Black&White Mdecs Only Disabled"
-msgstr ""
-
-#: ../win32/gui/plugin.c:135
-#, c-format
-msgid "*PCSX*: Xa Enabled"
-msgstr ""
-
-#: ../win32/gui/plugin.c:136
-#, c-format
-msgid "*PCSX*: Xa Disabled"
-msgstr ""
-
-#: ../win32/gui/plugin.c:145
-msgid "*PCSX*: CdRom Case Opened"
-msgstr ""
-
-#: ../win32/gui/plugin.c:150
-msgid "*PCSX*: CdRom Case Closed"
-msgstr ""
-
-#: ../win32/gui/plugin.c:177
-msgid "Connecting..."
-msgstr ""
-
-#: ../win32/gui/plugin.c:179 ../win32/gui/plugin.c:186
-#, c-format
-msgid "Please wait while connecting... %c\n"
-msgstr ""
-
-#: ../win32/gui/plugin.c:214
-msgid "Error Opening CDR Plugin"
-msgstr ""
-
-#: ../win32/gui/plugin.c:277
-#, c-format
-msgid "Error Opening GPU Plugin (%d)"
-msgstr ""
-
-#: ../win32/gui/plugin.c:279
-#, c-format
-msgid "Error Opening SPU Plugin (%d)"
-msgstr ""
-
-#: ../win32/gui/plugin.c:282
-#, c-format
-msgid "Error Opening PAD1 Plugin (%d)"
-msgstr ""
-
-#: ../win32/gui/plugin.c:284
-#, c-format
-msgid "Error Opening PAD2 Plugin (%d)"
-msgstr ""
-
-#: ../win32/gui/plugin.c:314
-msgid "Error Closing CDR Plugin"
-msgstr ""
-
-#: ../win32/gui/plugin.c:316
-msgid "Error Closing GPU Plugin"
-msgstr ""
-
-#: ../win32/gui/plugin.c:318
-msgid "Error Closing SPU Plugin"
-msgstr ""
-
-#: ../win32/gui/plugin.c:336
-#, c-format
-msgid "CDRinit error: %d"
-msgstr ""
-
-#: ../win32/gui/plugin.c:338
-#, c-format
-msgid "GPUinit error: %d"
-msgstr ""
-
-#: ../win32/gui/plugin.c:340
-#, c-format
-msgid "SPUinit error: %d"
-msgstr ""
-
-#: ../win32/gui/plugin.c:342
-#, c-format
-msgid "PAD1init error: %d"
-msgstr ""
-
-#: ../win32/gui/plugin.c:344
-#, c-format
-msgid "PAD2init error: %d"
-msgstr ""
-
-#: ../win32/gui/plugin.c:347
-#, c-format
-msgid "NETinit error: %d"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:76
-msgid "Arabic"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:77
-msgid "Catalan"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:78
-msgid "German"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:79
-msgid "Greek"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:80 ../win32/gui/WndMain.c:1566
-#: ../win32/gui/WndMain.c:1568
-msgid "English"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:81
-msgid "Spanish"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:82
-msgid "French"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:83
-msgid "Italian"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:84
-msgid "Portuguese"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:85
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:86
-msgid "Romanian"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:87
-msgid "Russian"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:88
-msgid "Simplified Chinese"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:89
-msgid "Traditional Chinese"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:90
-msgid "Japanese"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:91
-msgid "Korean"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:300 ../win32/gui/WndMain.c:352
-msgid "PCSX State Format"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:327
-#, c-format
-msgid "*PCSX*: Loaded State %s"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:328
-#, c-format
-msgid "*PCSX*: Error Loading State %s"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:379
-#, c-format
-msgid "*PCSX*: Saved State %s"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:380
-#, c-format
-msgid "*PCSX*: Error Saving State %s"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:429 ../win32/gui/WndMain.c:478 ../gui/Gtk2Gui.c:485
-#: ../gui/Gtk2Gui.c:610
-msgid "The CD does not appear to be a valid Playstation CD"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:435 ../win32/gui/WndMain.c:484 ../gui/Gtk2Gui.c:493
-#: ../gui/Gtk2Gui.c:618
-msgid "Could not load CD-ROM!"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:445
-msgid "Running BIOS is not supported with Internal HLE Bios."
-msgstr ""
-
-#: ../win32/gui/WndMain.c:664 ../gui/MemcardDlg.c:62
-msgid "Title"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:670 ../gui/MemcardDlg.c:68
-msgid "Status"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:676
-msgid "Game ID"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:682
-msgid "Game"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:864
-msgid "mid link block"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:867
-msgid "terminiting link block"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:875 ../gui/MemcardDlg.c:155 ../gui/MemcardDlg.c:260
-msgid "Deleted"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:876 ../win32/gui/WndMain.c:879
-#: ../gui/MemcardDlg.c:157 ../gui/MemcardDlg.c:161 ../gui/MemcardDlg.c:262
-#: ../gui/MemcardDlg.c:266
-msgid "Free"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:878 ../gui/MemcardDlg.c:159 ../gui/MemcardDlg.c:264
-msgid "Used"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:972
-msgid "Memcard Manager"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:976 ../win32/gui/WndMain.c:979
-msgid "Select Mcd"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:977 ../win32/gui/WndMain.c:980
-msgid "Format Mcd"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:978 ../win32/gui/WndMain.c:981
-msgid "Reload Mcd"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:982
-msgid "-> Copy ->"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:983
-msgid "<- Copy <-"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:984
-msgid "Paste"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:985
-msgid "<- Un/Delete"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:986
-msgid "Un/Delete ->"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:988
-msgid "Memory Card 1"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:989
-msgid "Memory Card 2"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1044
-msgid "Are you sure you want to paste this selection?"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1044 ../win32/gui/WndMain.c:1155
-#: ../win32/gui/WndMain.c:1162
-msgid "Confirmation"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1155 ../win32/gui/WndMain.c:1162
-msgid "Are you sure you want to format this Memory Card?"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1208
-msgid "Cpu Config"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1213
-msgid "Disable Xa Decoding"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1214
-msgid "Sio Irq Always Enabled"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1215
-msgid "Black && White Movies"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1216
-msgid "Disable Cd audio"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1217 ../data/pcsx.glade2:1595
-msgid "Autodetect"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1218
-msgid "Enable Interpreter Cpu"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1219 ../data/pcsx.glade2:1451
-msgid "Enable Console Output"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1220 ../data/pcsx.glade2:1401
-msgid "Enable Debugger"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1221
-msgid "Spu Irq Always Enabled"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1222 ../data/pcsx.glade2:1538
-msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1223 ../data/pcsx.glade2:1553
-msgid "InuYasha Sengoku Battle Fix"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1225
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:277
-#: ../plugins/dfinput/dfinput.glade2:448
-msgid "Options"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1226
-msgid "Psx System Type"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1330
-msgid "Psx Mcd Format (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1335
-msgid "Psx Memory Card (*.mcr;*.mc)"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1340
-msgid "CVGS Memory Card (*.mem;*.vgs)"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1345
-msgid "Bleem Memory Card (*.mcd)"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1350
-msgid "DexDrive Memory Card (*.gme)"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1355
-msgid "DataDeck Memory Card (*.ddf)"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1360 ../win32/gui/WndMain.c:1441 ../gui/Cheat.c:321
-#: ../gui/Gtk2Gui.c:422 ../gui/Gtk2Gui.c:561
-msgid "All Files"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1399
-msgid "Psx Exe Format"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1436
-msgid "Psx Isos (*.iso;*.mdf;*.img;*.bin)"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1512
-msgid "&File"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1513
-msgid "E&xit"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1515
-msgid "Run &EXE..."
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1516
-msgid "Run &BIOS"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1517
-msgid "Run &ISO..."
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1518
-msgid "Run &CD"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1520
-msgid "&Emulator"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1521
-msgid "&States"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1523
-msgid "S&witch ISO..."
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1525
-msgid "Re&set"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1526
-msgid "&Run"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1527
-msgid "&Save"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1528
-msgid "&Load"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1529 ../win32/gui/WndMain.c:1535
-msgid "&Other..."
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1530 ../win32/gui/WndMain.c:1536
-msgid "Slot &5"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1531 ../win32/gui/WndMain.c:1537
-msgid "Slot &4"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1532 ../win32/gui/WndMain.c:1538
-msgid "Slot &3"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1533 ../win32/gui/WndMain.c:1539
-msgid "Slot &2"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1534 ../win32/gui/WndMain.c:1540
-msgid "Slot &1"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1542
-msgid "&Configuration"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1543
-msgid "Cheat &Search..."
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1544
-msgid "Ch&eat Code..."
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1547
-msgid "&Language"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1572
-msgid "&Memory cards..."
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1573
-msgid "C&PU..."
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1575
-msgid "&NetPlay..."
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1577
-msgid "&Controllers..."
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1578
-msgid "CD-&ROM..."
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1579
-msgid "&Sound..."
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1580
-msgid "&Graphics..."
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1582
-msgid "&Plugins && Bios..."
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1584
-msgid "&Help"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1585
-msgid "&About..."
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1764
-msgid "Pcsx Msg"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1767
-msgid "Error Loading Symbol"
-msgstr ""
-
-#: ../gui/AboutDlg.c:74
-msgid ""
-"(C) 1999-2003 PCSX Team\n"
-"(C) 2005-2009 PCSX-df Team\n"
-"(C) 2009-2010 PCSX-Reloaded Team"
-msgstr ""
-
-#: ../gui/AboutDlg.c:79
-msgid ""
-"This program is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"this program; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA."
-msgstr ""
-
-#: ../gui/AboutDlg.c:102
-msgid "translator-credits"
-msgstr ""
-
-#: ../gui/AboutDlg.c:103
-msgid "A PlayStation emulator."
-msgstr ""
-
-#: ../gui/Cheat.c:117 ../gui/Cheat.c:202
-msgid "Cheat Description:"
-msgstr ""
-
-#: ../gui/Cheat.c:306
-msgid "Open Cheat File"
-msgstr ""
-
-#: ../gui/Cheat.c:316 ../gui/Cheat.c:356
-msgid "PCSX Cheat Code Files (*.cht)"
-msgstr ""
-
-#: ../gui/Cheat.c:346
-msgid "Save Cheat File"
-msgstr ""
-
-#: ../gui/Cheat.c:361
-msgid "All Files (*.*)"
-msgstr ""
-
-#: ../gui/Cheat.c:394 ../gui/Cheat.c:1124 ../gui/ConfDlg.c:104
-#: ../gui/ConfDlg.c:200 ../gui/DebugMemory.c:259
-msgid "Error: Glade interface could not be loaded!"
-msgstr ""
-
-#: ../gui/Cheat.c:399
-msgid "Cheat Codes"
-msgstr ""
-
-#: ../gui/Cheat.c:405
-msgid "Enable"
-msgstr ""
-
-#: ../gui/Cheat.c:630
-msgid "Freeze value"
-msgstr ""
-
-#: ../gui/Cheat.c:729
-msgid "Modify value"
-msgstr ""
-
-#: ../gui/Cheat.c:737
-msgid "New value:"
-msgstr ""
-
-#: ../gui/Cheat.c:1134
-msgid "Search Results"
-msgstr ""
-
-#: ../gui/ConfDlg.c:112 ../data/pcsx.glade2:778
-msgid "Configure PCSX"
-msgstr ""
-
-#: ../gui/ConfDlg.c:237 ../gui/ConfDlg.c:258 ../gui/ConfDlg.c:279
-#: ../gui/ConfDlg.c:300 ../gui/ConfDlg.c:355
-msgid "No configuration required"
-msgstr ""
-
-#: ../gui/ConfDlg.c:237 ../gui/ConfDlg.c:258 ../gui/ConfDlg.c:279
-#: ../gui/ConfDlg.c:300 ../gui/ConfDlg.c:355
-msgid "This plugin doesn't need to be configured."
-msgstr ""
-
-#: ../gui/ConfDlg.c:581
-#, c-format
-msgid "Could not open BIOS directory: '%s'\n"
-msgstr ""
-
-#: ../gui/ConfDlg.c:611 ../gui/ConfDlg.c:704 ../gui/LnxMain.c:168
-#, c-format
-msgid "Could not open directory: '%s'\n"
-msgstr ""
-
-#: ../gui/ConfDlg.c:675
-msgid "Simulate PSX BIOS"
-msgstr ""
-
-#: ../gui/DebugMemory.c:103 ../data/pcsx.glade2:3178
-msgid "Memory Dump"
-msgstr ""
-
-#: ../gui/DebugMemory.c:111
-msgid "Start Address (Hexadecimal):"
-msgstr ""
-
-#: ../gui/DebugMemory.c:121
-msgid "Length (Decimal):"
-msgstr ""
-
-#: ../gui/DebugMemory.c:147
-msgid "Dump to File"
-msgstr ""
-
-#: ../gui/DebugMemory.c:162
-#, c-format
-msgid "Error writing to %s!"
-msgstr ""
-
-#: ../gui/DebugMemory.c:180
-msgid "Memory Patch"
-msgstr ""
-
-#: ../gui/DebugMemory.c:188 ../data/pcsx.glade2:3199
-msgid "Address (Hexadecimal):"
-msgstr ""
-
-#: ../gui/DebugMemory.c:198
-msgid "Value (Hexa string):"
-msgstr ""
-
-#: ../gui/DebugMemory.c:264
-msgid "Memory Viewer"
-msgstr ""
-
-#: ../gui/DebugMemory.c:269
-msgid "Address"
-msgstr ""
-
-#: ../gui/DebugMemory.c:287
-msgid "Text"
-msgstr ""
-
-#: ../gui/Gtk2Gui.c:113
-msgid "Ready"
-msgstr ""
-
-#: ../gui/Gtk2Gui.c:154
-msgid "Emulation Paused."
-msgstr ""
-
-#: ../gui/Gtk2Gui.c:405
-msgid "Select PSX EXE File"
-msgstr ""
-
-#: ../gui/Gtk2Gui.c:418
-msgid "PlayStation Executable Files"
-msgstr ""
-
-#: ../gui/Gtk2Gui.c:454
-msgid "Not a valid PSX file"
-msgstr ""
-
-#: ../gui/Gtk2Gui.c:454
-msgid "The file does not appear to be a valid Playstation executable"
-msgstr ""
-
-#: ../gui/Gtk2Gui.c:485 ../gui/Gtk2Gui.c:610
-msgid "CD ROM failed"
-msgstr ""
-
-#: ../gui/Gtk2Gui.c:493 ../gui/Gtk2Gui.c:618
-msgid "The CD-ROM could not be loaded"
-msgstr ""
-
-#: ../gui/Gtk2Gui.c:507
-msgid "Could not run BIOS"
-msgstr ""
-
-#: ../gui/Gtk2Gui.c:507
-msgid "Running BIOS is not supported with Internal HLE BIOS."
-msgstr ""
-
-#: ../gui/Gtk2Gui.c:536
-msgid "Open PSX Disc Image File"
-msgstr ""
-
-#: ../gui/Gtk2Gui.c:556
-msgid "PSX Image Files (*.bin, *.img, *.mdf, *.iso)"
-msgstr ""
-
-#: ../gui/Gtk2Gui.c:771
-#, c-format
-msgid "Loaded state %s."
-msgstr ""
-
-#: ../gui/Gtk2Gui.c:774
-#, c-format
-msgid "Error loading state %s!"
-msgstr ""
-
-#: ../gui/Gtk2Gui.c:785
-#, c-format
-msgid "Saved state %s."
-msgstr ""
-
-#: ../gui/Gtk2Gui.c:787
-#, c-format
-msgid "Error saving state %s!"
-msgstr ""
-
-#: ../gui/Gtk2Gui.c:822 ../gui/Gtk2Gui.c:850
-msgid "Select State File"
-msgstr ""
-
-#: ../gui/Gtk2Gui.c:893
-msgid "Notice"
-msgstr ""
-
-#: ../gui/LnxMain.c:62
-#, c-format
-msgid "Creating memory card: %s\n"
-msgstr ""
-
-#: ../gui/LnxMain.c:325
-msgid ""
-" pcsx [options] [file]\n"
-"\toptions:\n"
-"\t-runcd\t\tRuns CD-ROM\n"
-"\t-cdfile FILE\tRuns a CD image file\n"
-"\t-nogui\t\tDon't open the GTK GUI\n"
-"\t-cfg FILE\tLoads desired configuration file (default: ~/.pcsx/pcsx.cfg)\n"
-"\t-psxout\t\tEnable PSX output\n"
-"\t-load STATENUM\tLoads savestate STATENUM (1-5)\n"
-"\t-h -help\tDisplay this message\n"
-"\tfile\t\tLoads file\n"
-msgstr ""
-
-#: ../gui/LnxMain.c:362
-#, c-format
-msgid ""
-"PCSX cannot be configured without using the GUI -- you should restart "
-"without -nogui.\n"
-msgstr ""
-
-#: ../gui/LnxMain.c:418
-msgid "Failed loading plugins!"
-msgstr ""
-
-#: ../gui/LnxMain.c:435
-#, c-format
-msgid "Could not load CD-ROM!\n"
-msgstr ""
-
-#: ../gui/LnxMain.c:466
-#, c-format
-msgid "PSX emulator couldn't be initialized.\n"
-msgstr ""
-
-#: ../gui/MemcardDlg.c:56
-msgid "Icon"
-msgstr ""
-
-#: ../gui/MemcardDlg.c:74
-msgid "ID"
-msgstr ""
-
-#: ../gui/MemcardDlg.c:80
-msgid "Name"
-msgstr ""
-
-#: ../gui/MemcardDlg.c:323
-msgid "Select A File"
-msgstr ""
-
-#: ../gui/MemcardDlg.c:364
-msgid "Format this Memory Card?"
-msgstr ""
-
-#: ../gui/MemcardDlg.c:366
-msgid ""
-"If you format the memory card, the card will be empty, and any existing data "
-"overwritten."
-msgstr ""
-
-#: ../gui/MemcardDlg.c:369
-msgid "Format card"
-msgstr ""
-
-#: ../gui/MemcardDlg.c:393
-msgid "Create a new Memory Card"
-msgstr ""
-
-#: ../gui/MemcardDlg.c:402
-msgid "New Memory Card.mcd"
-msgstr ""
-
-#: ../gui/MemcardDlg.c:503
-msgid "No free space on memory card"
-msgstr ""
-
-#: ../gui/MemcardDlg.c:504
-msgid ""
-"There are no free slots available on the target memory card. Please delete a "
-"slot first."
-msgstr ""
-
-#: ../gui/MemcardDlg.c:667
-msgid "Memory Card Manager"
-msgstr ""
-
-#: ../gui/Plugin.c:211 ../data/pcsx.glade2:1487
-#, c-format
-msgid "SIO IRQ Always Enabled"
-msgstr ""
-
-#: ../gui/Plugin.c:212
-#, c-format
-msgid "SIO IRQ Not Always Enabled"
-msgstr ""
-
-#: ../gui/Plugin.c:218
-#, c-format
-msgid "Black & White Mdecs Only Enabled"
-msgstr ""
-
-#: ../gui/Plugin.c:219
-#, c-format
-msgid "Black & White Mdecs Only Disabled"
-msgstr ""
-
-#: ../gui/Plugin.c:225
-#, c-format
-msgid "XA Enabled"
-msgstr ""
-
-#: ../gui/Plugin.c:226
-#, c-format
-msgid "XA Disabled"
-msgstr ""
-
-#: ../gui/Plugin.c:288
-msgid "Error opening CD-ROM plugin!"
-msgstr ""
-
-#: ../gui/Plugin.c:290
-msgid "Error opening SPU plugin!"
-msgstr ""
-
-#: ../gui/Plugin.c:293
-msgid "Error opening GPU plugin!"
-msgstr ""
-
-#: ../gui/Plugin.c:295
-msgid "Error opening Controller 1 plugin!"
-msgstr ""
-
-#: ../gui/Plugin.c:297
-msgid "Error opening Controller 2 plugin!"
-msgstr ""
-
-#: ../gui/Plugin.c:377
-msgid "Error closing CD-ROM plugin!"
-msgstr ""
-
-#: ../gui/Plugin.c:379
-msgid "Error closing SPU plugin!"
-msgstr ""
-
-#: ../gui/Plugin.c:381
-msgid "Error closing Controller 1 Plugin!"
-msgstr ""
-
-#: ../gui/Plugin.c:383
-msgid "Error closing Controller 2 plugin!"
-msgstr ""
-
-#: ../gui/Plugin.c:385
-msgid "Error closing GPU plugin!"
-msgstr ""
-
-#: ../libpcsxcore/cdriso.c:658
-#, c-format
-msgid "Track %.2d (%s) - Start %.2d:%.2d:%.2d, Length %.2d:%.2d:%.2d\n"
-msgstr ""
-
-#: ../libpcsxcore/cdriso.c:677
-#, c-format
-msgid "Loaded CD Image: %s"
-msgstr ""
-
-#: ../libpcsxcore/cheat.c:147
-#, c-format
-msgid "Cheats loaded from: %s\n"
-msgstr ""
-
-#: ../libpcsxcore/cheat.c:179
-#, c-format
-msgid "Cheats saved to: %s\n"
-msgstr ""
-
-#: ../libpcsxcore/cheat.c:322 ../libpcsxcore/cheat.c:443
-msgid "(Untitled)"
-msgstr ""
-
-#: ../libpcsxcore/debug.c:317
-msgid "Error allocating memory"
-msgstr ""
-
-#: ../libpcsxcore/debug.c:322
-msgid "Unable to start debug server.\n"
-msgstr ""
-
-#: ../libpcsxcore/debug.c:326
-msgid "Debugger started.\n"
-msgstr ""
-
-#: ../libpcsxcore/debug.c:333
-msgid "Debugger stopped.\n"
-msgstr ""
-
-#: ../libpcsxcore/misc.c:342
-#, c-format
-msgid "CD-ROM Label: %.32s\n"
-msgstr ""
-
-#: ../libpcsxcore/misc.c:343
-#, c-format
-msgid "CD-ROM ID: %.9s\n"
-msgstr ""
-
-#: ../libpcsxcore/misc.c:388
-#, c-format
-msgid "Error opening file: %s.\n"
-msgstr ""
-
-#: ../libpcsxcore/misc.c:428
-#, c-format
-msgid "Unknown CPE opcode %02x at position %08x.\n"
-msgstr ""
-
-#: ../libpcsxcore/misc.c:435
-msgid "COFF files not supported.\n"
-msgstr ""
-
-#: ../libpcsxcore/misc.c:439
-msgid "This file does not appear to be a valid PSX file.\n"
-msgstr ""
-
-#: ../libpcsxcore/plugins.c:181
-#, c-format
-msgid "Error loading %s: %s"
-msgstr ""
-
-#: ../libpcsxcore/plugins.c:221
-#, c-format
-msgid "Could not load GPU plugin %s!"
-msgstr ""
-
-#: ../libpcsxcore/plugins.c:292
-#, c-format
-msgid "Could not load CD-ROM plugin %s!"
-msgstr ""
-
-#: ../libpcsxcore/plugins.c:340
-#, c-format
-msgid "Could not load SPU plugin %s!"
-msgstr ""
-
-#: ../libpcsxcore/plugins.c:477
-#, c-format
-msgid "Could not load Controller 1 plugin %s!"
-msgstr ""
-
-#: ../libpcsxcore/plugins.c:531
-#, c-format
-msgid "Could not load Controller 2 plugin %s!"
-msgstr ""
-
-#: ../libpcsxcore/plugins.c:574
-#, c-format
-msgid "Could not load NetPlay plugin %s!"
-msgstr ""
-
-#: ../libpcsxcore/plugins.c:654
-#, c-format
-msgid "Could not load SIO1 plugin %s!"
-msgstr ""
-
-#: ../libpcsxcore/plugins.c:739
-#, c-format
-msgid "Error initializing CD-ROM plugin: %d"
-msgstr ""
-
-#: ../libpcsxcore/plugins.c:741
-#, c-format
-msgid "Error initializing GPU plugin: %d"
-msgstr ""
-
-#: ../libpcsxcore/plugins.c:743
-#, c-format
-msgid "Error initializing SPU plugin: %d"
-msgstr ""
-
-#: ../libpcsxcore/plugins.c:745
-#, c-format
-msgid "Error initializing Controller 1 plugin: %d"
-msgstr ""
-
-#: ../libpcsxcore/plugins.c:747
-#, c-format
-msgid "Error initializing Controller 2 plugin: %d"
-msgstr ""
-
-#: ../libpcsxcore/plugins.c:751
-#, c-format
-msgid "Error initializing NetPlay plugin: %d"
-msgstr ""
-
-#: ../libpcsxcore/plugins.c:756
-#, c-format
-msgid "Error initializing SIO1 plugin: %d"
-msgstr ""
-
-#: ../libpcsxcore/plugins.c:759
-msgid "Plugins loaded.\n"
-msgstr ""
-
-#: ../libpcsxcore/ppf.c:216
-#, c-format
-msgid "Invalid PPF patch: %s.\n"
-msgstr ""
-
-#: ../libpcsxcore/ppf.c:292
-#, c-format
-msgid "Unsupported PPF version (%d).\n"
-msgstr ""
-
-#: ../libpcsxcore/ppf.c:331
-#, c-format
-msgid "Loaded PPF %d.0 patch: %s.\n"
-msgstr ""
-
-#: ../libpcsxcore/psxmem.c:80
-msgid "Error allocating memory!"
-msgstr ""
-
-#: ../libpcsxcore/psxmem.c:122
-#, c-format
-msgid "Could not open BIOS:\"%s\". Enabling HLE Bios!\n"
-msgstr ""
-
-#: ../libpcsxcore/r3000a.c:33
-#, c-format
-msgid "Running PCSX Version %s (%s).\n"
-msgstr ""
-
-#: ../libpcsxcore/sio.c:345
-msgid "Connection closed!\n"
-msgstr ""
-
-#: ../libpcsxcore/sio.c:371
-#, c-format
-msgid "No memory card value was specified - creating a default card %s\n"
-msgstr ""
-
-#: ../libpcsxcore/sio.c:375
-#, c-format
-msgid "The memory card %s doesn't exist - creating it\n"
-msgstr ""
-
-#: ../libpcsxcore/sio.c:391
-#, c-format
-msgid "Memory card %s failed to load!\n"
-msgstr ""
-
-#: ../libpcsxcore/sio.c:395
-#, c-format
-msgid "Loading memory card %s\n"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpu.c:55
-msgid "SoftGL Driver"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpu.c:56
-msgid ""
-"P.E.Op.S. SoftGL Driver V1.17\n"
-"Coded by Pete Bernert and the P.E.Op.S. team\n"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpu.c:58
-msgid "XVideo Driver"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpu.c:59
-msgid ""
-"P.E.Op.S. Xvideo Driver V1.17\n"
-"Coded by Pete Bernert and the P.E.Op.S. team\n"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpu.c:62
-msgid "Pete Bernert and the P.E.Op.S. team"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:8
-msgid "Configure X11 Video"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:45
-msgid "Initial Window Size:"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:56
-msgid "Stretching:"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:69
-msgid "Dithering:"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:82
-msgid ""
-"320x240\n"
-"640x480\n"
-"800x600\n"
-"1024x768\n"
-"1152x864\n"
-"1280x1024\n"
-"1600x1200"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:101
-msgid ""
-"0: None\n"
-"1: 2xSai\n"
-"2: 2xSuperSai\n"
-"3: SuperEagle\n"
-"4: Scale2x\n"
-"5: Scale3x\n"
-"6: HQ2X\n"
-"7: HQ3X"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:123
-msgid ""
-"0: Off (fastest)\n"
-"1: Game dependant\n"
-"2: Always"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:146
-msgid "Maintain 4:3 Aspect Ratio"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:161
-#: ../plugins/peopsxgl/gpucfg/interface.c:322
-msgid "Fullscreen"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:165
-msgid "Toggle windowed/fullscreen mode."
-msgstr ""
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:187
-msgid "Screen"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:216
-msgid "Show FPS"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:220
-msgid "Toggle whether the FPS will be shown."
-msgstr ""
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:232
-msgid "Autodetect FPS limit"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:236
-msgid "Enable this if games display too quickly."
-msgstr ""
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:249
-msgid "Enable frame skipping"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:253
-msgid "Skip frames when rendering."
-msgstr ""
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:270
-msgid "Set FPS"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:287
-msgid "200.0"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:310
-msgid "Framerate"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:339
-#: ../plugins/peopsxgl/gpucfg/interface.c:568
-msgid "Use game fixes"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:366
-msgid "better g-colors, worse textures"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:381
-msgid "Needed by Dark Forces"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:394
-msgid "Draw quads with triangles"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:410
-msgid "Repeated flat tex triangles"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:426
-msgid "Disable CPU Saving"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:442
-msgid "Odd/even bit hack"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:458
-msgid "For precise framerate"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:473
-msgid "Better FPS limit in some"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:486
-msgid "PC FPS calculation"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:504
-msgid "Pandemonium 2"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:517
-msgid "Lazy screen update"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:535
-msgid "Skip every second frame"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:548
-#: ../plugins/peopsxgl/gpucfg/interface.c:640
-msgid "Old frame skipping"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:564
-msgid "Expand screen width"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:580
-msgid "Ignore brightness color"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:596
-msgid "Disable coordinate check"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:614
-msgid "Chrono Cross"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:627
-msgid "Capcom fighting games"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:642
-msgid "Black screens in Lunar"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:657
-msgid "Compatibility mode"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:670
-msgid "Fake 'gpu busy' states"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:688
-msgid "Toggle busy flags after drawing"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:713
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:268
-msgid "Compatibility"
-msgstr ""
-
-#: ../data/pcsx.glade2:7
-msgid "PCSX"
-msgstr ""
-
-#: ../data/pcsx.glade2:21
-msgid "_File"
-msgstr ""
-
-#: ../data/pcsx.glade2:27
-msgid "Run _CD"
-msgstr ""
-
-#: ../data/pcsx.glade2:45
-msgid "Run _ISO..."
-msgstr ""
-
-#: ../data/pcsx.glade2:62
-msgid "Run _BIOS"
-msgstr ""
-
-#: ../data/pcsx.glade2:79
-msgid "Run _EXE..."
-msgstr ""
-
-#: ../data/pcsx.glade2:101
-msgid "E_xit"
-msgstr ""
-
-#: ../data/pcsx.glade2:123
-msgid "_Emulator"
-msgstr ""
-
-#: ../data/pcsx.glade2:129
-msgid "_Continue"
-msgstr ""
-
-#: ../data/pcsx.glade2:146
-msgid "_Reset"
-msgstr ""
-
-#: ../data/pcsx.glade2:168
-msgid "S_witch ISO..."
-msgstr ""
-
-#: ../data/pcsx.glade2:190
-msgid "_Save State"
-msgstr ""
-
-#: ../data/pcsx.glade2:199 ../data/pcsx.glade2:280
-msgid "Slot _1"
-msgstr ""
-
-#: ../data/pcsx.glade2:208 ../data/pcsx.glade2:289
-msgid "Slot _2"
-msgstr ""
-
-#: ../data/pcsx.glade2:217 ../data/pcsx.glade2:298
-msgid "Slot _3"
-msgstr ""
-
-#: ../data/pcsx.glade2:226 ../data/pcsx.glade2:307
-msgid "Slot _4"
-msgstr ""
-
-#: ../data/pcsx.glade2:235 ../data/pcsx.glade2:316
-msgid "Slot _5"
-msgstr ""
-
-#: ../data/pcsx.glade2:243 ../data/pcsx.glade2:324
-msgid "_Other..."
-msgstr ""
-
-#: ../data/pcsx.glade2:271
-msgid "_Load State"
-msgstr ""
-
-#: ../data/pcsx.glade2:357
-msgid "_Configuration"
-msgstr ""
-
-#: ../data/pcsx.glade2:363
-msgid "_Plugins & BIOS..."
-msgstr ""
-
-#: ../data/pcsx.glade2:385
-msgid "_Graphics..."
-msgstr ""
-
-#: ../data/pcsx.glade2:400
-msgid "_Sound..."
-msgstr ""
-
-#: ../data/pcsx.glade2:415
-msgid "CD-_ROM..."
-msgstr ""
-
-#: ../data/pcsx.glade2:430
-msgid "C_ontrollers..."
-msgstr ""
-
-#: ../data/pcsx.glade2:450
-msgid "_CPU..."
-msgstr ""
-
-#: ../data/pcsx.glade2:466
-msgid "_Memory Cards..."
-msgstr ""
-
-#: ../data/pcsx.glade2:483
-msgid "_Netplay..."
-msgstr ""
-
-#: ../data/pcsx.glade2:504
-msgid "Chea_t"
-msgstr ""
-
-#: ../data/pcsx.glade2:513
-msgid "_Browse..."
-msgstr ""
-
-#: ../data/pcsx.glade2:528
-msgid "_Search..."
-msgstr ""
-
-#: ../data/pcsx.glade2:554
-msgid "Memory _Dump"
-msgstr ""
-
-#: ../data/pcsx.glade2:574
-msgid "_Help"
-msgstr ""
-
-#: ../data/pcsx.glade2:580
-msgid "_About PCSX..."
-msgstr ""
-
-#: ../data/pcsx.glade2:613 ../data/pcsx.glade2:614
-msgid "Run CD"
-msgstr ""
-
-#: ../data/pcsx.glade2:626
-msgid "Run ISO Image"
-msgstr ""
-
-#: ../data/pcsx.glade2:627
-msgid "Run ISO..."
-msgstr ""
-
-#: ../data/pcsx.glade2:648
-msgid "Continue Emulation"
-msgstr ""
-
-#: ../data/pcsx.glade2:649
-msgid "Continue..."
-msgstr ""
-
-#: ../data/pcsx.glade2:661
-msgid "Switch ISO Image"
-msgstr ""
-
-#: ../data/pcsx.glade2:662
-msgid "Switch ISO..."
-msgstr ""
-
-#: ../data/pcsx.glade2:683 ../data/pcsx.glade2:1810
-msgid "Configure Memory Cards"
-msgstr ""
-
-#: ../data/pcsx.glade2:684
-msgid "Memcards..."
-msgstr ""
-
-#: ../data/pcsx.glade2:696
-msgid "Configure Graphics"
-msgstr ""
-
-#: ../data/pcsx.glade2:697
-msgid "Graphics..."
-msgstr ""
-
-#: ../data/pcsx.glade2:709 ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:8
-msgid "Configure Sound"
-msgstr ""
-
-#: ../data/pcsx.glade2:710
-msgid "Sound..."
-msgstr ""
-
-#: ../data/pcsx.glade2:722
-msgid "Configure CD-ROM"
-msgstr ""
-
-#: ../data/pcsx.glade2:723
-msgid "CD-ROM..."
-msgstr ""
-
-#: ../data/pcsx.glade2:735
-msgid "Configure Controllers"
-msgstr ""
-
-#: ../data/pcsx.glade2:736
-msgid "Controllers..."
-msgstr ""
-
-#: ../data/pcsx.glade2:879
-msgid "Select Folder to Search"
-msgstr ""
-
-#: ../data/pcsx.glade2:895
-msgid "Search in:"
-msgstr ""
-
-#: ../data/pcsx.glade2:1168
-msgid "Graphics:"
-msgstr ""
-
-#: ../data/pcsx.glade2:1181
-msgid "Sound:"
-msgstr ""
-
-#: ../data/pcsx.glade2:1196
-msgid "Controller 1: "
-msgstr ""
-
-#: ../data/pcsx.glade2:1211
-msgid "Controller 2:"
-msgstr ""
-
-#: ../data/pcsx.glade2:1226
-msgid "CD-ROM:"
-msgstr ""
-
-#: ../data/pcsx.glade2:1264
-msgid "Plugins"
-msgstr ""
-
-#: ../data/pcsx.glade2:1325
-msgid "BIOS"
-msgstr ""
-
-#: ../data/pcsx.glade2:1375
-msgid "Configure CPU"
-msgstr ""
-
-#: ../data/pcsx.glade2:1419
-msgid "SPU IRQ Always Enabled"
-msgstr ""
-
-#: ../data/pcsx.glade2:1435
-msgid "Black & White Movies"
-msgstr ""
-
-#: ../data/pcsx.glade2:1469
-msgid "Enable Interpreter CPU"
-msgstr ""
-
-#: ../data/pcsx.glade2:1503
-msgid "Disable CD Audio"
-msgstr ""
-
-#: ../data/pcsx.glade2:1519
-msgid "Disable XA Decoding"
-msgstr ""
-
-#: ../data/pcsx.glade2:1571
-msgid "Options"
-msgstr ""
-
-#: ../data/pcsx.glade2:1612
-msgid ""
-"NTSC\n"
-"PAL"
-msgstr ""
-
-#: ../data/pcsx.glade2:1626
-msgid "System Type"
-msgstr ""
-
-#: ../data/pcsx.glade2:1674
-msgid "Configure NetPlay"
-msgstr ""
-
-#: ../data/pcsx.glade2:1760
-msgid "NetPlay"
-msgstr ""
-
-#: ../data/pcsx.glade2:1886 ../data/pcsx.glade2:2283
-msgid "New"
-msgstr ""
-
-#: ../data/pcsx.glade2:1936 ../data/pcsx.glade2:2333
-msgid "Format"
-msgstr ""
-
-#: ../data/pcsx.glade2:1986 ../data/pcsx.glade2:2383
-msgid "Un/Delete"
-msgstr ""
-
-#: ../data/pcsx.glade2:2079
-msgid "Memory Card 1"
-msgstr ""
-
-#: ../data/pcsx.glade2:2139 ../data/pcsx.glade2:2189 ../data/pcsx.glade2:3002
-msgid "Copy"
-msgstr ""
-
-#: ../data/pcsx.glade2:2476
-msgid "Memory Card 2"
-msgstr ""
-
-#: ../data/pcsx.glade2:2572
-msgid "Cheat Codes"
-msgstr ""
-
-#: ../data/pcsx.glade2:2736
-msgid ""
-"8-bit\n"
-"16-bit\n"
-"32-bit"
-msgstr ""
-
-#: ../data/pcsx.glade2:2799
-msgid ""
-"Equal Value\n"
-"Not Equal Value\n"
-"Range\n"
-"Increased By\n"
-"Decreased By\n"
-"Increased\n"
-"Decreased\n"
-"Different\n"
-"No Change"
-msgstr ""
-
-#: ../data/pcsx.glade2:2831
-msgid ""
-"Decimal\n"
-"Hexadecimal"
-msgstr ""
-
-#: ../data/pcsx.glade2:3035
-msgid "label_resultsfound"
-msgstr ""
-
-#: ../data/pcsx.glade2:3070
-msgid "Search"
-msgstr ""
-
-#: ../data/pcsx.glade2:3106
-msgid "Restart"
-msgstr ""
-
-#: ../data/pcsx.glade2:3135
-msgid "Cheat Search"
-msgstr ""
-
-#: ../data/pcsx.glade2:3291
-msgid "Raw Dump..."
-msgstr ""
-
-#: ../data/pcsx.glade2:3326
-msgid "Patch Memory..."
-msgstr ""
-
-#: ../plugins/dfsound/spu.c:38
-msgid "Mac OS X Sound"
-msgstr ""
-
-#: ../plugins/dfsound/spu.c:40
-msgid "ALSA Sound"
-msgstr ""
-
-#: ../plugins/dfsound/spu.c:42
-msgid "OSS Sound"
-msgstr ""
-
-#: ../plugins/dfsound/spu.c:44
-msgid "SDL Sound"
-msgstr ""
-
-#: ../plugins/dfsound/spu.c:46
-msgid "PulseAudio Sound"
-msgstr ""
-
-#: ../plugins/dfsound/spu.c:48
-msgid "NULL Sound"
-msgstr ""
-
-#: ../plugins/dfsound/spu.c:51
-msgid ""
-"P.E.Op.S. Sound Driver V1.7\n"
-"Coded by Pete Bernert and the P.E.Op.S. team\n"
-msgstr ""
-
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:42
-msgid "Volume:"
-msgstr ""
-
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:54
-msgid "Interpolation:"
-msgstr ""
-
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:68
-msgid "Reverb:"
-msgstr ""
-
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:81
-msgid ""
-"Low\n"
-"Medium\n"
-"Loud\n"
-"Loudest"
-msgstr ""
-
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:95
-msgid ""
-"Off\n"
-"Simple\n"
-"Playstation"
-msgstr ""
-
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:111
-msgid ""
-"None\n"
-"Simple\n"
-"Gaussian\n"
-"Cubic"
-msgstr ""
-
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:132
-msgid "General"
-msgstr ""
-
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:163
-msgid "Adjust XA speed"
-msgstr ""
-
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:167
-msgid "Choose this if XA music is played too quickly."
-msgstr ""
-
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:184
-msgid "XA Music"
-msgstr ""
-
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:215
-msgid "High compatibility mode"
-msgstr ""
-
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:219
-msgid "Use the asynchronous SPU interface."
-msgstr ""
-
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:231
-msgid "SPU IRQ Wait"
-msgstr ""
-
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:235
-msgid "Wait for CPU; only useful for some games."
-msgstr ""
-
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:247
-msgid "Single channel sound"
-msgstr ""
-
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:251
-msgid "Play only one channel for a performance boost."
-msgstr ""
-
-#: ../plugins/dfcdrom/cdr-libcdio.c:29 ../plugins/dfcdrom/cdr-linux.c:29
-msgid "CD-ROM Drive Reader"
-msgstr ""
-
-#: ../plugins/dfcdrom/cdr-null.c:26
-msgid "CDR NULL Plugin"
-msgstr ""
-
-#: ../plugins/dfcdrom/cdrcfg-0.1df/main.c:219
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:8
-msgid "CDR configuration"
-msgstr ""
-
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:33
-msgid "Choose your CD-ROM device or type its path if it's not listed"
-msgstr ""
-
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:44
-msgid "Select CD-ROM device"
-msgstr ""
-
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:72
-msgid "Select read mode:"
-msgstr ""
-
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:83
-msgid ""
-"Normal (No Cache)\n"
-"Threaded - Faster (With Cache)"
-msgstr ""
-
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:114
-msgid "Cache Size (Def. 64):"
-msgstr ""
-
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:159
-msgid "Spindown Time:"
-msgstr ""
-
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:170
-msgid ""
-"Default\n"
-"125ms\n"
-"250ms\n"
-"500ms\n"
-"1s\n"
-"2s\n"
-"4s\n"
-"8s\n"
-"16s\n"
-"32s\n"
-"1min\n"
-"2min\n"
-"4min\n"
-"8min\n"
-"16min\n"
-"32min"
-msgstr ""
-
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:216
-msgid "Cdrom Speed (Def. 0 = MAX):"
-msgstr ""
-
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:248
-msgid "hseparator"
-msgstr ""
-
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:258
-msgid "Enable subchannel read"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpu.c:61
-msgid "OpenGL Driver"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpu.c:63
-msgid "Pete Bernert"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpu.c:64
-msgid ""
-"Based on P.E.Op.S. MesaGL Driver V1.78\n"
-"Coded by Pete Bernert\n"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:118
-msgid "OpenGL Driver configuration"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:138
-msgid "Textures"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:161
-msgid "Quality:"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:178
-#: ../plugins/peopsxgl/gpucfg/interface.c:191
-msgid "0: don't care - Use driver's default textures"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:179
-msgid "1: 4444 - Fast, but less colorful"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:180
-msgid "2: 5551 - Nice colors, bad transparency"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:181
-msgid "3: 8888 - Best colors, more ram needed"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:182
-msgid "4: BGR8888 - Faster on some cards"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:193
-msgid "VRam size in MBytes (0..1024, 0=auto):"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:210
-#: ../plugins/peopsxgl/gpucfg/interface.c:225
-msgid "0: None"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:211
-msgid "1: Standard - Glitches will happen"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:212
-msgid "2: Extended - No black borders"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:213
-msgid "3: Standard without sprites - unfiltered 2D"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:214
-msgid "4: Extended without sprites - unfiltered 2D"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:215
-msgid "5: Standard + smoothed sprites"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:216
-msgid "6: Extended + smoothed sprites"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:227
-msgid "Filtering:"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:235
-msgid "HiRes Tex:"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:252
-#: ../plugins/peopsxgl/gpucfg/interface.c:263
-msgid "0: None (standard)"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:253
-msgid "1: 2xSaI (much vram needed)"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:254
-msgid "2: Scaled (needs tex filtering)"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:265
-msgid "Window options"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:296
-msgid "Width:"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:305
-msgid "Height:"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:314
-msgid "Keep psx aspect ratio"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:330
-msgid "Dithering"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:346
-msgid "Framerate"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:369
-msgid "FPS"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:377
-msgid "FPS limit manual"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:386
-msgid "Show FPS display on startup"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:394
-msgid "Use FPS limit"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:402
-msgid "FPS limit auto-detection"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:411
-msgid "Use Frame skipping"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:419
-msgid "Compatibility"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:434
-msgid "Advanced blending (Accurate psx color emulation)"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:442
-msgid "Framebuffer textures:"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:450
-msgid "Offscreen Drawing:"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:458
-msgid "Framebuffer access:"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:466
-msgid "Alpha Multipass (correct opaque texture areas)"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:474
-msgid "Mask bit detection (needed by a few games, zbuffer)"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:491
-#: ../plugins/peopsxgl/gpucfg/interface.c:504
-msgid "0: None - Fastest, most glitches"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:492
-msgid "1: Minimum - Missing screens"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:493
-msgid "2: Standard - OK for most games"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:494
-msgid "3: Enhanced - Shows more stuff"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:495
-msgid "4: Extended - Causing garbage"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:515
-#: ../plugins/peopsxgl/gpucfg/interface.c:527
-msgid "0: Emulated vram - Needs FVP"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:516
-msgid "1: Black - Fast, no effects"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:517
-msgid "2: Gfx card buffer - Can be slow"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:518
-msgid "3: Gfx card & soft - slow"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:538
-#: ../plugins/peopsxgl/gpucfg/interface.c:551
-msgid "0: Emulated vram - ok most times"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:539
-msgid "1: Gfx card buffer reads"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:540
-msgid "2: Gfx card buffer moves"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:541
-msgid "3: Gfx buffer reads & moves"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:542
-msgid "4: Full Software (FVP)"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:553
-msgid "Special game fixes"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:576
-msgid "Battle cursor (FF7)"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:584
-msgid "Direct FB updates"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:592
-msgid "Black brightness (Lunar)"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:600
-msgid "Swap front detection"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:608
-msgid "Disable coord check"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:616
-msgid "No blue glitches (LoD)"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:624
-msgid "Soft FB access"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:632
-msgid "PC fps calculation"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:648
-msgid "Yellow rect (FF9)"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:656
-msgid "No subtr. blending"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:664
-msgid "Lazy upload (DW7)"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:672
-msgid "Odd/even hack"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:680
-msgid "Adjust screen width"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:688
-msgid "Old texture filtering"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:696
-msgid "Additional uploads"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:704
-msgid "unused"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:712
-msgid "Fake 'gpu busy'"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:720
-msgid "Misc"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:743
-msgid "Scanlines"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:751
-msgid "Blending (0..255, -1=dot):"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:759
-msgid "Screen smoothing (can be slow or unsupported)"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:767
-msgid "Use OpenGL extensions (recommended)"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:775
-msgid "Polygon anti-aliasing (slow with most cards)"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:783
-msgid "Line mode (polygons will not get filled)"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:791
-msgid "Force 15 bit framebuffer updates (faster movies)"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:799
-msgid "Unfiltered MDECs (small movie speedup)"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:852
-msgid "Adapted from P.E.Op.S OpenGL GPU by Pete Bernert"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:861
-msgid "Homepage: http://www.pbernert.com"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:879
-msgid "Version: 1.78"
-msgstr ""
-
-#: ../plugins/dfinput/cfg-gtk2.c:48
-msgid "D-Pad Up"
-msgstr ""
-
-#: ../plugins/dfinput/cfg-gtk2.c:49
-msgid "D-Pad Down"
-msgstr ""
-
-#: ../plugins/dfinput/cfg-gtk2.c:50
-msgid "D-Pad Left"
-msgstr ""
-
-#: ../plugins/dfinput/cfg-gtk2.c:51
-msgid "D-Pad Right"
-msgstr ""
-
-#: ../plugins/dfinput/cfg-gtk2.c:52
-msgid "Cross"
-msgstr ""
-
-#: ../plugins/dfinput/cfg-gtk2.c:53
-msgid "Circle"
-msgstr ""
-
-#: ../plugins/dfinput/cfg-gtk2.c:54
-msgid "Square"
-msgstr ""
-
-#: ../plugins/dfinput/cfg-gtk2.c:55
-msgid "Triangle"
-msgstr ""
-
-#: ../plugins/dfinput/cfg-gtk2.c:56
-msgid "L1"
-msgstr ""
-
-#: ../plugins/dfinput/cfg-gtk2.c:57
-msgid "R1"
-msgstr ""
-
-#: ../plugins/dfinput/cfg-gtk2.c:58
-msgid "L2"
-msgstr ""
-
-#: ../plugins/dfinput/cfg-gtk2.c:59
-msgid "R2"
-msgstr ""
-
-#: ../plugins/dfinput/cfg-gtk2.c:60
-msgid "Select"
-msgstr ""
-
-#: ../plugins/dfinput/cfg-gtk2.c:61
-msgid "Start"
-msgstr ""
-
-#: ../plugins/dfinput/cfg-gtk2.c:62
-msgid "L3"
-msgstr ""
-
-#: ../plugins/dfinput/cfg-gtk2.c:63
-msgid "R3"
-msgstr ""
-
-#: ../plugins/dfinput/cfg-gtk2.c:67
-msgid "L-Stick Right"
-msgstr ""
-
-#: ../plugins/dfinput/cfg-gtk2.c:68
-msgid "L-Stick Left"
-msgstr ""
-
-#: ../plugins/dfinput/cfg-gtk2.c:69
-msgid "L-Stick Down"
-msgstr ""
-
-#: ../plugins/dfinput/cfg-gtk2.c:70
-msgid "L-Stick Up"
-msgstr ""
-
-#: ../plugins/dfinput/cfg-gtk2.c:71
-msgid "R-Stick Right"
-msgstr ""
-
-#: ../plugins/dfinput/cfg-gtk2.c:72
-msgid "R-Stick Left"
-msgstr ""
-
-#: ../plugins/dfinput/cfg-gtk2.c:73
-msgid "R-Stick Down"
-msgstr ""
-
-#: ../plugins/dfinput/cfg-gtk2.c:74
-msgid "R-Stick Up"
-msgstr ""
-
-#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
-msgid "Centered"
-msgstr ""
-
-#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
-msgid "Up"
-msgstr ""
-
-#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
-msgid "Right"
-msgstr ""
-
-#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
-msgid "Rightup"
-msgstr ""
-
-#: ../plugins/dfinput/cfg-gtk2.c:104 ../plugins/dfinput/cfg-gtk2.c:143
-msgid "Down"
-msgstr ""
-
-#: ../plugins/dfinput/cfg-gtk2.c:104 ../plugins/dfinput/cfg-gtk2.c:143
-msgid "Rightdown"
-msgstr ""
-
-#: ../plugins/dfinput/cfg-gtk2.c:104 ../plugins/dfinput/cfg-gtk2.c:143
-msgid "Left"
-msgstr ""
-
-#: ../plugins/dfinput/cfg-gtk2.c:104 ../plugins/dfinput/cfg-gtk2.c:143
-msgid "Leftup"
-msgstr ""
-
-#: ../plugins/dfinput/cfg-gtk2.c:105 ../plugins/dfinput/cfg-gtk2.c:144
-msgid "Leftdown"
-msgstr ""
-
-#: ../plugins/dfinput/cfg-gtk2.c:109 ../plugins/dfinput/cfg-gtk2.c:148
-#, c-format
-msgid "Joystick: Button %d"
-msgstr ""
-
-#: ../plugins/dfinput/cfg-gtk2.c:113 ../plugins/dfinput/cfg-gtk2.c:152
-#, c-format
-msgid "Joystick: Axis %d%c"
-msgstr ""
-
-#: ../plugins/dfinput/cfg-gtk2.c:118 ../plugins/dfinput/cfg-gtk2.c:157
-#, c-format
-msgid "Joystick: Hat %d %s"
-msgstr ""
-
-#: ../plugins/dfinput/cfg-gtk2.c:133 ../plugins/dfinput/cfg-gtk2.c:172
-msgid "Keyboard:"
-msgstr ""
-
-#: ../plugins/dfinput/cfg-gtk2.c:137 ../plugins/dfinput/cfg-gtk2.c:176
-msgid "(Not Set)"
-msgstr ""
-
-#: ../plugins/dfinput/cfg-gtk2.c:539
-msgid "None"
-msgstr ""
-
-#: ../plugins/dfinput/cfg-gtk2.c:581
-msgid "Gamepad/Keyboard Input Configuration"
-msgstr ""
-
-#: ../plugins/dfinput/cfg-gtk2.c:587 ../plugins/dfinput/cfg-gtk2.c:607
-msgid "Key"
-msgstr ""
-
-#: ../plugins/dfinput/cfg-gtk2.c:593 ../plugins/dfinput/cfg-gtk2.c:613
-msgid "Button"
-msgstr ""
-
-#: ../plugins/dfinput/pad.c:22
-msgid "Gamepad/Keyboard Input"
-msgstr ""
-
-#: ../plugins/dfinput/dfinput.glade2:35 ../plugins/dfinput/dfinput.glade2:232
-msgid "Device:"
-msgstr ""
-
-#: ../plugins/dfinput/dfinput.glade2:66 ../plugins/dfinput/dfinput.glade2:263
-msgid "Type:"
-msgstr ""
-
-#: ../plugins/dfinput/dfinput.glade2:78 ../plugins/dfinput/dfinput.glade2:275
-msgid ""
-"Digital Pad\n"
-"Analog Pad"
-msgstr ""
-
-#: ../plugins/dfinput/dfinput.glade2:149 ../plugins/dfinput/dfinput.glade2:346
-msgid "Change"
-msgstr ""
-
-#: ../plugins/dfinput/dfinput.glade2:185 ../plugins/dfinput/dfinput.glade2:382
-msgid "Reset"
-msgstr ""
-
-#: ../plugins/dfinput/dfinput.glade2:210
-msgid "Controller 1"
-msgstr ""
-
-#: ../plugins/dfinput/dfinput.glade2:412
-msgid "Controller 2"
-msgstr ""
-
-#: ../plugins/dfinput/dfinput.glade2:427
-msgid "Multi-Threaded (Recommended)"
-msgstr ""
-
-#: ../plugins/dfnet/dfnet.c:23
-msgid "Socket Driver"
-msgstr ""
-
-#: ../plugins/dfnet/dfnet.c:161
-#, c-format
-msgid "error connecting to %s: %s\n"
-msgstr ""
-
-#: ../plugins/dfnet/dfnet.c:186
-msgid "Error allocating memory!\n"
-msgstr ""
-
-#: ../plugins/dfnet/gui.c:39
-msgid "Nothing to configure"
-msgstr ""
-
-#: ../plugins/dfnet/gui.c:95
-#, c-format
-msgid "IP %s"
-msgstr ""
-
-#: ../plugins/dfnet/gui.c:165
-msgid "Waiting for connection..."
-msgstr ""
-
-#: ../plugins/dfnet/gui.c:168
-msgid "The Client should now Start a Connection, waiting..."
-msgstr ""
-
-#: ../plugins/dfnet/dfnet.glade2:23
-msgid ""
-"Select here if you'll be Server (Player1) or Client (Player2).\n"
-"\n"
-"If you select Server you must Copy your IP address to the Clipboard and "
-"paste if (Ctrl+V) wherever the Client can see it.\n"
-"\n"
-"If you selected Client please enter the IP address the Server gave to you in "
-"the IP Address Control."
-msgstr ""
-
-#: ../plugins/dfnet/dfnet.glade2:63
-msgid "Copy PC IP to Clipboard"
-msgstr ""
-
-#: ../plugins/dfnet/dfnet.glade2:94
-msgid "Server (Player1)"
-msgstr ""
-
-#: ../plugins/dfnet/dfnet.glade2:104
-msgid "Client (Player2)"
-msgstr ""
-
-#: ../plugins/dfnet/dfnet.glade2:130
-msgid ""
-"Do not change if not necessary (remember it must be changed on both sides)."
-msgstr ""
-
-#: ../plugins/dfnet/dfnet.glade2:143
-msgid "Port Number"
-msgstr ""
-
-#: ../plugins/dfnet/dfnet.glade2:202
-msgid "Start Game"
-msgstr ""
-
-#: ../plugins/dfnet/dfnet.glade2:240
-msgid "Play Offline"
-msgstr ""
-
-#: ../plugins/bladesio1/sio1.c:29
-msgid "Sio1 Driver"
-msgstr ""

pcsxr-1.9.92.tar.bz2/po/pt_BR.gmo Deleted

pcsxr-1.9.92.tar.bz2/po/quot.sed Deleted

pcsxr-1.9.92.tar.bz2/po/remove-potcdate.sin Deleted

pcsxr-1.9.92.tar.bz2/po/ru_RU.gmo Deleted

pcsxr-1.9.92.tar.bz2/po/zh_CN.gmo Deleted

pcsxr-1.9.92.tar.bz2/po/zh_TW.gmo Deleted

pcsxr-1.9.92.tar.bz2/win32/gui/cdrom02.ico Deleted

pcsxr-1.9.92.tar.bz2/win32/gui/pcsx.bmp Deleted

pcsxr-1.9.92.tar.bz2/win32/gui/pcsx.exe.manifest Deleted

pcsxr-1.9.92.tar.bz2/win32/pcsx.dev Deleted

@@ -1,1189 +0,0 @@
-[Project]
-FileName=pcsx.dev
-Name=pcsx
-Ver=1
-IsCpp=1
-Type=0
-Compiler=-D__GNUWIN32__ -march=pentiumpro -D_M_IX86=600 -W -finline-functions -fomit-frame-pointer -DWIN32 -DNDEBUG -D_WINDOWS -D_MBCS -D__WIN32__ -DPCSX_VERSION=\"1.5\" -D__i386__ -DENABLE_NLS -DPACKAGE=\"pcsx\"  -Dinline=__inline___@@_
-CppCompiler=-D__GNUWIN32__ -march=pentiumpro -D_M_IX86=600 -W -finline-functions -DWIN32 -DNDEBUG -D_WINDOWS -D_MBCS -D__WIN32__ -D_MSC_VER_ -DPCSX_VERSION=\"1.5\" -D__i386__ -DENABLE_NLS -DPACKAGE=\"pcsx\"_@@_
-Includes=.;./zlib;../libpcsxcore;./glue;./gui;./intl
-Linker=-lkernel32 -luser32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -luuid -lodbc32 -lodbccp32 -lcomctl32 -lwsock32_@@_
-Libs=
-UnitCount=114
-Folders=glue,glue/sys,gui,intl,libpcsxcore,libpcsxcore/ix86,zlib
-ObjFiles=
-PrivateResource=pcsx_private.rc
-ResourceIncludes=
-MakeIncludes=
-Icon=
-ExeOutput=
-ObjectOutput=
-OverrideOutput=0
-OverrideOutputName=pcsx.exe
-HostApplication=
-CommandLine=
-UseCustomMakefile=0
-CustomMakefile=
-IncludeVersionInfo=0
-SupportXPThemes=0
-CompilerSet=0
-CompilerSettings=0010000001001000000100
-
-[Unit1]
-FileName=..\libpcsxcore\ix86\iGte.h
-Folder=libpcsxcore/ix86
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit2]
-FileName=..\libpcsxcore\ix86\iR3000A.c
-Folder=libpcsxcore/ix86
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit3]
-FileName=..\libpcsxcore\ix86\ix86.c
-Folder=libpcsxcore/ix86
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit4]
-FileName=..\libpcsxcore\ix86\ix86.h
-Folder=libpcsxcore/ix86
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit5]
-FileName=..\libpcsxcore\cdrom.c
-Folder=libpcsxcore
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit6]
-FileName=..\libpcsxcore\cdrom.h
-Folder=libpcsxcore
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit7]
-FileName=..\libpcsxcore\coff.h
-Folder=libpcsxcore
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit8]
-FileName=..\libpcsxcore\debug.h
-Folder=libpcsxcore
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit9]
-FileName=..\libpcsxcore\decode_xa.c
-Folder=libpcsxcore
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit10]
-FileName=..\libpcsxcore\decode_xa.h
-Folder=libpcsxcore
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit11]
-FileName=..\libpcsxcore\disr3000a.c
-Folder=libpcsxcore
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit12]
-FileName=..\libpcsxcore\gte.c
-Folder=libpcsxcore
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit13]
-FileName=..\libpcsxcore\gte.h
-Folder=libpcsxcore
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit14]
-FileName=..\libpcsxcore\mdec.c
-Folder=libpcsxcore
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit15]
-FileName=..\libpcsxcore\mdec.h
-Folder=libpcsxcore
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit16]
-FileName=..\libpcsxcore\misc.c
-Folder=libpcsxcore
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit17]
-FileName=..\libpcsxcore\misc.h
-Folder=libpcsxcore
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit18]
-FileName=..\libpcsxcore\plugins.c
-Folder=libpcsxcore
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit19]
-FileName=..\libpcsxcore\plugins.h
-Folder=libpcsxcore
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit20]
-FileName=..\libpcsxcore\psemu_plugin_defs.h
-Folder=libpcsxcore
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit21]
-FileName=..\libpcsxcore\psxbios.c
-Folder=libpcsxcore
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit22]
-FileName=..\libpcsxcore\psxbios.h
-Folder=libpcsxcore
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit23]
-FileName=..\libpcsxcore\psxcommon.h
-Folder=libpcsxcore
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit24]
-FileName=..\libpcsxcore\psxcounters.c
-Folder=libpcsxcore
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit25]
-FileName=..\libpcsxcore\psxcounters.h
-Folder=libpcsxcore
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit26]
-FileName=..\libpcsxcore\psxdma.c
-Folder=libpcsxcore
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit27]
-FileName=..\libpcsxcore\psxdma.h
-Folder=libpcsxcore
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit28]
-FileName=..\libpcsxcore\psxhle.c
-Folder=libpcsxcore
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit29]
-FileName=..\libpcsxcore\psxhle.h
-Folder=libpcsxcore
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit30]
-FileName=..\libpcsxcore\psxhw.c
-Folder=libpcsxcore
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit31]
-FileName=..\libpcsxcore\psxhw.h
-Folder=libpcsxcore
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit32]
-FileName=..\libpcsxcore\psxinterpreter.c
-Folder=libpcsxcore
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit33]
-FileName=..\libpcsxcore\psxmem.c
-Folder=libpcsxcore
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit34]
-FileName=..\libpcsxcore\psxmem.h
-Folder=libpcsxcore
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit35]
-FileName=..\libpcsxcore\r3000a.c
-Folder=libpcsxcore
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit36]
-FileName=..\libpcsxcore\r3000a.h
-Folder=libpcsxcore
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit37]
-FileName=..\libpcsxcore\sio.c
-Folder=libpcsxcore
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit38]
-FileName=..\libpcsxcore\sio.h
-Folder=libpcsxcore
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit39]
-FileName=..\libpcsxcore\spu.c
-Folder=libpcsxcore
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit40]
-FileName=..\libpcsxcore\spu.h
-Folder=libpcsxcore
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit41]
-FileName=..\libpcsxcore\system.h
-Folder=libpcsxcore
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit42]
-FileName=gui\about.bmp
-Folder=gui
-Compile=0
-CompileCpp=0
-Link=0
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit43]
-FileName=gui\AboutDlg.c
-Folder=gui
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit44]
-FileName=gui\AboutDlg.h
-Folder=gui
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit45]
-FileName=gui\cdrom02.ico
-Folder=gui
-Compile=0
-CompileCpp=0
-Link=0
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit46]
-FileName=gui\ConfigurePlugins.c
-Folder=gui
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit47]
-FileName=gui\NoPic.h
-Folder=gui
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit48]
-FileName=gui\pcsx.bmp
-Folder=gui
-Compile=0
-CompileCpp=0
-Link=0
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit49]
-FileName=gui\pcsx.exe.manifest
-Folder=gui
-Compile=0
-CompileCpp=0
-Link=0
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit51]
-FileName=gui\plugin.h
-Folder=gui
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit52]
-FileName=gui\Win32.h
-Folder=gui
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit53]
-FileName=gui\WndMain.c
-Folder=gui
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit54]
-FileName=zlib\adler32.c
-Folder=zlib
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit55]
-FileName=zlib\compress.c
-Folder=zlib
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit56]
-FileName=zlib\crc32.c
-Folder=zlib
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit57]
-FileName=zlib\deflate.c
-Folder=zlib
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit58]
-FileName=zlib\deflate.h
-Folder=zlib
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit59]
-FileName=zlib\gzio.c
-Folder=zlib
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit60]
-FileName=zlib\infblock.c
-Folder=zlib
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit61]
-FileName=zlib\infblock.h
-Folder=zlib
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit62]
-FileName=zlib\infcodes.c
-Folder=zlib
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit63]
-FileName=zlib\infcodes.h
-Folder=zlib
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit64]
-FileName=zlib\inffast.c
-Folder=zlib
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit65]
-FileName=zlib\inffast.h
-Folder=zlib
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit66]
-FileName=zlib\inffixed.h
-Folder=zlib
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit67]
-FileName=zlib\inflate.c
-Folder=zlib
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit68]
-FileName=zlib\inftrees.c
-Folder=zlib
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit69]
-FileName=zlib\inftrees.h
-Folder=zlib
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit70]
-FileName=zlib\infutil.c
-Folder=zlib
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit71]
-FileName=zlib\infutil.h
-Folder=zlib
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit72]
-FileName=zlib\trees.c
-Folder=zlib
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit73]
-FileName=zlib\trees.h
-Folder=zlib
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit74]
-FileName=zlib\uncompr.c
-Folder=zlib
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit75]
-FileName=zlib\zconf.h
-Folder=zlib
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit76]
-FileName=zlib\zlib.h
-Folder=zlib
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit77]
-FileName=zlib\zutil.c
-Folder=zlib
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit78]
-FileName=zlib\zutil.h
-Folder=zlib
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit79]
-FileName=glue\sys\mman.h
-Folder=glue/sys
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit80]
-FileName=glue\stdint.h
-Folder=glue
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit81]
-FileName=intl\bindtextdom.c
-Folder=intl
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit82]
-FileName=intl\intlconfig.h
-Folder=intl
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit83]
-FileName=intl\dcgettext.c
-Folder=intl
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit84]
-FileName=intl\dgettext.c
-Folder=intl
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit85]
-FileName=intl\explodename.c
-Folder=intl
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit86]
-FileName=intl\finddomain.c
-Folder=intl
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit87]
-FileName=intl\gettext.c
-Folder=intl
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit88]
-FileName=intl\gettext.h
-Folder=intl
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit89]
-FileName=intl\gettextP.h
-Folder=intl
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit90]
-FileName=intl\l10nflist.c
-Folder=intl
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit91]
-FileName=intl\libgettext.h
-Folder=intl
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit92]
-FileName=intl\libintl.h
-Folder=intl
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit93]
-FileName=intl\loadinfo.h
-Folder=intl
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit94]
-FileName=intl\loadmsgcat.c
-Folder=intl
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit95]
-FileName=intl\localealias.c
-Folder=intl
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit96]
-FileName=intl\textdomain.c
-Folder=intl
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit97]
-FileName=config.h
-Folder=
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit98]
-FileName=intl\intl-compat.c
-Folder=intl
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c intl-compat.c -o intl-compat.o $(CFLAGS)
-
-[Unit99]
-FileName=intl\hash-string.h
-Folder=intl
-Compile=1
-CompileCpp=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[VersionInfo]
-Major=0
-Minor=1
-Release=1
-Build=1
-LanguageID=1033
-CharsetID=1252
-CompanyName=
-FileVersion=0.1
-FileDescription=Developed using the Dev-C++ IDE
-InternalName=
-LegalCopyright=
-LegalTrademarks=
-OriginalFilename=pcsx.exe
-ProductName=pcsx
-ProductVersion=0.1
-AutoIncBuildNr=0
-
-[Unit50]
-FileName=gui\plugin.c
-CompileCpp=0
-Folder=gui
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit102]
-FileName=..\libpcsxcore\cdriso.h
-Folder=libpcsxcore
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-CompileCpp=1
-
-[Unit101]
-FileName=pcsx.rc
-CompileCpp=1
-Folder=pcsx
-Compile=1
-Link=0
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit100]
-FileName=resource.h
-CompileCpp=1
-Folder=pcsx
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit103]
-FileName=..\libpcsxcore\cdriso.c
-CompileCpp=0
-Folder=libpcsxcore
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c cdriso.c -o cdriso.o $(CFLAGS)
-
-[Unit104]
-FileName=..\libpcsxcore\cheat.h
-CompileCpp=1
-Folder=libpcsxcore
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit105]
-FileName=..\libpcsxcore\cheat.c
-CompileCpp=0
-Folder=libpcsxcore
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c cheat.c -o cheat.o $(CFLAGS)
-
-[Unit106]
-FileName=gui\CheatDlg.c
-CompileCpp=0
-Folder=gui
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c CheatDlg.c -o CheatDlg.o $(CFLAGS)
-
-[Unit107]
-FileName=..\libpcsxcore\socket.h
-CompileCpp=1
-Folder=libpcsxcore
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit108]
-FileName=..\libpcsxcore\debug.c
-CompileCpp=0
-Folder=libpcsxcore
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c debug.c -o debug.o $(CFLAGS)
-
-[Unit109]
-FileName=..\libpcsxcore\socket.c
-CompileCpp=0
-Folder=libpcsxcore
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c socket.c -o socket.o $(CFLAGS)
-
-[Unit110]
-FileName=..\libpcsxcore\ppf.h
-CompileCpp=1
-Folder=libpcsxcore
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit111]
-FileName=..\libpcsxcore\ppf.c
-CompileCpp=0
-Folder=libpcsxcore
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c ppf.c -o ppf.o $(CFLAGS)
-
-[Unit112]
-FileName=..\libpcsxcore\psxcommon.c
-CompileCpp=0
-Folder=libpcsxcore
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=$(CC) -c psxcommon.c -o psxcommon.o $(CFLAGS)
-
-[Unit113]
-FileName=..\libpcsxcore\gte_divider.h
-CompileCpp=1
-Folder=libpcsxcore
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit114]
-FileName=..\libpcsxcore\sjisfont.h
-CompileCpp=1
-Folder=libpcsxcore
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-

pcsxr-1.9.92.tar.bz2/win32/pcsx.dsp Deleted

@@ -1,575 +0,0 @@
-# Microsoft Developer Studio Project File - Name="pcsx" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=PCSX - WIN32 RELEASE
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "pcsx.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "pcsx.mak" CFG="PCSX - WIN32 RELEASE"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "pcsx - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "pcsx - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "pcsx - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /G6 /Zp16 /MT /W3 /GX /O2 /Op /Ob2 /I "../" /I "./zlib" /I "../libpcsxcore" /I "./glue" /I "./" /I "./gui" /I "./intl" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "__WIN32__" /D "_MSC_VER_" /D PCSX_VERSION=\"1.5\" /D "__i386__" /D "ENABLE_NLS" /D PACKAGE=\"pcsx\" /D inline=__forceinline /FR /FD /Zm200 /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x408 /d "NDEBUG"
-# ADD RSC /l 0x408 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib wsock32.lib /nologo /subsystem:windows /pdb:none /machine:I386
-
-!ELSEIF "$(CFG)" == "pcsx - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D PCSX_VERSION=\"1.3\" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /I "../" /I "./zlib" /I "../libpcsxcore" /I "./glue" /I "./" /I "./gui" /I "./intl" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "__WIN32__" /D "__i386__" /D PCSX_VERSION=\"1.5\" /D "ENABLE_NLS" /D PACKAGE=\"pcsx\" /D inline= /FR /FD /GZ /Zm200 /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x408 /d "_DEBUG"
-# ADD RSC /l 0x408 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "pcsx - Win32 Release"
-# Name "pcsx - Win32 Debug"
-# Begin Group "libpcsxcore"
-
-# PROP Default_Filter ""
-# Begin Group "ix86"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\libpcsxcore\ix86\iGte.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\ix86\iR3000A.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\ix86\ix86.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\ix86\ix86.h
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=..\libpcsxcore\cdriso.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\cdriso.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\cdrom.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\cdrom.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\cheat.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\cheat.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\coff.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\debug.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\debug.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\decode_xa.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\decode_xa.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\disr3000a.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\gte.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\gte.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\gte_divider.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\mdec.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\mdec.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\misc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\misc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\plugins.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\plugins.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\ppf.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\ppf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\psemu_plugin_defs.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\psxbios.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\psxbios.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\psxcommon.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\psxcommon.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\psxcounters.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\psxcounters.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\psxdma.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\psxdma.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\psxhle.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\psxhle.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\psxhw.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\psxhw.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\psxinterpreter.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\psxmem.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\psxmem.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\r3000a.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\r3000a.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\sio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\sio.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\sjisfont.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\socket.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\socket.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\spu.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\spu.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpcsxcore\system.h
-# End Source File
-# End Group
-# Begin Group "gui"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\gui\about.bmp
-# End Source File
-# Begin Source File
-
-SOURCE=.\gui\AboutDlg.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\gui\AboutDlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\gui\cdrom02.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\gui\CheatDlg.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\gui\ConfigurePlugins.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\gui\NoPic.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\gui\pcsx.bmp
-# End Source File
-# Begin Source File
-
-SOURCE=.\gui\pcsx.exe.manifest
-# End Source File
-# Begin Source File
-
-SOURCE=.\gui\plugin.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\gui\plugin.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\gui\Win32.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\gui\WndMain.c
-# End Source File
-# End Group
-# Begin Group "zlib"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\zlib\adler32.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\compress.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\crc32.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\deflate.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\deflate.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\gzio.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\infblock.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\infblock.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\infcodes.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\infcodes.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\inffast.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\inffast.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\inffixed.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\inflate.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\inftrees.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\inftrees.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\infutil.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\infutil.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\trees.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\trees.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\uncompr.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\zconf.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\zlib.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\zutil.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zlib\zutil.h
-# End Source File
-# End Group
-# Begin Group "glue"
-
-# PROP Default_Filter ""
-# Begin Group "sys"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\glue\sys\mman.h
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=.\glue\stdint.h
-# End Source File
-# End Group
-# Begin Group "intl"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\intl\bindtextdom.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\intl\dcgettext.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\intl\dgettext.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\intl\explodename.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\intl\finddomain.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\intl\gettext.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\intl\gettext.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\intl\gettextP.h
-# End Source File
-# Begin Source File
-
-SOURCE=".\intl\hash-string.h"
-# End Source File
-# Begin Source File
-
-SOURCE=".\intl\intl-compat.c"
-# End Source File
-# Begin Source File
-
-SOURCE=.\intl\intlconfig.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\intl\l10nflist.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\intl\libgettext.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\intl\libintl.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\intl\loadinfo.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\intl\loadmsgcat.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\intl\localealias.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\intl\textdomain.c
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=.\config.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\pcsx.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\resource.h
-# End Source File
-# End Target
-# End Project

pcsxr-1.9.92.tar.bz2/win32/pcsx.rc Deleted

@@ -1,440 +0,0 @@
-//Microsoft Developer Studio generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "080404b0"
- BEGIN
- VALUE "CompanyName", "http://pcsxr.codeplex.com/\0"
- VALUE "FileDescription", "Playstation Emulator based on PCSX-df\0"
- VALUE "FileVersion", "1, 9, 1, 1\0"
- VALUE "InternalName", "pcsx\0"
- VALUE "LegalCopyright", "Copyright (c) 2010\0"
- VALUE "OriginalFilename", "pcsx.exe\0"
- VALUE "ProductName", "PCSX-Reloaded\0"
- VALUE "ProductVersion", "1, 9, 1, 1\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x804, 1200
- END
-END
-
-#endif // !_MAC
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_MCDCONF DIALOG DISCARDABLE 0, 0, 407, 197
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Memcard Manager"
-FONT 8, "MS Sans Serif"
-BEGIN
- DEFPUSHBUTTON "OK",IDOK,285,175,50,14
- PUSHBUTTON "Cancel",IDCANCEL,345,175,50,14
- EDITTEXT IDC_MCD1,10,155,160,14,ES_AUTOHSCROLL
- EDITTEXT IDC_MCD2,235,155,160,14,ES_AUTOHSCROLL
- PUSHBUTTON "Select Mcd",IDC_MCDSEL1,10,135,50,14
- PUSHBUTTON "Select Mcd",IDC_MCDSEL2,235,135,50,14
- GROUPBOX "Memory Card 2",IDC_FRAMEMCD2,230,5,170,125
- PUSHBUTTON "Format Mcd",IDC_FORMAT1,65,135,50,14
- GROUPBOX "Memory Card 1",IDC_FRAMEMCD1,5,5,170,125
- PUSHBUTTON "Format Mcd",IDC_FORMAT2,290,135,50,14
- CONTROL "List3",IDC_LIST1,"SysListView32",LVS_REPORT | 
- LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,10,15,160,110
- CONTROL "List3",IDC_LIST2,"SysListView32",LVS_REPORT | 
- LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,235,15,160,110
- PUSHBUTTON "Reload Mcd",IDC_RELOAD1,120,135,50,14
- PUSHBUTTON "Reload Mcd",IDC_RELOAD2,345,135,50,14
- PUSHBUTTON "-> Copy ->",IDC_COPYTO2,180,30,45,14
- PUSHBUTTON "<- Copy <-",IDC_COPYTO1,180,50,45,14
- PUSHBUTTON "Paste",IDC_PASTE,180,70,45,14
- PUSHBUTTON "<- Un/Delete",IDC_DELETE1,180,90,45,14
- PUSHBUTTON "Un/Delete ->",IDC_DELETE2,180,110,45,14
-END
-
-ABOUT_DIALOG DIALOGEX 0, 0, 332, 209
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "About"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
- DEFPUSHBUTTON "OK",IDOK,134,187,50,14
- CTEXT "PCSX EMU\nVersion x.x",IDC_PCSX_ABOUT_TEXT,22,10,112,15,
- 0,WS_EX_TRANSPARENT
- CTEXT "PCSX a psx emulator...",IDC_PCSX_ABOUT_AUTHORS,10,35,
- 135,63,0,WS_EX_TRANSPARENT
- CTEXT "Greets to...",IDC_PCSX_ABOUT_GREETS,45,110,232,65
- CONTROL 113,IDC_STATIC,"Static",SS_BITMAP | WS_BORDER,155,10,171,
- 101
- GROUPBOX "",IDC_STATIC,5,25,145,77
- GROUPBOX "",IDC_STATIC,43,100,234,79
-END
-
-IDD_CPUCONF DIALOG DISCARDABLE 0, 0, 232, 175
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Cpu Config"
-FONT 8, "MS Sans Serif"
-BEGIN
- DEFPUSHBUTTON "OK",IDOK,50,155,50,14
- PUSHBUTTON "Cancel",IDCANCEL,120,155,50,14
- CONTROL "Disable Xa Decoding",IDC_XA,"Button",BS_AUTOCHECKBOX | 
- WS_TABSTOP,10,15,91,10
- CONTROL "Sio Irq Always Enabled",IDC_SIO,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,10,30,92,10
- CONTROL "Black && White Movies",IDC_MDEC,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,10,60,100,10
- CONTROL "Autodetect",IDC_PSXAUTO,"Button",BS_AUTOCHECKBOX | 
- WS_TABSTOP,10,126,83,10
- GROUPBOX "Misc Options",IDC_MISCOPT,5,5,220,100
- COMBOBOX IDC_PSXTYPES,105,126,53,50,CBS_DROPDOWNLIST | CBS_SORT | 
- WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Select Psx System Type",IDC_SELPSX,5,110,220,35
- CONTROL "Disable Cd Audio",IDC_CDDA,"Button",BS_AUTOCHECKBOX | 
- WS_TABSTOP,112,15,113,10
- CONTROL "Enable Console Output",IDC_PSXOUT,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,112,30,113,10
- CONTROL "Enable Interpreter Cpu",IDC_CPU,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,112,45,113,10
- CONTROL "Spu Irq Always Enabled",IDC_SPUIRQ,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,10,45,91,10
- CONTROL "Parasite Eve 2, Vandal Hearts 1/2 Fix",IDC_RCNTFIX,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,75,205,10
- CONTROL "InuYasha Sengoku Battle Fix",IDC_VSYNCWA,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,10,90,205,10
- CONTROL "Enable Debugger",IDC_DEBUG,"Button",BS_AUTOCHECKBOX | 
- WS_TABSTOP,112,60,76,10
-END
-
-IDD_NETPLAY DIALOG DISCARDABLE 0, 0, 165, 95
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "NetPlay Configuration"
-FONT 8, "MS Sans Serif"
-BEGIN
- DEFPUSHBUTTON "OK",IDOK,55,75,50,14
- PUSHBUTTON "Cancel",IDCANCEL,110,75,50,14
- COMBOBOX IDC_LISTNET,10,15,145,74,CBS_DROPDOWNLIST | WS_VSCROLL | 
- WS_TABSTOP
- PUSHBUTTON "Configure...",IDC_CONFIGNET,10,35,45,12
- PUSHBUTTON "Test...",IDC_TESTNET,60,35,45,12
- PUSHBUTTON "About...",IDC_ABOUTNET,110,35,45,12
- RTEXT "NetPlay",IDC_NETPLAY,50,5,41,10,SS_CENTERIMAGE
- CTEXT "Note: The NetPlay Plugin Directory should be the same as the other Plugins.",
- IDC_NETPLAYNOTE,10,50,145,19
-END
-
-IDD_CONNECT DIALOG DISCARDABLE 0, 0, 112, 31
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Connecting..."
-FONT 8, "MS Sans Serif"
-BEGIN
- LTEXT "Please wait while connecting... /",IDC_CONNECTSTR,5,10,
- 104,8
-END
-
-IDD_CONFIG DIALOGEX 0, 0, 322, 161
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Configuration"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
- COMBOBOX IDC_LISTGPU,10,10,145,74,CBS_DROPDOWNLIST | WS_VSCROLL | 
- WS_TABSTOP
- PUSHBUTTON "Configure...",IDC_CONFIGGPU,10,30,45,12
- PUSHBUTTON "Test...",IDC_TESTGPU,60,30,45,12
- PUSHBUTTON "About...",IDC_ABOUTGPU,110,30,45,12
- COMBOBOX IDC_LISTSPU,165,10,145,74,CBS_DROPDOWNLIST | WS_VSCROLL | 
- WS_TABSTOP
- PUSHBUTTON "Configure...",IDC_CONFIGSPU,165,30,45,12
- PUSHBUTTON "Test...",IDC_TESTSPU,215,30,45,12
- PUSHBUTTON "About...",IDC_ABOUTSPU,265,30,43,12
- COMBOBOX IDC_LISTCDR,10,100,145,74,CBS_DROPDOWNLIST | WS_VSCROLL | 
- WS_TABSTOP
- PUSHBUTTON "Configure...",IDC_CONFIGCDR,10,120,43,12
- PUSHBUTTON "Test...",IDC_TESTCDR,60,120,45,12
- PUSHBUTTON "About...",IDC_ABOUTCDR,110,120,45,12
- COMBOBOX IDC_LISTBIOS,165,100,145,74,CBS_DROPDOWNLIST | 
- WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "OK",IDOK,205,140,50,14
- PUSHBUTTON "Cancel",IDCANCEL,260,140,50,14
- CTEXT "Graphics",IDC_GRAPHICS,10,0,145,10,SS_CENTERIMAGE
- CTEXT "Sound",IDC_SOUND,165,0,144,10,SS_CENTERIMAGE
- CTEXT "Cdrom",IDC_CDROM,10,90,144,10,SS_CENTERIMAGE
- CTEXT "Bios",IDC_BIOS,166,90,146,10,SS_CENTERIMAGE
- COMBOBOX IDC_LISTPAD1,10,55,145,74,CBS_DROPDOWNLIST | WS_VSCROLL | 
- WS_TABSTOP
- PUSHBUTTON "Configure...",IDC_CONFIGPAD1,10,75,45,12
- PUSHBUTTON "Test...",IDC_TESTPAD1,60,75,45,12
- PUSHBUTTON "About...",IDC_ABOUTPAD1,110,75,45,12
- CTEXT "Second Controller",IDC_SECONDCONTROLLER,164,45,144,10,
- SS_CENTERIMAGE
- COMBOBOX IDC_LISTPAD2,165,55,145,74,CBS_DROPDOWNLIST | WS_VSCROLL | 
- WS_TABSTOP
- PUSHBUTTON "Configure...",IDC_CONFIGPAD2,165,75,45,12
- PUSHBUTTON "Test...",IDC_TESTPAD2,215,75,45,12
- PUSHBUTTON "About...",IDC_ABOUTPAD2,265,75,45,12
- CTEXT "First Controller",IDC_FIRSTCONTROLLER,11,45,138,10,
- SS_CENTERIMAGE
- PUSHBUTTON "Set Bios Directory",IDC_BIOSDIR,90,140,65,14
- PUSHBUTTON "Set Plugins Directory",IDC_PLUGINSDIR,10,140,75,14
-END
-
-IDD_CHEATLIST DIALOGEX 0, 0, 392, 201
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Edit Cheat Codes"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
- PUSHBUTTON "&Close",IDCANCEL,324,180,61,14
- CONTROL "List2",IDC_CODELIST,"SysListView32",LVS_REPORT | 
- LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | 
- LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,7,312,187
- PUSHBUTTON "&Enable/Disable",IDC_TOGGLECODE,324,7,61,14
- PUSHBUTTON "&Add Code",IDC_ADDCODE,324,32,61,14
- PUSHBUTTON "&Edit Code",IDC_EDITCODE,324,50,61,14
- PUSHBUTTON "&Remove Code",IDC_REMOVECODE,324,68,61,14
- PUSHBUTTON "&Load...",IDC_LOADCODE,324,96,61,14
- PUSHBUTTON "&Save As...",IDC_SAVECODE,324,114,61,14
-END
-
-IDD_CHEATSEARCH DIALOGEX 0, 0, 280, 214
-STYLE DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_CAPTION
-CAPTION "Cheat Search"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
- LTEXT "Search For:",IDC_LABEL_SEARCHFOR,7,9,51,8,0,
- WS_EX_TRANSPARENT
- COMBOBOX IDC_SEARCHFOR,60,7,80,224,CBS_DROPDOWNLIST | WS_VSCROLL | 
- WS_TABSTOP
- LTEXT "Data Type:",IDC_LABEL_DATATYPE,7,26,51,8,0,
- WS_EX_TRANSPARENT
- COMBOBOX IDC_DATATYPE,60,24,80,224,CBS_DROPDOWNLIST | WS_VSCROLL | 
- WS_TABSTOP
- LTEXT "Data Base:",IDC_LABEL_DATABASE,147,26,44,8,0,
- WS_EX_TRANSPARENT
- COMBOBOX IDC_DATABASE,194,24,81,224,CBS_DROPDOWNLIST | WS_VSCROLL | 
- WS_TABSTOP
- LTEXT "Value:",IDC_LABEL_VALUE,7,43,50,8,0,WS_EX_TRANSPARENT
- EDITTEXT IDC_VALUEFROM,60,41,80,12,ES_AUTOHSCROLL
- RTEXT "To",IDC_LABEL_TO,144,43,45,8,0,WS_EX_TRANSPARENT
- EDITTEXT IDC_VALUETO,194,41,80,12,ES_AUTOHSCROLL
- LTEXT "Addresses Found : 0",IDC_LABEL_RESULTSFOUND,7,180,263,8,
- 0,WS_EX_TRANSPARENT
- LISTBOX IDC_RESLIST,6,62,199,112,LBS_NOINTEGRALHEIGHT | 
- WS_VSCROLL | WS_TABSTOP
- PUSHBUTTON "&Freeze",IDC_FREEZE,213,63,62,17,WS_DISABLED
- PUSHBUTTON "&Modify",IDC_MODIFY,213,86,62,17,WS_DISABLED
- PUSHBUTTON "&Copy",IDC_COPY,213,109,62,17,WS_DISABLED
- DEFPUSHBUTTON "&Search",IDC_SEARCH,8,194,86,14
- PUSHBUTTON "&New Search",IDC_NEWSEARCH,98,194,86,14
- PUSHBUTTON "C&lose",IDCANCEL,188,194,86,14
- EDITTEXT 10000,0,1000,10,10,ES_AUTOHSCROLL | NOT WS_BORDER | NOT 
- WS_TABSTOP
-END
-
-IDD_CHEATEDIT DIALOGEX 0, 0, 242, 161
-STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Edit Cheat Code"
-FONT 8, "MS Shell Dlg", 400, 0, 0x1
-BEGIN
- DEFPUSHBUTTON "OK",IDOK,126,143,50,14
- PUSHBUTTON "Cancel",IDCANCEL,185,143,50,14
- LTEXT "Description:",IDC_LABEL_DESCR,7,6,39,8
- LTEXT "Cheat Code:",IDC_LABEL_CODE,6,40,42,8
- EDITTEXT IDC_DESCR,6,17,232,14,ES_AUTOHSCROLL
- EDITTEXT IDC_CODE,6,52,231,84,ES_MULTILINE | ES_UPPERCASE | 
- ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN
-END
-
-IDD_CHEATVALEDIT DIALOGEX 0, 0, 162, 57
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Enter New Value"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
- DEFPUSHBUTTON "OK",IDOK,25,40,50,14
- PUSHBUTTON "Cancel",IDCANCEL,87,40,50,14
- LTEXT "Address:",IDC_LABEL_ADDRESS,7,7,30,8
- LTEXT "Value:",IDC_LABEL_VALUE,8,24,30,8
- EDITTEXT IDC_ADDRESS,41,4,113,12,ES_AUTOHSCROLL | WS_DISABLED
- EDITTEXT IDC_VALUE,41,22,113,12,ES_AUTOHSCROLL
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO MOVEABLE PURE 
-BEGIN
- IDD_MCDCONF, DIALOG
- BEGIN
- LEFTMARGIN, 7
- RIGHTMARGIN, 400
- TOPMARGIN, 7
- BOTTOMMARGIN, 190
- END
-
- ABOUT_DIALOG, DIALOG
- BEGIN
- RIGHTMARGIN, 310
- BOTTOMMARGIN, 201
- END
-
- IDD_CPUCONF, DIALOG
- BEGIN
- LEFTMARGIN, 7
- RIGHTMARGIN, 225
- TOPMARGIN, 7
- BOTTOMMARGIN, 168
- END
-
- IDD_NETPLAY, DIALOG
- BEGIN
- LEFTMARGIN, 7
- RIGHTMARGIN, 158
- TOPMARGIN, 7
- BOTTOMMARGIN, 88
- END
-
- IDD_CONNECT, DIALOG
- BEGIN
- LEFTMARGIN, 7
- RIGHTMARGIN, 105
- TOPMARGIN, 7
- BOTTOMMARGIN, 24
- END
-
- IDD_CONFIG, DIALOG
- BEGIN
- BOTTOMMARGIN, 147
- END
-
- IDD_CHEATLIST, DIALOG
- BEGIN
- LEFTMARGIN, 7
- RIGHTMARGIN, 385
- TOPMARGIN, 7
- BOTTOMMARGIN, 194
- END
-END
-#endif // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_APP_ICON ICON DISCARDABLE "gui\\cdrom02.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Bitmap
-//
-
-SPLASH_LOGO BITMAP MOVEABLE PURE "gui\\about.bmp"
-MAIN_LOGO BITMAP MOVEABLE PURE "gui\\pcsx.bmp"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// 24
-//
-
-1 24 MOVEABLE PURE "gui\\pcsx.exe.manifest"
-#endif // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Greek resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ELL)
-#ifdef _WIN32
-LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
-#pragma code_page(1253)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE MOVEABLE PURE 
-BEGIN
- "resource.h\0"
-END
-
-2 TEXTINCLUDE MOVEABLE PURE 
-BEGIN
- "#include ""afxres.h""\r\n"
- "\0"
-END
-
-3 TEXTINCLUDE MOVEABLE PURE 
-BEGIN
- "\r\n"
- "\0"
-END
-
-#endif // APSTUDIO_INVOKED
-
-#endif // Greek resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif // not APSTUDIO_INVOKED
-

pcsxr-1.9.92.tar.bz2/win32/pcsx.sln Deleted

pcsxr-1.9.92.tar.bz2/win32/pcsx.vcproj Deleted

@@ -1,1709 +0,0 @@
-<?xml version="1.0" encoding="gb2312"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="pcsx"
-	ProjectGUID="{9EEA62F5-46DC-4C07-AFE1-F72F9D6B9E3E}"
-	RootNamespace="pcsx"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/pcsx.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Zm200 "
-				Optimization="0"
-				AdditionalIncludeDirectories="../,./zlib,../libpcsxcore,./glue,./,./gui,./intl"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;__WIN32__;__i386__;PCSX_VERSION=\&quot;1.5\&quot;;ENABLE_NLS;PACKAGE=\&quot;pcsx\&quot;;inline="
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\Debug/pcsx.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1032"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib wsock32.lib"
-				OutputFile=".\Debug/pcsx.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\Debug/pcsx.pdb"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="false"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Debug/pcsx.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/pcsx.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Zm200 "
-				Optimization="2"
-				InlineFunctionExpansion="2"
-				AdditionalIncludeDirectories="../,./zlib,../libpcsxcore,./glue,./,./gui,./intl"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;__WIN32__;_MSC_VER_;PCSX_VERSION=\&quot;1.5\&quot;;__i386__;ENABLE_NLS;PACKAGE=\&quot;pcsx\&quot;;inline=__forceinline"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				StructMemberAlignment="5"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\Release/pcsx.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1032"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib wsock32.lib"
-				OutputFile=".\Release/pcsx.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Release/pcsx.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="libpcsxcore"
-			>
-			<File
-				RelativePath="..\libpcsxcore\cdriso.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\cdriso.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\cdrom.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\cdrom.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\cheat.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\cheat.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\coff.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\debug.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\debug.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\decode_xa.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\decode_xa.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\disr3000a.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\gte.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\gte.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\gte_divider.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\mdec.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\mdec.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\misc.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\misc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\plugins.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\plugins.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\ppf.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\ppf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\psemu_plugin_defs.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\psxbios.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\psxbios.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\psxcommon.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\psxcommon.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\psxcounters.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\psxcounters.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\psxdma.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\psxdma.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\psxhle.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\psxhle.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\psxhw.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\psxhw.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\psxinterpreter.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\psxmem.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\psxmem.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\r3000a.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\r3000a.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\sio.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\sio.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\sjisfont.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\socket.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\socket.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\spu.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\spu.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libpcsxcore\system.h"
-				>
-			</File>
-			<Filter
-				Name="ix86"
-				>
-				<File
-					RelativePath="..\libpcsxcore\ix86\iGte.h"
-					>
-				</File>
-				<File
-					RelativePath="..\libpcsxcore\ix86\iR3000A.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\libpcsxcore\ix86\ix86.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\libpcsxcore\ix86\ix86.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="gui"
-			>
-			<File
-				RelativePath="gui\about.bmp"
-				>
-			</File>
-			<File
-				RelativePath="gui\AboutDlg.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="gui\AboutDlg.h"
-				>
-			</File>
-			<File
-				RelativePath="gui\cdrom02.ico"
-				>
-			</File>
-			<File
-				RelativePath="gui\CheatDlg.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="gui\ConfigurePlugins.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="gui\NoPic.h"
-				>
-			</File>
-			<File
-				RelativePath="gui\pcsx.bmp"
-				>
-			</File>
-			<File
-				RelativePath="gui\pcsx.exe.manifest"
-				>
-			</File>
-			<File
-				RelativePath="gui\plugin.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="gui\plugin.h"
-				>
-			</File>
-			<File
-				RelativePath="gui\Win32.h"
-				>
-			</File>
-			<File
-				RelativePath="gui\WndMain.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="zlib"
-			>
-			<File
-				RelativePath="zlib\adler32.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="zlib\compress.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="zlib\crc32.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="zlib\deflate.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="zlib\deflate.h"
-				>
-			</File>
-			<File
-				RelativePath="zlib\gzio.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="zlib\infblock.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="zlib\infblock.h"
-				>
-			</File>
-			<File
-				RelativePath="zlib\infcodes.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="zlib\infcodes.h"
-				>
-			</File>
-			<File
-				RelativePath="zlib\inffast.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="zlib\inffast.h"
-				>
-			</File>
-			<File
-				RelativePath="zlib\inffixed.h"
-				>
-			</File>
-			<File
-				RelativePath="zlib\inflate.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="zlib\inftrees.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="zlib\inftrees.h"
-				>
-			</File>
-			<File
-				RelativePath="zlib\infutil.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="zlib\infutil.h"
-				>
-			</File>
-			<File
-				RelativePath="zlib\trees.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="zlib\trees.h"
-				>
-			</File>
-			<File
-				RelativePath="zlib\uncompr.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="zlib\zconf.h"
-				>
-			</File>
-			<File
-				RelativePath="zlib\zlib.h"
-				>
-			</File>
-			<File
-				RelativePath="zlib\zutil.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="zlib\zutil.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="glue"
-			>
-			<File
-				RelativePath="glue\stdint.h"
-				>
-			</File>
-			<Filter
-				Name="sys"
-				>
-				<File
-					RelativePath="glue\sys\mman.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="intl"
-			>
-			<File
-				RelativePath="intl\bindtextdom.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="intl\dcgettext.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="intl\dgettext.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="intl\explodename.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="intl\finddomain.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="intl\gettext.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="intl\gettext.h"
-				>
-			</File>
-			<File
-				RelativePath="intl\gettextP.h"
-				>
-			</File>
-			<File
-				RelativePath="intl\hash-string.h"
-				>
-			</File>
-			<File
-				RelativePath="intl\intl-compat.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="intl\intlconfig.h"
-				>
-			</File>
-			<File
-				RelativePath="intl\l10nflist.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="intl\libgettext.h"
-				>
-			</File>
-			<File
-				RelativePath="intl\libintl.h"
-				>
-			</File>
-			<File
-				RelativePath="intl\loadinfo.h"
-				>
-			</File>
-			<File
-				RelativePath="intl\loadmsgcat.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="intl\localealias.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="intl\textdomain.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<File
-			RelativePath="config.h"
-			>
-		</File>
-		<File
-			RelativePath="pcsx.rc"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCResourceCompilerTool"
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCResourceCompilerTool"
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="resource.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

pcsxr-1.9.92.tar.bz2/AUTHORS -> pcsxr-1.9.93.tar.bz2/AUTHORS Changed

@@ -20,20 +20,29 @@
 		(c) 2006 Marcus Comstedt
 
 PCSX-Reloaded Authors/Contributors: avlex (Help on xcode project)
+			    Benoît Gschwind (MDEC decoder improvements)
+			    ckain (Various bugfixes)
 			    Dario (Various bugfixes)
-			    edgbla (Root counters, various core/plugin fixes)
+			    edgbla (Root counters, SIO1, various core/plugin fixes)
 			    Firnis (GTE code from PCSX-Revolution Project)
+			    Hopkat (Sound plugin improvements, core fixes)
 			    Gabriele Gorla (MDEC decoder)
+			    MaddTheSane (Various bugfixes)
 			    maggix (Snow Leopard compile fix)
 			    NeToU (Bugfix)
+			    notaz (Various psxbios fixes)
 			    Peter Collingbourne (Various core/psxbios fixes)
 			    siveritas (Bugfix)
-			    shalma (GTE Divider, various core fixes)
+			    shalma (GTE Divider, many core improvements, sound plugin fixes)
 			    Tristin Celestin (PulseAudio support)
-			    Wei Mingzhi (Maintainer, input plugin, iso/cheat support, misc stuff)
+			    UTunnels (Mode 1 ISO support)
+			    VoidMage (Build system cleanups)
+			    Wei Mingzhi (Input plugin, iso/cheat support, misc stuff)
+			    (And others which I cannot keep track of)
 
-PCSX-Reloaded Translators: edgbla (Russian)
+PCSX-Reloaded Translators: Delirious (Hungarian)
+			   edgbla (Russian)
 			   Giovanni Scafora (Italian)
+			   Jean-André Santoni (French)
 			   Tibério Vítor (Brazilian Portuguese)
 			   Wei Mingzhi (Simplified & Traditional Chinese)
-

pcsxr-1.9.92.tar.bz2/COPYING -> pcsxr-1.9.93.tar.bz2/COPYING Changed

pcsxr-1.9.92.tar.bz2/ChangeLog -> pcsxr-1.9.93.tar.bz2/ChangeLog Changed

@@ -1,2078 +1,48 @@
-August 2, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * macosx/Pcsx.xcodeproj/project.pbxproj: Added some more optimizations
- parameters for the Deployment build.
-
-August 1, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * plugins/dfinput/cfg-gtk2.c: Only accept axis input if the current axis
- position is off enough from the previous position or initial position.
- * macosx/plugins/DFInput/macsrc/cfg.c: Likewise.
- * macosx/plugins/DFInput/macsrc/cfg.h: Likewise.
- * macosx/plugins/DFInput/macsrc/MappingCell.m: Likewise.
- * macosx/plugins/DFInput/DFInput.xcodeproj/project.pbxproj: Fixed compile
- error.
-
-July 31, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * plugins/dfsound/spu.c: Silenced warning on Mac OS X and FreeBSD.
- * macosx/plugins/DFInput/SDL/include/SDL_haptic.h: Upgraded to SDL 1.3 Beta.
- * macosx/plugins/DFInput/SDL/include/SDL_error.h: Likewise.
- * macosx/plugins/DFInput/SDL/include/begin_code.h: Likewise.
- * macosx/plugins/DFInput/SDL/include/close_code.h: Likewise.
- * macosx/plugins/DFInput/SDL/include/SDL_endian.h: Likewise.
- * macosx/plugins/DFInput/SDL/include/SDL_joystick.h: Likewise.
- * macosx/plugins/DFInput/SDL/include/SDL.h: Likewise.
- * macosx/plugins/DFInput/SDL/include/SDL_main.h: Likewise.
- * macosx/plugins/DFInput/SDL/include/SDL_stdinc.h: Likewise.
- * macosx/plugins/DFInput/SDL/include/SDL_platform.h: Likewise.
- * macosx/plugins/DFInput/SDL/include/SDL_config.h: Likewise.
- * macosx/plugins/DFInput/SDL/src/joystick/SDL_joystick.c: Likewise.
- * macosx/plugins/DFInput/SDL/src/joystick/darwin/SDL_sysjoystick.c: Likewise.
- * macosx/plugins/DFInput/SDL/src/joystick/darwin/SDL_sysjoystick_c.h: Likewise.
- * macosx/plugins/DFInput/SDL/src/joystick/SDL_sysjoystick.h: Likewise.
- * macosx/plugins/DFInput/SDL/src/joystick/SDL_joystick_c.h: Likewise.
- * macosx/plugins/DFInput/SDL/src/SDL.c: Likewise.
- * macosx/plugins/DFInput/SDL/src/SDL_error_c.h: Likewise.
- * macosx/plugins/DFInput/SDL/src/haptic/SDL_syshaptic.h: Likewise.
- * macosx/plugins/DFInput/SDL/src/haptic/SDL_haptic_c.h: Likewise.
- * macosx/plugins/DFInput/SDL/src/haptic/darwin/SDL_syshaptic.c: Likewise.
- * macosx/plugins/DFInput/SDL/src/haptic/SDL_haptic.c: Likewise.
- * macosx/plugins/DFInput/SDL/src/SDL_error.c: Likewise.
- * macosx/plugins/DFInput/SDL/include/SDL_name.h: Deleted.
- * macosx/plugins/DFInput/SDL/include/SDL_version.h: Likewise.
- * macosx/plugins/DFInput/DFInput.xcodeproj/project.pbxproj: Updated.
- * macosx/plugins/DFInput/macsrc/cfg.h: Include SDL_joystick.h.
- * plugins/dfinput/pad.h: Likewise.
- * macosx/PcsxController.h: Removed some useless stuff.
- * macosx/PcsxController.m: Likewise.
- * macosx/English.lproj/PCSX.nib/objects.nib: Likewise.
- * macosx/English.lproj/PCSX.nib/classes.nib: Likewise.
- * macosx/Pcsx.xcodeproj/project.pbxproj: Added some optimizations for
- Deployment build.
-
-July 29, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * macosx/plugins/DFInput/DFInput.xcodeproj/project.pbxproj: Implemented
- config dialog box.
- * macosx/plugins/DFInput/macsrc/cfg.c: Likewise.
- * macosx/plugins/DFInput/macsrc/MappingCell.h: Likewise.
- * macosx/plugins/DFInput/macsrc/PadController.m: Likewise.
- * macosx/plugins/DFInput/macsrc/cfg.h: Likewise.
- * macosx/plugins/DFInput/macsrc/ControllerList.h: Likewise.
- * macosx/plugins/DFInput/macsrc/PadView.h: Likewise.
- * macosx/plugins/DFInput/macsrc/MappingCell.m: Likewise.
- * macosx/plugins/DFInput/macsrc/ControllerList.m: Likewise.
- * macosx/plugins/DFInput/macsrc/PadView.m: Likewise.
- * macosx/plugins/DFInput/macsrc/PadController.h: Likewise.
- * macosx/plugins/DFInput/English.lproj/NetPcsxHIDInputPluginMain.nib:
- Likewise.
- * macosx/plugins/DFInput/English.lproj/NetPcsxHIDInputPluginMain.nib/
- info.nib: Likewise.
- * macosx/plugins/DFInput/English.lproj/NetPcsxHIDInputPluginMain.nib/
- keyedobjects.nib: Likewise.
- * macosx/plugins/DFInput/English.lproj/NetPcsxHIDInputPluginMain.nib/
- classes.nib: Likewise.
- * macosx/plugins/DFInput/English.lproj/Credits.rtf: Likewise.
- * macosx/plugins/DFCdrom/macsrc/cdr-macosx.c: Add check for whether the
- disc is really a PSX CD or not.
- * macosx/Pcsx.xcodeproj/project.pbxproj: Added DFInput to project.
- * macosx/plugins/HIDInput: Removed.
- * plugins/peopsxgl/draw.c: Replaced global symbols with glXGetProcAddress
- call (courtesy of siveritas).
- * AUTHORS: Updated info.
-
-July 25, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * plugins/dfcdrom/cdr.c: Wait for reading thread to complete for all
- operations.
- * plugins/dfcdrom/cdr.h: Don't define USE_NULL under Mac OS X.
- * macosx/plugins/DFCdrom: Added Mac OS X port of DFCdrom.
- * macosx/plugins/CDDeviceInterface: Removed old CDDeviceInterface plugin.
- * macosx/Pcsx.xcodeproj/project.pbxproj: Added DFCdrom into project.
- * plugins/dfinput/pad.c: Minor change for Mac OS X.
- * plugins/dfinput/pad.h: Likewise.
- * macosx/plugins/DFInput: Added Mac OS X port of DFInput (prelimiary, no
- config dialog yet).
-
-July 18, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2: Tweaked the config dialog
- to make it less confusing.
- * plugins/dfxvideo/gpucfg-0.1df/main.c: Likewise.
-
-July 17, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * plugins/dfcdrom/cdr-libcdio.c: Include libcdio headers before cdr.h.
- * macosx/plugins/CDDeviceInterface/src/PlugCD.c: Check for kIODVDMediaClass
- as well (MIGHT fix the "Can't check CD-ROM" issue, cannot test).
-
-July 15, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * plugins/dfcdrom/cdr-libcdio.c: Force CAM access mode on FreeBSD.
- * plugins/dfcdrom/cdrcfg-0.1df/main.c: Use /dev/cd? instead on /dev/acd? on
- FreeBSD.
- * plugins/dfcdrom/cdr.h: Likewise.
- * plugins/dfxvideo/cfg.c: Don't use 2xSai when no config file exists.
- * autogen.sh: Use autoreconf.
-
-July 14, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * plugins/dfcdrom/cdr.h: Silenced warning on macro redefination when using
- libcdio with some special configuration.
- * plugins/dfsound/spucfg-0.1df/main.c: Set volume to High by default.
-
-July 13, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * libpcsxcore/socket.c: Fixed FTBFS on Windows.
- * po/zh_CN.po: Updated.
-
-July 12, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * configure.ac: Use pkgconfig to detect libcdio.
- * plugins/dfcdrom/Makefile.am: Likewise.
-
-July 11, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * plugins/dfcdrom/cfg.c: Pick default cdrom device automatically on Solaris.
- * plugins/dfsound/spu.c: Reverted the previous change.
-
-July 10, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * configure.ac: Added --enable-libcdio parameter.
- * libpcsxcore/cdriso.c: Moved CRC check into...
- * libpcsxcore/cdrom.c: ...here.
- * libpcsxcore/misc.c: Moved calcCrc() to misc.c.
- * libpcsxcore/misc.h: Likewise.
- * libpcsxcore/plugins.h: Added CRC field to SubQ struct.
- * plugins/dfcdrom/cdr-freebsd.c: Removed.
- * plugins/dfcdrom/cdr-solaris.c: Likewise.
- * plugins/dfcdrom/cdr-linux.c: Added raw MMC command support.
- * plugins/dfcdrom/cdr-null.c: Return 0 for PlayCDDA()/StopCDDA().
- * plugins/dfcdrom/cdr.c: Moved several utility functions to util.c.
- * plugins/dfcdrom/util.c: Added.
- * plugins/dfcdrom/cfg.c: Removed unnecessary includes.
- * plugins/dfcdrom/cdr-libcdio.c: Added libcdio support.
- * plugins/dfcdrom/Makefile.am: Added util.c and cdr-libcdio.c, removed
- cdr-freebsd.c and cdr-solaris.c.
- * plugins/dfsound/cfg.c: Store config file into plugins dir by default.
- * plugins/dfsound/spu.c: Made volume louder.
- * po/POTFILES.in: Added files in plugins/bladesio1.
- * po/update-pot.sh: Likewise.
- * po/pcsx.pot, po/*.po: Updated.
-
-July 9, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * plugins/dfcdrom/cdr-solaris.c: Added (not implemented for now).
- * plugins/dfcdrom/Makefile.am: Added cdr-solaris.c.
- * plugins/dfcdrom/cdr-freebsd.c: Return 0 for PlayCDDA()/StopCDDA().
- * gui/ConfDlg.c: Don't use dlerror() to check for symbol load failure.
- * plugins/dfcdrom/cdr.c: Make cdHandle singleton as it could be different
- type on some OS and we don't need to open multiple handles.
- * plugins/dfcdrom/cdr.h: Likewise.
- * plugins/dfcdrom/cdr-linux.c: Likewise.
- * plugins/dfcdrom/cdrcfg-0.1df/main.c: Added device listing for Solaris.
- * configure.ac: Fixed FTBFS on Solaris.
- * plugins/peopsxgl/draw.c: Don't use glColorTableEXT on Solaris.
- * libpcsxcore/socket.c: Silenced warning on Solaris.
- * plugins/dfinput/cfg.c: Renamed LoadConfig()/SaveConfig() to avoid problems
- with some OSes like Solaris.
- * plugins/dfinput/cfg-gtk2.c: Likewise.
- * plugins/dfinput/pad.c: Likewise.
- * plugins/dfinput/pad.h: Likewise.
- * gui/AboutDlg.c: Minor text change.
-
-July 8, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * plugins/dfcdrom/cdr.c: Refactored for better portability.
- * plugins/dfcdrom/cdr.h: Likewise.
- * plugins/dfcdrom/cfg.c: Likewise.
- * plugins/dfcdrom/cdr-linux.c: Likewise.
- * plugins/dfcdrom/cdr-null.c: Likewise.
- * plugins/dfcdrom/cdrcfg-0.1df/main.c: Likewise.
- * plugins/dfcdrom/cdr-freebsd.c: Added prelimiary FreeBSD port (not working
- yet).
- * plugins/dfcdrom/Makefile.am: Added cdr-linux.c, cdr-null.c, cdr-freebsd.c.
- * configure.ac: Added bladesio1.
- * Makefile.am: Likewise.
-
-July 7, 2010 edgbla <edgbla@yandex.ru>
-
- * plugins/bladesio1/gui.c: Sio1 plugin (dummy).
- * plugins/bladesio1/Makefile.am: Likewise.
- * plugins/bladesio1/settings.c: Likewise.
- * plugins/bladesio1/settings.h: Likewise.
- * plugins/bladesio1/sio1.c: Likewise.
- * plugins/bladesio1/sio1.h: Likewise.
- * plugins/bladesio1/sio1.glade2: Likewise.
-
-July 7, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * libpcsxcore/plugins.c: #ifdef'ed out the currently unused Sio1 API.
- * libpcsxcore/plugins.h: Likewise.
- * libpcsxcore/psxhw.c: Likewise.
- * win32/gui/AboutDlg.c: Minor text change.
- * po/pcsx.pot, po/*.po: Updated.
- * libpcsxcore/socket.c: Fixed FTBFS on FreeBSD.
- * configure.ac: Likewise.
- * gui/Makefile.am: Likewise.
- * plugins/dfcdrom/cdr-null.c: Likewise.
- * libpcsxcore/plugins.c: Fixed plugin loading with FreeBSD.
-
-July 4, 2010 edgbla <edgbla@yandex.ru>
-
- * libpcsxcore/plugins.c: GPUvBlank (for gpuBladeSoft now, experimental).
- * libpcsxcore/plugins.h: Likewise.
- * libpcsxcore/psxcounters.c: Likewise.
-
-July 3, 2010 edgbla <edgbla@yandex.ru>
-
- * libpcsxcore/psxhw.c: Sio1 interface (link cable).
- * libpcsxcore/plugins.c: Likewise.
- * libpcsxcore/plugins.h: Likewise.
- * libpcsxcore/psxcommon.h: Likewise.
-
-July 2, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * libpcsxcore/cdriso.c: Fixed subchannel data handling with images ripped
- with cdrdao. Removed support for AcetoneISO. Parse .cue file as .toc file
- when needed to satisfy some stupid tutorials which tell users to use cdrdao
- to rip a "bin/cue" image which is in fact a "bin/toc" image.
-
-July 2, 2010 edgbla <edgbla@yandex.ru>
-
- * po/ru_RU.po: Updated.
- 
-July 1, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * libpcsxcore/cdriso.c: Added support for images ripped with cdrdao with
- "--read-subchan rw_raw" for subchannel data.
- * po/pcsx.pot, po/*.po: Updated.
-
-Jun 30, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * macosx/PcsxController.m: Default dynarec to off until it's actually working
- for Mac OS X :(
-
-Jun 29, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * win32/gui/plugin.c: Close PAD plugins before other plugins and don't check
- return value for PADclose(), which should fix issues with LilyPad.
- * plugins/dfxvideo/gpu.c: Added 'fake gpu busy' hack and GPUsetFix() API
- from P.E.Op.S Soft GPU 1.18.
- * plugins/dfxvideo/externals.h: Likewise.
- * plugins/dfxvideo/prim.c: Likewise.
- * plugins/dfxvideo/gpucfg-0.1df/main.c: Likewise.
- * plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2: Likewise.
- * macosx/plugins/DFXVideo/English.lproj/NetSfPeopsSoftGPUConfig.nib/classes.nib:
- Likewise.
- * macosx/plugins/DFXVideo/English.lproj/NetSfPeopsSoftGPUConfig.nib/keyedobjects.nib:
- Likewise.
- * po/pcsx.pot, po/*.po: Updated.
-
-Jun 26, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * libpcsxcore/psxbios.c: Fixed bcopy() (FF9 battle crash with HLE BIOS - my
- mistake :( ).
- * libpcsxcore/misc.c: Added check for HLE BIOS in savestate, bumped savestate
- version, don't byteswap savestate version as part of savestate data is not
- endianness clean.
-
-Jun 24, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * plugins/dfsound/spu.c: Reset lastch to -1 in SPUinit().
- * plugins/dfsound/psemu.c: Removed support for obsoleted ancient API.
- * plugins/dfsound/Makefile.am: Removed psemu.c.
- * macosx/plugins/DFSound/PeopsSPU.xcodeproj/project.pbxproj: Likewise.
-
-Jun 23, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * libpcsxcore/sio.c: Convert more ASCII characters to half-width.
-
-Jun 21, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * libpcsxcore/psxbios.c: Use a separate flag to identify whether we are
- inside a softcall or not, as ra might be modified inside the interrupt
- handler.
- * libpcsxcore/psxbios.h: Likewise.
- * libpcsxcore/psxcommon.c: Likewise.
- * plugins/dfsound/spu.c: Moved initialization routine from SPUopen() into
- SPUinit().
- * plugins/dfsound/freeze.c: Save spuAddr as well.
- * po/Makefile.in.in: Silenced warning.
-
-Jun 20, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * plugins/dfsound/freeze.c: Reset lastch when loading state, which fixes
- occasionally crash after state loading.
- * plugins/dfsound/spu.c: Likewise.
-
-Jun 19, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * macosx/PcsxController.m: Do not simulate CD case open if user clicked
- Cancel in switch ISO dialog.
-
-Jun 16, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * libpcsxcore/psxcommon.c: Do not allow hotkeys inside a softcall from HLE
- BIOS.
- * configure.ac: Removed -fno-dse, which is no longer necessary.
-
-Jun 9, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * win32/pcsx.rc: Embed manifest properly under MSVC6.
-
-Jun 8, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * plugins/dfcdrom/cdr-linux.c: Implemented CDRgetTE() and CDRreadCDDA() (not
- tested).
- * plugins/dfcdrom/cdr-null.c: Added CDRgetBufferSub().
- * libpcsxcore/plugins.c: CDRgetBufferSub() is now mandatory (again) :)
-
-Jun 7, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * libpcsxcore/cdrom.c: Use boolean/TRUE/FALSE for where it should, don't use
- "long" type for cdrStruct which is to be saved in savestates.
- * libpcsxcore/cdrom.h: Likewise.
- * libpcsxcore/misc.c: Bumped savestate version.
- * libpcsxcore/plugins.c: Added support for CDRreadCDDA()/CDRgetTE() (not used
- for now).
- * libpcsxcore/plugins.h: Likewise.
-
-Jun 6, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * libpcsxcore/sio.c: Fixed: 'y' and 'z' not converted to half-width.
-
-Jun 4, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * gui/Plugin.c: Hack-fixed the bug which causes crash when loading state
- with dynarec CPU core. A large amount of refactor is needed for a proper
- fix.
- * win32/gui/WndMain.c: Changed language code corresponding to the ones in
- source tree.
- * libpcsxcore/psxmem.c: Minor comment fix.
-
-Jun 3, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * libpcsxcore/cheat.c: Fixed endianness issue (not tested).
- * libpcsxcore/cdrom.c: Changed CDR interrupt timing value so that it behaves
- the same as old revisions. Not sure if it breaks or unbreaks anything.
- * libpcsxcore/psxbios.c: Silenced some GCC warnings.
- * libpcsxcore/psxcounters.c: Likewise.
- * libpcsxcore/misc.c: Bumped savestate version.
- * libpcsxcore/ix86/iR3000A.c: Use %x instead of %lx.
- * libpcsxcore/ix86_64/iR3000A-64.c: Likewise.
- * po/zh_CN.po, po/zh_TW.po: Updated ("PS" seems to be more common than "PSX"
- in Asian regions).
-
-Jun 2, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * gui/MemcardDlg.c: Use unsigned for currentIcon.
- * libpcsxcore/cdrom.c: Use %x instead of %lx.
- * libpcsxcore/psxbios.c: Likewise.
- * libpcsxcore/psxdma.c: Likewise.
- * libpcsxcore/psxhw.c: Likewise.
- * gui/Makefile.am: Added -ldl.
- * plugins/dfinput/Makefile.am: Added -lX11 to cfgDFInput_LDFLAGS.
-
-Jun 1, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * gui/MemcardDlg.c: Fixed icon animation.
- * gui/ConfDlg.c: Minor text change.
- * win32/gui/ConfigurePlugins.c: Likewise.
- * po/pcsx.pot, po/zh_CN.po, po/zh_TW.po, po/ru_RU.po, po/it.po, po/pt_BR.po:
- Updated.
- * win32/pcsx.dev: Added sjisfont.h.
-
-May 31, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * libpcsxcore/psxbios.c: Implemented Krom2RawAdd().
- * libpcsxcore/sjisfont.h: Added font data.
- * macosx/Pcsx.xcodeproj/project.pbxproj: Added sjisfont.h.
- * win32/pcsx.vcproj: Likewise.
- * win32/pcsx.dsp: Likewise.
- * libpcsxcore/Makefile.am: Likewise.
-
-May 30, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * libpcsxcore/psxbios.c: Fixed memcpy(), create new stack for interrupt
- handlers.
-
-May 29, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * libpcsxcore/psxbios.c: Implemented more functions without standard C library
- calls.
-
-May 28, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * macosx/Pcsx.xcodeproj/project.pbxproj: Fixed Xcode Project.
- * macosx/English.lproj/InfoPlist.strings: Updated info.
- * autogen.sh: Removed autoreconf.
- * libpcsxcore/psxbios.c: Implemented more functions by hand (qsort() is not
- tested).
-
-May 25, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * po/pt_BR.po, po/it.po, po/zh_TW.po, po/ru_RU.po, po/pcsx.pot, po/zh_CN.po:
- Updated.
- * win32/gui/WndMain.c: Do not make temporary buffer static.
- * win32/intl/gettext.c: Likewise.
-
-May 24, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * win32/gui/WndMain.c: Also show Japanese titles properly for Windows
- (need to set ACP to east-asian languages).
- * win32/intl/gettext.c: Added a hack for UTF-8 support.
- * win32/gui/AboutDlg.c: Updated info.
- * win32/config.h: Silenced MSVC6 warnings.
- * libpcsxcore/psxbios.c: Implemented more functions. RNG should behave
- exactly the same as real BIOS now.
- * libpcsxcore/psxcounters.c: Fixed freeze bug when launching an NTSC game
- when Config.PsxAuto is enabled and Config.PsxType is set to PAL.
-
-May 23, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * AUTHORS: Updated info.
- * gui/AboutDlg.c: Likewise, and fixed FTBFS on SLED 10.
- * gui/MemcardDlg.c: Show Japanese titles properly.
- * libpcsxcore/sio.h: Likewise.
- * libpcsxcore/sio.c: Likewise.
-
-May 22, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * plugins/dfsound/pulseaudio.c: Use Native Endian instead of Little Endian.
-
-May 21, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * plugins/dfsound/oss.c: Readded OSS, PulseAudio, ALSA & NULL backends.
- * plugins/dfsound/pulseaudio.c: Likewise.
- * plugins/dfsound/nullsnd.c: Likewise.
- * plugins/dfsound/alsa.c: Likewise.
- * plugins/dfsound/spu.c: Likewise.
- * configure.ac: Added an option --enable-sound to specify the sound backend.
- * plugins/dfsound/Makefile.am: Likewise.
- * po/pt_BR.po, po/it.po, po/zh_TW.po, po/ru_RU.po, po/pcsx.pot, po/zh_CN.po:
- Updated.
- * libpcsxcore/psxbios.c: Implemented several HLE BIOS functions inside the
- core instead of calling the standard C functions. (Not done yet)
- * plugins/dfsound/sdl.c: Changed buffer size.
- * libpcsxcore/psxinterpreter.c: Revert the previous revert (why the problem
- on amd64 disappeared?).
- * libpcsxcore/ppc/pR3000A.c: Likewise.
- * libpcsxcore/cdrom.c: Likewise.
- * libpcsxcore/ix86_64/iR3000A-64.c: Likewise.
- * libpcsxcore/ix86/iR3000A.c: Likewise.
- * libpcsxcore/sio.c: Likewise.
- * libpcsxcore/psxdma.c: Likewise.
- * libpcsxcore/psxcounters.c: Likewise.
- * libpcsxcore/mdec.c: Likewise, and fixed the cycle value in mdec1Interrupt().
-
-May 20, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * macosx/main.m: Removed obsolete code, added const to function definations.
- * libpcsxcore/plugins.c: Added brackets around the use of CheckErr().
- * libpcsxcore/psxcommon.h: Added brackets around gzfreeze().
- * plugins/dfinput/Makefile.am: Use $(SDL_CFLAGS) and $(SDL_LIBS).
- * plugins/dfsound/Makefile.am: Likewise.
- * libpcsxcore/psxmem.c: Map 1fc00000-1fc7ffff and 9fc00000-9fc7ffff to BIOS
- as well.
-
-May 19, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * plugins/dfsound/sdl.c: Use SDL for Sound Plugin.
- * plugins/dfsound/oss.c: Removed OSS, PulseAudio, ALSA & NULL sound code. If
- these are ever needed in the future we still have the thing called version
- control.
- * plugins/dfsound/pulseaudio.c: Likewise.
- * plugins/dfsound/nullsnd.c: Likewise.
- * plugins/dfsound/alsa.c: Likewise.
- * plugins/dfsound/spu.c: Removed OSS/PulseAudio/ALSA/NULL plugin names,
- added SDL plugin name.
- * debian/control: Removed libasound2-dev.
- * debian/rules: Removed --enable-alsa.
- * configure.ac: Removed ALSA, PulseAudio & OSS stuff.
- * plugins/dfsound/Makefile.am: Likewise.
- * po/pt_BR.po, po/it.po, po/zh_TW.po, po/ru_RU.po, po/pcsx.pot, po/zh_CN.po:
- Updated.
- * libpcsxcore/psxinterpreter.c: Reverted the change to how BIAS was handled in
- r48024, which was causing problems with x64 dynarec core.
- * libpcsxcore/ppc/pR3000A.c: Likewise.
- * libpcsxcore/cdrom.c: Likewise.
- * libpcsxcore/ix86_64/iR3000A-64.c: Likewise.
- * libpcsxcore/r3000a.c: Likewise.
- * libpcsxcore/mdec.c: Likewise.
- * libpcsxcore/ix86/iR3000A.c: Likewise.
- * libpcsxcore/sio.c: Likewise.
- * libpcsxcore/psxdma.c: Likewise.
- * libpcsxcore/psxcounters.c: Likewise.
-
-May 16, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * libpcsxcore/plugins.c: Added brackets around CheckErr() and LoadSym().
-
-May 15, 2010 edgbla <edgbla@yandex.ru>
-
- * libpcsxcore/psxdma.h: spu dma was fixed.
- * libpcsxcore/r3000a.c: Likewise.
- * libpcsxcore/psxdma.c: Likewise.
-
-May 14, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * libpcsxcore/plugins.c: Fixed crash when launching another game if netplay
- plugin is selected but not used during the previously running game.
- * gui/Plugin.c: Use TRUE/FALSE for Config.UseNet.
- * win32/gui/plugin.c: Likewise.
- * libpcsxcore/psxbios.c: Minor cleanup.
-
-May 14, 2010 edgbla <edgbla@yandex.ru>
-
- * libpcsxcore/psxinterpreter.c: Bias was moved into rec/int.
- * libpcsxcore/ppc/pR3000A.c: Likewise.
- * libpcsxcore/cdrom.c: Likewise.
- * libpcsxcore/ix86_64/iR3000A-64.c: Likewise.
- * libpcsxcore/mdec.c: Likewise.
- * libpcsxcore/ix86/iR3000A.c: Likewise.
- * libpcsxcore/psxcommon.h: Likewise.
- * libpcsxcore/sio.c: Likewise.
- * libpcsxcore/psxdma.c: Likewise.
- * libpcsxcore/psxcounters.c: Likewise.
- * po/ru_RU.po: Updated.
-
-May 14, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * data/pcsx.glade2: Moved About dialog box out of glade2 file.
- * gui/AboutDlg.c: Added.
- * gui/AboutDlg.h: Likewise.
- * gui/Gtk2Gui.c: Call RunAboutDialog() instead of showing about dialog from
- glade2 file.
- * po/pcsx.pot, po/pt_BR.po, po/it.po, po/zh_TW.po, po/ru_RU.po, po/zh_CN.po:
- Updated.
- * gui/Makefile.am: Added AboutDlg.c.
- * po/POTFILES.in: Added all current files.
-
-May 13, 2010 edgbla <edgbla@yandex.ru>
-
- * libpcsxcore/plugins.h: CDRgetBufferSub for internal cdr plugin.
- * libpcsxcore/plugins.c: Likewise.
-
-May 13, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * plugins/dfnet/gui.c: Get the correct address under GNU/Linux.
- * plugins/dfnet/dfnet.c: Removed sockGetIP(), which is unused in plugin.
- * plugins/dfnet/dfnet.h: Likewise.
- * plugins/dfnet/dfnet.glade2: Fixed max length of IP address entry.
- * libpcsxcore/gte.c: Improved accuracy (or 'inaccuracy') of the divider
- (courtesy of shalma).
- * libpcsxcore/gte_divider.h: Added.
- * win32/pcsx.dsp: Added gte_divider.h.
- * win32/pcsx.vcproj: Likewise.
- * win32/pcsx.dev: Likewise.
-
-May 13, 2010 edgbla <edgbla@yandex.ru>
-
- * libpcsxcore/plugins.h: PADreadPort1/2 for NRage pad plugin (windows).
- * libpcsxcore/plugins.c: Likewise.
- * po/ru_RU.po: Updated.
-
-May 13, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * configure.ac: Added plugins/dfnet/Makefile.am.
- * Makefile.am: Added plugins/dfnet.
- * plugins/dfnet/dfnet.c: Added NetPlay plugin (based on netSock).
- * plugins/dfnet/unix.c: Likewise.
- * plugins/dfnet/cfg.c: Likewise.
- * plugins/dfnet/gui.c: Likewise.
- * plugins/dfnet/dfnet.h: Likewise.
- * plugins/dfnet/Makefile.am: Likewise.
- * plugins/dfnet/dfnet.glade2: Likewise.
- * plugins/dfinput/cfg-gtk2.c: Use gtk_dialog_run() for about dialog.
- * plugins/dfcdrom/cdrcfg-0.1df/main.c: Likewise.
- * po/pt_BR.po, po/it.po, po/zh_CN.po, po/zh_TW.po, po/ru_RU.po, po/pcsx.pot:
- Updated.
- * po/update-pot.sh: Added files in plugins/dfnet.
-
-May 12, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * libpcsxcore/sio.c: Erase CdromId and CdromLabel when net connection closed.
- * libpcsxcore/psxcommon.h: Use boolean type for config values, byte for enum
- values.
- * gui/Config.c: Use TRUE/FALSE for boolean values, enums for byte values in
- config.
- * gui/ConfDlg.c: Likewise.
- * macosx/PcsxController.m: Likewise.
- * win32/gui/ConfigurePlugins.c: Likewise.
- * win32/gui/WndMain.c: Likewise.
- * libpcsxcore/psxmem.c: Likewise.
- * libpcsxcore/r3000a.c: Likewise.
- * libpcsxcore/plugins.c: Likewise.
- * libpcsxcore/misc.c: Likewise.
- * AUTHORS: Updated info.
-
-May 11, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * gui/Gtk2Gui.c: Use TRUE/FALSE instead of 0/1 for NetOpened.
- * gui/Plugin.c: Likewise.
- * win32/gui/plugin.c: Likewise.
- * macosx/Plugin.c: Removed obsolete code.
-
-May 10, 2010 edgbla <edgbla@yandex.ru>
-
- * data/pcsx.glade2: Memory cards dialog is now resizable, icons were
- enlarged and animated. (experimental,gtk)
- * gui/MemcardDlg.c: Likewise.
-
-May 10, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * libpcsxcore/psxcommon.c: Include ppf.h.
- * libpcsxcore/misc.c: Silenced MSVC warning.
-
-May 10, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * libpcsxcore/plugins.c: Use functions instead of using global variables,
- other minor cleanups.
- * gui/Plugin.c: Likewise.
- * gui/LnxMain.c: Likewise.
- * gui/Gtk2Gui.c: Likewise.
- * win32/gui/plugin.c: Likewise.
- * win32/gui/WndMain.c: Likewise.
- * libpcsxcore/cdriso.c: Likewise.
- * libpcsxcore/psxcommon.c: Likewise.
- * libpcsxcore/plugins.h: Likewise.
- * libpcsxcore/psxcommon.h: Likewise.
- * libpcsxcore/sio.c: Likewise.
- * libpcsxcore/psxhw.c: Likewise.
- * libpcsxcore/psxbios.c: Moved declaration of netError() into ...
- * libpcsxcore/sio.h: Here.
-
-May 10, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * libpcsxcore/cdrom.c: Got rid of gzfreezel.
- * libpcsxcore/mdec.c: Likewise.
- * libpcsxcore/psxcommon.h: Likewise.
- * libpcsxcore/sio.c: Likewise.
- * libpcsxcore/psxcounters.c: Likewise.
- * libpcsxcore/misc.c: Added savestate versioning support.
- * gui/Gtk2Gui.c: Don't reset when loading from savestate unless loading
- succeeded.
-
-May 10, 2010 edgbla <edgbla@yandex.ru>
-
- * libpcsxcore/sio.h: Some code (regs,macro) was moved to the 'c' file. 
- * libpcsxcore/sio.c: Likewise.
-
-May 10, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * configure.ac: libbz2 is no longer needed.
- * debian/control: Likewise.
- * libpcsxcore/plugins.c: CDRgetBufferSub() is now mandatory.
- * libpcsxcore/cdrom.h: Savestate compatibility is already broken, so no need
- to stuff garbage into saved files :)
- * libpcsxcore/mdec.c: Likewise.
- * libpcsxcore/psxhw.c: Likewise.
- * libpcsxcore/sio.c: Likewise.
- * libpcsxcore/psxcounters.c: Likewise.
-
-May 9, 2010 edgbla <edgbla@yandex.ru>
-
- * libpcsxcore/psxcounters.c: psxRcntFreeze was fixed.
- * plugins/dfxvideo/prim.c: Returned some code (iGPUHeight=1024), IMO, it's
- wrong, can't perform the tests.
-
-May 9, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * libpcsxcore/plugins.c: Removed support for ancient GPU/SPU plugin APIs.
- * libpcsxcore/plugins.h: Likewise.
-
-May 8, 2010 edgbla <edgbla@yandex.ru>
-
- * plugins/dfxvideo/prim.c: Dithering logic was fixed.
- * plugins/dfxvideo/gpucfg-0.1df/main.c: Likewise.
-
-May 8, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * libpcsxcore/misc.c: Use const for input strings.
- * libpcsxcore/misc.h: Likewise.
- * libpcsxcore/spu.c: Got rid of 0x80000000 flag of psxRegs.interrupt.
- * libpcsxcore/psxinterpreter.c: Likewise.
- * libpcsxcore/cdrom.c: Likewise.
- * libpcsxcore/ix86_64/iR3000A-64.c: Likewise.
- * libpcsxcore/r3000a.c: Likewise.
- * libpcsxcore/psxhw.c: Likewise.
- * libpcsxcore/r3000a.h: Likewise.
- * libpcsxcore/ix86/iR3000A.c: Likewise.
- * libpcsxcore/psxhw.h: Likewise.
- * libpcsxcore/sio.c: Likewise.
- * libpcsxcore/psxcounters.c: Likewise.
-
-May 8, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * libpcsxcore/sio.h: Added extern "C" to all headers.
- * libpcsxcore/misc.h: Likewise.
- * libpcsxcore/ppc/reguse.h: Likewise.
- * libpcsxcore/ppc/pGte.h: Likewise.
- * libpcsxcore/ppc/ppc.h: Likewise.
- * libpcsxcore/psxdma.h: Likewise.
- * libpcsxcore/psxcounters.h: Likewise.
- * libpcsxcore/cdrom.h: Likewise.
- * libpcsxcore/psxmem.h: Likewise.
- * libpcsxcore/decode_xa.h: Likewise.
- * libpcsxcore/coff.h: Likewise.
- * libpcsxcore/gte.h: Likewise.
- * libpcsxcore/ix86_64/iGte.h: Likewise.
- * libpcsxcore/cdriso.h: Likewise.
- * libpcsxcore/system.h: Likewise.
- * libpcsxcore/ppf.h: Likewise.
- * libpcsxcore/debug.h: Likewise.
- * libpcsxcore/psxbios.h: Likewise.
- * libpcsxcore/psxhle.h: Likewise.
- * libpcsxcore/r3000a.h: Likewise.
- * libpcsxcore/spu.h: Likewise.
- * libpcsxcore/psemu_plugin_defs.h: Likewise.
- * libpcsxcore/mdec.h: Likewise.
- * libpcsxcore/plugins.h: Likewise.
- * libpcsxcore/ix86/iGte.h: Likewise.
- * libpcsxcore/psxhw.h: Likewise.
- * libpcsxcore/cheat.h: Likewise.
- * libpcsxcore/socket.h: Likewise.
- * libpcsxcore/r3000a.c: Separated cheat related stuff out of the r3000a code.
- * libpcsxcore/psxcounters.c: Likewise.
- * libpcsxcore/psxcommon.h: Added EmuInit, EmuReset, EmuShutdown & EmuReset.
- * libpcsxcore/misc.c: Moved logging stuff to psxcommon.c.
- * libpcsxcore/psxcommon.c: Added EmuInit, EmuReset, EmuShutdown & EmuReset,
- moved logging stuff from misc.c to here.
- * gui/LnxMain.c: Call Emu* instead of psx*.
- * macosx/main.m: Likewise.
- * macosx/EmuThread.m: Likewise.
- * win32/gui/WndMain.c: Likewise.
- * libpcsxcore/ix86/ix86.c: Moved definations in ix86.h to source file.
- * libpcsxcore/ix86/ix86.h: Likewise.
-
-May 7, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * libpcsxcore/r3000a.c: Removed unneeded declarations, other minor cleanups.
- * libpcsxcore/plugins.c: Likewise.
- * libpcsxcore/plugins.h: Likewise.
- * libpcsxcore/psxcommon.h: Added definations for boolean type, as well as
- TRUE and FALSE (not used for now).
- * gui/Linux.h: Declares StatesC here.
-
-May 7, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * libpcsxcore/misc.h: Preparing for refactor/cleanup, moved all definations
- into .c files, other minor cleanups. (Breaks Mac OS X and maybe Windows as
- well for now, will fix later)
- * libpcsxcore/psxdma.h: Likewise.
- * libpcsxcore/psxcounters.h: Likewise.
- * libpcsxcore/cdrom.c: Likewise.
- * libpcsxcore/cdrom.h: Likewise.
- * libpcsxcore/psxmem.c: Likewise.
- * libpcsxcore/psxmem.h: Likewise.
- * libpcsxcore/cdriso.c: Likewise.
- * libpcsxcore/ppf.c: Likewise.
- * libpcsxcore/cdriso.h: Likewise.
- * libpcsxcore/system.h: Likewise.
- * libpcsxcore/debug.h: Likewise.
- * libpcsxcore/r3000a.c: Likewise.
- * libpcsxcore/psxhle.h: Likewise.
- * libpcsxcore/spu.h: Likewise.
- * libpcsxcore/mdec.h: Likewise.
- * libpcsxcore/psxhw.h: Likewise.
- * libpcsxcore/plugins.c: Likewise.
- * libpcsxcore/plugins.h: Likewise.
- * libpcsxcore/psxcommon.h: Likewise.
- * libpcsxcore/sio.c: Likewise.
- * libpcsxcore/misc.c: Likewise.
- * libpcsxcore/psxcounters.c: Likewise.
- * libpcsxcore/ix86_64/iR3000A-64.c: Likewise.
- * libpcsxcore/ix86_64/ix86-64.c: Likewise.
- * gui/LnxMain.c: Likewise.
- * gui/Gtk2Gui.c: Likewise.
- * win32/WndMain.c: Likewise.
- * libpcsxcore/psxcommon.c: Added.
- * win32/pcsx.dsp: Added psxcommon.c.
- * win32/pcsx.dev: Likewise.
- * win32/pcsx.vcproj: Likewise.
- * libpcsxcore/Makefile.am: Likewise.
- * autogen.sh: Run autoreconf as well.
- * AUTHORS: Updated info.
-
-May 5, 2010 edgbla <edgbla@yandex.ru>
-
- * libpcsxcore/psxcounters.c: Updated (Rc2Disable).
-
-May 5, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * gui/DebugMemory.c: Show 0x7f as dots.
- * libpcsxcore/plugins.c: Got rid of old PAD_readPort1()/PAD_readPort2() APIs.
- PAD_startPoll() and PAD_poll() are now required.
- * libpcsxcore/plugins.h: Likewise.
- * libpcsxcore/sio.c: Likewise.
- * libpcsxcore/psemu_plugin_defs.h: Updated info.
-
-May 2, 2010 edgbla <edgbla@yandex.ru>
-
- * libpcsxcore/psxcounters.h: Root counters code was written from scratch.
- * libpcsxcore/psxcounters.c: Likewise.
- * libpcsxcore/psxhw.c: Likewise.
- * libpcsxcore/misc.c: Likewise.
- * libpcsxcore/ix86/iR3000A.c: Likewise.
- * libpcsxcore/ix86_64/iR3000A-64.c: Likewise.
- * libpcsxcore/ppc/pR3000A.c: Likewise.
-
-April 30, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * Mass update to the copyright headers. Fixed typo in FSF's address,
- Removed obsolete URL. (No real change :) )
-
-April 24, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * win32/pcsx.rc: Don't include afxres.h, which doesn't exist in MSVC
- 2010 Express.
-
-April 18, 2010 edgbla <edgbla@yandex.ru>
-
- * po/ru_RU.po: Updated.
-
-April 17, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * po/ru_RU.po: Added Russian translation by edgbla.
- * po/update-pot.sh: Added ru_RU.po.
- * po/LINGUAS: Likewise.
- * AUTHORS: Updated info.
-
-April 16, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * plugins/peopsxgl/soft.c: Applied the same fix by edgbla as dfxvideo.
- * libpcsxcore/gte.c: Use integer math for division operations.
-
-April 15, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * plugins/dfsound/freeze.c: Fixed the sound doesn't always play properly
- after loading the state. (Thanks edgbla)
- * libpcsxcore/psxmem.c: Fixed KKND freeze at startup. (edgbla)
- * libpcsxcore/gte.c: Fixed gteDCPL. (edgbla)
- * AUTHORS: Updated info.
-
-April 14, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * libpcsxcore/gte.c: Use u32 instead of unsigned long.
- * COPYING: Fixed a typo in FSF's address.
- * plugins/dfxvideo/soft.c: Army Man invisible bullets fix (courtesy of
- edgbla).
- * AUTHORS: Updated info.
- * data/pcsx.glade2: Likewise.
-
-April 13, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * libpcsxcore/gte.c: Backported the new GTE code from PCSX-Revolution project
- (http://code.google.com/p/pcsx-revolution), which is more accurate & fixes
- at least graphic corruption problems with Mat Hoffman's Pro BMX.
- * libpcsxcore/gte.h: Likewise.
- * libpcsxcore/r3000a.h: Likewise.
- * libpcsxcore/ppc/pGte.h: Call functions in gte.c instead of generating
- machine code directly for now.
- * libpcsxcore/ix86_64/iGte.h: Likewise.
- * libpcsxcore/ix86/iGte.h: Likewise.
- * libpcsxcore/debug.h: Removed GTE_DUMP.
- * gui/LnxMain.c: Likewise.
- * macosx/main.m: Likewise.
- * win32/gui/WndMain.c: Likewise.
-
-April 11, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * libpcsxcore/cdriso.c: Check the CRC value of subchannel after reading.
- * gui/DebugMemory.c: Allow using a hexa string instead of one value for
- Memory Patch.
- * po/zh_CN.po, po/zh_TW.po, po/it.po, po/pt_BR.po, po/pcsx.pot: Updated.
-
-April 10, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * data/pcsx.glade2: Added "Memory Dump" to menu item. Added Memory Viewer
- dialog box. Added more info to About dialog box.
- * gui/Gtk2Gui.c: Likewise.
- * gui/DebugMemory.c: Implemented memory viewer/dumper.
- * gui/DebugMemory.h: Likewise.
- * gui/Makefile.am: Added DebugMemory.c.
- * gui/Cheat.c: Changed the order of OK/Cancel buttons for consistency with
- GNOME UI standards.
- * libpcsxcore/psxmem.c: Minor cleanup (thanks Sebun).
- * libpcsxcore/spu.c: Likewise.
- * libpcsxcore/cdrom.c: Check case open/close in CdlStop (courtesy of shalma).
- * plugins/peopsxgl/gpucfg/callbacks.c: Fixed warnings.
- * po/zh_CN.po, po/zh_TW.po, po/it.po, po/pt_BR.po, po/pcsx.pot: Updated.
-
-March 21, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * libpcsxcore/mdec.c: Minor cleanup.
-
-March 18, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * macosx/plugins/HIDInput/src/PlugPAD.c: Commented out calls to
- HIDCalibrateValue(), which caused problem in some cases.
-
-March 17, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * macosx/plugins/HIDInput/HIDInput.xcodeproj/project.pbxproj: Fixed build
- issue.
-
-March 16, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * po/it.po: Updated Italian translation by Giovanni Scafora.
-
-March 15, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * libpcsxcore/mdec.c: 0x1f should be 31 rather than 15 (stupid /me).
- * po/it.po: Added Italian translation (Thanks Giovanni Scafora).
- * AUTHORS, po/LINGUAS, po/update-pot.sh: Updated.
-
-March 14, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * libpcsxcore/mdec.c: Rewritten MDEC decoder to replace non-free code, also
- fixes image quality issues and improves decoding speed. (Thanks gorlik)
- * AUTHORS: Updated info.
-
-March 12, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * gui/LnxMain.c: Fixed -cdfile switch (Thanks NeToU).
- * AUTHORS: Updated info.
-
-March 6, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * libpcsxcore/ppf.c: Speeded up the PPF loading routine when the PPF file
- is "in order".
-
-February 23, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * plugins/dfinput/analog.c: Confirmed center value should be 127 instead of
- 128, removed obsolete comments.
- (http://code.google.com/p/pcsx2/source/detail?r=2587)
-
-February 18, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * AUTHORS: Updated info.
-
-February 17, 2010 Tristin Celestin <cetris1@umbc.edu>
-
- * configure.ac: Removed PulseAudio Simple API support.
- * plugins/dfsound/Makefile.am: Likewise.
- * plugins/dfsound/nullsnd.c: Likewise.
- * plugins/dfsound/spu.c: Likewise.
- * plugins/dfsound/pulseaudiosimple.c: Removed.
- * plugins/dfsound/pulseaudio.c: Fixed high-compatibility (SPUasync) mode.
-
-February 15, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * libpcsxcore/psxhw.c: Don't skip calls to psxDman() when TR flag of CHCR is
- true, which fixes the menu problem in Dragon Quest 7.
- * plugins/dfcdrom/cdr-linux.c: Fixed subchannel reading in threaded mode.
-
-February 14, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * libpcsxcore/cdrom.c: Fixed GetlocP, which solves the problem with libcrypt
- copy protected games. (Thanks shalma)
-
-February 13, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * libpcsxcore/cdrom.c: Clear the 0x20 flag when stop reading, which fixes the
- problem with Syphon Filter.
- * libpcsxcore/psxhw.c: Always update HW_DMAx_CHCR in DmaExec(), which fixes
- the problem with Harvest Moon.
- (Thanks shalma: http://forums.ngemu.com/pcsx-discussion/116599-developers-wanted-pcsx-revival-2.html)
-
-February 10, 2010 Tristin Celestin <cetris1@umbc.edu>
-
- * plugins/dfsound/pulseaudio.c: PulseAudio Normal API support is now working
- in threaded non-SPUasync() mode.
-
-February 7, 2010 Tristin Celestin <cetris1@umbc.edu>
-
- * plugins/dfsound/pulseaudio.c: Added PulseAudio support (not working yet).
- * plugins/dfsound/pulseaudiosimple.c: Added PulseAudio Simple API support
- (not working with SPUasync).
- * plugins/dfsound/alsa.c: Fixed the alsa plugin so that it produces cleaner
- audio through PulseAudio.
- * plugins/dfsound/nullsnd.c: Don't compile when PulseAudio or PulseAudio
- Simple API support is enabled.
- * plugins/dfsound/spu.c: Added strings for PulseAudio plugin.
- * plugins/dfsound/Makefile.am: Added pulseaudio.c and pulseaudiosimple.c.
- * configure.ac: Added PulseAudio-related stuff.
- * po/zh_CN.po, po/zh_TW.po, po/pt_BR.po, po/pcsx.pot: Updated.
-
-February 1, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * macosx/plugins/HIDInput/src/HID_Utilities.h: Removed duplicate file.
- * macosx/plugins/HIDInput/src/PlugPAD.c: #include HID_Utilities_External.h
- instead of HID_Utilities.h.
- * macosx/plugins/HIDInput/src/PadController.m: Likewise.
- * macosx/plugins/HIDInput/src/KeyConfig.h: Likewise.
-
-January 31, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * macosx/EmuThread.m: Use setjmp()/longjmp() for resetting to avoid nasty
- plugin issues.
- * libpcsxcore/mdec.c: Minor cleanup.
-
-January 24, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
-
- * gui/LnxMain.c: Don't always move the mouse to the right for screensaver
- disabling.
- * win32/pcsx.sln, win32/pcsx.vcproj: Added VC8 Project File.
-
-January 23, 2010 Wei Mingzhi <weimingzhi@gmail.com>
-
- * libpcsxcore/cdriso.c: Moved several definations into cdriso.h.
- * libpcsxcore/cdriso.h: Likewise.
- * libpcsxcore/ppf.c: Added PPF patch support.
- * libpcsxcore/ppf.h: Likewise.
- * libpcsxcore/cdrom.c: Likewise.
- * libpcsxcore/cdrom.h: Likewise.
- * libpcsxcore/misc.c: Likewise.
- * libpcsxcore/r3000a.c: Likewise.
- * libpcsxcore/psxcommon.h: Likewise.
- * gui/LnxMain.c: Likewise.
- * gui/Linux.h: Likewise.
- * win32/gui/WndMain.c: Likewise.
- * macosx/main.m: Likewise.
- * macosx/PcsxController.m: Likewise.
- * libpcsxcore/Makefile.am: Added ppf.c and ppf.h.
- * win32/pcsx.dsp: Likewise.
- * win32/pcsx.dev: Likewise.
- * macosx/Pcsx.xcodeproj/project.pbxproj: Likewise.
- * po/zh_CN.po, po/zh_TW.po, po/pt_BR.po, po/pcsx.pot: Updated.
-
-January 7, 2010 Wei Mingzhi <weimingzhi@gmail.com>
-
- * plugins/dfxvideo/draw.c: MaintainAspect() now only depends on screen
- resolution.
-
-December 28, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * data/pcsx.glade2: Reverted to "Close" button instead of "OK/Cancel" for
- consistency with GNOME UI standards.
- * plugins/dfsound/spucfg-0.1df/dfsound.glade2: Likewise.
- * plugins/dfsound/spucfg-0.1df/main.c: Likewise.
- * plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2: Likewise.
- * plugins/dfxvideo/gpucfg-0.1df/main.c: Likewise.
- * plugins/dfinput/cfg-gtk2.c: Likewise.
- * plugins/dfinput/dfinput.glade2: Likewise.
- * plugins/dfcdrom/cdrcfg-0.1df/main.c: Likewise.
- * plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2: Likewise.
- * gui/ConfDlg.c: Likewise.
- * po/zh_TW.po: Updated.
- * README, NEWS: Updated.
-
-December 19, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * win32/gui/WndMain.c: Added Portuguese (Brazilian) to the language list.
- * po/pt_BR.po, po/zh_CN.po, po/zh_TW.po, po/pcsx.pot: Updated.
-
-December 8, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * plugins/peopsxgl/gpu.c: Hide the panels in fullscreen mode.
-
-December 4, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * plugins/dfinput/analog.c: Allow analog sticks to be mapped to non-axis
- events (keyboard & joystick buttons) as well.
- * plugins/dfinput/cfg.c: Likewise.
- * plugins/dfinput/cfg-gtk2.c: Likewise.
- * plugins/dfinput/xkb.c: Likewise.
- * plugins/dfinput/pad.h: Likewise.
- * po/zh_CN.po, po/zh_TW.po, po/pt_BR.po, po/pcsx.pot: Updated.
- * libpcsxcore/psxbios.c: Don't touch the stack pointer if pointed to the
- hardware area, which fixes FF7 chocobo racing problem. Don't always
- allocate stack spaces before softcall.
-
-December 3, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * plugins/dfinput/pad.c: Changed the value of center position to 127 instead
- of 128, which fixes the FF8 problem. Still need further confirmation about
- this, as all of the protocol docs I've read as well as psemu_plugin_defs.h
- say 128 is the center position.
- * libpcsxcore/r3000a.c: Minor cleanup.
-
-December 2, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * plugins/dfinput/pad.c: Removed DualShock2-specific stuff in PADpoll().
- * macosx/plugins/HIDInput/src/PlugPAD.c: Likewise.
-
-December 1, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * plugins/dfcdrom/cdr-linux.c: Fixed crash bug when resuming emulation in
- Threaded mode.
- * gui/MemcardDlg.c: Don't keep previous selection after creating a new
- memcard or changing a memcard.
- * gui/Gtk2Gui.c: Minor cleanup.
-
-November 30, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * macosx/plugins/DFSound/PeopsSPU.xcodeproj/project.pbxproj: Changed build
- directory into ../../build.
- * macosx/plugins/HIDInput/HIDInput.xcodeproj/project.pbxproj: Likewise.
- * macosx/plugins/CDDeviceInterface/CDDeviceInterfacePlugin.xcodeproj/
- project.pbxproj: Likewise.
- * macosx/plugins/DFXVideo/PeopsSoftGPU.xcodeproj/project.pbxproj: Likewise.
- * macosx/Pcsx.xcodeproj/project.pbxproj: Include building and copying plugins
- to the bundle (thanks avlex).
-
-November 29, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * data/pcsx.glade2: Got rid of GtkFileChooserButton, which is buggy. Added
- a Toolbar which contains several most-used functions.
- * gui/MemcardDlg.c: Got rid of GtkFileChooserButton.
- * gui/Gtk2Gui.c: Moved configuration-related stuff into ConfDlg.c. Added
- Toolbar support.
- * gui/ConfDlg.c: Added.
- * gui/ConfDlg.h: Added.
- * gui/Linux.h: Removed unnecessary prototypes. Moved some stuff into
- ConfDlg.h.
- * libpcsxcore/psxcommon.h: Use MAXPATHLEN for string lengths.
- * po/pt_BR.po, po/zh_CN.po, po/zh_TW.po, po/pcsx.pot: Updated.
- * po/update-pot.sh: Also run msgmerge automatically.
- * doc/pcsx.1: Don't say "PCSX-df".
- * macosx/main.m: Minor cleanup.
- * macosx/PluginController.m: Likewise.
- * macosx/PcsxController.m: Made the memory card files configurable.
- * macosx/ConfigurationController.m: Likewise.
- * macosx/ConfigurationController.h: Likewise.
- * macosx/English.lproj/Configuration.nib/info.nib: Likewise.
- * macosx/English.lproj/Configuration.nib/classes.nib: Likewise.
-
-November 28, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * data/pcsx.glade2: Adjusted Memcard dialog.
- * po/pt_BR.po, po/zh_CN.po, po/zh_TW.po, po/pcsx.pot: Updated.
- * gui/Cheat.c: Fixed memory leaks.
- * plugins/dfinput/cfg-gtk2.c: Likewise.
- * gui/Gtk2Gui.c: Moved memcard dialog stuff into MemcardDlg.c.
- * gui/MemcardDlg.c: Added.
- * gui/MemcardDlg.h: Likewise.
- * gui/Makefile.am: Added MemcardDlg.c.
- * gui/LnxMain.c: Minor cleanup.
- * gui/Linux.h: Likewise.
-
-November 27, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * plugins/dfcdrom/cdrcfg-0.1df/main.c: Rewritten the configuration utility
- with libglade.
- * plugins/dfcdrom/Makefile.am: Fixed compiling.
- * plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2: Added.
- * plugins/dfcdrom/cdrcfg-0.1df/callbacks.c: Removed Glade-generated code.
- * plugins/dfcdrom/cdrcfg-0.1df/callbacks.h: Likewise.
- * plugins/dfcdrom/cdrcfg-0.1df/support.c: Likewise.
- * plugins/dfcdrom/cdrcfg-0.1df/support.h: Likewise.
- * plugins/dfcdrom/cdrcfg-0.1df/interface.c: Likewise.
- * plugins/dfcdrom/cdrcfg-0.1df/interface.h: Likewise.
- * plugins/dfcdrom/cdrcfg-0.1df/cfgCdr.glade: Likewise.
- * plugins/dfcdrom/cdrcfg-0.1df/cfg-gtk2: Likewise.
- * plugins/dfcdrom/cdr-linux.c: Added selection of spin-down time.
- Don't return NULL when CDRgetBuffer() is called more than once without
- another CDRreadTrack() call in threaded mode, which solves the problem
- with Final Fantasy 6 (maybe other games too).
- * plugins/dfcdrom/cfg.c: Likewise.
- * plugins/dfcdrom/cfg.h: Likewise.
- * po/update-pot.sh: Include files from plugins/dfcdrom/cdrcfg-0.1df.
- * po/pcsx.pot, po/zh_CN.po, po/zh_TW.po, po/pt_BR.po: Updated.
- * plugins/dfcdrom/cdr.h: Moved global variables into cdr-linux.c.
- * plugins/dfxvideo/draw.c: Removed the screensaver disabling code.
- * plugins/dfxvideo/Makefile.am: Don't link against Xtst.
- * gui/LnxMain.c: Disable screensaver in the main emu, so that it will be
- effective in all of the plugins.
- * gui/Makefile.am: Added -lXext -lXtst.
-
-November 26, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * plugins/dfcdrom/cdr.c: Separated GNU/Linux-specific code and NULL code
- into separate files (cdr-linux.c and cdr-null.c).
- * plugins/dfcdrom/cdr-linux.c: Added.
- * plugins/dfcdrom/cdr-null.c: Likewise.
- * plugins/dfcdrom/cdrcfg-0.1df: Moved configuration utility into a subdir.
- * plugins/dfcdrom/interface.c: Moved into cdrcfg-0.1df directory.
- * plugins/dfcdrom/interface.h: Likewise.
- * plugins/dfcdrom/cfg-gtk2.c: Likewise.
- * plugins/dfcdrom/support.c: Likewise.
- * plugins/dfcdrom/support.h: Likewise.
- * plugins/dfcdrom/main.c: Likewise.
- * plugins/dfcdrom/callbacks.c: Likewise.
- * plugins/dfcdrom/callbacks.h: Likewise.
- * plugins/dfcdrom/cfgCdr.glade: Likewise.
- * plugins/dfcdrom/Makefile.am: Likewise.
- * libpcsxcore/psxbios.c: Fixed MSVC6 errors when psxbios logging is enabled.
- * debian/changelog: Changed version number.
- * libpcsxcore/cdriso.c: Added support for reporting current CDDA play time.
-
-November 25, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * po/zh_CN.po, po/zh_TW.po: Updated.
-
-November 13, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * libpcsxcore/misc.c: Fixed CheckCdrom() and LoadCdrom() so that format like
- "cdrom:\\FILENAME" and "cdrom:/FILENAME" in SYSTEM.CNF can be accepted.
- * libpcsxcore/ix86_64/README: Removed obsolete information.
- * macosx/plugins/CDDeviceInterface/src/PlugCD.c: Changed the include path
- to SCSITaskLib.h for compatibility with Mac OS X 10.6 SDK (Thanks magiix).
- * macosx/English.lproj/PCSX.nib/objects.nib: Added 2 more savestate slots.
- * macosx/English.lproj/PCSX.nib/info.nib: Likewise.
-
-November 9, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * plugins/dfxvideo/draw.c: Fixed green edge in YUV mode.
-
-November 8, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * libpcsxcore/r3000a.c: Commented out the check for psxRegs.interrupt
- before checking for hardware interrupts, which fixes the issue with I.Q.
- Final (maybe other games too).
-
-November 7, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * plugins/dfxvideo/draw.c: Don't bail out if the color depth is not set to 32.
-
-November 5, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * plugins/dfxvideo/draw.c: Check for centering during blits.
-
-November 4, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * libpcsxcore/sio.c: Fixed the format of new memory card file, which solves
- the saving problem with Final Fantasy 6.
- * macosx/EmuThread.h: Added "Run BIOS" menu item.
- * macosx/PcsxController.h: Likewise.
- * macosx/EmuThread.m: Likewise.
- * macosx/PcsxController.m: Likewise.
- * macosx/English.lproj/PCSX.nib/objects.nib: Likewise.
- * macosx/English.lproj/PCSX.nib/info.nib: Likewise.
- * macosx/English.lproj/PCSX.nib/classes.nib: Likewise.
- * macosx/main.m: Reload plugins at each time emulation starts.
- * macosx/Info.plist: Changed version number.
-
-November 3, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * macosx/plugins/HIDInput/src/PlugPAD.c: Implemented PADstartPoll() and
- PADpoll().
- * plugins/dfxvideo/key.c: Handle Fullscreen toggle message for Mac OS X.
- * macosx/plugins/DFXVideo/macsrc/PluginGLView.m: Fixed one byte-order issue.
-
-November 2, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * macosx/plugins/DFXVideo: Added project file and necessary codes for
- building existing dfxvideo sources for Mac OS X. (NOT bug-free yet!!!)
- * dfxvideo/gpu.c: Made necessary changes for Mac OS X build.
- * dfxvideo/externals.h: Likewise.
- * macosx/plugins/HIDInput/HIDInput.xcodeproj/project.pbxproj: Use
- psemu_plugin_defs.h from libpcsxcore.
- * macosx/plugins/HIDInput/src/PlugPAD.c: Likewise.
- * macosx/plugins/CDDeviceInterface/CDDeviceInterfacePlugin.xcodeproj/
- project.pbxproj: Likewise.
- * macosx/plugins/CDDeviceInterface/src/PlugCD.c: Likewise.
- * macosx/plugins/HIDInput/src/PSEmu_Plugin_Defs.h: Removed.
- * macosx/plugins/CDDeviceInterface/src/PSEmu_Plugin_Defs.h: Removed.
- * macosx/PcsxController.m: Don't allow starting game when Preferences dialog
- box is opened. Don't allow opening the Preferences dialog when game is
- running.
-
-November 1, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * macosx/plugins/PeopsSpu109: Removed.
- * macosx/plugins/DFSound: Added project file and necessary platform-dependant
- files for building existing dfsound sources for Mac OS X.
- * plugins/dfsound/stdafx.h: Made necessary changes for Mac OS X build.
- * plugins/dfsound/spu.c: Likewise.
- * plugins/dfsound/xa.c: Likewise.
-
-October 31, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * libpcsxcore/cdriso.c: Declare thread controlling variable as volatile.
- * plugins/dfinput/pad.c: Likewise.
- * macosx/plugins/PeopsSpu109: Added SPU plugin for Mac OS X.
-
-October 30, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * data/pcsx.glade2: Do not allow resizing for dialog boxes.
- * plugins/dfsound/spucfg-0.1df/dfsound.glade2: Likewise.
- * plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2: Likewise.
- * plugins/dfinput/pad.h: Declare several variables as volatile.
- * plugins/dfinput/Makefile.am: Use $(SDL_CONFIG) instead of "sdl-config".
-
-October 29, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * data/pcsx.glade2: Replaced the "Close" button on many dialog boxes to
- "OK/Cancel" buttons.
- * gui/Gtk2Gui.c: Likewise.
- * plugins/dfsound/spucfg-0.1df/dfsound.glade2: Likewise.
- * plugins/dfsound/spucfg-0.1df/main.c: Likewise.
- * plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2: Likewise.
- * plugins/dfxvideo/gpucfg-0.1df/main.c: Likewise.
- * plugins/dfinput/dfinput.glade2: Likewise.
- * plugins/dfinput/cfg-gtk2.c: Likewise.
-
-October 27, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * plugins/dfinput/xkb.c: Use XkbSetDetectableAutoRepeat() instead of
- disabling autorepeat globally.
- * po/zh_CN.po: Updated.
- * plugins/peopsxgl/gpu.c: Allow clicking close button to return to the main
- UI instead of bailing out.
-
-October 26, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * plugins/dfinput/cfg.c: Fixed a bug which caused the settings for analog
- pad not correctly read from the config file.
-
-October 25, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * plugins/dfinput/cfg.c: Replaced dfinput with new SDL/Xkb-based input plugin.
- * plugins/dfinput/analog.c: Likewise.
- * plugins/dfinput/Makefile.in: Likewise.
- * plugins/dfinput/cfg-gtk2.c: Likewise.
- * plugins/dfinput/pad.c: Likewise.
- * plugins/dfinput/sdljoy.c: Likewise.
- * plugins/dfinput/xkb.c: Likewise.
- * plugins/dfinput/dfinput.glade2: Likewise.
- * plugins/dfinput/Makefile.am: Likewise.
- * plugins/dfinput/pad.h: Likewise.
- * plugins/dfinput/padjoy.h: Removed.
- * configure.ac: Check for SDL on configure.
- * debian/control: Added libsdl1.2-dev to Build-Depends.
- * po/pt_BR.po, po/zh_TW.po, po/zh_CN.po, po/pcsx.pot: Updated.
-
-October 24, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * macosx/Pcsx.xcodeproj/project.pbxproj: Fixed Mac OS X build.
- * macosx/plugins: Added CDR and PAD plugins for Mac OS X..
-
-October 9, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * gui/hdebug.c: Removed PCSX-df debugger, which is incompleted and buggy.
- * gui/hdebug.h: Likewise.
- * gui/Makefile.am: Likewise.
- * libpcsxcore/debug.c: Added telnet-based debugger from PCSX CVS. GUI-based
- debugger should be worked on for better usability.
- * libpcsxcore/debug.h: Likewise.
- * libpcsxcore/socket.c: Likewise.
- * libpcsxcore/socket.h: Likewise.
- * libpcsxcore/psxinterpreter.c: Likewise.
- * libpcsxcore/psxmem.c: Likewise.
- * libpcsxcore/r3000a.c: Likewise.
- * libpcsxcore/r3000a.h: Likewise.
- * libpcsxcore/psxcommon.h: Likewise.
- * libpcsxcore/psxcounters.c: Likewise.
- * libpcsxcore/Makefile.am: Likewise.
- * gui/Config.c: Likewise.
- * gui/LnxMain.c: Likewise.
- * gui/Gtk2Gui.c: Likewise.
- * win32/pcsx.rc: Likewise.
- * win32/pcsx.dsp: Likewise.
- * win32/gui/ConfigurePlugins.c: Likewise.
- * win32/gui/WndMain.c: Likewise.
- * win32/pcsx.dev: Likewise.
- * win32/resource.h: Likewise.
-
-October 4, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * plugins/dfxvideo/gpucfg-0.1df/main.c: Fixed: when trying to choose
- resolution for dfxvideo, values>1024x768 doesn't save.
- * plugins/peopsxgl/cfg.c: Minor cleanup.
- * plugins/peopsxgl/gpu.c: Use fork()/execl() instead of system() to launch
- the configuration utility.
- * plugins/dfsound/cfg.c: Likewise.
- * plugins/dfxvideo/cfg.c: Likewise.
- * plugins/dfinput/pad.c: Likewise.
- * plugins/dfcdrom/cdr.c: Likewise.
- * plugins/dfsound/spucfg-0.1df/dfsound.glade2: Display the dialog box at
- the center of the screen. Removed unused About dialog box.
- * plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2: Likewise.
- * plugins/dfsound/spucfg-0.1df/main.c: Minor cleanup.
- * plugins/dfinput/dfinput.glade2: Fixed problem with new version of glade-3.
- * plugins/dfcdrom/cfgCdr.glade: Likewise.
- * libpcsxcore/cdriso.c: Fixed crash bug when the .toc/.cue file contains
- empty lines.
-
-October 3, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * plugins/dfsound/spucfg-0.1df/dfsound.glade2: Removed the "Enable XA" option
- as we already have such an option in the main emu.
- * plugins/dfsound/spucfg-0.1df/main.c: Likewise.
- * plugins/dfsound/cfg.c: Likewise.
- * plugins/dfsound/spu.c: Likewise.
- * plugins/dfsound/externals.h: Likewise.
- * plugins/dfsound/psemu.c: Likewise.
-
-October 1, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * gui/Gtk2Gui.c: Disable the "Graphics/Sound/CD-ROM/Controller" menuitems
- when the emu is already running.
- * data/pcsx.glade2: Merged the "Controller 1" and "Controller 2" menuitems.
-
-September 26, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * data/pcsx.glade2: Re-added the "Graphics/Sound/CD-ROM/Controller" menuitems
- in the configuration menu, which are more self-explanative than a "Plugins
- and BIOS".
- * gui/Gtk2Gui.c: Likewise.
- * po/pcsx.pot, po/zh_CN.po, po/zh_TW.po, po/pt_BR.po: Updated.
- * libpcsxcore/cdriso.c: Implemented MDS parsing. MDF files with interleaved
- subchannel data is now supported.
- * win32/gui/WndMain.c: Moved States submenu from File menu to Emulator menu.
-
-September 24, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * libpcsxcore/cdriso.c: Fixed filenames with spaces when loading .toc file
- (Thanks dario86). Force byteswap if .toc file is loaded as cdrdao uses
- Big-Endian for CD Audio. Fixed skipping of the first 2 seconds when playing
- CDDA Track #2. Check for image.toc if image.toc.bin is loaded.
-
-September 22, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * win32/gui/CheatDlg.c: Always enable the value inputbox when "New Search" is
- clicked.
-
-September 21, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * libpcsxcore/cdrom.c: Reverted the previous change as the CD change problem
- can be fixed in the cdrSapu plugin.
-
-September 20, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * win32/glue/sys/mman.h: Use VirtualAlloc() and VirtualFree() instead of
- malloc() and free().
- * libpcsxcore/ix86/iR3000A.c: Minor cleanup.
- * po/zh_TW.po: Updated.
- * libpcsxcore/cdrom.c: Close & reopen the CDR plugin after switching discs.
-
-September 18, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * win32/gui/CheatDlg.c: Disable "Search Type" combo box if search results
- already exist.
-
-September 16, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * po/pt_BR.po, po/pt_BR.gmo: Added Portuguese (Brazil) translation. Thanks
- to TibÃ©rio VÃtor <tvtoon at gmail dot com>.
- * po/LINGUAS: Added pt_BR.po.
- * po/pcsx.pot: Updated.
- * gui/Cheat.c: Use checkboxes for toggling cheats.
- * data/pcsx.glade2: Likewise.
-
-September 15, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * debian/changelog: Bumped version.
-
-September 12, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * libpcsxcore/cdriso.c: Disregard the synchronization information and header
- data when playing CDDA music.
-
-September 8, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * win32/gui/ConfigurePlugins.c: Select a real BIOS instead of the Internal
- HLE BIOS by default at the first run.
- * gui/Gtk2Gui.c: Likewise.
- * gui/LnxMain.c: Scan BIOSes in certain system-wide directories and place
- symlinks in ~/.pcsx/bios.
- * gui/Makefile.am, gui/Makefile.in: Added PSEMU_DATA_DIR.
- * po/pcsx.pot, po/zh_CN.po, po/zh_TW.po: Updated.
-
-September 7, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * plugins/dfsound/alsa.c: Removed ALSA-specific CDDA stuff, which causes
- problems with some versions of PulseAudio.
- * plugins/dfsound/spu.c: Implemented CDDA support in a more "general" way.
- * plugins/dfsound/xa.c: Likewise.
- * plugins/dfsound/externals.h: Likewise.
- * plugins/dfsound/spu.h: Likewise.
- * plugins/dfsound/xa.h: Likewise.
- * plugins/dfsound/cfg.c: Removed NOTHREADLIB.
- * plugins/dfsound/spu.c: Likewise.
- * plugins/dfsound/stdafx.h: Likewise.
- * libpcsxcore/cdriso.c: Reverted to the method which feeds the CDDA data to
- the SPU plugin at an interval instead of continuously, otherwise it's still
- broken with spuEternal in SPUasync mode.
-
-September 6, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * plugins/dfsound/spu.c: Fixed frequency modulation emulation. Handle IRQs
- in the decoded sound buffer areas. (sync'ed from the P.E.Op.S SPU 1.09)
- * plugins/dfsound/dma.c: Likewise.
- * plugins/dfsound/registers.c: Likewise.
- * plugins/dfsound/xa.c: Likewise.
- * plugins/dfsound/externals.h: Likewise.
-
-September 5, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * libpcsxcore/cdriso.c: Don't feed CDDA data to the SPU plugin when CDDA
- is muted, which fixes the "noise" in Final Fantasy 8. Also check for
- image.bin.toc in addition to image.toc.
- * plugins/dfsound/alsa.c: Added support for CDDA volume.
-
-September 4, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * libpcsxcore/cdriso.c: Don't delay before feeding CDDA data to the SPU
- plugin.
- * plugins/dfsound/alsa.c: Don't try initializing CDDA sound handle over
- and over and over again if failed.
-
-September 3, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * libpcsxcore/cdriso.c: Fixed time overflow on 32-bit GNU/Linux system.
-
-September 1, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * libpcsxcore/cdrom.c: Added the definations of some missing commands.
-
-August 30, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * libpcsxcore/cdriso.c: Implemented CDDA playing via SPUplayCDDAchannel().
- Now CD tracks can be played directly via a SPU plugin which implements the
- SPUplayCDDAchannel() function, e.g., spuEternal.
- * libpcsxcore/cdriso.h: Removed unused prototypes.
- * doc/tweaks.txt: Removed obsolete information.
- * win32/pcsx.dsp: Use Multithreaded instead of Singlethreaded.
- * plugins/dfsound/alsa.c: Set the buffer_time and period_time manually,
- hopefully the "lagging" issue can be fixed. Implemented
- SPUplayCDDAchannel() in the ALSA driver.
-
-August 29, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * plugins/dfcdrom/cdr.c: Don't restart the track if play was called with
- the same time as the previous call.
- * libpcsxcore/cdriso.c: Added playCDDA() and stopCDDA() functions. (still
- not implemented)
-
-August 27, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * libpcsxcore/plugins.h: Added prototype and interface for
- SPUplayCDDAchannel().
- * libpcsxcore/plugins.c: Likewise.
-
-August 26, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * win32/pcsx.rc: Completed the Cheat Search dialog.
- * win32/resource.h: Likewise.
- * win32/gui/CheatDlg.c: Implemented the Cheat Search dialog. Fixed MinGW
- compilation issue.
- * win32/gui/pcsx.dev: Fixed Dev-C++ build.
- * win32/WndMain.c: Moved Language menu into the Config menu.
- * gui/Cheat.c: Clamp values when editing value in Cheat Search dialog.
- * doc/tweaks.txt: Added instructions to allow CD-DA playing when using
- image files (as suggested by dario86).
-
-August 24, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * win32/gui/WndMain.c: Set the language to the OS language by default.
- * win32/gui/ConfigurePlugins.c: Made some strings translatable.
- * win32/gui/CheatDlg.c: Fixed incorrect usage of SysMessage().
- * win32/pcsx.rc, win32/resource.h: Fixed manifest.
-
-August 23, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * data/pcsx.glade2: Added "..." in menu items which will popup a dialog.
- * po/pcsx.pot, po/zh_CN.po, po/zh_TW.po: Updated.
-
-August 22, 2009 dario86
-
- * libpcsxcore/cdrom.c: Demute the CD-DA by default, which fixes the music
- problem with Tekken 1.
-
-August 22, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * libpcsxcore/misc.c: Also check for PSX.EXE in CheckCdrom(). Added support
- for CPE binaries. Returns -1 in Load() if EXE is not found. Print the
- EXE loading error messages in console instead of a message box.
- * gui/Gtk2Gui.c: Show files with .cpe extension in the Load EXE dialog box.
- * debian/rules: Removed dh_desktop.
-
-August 17, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * plugins/peopsxgl/gpu.c: Made the name of the plugin translatable.
- * plugins/dfsound/spu.c: Likewise.
- * plugins/dfxvideo/gpu.c: Likewise.
- * plugins/dfinput/pad.c: Likewise.
- * plugins/dfcdrom/cdr.c: Likewise.
- * plugins/dfcdrom/interface.c: #include locale.h.
- * po/update-pot.sh: Also check plugins' source files.
- * plugins/dfxvideo/Makefile.am: Removed VERSION and NUMBER defination.
- * po/zh_CN.po, po/zh_TW.po, po/pcsx.pot: Updated.
-
-August 9, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * win32/cdrom02.ico: Reworked the icon.
- * win32/pcsx.rc: Added cheat-related dialogs.
- * win32/resource.h: Likewise.
- * win32/gui/CheatDlg.c: Added, implemented Cheat Dialog.
- * win32/pcsx.dsp: Added CheatDlg.c.
- * win32/pcsx.dev: Likewise.
- * win32/gui/plugin.c: Use lowercase for #include's.
- * win32/gui/AboutDlg.c: Likewise.
- * win32/gui/ConfigurePlugins.c: Likewise.
- * win32/gui/Win32.h: Added prototype from CheatDlg.c.
- * win32/gui/WndMain.c: Added Cheat functions to the menu.
- * win32/glue/stdint.h: Added a "no warranty" disclaimer.
- * win32/glue/sys/mman.h: Likewise.
-
-August 5, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * plugins/dfxvideo/prim.c: Reverted the previous change, which is wrong.
-
-July 27, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * plugins/dfxvideo/prim.c: Clamp the offsets before performing
- blkfill.
-
-July 24, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * libpcsxcore/cdriso.c: Implemented CCD parsing.
- * libpcsxcore/cheat.c: Optimized Cheat Applying a bit.
-
-July 15, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * libpcsxcore/psxbios.c: Allocate more stack spaces to fix crash at FF7
- minigames.
- * libpcsxcore/cdriso.c: Implemented CUE parsing.
-
-July 7, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * libpcsxcore/psxbios.c: Use u32 instead of native pointer for
- DIRENTRY::next. It's a pointer in PSX subsystem and not in native system.
-
-July 4, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * debian/control: Added libasound2-dev to Build-Depends.
- * libpcsxcore/plugins.h: Fixed SubQ struct.
- * plugins/dfcdrom/cdr.c: Likewise.
- * libpcsxcore/cdriso.c: Implemented subchannel reading from CloneCD
- .sub file.
-
-July 1, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * libpcsxcore/psxbios.c: Use s32 instead of long in DIRENTRY struct for
- compatibility with x86_64. Fixed error in MSVC6.
-
-June 30, 2009 Peter Collingbourne <peter@pcc.me.uk>
-
- * libpcsxcore/psxbios.c: Implemented psxBios_rename(). Interpret a file
- path of the form buX0: as buX0:* in firstfile() and nextfile(). Ensure
- that memory card data is saved when deleting a file. Advance the file
- offset when a write or synchronous read occurs.
-
-June 30, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * plugins/peopsxgl/gpu.c: Changed a format string from %08lx to %08x.
-
-June 30, 2009 Peter Collingbourne <peter@pcc.me.uk>
-
- * plugins/dfcdrom/main.c: #include locale.h as well as libintl.h to allow
- the code to compile in unoptimized mode.
- * plugins/dfinput/cfg.c: Likewise.
- * plugins/dfsound/spucfg-0.1df/main.c: Likewise.
- * plugins/dfxvideo/gpucfg-0.1df/main.c: Likewise.
- * plugins/peopsxgl/gpucfg/main.c: Likewise.
- * plugins/peopsxgl/gpucfg/interface.c: Likewise.
- * libpcsxcore/psxbios.c: Fixed a cast that may cause problems on x86_64.
- Allocate stack space for programs which store data below the stack pointer
- when an interrupt occurs.
-
-June 29, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * libpcsxcore/cheat.c: Implemented Cheat Search.
- * libpcsxcore/cheat.h: Likewise.
- * gui/Cheat.c: Likewise.
- * gui/Gtk2Gui.c: Backup the memory for cheat search when continuing emulation.
- * data/pcsx.glade2: Tweaked the cheat search dialog for implemention. Fixed
- the main menu under newer version of Glade.
- * libpcsxcore/r3000a.c: Free cheat search results on exit.
- * libpcsxcore/psxmem.h: Fixed a typo in psxMu8(). Removed check for __sh__
- macro.
- * win32/gui/WndMain.c: Restarting is no longer needed at first run.
- * po/zh_CN.po, po/zh_TW.po: Updated.
-
-June 20, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * libpcsxcore/misc.c: Fixed a bug which prevented files in a subdirectory
- from being located correctly in GetCdromFile().
-
-June 19, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * gui/Gtk2Gui.c: Also allow extensions with capital letters in the open
- file dialog.
- * plugins/dfsound/alsa.c: Don't include alsa.h, which is useless. Don't
- set the buffer time and period time manually.
- * plugins/dfsound/alsa.h: Deleted.
- * plugins/dfsound/oss.c: Moved the definations from oss.h to oss.c.
- * plugins/dfsound/oss.h: Deleted.
- * debian/rules: Added --enable-alsa to configure parameters.
-
-June 18, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * plugins/peopsxgl/soft.c: Fixed crash with full-software (FVP) enabled
- on x86_64.
- * macosx/main.m: Removed LoadCdBios.
-
-June 16, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * plugins/dfOpenGL: Removed experimental dfOpenGL plugin.
- * configure.ac: OpenGL plugin is only built with --enable-opengl.
- * Makefile.am: Likewise.
- * debian/rules: Added --enable-opengl to configure parameters.
- * plugins/peopsxgl/draw.c: Don't enable OpenGL Extension by default, which
- may be unsupported or slow with some old cards.
- * plugins/peopsxgl/gpucfg/main.c: Likewise.
-
-June 11, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * macosx/English.lproj/PCSX.nib/objects.nib: Added "Run ISO" function.
- * macosx/English.lproj/PCSX.nib/info.nib: Likewise.
- * macosx/English.lproj/PCSX.nib/classes.nib: Likewise.
- * macosx/PcsxController.h: Likewise.
- * macosx/PcsxController.m: Likewise.
-
-June 10, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * libpcsxcore/plugins.c: Don't add "_" to function name for Mac OS X.
- * macosx/Info.plist: Modified software information.
- * macosx/English.lproj/InfoPlist.strings: Likewise.
- * macosx/Pcsx.xcodeproj/project.pbxproj: Tweaked parameter.
- * macosx/English.lproj/PCSX.nib/objects.nib: Removed Edit menu.
- * macosx/English.lproj/PCSX.nib/info.nib: Likewise.
-
-June 9, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * macosx/*: Added preliminary Mac OS X port. Code copied from PCSX Mac
- Project (Still not working).
-
-June 4, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * po/zh_CN.po, po/zh_TW.po: Don't use UTF-8.
- * debian/changelog: Bumped version.
-
-June 2, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * plugins/peopsxgl/interface.c: Tweaked UI.
-
-June 1, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * plugins/peopsxgl/Makefile.am: Added config utility.
- * plugins/peopsxgl/gpucfg/callbacks.c: Added.
- * plugins/peopsxgl/gpucfg/callbacks.h: Added.
- * plugins/peopsxgl/gpucfg/interface.c: Added.
- * plugins/peopsxgl/gpucfg/interface.h: Added.
- * plugins/peopsxgl/gpucfg/main.c: Added.
- * plugins/peopsxgl/gpucfg/support.c: Added.
- * plugins/peopsxgl/gpucfg/support.h: Added.
- * plugins/peopsxgl/cfg.c: Reverted the filename of config file.
- * plugins/dfcdrom/interface.c: Supported translation.
- * po/pcsx.pot, po/zh_CN.po, po/zh_TW.po: Updated.
-
-May 31, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * gui/Config.c, plugins/dfxvideo/cfg.c: Fixed invalid memory access.
- * debian/control: Added libxxf86vm-dev to Build-Depend.
- * plugins/dfOpenGL/cfg.c: Don't use sprintf().
-
-May 30, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * plugins/peopsxgl/draw.c: Modified for compatiability with x86_64.
- * plugins/peopsxgl/draw.h: Likewise.
- * plugins/peopsxgl/externals.h: Likewise.
- * plugins/peopsxgl/fps.c: Likewise.
- * plugins/peopsxgl/fps.h: Likewise.
- * plugins/peopsxgl/gpu.c: Likewise.
- * plugins/peopsxgl/key.c: Likewise.
- * plugins/peopsxgl/menu.c: Likewise.
- * plugins/peopsxgl/prim.c: Likewise.
- * plugins/peopsxgl/prim.h: Likewise.
- * plugins/peopsxgl/soft.c: Likewise.
- * plugins/peopsxgl/soft.h: Likewise.
- * plugins/peopsxgl/texture.c: Likewise.
- * plugins/peopsxgl/texture.h: Likewise.
-
-Apr 26, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * plugins/peopsxgl/cfg.c: Integrated P.E.Op.S OpenGL GPU into the build tree.
- Cleaned up the sources, removed Windows-specific stuff.
- * plugins/peopsxgl/cfg.h: Likewise.
- * plugins/peopsxgl/draw.c: Likewise.
- * plugins/peopsxgl/draw.h: Likewise.
- * plugins/peopsxgl/externals.h: Likewise.
- * plugins/peopsxgl/fps.c: Likewise.
- * plugins/peopsxgl/fps.h: Likewise.
- * plugins/peopsxgl/gl_ext.h: Likewise.
- * plugins/peopsxgl/gpu.c: Likewise.
- * plugins/peopsxgl/gpu.h: Likewise.
- * plugins/peopsxgl/key.c: Likewise.
- * plugins/peopsxgl/key.h: Likewise.
- * plugins/peopsxgl/menu.c: Likewise.
- * plugins/peopsxgl/menu.h: Likewise.
- * plugins/peopsxgl/prim.c: Likewise.
- * plugins/peopsxgl/prim.h: Likewise.
- * plugins/peopsxgl/soft.c: Likewise.
- * plugins/peopsxgl/soft.h: Likewise.
- * plugins/peopsxgl/stdafx.h: Likewise.
- * plugins/peopsxgl/texture.c: Likewise.
- * plugins/peopsxgl/texture.h: Likewise.
- * plugins/peopsxgl/zn.c: Likewise.
- * plugins/peopsxgl/Makefile.am: Likewise.
- * plugins/dfOpenGL/GPU.c: Changed the name of the plugin into "PCSX-df OpenGL
- Driver" to avoid confusion.
-
-Apr 23, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * gui/LnxMain.c: use BIOS_DIR instead of "/.pcsx/bios/". Always set the
- default memcard when config file does not exist.
-
-Mar 25, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * data/pcsx.glade2: Reorganized the menu a bit. Added Cheat Search
- dialog.
-
-Mar 22, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * plugins/dfxvideo/gpu.c: Capture screenshots correctly in RGB24
- mode.
-
-Mar 11, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * gui/Gtk2Gui.c, win32/gui/WndMain.c: Don't call CheckCdrom() and
- LoadCdrom() when switching ISO.
-
-Mar 6, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * data/pcsx.glade2: Reorganized menu.
- * po/zh_CN.po, po/zh_TW.po, po/pcsx.pot: Updated.
-
-Mar 2, 2009 Wei Mingzhi <weimingzhi@gmail.com>
-
- * gui/Gtk2Gui.c: Remember last used directory in the Open Image dialog.
-
-Feb 27, 2009 Wei Mingzhi <whistler@openoffice.org>
-
- * libpcsxcore/plugins.c, win32/gui/WndMain.c, gui/Plugin.c: Moved
- cdOpenCase to libpcsxcore.
- * data/pcsx.glade2, gui/Gtk2Gui.c: Added "Switch ISO" function.
- * win32/gui/WndMain.c, win32/resource.h: Likewise.
- * libpcsxcore/mdec.c: Don't use precalculated table in ROUND(), which
- may cause crashes due to subscript out of the bound in some cases.
- * libpcsxcore/psxinterpreter.c: Silenced GCC warnings.
-
-Feb 20, 2009 Wei Mingzhi <whistler@openoffice.org>
-
- * configure.ac, Makefile.am: dfOpenGL is now only built when specified
- with --enable-dfopengl during configure.
-
-Feb 19, 2009 Wei Mingzhi <whistler@openoffice.org>
-
- * configure.ac: Allow changing plugins install directory with --libdir.
- * plugins/dfinput/Makefile.am: Likewise.
- * plugins/dfcdrom/Makefile.am: Likewise.
- * plugins/dfxvideo/Makefile.am: Likewise.
- * plugins/dfsound/Makefile.am: Likewise.
- * plugins/dfOpenGL/Makefile.am: Likewise.
- * gui/Cheat.c, libpcsxcore/cheat.c: Moved platform-indepandent stuff
- to libpcsxcore. Use dynamic memory allocation.
- * libpcsxcore/cheat.h: Added.
- * libpcsxcore/r3000a.c: Free all cheats on shutdown.
- * gui/LnxMain.c, libpcsxcore/psxcounters.c: Moved cheat applying to
- psxcounters.c from SysUpdate().
-
-Feb 13, 2009 Wei Mingzhi <whistler@openoffice.org>
-
- * plugins/dfOpenGL/gpu_i.h: include stdint.h.
- * plugins/dfOpenGL/cfg.c: Use frame limit by default.
- * libpcsxcore/ix86/iR3000A.c: Don't execute x86Init(), which causes crash
- in certain computers.
-
-Feb 12, 2009 Wei Mingzhi <whistler@openoffice.org>
-
- * gui/Cheat.c, data/pcsx.glade2: Implemented the Cheat List dialog.
- * data/pcsx.glade2: Tweaked the About Dialog.
- * plugins/dfsound/cfg.c: The Volume value in config file should now be
- handled correctly as 0 (lowest) to 3 (loudest).
-
-Feb 11, 2009 Wei Mingzhi <whistler@openoffice.org>
-
- * gui/Cheat.c, gui/Cheat.h: Added cheat support.
- * gui/Plugin.c: Apply cheats in SysUpdate().
-
-Feb 10, 2009 Wei Mingzhi <whistler@openoffice.org>
-
- * gui/Config.c, gui/LnxMain.c: Moved the dotdir creation routine into
- LnxMain.c. Check the directories and symlinks to plugins each time
- the program starts.
- * gui/Gtk2Gui.c, gui/LnxMain.c, gui/Plugin.c: Load the plugins at
- emulation start instead of program start.
-
-Feb 9, 2009 Wei Mingzhi <whistler@openoffice.org>
-
- * libpcsxcore/psxmem.c: Define MAP_ANONYMOUS into MAP_ANON if it's not
- defined.
- * libpcsxcore/ix86/iR3000A.c: Likewise.
- * libpcsxcore/ix86_64/iR3000A-64.c: Likewise.
- * libpcsxcore/ppc/pR3000A.c: Likewise.
- * pixmaps/pcsx-icon.png: Replaced the icon with a better one from PCSX
- Mac OS X Port project.
- * win32/gui/cdrom02.ico: Likewise.
- * configure.ac: Only enable NASM in GNU/Linux.
- * plugins/dfOpenGL/Makefile.am: Added /usr/X11R6 search path.
- * plugins/dfxvideo/Makefile.am: Likewise.
- * plugins/dfinput/Makefile.am: Likewise.
- * plugins/dfinput/pad.c: Only enable joystick support in GNU/Linux.
- * plugins/dfinput/cfg.c: Likewise.
- * configure.ac: Add detection for sys/soundcard.h.
- * plugins/dfsound/Makefile.am: Use NULL sound input if sys/soundcard.h
- cannot be found.
- * plugins/dfsound/nullsnd.c: Added.
- * plugins/dfsound/spuPeopsSound.c: Removed unused files.
- * plugins/dfsound/spuPeopsSound.def: Likewise.
- * plugins/dfsound/stdafx.c: Likewise.
-
-Feb 8, 2009 Wei Mingzhi <whistler@openoffice.org>
-
- * data/pcsx.glade2, gui/Gtk2Gui.c: Changed "btn_ConfAbout" to
- "btn_AboutNet" in the netplay config dialog.
-
-Feb 7, 2009 Wei Mingzhi <whistler@openoffice.org>
-
- * plugins/dfinput/cfg.c, plugins/dfinput/pad.c: Use Keyboard instead of
- Joystick by default when no config file exists.
- * plugins/dfinput/cfg.c: Update the UI when user switches the current pad.
- Removed the useless "Device File" label.
- * plugins/dfcdrom/interface.c: Fixed the behavior when closing the dfcdrom
- config dialog box directly.
- * gui/Gtk2Gui.c: Don't enable the "Use Debugger" checkbox when interpreter
- core is not selected in CPU Config dialog box. Always enable the "Use
- Interpreter CPU" when dynarec is not enabled during compilation.
- * configure.ac: --disable-dynarec can now correctly disable the compilation
- of dynamic recompiler core.
- * plugins/dfxvideo/gpucfg-0.1df/main.c: Disable the checkboxes for game
- fixes initially if the "Enable Special Game Fixes" is not checked.
-
-Feb 6, 2009 Wei Mingzhi <whistler@openoffice.org>
-
- * data/pcsx.glade2, gui/Gtk2Gui.c: Enable the GtkFileChooserButton in
- memcard config dialog only when ready.
- * win32/pcsx.dsp, win32/pcsx.dev: Added cdriso.c, cdriso.h.
- * win32/gui/WndMain.c, win32/gui/Win32.h, win32/gui/plugin.c,
- win32/resource.h: Make use of the internal image reader.
- * libpcsxcore/cdriso.c: Cast the return value of ISOgetBuffer into
- unsigned char * instead of char *.
- * plugins/dfinput/pad.c: Removed usage of pcsx_style.
- * plugins/dfinput/cfg.c, plugins/dfinput/dfinput.glade2: Likewise.
-
-Feb 5, 2009 Wei Mingzhi <whistler@openoffice.org>
-
- * libpcsxcore/plugins.h, win32/gui/plugin.h: Moved definations of GPUopen,
- SPUopen, PADopen and NETopen to libpcsxcore.
- * libpcsxcore/plugins.c: Check for each type of plugins in ReleasePlugins().
- * gui/Plugin.h: Removed useless file.
- * libpcsxcore/cdriso.c, libpcsxcore/cdriso.h: Added internal image reader.
- * libpcsxcore/plugins.c, gui/Gtk2Gui.c, gui/LnxMain.c: Make use of the
- internal image reader.
- * data/pcsx.glade2: Added "Run ISO" menu item.
- * libpcsxcore/plugins.c: Initialize handles to plugins with NULL.
- * plugins/dfiso, plugins/dfbinimage: Removed.
- * plugins/dfxvideo/gpucfg-0.1df/callbacks.c: Removed unused files.
- * plugins/dfxvideo/gpucfg-0.1df/callbacks.h: Likewise.
- * plugins/dfxvideo/gpucfg-0.1df/interface.c: Likewise.
- * plugins/dfxvideo/gpucfg-0.1df/interface.h: Likewise.
- * plugins/dfxvideo/gpucfg-0.1df/support.c: Likewise.
- * plugins/dfxvideo/gpucfg-0.1df/support.h: Likewise.
- * plugins/dfxvideo/gpucfg-0.1df/HACKING: Likewise.
- * plugins/dfxvideo/gpucfg-0.1df/gpucfg.gladep: Likewise.
- * plugins/dfxvideo/callbacks.c: Likewise.
- * plugins/dfxvideo/callbacks.h: Likewise.
- * plugins/dfxvideo/interface.c: Likewise.
- * plugins/dfxvideo/interface.h: Likewise.
- * plugins/dfxvideo/support.c: Likewise.
- * plugins/dfxvideo/support.h: Likewise.
- * plugins/dfxvideo/gpucfg-0.1df/main.c: Removed support.h, interface.h.
- * plugins/dfsound/cfg.c: Removed Windows-specific code.
- * plugins/dfsound/spu.c: Likewise.
- * plugins/dfsound/stdafx.c: Likewise.
- * plugins/dfsound/alsa.c: Likewise.
- * plugins/dfsound/oss.c: Likewise.
- * plugins/dfsound/cfg.h: Likewise.
- * plugins/dfsound/externals.h: Likewise.
- * plugins/dfsound/freeze.c: Likewise.
- * plugins/dfsound/debug.c: Removed unused files.
- * plugins/dfsound/debug.h: Likewise.
- * plugins/dfsound/resource.h: Likewise.
- * plugins/dfsound/record.c: Likewise.
- * plugins/dfsound/record.h: Likewise.
- * gui/LnxMain.c: Fixed EXE loading in command line.
- * plugins/dfsound/spucfg-0.1df/main.c: Added default values.
-
-Feb 4, 2009 Wei Mingzhi <whistler@openoffice.org>
-
- * gui/Makefile.am, libpcsxcore/Makefile.am: Now libpcsxcore is always
- statically linked.
- * INSTALL: Updated.
- * gui/Gtk2Gui.c, gui/LnxMain.c: Moved ScanPlugins() and
- check_symlink_in_path() to LnxMain.c.
- * win32/gui/WndMain.c: Tweaked GUI behaviors.
- * win32/gui/WndMain.c: Fixed Save/Load state.
-
-Feb 3, 2009 Wei Mingzhi <whistler@openoffice.org>
-
- * gui/Gtk2Gui.c, gui/Linux.h, gui/LnxMain.c: Tweaked some of the behaviors
- of GUI.
- * gui/Gtk2Gui.c: Removed some unnecessary debug messages.
-
-Feb 2, 2009 Wei Mingzhi <whistler@openoffice.org>
-
- * plugins/dfsound/spucfg-0.1df/interface.c: Removed unused files.
- * plugins/dfsound/spucfg-0.1df/interface.h: Likewise.
- * plugins/dfsound/spucfg-0.1df/support.c: Likewise.
- * plugins/dfsound/spucfg-0.1df/support.h: Likewise.
- * plugins/dfsound/spucfg-0.1df/callbacks.h: Likewise.
- * plugins/dfsound/spucfg-0.1df/callbacks.h: Likewise.
- * plugins/dfsound/spucfg-0.1df/Makefile: Likewise.
- * plugins/dfsound/spucfg-0.1df/HACKING: Likewise.
- * plugins/dfsound/spucfg-0.1df/spucfg2.gladep: Likewise.
- * plugins/dfinput/Makefile.noautoconf: Likewise.
- * plugins/dfcdrom/PSEmu Plugin Defs.h: Removed duplicate files.
- * plugins/dfcdrom/Makefile.am: Added -I../../libpcsxcore.
- * plugins/dfcdrom/cdr.h: Changed "PSEmu Plugin Defs.h" into
- "psemu_plugin_defs.h". Added #include <stdint.h>.
- * gui/Makefile.am: Added DEF_PLUGIN_DIR defination.
- * gui/LnxMain.c, gui/Gtk2Gui.c: Also scan for plugins in DEF_PLUGIN_DIR,
- so that the program can be installed to any path.
- * libpcsxcore/psxmem.c, libpcsxcore/plugins.c: Don't use GLIB in libpcsxcore.
- * win32/glue/glib.h: Removed.
- * win32/pcsx.dsp, win32/pcsx.dev: Removed glib.h.
- * win32/plugin.c, win32/WndMain.c: Unified the save state naming convention
- with the GTK port.
- * win32/WndMain.c: Fixed OpenFile Dialog usage.
- * data/pcsx.glade2: Changed hotkey for save state into Ctrl+1~5, as Shift
- key is not working. Changed hotkey for Load Other/Save Other into Alt+0
- and Ctrl+0.
- * doc/tweaks.txt, doc/keys.txt: Updated.
- * debian/docs: Added ChangeLog.df file.
- * debian/control: This package should be in otherosfs section according
- to Debian policy.
- * gui/Gtk2Gui.c: Disable state save/load in menu if no CD is loaded.
-
-Feb 1, 2009 Wei Mingzhi <whistler@openoffice.org>
-
- * win32/gui/WndMain.c: Don't paint the logo when the emu is running.
- * win32/intl/intlconfig.h: Silented MSVC2005 warnings.
- * Applied x86_64 patch by Dylan Simon (not tested).
-
-Jan 31, 2009 Wei Mingzhi <whistler@openoffice.org>
-
- * po/pcsx.pot: Regenerated.
- * po/zh_CN.po, po/zh_TW.po: Updated.
- * win32/pcsx.dev: Added Dev-C++ project file.
- * win32/pcsx.rc: Adjusted some dialog boxes.
- * Updated FSF's snail address in source files.
- * data/pcsx.glade2: Fixed shortcut keys for "Save State" menu items.
-
-Jan 30, 2009 Wei Mingzhi <whistler@openoffice.org>
-
- * First alpha release of PCSX Reloaded.
- - Backported to Windows.
- - PCSX-df XVideo Plugin: Don't allow screen saver in fullscreen mode.
- - PCSX-df XVideo Plugin: Don't show the GNOME panels in fullscreen mode.
- - Minor bugfixes for UI.
- - Fixed a bug which caused crash in FF8 Final Boss Fight.
- - GCC 4.3 support.
+1.9.92
+- Many fixes/changes to the core and Internal HLE BIOS.
+- Root counters code has been rewritten.
+- Use GTE code from PCSX-Revolution Project which improved accuracy.
+- Added netplay plugin for *NIX (based on netSock).
+- Native support for FreeBSD and Solaris.
+- Replaced HIDInput and CDDeviceInterface plugins with dfinput/dfcdrom for Mac OS X.
+- PPF patching support.
+- Other minor bugfixes/tweaks.
+
+1.9.91
+- Fixed FF7 Chocobo Racing crash bug with Internal HLE BIOS.
+- Fixed freeze issue with Japanese version of I.Q. Final.
+- Fixed memory card issue with Final Fantasy 6.
+- Better support for Alcohol 120% .mdf/.mds images.
+- Input plugin has been rewritten using SDL for GNU/Linux port.
+- Prelimiary Mac OS X (Intel) support (may contain bugs and dynarec is still not working yet).
+- Hide the GNOME panels in fullscreen mode when using the OpenGL plugin.
+- GTK UI: Added a toolbar in mainwindow, improved Memory Card dialog box.
+- Added Telnet-based debugger (based on PCSX CVS). Removed PCSX-df debugger.
+- Added Portuguese (Brazilian) translation (courtesy of Tib¨¦rio V¨ªtor).
+- Other minor bugfixes/tweaks.
+
+1.9.83
+- Added support for CDDA sound when running a CD image.
+- Added cheat code support for the Windows port.
+- Incorporated various fixes from P.E.Op.S SPU 1.0.9 into dfsound.
+- Various psxbios/core fixes. Final Fantasy 7 no longer crashes with Internal HLE BIOS (Thanks pcc).
+- Minor bugfixes/tweaks.
+
+1.9.82
+- Added ability to run CD images directly.
+- Added ability to switch CD images.
+- GNU/Linux port: Integrated P.E.Op.S OpenGL Driver into the build tree. Ported the configuration utility to GTK2.
+- GNU/Linux port: Added Cheat Code manager (Cheat Search is still not implemented).
+- GNU/Linux port: Improved compatibility with x86_64 systems.
+- GNU/Linux port: Supported translation of plugin configuration utilities.
+- Tweaked UI.
+- Bugfixes.
+
+1.9.81
+- Backported to Windows.
+- PCSX-df XVideo Plugin: Don't allow screen saver in fullscreen mode.
+- PCSX-df XVideo Plugin: Don't show the GNOME panels in fullscreen mode.
+- Minor bugfixes for UI.
+- Fixed a bug which caused crash in FF8 Final Boss Fight.
+
+From PCSX-df 1.9 (ChangeLog.df)

pcsxr-1.9.92.tar.bz2/INSTALL -> pcsxr-1.9.93.tar.bz2/INSTALL Changed

@@ -2,10 +2,12 @@
 *************************
 
 Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008 Free Software Foundation, Inc.
+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
-   This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+   Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
 
 Basic Installation
 ==================
@@ -13,7 +15,11 @@
    Briefly, the shell commands `./configure; make; make install' should
 configure, build, and install this package.  The following
 more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
+instructions specific to this package.  Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below.  The lack of an optional feature in a given package is not
+necessarily a bug.  More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
 
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@@ -42,7 +48,7 @@
 you want to change it or regenerate `configure' using a newer version
 of `autoconf'.
 
-The simplest way to compile this package is:
+   The simplest way to compile this package is:
 
   1. `cd' to the directory containing the package's source code and type
      `./configure' to configure the package for your system.
@@ -53,12 +59,22 @@
   2. Type `make' to compile the package.
 
   3. Optionally, type `make check' to run any self-tests that come with
-     the package.
+     the package, generally using the just-built uninstalled binaries.
 
   4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
+     documentation.  When installing into a prefix owned by root, it is
+     recommended that the package be configured and built as a regular
+     user, and only the `make install' phase executed with root
+     privileges.
+
+  5. Optionally, type `make installcheck' to repeat any self-tests, but
+     this time using the binaries in their final installed location.
+     This target does not install anything.  Running this target as a
+     regular user, particularly if the prior `make install' required
+     root privileges, verifies that the installation completed
+     correctly.
+
+  6. You can remove the program binaries and object files from the
      source code directory by typing `make clean'.  To also remove the
      files that `configure' created (so you can compile the package for
      a different kind of computer), type `make distclean'.  There is
@@ -67,8 +83,15 @@
      all sorts of other programs in order to regenerate files that came
      with the distribution.
 
-  6. Often, you can also type `make uninstall' to remove the installed
-     files again.
+  7. Often, you can also type `make uninstall' to remove the installed
+     files again.  In practice, not all packages have tested that
+     uninstallation works correctly, even though it is required by the
+     GNU Coding Standards.
+
+  8. Some packages, particularly those that use Automake, provide `make
+     distcheck', which can by used by developers to test that all other
+     targets like `make install' and `make uninstall' work correctly.
+     This target is generally not run by end users.
 
 Compilers and Options
 =====================
@@ -93,7 +116,8 @@
 own directory.  To do this, you can use GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
+source code in the directory that `configure' is in and in `..'.  This
+is known as a "VPATH" build.
 
    With a non-GNU `make', it is safer to compile the package for one
 architecture at a time in the source code directory.  After you have
@@ -120,7 +144,8 @@
    By default, `make install' installs the package's commands under
 `/usr/local/bin', include files under `/usr/local/include', etc.  You
 can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
@@ -131,15 +156,46 @@
    In addition, if you use an unusual directory layout you can give
 options like `--bindir=DIR' to specify different values for particular
 kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
+you can set and what kinds of files go in them.  In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+   The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+   The first method involves providing an override variable for each
+affected directory.  For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'.  Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated.  The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+   The second method involves providing the `DESTDIR' variable.  For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names.  The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters.  On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
 
    If the package supports it, you can cause programs to be installed
 with an extra prefix or suffix on their names by giving `configure' the
 option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
 
-Optional Features
-=================
-
    Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
@@ -152,6 +208,13 @@
 you can use the `configure' options `--x-includes=DIR' and
 `--x-libraries=DIR' to specify their locations.
 
+   Some packages offer the ability to configure how verbose the
+execution of `make' will be.  For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
 Particular systems
 ==================
 
@@ -159,7 +222,7 @@
 CC is not installed, it is recommended to use the following options in
 order to use an ANSI C compiler:
 
-     ./configure CC="cc -Ae"
+     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
@@ -174,6 +237,16 @@
 
      ./configure CC="cc -nodtk"
 
+   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+   On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'.  It is recommended to use the following options:
+
+     ./configure --prefix=/boot/common
+
 Specifying the System Type
 ==========================
 
@@ -189,7 +262,8 @@
 
 where SYSTEM can have one of these forms:
 
-     OS KERNEL-OS
+     OS
+     KERNEL-OS
 
    See the file `config.sub' for the possible values of each field.  If
 `config.sub' isn't included in this package, then this package doesn't
@@ -277,7 +351,7 @@
      `configure' can determine that directory automatically.
 
 `--prefix=DIR'
-     Use DIR as the installation prefix.  *Note Installation Names::
+     Use DIR as the installation prefix.  *note Installation Names::
      for more details, including other options available for fine-tuning
      the installation locations.

pcsxr-1.9.92.tar.bz2/Makefile.am -> pcsxr-1.9.93.tar.bz2/Makefile.am Changed

pcsxr-1.9.92.tar.bz2/NEWS -> pcsxr-1.9.93.tar.bz2/NEWS Changed

pcsxr-1.9.92.tar.bz2/configure.ac -> pcsxr-1.9.93.tar.bz2/configure.ac Changed

@@ -1,53 +1,64 @@
-AC_INIT(pcsx, 1.9)
+AC_INIT([pcsxr], [1.9.93])
 
 AC_CANONICAL_HOST
-AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(pcsx, 1.9)
+AC_CANONICAL_BUILD
+AM_INIT_AUTOMAKE(foreign)
 AM_MAINTAINER_MODE
 
 AC_CONFIG_HEADERS([include/config.h:include/config.h.in])
 
 AC_PROG_CC
-AC_PROG_RANLIB
-AC_DISABLE_STATIC
-AC_PROG_LIBTOOL
+AM_PROG_CC_C_O
 AC_PROG_INSTALL
 AC_STDC_HEADERS
 AM_PROG_AS
 
-AM_GNU_GETTEXT([external])
+LT_PREREQ([2.2.6])
+LT_INIT([disable-static])
 
-GETTEXT_PACKAGE=pcsx
+AM_GLIB_GNU_GETTEXT
+IT_PROG_INTLTOOL([0.35.0])
+
+GETTEXT_PACKAGE=pcsxr
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["${GETTEXT_PACKAGE}"], [gettext domain])
 
-PKG_CHECK_MODULES(GLIB2, glib-2.0, [], AC_MSG_ERROR([*** glib2 not found!]))
-PKG_CHECK_MODULES(GTK2, gtk+-2.0, [], AC_MSG_ERROR([*** libgtk2 not found!]))
-PKG_CHECK_MODULES(GLADE2, libglade-2.0, [], AC_MSG_ERROR([*** libglade2 not found!]))
+PKG_CHECK_MODULES(GLIB2, glib-2.0 >= 2.20, [], AC_MSG_ERROR([*** glib2 >= 2.20 not found!]))
+PKG_CHECK_MODULES(GTK3, gtk+-3.0 , [], AC_MSG_ERROR([*** libgtk3 >= 3.0 not found!]))
 
-AM_PATH_SDL(1.2.0, :, AC_MSG_ERROR([*** SDL not found!]))
+PKG_CHECK_MODULES(SDL, sdl >= 1.2.12, [], AC_MSG_ERROR([*** SDL >= 1.2.12 not found!]))
 
 AC_SUBST(GLIB2_CFLAGS)
 AC_SUBST(GLIB2_LIBS)
-AC_SUBST(GTK2_CFLAGS)
-AC_SUBST(GTK2_LIBS)
-AC_SUBST(GLADE2_CFLAGS)
-AC_SUBST(GLADE2_LIBS)
-
-AC_CONFIG_FILES([Makefile data/Makefile doc/Makefile libpcsxcore/Makefile gui/Makefile plugins/dfinput/Makefile plugins/dfsound/Makefile plugins/dfxvideo/Makefile plugins/dfcdrom/Makefile plugins/dfnet/Makefile pixmaps/Makefile po/Makefile.in])
-
-AC_CHECK_LIB(dl, dlsym, [LDFLAGS="$LDFLAGS -ldl"], [])
-AC_CHECK_LIB(socket, socket, [LDFLAGS="$LDFLAGS -lsocket"], [])
-AC_CHECK_LIB(nsl, gethostbyname, [LDFLAGS="$LDFLAGS -lnsl"], [])
-AC_CHECK_LIB(umem, umem_alloc, [LDFLAGS="$LDFLAGS -lumem"], [])
+AC_SUBST(GTK3_CFLAGS)
+AC_SUBST(GTK3_LIBS)
+
+AC_CONFIG_FILES([Makefile
+data/Makefile
+doc/Makefile
+libpcsxcore/Makefile
+gui/Makefile
+plugins/dfinput/Makefile
+plugins/dfsound/Makefile
+plugins/dfxvideo/Makefile
+plugins/dfcdrom/Makefile
+plugins/dfnet/Makefile
+pixmaps/Makefile
+po/Makefile.in])
+
+AC_CHECK_LIB(dl, dlsym, [LIBS="$LIBS -ldl"], [])
+AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"], [])
+AC_CHECK_LIB(nsl, gethostbyname, [LIBS="$LIBS -lnsl"], [])
+AC_CHECK_LIB(umem, umem_alloc, [LIBS="$LIBS -lumem"], [])
 
 AM_CONDITIONAL(SOUND_OSS, false)
 AM_CONDITIONAL(SOUND_SDL, false)
+AM_CONDITIONAL(SOUND_OPENAL, false)
 AM_CONDITIONAL(SOUND_NULL, false)
 
-dnl Check for ALSA 1.x, OSS, or PulseAudio
+dnl Check for ALSA 1.x, OSS, OpenAL or PulseAudio
 
-AC_ARG_ENABLE(sound, [  --enable-sound=...      force selection of sound backend (alsa/null/oss/pulseaudio/sdl) (default: sdl)],
+AC_ARG_ENABLE(sound, [  --enable-sound=...      force selection of sound backend (alsa/null/oss/pulseaudio/sdl/openal) (default: sdl)],
 [ SOUND="$enableval" ],[ SOUND="sdl" ])
 
 if test "x$SOUND" = xalsa; then
@@ -61,6 +72,8 @@
 	else
 		AM_CONDITIONAL(SOUND_OSS, true)
 	fi
+elif test "x$SOUND" = xopenal; then
+	PKG_CHECK_MODULES(OPENAL, openal >= 1.0.0, have_openal=yes)
 elif test "x$SOUND" = xno; then
 	AM_CONDITIONAL(SOUND_NULL, true)
 elif test "x$SOUND" = xnull; then
@@ -71,6 +84,8 @@
 
 AM_CONDITIONAL(SOUND_ALSA, test "x$have_alsa" = xyes)
 AC_SUBST(ALSA_LIBS)
+AM_CONDITIONAL(SOUND_OPENAL, test "x$have_openal" = xyes)
+AC_SUBST(OPENAL_LIBS)
 AM_CONDITIONAL(SOUND_PULSEAUDIO, test "x$have_pulseaudio" = xyes)
 AC_SUBST(PULSEAUDIO_CFLAGS)
 AC_SUBST(PULSEAUDIO_LIBS)
@@ -127,10 +142,22 @@
 	AC_CONFIG_FILES([plugins/peopsxgl/Makefile])
 fi
 
+AC_ARG_ENABLE(sio1, [  --enable-sio1         build SIO1 plugin (default=yes)],
+[ BUILD_SIO1="$enableval" ],[ BUILD_SIO1="yes" ])
+
+BLADESIO1=""
+
+if test "$BUILD_SIO1" = "yes"; then
+	AC_DEFINE([ENABLE_SIO1API], [1], [Define if we want use sio interface.])
+	BLADESIO1="plugins/bladesio1"
+	AC_SUBST(BLADESIO1)
+	AC_CONFIG_FILES([plugins/bladesio1/Makefile])
+fi
+
 AM_CONDITIONAL(X86_NASM, false)
 
-if expr x"$target_cpu" : 'xi.86' > /dev/null; then
-	if expr x"$target_os" : 'x.*linux.*' > /dev/null; then
+if expr x"$build_cpu" : 'xi.86' > /dev/null; then
+	if expr x"$build_os" : 'x.*linux.*' > /dev/null; then
 		AC_PATH_PROG([NASM],[nasm],[missing])
 		if test "$NASM" = "missing"; then
 			AC_MSG_WARN([unable to find nasm, needed to build dfx11video])
@@ -150,59 +177,45 @@
 
 if test "x$DYNAREC" = xauto; then
 	DYNARECSEL="auto"
-else if test "x$DYNAREC" = xx86; then
+elif test "x$DYNAREC" = xx86; then
 	DYNARECSEL="x86"
-else if test "x$DYNAREC" = xx86_64; then
+elif test "x$DYNAREC" = xx86_64; then
 	DYNARECSEL="x86_64"
-else if test "x$DYNAREC" = xppc; then
+elif test "x$DYNAREC" = xppc; then
 	DYNARECSEL="ppc"
-else if test "x$DYNAREC" = xno; then
+elif test "x$DYNAREC" = xno; then
 	DYNARECSEL="no"
 else
 	AC_MSG_WARN([Dynamic Recompiler "$DYNAREC" not found.  Autodetecting...])
 	DYNARECSEL="auto"
 fi
-fi
-fi
-fi
-fi
 
 if test "x$DYNARECSEL" = xauto; then
-	if expr x"$target_cpu" : 'xi.86' > /dev/null; then
+	if expr x"$build_cpu" : 'xi.86' > /dev/null; then
 		DYNARECSEL="x86"
-	fi
-
-	if expr x"$target_cpu" : 'xx86_64' > /dev/null; then
+	elif expr x"$build_cpu" : 'xx86_64' > /dev/null; then
 		DYNARECSEL="x86_64"
-	fi
-
-	if expr x"$target_cpu" : 'xpowerpc' > /dev/null; then
+	elif expr x"$build_cpu" : 'xpowerpc' > /dev/null; then
 		DYNARECSEL="ppc"
 	fi
 fi
 
 if test "x$DYNARECSEL" = xno; then
         AC_DEFINE([NOPSXREC], [1], [Define if we are compiling without dynamic recompiler.])
-fi
-
-if test "x$DYNARECSEL" = xx86; then
-        AC_DEFINE([__i386__], [1], [Define if we are compiling for x86 architectures.])
-        AM_CONDITIONAL(ARCH_X86, true)
+elif test "x$DYNARECSEL" = xx86; then
+	AC_DEFINE([__i386__], [1], [Define if we are compiling for x86 architectures.])
+	AM_CONDITIONAL(ARCH_X86, true)
 
 	AC_MSG_RESULT([Dynamic Recompiler selected: x86])
-fi
-
-if test "x$DYNARECSEL" = xx86_64; then
-        AC_DEFINE([__x86_64__], [1], [Define if we are compiling for x86_64 architectures.])
-        AM_CONDITIONAL(ARCH_X86_64, true)
+elif test "x$DYNARECSEL" = xx86_64; then
+	AC_DEFINE([__x86_64__], [1], [Define if we are compiling for x86_64 architectures.])
+	AM_CONDITIONAL(ARCH_X86_64, true)
 	dnl CFLAGS+=" -m64 "
 	dnl AC_COMPILE_IFELSE(AC_LANG_PROGRAM,,AC_MSG_ERROR([Cannot compile with -m64])) 
 	AC_MSG_RESULT([Dynamic Recompiler selected: x86_64])
-fi
-
-if test "x$DYNARECSEL" = xppc; then
-        AC_DEFINE([__ppc__], [1], [Define if we are compiling for powerpc architectures.])
-        AM_CONDITIONAL(ARCH_PPC, true)
+elif test "x$DYNARECSEL" = xppc; then
+	AC_DEFINE([__ppc__], [1], [Define if we are compiling for powerpc architectures.])
+	AM_CONDITIONAL(ARCH_PPC, true)
 	AC_MSG_RESULT([Dynamic Recompiler selected: ppc])
 fi

pcsxr-1.9.92.tar.bz2/data/Makefile.am -> pcsxr-1.9.93.tar.bz2/data/Makefile.am Changed

pcsxr-1.9.93.tar.bz2/data/pcsxr.desktop Added

pcsxr-1.9.93.tar.bz2/data/pcsxr.ui Added

@@ -0,0 +1,4177 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ 
+ <object class="GtkIconFactory" id="iconfactory1">
+ <sources>
+ <source stock-id="generated-icon-iso-open-png" filename="iso-open.png"/>
+ <source stock-id="generated-icon-pad-png" filename="pad.png"/>
+ <source stock-id="generated-icon-cdr-png" filename="cdr.png"/>
+ <source stock-id="generated-icon-gpu-png" filename="gpu.png"/>
+ <source stock-id="generated-icon-sio1-png" filename="sio1.png"/>
+ <source stock-id="generated-icon-memcard-png" filename="memcard.png"/>
+ <source stock-id="generated-icon-iso-reopen-png" filename="iso-reopen.png"/>
+ <source stock-id="generated-icon-spu-png" filename="spu.png"/>
+ <source stock-id="generated-icon-play-png" filename="play.png"/>
+ <source stock-id="generated-icon-cd-png" filename="cd.png"/>
+ </sources>
+ </object>
+ <object class="GtkDialog" id="CheatListDlg">
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Edit Cheat Codes</property>
+ <property name="modal">True</property>
+ <property name="window_position">center</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="closbutton1">
+ <property name="label">gtk-close</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">15</property>
+ <child>
+ <object class="GtkFrame" id="frame3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow1">
+ <property name="width_request">500</property>
+ <property name="height_request">355</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="border_width">5</property>
+ <property name="window_placement_set">True</property>
+ <property name="shadow_type">etched-in</property>
+ <child>
+ <object class="GtkTreeView" id="GtkCList_Cheat">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection1"/>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;Cheat Codes&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">5</property>
+ <child>
+ <object class="GtkButton" id="savebutton1">
+ <property name="label">gtk-save-as</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="loadbutton1">
+ <property name="label">gtk-open</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="editbutton1">
+ <property name="label">gtk-edit</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="delbutton1">
+ <property name="label">gtk-delete</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="addbutton1">
+ <property name="label">gtk-add</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="padding">10</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">closbutton1</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="CheatSearchDlg">
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Cheat Search</property>
+ <property name="resizable">False</property>
+ <property name="modal">True</property>
+ <property name="window_position">center</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="closebutton">
+ <property name="label">gtk-close</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <child>
+ <object class="GtkAlignment" id="alignment23">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="bottom_padding">5</property>
+ <property name="left_padding">5</property>
+ <property name="right_padding">5</property>
+ <child>
+ <object class="GtkVBox" id="vbox2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">5</property>
+ <child>
+ <object class="GtkTable" id="table1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">3</property>
+ <property name="n_columns">4</property>
+ <property name="column_spacing">5</property>
+ <property name="row_spacing">5</property>
+ <child>
+ <object class="GtkComboBox" id="combo_datatype">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="model">liststore2</property>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertext2"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Search For:</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Data Type:</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Value:</property>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Data Base:</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="combo_searchfor">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="model">liststore3</property>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertext3"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="entry_value">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="combo_database">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="model">liststore4</property>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertext4"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_valueto">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">To:</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkEntry" id="entry_valueto">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow2">
+ <property name="width_request">450</property>
+ <property name="height_request">250</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">never</property>
+ <property name="shadow_type">etched-in</property>
+ <child>
+ <object class="GtkTreeView" id="GtkCList_Result">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="headers_clickable">False</property>
+ <property name="show_expanders">False</property>
+ <property name="enable_grid_lines">vertical</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection2"/>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVButtonBox" id="vbuttonbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">10</property>
+ <property name="layout_style">start</property>
+ <child>
+ <object class="GtkButton" id="btn_freeze">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <child>
+ <object class="GtkHBox" id="hbox7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkImage" id="image26">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-ok</property>
+ <property name="icon-size">1</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label13">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Freeze</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="btn_modify">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <child>
+ <object class="GtkHBox" id="hbox8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkImage" id="image27">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-edit</property>
+ <property name="icon-size">1</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label14">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Modify</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="btn_copy">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <child>
+ <object class="GtkHBox" id="hbox9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkImage" id="image28">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-paste</property>
+ <property name="icon-size">1</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label15">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Copy</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">10</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_resultsfound">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes">label_resultsfound</property>
+ <property name="single_line_mode">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHButtonBox" id="hbuttonbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">20</property>
+ <property name="layout_style">center</property>
+ <child>
+ <object class="GtkButton" id="btn_start">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <child>
+ <object class="GtkHBox" id="hbox5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkImage" id="image29">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-ok</property>
+ <property name="icon-size">1</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label11">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Search</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="btn_restart">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <child>
+ <object class="GtkHBox" id="hbox6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkImage" id="image35">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-undo</property>
+ <property name="icon-size">1</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label12">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Restart</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;Cheat Search&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">closebutton</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="ConfDlg">
+ <property name="can_focus">False</property>
+ <property name="title" translatable="yes">Configure PCSXR</property>
+ <property name="resizable">False</property>
+ <property name="modal">True</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="btn_ConfClose">
+ <property name="label">gtk-close</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox28">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="spacing">3</property>
+ <child>
+ <object class="GtkFrame" id="frame17">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <child>
+ <object class="GtkAlignment" id="alignment38">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <child>
+ <object class="GtkTable" id="table4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">7</property>
+ <property name="n_columns">5</property>
+ <property name="column_spacing">5</property>
+ <property name="row_spacing">5</property>
+ <child>
+ <object class="GtkImage" id="image337">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">generated-icon-gpu-png</property>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="image341">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">generated-icon-cdr-png</property>
+ </object>
+ <packing>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="image340">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">generated-icon-pad-png</property>
+ </object>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="image339">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">generated-icon-pad-png</property>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="image338">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">generated-icon-spu-png</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="btn_ConfGpu">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <signal name="clicked" handler="OnConfConf_GpuConf" swapped="no"/>
+ <child>
+ <object class="GtkImage" id="image321">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-preferences</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="GtkCombo_Cdr">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="GtkCombo_Pad2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="GtkCombo_Pad1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <accessibility>
+ <relation type="flows-to" target="btn_ConfPad1"/>
+ <relation type="flows-from" target="btn_AboutSpu"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="GtkCombo_Spu">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="GtkCombo_Gpu">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="btn_AboutSpu">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <signal name="clicked" handler="OnConfConf_SpuConf" swapped="no"/>
+ <child>
+ <object class="GtkImage" id="image318">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-info</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">4</property>
+ <property name="right_attach">5</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="btn_AboutPad1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <signal name="clicked" handler="OnConfConf_Pad1About" swapped="no"/>
+ <child>
+ <object class="GtkImage" id="image319">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-info</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">4</property>
+ <property name="right_attach">5</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="btn_AboutPad2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <signal name="clicked" handler="OnConfConf_Pad2About" swapped="no"/>
+ <child>
+ <object class="GtkImage" id="image320">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-info</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">4</property>
+ <property name="right_attach">5</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="btn_AboutCdr">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <signal name="clicked" handler="OnConfConf_CdrAbout" swapped="no"/>
+ <child>
+ <object class="GtkImage" id="image311">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-info</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">4</property>
+ <property name="right_attach">5</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="btn_ConfCdr">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <signal name="clicked" handler="OnConfConf_CdrConf" swapped="no"/>
+ <child>
+ <object class="GtkImage" id="image310">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-preferences</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="btn_ConfPad2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <signal name="clicked" handler="OnConfConf_Pad2Conf" swapped="no"/>
+ <child>
+ <object class="GtkImage" id="image317">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-preferences</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="btn_ConfPad1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <signal name="clicked" handler="OnConfConf_Pad1Conf" swapped="no"/>
+ <child>
+ <object class="GtkImage" id="image316">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-preferences</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="btn_ConfSpu">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <signal name="clicked" handler="OnConfConf_SpuConf" swapped="no"/>
+ <child>
+ <object class="GtkImage" id="image315">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-preferences</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label95">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Graphics:</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label96">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Sound:</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label85">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Controller 1:</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label87">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Controller 2:</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label91">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">CD-ROM:</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="btn_AboutGpu">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <signal name="clicked" handler="OnConfConf_GpuAbout" swapped="no"/>
+ <child>
+ <object class="GtkImage" id="image313">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-info</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">4</property>
+ <property name="right_attach">5</property>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="image342">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">gtk-find</property>
+ </object>
+ <packing>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label89">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Search in:</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkFileChooserButton" id="GtkFileChooser_Plugin">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action">select-folder</property>
+ <property name="show_hidden">True</property>
+ <property name="title" translatable="yes">Select Folder to Search</property>
+ <signal name="current-folder-changed" handler="OnConfConf_PluginPath" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">5</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="image39">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">generated-icon-sio1-png</property>
+ </object>
+ <packing>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label18">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Link cable:</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="GtkCombo_Sio1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="btn_ConfSio1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked" handler="OnConfConf_Sio1Conf" swapped="no"/>
+ <child>
+ <object class="GtkImage" id="image40">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-preferences</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="btn_AboutSio1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked" handler="OnConfConf_Sio1About" swapped="no"/>
+ <child>
+ <object class="GtkImage" id="image41">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-info</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">4</property>
+ <property name="right_attach">5</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label97">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;Plugins&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame18">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <child>
+ <object class="GtkAlignment" id="alignment39">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <child>
+ <object class="GtkGrid" id="grid1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">5</property>
+ <property name="column_spacing">5</property>
+ <child>
+ <object class="GtkImage" id="image343">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-execute</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label17">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">BIOS:</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="image38">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">gtk-find</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label16">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Search in:</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkComboBox" id="GtkCombo_Bios">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkFileChooserButton" id="GtkFileChooser_Bios">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action">select-folder</property>
+ <property name="show_hidden">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label98">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;BIOS&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">btn_ConfClose</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="CpuDlg">
+ <property name="can_focus">False</property>
+ <property name="title" translatable="yes">Configure CPU</property>
+ <property name="resizable">False</property>
+ <property name="modal">True</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="closebutton1">
+ <property name="label">gtk-close</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox25">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="spacing">5</property>
+ <child>
+ <object class="GtkFrame" id="frame15">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <child>
+ <object class="GtkTable" id="table3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="n_rows">12</property>
+ <child>
+ <object class="GtkCheckButton" id="GtkCheckButton_SpuIrq">
+ <property name="label" translatable="yes">SPU IRQ Always Enabled</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="GtkCheckButton_Mdec">
+ <property name="label" translatable="yes">Black &amp; White Movies</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="GtkCheckButton_SioIrq">
+ <property name="label" translatable="yes">SIO IRQ Always Enabled</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="GtkCheckButton_Xa">
+ <property name="label" translatable="yes">Disable XA Decoding</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="GtkCheckButton_CDDA">
+ <property name="label" translatable="yes">Disable CD Audio</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="GtkCheckButton_SlowBoot">
+ <property name="label" translatable="yes">Slow Boot</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="GtkCheckButton_Cpu">
+ <property name="label" translatable="yes">Enable Interpreter CPU</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">7</property>
+ <property name="bottom_attach">8</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="GtkCheckButton_PsxOut">
+ <property name="label" translatable="yes">Enable Console Output</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="GtkCheckButton_Dbg">
+ <property name="label" translatable="yes">Enable Debugger</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">8</property>
+ <property name="bottom_attach">9</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="GtkCheckButton_RCntFix">
+ <property name="label" translatable="yes">Parasite Eve 2, Vandal Hearts 1/2 Fix</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">9</property>
+ <property name="bottom_attach">10</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="GtkCheckButton_VSyncWA">
+ <property name="label" translatable="yes">InuYasha Sengoku Battle Fix</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">10</property>
+ <property name="bottom_attach">11</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="GtkCheckButton_Widescreen">
+ <property name="label" translatable="yes">Widescreen (GTE Hack)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">11</property>
+ <property name="bottom_attach">12</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label66">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;Options&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame16">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <child>
+ <object class="GtkHBox" id="hbox49">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="spacing">10</property>
+ <child>
+ <object class="GtkCheckButton" id="GtkCheckButton_PsxAuto">
+ <property name="label" translatable="yes">Autodetect</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="GtkCombo_PsxType">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="model">liststore1</property>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertext1"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label68">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;System Type&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">closebutton1</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkWindow" id="MainWindow">
+ <property name="can_focus">False</property>
+ <property name="title" translatable="yes">PCSXR</property>
+ <property name="resizable">False</property>
+ <property name="window_position">center</property>
+ <property name="icon_name">pcsxr-icon.png</property>
+ <signal name="destroy" handler="OnDestroy" swapped="no"/>
+ <child>
+ <object class="GtkVBox" id="vbox18">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkMenuBar" id="menubar1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkMenuItem" id="item1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_File</property>
+ <property name="use_underline">True</property>
+ <child type="submenu">
+ <object class="GtkMenu" id="item1_menu">
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkImageMenuItem" id="RunCd">
+ <property name="label" translatable="yes">Run _CD</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="image">image2</property>
+ <property name="use_stock">False</property>
+ <accelerator key="O" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+ <signal name="activate" handler="OnFile_RunCd" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="RunImage">
+ <property name="label" translatable="yes">Run _ISO...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="image">image3</property>
+ <property name="use_stock">False</property>
+ <accelerator key="I" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+ <signal name="activate" handler="OnFile_RunImage" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="RunBios">
+ <property name="label" translatable="yes">Run _BIOS</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="image">image4</property>
+ <property name="use_stock">False</property>
+ <accelerator key="B" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+ <signal name="activate" handler="OnFile_RunBios" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="RunExe">
+ <property name="label" translatable="yes">Run _EXE...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="image">image5</property>
+ <property name="use_stock">False</property>
+ <accelerator key="E" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+ <signal name="activate" handler="OnFile_RunExe" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="separator5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="exit2">
+ <property name="label" translatable="yes">E_xit</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="image">image25</property>
+ <property name="use_stock">False</property>
+ <accelerator key="Q" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+ <signal name="activate" handler="OnFile_Exit" swapped="no"/>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="emulator1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Emulator</property>
+ <property name="use_underline">True</property>
+ <child type="submenu">
+ <object class="GtkMenu" id="emulator1_menu">
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkImageMenuItem" id="run1">
+ <property name="label" translatable="yes">_Continue</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="image">image6</property>
+ <property name="use_stock">False</property>
+ <accelerator key="c" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+ <signal name="activate" handler="OnEmu_Run" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="reset1">
+ <property name="label" translatable="yes">_Reset</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="image">image7</property>
+ <property name="use_stock">False</property>
+ <accelerator key="r" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+ <signal name="activate" handler="OnEmu_Reset" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="shutdown1">
+ <property name="label" translatable="yes">_Shutdown</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="image">image20</property>
+ <property name="use_stock">False</property>
+ <accelerator key="s" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+ <signal name="activate" handler="OnEmu_Shutdown" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="separator2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="SwitchImage">
+ <property name="label" translatable="yes">S_witch ISO...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="image">image8</property>
+ <property name="use_stock">False</property>
+ <accelerator key="W" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+ <signal name="activate" handler="OnEmu_SwitchImage" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="separator1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="save1">
+ <property name="label" translatable="yes">_Save State</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="image">image9</property>
+ <property name="use_stock">False</property>
+ <child type="submenu">
+ <object class="GtkMenu" id="save1_menu">
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkMenuItem" id="GtkMenuItem_SaveSlot1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Slot _1</property>
+ <property name="use_underline">True</property>
+ <accelerator key="1" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+ <signal name="activate" handler="OnStates_Save1" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="GtkMenuItem_SaveSlot2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Slot _2</property>
+ <property name="use_underline">True</property>
+ <accelerator key="2" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+ <signal name="activate" handler="OnStates_Save2" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="GtkMenuItem_SaveSlot3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Slot _3</property>
+ <property name="use_underline">True</property>
+ <accelerator key="3" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+ <signal name="activate" handler="OnStates_Save3" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="GtkMenuItem_SaveSlot4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Slot _4</property>
+ <property name="use_underline">True</property>
+ <accelerator key="4" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+ <signal name="activate" handler="OnStates_Save4" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="GtkMenuItem_SaveSlot5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Slot _5</property>
+ <property name="use_underline">True</property>
+ <accelerator key="5" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+ <signal name="activate" handler="OnStates_Save5" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="GtkMenuItem_SaveSlot6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Slot _6</property>
+ <property name="use_underline">True</property>
+ <accelerator key="6" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="GtkMenuItem_SaveSlot7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Slot _7</property>
+ <property name="use_underline">True</property>
+ <accelerator key="7" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="GtkMenuItem_SaveSlot8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Slot _8</property>
+ <property name="use_underline">True</property>
+ <accelerator key="8" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="GtkMenuItem_SaveSlot9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Slot _9</property>
+ <property name="use_underline">True</property>
+ <accelerator key="9" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="other2">
+ <property name="label" translatable="yes">_Other...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="image">image19</property>
+ <property name="use_stock">False</property>
+ <accelerator key="0" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+ <signal name="activate" handler="OnStates_SaveOther" swapped="no"/>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="load1">
+ <property name="label" translatable="yes">_Load State</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="image">image10</property>
+ <property name="use_stock">False</property>
+ <child type="submenu">
+ <object class="GtkMenu" id="load1_menu">
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkMenuItem" id="GtkMenuItem_LoadSlot1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Slot _1</property>
+ <property name="use_underline">True</property>
+ <accelerator key="1" signal="activate" modifiers="GDK_MOD1_MASK"/>
+ <signal name="activate" handler="OnStates_Load1" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="GtkMenuItem_LoadSlot2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Slot _2</property>
+ <property name="use_underline">True</property>
+ <accelerator key="2" signal="activate" modifiers="GDK_MOD1_MASK"/>
+ <signal name="activate" handler="OnStates_Load2" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="GtkMenuItem_LoadSlot3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Slot _3</property>
+ <property name="use_underline">True</property>
+ <accelerator key="3" signal="activate" modifiers="GDK_MOD1_MASK"/>
+ <signal name="activate" handler="OnStates_Load3" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="GtkMenuItem_LoadSlot4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Slot _4</property>
+ <property name="use_underline">True</property>
+ <accelerator key="4" signal="activate" modifiers="GDK_MOD1_MASK"/>
+ <signal name="activate" handler="OnStates_Load4" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="GtkMenuItem_LoadSlot5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Slot _5</property>
+ <property name="use_underline">True</property>
+ <accelerator key="5" signal="activate" modifiers="GDK_MOD1_MASK"/>
+ <signal name="activate" handler="OnStates_Load5" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="GtkMenuItem_LoadSlot6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Slot _6</property>
+ <property name="use_underline">True</property>
+ <accelerator key="6" signal="activate" modifiers="GDK_MOD1_MASK"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="GtkMenuItem_LoadSlot7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Slot _7</property>
+ <property name="use_underline">True</property>
+ <accelerator key="7" signal="activate" modifiers="GDK_MOD1_MASK"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="GtkMenuItem_LoadSlot8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Slot _8</property>
+ <property name="use_underline">True</property>
+ <accelerator key="8" signal="activate" modifiers="GDK_MOD1_MASK"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="GtkMenuItem_LoadSlot9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Slot _9</property>
+ <property name="use_underline">True</property>
+ <accelerator key="9" signal="activate" modifiers="GDK_MOD1_MASK"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="other1">
+ <property name="label" translatable="yes">_Other...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="image">image1</property>
+ <property name="use_stock">False</property>
+ <accelerator key="0" signal="activate" modifiers="GDK_MOD1_MASK"/>
+ <signal name="activate" handler="OnStates_LoadOther" swapped="no"/>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="configuration1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Configuration</property>
+ <property name="use_underline">True</property>
+ <child type="submenu">
+ <object class="GtkMenu" id="configuration1_menu">
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkImageMenuItem" id="plugins_bios">
+ <property name="label" translatable="yes">_Plugins &amp; BIOS...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="image">image11</property>
+ <property name="use_stock">False</property>
+ <accelerator key="P" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+ <signal name="activate" handler="ConfigurePlugins" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="separator6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="graphics1">
+ <property name="label" translatable="yes">_Graphics...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="image">image21</property>
+ <property name="use_stock">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="sound1">
+ <property name="label" translatable="yes">_Sound...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="image">image22</property>
+ <property name="use_stock">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="cdrom1">
+ <property name="label" translatable="yes">CD-_ROM...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="image">image23</property>
+ <property name="use_stock">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="pad1">
+ <property name="label" translatable="yes">C_ontrollers...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="image">image24</property>
+ <property name="use_stock">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="sio1">
+ <property name="label" translatable="yes">_Link cable...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="image">image42</property>
+ <property name="use_stock">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="separator7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="net1">
+ <property name="label" translatable="yes">_Netplay...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="image">image14</property>
+ <property name="use_stock">False</property>
+ <signal name="activate" handler="OnConf_Net" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="separator8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="cpu1">
+ <property name="label" translatable="yes">_CPU...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="image">image12</property>
+ <property name="use_stock">False</property>
+ <signal name="activate" handler="OnConf_Cpu" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="memory_cards1">
+ <property name="label" translatable="yes">_Memory Cards...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="image">image13</property>
+ <property name="use_stock">False</property>
+ <accelerator key="M" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+ <signal name="activate" handler="OnConf_Mcds" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="separator3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="cheat1">
+ <property name="label" translatable="yes">Chea_t</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="image">image15</property>
+ <property name="use_stock">False</property>
+ <child type="submenu">
+ <object class="GtkMenu" id="menu1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkImageMenuItem" id="browse1">
+ <property name="label" translatable="yes">_Browse...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="image">image16</property>
+ <property name="use_stock">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="search1">
+ <property name="label" translatable="yes">_Search...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="image">image17</property>
+ <property name="use_stock">False</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="memorydump1">
+ <property name="label" translatable="yes">Memory _Dump</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="image">image34</property>
+ <property name="use_stock">False</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="help1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Help</property>
+ <property name="use_underline">True</property>
+ <child type="submenu">
+ <object class="GtkMenu" id="help1_menu">
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkImageMenuItem" id="about_pcsxr1">
+ <property name="label" translatable="yes">_About PCSXR...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="image">image18</property>
+ <property name="use_stock">False</property>
+ <signal name="activate" handler="OnHelp_About" swapped="no"/>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkTable" id="tableToolbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="n_columns">11</property>
+ <child>
+ <object class="GtkToolButton" id="toolbutton_runcd">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes">Run CD</property>
+ <property name="use_underline">True</property>
+ <property name="stock_id">generated-icon-cd-png</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="toolbutton_runimage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes">Run ISO Image</property>
+ <property name="use_underline">True</property>
+ <property name="stock_id">generated-icon-iso-open-png</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSeparatorToolItem" id="toolbutton3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="toolbutton_run">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes">Continue Emulation</property>
+ <property name="use_underline">True</property>
+ <property name="stock_id">generated-icon-play-png</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="toolbutton_switchimage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes">Switch ISO Image</property>
+ <property name="use_underline">True</property>
+ <property name="stock_id">generated-icon-iso-reopen-png</property>
+ </object>
+ <packing>
+ <property name="left_attach">4</property>
+ <property name="right_attach">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSeparatorToolItem" id="toolbutton4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">5</property>
+ <property name="right_attach">6</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="toolbutton_memcards">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes">Configure Memory Cards</property>
+ <property name="use_underline">True</property>
+ <property name="stock_id">generated-icon-memcard-png</property>
+ </object>
+ <packing>
+ <property name="left_attach">6</property>
+ <property name="right_attach">7</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="toolbutton_graphics">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes">Configure Graphics</property>
+ <property name="use_underline">True</property>
+ <property name="stock_id">generated-icon-gpu-png</property>
+ </object>
+ <packing>
+ <property name="left_attach">7</property>
+ <property name="right_attach">8</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="toolbutton_sound">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes">Configure Sound</property>
+ <property name="use_underline">True</property>
+ <property name="stock_id">generated-icon-spu-png</property>
+ </object>
+ <packing>
+ <property name="left_attach">8</property>
+ <property name="right_attach">9</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="toolbutton_cdrom">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes">Configure CD-ROM</property>
+ <property name="use_underline">True</property>
+ <property name="stock_id">generated-icon-cdr-png</property>
+ </object>
+ <packing>
+ <property name="left_attach">9</property>
+ <property name="right_attach">10</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="toolbutton_controllers">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes">Configure Controllers</property>
+ <property name="use_underline">True</property>
+ <property name="stock_id">generated-icon-pad-png</property>
+ </object>
+ <packing>
+ <property name="left_attach">10</property>
+ <property name="right_attach">11</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="image160">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">pcsxr.png</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkStatusbar" id="statusbar">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <object class="GtkDialog" id="McdsDlg">
+ <property name="can_focus">False</property>
+ <property name="title" translatable="yes">Configure Memory Cards</property>
+ <property name="modal">True</property>
+ <property name="default_width">688</property>
+ <property name="default_height">400</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="McdClose">
+ <property name="label">gtk-close</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox54">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="label_xalign">0</property>
+ <child>
+ <object class="GtkVBox" id="vbox31">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="GtkCList_McdList1">
+ <property name="width_request">265</property>
+ <property name="height_request">400</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection3"/>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHButtonBox" id="hbuttonbox19">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="spacing">5</property>
+ <child>
+ <object class="GtkButton" id="GtkButton_New1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <signal name="clicked" handler="OnMcd_Reload1" swapped="no"/>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkHBox" id="hbox57">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image324">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-new</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">New</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="GtkButton_Format1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <signal name="clicked" handler="OnMcd_Format" object="1" swapped="yes"/>
+ <child>
+ <object class="GtkAlignment" id="alignment50">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkHBox" id="hbox70">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image346">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-clear</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label111">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Format</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="GtkButton_Delete1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked" handler="OnMcd_Delete1" swapped="no"/>
+ <child>
+ <object class="GtkAlignment" id="alignment45">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkHBox" id="hbox63">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image330">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-delete</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label105">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Un/Delete</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="Mcd1Button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <child>
+ <object class="GtkHBox" id="hbox2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">3</property>
+ <child>
+ <object class="GtkImage" id="image30">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-floppy</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="Mcd1Label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">Loading...</property>
+ <property name="ellipsize">middle</property>
+ <property name="single_line_mode">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVSeparator" id="vseparator1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="image31">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-open</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkHBox" id="hbox58">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="label100">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;Memory Card 1&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">4</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment51">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">27</property>
+ <property name="bottom_padding">132</property>
+ <child>
+ <object class="GtkVButtonBox" id="vbuttonbox2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <property name="layout_style">spread</property>
+ <child>
+ <object class="GtkButton" id="GtkButton_CopyTo2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <signal name="clicked" handler="OnMcd_CopyTo2" swapped="no"/>
+ <child>
+ <object class="GtkAlignment" id="alignment41">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkHBox" id="hbox59">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image326">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-go-forward</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label101">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Copy</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="GtkButton_CopyTo1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <signal name="clicked" handler="OnMcd_CopyTo1" swapped="no"/>
+ <child>
+ <object class="GtkAlignment" id="alignment42">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkHBox" id="hbox60">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image327">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-go-back</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label102">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Copy</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="label_xalign">0</property>
+ <child>
+ <object class="GtkVBox" id="vbox32">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow4">
+ <property name="width_request">265</property>
+ <property name="height_request">400</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="GtkCList_McdList2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection4"/>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHButtonBox" id="hbuttonbox20">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="spacing">5</property>
+ <child>
+ <object class="GtkButton" id="GtkButton_New2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <signal name="clicked" handler="OnMcd_Reload2" swapped="no"/>
+ <child>
+ <object class="GtkAlignment" id="alignment48">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkHBox" id="hbox66">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image333">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-new</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label108">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">New</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="GtkButton_Format2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <signal name="clicked" handler="OnMcd_Format" object="2" swapped="yes"/>
+ <child>
+ <object class="GtkAlignment" id="alignment49">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkHBox" id="hbox69">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image345">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-clear</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label110">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Format</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="GtkButton_Delete2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked" handler="OnMcd_Delete2" swapped="no"/>
+ <child>
+ <object class="GtkAlignment" id="alignment44">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkHBox" id="hbox62">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image329">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-delete</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label104">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Un/Delete</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="Mcd2Button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <child>
+ <object class="GtkHBox" id="hbox3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">3</property>
+ <child>
+ <object class="GtkImage" id="image32">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-floppy</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="Mcd2Label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">Loading...</property>
+ <property name="ellipsize">middle</property>
+ <property name="single_line_mode">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVSeparator" id="vseparator2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="image33">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-open</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkHBox" id="hbox67">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="label109">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;Memory Card 2&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">4</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-5">McdClose</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="MemViewDlg">
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Memory Dump</property>
+ <property name="resizable">False</property>
+ <property name="modal">True</property>
+ <property name="window_position">center</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">5</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="memview_close">
+ <property name="label">gtk-close</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">13</property>
+ <child>
+ <object class="GtkHBox" id="hbox11">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">10</property>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Address (Hexadecimal):</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="entry_address">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox111">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">10</property>
+ <child>
+ <object class="GtkButton" id="btn_go">
+ <property name="label">gtk-jump-to</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="btn_prev">
+ <property name="label">gtk-media-rewind</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="btn_next">
+ <property name="label">gtk-media-forward</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">5</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow5">
+ <property name="width_request">580</property>
+ <property name="height_request">380</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">never</property>
+ <property name="shadow_type">etched-in</property>
+ <child>
+ <object class="GtkTreeView" id="GtkCList_MemView">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hover_selection">True</property>
+ <property name="enable_grid_lines">horizontal</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection5"/>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHButtonBox" id="hbuttonbox2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">20</property>
+ <property name="layout_style">center</property>
+ <child>
+ <object class="GtkButton" id="btn_dump">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <child>
+ <object class="GtkHBox" id="hbox12">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkImage" id="image36">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-save-as</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Raw Dump...</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="btn_patch">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <child>
+ <object class="GtkHBox" id="hbox13">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkImage" id="image37">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-edit</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Patch Memory...</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">memview_close</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="NetDlg">
+ <property name="can_focus">False</property>
+ <property name="title" translatable="yes">Configure NetPlay</property>
+ <property name="resizable">False</property>
+ <property name="modal">True</property>
+ <property name="type_hint">dialog</property>
+ <signal name="destroy" handler="OnNet_Cancel" swapped="no"/>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="closebutton2">
+ <property name="label">gtk-close</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox27">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkFrame" id="frame19">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="label_xalign">0</property>
+ <child>
+ <object class="GtkAlignment" id="alignment40">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <child>
+ <object class="GtkHBox" id="hbox68">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">5</property>
+ <child>
+ <object class="GtkImage" id="image344">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-network</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="GtkCombo_Net">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="btn_ConfNet">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <signal name="clicked" handler="OnNet_Conf" swapped="no"/>
+ <child>
+ <object class="GtkImage" id="image335">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-preferences</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="btn_AboutNet">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <signal name="clicked" handler="OnNet_About" swapped="no"/>
+ <child>
+ <object class="GtkImage" id="image336">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-info</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label99">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;b&gt;NetPlay&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">closebutton2</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-open</property>
+ <property name="icon-size">1</property>
+ </object>
+ <object class="GtkImage" id="image10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-revert-to-saved</property>
+ <property name="icon-size">1</property>
+ </object>
+ <object class="GtkImage" id="image11">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-preferences</property>
+ <property name="icon-size">1</property>
+ </object>
+ <object class="GtkImage" id="image12">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-properties</property>
+ <property name="icon-size">1</property>
+ </object>
+ <object class="GtkImage" id="image13">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-floppy</property>
+ <property name="icon-size">1</property>
+ </object>
+ <object class="GtkImage" id="image14">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-properties</property>
+ <property name="icon-size">1</property>
+ </object>
+ <object class="GtkImage" id="image15">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-indent</property>
+ <property name="icon-size">1</property>
+ </object>
+ <object class="GtkImage" id="image16">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-index</property>
+ <property name="icon-size">1</property>
+ </object>
+ <object class="GtkImage" id="image17">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-find</property>
+ <property name="icon-size">1</property>
+ </object>
+ <object class="GtkImage" id="image18">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-about</property>
+ <property name="icon-size">1</property>
+ </object>
+ <object class="GtkImage" id="image19">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-save-as</property>
+ <property name="icon-size">1</property>
+ </object>
+ <object class="GtkImage" id="image2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0.49000000953674316</property>
+ <property name="stock">gtk-cdrom</property>
+ <property name="icon-size">1</property>
+ </object>
+ <object class="GtkImage" id="image20">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-stop</property>
+ <property name="icon-size">1</property>
+ </object>
+ <object class="GtkImage" id="image21">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-select-color</property>
+ <property name="icon-size">1</property>
+ </object>
+ <object class="GtkImage" id="image22">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-convert</property>
+ <property name="icon-size">1</property>
+ </object>
+ <object class="GtkImage" id="image23">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-cdrom</property>
+ <property name="icon-size">1</property>
+ </object>
+ <object class="GtkImage" id="image24">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-execute</property>
+ <property name="icon-size">1</property>
+ </object>
+ <object class="GtkImage" id="image25">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-quit</property>
+ <property name="icon-size">1</property>
+ </object>
+ <object class="GtkImage" id="image3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-open</property>
+ <property name="icon-size">1</property>
+ </object>
+ <object class="GtkImage" id="image34">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-revert-to-saved</property>
+ <property name="icon-size">1</property>
+ </object>
+ <object class="GtkImage" id="image4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-convert</property>
+ <property name="icon-size">1</property>
+ </object>
+ <object class="GtkImage" id="image42">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-execute</property>
+ <property name="icon-size">1</property>
+ </object>
+ <object class="GtkImage" id="image5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-execute</property>
+ <property name="icon-size">1</property>
+ </object>
+ <object class="GtkImage" id="image6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-go-forward</property>
+ <property name="icon-size">1</property>
+ </object>
+ <object class="GtkImage" id="image7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-refresh</property>
+ <property name="icon-size">1</property>
+ </object>
+ <object class="GtkImage" id="image8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-open</property>
+ <property name="icon-size">1</property>
+ </object>
+ <object class="GtkImage" id="image9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-save-as</property>
+ <property name="icon-size">1</property>
+ </object>
+ <object class="GtkListStore" id="liststore1">
+ <columns>
+ 
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">NTSC</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">PAL</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="liststore2">
+ <columns>
+ 
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">8-bit</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">16-bit</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">32-bit</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="liststore3">
+ <columns>
+ 
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Equal Value</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Not Equal Value</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Range</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Increased By</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Decreased By</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Increased</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Decreased</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Different</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">No Change</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="liststore4">
+ <columns>
+ 
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Decimal</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Hexadecimal</col>
+ </row>
+ </data>
+ </object>
+</interface>

pcsxr-1.9.93.tar.bz2/debian-upstream Added

pcsxr-1.9.93.tar.bz2/debian-upstream/changelog Changed

pcsxr-1.9.93.tar.bz2/debian-upstream/compat Changed

pcsxr-1.9.93.tar.bz2/debian-upstream/control Added

@@ -0,0 +1,20 @@
+Source: pcsxr
+Section: otherosfs
+Priority: extra
+Maintainer: Wei Mingzhi <whistler_wmz@users.sf.net>
+Build-Depends: debhelper (>= 5), libgtk-3-dev, zlib1g-dev | libz-dev, libxv-dev, libxtst-dev, nasm, libgl1-mesa-dev, libxxf86vm-dev, libsdl1.2-dev, intltool
+Standards-Version: 3.7.3
+
+Package: pcsxr
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: pcsx, pcsx-bin, pcsx-i18n, psemu-drive-cdrmooby, psemu-input-omnijoy, psemu-input-padjoy, psemu-sound-alsa, psemu-sound-oss, psemu-video-x11, pcsx-df
+Conflicts: pcsx (<= 1:1.699df-rc3-1), pcsx-bin (<= 1:1.699df-rc3-1), pcsx-i18n (<= 1:1.699df-rc3-1), pcsx-df (<= 1:1.999)
+Description: Sony PlayStation emulator -- binary
+ PCSXR is an advanced PlayStation (PSX) emulator, which uses a plugin 
+ architecture to provide full support for all components of the PSX.
+ It has full emulation support for gamepads, videos, sound, memory cards,
+ and other important PSX components, and is able to play many games
+ without problems.
+ .
+ This package provides the main PCSXR binary, library, and support files.

pcsxr-1.9.93.tar.bz2/debian-upstream/copyright Added

@@ -0,0 +1,62 @@
+This package was debianized by Wei Mingzhi <whistler_wmz@users.sf.net> on
+Fri, 16 Jan 2009 13:32:52 +0800.
+
+It was downloaded from <http://www.codeplex.com/pcsxr>
+
+Upstream Authors:
+	PCSX-Reloaded:
+		Wei Mingzhi <whistler_wmz@users.sf.net>
+		edgbla <edgbla@yandex.ru>
+	PCSX-df:
+		Stephen Chao <stephen@digitalnexus.org>
+		Ryan Schultz <schultz.ryan@gmail.com>
+		Andrew Burton <adb@iinet.net.au>
+		Stefan Sikora <hoshy@schrauberstube.de>
+		Marcus Comstedt <marcus@mc.pp.se>
+	PCSX Team
+		Linuzappz <linuzappz@pcsx.net>
+		Shadow <shadow@pcsx.net>
+		Pete Bernett <psswitch@online.de>
+		NoComp <NoComp@mailcity.com>
+		Nik3d
+		Akumax <akumax@pcsx.net>
+
+Copyright:	(C) 2008-2009 Wei Mingzhi
+		(C) 2005-2007 Ryan Schultz
+		(C) 2005-2007 Andrew Burton
+		(C) 2007 Stephen Chao
+		(C) 2007 Stefan Sikora
+		(C) 1999-2003 Pcsx Team
+ 	(C) 1998 Vision Thing
+
+License:
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA
+ 02111-1307 USA.
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+The file 'PSEmu_Plugin_Defs.h' is released to the public domain, contrary
+to its headers. This is an excerpt from a forum, by Pete Bernert (who wrote
+many of the plugins and was a PCSX contributor):
+
+"The "PSEmu Plugin Def.h" header file is very old (1998) and (as you
+have noticed) contains just a few basic defines. When PSemu Pro died in
+early 1999, and new psx emus showed up, the Vision Thing crew allowed
+free usage/enhancements of the interface. Sure, nobody ever updated the
+header file to state something new, but Duddie gave his agreement, as
+well as Kazz with his XA audio defines (used in the spu plugin
+interface). So, there is nothing to worry about using the headers."

pcsxr-1.9.93.tar.bz2/debian-upstream/docs Changed

pcsxr-1.9.93.tar.bz2/debian-upstream/pcsxr.menu Added

pcsxr-1.9.93.tar.bz2/debian-upstream/rules Added

@@ -0,0 +1,75 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+#export DH_VERBOSE=1
+
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2 -fomit-frame-pointer -fno-strict-aliasing
+endif
+
+CONFIGURE_PARAM = \
+	--host=$(DEB_HOST_GNU_TYPE) \
+	--build=$(DEB_BUILD_GNU_TYPE) \
+	--prefix=/usr \
+	--bindir=/usr/games \
+	--mandir=\$${prefix}/share/man \
+	--infodir=\$${prefix}/share/info \
+	--enable-opengl
+
+config.status: configure
+	dh_testdir
+	CFLAGS="$(CFLAGS)" ./configure $(CONFIGURE_PARAM)
+
+build: build-stamp
+
+build-stamp: config.status
+	dh_testdir
+	$(MAKE)
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+
+	[ ! -f Makefile ] || make distclean
+
+	dh_clean config.status config.log po/stamp-po
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_installdirs
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/pcsxr
+	# Remove useless files
+	rm -f $(CURDIR)/debian/pcsxr/usr/lib/games/psemu/*.la
+
+binary-indep: build install
+
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs ChangeLog
+	dh_installdocs
+	dh_installmenu
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_makeshlibs
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install

pcsxr-1.9.92.tar.bz2/doc/Makefile.am -> pcsxr-1.9.93.tar.bz2/doc/Makefile.am Changed

pcsxr-1.9.92.tar.bz2/doc/keys.txt -> pcsxr-1.9.93.tar.bz2/doc/keys.txt Changed

pcsxr-1.9.93.tar.bz2/doc/pcsxr.1 Added

@@ -0,0 +1,39 @@
+.\" Hey, EMACS: -*- nroff -*-
+.TH PCSXR 1 "October 01, 2005"
+.SH NAME
+pcsxr - Playstation emulator
+.SH SYPNOSIS
+.B pcsxr
+.I [options] [file]
+.SH DESCRIPTION
+PCSXR is a plugin-based PlayStation emulator able to play most PSX games. It provides CPU, BIOS, and basic system emulation and relies on plugins for sound, input, and graphics emulation.
+.PP
+.SH OPTIONS
+.TP
+.B -runcd
+Runs CD-ROM from drive
+.TP
+.B -cdfile FILE
+Runs a CD image file
+.TP
+.B -nogui
+Don't load the GUI
+.TP
+.B -cfg FILE
+Specify a different config file
+.TP
+.B -psxout
+Enable PSX output
+.TP
+.B -slowboot
+Enable BIOS Logo
+.TP
+.B -load STATENUM
+Loads savestate STATENUM
+.TP
+.B -help (-h)
+Display help message
+.TP
+.SH AUTHOR
+PCSX was written by Linuzappz <linuzappz@pcsx.net>. PCSX-df was written by Ryan Schultz <schultz.ryan@gmail.com> and Andrew Burton <adb@iinet.net.au>. PCSX-Reloaded was written by Wei Mingzhi <weimingzhi@gmail.com>.
+This manual page was written by Ryan Schultz <schultz.ryan@gmail.com> for the Debian Project.

pcsxr-1.9.92.tar.bz2/doc/tweaks.txt -> pcsxr-1.9.93.tar.bz2/doc/tweaks.txt Changed

pcsxr-1.9.93.tar.bz2/gui/._AboutDlg.c Added

pcsxr-1.9.92.tar.bz2/gui/AboutDlg.c -> pcsxr-1.9.93.tar.bz2/gui/AboutDlg.c Changed

@@ -13,17 +13,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
 #include "Linux.h"
 #include <gtk/gtk.h>
 
-#if GTK_MAJOR_VERSION <= 2 && GTK_MINOR_VERSION < 12
-#define gtk_about_dialog_set_program_name gtk_about_dialog_set_name
-#endif
-
-#define ABOUT_VERSION "1.9.92"
+#define ABOUT_VERSION "1.9.93"
 
 void RunAboutDialog(void) {
 	GtkWidget *AboutDlg;
@@ -31,14 +27,16 @@
 	const gchar *authors[] = {
 		"PCSX-Reloaded Team:",
 		"edgbla <edgbla@yandex.ru>",
+		"shalma",
 		"Wei Mingzhi <whistler_wmz@users.sf.net>",
 		"",
 		"Contributors:",
+		"Benoît Gschwind",
 		"Dario",
 		"Firnis",
 		"Gabriele Gorla",
+		"Hopkat",
 		"Peter Collingbourne",
-		"shalma",
 		"Tristin Celestin",
 		"(See the included AUTHORS file for more details.)",
 		"",
@@ -59,9 +57,8 @@
 
 	const gchar *artists[] = {
 		"Ryan Schultz <schultz.ryan@gmail.com>",
-		"",
-		"Icon Design:",
 		"Romain Lafourcade",
+		"perchibald",
 		NULL
 	};
 
@@ -73,7 +70,7 @@
 	const gchar *copyright = N_(
 		"(C) 1999-2003 PCSX Team\n"
 		"(C) 2005-2009 PCSX-df Team\n"
-		"(C) 2009-2010 PCSX-Reloaded Team");
+		"(C) 2009-2011 PCSX-Reloaded Team");
 
 	const gchar *license = N_(
 		"This program is free software; you can redistribute it and/or modify "
@@ -88,9 +85,10 @@
 		"\n"
 		"You should have received a copy of the GNU General Public License "
 		"along with this program; if not, write to the Free Software "
-		"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.");
+		"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.");
 
 	AboutDlg = gtk_about_dialog_new();
+	gtk_window_set_resizable(GTK_WINDOW(AboutDlg), TRUE);
 	gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(AboutDlg), "PCSX-Reloaded");
 	gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(AboutDlg), ABOUT_VERSION);
 	gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(AboutDlg), "http://pcsxr.codeplex.com/");

pcsxr-1.9.92.tar.bz2/gui/AboutDlg.h -> pcsxr-1.9.93.tar.bz2/gui/AboutDlg.h Changed

pcsxr-1.9.92.tar.bz2/gui/Cheat.c -> pcsxr-1.9.93.tar.bz2/gui/Cheat.c Changed

@@ -13,7 +13,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
 #include <stdio.h>
@@ -23,13 +23,13 @@
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
-#include <glade/glade.h>
 
 #include "Linux.h"
 
 #include "../libpcsxcore/cheat.h"
 #include "../libpcsxcore/psxmem.h"
 
+static GtkBuilder *builder;
 GtkWidget *CheatListDlg = NULL;
 GtkWidget *CheatSearchDlg = NULL;
 
@@ -37,12 +37,10 @@
 	GtkListStore *store = gtk_list_store_new(2, G_TYPE_BOOLEAN, G_TYPE_STRING);
 	GtkTreeIter iter;
 	GtkWidget *widget;
-	GladeXML *xml;
 
 	int i;
 
-	xml = glade_get_widget_tree(CheatListDlg);
-	widget = glade_xml_get_widget(xml, "GtkCList_Cheat");
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "GtkCList_Cheat"));
 
 	for (i = 0; i < NumCheats; i++) {
 		gtk_list_store_append(store, &iter);
@@ -52,6 +50,7 @@
 	gtk_tree_view_set_model(GTK_TREE_VIEW(widget), GTK_TREE_MODEL(store));
 	g_object_unref(G_OBJECT(store));
 	gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(widget), TRUE);
+	gtk_tree_view_set_search_column(GTK_TREE_VIEW(widget), 1);
 	gtk_widget_show(widget);
 
 	if (index >= NumCheats) {
@@ -71,7 +70,6 @@
 }
 
 static void CheatList_TreeSelectionChanged(GtkTreeSelection *selection, gpointer user_data) {
-	GladeXML *xml;
 	GtkTreeIter iter;
 	GtkTreeModel *model;
 	GtkTreePath *path;
@@ -86,20 +84,14 @@
 		i = *gtk_tree_path_get_indices(path);
 		gtk_tree_path_free(path);
 
-		// If a row was selected, and the row is not blank, we can now enable
-		// some of the disabled widgets
-		xml = glade_get_widget_tree(CheatListDlg);
-
-		gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "editbutton1")), TRUE);
-		gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "delbutton1")), TRUE);
+		gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "editbutton1")), TRUE);
+		gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "delbutton1")), TRUE);
 	} else {
-		xml = glade_get_widget_tree(CheatListDlg);
-
-		gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "editbutton1")), FALSE);
-		gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "delbutton1")), FALSE);
+		gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "editbutton1")), FALSE);
+		gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "delbutton1")), FALSE);
 	}
 
-	gtk_widget_set_sensitive (GTK_WIDGET(glade_xml_get_widget(xml, "savebutton1")), NumCheats);
+	gtk_widget_set_sensitive (GTK_WIDGET(gtk_builder_get_object(builder, "savebutton1")), NumCheats);
 }
 
 static void OnCheatListDlg_AddClicked(GtkWidget *widget, gpointer user_data) {
@@ -112,7 +104,7 @@
 
 	gtk_window_set_default_size(GTK_WINDOW(dlg), 350, 350);
 
-	box = GTK_WIDGET(GTK_DIALOG(dlg)->vbox);
+	box = GTK_WIDGET(gtk_dialog_get_content_area(GTK_DIALOG(dlg)));
 
 	label = gtk_label_new(_("Cheat Description:"));
 	gtk_box_pack_start(GTK_BOX(box), label, FALSE, FALSE, 5);
@@ -143,7 +135,7 @@
 
 	gtk_widget_show_all(dlg);
 
-	if (gtk_dialog_run(GTK_DIALOG(dlg)) == GTK_RESPONSE_ACCEPT) {
+	while (gtk_dialog_run(GTK_DIALOG(dlg)) == GTK_RESPONSE_ACCEPT) {
 		GtkTextBuffer *b = gtk_text_view_get_buffer(GTK_TEXT_VIEW(code_edit));
 		GtkTextIter s, e;
 		char *codetext;
@@ -153,11 +145,12 @@
 
 		if (AddCheat(gtk_entry_get_text(GTK_ENTRY(descr_edit)), codetext) != 0) {
 			SysErrorMessage(_("Error"), _("Invalid cheat code!"));
+			continue;
 		}
 
 		LoadCheatListItems(NumCheats - 1);
-
 		free(codetext);
+		break;
 	}
 
 	gtk_widget_destroy(dlg);
@@ -166,7 +159,6 @@
 static void OnCheatListDlg_EditClicked(GtkWidget *widget, gpointer user_data) {
 	GtkWidget *dlg;
 	GtkWidget *box, *scroll, *label, *descr_edit, *code_edit;
-	GladeXML *xml;
 	GtkTreeIter iter;
 	GtkTreeModel *model;
 	GtkTreePath *path;
@@ -176,8 +168,7 @@
 	char buf[8192];
 	char *p = buf;
 
-	xml = glade_get_widget_tree(CheatListDlg);
-	widget = glade_xml_get_widget(xml, "GtkCList_Cheat");
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "GtkCList_Cheat"));
 
 	selected = gtk_tree_selection_get_selected(
 		gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)),
@@ -197,7 +188,7 @@
 
 	gtk_window_set_default_size(GTK_WINDOW(dlg), 350, 350);
 
-	box = GTK_WIDGET(GTK_DIALOG(dlg)->vbox);
+	box = GTK_WIDGET(gtk_dialog_get_content_area(GTK_DIALOG(dlg)));
 
 	label = gtk_label_new(_("Cheat Description:"));
 	gtk_box_pack_start(GTK_BOX(box), label, FALSE, FALSE, 5);
@@ -253,14 +244,13 @@
 
 		LoadCheatListItems(index);
 
-		free(codetext);		
+		free(codetext);
 	}
 
 	gtk_widget_destroy(dlg);
 }
 
 static void OnCheatListDlg_DelClicked(GtkWidget *widget, gpointer user_data) {
-	GladeXML *xml;
 	GtkTreeIter iter;
 	GtkTreeModel *model;
 	GtkTreePath *path;
@@ -268,8 +258,7 @@
 	gboolean selected;
 	int i = -1;
 
-	xml = glade_get_widget_tree(CheatListDlg);
-	widget = glade_xml_get_widget(xml, "GtkCList_Cheat");
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "GtkCList_Cheat"));
 
 	selected = gtk_tree_selection_get_selected(
 		gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)),
@@ -278,25 +267,43 @@
 	if (selected) {
 		path = gtk_tree_model_get_path(model, &iter);
 		i = *gtk_tree_path_get_indices(path);
+		gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
 		gtk_tree_path_free(path);
 
 		RemoveCheat(i);
 	}
-
-	LoadCheatListItems(i); // FIXME: should remove it from the list directly
-	 // rather than regenerating the whole list
 }
 
-static void OnCheatListDlg_EnableToggled(GtkWidget *widget, gchar *path, gpointer user_data) {
-	int i = atoi(path);
+static void OnCheatListDlg_EnableToggled(GtkCellRendererToggle *cell, gchar *path_str, gpointer user_data) {
+	GtkWidget *widget;
+	GtkTreeModel *model;
+	GtkTreePath *path;
+	GtkTreeIter iter;
+	gboolean fixed;
+
+	widget = GTK_WIDGET(gtk_builder_get_object (builder, "GtkCList_Cheat"));
+	model = gtk_tree_view_get_model (GTK_TREE_VIEW(widget));
+	path = gtk_tree_path_new_from_string (path_str);
 
+	gtk_tree_model_get_iter (model, &iter, path);
+	gtk_tree_model_get (model, &iter, 0, &fixed, -1);
+
+	fixed ^= 1;
+
+	int i = atoi(path_str);
 	assert(i >= 0 && i < NumCheats);
-	Cheats[i].Enabled ^= 1;
 
-	LoadCheatListItems(i); // FIXME: should modify it in the list directly
-	 // rather than regenerating the whole list
+	Cheats[i].Enabled = fixed;
+
+	gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, fixed, -1);
+	gtk_tree_path_free (path);
 }
 
+// last chosen filename is kept in here
+static gchar *lastfilename = NULL;
+
+const gchar* file_filter_all = NULL;
+
 static void OnCheatListDlg_OpenClicked(GtkWidget *widget, gpointer user_data) {
 	GtkWidget *chooser;
 	gchar *filename;
@@ -309,16 +316,17 @@
 
 	filename = g_build_filename(getenv("HOME"), CHEATS_DIR, NULL);
 	gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (chooser), filename);
+	//gtk_file_chooser_select_filename(GTK_FILE_CHOOSER(chooser), filename);
 	g_free(filename);
 
 	filter = gtk_file_filter_new ();
-	gtk_file_filter_add_pattern (filter, "*.cht");
-	gtk_file_filter_set_name (filter, _("PCSX Cheat Code Files (*.cht)"));
+	gtk_file_filter_add_pattern (filter, all_extension_cht);
+	gtk_file_filter_set_name (filter, _("PCSXR Cheat Code Files (*.cht)"));
 	gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (chooser), filter);
 
 	filter = gtk_file_filter_new ();
 	gtk_file_filter_add_pattern (filter, "*");
-	gtk_file_filter_set_name (filter, _("All Files"));
+	gtk_file_filter_set_name (filter, file_filter_all);
 	gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (chooser), filter);
 
 	if (gtk_dialog_run (GTK_DIALOG (chooser)) == GTK_RESPONSE_OK) {
@@ -333,6 +341,9 @@
 
 	LoadCheats(filename);
 
+	g_free(lastfilename);
+	lastfilename = g_path_get_basename(filename);
+
 	g_free(filename);
 
 	LoadCheatListItems(-1);
@@ -340,7 +351,7 @@
 
 static void OnCheatListDlg_SaveClicked(GtkWidget *widget, gpointer user_data) {
 	GtkWidget *chooser;
-	gchar *filename;
+	gchar *filename, *filename2=NULL;
 	GtkFileFilter *filter;
 
 	chooser = gtk_file_chooser_dialog_new(_("Save Cheat File"),
@@ -349,20 +360,35 @@
 
 	filename = g_build_filename(getenv("HOME"), CHEATS_DIR, NULL);
 	gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(chooser), filename);
+
+	// Use game code as default filename, otherwise remember what user selected
+	if (!lastfilename) {
+		lastfilename = get_cdrom_label_id(dot_extension_cht);
+	}
+	gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(chooser), lastfilename);
+
 	g_free(filename);
 
 	filter = gtk_file_filter_new();
-	gtk_file_filter_add_pattern(filter, "*.cht");
-	gtk_file_filter_set_name(filter, _("PCSX Cheat Code Files (*.cht)"));
+	gtk_file_filter_add_pattern(filter, all_extension_cht);
+	gtk_file_filter_set_name(filter, _("PCSXR Cheat Code Files (*.cht)"));
 	gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(chooser), filter);
 
 	filter = gtk_file_filter_new();
 	gtk_file_filter_add_pattern(filter, "*");
-	gtk_file_filter_set_name(filter, _("All Files (*.*)"));
+	gtk_file_filter_set_name(filter, file_filter_all);
 	gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(chooser), filter);
 
 	if (gtk_dialog_run(GTK_DIALOG(chooser)) == GTK_RESPONSE_OK) {
-		filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (chooser));
+		filename = filename2 = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (chooser));
+	if (!g_str_has_suffix(filename, dot_extension_cht) // add extension if cht filter chosen and filename doesn't end with .cht
+			&& strcmp(file_filter_all, gtk_file_filter_get_name(
+				gtk_file_chooser_get_filter(GTK_FILE_CHOOSER(chooser)))) != 0) {
+		filename = g_strdup_printf ("%s%s", filename2, dot_extension_cht);
+	} else {
+		filename2 = NULL;
+	}
+
 		gtk_widget_destroy (GTK_WIDGET(chooser));
 		while (gtk_events_pending()) gtk_main_iteration();
 	} else {
@@ -373,32 +399,42 @@
 
 	SaveCheats(filename);
 
+	g_free(lastfilename);
+	lastfilename = g_path_get_basename(filename);
+
 	g_free(filename);
+	g_free(filename2);
 }
 
 static void OnCheatListDlg_CloseClicked() {
 	gtk_widget_destroy(CheatListDlg);
 	CheatListDlg = NULL;
+	//g_free(lastfilename);
+	//lastfilename = NULL;
 }
 
 // run the cheat list dialog
 void RunCheatListDialog() {
-	GladeXML *xml;
 	GtkWidget *widget;
 	GtkTreeSelection *treesel;
 	GtkTreeViewColumn *column;
 	GtkCellRenderer *renderer;
 
-	xml = glade_xml_new(PACKAGE_DATA_DIR "pcsx.glade2", "CheatListDlg", NULL);
-	if (!xml) {
-		g_warning(_("Error: Glade interface could not be loaded!"));
+	file_filter_all = _("All Files (*.*)");
+
+	builder = gtk_builder_new();
+
+	if (!gtk_builder_add_from_file(builder, PACKAGE_DATA_DIR "pcsxr.ui", NULL)) {
+		g_warning("Error: interface could not be loaded!");
 		return;
 	}
 
-	CheatListDlg = glade_xml_get_widget(xml, "CheatListDlg");
+	CheatListDlg = GTK_WIDGET(gtk_builder_get_object(builder, "CheatListDlg"));
+
 	gtk_window_set_title(GTK_WINDOW(CheatListDlg), _("Cheat Codes"));
+	gtk_widget_show (CheatListDlg);
 
-	widget = glade_xml_get_widget(xml, "GtkCList_Cheat");
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "GtkCList_Cheat"));
 
 	// column for enable
 	renderer = gtk_cell_renderer_toggle_new();
@@ -422,34 +458,34 @@
 						 G_CALLBACK (CheatList_TreeSelectionChanged),
 						 NULL, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "addbutton1");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnCheatListDlg_AddClicked), xml, NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "addbutton1"));
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+			G_CALLBACK(OnCheatListDlg_AddClicked), builder, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "editbutton1");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnCheatListDlg_EditClicked), xml, NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "editbutton1"));
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+			G_CALLBACK(OnCheatListDlg_EditClicked), builder, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "delbutton1");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnCheatListDlg_DelClicked), xml, NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "delbutton1"));
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+			G_CALLBACK(OnCheatListDlg_DelClicked), builder, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "loadbutton1");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnCheatListDlg_OpenClicked), xml, NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "loadbutton1"));
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+			G_CALLBACK(OnCheatListDlg_OpenClicked), builder, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "savebutton1");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnCheatListDlg_SaveClicked), xml, NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "savebutton1"));
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+			G_CALLBACK(OnCheatListDlg_SaveClicked), builder, NULL, G_CONNECT_AFTER);
 
 	// Setup a handler for when Close or Cancel is clicked
-	g_signal_connect_data(GTK_OBJECT(CheatListDlg), "response",
-			GTK_SIGNAL_FUNC(OnCheatListDlg_CloseClicked), xml, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
+	g_signal_connect_data(G_OBJECT(CheatListDlg), "response",
+			G_CALLBACK(OnCheatListDlg_CloseClicked), builder, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
 
-	gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "savebutton1")), NumCheats);
-	gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "editbutton1")), FALSE);
-	gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "delbutton1")), FALSE);
-	gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "editbutton1")), FALSE);
+	gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "savebutton1")), NumCheats);
+	gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "editbutton1")), FALSE);
+	gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "delbutton1")), FALSE);
+	gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "editbutton1")), FALSE);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -479,7 +515,6 @@
 
 // update the cheat search dialog
 static void UpdateCheatSearchDialog() {
-	GladeXML		*xml;
 	char			buf[256];
 	int				i;
 	u32				addr;
@@ -487,55 +522,54 @@
 	GtkTreeIter		iter;
 	GtkWidget		*widget;
 
-	xml = glade_get_widget_tree(CheatSearchDlg);
-	widget = glade_xml_get_widget(xml, "GtkCList_Result");
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "GtkCList_Result"));
 
-	gtk_combo_box_set_active(GTK_COMBO_BOX(glade_xml_get_widget(xml, "combo_searchfor")), current_search);
-	gtk_combo_box_set_active(GTK_COMBO_BOX(glade_xml_get_widget(xml, "combo_datatype")), current_searchtype);
-	gtk_combo_box_set_active(GTK_COMBO_BOX(glade_xml_get_widget(xml, "combo_database")), current_searchbase);
+	gtk_combo_box_set_active(GTK_COMBO_BOX(gtk_builder_get_object(builder, "combo_searchfor")), current_search);
+	gtk_combo_box_set_active(GTK_COMBO_BOX(gtk_builder_get_object(builder, "combo_datatype")), current_searchtype);
+	gtk_combo_box_set_active(GTK_COMBO_BOX(gtk_builder_get_object(builder, "combo_database")), current_searchbase);
 
 	if (current_searchbase == SEARCHBASE_DEC) {
 		sprintf(buf, "%u", current_valuefrom);
-		gtk_entry_set_text(GTK_ENTRY(glade_xml_get_widget(xml, "entry_value")), buf);
+		gtk_entry_set_text(GTK_ENTRY(gtk_builder_get_object(builder, "entry_value")), buf);
 		sprintf(buf, "%u", current_valueto);
-		gtk_entry_set_text(GTK_ENTRY(glade_xml_get_widget(xml, "entry_valueto")), buf);
+		gtk_entry_set_text(GTK_ENTRY(gtk_builder_get_object(builder, "entry_valueto")), buf);
 	}
 	else {
 		sprintf(buf, "%X", current_valuefrom);
-		gtk_entry_set_text(GTK_ENTRY(glade_xml_get_widget(xml, "entry_value")), buf);
+		gtk_entry_set_text(GTK_ENTRY(gtk_builder_get_object(builder, "entry_value")), buf);
 		sprintf(buf, "%X", current_valueto);
-		gtk_entry_set_text(GTK_ENTRY(glade_xml_get_widget(xml, "entry_valueto")), buf);
+		gtk_entry_set_text(GTK_ENTRY(gtk_builder_get_object(builder, "entry_valueto")), buf);
 	}
 
 	if (current_search == SEARCH_RANGE) {
-		gtk_widget_show(GTK_WIDGET(glade_xml_get_widget(xml, "label_valueto")));
-		gtk_widget_show(GTK_WIDGET(glade_xml_get_widget(xml, "entry_valueto")));
+		gtk_widget_show(GTK_WIDGET(gtk_builder_get_object(builder, "label_valueto")));
+		gtk_widget_show(GTK_WIDGET(gtk_builder_get_object(builder, "entry_valueto")));
 	}
 	else {
-		gtk_widget_hide(GTK_WIDGET(glade_xml_get_widget(xml, "label_valueto")));
-		gtk_widget_hide(GTK_WIDGET(glade_xml_get_widget(xml, "entry_valueto")));
+		gtk_widget_hide(GTK_WIDGET(gtk_builder_get_object(builder, "label_valueto")));
+		gtk_widget_hide(GTK_WIDGET(gtk_builder_get_object(builder, "entry_valueto")));
 	}
 
 	if (current_search >= SEARCH_INC) {
-		gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "entry_value")), FALSE);
+		gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "entry_value")), FALSE);
 	}
 	else {
-		gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "entry_value")), TRUE);
+		gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "entry_value")), TRUE);
 	}
 
 	if (current_search >= SEARCH_INCBY && prevM == NULL) {
-		gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "btn_start")), FALSE);
+		gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "btn_start")), FALSE);
 	}
 	else {
-		gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "btn_start")), TRUE);
+		gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "btn_start")), TRUE);
 	}
 
-	gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "btn_freeze")), FALSE);
-	gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "btn_modify")), FALSE);
-	gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "btn_copy")), FALSE);
+	gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "btn_freeze")), FALSE);
+	gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "btn_modify")), FALSE);
+	gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "btn_copy")), FALSE);
 
 	if (prevM != NULL) {
-		gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "combo_datatype")), FALSE);
+		gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "combo_datatype")), FALSE);
 
 		if (NumSearchResults > 100) {
 			// too many results to be shown
@@ -575,13 +609,13 @@
 		}
 
 		sprintf(buf, _("Founded Addresses: %d"), NumSearchResults);
-		gtk_label_set_text(GTK_LABEL(glade_xml_get_widget(xml, "label_resultsfound")), buf);
+		gtk_label_set_text(GTK_LABEL(gtk_builder_get_object(builder, "label_resultsfound")), buf);
 	}
 	else {
-		gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "combo_datatype")), TRUE);
+		gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "combo_datatype")), TRUE);
 		gtk_widget_set_sensitive(widget, FALSE);
 
-		gtk_label_set_text(GTK_LABEL(glade_xml_get_widget(xml, "label_resultsfound")),
+		gtk_label_set_text(GTK_LABEL(gtk_builder_get_object(builder, "label_resultsfound")),
 			_("Enter the values and start your search."));
 	}
 
@@ -593,7 +627,6 @@
 
 // get the current selected result index in the list
 static int GetSelectedResultIndex() {
-	GladeXML			*xml;
 	GtkTreeSelection	*selection;
 	GtkTreeIter			iter;
 	GtkTreeModel		*model;
@@ -601,9 +634,7 @@
 	gboolean			selected;
 	int					i;
 
-	xml = glade_get_widget_tree(CheatSearchDlg);
-
-	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(glade_xml_get_widget(xml, "GtkCList_Result")));
+	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(gtk_builder_get_object(builder, "GtkCList_Result")));
 	selected = gtk_tree_selection_get_selected(selection, &model, &iter);
 
 	if (!selected) {
@@ -631,7 +662,7 @@
 		GTK_DIALOG_MODAL, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
 		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL);
 
-	box = GTK_WIDGET(GTK_DIALOG(dlg)->vbox);
+	box = GTK_WIDGET(gtk_dialog_get_content_area(GTK_DIALOG(dlg)));
 
 	label = gtk_label_new(_("Description:"));
 	gtk_box_pack_start(GTK_BOX(box), label, FALSE, FALSE, 5);
@@ -730,7 +761,7 @@
 		GTK_DIALOG_MODAL, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
 		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL);
 
-	box = GTK_WIDGET(GTK_DIALOG(dlg)->vbox);
+	box = GTK_WIDGET(gtk_dialog_get_content_area(GTK_DIALOG(dlg)));
 	hbox = gtk_hbox_new(FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, FALSE, 5);
 
@@ -816,23 +847,19 @@
 
 // preform the search
 static void OnCheatSearchDlg_SearchClicked(GtkWidget *widget, gpointer user_data) {
-	GladeXML		*xml;
-
-	xml = glade_get_widget_tree(CheatSearchDlg);
-
-	current_search = gtk_combo_box_get_active(GTK_COMBO_BOX(glade_xml_get_widget(xml, "combo_searchfor")));
-	current_searchtype = gtk_combo_box_get_active(GTK_COMBO_BOX(glade_xml_get_widget(xml, "combo_datatype")));
-	current_searchbase = gtk_combo_box_get_active(GTK_COMBO_BOX(glade_xml_get_widget(xml, "combo_database")));
+	current_search = gtk_combo_box_get_active(GTK_COMBO_BOX(gtk_builder_get_object(builder, "combo_searchfor")));
+	current_searchtype = gtk_combo_box_get_active(GTK_COMBO_BOX(gtk_builder_get_object(builder, "combo_datatype")));
+	current_searchbase = gtk_combo_box_get_active(GTK_COMBO_BOX(gtk_builder_get_object(builder, "combo_database")));
 	current_valuefrom = 0;
 	current_valueto = 0;
 
 	if (current_searchbase == SEARCHBASE_DEC) {
-		sscanf(gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(xml, "entry_value"))), "%u", &current_valuefrom);
-		sscanf(gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(xml, "entry_valueto"))), "%u", &current_valueto);
+		sscanf(gtk_entry_get_text(GTK_ENTRY(gtk_builder_get_object(builder, "entry_value"))), "%u", &current_valuefrom);
+		sscanf(gtk_entry_get_text(GTK_ENTRY(gtk_builder_get_object(builder, "entry_valueto"))), "%u", &current_valueto);
 	}
 	else {
-		sscanf(gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(xml, "entry_value"))), "%x", &current_valuefrom);
-		sscanf(gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(xml, "entry_valueto"))), "%x", &current_valueto);
+		sscanf(gtk_entry_get_text(GTK_ENTRY(gtk_builder_get_object(builder, "entry_value"))), "%x", &current_valuefrom);
+		sscanf(gtk_entry_get_text(GTK_ENTRY(gtk_builder_get_object(builder, "entry_valueto"))), "%x", &current_valueto);
 	}
 
 	switch (current_searchtype) {
@@ -1035,100 +1062,91 @@
 }
 
 static void OnCheatSearchDlg_SearchForChanged(GtkWidget *widget, gpointer user_data) {
-	GladeXML *xml;
-
-	xml = glade_get_widget_tree(CheatSearchDlg);
-
 	if (gtk_combo_box_get_active(GTK_COMBO_BOX(widget)) == SEARCH_RANGE) {
-		gtk_widget_show(GTK_WIDGET(glade_xml_get_widget(xml, "label_valueto")));
-		gtk_widget_show(GTK_WIDGET(glade_xml_get_widget(xml, "entry_valueto")));
+		gtk_widget_show(GTK_WIDGET(gtk_builder_get_object(builder, "label_valueto")));
+		gtk_widget_show(GTK_WIDGET(gtk_builder_get_object(builder, "entry_valueto")));
 	}
 	else {
-		gtk_widget_hide(GTK_WIDGET(glade_xml_get_widget(xml, "label_valueto")));
-		gtk_widget_hide(GTK_WIDGET(glade_xml_get_widget(xml, "entry_valueto")));
+		gtk_widget_hide(GTK_WIDGET(gtk_builder_get_object(builder, "label_valueto")));
+		gtk_widget_hide(GTK_WIDGET(gtk_builder_get_object(builder, "entry_valueto")));
 	}
 
 	if (gtk_combo_box_get_active(GTK_COMBO_BOX(widget)) >= SEARCH_INC) {
-		gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "entry_value")), FALSE);
+		gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "entry_value")), FALSE);
 	}
 	else {
-		gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "entry_value")), TRUE);
+		gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "entry_value")), TRUE);
 	}
 
 	if (gtk_combo_box_get_active(GTK_COMBO_BOX(widget)) >= SEARCH_INCBY && prevM == NULL) {
-		gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "btn_start")), FALSE);
+		gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "btn_start")), FALSE);
 	}
 	else {
-		gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "btn_start")), TRUE);
+		gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "btn_start")), TRUE);
 	}
 }
 
 static void OnCheatSearchDlg_DataBaseChanged(GtkWidget *widget, gpointer user_data) {
 	u32				val;
 	char			buf[256];
-	GladeXML		*xml;
-
-	xml = glade_get_widget_tree(CheatSearchDlg);
 
 	if (gtk_combo_box_get_active(GTK_COMBO_BOX(widget)) == SEARCHBASE_DEC) {
 		val = 0;
-		sscanf(gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(xml, "entry_value"))), "%x", &val);
+		sscanf(gtk_entry_get_text(GTK_ENTRY(gtk_builder_get_object(builder, "entry_value"))), "%x", &val);
 		sprintf(buf, "%u", val);
-		gtk_entry_set_text(GTK_ENTRY(glade_xml_get_widget(xml, "entry_value")), buf);
+		gtk_entry_set_text(GTK_ENTRY(gtk_builder_get_object(builder, "entry_value")), buf);
 
 		val = 0;
-		sscanf(gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(xml, "entry_valueto"))), "%x", &val);
+		sscanf(gtk_entry_get_text(GTK_ENTRY(gtk_builder_get_object(builder, "entry_valueto"))), "%x", &val);
 		sprintf(buf, "%u", val);
-		gtk_entry_set_text(GTK_ENTRY(glade_xml_get_widget(xml, "entry_valueto")), buf);
+		gtk_entry_set_text(GTK_ENTRY(gtk_builder_get_object(builder, "entry_valueto")), buf);
 	}
 	else {
 		val = 0;
-		sscanf(gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(xml, "entry_value"))), "%u", &val);
+		sscanf(gtk_entry_get_text(GTK_ENTRY(gtk_builder_get_object(builder, "entry_value"))), "%u", &val);
 		sprintf(buf, "%X", val);
-		gtk_entry_set_text(GTK_ENTRY(glade_xml_get_widget(xml, "entry_value")), buf);
+		gtk_entry_set_text(GTK_ENTRY(gtk_builder_get_object(builder, "entry_value")), buf);
 
 		val = 0;
-		sscanf(gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(xml, "entry_valueto"))), "%u", &val);
+		sscanf(gtk_entry_get_text(GTK_ENTRY(gtk_builder_get_object(builder, "entry_valueto"))), "%u", &val);
 		sprintf(buf, "%X", val);
-		gtk_entry_set_text(GTK_ENTRY(glade_xml_get_widget(xml, "entry_valueto")), buf);
+		gtk_entry_set_text(GTK_ENTRY(gtk_builder_get_object(builder, "entry_valueto")), buf);
 	}
 }
 
 static void CheatSearch_TreeSelectionChanged(GtkTreeSelection *selection, gpointer user_data) {
-	GladeXML			*xml;
-
-	xml = glade_get_widget_tree(CheatSearchDlg);
-
 	if (GetSelectedResultIndex() != -1) {
 		// If a row was selected, we can now enable some of the disabled widgets
-		gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "btn_freeze")), TRUE);
-		gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "btn_modify")), TRUE);
-		gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "btn_copy")), TRUE);
+		gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "btn_freeze")), TRUE);
+		gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "btn_modify")), TRUE);
+		gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "btn_copy")), TRUE);
 	} else {
-		gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "btn_freeze")), FALSE);
-		gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "btn_modify")), FALSE);
-		gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "btn_copy")), FALSE);
+		gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "btn_freeze")), FALSE);
+		gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "btn_modify")), FALSE);
+		gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "btn_copy")), FALSE);
 	}
 }
 
 // run the cheat search dialog
 void RunCheatSearchDialog() {
-	GladeXML *xml;
 	GtkWidget *widget;
 	GtkCellRenderer *renderer;
 	GtkTreeSelection *treesel;
 	GtkTreeViewColumn *column;
 
-	xml = glade_xml_new(PACKAGE_DATA_DIR "pcsx.glade2", "CheatSearchDlg", NULL);
-	if (!xml) {
-		g_warning(_("Error: Glade interface could not be loaded!"));
+	builder = gtk_builder_new();
+
+	if (!gtk_builder_add_from_file(builder, PACKAGE_DATA_DIR "pcsxr.ui", NULL)) {
+		g_warning("Error: interface could not be loaded!");
 		return;
 	}
 
-	CheatSearchDlg = glade_xml_get_widget(xml, "CheatSearchDlg");
+	CheatSearchDlg = GTK_WIDGET(gtk_builder_get_object(builder, "CheatSearchDlg"));
+
 	gtk_window_set_title(GTK_WINDOW(CheatSearchDlg), _("Cheat Search"));
+	gtk_widget_show (CheatSearchDlg);
 
-	widget = glade_xml_get_widget(xml, "GtkCList_Result");
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "GtkCList_Result"));
 
 	renderer = gtk_cell_renderer_text_new ();
 	column = gtk_tree_view_column_new_with_attributes(_("Search Results"),
@@ -1143,34 +1161,34 @@
 
 	UpdateCheatSearchDialog();
 
-	widget = glade_xml_get_widget(xml, "btn_freeze");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		GTK_SIGNAL_FUNC(OnCheatSearchDlg_FreezeClicked), xml, NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "btn_freeze"));
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+		G_CALLBACK(OnCheatSearchDlg_FreezeClicked), builder, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "btn_modify");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		GTK_SIGNAL_FUNC(OnCheatSearchDlg_ModifyClicked), xml, NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "btn_modify"));
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+		G_CALLBACK(OnCheatSearchDlg_ModifyClicked), builder, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "btn_copy");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		GTK_SIGNAL_FUNC(OnCheatSearchDlg_CopyClicked), xml, NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "btn_copy"));
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+		G_CALLBACK(OnCheatSearchDlg_CopyClicked), builder, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "btn_start");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		GTK_SIGNAL_FUNC(OnCheatSearchDlg_SearchClicked), xml, NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "btn_start"));
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+		G_CALLBACK(OnCheatSearchDlg_SearchClicked), builder, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "btn_restart");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		GTK_SIGNAL_FUNC(OnCheatSearchDlg_RestartClicked), xml, NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "btn_restart"));
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+		G_CALLBACK(OnCheatSearchDlg_RestartClicked), builder, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "combo_searchfor");
-	g_signal_connect_data(GTK_OBJECT(widget), "changed",
-		GTK_SIGNAL_FUNC(OnCheatSearchDlg_SearchForChanged), xml, NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "combo_searchfor"));
+	g_signal_connect_data(G_OBJECT(widget), "changed",
+		G_CALLBACK(OnCheatSearchDlg_SearchForChanged), builder, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "combo_database");
-	g_signal_connect_data(GTK_OBJECT(widget), "changed",
-		GTK_SIGNAL_FUNC(OnCheatSearchDlg_DataBaseChanged), xml, NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "combo_database"));
+	g_signal_connect_data(G_OBJECT(widget), "changed",
+		G_CALLBACK(OnCheatSearchDlg_DataBaseChanged), builder, NULL, G_CONNECT_AFTER);
 
-	g_signal_connect_data(GTK_OBJECT(CheatSearchDlg), "response",
-		GTK_SIGNAL_FUNC(OnCheatSearchDlg_CloseClicked), xml, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
+	g_signal_connect_data(G_OBJECT(CheatSearchDlg), "response",
+		G_CALLBACK(OnCheatSearchDlg_CloseClicked), builder, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
 }

pcsxr-1.9.92.tar.bz2/gui/Cheat.h -> pcsxr-1.9.93.tar.bz2/gui/Cheat.h Changed

pcsxr-1.9.92.tar.bz2/gui/ConfDlg.c -> pcsxr-1.9.93.tar.bz2/gui/ConfDlg.c Changed

@@ -13,7 +13,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
 #include <stdio.h>
@@ -25,7 +25,6 @@
 #include <sys/stat.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
-#include <glade/glade.h>
 #include <signal.h>
 #include <sys/time.h>
 #include <regex.h>
@@ -45,13 +44,14 @@
 static void OnNet_About(GtkWidget *widget, gpointer user_data);
 static void on_configure_plugin(GtkWidget *widget, gpointer user_data);
 static void on_about_plugin(GtkWidget *widget, gpointer user_data);
-static void UpdatePluginsBIOS_UpdateGUI(GladeXML *xml);
-static void FindNetPlugin(GladeXML *xml);
+static void UpdatePluginsBIOS_UpdateGUI();
+static void FindNetPlugin();
 
 PSEgetLibType		PSE_getLibType = NULL;
 PSEgetLibVersion	PSE_getLibVersion = NULL;
 PSEgetLibName		PSE_getLibName = NULL;
 
+static GtkBuilder *builder;
 GtkWidget *ConfDlg = NULL;
 GtkWidget *NetDlg = NULL;
 GtkWidget *controlwidget = NULL;
@@ -62,6 +62,9 @@
 PluginConf Pad1ConfS;
 PluginConf Pad2ConfS;
 PluginConf NetConfS;
+#ifdef ENABLE_SIO1API
+PluginConf Sio1ConfS;
+#endif
 PluginConf BiosConfS;
 
 #define FindComboText(combo, list, conf) \
@@ -91,31 +94,30 @@
 		return;
 	}
 
-	GladeXML *xml;
 	GtkWidget *widget;
 
 	gchar *path;
 
 	UpdatePluginsBIOS();
 
-	xml = glade_xml_new(PACKAGE_DATA_DIR "pcsx.glade2", "ConfDlg", NULL);
-
-	if (!xml) {
-		g_warning(_("Error: Glade interface could not be loaded!"));
+	builder = gtk_builder_new();
+	if (!gtk_builder_add_from_file(builder, PACKAGE_DATA_DIR "pcsxr.ui", NULL)) {
+		g_warning("Error: interface could not be loaded!");
 		return;
 	}
 
-	UpdatePluginsBIOS_UpdateGUI(xml);
+	UpdatePluginsBIOS_UpdateGUI(builder);
 
-	ConfDlg = glade_xml_get_widget(xml, "ConfDlg");
-
-	gtk_window_set_title(GTK_WINDOW(ConfDlg), _("Configure PCSX"));
+	ConfDlg = GTK_WIDGET(gtk_builder_get_object(builder, "ConfDlg"));
+	
+	gtk_window_set_title(GTK_WINDOW(ConfDlg), _("Configure PCSXR"));
+	gtk_widget_show (ConfDlg);
 
 	/* Set the paths in the file choosers to be based on the saved configurations */
-	widget = glade_xml_get_widget(xml, "GtkFileChooser_Bios");
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "GtkFileChooser_Bios"));
 	gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (widget), Config.BiosDir);
 
-	widget = glade_xml_get_widget(xml, "GtkFileChooser_Plugin");
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "GtkFileChooser_Plugin"));
 	gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (widget), Config.PluginsDir);
 
 	if (strlen(Config.PluginsDir) == 0) {
@@ -125,57 +127,74 @@
 		}
 	}
 
-	widget = glade_xml_get_widget(xml, "btn_ConfGpu");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(on_configure_plugin), (gpointer) PSE_LT_GPU, NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "btn_ConfGpu"));
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+			G_CALLBACK(on_configure_plugin), GINT_TO_POINTER(PSE_LT_GPU), NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "btn_ConfSpu");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(on_configure_plugin), (gpointer) PSE_LT_SPU, NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "btn_ConfSpu"));
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+			G_CALLBACK(on_configure_plugin), GINT_TO_POINTER(PSE_LT_SPU), NULL, G_CONNECT_AFTER);
 
 	/* ADB TODO Does pad 1 and 2 need to be different? */
-	widget = glade_xml_get_widget(xml, "btn_ConfPad1");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-						 GTK_SIGNAL_FUNC(OnConfConf_Pad1Conf), xml, NULL, G_CONNECT_AFTER);
-
-	widget = glade_xml_get_widget(xml, "btn_ConfPad2");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnConfConf_Pad2Conf), xml, NULL, G_CONNECT_AFTER);
-
-	widget = glade_xml_get_widget(xml, "btn_ConfCdr");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(on_configure_plugin), (gpointer) PSE_LT_CDR, NULL, G_CONNECT_AFTER);
-
-	widget = glade_xml_get_widget(xml, "btn_AboutGpu");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(on_about_plugin), (gpointer) PSE_LT_GPU, NULL, G_CONNECT_AFTER);
-
-	widget = glade_xml_get_widget(xml, "btn_AboutSpu");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(on_about_plugin), (gpointer) PSE_LT_SPU, NULL, G_CONNECT_AFTER);
-
-	widget = glade_xml_get_widget(xml, "btn_AboutPad1");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnConfConf_Pad1About), xml, NULL, G_CONNECT_AFTER);
-
-	widget = glade_xml_get_widget(xml, "btn_AboutPad2");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnConfConf_Pad2About), xml, NULL, G_CONNECT_AFTER);
-
-	widget = glade_xml_get_widget(xml, "btn_AboutCdr");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(on_about_plugin), (gpointer) PSE_LT_CDR, NULL, G_CONNECT_AFTER);
-
-	widget = glade_xml_get_widget(xml, "GtkFileChooser_Bios");
-	g_signal_connect_data(GTK_OBJECT(widget), "current_folder_changed",
-			GTK_SIGNAL_FUNC(OnBiosPath_Changed), xml, NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "btn_ConfPad1"));
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+						 G_CALLBACK(OnConfConf_Pad1Conf), builder, NULL, G_CONNECT_AFTER);
+
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "btn_ConfPad2"));
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+			G_CALLBACK(OnConfConf_Pad2Conf), builder, NULL, G_CONNECT_AFTER);
+
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "btn_ConfCdr"));
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+			G_CALLBACK(on_configure_plugin), GINT_TO_POINTER(PSE_LT_CDR), NULL, G_CONNECT_AFTER);
+#ifdef ENABLE_SIO1API
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "btn_ConfSio1"));
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+			G_CALLBACK(on_configure_plugin), (gpointer) PSE_LT_SIO1, NULL, G_CONNECT_AFTER);
+#else
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "label18"));
+	gtk_widget_set_sensitive(widget, FALSE);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "GtkCombo_Sio1"));
+	gtk_widget_set_sensitive(widget, FALSE);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "btn_ConfSio1"));
+	gtk_widget_set_sensitive(widget, FALSE);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "btn_AboutSio1"));
+	gtk_widget_set_sensitive(widget, FALSE);
+#endif
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "btn_AboutGpu"));
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+			G_CALLBACK(on_about_plugin), GINT_TO_POINTER(PSE_LT_GPU), NULL, G_CONNECT_AFTER);
+
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "btn_AboutSpu"));
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+			G_CALLBACK(on_about_plugin), GINT_TO_POINTER(PSE_LT_SPU), NULL, G_CONNECT_AFTER);
+
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "btn_AboutPad1"));
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+			G_CALLBACK(OnConfConf_Pad1About), builder, NULL, G_CONNECT_AFTER);
+
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "btn_AboutPad2"));
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+			G_CALLBACK(OnConfConf_Pad2About), builder, NULL, G_CONNECT_AFTER);
+
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "btn_AboutCdr"));
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+			G_CALLBACK(on_about_plugin), GINT_TO_POINTER(PSE_LT_CDR), NULL, G_CONNECT_AFTER);
+#ifdef ENABLE_SIO1API
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "btn_AboutSio1"));
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+			G_CALLBACK(on_about_plugin), (gpointer) PSE_LT_SIO1, NULL, G_CONNECT_AFTER);
+#endif
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "GtkFileChooser_Bios"));
+	g_signal_connect_data(G_OBJECT(widget), "current_folder_changed",
+			G_CALLBACK(OnBiosPath_Changed), builder, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "GtkFileChooser_Plugin");
-	g_signal_connect_data(GTK_OBJECT(widget), "current_folder_changed",
-			GTK_SIGNAL_FUNC(OnPluginPath_Changed), xml, NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "GtkFileChooser_Plugin"));
+	g_signal_connect_data(G_OBJECT(widget), "current_folder_changed",
+			G_CALLBACK(OnPluginPath_Changed), builder, NULL, G_CONNECT_AFTER);
 
-	g_signal_connect_data(GTK_OBJECT(ConfDlg), "response",
-			GTK_SIGNAL_FUNC(OnConf_Clicked), xml, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
+	g_signal_connect_data(G_OBJECT(ConfDlg), "response",
+			G_CALLBACK(OnConf_Clicked), builder, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
 }
 
 void OnNet_Clicked(GtkDialog *dialog, gint arg1, gpointer user_data) {
@@ -186,7 +205,6 @@
 }
 
 void OnConf_Net() {
-	GladeXML *xml;
 	GtkWidget *widget;
 
 	if (NetDlg != NULL) {
@@ -194,28 +212,29 @@
 		return;
 	}
 
-	xml = glade_xml_new(PACKAGE_DATA_DIR "pcsx.glade2", "NetDlg", NULL);
-
-	if (!xml) {
-		g_warning(_("Error: Glade interface could not be loaded!"));
+	builder = gtk_builder_new();
+	if (!gtk_builder_add_from_file(builder, PACKAGE_DATA_DIR "pcsxr.ui", NULL)) {
+		g_warning("Error: interface could not be loaded!");
 		return;
 	}
 
-	NetDlg = glade_xml_get_widget(xml, "NetDlg");
+	NetDlg = GTK_WIDGET(gtk_builder_get_object(builder, "NetDlg"));
+	
+	gtk_widget_show (NetDlg);
 
-	FindNetPlugin(xml);
+	FindNetPlugin(builder);
 
 	/* Setup a handler for when Close or Cancel is clicked */
-	g_signal_connect_data(GTK_OBJECT(NetDlg), "response",
-			GTK_SIGNAL_FUNC(OnNet_Clicked), xml, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
+	g_signal_connect_data(G_OBJECT(NetDlg), "response",
+			G_CALLBACK(OnNet_Clicked), builder, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "btn_ConfNet");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnNet_Conf), xml, NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "btn_ConfNet"));
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+			G_CALLBACK(OnNet_Conf), builder, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "btn_AboutNet");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnNet_About), xml, NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "btn_AboutNet"));
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+			G_CALLBACK(OnNet_About), builder, NULL, G_CONNECT_AFTER);
 }
 
 void OnConf_Graphics() {
@@ -280,7 +299,28 @@
 
 	SysCloseLibrary(drv);
 }
+#ifdef ENABLE_SIO1API
+void OnConf_Sio1() {
+	void *drv;
+	SIO1configure conf;
+	char Plugin[MAXPATHLEN];
+
+	sprintf(Plugin, "%s/%s", Config.PluginsDir, Config.Sio1);
+	drv = SysLoadLibrary(Plugin);
+	if (drv == NULL) { printf("Error with file %s\n", Plugin); return; }
+
+	while (gtk_events_pending()) gtk_main_iteration();
+
+	conf = (SIO1configure)SysLoadSym(drv, "SIO1configure");
+	if (conf != NULL) {
+		conf();
+	}
+	else
+		SysInfoMessage (_("No configuration required"), _("This plugin doesn't need to be configured."));
 
+	SysCloseLibrary(drv);
+}
+#endif
 void OnConf_Pad() {
 	void *drv;
 	PADconfigure conf;
@@ -292,7 +332,7 @@
 
 	while (gtk_events_pending()) gtk_main_iteration();
 
-	conf = (GPUconfigure)SysLoadSym(drv, "PADconfigure");
+	conf = (PADconfigure)SysLoadSym(drv, "PADconfigure");
 	if (conf != NULL) {
 		conf();
 	}
@@ -308,7 +348,7 @@
 
 		while (gtk_events_pending()) gtk_main_iteration();
 
-		conf = (GPUconfigure)SysLoadSym(drv, "PADconfigure");
+		conf = (PADconfigure)SysLoadSym(drv, "PADconfigure");
 		if (conf != NULL) {
 			conf();
 		}
@@ -321,10 +361,13 @@
 	int retval;
 
 	if ((strlen(Config.Gpu) != 0) &&
-	 (strlen(Config.Spu) != 0) &&
-	 (strlen(Config.Cdr) != 0) &&
-	 (strlen(Config.Pad1) != 0) &&
-	 (strlen(Config.Pad2) != 0))
+		(strlen(Config.Spu) != 0) &&
+		(strlen(Config.Cdr) != 0) &&
+#ifdef ENABLE_SIO1API
+		(strlen(Config.Sio1) != 0) &&
+#endif
+		(strlen(Config.Pad1) != 0) &&
+		(strlen(Config.Pad2) != 0))
 		retval = TRUE;
 	else
 		retval = FALSE;
@@ -342,61 +385,69 @@
 	gchar *filename; \
 \
 	GetComboText(confs.Combo, confs.plist, plugin); \
-	filename = g_build_filename (getenv("HOME"), PLUGINS_DIR, plugin, NULL); \
-	/*printf("Configuring plugin %s\n", filename);*/ \
-	drv = SysLoadLibrary(filename); \
-	if (drv == NULL) {printf("Error with file %s\n", filename);return; } \
+	if (strlen(plugin) > 0) { \
+		filename = g_build_filename (getenv("HOME"), PLUGINS_DIR, plugin, NULL); \
+		/*printf("Configuring plugin %s\n", filename);*/ \
+		drv = SysLoadLibrary(filename); \
+		if (drv == NULL) {printf("Error with file %s\n", filename);return; } \
 \
-	while (gtk_events_pending()) gtk_main_iteration(); \
-	conf = (src) SysLoadSym(drv, name); \
-	if (conf) { \
-		conf(); \
-	} else \
-		SysInfoMessage (_("No configuration required"), _("This plugin doesn't need to be configured.")); \
-	SysCloseLibrary(drv); \
-	g_free (filename); \
+		while (gtk_events_pending()) gtk_main_iteration(); \
+			conf = (src) SysLoadSym(drv, name); \
+		if (conf) { \
+			conf(); \
+		} else \
+			SysInfoMessage (_("No configuration required"), _("This plugin doesn't need to be configured.")); \
+		SysCloseLibrary(drv); \
+		g_free (filename); \
+	} else SysInfoMessage (name, _("Please select a plugin.")); \
 }
 
 static void on_configure_plugin(GtkWidget *widget, gpointer user_data) {
-	gint plugin_type = (int) user_data;
+	gint plugin_type = GPOINTER_TO_INT(user_data);
 
 	while (gtk_events_pending())
 		gtk_main_iteration();
-	if (all_config_set() == TRUE) {
-		switch (plugin_type) {
-			case PSE_LT_GPU:
-				ConfPlugin(GPUconfigure, GpuConfS, Config.Gpu, "GPUconfigure", ConfDlg);
-				break;
-			case PSE_LT_SPU:
-				ConfPlugin(SPUconfigure, SpuConfS, Config.Spu, "SPUconfigure", ConfDlg);
-				break;
-			case PSE_LT_CDR:
-				ConfPlugin(CDRconfigure, CdrConfS, Config.Cdr, "CDRconfigure", ConfDlg);
-				break;
-		}
-	} else
-		ConfigurePlugins();
+
+	switch (plugin_type) {
+		case PSE_LT_GPU:
+			ConfPlugin(GPUconfigure, GpuConfS, Config.Gpu, "GPUconfigure", ConfDlg);
+			break;
+		case PSE_LT_SPU:
+			ConfPlugin(SPUconfigure, SpuConfS, Config.Spu, "SPUconfigure", ConfDlg);
+			break;
+		case PSE_LT_CDR:
+			ConfPlugin(CDRconfigure, CdrConfS, Config.Cdr, "CDRconfigure", ConfDlg);
+			break;
+#ifdef ENABLE_SIO1API
+		case PSE_LT_SIO1:
+			ConfPlugin(SIO1configure, Sio1ConfS, Config.Sio1, "SIO1configure", ConfDlg);
+			break;
+#endif
+	}
 }
 
 static void on_about_plugin(GtkWidget *widget, gpointer user_data) {
-	gint plugin_type = (int) user_data;
+	gint plugin_type = GPOINTER_TO_INT(user_data);
 
 	while (gtk_events_pending())
 		gtk_main_iteration();
-	if (all_config_set() == TRUE) {
-		switch (plugin_type) {
-			case PSE_LT_GPU:
-				ConfPlugin(GPUconfigure, GpuConfS, Config.Gpu, "GPUabout", ConfDlg);
-				break;
-			case PSE_LT_SPU:
-				ConfPlugin(SPUconfigure, SpuConfS, Config.Spu, "SPUabout", ConfDlg);
-				break;
-			case PSE_LT_CDR:
-				ConfPlugin(CDRconfigure, CdrConfS, Config.Cdr, "CDRabout", ConfDlg);
-				break;
-		}
-	} else
-		ConfigurePlugins();
+
+	switch (plugin_type) {
+		case PSE_LT_GPU:
+			ConfPlugin(GPUconfigure, GpuConfS, Config.Gpu, "GPUabout", ConfDlg);
+			break;
+		case PSE_LT_SPU:
+			ConfPlugin(SPUconfigure, SpuConfS, Config.Spu, "SPUabout", ConfDlg);
+			break;
+		case PSE_LT_CDR:
+			ConfPlugin(CDRconfigure, CdrConfS, Config.Cdr, "CDRabout", ConfDlg);
+			break;
+#ifdef ENABLE_SIO1API
+		case PSE_LT_SIO1:
+			ConfPlugin(SIO1configure, Sio1ConfS, Config.Sio1, "SIO1about", ConfDlg);
+			break;
+#endif
+	}
 }
 
 static void OnConfConf_Pad1About(GtkWidget *widget, gpointer user_data) {
@@ -427,8 +478,13 @@
 	gchar *path;
 
 	path = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (wdg));
+	GSList * l = gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER (wdg));
+	//printf(("%s and %s\n"), path, l->data);
+
+ if (l) path = l->data;
 	strcpy(Config.PluginsDir, path);
-	UpdatePluginsBIOS();
+
+ UpdatePluginsBIOS();
 	UpdatePluginsBIOS_UpdateGUI(data);
 
 	g_free(path);
@@ -438,6 +494,10 @@
 	gchar *foldername;
 
 	foldername = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (wdg));
+	GSList * l = gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER (wdg));
+	//printf(("%s and %s\n"), foldername, l->data);
+
+	if (l) foldername = l->data;
 	strcpy(Config.BiosDir, foldername);
 
 	UpdatePluginsBIOS();
@@ -450,6 +510,9 @@
 	GetComboText(GpuConfS.Combo, GpuConfS.plist, Config.Gpu);
 	GetComboText(SpuConfS.Combo, SpuConfS.plist, Config.Spu);
 	GetComboText(CdrConfS.Combo, CdrConfS.plist, Config.Cdr);
+#ifdef ENABLE_SIO1API
+	GetComboText(Sio1ConfS.Combo, Sio1ConfS.plist, Config.Sio1);
+#endif
 	GetComboText(Pad1ConfS.Combo, Pad1ConfS.plist, Config.Pad1);
 	GetComboText(Pad2ConfS.Combo, Pad2ConfS.plist, Config.Pad2);
 	GetComboText(BiosConfS.Combo, BiosConfS.plist, Config.Bios);
@@ -493,24 +556,24 @@
 	/* Populate the relevant combo widget with the list of plugins. \
 	 If no plugins available, disable the combo and its controls. \
 	 Note that the Bios plugin has no About/Conf control. */ \
-	type##ConfS.Combo = glade_xml_get_widget(xml, "GtkCombo_" name); \
+	type##ConfS.Combo = GTK_WIDGET(gtk_builder_get_object(builder, "GtkCombo_" name)); \
 	if (type##ConfS.glist != NULL) { \
 		populate_combo_box (type##ConfS.Combo, type##ConfS.glist); \
 		FindComboText(type##ConfS.Combo, type##ConfS.plist, Config.type); \
 		gtk_widget_set_sensitive (type##ConfS.Combo, TRUE); \
 		if (g_ascii_strcasecmp (name, "Bios") != 0) { \
-			controlwidget = glade_xml_get_widget(xml, "btn_Conf" name); \
+			controlwidget = GTK_WIDGET(gtk_builder_get_object(builder, "btn_Conf" name)); \
 			gtk_widget_set_sensitive (controlwidget, TRUE); \
-			controlwidget = glade_xml_get_widget(xml, "btn_About" name); \
+			controlwidget = GTK_WIDGET(gtk_builder_get_object(builder, "btn_About" name)); \
 			gtk_widget_set_sensitive (controlwidget, TRUE); \
 		} \
 	} else { \
 		if (g_ascii_strcasecmp (name, "Bios") != 0) { \
-			gtk_cell_layout_clear (GTK_CELL_LAYOUT (type##ConfS.Combo)); \
+			gtk_combo_box_set_model(GTK_COMBO_BOX(type##ConfS.Combo), NULL); \
 			gtk_widget_set_sensitive (type##ConfS.Combo, FALSE); \
-			controlwidget = glade_xml_get_widget(xml, "btn_Conf" name); \
+			controlwidget = GTK_WIDGET(gtk_builder_get_object(builder, "btn_Conf" name)); \
 			gtk_widget_set_sensitive (controlwidget, FALSE); \
-			controlwidget = glade_xml_get_widget(xml, "btn_About" name); \
+			controlwidget = GTK_WIDGET(gtk_builder_get_object(builder, "btn_About" name)); \
 			gtk_widget_set_sensitive (controlwidget, FALSE); \
 		} \
 	}
@@ -542,6 +605,9 @@
 	if (plugin_is_available (Config.Gpu) == FALSE) { Config.Gpu[0] = '\0'; return FALSE; }
 	if (plugin_is_available (Config.Spu) == FALSE) { Config.Spu[0] = '\0'; return FALSE; }
 	if (plugin_is_available (Config.Cdr) == FALSE) { Config.Cdr[0] = '\0'; return FALSE; }
+#ifdef ENABLE_SIO1API
+	if (plugin_is_available (Config.Sio1) == FALSE) { Config.Sio1[0] = '\0'; return FALSE; }
+#endif
 	if (plugin_is_available (Config.Pad1) == FALSE) { Config.Pad1[0] = '\0'; return FALSE; }
 	if (plugin_is_available (Config.Pad2) == FALSE) { Config.Pad2[0] = '\0'; return FALSE; }
 
@@ -598,12 +664,33 @@
 	char name[256];
 	gchar *linkname;
 
-	GpuConfS.plugins = 0; SpuConfS.plugins = 0; CdrConfS.plugins = 0;
-	Pad1ConfS.plugins = 0; Pad2ConfS.plugins = 0; BiosConfS.plugins = 0;
-	GpuConfS.glist = NULL; SpuConfS.glist = NULL; CdrConfS.glist = NULL;
-	Pad1ConfS.glist = NULL; Pad2ConfS.glist = NULL; BiosConfS.glist = NULL;
-	GpuConfS.plist[0][0] = '\0'; SpuConfS.plist[0][0] = '\0'; CdrConfS.plist[0][0] = '\0';
-	Pad1ConfS.plist[0][0] = '\0'; Pad2ConfS.plist[0][0] = '\0'; BiosConfS.plist[0][0] = '\0';
+	GpuConfS.plugins = 0;
+	SpuConfS.plugins = 0;
+	CdrConfS.plugins = 0;
+#ifdef ENABLE_SIO1API
+	Sio1ConfS.plugins = 0;
+#endif
+	Pad1ConfS.plugins = 0;
+	Pad2ConfS.plugins = 0;
+	BiosConfS.plugins = 0;
+	GpuConfS.glist = NULL;
+	SpuConfS.glist = NULL;
+	CdrConfS.glist = NULL;
+#ifdef ENABLE_SIO1API
+	Sio1ConfS.glist = NULL;
+#endif
+	Pad1ConfS.glist = NULL;
+	Pad2ConfS.glist = NULL;
+	BiosConfS.glist = NULL;
+	GpuConfS.plist[0][0] = '\0';
+	SpuConfS.plist[0][0] = '\0';
+	CdrConfS.plist[0][0] = '\0';
+#ifdef ENABLE_SIO1API
+	Sio1ConfS.plist[0][0] = '\0';
+#endif
+	Pad1ConfS.plist[0][0] = '\0';
+	Pad2ConfS.plist[0][0] = '\0';
+	BiosConfS.plist[0][0] = '\0';
 
 	// Load and get plugin info
 	dir = opendir(Config.PluginsDir);
@@ -630,6 +717,9 @@
 		if (PSE_getLibType == NULL) {
 			if (strstr(linkname, "gpu") != NULL) type = PSE_LT_GPU;
 			else if (strstr(linkname, "cdr") != NULL) type = PSE_LT_CDR;
+#ifdef ENABLE_SIO1API
+			else if (strstr(linkname, "sio1") != NULL) type = PSE_LT_SIO1;
+#endif
 			else if (strstr(linkname, "spu") != NULL) type = PSE_LT_SPU;
 			else if (strstr(linkname, "pad") != NULL) type = PSE_LT_PAD;
 			else { g_free(linkname); continue; }
@@ -652,6 +742,10 @@
 
 		if (type & PSE_LT_CDR)
 			ComboAddPlugin(Cdr);
+#ifdef ENABLE_SIO1API
+		if (type & PSE_LT_SIO1)
+			ComboAddPlugin(Sio1);
+#endif
 		if (type & PSE_LT_GPU)
 			ComboAddPlugin(Gpu);
 		if (type & PSE_LT_SPU)
@@ -671,21 +765,24 @@
 
 	scan_bios_dir(Config.BiosDir);
 
-	// The BIOS list always contains the PCSX internal BIOS
+	// The BIOS list always contains the PCSXR internal BIOS
 	add_bios_to_list(_("Simulate PSX BIOS"), "HLE");
 }
 
-static void UpdatePluginsBIOS_UpdateGUI(GladeXML *xml) {
+static void UpdatePluginsBIOS_UpdateGUI() {
 	// Populate the plugin combo boxes
 	ConfCreatePConf("Gpu", Gpu);
 	ConfCreatePConf("Spu", Spu);
 	ConfCreatePConf("Pad1", Pad1);
 	ConfCreatePConf("Pad2", Pad2);
 	ConfCreatePConf("Cdr", Cdr);
+#ifdef ENABLE_SIO1API
+	ConfCreatePConf("Sio1", Sio1);
+#endif
 	ConfCreatePConf("Bios", Bios);
 }
 
-static void FindNetPlugin(GladeXML *xml) {
+static void FindNetPlugin() {
 	DIR *dir;
 	struct dirent *ent;
 	void *Handle;
@@ -756,8 +853,7 @@
 // When the auto-detect CPU type is selected, disable the NTSC/PAL selection
 static void OnCpu_PsxAutoClicked (GtkWidget *widget, gpointer user_data) {
 	GtkWidget *combo;
-	GladeXML *xml = user_data;
-	combo = glade_xml_get_widget(xml, "GtkCombo_PsxType");
+	combo = GTK_WIDGET(gtk_builder_get_object(builder, "GtkCombo_PsxType"));
 
 	gtk_widget_set_sensitive (combo,
 			!(gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))));
@@ -766,8 +862,7 @@
 // When the interpreter core is deselected, disable the debugger checkbox
 static void OnCpu_CpuClicked(GtkWidget *widget, gpointer user_data) {
 	GtkWidget *check;
-	GladeXML *xml = user_data;
-	check = glade_xml_get_widget(xml, "GtkCheckButton_Dbg");
+	check = GTK_WIDGET(gtk_builder_get_object(builder, "GtkCheckButton_Dbg"));
 
 	// Debugger is only working with interpreter not recompiler, so let's set it
 	if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
@@ -779,11 +874,10 @@
 
 void OnCpu_Clicked(GtkDialog *dialog, gint arg1, gpointer user_data) {
 	GtkWidget *widget;
-	GladeXML *xml = user_data;
 	int tmp;
 	long t;
 
-	widget = glade_xml_get_widget(xml, "GtkCombo_PsxType");
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "GtkCombo_PsxType"));
 
 	// If nothing chosen, default to NTSC
 	tmp = gtk_combo_box_get_active (GTK_COMBO_BOX (widget));
@@ -795,21 +889,22 @@
 	else
 		Config.PsxType = PSX_TYPE_PAL;
 
-	Config.Xa = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_Xa")));
-	Config.Sio = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_Sio")));
-	Config.Mdec = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_Mdec")));
-	Config.Cdda = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_CDDA")));
-	Config.PsxAuto = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_PsxAuto")));
+	Config.Xa = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_Xa")));
+	Config.SioIrq = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_SioIrq")));
+	Config.Mdec = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_Mdec")));
+	Config.Cdda = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_CDDA")));
+	Config.SlowBoot = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_SlowBoot")));
+	Config.PsxAuto = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_PsxAuto")));
 
 	t = Config.Debug;
-	Config.Debug = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_Dbg")));
+	Config.Debug = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_Dbg")));
 	if (t != Config.Debug) {
 		if (Config.Debug) StartDebugger();
 		else StopDebugger();
 	}
 
 	t = Config.Cpu;
-	Config.Cpu = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_Cpu")));
+	Config.Cpu = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_Cpu")));
 	if (t != Config.Cpu) {
 		psxCpu->Shutdown();
 #ifdef PSXREC
@@ -827,10 +922,11 @@
 		psxCpu->Reset();
 	}
 
-	Config.PsxOut = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_PsxOut")));
-	Config.SpuIrq = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_SpuIrq")));
-	Config.RCntFix = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_RCntFix")));
-	Config.VSyncWA = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_VSyncWA")));
+	Config.PsxOut = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_PsxOut")));
+	Config.SpuIrq = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_SpuIrq")));
+	Config.RCntFix = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_RCntFix")));
+	Config.VSyncWA = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_VSyncWA")));
+	Config.Widescreen = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_Widescreen")));
 
 	SaveConfig();
 
@@ -839,51 +935,55 @@
 }
 
 void OnConf_Cpu() {
-	GladeXML *xml;
-
-	xml = glade_xml_new(PACKAGE_DATA_DIR "pcsx.glade2", "CpuDlg", NULL);
+	
 
-	if (!xml) {
-		g_warning("We could not load the interface!");
+	builder = gtk_builder_new();
+	
+	if (!gtk_builder_add_from_file(builder, PACKAGE_DATA_DIR "pcsxr.ui", NULL)) {
+		g_warning("Error: interface could not be loaded!");
 		return;
 	}
 
-	CpuDlg = glade_xml_get_widget(xml, "CpuDlg");
+	CpuDlg = GTK_WIDGET(gtk_builder_get_object(builder, "CpuDlg"));
+
+	gtk_widget_show (CpuDlg);
 
-	PsxCombo = glade_xml_get_widget(xml, "GtkCombo_PsxType");
+	PsxCombo = GTK_WIDGET(gtk_builder_get_object(builder, "GtkCombo_PsxType"));
 	gtk_combo_box_set_active(GTK_COMBO_BOX (PsxCombo), Config.PsxType);
 	gtk_widget_set_sensitive(GTK_WIDGET (PsxCombo), !Config.PsxAuto);
 
-	gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_Xa")), Config.Xa);
-	gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_Sio")), Config.Sio);
-	gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_Mdec")), Config.Mdec);
-	gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_CDDA")), Config.Cdda);
-	gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_PsxAuto")), Config.PsxAuto);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_Xa")), Config.Xa);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_SioIrq")), Config.SioIrq);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_Mdec")), Config.Mdec);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_CDDA")), Config.Cdda);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_SlowBoot")), Config.SlowBoot);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_PsxAuto")), Config.PsxAuto);
 
-	g_signal_connect_data(GTK_OBJECT(glade_xml_get_widget(xml, "GtkCheckButton_PsxAuto")), "toggled",
-			GTK_SIGNAL_FUNC(OnCpu_PsxAutoClicked), xml, NULL, G_CONNECT_AFTER);
+	g_signal_connect_data(G_OBJECT(gtk_builder_get_object(builder, "GtkCheckButton_PsxAuto")), "toggled",
+			G_CALLBACK(OnCpu_PsxAutoClicked), builder, NULL, G_CONNECT_AFTER);
 
 #ifdef PSXREC
-	gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "GtkCheckButton_Cpu")), Config.Cpu);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "GtkCheckButton_Cpu")), Config.Cpu);
 
-	g_signal_connect_data(GTK_OBJECT(glade_xml_get_widget(xml, "GtkCheckButton_Cpu")), "toggled",
-			GTK_SIGNAL_FUNC(OnCpu_CpuClicked), xml, NULL, G_CONNECT_AFTER);
+	g_signal_connect_data(G_OBJECT(gtk_builder_get_object(builder, "GtkCheckButton_Cpu")), "toggled",
+			G_CALLBACK(OnCpu_CpuClicked), builder, NULL, G_CONNECT_AFTER);
 #else
 	Config.Cpu = CPU_INTERPRETER;
 
-	gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "GtkCheckButton_Cpu")), TRUE);
-	gtk_widget_set_sensitive(GTK_WIDGET (glade_xml_get_widget(xml, "GtkCheckButton_Cpu")), FALSE);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "GtkCheckButton_Cpu")), TRUE);
+	gtk_widget_set_sensitive(GTK_WIDGET (gtk_builder_get_object(builder, "GtkCheckButton_Cpu")), FALSE);
 #endif
 
-	gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "GtkCheckButton_Dbg")), Config.Cpu && Config.Debug);
-	gtk_widget_set_sensitive(GTK_WIDGET (glade_xml_get_widget(xml, "GtkCheckButton_Dbg")), Config.Cpu);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "GtkCheckButton_Dbg")), Config.Cpu && Config.Debug);
+	gtk_widget_set_sensitive(GTK_WIDGET (gtk_builder_get_object(builder, "GtkCheckButton_Dbg")), Config.Cpu);
 
-	gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_PsxOut")), Config.PsxOut);
-	gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_SpuIrq")), Config.SpuIrq);
-	gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_RCntFix")), Config.RCntFix);
-	gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_VSyncWA")), Config.VSyncWA);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_PsxOut")), Config.PsxOut);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_SpuIrq")), Config.SpuIrq);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_RCntFix")), Config.RCntFix);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_VSyncWA")), Config.VSyncWA);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_Widescreen")), Config.Widescreen);
 
 	// Setup a handler for when Close or Cancel is clicked
-	g_signal_connect_data(GTK_OBJECT(CpuDlg), "response",
-			GTK_SIGNAL_FUNC(OnCpu_Clicked), xml, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
+	g_signal_connect_data(G_OBJECT(CpuDlg), "response",
+			G_CALLBACK(OnCpu_Clicked), builder, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
 }

pcsxr-1.9.92.tar.bz2/gui/ConfDlg.h -> pcsxr-1.9.93.tar.bz2/gui/ConfDlg.h Changed

pcsxr-1.9.92.tar.bz2/gui/Config.c -> pcsxr-1.9.93.tar.bz2/gui/Config.c Changed

pcsxr-1.9.92.tar.bz2/gui/DebugMemory.c -> pcsxr-1.9.93.tar.bz2/gui/DebugMemory.c Changed

@@ -13,17 +13,29 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
 #include "Linux.h"
 #include "../libpcsxcore/psxmem.h"
-#include <glade/glade.h>
+#include <gtk/gtk.h>
 
 #define MEMVIEW_MAX_LINES 256
 
+static GtkBuilder *builder;
 static GtkWidget *MemViewDlg = NULL;
 static u32 MemViewAddress = 0;
+static u8 MemViewValue = 0;
+
+/* Copy value of MemViewAddress as text of entry_address */
+static void sync_update_address_text() {
+	char buftext[20];
+	GtkWidget *widget;
+
+	sprintf(buftext, "%.8X", MemViewAddress | 0x80000000);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "entry_address"));
+	gtk_entry_set_text(GTK_ENTRY(widget), buftext);
+}
 
 static void UpdateMemViewDlg() {
 	s32 start, end;
@@ -38,22 +50,17 @@
 
 	GtkTreeIter iter;
 	GtkWidget *widget;
-	GladeXML *xml;
-
-	xml = glade_get_widget_tree(MemViewDlg);
 
 	MemViewAddress &= 0x1fffff;
 
-	sprintf(buftext, "%.8X", MemViewAddress | 0x80000000);
-	widget = glade_xml_get_widget(xml, "entry_address");
-	gtk_entry_set_text(GTK_ENTRY(widget), buftext);
+	sync_update_address_text();
 
 	start = MemViewAddress & 0x1ffff0;
 	end = start + MEMVIEW_MAX_LINES * 16;
 
 	if (end > 0x1fffff) end = 0x1fffff;
 
-	widget = glade_xml_get_widget(xml, "GtkCList_MemView");
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "GtkCList_MemView"));
 
 	buftext[16] = '\0';
 
@@ -83,18 +90,60 @@
 	gtk_widget_show(widget);
 }
 
+static void MemView_Prev() {
+	MemViewAddress -= MEMVIEW_MAX_LINES;
+	sync_update_address_text();
+	UpdateMemViewDlg();
+}
+
+static void MemView_Next() {
+	MemViewAddress += MEMVIEW_MAX_LINES;
+	sync_update_address_text();
+	UpdateMemViewDlg();
+}
+
 static void MemView_Go() {
 	GtkWidget *widget;
-	GladeXML *xml;
 
-	xml = glade_get_widget_tree(MemViewDlg);
-	widget = glade_xml_get_widget(xml, "entry_address");
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "entry_address"));
 
 	sscanf(gtk_entry_get_text(GTK_ENTRY(widget)), "%x", &MemViewAddress);
 
 	UpdateMemViewDlg();
 }
 
+static void MemView_RowActivated(
+	GtkTreeView			*tree_view,
+	GtkTreePath			*path,
+	GtkTreeViewColumn	*column,
+	gpointer			user_data)
+{
+	GtkTreeIter iter;
+	GtkTreeModel *mdl = gtk_tree_view_get_model(tree_view);
+
+	if (gtk_tree_model_get_iter(mdl, &iter, path)) {
+		const char *title = gtk_tree_view_column_get_title(column);
+		char *value, *address;
+		s8 index;
+		if (title[1] != '\0') {
+			index=1;
+		} else if (title[0] > 0x40) {
+			index=title[0]-0x36;
+		} else {
+			index=title[0]-0x2F;
+		}
+		gtk_tree_model_get(mdl, &iter, 0, &address, index, &value, -1);
+		sscanf(value, "%x", &MemViewValue);
+		sscanf(address, "%x", &MemViewAddress);
+		MemViewAddress &= ~0xF;
+		MemViewAddress |= (index-1u);
+		sync_update_address_text();
+
+		g_free(address);
+		g_free(value);
+	}
+}
+
 static void MemView_Dump() {
 	GtkWidget *dlg;
 	GtkWidget *box, *table, *label, *start_edit, *length_edit;
@@ -104,7 +153,7 @@
 		GTK_DIALOG_MODAL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 		GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL);
 
-	box = GTK_WIDGET(GTK_DIALOG(dlg)->vbox);
+	box = GTK_WIDGET(gtk_dialog_get_content_area(GTK_DIALOG(dlg)));
 
 	table = gtk_table_new(2, 2, FALSE);
 
@@ -112,7 +161,8 @@
 	gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, 0, 0, 5, 5);
 	gtk_widget_show(label);
 
-	start_edit = gtk_entry_new_with_max_length(8);
+	start_edit = gtk_entry_new();
+	gtk_entry_set_max_length(GTK_ENTRY(start_edit), 8);
 	sprintf(buf, "%.8X", MemViewAddress | 0x80000000);
 	gtk_entry_set_text(GTK_ENTRY(start_edit), buf);
 	gtk_table_attach(GTK_TABLE(table), start_edit, 1, 2, 0, 1, 0, 0, 5, 5);
@@ -175,13 +225,13 @@
 static void MemView_Patch() {
 	GtkWidget *dlg;
 	GtkWidget *box, *table, *label, *addr_edit, *val_edit;
-	char buf[10];
+	char buf[12];
 
 	dlg = gtk_dialog_new_with_buttons(_("Memory Patch"), GTK_WINDOW(MemViewDlg),
 		GTK_DIALOG_MODAL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 		GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL);
 
-	box = GTK_WIDGET(GTK_DIALOG(dlg)->vbox);
+	box = GTK_WIDGET(gtk_dialog_get_content_area(GTK_DIALOG(dlg)));
 
 	table = gtk_table_new(2, 2, FALSE);
 
@@ -189,7 +239,8 @@
 	gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, 0, 0, 5, 5);
 	gtk_widget_show(label);
 
-	addr_edit = gtk_entry_new_with_max_length(8);
+	addr_edit = gtk_entry_new();
+	gtk_entry_set_max_length(GTK_ENTRY(addr_edit), 8);
 	sprintf(buf, "%.8X", MemViewAddress | 0x80000000);
 	gtk_entry_set_text(GTK_ENTRY(addr_edit), buf);
 	gtk_table_attach(GTK_TABLE(table), addr_edit, 1, 2, 0, 1, 0, 0, 5, 5);
@@ -200,6 +251,8 @@
 	gtk_widget_show(label);
 
 	val_edit = gtk_entry_new();
+	sprintf(buf, "%.2X", MemViewValue);
+	gtk_entry_set_text(GTK_ENTRY(val_edit), buf);
 	gtk_table_attach(GTK_TABLE(table), val_edit, 1, 2, 1, 2, 0, 0, 5, 5);
 	gtk_widget_show(val_edit);
 
@@ -247,23 +300,25 @@
 }
 
 void RunDebugMemoryDialog() {
-	GladeXML *xml;
 	GtkWidget *widget;
 	GtkCellRenderer *renderer;
 	GtkTreeViewColumn *column;
 	PangoFontDescription *pfd;
 	int i;
-
-	xml = glade_xml_new(PACKAGE_DATA_DIR "pcsx.glade2", "MemViewDlg", NULL);
-	if (!xml) {
-		g_warning(_("Error: Glade interface could not be loaded!"));
+	
+	builder = gtk_builder_new();
+	
+	if (!gtk_builder_add_from_file(builder, PACKAGE_DATA_DIR "pcsxr.ui", NULL)) {
+		g_warning("Error: interface could not be loaded!");
 		return;
 	}
-
-	MemViewDlg = glade_xml_get_widget(xml, "MemViewDlg");
+	
+	MemViewDlg = GTK_WIDGET(gtk_builder_get_object(builder, "MemViewDlg"));
+	
 	gtk_window_set_title(GTK_WINDOW(MemViewDlg), _("Memory Viewer"));
-
-	widget = glade_xml_get_widget(xml, "GtkCList_MemView");
+	gtk_widget_show (MemViewDlg);
+	
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "GtkCList_MemView"));
 
 	renderer = gtk_cell_renderer_text_new();
 	column = gtk_tree_view_column_new_with_attributes(_("Address"),
@@ -290,23 +345,36 @@
 
 	pfd = pango_font_description_from_string("Bitstream Vera Sans Mono, "
 		"DejaVu Sans Mono, Liberation Mono, FreeMono, Sans Mono 9");
-	gtk_widget_modify_font(widget, pfd);
+
+	gtk_widget_override_font(widget, pfd);
+
 	pango_font_description_free(pfd);
 
 	UpdateMemViewDlg();
 
-	widget = glade_xml_get_widget(xml, "btn_dump");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		GTK_SIGNAL_FUNC(MemView_Dump), xml, NULL, G_CONNECT_AFTER);
+	g_signal_connect_data(G_OBJECT(widget), "row-activated",
+		G_CALLBACK(MemView_RowActivated), builder, NULL, G_CONNECT_AFTER);
+
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "btn_dump"));
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+		G_CALLBACK(MemView_Dump), builder, NULL, G_CONNECT_AFTER);
+
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "btn_patch"));
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+		G_CALLBACK(MemView_Patch), builder, NULL, G_CONNECT_AFTER);
+
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "btn_go"));
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+		G_CALLBACK(MemView_Go), builder, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "btn_patch");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		GTK_SIGNAL_FUNC(MemView_Patch), xml, NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "btn_prev"));
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+		G_CALLBACK(MemView_Prev), builder, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "btn_go");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		GTK_SIGNAL_FUNC(MemView_Go), xml, NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "btn_next"));
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+		G_CALLBACK(MemView_Next), builder, NULL, G_CONNECT_AFTER);
 
-	g_signal_connect_data(GTK_OBJECT(MemViewDlg), "response",
-		GTK_SIGNAL_FUNC(MemView_Close), xml, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
+	g_signal_connect_data(G_OBJECT(MemViewDlg), "response",
+		G_CALLBACK(MemView_Close), builder, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
 }

pcsxr-1.9.92.tar.bz2/gui/DebugMemory.h -> pcsxr-1.9.93.tar.bz2/gui/DebugMemory.h Changed

pcsxr-1.9.93.tar.bz2/gui/GtkGui.c Added

@@ -0,0 +1,1129 @@
+/* Pcsx - Pc Psx Emulator
+ * Copyright (C) 1999-2002 Pcsx Team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <dirent.h>
+#include <dlfcn.h>
+#include <sys/stat.h>
+#include <gdk/gdkkeysyms.h>
+#include <gtk/gtk.h>
+#include <signal.h>
+#include <sys/time.h>
+#include <regex.h>
+
+#include "Linux.h"
+
+#include "../libpcsxcore/plugins.h"
+#include "../libpcsxcore/cheat.h"
+
+#include "MemcardDlg.h"
+#include "ConfDlg.h"
+#include "DebugMemory.h"
+#include "AboutDlg.h"
+
+// Functions Callbacks
+void OnFile_RunCd();
+void OnFile_RunBios();
+void OnFile_RunExe();
+void OnFile_RunImage();
+void OnEmu_Run();
+void OnEmu_Reset();
+void OnEmu_Shutdown();
+void OnEmu_SwitchImage();
+void OnHelp_Help();
+void OnHelp_About();
+void OnDestroy();
+void OnFile_Exit();
+
+void on_states_load(GtkWidget *widget, gpointer user_data);
+void on_states_load_other();
+void on_states_save(GtkWidget *widget, gpointer user_data);
+void on_states_save_other();
+
+static GtkBuilder *builder;
+GtkWidget *Window = NULL;
+
+int destroy = 0;
+
+#define MAX_SLOTS 9
+
+/* TODO - If MAX_SLOTS changes, need to find a way to automatically set all positions */
+int Slots[MAX_SLOTS] = { -1, -1, -1, -1, -1, -1, -1, -1, -1 };
+
+void ResetMenuSlots() {
+	GtkWidget *widget;
+	gchar *str;
+	int i;
+
+	if (CdromId[0] == '\0') {
+		// disable state saving/loading if no CD is loaded
+		for (i = 0; i < MAX_SLOTS; i++) {
+			str = g_strdup_printf("GtkMenuItem_SaveSlot%d", i+1);
+			widget = GTK_WIDGET(gtk_builder_get_object(builder, str));
+			g_free(str);
+
+			gtk_widget_set_sensitive(widget, FALSE);
+
+			str = g_strdup_printf("GtkMenuItem_LoadSlot%d", i+1);
+			widget = GTK_WIDGET(gtk_builder_get_object(builder, str));
+			g_free(str);
+
+			gtk_widget_set_sensitive(widget, FALSE);
+		}
+
+		// also disable certain menu/toolbar items
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "other1"));
+		gtk_widget_set_sensitive(widget, FALSE);
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "other2"));
+		gtk_widget_set_sensitive(widget, FALSE);
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "run1"));
+		gtk_widget_set_sensitive(widget, FALSE);
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "reset1"));
+		gtk_widget_set_sensitive(widget, FALSE);
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "shutdown1"));
+		gtk_widget_set_sensitive(widget, FALSE);
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "search1"));
+		gtk_widget_set_sensitive(widget, FALSE);
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "SwitchImage"));
+		gtk_widget_set_sensitive(widget, FALSE);
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "memorydump1"));
+		gtk_widget_set_sensitive(widget, FALSE);
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "toolbutton_run"));
+		gtk_widget_set_sensitive(widget, FALSE);
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "toolbutton_switchimage"));
+		gtk_widget_set_sensitive(widget, FALSE);
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "plugins_bios"));
+		gtk_widget_set_sensitive(widget, TRUE);
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "graphics1"));
+		gtk_widget_set_sensitive(widget, TRUE);
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "sound1"));
+		gtk_widget_set_sensitive(widget, TRUE);
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "cdrom1"));
+		gtk_widget_set_sensitive(widget, TRUE);
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "pad1"));
+		gtk_widget_set_sensitive(widget, TRUE);
+#ifdef ENABLE_SIO1API
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "sio1"));
+		gtk_widget_set_sensitive(widget, TRUE);
+#else
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "sio1"));
+		gtk_widget_set_sensitive(widget, FALSE);	
+#endif
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "net1"));
+		gtk_widget_set_sensitive(widget, TRUE);
+
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "toolbutton_switchimage"));
+		gtk_widget_set_sensitive(widget, UsingIso());
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "toolbutton_graphics"));
+		gtk_widget_set_sensitive(widget, TRUE);
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "toolbutton_sound"));
+		gtk_widget_set_sensitive(widget, TRUE);
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "toolbutton_cdrom"));
+		gtk_widget_set_sensitive(widget, TRUE);
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "toolbutton_controllers"));
+		gtk_widget_set_sensitive(widget, TRUE);
+		
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "statusbar"));
+		gtk_statusbar_pop(GTK_STATUSBAR(widget), 1);
+		gtk_statusbar_push(GTK_STATUSBAR(widget), 1, _("Ready"));
+	}
+	else {
+		for (i = 0; i < MAX_SLOTS; i++) {
+			str = g_strdup_printf("GtkMenuItem_LoadSlot%d", i+1);
+			widget = GTK_WIDGET(gtk_builder_get_object (builder, str));
+			g_free (str);
+
+			if (Slots[i] == -1) 
+				gtk_widget_set_sensitive(widget, FALSE);
+			else
+				gtk_widget_set_sensitive(widget, TRUE);
+		}
+
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "plugins_bios"));
+		gtk_widget_set_sensitive(widget, FALSE);
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "graphics1"));
+		gtk_widget_set_sensitive(widget, FALSE);
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "sound1"));
+		gtk_widget_set_sensitive(widget, FALSE);
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "cdrom1"));
+		gtk_widget_set_sensitive(widget, FALSE);
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "pad1"));
+		gtk_widget_set_sensitive(widget, FALSE);
+#ifdef ENABLE_SIO1API
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "sio1"));
+		gtk_widget_set_sensitive(widget, FALSE);
+#endif
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "net1"));
+		gtk_widget_set_sensitive(widget, FALSE);
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "SwitchImage"));
+		gtk_widget_set_sensitive(widget, UsingIso());
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "toolbutton_switchimage"));
+		gtk_widget_set_sensitive(widget, UsingIso());
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "toolbutton_graphics"));
+		gtk_widget_set_sensitive(widget, FALSE);
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "toolbutton_sound"));
+		gtk_widget_set_sensitive(widget, FALSE);
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "toolbutton_cdrom"));
+		gtk_widget_set_sensitive(widget, FALSE);
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "toolbutton_controllers"));
+		gtk_widget_set_sensitive(widget, FALSE);
+
+		widget = GTK_WIDGET(gtk_builder_get_object(builder, "statusbar"));
+		gtk_statusbar_pop(GTK_STATUSBAR(widget), 1);
+		gtk_statusbar_push(GTK_STATUSBAR(widget), 1, _("Emulation Paused."));
+	}
+}
+
+int match(const char *string, char *pattern) {
+	int status;
+	regex_t re;
+
+	if (regcomp(&re, pattern, REG_EXTENDED | REG_NOSUB) != 0) {
+		return 0;
+	}
+	status = regexec(&re, string, (size_t) 0, NULL, 0);
+	regfree(&re);
+	if (status != 0) {
+		return 0;
+	}
+
+	return 1;
+}
+
+gchar* get_state_filename(int i) {
+	gchar *state_filename, *trimlabel;
+	char SStateFile[64];
+	int j;
+
+	trimlabel = get_cdrom_label_trim();
+
+	sprintf(SStateFile, "%.32s-%.9s.%3.3d", trimlabel, CdromId, i);
+	state_filename = g_build_filename (getenv("HOME"), STATES_DIR, SStateFile, NULL);
+
+	g_free(trimlabel);
+
+	return state_filename;
+}
+
+gchar* get_cdrom_label_trim() {
+	char trimlabel[33];
+	int j;
+
+	strncpy(trimlabel, CdromLabel, 32);
+	trimlabel[32] = 0;
+	for (j = 31; j >= 0; j--) {
+		if (trimlabel[j] == ' ')
+			trimlabel[j] = 0;
+		else
+			continue;
+	}
+
+	return g_strdup(trimlabel);
+}
+
+gchar* get_cdrom_label_id(const gchar* suffix) {
+	const u8 lblmax = sizeof(CdromId) + sizeof(CdromLabel) + 20u;
+	//printf("MAx %u\n", lblmax);
+	char buf[lblmax];
+	gchar *trimlabel = get_cdrom_label_trim();
+
+	snprintf(buf, lblmax, "%.32s-%.9s%s", trimlabel, CdromId, suffix);
+
+	g_free(trimlabel);
+
+	return g_strdup(buf);
+}
+
+void UpdateMenuSlots() {
+	gchar *str;
+	int i;
+
+	for (i = 0; i < MAX_SLOTS; i++) {
+		str = get_state_filename (i);
+		Slots[i] = CheckState(str);
+		g_free (str);
+	}
+}
+
+void autoloadCheats() {
+	gchar *chtfile = get_cdrom_label_id(dot_extension_cht);
+	gchar *defaultChtFilePath = g_build_filename (getenv("HOME"), CHEATS_DIR, chtfile, NULL);
+	LoadCheats(defaultChtFilePath); // file existence/access check in LoadCheats()
+	g_free(defaultChtFilePath);
+	g_free(chtfile);
+}
+
+void StartGui() {
+	GtkWidget *widget;
+
+	/* If a plugin fails, the Window is not NULL, but is not initialised,
+	 so the following causes a segfault
+	if (Window != NULL) {
+		gtk_window_present (GTK_WINDOW (Window));
+		return;
+	}*/
+	builder = gtk_builder_new();
+	
+	if (!gtk_builder_add_from_file(builder, PACKAGE_DATA_DIR "pcsxr.ui", NULL)) {
+		g_warning("Error: interface could not be loaded!");
+		return;
+	}
+	
+	Window = GTK_WIDGET(gtk_builder_get_object(builder, "MainWindow"));
+	gtk_widget_show(GTK_WIDGET(Window));
+
+	gtk_window_set_title(GTK_WINDOW(Window), "PCSXR");
+	gtk_window_set_icon_from_file(GTK_WINDOW(Window), PIXMAPDIR "pcsxr-icon.png", NULL);
+	gtk_window_set_default_icon_from_file(PIXMAPDIR "pcsxr-icon.png", NULL);
+	ResetMenuSlots();
+
+	// Set up callbacks
+	g_signal_connect_data(G_OBJECT(Window), "delete-event",
+			G_CALLBACK(OnDestroy), builder, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
+
+	// File menu
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "RunCd"));
+	g_signal_connect_data(G_OBJECT(widget), "activate",
+			G_CALLBACK(OnFile_RunCd), NULL, NULL, G_CONNECT_AFTER);
+
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "RunBios"));
+	g_signal_connect_data(G_OBJECT(widget), "activate",
+			G_CALLBACK(OnFile_RunBios), NULL, NULL, G_CONNECT_AFTER);
+
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "RunExe"));
+	g_signal_connect_data(G_OBJECT(widget), "activate",
+			G_CALLBACK(OnFile_RunExe), NULL, NULL, G_CONNECT_AFTER);
+
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "RunImage"));
+	g_signal_connect_data(G_OBJECT(widget), "activate",
+			G_CALLBACK(OnFile_RunImage), NULL, NULL, G_CONNECT_AFTER);
+
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "exit2"));
+	g_signal_connect_data(G_OBJECT(widget), "activate",
+			G_CALLBACK(OnFile_Exit), NULL, NULL, G_CONNECT_AFTER);
+
+	// States
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "GtkMenuItem_LoadSlot1"));
+	g_signal_connect_data(G_OBJECT(widget), "activate",
+			G_CALLBACK(on_states_load), GINT_TO_POINTER(0), NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "GtkMenuItem_LoadSlot2"));
+	g_signal_connect_data(G_OBJECT(widget), "activate",
+			G_CALLBACK(on_states_load), GINT_TO_POINTER(1), NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "GtkMenuItem_LoadSlot3"));
+	g_signal_connect_data(G_OBJECT(widget), "activate",
+			G_CALLBACK(on_states_load), GINT_TO_POINTER(2), NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "GtkMenuItem_LoadSlot4"));
+	g_signal_connect_data(G_OBJECT(widget), "activate",
+			G_CALLBACK(on_states_load), GINT_TO_POINTER(3), NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "GtkMenuItem_LoadSlot5"));
+	g_signal_connect_data(G_OBJECT(widget), "activate",
+			G_CALLBACK(on_states_load), GINT_TO_POINTER(4), NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "GtkMenuItem_LoadSlot6"));
+	g_signal_connect_data(G_OBJECT(widget), "activate",
+			G_CALLBACK(on_states_load), GINT_TO_POINTER(5), NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "GtkMenuItem_LoadSlot7"));
+	g_signal_connect_data(G_OBJECT(widget), "activate",
+			G_CALLBACK(on_states_load), GINT_TO_POINTER(6), NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "GtkMenuItem_LoadSlot8"));
+	g_signal_connect_data(G_OBJECT(widget), "activate",
+			G_CALLBACK(on_states_load), GINT_TO_POINTER(7), NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "GtkMenuItem_LoadSlot9"));
+	g_signal_connect_data(G_OBJECT(widget), "activate",
+			G_CALLBACK(on_states_load), GINT_TO_POINTER(8), NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "other1"));
+	g_signal_connect_data(G_OBJECT(widget), "activate",
+			G_CALLBACK(on_states_load_other), NULL, NULL, G_CONNECT_AFTER);			
+
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "GtkMenuItem_SaveSlot1"));
+	g_signal_connect_data(G_OBJECT(widget), "activate",
+			G_CALLBACK(on_states_save), GINT_TO_POINTER(0), NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "GtkMenuItem_SaveSlot2"));
+	g_signal_connect_data(G_OBJECT(widget), "activate",
+			G_CALLBACK(on_states_save), GINT_TO_POINTER(1), NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "GtkMenuItem_SaveSlot3"));
+	g_signal_connect_data(G_OBJECT(widget), "activate",
+			G_CALLBACK(on_states_save), GINT_TO_POINTER(2), NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "GtkMenuItem_SaveSlot4"));
+	g_signal_connect_data(G_OBJECT(widget), "activate",
+			G_CALLBACK(on_states_save), GINT_TO_POINTER(3), NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "GtkMenuItem_SaveSlot5"));
+	g_signal_connect_data(G_OBJECT(widget), "activate",
+			G_CALLBACK(on_states_save), GINT_TO_POINTER(4), NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "GtkMenuItem_SaveSlot6"));
+	g_signal_connect_data(G_OBJECT(widget), "activate",
+			G_CALLBACK(on_states_save), GINT_TO_POINTER(5), NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "GtkMenuItem_SaveSlot7"));
+	g_signal_connect_data(G_OBJECT(widget), "activate",
+			G_CALLBACK(on_states_save), GINT_TO_POINTER(6), NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "GtkMenuItem_SaveSlot8"));
+	g_signal_connect_data(G_OBJECT(widget), "activate",
+			G_CALLBACK(on_states_save), GINT_TO_POINTER(7), NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "GtkMenuItem_SaveSlot9"));
+	g_signal_connect_data(G_OBJECT(widget), "activate",
+			G_CALLBACK(on_states_save), GINT_TO_POINTER(8), NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "other2"));
+	g_signal_connect_data(G_OBJECT(widget), "activate",
+			G_CALLBACK(on_states_save_other), NULL, NULL, G_CONNECT_AFTER);
+
+	// Emulation menu
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "run1"));
+	g_signal_connect_data(G_OBJECT(widget), "activate",
+			G_CALLBACK(OnEmu_Run), NULL, NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "reset1"));
+	g_signal_connect_data(G_OBJECT(widget), "activate",
+			G_CALLBACK(OnEmu_Reset), NULL, NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "shutdown1"));
+	g_signal_connect_data(G_OBJECT(widget), "activate",
+			G_CALLBACK(OnEmu_Shutdown), NULL, NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "SwitchImage"));
+	g_signal_connect_data(G_OBJECT(widget), "activate",
+			G_CALLBACK(OnEmu_SwitchImage), NULL, NULL, G_CONNECT_AFTER);
+
+	// Configuration menu
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "plugins_bios"));
+	g_signal_connect_data(G_OBJECT(widget), "activate",
+			G_CALLBACK(ConfigurePlugins), NULL, NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "graphics1"));
+	g_signal_connect_data(G_OBJECT(widget), "activate",
+			G_CALLBACK(OnConf_Graphics), NULL, NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "sound1"));
+	g_signal_connect_data(G_OBJECT(widget), "activate",
+			G_CALLBACK(OnConf_Sound), NULL, NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "cdrom1"));
+	g_signal_connect_data(G_OBJECT(widget), "activate",
+			G_CALLBACK(OnConf_CdRom), NULL, NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "pad1"));
+	g_signal_connect_data(G_OBJECT(widget), "activate",
+			G_CALLBACK(OnConf_Pad), NULL, NULL, G_CONNECT_AFTER);
+#ifdef ENABLE_SIO1API
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "sio1"));
+	g_signal_connect_data(G_OBJECT(widget), "activate",
+			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);
+	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);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "net1"));
+	g_signal_connect_data(G_OBJECT(widget), "activate",
+			G_CALLBACK(OnConf_Net), NULL, NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "memorydump1"));
+	g_signal_connect_data(G_OBJECT(widget), "activate",
+			G_CALLBACK(RunDebugMemoryDialog), NULL, NULL, G_CONNECT_AFTER);
+
+	// Cheat menu
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "browse1"));
+	g_signal_connect_data(G_OBJECT(widget), "activate",
+			G_CALLBACK(RunCheatListDialog), NULL, NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "search1"));
+	g_signal_connect_data(G_OBJECT(widget), "activate",
+			G_CALLBACK(RunCheatSearchDialog), NULL, NULL, G_CONNECT_AFTER);
+
+	// Help menu
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "about_pcsxr1"));
+	g_signal_connect_data(G_OBJECT(widget), "activate",
+			G_CALLBACK(OnHelp_About), NULL, NULL, G_CONNECT_AFTER);
+
+	// Toolbar
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "toolbutton_runcd"));
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+			G_CALLBACK(OnFile_RunCd), NULL, NULL, G_CONNECT_AFTER);
+
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "toolbutton_runimage"));
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+			G_CALLBACK(OnFile_RunImage), NULL, NULL, G_CONNECT_AFTER);
+
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "toolbutton_run"));
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+			G_CALLBACK(OnEmu_Run), NULL, NULL, G_CONNECT_AFTER);
+
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "toolbutton_switchimage"));
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+			G_CALLBACK(OnEmu_SwitchImage), NULL, NULL, G_CONNECT_AFTER);
+
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "toolbutton_memcards"));
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+			G_CALLBACK(OnConf_Mcds), NULL, NULL, G_CONNECT_AFTER);
+
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "toolbutton_graphics"));
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+			G_CALLBACK(OnConf_Graphics), NULL, NULL, G_CONNECT_AFTER);
+
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "toolbutton_sound"));
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+			G_CALLBACK(OnConf_Sound), NULL, NULL, G_CONNECT_AFTER);
+
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "toolbutton_cdrom"));
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+			G_CALLBACK(OnConf_CdRom), NULL, NULL, G_CONNECT_AFTER);
+
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "toolbutton_controllers"));
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+			G_CALLBACK(OnConf_Pad), NULL, NULL, G_CONNECT_AFTER);
+
+	gtk_main();
+}
+
+void OnDestroy() {
+	if (!destroy) OnFile_Exit();
+}
+
+void destroy_main_window () {
+#ifdef DISABLE_GNOME_SCREENSAVER
+	// Disable GNOME screensaver
+	int response_token = 0;
+	GError *error;
+	GDBusProxy *proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
+					G_DBUS_PROXY_FLAGS_NONE, NULL,
+					"org.gnome.ScreenSaver",
+					"org/gnome/ScreenSaver",
+					"org.gnome.ScreenSaver",
+					NULL, &error);
+
+	GVariant *retval = g_dbus_proxy_call_sync (proxy,
+					 "Inhibit",
+					 g_variant_new ("(ssu)", "PCSXR",
+							"Emulating",
+							response_token),
+					 G_DBUS_CALL_FLAGS_NONE,
+					 2, /* timeout */
+					 NULL, /* cancellable */
+					 &error);
+	printf("Response %i\n", response_token);
+#endif
+
+	destroy = 1;
+	gtk_widget_destroy(Window);
+	Window = NULL;
+	destroy = 0;
+	gtk_main_quit();
+	while (gtk_events_pending()) gtk_main_iteration();
+}
+
+void OnFile_RunExe() {
+	GtkWidget *file_chooser;
+
+	if (plugins_configured() == FALSE) {
+		ConfigurePlugins();
+	} else {
+		file_chooser = gtk_file_chooser_dialog_new(_("Select PSX EXE File"),
+			NULL, GTK_FILE_CHOOSER_ACTION_OPEN,
+			GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+			GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL);
+
+		// Add file filters
+		GtkFileFilter *exefilter = gtk_file_filter_new ();
+		gtk_file_filter_add_pattern (exefilter, "*.exe");
+		gtk_file_filter_add_pattern (exefilter, "*.psx");
+		gtk_file_filter_add_pattern (exefilter, "*.cpe");
+		gtk_file_filter_add_pattern (exefilter, "*.EXE");
+		gtk_file_filter_add_pattern (exefilter, "*.PSX");
+		gtk_file_filter_add_pattern (exefilter, "*.CPE");
+		gtk_file_filter_set_name (exefilter, _("PlayStation Executable Files"));
+		gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (file_chooser), exefilter);
+		GtkFileFilter *allfilter = gtk_file_filter_new ();
+		gtk_file_filter_add_pattern (allfilter, "*");
+		gtk_file_filter_set_name (allfilter, _("All Files"));
+		gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (file_chooser), allfilter);
+
+		// Set this to the config object and retain it - maybe LastUsedDir
+		gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(file_chooser), getenv("HOME"));
+
+		if (gtk_dialog_run(GTK_DIALOG(file_chooser)) == GTK_RESPONSE_ACCEPT) {
+			gchar *file;
+
+			/* TODO Need to validate the file */
+
+			file = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(file_chooser));
+
+			gtk_widget_destroy (file_chooser);
+			destroy_main_window();
+
+			SetIsoFile(NULL);
+			LoadPlugins();
+			NetOpened = FALSE;
+
+			if (OpenPlugins() == -1) {
+				g_free(file);
+				SysRunGui();
+			} else {
+				// Auto-detect: get region first, then rcnt-bios reset
+				SysReset();
+
+				if (Load(file) == 0) {
+					g_free(file);
+					psxCpu->Execute();
+				} else {
+					g_free(file);
+					ClosePlugins();
+					SysErrorMessage(_("Not a valid PSX file"), _("The file does not appear to be a valid Playstation executable"));
+					SysRunGui();
+				}
+			}
+		} else
+			gtk_widget_destroy(file_chooser);
+	}
+}
+
+void OnFile_RunCd() {
+	if (plugins_configured() == FALSE) { 
+		ConfigurePlugins();
+		return;
+	}
+
+	destroy_main_window();
+
+	SetIsoFile(NULL);
+	LoadPlugins();
+	NetOpened = FALSE;
+
+	if (OpenPlugins() == -1) {
+		SysRunGui();
+		return;
+	}
+
+	if (CheckCdrom() == -1) {
+		/* Only check the CD if we are starting the console with a CD */
+		ClosePlugins();
+		SysErrorMessage (_("CD ROM failed"), _("The CD does not appear to be a valid Playstation CD"));
+		SysRunGui();
+		return;
+	}
+
+	// Auto-detect: get region first, then rcnt-bios reset
+	SysReset();
+
+	// Read main executable directly from CDRom and start it
+	if (LoadCdrom() == -1) {
+		ClosePlugins();
+		SysErrorMessage(_("Could not load CD-ROM!"), _("The CD-ROM could not be loaded"));
+		SysRunGui();
+	}
+
+	autoloadCheats();
+	psxCpu->Execute();
+}
+
+void OnFile_RunBios() {
+	if (plugins_configured() == FALSE) { 
+		ConfigurePlugins();
+		return;
+	}
+
+	if (strcmp(Config.Bios, "HLE") == 0) {
+		SysErrorMessage (_("Could not run BIOS"), _("Running BIOS is not supported with Internal HLE BIOS."));
+		return;
+	}
+
+	destroy_main_window();
+
+	SetIsoFile(NULL);
+	LoadPlugins();
+	NetOpened = FALSE;
+
+	if (OpenPlugins() == -1) {
+		SysRunGui();
+		return;
+	}
+
+	SysReset();
+
+	CdromId[0] = '\0';
+	CdromLabel[0] = '\0';
+
+	psxCpu->Execute();
+}
+
+static gchar *Open_Iso_Proc() {
+	struct stat sb;
+	GtkWidget *chooser;
+	gchar *filename;
+	GtkFileFilter *psxfilter, *allfilter;
+	static char current_folder[MAXPATHLEN] = "";
+
+	chooser = gtk_file_chooser_dialog_new (_("Open PSX Disc Image File"),
+		NULL, GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+		GTK_STOCK_OK, GTK_RESPONSE_OK,
+		NULL);
+
+	if (stat(Config.IsoImgDir, &sb) == 0 && S_ISDIR(sb.st_mode)) {
+		strcpy(current_folder, Config.IsoImgDir);
+	} else if (strlen(Config.IsoImgDir) <= 0) {
+		strcpy(current_folder, getenv("HOME"));
+	} else {
+		/* Using static (recent) PATH */
+	}
+
+	gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER (chooser), current_folder);
+
+	psxfilter = gtk_file_filter_new();
+	gtk_file_filter_add_pattern(psxfilter, "*.bin");
+	gtk_file_filter_add_pattern(psxfilter, "*.img");
+	gtk_file_filter_add_pattern(psxfilter, "*.mdf");
+	gtk_file_filter_add_pattern(psxfilter, "*.iso");
+	gtk_file_filter_add_pattern(psxfilter, "*.cue");
+	gtk_file_filter_add_pattern(psxfilter, "*.pbp");
+	gtk_file_filter_add_pattern(psxfilter, "*.cbn");
+	gtk_file_filter_add_pattern(psxfilter, "*.BIN");
+	gtk_file_filter_add_pattern(psxfilter, "*.IMG");
+	gtk_file_filter_add_pattern(psxfilter, "*.MDF");
+	gtk_file_filter_add_pattern(psxfilter, "*.ISO");
+	gtk_file_filter_add_pattern(psxfilter, "*.CUE");
+	gtk_file_filter_add_pattern(psxfilter, "*.PBP");
+	gtk_file_filter_add_pattern(psxfilter, "*.CBN");
+	gtk_file_filter_set_name(psxfilter, _("PSX Image Files (*.bin, *.img, *.mdf, *.iso, *.cue, *.pbp, *.cbn)"));
+	gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (chooser), psxfilter);
+
+	allfilter = gtk_file_filter_new();
+	gtk_file_filter_add_pattern(allfilter, "*");
+	gtk_file_filter_set_name(allfilter, _("All Files"));
+	gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (chooser), allfilter);
+
+	if (gtk_dialog_run(GTK_DIALOG(chooser)) == GTK_RESPONSE_OK) {
+		gchar *path = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(chooser));
+		
+		/* Workaround:
+		for some reasons gtk_file_chooser_get_current_folder return NULL
+		if a file is selected from "Recently Used" or "Searsh"*/
+		if(path != NULL) {
+		 strcpy(current_folder, path);
+		 g_free(path);
+		}
+		
+		GSList * l = gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER (chooser));
+		if(l) {
+		filename = l->data;
+		
+		/* if the file was selected from "Recently Used" or "Searsh"
+		we need to extract the path from the filename to set it to current_folder*/
+		if(path == NULL) {
+		 strncpy(current_folder, filename, strrchr(filename, '/') - filename);
+		}
+
+		/* If ISO path is NULL save current path. */
+		if (!S_ISDIR(sb.st_mode)) {
+		 strcpy(Config.IsoImgDir, current_folder);
+		 SaveConfig();
+		}
+
+		/* free useless data */
+		GSList * ll = l;
+		while(l->next) {
+			l = l->next;
+			g_free(l->data);
+		}
+		g_slist_free(ll);
+
+		gtk_widget_destroy(GTK_WIDGET(chooser));
+		while (gtk_events_pending()) gtk_main_iteration();
+		return filename;
+		} else {
+			gtk_widget_destroy (GTK_WIDGET(chooser));
+			while (gtk_events_pending()) gtk_main_iteration();
+			return NULL;
+		}
+	} else {
+		gtk_widget_destroy (GTK_WIDGET(chooser));
+		while (gtk_events_pending()) gtk_main_iteration();
+		return NULL;
+	}
+}
+
+void OnFile_RunImage() {
+	gchar *filename;
+
+	if (plugins_configured() == FALSE) { 
+		ConfigurePlugins();
+		return;
+	}
+
+	filename = Open_Iso_Proc();
+	if (filename == NULL) {
+		return;
+	}
+
+	destroy_main_window();
+
+	SetIsoFile(filename);
+	g_free(filename);
+
+	LoadPlugins();
+	NetOpened = FALSE;
+
+	if (OpenPlugins() == -1) {
+		SysRunGui();
+		return;
+	}
+
+	if (CheckCdrom() == -1) {
+		// Only check the CD if we are starting the console with a CD
+		ClosePlugins();
+		SysErrorMessage (_("CD ROM failed"), _("The CD does not appear to be a valid Playstation CD"));
+		SysRunGui();
+		return;
+	}
+
+	// Auto-detect: get region first, then rcnt-bios reset
+	SysReset();
+
+	// Read main executable directly from CDRom and start it
+	if (LoadCdrom() == -1) {
+		ClosePlugins();
+		SysErrorMessage(_("Could not load CD-ROM!"), _("The CD-ROM could not be loaded"));
+		SysRunGui();
+	}
+
+	autoloadCheats();
+	psxCpu->Execute();
+}
+
+void OnEmu_Run() {
+	if (plugins_configured() == FALSE) { 
+		ConfigurePlugins();
+		return;
+	}
+
+	destroy_main_window();
+
+	if (OpenPlugins() == -1) {
+		SysRunGui();
+		return;
+	}
+
+	CheatSearchBackupMemory();
+	psxCpu->Execute();
+}
+
+void OnEmu_Reset() {
+	if (plugins_configured() == FALSE) { 
+		ConfigurePlugins();
+		return;
+	}
+
+	destroy_main_window();
+
+	if (OpenPlugins() == -1) {
+		SysRunGui();
+		return;
+	}
+
+	if (CheckCdrom() != -1) {
+		LoadCdrom();
+	}
+
+	// Auto-detect: get region first, then rcnt-bios reset
+	SysReset();
+
+	psxCpu->Execute();
+}
+
+void OnEmu_Shutdown() {
+	ReleasePlugins();
+	SetIsoFile(NULL);
+	CdromId[0] = '\0';
+	CdromLabel[0] = '\0';
+	ResetMenuSlots();
+}
+
+void OnEmu_SwitchImage() {
+	gchar *filename;
+
+	if (plugins_configured() == FALSE) { 
+		ConfigurePlugins();
+		return;
+	}
+
+	filename = Open_Iso_Proc();
+	if (filename == NULL) {
+		return;
+	}
+
+	destroy_main_window();
+
+	SetIsoFile(filename);
+	g_free(filename);
+
+	if (OpenPlugins() == -1) {
+		SysRunGui();
+		return;
+	}
+
+	SetCdOpenCaseTime(time(NULL) + 2);
+	LidInterrupt(); // causes CD lid open event
+
+	CheatSearchBackupMemory();
+	psxCpu->Execute();
+}
+
+void OnFile_Exit() {
+	DIR *dir;
+	struct dirent *ent;
+	void *Handle;
+	gchar *plugin = NULL;
+	gchar *dotdir;
+
+	dotdir = g_build_filename(getenv("HOME"), PLUGINS_DIR, NULL);
+
+	// with this the problem with plugins that are linked with the pthread
+	// library is solved
+
+	dir = opendir(dotdir);
+	if (dir != NULL) {
+		while ((ent = readdir(dir)) != NULL) {
+			plugin = g_build_filename(dotdir, ent->d_name, NULL);
+
+			if (strstr(plugin, ".so") == NULL && strstr(plugin, ".dylib") == NULL)
+				continue;
+			Handle = dlopen(plugin, RTLD_NOW);
+			if (Handle == NULL)
+				continue;
+
+			g_free(plugin);
+		}
+	}
+	g_free(dotdir);
+
+	bind_textdomain_codeset(PACKAGE_NAME, "");
+	if (UseGui)
+		gtk_main_quit();
+	SysClose();
+	exit(0);
+}
+
+void state_load(gchar *state_filename) {
+	int ret;
+	char Text[MAXPATHLEN + 20];
+	FILE *fp;
+
+	// check if the state file actually exists
+	fp = fopen(state_filename, "rb");
+	if (fp == NULL) {
+		// file does not exist
+		return;
+	}
+
+	fclose(fp);
+
+	// If the window exists, then we are loading the state from within
+	// within the PCSXR GUI. We need to initialise the plugins first
+	if (Window) {
+		destroy_main_window();
+
+		if (OpenPlugins() == -1) {
+			SysRunGui();
+			return;
+		}
+	}
+
+	ret = CheckState(state_filename);
+
+	if (ret == 0) {
+		// Check the CD-ROM is valid
+		if (CheckCdrom() == -1) {
+			ClosePlugins();
+			SysRunGui();
+			return;
+		}
+
+		// Auto-detect: region first, then rcnt reset
+		SysReset();
+		ret = LoadState(state_filename);
+
+		sprintf(Text, _("Loaded state %s."), state_filename);
+		GPU_displayText(Text);
+	} else {
+		sprintf(Text, _("Error loading state %s!"), state_filename);
+		GPU_displayText(Text);
+	}
+}
+
+void state_save(gchar *state_filename) {
+	char Text[MAXPATHLEN + 20];
+
+	GPU_updateLace();
+
+	if (SaveState(state_filename) == 0)
+		sprintf(Text, _("Saved state %s."), state_filename);
+	else
+		sprintf(Text, _("Error saving state %s!"), state_filename);
+
+	GPU_displayText(Text);
+}
+
+void on_states_load (GtkWidget *widget, gpointer user_data) {
+	(void)widget; // unused
+
+	gchar *state_filename;
+	gint state = GPOINTER_TO_INT(user_data);
+
+	state_filename = get_state_filename(state);
+
+	state_load(state_filename);
+
+	g_free(state_filename);
+
+	psxCpu->Execute();
+}
+
+void on_states_save (GtkWidget *widget, gpointer user_data) {
+	(void)widget; // unused
+
+	gchar *state_filename;
+	gint state = GPOINTER_TO_INT(user_data);
+
+	state_filename = get_state_filename(state);
+
+	state_save(state_filename);
+
+	g_free(state_filename);
+}
+
+void on_states_load_other() {
+	GtkWidget *file_chooser;
+	gchar *SStateFile;
+
+	SStateFile = g_strconcat(getenv("HOME"), STATES_DIR, NULL);
+
+	file_chooser = gtk_file_chooser_dialog_new(_("Select State File"), NULL, GTK_FILE_CHOOSER_ACTION_OPEN,
+		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+		GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+		NULL);
+	gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER (file_chooser), SStateFile);
+	g_free(SStateFile);
+
+	if (gtk_dialog_run(GTK_DIALOG(file_chooser)) == GTK_RESPONSE_ACCEPT) {
+		gchar *filename;
+
+		filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(file_chooser));
+		gtk_widget_destroy(file_chooser);
+
+		state_load(filename);
+
+		g_free(filename);
+
+		psxCpu->Execute();
+	} else
+		gtk_widget_destroy(file_chooser);
+} 
+
+void on_states_save_other() {
+	GtkWidget *file_chooser;
+	gchar *SStateFile;
+
+	SStateFile = g_strconcat (getenv("HOME"), STATES_DIR, NULL);
+
+	file_chooser = gtk_file_chooser_dialog_new(_("Select State File"),
+			NULL, GTK_FILE_CHOOSER_ACTION_SAVE,
+			GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+			GTK_STOCK_SAVE, GTK_RESPONSE_OK,
+			NULL);
+	gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(file_chooser), SStateFile);
+	g_free(SStateFile);
+
+	if (gtk_dialog_run (GTK_DIALOG(file_chooser)) == GTK_RESPONSE_OK) {
+		gchar *filename;
+
+		filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER (file_chooser));
+		gtk_widget_destroy(file_chooser);
+
+		state_save(filename);
+
+		g_free(filename);
+	}
+	else
+		gtk_widget_destroy(file_chooser);
+} 
+
+void OnHelp_About(GtkWidget *widget, gpointer user_data) {
+	RunAboutDialog();
+}
+
+void SysMessage(const char *fmt, ...) {
+	GtkWidget *Txt, *MsgDlg;
+	va_list list;
+	char msg[512];
+
+	va_start(list, fmt);
+	vsprintf(msg, fmt, list);
+	va_end(list);
+
+	if (msg[strlen(msg) - 1] == '\n')
+		msg[strlen(msg) - 1] = 0;
+
+	if (!UseGui) {
+		fprintf(stderr, "%s\n", msg);
+		return;
+	}
+
+	MsgDlg = gtk_dialog_new_with_buttons(_("Notice"), NULL,
+		GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_OK, GTK_RESPONSE_NONE, NULL);
+
+	gtk_window_set_position (GTK_WINDOW(MsgDlg), GTK_WIN_POS_CENTER);
+
+	Txt = gtk_label_new (msg);
+	gtk_label_set_line_wrap(GTK_LABEL(Txt), TRUE);
+	gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area(GTK_DIALOG(MsgDlg))), Txt);
+
+	gtk_widget_show (Txt);
+	gtk_widget_show_all (MsgDlg);
+	gtk_dialog_run (GTK_DIALOG(MsgDlg));
+	gtk_widget_destroy (MsgDlg);
+}
+
+void SysErrorMessage(gchar *primary, gchar *secondary) {
+	GtkWidget *message_dialog;	
+	if (!UseGui)
+		printf ("%s - %s\n", primary, secondary);
+	else {
+		message_dialog = gtk_message_dialog_new(NULL,
+				GTK_DIALOG_MODAL,
+				GTK_MESSAGE_ERROR,
+				GTK_BUTTONS_CLOSE,
+				primary,
+				NULL);
+		gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(message_dialog),
+				secondary);
+
+		gtk_dialog_run(GTK_DIALOG(message_dialog));
+		gtk_widget_destroy(message_dialog);
+	}
+}
+
+void SysInfoMessage(gchar *primary, gchar *secondary) {
+	GtkWidget *message_dialog;	
+	if (!UseGui)
+		printf ("%s - %s\n", primary, secondary);
+	else {
+		message_dialog = gtk_message_dialog_new(NULL,
+				GTK_DIALOG_MODAL,
+				GTK_MESSAGE_INFO,
+				GTK_BUTTONS_CLOSE,
+				primary,
+				NULL);
+		gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(message_dialog),
+				secondary);
+
+		gtk_dialog_run(GTK_DIALOG(message_dialog));
+		gtk_widget_destroy(message_dialog);
+	}
+}

pcsxr-1.9.92.tar.bz2/gui/Linux.h -> pcsxr-1.9.93.tar.bz2/gui/Linux.h Changed

pcsxr-1.9.92.tar.bz2/gui/LnxMain.c -> pcsxr-1.9.93.tar.bz2/gui/LnxMain.c Changed

pcsxr-1.9.92.tar.bz2/gui/Makefile.am -> pcsxr-1.9.93.tar.bz2/gui/Makefile.am Changed

pcsxr-1.9.92.tar.bz2/gui/MemcardDlg.c -> pcsxr-1.9.93.tar.bz2/gui/MemcardDlg.c Changed

@@ -13,7 +13,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
 #include <stdio.h>
@@ -22,7 +22,6 @@
 #include <string.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
-#include <glade/glade.h>
 #include <signal.h>
 #include <sys/time.h>
 
@@ -37,14 +36,15 @@
 McdBlock Blocks[2][MAX_MEMCARD_BLOCKS];	// Assuming 2 cards, 15 blocks?
 int IconC[2][MAX_MEMCARD_BLOCKS];
 enum {
- CL_ICON,
- CL_TITLE,
- CL_STAT,
- CL_ID,
- CL_NAME,
- NUM_CL
+	CL_ICON,
+	CL_TITLE,
+	CL_STAT,
+	CL_ID,
+	CL_NAME,
+	NUM_CL
 };
 
+static GtkBuilder *builder;
 GtkWidget *GtkCList_McdList1, *GtkCList_McdList2;
 
 static void AddColumns(GtkTreeView *treeview) {
@@ -82,50 +82,56 @@
 	gtk_tree_view_append_column(treeview, column);
 }
 
-static GdkPixbuf *SetIcon(GtkWidget *dialog, short *icon, int i) {
-	GdkPixmap *pixmap;
-	GdkImage *image;
-	GdkVisual *visual;
-	GdkPixbuf *pixbuf;
-	GdkGC *gc;
-	int x, y, c;
-
-	visual = gdk_window_get_visual(dialog->window);
-
-	if (visual->depth == 8) return NULL;
-
-	image = gdk_image_new(GDK_IMAGE_NORMAL, visual, 32, 32);
-
-	for (y = 0; y < 32; y++) {
-		for (x = 0; x < 32; x++) {
-			c = icon[(y>>1) * 16 + (x>>1)];
-			c = ((c & 0x001f) << 10) | ((c & 0x7c00) >> 10) | (c & 0x03e0);
-			if (visual->depth == 16)
-				c = (c & 0x001f) | ((c & 0x7c00) << 1) | ((c & 0x03e0) << 1);
-			else if (visual->depth == 24 || visual->depth == 32)
-				c = ((c & 0x001f) << 3) | ((c & 0x03e0) << 6) | ((c & 0x7c00) << 9);
-
-			gdk_image_put_pixel(image, x, y, c);
+static GdkPixbuf *SetIcon(GtkWidget *dialog, short *icon, int scale) {
+	GdkPixbuf *gdkpixbuf;
+	GdkPixbuf *gdkpixbuf2;
+	guchar *dest_pixels;
+	u32 x, y;
+	u16 c;
+
+	gdkpixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, 0, 8, 16, 16);
+	dest_pixels = gdk_pixbuf_get_pixels(gdkpixbuf);
+
+	for (y = 0; y < 16; y++) {
+		for (x = 0; x < 16; x++) {
+			c = icon[y * 16 + x];
+			dest_pixels[0] = (c & 0x001f) << 3;
+			dest_pixels[1] = (c & 0x03e0) >> 2;
+			dest_pixels[2] = (c & 0x7c00) >> 7;
+			dest_pixels += 3;
 		}
 	}
 
-	pixmap = gdk_pixmap_new(dialog->window, 32, 32, visual->depth);
+	if(scale != 1) {
+		gdkpixbuf2 = gdk_pixbuf_scale_simple(gdkpixbuf, 16 * scale, 16 * scale, GDK_INTERP_NEAREST);
+		g_object_unref(gdkpixbuf);
+		return gdkpixbuf2;
+	}
 
-	gc = gdk_gc_new(pixmap);
-	gdk_draw_image(pixmap, gc, image, 0, 0, 0, 0, 32, 32);
-	gdk_gc_destroy(gc);
-	gdk_image_destroy(image);
+	return gdkpixbuf;
+}
 
-	pixbuf = gdk_pixbuf_get_from_drawable(NULL, GDK_PIXMAP (pixmap), NULL,
-										0, 0, 0, 0, -1, -1);
-	g_object_unref(pixmap);
-	
-	return pixbuf;
+static gchar* MCDStatusToChar(McdBlock *Info) {
+	gchar *state;
+	if ((Info->Flags & 0xF0) == 0xA0) {
+		if ((Info->Flags & 0xF) >= 1 && (Info->Flags & 0xF) <= 3)
+			state = _("Deleted");
+		else
+			state = _("Free");
+	} else if ((Info->Flags & 0xF0) == 0x50) {
+		if ((Info->Flags & 0xF) == 0x1)
+			state = _("Used");
+		else if ((Info->Flags & 0xF) == 0x2)
+			state = _("Link");
+		else if ((Info->Flags & 0xF) == 0x3)
+			state = _("End link");
+ } else
+		state = _("Free");
+	return state;
 }
 
 static void LoadListItems(int mcd, GtkWidget *widget) {
 	int i;
-	GladeXML *xml;
 	GtkWidget *List;
 	GtkWidget *dialog;
 	GtkListStore *store;
@@ -136,11 +142,10 @@
 	store = gtk_list_store_new(NUM_CL, GDK_TYPE_PIXBUF, G_TYPE_STRING,
 			G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
 
-	xml = glade_get_widget_tree(widget);
-	dialog = glade_xml_get_widget(xml, "McdsDlg");
+	dialog = GTK_WIDGET(gtk_builder_get_object(builder, "McdsDlg"));
 
-	if (mcd == 1) List = glade_xml_get_widget(xml, "GtkCList_McdList1");
-	else List = glade_xml_get_widget(xml, "GtkCList_McdList2");
+	if (mcd == 1) List = GTK_WIDGET(gtk_builder_get_object(builder, "GtkCList_McdList1"));
+	else List = GTK_WIDGET(gtk_builder_get_object(builder, "GtkCList_McdList2"));
 
 	for (i = 0; i < MAX_MEMCARD_BLOCKS; i++) {
 		McdBlock *Info;
@@ -148,19 +153,9 @@
 
 		Info = &Blocks[mcd - 1][i];
 		IconC[mcd - 1][i] = 0;
+		state = MCDStatusToChar(Info);
 
-		if ((Info->Flags & 0xF0) == 0xA0) {
-			if ((Info->Flags & 0xF) >= 1 &&
-				(Info->Flags & 0xF) <= 3) {
-				state = _("Deleted");
-			} else
-				state = _("Free");
-		} else if ((Info->Flags & 0xF0) == 0x50)
-			state = _("Used");
-		else
-			state = _("Free");
-
-		pixbuf = SetIcon(dialog, Info->Icon, i + 1);
+		pixbuf = SetIcon(dialog, Info->Icon, 2);
 
 		gtk_list_store_append(store, &iter);
 
@@ -188,20 +183,18 @@
 
 static void UpdateFilenameButtons(GtkWidget *widget) {
 	int i;
-	GladeXML *xml;
 	GtkWidget *dialog;
 	const char *filename;
 	gchar *p;
 
-	xml = glade_get_widget_tree(widget);
-	dialog = glade_xml_get_widget(xml, "McdsDlg");
+	dialog = GTK_WIDGET(gtk_builder_get_object(builder, "McdsDlg"));
 
 	for (i = 0; i < 2; i++) {
 		if (i == 0) {
-			widget = glade_xml_get_widget(xml, "Mcd1Label");
+			widget = GTK_WIDGET(gtk_builder_get_object(builder, "Mcd1Label"));
 			filename = Config.Mcd1;
 		} else {
-			widget = glade_xml_get_widget(xml, "Mcd2Label");
+			widget = GTK_WIDGET(gtk_builder_get_object(builder, "Mcd2Label"));
 			filename = Config.Mcd2;
 		}
 
@@ -228,7 +221,6 @@
 static void OnTreeSelectionChanged(GtkTreeSelection *selection, gpointer user_data);
 
 static void UpdateListItems(int mcd, GtkWidget *widget) {
-	GladeXML *xml;
 	GtkWidget *List;
 	GtkWidget *dialog;
 	GtkListStore *store;
@@ -238,11 +230,10 @@
 	int i;
 	gchar *title;
 
-	xml = glade_get_widget_tree(widget);
-	dialog = glade_xml_get_widget(xml, "McdsDlg");
+	dialog = GTK_WIDGET(gtk_builder_get_object(builder, "McdsDlg"));
 
-	if (mcd == 1) List = glade_xml_get_widget(xml, "GtkCList_McdList1");
-	else List = glade_xml_get_widget(xml, "GtkCList_McdList2");
+	if (mcd == 1) List = GTK_WIDGET(gtk_builder_get_object(builder, "GtkCList_McdList1"));
+	else List = GTK_WIDGET(gtk_builder_get_object(builder, "GtkCList_McdList2"));
 
 	store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(List)));
 	gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter);
@@ -254,16 +245,7 @@
 		Info = &Blocks[mcd - 1][i];
 		IconC[mcd - 1][i] = 0;
 
-		if ((Info->Flags & 0xF0) == 0xA0) {
-			if ((Info->Flags & 0xF) >= 1 &&
-				(Info->Flags & 0xF) <= 3) {
-				state = _("Deleted");
-			} else
-				state = _("Free");
-		} else if ((Info->Flags & 0xF0) == 0x50)
-			state = _("Used");
-		else
-			state = _("Free");
+		state = MCDStatusToChar(Info);
 
 		if (Info->IconCount > 0) {
 			pIcon = &Info->Icon[(currentIcon % Info->IconCount) * 16 * 16];
@@ -271,7 +253,7 @@
 			pIcon = Info->Icon;
 		}
 
-		pixbuf = SetIcon(dialog, pIcon, i + 1);
+		pixbuf = SetIcon(dialog, pIcon, 2);
 		title = g_convert(Info->sTitle, strlen(Info->sTitle), "UTF-8",
 			"Shift-JIS", NULL, NULL, NULL);
 
@@ -291,7 +273,7 @@
 
 	gtk_widget_show(List);
 
-	OnTreeSelectionChanged(gtk_tree_view_get_selection(GTK_TREE_VIEW(List)), (gpointer)mcd);
+	OnTreeSelectionChanged(gtk_tree_view_get_selection(GTK_TREE_VIEW(List)), GINT_TO_POINTER(mcd));
 }
 
 static void UpdateMcdDlg(GtkWidget *widget) {
@@ -315,16 +297,16 @@
 }
 
 static void OnMcd_FileChange(GtkWidget *widget, gpointer user_data) {
-	gint memcard = (int)user_data;
+	gint memcard = GPOINTER_TO_INT(user_data);
 	gchar *filename;
 	GtkWidget *chooser;
 
 	// Ask for name of memory card
 	chooser = gtk_file_chooser_dialog_new(_("Select A File"),
-	 NULL, GTK_FILE_CHOOSER_ACTION_OPEN,
-	 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-	 GTK_STOCK_OPEN, GTK_RESPONSE_OK,
-	 NULL);
+		NULL, GTK_FILE_CHOOSER_ACTION_OPEN,
+		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+		GTK_STOCK_OPEN, GTK_RESPONSE_OK,
+		NULL);
 
 	if (memcard == 1)
 		gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(chooser), Config.Mcd1);
@@ -352,12 +334,11 @@
 
 // format a memory card
 static void OnMcd_Format(GtkWidget *widget, gpointer user_data) {
-	GladeXML *xml;
 	GtkWidget *message_dialog;
 	gint result;
 	char *str;
 
-	gint memcard = (int)user_data;
+	gint memcard = GPOINTER_TO_INT(user_data);
 
 	message_dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL,
 		GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE,
@@ -372,8 +353,6 @@
 	gtk_widget_destroy(message_dialog);
 
 	if (result == GTK_RESPONSE_YES) {
-		xml = glade_get_widget_tree(widget);
-
 		if (memcard == 1) str = Config.Mcd1;
 		else str = Config.Mcd2;
 
@@ -391,13 +370,13 @@
 
 	// Ask for name of new memory card
 	chooser = gtk_file_chooser_dialog_new(_("Create a new Memory Card"),
-	 NULL, GTK_FILE_CHOOSER_ACTION_SAVE,
-	 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-	 GTK_STOCK_SAVE, GTK_RESPONSE_OK,
-	 NULL);
+		NULL, GTK_FILE_CHOOSER_ACTION_SAVE,
+		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+		GTK_STOCK_SAVE, GTK_RESPONSE_OK,
+		NULL);
 
-	// Card should be put into $HOME/.pcsx/memcards
-	path = g_build_filename(g_get_home_dir(), ".pcsx", "memcards", NULL);
+	// Card should be put into $HOME/.pcsxr/memcards
+	path = g_build_filename(g_get_home_dir(), ".pcsxr", "memcards", NULL);
 	gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(chooser), path);
 	gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(chooser), _("New Memory Card.mcd"));
 	gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(chooser), TRUE);
@@ -410,10 +389,11 @@
 
 		CreateMcd(name);
 
-		if ((int)user_data == 1) strncpy(Config.Mcd1, name, MAXPATHLEN);
+		gint mcd = GPOINTER_TO_INT(user_data);
+		if (mcd == 1) strncpy(Config.Mcd1, name, MAXPATHLEN);
 		else strncpy(Config.Mcd2, name, MAXPATHLEN);
 
-		LoadMcd((int)user_data, name);
+		LoadMcd(mcd, name);
 		LoadMcdDlg(widget);
 
 		g_free(name);
@@ -423,81 +403,110 @@
 	g_free(path);
 }
 
-static int copy = 0, copymcd = 0;
-
-static int GetFreeMemcardSlot(int target_card) {
+static int GetFreeMemcardSlot(gint target_card, gint count) {
 	McdBlock *Info;
-	gboolean found = FALSE;
-
-	int i = 0;
-	while (i < 15 && found == FALSE) {
-		Info = &Blocks[target_card][i];
-		if (g_ascii_strcasecmp(Info->Title, "") == 0) {
-			found = TRUE;
+	gint foundcount=0, i=-1;
+
+	// search for empty (formatted) blocks first
+	while (i < MAX_MEMCARD_BLOCKS && foundcount < count) {
+		Info = &Blocks[target_card][++i];
+		if ((Info->Flags & 0xFF) == 0xA0) { // if A0 but not A1
+			foundcount++;
+		} else if (foundcount >= 1) { // need to find n count consecutive blocks
+			foundcount=0;
 		} else {
-			i++;
 		}
+		//printf("formatstatus=%x\n", Info->Flags);
 	}
 
-	if (found == TRUE)
-		return i;
-
-	// no free slots, try to find a deleted one
-	i = 0;
-	while (i < 15 && found == FALSE) {
-		Info = &Blocks[target_card][i];
-		if ((Info->Flags & 0xF0) != 0x50) {
-			found = TRUE;
+	if (foundcount == count)
+		return (i-foundcount+1);
+
+	// no free formatted slots, try to find a deleted one
+	foundcount=0;
+	i = -1;
+	while (i < MAX_MEMCARD_BLOCKS && foundcount < count) {
+		Info = &Blocks[target_card][++i];
+		if ((Info->Flags & 0xF0) == 0xA0) { // A2 or A6 f.e.
+			foundcount++;
+		} else if (foundcount >= 1) { // need to find n count consecutive blocks
+			foundcount=0;
 		} else {
-			i++;
 		}
+		//printf("delstatus=%x\n", Info->Flags);
 	}
 
-	if (found == TRUE)
-		return i;
+	if (foundcount == count)
+		return (i-foundcount+1);
 
 	return -1;
 }
 
-static void CopyMemcardData(char *from, char *to, gint *i, gchar *str) {
-	memcpy(to + (*i + 1) * 128, from + (copy + 1) * 128, 128);
-	SaveMcd((char *)str, to, (*i + 1) * 128, 128);
-	memcpy(to + (*i + 1) * 1024 * 8, from + (copy+1) * 1024 * 8, 1024 * 8);
-	SaveMcd((char *)str, to, (*i + 1) * 1024 * 8, 1024 * 8);
+static void CopyMemcardData(char *from, char *to, gint srci, gint dsti, gchar *str) {
+	// header	
+	memcpy(to + (dsti + 1) * 128, from + (srci + 1) * 128, 128);
+	SaveMcd((char *)str, to, (dsti + 1) * 128, 128);
+
+	// data	
+	memcpy(to + (dsti + 1) * 1024 * 8, from + (srci+1) * 1024 * 8, 1024 * 8);
+	SaveMcd((char *)str, to, (dsti + 1) * 1024 * 8, 1024 * 8);
+
+	//printf("data = %s\n", from + (srci+1) * 128);
+}
+
+gint GetMcdBlockCount(gint mcd, gint startblock) {
+	McdBlock b;
+	gint i;
+
+	// check status on startblock+1...n
+	for (i=1; i <= (MAX_MEMCARD_BLOCKS-startblock); i++) {
+		GetMcdBlockInfo(mcd, startblock+i, &b);
+		//printf("i=%i, mcd=%i, startblock=%i, diff=%i, flags=%x\n", i, mcd, startblock, (MAX_MEMCARD_BLOCKS-startblock), b.Flags);
+		if ((b.Flags & 0x3) == 0x3) {
+			return i+1;
+		} else if ((b.Flags & 0x2) == 0x2) {
+			//i++
+		} else {
+			return i;
+		}
+	}
+	return i; // startblock was the last block so count = 1
 }
 
 static void OnMcd_CopyTo(GtkWidget *widget, gpointer user_data) {
-	gint mcd = (gint)user_data;
+	gint dstmcd = GPOINTER_TO_INT(user_data);
+	gint srcmcd;
 
 	GtkTreeIter iter;
 	GtkTreeModel *model;
 	GtkTreePath *path;
-	gint *i;
-	GladeXML *xml;
+	gint *i, j, count, srci, first_free_slot;
 	GtkTreeSelection *treesel;
 	gchar *str;
 	char *source, *destination;
 
-	int first_free_slot;
-
-	xml = glade_get_widget_tree(widget);
-
-	if (mcd == 1)
+	if (dstmcd == 1) {
 		treesel = gtk_tree_view_get_selection(GTK_TREE_VIEW(GtkCList_McdList2));
-	else
+		srcmcd = 2;
+	} else {
 		treesel = gtk_tree_view_get_selection(GTK_TREE_VIEW(GtkCList_McdList1));
+		srcmcd = 1;
+	}
+	//printf("src=%i and dst=%i\n", srcmcd, dstmcd);
 
 	// If the item selected is not reported as a 'Free' slot
 	if (gtk_tree_selection_get_selected(treesel, &model, &iter)) {
 		path = gtk_tree_model_get_path(model, &iter);
 		i = gtk_tree_path_get_indices(path);
-		copy = *i;
-		copymcd = mcd;
+		srci = *i;
 		gtk_tree_path_free(path);
 	}
 
+	// get how many blocks there are including linked blocks
+	count = GetMcdBlockCount(srcmcd, (srci+1));
+
 	// Determine the first free slot in the target memory card
-	first_free_slot = GetFreeMemcardSlot(mcd - 1);
+	first_free_slot = GetFreeMemcardSlot((dstmcd - 1), count);
 	if (first_free_slot == -1) {
 		// No free slots available on the destination card
 		SysErrorMessage(_("No free space on memory card"),
@@ -505,9 +514,7 @@
 		return;
 	}
 
-	xml = glade_get_widget_tree(GtkCList_McdList1);
-
-	if (mcd == 1) {
+	if (dstmcd == 1) {
 		str = Config.Mcd1;
 		source = Mcd2Data;
 		destination = Mcd1Data;
@@ -517,7 +524,11 @@
 		destination = Mcd2Data;
 	}
 
-	CopyMemcardData(source, destination, &first_free_slot, str);
+	for (j=0; j < count; j++) {
+		CopyMemcardData(source, destination, (srci+j), (first_free_slot+j), str);
+		printf("count = %i, firstfree=%i, i=%i\n", count, first_free_slot, j);
+	}
+
 	UpdateMcdDlg(widget);
 }
 
@@ -529,23 +540,20 @@
 	GtkTreeModel *model;
 	GtkTreePath *path;
 	gchar *filename;
-	GladeXML *xml;
 	gboolean selected;
 	GtkWidget *tree;
 	GtkTreeSelection *sel;
 
-	gint memcard = (int)user_data;
-
-	xml = glade_get_widget_tree(widget);
+	gint memcard = GPOINTER_TO_INT(user_data);
 
 	if (memcard == 1) {
-		tree = glade_xml_get_widget(xml, "GtkCList_McdList1");
+		tree = GTK_WIDGET(gtk_builder_get_object(builder, "GtkCList_McdList1"));
 		sel = gtk_tree_view_get_selection(GTK_TREE_VIEW (tree));
 		selected = gtk_tree_selection_get_selected (sel, &model, &iter);
 		data = Mcd1Data;
 		filename = Config.Mcd1;
 	} else {
-		tree = glade_xml_get_widget(xml, "GtkCList_McdList2");
+		tree = GTK_WIDGET(gtk_builder_get_object(builder, "GtkCList_McdList2"));
 		sel = gtk_tree_view_get_selection(GTK_TREE_VIEW (tree));
 		selected = gtk_tree_selection_get_selected(sel, &model, &iter);
 		data = Mcd2Data;
@@ -578,7 +586,6 @@
 }
 
 static void OnTreeSelectionChanged(GtkTreeSelection *selection, gpointer user_data) {
-	GladeXML *xml;
 	GtkTreeIter iter;
 	GtkTreeModel *model;
 	GtkTreePath *path;
@@ -587,9 +594,8 @@
 	int i;
 	McdBlock b;
 
-	gint memcard = (int)user_data;
+	gint memcard = GPOINTER_TO_INT(user_data);
 
-	xml = glade_get_widget_tree(GtkCList_McdList1);
 	selected = gtk_tree_selection_get_selected(selection, &model, &iter);
 
 	if (selected) {
@@ -603,38 +609,38 @@
 			GetMcdBlockInfo(1, i + 1, &b);
 
 			if ((b.Flags >= 0xA1 && b.Flags <= 0xA3) || ((b.Flags & 0xF0) == 0x50)) {
-				gtk_widget_set_sensitive(glade_xml_get_widget(xml, "GtkButton_Delete1"), TRUE);
+				gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "GtkButton_Delete1")), TRUE);
 			} else {
-				gtk_widget_set_sensitive(glade_xml_get_widget(xml, "GtkButton_Delete1"), FALSE);
+				gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "GtkButton_Delete1")), FALSE);
 			}
 
-			if ((b.Flags & 0xF0) == 0x50) {
-				gtk_widget_set_sensitive(glade_xml_get_widget(xml, "GtkButton_CopyTo2"), TRUE);
+			if ((b.Flags & 0xF3) == 0x51) {
+				gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "GtkButton_CopyTo2")), TRUE);
 			} else {
-				gtk_widget_set_sensitive(glade_xml_get_widget(xml, "GtkButton_CopyTo2"), FALSE);
+				gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "GtkButton_CopyTo2")), FALSE);
 			}
 		} else {
 			GetMcdBlockInfo(2, i + 1, &b);
 
 			if ((b.Flags >= 0xA1 && b.Flags <= 0xA3) || ((b.Flags & 0xF0) == 0x50)) {
-				gtk_widget_set_sensitive(glade_xml_get_widget(xml, "GtkButton_Delete2"), TRUE);
+				gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "GtkButton_Delete2")), TRUE);
 			} else {
-				gtk_widget_set_sensitive(glade_xml_get_widget(xml, "GtkButton_Delete2"), FALSE);
+				gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "GtkButton_Delete2")), FALSE);
 			}
 
-			if ((b.Flags & 0xF0) == 0x50) {
-				gtk_widget_set_sensitive(glade_xml_get_widget(xml, "GtkButton_CopyTo1"), TRUE);
+			if ((b.Flags & 0xF3) == 0x51) {
+				gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "GtkButton_CopyTo1")), TRUE);
 			} else {
-				gtk_widget_set_sensitive(glade_xml_get_widget(xml, "GtkButton_CopyTo1"), FALSE);
+				gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "GtkButton_CopyTo1")), FALSE);
 			}
 		}
 	} else {
 		if (memcard == 1) {
-			gtk_widget_set_sensitive(glade_xml_get_widget(xml, "GtkButton_CopyTo2"), FALSE);
-			gtk_widget_set_sensitive(glade_xml_get_widget(xml, "GtkButton_Delete1"), FALSE);
+			gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "GtkButton_CopyTo2")), FALSE);
+			gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "GtkButton_Delete1")), FALSE);
 		} else {
-			gtk_widget_set_sensitive(glade_xml_get_widget(xml, "GtkButton_CopyTo1"), FALSE);
-			gtk_widget_set_sensitive(glade_xml_get_widget(xml, "GtkButton_Delete2"), FALSE);
+			gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "GtkButton_CopyTo1")), FALSE);
+			gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(builder, "GtkButton_Delete2")), FALSE);
 		}
 	}
 }
@@ -644,27 +650,27 @@
 	currentIcon++;
 	UpdateListItems(1, GtkCList_McdList1);
 	UpdateListItems(2, GtkCList_McdList2);
-	g_timeout_add(333, updateFunc, 0);
+	g_timeout_add(200, updateFunc, 0);
 	return FALSE;
 }
 
 void OnConf_Mcds() {
-	GladeXML *xml;
 	GtkWidget *dialog;
 	GtkWidget *widget;
 	GtkTreeSelection *treesel1, *treesel2;
 	gchar *str;
 
-	xml = glade_xml_new(PACKAGE_DATA_DIR "pcsx.glade2", "McdsDlg", NULL);
-
-	if (!xml) {
-		g_warning("We could not load the interface!");
+	builder = gtk_builder_new();
+	
+	if (!gtk_builder_add_from_file(builder, PACKAGE_DATA_DIR "pcsxr.ui", NULL)) {
+		g_warning("Error: interface could not be loaded!");
 		return;
 	}
 
-	dialog = glade_xml_get_widget(xml, "McdsDlg");
+	dialog = GTK_WIDGET(gtk_builder_get_object(builder, "McdsDlg"));
 
 	gtk_window_set_title(GTK_WINDOW(dialog), _("Memory Card Manager"));
+	gtk_widget_show (dialog);
 
 	// Assign default memory cards
 	if (!strlen(Config.Mcd1)) {
@@ -679,77 +685,77 @@
 		g_free(str);
 	}
 
-	GtkCList_McdList1 = glade_xml_get_widget(xml, "GtkCList_McdList1");
+	GtkCList_McdList1 = GTK_WIDGET(gtk_builder_get_object(builder, "GtkCList_McdList1"));
 	AddColumns(GTK_TREE_VIEW(GtkCList_McdList1));
-	GtkCList_McdList2 = glade_xml_get_widget(xml, "GtkCList_McdList2");
+	GtkCList_McdList2 = GTK_WIDGET(gtk_builder_get_object(builder, "GtkCList_McdList2"));
 	AddColumns(GTK_TREE_VIEW(GtkCList_McdList2));
 
 	treesel1 = gtk_tree_view_get_selection(GTK_TREE_VIEW (GtkCList_McdList1));
 	gtk_tree_selection_set_mode(treesel1, GTK_SELECTION_SINGLE);
 	g_signal_connect_data(G_OBJECT(treesel1), "changed",
 						 G_CALLBACK(OnTreeSelectionChanged),
-						 (gpointer)1, NULL, G_CONNECT_AFTER);
+						 GINT_TO_POINTER(1), NULL, G_CONNECT_AFTER);
 
 	treesel2 = gtk_tree_view_get_selection(GTK_TREE_VIEW (GtkCList_McdList2));
 	gtk_tree_selection_set_mode(treesel2, GTK_SELECTION_SINGLE);
 	g_signal_connect_data(G_OBJECT(treesel2), "changed",
 						 G_CALLBACK(OnTreeSelectionChanged),
-						 (gpointer)2, NULL, G_CONNECT_AFTER);
+						 GINT_TO_POINTER(2), NULL, G_CONNECT_AFTER);
 
 	LoadMcdDlg(dialog);
 
 	// Setup a handler for when Close or Cancel is clicked
-	g_signal_connect_data(GTK_OBJECT(dialog), "response",
-			GTK_SIGNAL_FUNC(OnMcd_Close), xml, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
+	g_signal_connect_data(G_OBJECT(dialog), "response",
+			G_CALLBACK(OnMcd_Close), builder, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "GtkButton_Format1");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnMcd_Format), (gpointer)1, NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "GtkButton_Format1"));
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+			G_CALLBACK(OnMcd_Format), GINT_TO_POINTER(1), NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "GtkButton_Format2");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnMcd_Format), (gpointer)2, NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "GtkButton_Format2"));
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+			G_CALLBACK(OnMcd_Format), GINT_TO_POINTER(2), NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "Mcd1Button");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnMcd_FileChange), (gpointer)1, NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "Mcd1Button"));
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+			G_CALLBACK(OnMcd_FileChange), GINT_TO_POINTER(1), NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "Mcd2Button");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnMcd_FileChange), (gpointer)2, NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "Mcd2Button"));
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+			G_CALLBACK(OnMcd_FileChange), GINT_TO_POINTER(2), NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "GtkButton_New1");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnMcd_New), (gpointer)1, NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "GtkButton_New1"));
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+			G_CALLBACK(OnMcd_New), GINT_TO_POINTER(1), NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "GtkButton_New2");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnMcd_New), (gpointer)2, NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "GtkButton_New2"));
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+			G_CALLBACK(OnMcd_New), GINT_TO_POINTER(2), NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "GtkButton_CopyTo1");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnMcd_CopyTo), (gpointer)1, NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "GtkButton_CopyTo1"));
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+			G_CALLBACK(OnMcd_CopyTo), GINT_TO_POINTER(1), NULL, G_CONNECT_AFTER);
 	gtk_widget_set_sensitive(GTK_WIDGET(widget), FALSE);
 
-	widget = glade_xml_get_widget(xml, "GtkButton_CopyTo2");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnMcd_CopyTo), (gpointer)2, NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "GtkButton_CopyTo2"));
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+			G_CALLBACK(OnMcd_CopyTo), GINT_TO_POINTER(2), NULL, G_CONNECT_AFTER);
 	gtk_widget_set_sensitive(GTK_WIDGET(widget), FALSE);
 
-	widget = glade_xml_get_widget(xml, "GtkButton_Delete1");
-	g_signal_connect_data (GTK_OBJECT (widget), "clicked",
-			GTK_SIGNAL_FUNC(OnMemcardDelete), (gpointer)1, NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "GtkButton_Delete1"));
+	g_signal_connect_data (G_OBJECT (widget), "clicked",
+			G_CALLBACK(OnMemcardDelete), GINT_TO_POINTER(1), NULL, G_CONNECT_AFTER);
 	gtk_widget_set_sensitive(GTK_WIDGET(widget), FALSE);
 
-	widget = glade_xml_get_widget(xml, "GtkButton_Delete2");
-	g_signal_connect_data (GTK_OBJECT (widget), "clicked",
-			GTK_SIGNAL_FUNC(OnMemcardDelete), (gpointer)2, NULL, G_CONNECT_AFTER);
+	widget = GTK_WIDGET(gtk_builder_get_object(builder, "GtkButton_Delete2"));
+	g_signal_connect_data (G_OBJECT (widget), "clicked",
+			G_CALLBACK(OnMemcardDelete), GINT_TO_POINTER(2), NULL, G_CONNECT_AFTER);
 	gtk_widget_set_sensitive(GTK_WIDGET(widget), FALSE);
 
 	quit = FALSE;
 	currentIcon = 0;
 
- g_timeout_add(1, updateFunc, 0);
+	g_timeout_add(1, updateFunc, 0);
 
 	while (gtk_events_pending()) { gtk_main_iteration(); }
 }

pcsxr-1.9.92.tar.bz2/gui/MemcardDlg.h -> pcsxr-1.9.93.tar.bz2/gui/MemcardDlg.h Changed

pcsxr-1.9.92.tar.bz2/gui/Plugin.c -> pcsxr-1.9.93.tar.bz2/gui/Plugin.c Changed

pcsxr-1.9.93.tar.bz2/libpcsxcore/._cheat.h Added

pcsxr-1.9.92.tar.bz2/libpcsxcore/Makefile.am -> pcsxr-1.9.93.tar.bz2/libpcsxcore/Makefile.am Changed

@@ -1,4 +1,4 @@
-INCLUDES = -DLOCALE_DIR=\"${datadir}/locale/\" \
+AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
 	-I$(top_srcdir)/include
 
 noinst_LIBRARIES = libpcsxcore.a
@@ -9,6 +9,8 @@
 	$(top_builddir)/libpcsxcore/psxcounters.c	\
 	$(top_builddir)/libpcsxcore/psxdma.c	\
 	$(top_builddir)/libpcsxcore/disr3000a.c	\
+	$(top_builddir)/libpcsxcore/gpu.c	\
+	$(top_builddir)/libpcsxcore/gpu.h	\
 	$(top_builddir)/libpcsxcore/spu.c	\
 	$(top_builddir)/libpcsxcore/sio.c	\
 	$(top_builddir)/libpcsxcore/psxhw.c	\
@@ -26,8 +28,8 @@
 	$(top_builddir)/libpcsxcore/debug.c \
 	$(top_builddir)/libpcsxcore/debug.h \
 	$(top_builddir)/libpcsxcore/decode_xa.h \
-	$(top_builddir)/libpcsxcore/gte.h \
-	$(top_builddir)/libpcsxcore/gte_divider.h \
+	$(top_builddir)/libpcsxcore/gte.h \
+	$(top_builddir)/libpcsxcore/gte_divider.h \
 	$(top_builddir)/libpcsxcore/mdec.h \
 	$(top_builddir)/libpcsxcore/misc.h \
 	$(top_builddir)/libpcsxcore/plugins.h \
@@ -41,8 +43,8 @@
 	$(top_builddir)/libpcsxcore/psxhw.h \
 	$(top_builddir)/libpcsxcore/psxmem.h \
 	$(top_builddir)/libpcsxcore/r3000a.h \
-	$(top_builddir)/libpcsxcore/sio.h \
-	$(top_builddir)/libpcsxcore/sjisfont.h \
+	$(top_builddir)/libpcsxcore/sio.h \
+	$(top_builddir)/libpcsxcore/sjisfont.h \
 	$(top_builddir)/libpcsxcore/spu.h \
 	$(top_builddir)/libpcsxcore/system.h \
 	$(top_builddir)/libpcsxcore/cdriso.c \
@@ -67,8 +69,10 @@
 else		
 if ARCH_X86
 libpcsxcore_a_SOURCES += \
+	$(top_builddir)/libpcsxcore/ix86/iGte.h	\
 	$(top_builddir)/libpcsxcore/ix86/iR3000A.c	\
 	$(top_builddir)/libpcsxcore/ix86/ix86.c	\
+	$(top_builddir)/libpcsxcore/ix86/ix86.h	\
 	$(top_builddir)/libpcsxcore/
 endif
 endif
@@ -80,5 +84,5 @@
 	$(top_builddir)/libpcsxcore/ppc/reguse.c	\
 	$(top_builddir)/libpcsxcore/ppc/pasm.s	\
 	$(top_builddir)/libpcsxcore/
-libpcsxcore_a_CCASFLAGS = -x assembler-with-cpp -mregnames
+libpcsxcore_a_CCASFLAGS = -x assembler-with-cpp -mregnames -D__POWERPC__
 endif

pcsxr-1.9.92.tar.bz2/libpcsxcore/cdriso.c -> pcsxr-1.9.93.tar.bz2/libpcsxcore/cdriso.c Changed

@@ -1,6 +1,7 @@
 /***************************************************************************
 * Copyright (C) 2007 PCSX-df Team *
 * Copyright (C) 2009 Wei Mingzhi *
+ * Copyright (C) 2012 notaz *
 * *
 * This program is free software; you can redistribute it and/or modify *
 * it under the terms of the GNU General Public License as published by *
@@ -15,45 +16,62 @@
 * You should have received a copy of the GNU General Public License *
 * along with this program; if not, write to the *
 * Free Software Foundation, Inc., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
 ***************************************************************************/
 
 #include "psxcommon.h"
 #include "plugins.h"
 #include "cdrom.h"
 #include "cdriso.h"
+#include "ppf.h"
 
 #ifdef _WIN32
 #include <process.h>
 #include <windows.h>
+#define strcasecmp _stricmp
 #else
-#include <pthread.h>
 #include <sys/time.h>
+#include <unistd.h>
 #endif
+#include <zlib.h>
+
+unsigned int cdrIsoMultidiskCount;
+unsigned int cdrIsoMultidiskSelect;
 
 static FILE *cdHandle = NULL;
-static FILE *cddaHandle = NULL;
 static FILE *subHandle = NULL;
 
 static boolean subChanMixed = FALSE;
 static boolean subChanRaw = FALSE;
+static boolean subChanMissing = FALSE;
 
-static unsigned char cdbuffer[DATA_SIZE];
-static unsigned char subbuffer[SUB_FRAMESIZE];
-
-static unsigned char sndbuffer[CD_FRAMESIZE_RAW * 10];
+static boolean multifile = FALSE;
 
-#define CDDA_FRAMETIME			(1000 * (sizeof(sndbuffer) / CD_FRAMESIZE_RAW) / 75)
+static unsigned char cdbuffer[CD_FRAMESIZE_RAW];
+static unsigned char subbuffer[SUB_FRAMESIZE];
 
-#ifdef _WIN32
-static HANDLE threadid;
-#else
-static pthread_t threadid;
-#endif
-static unsigned int initial_offset = 0;
-static volatile boolean playing = FALSE;
+static boolean playing = FALSE;
 static boolean cddaBigEndian = FALSE;
-static volatile unsigned int cddaCurOffset = 0;
+static unsigned int cddaCurPos = 0;
+
+/* Frame offset into CD image where pregap data would be found if it was there.
+ * If a game seeks there we must *not* return subchannel data since it's
+ * not in the CD image, so that cdrom code can fake subchannel data instead.
+ * XXX: there could be multiple pregaps but PSX dumps only have one? */
+static unsigned int pregapOffset;
+
+// compressed image stuff
+static struct {
+	unsigned char buff_raw[16][CD_FRAMESIZE_RAW];
+	unsigned char buff_compressed[CD_FRAMESIZE_RAW * 16 + 100];
+	unsigned int *index_table;
+	unsigned int index_len;
+	unsigned int block_shift;
+	unsigned int current_block;
+	unsigned int sector_in_blk;
+} *compr_img;
+
+int (*cdimg_read_func)(FILE *f, unsigned int base, void *dest, int sector);
 
 char* CALLBACK CDR__getDriveLetter(void);
 long CALLBACK CDR__configure(void);
@@ -62,12 +80,14 @@
 long CALLBACK CDR__setfilename(char *filename);
 long CALLBACK CDR__getStatus(struct CdrStat *stat);
 
-extern void *hCDRDriver;
+static void DecodeRawSubData(void);
 
 struct trackinfo {
-	enum {DATA, CDDA} type;
-	char start[3];		// MSF-format
-	char length[3];		// MSF-format
+	enum {DATA=1, CDDA} type;
+	u8 start[3];		// MSF-format
+	u8 length[3];		// MSF-format
+	FILE *handle;		// for multi-track images CDDA
+	unsigned int start_offset; // byte offset from start of above file
 };
 
 #define MAXTRACKS 100 /* How many tracks can a CD hold? */
@@ -76,11 +96,11 @@
 static struct trackinfo ti[MAXTRACKS];
 
 // get a sector from a msf-array
-static unsigned int msf2sec(char *msf) {
+unsigned int msf2sec(char *msf) {
 	return ((msf[0] * 60 + msf[1]) * 75) + msf[2];
 }
 
-static void sec2msf(unsigned int s, char *msf) {
+void sec2msf(unsigned int s, char *msf) {
 	msf[0] = s / 75 / 60;
 	s = s - msf[0] * 75 * 60;
 	msf[1] = s / 75;
@@ -117,157 +137,16 @@
 	}
 }
 
-#ifndef _WIN32
-static long GetTickCount(void) {
-	static time_t		initial_time = 0;
-	struct timeval		now;
-
-	gettimeofday(&now, NULL);
-
-	if (initial_time == 0) {
-		initial_time = now.tv_sec;
-	}
-
-	return (now.tv_sec - initial_time) * 1000L + now.tv_usec / 1000L;
-}
-#endif
-
-// this thread plays audio data
-#ifdef _WIN32
-static void playthread(void *param)
-#else
-static void *playthread(void *param)
-#endif
-{
-	long			d, t, i, s;
-	unsigned char	tmp;
-
-	t = GetTickCount();
-
-	while (playing) {
-		d = t - (long)GetTickCount();
-		if (d <= 0) {
-			d = 1;
-		}
-		else if (d > CDDA_FRAMETIME) {
-			d = CDDA_FRAMETIME;
-		}
-#ifdef _WIN32
-		Sleep(d);
-#else
-		usleep(d * 1000);
-#endif
-
-		t = GetTickCount() + CDDA_FRAMETIME;
-
-		if (subChanMixed) {
-			s = 0;
-
-			for (i = 0; i < sizeof(sndbuffer) / CD_FRAMESIZE_RAW; i++) {
-				// read one sector
-				d = fread(sndbuffer + CD_FRAMESIZE_RAW * i, 1, CD_FRAMESIZE_RAW, cddaHandle);
-				if (d < CD_FRAMESIZE_RAW) {
-					break;
-				}
-
-				s += d;
-
-				// skip the subchannel data
-				fseek(cddaHandle, SUB_FRAMESIZE, SEEK_CUR);
-			}
-		}
-		else {
-			s = fread(sndbuffer, 1, sizeof(sndbuffer), cddaHandle);
-		}
-
-		if (s == 0) {
-			playing = FALSE;
-			fclose(cddaHandle);
-			cddaHandle = NULL;
-			initial_offset = 0;
-			break;
-		}
-
-		if (!cdr.Muted && playing) {
-			if (cddaBigEndian) {
-				for (i = 0; i < s / 2; i++) {
-					tmp = sndbuffer[i * 2];
-					sndbuffer[i * 2] = sndbuffer[i * 2 + 1];
-					sndbuffer[i * 2 + 1] = tmp;
-				}
-			}
-
-			SPU_playCDDAchannel((short *)sndbuffer, s);
-		}
-
-		cddaCurOffset += s;
-	}
-
-#ifdef _WIN32
-	_endthread();
-#else
-	pthread_exit(0);
-	return NULL;
-#endif
-}
-
-// stop the CDDA playback
-static void stopCDDA() {
-	if (!playing) {
-		return;
-	}
-
-	playing = FALSE;
-#ifdef _WIN32
-	WaitForSingleObject(threadid, INFINITE);
-#else
-	pthread_join(threadid, NULL);
-#endif
-
-	if (cddaHandle != NULL) {
-		fclose(cddaHandle);
-		cddaHandle = NULL;
-	}
-
-	initial_offset = 0;
-}
-
-// start the CDDA playback
-static void startCDDA(unsigned int offset) {
-	if (playing) {
-		if (initial_offset == offset) {
-			return;
-		}
-		stopCDDA();
-	}
-
-	cddaHandle = fopen(GetIsoFile(), "rb");
-	if (cddaHandle == NULL) {
-		return;
-	}
-
-	initial_offset = offset;
-	cddaCurOffset = initial_offset;
-	fseek(cddaHandle, initial_offset, SEEK_SET);
-
-	playing = TRUE;
-
-#ifdef _WIN32
-	threadid = (HANDLE)_beginthread(playthread, 0, NULL);
-#else
-	pthread_create(&threadid, NULL, playthread, NULL);
-#endif
-}
-
 // this function tries to get the .toc file of the given .bin
 // the necessary data is put into the ti (trackinformation)-array
 static int parsetoc(const char *isofile) {
 	char			tocname[MAXPATHLEN];
 	FILE			*fi;
-	char			linebuf[256], dummy[256], name[256];
+	char			linebuf[256], tmp[256], name[256];
 	char			*token;
 	char			time[20], time2[20];
-	unsigned int	t;
+	unsigned int	t, sector_offs, sector_size;
+	unsigned int	current_zero_gap = 0;
 
 	numtracks = 0;
 
@@ -303,15 +182,21 @@
 	memset(&ti, 0, sizeof(ti));
 	cddaBigEndian = TRUE; // cdrdao uses big-endian for CD Audio
 
+	sector_size = CD_FRAMESIZE_RAW;
+	sector_offs = 2 * 75;
+
 	// parse the .toc file
 	while (fgets(linebuf, sizeof(linebuf), fi) != NULL) {
 		// search for tracks
-		strncpy(dummy, linebuf, sizeof(linebuf));
-		token = strtok(dummy, " ");
+		strncpy(tmp, linebuf, sizeof(linebuf));
+		token = strtok(tmp, " ");
 
 		if (token == NULL) continue;
 
 		if (!strcmp(token, "TRACK")) {
+			sector_offs += current_zero_gap;
+			current_zero_gap = 0;
+
 			// get type of track
 			token = strtok(NULL, " ");
 			numtracks++;
@@ -322,9 +207,11 @@
 
 				// check if this image contains mixed subchannel data
 				token = strtok(NULL, " ");
-				if (token != NULL && !strncmp(token, "RW_RAW", 6)) {
+				if (token != NULL && !strncmp(token, "RW", 2)) {
+					sector_size = CD_FRAMESIZE_RAW + SUB_FRAMESIZE;
 					subChanMixed = TRUE;
-					subChanRaw = TRUE;
+					if (!strncmp(token, "RW_RAW", 6))
+						subChanRaw = TRUE;
 				}
 			}
 			else if (!strncmp(token, "AUDIO", 5)) {
@@ -334,8 +221,8 @@
 		else if (!strcmp(token, "DATAFILE")) {
 			if (ti[numtracks].type == CDDA) {
 				sscanf(linebuf, "DATAFILE \"%[^\"]\" #%d %8s", name, &t, time2);
-				t /= CD_FRAMESIZE_RAW + (subChanMixed ? SUB_FRAMESIZE : 0);
-				t += 2 * 75;
+				ti[numtracks].start_offset = t;
+				t = t / sector_size + sector_offs;
 				sec2msf(t, (char *)&ti[numtracks].start);
 				tok2msf((char *)&time2, (char *)&ti[numtracks].length);
 			}
@@ -347,11 +234,39 @@
 		else if (!strcmp(token, "FILE")) {
 			sscanf(linebuf, "FILE \"%[^\"]\" #%d %8s %8s", name, &t, time, time2);
 			tok2msf((char *)&time, (char *)&ti[numtracks].start);
-			t /= CD_FRAMESIZE_RAW + (subChanMixed ? SUB_FRAMESIZE : 0);
-			t += msf2sec(ti[numtracks].start) + 2 * 75;
+			t += msf2sec(ti[numtracks].start) * sector_size;
+			ti[numtracks].start_offset = t;
+			t = t / sector_size + sector_offs;
 			sec2msf(t, (char *)&ti[numtracks].start);
 			tok2msf((char *)&time2, (char *)&ti[numtracks].length);
 		}
+		else if (!strcmp(token, "ZERO") || !strcmp(token, "SILENCE")) {
+			// skip unneeded optional fields
+			while (token != NULL) {
+				token = strtok(NULL, " ");
+				if (strchr(token, ':') != NULL)
+					break;
+			}
+			if (token != NULL) {
+				tok2msf(token, tmp);
+				current_zero_gap = msf2sec(tmp);
+			}
+			if (numtracks > 1) {
+				t = ti[numtracks - 1].start_offset;
+				t /= sector_size;
+				pregapOffset = t + msf2sec(ti[numtracks - 1].length);
+			}
+		}
+		else if (!strcmp(token, "START")) {
+			token = strtok(NULL, " ");
+			if (token != NULL && strchr(token, ':')) {
+				tok2msf(token, tmp);
+				t = msf2sec(tmp);
+				ti[numtracks].start_offset += (t - current_zero_gap) * sector_size;
+				t = msf2sec(ti[numtracks].start) + t;
+				sec2msf(t, (char *)&ti[numtracks].start);
+			}
+		}
 	}
 
 	fclose(fi);
@@ -363,12 +278,16 @@
 // the necessary data is put into the ti (trackinformation)-array
 static int parsecue(const char *isofile) {
 	char			cuename[MAXPATHLEN];
+	char			filepath[MAXPATHLEN];
+	char			*incue_fname;
 	FILE			*fi;
 	char			*token;
 	char			time[20];
 	char			*tmp;
-	char			linebuf[256], dummy[256];
-	unsigned int	t;
+	char			linebuf[256], tmpb[256], dummy[256];
+	unsigned int	incue_max_len;
+	unsigned int	t, file_len, mode, sector_offs;
+	unsigned int	sector_size = 2352;
 
 	numtracks = 0;
 
@@ -399,8 +318,25 @@
 		fseek(fi, 0, SEEK_SET);
 	}
 
+	// build a path for files referenced in .cue
+	strncpy(filepath, cuename, sizeof(filepath));
+	tmp = strrchr(filepath, '/');
+	if (tmp == NULL)
+		tmp = strrchr(filepath, '\\');
+	if (tmp != NULL)
+		tmp++;
+	else
+		tmp = filepath;
+	*tmp = 0;
+	filepath[sizeof(filepath) - 1] = 0;
+	incue_fname = tmp;
+	incue_max_len = sizeof(filepath) - (tmp - filepath) - 1;
+
 	memset(&ti, 0, sizeof(ti));
 
+	file_len = 0;
+	sector_offs = 2 * 75;
+
 	while (fgets(linebuf, sizeof(linebuf), fi) != NULL) {
 		strncpy(dummy, linebuf, sizeof(linebuf));
 		token = strtok(dummy, " ");
@@ -409,46 +345,99 @@
 			continue;
 		}
 
-		if (!strcmp(token, "TRACK")){
+		if (!strcmp(token, "TRACK")) {
 			numtracks++;
 
+			sector_size = 0;
 			if (strstr(linebuf, "AUDIO") != NULL) {
 				ti[numtracks].type = CDDA;
+				sector_size = 2352;
 			}
-			else if (strstr(linebuf, "MODE1/2352") != NULL || strstr(linebuf, "MODE2/2352") != NULL) {
+			else if (sscanf(linebuf, " TRACK %u MODE%u/%u", &t, &mode, &sector_size) == 3)
 				ti[numtracks].type = DATA;
+			else {
+				SysPrintf(".cue: failed to parse TRACK\n");
+				ti[numtracks].type = numtracks == 1 ? DATA : CDDA;
 			}
+			if (sector_size == 0)
+				sector_size = 2352;
 		}
 		else if (!strcmp(token, "INDEX")) {
-			tmp = strstr(linebuf, "INDEX");
-			if (tmp != NULL) {
-				tmp += strlen("INDEX") + 3; // 3 - space + numeric index
-				while (*tmp == ' ') tmp++;
-				if (*tmp != '\n') sscanf(tmp, "%8s", time);
-			}
+			if (sscanf(linebuf, " INDEX %02d %8s", &t, time) != 2)
+				SysPrintf(".cue: failed to parse INDEX\n");
+			tok2msf(time, (char *)&ti[numtracks].start);
 
-			tok2msf((char *)&time, (char *)&ti[numtracks].start);
-
-			t = msf2sec(ti[numtracks].start) + 2 * 75;
+			t = msf2sec(ti[numtracks].start);
+			ti[numtracks].start_offset = t * sector_size;
+			t += sector_offs;
 			sec2msf(t, ti[numtracks].start);
 
-			// If we've already seen another track, this is its end
-			if (numtracks > 1) {
+			// default track length to file length
+			t = file_len - ti[numtracks].start_offset / sector_size;
+			sec2msf(t, ti[numtracks].length);
+
+			if (numtracks > 1 && ti[numtracks].handle == NULL) {
+				// this track uses the same file as the last,
+				// start of this track is last track's end
 				t = msf2sec(ti[numtracks].start) - msf2sec(ti[numtracks - 1].start);
 				sec2msf(t, ti[numtracks - 1].length);
 			}
+			if (numtracks > 1 && pregapOffset == -1)
+				pregapOffset = ti[numtracks].start_offset / sector_size;
 		}
-	}
+		else if (!strcmp(token, "PREGAP")) {
+			if (sscanf(linebuf, " PREGAP %8s", time) == 1) {
+				tok2msf(time, dummy);
+				sector_offs += msf2sec(dummy);
+			}
+			pregapOffset = -1; // mark to fill track start_offset
+		}
+		else if (!strcmp(token, "FILE")) {
+			t = sscanf(linebuf, " FILE \"%256[^\"]\"", tmpb);
+			if (t != 1)
+				sscanf(linebuf, " FILE %256s", tmpb);
+
+			// absolute path?
+			ti[numtracks + 1].handle = fopen(tmpb, "rb");
+			if (ti[numtracks + 1].handle == NULL) {
+				// relative to .cue?
+				tmp = strrchr(tmpb, '\\');
+				if (tmp == NULL)
+					tmp = strrchr(tmpb, '/');
+				if (tmp != NULL)
+					tmp++;
+				else
+					tmp = tmpb;
+				strncpy(incue_fname, tmp, incue_max_len);
+				ti[numtracks + 1].handle = fopen(filepath, "rb");
+			}
 
-	fclose(fi);
+			// update global offset if this is not first file in this .cue
+			if (numtracks + 1 > 1) {
+				multifile = 1;
+				sector_offs += file_len;
+			}
 
-	// Fill out the last track's end based on size
-	if (numtracks >= 1) {
-		fseek(cdHandle, 0, SEEK_END);
-		t = ftell(cdHandle) / 2352 - msf2sec(ti[numtracks].start) + 2 * 75;
-		sec2msf(t, ti[numtracks].length);
+			file_len = 0;
+			if (ti[numtracks + 1].handle == NULL) {
+				SysPrintf(_("\ncould not open: %s\n"), filepath);
+				continue;
+			}
+			fseek(ti[numtracks + 1].handle, 0, SEEK_END);
+			file_len = ftell(ti[numtracks + 1].handle) / 2352;
+
+			if (numtracks == 0 && strlen(isofile) >= 4 &&
+				strcmp(isofile + strlen(isofile) - 4, ".cue") == 0)
+			{
+				// user selected .cue as image file, use it's data track instead
+				fclose(cdHandle);
+				cdHandle = fopen(filepath, "rb");
+			}
+		}
 	}
 
+	fclose(fi);
+
 	return 0;
 }
 
@@ -489,6 +478,7 @@
 		else if (!strncmp(linebuf, "INDEX 1=", 8)) {
 			sscanf(linebuf, "INDEX 1=%d", &t);
 			sec2msf(t + 2 * 75, ti[numtracks].start);
+			ti[numtracks].start_offset = t * 2352;
 
 			// If we've already seen another track, this is its end
 			if (numtracks > 1) {
@@ -573,7 +563,7 @@
 
 	// check if the image contains mixed subchannel data
 	fseek(fi, offset + 1, SEEK_SET);
-	subChanMixed = (fgetc(fi) ? TRUE : FALSE);
+	subChanMixed = subChanRaw = (fgetc(fi) ? TRUE : FALSE);
 
 	// read track data
 	for (i = 1; i <= numtracks; i++) {
@@ -588,16 +578,23 @@
 		ti[i].start[1] = fgetc(fi);
 		ti[i].start[2] = fgetc(fi);
 
-		if (i > 1) {
-			l = msf2sec(ti[i].start);
-			sec2msf(l - 2 * 75, ti[i].start); // ???
-		}
-
-		// get the track length
 		fread(&extra_offset, 1, sizeof(unsigned int), fi);
 		extra_offset = SWAP32(extra_offset);
 
-		fseek(fi, extra_offset + 4, SEEK_SET);
+		// get track start offset (in .mdf)
+		fseek(fi, offset + 0x28, SEEK_SET);
+		fread(&l, 1, sizeof(unsigned int), fi);
+		l = SWAP32(l);
+		ti[i].start_offset = l;
+
+		// get pregap
+		fseek(fi, extra_offset, SEEK_SET);
+		fread(&l, 1, sizeof(unsigned int), fi);
+		l = SWAP32(l);
+		if (l != 0 && i > 1)
+			pregapOffset = msf2sec(ti[i].start);
+
+		// get the track length
 		fread(&l, 1, sizeof(unsigned int), fi);
 		l = SWAP32(l);
 		sec2msf(l, ti[i].length);
@@ -609,6 +606,257 @@
 	return 0;
 }
 
+static int handlepbp(const char *isofile) {
+	struct {
+		unsigned int sig;
+		unsigned int dontcare[8];
+		unsigned int psar_offs;
+	} pbp_hdr;
+	struct {
+		unsigned char type;
+		unsigned char pad0;
+		unsigned char track;
+		char index0[3];
+		char pad1;
+		char index1[3];
+	} toc_entry;
+	struct {
+		unsigned int offset;
+		unsigned int size;
+		unsigned int dontcare[6];
+	} index_entry;
+	char psar_sig[11];
+	unsigned int t, cd_length, cdimg_base;
+	unsigned int offsettab[8], psisoimg_offs;
+	const char *ext = NULL;
+	int i, ret;
+
+	if (strlen(isofile) >= 4)
+		ext = isofile + strlen(isofile) - 4;
+	if (ext == NULL || (strcmp(ext, ".pbp") != 0 && strcmp(ext, ".PBP") != 0))
+		return -1;
+
+	numtracks = 0;
+
+	ret = fread(&pbp_hdr, 1, sizeof(pbp_hdr), cdHandle);
+	if (ret != sizeof(pbp_hdr)) {
+		SysPrintf("failed to read pbp\n");
+		goto fail_io;
+	}
+
+	ret = fseek(cdHandle, pbp_hdr.psar_offs, SEEK_SET);
+	if (ret != 0) {
+		SysPrintf("failed to seek to %x\n", pbp_hdr.psar_offs);
+		goto fail_io;
+	}
+
+	psisoimg_offs = pbp_hdr.psar_offs;
+	fread(psar_sig, 1, sizeof(psar_sig), cdHandle);
+	psar_sig[10] = 0;
+	if (strcmp(psar_sig, "PSTITLEIMG") == 0) {
+		// multidisk image?
+		ret = fseek(cdHandle, pbp_hdr.psar_offs + 0x200, SEEK_SET);
+		if (ret != 0) {
+			SysPrintf("failed to seek to %x\n", pbp_hdr.psar_offs + 0x200);
+			goto fail_io;
+		}
+
+		if (fread(&offsettab, 1, sizeof(offsettab), cdHandle) != sizeof(offsettab)) {
+			SysPrintf("failed to read offsettab\n");
+			goto fail_io;
+		}
+
+		for (i = 0; i < sizeof(offsettab) / sizeof(offsettab[0]); i++) {
+			if (offsettab[i] == 0)
+				break;
+		}
+		cdrIsoMultidiskCount = i;
+		if (cdrIsoMultidiskCount == 0) {
+			SysPrintf("multidisk eboot has 0 images?\n");
+			goto fail_io;
+		}
+
+		if (cdrIsoMultidiskSelect >= cdrIsoMultidiskCount)
+			cdrIsoMultidiskSelect = 0;
+
+		psisoimg_offs += offsettab[cdrIsoMultidiskSelect];
+
+		ret = fseek(cdHandle, psisoimg_offs, SEEK_SET);
+		if (ret != 0) {
+			SysPrintf("failed to seek to %x\n", psisoimg_offs);
+			goto fail_io;
+		}
+
+		fread(psar_sig, 1, sizeof(psar_sig), cdHandle);
+		psar_sig[10] = 0;
+	}
+
+	if (strcmp(psar_sig, "PSISOIMG00") != 0) {
+		SysPrintf("bad psar_sig: %s\n", psar_sig);
+		goto fail_io;
+	}
+
+	// seek to TOC
+	ret = fseek(cdHandle, psisoimg_offs + 0x800, SEEK_SET);
+	if (ret != 0) {
+		SysPrintf("failed to seek to %x\n", psisoimg_offs + 0x800);
+		goto fail_io;
+	}
+
+	// first 3 entries are special
+	fseek(cdHandle, sizeof(toc_entry), SEEK_CUR);
+	fread(&toc_entry, 1, sizeof(toc_entry), cdHandle);
+	numtracks = btoi(toc_entry.index1[0]);
+
+	fread(&toc_entry, 1, sizeof(toc_entry), cdHandle);
+	cd_length = btoi(toc_entry.index1[0]) * 60 * 75 +
+		btoi(toc_entry.index1[1]) * 75 + btoi(toc_entry.index1[2]);
+
+	for (i = 1; i <= numtracks; i++) {
+		fread(&toc_entry, 1, sizeof(toc_entry), cdHandle);
+
+		ti[i].type = (toc_entry.type == 1) ? CDDA : DATA;
+
+		ti[i].start_offset = btoi(toc_entry.index0[0]) * 60 * 75 +
+			btoi(toc_entry.index0[1]) * 75 + btoi(toc_entry.index0[2]);
+		ti[i].start_offset *= 2352;
+		ti[i].start[0] = btoi(toc_entry.index1[0]);
+		ti[i].start[1] = btoi(toc_entry.index1[1]);
+		ti[i].start[2] = btoi(toc_entry.index1[2]);
+
+		if (i > 1) {
+			t = msf2sec(ti[i].start) - msf2sec(ti[i - 1].start);
+			sec2msf(t, ti[i - 1].length);
+		}
+	}
+	t = cd_length - ti[numtracks].start_offset / 2352;
+	sec2msf(t, ti[numtracks].length);
+
+	// seek to ISO index
+	ret = fseek(cdHandle, psisoimg_offs + 0x4000, SEEK_SET);
+	if (ret != 0) {
+		SysPrintf("failed to seek to ISO index\n");
+		goto fail_io;
+	}
+
+	compr_img = calloc(1, sizeof(*compr_img));
+	if (compr_img == NULL)
+		goto fail_io;
+
+	compr_img->block_shift = 4;
+	compr_img->current_block = (unsigned int)-1;
+
+	compr_img->index_len = (0x100000 - 0x4000) / sizeof(index_entry);
+	compr_img->index_table = malloc((compr_img->index_len + 1) * sizeof(compr_img->index_table[0]));
+	if (compr_img->index_table == NULL)
+		goto fail_io;
+
+	cdimg_base = psisoimg_offs + 0x100000;
+	for (i = 0; i < compr_img->index_len; i++) {
+		ret = fread(&index_entry, 1, sizeof(index_entry), cdHandle);
+		if (ret != sizeof(index_entry)) {
+			SysPrintf("failed to read index_entry #%d\n", i);
+			goto fail_index;
+		}
+
+		if (index_entry.size == 0)
+			break;
+
+		compr_img->index_table[i] = cdimg_base + index_entry.offset;
+	}
+	compr_img->index_table[i] = cdimg_base + index_entry.offset + index_entry.size;
+
+	return 0;
+
+fail_index:
+	free(compr_img->index_table);
+	compr_img->index_table = NULL;
+fail_io:
+	if (compr_img != NULL) {
+		free(compr_img);
+		compr_img = NULL;
+	}
+	return -1;
+}
+
+static int handlecbin(const char *isofile) {
+	struct
+	{
+		char magic[4];
+		unsigned int header_size;
+		unsigned long long total_bytes;
+		unsigned int block_size;
+		unsigned char ver;		// 1
+		unsigned char align;
+		unsigned char rsv_06[2];
+	} ciso_hdr;
+	const char *ext = NULL;
+	unsigned int index = 0, plain;
+	int i, ret;
+
+	if (strlen(isofile) >= 5)
+		ext = isofile + strlen(isofile) - 5;
+	if (ext == NULL || (strcasecmp(ext + 1, ".cbn") != 0 && strcasecmp(ext, ".cbin") != 0))
+		return -1;
+
+	ret = fread(&ciso_hdr, 1, sizeof(ciso_hdr), cdHandle);
+	if (ret != sizeof(ciso_hdr)) {
+		SysPrintf("failed to read ciso header\n");
+		return -1;
+	}
+
+	if (strncmp(ciso_hdr.magic, "CISO", 4) != 0 || ciso_hdr.total_bytes <= 0 || ciso_hdr.block_size <= 0) {
+		SysPrintf("bad ciso header\n");
+		return -1;
+	}
+	if (ciso_hdr.header_size != 0 && ciso_hdr.header_size != sizeof(ciso_hdr)) {
+		ret = fseek(cdHandle, ciso_hdr.header_size, SEEK_SET);
+		if (ret != 0) {
+			SysPrintf("failed to seek to %x\n", ciso_hdr.header_size);
+			return -1;
+		}
+	}
+
+	compr_img = calloc(1, sizeof(*compr_img));
+	if (compr_img == NULL)
+		goto fail_io;
+
+	compr_img->block_shift = 0;
+	compr_img->current_block = (unsigned int)-1;
+
+	compr_img->index_len = ciso_hdr.total_bytes / ciso_hdr.block_size;
+	compr_img->index_table = malloc((compr_img->index_len + 1) * sizeof(compr_img->index_table[0]));
+	if (compr_img->index_table == NULL)
+		goto fail_io;
+
+	ret = fread(compr_img->index_table, sizeof(compr_img->index_table[0]), compr_img->index_len, cdHandle);
+	if (ret != compr_img->index_len) {
+		SysPrintf("failed to read index table\n");
+		goto fail_index;
+	}
+
+	for (i = 0; i < compr_img->index_len + 1; i++) {
+		index = compr_img->index_table[i];
+		plain = index & 0x80000000;
+		index &= 0x7fffffff;
+		compr_img->index_table[i] = (index << ciso_hdr.align) | plain;
+	}
+	if ((long long)index << ciso_hdr.align >= 0x80000000ll)
+		SysPrintf("warning: ciso img too large, expect problems\n");
+
+	return 0;
+
+fail_index:
+	free(compr_img->index_table);
+	compr_img->index_table = NULL;
+fail_io:
+	if (compr_img != NULL) {
+		free(compr_img);
+		compr_img = NULL;
+	}
+	return -1;
+}
+
 // this function tries to get the .sub file of the given .img
 static int opensubfile(const char *isoname) {
 	char		subname[MAXPATHLEN];
@@ -631,24 +879,161 @@
 	return 0;
 }
 
-static long CALLBACK ISOinit(void) {
-	assert(cdHandle == NULL);
-	assert(subHandle == NULL);
+static int opensbifile(const char *isoname) {
+	char		sbiname[MAXPATHLEN];
 
-	return 0; // do nothing
+	strncpy(sbiname, isoname, sizeof(sbiname));
+	sbiname[MAXPATHLEN - 1] = '\0';
+	if (strlen(sbiname) >= 4) {
+		strcpy(sbiname + strlen(sbiname) - 4, ".sbi");
+	}
+	else {
+		return -1;
+	}
+
+	return LoadSBI(sbiname);
 }
 
-static long CALLBACK ISOshutdown(void) {
-	if (cdHandle != NULL) {
-		fclose(cdHandle);
-		cdHandle = NULL;
+static int cdread_normal(FILE *f, unsigned int base, void *dest, int sector)
+{
+	fseek(f, base + sector * CD_FRAMESIZE_RAW, SEEK_SET);
+	return fread(dest, 1, CD_FRAMESIZE_RAW, f);
+}
+
+static int cdread_sub_mixed(FILE *f, unsigned int base, void *dest, int sector)
+{
+	int ret;
+
+	fseek(f, base + sector * (CD_FRAMESIZE_RAW + SUB_FRAMESIZE), SEEK_SET);
+	ret = fread(dest, 1, CD_FRAMESIZE_RAW, f);
+	fread(subbuffer, 1, SUB_FRAMESIZE, f);
+
+	if (subChanRaw) DecodeRawSubData();
+
+	return ret;
+}
+
+static int uncompress2(void *out, unsigned long *out_size, void *in, unsigned long in_size)
+{
+	static z_stream z;
+	int ret = 0;
+
+	if (z.zalloc == NULL) {
+		// XXX: one-time leak here..
+		z.next_in = Z_NULL;
+		z.avail_in = 0;
+		z.zalloc = Z_NULL;
+		z.zfree = Z_NULL;
+		z.opaque = Z_NULL;
+		ret = inflateInit2(&z, -15);
 	}
-	if (subHandle != NULL) {
-		fclose(subHandle);
-		subHandle = NULL;
+	else
+		ret = inflateReset(&z);
+	if (ret != Z_OK)
+		return ret;
+
+	z.next_in = in;
+	z.avail_in = in_size;
+	z.next_out = out;
+	z.avail_out = *out_size;
+
+	ret = inflate(&z, Z_NO_FLUSH);
+	//inflateEnd(&z);
+
+	*out_size -= z.avail_out;
+	return ret == 1 ? 0 : ret;
+}
+
+static int cdread_compressed(FILE *f, unsigned int base, void *dest, int sector)
+{
+	unsigned long cdbuffer_size, cdbuffer_size_expect;
+	unsigned int start_byte, size;
+	int is_compressed;
+	int ret, block;
+
+	if (base)
+		sector += base / 2352;
+
+	block = sector >> compr_img->block_shift;
+	compr_img->sector_in_blk = sector & ((1 << compr_img->block_shift) - 1);
+
+	if (block == compr_img->current_block) {
+		//printf("hit sect %d\n", sector);
+		goto finish;
 	}
-	stopCDDA();
-	return 0;
+
+	if (sector >= compr_img->index_len * 16) {
+		SysPrintf("sector %d is past img end\n", sector);
+		return -1;
+	}
+
+	start_byte = compr_img->index_table[block] & 0x7fffffff;
+	if (fseek(cdHandle, start_byte, SEEK_SET) != 0) {
+		SysPrintf("seek error for block %d at %x: ",
+			block, start_byte);
+		perror(NULL);
+		return -1;
+	}
+
+	is_compressed = !(compr_img->index_table[block] & 0x80000000);
+	size = (compr_img->index_table[block + 1] & 0x7fffffff) - start_byte;
+	if (size > sizeof(compr_img->buff_compressed)) {
+		SysPrintf("block %d is too large: %u\n", block, size);
+		return -1;
+	}
+
+	if (fread(is_compressed ? compr_img->buff_compressed : compr_img->buff_raw[0],
+				1, size, cdHandle) != size) {
+		SysPrintf("read error for block %d at %x: ", block, start_byte);
+		perror(NULL);
+		return -1;
+	}
+
+	if (is_compressed) {
+		cdbuffer_size_expect = sizeof(compr_img->buff_raw[0]) << compr_img->block_shift;
+		cdbuffer_size = cdbuffer_size_expect;
+		ret = uncompress2(compr_img->buff_raw[0], &cdbuffer_size, compr_img->buff_compressed, size);
+		if (ret != 0) {
+			SysPrintf("uncompress failed with %d for block %d, sector %d\n",
+					ret, block, sector);
+			return -1;
+		}
+		if (cdbuffer_size != cdbuffer_size_expect)
+			SysPrintf("cdbuffer_size: %lu != %lu, sector %d\n", cdbuffer_size,
+					cdbuffer_size_expect, sector);
+	}
+
+	// done at last!
+	compr_img->current_block = block;
+
+finish:
+	if (dest != cdbuffer) // copy avoid HACK
+		memcpy(dest, compr_img->buff_raw[compr_img->sector_in_blk],
+			CD_FRAMESIZE_RAW);
+	return CD_FRAMESIZE_RAW;
+}
+
+static int cdread_2048(FILE *f, unsigned int base, void *dest, int sector)
+{
+	int ret;
+
+	fseek(f, base + sector * 2048, SEEK_SET);
+	ret = fread((char *)dest + 12 * 2, 1, 2048, f);
+
+	// not really necessary, fake mode 2 header
+	memset(cdbuffer, 0, 12 * 2);
+	sec2msf(sector + 2 * 75, (char *)&cdbuffer[12]);
+	cdbuffer[12 + 3] = 1;
+
+	return ret;
+}
+
+static unsigned char * CALLBACK ISOgetBuffer_compr(void) {
+	return compr_img->buff_raw[compr_img->sector_in_blk] + 12;
+}
+
+static unsigned char * CALLBACK ISOgetBuffer(void) {
+	return cdbuffer + 12;
 }
 
 static void PrintTracks(void) {
@@ -665,6 +1050,8 @@
 // This function is invoked by the front-end when opening an ISO
 // file for playback
 static long CALLBACK ISOopen(void) {
+	boolean isMode1ISO = FALSE;
+
 	if (cdHandle != NULL) {
 		return 0; // it's already open
 	}
@@ -679,6 +1066,12 @@
 	cddaBigEndian = FALSE;
 	subChanMixed = FALSE;
 	subChanRaw = FALSE;
+	pregapOffset = 0;
+	cdrIsoMultidiskCount = 1;
+	multifile = 0;
+
+	CDR_getBuffer = ISOgetBuffer;
+	cdimg_read_func = cdread_normal;
 
 	if (parsecue(GetIsoFile()) == 0) {
 		SysPrintf("[+cue]");
@@ -692,19 +1085,57 @@
 	else if (parsemds(GetIsoFile()) == 0) {
 		SysPrintf("[+mds]");
 	}
+	if (handlepbp(GetIsoFile()) == 0) {
+		SysPrintf("[pbp]");
+		CDR_getBuffer = ISOgetBuffer_compr;
+		cdimg_read_func = cdread_compressed;
+	}
+	else if (handlecbin(GetIsoFile()) == 0) {
+		SysPrintf("[cbin]");
+		CDR_getBuffer = ISOgetBuffer_compr;
+		cdimg_read_func = cdread_compressed;
+	}
 
 	if (!subChanMixed && opensubfile(GetIsoFile()) == 0) {
 		SysPrintf("[+sub]");
 	}
+	if (opensbifile(GetIsoFile()) == 0) {
+		SysPrintf("[+sbi]");
+	}
+
+	// guess whether it is mode1/2048
+	fseek(cdHandle, 0, SEEK_END);
+	if (ftell(cdHandle) % 2048 == 0) {
+		unsigned int modeTest = 0;
+		fseek(cdHandle, 0, SEEK_SET);
+		fread(&modeTest, 4, 1, cdHandle);
+		if (SWAP32(modeTest) != 0xffffff00) {
+			SysPrintf("[2048]");
+			isMode1ISO = TRUE;
+		}
+	}
+	fseek(cdHandle, 0, SEEK_SET);
 
 	SysPrintf(".\n");
 
 	PrintTracks();
 
+	if (subChanMixed)
+		cdimg_read_func = cdread_sub_mixed;
+	else if (isMode1ISO)
+		cdimg_read_func = cdread_2048;
+
+	// make sure we have another handle open for cdda
+	if (numtracks > 1 && ti[1].handle == NULL) {
+		ti[1].handle = fopen(GetIsoFile(), "rb");
+	}
+
 	return 0;
 }
 
 static long CALLBACK ISOclose(void) {
+	int i;
+
 	if (cdHandle != NULL) {
 		fclose(cdHandle);
 		cdHandle = NULL;
@@ -713,7 +1144,37 @@
 		fclose(subHandle);
 		subHandle = NULL;
 	}
-	stopCDDA();
+
+	if (compr_img != NULL) {
+		free(compr_img->index_table);
+		free(compr_img);
+		compr_img = NULL;
+	}
+
+	for (i = 1; i <= numtracks; i++) {
+		if (ti[i].handle != NULL) {
+			fclose(ti[i].handle);
+			ti[i].handle = NULL;
+		}
+	}
+	numtracks = 0;
+	ti[1].type = 0;
+ 
+	memset(cdbuffer, 0, sizeof(cdbuffer));
+	CDR_getBuffer = ISOgetBuffer;
+
+	return 0;
+}
+
+long CALLBACK ISOinit(void) {
+	assert(cdHandle == NULL);
+	assert(subHandle == NULL);
+
+	return 0; // do nothing
+}
+
+static long CALLBACK ISOshutdown(void) {
+	ISOclose();
 	return 0;
 }
 
@@ -740,7 +1201,16 @@
 // byte 1 - second
 // byte 2 - minute
 static long CALLBACK ISOgetTD(unsigned char track, unsigned char *buffer) {
-	if (numtracks > 0 && track <= numtracks) {
+	if (track == 0) {
+		unsigned int sect;
+		unsigned char time[3];
+		sect = msf2sec(ti[numtracks].start) + msf2sec(ti[numtracks].length);
+		sec2msf(sect, (char *)time);
+		buffer[2] = time[0];
+		buffer[1] = time[1];
+		buffer[0] = time[2];
+	}
+	else if (numtracks > 0 && track <= numtracks) {
 		buffer[2] = ti[track].start[0];
 		buffer[1] = ti[track].start[1];
 		buffer[0] = ti[track].start[2];
@@ -774,61 +1244,53 @@
 // time: byte 0 - minute; byte 1 - second; byte 2 - frame
 // uses bcd format
 static long CALLBACK ISOreadTrack(unsigned char *time) {
+	int sector = MSF2SECT(btoi(time[0]), btoi(time[1]), btoi(time[2]));
+	long ret;
+
 	if (cdHandle == NULL) {
 		return -1;
 	}
 
-	if (subChanMixed) {
-		fseek(cdHandle, MSF2SECT(btoi(time[0]), btoi(time[1]), btoi(time[2])) * (CD_FRAMESIZE_RAW + SUB_FRAMESIZE) + 12, SEEK_SET);
-		fread(cdbuffer, 1, DATA_SIZE, cdHandle);
-		fread(subbuffer, 1, SUB_FRAMESIZE, cdHandle);
-
-		if (subChanRaw) DecodeRawSubData();
+	if (pregapOffset) {
+		subChanMissing = FALSE;
+		if (sector >= pregapOffset) {
+			sector -= 2 * 75;
+			if (sector < pregapOffset)
+				subChanMissing = TRUE;
+		}
 	}
-	else {
-		fseek(cdHandle, MSF2SECT(btoi(time[0]), btoi(time[1]), btoi(time[2])) * CD_FRAMESIZE_RAW + 12, SEEK_SET);
-		fread(cdbuffer, 1, DATA_SIZE, cdHandle);
 
-		if (subHandle != NULL) {
-			fseek(subHandle, MSF2SECT(btoi(time[0]), btoi(time[1]), btoi(time[2])) * SUB_FRAMESIZE, SEEK_SET);
-			fread(subbuffer, 1, SUB_FRAMESIZE, subHandle);
+	ret = cdimg_read_func(cdHandle, 0, cdbuffer, sector);
+	if (ret < 0)
+		return -1;
 
-			if (subChanRaw) DecodeRawSubData();
-		}
+	if (subHandle != NULL) {
+		fseek(subHandle, sector * SUB_FRAMESIZE, SEEK_SET);
+		fread(subbuffer, 1, SUB_FRAMESIZE, subHandle);
+
+		if (subChanRaw) DecodeRawSubData();
 	}
 
 	return 0;
 }
 
-// return readed track
-static unsigned char * CALLBACK ISOgetBuffer(void) {
-	return cdbuffer;
-}
-
 // plays cdda audio
 // sector: byte 0 - minute; byte 1 - second; byte 2 - frame
 // does NOT uses bcd format
 static long CALLBACK ISOplay(unsigned char *time) {
-	if (SPU_playCDDAchannel != NULL) {
-		if (subChanMixed) {
-			startCDDA(MSF2SECT(time[0], time[1], time[2]) * (CD_FRAMESIZE_RAW + SUB_FRAMESIZE));
-		}
-		else {
-			startCDDA(MSF2SECT(time[0], time[1], time[2]) * CD_FRAMESIZE_RAW);
-		}
-	}
+	playing = TRUE;
 	return 0;
 }
 
 // stops cdda audio
 static long CALLBACK ISOstop(void) {
-	stopCDDA();
+	playing = FALSE;
 	return 0;
 }
 
 // gets subchannel data
 static unsigned char* CALLBACK ISOgetBufferSub(void) {
-	if (subHandle != NULL || subChanMixed) {
+	if ((subHandle != NULL || subChanMixed) && !subChanMissing) {
 		return subbuffer;
 	}
 
@@ -836,18 +1298,73 @@
 }
 
 static long CALLBACK ISOgetStatus(struct CdrStat *stat) {
-	int sec;
-
+	u32 sect;
+	
 	CDR__getStatus(stat);
-
+	
 	if (playing) {
 		stat->Type = 0x02;
 		stat->Status |= 0x80;
-		sec = cddaCurOffset / CD_FRAMESIZE_RAW;
-		sec2msf(sec, (char *)stat->Time);
 	}
 	else {
-		stat->Type = 0x01;
+		// BIOS - boot ID (CD type)
+		stat->Type = ti[1].type;
+	}
+	
+	// relative -> absolute time
+	sect = cddaCurPos;
+	sec2msf(sect, (u8 *)stat->Time);
+	
+	return 0;
+}
+
+// read CDDA sector into buffer
+long CALLBACK ISOreadCDDA(unsigned char m, unsigned char s, unsigned char f, unsigned char *buffer) {
+	unsigned char msf[3] = {m, s, f};
+	unsigned int file, track, track_start = 0;
+	int ret;
+
+	cddaCurPos = msf2sec(msf);
+
+	// find current track index
+	for (track = numtracks; ; track--) {
+		track_start = msf2sec(ti[track].start);
+		if (track_start <= cddaCurPos)
+			break;
+		if (track == 1)
+			break;
+	}
+
+	// data tracks play silent
+	if (ti[track].type != CDDA) {
+		memset(buffer, 0, CD_FRAMESIZE_RAW);
+		return 0;
+	}
+
+	file = 1;
+	if (multifile) {
+		// find the file that contains this track
+		for (file = track; file > 1; file--)
+			if (ti[file].handle != NULL)
+				break;
+	}
+
+	ret = cdimg_read_func(ti[file].handle, ti[track].start_offset,
+		buffer, cddaCurPos - track_start);
+	if (ret != CD_FRAMESIZE_RAW) {
+		memset(buffer, 0, CD_FRAMESIZE_RAW);
+		return -1;
+	}
+
+	if (cddaBigEndian) {
+		int i;
+		unsigned char tmp;
+
+		for (i = 0; i < CD_FRAMESIZE_RAW / 2; i++) {
+			tmp = buffer[i * 2];
+			buffer[i * 2] = buffer[i * 2 + 1];
+			buffer[i * 2 + 1] = tmp;
+		}
 	}
 
 	return 0;
@@ -866,6 +1383,7 @@
 	CDR_stop = ISOstop;
 	CDR_getBufferSub = ISOgetBufferSub;
 	CDR_getStatus = ISOgetStatus;
+	CDR_readCDDA = ISOreadCDDA;
 
 	CDR_getDriveLetter = CDR__getDriveLetter;
 	CDR_configure = CDR__configure;

pcsxr-1.9.92.tar.bz2/libpcsxcore/cdriso.h -> pcsxr-1.9.93.tar.bz2/libpcsxcore/cdriso.h Changed

pcsxr-1.9.92.tar.bz2/libpcsxcore/cdrom.c -> pcsxr-1.9.93.tar.bz2/libpcsxcore/cdrom.c Changed

@@ -14,15 +14,16 @@
 * You should have received a copy of the GNU General Public License *
 * along with this program; if not, write to the *
 * Free Software Foundation, Inc., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
 ***************************************************************************/
 
-/* 
+/*
 * Handles all CD-ROM registers and functions.
 */
 
 #include "cdrom.h"
 #include "ppf.h"
+#include "psxdma.h"
 
 cdrStruct cdr;
 
@@ -37,34 +38,27 @@
 #define CdlStandby 7
 #define CdlStop 8
 #define CdlPause 9
-#define CdlInit 10
-#define CdlMute 11
-#define CdlDemute 12
-#define CdlSetfilter 13
-#define CdlSetmode 14
-#define CdlGetmode 15
-#define CdlGetlocL 16
-#define CdlGetlocP 17
-#define CdlReadT 18
-#define CdlGetTN 19
-#define CdlGetTD 20
-#define CdlSeekL 21
-#define CdlSeekP 22
-#define CdlSetclock 23
-#define CdlGetclock 24
-#define CdlTest 25
-#define CdlID 26
-#define CdlReadS 27
-#define CdlReset 28
-#define CdlReadToc 30
-
-#define AUTOPAUSE 249
-#define READ_ACK 250
-#define READ 251
-#define REPPLAY_ACK 252
-#define REPPLAY 253
-#define ASYNC 254
-/* don't set 255, it's reserved */
+#define CdlInit 10 // 0xa
+#define CdlMute 11 // 0xb
+#define CdlDemute 12 // 0xc
+#define CdlSetfilter 13 // 0xd
+#define CdlSetmode 14 // 0xe
+#define CdlGetmode 15 // 0xf
+#define CdlGetlocL 16 // 0x10
+#define CdlGetlocP 17 // 0x11
+#define CdlReadT 18 // 0x12
+#define CdlGetTN 19 // 0x13
+#define CdlGetTD 20 // 0x14
+#define CdlSeekL 21 // 0x15
+#define CdlSeekP 22 // 0x16
+#define CdlSetclock 23 // 0x17
+#define CdlGetclock 24 // 0x18
+#define CdlTest 25 // 0x19
+#define CdlID 26 // 0x1a
+#define CdlReadS 27 // 0x1b
+#define CdlReset 28 // 0x1c
+#define CdlGetQ 29 // 0x1d
+#define CdlReadToc 30 // 0x1e
 
 char *CmdName[0x100]= {
 "CdlSync", "CdlNop", "CdlSetloc", "CdlPlay",
@@ -83,330 +77,812 @@
 unsigned char Test22[] = { 0x66, 0x6F, 0x72, 0x20, 0x45, 0x75, 0x72, 0x6F };
 unsigned char Test23[] = { 0x43, 0x58, 0x44, 0x32, 0x39 ,0x34, 0x30, 0x51 };
 
+// cdr.Stat:
+#define NoIntr		0
+#define DataReady	1
+#define Complete	2
+#define Acknowledge	3
+#define DataEnd		4
+#define DiskError	5
+
+/* Modes flags */
+#define MODE_SPEED (1<<7) // 0x80
+#define MODE_STRSND (1<<6) // 0x40 ADPCM on/off
+#define MODE_SIZE_2340 (1<<5) // 0x20
+#define MODE_SIZE_2328 (1<<4) // 0x10
+#define MODE_SIZE_2048 (0<<4) // 0x00
+#define MODE_SF (1<<3) // 0x08 channel on/off
+#define MODE_REPORT (1<<2) // 0x04
+#define MODE_AUTOPAUSE (1<<1) // 0x02
+#define MODE_CDDA (1<<0) // 0x01
+
+/* Status flags */
+#define STATUS_PLAY (1<<7) // 0x80
+#define STATUS_SEEK (1<<6) // 0x40
+#define STATUS_READ (1<<5) // 0x20
+#define STATUS_SHELLOPEN (1<<4) // 0x10
+#define STATUS_UNKNOWN3 (1<<3) // 0x08
+#define STATUS_UNKNOWN2 (1<<2) // 0x04
+#define STATUS_ROTATING (1<<1) // 0x02
+#define STATUS_ERROR (1<<0) // 0x01
+
+/* Errors */
+#define ERROR_NOT_READY (1<<7) // 0x80
+#define ERROR_INVALIDCMD (1<<6) // 0x40
+#define ERROR_INVALIDARG (1<<5) // 0x20
+
 // 1x = 75 sectors per second
 // PSXCLK = 1 sec in the ps
 // so (PSXCLK / 75) = cdr read time (linuzappz)
 #define cdReadTime (PSXCLK / 75)
 
+enum drive_state {
+	DRIVESTATE_STANDBY = 0,
+	DRIVESTATE_LID_OPEN,
+	DRIVESTATE_RESCAN_CD,
+	DRIVESTATE_PREPARE_CD,
+	DRIVESTATE_STOPPED,
+};
+
+// for cdr.Seeked
+enum seeked_state {
+	SEEK_PENDING = 0,
+	SEEK_DONE = 1,
+};
+
 static struct CdrStat stat;
-static struct SubQ *subq;
 
+extern unsigned int msf2sec(const char *msf);
+extern void sec2msf(unsigned int s, const char *msf);
+
+// for that weird psemu API..
+static unsigned int fsm2sec(const u8 *msf) {
+	return ((msf[2] * 60 + msf[1]) * 75) + msf[0];
+}
+
+
+extern long CALLBACK ISOinit(void);
+extern void CALLBACK SPUirq(void);
+extern SPUregisterCallback SPU_registerCallback;
+
+// A bit of a kludge, but it will get rid of the "macro redefined" warnings
+
+#ifdef H_SPUirqAddr
+#undef H_SPUirqAddr
+#endif
+
+#ifdef H_SPUaddr
+#undef H_SPUaddr
+#endif
+
+#ifdef H_SPUctrl
+#undef H_SPUctrl
+#endif
+
+#define H_SPUirqAddr		0x1f801da4
+#define H_SPUaddr				0x1f801da6
+#define H_SPUctrl				0x1f801daa
+#define H_CDLeft				0x1f801db0
+#define H_CDRight				0x1f801db2
+
+
+// cdrInterrupt
 #define CDR_INT(eCycle) { \
-	psxRegs.interrupt |= 0x4; \
-	psxRegs.intCycle[2 + 1] = eCycle; \
-	psxRegs.intCycle[2] = psxRegs.cycle; }
+	psxRegs.interrupt |= (1 << PSXINT_CDR); \
+	psxRegs.intCycle[PSXINT_CDR].cycle = eCycle; \
+	psxRegs.intCycle[PSXINT_CDR].sCycle = psxRegs.cycle; \
+}
 
+// cdrReadInterrupt
 #define CDREAD_INT(eCycle) { \
-	psxRegs.interrupt |= 0x40000; \
-	psxRegs.intCycle[2 + 16 + 1] = eCycle; \
-	psxRegs.intCycle[2 + 16] = psxRegs.cycle; }
-
-#define StartReading(type, eCycle) { \
- 	cdr.Reading = type; \
- 	cdr.FirstSector = 1; \
- 	cdr.Readed = 0xff; \
-	AddIrqQueue(READ_ACK, eCycle); \
+	psxRegs.interrupt |= (1 << PSXINT_CDREAD); \
+	psxRegs.intCycle[PSXINT_CDREAD].cycle = eCycle; \
+	psxRegs.intCycle[PSXINT_CDREAD].sCycle = psxRegs.cycle; \
+}
+
+// cdrDecodedBufferInterrupt
+#define CDRDBUF_INT(eCycle) { \
+	psxRegs.interrupt |= (1 << PSXINT_CDRDBUF); \
+	psxRegs.intCycle[PSXINT_CDRDBUF].cycle = eCycle; \
+	psxRegs.intCycle[PSXINT_CDRDBUF].sCycle = psxRegs.cycle; \
+}
+
+// cdrLidSeekInterrupt
+#define CDRLID_INT(eCycle) { \
+	psxRegs.interrupt |= (1 << PSXINT_CDRLID); \
+	psxRegs.intCycle[PSXINT_CDRLID].cycle = eCycle; \
+	psxRegs.intCycle[PSXINT_CDRLID].sCycle = psxRegs.cycle; \
+}
+
+// cdrPlayInterrupt
+#define CDRMISC_INT(eCycle) { \
+	psxRegs.interrupt |= (1 << PSXINT_CDRPLAY); \
+	psxRegs.intCycle[PSXINT_CDRPLAY].cycle = eCycle; \
+	psxRegs.intCycle[PSXINT_CDRPLAY].sCycle = psxRegs.cycle; \
 }
 
 #define StopReading() { \
 	if (cdr.Reading) { \
 		cdr.Reading = 0; \
-		psxRegs.interrupt &= ~0x40000; \
+		psxRegs.interrupt &= ~(1 << PSXINT_CDREAD); \
 	} \
-	cdr.StatP &= ~0x20;\
+	cdr.StatP &= ~(STATUS_READ|STATUS_SEEK);\
 }
 
 #define StopCdda() { \
 	if (cdr.Play) { \
 		if (!Config.Cdda) CDR_stop(); \
-		cdr.StatP &= ~0x80; \
+		cdr.StatP &= ~STATUS_PLAY; \
 		cdr.Play = FALSE; \
+		cdr.FastForward = 0; \
+		cdr.FastBackward = 0; \
+		SPU_registerCallback( SPUirq ); \
 	} \
 }
 
 #define SetResultSize(size) { \
- cdr.ResultP = 0; \
+	cdr.ResultP = 0; \
 	cdr.ResultC = size; \
 	cdr.ResultReady = 1; \
 }
 
-static void ReadTrack() {
-	cdr.Prev[0] = itob(cdr.SetSector[0]);
-	cdr.Prev[1] = itob(cdr.SetSector[1]);
-	cdr.Prev[2] = itob(cdr.SetSector[2]);
+static void setIrq(void)
+{
+	if (cdr.Stat & cdr.Reg2)
+		psxHu32ref(0x1070) |= SWAP32((u32)0x4);
+}
+
+static void adjustTransferIndex(void)
+{
+	unsigned int bufSize = 0;
+	
+	switch (cdr.Mode & (MODE_SIZE_2340|MODE_SIZE_2328)) {
+		case MODE_SIZE_2340: bufSize = 2340; break;
+		case MODE_SIZE_2328: bufSize = 12 + 2328; break;
+		default:
+		case MODE_SIZE_2048: bufSize = 12 + 2048; break;
+	}
+	
+	if (cdr.transferIndex >= bufSize)
+		cdr.transferIndex -= bufSize;
+}
+
+// FIXME: do this in SPU instead
+void cdrDecodedBufferInterrupt()
+{
+#if 0
+	return;
+#endif
+
+
+	// ISO reader only
+	if( CDR_init != ISOinit ) return;
+
+
+	// check dbuf IRQ still active
+	if( cdr.Play == 0 ) return;
+	if( (SPU_readRegister( H_SPUctrl ) & 0x40) == 0 ) return;
+	if( (SPU_readRegister( H_SPUirqAddr ) * 8) >= 0x800 ) return;
+
+
+	// turn off plugin SPU IRQ decoded buffer handling
+	SPU_registerCallback( 0 );
+
+
+	/*
+	Vib Ribbon
+
+	000-3FF = left CDDA
+	400-7FF = right CDDA
+
+	Assume IRQ every wrap
+	*/
+
+	// signal CDDA data ready
+	psxHu32ref(0x1070) |= SWAP32((u32)0x200);
+
+
+	// time for next full buffer
+	//CDRDBUF_INT( PSXCLK / 44100 * 0x200 );
+	CDRDBUF_INT( PSXCLK / 44100 * 0x100 );
+}
+
+// timing used in this function was taken from tests on real hardware
+// (yes it's slow, but you probably don't want to modify it)
+void cdrLidSeekInterrupt()
+{
+	switch (cdr.DriveState) {
+	default:
+	case DRIVESTATE_STANDBY:
+		cdr.StatP &= ~STATUS_SEEK;
 
+		if (CDR_getStatus(&stat) == -1)
+			return;
+
+		if (stat.Status & STATUS_SHELLOPEN)
+		{
+			StopCdda();
+			cdr.DriveState = DRIVESTATE_LID_OPEN;
+			CDRLID_INT(0x800);
+		}
+		break;
+
+	case DRIVESTATE_LID_OPEN:
+		if (CDR_getStatus(&stat) == -1)
+			stat.Status &= ~STATUS_SHELLOPEN;
+
+		// 02, 12, 10
+		if (!(cdr.StatP & STATUS_SHELLOPEN)) {
+			StopReading();
+			cdr.StatP |= STATUS_SHELLOPEN;
+
+			// could generate error irq here, but real hardware
+			// only sometimes does that
+			// (not done when lots of commands are sent?)
+
+			CDRLID_INT(cdReadTime * 30);
+			break;
+		}
+		else if (cdr.StatP & STATUS_ROTATING) {
+			cdr.StatP &= ~STATUS_ROTATING;
+		}
+		else if (!(stat.Status & STATUS_SHELLOPEN)) {
+			// closed now
+			CheckCdrom();
+
+			// cdr.StatP STATUS_SHELLOPEN is "sticky"
+			// and is only cleared by CdlNop
+
+			cdr.DriveState = DRIVESTATE_RESCAN_CD;
+			CDRLID_INT(cdReadTime * 105);
+			break;
+		}
+
+		// recheck for close
+		CDRLID_INT(cdReadTime * 3);
+		break;
+
+	case DRIVESTATE_RESCAN_CD:
+		cdr.StatP |= STATUS_ROTATING;
+		cdr.DriveState = DRIVESTATE_PREPARE_CD;
+
+		// this is very long on real hardware, over 6 seconds
+		// make it a bit faster here...
+		CDRLID_INT(cdReadTime * 150);
+		break;
+
+	case DRIVESTATE_PREPARE_CD:
+		cdr.StatP |= STATUS_SEEK;
+
+		cdr.DriveState = DRIVESTATE_STANDBY;
+		CDRLID_INT(cdReadTime * 26);
+		break;
+	}
+}
+
+static void Find_CurTrack(const u8 *time)
+{
+	int current, sect;
+
+	current = msf2sec(time);
+
+	for (cdr.CurTrack = 1; cdr.CurTrack < cdr.ResultTN[1]; cdr.CurTrack++) {
+		CDR_getTD(cdr.CurTrack + 1, cdr.ResultTD);
+		sect = fsm2sec(cdr.ResultTD);
+		if (sect - current >= 150)
+			break;
+	}
 #ifdef CDR_LOG
-	CDR_LOG("ReadTrack() Log: KEY *** %x:%x:%x\n", cdr.Prev[0], cdr.Prev[1], cdr.Prev[2]);
+	CDR_LOG("Find_CurTrack *** %02d %02d\n", cdr.CurTrack, current);
 #endif
-	cdr.RErr = CDR_readTrack(cdr.Prev);
 }
 
-// cdr.Stat:
-#define NoIntr		0
-#define DataReady	1
-#define Complete	2
-#define Acknowledge	3
-#define DataEnd		4
-#define DiskError	5
+static void generate_subq(const u8 *time)
+{
+	unsigned char start[3], next[3];
+	unsigned int this_s, start_s, next_s, pregap;
+	int relative_s;
+
+	CDR_getTD(cdr.CurTrack, start);
+	if (cdr.CurTrack + 1 <= cdr.ResultTN[1]) {
+		pregap = 150;
+		CDR_getTD(cdr.CurTrack + 1, next);
+	}
+	else {
+		// last track - cd size
+		pregap = 0;
+		next[0] = cdr.SetSectorEnd[2];
+		next[1] = cdr.SetSectorEnd[1];
+		next[2] = cdr.SetSectorEnd[0];
+	}
+
+	this_s = msf2sec(time);
+	start_s = fsm2sec(start);
+	next_s = fsm2sec(next);
+
+	cdr.TrackChanged = FALSE;
+
+	if (next_s - this_s < pregap) {
+		cdr.TrackChanged = TRUE;
+		cdr.CurTrack++;
+		start_s = next_s;
+	}
+
+	cdr.subq.Index = 1;
+
+	relative_s = this_s - start_s;
+	if (relative_s < 0) {
+		cdr.subq.Index = 0;
+		relative_s = -relative_s;
+	}
+	sec2msf(relative_s, cdr.subq.Relative);
+
+	cdr.subq.Track = itob(cdr.CurTrack);
+	cdr.subq.Relative[0] = itob(cdr.subq.Relative[0]);
+	cdr.subq.Relative[1] = itob(cdr.subq.Relative[1]);
+	cdr.subq.Relative[2] = itob(cdr.subq.Relative[2]);
+	cdr.subq.Absolute[0] = itob(time[0]);
+	cdr.subq.Absolute[1] = itob(time[1]);
+	cdr.subq.Absolute[2] = itob(time[2]);
+}
+
+static void ReadTrack(const u8 *time) {
+	unsigned char tmp[3];
+	struct SubQ *subq;
+	u16 crc;
+
+	tmp[0] = itob(time[0]);
+	tmp[1] = itob(time[1]);
+	tmp[2] = itob(time[2]);
+
+	if (memcmp(cdr.Prev, tmp, 3) == 0)
+		return;
+
+#ifdef CDR_LOG
+	CDR_LOG("ReadTrack *** %02x:%02x:%02x\n", tmp[0], tmp[1], tmp[2]);
+#endif
+
+	cdr.RErr = CDR_readTrack(tmp);
+	memcpy(cdr.Prev, tmp, 3);
+
+	if (CheckSBI(time))
+		return;
+
+	subq = (struct SubQ *)CDR_getBufferSub();
+	if (subq != NULL && cdr.CurTrack == 1) {
+		crc = calcCrc((u8 *)subq + 12, 10);
+		if (crc == (((u16)subq->CRC[0] << 8) | subq->CRC[1])) {
+			cdr.subq.Track = subq->TrackNumber;
+			cdr.subq.Index = subq->IndexNumber;
+			memcpy(cdr.subq.Relative, subq->TrackRelativeAddress, 3);
+			memcpy(cdr.subq.Absolute, subq->AbsoluteAddress, 3);
+		}
+		else {
+#ifdef CDR_LOG_IO
+			CDR_LOG_IO("subq bad crc @%02x:%02x:%02x\n",
+				tmp[0], tmp[1], tmp[2]);
+#endif
+		}
+	}
+	else {
+		generate_subq(time);
+	}
+
+#ifdef CDR_LOG
+	CDR_LOG(" -> %02x,%02x %02x:%02x:%02x %02x:%02x:%02x\n",
+		cdr.subq.Track, cdr.subq.Index,
+		cdr.subq.Relative[0], cdr.subq.Relative[1], cdr.subq.Relative[2],
+		cdr.subq.Absolute[0], cdr.subq.Absolute[1], cdr.subq.Absolute[2]);
+#endif
+}
+
+static void AddIrqQueue(unsigned short irq, unsigned long ecycle) {
+	if (cdr.Irq != 0) {
+		if (irq == cdr.Irq || irq + 0x100 == cdr.Irq) {
+			cdr.IrqRepeated = 1;
+			CDR_INT(ecycle);
+			return;
+		}
+#ifdef CDR_LOG_IO
+		CDR_LOG_IO("cdr: override cmd %02x -> %02x\n", cdr.Irq, irq);
+#endif
+	}
 
-void AddIrqQueue(unsigned char irq, unsigned long ecycle) {
 	cdr.Irq = irq;
-	if (cdr.Stat) {
-		cdr.eCycle = ecycle;
-	} else {
-		CDR_INT(ecycle);
+	cdr.eCycle = ecycle;
+
+	CDR_INT(ecycle);
+}
+
+static void cdrPlayInterrupt_Autopause()
+{
+	if ((cdr.Mode & MODE_AUTOPAUSE) && cdr.TrackChanged) {
+#ifdef CDR_LOG
+		CDR_LOG( "CDDA STOP\n" );
+#endif
+		// Magic the Gathering
+		// - looping territory cdda
+
+		// ...?
+		//cdr.ResultReady = 1;
+		//cdr.Stat = DataReady;
+		cdr.Stat = DataEnd;
+		setIrq();
+
+		StopCdda();
+	}
+	else if (cdr.Mode & MODE_REPORT) {
+
+		cdr.Result[0] = cdr.StatP;
+		cdr.Result[1] = cdr.subq.Track;
+		cdr.Result[2] = cdr.subq.Index;
+
+		if (cdr.subq.Absolute[2] & 0x10) {
+			cdr.Result[3] = cdr.subq.Relative[0];
+			cdr.Result[4] = cdr.subq.Relative[1] | 0x80;
+			cdr.Result[5] = cdr.subq.Relative[2];
+		}
+		else {
+			cdr.Result[3] = cdr.subq.Absolute[0];
+			cdr.Result[4] = cdr.subq.Absolute[1];
+			cdr.Result[5] = cdr.subq.Absolute[2];
+		}
+
+		cdr.Result[6] = 0;
+		cdr.Result[7] = 0;
+
+		// Rayman: Logo freeze (resultready + dataready)
+		cdr.ResultReady = 1;
+		cdr.Stat = DataReady;
+
+		SetResultSize(8);
+		setIrq();
 	}
 }
 
+// also handles seek
+void cdrPlayInterrupt()
+{
+	if (cdr.Seeked == SEEK_PENDING) {
+		if (cdr.Stat) {
+			CDRMISC_INT( 0x100 );
+			return;
+		}
+		SetResultSize(1);
+		cdr.StatP |= STATUS_ROTATING;
+		cdr.StatP &= ~STATUS_SEEK;
+		cdr.Result[0] = cdr.StatP;
+		cdr.Seeked = SEEK_DONE;
+		if (cdr.Irq == 0) {
+			cdr.Stat = Complete;
+			setIrq();
+		}
+
+		if (cdr.SetlocPending) {
+			memcpy(cdr.SetSectorPlay, cdr.SetSector, 4);
+			cdr.SetlocPending = 0;
+		}
+		Find_CurTrack(cdr.SetSectorPlay);
+		ReadTrack(cdr.SetSectorPlay);
+		cdr.TrackChanged = FALSE;
+	}
+
+	if (!cdr.Play) return;
+#ifdef CDR_LOG
+	CDR_LOG( "CDDA - %d:%d:%d\n",
+		cdr.SetSectorPlay[0], cdr.SetSectorPlay[1], cdr.SetSectorPlay[2] );
+#endif
+	if (memcmp(cdr.SetSectorPlay, cdr.SetSectorEnd, 3) == 0) {
+		StopCdda();
+		cdr.TrackChanged = TRUE;
+	}
+
+	if (!cdr.Irq && !cdr.Stat && (cdr.Mode & (MODE_AUTOPAUSE|MODE_REPORT)))
+		cdrPlayInterrupt_Autopause();
+
+	if (!cdr.Play) return;
+
+	if (CDR_readCDDA && !cdr.Muted) {
+		CDR_readCDDA(cdr.SetSectorPlay[0], cdr.SetSectorPlay[1],
+			cdr.SetSectorPlay[2], cdr.Transfer);
+
+		cdrAttenuate((s16 *)cdr.Transfer, CD_FRAMESIZE_RAW / 4, 1);
+		if (SPU_playCDDAchannel)
+			SPU_playCDDAchannel((short *)cdr.Transfer, CD_FRAMESIZE_RAW);
+	}
+
+	cdr.SetSectorPlay[2]++;
+	if (cdr.SetSectorPlay[2] == 75) {
+		cdr.SetSectorPlay[2] = 0;
+		cdr.SetSectorPlay[1]++;
+		if (cdr.SetSectorPlay[1] == 60) {
+			cdr.SetSectorPlay[1] = 0;
+			cdr.SetSectorPlay[0]++;
+		}
+	}
+
+	CDRMISC_INT(cdReadTime);
+
+	// update for CdlGetlocP/autopause
+	generate_subq(cdr.SetSectorPlay);
+}
+
 void cdrInterrupt() {
-	int i;
-	unsigned char Irq = cdr.Irq;
+	u16 Irq = cdr.Irq;
+	int no_busy_error = 0;
+	int start_rotating = 0;
+	int error = 0;
+	int delay;
 
+	// Reschedule IRQ
 	if (cdr.Stat) {
-		CDR_INT(0x1000);
+		CDR_INT( 0x100 );
 		return;
 	}
 
-	cdr.Irq = 0xff;
 	cdr.Ctrl &= ~0x80;
 
+	// default response
+	SetResultSize(1);
+	cdr.Result[0] = cdr.StatP;
+	cdr.Stat = Acknowledge;
+
+	if (cdr.IrqRepeated) {
+		cdr.IrqRepeated = 0;
+		if (cdr.eCycle > psxRegs.cycle) {
+			CDR_INT(cdr.eCycle);
+			goto finish;
+		}
+	}
+
+	cdr.Irq = 0;
+#ifdef CDR_LOG
+	CDR_LOG("CDRINT %x %x %x %x\n", cdr.Seeked, cdr.Stat, Irq, cdr.IrqRepeated);
+#endif
 	switch (Irq) {
 		case CdlSync:
-			SetResultSize(1);
-			cdr.StatP |= 0x2;
-			cdr.Result[0] = cdr.StatP;
-			cdr.Stat = Acknowledge; 
+			// TOOD: sometimes/always return error?
 			break;
 
 		case CdlNop:
-			SetResultSize(1);
-			cdr.Result[0] = cdr.StatP;
-			cdr.Stat = Acknowledge;
-			i = stat.Status;
-			if (CDR_getStatus(&stat) != -1) {
-				if (stat.Type == 0xff) cdr.Stat = DiskError;
-				if (stat.Status & 0x10) {
-					cdr.Stat = DiskError;
-					cdr.Result[0] |= 0x11;
-					cdr.Result[0] &= ~0x02;
-				}
-				else if (i & 0x10) {
-					cdr.StatP |= 0x2;
-					cdr.Result[0] |= 0x2;
-					CheckCdrom();
-				}
-			}
+			if (cdr.DriveState != DRIVESTATE_LID_OPEN)
+				cdr.StatP &= ~STATUS_SHELLOPEN;
+			no_busy_error = 1;
 			break;
 
 		case CdlSetloc:
-			cdr.CmdProcess = 0;
-			SetResultSize(1);
-			cdr.StatP |= 0x2;
-			cdr.Result[0] = cdr.StatP;
-			cdr.Stat = Acknowledge;
 			break;
 
+		do_CdlPlay:
 		case CdlPlay:
-			cdr.CmdProcess = 0;
-			SetResultSize(1);
-			cdr.StatP |= 0x2;
+			StopCdda();
+			if (cdr.Seeked == SEEK_PENDING) {
+				// XXX: wrong, should seek instead..
+				cdr.Seeked = SEEK_DONE;
+			}
+			if (cdr.SetlocPending) {
+				memcpy(cdr.SetSectorPlay, cdr.SetSector, 4);
+				cdr.SetlocPending = 0;
+			}
+
+			// BIOS CD Player
+			// - Pause player, hit Track 01/02/../xx (Setloc issued!!)
+
+			if (cdr.ParamC == 0 || cdr.Param[0] == 0) {
+#ifdef CDR_LOG
+				CDR_LOG("PLAY Resume @ %d:%d:%d\n",
+					cdr.SetSectorPlay[0], cdr.SetSectorPlay[1], cdr.SetSectorPlay[2]);
+#endif
+			}
+			else
+			{
+				int track = btoi( cdr.Param[0] );
+
+				if (track <= cdr.ResultTN[1])
+					cdr.CurTrack = track;
+
+#ifdef CDR_LOG
+				CDR_LOG("PLAY track %d\n", cdr.CurTrack);
+#endif
+
+				if (CDR_getTD((u8)cdr.CurTrack, cdr.ResultTD) != -1) {
+					cdr.SetSectorPlay[0] = cdr.ResultTD[2];
+					cdr.SetSectorPlay[1] = cdr.ResultTD[1];
+					cdr.SetSectorPlay[2] = cdr.ResultTD[0];
+				}
+			}
+
+			/*
+			Rayman: detect track changes
+			- fixes logo freeze
+
+			Twisted Metal 2: skip PREGAP + starting accurate SubQ
+			- plays tracks without retry play
+
+			Wild 9: skip PREGAP + starting accurate SubQ
+			- plays tracks without retry play
+			*/
+			Find_CurTrack(cdr.SetSectorPlay);
+			ReadTrack(cdr.SetSectorPlay);
+			cdr.TrackChanged = FALSE;
+
+			if (!Config.Cdda)
+				CDR_play(cdr.SetSectorPlay);
+
+			// Vib Ribbon: gameplay checks flag
+			cdr.StatP &= ~STATUS_SEEK;
 			cdr.Result[0] = cdr.StatP;
-			cdr.Stat = Acknowledge;
-			cdr.StatP |= 0x80;
-//			if ((cdr.Mode & 0x5) == 0x5) AddIrqQueue(REPPLAY, cdReadTime);
+
+			cdr.StatP |= STATUS_PLAY;
+			
+			// BIOS player - set flag again
+			cdr.Play = TRUE;
+
+			CDRMISC_INT( cdReadTime );
+			start_rotating = 1;
+			break;
+
+		case CdlForward:
+			// TODO: error 80 if stopped
+			cdr.Stat = Complete;
+
+			// GameShark CD Player: Calls 2x + Play 2x
+			if( cdr.FastForward == 0 ) cdr.FastForward = 2;
+			else cdr.FastForward++;
+
+			cdr.FastBackward = 0;
 			break;
 
- 	case CdlForward:
-			cdr.CmdProcess = 0;
-			SetResultSize(1);
-			cdr.StatP |= 0x2;
- 	cdr.Result[0] = cdr.StatP;
- 	cdr.Stat = Complete;
+		case CdlBackward:
+			cdr.Stat = Complete;
+
+			// GameShark CD Player: Calls 2x + Play 2x
+			if( cdr.FastBackward == 0 ) cdr.FastBackward = 2;
+			else cdr.FastBackward++;
+
+			cdr.FastForward = 0;
 			break;
 
- 	case CdlBackward:
-			cdr.CmdProcess = 0;
-			SetResultSize(1);
-			cdr.StatP |= 0x2;
- 	cdr.Result[0] = cdr.StatP;
- 	cdr.Stat = Complete;
+		case CdlStandby:
+			if (cdr.DriveState != DRIVESTATE_STOPPED) {
+				error = ERROR_INVALIDARG;
+				goto set_error;
+			}
+			AddIrqQueue(CdlStandby + 0x100, cdReadTime * 125 / 2);
+			start_rotating = 1;
 			break;
 
- 	case CdlStandby:
-			cdr.CmdProcess = 0;
-			SetResultSize(1);
-			cdr.StatP |= 0x2;
-			cdr.Result[0] = cdr.StatP;
+		case CdlStandby + 0x100:
 			cdr.Stat = Complete;
 			break;
 
 		case CdlStop:
-			cdr.CmdProcess = 0;
-			SetResultSize(1);
-			cdr.StatP &= ~0x2;
+			if (cdr.Play) {
+				// grab time for current track
+				CDR_getTD((u8)(cdr.CurTrack), cdr.ResultTD);
+
+				cdr.SetSectorPlay[0] = cdr.ResultTD[2];
+				cdr.SetSectorPlay[1] = cdr.ResultTD[1];
+				cdr.SetSectorPlay[2] = cdr.ResultTD[0];
+			}
+
+			StopCdda();
+			StopReading();
+
+			delay = 0x800;
+			if (cdr.DriveState == DRIVESTATE_STANDBY)
+				delay = cdReadTime * 30 / 2;
+
+			cdr.DriveState = DRIVESTATE_STOPPED;
+			AddIrqQueue(CdlStop + 0x100, delay);
+			break;
+
+		case CdlStop + 0x100:
+			cdr.StatP &= ~STATUS_ROTATING;
 			cdr.Result[0] = cdr.StatP;
 			cdr.Stat = Complete;
-//			cdr.Stat = Acknowledge;
-
-			// check case open/close -shalma
-			i = stat.Status;
-			if (CDR_getStatus(&stat) != -1) {
-				if (stat.Type == 0xff) cdr.Stat = DiskError;
-				if (stat.Status & 0x10) {
-					cdr.Stat = DiskError;
-					cdr.Result[0] |= 0x11;
-					cdr.Result[0] &= ~0x02;
-				}
-				else if (i & 0x10) {
-					cdr.StatP |= 0x2;
-					cdr.Result[0] |= 0x2;
-					CheckCdrom();
-				}
-			}
 			break;
 
 		case CdlPause:
-			SetResultSize(1);
-			cdr.Result[0] = cdr.StatP;
- 	cdr.Stat = Acknowledge;
-			AddIrqQueue(CdlPause + 0x20, 0x1000);
+			/*
+			Gundam Battle Assault 2: much slower (*)
+			- Fixes boot, gameplay
+
+			Hokuto no Ken 2: slower
+			- Fixes intro + subtitles
+
+			InuYasha - Feudal Fairy Tale: slower
+			- Fixes battles
+			*/
+			AddIrqQueue(CdlPause + 0x100, cdReadTime * 3);
 			cdr.Ctrl |= 0x80;
 			break;
 
-		case CdlPause + 0x20:
-			SetResultSize(1);
- 	cdr.StatP &= ~0x20;
-			cdr.StatP |= 0x2;
+
+		case CdlPause + 0x100:
+			cdr.StatP &= ~STATUS_READ;
 			cdr.Result[0] = cdr.StatP;
- 	cdr.Stat = Complete;
+			cdr.Stat = Complete;
 			break;
 
- 	case CdlInit:
-			SetResultSize(1);
- 	cdr.StatP = 0x2;
-			cdr.Result[0] = cdr.StatP;
- 	cdr.Stat = Acknowledge;
-//			if (!cdr.Init) {
-				AddIrqQueue(CdlInit + 0x20, 0x1000);
-//			}
- 	break;
-
-		case CdlInit + 0x20:
-			SetResultSize(1);
-			cdr.Result[0] = cdr.StatP;
- 	cdr.Stat = Complete;
-			cdr.Init = 1;
+		case CdlInit:
+			AddIrqQueue(CdlInit + 0x100, cdReadTime * 6);
+			no_busy_error = 1;
+			start_rotating = 1;
 			break;
 
- 	case CdlMute:
-			SetResultSize(1);
-			cdr.StatP |= 0x2;
- 	cdr.Result[0] = cdr.StatP;
- 	cdr.Stat = Acknowledge;
+		case CdlInit + 0x100:
+			cdr.Stat = Complete;
 			break;
 
- 	case CdlDemute:
-			SetResultSize(1);
-			cdr.StatP |= 0x2;
- 	cdr.Result[0] = cdr.StatP;
- 	cdr.Stat = Acknowledge;
+		case CdlMute:
+			cdr.Muted = TRUE;
 			break;
 
- 	case CdlSetfilter:
-			SetResultSize(1);
-			cdr.StatP |= 0x2;
- 	cdr.Result[0] = cdr.StatP;
- 	cdr.Stat = Acknowledge; 
- 	break;
+		case CdlDemute:
+			cdr.Muted = FALSE;
+			break;
+
+		case CdlSetfilter:
+			cdr.File = cdr.Param[0];
+			cdr.Channel = cdr.Param[1];
+			break;
 
 		case CdlSetmode:
-			SetResultSize(1);
-			cdr.StatP |= 0x2;
- 	cdr.Result[0] = cdr.StatP;
- 	cdr.Stat = Acknowledge;
- 	break;
+			no_busy_error = 1;
+			break;
 
- 	case CdlGetmode:
+		case CdlGetmode:
 			SetResultSize(6);
-			cdr.StatP |= 0x2;
- 	cdr.Result[0] = cdr.StatP;
- 	cdr.Result[1] = cdr.Mode;
- 	cdr.Result[2] = cdr.File;
- 	cdr.Result[3] = cdr.Channel;
- 	cdr.Result[4] = 0;
- 	cdr.Result[5] = 0;
- 	cdr.Stat = Acknowledge;
- 	break;
-
- 	case CdlGetlocL:
+			cdr.Result[1] = cdr.Mode;
+			cdr.Result[2] = cdr.File;
+			cdr.Result[3] = cdr.Channel;
+			cdr.Result[4] = 0;
+			cdr.Result[5] = 0;
+			no_busy_error = 1;
+			break;
+
+		case CdlGetlocL:
 			SetResultSize(8);
-// 	for (i = 0; i < 8; i++)
-//				cdr.Result[i] = itob(cdr.Transfer[i]);
- 	for (i = 0; i < 8; i++)
-				cdr.Result[i] = cdr.Transfer[i];
- 	cdr.Stat = Acknowledge;
- 	break;
+			memcpy(cdr.Result, cdr.Transfer, 8);
+			break;
 
 		case CdlGetlocP:
 			SetResultSize(8);
-			subq = (struct SubQ *)CDR_getBufferSub();
-
-			if (subq != NULL) {
-				cdr.Result[0] = subq->TrackNumber;
-				cdr.Result[1] = subq->IndexNumber;
-				memcpy(cdr.Result + 2, subq->TrackRelativeAddress, 3);
-				memcpy(cdr.Result + 5, subq->AbsoluteAddress, 3);
-
-				// subQ integrity check
-				if (calcCrc((u8 *)subq + 12, 10) != (((u16)subq->CRC[0] << 8) | subq->CRC[1])) {
-					memset(cdr.Result + 2, 0, 3 + 3); // CRC wrong, wipe out time data
-				}
-			} else {
-				cdr.Result[0] = 1;
-				cdr.Result[1] = 1;
-
-				cdr.Result[2] = btoi(cdr.Prev[0]);
-				cdr.Result[3] = btoi(cdr.Prev[1]) - 2;
-				cdr.Result[4] = cdr.Prev[2];
+			memcpy(&cdr.Result, &cdr.subq, 8);
 
-				// m:s adjustment
-				if ((s8)cdr.Result[3] < 0) {
-					cdr.Result[3] += 60;
-					cdr.Result[2] -= 1;
-				}
-
-				cdr.Result[2] = itob(cdr.Result[2]);
-				cdr.Result[3] = itob(cdr.Result[3]);
+			if (!cdr.Play && !cdr.Reading)
+				cdr.Result[1] = 0; // HACK?
+			break;
 
-				memcpy(cdr.Result + 5, cdr.Prev, 3);
-			}
+		case CdlReadT: // SetSession?
+			// really long
+			AddIrqQueue(CdlReadT + 0x100, cdReadTime * 290 / 4);
+			start_rotating = 1;
+			break;
 
-			cdr.Stat = Acknowledge;
+		case CdlReadT + 0x100:
+			cdr.Stat = Complete;
 			break;
 
- 	case CdlGetTN:
-			cdr.CmdProcess = 0;
+		case CdlGetTN:
 			SetResultSize(3);
-			cdr.StatP |= 0x2;
- 	cdr.Result[0] = cdr.StatP;
- 	if (CDR_getTN(cdr.ResultTN) == -1) {
+			if (CDR_getTN(cdr.ResultTN) == -1) {
 				cdr.Stat = DiskError;
-				cdr.Result[0] |= 0x01;
- 	} else {
- 		cdr.Stat = Acknowledge;
- 	 cdr.Result[1] = itob(cdr.ResultTN[0]);
- 	 cdr.Result[2] = itob(cdr.ResultTN[1]);
- 	}
- 	break;
-
- 	case CdlGetTD:
-			cdr.CmdProcess = 0;
+				cdr.Result[0] |= STATUS_ERROR;
+			} else {
+				cdr.Stat = Acknowledge;
+				cdr.Result[1] = itob(cdr.ResultTN[0]);
+				cdr.Result[2] = itob(cdr.ResultTN[1]);
+			}
+			break;
+
+		case CdlGetTD:
 			cdr.Track = btoi(cdr.Param[0]);
 			SetResultSize(4);
-			cdr.StatP |= 0x2;
 			if (CDR_getTD(cdr.Track, cdr.ResultTD) == -1) {
 				cdr.Stat = DiskError;
-				cdr.Result[0] |= 0x01;
+				cdr.Result[0] |= STATUS_ERROR;
 			} else {
 				cdr.Stat = Acknowledge;
 				cdr.Result[0] = cdr.StatP;
@@ -416,45 +892,33 @@
 			}
 			break;
 
- 	case CdlSeekL:
-			SetResultSize(1);
-			cdr.StatP |= 0x2;
- 	cdr.Result[0] = cdr.StatP;
-			cdr.StatP |= 0x40;
- 	cdr.Stat = Acknowledge;
-			cdr.Seeked = TRUE;
-			AddIrqQueue(CdlSeekL + 0x20, 0x1000);
-			break;
+		case CdlSeekL:
+		case CdlSeekP:
+			StopCdda();
+			StopReading();
+			cdr.StatP |= STATUS_SEEK;
 
- 	case CdlSeekL + 0x20:
-			SetResultSize(1);
-			cdr.StatP |= 0x2;
-			cdr.StatP &= ~0x40;
- 	cdr.Result[0] = cdr.StatP;
- 	cdr.Stat = Complete;
-			break;
+			/*
+			Crusaders of Might and Magic = 0.5x-4x
+			- fix cutscene speech start
 
- 	case CdlSeekP:
-			SetResultSize(1);
-			cdr.StatP |= 0x2;
- 	cdr.Result[0] = cdr.StatP;
-			cdr.StatP |= 0x40;
- 	cdr.Stat = Acknowledge;
-			AddIrqQueue(CdlSeekP + 0x20, 0x1000);
-			break;
+			Eggs of Steel = 2x-?
+			- fix new game
 
- 	case CdlSeekP + 0x20:
-			SetResultSize(1);
-			cdr.StatP |= 0x2;
-			cdr.StatP &= ~0x40;
- 	cdr.Result[0] = cdr.StatP;
- 	cdr.Stat = Complete;
+			Medievil = ?-4x
+			- fix cutscene speech
+
+			Rockman X5 = 0.5-4x
+			- fix capcom logo
+			*/
+			CDRMISC_INT(cdr.Seeked == SEEK_DONE ? 0x800 : cdReadTime * 4);
+			cdr.Seeked = SEEK_PENDING;
+			start_rotating = 1;
 			break;
 
 		case CdlTest:
- 	cdr.Stat = Acknowledge;
- 	switch (cdr.Param[0]) {
- 	 case 0x20: // System Controller ROM Version
+			switch (cdr.Param[0]) {
+				case 0x20: // System Controller ROM Version
 					SetResultSize(4);
 					memcpy(cdr.Result, Test20, 4);
 					break;
@@ -466,155 +930,238 @@
 					SetResultSize(8);
 					memcpy(cdr.Result, Test23, 4);
 					break;
- 	}
+			}
+			no_busy_error = 1;
 			break;
 
- 	case CdlID:
-			SetResultSize(1);
-			cdr.StatP |= 0x2;
- 	cdr.Result[0] = cdr.StatP;
- 	cdr.Stat = Acknowledge;
-			AddIrqQueue(CdlID + 0x20, 0x1000);
+		case CdlID:
+			AddIrqQueue(CdlID + 0x100, 20480);
 			break;
 
-		case CdlID + 0x20:
+		case CdlID + 0x100:
 			SetResultSize(8);
- 	if (CDR_getStatus(&stat) == -1) {
- 		cdr.Result[0] = 0x00; // 0x08 and cdr.Result[1]|0x10 : audio cd, enters cd player
- cdr.Result[1] = 0x00; // 0x80 leads to the menu in the bios, else loads CD
- 	}
- 	else {
- if (stat.Type == 2) {
- 	cdr.Result[0] = 0x08;
- cdr.Result[1] = 0x10;
-	 	}
-	 	else {
- cdr.Result[0] = 0x00;
- cdr.Result[1] = 0x00;
-	 	}
- 	}
-			cdr.Result[1] |= 0x80;
-			cdr.Result[2] = 0x00;
-			cdr.Result[3] = 0x00;
+			cdr.Result[0] = cdr.StatP;
+			cdr.Result[1] = 0;
+			cdr.Result[2] = 0;
+			cdr.Result[3] = 0;
+
+			// 0x10 - audio | 0x40 - disk missing | 0x80 - unlicensed
+			if (CDR_getStatus(&stat) == -1 || stat.Type == 0 || stat.Type == 0xff) {
+				cdr.Result[1] = 0xc0;
+			}
+			else {
+				if (stat.Type == 2)
+					cdr.Result[1] |= 0x10;
+				if (CdromId[0] == '\0')
+					cdr.Result[1] |= 0x80;
+			}
+			cdr.Result[0] |= (cdr.Result[1] >> 4) & 0x08;
+
 			strncpy((char *)&cdr.Result[4], "PCSX", 4);
 			cdr.Stat = Complete;
 			break;
 
 		case CdlReset:
-			SetResultSize(1);
- 	cdr.StatP = 0x2;
-			cdr.Result[0] = cdr.StatP;
- 	cdr.Stat = Acknowledge;
+			// yes, it really sets STATUS_SHELLOPEN
+			cdr.StatP |= STATUS_SHELLOPEN;
+			cdr.DriveState = DRIVESTATE_RESCAN_CD;
+			CDRLID_INT(20480);
+			no_busy_error = 1;
+			start_rotating = 1;
 			break;
 
- 	case CdlReadToc:
-			SetResultSize(1);
-			cdr.StatP |= 0x2;
- 	cdr.Result[0] = cdr.StatP;
- 	cdr.Stat = Acknowledge;
-			AddIrqQueue(CdlReadToc + 0x20, 0x1000);
+		case CdlGetQ:
+			// TODO?
+#ifdef CDR_LOG
+			CDR_LOG("got CdlGetQ\n");
+#endif
 			break;
 
- 	case CdlReadToc + 0x20:
-			SetResultSize(1);
-			cdr.StatP |= 0x2;
- 	cdr.Result[0] = cdr.StatP;
- 	cdr.Stat = Complete;
+		case CdlReadToc:
+			AddIrqQueue(CdlReadToc + 0x100, cdReadTime * 180 / 4);
+			no_busy_error = 1;
+			start_rotating = 1;
 			break;
 
-		case AUTOPAUSE:
-			cdr.OCUP = 0;
-/*			SetResultSize(1);
-			StopCdda();
-			StopReading();
-			cdr.OCUP = 0;
- 	cdr.StatP&=~0x20;
-			cdr.StatP|= 0x2;
- 	cdr.Result[0] = cdr.StatP;
- 		cdr.Stat = DataEnd;
-*/			AddIrqQueue(CdlPause, 0x800);
+		case CdlReadToc + 0x100:
+			cdr.Stat = Complete;
+			no_busy_error = 1;
 			break;
 
-		case READ_ACK:
-			if (!cdr.Reading) return;
+		case CdlReadN:
+		case CdlReadS:
+			if (cdr.SetlocPending) {
+				memcpy(cdr.SetSectorPlay, cdr.SetSector, 4);
+				cdr.SetlocPending = 0;
+			}
+			Find_CurTrack(cdr.SetSectorPlay);
+
+			if ((cdr.Mode & MODE_CDDA) && cdr.CurTrack > 1)
+				// Read* acts as play for cdda tracks in cdda mode
+				goto do_CdlPlay;
 
-			SetResultSize(1);
-			cdr.StatP |= 0x2;
- 	cdr.Result[0] = cdr.StatP;
-			if (!cdr.Seeked) {
-				cdr.Seeked = TRUE;
-				cdr.StatP |= 0x40;
+			cdr.Reading = 1;
+			cdr.FirstSector = 1;
+
+			// Fighting Force 2 - update subq time immediately
+			// - fixes new game
+			ReadTrack(cdr.SetSectorPlay);
+
+
+			// Crusaders of Might and Magic - update getlocl now
+			// - fixes cutscene speech
+			{
+				u8 *buf = CDR_getBuffer();
+				if (buf != NULL)
+					memcpy(cdr.Transfer, buf, 8);
 			}
-			cdr.StatP |= 0x20;
- 	cdr.Stat = Acknowledge;
 
-//			CDREAD_INT((cdr.Mode & 0x80) ? (cdReadTime / 2) : cdReadTime);
-			CDREAD_INT(0x80000);
-			break;
+			/*
+			Duke Nukem: Land of the Babes - seek then delay read for one frame
+			- fixes cutscenes
+			C-12 - Final Resistance - doesn't like seek
+			*/
 
-		case REPPLAY_ACK:
-			cdr.Stat = Acknowledge;
-			cdr.Result[0] = cdr.StatP;
-			SetResultSize(1);
-			AddIrqQueue(REPPLAY, cdReadTime);
-			break;
+			if (cdr.Seeked != SEEK_DONE) {
+				cdr.StatP |= STATUS_SEEK;
+				cdr.StatP &= ~STATUS_READ;
 
-		case REPPLAY: 
-			if ((cdr.Mode & 5) != 5) break;
-/*			if (CDR_getStatus(&stat) == -1) {
-				cdr.Result[0] = 0;
-				cdr.Result[1] = 0;
-				cdr.Result[2] = 0;
-				cdr.Result[3] = 0;
-				cdr.Result[4] = 0;
-				cdr.Result[5] = 0;
-				cdr.Result[6] = 0;
-				cdr.Result[7] = 0;
-			} else memcpy(cdr.Result, &stat.Track, 8);
-			cdr.Stat = 1;
-			SetResultSize(8);
-			AddIrqQueue(REPPLAY_ACK, cdReadTime);
-*/			break;
+				// Crusaders of Might and Magic - use short time
+				// - fix cutscene speech (startup)
 
-		case 0xff:
-			return;
+				// ??? - use more accurate seek time later
+				CDREAD_INT((cdr.Mode & 0x80) ? (cdReadTime) : cdReadTime * 2);
+			} else {
+				cdr.StatP |= STATUS_READ;
+				cdr.StatP &= ~STATUS_SEEK;
+
+				CDREAD_INT((cdr.Mode & 0x80) ? (cdReadTime) : cdReadTime * 2);
+			}
+
+			cdr.Result[0] = cdr.StatP;
+			start_rotating = 1;
+			break;
 
 		default:
-			cdr.Stat = Complete;
+#ifdef CDR_LOG
+			CDR_LOG("Invalid command: %02x\n", Irq);
+#endif
+			error = ERROR_INVALIDCMD;
+			// FALLTHROUGH
+
+		set_error:
+			SetResultSize(2);
+			cdr.Result[0] = cdr.StatP | STATUS_ERROR;
+			cdr.Result[1] = error;
+			cdr.Stat = DiskError;
 			break;
 	}
 
-	if (cdr.Stat != NoIntr && cdr.Reg2 != 0x18) {
-		psxHu32ref(0x1070) |= SWAP32((u32)0x4);
+	if (cdr.DriveState == DRIVESTATE_STOPPED && start_rotating) {
+		cdr.DriveState = DRIVESTATE_STANDBY;
+		cdr.StatP |= STATUS_ROTATING;
 	}
 
-#ifdef CDR_LOG
-	CDR_LOG("cdrInterrupt() Log: CDR Interrupt IRQ %x\n", Irq);
+	if (!no_busy_error) {
+		switch (cdr.DriveState) {
+		case DRIVESTATE_LID_OPEN:
+		case DRIVESTATE_RESCAN_CD:
+		case DRIVESTATE_PREPARE_CD:
+			SetResultSize(2);
+			cdr.Result[0] = cdr.StatP | STATUS_ERROR;
+			cdr.Result[1] = ERROR_NOT_READY;
+			cdr.Stat = DiskError;
+			break;
+		}
+	}
+
+finish:
+	setIrq();
+	cdr.ParamC = 0;
+
+#ifdef CDR_LOG_IO
+	{
+		int i;
+		CDR_LOG_IO("CDR IRQ %d cmd %02x stat %02x: ",
+			!!(cdr.Stat & cdr.Reg2), Irq, cdr.Stat);
+		for (i = 0; i < cdr.ResultC; i++)
+			CDR_LOG_IO("%02x ", cdr.Result[i]);
+		CDR_LOG_IO("\n");
+	}
 #endif
 }
 
+#define ssat32_to_16(v) do { \
+	if (v < -32768) v = -32768; \
+	else if (v > 32767) v = 32767; \
+} while (0)
+
+void cdrAttenuate(s16 *buf, int samples, int stereo)
+{
+	int i, l, r;
+	int ll = cdr.AttenuatorLeftToLeft;
+	int lr = cdr.AttenuatorLeftToRight;
+	int rl = cdr.AttenuatorRightToLeft;
+	int rr = cdr.AttenuatorRightToRight;
+
+	if (lr == 0 && rl == 0 && 0x78 <= ll && ll <= 0x88 && 0x78 <= rr && rr <= 0x88)
+		return;
+
+	if (!stereo && ll == 0x40 && lr == 0x40 && rl == 0x40 && rr == 0x40)
+		return;
+
+	if (stereo) {
+		for (i = 0; i < samples; i++) {
+			l = buf[i * 2];
+			r = buf[i * 2 + 1];
+			l = (l * ll + r * rl) >> 7;
+			r = (r * rr + l * lr) >> 7;
+			ssat32_to_16(l);
+			ssat32_to_16(r);
+			buf[i * 2] = l;
+			buf[i * 2 + 1] = r;
+		}
+	}
+	else {
+		for (i = 0; i < samples; i++) {
+			l = buf[i];
+			l = l * (ll + rl) >> 7;
+			//r = r * (rr + lr) >> 7;
+			ssat32_to_16(l);
+			//ssat32_to_16(r);
+			buf[i] = l;
+		}
+	}
+}
+
 void cdrReadInterrupt() {
 	u8 *buf;
 
 	if (!cdr.Reading)
 		return;
 
-	if (cdr.Stat) {
-		CDREAD_INT(0x1000);
+	if (cdr.Irq || cdr.Stat) {
+		CDREAD_INT(0x100);
 		return;
 	}
 
-#ifdef CDR_LOG
-	CDR_LOG("cdrReadInterrupt() Log: KEY END");
-#endif
+	if ((psxHu32ref(0x1070) & psxHu32ref(0x1074) & SWAP32((u32)0x4)) && !cdr.ReadRescheduled) {
+		// HACK: with BIAS 2, emulated CPU is often slower than real thing,
+		// game may be unfinished with prev data read, so reschedule
+		// (Brave Fencer Musashi)
+		CDREAD_INT(cdReadTime / 2);
+		cdr.ReadRescheduled = 1;
+		return;
+	}
 
- cdr.OCUP = 1;
+	cdr.OCUP = 1;
 	SetResultSize(1);
-	cdr.StatP |= 0x22;
-	cdr.StatP &= ~0x40;
- cdr.Result[0] = cdr.StatP;
+	cdr.StatP |= STATUS_READ|STATUS_ROTATING;
+	cdr.StatP &= ~STATUS_SEEK;
+	cdr.Result[0] = cdr.StatP;
+	cdr.Seeked = SEEK_DONE;
 
-	ReadTrack();
+	ReadTrack(cdr.SetSectorPlay);
 
 	buf = CDR_getBuffer();
 	if (buf == NULL)
@@ -622,11 +1169,11 @@
 
 	if (cdr.RErr == -1) {
 #ifdef CDR_LOG
-		fprintf(emuLog, "cdrReadInterrupt() Log: err\n");
+		CDR_LOG("cdrReadInterrupt() Log: err\n");
 #endif
 		memset(cdr.Transfer, 0, DATA_SIZE);
 		cdr.Stat = DiskError;
-		cdr.Result[0] |= 0x01;
+		cdr.Result[0] |= STATUS_ERROR;
 		CDREAD_INT((cdr.Mode & 0x80) ? (cdReadTime / 2) : cdReadTime);
 		return;
 	}
@@ -634,19 +1181,23 @@
 	memcpy(cdr.Transfer, buf, DATA_SIZE);
 	CheckPPFCache(cdr.Transfer, cdr.Prev[0], cdr.Prev[1], cdr.Prev[2]);
 
- cdr.Stat = DataReady;
-
 #ifdef CDR_LOG
-	fprintf(emuLog, "cdrReadInterrupt() Log: cdr.Transfer %x:%x:%x\n", cdr.Transfer[0], cdr.Transfer[1], cdr.Transfer[2]);
+	CDR_LOG("cdrReadInterrupt() Log: cdr.Transfer %x:%x:%x\n", cdr.Transfer[0], cdr.Transfer[1], cdr.Transfer[2]);
 #endif
 
-	if ((!cdr.Muted) && (cdr.Mode & 0x40) && (!Config.Xa) && (cdr.FirstSector != -1)) { // CD-XA
-		if ((cdr.Transfer[4 + 2] & 0x4) &&
-			((cdr.Mode & 0x8) ? (cdr.Transfer[4 + 1] == cdr.Channel) : 1) &&
-			(cdr.Transfer[4 + 0] == cdr.File)) {
-			int ret = xa_decode_sector(&cdr.Xa, cdr.Transfer+4, cdr.FirstSector);
+	if ((!cdr.Muted) && (cdr.Mode & MODE_STRSND) && (!Config.Xa) && (cdr.FirstSector != -1)) { // CD-XA
+		// Firemen 2: Multi-XA files - briefings, cutscenes
+		if( cdr.FirstSector == 1 && (cdr.Mode & MODE_SF)==0 ) {
+			cdr.File = cdr.Transfer[4 + 0];
+			cdr.Channel = cdr.Transfer[4 + 1];
+		}
 
+		if((cdr.Transfer[4 + 2] & 0x4) &&
+			 (cdr.Transfer[4 + 1] == cdr.Channel) &&
+			 (cdr.Transfer[4 + 0] == cdr.File)) {
+			int ret = xa_decode_sector(&cdr.Xa, cdr.Transfer+4, cdr.FirstSector);
 			if (!ret) {
+				cdrAttenuate(cdr.Xa.pcm, cdr.Xa.nsamples, cdr.Xa.stereo);
 				SPU_playADPCMchannel(&cdr.Xa);
 				cdr.FirstSector = 0;
 			}
@@ -654,35 +1205,39 @@
 		}
 	}
 
-	cdr.SetSector[2]++;
- if (cdr.SetSector[2] == 75) {
- cdr.SetSector[2] = 0;
- cdr.SetSector[1]++;
- if (cdr.SetSector[1] == 60) {
- cdr.SetSector[1] = 0;
- cdr.SetSector[0]++;
- }
- }
+	cdr.SetSectorPlay[2]++;
+	if (cdr.SetSectorPlay[2] == 75) {
+		cdr.SetSectorPlay[2] = 0;
+		cdr.SetSectorPlay[1]++;
+		if (cdr.SetSectorPlay[1] == 60) {
+			cdr.SetSectorPlay[1] = 0;
+			cdr.SetSectorPlay[0]++;
+		}
+	}
 
- cdr.Readed = 0;
+	cdr.Readed = 0;
+	cdr.ReadRescheduled = 0;
 
-	if ((cdr.Transfer[4 + 2] & 0x80) && (cdr.Mode & 0x2)) { // EOF
-#ifdef CDR_LOG
-		CDR_LOG("cdrReadInterrupt() Log: Autopausing read\n");
-#endif
-//		AddIrqQueue(AUTOPAUSE, 0x1000);
-		AddIrqQueue(CdlPause, 0x1000);
-	}
-	else {
-		CDREAD_INT((cdr.Mode & 0x80) ? (cdReadTime / 2) : cdReadTime);
+	CDREAD_INT((cdr.Mode & MODE_SPEED) ? (cdReadTime / 2) : cdReadTime);
+
+	/*
+	Croc 2: $40 - only FORM1 (*)
+	Judge Dredd: $C8 - only FORM1 (*)
+	Sim Theme Park - no adpcm at all (zero)
+	*/
+
+	if (!(cdr.Mode & MODE_STRSND) || !(cdr.Transfer[4+2] & 0x4)) {
+		cdr.Stat = DataReady;
+		setIrq();
 	}
-	psxHu32ref(0x1070) |= SWAP32((u32)0x4);
+
+	// update for CdlGetlocP
+	ReadTrack(cdr.SetSectorPlay);
 }
 
 /*
 cdrRead0:
-	bit 0 - 0 REG1 command send / 1 REG1 data read
-	bit 1 - 0 data transfer finish / 1 data transfer ready/in progress
+	bit 0,1 - mode
 	bit 2 - unknown
 	bit 3 - unknown
 	bit 4 - unknown
@@ -705,284 +1260,109 @@
 	// What means the 0x10 and the 0x08 bits? I only saw it used by the bios
 	cdr.Ctrl |= 0x18;
 
-#ifdef CDR_LOG
-	CDR_LOG("cdrRead0() Log: CD0 Read: %x\n", cdr.Ctrl);
+#ifdef CDR_LOG_IO
+	CDR_LOG_IO("cdr r0: %02x\n", cdr.Ctrl);
 #endif
-
 	return psxHu8(0x1800) = cdr.Ctrl;
 }
 
-/*
-cdrWrite0:
-	0 - to send a command / 1 - to get the result
-*/
-
 void cdrWrite0(unsigned char rt) {
-#ifdef CDR_LOG
-	CDR_LOG("cdrWrite0() Log: CD0 write: %x\n", rt);
+#ifdef CDR_LOG_IO
+	CDR_LOG_IO("cdr w0: %02x\n", rt);
 #endif
-	cdr.Ctrl = rt | (cdr.Ctrl & ~0x3);
-
- if (rt == 0) {
-		cdr.ParamP = 0;
-		cdr.ParamC = 0;
-		cdr.ResultReady = 0;
-	}
+	cdr.Ctrl = (rt & 3) | (cdr.Ctrl & ~3);
 }
 
 unsigned char cdrRead1(void) {
- if (cdr.ResultReady) { // && cdr.Ctrl & 0x1) {
-		psxHu8(0x1801) = cdr.Result[cdr.ResultP++];
-		if (cdr.ResultP == cdr.ResultC)
-			cdr.ResultReady = 0;
-	} else {
+	if ((cdr.ResultP & 0xf) < cdr.ResultC)
+		psxHu8(0x1801) = cdr.Result[cdr.ResultP & 0xf];
+	else
 		psxHu8(0x1801) = 0;
-	}
-#ifdef CDR_LOG
-	CDR_LOG("cdrRead1() Log: CD1 Read: %x\n", psxHu8(0x1801));
+	cdr.ResultP++;
+	if (cdr.ResultP == cdr.ResultC)
+		cdr.ResultReady = 0;
+#ifdef CDR_LOG_IO
+	CDR_LOG_IO("cdr r1: %02x\n", psxHu8(0x1801));
 #endif
 	return psxHu8(0x1801);
 }
 
 void cdrWrite1(unsigned char rt) {
+	u8 set_loc[3];
 	int i;
-
-#ifdef CDR_LOG
-	CDR_LOG("cdrWrite1() Log: CD1 write: %x (%s)\n", rt, CmdName[rt]);
+#ifdef CDR_LOG_IO
+	CDR_LOG_IO("cdr w1: %02x\n", rt);
 #endif
-//	psxHu8(0x1801) = rt;
- cdr.Cmd = rt;
+	switch (cdr.Ctrl & 3) {
+	case 0:
+		break;
+	case 3:
+		cdr.AttenuatorRightToRightT = rt;
+		return;
+	default:
+		return;
+	}
+
+	cdr.Cmd = rt;
 	cdr.OCUP = 0;
 
-#ifdef CDRCMD_DEBUG
-	SysPrintf("cdrWrite1() Log: CD1 write: %x (%s)", rt, CmdName[rt]);
+#ifdef CDR_LOG_IO
+	CDR_LOG_IO("CD1 write: %x (%s)", rt, CmdName[rt]);
 	if (cdr.ParamC) {
-		SysPrintf(" Param[%d] = {", cdr.ParamC);
+		CDR_LOG_IO(" Param[%d] = {", cdr.ParamC);
 		for (i = 0; i < cdr.ParamC; i++)
-			SysPrintf(" %x,", cdr.Param[i]);
-		SysPrintf("}\n");
+			CDR_LOG_IO(" %x,", cdr.Param[i]);
+		CDR_LOG_IO("}\n");
 	} else {
-		SysPrintf("\n");
+		CDR_LOG_IO("\n");
 	}
 #endif
 
-	if (cdr.Ctrl & 0x1) return;
-
- switch (cdr.Cmd) {
- 	case CdlSync:
-			cdr.Ctrl |= 0x80;
- 		cdr.Stat = NoIntr; 
- 		AddIrqQueue(cdr.Cmd, 0x1000);
- 	break;
-
- 	case CdlNop:
-			cdr.Ctrl |= 0x80;
- 		cdr.Stat = NoIntr; 
- 		AddIrqQueue(cdr.Cmd, 0x1000);
- 	break;
-
- 	case CdlSetloc:
-			StopReading();
-			cdr.Seeked = FALSE;
- 	for (i = 0; i < 3; i++)
-				cdr.SetSector[i] = btoi(cdr.Param[i]);
- 	cdr.SetSector[3] = 0;
-/* 	if ((cdr.SetSector[0] | cdr.SetSector[1] | cdr.SetSector[2]) == 0) {
-				*(u32 *)cdr.SetSector = *(u32 *)cdr.SetSectorSeek;
-			}*/
-			cdr.Ctrl |= 0x80;
- 	cdr.Stat = NoIntr;
- 		AddIrqQueue(cdr.Cmd, 0x1000);
- 	break;
-
- 	case CdlPlay:
- 	if (!cdr.SetSector[0] & !cdr.SetSector[1] & !cdr.SetSector[2]) {
- 	if (CDR_getTN(cdr.ResultTN) != -1) {
-	 if (cdr.CurTrack > cdr.ResultTN[1])
-						cdr.CurTrack = cdr.ResultTN[1];
- if (CDR_getTD((unsigned char)(cdr.CurTrack), cdr.ResultTD) != -1) {
-		 	int tmp = cdr.ResultTD[2];
- cdr.ResultTD[2] = cdr.ResultTD[0];
-						cdr.ResultTD[0] = tmp;
-	 if (!Config.Cdda) CDR_play(cdr.ResultTD);
-					}
- }
-			} else if (!Config.Cdda) {
-				CDR_play(cdr.SetSector);
-			}
- 		cdr.Play = TRUE;
-			cdr.Ctrl |= 0x80;
- 		cdr.Stat = NoIntr; 
- 		AddIrqQueue(cdr.Cmd, 0x1000);
- 		break;
-
- 	case CdlForward:
- 	if (cdr.CurTrack < 0xaa)
-				cdr.CurTrack++;
-			cdr.Ctrl |= 0x80;
- 		cdr.Stat = NoIntr; 
- 		AddIrqQueue(cdr.Cmd, 0x1000);
- 	break;
-
- 	case CdlBackward:
- 	if (cdr.CurTrack > 1)
-				cdr.CurTrack--;
-			cdr.Ctrl |= 0x80;
- 		cdr.Stat = NoIntr; 
- 		AddIrqQueue(cdr.Cmd, 0x1000);
- 	break;
-
- 	case CdlReadN:
-			cdr.Irq = 0;
-			StopReading();
-			cdr.Ctrl|= 0x80;
- 	cdr.Stat = NoIntr; 
-			StartReading(1, 0x1000);
- 	break;
-
- 	case CdlStandby:
-			StopCdda();
-			StopReading();
-			cdr.Ctrl |= 0x80;
- 		cdr.Stat = NoIntr;
- 		AddIrqQueue(cdr.Cmd, 0x1000);
- 	break;
-
- 	case CdlStop:
-			StopCdda();
-			StopReading();
-			cdr.Ctrl |= 0x80;
- 		cdr.Stat = NoIntr;
- 		AddIrqQueue(cdr.Cmd, 0x1000);
- 	break;
-
- 	case CdlPause:
-			StopCdda();
-			StopReading();
-			cdr.Ctrl |= 0x80;
- 		cdr.Stat = NoIntr;
- 		AddIrqQueue(cdr.Cmd, 0x80000);
- 	break;
-
-		case CdlReset:
- 	case CdlInit:
-			StopCdda();
-			StopReading();
-			cdr.Ctrl |= 0x80;
- 		cdr.Stat = NoIntr; 
- 		AddIrqQueue(cdr.Cmd, 0x1000);
- 	break;
-
- 	case CdlMute:
- 	cdr.Muted = TRUE;
-			cdr.Ctrl |= 0x80;
- 		cdr.Stat = NoIntr; 
- 		AddIrqQueue(cdr.Cmd, 0x1000);
- 	break;
-
- 	case CdlDemute:
- 	cdr.Muted = FALSE;
-			cdr.Ctrl |= 0x80;
- 		cdr.Stat = NoIntr; 
- 		AddIrqQueue(cdr.Cmd, 0x1000);
- 	break;
-
- 	case CdlSetfilter:
- 	cdr.File = cdr.Param[0];
- 	cdr.Channel = cdr.Param[1];
-			cdr.Ctrl |= 0x80;
- 		cdr.Stat = NoIntr; 
- 		AddIrqQueue(cdr.Cmd, 0x1000);
- 	break;
-
- 	case CdlSetmode:
-#ifdef CDR_LOG
-			CDR_LOG("cdrWrite1() Log: Setmode %x\n", cdr.Param[0]);
-#endif 
- 	cdr.Mode = cdr.Param[0];
-			cdr.Ctrl |= 0x80;
- 		cdr.Stat = NoIntr; 
- 		AddIrqQueue(cdr.Cmd, 0x1000);
- 	break;
-
- 	case CdlGetmode:
-			cdr.Ctrl |= 0x80;
- 		cdr.Stat = NoIntr; 
- 		AddIrqQueue(cdr.Cmd, 0x1000);
- 	break;
-
- 	case CdlGetlocL:
-			cdr.Ctrl |= 0x80;
- 		cdr.Stat = NoIntr; 
- 		AddIrqQueue(cdr.Cmd, 0x1000);
- 	break;
-
- 	case CdlGetlocP:
-			cdr.Ctrl |= 0x80;
- 		cdr.Stat = NoIntr; 
-			AddIrqQueue(cdr.Cmd, 0x1000);
- 	break;
-
- 	case CdlGetTN:
-			cdr.Ctrl |= 0x80;
- 		cdr.Stat = NoIntr; 
- 		AddIrqQueue(cdr.Cmd, 0x1000);
- 	break;
-
- 	case CdlGetTD:
-			cdr.Ctrl |= 0x80;
- 		cdr.Stat = NoIntr; 
- 		AddIrqQueue(cdr.Cmd, 0x1000);
- 	break;
-
- 	case CdlSeekL:
-//			((u32 *)cdr.SetSectorSeek)[0] = ((u32 *)cdr.SetSector)[0];
-			cdr.Ctrl |= 0x80;
- 		cdr.Stat = NoIntr; 
- 		AddIrqQueue(cdr.Cmd, 0x1000);
- 	break;
-
- 	case CdlSeekP:
-// 	((u32 *)cdr.SetSectorSeek)[0] = ((u32 *)cdr.SetSector)[0];
-			cdr.Ctrl |= 0x80;
- 		cdr.Stat = NoIntr; 
- 		AddIrqQueue(cdr.Cmd, 0x1000);
- 	break;
-
- 	case CdlTest:
-			cdr.Ctrl |= 0x80;
- 		cdr.Stat = NoIntr; 
- 		AddIrqQueue(cdr.Cmd, 0x1000);
- 	break;
-
- 	case CdlID:
-			cdr.Ctrl |= 0x80;
- 		cdr.Stat = NoIntr; 
- 		AddIrqQueue(cdr.Cmd, 0x1000);
- 	break;
-
- 	case CdlReadS:
-			cdr.Irq = 0;
-			StopReading();
-			cdr.Ctrl |= 0x80;
- 		cdr.Stat = NoIntr; 
-			StartReading(2, 0x1000);
- 	break;
-
- 	case CdlReadToc:
-			cdr.Ctrl |= 0x80;
- 		cdr.Stat = NoIntr; 
- 		AddIrqQueue(cdr.Cmd, 0x1000);
- 	break;
-
- 	default:
+	cdr.ResultReady = 0;
+	cdr.Ctrl |= 0x80;
+	// cdr.Stat = NoIntr; 
+	AddIrqQueue(cdr.Cmd, 0x800);
+
+	switch (cdr.Cmd) {
+	case CdlSetloc:
+		for (i = 0; i < 3; i++)
+			set_loc[i] = btoi(cdr.Param[i]);
+
+		i = msf2sec(cdr.SetSectorPlay);
+		i = abs(i - msf2sec(set_loc));
+		if (i > 16)
+			cdr.Seeked = SEEK_PENDING;
+
+		memcpy(cdr.SetSector, set_loc, 3);
+		cdr.SetSector[3] = 0;
+		cdr.SetlocPending = 1;
+		break;
+
+	case CdlReadN:
+	case CdlReadS:
+	case CdlPause:
+		StopCdda();
+		StopReading();
+		break;
+
+	case CdlReset:
+	case CdlInit:
+		cdr.Seeked = SEEK_DONE;
+		StopCdda();
+		StopReading();
+		break;
+
+	case CdlSetmode:
 #ifdef CDR_LOG
-			CDR_LOG("cdrWrite1() Log: Unknown command: %x\n", cdr.Cmd);
+		CDR_LOG("cdrWrite1() Log: Setmode %x\n", cdr.Param[0]);
 #endif
-			return;
- }
-	if (cdr.Stat != NoIntr) {
-		psxHu32ref(0x1070) |= SWAP32((u32)0x4);
+		cdr.Mode = cdr.Param[0];
+
+		// Squaresoft on PlayStation 1998 Collector's CD Vol. 1
+		// - fixes choppy movie sound
+		if( cdr.Play && (cdr.Mode & MODE_CDDA) == 0 )
+			StopCdda();
+		break;
 	}
 }
 
@@ -992,80 +1372,91 @@
 	if (cdr.Readed == 0) {
 		ret = 0;
 	} else {
-		ret = *cdr.pTransfer++;
+		ret = cdr.Transfer[cdr.transferIndex];
+		cdr.transferIndex++;
+		adjustTransferIndex();
 	}
-
-#ifdef CDR_LOG
-	CDR_LOG("cdrRead2() Log: CD2 Read: %x\n", ret);
+#ifdef CDR_LOG_IO
+	CDR_LOG_IO("cdr r2: %02x\n", ret);
 #endif
 	return ret;
 }
 
 void cdrWrite2(unsigned char rt) {
-#ifdef CDR_LOG
-	CDR_LOG("cdrWrite2() Log: CD2 write: %x\n", rt);
+#ifdef CDR_LOG_IO
+	CDR_LOG_IO("cdr w2: %02x\n", rt);
 #endif
- if (cdr.Ctrl & 0x1) {
-		switch (rt) {
-			case 0x07:
-	 		cdr.ParamP = 0;
-				cdr.ParamC = 0;
-				cdr.ResultReady = 1; //0;
-				cdr.Ctrl &= ~3; //cdr.Ctrl = 0;
-				break;
-
-			default:
-				cdr.Reg2 = rt;
-				break;
-		}
- } else if (!(cdr.Ctrl & 0x1) && cdr.ParamP < 8) {
-		cdr.Param[cdr.ParamP++] = rt;
-		cdr.ParamC++;
+	switch (cdr.Ctrl & 3) {
+	case 0:
+		if (cdr.ParamC < 8) // FIXME: size and wrapping
+			cdr.Param[cdr.ParamC++] = rt;
+		return;
+	case 1:
+		cdr.Reg2 = rt;
+		setIrq();
+		return;
+	case 2:
+		cdr.AttenuatorLeftToLeftT = rt;
+		return;
+	case 3:
+		cdr.AttenuatorRightToLeftT = rt;
+		return;
 	}
 }
 
 unsigned char cdrRead3(void) {
-	if (cdr.Stat) {
-		if (cdr.Ctrl & 0x1)
-			psxHu8(0x1803) = cdr.Stat | 0xE0;
-		else
-			psxHu8(0x1803) = 0xff;
-	} else {
-		psxHu8(0x1803) = 0;
-	}
-#ifdef CDR_LOG
-	CDR_LOG("cdrRead3() Log: CD3 Read: %x\n", psxHu8(0x1803));
+	if (cdr.Ctrl & 0x1)
+		psxHu8(0x1803) = cdr.Stat | 0xE0;
+	else
+		psxHu8(0x1803) = cdr.Reg2 | 0xE0;
+#ifdef CDR_LOG_IO
+	CDR_LOG_IO("cdr r3: %02x\n", psxHu8(0x1803));
 #endif
 	return psxHu8(0x1803);
 }
 
 void cdrWrite3(unsigned char rt) {
-#ifdef CDR_LOG
-	CDR_LOG("cdrWrite3() Log: CD3 write: %x\n", rt);
+#ifdef CDR_LOG_IO
+	CDR_LOG_IO("cdr w3: %02x\n", rt);
+#endif
+	switch (cdr.Ctrl & 3) {
+	case 0:
+		break; // transfer
+	case 1:
+		cdr.Stat &= ~rt;
+
+		if (rt & 0x40)
+			cdr.ParamC = 0;
+		return;
+	case 2:
+		cdr.AttenuatorLeftToRightT = rt;
+		return;
+	case 3:
+		if (rt & 0x20) {
+			memcpy(&cdr.AttenuatorLeftToLeft, &cdr.AttenuatorLeftToLeftT, 4);
+#ifdef CDR_LOG_IO
+			CDR_LOG_IO("CD-XA Volume: %02x %02x | %02x %02x\n",
+				cdr.AttenuatorLeftToLeft, cdr.AttenuatorLeftToRight,
+				cdr.AttenuatorRightToLeft, cdr.AttenuatorRightToRight);
 #endif
- if (rt == 0x07 && cdr.Ctrl & 0x1) {
-		cdr.Stat = 0;
-
-		if (cdr.Irq == 0xff) {
-			cdr.Irq = 0;
-			return;
 		}
-		if (cdr.Irq)
-			CDR_INT(cdr.eCycle);
-		if (cdr.Reading && !cdr.ResultReady) 
- CDREAD_INT((cdr.Mode & 0x80) ? (cdReadTime / 2) : cdReadTime);
-
 		return;
 	}
-	if (rt == 0x80 && !(cdr.Ctrl & 0x1) && cdr.Readed == 0) {
+
+	if ((rt & 0x80) && cdr.Readed == 0) {
 		cdr.Readed = 1;
-		cdr.pTransfer = cdr.Transfer;
+		cdr.transferIndex = 0;
+
+		switch (cdr.Mode & (MODE_SIZE_2340|MODE_SIZE_2328)) {
+			case MODE_SIZE_2328:
+			case MODE_SIZE_2048:
+				cdr.transferIndex += 12;
+				break;
 
-		switch (cdr.Mode & 0x30) {
-			case 0x10:
-			case 0x00:
-				cdr.pTransfer += 12;
+			case MODE_SIZE_2340:
+				cdr.transferIndex += 0;
 				break;
+
 			default:
 				break;
 		}
@@ -1074,12 +1465,14 @@
 
 void psxDma3(u32 madr, u32 bcr, u32 chcr) {
 	u32 cdsize;
+	int i;
 	u8 *ptr;
 
 #ifdef CDR_LOG
 	CDR_LOG("psxDma3() Log: *** DMA 3 *** %x addr = %x size = %x\n", chcr, madr, bcr);
 #endif
 
+
 	switch (chcr) {
 		case 0x11000000:
 		case 0x11400100:
@@ -1092,17 +1485,50 @@
 
 			cdsize = (bcr & 0xffff) * 4;
 
+			// Ape Escape: bcr = 0001 / 0000
+			// - fix boot
+			if( cdsize == 0 )
+			{
+				switch (cdr.Mode & (MODE_SIZE_2340|MODE_SIZE_2328)) {
+					case MODE_SIZE_2340: cdsize = 2340; break;
+					case MODE_SIZE_2328: cdsize = 2328; break;
+					default:
+					case MODE_SIZE_2048: cdsize = 2048; break;
+				}
+			}
+
+
 			ptr = (u8 *)PSXM(madr);
 			if (ptr == NULL) {
-#ifdef CPU_LOG
+#ifdef CDR_LOG
 				CDR_LOG("psxDma3() Log: *** DMA 3 *** NULL Pointer!\n");
 #endif
 				break;
 			}
-			memcpy(ptr, cdr.pTransfer, cdsize);
+
+			/*
+			GS CDX: Enhancement CD crash
+			- Setloc 0:0:0
+			- CdlPlay
+			- Spams DMA3 and gets buffer overrun
+			*/
+			for(i = 0; i < cdsize; ++i) {
+				ptr[i] = cdr.Transfer[cdr.transferIndex];
+				cdr.transferIndex++;
+				adjustTransferIndex();
+			}
+
 			psxCpu->Clear(madr, cdsize / 4);
-			cdr.pTransfer += cdsize;
-			break;
+
+			// burst vs normal
+			if( chcr == 0x11400100 ) {
+				CDRDMA_INT( (cdsize/4) / 4 );
+			}
+			else if( chcr == 0x11000000 ) {
+				CDRDMA_INT( (cdsize/4) * 1 );
+			}
+			return;
+
 		default:
 #ifdef CDR_LOG
 			CDR_LOG("psxDma3() Log: Unknown cddma %x\n", chcr);
@@ -1114,25 +1540,77 @@
 	DMA_INTERRUPT(3);
 }
 
+void cdrDmaInterrupt()
+{
+	if (HW_DMA3_CHCR & SWAP32(0x01000000))
+	{
+		HW_DMA3_CHCR &= SWAP32(~0x01000000);
+		DMA_INTERRUPT(3);
+	}
+}
+
+static void getCdInfo(void)
+{
+	u8 tmp;
+
+	CDR_getTN(cdr.ResultTN);
+	CDR_getTD(0, cdr.SetSectorEnd);
+	tmp = cdr.SetSectorEnd[0];
+	cdr.SetSectorEnd[0] = cdr.SetSectorEnd[2];
+	cdr.SetSectorEnd[2] = tmp;
+}
+
 void cdrReset() {
 	memset(&cdr, 0, sizeof(cdr));
 	cdr.CurTrack = 1;
 	cdr.File = 1;
 	cdr.Channel = 1;
+	cdr.transferIndex = 0;
+	cdr.Reg2 = 0x1f;
+	cdr.Stat = NoIntr;
+	cdr.DriveState = DRIVESTATE_STANDBY;
+	cdr.StatP = STATUS_ROTATING;
+
+	// BIOS player - default values
+	cdr.AttenuatorLeftToLeft = 0x80;
+	cdr.AttenuatorLeftToRight = 0x00;
+	cdr.AttenuatorRightToLeft = 0x00;
+	cdr.AttenuatorRightToRight = 0x80;
+
+	getCdInfo();
 }
 
 int cdrFreeze(gzFile f, int Mode) {
-	uintptr_t tmp;
+	u8 tmpp[3];
 
+	if (Mode == 0 && !Config.Cdda)
+		CDR_stop();
+	
 	gzfreeze(&cdr, sizeof(cdr));
-
+	
 	if (Mode == 1)
-		tmp = cdr.pTransfer - cdr.Transfer;
+		cdr.ParamP = cdr.ParamC;
 
-	gzfreeze(&tmp, sizeof(tmp));
+	if (Mode == 0) {
+		getCdInfo();
 
-	if (Mode == 0)
-		cdr.pTransfer = cdr.Transfer + tmp;
+		// read right sub data
+		memcpy(tmpp, cdr.Prev, 3);
+		cdr.Prev[0]++;
+		ReadTrack(tmpp);
+
+		if (cdr.Play) {
+			Find_CurTrack(cdr.SetSectorPlay);
+			if (!Config.Cdda)
+				CDR_play(cdr.SetSectorPlay);
+		}
+	}
 
 	return 0;
 }
+
+void LidInterrupt() {
+	getCdInfo();
+	StopCdda();
+	cdrLidSeekInterrupt();
+}

pcsxr-1.9.92.tar.bz2/libpcsxcore/cdrom.h -> pcsxr-1.9.93.tar.bz2/libpcsxcore/cdrom.h Changed

pcsxr-1.9.92.tar.bz2/libpcsxcore/cheat.c -> pcsxr-1.9.93.tar.bz2/libpcsxcore/cheat.c Changed

pcsxr-1.9.92.tar.bz2/libpcsxcore/cheat.h -> pcsxr-1.9.93.tar.bz2/libpcsxcore/cheat.h Changed

pcsxr-1.9.92.tar.bz2/libpcsxcore/coff.h -> pcsxr-1.9.93.tar.bz2/libpcsxcore/coff.h Changed

@@ -1,38 +1,69 @@
-/***************************************************************************
- *   Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team              *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *
- ***************************************************************************/
+/*
+ * Copyright (c) 1995
+ *	Ted Lemon (hereinafter referred to as the author)
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
 
-#ifndef __COFF_H__
-#define __COFF_H__
+#ifndef __ECOFF_H__
+#define __ECOFF_H__
 
-/********************** FILE HEADER **********************/
+/*
+ * Some ECOFF definitions.
+ */
+typedef struct filehdr {
+	u16		f_magic;        /* magic number */
+	u16		f_nscns;        /* number of sections */
+	u32		f_timdat;       /* time & date stamp */
+	u32		f_symptr;       /* file pointer to symbolic header */
+	u32		f_nsyms;        /* sizeof(symbolic hdr) */
+	u16		f_opthdr;       /* sizeof(optional hdr) */
+	u16		f_flags;        /* flags */
+} FILHDR;
 
-struct external_filehdr {
-	unsigned short f_magic;		/* magic number			*/
-	unsigned short f_nscns;		/* number of sections		*/
-	unsigned long f_timdat;	/* time & date stamp		*/
-	unsigned long f_symptr;	/* file pointer to symtab	*/
-	unsigned long f_nsyms;		/* number of symtab entries	*/
-	unsigned short f_opthdr;	/* sizeof(optional hdr)		*/
-	unsigned short f_flags;		/* flags			*/
-};
+typedef struct scnhdr {
+	char	s_name[8];      /* section name */
+	u32		s_paddr;        /* physical address, aliased s_nlib */
+	u32		s_vaddr;        /* virtual address */
+	u32		s_size;         /* section size */
+	u32		s_scnptr;       /* file ptr to raw data for section */
+	u32		s_relptr;       /* file ptr to relocation */
+	u32		s_lnnoptr;      /* file ptr to gp histogram */
+	u16		s_nreloc;       /* number of relocation entries */
+	u16		s_nlnno;        /* number of gp histogram entries */
+	u32		s_flags;        /* flags */
+} SCNHDR;
 
-#define	FILHDR	struct external_filehdr
-#define	FILHSZ	sizeof(FILHDR)
+typedef struct aouthdr {
+	u16		magic;          /* magic */
+	u16		vstamp;         /* version stamp */
+	u32		tsize;          /* text size in bytes, padded to DW bdry */
+	u32		dsize;          /* initialized data */
+	u32		bsize;          /* uninitialized data */
+	u32		entry;          /* entry pt. */
+	u32		text_start;     /* base of text used for this file */
+	u32		data_start;     /* base of data used for this file */
+} AOUTHDR;
 
 #endif

pcsxr-1.9.92.tar.bz2/libpcsxcore/debug.c -> pcsxr-1.9.93.tar.bz2/libpcsxcore/debug.c Changed

@@ -21,7 +21,7 @@
 #include "socket.h"
 
 /*
-PCSX Debug console protocol description, version 1.0
+PCSXR Debug console protocol description, version 1.0
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Commands number are formatted using %03X (yes)
@@ -37,7 +37,7 @@
 100 <message>
 Sends a dumb message. Will be replied with a 200 reply, followed by the message.
 101
- Gets PCSX version.
+ Gets PCSXR version.
 102
 Gets protocol version.
 103
@@ -127,7 +127,9 @@
 391
 Restarts execution.
 395 [number]
- Traces execution, 1 instruction by default. Formatted using %i
+ Traces execution, 1 instruction by default. Formatted using %i.
+396 [number]
+ Disassemble and print current PC in trace mode.
 398
 Soft (quick) resets.
 399
@@ -143,14 +145,14 @@
 010 / 011 / 012 / 013 / 014 / 015 / 016
 Execution hit mapping flow automatic breakpoint.
 030 <number>@<PC>
- Execution hit breakpoint, PCSX is paused. Displays PC's value.
+ Execution hit breakpoint, PCSXR is paused. Displays PC's value.
 
 Basic commands acknowledge (2xx):
 --------------------------------
 200 <message>
 Sends a dumb message.
 201 <message>
- Returns PCSX version.
+ Returns PCSXR version.
 202 <message>
 Returns protocol version.
 203 <status>
@@ -193,7 +195,7 @@
 Execution flow control commands acknowledge (4xx):
 -------------------------------------------------
 400 <number>@<address>-<type>
- Displays a breakpoint, where 'type' can be of E, R1, R2, R4, W1, W2 or W4.
+ Displays a breakpoint, where 'type' can be of BE, BR1, BR2, BR4, BW1, BW2 or BW4.
 401 <message>
 Breakpoint deleting acknowledge.
 410, 420, 421, 422, 430, 431, 432 <number>
@@ -204,6 +206,8 @@
 Resuming.
 495 <message>
 Tracing.
+496 <message>
+ Printing.
 498 <message>
 Soft resetting.
 499 <message>
@@ -225,7 +229,7 @@
 Invalid breakpoint address.
 */
 
-static int debugger_active = 0, paused = 0, trace = 0, reset = 0, resetting = 0;
+static int debugger_active = 0, paused = 0, trace = 0, printpc = 0, reset = 0, resetting = 0;
 static int mapping_e = 0, mapping_r8 = 0, mapping_r16 = 0, mapping_r32 = 0, mapping_w8 = 0, mapping_w16 = 0, mapping_w32 = 0;
 static int breakmp_e = 0, breakmp_r8 = 0, breakmp_r16 = 0, breakmp_r32 = 0, breakmp_w8 = 0, breakmp_w16 = 0, breakmp_w32 = 0;
 
@@ -314,23 +318,23 @@
 
 MemoryMap = (u8 *)malloc(0x200000);
 if (MemoryMap == NULL) {
- SysMessage(_("Error allocating memory"));
+ SysMessage("%s", _("Error allocating memory"));
 return;
 }
 
 if (StartServer() == -1) {
- SysPrintf(_("Unable to start debug server.\n"));
+ SysPrintf("%s", _("Unable to start debug server.\n"));
 return;
 }
 
- SysPrintf(_("Debugger started.\n"));
+ SysPrintf("%s", _("Debugger started.\n"));
 debugger_active = 1;
 }
 
 void StopDebugger() {
 if (debugger_active) {
 StopServer();
- SysPrintf(_("Debugger stopped.\n"));
+ SysPrintf("%s", _("Debugger stopped.\n"));
 }
 
 if (MemoryMap != NULL) {
@@ -389,14 +393,21 @@
 }
 }
 if (!paused) {
- DebugCheckBP(psxRegs.pc, E);
+		if(trace && printpc)
+		{
+			char reply[256];
+			sprintf(reply, "219 %s\r\n", disR3000AF(psxMemRead32(psxRegs.pc), psxRegs.pc));
+			WriteSocket(reply, strlen(reply));
+		}
+		
+ DebugCheckBP(psxRegs.pc, BE);
 }
 if (mapping_e) {
 MarkMap(psxRegs.pc, MAP_EXEC);
 if ((psxRegs.code >> 26) == 3) {
 MarkMap(_JumpTarget_, MAP_EXEC_JAL);
 }
- if (((psxRegs.code >> 26) == 0) && ((psxRegs.code && 0x3F) == 9)) {
+ if (((psxRegs.code >> 26) == 0) && ((psxRegs.code & 0x3F) == 9)) {
 MarkMap(_Rd_, MAP_EXEC_JAL);
 }
 }
@@ -466,11 +477,11 @@
 if (!arguments) {
 reply[0] = 0;
 for (i = 0; i < 32; i++) {
- sprintf(reply, "%s211 %02X=%08X\r\n", reply, i, psxRegs.GPR.r[i]);
+ sprintf(reply, "%s211 %02X(%2.2s)=%08X\r\n", reply, i, disRNameGPR[i], psxRegs.GPR.r[i]);
 }
 } else {
 if ((code >= 0) && (code < 32)) {
- sprintf(reply, "211 %02X=%08X\r\n", code, psxRegs.GPR.r[code]);
+ sprintf(reply, "211 %02X(%2.2s)=%08X\r\n", code, disRNameGPR[code], psxRegs.GPR.r[code]);
 } else {
 sprintf(reply, "511 Invalid GPR register: %X\r\n", code);
 }
@@ -489,11 +500,11 @@
 if (!arguments) {
 reply[0] = 0;
 for (i = 0; i < 32; i++) {
- sprintf(reply, "%s213 %02X=%08X\r\n", reply, i, psxRegs.CP0.r[i]);
+ sprintf(reply, "%s213 %02X(%8.8s)=%08X\r\n", reply, i, disRNameCP0[i], psxRegs.CP0.r[i]);
 }
 } else {
 if ((code >= 0) && (code < 32)) {
- sprintf(reply, "213 %02X=%08X\r\n", code, psxRegs.CP0.r[code]);
+ sprintf(reply, "213 %02X(%8.8s)=%08X\r\n", code, disRNameCP0[code], psxRegs.CP0.r[code]);
 } else {
 sprintf(reply, "511 Invalid COP0 register: %X\r\n", code);
 }
@@ -509,11 +520,11 @@
 if (!arguments) {
 reply[0] = 0;
 for (i = 0; i < 32; i++) {
- sprintf(reply, "%s214 %02X=%08X\r\n", reply, i, psxRegs.CP2C.r[i]);
+ sprintf(reply, "%s214 %02X(%6.6s)=%08X\r\n", reply, i, disRNameCP2C[i], psxRegs.CP2C.r[i]);
 }
 } else {
 if ((code >= 0) && (code < 32)) {
- sprintf(reply, "214 %02X=%08X\r\n", code, psxRegs.CP2C.r[code]);
+ sprintf(reply, "214 %02X(%6.6s)=%08X\r\n", code, disRNameCP2C[code], psxRegs.CP2C.r[code]);
 } else {
 sprintf(reply, "511 Invalid COP2C register: %X\r\n", code);
 }
@@ -529,11 +540,11 @@
 if (!arguments) {
 reply[0] = 0;
 for (i = 0; i < 32; i++) {
- sprintf(reply, "%s215 %02X=%08X\r\n", reply, i, psxRegs.CP2D.r[i]);
+ sprintf(reply, "%s215 %02X(%4.4s)=%08X\r\n", reply, i, disRNameCP2D[i], psxRegs.CP2D.r[i]);
 }
 } else {
 if ((code >= 0) && (code < 32)) {
- sprintf(reply, "215 %02X=%08X\r\n", code, psxRegs.CP2D.r[code]);
+ sprintf(reply, "215 %02X(%4.4s)=%08X\r\n", code, disRNameCP2D[code], psxRegs.CP2D.r[code]);
 } else {
 sprintf(reply, "511 Invalid COP2D register: %X\r\n", code);
 }
@@ -951,7 +962,7 @@
 // sprintf(reply, "531 Invalid address %08X\r\n", address);
 // break;
 // }
- code = add_breakpoint(E, address);
+ code = add_breakpoint(BE, address);
 sprintf(reply, "410 %X\r\n", code);
 break;
 case 0x320:
@@ -963,7 +974,7 @@
 sprintf(reply, "532 Invalid address %08X\r\n", address);
 break;
 }
- code = add_breakpoint(R1, address);
+ code = add_breakpoint(BR1, address);
 sprintf(reply, "420 %X\r\n", code);
 break;
 case 0x321:
@@ -975,7 +986,7 @@
 sprintf(reply, "532 Invalid address %08X\r\n", address);
 break;
 }
- code = add_breakpoint(R2, address);
+ code = add_breakpoint(BR2, address);
 sprintf(reply, "421 %X\r\n", code);
 break;
 case 0x322:
@@ -987,7 +998,7 @@
 sprintf(reply, "532 Invalid address %08X\r\n", address);
 break;
 }
- code = add_breakpoint(R4, address);
+ code = add_breakpoint(BR4, address);
 sprintf(reply, "422 %X\r\n", code);
 break;
 case 0x330:
@@ -999,7 +1010,7 @@
 sprintf(reply, "533 Invalid address %08X\r\n", address);
 break;
 }
- code = add_breakpoint(W1, address);
+ code = add_breakpoint(BW1, address);
 sprintf(reply, "430 %X\r\n", code);
 break;
 case 0x331:
@@ -1011,7 +1022,7 @@
 sprintf(reply, "533 Invalid address %08X\r\n", address);
 break;
 }
- code = add_breakpoint(W2, address);
+ code = add_breakpoint(BW2, address);
 sprintf(reply, "431 %X\r\n", code);
 break;
 case 0x332:
@@ -1023,7 +1034,7 @@
 sprintf(reply, "533 Invalid address %08X\r\n", address);
 break;
 }
- code = add_breakpoint(W4, address);
+ code = add_breakpoint(BW4, address);
 sprintf(reply, "432 %X\r\n", code);
 break;
 case 0x390:
@@ -1045,6 +1056,16 @@
 paused = 0;
 sprintf(reply, "495 Tracing\r\n");
 break;
+ case 0x396:
+ p = arguments;
+ if (arguments) {
+ printpc = strtol(arguments, &p, 10);
+ }
+ if (p == arguments) {
+ printpc = !printpc;
+ }
+ sprintf(reply, "496 Printing %s\r\n", printpc ? "enabled" : "disabled");
+ break;
 case 0x398:
 paused = 0;
 trace = 0;
@@ -1087,59 +1108,59 @@
 return;
 }
 }
- if (breakmp_e && type == E) {
+ if (breakmp_e && type == BE) {
 if (!IsMapMarked(address, MAP_EXEC)) {
 sprintf(reply, "010 %08X@%08X\r\n", address, psxRegs.pc);
 WriteSocket(reply, strlen(reply));
 paused = 1;
 }
 }
- if (breakmp_r8 && type == R1) {
+ if (breakmp_r8 && type == BR1) {
 if (!IsMapMarked(address, MAP_R8)) {
 sprintf(reply, "011 %08X@%08X\r\n", address, psxRegs.pc);
 WriteSocket(reply, strlen(reply));
 paused = 1;
 }
 }
- if (breakmp_r16 && type == R2) {
+ if (breakmp_r16 && type == BR2) {
 if (!IsMapMarked(address, MAP_R16)) {
 sprintf(reply, "012 %08X@%08X\r\n", address, psxRegs.pc);
 WriteSocket(reply, strlen(reply));
 paused = 1;
 }
 }
- if (breakmp_r32 && type == R4) {
+ if (breakmp_r32 && type == BR4) {
 if (!IsMapMarked(address, MAP_R32)) {
 sprintf(reply, "013 %08X@%08X\r\n", address, psxRegs.pc);
 WriteSocket(reply, strlen(reply));
 paused = 1;
 }
 }
- if (breakmp_w8 && type == W1) {
+ if (breakmp_w8 && type == BW1) {
 if (!IsMapMarked(address, MAP_W8)) {
 sprintf(reply, "014 %08X@%08X\r\n", address, psxRegs.pc);
 WriteSocket(reply, strlen(reply));
 paused = 1;
 }
 }
- if (breakmp_w16 && type == W2) {
+ if (breakmp_w16 && type == BW2) {
 if (!IsMapMarked(address, MAP_W16)) {
 sprintf(reply, "015 %08X@%08X\r\n", address, psxRegs.pc);
 WriteSocket(reply, strlen(reply));
 paused = 1;
 }
 }
- if (breakmp_w32 && type == W4) {
+ if (breakmp_w32 && type == BW4) {
 if (!IsMapMarked(address, MAP_W32)) {
 sprintf(reply, "016 %08X@%08X\r\n", address, psxRegs.pc);
 WriteSocket(reply, strlen(reply));
 paused = 1;
 }
 }
- if (mapping_r8 && type == R1) MarkMap(address, MAP_R8);
- if (mapping_r16 && type == R2) MarkMap(address, MAP_R16);
- if (mapping_r32 && type == R4) MarkMap(address, MAP_R32);
- if (mapping_w8 && type == W1) MarkMap(address, MAP_W8);
- if (mapping_w16 && type == W2) MarkMap(address, MAP_W16);
- if (mapping_w32 && type == W4) MarkMap(address, MAP_W32);
+ if (mapping_r8 && type == BR1) MarkMap(address, MAP_R8);
+ if (mapping_r16 && type == BR2) MarkMap(address, MAP_R16);
+ if (mapping_r32 && type == BR4) MarkMap(address, MAP_R32);
+ if (mapping_w8 && type == BW1) MarkMap(address, MAP_W8);
+ if (mapping_w16 && type == BW2) MarkMap(address, MAP_W16);
+ if (mapping_w32 && type == BW4) MarkMap(address, MAP_W32);
 }

pcsxr-1.9.92.tar.bz2/libpcsxcore/debug.h -> pcsxr-1.9.93.tar.bz2/libpcsxcore/debug.h Changed

pcsxr-1.9.92.tar.bz2/libpcsxcore/decode_xa.c -> pcsxr-1.9.93.tar.bz2/libpcsxcore/decode_xa.c Changed

pcsxr-1.9.92.tar.bz2/libpcsxcore/decode_xa.h -> pcsxr-1.9.93.tar.bz2/libpcsxcore/decode_xa.h Changed

pcsxr-1.9.92.tar.bz2/libpcsxcore/disr3000a.c -> pcsxr-1.9.93.tar.bz2/libpcsxcore/disr3000a.c Changed

pcsxr-1.9.93.tar.bz2/libpcsxcore/gpu.c Added

@@ -0,0 +1,187 @@
+/* Copyright (c) 2010, shalma.
+ * Portions Copyright (c) 2002, Pete Bernert.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "psxhw.h"
+#include "gpu.h"
+#include "psxdma.h"
+
+#define GPUSTATUS_ODDLINES 0x80000000
+#define GPUSTATUS_DMABITS 0x60000000 // Two bits
+#define GPUSTATUS_READYFORCOMMANDS 0x10000000
+#define GPUSTATUS_READYFORVRAM 0x08000000
+#define GPUSTATUS_IDLE 0x04000000
+
+#define GPUSTATUS_DISPLAYDISABLED 0x00800000
+#define GPUSTATUS_INTERLACED 0x00400000
+#define GPUSTATUS_RGB24 0x00200000
+#define GPUSTATUS_PAL 0x00100000
+#define GPUSTATUS_DOUBLEHEIGHT 0x00080000
+#define GPUSTATUS_WIDTHBITS 0x00070000 // Three bits
+#define GPUSTATUS_MASKENABLED 0x00001000
+#define GPUSTATUS_MASKDRAWN 0x00000800
+#define GPUSTATUS_DRAWINGALLOWED 0x00000400
+#define GPUSTATUS_DITHER 0x00000200
+
+// Taken from PEOPS SOFTGPU
+u32 lUsedAddr[3];
+
+static inline boolean CheckForEndlessLoop(u32 laddr) {
+	if (laddr == lUsedAddr[1]) return TRUE;
+	if (laddr == lUsedAddr[2]) return TRUE;
+
+	if (laddr < lUsedAddr[0]) lUsedAddr[1] = laddr;
+	else lUsedAddr[2] = laddr;
+
+	lUsedAddr[0] = laddr;
+
+	return FALSE;
+}
+
+static u32 gpuDmaChainSize(u32 addr) {
+	u32 size;
+	u32 DMACommandCounter = 0;
+
+	lUsedAddr[0] = lUsedAddr[1] = lUsedAddr[2] = 0xffffff;
+
+	// initial linked list ptr (word)
+	size = 1;
+
+	do {
+		addr &= 0x1ffffc;
+
+		if (DMACommandCounter++ > 2000000) break;
+		if (CheckForEndlessLoop(addr)) break;
+
+
+		// # 32-bit blocks to transfer
+		size += psxMu8( addr + 3 );
+
+
+		// next 32-bit pointer
+		addr = psxMu32( addr & ~0x3 ) & 0xffffff;
+		size += 1;
+	} while (addr != 0xffffff);
+
+
+	return size;
+}
+
+int gpuReadStatus() {
+	int hard;
+
+
+	// GPU plugin
+	hard = GPU_readStatus();
+
+
+	// Gameshark Lite - wants to see VRAM busy
+	// - Must enable GPU 'Fake Busy States' hack
+	if( (hard & GPUSTATUS_IDLE) == 0 )
+		hard &= ~GPUSTATUS_READYFORVRAM;
+
+	return hard;
+}
+
+void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU
+	u32 *ptr;
+	u32 size, bs;
+
+	switch (chcr) {
+		case 0x01000200: // vram2mem
+#ifdef PSXDMA_LOG
+			PSXDMA_LOG("*** DMA2 GPU - vram2mem *** %lx addr = %lx size = %lx\n", chcr, madr, bcr);
+#endif
+			ptr = (u32 *)PSXM(madr);
+			if (ptr == NULL) {
+#ifdef PSXDMA_LOG
+				PSXDMA_LOG("*** DMA2 GPU - vram2mem *** NULL Pointer!!!\n");
+#endif
+				break;
+			}
+			// BA blocks * BS words (word = 32-bits)
+			size = (bcr >> 16) * (bcr & 0xffff);
+			GPU_readDataMem(ptr, size);
+			psxCpu->Clear(madr, size);
+
+#if 1
+			// already 32-bit word size ((size * 4) / 4)
+			GPUDMA_INT(size);
+#else
+			// Experimental burst dma transfer (0.333x max)
+			GPUDMA_INT(size/3);
+#endif
+			return;
+
+		case 0x01000201: // mem2vram
+ 		bs=(bcr & 0xffff);
+			size = (bcr >> 16) * bs; // BA blocks * BS words (word = 32-bits)
+#ifdef PSXDMA_LOG
+			PSXDMA_LOG("*** DMA 2 - GPU mem2vram *** %lx addr = %lxh, BCR %lxh => size %d = BA(%d) * BS(%xh)\n",
+						chcr, madr, bcr, size, size / bs, size / (bcr >> 16));
+#endif
+			ptr = (u32 *)PSXM(madr);
+			if (ptr == NULL) {
+#ifdef PSXDMA_LOG
+				PSXDMA_LOG("*** DMA2 GPU - mem2vram *** NULL Pointer!!!\n");
+#endif
+				break;
+			}
+			GPU_writeDataMem(ptr, size);
+
+#if 0
+			// already 32-bit word size ((size * 4) / 4)
+			GPUDMA_INT(size);
+#else
+			// X-Files video interlace. Experimental delay depending of BS.
+			GPUDMA_INT( (7 * size) / bs );
+#endif
+			return;
+
+		case 0x0401: // Vampire Hunter D: title screen linked list update
+		case 0x01000401: // dma chain
+#ifdef PSXDMA_LOG
+			PSXDMA_LOG("*** DMA 2 - GPU dma chain *** %8.8lx addr = %lx size = %lx\n", chcr, madr, bcr);
+#endif
+
+			size = gpuDmaChainSize(madr);
+			GPU_dmaChain((u32 *)psxM, madr & 0x1fffff);
+
+			// Tekken 3 = use 1.0 only (not 1.5x)
+
+			// Einhander = parse linked list in pieces (todo)
+			// Final Fantasy 4 = internal vram time (todo)
+			// Rebel Assault 2 = parse linked list in pieces (todo)
+			// Vampire Hunter D = allow edits to linked list (todo)
+			GPUDMA_INT(size);
+			return;
+
+#ifdef PSXDMA_LOG
+		default:
+			PSXDMA_LOG("*** DMA 2 - GPU unknown *** %lx addr = %lx size = %lx\n", chcr, madr, bcr);
+			break;
+#endif
+	}
+
+	HW_DMA2_CHCR &= SWAP32(~0x01000000);
+	DMA_INTERRUPT(2);
+}
+
+void gpuInterrupt() {
+	HW_DMA2_CHCR &= SWAP32(~0x01000000);
+	DMA_INTERRUPT(2);
+}

pcsxr-1.9.93.tar.bz2/libpcsxcore/gpu.h Added

pcsxr-1.9.92.tar.bz2/libpcsxcore/gte.c -> pcsxr-1.9.93.tar.bz2/libpcsxcore/gte.c Changed

@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License *
 * along with this program; if not, write to the *
 * Free Software Foundation, Inc., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
 ***************************************************************************/
 
 /*
@@ -156,6 +156,8 @@
 #define gteZSF4 (psxRegs.CP2C.p[30].sw.l)
 #define gteFLAG (psxRegs.CP2C.r[31])
 
+#define SUM_FLAG { if( gteFLAG & 0x7f87e000 ) gteFLAG |= 0x80000000; }
+
 #define GTE_OP(op) ((op >> 20) & 31)
 #define GTE_SF(op) ((op >> 19) & 1)
 #define GTE_MX(op) ((op >> 17) & 3)
@@ -177,8 +179,8 @@
 	return n_value;
 }
 
-static inline s32 LIM(s32 value, s32 max, s32 min, u32 flag) {
-	s32 ret = value;
+static inline s64 LIM(s64 value, s64 max, s64 min, u32 flag) {
+	s64 ret = value;
 	if (value > max) {
 		gteFLAG |= flag;
 		ret = max;
@@ -189,29 +191,40 @@
 	return ret;
 }
 
-#define A1(a) BOUNDS((a), 0x7fffffff, (1 << 30), -(s64)0x80000000, (1 << 31) | (1 << 27))
-#define A2(a) BOUNDS((a), 0x7fffffff, (1 << 29), -(s64)0x80000000, (1 << 31) | (1 << 26))
-#define A3(a) BOUNDS((a), 0x7fffffff, (1 << 28), -(s64)0x80000000, (1 << 31) | (1 << 25))
-#define limB1(a, l) LIM((a), 0x7fff, -0x8000 * !l, (1 << 31) | (1 << 24))
-#define limB2(a, l) LIM((a), 0x7fff, -0x8000 * !l, (1 << 31) | (1 << 23))
+#define A1(a) BOUNDS((a), 0x7fffffff, (1 << 30), -(s64)0x80000000, (1 << 27))
+#define A2(a) BOUNDS((a), 0x7fffffff, (1 << 29), -(s64)0x80000000, (1 << 26))
+#define A3(a) BOUNDS((a), 0x7fffffff, (1 << 28), -(s64)0x80000000, (1 << 25))
+#define limB1(a, l) LIM((a), 0x7fff, -0x8000 * !l, (1 << 24))
+#define limB2(a, l) LIM((a), 0x7fff, -0x8000 * !l, (1 << 23))
 #define limB3(a, l) LIM((a), 0x7fff, -0x8000 * !l, (1 << 22))
 #define limC1(a) LIM((a), 0x00ff, 0x0000, (1 << 21))
 #define limC2(a) LIM((a), 0x00ff, 0x0000, (1 << 20))
 #define limC3(a) LIM((a), 0x00ff, 0x0000, (1 << 19))
-#define limD(a) LIM((a), 0xffff, 0x0000, (1 << 31) | (1 << 18))
+#define limD(a) LIM((a), 0xffff, 0x0000, (1 << 18))
 
 static inline u32 limE(u32 result) {
 	if (result > 0x1ffff) {
-		gteFLAG |= (1 << 31) | (1 << 17);
+		gteFLAG |= (1 << 17);
+		return 0x1ffff;
+	}
+	return result;
+}
+
+static inline float flimE(float result) {
+	if (result > 0x1ffff) {
+		gteFLAG |= (1 << 17);
 		return 0x1ffff;
 	}
 	return result;
 }
 
-#define F(a) BOUNDS((a), 0x7fffffff, (1 << 31) | (1 << 16), -(s64)0x80000000, (1 << 31) | (1 << 15))
-#define limG1(a) LIM((a), 0x3ff, -0x400, (1 << 31) | (1 << 14))
-#define limG2(a) LIM((a), 0x3ff, -0x400, (1 << 31) | (1 << 13))
-#define limH(a) LIM((a), 0xfff, 0x000, (1 << 12))
+#define F(a) BOUNDS((a), 0x7fffffff, (1 << 16), -(s64)0x80000000, (1 << 15))
+#define limG1(a) LIM((a), 0x3ff, -0x400,(1 << 14))
+#define limG2(a) LIM((a), 0x3ff, -0x400, (1 << 13))
+#define limH(a) LIM((a), 0x1000, 0x0000, (1 << 12))
+
+#define limG1_ia(a) LIM((a), 0x3ffffff, -0x4000000, (1 << 14))
+#define limG2_ia(a) LIM((a), 0x3ffffff, -0x4000000, (1 << 13))
 
 #include "gte_divider.h"
 
@@ -240,9 +253,6 @@
 			break;
 
 		case 28:
-		case 30:
-			return 0;
-
 		case 29:
 			psxRegs.CP2D.r[reg] = LIM(gteIR1 >> 7, 0x1f, 0, 0) |
 									(LIM(gteIR2 >> 7, 0x1f, 0, 0) << 5) |
@@ -270,9 +280,11 @@
 
 		case 30:
 			{
+#if 1
 				int a;
 				gteLZCS = value;
 
+				// non-MAME code
 				a = gteLZCS;
 				if (a > 0) {
 					int i;
@@ -286,13 +298,35 @@
 				} else {
 					gteLZCR = 32;
 				}
+#else
+				// MAME
+				u32 lzcs = value;
+				u32 lzcr = 0;
+
+				gteLZCS = value;
+
+				if( ( lzcs & 0x80000000 ) == 0 )
+				{
+					lzcs = ~lzcs;
+				}
+				while( ( lzcs & 0x80000000 ) != 0 )
+				{
+					lzcr++;
+					lzcs <<= 1;
+				}
+				gteLZCR = lzcr;
+#endif
 			}
 			break;
 
-		case 7:
-		case 29:
+#if 1
 		case 31:
 			return;
+#else
+		case 31:
+			value = psxRegs.CP2D.r[reg];
+			break;
+#endif
 
 		default:
 			psxRegs.CP2D.r[reg] = value;
@@ -313,7 +347,6 @@
 
 		case 31:
 			value = value & 0x7ffff000;
-			if (value & 0x7f87e000) value |= 0x80000000;
 			break;
 	}
 
@@ -327,6 +360,7 @@
 
 void gteCFC2() {
 	if (!_Rt_) return;
+	if (_Rd_ == 31) SUM_FLAG;
 	psxRegs.GPR.r[_Rt_] = psxRegs.CP2C.r[_Rd_];
 }
 
@@ -350,6 +384,7 @@
 
 void gteRTPS() {
 	int quotient;
+ float fquotient;
 
 #ifdef GTE_LOG
 	GTE_LOG("GTE RTPS\n");
@@ -369,15 +404,23 @@
 	quotient = limE(DIVIDE(gteH, gteSZ3));
 	gteSXY0 = gteSXY1;
 	gteSXY1 = gteSXY2;
-	gteSX2 = limG1(F((s64)gteOFX + ((s64)gteIR1 * quotient)) >> 16);
+	gteSX2 = limG1(F((s64)gteOFX + ((s64)gteIR1 * quotient) * (Config.Widescreen ? 0.75 : 1)) >> 16);
 	gteSY2 = limG2(F((s64)gteOFY + ((s64)gteIR2 * quotient)) >> 16);
 
+ fquotient = flimE((float)(gteH << 16) / (float)gteSZ3);
+ GPU_addVertex(gteSX2,
+ gteSY2,
+ limG1_ia((s64)gteOFX + (s64)(gteIR1 * fquotient) * (Config.Widescreen ? 0.75 : 1)), // TODO: MAC1 calc instead of IR1.
+ limG2_ia((s64)gteOFY + (s64)(gteIR2 * fquotient)), // TODO: MAC2 calc instead of IR2.
+				 ((s64)gteSZ3)); // TODO: MAC3 calc instead of SZ3.
+	
 	gteMAC0 = F((s64)(gteDQB + ((s64)gteDQA * quotient)) >> 12);
 	gteIR0 = limH(gteMAC0);
 }
 
 void gteRTPT() {
 	int quotient;
+ float fquotient;
 	int v;
 	s32 vx, vy, vz;
 
@@ -399,9 +442,17 @@
 		gteIR3 = limB3(gteMAC3, 0);
 		fSZ(v) = limD(gteMAC3);
 		quotient = limE(DIVIDE(gteH, fSZ(v)));
-		fSX(v) = limG1(F((s64)gteOFX + ((s64)gteIR1 * quotient)) >> 16);
+		fSX(v) = limG1(F((s64)gteOFX + ((s64)gteIR1 * quotient) * (Config.Widescreen ? 0.75 : 1)) >> 16);
 		fSY(v) = limG2(F((s64)gteOFY + ((s64)gteIR2 * quotient)) >> 16);
+
+ fquotient = flimE((float)(gteH << 16) / (float)fSZ(v));
+		GPU_addVertex(fSX(v),
+ fSY(v),
+ limG1_ia((s64)gteOFX + (s64)(gteIR1 * fquotient) * (Config.Widescreen ? 0.75 : 1)), // TODO: MAC1 calc instead of IR1.
+ limG2_ia((s64)gteOFY + (s64)(gteIR2 * fquotient)), // TODO: MAC2 calc instead of IR2.
+					 ((s64)fSZ(v))); // TODO: MAC3 calc instead of fSZ(v).
 	}
+	
 	gteMAC0 = F((s64)(gteDQB + ((s64)gteDQA * quotient)) >> 12);
 	gteIR0 = limH(gteMAC0);
 }
@@ -442,23 +493,29 @@
 }
 
 void gteAVSZ3() {
+	s64 t;
+	
 #ifdef GTE_LOG
 	GTE_LOG("GTE AVSZ3\n");
 #endif
 	gteFLAG = 0;
 
-	gteMAC0 = F((s64)(gteZSF3 * gteSZ1) + (gteZSF3 * gteSZ2) + (gteZSF3 * gteSZ3));
-	gteOTZ = limD(gteMAC0 >> 12);
+	t = (s64)(gteZSF3 * (s64)(gteSZ1 + gteSZ2 + gteSZ3));
+	gteMAC0 = F(t);
+	gteOTZ = limD(t >> 12);
 }
 
 void gteAVSZ4() {
+	s64 t;
+	
 #ifdef GTE_LOG
 	GTE_LOG("GTE AVSZ4\n");
 #endif
 	gteFLAG = 0;
 
-	gteMAC0 = F((s64)(gteZSF4 * (gteSZ0 + gteSZ1 + gteSZ2 + gteSZ3)));
-	gteOTZ = limD(gteMAC0 >> 12);
+	t = (s64)(gteZSF4 * (s64)(gteSZ0 + gteSZ1 + gteSZ2 + gteSZ3));
+	gteMAC0 = F(t);
+	gteOTZ = limD(t >> 12);
 }
 
 void gteSQR() {
@@ -473,9 +530,9 @@
 	gteMAC1 = A1((gteIR1 * gteIR1) >> shift);
 	gteMAC2 = A2((gteIR2 * gteIR2) >> shift);
 	gteMAC3 = A3((gteIR3 * gteIR3) >> shift);
-	gteIR1 = limB1(gteMAC1 >> shift, lm);
-	gteIR2 = limB2(gteMAC2 >> shift, lm);
-	gteIR3 = limB3(gteMAC3 >> shift, lm);
+	gteIR1 = limB1(gteMAC1, lm);
+	gteIR2 = limB2(gteMAC2, lm);
+	gteIR3 = limB3(gteMAC3, lm);
 }
 
 void gteNCCS() {
@@ -673,18 +730,19 @@
 
 void gteGPF() {
 	int shift = 12 * GTE_SF(gteop);
+	int lm = GTE_LM(gteop);
 
 #ifdef GTE_LOG
 	GTE_LOG("GTE GPF\n");
 #endif
 	gteFLAG = 0;
 
-	gteMAC1 = A1(((s64)gteIR0 * gteIR1) >> shift);
-	gteMAC2 = A2(((s64)gteIR0 * gteIR2) >> shift);
-	gteMAC3 = A3(((s64)gteIR0 * gteIR3) >> shift);
-	gteIR1 = limB1(gteMAC1, 0);
-	gteIR2 = limB2(gteMAC2, 0);
-	gteIR3 = limB3(gteMAC3, 0);
+	gteMAC1 = A1((s64)(gteIR0 * gteIR1)) >> shift;
+	gteMAC2 = A2((s64)(gteIR0 * gteIR2)) >> shift;
+	gteMAC3 = A3((s64)(gteIR0 * gteIR3)) >> shift;
+	gteIR1 = limB1(gteMAC1, lm);
+	gteIR2 = limB2(gteMAC2, lm);
+	gteIR3 = limB3(gteMAC3, lm);
 
 	gteRGB0 = gteRGB1;
 	gteRGB1 = gteRGB2;
@@ -868,6 +926,7 @@
 	gteIR1 = limB1(gteMAC1, lm);
 	gteIR2 = limB2(gteMAC2, lm);
 	gteIR3 = limB3(gteMAC3, lm);
+	
 	gteRGB0 = gteRGB1;
 	gteRGB1 = gteRGB2;
 	gteCODE2 = gteCODE;

pcsxr-1.9.92.tar.bz2/libpcsxcore/gte.h -> pcsxr-1.9.93.tar.bz2/libpcsxcore/gte.h Changed

pcsxr-1.9.92.tar.bz2/libpcsxcore/ix86/iGte.h -> pcsxr-1.9.93.tar.bz2/libpcsxcore/ix86/iGte.h Changed

pcsxr-1.9.92.tar.bz2/libpcsxcore/ix86/iR3000A.c -> pcsxr-1.9.93.tar.bz2/libpcsxcore/ix86/iR3000A.c Changed

pcsxr-1.9.92.tar.bz2/libpcsxcore/ix86/ix86.c -> pcsxr-1.9.93.tar.bz2/libpcsxcore/ix86/ix86.c Changed

pcsxr-1.9.92.tar.bz2/libpcsxcore/ix86/ix86.h -> pcsxr-1.9.93.tar.bz2/libpcsxcore/ix86/ix86.h Changed

pcsxr-1.9.92.tar.bz2/libpcsxcore/ix86_64/iGte.h -> pcsxr-1.9.93.tar.bz2/libpcsxcore/ix86_64/iGte.h Changed

pcsxr-1.9.92.tar.bz2/libpcsxcore/ix86_64/iR3000A-64.c -> pcsxr-1.9.93.tar.bz2/libpcsxcore/ix86_64/iR3000A-64.c Changed

@@ -14,13 +14,15 @@
 * You should have received a copy of the GNU General Public License *
 * along with this program; if not, write to the *
 * Free Software Foundation, Inc., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
 ***************************************************************************/
 
 /*
 * i386 assembly functions for R3000A core.
 */
 
+#ifdef __x86_64__
+
 #include "ix86-64.h"
 #include "../r3000a.h"
 #include "../psxhle.h"
@@ -63,6 +65,7 @@
 
 static iRegisters iRegs[32];
 static iRegisters iRegsS[32];
+static psxRegisters psxRegsS;
 
 #define ST_UNK 0
 #define ST_CONST 1
@@ -88,6 +91,8 @@
 #endif
 }
 
+int dump = FALSE;
+
 static void MapConst(int reg, u32 _const) {
 	iRegs[reg].k = _const;
 	iRegs[reg].state = ST_CONST;
@@ -100,6 +105,26 @@
 	iRegs[reg].state = ST_UNK;
 }
 
+
+static inline void iDump(const iRegisters* iRegsParam) {
+#ifdef PSXCPU_LOG
+	int i;
+
+	for (i=0; i<32; i++) {
+		psxRegsS.GPR.r[i] = psxRegs.GPR.r[i];
+		if (iRegsParam[i].state != ST_UNK) psxRegs.GPR.r[i] = iRegsParam[i].k;
+	}
+
+	PSXCPU_LOG("%s\n", disR3000AF(PSXMu32(pc), pc));
+//	PSXCPU_LOG("%s (%x %x)\n", disR3000AF(PSXMu32(pc), pc), iRegsParam[_Rt_].k, psxRegs.GPR.r[_Rt_]);
+
+
+	for (i=0; i<32; i++) {
+		psxRegs.GPR.r[i] = psxRegsS.GPR.r[i];
+	}
+#endif
+}
+
 static void iFlushRegs() {
 	int i;
 
@@ -108,10 +133,13 @@
 	}
 }
 
-static void iRet() {
-	/* store cycle */
+static void iStoreCycle() {
 	count = ((pc - pcold) / 4) * BIAS;
 	ADD32ItoM((uptr)&psxRegs.cycle, count);
+}
+
+static void iRet() {
+	iStoreCycle();
 	StackRes();
 	RET();
 }
@@ -155,6 +183,9 @@
 static void SetBranch() {
 	branch = 1;
 	psxRegs.code = PSXMu32(pc);
+#ifdef PSXCPU_LOG
+	if (dump) iDump(iRegsS);
+#endif
 	pc+=4;
 
 	if (iLoadTest() == 1) {
@@ -173,20 +204,39 @@
 		RET();
 		return;
 	}
+	switch( psxRegs.code >> 26 ) {
+		// Lode Runner (jr - beq)
 
-	recBSC[psxRegs.code>>26]();
+		// bltz - bgez - bltzal - bgezal / beq - bne - blez - bgtz
+		case 0x01:
+		case 0x04:
+		case 0x05:
+		case 0x06:
+		case 0x07:
+			break;
+
+		default:
+			recBSC[psxRegs.code>>26]();
+			break;
+	}
 
 	iFlushRegs();
+	iStoreCycle();
 	MOV32MtoR(EAX, (uptr)&target);
 	MOV32RtoM((uptr)&psxRegs.pc, EAX);
 	CALLFunc((uptr)psxBranchTest);
+	CALLFunc((uptr)psxJumpTest);
 
-	iRet();
+	StackRes();
+	RET();
 }
 
 static void iJump(u32 branchPC) {
 	branch = 1;
 	psxRegs.code = PSXMu32(pc);
+#ifdef PSXCPU_LOG
+	if (dump) iDump(iRegsS);
+#endif
 	pc+=4;
 
 	if (iLoadTest() == 1) {
@@ -210,11 +260,11 @@
 	recBSC[psxRegs.code>>26]();
 
 	iFlushRegs();
+	iStoreCycle();
 	MOV32ItoM((uptr)&psxRegs.pc, branchPC);
 	CALLFunc((uptr)psxBranchTest);
-	/* store cycle */
-	count = ((pc - pcold) / 4) * BIAS;
-	ADD32ItoM((uptr)&psxRegs.cycle, count);
+	CALLFunc((uptr)psxJumpTest);
+
 	StackRes();
 
 		RET();
@@ -250,7 +300,9 @@
 
 	branch = 1;
 	psxRegs.code = PSXMu32(pc);
-
+#ifdef PSXCPU_LOG
+	if (dump && savectx) iDump(iRegsS);
+#endif
 	// the delay test is only made when the branch is taken
 	// savectx == 0 will mean that :)
 	if (savectx == 0 && iLoadTest() == 1) {
@@ -275,12 +327,11 @@
 	recBSC[psxRegs.code>>26]();
 
 	iFlushRegs();
+	iStoreCycle();
 	MOV32ItoM((uptr)&psxRegs.pc, branchPC);
 	CALLFunc((uptr)psxBranchTest);
-	/* store cycle */
-	count = ((pc - pcold) / 4) * BIAS;
-	ADD32ItoM((uptr)&psxRegs.cycle, count);
-	
+	CALLFunc((uptr)psxJumpTest);
+
 	StackRes();
 
 	// maybe just happened an interruption, check so
@@ -341,6 +392,7 @@
 	ADD32ItoR(ESP, 8*2);
 }
 
+#if 0
 static void iDumpRegs() {
 	int i, j;
 
@@ -351,22 +403,22 @@
 		printf("\n");
 	}
 }
+#endif
 
 void iDumpBlock(char *ptr) {
-	FILE *f;
+#ifdef PSXCPU_LOG
 	u32 i;
-
-	SysPrintf("dump1 %x:%x, %x\n", psxRegs.pc, pc, psxRegs.cycle);
-
 	for (i = psxRegs.pc; i < pc; i+=4)
-		SysPrintf("%s\n", disR3000AF(PSXMu32(i), i));
+		PSXCPU_LOG("%s\n", disR3000AF(PSXMu32(i), i));
+#endif
 
-	fflush(stdout);
+#ifdef PSXCPUDUMP_LOG
+	FILE *f;
 	f = fopen("dump1", "w");
 	fwrite(ptr, 1, (uptr)x86Ptr - (uptr)ptr, f);
 	fclose(f);
 	//system("ndisasm -b64 dump1");
-	fflush(stdout);
+#endif
 }
 
 #define REC_FUNC(f) \
@@ -472,6 +524,13 @@
 	if (*p == 0) {
 		recRecompile();
 	}
+	else if (psxRegs.ICache_valid == FALSE) { // Xenogears: fixes memory card access with original BIOS (0a_44_FlushCache issue)
+		//psxCpu->Clear(0x0, 0x20000);
+		memset(recRAM, 0, 0x10000 * PTRMULT);
+		recRecompile();
+		p = (uptr *)PC_REC(psxRegs.pc);
+		psxRegs.ICache_valid = TRUE;
+	}
 
 	if (*p < (uptr)recMem || *p >= (uptr)recMem + RECMEM_SIZE)
 	{
@@ -491,7 +550,7 @@
 }
 
 static void recClear(u32 Addr, u32 Size) {
-	memset((void*)PC_REC(Addr), 0, Size * sizeof(uptr));
+	memset((void *)PC_REC(Addr), 0, Size * sizeof(uptr));
 }
 
 static void recNULL() {
@@ -521,7 +580,13 @@
 //REC_SYS(COP2);
 #if 1
 static void recCOP2() {
+	MOV32MtoR(EAX, (uptr)&psxRegs.CP0.n.Status);
+	AND32ItoR(EAX, 0x40000000);
+	j32Ptr[31] = JZ32(0);
+
 	recCP2[_Funct_]();
+
+	x86SetJ32(j32Ptr[31]);
 }
 #endif
 
@@ -572,7 +637,7 @@
 			iRegs[_Rt_].state = ST_UNK;
 
 			MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rs_]);
-			if (_Imm_ == 1) { 
+			if (_Imm_ == 1) {
 				INC32R(EAX);
 			} else if (_Imm_ == -1) {
 				DEC32R(EAX);
@@ -702,7 +767,7 @@
 	}
 }
 #endif
-//end of * Arithmetic with immediate operand 
+//end of * Arithmetic with immediate operand
 
 /*********************************************************
 * Load higher 16 bits of the first word in GPR with imm *
@@ -713,8 +778,8 @@
 static void recLUI() {
 // Rt = Imm << 16
 	if (!_Rt_) return;
-
-	MapConst(_Rt_, psxRegs.code << 16);
+	//iFlushReg(_Rt_);
+	MapConst(_Rt_, _ImmLU_);
 }
 #endif
 //End of Load Higher .....
@@ -741,7 +806,7 @@
 
 #if 1
 static void recADDU() {
-// Rd = Rs + Rt 
+// Rd = Rs + Rt
 	if (!_Rd_) return;
 
 //	iFlushRegs();
@@ -761,7 +826,7 @@
 			}
 		} else {
 			MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rt_]);
-			if (iRegs[_Rs_].k == 1) { 
+			if (iRegs[_Rs_].k == 1) {
 				INC32R(EAX);
 			} else if (iRegs[_Rs_].k == 0xffffffff) {
 				DEC32R(EAX);
@@ -783,7 +848,7 @@
 			}
 		} else {
 			MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rs_]);
-			if (iRegs[_Rt_].k == 1) { 
+			if (iRegs[_Rt_].k == 1) {
 				INC32R(EAX);
 			} else if (iRegs[_Rt_].k == 0xffffffff) {
 				DEC32R(EAX);
@@ -841,12 +906,12 @@
 		SUB32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rt_]);
 		MOV32RtoM((uptr)&psxRegs.GPR.r[_Rd_], EAX);
 	}
-} 
+}
 
 static void recSUB() {
 // Rd = Rs - Rt
 	recSUBU();
-} 
+}
 
 static void recAND() {
 // Rd = Rs And Rt
@@ -891,7 +956,7 @@
 			MOV32RtoM((uptr)&psxRegs.GPR.r[_Rd_], EAX);
 		}
 	}
-} 
+}
 
 static void recOR() {
 // Rd = Rs Or Rt
@@ -920,7 +985,7 @@
 		OR32MtoR (EAX, (uptr)&psxRegs.GPR.r[_Rt_]);
 		MOV32RtoM((uptr)&psxRegs.GPR.r[_Rd_], EAX);
 	}
-} 
+}
 
 static void recXOR() {
 // Rd = Rs Xor Rt
@@ -1016,9 +1081,9 @@
 		AND32ItoR(EAX, 0xff);
 		MOV32RtoM((uptr)&psxRegs.GPR.r[_Rd_], EAX);
 	}
-} 
+}
 
-static void recSLTU() { 
+static void recSLTU() {
 // Rd = Rs < Rt (unsigned)
 	if (!_Rd_) return;
 
@@ -1130,7 +1195,16 @@
 //	iFlushRegs();
 
 	if (IsConst(_Rt_)) {
-		if (iRegs[_Rt_].k == 0) return;
+		if (iRegs[_Rt_].k == 0) {
+			MOV32ItoM((uptr)&psxRegs.GPR.n.lo, 0xffffffff);
+			if (IsConst(_Rs_)) {
+				MOV32ItoM((uptr)&psxRegs.GPR.n.hi, iRegs[_Rs_].k);
+			} else {
+				MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rs_]);
+				MOV32RtoM((uptr)&psxRegs.GPR.n.hi, EAX);
+			}
+			return;
+		}
 		MOV32ItoR(ECX, iRegs[_Rt_].k);// printf("divrtk %x\n", iRegs[_Rt_].k);
 	} else {
 		MOV32MtoR(ECX, (uptr)&psxRegs.GPR.r[_Rt_]);
@@ -1147,7 +1221,19 @@
 	MOV32RtoM((uptr)&psxRegs.GPR.n.lo, EAX);
 	MOV32RtoM((uptr)&psxRegs.GPR.n.hi, EDX);
 	if (!IsConst(_Rt_)) {
+		j8Ptr[1] = JMP8(1);
+
 		x86SetJ8(j8Ptr[0]);
+
+		MOV32ItoM((uptr)&psxRegs.GPR.n.lo, 0xffffffff);
+		if (IsConst(_Rs_)) {
+			MOV32ItoM((uptr)&psxRegs.GPR.n.hi, iRegs[_Rs_].k);
+		} else {
+			MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rs_]);
+			MOV32RtoM((uptr)&psxRegs.GPR.n.hi, EAX);
+		}
+
+		x86SetJ8(j8Ptr[1]);
 	}
 }
 
@@ -1157,7 +1243,16 @@
 //	iFlushRegs();
 
 	if (IsConst(_Rt_)) {
-		if (iRegs[_Rt_].k == 0) return;
+		if (iRegs[_Rt_].k == 0) {
+			MOV32ItoM((uptr)&psxRegs.GPR.n.lo, 0xffffffff);
+			if (IsConst(_Rs_)) {
+				MOV32ItoM((uptr)&psxRegs.GPR.n.hi, iRegs[_Rs_].k);
+			} else {
+				MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rs_]);
+				MOV32RtoM((uptr)&psxRegs.GPR.n.hi, EAX);
+			}
+			return;
+		}
 		MOV32ItoR(ECX, iRegs[_Rt_].k);// printf("divurtk %x\n", iRegs[_Rt_].k);
 	} else {
 		MOV32MtoR(ECX, (uptr)&psxRegs.GPR.r[_Rt_]);
@@ -1174,11 +1269,23 @@
 	MOV32RtoM((uptr)&psxRegs.GPR.n.lo, EAX);
 	MOV32RtoM((uptr)&psxRegs.GPR.n.hi, EDX);
 	if (!IsConst(_Rt_)) {
+		j8Ptr[1] = JMP8(1);
+
 		x86SetJ8(j8Ptr[0]);
+
+		MOV32ItoM((uptr)&psxRegs.GPR.n.lo, 0xffffffff);
+		if (IsConst(_Rs_)) {
+			MOV32ItoM((uptr)&psxRegs.GPR.n.hi, iRegs[_Rs_].k);
+		} else {
+			MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rs_]);
+			MOV32RtoM((uptr)&psxRegs.GPR.n.hi, EAX);
+		}
+
+		x86SetJ8(j8Ptr[1]);
 	}
 }
 #endif
-//End of * Register mult/div & Register trap logic 
+//End of * Register mult/div & Register trap logic
 
 #if 0
 REC_FUNC(LB);
@@ -1226,6 +1333,7 @@
 }
 
 #if 1
+
 static void recLB() {
 // Rt = mem[Rs + Im] (signed)
 
@@ -1241,7 +1349,7 @@
 			MapConst(_Rt_, psxRs8(addr));
 			return;
 		}
-		if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
+		if ((t & 0x1fe0) == 0) {
 			if (!_Rt_) return;
 			iRegs[_Rt_].state = ST_UNK;
 
@@ -1285,7 +1393,7 @@
 			MapConst(_Rt_, psxRu8(addr));
 			return;
 		}
-		if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
+		if ((t & 0x1fe0) == 0) {
 			if (!_Rt_) return;
 			iRegs[_Rt_].state = ST_UNK;
 
@@ -1329,7 +1437,7 @@
 			MapConst(_Rt_, psxRs16(addr));
 			return;
 		}
-		if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
+		if ((t & 0x1fe0) == 0) {
 			if (!_Rt_) return;
 			iRegs[_Rt_].state = ST_UNK;
 
@@ -1373,7 +1481,7 @@
 			MapConst(_Rt_, psxRu16(addr));
 			return;
 		}
-		if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
+		if ((t & 0x1fe0) == 0) {
 			if (!_Rt_) return;
 			iRegs[_Rt_].state = ST_UNK;
 
@@ -1455,6 +1563,7 @@
 //	ADD32ItoR(ESP, 4);
 }
 
+
 static void recLW() {
 // Rt = mem[Rs + Im] (unsigned)
 
@@ -1470,7 +1579,7 @@
 			MapConst(_Rt_, psxRu32(addr));
 			return;
 		}
-		if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
+		if ((t & 0x1fe0) == 0) {
 			if (!_Rt_) return;
 			iRegs[_Rt_].state = ST_UNK;
 
@@ -1488,20 +1597,20 @@
 		}
 		if (t == 0x1f80) {
 			switch (addr) {
-				case 0x1f801080: case 0x1f801084: case 0x1f801088: 
-				case 0x1f801090: case 0x1f801094: case 0x1f801098: 
-				case 0x1f8010a0: case 0x1f8010a4: case 0x1f8010a8: 
-				case 0x1f8010b0: case 0x1f8010b4: case 0x1f8010b8: 
-				case 0x1f8010c0: case 0x1f8010c4: case 0x1f8010c8: 
-				case 0x1f8010d0: case 0x1f8010d4: case 0x1f8010d8: 
-				case 0x1f8010e0: case 0x1f8010e4: case 0x1f8010e8: 
+				case 0x1f801080: case 0x1f801084: case 0x1f801088:
+				case 0x1f801090: case 0x1f801094: case 0x1f801098:
+				case 0x1f8010a0: case 0x1f8010a4: case 0x1f8010a8:
+				case 0x1f8010b0: case 0x1f8010b4: case 0x1f8010b8:
+				case 0x1f8010c0: case 0x1f8010c4: case 0x1f8010c8:
+				case 0x1f8010d0: case 0x1f8010d4: case 0x1f8010d8:
+				case 0x1f8010e0: case 0x1f8010e4: case 0x1f8010e8:
 				case 0x1f801070: case 0x1f801074:
 				case 0x1f8010f0: case 0x1f8010f4:
 					if (!_Rt_) return;
 					iRegs[_Rt_].state = ST_UNK;
-
 					MOV32MtoR(EAX, (uptr)&psxH[addr & 0xffff]);
 					MOV32RtoM((uptr)&psxRegs.GPR.r[_Rt_], EAX);
+					
 					return;
 
 				case 0x1f801810:
@@ -1531,6 +1640,11 @@
 		MOV32RtoM((uptr)&psxRegs.GPR.r[_Rt_], EAX);
 	}
 //	ADD32ItoR(ESP, 4);
+
+	// Delay is memread delay + 1 cycle.
+	// Seems to work nicely with games that require cycle accuracy like CART World Series.
+	// TODO: this could be needed with other L ops such as LB.
+	INC32M((uptr)&psxRegs.cycle);
 }
 
 extern u32 LWL_MASK[4];
@@ -1554,7 +1668,7 @@
 		u32 addr = iRegs[_Rs_].k + _Imm_;
 		int t = addr >> 16;
 
-		if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
+		if ((t & 0x1fe0) == 0) {
 			MOV32MtoR(EAX, (uptr)&psxM[addr & 0x1ffffc]);
 			iLWLk(addr & 3);
 
@@ -1638,7 +1752,7 @@
 			}
 			return;
 		}
-		if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
+		if ((t & 0x1fe0) == 0) {
 			for (i=0; i<count; i++, code++, addr+=4) {
 				if (!_fRt_(*code)) return;
 				iRegs[_fRt_(*code)].state = ST_UNK;
@@ -1672,7 +1786,7 @@
 	for (i=0; i<count; i++, code++) {
 		if (_fRt_(*code)) {
 			iRegs[_fRt_(*code)].state = ST_UNK;
-			
+
 			MOV64RmStoR(EDX, EAX, ECX, 2);
 			MOV32RtoM((uptr)&psxRegs.GPR.r[_fRt_(*code)], EDX);
 		}
@@ -1713,7 +1827,7 @@
 		u32 addr = iRegs[_Rs_].k + _Imm_;
 		int t = addr >> 16;
 
-		if ((t & 0x1fe0) == 0 && (t & 0x1fff) != 0) {
+		if ((t & 0x1fe0) == 0) {
 			MOV32MtoR(EAX, (uptr)&psxM[addr & 0x1ffffc]);
 			iLWRk(addr & 3);
 
@@ -1784,6 +1898,9 @@
 				MOV8MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rt_]);
 				MOV8RtoM((uptr)&psxM[addr & 0x1fffff], EAX);
 			}
+			MOV32ItoR(X86ARG2, 1);
+			MOV32ItoR(X86ARG1, addr & ~3);
+			CALLFunc((uptr)&recClear);
 			return;
 		}
 		if (t == 0x1f80 && addr < 0x1f801000) {
@@ -1805,6 +1922,7 @@
 	}
 	SetArg_OfB(X86ARG1);
 	CALLFunc((uptr)psxMemWrite8);
+
 //	ADD32ItoR(ESP, 8);
 }
 
@@ -1824,6 +1942,9 @@
 				MOV16MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rt_]);
 				MOV16RtoM((uptr)&psxM[addr & 0x1fffff], EAX);
 			}
+			MOV32ItoR(X86ARG2, 1);
+			MOV32ItoR(X86ARG1, addr & ~3);
+			CALLFunc((uptr)&recClear);
 			return;
 		}
 		if (t == 0x1f80 && addr < 0x1f801000) {
@@ -1879,6 +2000,9 @@
 				MOV32MtoR(EAX, (uptr)&psxRegs.GPR.r[_Rt_]);
 				MOV32RtoM((uptr)&psxM[addr & 0x1fffff], EAX);
 			}
+			MOV32ItoR(X86ARG2, 1);
+			MOV32ItoR(X86ARG1, addr);
+			CALLFunc((uptr)&recClear);
 			return;
 		}
 		if (t == 0x1f80 && addr < 0x1f801000) {
@@ -1892,13 +2016,13 @@
 		}
 		if (t == 0x1f80) {
 			switch (addr) {
-				case 0x1f801080: case 0x1f801084: 
-				case 0x1f801090: case 0x1f801094: 
-				case 0x1f8010a0: case 0x1f8010a4: 
-				case 0x1f8010b0: case 0x1f8010b4: 
-				case 0x1f8010c0: case 0x1f8010c4: 
-				case 0x1f8010d0: case 0x1f8010d4: 
-				case 0x1f8010e0: case 0x1f8010e4: 
+				case 0x1f801080: case 0x1f801084:
+				case 0x1f801090: case 0x1f801094:
+				case 0x1f8010a0: case 0x1f8010a4:
+				case 0x1f8010b0: case 0x1f8010b4:
+				case 0x1f8010c0: case 0x1f8010c4:
+				case 0x1f8010d0: case 0x1f8010d4:
+				case 0x1f8010e0: case 0x1f8010e4:
 				case 0x1f801074:
 				case 0x1f8010f0:
 					if (IsConst(_Rt_)) {
@@ -2133,7 +2257,7 @@
 		if (_Imm_) ADD32ItoR(EAX, _Imm_);
 	}
 	PUSHR (EAX);
-	
+
 	AND32ItoR(EAX, ~3);
 	MOV32RtoR(X86ARG1, EAX);
 
@@ -2339,8 +2463,6 @@
 REC_SYS(BREAK);
 #endif
 
-int dump = 0;
-
 #if 1
 static void recSYSCALL() {
 //	dump=1;
@@ -2581,7 +2703,7 @@
 	if (_Rd_) {
 		MapConst(_Rd_, pc + 4);
 	}
-	
+
 	SetBranch();
 }
 
@@ -2856,7 +2978,7 @@
 	recDPCS , recINTPL, recMVMVA, recNCDS, recCDP , recNULL , recNCDT , recNULL, // 10
 	recNULL , recNULL , recNULL , recNCCS, recCC , recNULL , recNCS , recNULL, // 18
 	recNCT , recNULL , recNULL , recNULL, recNULL, recNULL , recNULL , recNULL, // 20
-	recSQR , recDCPL , recDPCT , recNULL, recNULL, recAVSZ3, recAVSZ4, recNULL, // 28 
+	recSQR , recDCPL , recDPCT , recNULL, recNULL, recAVSZ3, recAVSZ4, recNULL, // 28
 	recRTPT , recNULL , recNULL , recNULL, recNULL, recNULL , recNULL , recNULL, // 30
 	recNULL , recNULL , recNULL , recNULL, recNULL, recGPF , recGPL , recNCCT // 38
 };
@@ -2872,8 +2994,6 @@
 static void recRecompile() {
 	char *p;
 	char *ptr;
-
-	dump = 0;
 	resp = 0;
 
 	/* if x86Ptr reached the mem limit reset whole mem */
@@ -2883,7 +3003,7 @@
 	x86Align(32);
 	ptr = x86Ptr;
 
-	PC_RECP(psxRegs.pc) = x86Ptr;
+	PC_RECP(psxRegs.pc) = (uptr)x86Ptr;
 	pc = psxRegs.pc;
 	pcold = pc;
 
@@ -2935,13 +3055,20 @@
 				pc = pc + i*4; continue;
 			}
 		}*/
-
+#ifdef PSXCPU_LOG
+		if (Config.PsxOut) { dump = TRUE; }
+		iDump(iRegs);
+#endif
 		pc+=4; count++;
 		recBSC[psxRegs.code>>26]();
-
+#ifdef PSXCPU_LOG
+		dump = FALSE;
+#endif
 		if (branch) {
 			branch = 0;
+#ifdef PSXCPU_LOG
 			if (dump) iDumpBlock(ptr);
+#endif
 			return;
 		}
 	}
@@ -2961,3 +3088,4 @@
 	recClear,
 	recShutdown
 };
+#endif

pcsxr-1.9.92.tar.bz2/libpcsxcore/ix86_64/ix86-64.c -> pcsxr-1.9.93.tar.bz2/libpcsxcore/ix86_64/ix86-64.c Changed

pcsxr-1.9.92.tar.bz2/libpcsxcore/ix86_64/ix86_cpudetect.c -> pcsxr-1.9.93.tar.bz2/libpcsxcore/ix86_64/ix86_cpudetect.c Changed

@@ -1,487 +1,492 @@
-/* Cpudetection lib 
- * Copyright (C) 2002-2003 Pcsx2 Team
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
- */
-#if defined (_WIN32)
-#include <windows.h>
-#endif
-
-#include <string.h>
-#include <stdio.h>
-
-#include "ix86-64.h"
-
-#if defined (_MSC_VER) && _MSC_VER >= 1400
-
- void __cpuid(int* CPUInfo, int InfoType);
- unsigned __int64 __rdtsc();
-
- #pragma intrinsic(__cpuid)
- #pragma intrinsic(__rdtsc)
-
-#endif
-
-CAPABILITIES cpucaps;
-CPUINFO cpuinfo;
-
-#define cpuid(cmd,a,b,c,d) \
- __asm__ __volatile__("cpuid" \
-		: "=a" (a), "=b" (b), "=c" (c), "=d" (d) : "0" (cmd))
-
-static s32 iCpuId( u32 cmd, u32 *regs ) 
-{
- int flag=1;
-
-#if defined (_MSC_VER) && _MSC_VER >= 1400
-
- __cpuid( regs, cmd );
-
- return 0;
-
-#elif defined (_MSC_VER) 
-
-#ifdef __x86_64__
- assert(0);
-#else // __x86_64__
- __asm 
- {
- push ebx;
- push edi;
-
- pushfd;
- pop eax;
- mov edx, eax;
- xor eax, 1 << 21;
- push eax;
- popfd;
- pushfd;
- pop eax;
- xor eax, edx;
- mov flag, eax;
- }
- if ( ! flag )
- {
- return -1;
- }
-
- __asm 
- {
- mov eax, cmd;
- cpuid;
- mov edi, [regs]
- mov [edi], eax;
- mov [edi+4], ebx;
- mov [edi+8], ecx;
- mov [edi+12], edx;
-
- pop edi;
- pop ebx;
- }
-#endif // __x86_64__
- return 0;
-
-
-#else
-
-#ifndef __x86_64__
- // see if we can use cpuid
- __asm__ __volatile__ (
- "sub $0x18, %%esp\n"
- "pushf\n"
- "pop %%eax\n"
- "mov %%eax, %%edx\n"
- "xor $0x200000, %%eax\n"
- "push %%eax\n"
- "popf\n"
- "pushf\n"
- "pop %%eax\n"
- "xor %%edx, %%eax\n"
- "mov %%eax, %0\n"
-	 "add $0x18, %%esp\n"
- : "=r"(flag) :
- );
-#endif
-
- if ( !flag )
- return -1;
-
- cpuid(cmd, regs[0], regs[1], regs[2], regs[3]);
- return 0;
-#endif // _MSC_VER
-}
-
-u64 GetCPUTick( void ) 
-{
-#if defined (_MSC_VER) && _MSC_VER >= 1400
-
- return __rdtsc();
-
-#elif defined(__MSCW32__) && !defined(__x86_64__)
-
- __asm rdtsc;
-
-#else
-
- u32 _a, _d;
-	__asm__ __volatile__ ("rdtsc" : "=a"(_a), "=d"(_d));
-	return (u64)_a | ((u64)_d << 32);
-
-#endif
-}
-
-#if defined __LINUX__
-
-#include <sys/time.h>
-#include <errno.h>
-//*
-unsigned long timeGetTime2()
-{
- struct timeval tv;
- gettimeofday(&tv, 0); // well, maybe there are better ways
- return (unsigned long)tv.tv_sec * 1000 + tv.tv_usec/1000; // to do that, but at least it works
-}
-//*/
-#endif
-
-s64 CPUSpeedHz( unsigned int time )
-{
- s64 timeStart, 
- timeStop;
- s64 startTick, 
- endTick;
- s64 overhead;
-
- if( ! cpucaps.hasTimeStampCounter )
- {
- return 0; //check if function is supported
- }
-
-	overhead = GetCPUTick() - GetCPUTick();
-	
-	timeStart = timeGetTime2( );
-	while( timeGetTime2( ) == timeStart ) 
- {
- timeStart = timeGetTime2( );
- }
-	for(;;)
-	{
-		timeStop = timeGetTime2( );
-		if ( ( timeStop - timeStart ) > 1 )	
-		{
-			startTick = GetCPUTick( );
-			break;
-		}
-	}
-
-	timeStart = timeStop;
-	for(;;)
-	{
-		timeStop = timeGetTime2( );
-		if ( ( timeStop - timeStart ) > time )	
-		{
-			endTick = GetCPUTick( );
-			break;
-		}
-	}
-
-	return (s64)( ( endTick - startTick ) + ( overhead ) );
-}
-
-////////////////////////////////////////////////////
-void cpudetectInit( void ) 
-{
- u32 regs[ 4 ];
- u32 cmds;
- u32 AMDspeed;
- s8 AMDspeedString[10];
- int cputype=0; // Cpu type
- //AMD 64 STUFF
- u32 x86_64_8BITBRANDID;
- u32 x86_64_12BITBRANDID; 
- memset( cpuinfo.x86ID, 0, sizeof( cpuinfo.x86ID ) );
- cpuinfo.x86Family = 0;
- cpuinfo.x86Model = 0;
- cpuinfo.x86PType = 0;
- cpuinfo.x86StepID = 0;
- cpuinfo.x86Flags = 0;
- cpuinfo.x86EFlags = 0;
- 
- if ( iCpuId( 0, regs ) == -1 ) return;
-
- cmds = regs[ 0 ];
- ((u32*)cpuinfo.x86ID)[ 0 ] = regs[ 1 ];
- ((u32*)cpuinfo.x86ID)[ 1 ] = regs[ 3 ];
- ((u32*)cpuinfo.x86ID)[ 2 ] = regs[ 2 ];
- if ( cmds >= 0x00000001 ) 
- {
- if ( iCpuId( 0x00000001, regs ) != -1 )
- {
- cpuinfo.x86StepID = regs[ 0 ] & 0xf;
- cpuinfo.x86Model = (regs[ 0 ] >> 4) & 0xf;
- cpuinfo.x86Family = (regs[ 0 ] >> 8) & 0xf;
- cpuinfo.x86PType = (regs[ 0 ] >> 12) & 0x3;
- x86_64_8BITBRANDID = regs[1] & 0xff;
- cpuinfo.x86Flags = regs[ 3 ];
- }
- }
- if ( iCpuId( 0x80000000, regs ) != -1 )
- {
- cmds = regs[ 0 ];
- if ( cmds >= 0x80000001 ) 
- {
-		 if ( iCpuId( 0x80000001, regs ) != -1 )
- {
-			x86_64_12BITBRANDID = regs[1] & 0xfff;
- cpuinfo.x86EFlags = regs[ 3 ];
- 
- }
- }
- }
- switch(cpuinfo.x86PType)
- {
- case 0:
- strcpy( cpuinfo.x86Type, "Standard OEM");
- break;
- case 1:
- strcpy( cpuinfo.x86Type, "Overdrive");
- break;
- case 2:
- strcpy( cpuinfo.x86Type, "Dual");
- break;
- case 3:
- strcpy( cpuinfo.x86Type, "Reserved");
- break;
- default:
- strcpy( cpuinfo.x86Type, "Unknown");
- break;
- }
- if ( cpuinfo.x86ID[ 0 ] == 'G' ){ cputype=0;}//trick lines but if you know a way better ;p
- if ( cpuinfo.x86ID[ 0 ] == 'A' ){ cputype=1;}
- 
- if ( cputype == 0 ) //intel cpu
- {
- if( ( cpuinfo.x86Family >= 7 ) && ( cpuinfo.x86Family < 15 ) )
- {
- strcpy( cpuinfo.x86Fam, "Intel P6 family (Not PIV and Higher then PPro" );
- }
- else
- {
- switch( cpuinfo.x86Family )
- { 
- // Start at 486 because if it's below 486 there is no cpuid instruction
- case 4:
- strcpy( cpuinfo.x86Fam, "Intel 486" );
- break;
- case 5: 
- switch( cpuinfo.x86Model )
- {
- case 4:
- case 8: // 0.25 µm
- strcpy( cpuinfo.x86Fam, "Intel Pentium (MMX)");
- break;
- default:
- strcpy( cpuinfo.x86Fam, "Intel Pentium" );
- }
- break;
- case 6: 
- switch( cpuinfo.x86Model )
- {
- case 0: // Pentium pro (P6 A-Step)
- case 1: // Pentium pro
- strcpy( cpuinfo.x86Fam, "Intel Pentium Pro" );
- break;
-
- case 2: // 66 MHz FSB
- case 5: // Xeon/Celeron (0.25 µm)
- case 6: // Internal L2 cache
- strcpy( cpuinfo.x86Fam, "Intel Pentium II" );
- break;
-
- case 7: // Xeon external L2 cache
- case 8: // Xeon/Celeron with 256 KB on-die L2 cache
- case 10: // Xeon/Celeron with 1 or 2 MB on-die L2 cache
- case 11: // Xeon/Celeron with Tualatin core, on-die cache
- strcpy( cpuinfo.x86Fam, "Intel Pentium III" );
- break;
-			 case 15: // Core 2 Duo Allendale/Conroe
-				 strcpy( cpuinfo.x86Fam, "Intel Core 2 Duo" );
-				 break;
-
- default:
- strcpy( cpuinfo.x86Fam, "Intel Pentium Pro (Unknown)" );
- }
- break;
- case 15:
- switch( cpuinfo.x86Model )
- {
- case 0: // Willamette (A-Step)
- case 1: // Willamette 
- strcpy( cpuinfo.x86Fam, "Willamette Intel Pentium IV" );
- break;
- case 2: // Northwood 
- strcpy( cpuinfo.x86Fam, "Northwood Intel Pentium IV" );
- break;
-
- default:
- strcpy( cpuinfo.x86Fam, "Intel Pentium IV (Unknown)" );
- break;
- }
- break;
- default:
- strcpy( cpuinfo.x86Fam, "Unknown Intel CPU" );
- }
- }
- }
- else if ( cputype == 1 ) //AMD cpu
- {
- if( cpuinfo.x86Family >= 7 )
- {
-		 if((x86_64_12BITBRANDID !=0) || (x86_64_8BITBRANDID !=0))
-		 {
-		 if(x86_64_8BITBRANDID == 0 )
-		 {
- switch((x86_64_12BITBRANDID >>6)& 0x3f)
-			 {
-			 case 4:
-				 strcpy(cpuinfo.x86Fam,"AMD Athlon(tm) 64 Processor");
- AMDspeed = 22 + (x86_64_12BITBRANDID & 0x1f);
-				 //AMDspeedString = strtol(AMDspeed, (char**)NULL,10);
-				 sprintf(AMDspeedString," %d",AMDspeed);
-				 strcat(AMDspeedString,"00+");
-				 strcat(cpuinfo.x86Fam,AMDspeedString);
-				 break;
-			 case 12: 
-				 strcpy(cpuinfo.x86Fam,"AMD Opteron(tm) Processor");
-				 break;
-			 case 5:
-				 strcpy( cpuinfo.x86Fam, "AMD Athlon X2 Processor" );
-				 AMDspeed = 22 + (x86_64_12BITBRANDID & 0x1f);
-				 //AMDspeedString = strtol(AMDspeed, (char**)NULL,10);
-				 sprintf(AMDspeedString," %d",AMDspeed);
-				 strcat(AMDspeedString,"00+");
-				 strcat(cpuinfo.x86Fam,AMDspeedString);
- break;
-			 case 44:
-				 strcpy( cpuinfo.x86Fam, "AMD Opteron(tm) Dual Core Processor" );
- break;
-			 default:
-				 strcpy(cpuinfo.x86Fam,"Unknown AMD 64 proccesor");
-				 
-			 }
-		 }
-		 else //8bit brand id is non zero
-		 {
- strcpy(cpuinfo.x86Fam,"Unsupported yet AMD64 cpu");
-		 }
-		 }
-		 else
-		 {		 
-			 strcpy( cpuinfo.x86Fam, "AMD K7+ Processor" );
-		 }
- }
- else
- {
- switch ( cpuinfo.x86Family )
- {
- case 4:
- switch( cpuinfo.x86Model )
- {
- case 14: 
- case 15: // Write-back enhanced
- strcpy( cpuinfo.x86Fam, "AMD 5x86 Processor" );
- break;
-
- case 3: // DX2
- case 7: // Write-back enhanced DX2
- case 8: // DX4
- case 9: // Write-back enhanced DX4
- strcpy( cpuinfo.x86Fam, "AMD 486 Processor" );
- break;
-			 			 
-
- default:
- strcpy( cpuinfo.x86Fam, "AMD Unknown Processor" );
-
- }
- break;
-
- case 5: 
- switch( cpuinfo.x86Model)
- {
- case 0: // SSA 5 (75, 90 and 100 Mhz)
- case 1: // 5k86 (PR 120 and 133 MHz)
- case 2: // 5k86 (PR 166 MHz)
- case 3: // K5 5k86 (PR 200 MHz)
- strcpy( cpuinfo.x86Fam, "AMD K5 Processor" );
- break;
-
- case 6: 
- case 7: // (0.25 µm)
- case 8: // K6-2
- case 9: // K6-III
- case 14: // K6-2+ / K6-III+
- strcpy( cpuinfo.x86Fam, "AMD K6 Series Processor" );
- break;
-
- default:
- strcpy( cpuinfo.x86Fam, "AMD Unknown Processor" );
- }
- break;
- case 6: 
- strcpy( cpuinfo.x86Fam, "AMD Athlon XP Processor" );
- break;
- default:
- strcpy( cpuinfo.x86Fam, "Unknown AMD CPU" ); 
- }
- }
- }
- //capabilities
- cpucaps.hasFloatingPointUnit = ( cpuinfo.x86Flags >> 0 ) & 1;
- cpucaps.hasVirtual8086ModeEnhancements = ( cpuinfo.x86Flags >> 1 ) & 1;
- cpucaps.hasDebuggingExtensions = ( cpuinfo.x86Flags >> 2 ) & 1;
- cpucaps.hasPageSizeExtensions = ( cpuinfo.x86Flags >> 3 ) & 1;
- cpucaps.hasTimeStampCounter = ( cpuinfo.x86Flags >> 4 ) & 1;
- cpucaps.hasModelSpecificRegisters = ( cpuinfo.x86Flags >> 5 ) & 1;
- cpucaps.hasPhysicalAddressExtension = ( cpuinfo.x86Flags >> 6 ) & 1;
- cpucaps.hasMachineCheckArchitecture = ( cpuinfo.x86Flags >> 7 ) & 1;
- cpucaps.hasCOMPXCHG8BInstruction = ( cpuinfo.x86Flags >> 8 ) & 1;
- cpucaps.hasAdvancedProgrammableInterruptController = ( cpuinfo.x86Flags >> 9 ) & 1;
- cpucaps.hasSEPFastSystemCall = ( cpuinfo.x86Flags >> 11 ) & 1;
- cpucaps.hasMemoryTypeRangeRegisters = ( cpuinfo.x86Flags >> 12 ) & 1;
- cpucaps.hasPTEGlobalFlag = ( cpuinfo.x86Flags >> 13 ) & 1;
- cpucaps.hasMachineCheckArchitecture = ( cpuinfo.x86Flags >> 14 ) & 1;
- cpucaps.hasConditionalMoveAndCompareInstructions = ( cpuinfo.x86Flags >> 15 ) & 1;
- cpucaps.hasFGPageAttributeTable = ( cpuinfo.x86Flags >> 16 ) & 1;
- cpucaps.has36bitPageSizeExtension = ( cpuinfo.x86Flags >> 17 ) & 1;
- cpucaps.hasProcessorSerialNumber = ( cpuinfo.x86Flags >> 18 ) & 1;
- cpucaps.hasCFLUSHInstruction = ( cpuinfo.x86Flags >> 19 ) & 1;
- cpucaps.hasDebugStore = ( cpuinfo.x86Flags >> 21 ) & 1;
- cpucaps.hasACPIThermalMonitorAndClockControl = ( cpuinfo.x86Flags >> 22 ) & 1;
- cpucaps.hasMultimediaExtensions = ( cpuinfo.x86Flags >> 23 ) & 1; //mmx
- cpucaps.hasFastStreamingSIMDExtensionsSaveRestore = ( cpuinfo.x86Flags >> 24 ) & 1;
- cpucaps.hasStreamingSIMDExtensions = ( cpuinfo.x86Flags >> 25 ) & 1; //sse
- cpucaps.hasStreamingSIMD2Extensions = ( cpuinfo.x86Flags >> 26 ) & 1; //sse2
- cpucaps.hasSelfSnoop = ( cpuinfo.x86Flags >> 27 ) & 1;
- cpucaps.hasHyperThreading = ( cpuinfo.x86Flags >> 28 ) & 1;
- cpucaps.hasThermalMonitor = ( cpuinfo.x86Flags >> 29 ) & 1;
- cpucaps.hasIntel64BitArchitecture = ( cpuinfo.x86Flags >> 30 ) & 1;
- //that is only for AMDs
- cpucaps.hasMultimediaExtensionsExt = ( cpuinfo.x86EFlags >> 22 ) & 1; //mmx2
- cpucaps.hasAMD64BitArchitecture = ( cpuinfo.x86EFlags >> 29 ) & 1; //64bit cpu
- cpucaps.has3DNOWInstructionExtensionsExt = ( cpuinfo.x86EFlags >> 30 ) & 1; //3dnow+
- cpucaps.has3DNOWInstructionExtensions = ( cpuinfo.x86EFlags >> 31 ) & 1; //3dnow 
- cpuinfo.cpuspeed = (u32 )(CPUSpeedHz( 1000 ) / 1000000);
-}
+/* Cpudetection lib 
+ * Copyright (C) 2002-2003 Pcsx2 Team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifdef __x86_64__
+
+#if defined (_WIN32)
+#include <windows.h>
+#endif
+
+#include <string.h>
+#include <stdio.h>
+
+#include "ix86-64.h"
+
+#if defined (_MSC_VER) && _MSC_VER >= 1400
+
+ void __cpuid(int* CPUInfo, int InfoType);
+ unsigned __int64 __rdtsc();
+
+ #pragma intrinsic(__cpuid)
+ #pragma intrinsic(__rdtsc)
+
+#endif
+
+CAPABILITIES cpucaps;
+CPUINFO cpuinfo;
+
+#define cpuid(cmd,a,b,c,d) \
+ __asm__ __volatile__("cpuid" \
+		: "=a" (a), "=b" (b), "=c" (c), "=d" (d) : "0" (cmd))
+
+static s32 iCpuId( u32 cmd, u32 *regs ) 
+{
+ int flag=1;
+
+#if defined (_MSC_VER) && _MSC_VER >= 1400
+
+ __cpuid( regs, cmd );
+
+ return 0;
+
+#elif defined (_MSC_VER) 
+
+#ifdef __x86_64__
+ assert(0);
+#else // __x86_64__
+ __asm 
+ {
+ push ebx;
+ push edi;
+
+ pushfd;
+ pop eax;
+ mov edx, eax;
+ xor eax, 1 << 21;
+ push eax;
+ popfd;
+ pushfd;
+ pop eax;
+ xor eax, edx;
+ mov flag, eax;
+ }
+ if ( ! flag )
+ {
+ return -1;
+ }
+
+ __asm 
+ {
+ mov eax, cmd;
+ cpuid;
+ mov edi, [regs]
+ mov [edi], eax;
+ mov [edi+4], ebx;
+ mov [edi+8], ecx;
+ mov [edi+12], edx;
+
+ pop edi;
+ pop ebx;
+ }
+#endif // __x86_64__
+ return 0;
+
+
+#else
+
+#ifndef __x86_64__
+ // see if we can use cpuid
+ __asm__ __volatile__ (
+ "sub $0x18, %%esp\n"
+ "pushf\n"
+ "pop %%eax\n"
+ "mov %%eax, %%edx\n"
+ "xor $0x200000, %%eax\n"
+ "push %%eax\n"
+ "popf\n"
+ "pushf\n"
+ "pop %%eax\n"
+ "xor %%edx, %%eax\n"
+ "mov %%eax, %0\n"
+	 "add $0x18, %%esp\n"
+ : "=r"(flag) :
+ );
+#endif
+
+ if ( !flag )
+ return -1;
+
+ cpuid(cmd, regs[0], regs[1], regs[2], regs[3]);
+ return 0;
+#endif // _MSC_VER
+}
+
+u64 GetCPUTick( void ) 
+{
+#if defined (_MSC_VER) && _MSC_VER >= 1400
+
+ return __rdtsc();
+
+#elif defined(__MSCW32__) && !defined(__x86_64__)
+
+ __asm rdtsc;
+
+#else
+
+ u32 _a, _d;
+	__asm__ __volatile__ ("rdtsc" : "=a"(_a), "=d"(_d));
+	return (u64)_a | ((u64)_d << 32);
+
+#endif
+}
+
+#if defined(__LINUX__) || defined(__APPLE__)
+
+#include <sys/time.h>
+#include <errno.h>
+//*
+unsigned long timeGetTime2()
+{
+ struct timeval tv;
+ gettimeofday(&tv, 0); // well, maybe there are better ways
+ return (unsigned long)tv.tv_sec * 1000 + tv.tv_usec/1000; // to do that, but at least it works
+}
+//*/
+#endif
+
+s64 CPUSpeedHz( unsigned int time )
+{
+ s64 timeStart, 
+ timeStop;
+ s64 startTick, 
+ endTick;
+ s64 overhead;
+
+ if( ! cpucaps.hasTimeStampCounter )
+ {
+ return 0; //check if function is supported
+ }
+
+	overhead = GetCPUTick() - GetCPUTick();
+	
+	timeStart = timeGetTime2( );
+	while( timeGetTime2( ) == timeStart ) 
+ {
+ timeStart = timeGetTime2( );
+ }
+	for(;;)
+	{
+		timeStop = timeGetTime2( );
+		if ( ( timeStop - timeStart ) > 1 )	
+		{
+			startTick = GetCPUTick( );
+			break;
+		}
+	}
+
+	timeStart = timeStop;
+	for(;;)
+	{
+		timeStop = timeGetTime2( );
+		if ( ( timeStop - timeStart ) > time )	
+		{
+			endTick = GetCPUTick( );
+			break;
+		}
+	}
+
+	return (s64)( ( endTick - startTick ) + ( overhead ) );
+}
+
+////////////////////////////////////////////////////
+void cpudetectInit( void ) 
+{
+ u32 regs[ 4 ];
+ u32 cmds;
+ u32 AMDspeed;
+ s8 AMDspeedString[10];
+ int cputype=0; // Cpu type
+ //AMD 64 STUFF
+ u32 x86_64_8BITBRANDID = 0;
+ u32 x86_64_12BITBRANDID = 0;
+ memset( cpuinfo.x86ID, 0, sizeof( cpuinfo.x86ID ) );
+ cpuinfo.x86Family = 0;
+ cpuinfo.x86Model = 0;
+ cpuinfo.x86PType = 0;
+ cpuinfo.x86StepID = 0;
+ cpuinfo.x86Flags = 0;
+ cpuinfo.x86EFlags = 0;
+ 
+ if ( iCpuId( 0, regs ) == -1 ) return;
+
+ cmds = regs[ 0 ];
+ ((u32*)cpuinfo.x86ID)[ 0 ] = regs[ 1 ];
+ ((u32*)cpuinfo.x86ID)[ 1 ] = regs[ 3 ];
+ ((u32*)cpuinfo.x86ID)[ 2 ] = regs[ 2 ];
+ if ( cmds >= 0x00000001 ) 
+ {
+ if ( iCpuId( 0x00000001, regs ) != -1 )
+ {
+ cpuinfo.x86StepID = regs[ 0 ] & 0xf;
+ cpuinfo.x86Model = (regs[ 0 ] >> 4) & 0xf;
+ cpuinfo.x86Family = (regs[ 0 ] >> 8) & 0xf;
+ cpuinfo.x86PType = (regs[ 0 ] >> 12) & 0x3;
+ x86_64_8BITBRANDID = regs[1] & 0xff;
+ cpuinfo.x86Flags = regs[ 3 ];
+ }
+ }
+ if ( iCpuId( 0x80000000, regs ) != -1 )
+ {
+ cmds = regs[ 0 ];
+ if ( cmds >= 0x80000001 ) 
+ {
+		 if ( iCpuId( 0x80000001, regs ) != -1 )
+ {
+			x86_64_12BITBRANDID = regs[1] & 0xfff;
+ cpuinfo.x86EFlags = regs[ 3 ];
+ 
+ }
+ }
+ }
+ switch(cpuinfo.x86PType)
+ {
+ case 0:
+ strcpy( cpuinfo.x86Type, "Standard OEM");
+ break;
+ case 1:
+ strcpy( cpuinfo.x86Type, "Overdrive");
+ break;
+ case 2:
+ strcpy( cpuinfo.x86Type, "Dual");
+ break;
+ case 3:
+ strcpy( cpuinfo.x86Type, "Reserved");
+ break;
+ default:
+ strcpy( cpuinfo.x86Type, "Unknown");
+ break;
+ }
+ if ( cpuinfo.x86ID[ 0 ] == 'G' ){ cputype=0;}//trick lines but if you know a way better ;p
+ if ( cpuinfo.x86ID[ 0 ] == 'A' ){ cputype=1;}
+ 
+ if ( cputype == 0 ) //intel cpu
+ {
+ if( ( cpuinfo.x86Family >= 7 ) && ( cpuinfo.x86Family < 15 ) )
+ {
+ strcpy( cpuinfo.x86Fam, "Intel P6 family (Not PIV and Higher then PPro" );
+ }
+ else
+ {
+ switch( cpuinfo.x86Family )
+ { 
+ // Start at 486 because if it's below 486 there is no cpuid instruction
+ case 4:
+ strcpy( cpuinfo.x86Fam, "Intel 486" );
+ break;
+ case 5: 
+ switch( cpuinfo.x86Model )
+ {
+ case 4:
+ case 8: // 0.25 ï¿½m
+ strcpy( cpuinfo.x86Fam, "Intel Pentium (MMX)");
+ break;
+ default:
+ strcpy( cpuinfo.x86Fam, "Intel Pentium" );
+ }
+ break;
+ case 6: 
+ switch( cpuinfo.x86Model )
+ {
+ case 0: // Pentium pro (P6 A-Step)
+ case 1: // Pentium pro
+ strcpy( cpuinfo.x86Fam, "Intel Pentium Pro" );
+ break;
+
+ case 2: // 66 MHz FSB
+ case 5: // Xeon/Celeron (0.25 ï¿½m)
+ case 6: // Internal L2 cache
+ strcpy( cpuinfo.x86Fam, "Intel Pentium II" );
+ break;
+
+ case 7: // Xeon external L2 cache
+ case 8: // Xeon/Celeron with 256 KB on-die L2 cache
+ case 10: // Xeon/Celeron with 1 or 2 MB on-die L2 cache
+ case 11: // Xeon/Celeron with Tualatin core, on-die cache
+ strcpy( cpuinfo.x86Fam, "Intel Pentium III" );
+ break;
+			 case 15: // Core 2 Duo Allendale/Conroe
+				 strcpy( cpuinfo.x86Fam, "Intel Core 2 Duo" );
+				 break;
+
+ default:
+ strcpy( cpuinfo.x86Fam, "Intel Pentium Pro (Unknown)" );
+ }
+ break;
+ case 15:
+ switch( cpuinfo.x86Model )
+ {
+ case 0: // Willamette (A-Step)
+ case 1: // Willamette 
+ strcpy( cpuinfo.x86Fam, "Willamette Intel Pentium IV" );
+ break;
+ case 2: // Northwood 
+ strcpy( cpuinfo.x86Fam, "Northwood Intel Pentium IV" );
+ break;
+
+ default:
+ strcpy( cpuinfo.x86Fam, "Intel Pentium IV (Unknown)" );
+ break;
+ }
+ break;
+ default:
+ strcpy( cpuinfo.x86Fam, "Unknown Intel CPU" );
+ }
+ }
+ }
+ else if ( cputype == 1 ) //AMD cpu
+ {
+ if( cpuinfo.x86Family >= 7 )
+ {
+		 if((x86_64_12BITBRANDID !=0) || (x86_64_8BITBRANDID !=0))
+		 {
+		 if(x86_64_8BITBRANDID == 0 )
+		 {
+ switch((x86_64_12BITBRANDID >>6)& 0x3f)
+			 {
+			 case 4:
+				 strcpy(cpuinfo.x86Fam,"AMD Athlon(tm) 64 Processor");
+ AMDspeed = 22 + (x86_64_12BITBRANDID & 0x1f);
+				 //AMDspeedString = strtol(AMDspeed, (char**)NULL,10);
+				 sprintf(AMDspeedString," %d",AMDspeed);
+				 strcat(AMDspeedString,"00+");
+				 strcat(cpuinfo.x86Fam,AMDspeedString);
+				 break;
+			 case 12: 
+				 strcpy(cpuinfo.x86Fam,"AMD Opteron(tm) Processor");
+				 break;
+			 case 5:
+				 strcpy( cpuinfo.x86Fam, "AMD Athlon X2 Processor" );
+				 AMDspeed = 22 + (x86_64_12BITBRANDID & 0x1f);
+				 //AMDspeedString = strtol(AMDspeed, (char**)NULL,10);
+				 sprintf(AMDspeedString," %d",AMDspeed);
+				 strcat(AMDspeedString,"00+");
+				 strcat(cpuinfo.x86Fam,AMDspeedString);
+ break;
+			 case 44:
+				 strcpy( cpuinfo.x86Fam, "AMD Opteron(tm) Dual Core Processor" );
+ break;
+			 default:
+				 strcpy(cpuinfo.x86Fam,"Unknown AMD 64 proccesor");
+				 
+			 }
+		 }
+		 else //8bit brand id is non zero
+		 {
+ strcpy(cpuinfo.x86Fam,"Unsupported yet AMD64 cpu");
+		 }
+		 }
+		 else
+		 {		 
+			 strcpy( cpuinfo.x86Fam, "AMD K7+ Processor" );
+		 }
+ }
+ else
+ {
+ switch ( cpuinfo.x86Family )
+ {
+ case 4:
+ switch( cpuinfo.x86Model )
+ {
+ case 14: 
+ case 15: // Write-back enhanced
+ strcpy( cpuinfo.x86Fam, "AMD 5x86 Processor" );
+ break;
+
+ case 3: // DX2
+ case 7: // Write-back enhanced DX2
+ case 8: // DX4
+ case 9: // Write-back enhanced DX4
+ strcpy( cpuinfo.x86Fam, "AMD 486 Processor" );
+ break;
+			 			 
+
+ default:
+ strcpy( cpuinfo.x86Fam, "AMD Unknown Processor" );
+
+ }
+ break;
+
+ case 5: 
+ switch( cpuinfo.x86Model)
+ {
+ case 0: // SSA 5 (75, 90 and 100 Mhz)
+ case 1: // 5k86 (PR 120 and 133 MHz)
+ case 2: // 5k86 (PR 166 MHz)
+ case 3: // K5 5k86 (PR 200 MHz)
+ strcpy( cpuinfo.x86Fam, "AMD K5 Processor" );
+ break;
+
+ case 6: 
+ case 7: // (0.25 ï¿½m)
+ case 8: // K6-2
+ case 9: // K6-III
+ case 14: // K6-2+ / K6-III+
+ strcpy( cpuinfo.x86Fam, "AMD K6 Series Processor" );
+ break;
+
+ default:
+ strcpy( cpuinfo.x86Fam, "AMD Unknown Processor" );
+ }
+ break;
+ case 6: 
+ strcpy( cpuinfo.x86Fam, "AMD Athlon XP Processor" );
+ break;
+ default:
+ strcpy( cpuinfo.x86Fam, "Unknown AMD CPU" ); 
+ }
+ }
+ }
+ //capabilities
+ cpucaps.hasFloatingPointUnit = ( cpuinfo.x86Flags >> 0 ) & 1;
+ cpucaps.hasVirtual8086ModeEnhancements = ( cpuinfo.x86Flags >> 1 ) & 1;
+ cpucaps.hasDebuggingExtensions = ( cpuinfo.x86Flags >> 2 ) & 1;
+ cpucaps.hasPageSizeExtensions = ( cpuinfo.x86Flags >> 3 ) & 1;
+ cpucaps.hasTimeStampCounter = ( cpuinfo.x86Flags >> 4 ) & 1;
+ cpucaps.hasModelSpecificRegisters = ( cpuinfo.x86Flags >> 5 ) & 1;
+ cpucaps.hasPhysicalAddressExtension = ( cpuinfo.x86Flags >> 6 ) & 1;
+ cpucaps.hasMachineCheckArchitecture = ( cpuinfo.x86Flags >> 7 ) & 1;
+ cpucaps.hasCOMPXCHG8BInstruction = ( cpuinfo.x86Flags >> 8 ) & 1;
+ cpucaps.hasAdvancedProgrammableInterruptController = ( cpuinfo.x86Flags >> 9 ) & 1;
+ cpucaps.hasSEPFastSystemCall = ( cpuinfo.x86Flags >> 11 ) & 1;
+ cpucaps.hasMemoryTypeRangeRegisters = ( cpuinfo.x86Flags >> 12 ) & 1;
+ cpucaps.hasPTEGlobalFlag = ( cpuinfo.x86Flags >> 13 ) & 1;
+ cpucaps.hasMachineCheckArchitecture = ( cpuinfo.x86Flags >> 14 ) & 1;
+ cpucaps.hasConditionalMoveAndCompareInstructions = ( cpuinfo.x86Flags >> 15 ) & 1;
+ cpucaps.hasFGPageAttributeTable = ( cpuinfo.x86Flags >> 16 ) & 1;
+ cpucaps.has36bitPageSizeExtension = ( cpuinfo.x86Flags >> 17 ) & 1;
+ cpucaps.hasProcessorSerialNumber = ( cpuinfo.x86Flags >> 18 ) & 1;
+ cpucaps.hasCFLUSHInstruction = ( cpuinfo.x86Flags >> 19 ) & 1;
+ cpucaps.hasDebugStore = ( cpuinfo.x86Flags >> 21 ) & 1;
+ cpucaps.hasACPIThermalMonitorAndClockControl = ( cpuinfo.x86Flags >> 22 ) & 1;
+ cpucaps.hasMultimediaExtensions = ( cpuinfo.x86Flags >> 23 ) & 1; //mmx
+ cpucaps.hasFastStreamingSIMDExtensionsSaveRestore = ( cpuinfo.x86Flags >> 24 ) & 1;
+ cpucaps.hasStreamingSIMDExtensions = ( cpuinfo.x86Flags >> 25 ) & 1; //sse
+ cpucaps.hasStreamingSIMD2Extensions = ( cpuinfo.x86Flags >> 26 ) & 1; //sse2
+ cpucaps.hasSelfSnoop = ( cpuinfo.x86Flags >> 27 ) & 1;
+ cpucaps.hasHyperThreading = ( cpuinfo.x86Flags >> 28 ) & 1;
+ cpucaps.hasThermalMonitor = ( cpuinfo.x86Flags >> 29 ) & 1;
+ cpucaps.hasIntel64BitArchitecture = ( cpuinfo.x86Flags >> 30 ) & 1;
+ //that is only for AMDs
+ cpucaps.hasMultimediaExtensionsExt = ( cpuinfo.x86EFlags >> 22 ) & 1; //mmx2
+ cpucaps.hasAMD64BitArchitecture = ( cpuinfo.x86EFlags >> 29 ) & 1; //64bit cpu
+ cpucaps.has3DNOWInstructionExtensionsExt = ( cpuinfo.x86EFlags >> 30 ) & 1; //3dnow+
+ cpucaps.has3DNOWInstructionExtensions = ( cpuinfo.x86EFlags >> 31 ) & 1; //3dnow 
+ cpuinfo.cpuspeed = (u32 )(CPUSpeedHz( 1000 ) / 1000000);
+}
+
+#endif

pcsxr-1.9.92.tar.bz2/libpcsxcore/ix86_64/ix86_fpu.c -> pcsxr-1.9.93.tar.bz2/libpcsxcore/ix86_64/ix86_fpu.c Changed

pcsxr-1.9.92.tar.bz2/libpcsxcore/ix86_64/ix86_mmx.c -> pcsxr-1.9.93.tar.bz2/libpcsxcore/ix86_64/ix86_mmx.c Changed

pcsxr-1.9.92.tar.bz2/libpcsxcore/ix86_64/ix86_sse.c -> pcsxr-1.9.93.tar.bz2/libpcsxcore/ix86_64/ix86_sse.c Changed

pcsxr-1.9.92.tar.bz2/libpcsxcore/mdec.c -> pcsxr-1.9.93.tar.bz2/libpcsxcore/mdec.c Changed

@@ -15,11 +15,25 @@
 * You should have received a copy of the GNU General Public License *
 * along with this program; if not, write to the *
 * Free Software Foundation, Inc., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
 ***************************************************************************/
 
 #include "mdec.h"
 
+/* memory speed is 1 byte per MDEC_BIAS psx clock
+ * That mean (PSXCLK / MDEC_BIAS) B/s
+ * MDEC_BIAS = 2.0 => ~16MB/s
+ * MDEC_BIAS = 3.0 => ~11MB/s
+ * and so on ...
+ * I guess I have 50 images in 50Hz ... (could be 25 images ?)
+ * 320x240x24@50Hz => 11.52 MB/s
+ * 320x240x24@60Hz => 13.824 MB/s
+ * 320x240x16@50Hz => 7.68 MB/s
+ * 320x240x16@60Hz => 9.216 MB/s
+ * so 2.0 to 4.0 should be fine.
+ */
+#define MDEC_BIAS 2.0f
+
 #define DSIZE			8
 #define DSIZE2			(DSIZE * DSIZE)
 
@@ -189,7 +203,7 @@
 // mdec0: command register
 #define MDEC0_STP			0x02000000
 #define MDEC0_RGB24			0x08000000
-#define MDEC0_SIZE_MASK		0xFFFF
+#define MDEC0_SIZE_MASK		0x0000FFFF
 
 // mdec1: status register
 #define MDEC1_BUSY			0x20000000
@@ -199,11 +213,20 @@
 #define MDEC1_STP			0x00800000
 #define MDEC1_RESET			0x80000000
 
-struct {
- u32 reg0;
- u32 reg1;
- unsigned short *rl;
- int rlsize;
+struct _pending_dma1 {
+	u32 adr;
+	u32 bcr;
+	u32 chcr;
+};
+
+static struct {
+	u32 reg0;
+	u32 reg1;
+	u16 * rl;
+	u16 * rl_end;
+	u8 * block_buffer_pos;
+	u8 block_buffer[16*16*3];
+	struct _pending_dma1 pending_dma1;
 } mdec;
 
 static int iq_y[DSIZE2], iq_uv[DSIZE2];
@@ -301,7 +324,7 @@
 #define CLAMP_SCALE8(a) (CLAMP8(SCALE8(a)))
 #define CLAMP_SCALE5(a) (CLAMP5(SCALE5(a)))
 
-static inline void putlinebw15(unsigned short *image, int *Yblk) {
+static inline void putlinebw15(u16 *image, int *Yblk) {
 	int i;
 	int A = (mdec.reg0 & MDEC0_STP) ? 0x8000 : 0;
 
@@ -312,7 +335,7 @@
 	}
 }
 
-static void putquadrgb15(unsigned short *image, int *Yblk, int Cr, int Cb) {
+static inline void putquadrgb15(u16 *image, int *Yblk, int Cr, int Cb) {
 	int Y, R, G, B;
 	int A = (mdec.reg0 & MDEC0_STP) ? 0x8000 : 0;
 	R = MULR(Cr);
@@ -330,7 +353,7 @@
 	image[17] = MAKERGB15(CLAMP_SCALE5(Y + R), CLAMP_SCALE5(Y + G), CLAMP_SCALE5(Y + B), A);
 }
 
-static void yuv2rgb15(int *blk, unsigned short *image) {
+static inline void yuv2rgb15(int *blk, unsigned short *image) {
 	int x, y;
 	int *Yblk = blk + DSIZE2 * 2;
 	int *Crblk = blk;
@@ -353,7 +376,7 @@
 	}
 }
 
-static inline void putlinebw24(unsigned char *image, int *Yblk) {
+static inline void putlinebw24(u8 * image, int *Yblk) {
 	int i;
 	unsigned char Y;
 	for (i = 0; i < 8 * 3; i += 3, Yblk++) {
@@ -364,7 +387,7 @@
 	}
 }
 
-static void putquadrgb24(unsigned char *image, int *Yblk, int Cr, int Cb) {
+static inline void putquadrgb24(u8 * image, int *Yblk, int Cr, int Cb) {
 	int Y, R, G, B;
 
 	R = MULR(Cr);
@@ -389,14 +412,14 @@
 	image[17 * 3 + 2] = CLAMP_SCALE8(Y + B);
 }
 
-static void yuv2rgb24(int *blk, unsigned char *image) {
+static void yuv2rgb24(int *blk, u8 *image) {
 	int x, y;
 	int *Yblk = blk + DSIZE2 * 2;
 	int *Crblk = blk;
 	int *Cbblk = blk + DSIZE2;
 
 	if (!Config.Mdec) {
-		for (y = 0; y < 16; y += 2, Crblk += 4, Cbblk += 4, Yblk += 8, image += 24 * 3) {
+		for (y = 0; y < 16; y += 2, Crblk += 4, Cbblk += 4, Yblk += 8, image += 8 * 3 * 3) {
 			if (y == 8) Yblk += DSIZE2;
 			for (x = 0; x < 4; x++, image += 6, Crblk++, Cbblk++, Yblk += 2) {
 				putquadrgb24(image, Yblk, *Crblk, *Cbblk);
@@ -413,68 +436,70 @@
 }
 
 void mdecInit(void) {
+	memset(&mdec, 0, sizeof(mdec));
+	memset(iq_y, 0, sizeof(iq_y));
+	memset(iq_uv, 0, sizeof(iq_uv));
 	mdec.rl = (u16 *)&psxM[0x100000];
-	mdec.reg0 = 0;
-	mdec.reg1 = 0;
 }
 
 // command register
 void mdecWrite0(u32 data) {
-#ifdef CDR_LOG
-	CDR_LOG("mdec0 write %08x\n", data);
-#endif
 	mdec.reg0 = data;
 }
 
 u32 mdecRead0(void) {
-#ifdef CDR_LOG
-	CDR_LOG("mdec0 read %08x\n", mdec.reg0);
-#endif
-	// mame is returning 0
 	return mdec.reg0;
 }
 
 // status register
 void mdecWrite1(u32 data) {
-#ifdef CDR_LOG
-	CDR_LOG("mdec1 write %08x\n", data);
-#endif
 	if (data & MDEC1_RESET) { // mdec reset
 		mdec.reg0 = 0;
 		mdec.reg1 = 0;
+		mdec.pending_dma1.adr = 0;
+		mdec.block_buffer_pos = 0;
 	}
 }
 
 u32 mdecRead1(void) {
 	u32 v = mdec.reg1;
-	v |= (mdec.reg0 & MDEC0_STP) ? MDEC1_STP : 0;
-	v |= (mdec.reg0 & MDEC0_RGB24) ? MDEC1_RGB24 : 0;
-#ifdef CDR_LOG
-	CDR_LOG("mdec1 read %08x\n", v);
-#endif
 	return v;
 }
 
 void psxDma0(u32 adr, u32 bcr, u32 chcr) {
 	int cmd = mdec.reg0;
 	int size;
-	
-#ifdef CDR_LOG
-	CDR_LOG("DMA0 %08x %08x %08x\n", adr, bcr, chcr);
-#endif
 
 	if (chcr != 0x01000201) {
-		// printf("chcr != 0x01000201\n");
 		return;
 	}
 
+	/* mdec is STP till dma0 is released */
+	mdec.reg1 |= MDEC1_STP;
+
 	size = (bcr >> 16) * (bcr & 0xffff);
 
 	switch (cmd >> 28) {
 		case 0x3: // decode
-			mdec.rl = (u16 *)PSXM(adr);
-			mdec.rlsize = mdec.reg0 & MDEC0_SIZE_MASK;
-			break;
+			mdec.rl = (u16 *) PSXM(adr);
+			/* now the mdec is busy till all data are decoded */
+			mdec.reg1 |= MDEC1_BUSY;
+			/* detect the end of decoding */
+			mdec.rl_end = mdec.rl + (size * 2);
+
+			/* sanity check */
+			if(mdec.rl_end <= mdec.rl) {
+				MDECINDMA_INT( size / 4 );
+				return;
+			}
+
+			/* process the pending dma1 */
+			if(mdec.pending_dma1.adr){
+				psxDma1(mdec.pending_dma1.adr, mdec.pending_dma1.bcr, mdec.pending_dma1.chcr);
+			}
+			mdec.pending_dma1.adr = 0;
+			return;
+			
 
 		case 0x4: // quantization table upload
 			{
@@ -485,11 +510,15 @@
 				iqtab_init(iq_y, p);
 				iqtab_init(iq_uv, p + 64);
 			}
-			break;
+
+			MDECINDMA_INT( size / 4 );
+ return;
 
 		case 0x6: // cosine table
 			// printf("mdec cosine table\n");
-			break;
+
+			MDECINDMA_INT( size / 4 );
+ return;
 
 		default:
 			// printf("mdec unknown command\n");
@@ -500,64 +529,171 @@
 	DMA_INTERRUPT(0);
 }
 
+void mdec0Interrupt()
+{
+	HW_DMA0_CHCR &= SWAP32(~0x01000000);
+	DMA_INTERRUPT(0);
+}
+
+#define SIZE_OF_24B_BLOCK (16*16*3)
+#define SIZE_OF_16B_BLOCK (16*16*2)
+
 void psxDma1(u32 adr, u32 bcr, u32 chcr) {
 	int blk[DSIZE2 * 6];
-	unsigned short *image;
+	u8 * image;
 	int size;
-
-#ifdef CDR_LOG
-	CDR_LOG("DMA1 %08x %08x %08x (cmd = %08x)\n", adr, bcr, chcr, mdec.reg0);
-#endif
+	int dmacnt;
 
 	if (chcr != 0x01000200) return;
 
 	size = (bcr >> 16) * (bcr & 0xffff);
+	/* size in byte */
+	size *= 4;
+	/* I guess the memory speed is limitating */
+	dmacnt = size;
+
+	if (!(mdec.reg1 & MDEC1_BUSY)) {
+		/* add to pending */
+		mdec.pending_dma1.adr = adr;
+		mdec.pending_dma1.bcr = bcr;
+		mdec.pending_dma1.chcr = chcr;
+		/* do not free the dma */
+	} else {
 
-	image = (u16 *)PSXM(adr);
+	image = (u8 *)PSXM(adr);
+
+	if (mdec.reg0 & MDEC0_RGB24) {
+		/* 16 bits decoding
+		 * block are 16 px * 16 px, each px are 2 byte
+		 */
+
+		/* there is some partial block pending ? */
+		if(mdec.block_buffer_pos != 0) {
+			int n = mdec.block_buffer - mdec.block_buffer_pos + SIZE_OF_16B_BLOCK;
+			/* TODO: check if partial block do not larger than size */
+			memcpy(image, mdec.block_buffer_pos, n);
+			image += n;
+			size -= n;
+			mdec.block_buffer_pos = 0;
+		}
 
-	if (mdec.reg0 & MDEC0_RGB24) { // 15-b decoding
-		// MDECOUTDMA_INT(((size * (1000000 / 9000)) / 4) /** 4*/);
-		MDECOUTDMA_INT(size / 4);
-		size = size / ((16 * 16) / 2);
-		for (; size > 0; size--, image += (16 * 16)) {
+		while(size >= SIZE_OF_16B_BLOCK) {
 			mdec.rl = rl2blk(blk, mdec.rl);
-			yuv2rgb15(blk, image);
+			yuv2rgb15(blk, (u16 *)image);
+			image += SIZE_OF_16B_BLOCK;
+			size -= SIZE_OF_16B_BLOCK;
 		}
-	} else { // 24-b decoding
-		// MDECOUTDMA_INT(((size * (1000000 / 9000)) / 4) /** 4*/);
-		MDECOUTDMA_INT(size / 4);
-		size = size / ((24 * 16) / 2);
-		for (; size > 0; size--, image += (24 * 16)) {
+
+		if(size != 0) {
 			mdec.rl = rl2blk(blk, mdec.rl);
-			yuv2rgb24(blk, (u8 *)image);
+			yuv2rgb15(blk, (u16 *)mdec.block_buffer);
+			memcpy(image, mdec.block_buffer, size);
+			mdec.block_buffer_pos = mdec.block_buffer + size;
+		}
+
+	} else {
+		/* 24 bits decoding
+		 * block are 16 px * 16 px, each px are 3 byte
+		 */
+
+		/* there is some partial block pending ? */
+		if(mdec.block_buffer_pos != 0) {
+			int n = mdec.block_buffer - mdec.block_buffer_pos + SIZE_OF_24B_BLOCK;
+			/* TODO: check if partial block do not larger than size */
+			memcpy(image, mdec.block_buffer_pos, n);
+			image += n;
+			size -= n;
+			mdec.block_buffer_pos = 0;
+		}
+
+		while(size >= SIZE_OF_24B_BLOCK) {
+			mdec.rl = rl2blk(blk, mdec.rl);
+			yuv2rgb24(blk, image);
+			image += SIZE_OF_24B_BLOCK;
+			size -= SIZE_OF_24B_BLOCK;
 		}
-	}
 
-	mdec.reg1 |= MDEC1_BUSY;
+		if(size != 0) {
+			mdec.rl = rl2blk(blk, mdec.rl);
+			yuv2rgb24(blk, mdec.block_buffer);
+			memcpy(image, mdec.block_buffer, size);
+			mdec.block_buffer_pos = mdec.block_buffer + size;
+		}
+	}
+	
+	/* define the power of mdec */
+	MDECOUTDMA_INT((int) ((dmacnt* MDEC_BIAS)));
+	}
 }
 
 void mdec1Interrupt() {
-#ifdef CDR_LOG
-	CDR_LOG("mdec1Interrupt\n");
-#endif
-	if (HW_DMA1_CHCR & SWAP32(0x01000000)) {
-		// Set a fixed value totaly arbitrarie another sound value is
-		// PSXCLK / 60 or PSXCLK / 50 since the bug happened at end of frame.
-		// PSXCLK / 1000 seems good for FF9. (for FF9 need < ~28000)
-		// CAUTION: commented interrupt-handling may lead to problems, keep an eye ;-)
-		MDECOUTDMA_INT(PSXCLK / 1000 * BIAS);
-//		psxRegs.interrupt |= 0x02000000;
-//		psxRegs.intCycle[5 + 24 + 1] *= 8;
-//		psxRegs.intCycle[5 + 24] = psxRegs.cycle;
-		HW_DMA1_CHCR &= SWAP32(~0x01000000);
-		DMA_INTERRUPT(1);
-	} else {
+	/* Author : gschwind
+	 *
+	 * in that case we have done all decoding stuff
+	 * Note that : each block end with 0xfe00 flags
+	 * the list of blocks end with the same 0xfe00 flags
+	 * data loock like :
+	 *
+	 * data block ...
+	 * 0xfe00
+	 * data block ...
+	 * 0xfe00
+	 * a lost of block ..
+	 *
+	 * 0xfe00
+	 * the last block
+	 * 0xfe00
+	 * 0xfe00
+	 *
+	 * OR
+	 *
+	 * if the 0xfe00 is not present the data size is important.
+	 *
+	 */
+
+	/* this else if avoid to read outside memory */
+	if(mdec.rl >= mdec.rl_end) {
+		mdec.reg1 &= ~MDEC1_STP;
+		HW_DMA0_CHCR &= SWAP32(~0x01000000);
+		DMA_INTERRUPT(0);
+		mdec.reg1 &= ~MDEC1_BUSY;
+	} else if (SWAP16(*(mdec.rl)) == MDEC_END_OF_DATA) {
+		mdec.reg1 &= ~MDEC1_STP;
+		HW_DMA0_CHCR &= SWAP32(~0x01000000);
+		DMA_INTERRUPT(0);
 		mdec.reg1 &= ~MDEC1_BUSY;
 	}
+
+	HW_DMA1_CHCR &= SWAP32(~0x01000000);
+	DMA_INTERRUPT(1);
+	return;
 }
 
 int mdecFreeze(gzFile f, int Mode) {
-	gzfreeze(&mdec, sizeof(mdec));
+	u8 *base = (u8 *)&psxM[0x100000];
+	u32 v;
+
+	gzfreeze(&mdec.reg0, sizeof(mdec.reg0));
+	gzfreeze(&mdec.reg1, sizeof(mdec.reg1));
+
+	// old code used to save raw pointers..
+	v = (u8 *)mdec.rl - base;
+	gzfreeze(&v, sizeof(v));
+	mdec.rl = (u16 *)(base + (v & 0xffffe));
+	v = (u8 *)mdec.rl_end - base;
+	gzfreeze(&v, sizeof(v));
+	mdec.rl_end = (u16 *)(base + (v & 0xffffe));
+
+	v = 0;
+	if (mdec.block_buffer_pos)
+		v = mdec.block_buffer_pos - base;
+	gzfreeze(&v, sizeof(v));
+	mdec.block_buffer_pos = 0;
+	if (v)
+		mdec.block_buffer_pos = base + (v & 0xfffff);
+
+	gzfreeze(&mdec.block_buffer, sizeof(mdec.block_buffer));
+	gzfreeze(&mdec.pending_dma1, sizeof(mdec.pending_dma1));
 	gzfreeze(iq_y, sizeof(iq_y));
 	gzfreeze(iq_uv, sizeof(iq_uv));

pcsxr-1.9.92.tar.bz2/libpcsxcore/mdec.h -> pcsxr-1.9.93.tar.bz2/libpcsxcore/mdec.h Changed

pcsxr-1.9.92.tar.bz2/libpcsxcore/misc.c -> pcsxr-1.9.93.tar.bz2/libpcsxcore/misc.c Changed

pcsxr-1.9.92.tar.bz2/libpcsxcore/misc.h -> pcsxr-1.9.93.tar.bz2/libpcsxcore/misc.h Changed

pcsxr-1.9.92.tar.bz2/libpcsxcore/plugins.c -> pcsxr-1.9.93.tar.bz2/libpcsxcore/plugins.c Changed

@@ -1,815 +1,846 @@
-/***************************************************************************
- * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program; if not, write to the *
- * Free Software Foundation, Inc., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
- ***************************************************************************/
-
-/*
-* Plugin library callback/access functions.
-*/
-
-#include "plugins.h"
-#include "cdriso.h"
-
-static char IsoFile[MAXPATHLEN] = "";
-static s64 cdOpenCaseTime = 0;
-
-GPUupdateLace GPU_updateLace;
-GPUinit GPU_init;
-GPUshutdown GPU_shutdown; 
-GPUconfigure GPU_configure;
-GPUtest GPU_test;
-GPUabout GPU_about;
-GPUopen GPU_open;
-GPUclose GPU_close;
-GPUreadStatus GPU_readStatus;
-GPUreadData GPU_readData;
-GPUreadDataMem GPU_readDataMem;
-GPUwriteStatus GPU_writeStatus; 
-GPUwriteData GPU_writeData;
-GPUwriteDataMem GPU_writeDataMem;
-GPUdmaChain GPU_dmaChain;
-GPUkeypressed GPU_keypressed;
-GPUdisplayText GPU_displayText;
-GPUmakeSnapshot GPU_makeSnapshot;
-GPUfreeze GPU_freeze;
-GPUgetScreenPic GPU_getScreenPic;
-GPUshowScreenPic GPU_showScreenPic;
-GPUclearDynarec GPU_clearDynarec;
-GPUvBlank GPU_vBlank;
-
-CDRinit CDR_init;
-CDRshutdown CDR_shutdown;
-CDRopen CDR_open;
-CDRclose CDR_close; 
-CDRtest CDR_test;
-CDRgetTN CDR_getTN;
-CDRgetTD CDR_getTD;
-CDRreadTrack CDR_readTrack;
-CDRgetBuffer CDR_getBuffer;
-CDRplay CDR_play;
-CDRstop CDR_stop;
-CDRgetStatus CDR_getStatus;
-CDRgetDriveLetter CDR_getDriveLetter;
-CDRgetBufferSub CDR_getBufferSub;
-CDRconfigure CDR_configure;
-CDRabout CDR_about;
-CDRsetfilename CDR_setfilename;
-CDRreadCDDA CDR_readCDDA;
-CDRgetTE CDR_getTE;
-
-SPUconfigure SPU_configure;
-SPUabout SPU_about;
-SPUinit SPU_init;
-SPUshutdown SPU_shutdown;
-SPUtest SPU_test;
-SPUopen SPU_open;
-SPUclose SPU_close;
-SPUplaySample SPU_playSample;
-SPUwriteRegister SPU_writeRegister;
-SPUreadRegister SPU_readRegister;
-SPUwriteDMA SPU_writeDMA;
-SPUreadDMA SPU_readDMA;
-SPUwriteDMAMem SPU_writeDMAMem;
-SPUreadDMAMem SPU_readDMAMem;
-SPUplayADPCMchannel SPU_playADPCMchannel;
-SPUfreeze SPU_freeze;
-SPUregisterCallback SPU_registerCallback;
-SPUasync SPU_async;
-SPUplayCDDAchannel SPU_playCDDAchannel;
-
-PADconfigure PAD1_configure;
-PADabout PAD1_about;
-PADinit PAD1_init;
-PADshutdown PAD1_shutdown;
-PADtest PAD1_test;
-PADopen PAD1_open;
-PADclose PAD1_close;
-PADquery PAD1_query;
-PADreadPort1 PAD1_readPort1;
-PADkeypressed PAD1_keypressed;
-PADstartPoll PAD1_startPoll;
-PADpoll PAD1_poll;
-PADsetSensitive PAD1_setSensitive;
-
-PADconfigure PAD2_configure;
-PADabout PAD2_about;
-PADinit PAD2_init;
-PADshutdown PAD2_shutdown;
-PADtest PAD2_test;
-PADopen PAD2_open;
-PADclose PAD2_close;
-PADquery PAD2_query;
-PADreadPort2 PAD2_readPort2;
-PADkeypressed PAD2_keypressed;
-PADstartPoll PAD2_startPoll;
-PADpoll PAD2_poll;
-PADsetSensitive PAD2_setSensitive;
-
-NETinit NET_init;
-NETshutdown NET_shutdown;
-NETopen NET_open;
-NETclose NET_close; 
-NETtest NET_test;
-NETconfigure NET_configure;
-NETabout NET_about;
-NETpause NET_pause;
-NETresume NET_resume;
-NETqueryPlayer NET_queryPlayer;
-NETsendData NET_sendData;
-NETrecvData NET_recvData;
-NETsendPadData NET_sendPadData;
-NETrecvPadData NET_recvPadData;
-NETsetInfo NET_setInfo;
-NETkeypressed NET_keypressed;
-
-#ifdef ENABLE_SIO1API
-
-SIO1init SIO1_init;
-SIO1shutdown SIO1_shutdown;
-SIO1open SIO1_open;
-SIO1close SIO1_close; 
-SIO1test SIO1_test;
-SIO1configure SIO1_configure;
-SIO1about SIO1_about;
-SIO1pause SIO1_pause;
-SIO1resume SIO1_resume;
-SIO1keypressed SIO1_keypressed;
-SIO1writeData8 SIO1_writeData8;
-SIO1writeData16 SIO1_writeData16;
-SIO1writeData32 SIO1_writeData32;
-SIO1writeStat16 SIO1_writeStat16;
-SIO1writeStat32 SIO1_writeStat32;
-SIO1writeMode16 SIO1_writeMode16;
-SIO1writeMode32 SIO1_writeMode32;
-SIO1writeCtrl16 SIO1_writeCtrl16;
-SIO1writeCtrl32 SIO1_writeCtrl32;
-SIO1writeBaud16 SIO1_writeBaud16;
-SIO1writeBaud32 SIO1_writeBaud32;
-SIO1readData8 SIO1_readData8;
-SIO1readData16 SIO1_readData16;
-SIO1readData32 SIO1_readData32;
-SIO1readStat16 SIO1_readStat16;
-SIO1readStat32 SIO1_readStat32;
-SIO1readMode16 SIO1_readMode16;
-SIO1readMode32 SIO1_readMode32;
-SIO1readCtrl16 SIO1_readCtrl16;
-SIO1readCtrl32 SIO1_readCtrl32;
-SIO1readBaud16 SIO1_readBaud16;
-SIO1readBaud32 SIO1_readBaud32;
-SIO1registerCallback SIO1_registerCallback;
-
-#endif
-
-static const char *err;
-
-#define CheckErr(func) { \
-	err = SysLibError(); \
-	if (err != NULL) { SysMessage(_("Error loading %s: %s"), func, err); return -1; } \
-}
-
-#define LoadSym(dest, src, name, checkerr) { \
-	dest = (src)SysLoadSym(drv, name); \
-	if (checkerr) { CheckErr(name); } else SysLibError(); \
-}
-
-void *hGPUDriver = NULL;
-
-void CALLBACK GPU__displayText(char *pText) {
-	SysPrintf("%s\n", pText);
-}
-
-long CALLBACK GPU__configure(void) { return 0; }
-long CALLBACK GPU__test(void) { return 0; }
-void CALLBACK GPU__about(void) {}
-void CALLBACK GPU__makeSnapshot(void) {}
-void CALLBACK GPU__keypressed(int key) {}
-long CALLBACK GPU__getScreenPic(unsigned char *pMem) { return -1; }
-long CALLBACK GPU__showScreenPic(unsigned char *pMem) { return -1; }
-void CALLBACK GPU__clearDynarec(void (CALLBACK *callback)(void)) {}
-void CALLBACK GPU__vBlank(int val) {}
-
-#define LoadGpuSym1(dest, name) \
-	LoadSym(GPU_##dest, GPU##dest, name, TRUE);
-
-#define LoadGpuSym0(dest, name) \
-	LoadSym(GPU_##dest, GPU##dest, name, FALSE); \
-	if (GPU_##dest == NULL) GPU_##dest = (GPU##dest) GPU__##dest;
-
-#define LoadGpuSymN(dest, name) \
-	LoadSym(GPU_##dest, GPU##dest, name, FALSE);
-
-static int LoadGPUplugin(const char *GPUdll) {
-	void *drv;
-
-	hGPUDriver = SysLoadLibrary(GPUdll);
-	if (hGPUDriver == NULL) { 
-		GPU_configure = NULL;
-		SysMessage (_("Could not load GPU plugin %s!"), GPUdll); return -1; 
-	}
-	drv = hGPUDriver;
-	LoadGpuSym1(init, "GPUinit");
-	LoadGpuSym1(shutdown, "GPUshutdown");
-	LoadGpuSym1(open, "GPUopen");
-	LoadGpuSym1(close, "GPUclose");
-	LoadGpuSym1(readData, "GPUreadData");
-	LoadGpuSym1(readDataMem, "GPUreadDataMem");
-	LoadGpuSym1(readStatus, "GPUreadStatus");
-	LoadGpuSym1(writeData, "GPUwriteData");
-	LoadGpuSym1(writeDataMem, "GPUwriteDataMem");
-	LoadGpuSym1(writeStatus, "GPUwriteStatus");
-	LoadGpuSym1(dmaChain, "GPUdmaChain");
-	LoadGpuSym1(updateLace, "GPUupdateLace");
-	LoadGpuSym0(keypressed, "GPUkeypressed");
-	LoadGpuSym0(displayText, "GPUdisplayText");
-	LoadGpuSym0(makeSnapshot, "GPUmakeSnapshot");
-	LoadGpuSym1(freeze, "GPUfreeze");
-	LoadGpuSym0(getScreenPic, "GPUgetScreenPic");
-	LoadGpuSym0(showScreenPic, "GPUshowScreenPic");
-	LoadGpuSym0(clearDynarec, "GPUclearDynarec");
- LoadGpuSym0(vBlank, "GPUvBlank");
-	LoadGpuSym0(configure, "GPUconfigure");
-	LoadGpuSym0(test, "GPUtest");
-	LoadGpuSym0(about, "GPUabout");
-
-	return 0;
-}
-
-void *hCDRDriver = NULL;
-
-long CALLBACK CDR__play(unsigned char *sector) { return 0; }
-long CALLBACK CDR__stop(void) { return 0; }
-
-long CALLBACK CDR__getStatus(struct CdrStat *stat) {
-	if (cdOpenCaseTime < 0 || cdOpenCaseTime > (s64)time(NULL))
-		stat->Status = 0x10;
-	else
-		stat->Status = 0;
-
-	return 0;
-}
-
-char* CALLBACK CDR__getDriveLetter(void) { return NULL; }
-long CALLBACK CDR__configure(void) { return 0; }
-long CALLBACK CDR__test(void) { return 0; }
-void CALLBACK CDR__about(void) {}
-long CALLBACK CDR__setfilename(char*filename) { return 0; }
-
-#define LoadCdrSym1(dest, name) \
-	LoadSym(CDR_##dest, CDR##dest, name, TRUE);
-
-#define LoadCdrSym0(dest, name) \
-	LoadSym(CDR_##dest, CDR##dest, name, FALSE); \
-	if (CDR_##dest == NULL) CDR_##dest = (CDR##dest) CDR__##dest;
-
-#define LoadCdrSymN(dest, name) \
-	LoadSym(CDR_##dest, CDR##dest, name, FALSE);
-
-static int LoadCDRplugin(const char *CDRdll) {
-	void *drv;
-
-	if (CDRdll == NULL) {
-		cdrIsoInit();
-		return 0;
-	}
-
-	hCDRDriver = SysLoadLibrary(CDRdll);
-	if (hCDRDriver == NULL) {
-		CDR_configure = NULL;
-		SysMessage (_("Could not load CD-ROM plugin %s!"), CDRdll); return -1;
-	}
-	drv = hCDRDriver;
-	LoadCdrSym1(init, "CDRinit");
-	LoadCdrSym1(shutdown, "CDRshutdown");
-	LoadCdrSym1(open, "CDRopen");
-	LoadCdrSym1(close, "CDRclose");
-	LoadCdrSym1(getTN, "CDRgetTN");
-	LoadCdrSym1(getTD, "CDRgetTD");
-	LoadCdrSym1(readTrack, "CDRreadTrack");
-	LoadCdrSym1(getBuffer, "CDRgetBuffer");
-	LoadCdrSym1(getBufferSub, "CDRgetBufferSub");
-	LoadCdrSym0(play, "CDRplay");
-	LoadCdrSym0(stop, "CDRstop");
-	LoadCdrSym0(getStatus, "CDRgetStatus");
-	LoadCdrSym0(getDriveLetter, "CDRgetDriveLetter");
-	LoadCdrSym0(configure, "CDRconfigure");
-	LoadCdrSym0(test, "CDRtest");
-	LoadCdrSym0(about, "CDRabout");
-	LoadCdrSym0(setfilename, "CDRsetfilename");
-	LoadCdrSymN(readCDDA, "CDRreadCDDA");
-	LoadCdrSymN(getTE, "CDRgetTE");
-
-	return 0;
-}
-
-void *hSPUDriver = NULL;
-
-long CALLBACK SPU__configure(void) { return 0; }
-void CALLBACK SPU__about(void) {}
-long CALLBACK SPU__test(void) { return 0; }
-
-#define LoadSpuSym1(dest, name) \
-	LoadSym(SPU_##dest, SPU##dest, name, TRUE);
-
-#define LoadSpuSym0(dest, name) \
-	LoadSym(SPU_##dest, SPU##dest, name, FALSE); \
-	if (SPU_##dest == NULL) SPU_##dest = (SPU##dest) SPU__##dest;
-
-#define LoadSpuSymN(dest, name) \
-	LoadSym(SPU_##dest, SPU##dest, name, FALSE);
-
-static int LoadSPUplugin(const char *SPUdll) {
-	void *drv;
-
-	hSPUDriver = SysLoadLibrary(SPUdll);
-	if (hSPUDriver == NULL) {
-		SPU_configure = NULL;
-		SysMessage (_("Could not load SPU plugin %s!"), SPUdll); return -1;
-	}
-	drv = hSPUDriver;
-	LoadSpuSym1(init, "SPUinit");
-	LoadSpuSym1(shutdown, "SPUshutdown");
-	LoadSpuSym1(open, "SPUopen");
-	LoadSpuSym1(close, "SPUclose");
-	LoadSpuSym0(configure, "SPUconfigure");
-	LoadSpuSym0(about, "SPUabout");
-	LoadSpuSym0(test, "SPUtest");
-	LoadSpuSym1(writeRegister, "SPUwriteRegister");
-	LoadSpuSym1(readRegister, "SPUreadRegister");		
-	LoadSpuSym1(writeDMA, "SPUwriteDMA");
-	LoadSpuSym1(readDMA, "SPUreadDMA");
-	LoadSpuSym1(writeDMAMem, "SPUwriteDMAMem");
-	LoadSpuSym1(readDMAMem, "SPUreadDMAMem");
-	LoadSpuSym1(playADPCMchannel, "SPUplayADPCMchannel");
-	LoadSpuSym1(freeze, "SPUfreeze");
-	LoadSpuSym1(registerCallback, "SPUregisterCallback");
-	LoadSpuSymN(async, "SPUasync");
-	LoadSpuSymN(playCDDAchannel, "SPUplayCDDAchannel");
-
-	return 0;
-}
-
-void *hPAD1Driver = NULL;
-void *hPAD2Driver = NULL;
-
-static unsigned char buf[256];
-unsigned char stdpar[10] = { 0x00, 0x41, 0x5a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
-unsigned char mousepar[8] = { 0x00, 0x12, 0x5a, 0xff, 0xff, 0xff, 0xff };
-unsigned char analogpar[9] = { 0x00, 0xff, 0x5a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
-
-static int bufcount, bufc;
-
-PadDataS padd1, padd2;
-
-unsigned char _PADstartPoll(PadDataS *pad) {
- bufc = 0;
-
- switch (pad->controllerType) {
- case PSE_PAD_TYPE_MOUSE:
- mousepar[3] = pad->buttonStatus & 0xff;
- mousepar[4] = pad->buttonStatus >> 8;
- mousepar[5] = pad->moveX;
- mousepar[6] = pad->moveY;
-
- memcpy(buf, mousepar, 7);
- bufcount = 6;
- break;
- case PSE_PAD_TYPE_NEGCON: // npc101/npc104(slph00001/slph00069)
- analogpar[1] = 0x23;
- analogpar[3] = pad->buttonStatus & 0xff;
- analogpar[4] = pad->buttonStatus >> 8;
- analogpar[5] = pad->rightJoyX;
- analogpar[6] = pad->rightJoyY;
- analogpar[7] = pad->leftJoyX;
- analogpar[8] = pad->leftJoyY;
-
- memcpy(buf, analogpar, 9);
- bufcount = 8;
- break;
- case PSE_PAD_TYPE_ANALOGPAD: // scph1150
- analogpar[1] = 0x73;
- analogpar[3] = pad->buttonStatus & 0xff;
- analogpar[4] = pad->buttonStatus >> 8;
- analogpar[5] = pad->rightJoyX;
- analogpar[6] = pad->rightJoyY;
- analogpar[7] = pad->leftJoyX;
- analogpar[8] = pad->leftJoyY;
-
- memcpy(buf, analogpar, 9);
- bufcount = 8;
- break;
- case PSE_PAD_TYPE_ANALOGJOY: // scph1110
- analogpar[1] = 0x53;
- analogpar[3] = pad->buttonStatus & 0xff;
- analogpar[4] = pad->buttonStatus >> 8;
- analogpar[5] = pad->rightJoyX;
- analogpar[6] = pad->rightJoyY;
- analogpar[7] = pad->leftJoyX;
- analogpar[8] = pad->leftJoyY;
-
- memcpy(buf, analogpar, 9);
- bufcount = 8;
- break;
- case PSE_PAD_TYPE_STANDARD:
- default:
- stdpar[3] = pad->buttonStatus & 0xff;
- stdpar[4] = pad->buttonStatus >> 8;
-
- memcpy(buf, stdpar, 5);
- bufcount = 4;
- }
-
- return buf[bufc++];
-}
-
-unsigned char _PADpoll(unsigned char value) {
- if (bufc > bufcount) return 0;
- return buf[bufc++];
-}
-
-unsigned char CALLBACK PAD1__startPoll(int pad) {
- PadDataS padd;
-
- PAD1_readPort1(&padd);
-
- return _PADstartPoll(&padd);
-}
-
-unsigned char CALLBACK PAD1__poll(unsigned char value) {
- return _PADpoll(value);
-}
-
-long CALLBACK PAD1__configure(void) { return 0; }
-void CALLBACK PAD1__about(void) {}
-long CALLBACK PAD1__test(void) { return 0; }
-long CALLBACK PAD1__query(void) { return 3; }
-long CALLBACK PAD1__keypressed() { return 0; }
-
-#define LoadPad1Sym1(dest, name) \
-	LoadSym(PAD1_##dest, PAD##dest, name, TRUE);
-
-#define LoadPad1SymN(dest, name) \
-	LoadSym(PAD1_##dest, PAD##dest, name, FALSE);
-
-#define LoadPad1Sym0(dest, name) \
-	LoadSym(PAD1_##dest, PAD##dest, name, FALSE); \
-	if (PAD1_##dest == NULL) PAD1_##dest = (PAD##dest) PAD1__##dest;
-
-static int LoadPAD1plugin(const char *PAD1dll) {
-	void *drv;
-
-	hPAD1Driver = SysLoadLibrary(PAD1dll);
-	if (hPAD1Driver == NULL) {
-		PAD1_configure = NULL;
-		SysMessage (_("Could not load Controller 1 plugin %s!"), PAD1dll); return -1;
-	}
-	drv = hPAD1Driver;
-	LoadPad1Sym1(init, "PADinit");
-	LoadPad1Sym1(shutdown, "PADshutdown");
-	LoadPad1Sym1(open, "PADopen");
-	LoadPad1Sym1(close, "PADclose");
-	LoadPad1Sym0(query, "PADquery");
-	LoadPad1Sym1(readPort1, "PADreadPort1");
-	LoadPad1Sym0(configure, "PADconfigure");
-	LoadPad1Sym0(test, "PADtest");
-	LoadPad1Sym0(about, "PADabout");
-	LoadPad1Sym0(keypressed, "PADkeypressed");
-	LoadPad1Sym0(startPoll, "PADstartPoll");
-	LoadPad1Sym0(poll, "PADpoll");
-	LoadPad1SymN(setSensitive, "PADsetSensitive");
-
-	return 0;
-}
-
-unsigned char CALLBACK PAD2__startPoll(int pad) {
-	PadDataS padd;
-
-	PAD2_readPort2(&padd);
- 
-	return _PADstartPoll(&padd);
-}
-
-unsigned char CALLBACK PAD2__poll(unsigned char value) {
-	return _PADpoll(value);
-}
-
-long CALLBACK PAD2__configure(void) { return 0; }
-void CALLBACK PAD2__about(void) {}
-long CALLBACK PAD2__test(void) { return 0; }
-long CALLBACK PAD2__query(void) { return PSE_PAD_USE_PORT1 | PSE_PAD_USE_PORT2; }
-long CALLBACK PAD2__keypressed() { return 0; }
-
-#define LoadPad2Sym1(dest, name) \
-	LoadSym(PAD2_##dest, PAD##dest, name, TRUE);
-
-#define LoadPad2Sym0(dest, name) \
-	LoadSym(PAD2_##dest, PAD##dest, name, FALSE); \
-	if (PAD2_##dest == NULL) PAD2_##dest = (PAD##dest) PAD2__##dest;
-
-#define LoadPad2SymN(dest, name) \
-	LoadSym(PAD2_##dest, PAD##dest, name, FALSE);
-
-static int LoadPAD2plugin(const char *PAD2dll) {
-	void *drv;
-
-	hPAD2Driver = SysLoadLibrary(PAD2dll);
-	if (hPAD2Driver == NULL) {
-		PAD2_configure = NULL;
-		SysMessage (_("Could not load Controller 2 plugin %s!"), PAD2dll); return -1;
-	}
-	drv = hPAD2Driver;
-	LoadPad2Sym1(init, "PADinit");
-	LoadPad2Sym1(shutdown, "PADshutdown");
-	LoadPad2Sym1(open, "PADopen");
-	LoadPad2Sym1(close, "PADclose");
-	LoadPad2Sym0(query, "PADquery");
-	LoadPad2Sym1(readPort2, "PADreadPort2");
-	LoadPad2Sym0(configure, "PADconfigure");
-	LoadPad2Sym0(test, "PADtest");
-	LoadPad2Sym0(about, "PADabout");
-	LoadPad2Sym0(keypressed, "PADkeypressed");
-	LoadPad2Sym0(startPoll, "PADstartPoll");
-	LoadPad2Sym0(poll, "PADpoll");
-	LoadPad2SymN(setSensitive, "PADsetSensitive");
-
-	return 0;
-}
-
-void *hNETDriver = NULL;
-
-void CALLBACK NET__setInfo(netInfo *info) {}
-void CALLBACK NET__keypressed(int key) {}
-long CALLBACK NET__configure(void) { return 0; }
-long CALLBACK NET__test(void) { return 0; }
-void CALLBACK NET__about(void) {}
-
-#define LoadNetSym1(dest, name) \
-	LoadSym(NET_##dest, NET##dest, name, TRUE);
-
-#define LoadNetSymN(dest, name) \
-	LoadSym(NET_##dest, NET##dest, name, FALSE);
-
-#define LoadNetSym0(dest, name) \
-	LoadSym(NET_##dest, NET##dest, name, FALSE); \
-	if (NET_##dest == NULL) NET_##dest = (NET##dest) NET__##dest;
-
-static int LoadNETplugin(const char *NETdll) {
-	void *drv;
-
-	hNETDriver = SysLoadLibrary(NETdll);
-	if (hNETDriver == NULL) {
-		SysMessage (_("Could not load NetPlay plugin %s!"), NETdll); return -1;
-	}
-	drv = hNETDriver;
-	LoadNetSym1(init, "NETinit");
-	LoadNetSym1(shutdown, "NETshutdown");
-	LoadNetSym1(open, "NETopen");
-	LoadNetSym1(close, "NETclose");
-	LoadNetSymN(sendData, "NETsendData");
-	LoadNetSymN(recvData, "NETrecvData");
-	LoadNetSym1(sendPadData, "NETsendPadData");
-	LoadNetSym1(recvPadData, "NETrecvPadData");
-	LoadNetSym1(queryPlayer, "NETqueryPlayer");
-	LoadNetSym1(pause, "NETpause");
-	LoadNetSym1(resume, "NETresume");
-	LoadNetSym0(setInfo, "NETsetInfo");
-	LoadNetSym0(keypressed, "NETkeypressed");
-	LoadNetSym0(configure, "NETconfigure");
-	LoadNetSym0(test, "NETtest");
-	LoadNetSym0(about, "NETabout");
-
-	return 0;
-}
-
-#ifdef ENABLE_SIO1API
-
-void *hSIO1Driver = NULL;
-
-long CALLBACK SIO1__init(void) { return 0; }
-long CALLBACK SIO1__shutdown(void) { return 0; }
-long CALLBACK SIO1__open(void) { return 0; }
-long CALLBACK SIO1__close(void) { return 0; }
-long CALLBACK SIO1__configure(void) { return 0; }
-long CALLBACK SIO1__test(void) { return 0; }
-void CALLBACK SIO1__about(void) {}
-void CALLBACK SIO1__pause(void) {}
-void CALLBACK SIO1__resume(void) {}
-long CALLBACK SIO1__keypressed(int key) { return 0; }
-void CALLBACK SIO1__writeData8(unsigned char val) {}
-void CALLBACK SIO1__writeData16(unsigned short val) {}
-void CALLBACK SIO1__writeData32(unsigned long val) {}
-void CALLBACK SIO1__writeStat16(unsigned short val) {}
-void CALLBACK SIO1__writeStat32(unsigned long val) {}
-void CALLBACK SIO1__writeMode16(unsigned short val) {}
-void CALLBACK SIO1__writeMode32(unsigned long val) {}
-void CALLBACK SIO1__writeCtrl16(unsigned short val) {}
-void CALLBACK SIO1__writeCtrl32(unsigned long val) {}
-void CALLBACK SIO1__writeBaud16(unsigned short val) {}
-void CALLBACK SIO1__writeBaud32(unsigned long val) {}
-unsigned char CALLBACK SIO1__readData8(void) { return 0; }
-unsigned short CALLBACK SIO1__readData16(void) { return 0; }
-unsigned long CALLBACK SIO1__readData32(void) { return 0; }
-unsigned short CALLBACK SIO1__readStat16(void) { return 0; }
-unsigned long CALLBACK SIO1__readStat32(void) { return 0; }
-unsigned short CALLBACK SIO1__readMode16(void) { return 0; }
-unsigned long CALLBACK SIO1__readMode32(void) { return 0; }
-unsigned short CALLBACK SIO1__readCtrl16(void) { return 0; }
-unsigned long CALLBACK SIO1__readCtrl32(void) { return 0; }
-unsigned short CALLBACK SIO1__readBaud16(void) { return 0; }
-unsigned long CALLBACK SIO1__readBaud32(void) { return 0; }
-void CALLBACK SIO1__registerCallback(void (CALLBACK *callback)(void)) {};
-
-void CALLBACK SIO1irq(void) {
- psxHu32ref(0x1070) |= SWAPu32(0x100);
-}
-
-#define LoadSio1Sym1(dest, name) \
- LoadSym(SIO1_##dest, SIO1##dest, name, TRUE);
-
-#define LoadSio1SymN(dest, name) \
- LoadSym(SIO1_##dest, SIO1##dest, name, FALSE);
-
-#define LoadSio1Sym0(dest, name) \
- LoadSym(SIO1_##dest, SIO1##dest, name, FALSE); \
- if (SIO1_##dest == NULL) SIO1_##dest = (SIO1##dest) SIO1__##dest;
-
-static int LoadSIO1plugin(const char *SIO1dll) {
- void *drv;
-
- hSIO1Driver = SysLoadLibrary(SIO1dll);
- if (hSIO1Driver == NULL) {
- SysMessage (_("Could not load SIO1 plugin %s!"), SIO1dll); return -1;
- }
- drv = hSIO1Driver;
-
- LoadSio1Sym0(init, "SIO1init");
- LoadSio1Sym0(shutdown, "SIO1shutdown");
- LoadSio1Sym0(open, "SIO1open");
- LoadSio1Sym0(close, "SIO1close");
- LoadSio1Sym0(pause, "SIO1pause");
- LoadSio1Sym0(resume, "SIO1resume");
- LoadSio1Sym0(keypressed, "SIO1keypressed");
- LoadSio1Sym0(configure, "SIO1configure");
- LoadSio1Sym0(test, "SIO1test");
- LoadSio1Sym0(about, "SIO1about");
- LoadSio1Sym0(writeData8, "SIO1writeData8");
- LoadSio1Sym0(writeData16, "SIO1writeData16");
- LoadSio1Sym0(writeData32, "SIO1writeData32");
- LoadSio1Sym0(writeStat16, "SIO1writeStat16");
- LoadSio1Sym0(writeStat32, "SIO1writeStat32");
- LoadSio1Sym0(writeMode16, "SIO1writeMode16");
- LoadSio1Sym0(writeMode32, "SIO1writeMode32");
- LoadSio1Sym0(writeCtrl16, "SIO1writeCtrl16");
- LoadSio1Sym0(writeCtrl32, "SIO1writeCtrl32");
- LoadSio1Sym0(writeBaud16, "SIO1writeBaud16");
- LoadSio1Sym0(writeBaud32, "SIO1writeBaud32");
- LoadSio1Sym0(readData16, "SIO1readData16");
- LoadSio1Sym0(readData32, "SIO1readData32");
- LoadSio1Sym0(readStat16, "SIO1readStat16");
- LoadSio1Sym0(readStat32, "SIO1readStat32");
- LoadSio1Sym0(readMode16, "SIO1readMode16");
- LoadSio1Sym0(readMode32, "SIO1readMode32");
- LoadSio1Sym0(readCtrl16, "SIO1readCtrl16");
- LoadSio1Sym0(readCtrl32, "SIO1readCtrl32");
- LoadSio1Sym0(readBaud16, "SIO1readBaud16");
- LoadSio1Sym0(readBaud32, "SIO1readBaud32");
- LoadSio1Sym0(registerCallback, "SIO1registerCallback");
-
- return 0;
-}
-
-#endif
-
-void CALLBACK clearDynarec(void) {
-	psxCpu->Reset();
-}
-
-int LoadPlugins() {
-	int ret;
-	char Plugin[MAXPATHLEN];
-
-	ReleasePlugins();
-
-	if (UsingIso()) {
-		LoadCDRplugin(NULL);
-	} else {
-		sprintf(Plugin, "%s/%s", Config.PluginsDir, Config.Cdr);
-		if (LoadCDRplugin(Plugin) == -1) return -1;
-	}
-
-	sprintf(Plugin, "%s/%s", Config.PluginsDir, Config.Gpu);
-	if (LoadGPUplugin(Plugin) == -1) return -1;
-
-	sprintf(Plugin, "%s/%s", Config.PluginsDir, Config.Spu);
-	if (LoadSPUplugin(Plugin) == -1) return -1;
-
-	sprintf(Plugin, "%s/%s", Config.PluginsDir, Config.Pad1);
-	if (LoadPAD1plugin(Plugin) == -1) return -1;
-
-	sprintf(Plugin, "%s/%s", Config.PluginsDir, Config.Pad2);
-	if (LoadPAD2plugin(Plugin) == -1) return -1;
-
-	if (strcmp("Disabled", Config.Net) == 0 || strcmp("", Config.Net) == 0)
-		Config.UseNet = FALSE;
-	else {
-		Config.UseNet = TRUE;
-		sprintf(Plugin, "%s/%s", Config.PluginsDir, Config.Net);
-		if (LoadNETplugin(Plugin) == -1) Config.UseNet = FALSE;
-	}
-
-#ifdef ENABLE_SIO1API
-	sprintf(Plugin, "%s/%s", Config.PluginsDir, Config.Sio1);
-	if (LoadSIO1plugin(Plugin) == -1) return -1;
-#endif
-
-	ret = CDR_init();
-	if (ret < 0) { SysMessage (_("Error initializing CD-ROM plugin: %d"), ret); return -1; }
-	ret = GPU_init();
-	if (ret < 0) { SysMessage (_("Error initializing GPU plugin: %d"), ret); return -1; }
-	ret = SPU_init();
-	if (ret < 0) { SysMessage (_("Error initializing SPU plugin: %d"), ret); return -1; }
-	ret = PAD1_init(1);
-	if (ret < 0) { SysMessage (_("Error initializing Controller 1 plugin: %d"), ret); return -1; }
-	ret = PAD2_init(2);
-	if (ret < 0) { SysMessage (_("Error initializing Controller 2 plugin: %d"), ret); return -1; }
-
-	if (Config.UseNet) {
-		ret = NET_init();
-		if (ret < 0) { SysMessage (_("Error initializing NetPlay plugin: %d"), ret); return -1; }
-	}
-
-#ifdef ENABLE_SIO1API
-	ret = SIO1_init();
-	if (ret < 0) { SysMessage (_("Error initializing SIO1 plugin: %d"), ret); return -1; }
-#endif
-
-	SysPrintf(_("Plugins loaded.\n"));
-	return 0;
-}
-
-void ReleasePlugins() {
-	if (Config.UseNet) {
-		int ret = NET_close();
-		if (ret < 0) Config.UseNet = FALSE;
-	}
-	NetOpened = FALSE;
-
-	if (hCDRDriver != NULL || cdrIsoActive()) CDR_shutdown();
-	if (hGPUDriver != NULL) GPU_shutdown();
-	if (hSPUDriver != NULL) SPU_shutdown();
-	if (hPAD1Driver != NULL) PAD1_shutdown();
-	if (hPAD2Driver != NULL) PAD2_shutdown();
-
-	if (Config.UseNet && hNETDriver != NULL) NET_shutdown(); 
-
-	if (hCDRDriver != NULL) SysCloseLibrary(hCDRDriver); hCDRDriver = NULL;
-	if (hGPUDriver != NULL) SysCloseLibrary(hGPUDriver); hGPUDriver = NULL;
-	if (hSPUDriver != NULL) SysCloseLibrary(hSPUDriver); hSPUDriver = NULL;
-	if (hPAD1Driver != NULL) SysCloseLibrary(hPAD1Driver); hPAD1Driver = NULL;
-	if (hPAD2Driver != NULL) SysCloseLibrary(hPAD2Driver); hPAD2Driver = NULL;
-
-	if (Config.UseNet && hNETDriver != NULL) {
-		SysCloseLibrary(hNETDriver); hNETDriver = NULL;
-	}
-
-#ifdef ENABLE_SIO1API
-	if (hSIO1Driver != NULL) {
-		SIO1_shutdown();
-		SysCloseLibrary(hSIO1Driver);
-		hSIO1Driver = NULL;
-	}
-#endif
-}
-
-void SetIsoFile(const char *filename) {
-	if (filename == NULL) {
-		IsoFile[0] = '\0';
-		return;
-	}
-	strncpy(IsoFile, filename, MAXPATHLEN);
-}
-
-const char *GetIsoFile(void) {
-	return IsoFile;
-}
-
-boolean UsingIso(void) {
-	return (IsoFile[0] != '\0');
-}
-
-void SetCdOpenCaseTime(s64 time) {
-	cdOpenCaseTime = time;
-}
+/***************************************************************************
+ * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
+ ***************************************************************************/
+
+/*
+* Plugin library callback/access functions.
+*/
+
+#include "plugins.h"
+#include "cdriso.h"
+
+static char IsoFile[MAXPATHLEN] = "";
+static s64 cdOpenCaseTime = 0;
+
+GPUupdateLace GPU_updateLace;
+GPUinit GPU_init;
+GPUshutdown GPU_shutdown;
+GPUconfigure GPU_configure;
+GPUtest GPU_test;
+GPUabout GPU_about;
+GPUopen GPU_open;
+GPUclose GPU_close;
+GPUreadStatus GPU_readStatus;
+GPUreadData GPU_readData;
+GPUreadDataMem GPU_readDataMem;
+GPUwriteStatus GPU_writeStatus;
+GPUwriteData GPU_writeData;
+GPUwriteDataMem GPU_writeDataMem;
+GPUdmaChain GPU_dmaChain;
+GPUkeypressed GPU_keypressed;
+GPUdisplayText GPU_displayText;
+GPUmakeSnapshot GPU_makeSnapshot;
+GPUfreeze GPU_freeze;
+GPUgetScreenPic GPU_getScreenPic;
+GPUshowScreenPic GPU_showScreenPic;
+GPUclearDynarec GPU_clearDynarec;
+GPUhSync GPU_hSync;
+GPUvBlank GPU_vBlank;
+GPUvisualVibration GPU_visualVibration;
+GPUcursor GPU_cursor;
+GPUaddVertex GPU_addVertex;
+
+CDRinit CDR_init;
+CDRshutdown CDR_shutdown;
+CDRopen CDR_open;
+CDRclose CDR_close;
+CDRtest CDR_test;
+CDRgetTN CDR_getTN;
+CDRgetTD CDR_getTD;
+CDRreadTrack CDR_readTrack;
+CDRgetBuffer CDR_getBuffer;
+CDRplay CDR_play;
+CDRstop CDR_stop;
+CDRgetStatus CDR_getStatus;
+CDRgetDriveLetter CDR_getDriveLetter;
+CDRgetBufferSub CDR_getBufferSub;
+CDRconfigure CDR_configure;
+CDRabout CDR_about;
+CDRsetfilename CDR_setfilename;
+CDRreadCDDA CDR_readCDDA;
+CDRgetTE CDR_getTE;
+
+SPUconfigure SPU_configure;
+SPUabout SPU_about;
+SPUinit SPU_init;
+SPUshutdown SPU_shutdown;
+SPUtest SPU_test;
+SPUopen SPU_open;
+SPUclose SPU_close;
+SPUplaySample SPU_playSample;
+SPUwriteRegister SPU_writeRegister;
+SPUreadRegister SPU_readRegister;
+SPUwriteDMA SPU_writeDMA;
+SPUreadDMA SPU_readDMA;
+SPUwriteDMAMem SPU_writeDMAMem;
+SPUreadDMAMem SPU_readDMAMem;
+SPUplayADPCMchannel SPU_playADPCMchannel;
+SPUfreeze SPU_freeze;
+SPUregisterCallback SPU_registerCallback;
+SPUasync SPU_async;
+SPUplayCDDAchannel SPU_playCDDAchannel;
+
+PADconfigure PAD1_configure;
+PADabout PAD1_about;
+PADinit PAD1_init;
+PADshutdown PAD1_shutdown;
+PADtest PAD1_test;
+PADopen PAD1_open;
+PADclose PAD1_close;
+PADquery PAD1_query;
+PADreadPort1 PAD1_readPort1;
+PADkeypressed PAD1_keypressed;
+PADstartPoll PAD1_startPoll;
+PADpoll PAD1_poll;
+PADsetSensitive PAD1_setSensitive;
+PADregisterVibration PAD1_registerVibration;
+PADregisterCursor PAD1_registerCursor;
+
+PADconfigure PAD2_configure;
+PADabout PAD2_about;
+PADinit PAD2_init;
+PADshutdown PAD2_shutdown;
+PADtest PAD2_test;
+PADopen PAD2_open;
+PADclose PAD2_close;
+PADquery PAD2_query;
+PADreadPort2 PAD2_readPort2;
+PADkeypressed PAD2_keypressed;
+PADstartPoll PAD2_startPoll;
+PADpoll PAD2_poll;
+PADsetSensitive PAD2_setSensitive;
+PADregisterVibration PAD2_registerVibration;
+PADregisterCursor PAD2_registerCursor;
+
+NETinit NET_init;
+NETshutdown NET_shutdown;
+NETopen NET_open;
+NETclose NET_close;
+NETtest NET_test;
+NETconfigure NET_configure;
+NETabout NET_about;
+NETpause NET_pause;
+NETresume NET_resume;
+NETqueryPlayer NET_queryPlayer;
+NETsendData NET_sendData;
+NETrecvData NET_recvData;
+NETsendPadData NET_sendPadData;
+NETrecvPadData NET_recvPadData;
+NETsetInfo NET_setInfo;
+NETkeypressed NET_keypressed;
+
+#ifdef ENABLE_SIO1API
+
+SIO1init SIO1_init;
+SIO1shutdown SIO1_shutdown;
+SIO1open SIO1_open;
+SIO1close SIO1_close;
+SIO1test SIO1_test;
+SIO1configure SIO1_configure;
+SIO1about SIO1_about;
+SIO1pause SIO1_pause;
+SIO1resume SIO1_resume;
+SIO1keypressed SIO1_keypressed;
+SIO1writeData8 SIO1_writeData8;
+SIO1writeData16 SIO1_writeData16;
+SIO1writeData32 SIO1_writeData32;
+SIO1writeStat16 SIO1_writeStat16;
+SIO1writeStat32 SIO1_writeStat32;
+SIO1writeMode16 SIO1_writeMode16;
+SIO1writeMode32 SIO1_writeMode32;
+SIO1writeCtrl16 SIO1_writeCtrl16;
+SIO1writeCtrl32 SIO1_writeCtrl32;
+SIO1writeBaud16 SIO1_writeBaud16;
+SIO1writeBaud32 SIO1_writeBaud32;
+SIO1readData8 SIO1_readData8;
+SIO1readData16 SIO1_readData16;
+SIO1readData32 SIO1_readData32;
+SIO1readStat16 SIO1_readStat16;
+SIO1readStat32 SIO1_readStat32;
+SIO1readMode16 SIO1_readMode16;
+SIO1readMode32 SIO1_readMode32;
+SIO1readCtrl16 SIO1_readCtrl16;
+SIO1readCtrl32 SIO1_readCtrl32;
+SIO1readBaud16 SIO1_readBaud16;
+SIO1readBaud32 SIO1_readBaud32;
+SIO1update SIO1_update;
+SIO1registerCallback SIO1_registerCallback;
+
+#endif
+
+static const char *err;
+
+#define CheckErr(func) { \
+	err = SysLibError(); \
+	if (err != NULL) { SysMessage(_("Error loading %s: %s"), func, err); return -1; } \
+}
+
+#define LoadSym(dest, src, name, checkerr) { \
+	dest = (src)SysLoadSym(drv, name); \
+	if (checkerr) { CheckErr(name); } else SysLibError(); \
+}
+
+void *hGPUDriver = NULL;
+
+void CALLBACK GPU__displayText(char *pText) {
+	SysPrintf("%s\n", pText);
+}
+
+long CALLBACK GPU__configure(void) { return 0; }
+long CALLBACK GPU__test(void) { return 0; }
+void CALLBACK GPU__about(void) {}
+void CALLBACK GPU__makeSnapshot(void) {}
+void CALLBACK GPU__keypressed(int key) {}
+long CALLBACK GPU__getScreenPic(unsigned char *pMem) { return -1; }
+long CALLBACK GPU__showScreenPic(unsigned char *pMem) { return -1; }
+void CALLBACK GPU__clearDynarec(void (CALLBACK *callback)(void)) {}
+void CALLBACK GPU__hSync(int val) {}
+void CALLBACK GPU__vBlank(int val) {}
+void CALLBACK GPU__visualVibration(unsigned long iSmall, unsigned long iBig) {}
+void CALLBACK GPU__cursor(int player, int x, int y) {}
+void CALLBACK GPU__addVertex(short sx,short sy,s64 fx,s64 fy,s64 fz) {}
+
+#define LoadGpuSym1(dest, name) \
+	LoadSym(GPU_##dest, GPU##dest, name, TRUE);
+
+#define LoadGpuSym0(dest, name) \
+	LoadSym(GPU_##dest, GPU##dest, name, FALSE); \
+	if (GPU_##dest == NULL) GPU_##dest = (GPU##dest) GPU__##dest;
+
+#define LoadGpuSymN(dest, name) \
+	LoadSym(GPU_##dest, GPU##dest, name, FALSE);
+
+static int LoadGPUplugin(const char *GPUdll) {
+	void *drv;
+
+	hGPUDriver = SysLoadLibrary(GPUdll);
+	if (hGPUDriver == NULL) {
+		GPU_configure = NULL;
+		SysMessage (_("Could not load GPU plugin %s!\n%s"), GPUdll, SysLibError());
+		return -1;
+	}
+	drv = hGPUDriver;
+	LoadGpuSym1(init, "GPUinit");
+	LoadGpuSym1(shutdown, "GPUshutdown");
+	LoadGpuSym1(open, "GPUopen");
+	LoadGpuSym1(close, "GPUclose");
+	LoadGpuSym1(readData, "GPUreadData");
+	LoadGpuSym1(readDataMem, "GPUreadDataMem");
+	LoadGpuSym1(readStatus, "GPUreadStatus");
+	LoadGpuSym1(writeData, "GPUwriteData");
+	LoadGpuSym1(writeDataMem, "GPUwriteDataMem");
+	LoadGpuSym1(writeStatus, "GPUwriteStatus");
+	LoadGpuSym1(dmaChain, "GPUdmaChain");
+	LoadGpuSym1(updateLace, "GPUupdateLace");
+	LoadGpuSym0(keypressed, "GPUkeypressed");
+	LoadGpuSym0(displayText, "GPUdisplayText");
+	LoadGpuSym0(makeSnapshot, "GPUmakeSnapshot");
+	LoadGpuSym1(freeze, "GPUfreeze");
+	LoadGpuSym0(getScreenPic, "GPUgetScreenPic");
+	LoadGpuSym0(showScreenPic, "GPUshowScreenPic");
+	LoadGpuSym0(clearDynarec, "GPUclearDynarec");
+ LoadGpuSym0(hSync, "GPUhSync");
+ LoadGpuSym0(vBlank, "GPUvBlank");
+ LoadGpuSym0(visualVibration, "GPUvisualVibration");
+ LoadGpuSym0(cursor, "GPUcursor");
+	LoadGpuSym0(addVertex, "GPUaddVertex");
+	LoadGpuSym0(configure, "GPUconfigure");
+	LoadGpuSym0(test, "GPUtest");
+	LoadGpuSym0(about, "GPUabout");
+
+	return 0;
+}
+
+void *hCDRDriver = NULL;
+
+long CALLBACK CDR__play(unsigned char *sector) { return 0; }
+long CALLBACK CDR__stop(void) { return 0; }
+
+long CALLBACK CDR__getStatus(struct CdrStat *stat) {
+	if (cdOpenCaseTime < 0 || cdOpenCaseTime > (s64)time(NULL))
+		stat->Status = 0x10;
+	else
+		stat->Status = 0;
+
+	return 0;
+}
+
+char* CALLBACK CDR__getDriveLetter(void) { return NULL; }
+long CALLBACK CDR__configure(void) { return 0; }
+long CALLBACK CDR__test(void) { return 0; }
+void CALLBACK CDR__about(void) {}
+long CALLBACK CDR__setfilename(char*filename) { return 0; }
+
+#define LoadCdrSym1(dest, name) \
+	LoadSym(CDR_##dest, CDR##dest, name, TRUE);
+
+#define LoadCdrSym0(dest, name) \
+	LoadSym(CDR_##dest, CDR##dest, name, FALSE); \
+	if (CDR_##dest == NULL) CDR_##dest = (CDR##dest) CDR__##dest;
+
+#define LoadCdrSymN(dest, name) \
+	LoadSym(CDR_##dest, CDR##dest, name, FALSE);
+
+static int LoadCDRplugin(const char *CDRdll) {
+	void *drv;
+
+	if (CDRdll == NULL) {
+		cdrIsoInit();
+		return 0;
+	}
+
+	hCDRDriver = SysLoadLibrary(CDRdll);
+	if (hCDRDriver == NULL) {
+		CDR_configure = NULL;
+		SysMessage (_("Could not load CD-ROM plugin %s!\n%s"), CDRdll, SysLibError());
+		return -1;
+	}
+	drv = hCDRDriver;
+	LoadCdrSym1(init, "CDRinit");
+	LoadCdrSym1(shutdown, "CDRshutdown");
+	LoadCdrSym1(open, "CDRopen");
+	LoadCdrSym1(close, "CDRclose");
+	LoadCdrSym1(getTN, "CDRgetTN");
+	LoadCdrSym1(getTD, "CDRgetTD");
+	LoadCdrSym1(readTrack, "CDRreadTrack");
+	LoadCdrSym1(getBuffer, "CDRgetBuffer");
+	LoadCdrSym1(getBufferSub, "CDRgetBufferSub");
+	LoadCdrSym0(play, "CDRplay");
+	LoadCdrSym0(stop, "CDRstop");
+	LoadCdrSym0(getStatus, "CDRgetStatus");
+	LoadCdrSym0(getDriveLetter, "CDRgetDriveLetter");
+	LoadCdrSym0(configure, "CDRconfigure");
+	LoadCdrSym0(test, "CDRtest");
+	LoadCdrSym0(about, "CDRabout");
+	LoadCdrSym0(setfilename, "CDRsetfilename");
+	LoadCdrSymN(readCDDA, "CDRreadCDDA");
+	LoadCdrSymN(getTE, "CDRgetTE");
+
+	return 0;
+}
+
+void *hSPUDriver = NULL;
+
+long CALLBACK SPU__configure(void) { return 0; }
+void CALLBACK SPU__about(void) {}
+long CALLBACK SPU__test(void) { return 0; }
+
+#define LoadSpuSym1(dest, name) \
+	LoadSym(SPU_##dest, SPU##dest, name, TRUE);
+
+#define LoadSpuSym0(dest, name) \
+	LoadSym(SPU_##dest, SPU##dest, name, FALSE); \
+	if (SPU_##dest == NULL) SPU_##dest = (SPU##dest) SPU__##dest;
+
+#define LoadSpuSymN(dest, name) \
+	LoadSym(SPU_##dest, SPU##dest, name, FALSE);
+
+static int LoadSPUplugin(const char *SPUdll) {
+	void *drv;
+
+	hSPUDriver = SysLoadLibrary(SPUdll);
+	if (hSPUDriver == NULL) {
+		SPU_configure = NULL;
+		SysMessage (_("Could not load SPU plugin %s!\n%s"), SPUdll, SysLibError());
+		return -1;
+	}
+	drv = hSPUDriver;
+	LoadSpuSym1(init, "SPUinit");
+	LoadSpuSym1(shutdown, "SPUshutdown");
+	LoadSpuSym1(open, "SPUopen");
+	LoadSpuSym1(close, "SPUclose");
+	LoadSpuSym0(configure, "SPUconfigure");
+	LoadSpuSym0(about, "SPUabout");
+	LoadSpuSym0(test, "SPUtest");
+	LoadSpuSym1(writeRegister, "SPUwriteRegister");
+	LoadSpuSym1(readRegister, "SPUreadRegister");
+	LoadSpuSym1(writeDMA, "SPUwriteDMA");
+	LoadSpuSym1(readDMA, "SPUreadDMA");
+	LoadSpuSym1(writeDMAMem, "SPUwriteDMAMem");
+	LoadSpuSym1(readDMAMem, "SPUreadDMAMem");
+	LoadSpuSym1(playADPCMchannel, "SPUplayADPCMchannel");
+	LoadSpuSym1(freeze, "SPUfreeze");
+	LoadSpuSym1(registerCallback, "SPUregisterCallback");
+	LoadSpuSymN(async, "SPUasync");
+	LoadSpuSymN(playCDDAchannel, "SPUplayCDDAchannel");
+
+	return 0;
+}
+
+void *hPAD1Driver = NULL;
+void *hPAD2Driver = NULL;
+
+static unsigned char buf[256];
+unsigned char stdpar[10] = { 0x00, 0x41, 0x5a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
+unsigned char mousepar[8] = { 0x00, 0x12, 0x5a, 0xff, 0xff, 0xff, 0xff };
+unsigned char analogpar[9] = { 0x00, 0xff, 0x5a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
+
+static int bufcount, bufc;
+
+PadDataS padd1, padd2;
+
+unsigned char _PADstartPoll(PadDataS *pad) {
+ bufc = 0;
+
+ switch (pad->controllerType) {
+ case PSE_PAD_TYPE_MOUSE:
+ mousepar[3] = pad->buttonStatus & 0xff;
+ mousepar[4] = pad->buttonStatus >> 8;
+ mousepar[5] = pad->moveX;
+ mousepar[6] = pad->moveY;
+
+ memcpy(buf, mousepar, 7);
+ bufcount = 6;
+ break;
+ case PSE_PAD_TYPE_NEGCON: // npc101/npc104(slph00001/slph00069)
+ analogpar[1] = 0x23;
+ analogpar[3] = pad->buttonStatus & 0xff;
+ analogpar[4] = pad->buttonStatus >> 8;
+ analogpar[5] = pad->rightJoyX;
+ analogpar[6] = pad->rightJoyY;
+ analogpar[7] = pad->leftJoyX;
+ analogpar[8] = pad->leftJoyY;
+
+ memcpy(buf, analogpar, 9);
+ bufcount = 8;
+ break;
+ case PSE_PAD_TYPE_ANALOGPAD: // scph1150
+ analogpar[1] = 0x73;
+ analogpar[3] = pad->buttonStatus & 0xff;
+ analogpar[4] = pad->buttonStatus >> 8;
+ analogpar[5] = pad->rightJoyX;
+ analogpar[6] = pad->rightJoyY;
+ analogpar[7] = pad->leftJoyX;
+ analogpar[8] = pad->leftJoyY;
+
+ memcpy(buf, analogpar, 9);
+ bufcount = 8;
+ break;
+ case PSE_PAD_TYPE_ANALOGJOY: // scph1110
+ analogpar[1] = 0x53;
+ analogpar[3] = pad->buttonStatus & 0xff;
+ analogpar[4] = pad->buttonStatus >> 8;
+ analogpar[5] = pad->rightJoyX;
+ analogpar[6] = pad->rightJoyY;
+ analogpar[7] = pad->leftJoyX;
+ analogpar[8] = pad->leftJoyY;
+
+ memcpy(buf, analogpar, 9);
+ bufcount = 8;
+ break;
+ case PSE_PAD_TYPE_STANDARD:
+ default:
+ stdpar[3] = pad->buttonStatus & 0xff;
+ stdpar[4] = pad->buttonStatus >> 8;
+
+ memcpy(buf, stdpar, 5);
+ bufcount = 4;
+ }
+
+ return buf[bufc++];
+}
+
+unsigned char _PADpoll(unsigned char value) {
+ if (bufc > bufcount) return 0;
+ return buf[bufc++];
+}
+
+unsigned char CALLBACK PAD1__startPoll(int pad) {
+ PadDataS padd;
+
+ PAD1_readPort1(&padd);
+
+ return _PADstartPoll(&padd);
+}
+
+unsigned char CALLBACK PAD1__poll(unsigned char value) {
+ return _PADpoll(value);
+}
+
+long CALLBACK PAD1__configure(void) { return 0; }
+void CALLBACK PAD1__about(void) {}
+long CALLBACK PAD1__test(void) { return 0; }
+long CALLBACK PAD1__query(void) { return 3; }
+long CALLBACK PAD1__keypressed() { return 0; }
+void CALLBACK PAD1__registerVibration(void (CALLBACK *callback)(unsigned long, unsigned long)) {}
+void CALLBACK PAD1__registerCursor(void (CALLBACK *callback)(int, int, int)) {}
+
+#define LoadPad1Sym1(dest, name) \
+	LoadSym(PAD1_##dest, PAD##dest, name, TRUE);
+
+#define LoadPad1SymN(dest, name) \
+	LoadSym(PAD1_##dest, PAD##dest, name, FALSE);
+
+#define LoadPad1Sym0(dest, name) \
+	LoadSym(PAD1_##dest, PAD##dest, name, FALSE); \
+	if (PAD1_##dest == NULL) PAD1_##dest = (PAD##dest) PAD1__##dest;
+
+static int LoadPAD1plugin(const char *PAD1dll) {
+	void *drv;
+
+	hPAD1Driver = SysLoadLibrary(PAD1dll);
+	if (hPAD1Driver == NULL) {
+		PAD1_configure = NULL;
+		SysMessage (_("Could not load Controller 1 plugin %s!\n%s"), PAD1dll, SysLibError());
+		return -1;
+	}
+	drv = hPAD1Driver;
+	LoadPad1Sym1(init, "PADinit");
+	LoadPad1Sym1(shutdown, "PADshutdown");
+	LoadPad1Sym1(open, "PADopen");
+	LoadPad1Sym1(close, "PADclose");
+	LoadPad1Sym0(query, "PADquery");
+	LoadPad1Sym1(readPort1, "PADreadPort1");
+	LoadPad1Sym0(configure, "PADconfigure");
+	LoadPad1Sym0(test, "PADtest");
+	LoadPad1Sym0(about, "PADabout");
+	LoadPad1Sym0(keypressed, "PADkeypressed");
+	LoadPad1Sym0(startPoll, "PADstartPoll");
+	LoadPad1Sym0(poll, "PADpoll");
+	LoadPad1SymN(setSensitive, "PADsetSensitive");
+ LoadPad1Sym0(registerVibration, "PADregisterVibration");
+ LoadPad1Sym0(registerCursor, "PADregisterCursor");
+
+	return 0;
+}
+
+unsigned char CALLBACK PAD2__startPoll(int pad) {
+	PadDataS padd;
+
+	PAD2_readPort2(&padd);
+
+	return _PADstartPoll(&padd);
+}
+
+unsigned char CALLBACK PAD2__poll(unsigned char value) {
+	return _PADpoll(value);
+}
+
+long CALLBACK PAD2__configure(void) { return 0; }
+void CALLBACK PAD2__about(void) {}
+long CALLBACK PAD2__test(void) { return 0; }
+long CALLBACK PAD2__query(void) { return PSE_PAD_USE_PORT1 | PSE_PAD_USE_PORT2; }
+long CALLBACK PAD2__keypressed() { return 0; }
+void CALLBACK PAD2__registerVibration(void (CALLBACK *callback)(unsigned long, unsigned long)) {}
+void CALLBACK PAD2__registerCursor(void (CALLBACK *callback)(int, int, int)) {}
+
+#define LoadPad2Sym1(dest, name) \
+	LoadSym(PAD2_##dest, PAD##dest, name, TRUE);
+
+#define LoadPad2Sym0(dest, name) \
+	LoadSym(PAD2_##dest, PAD##dest, name, FALSE); \
+	if (PAD2_##dest == NULL) PAD2_##dest = (PAD##dest) PAD2__##dest;
+
+#define LoadPad2SymN(dest, name) \
+	LoadSym(PAD2_##dest, PAD##dest, name, FALSE);
+
+static int LoadPAD2plugin(const char *PAD2dll) {
+	void *drv;
+
+	hPAD2Driver = SysLoadLibrary(PAD2dll);
+	if (hPAD2Driver == NULL) {
+		PAD2_configure = NULL;
+		SysMessage (_("Could not load Controller 2 plugin %s!\n%s"), PAD2dll, SysLibError());
+		return -1;
+	}
+	drv = hPAD2Driver;
+	LoadPad2Sym1(init, "PADinit");
+	LoadPad2Sym1(shutdown, "PADshutdown");
+	LoadPad2Sym1(open, "PADopen");
+	LoadPad2Sym1(close, "PADclose");
+	LoadPad2Sym0(query, "PADquery");
+	LoadPad2Sym1(readPort2, "PADreadPort2");
+	LoadPad2Sym0(configure, "PADconfigure");
+	LoadPad2Sym0(test, "PADtest");
+	LoadPad2Sym0(about, "PADabout");
+	LoadPad2Sym0(keypressed, "PADkeypressed");
+	LoadPad2Sym0(startPoll, "PADstartPoll");
+	LoadPad2Sym0(poll, "PADpoll");
+	LoadPad2SymN(setSensitive, "PADsetSensitive");
+ LoadPad2Sym0(registerVibration, "PADregisterVibration");
+ LoadPad2Sym0(registerCursor, "PADregisterCursor");
+
+	return 0;
+}
+
+void *hNETDriver = NULL;
+
+void CALLBACK NET__setInfo(netInfo *info) {}
+void CALLBACK NET__keypressed(int key) {}
+long CALLBACK NET__configure(void) { return 0; }
+long CALLBACK NET__test(void) { return 0; }
+void CALLBACK NET__about(void) {}
+
+#define LoadNetSym1(dest, name) \
+	LoadSym(NET_##dest, NET##dest, name, TRUE);
+
+#define LoadNetSymN(dest, name) \
+	LoadSym(NET_##dest, NET##dest, name, FALSE);
+
+#define LoadNetSym0(dest, name) \
+	LoadSym(NET_##dest, NET##dest, name, FALSE); \
+	if (NET_##dest == NULL) NET_##dest = (NET##dest) NET__##dest;
+
+static int LoadNETplugin(const char *NETdll) {
+	void *drv;
+
+	hNETDriver = SysLoadLibrary(NETdll);
+	if (hNETDriver == NULL) {
+		SysMessage (_("Could not load NetPlay plugin %s!\n%s"), NETdll, SysLibError());
+		return -1;
+	}
+	drv = hNETDriver;
+	LoadNetSym1(init, "NETinit");
+	LoadNetSym1(shutdown, "NETshutdown");
+	LoadNetSym1(open, "NETopen");
+	LoadNetSym1(close, "NETclose");
+	LoadNetSymN(sendData, "NETsendData");
+	LoadNetSymN(recvData, "NETrecvData");
+	LoadNetSym1(sendPadData, "NETsendPadData");
+	LoadNetSym1(recvPadData, "NETrecvPadData");
+	LoadNetSym1(queryPlayer, "NETqueryPlayer");
+	LoadNetSym1(pause, "NETpause");
+	LoadNetSym1(resume, "NETresume");
+	LoadNetSym0(setInfo, "NETsetInfo");
+	LoadNetSym0(keypressed, "NETkeypressed");
+	LoadNetSym0(configure, "NETconfigure");
+	LoadNetSym0(test, "NETtest");
+	LoadNetSym0(about, "NETabout");
+
+	return 0;
+}
+
+#ifdef ENABLE_SIO1API
+
+void *hSIO1Driver = NULL;
+
+long CALLBACK SIO1__init(void) { return 0; }
+long CALLBACK SIO1__shutdown(void) { return 0; }
+long CALLBACK SIO1__open(void) { return 0; }
+long CALLBACK SIO1__close(void) { return 0; }
+long CALLBACK SIO1__configure(void) { return 0; }
+long CALLBACK SIO1__test(void) { return 0; }
+void CALLBACK SIO1__about(void) {}
+void CALLBACK SIO1__pause(void) {}
+void CALLBACK SIO1__resume(void) {}
+long CALLBACK SIO1__keypressed(int key) { return 0; }
+void CALLBACK SIO1__writeData8(u8 val) {}
+void CALLBACK SIO1__writeData16(u16 val) {}
+void CALLBACK SIO1__writeData32(u32 val) {}
+void CALLBACK SIO1__writeStat16(u16 val) {}
+void CALLBACK SIO1__writeStat32(u32 val) {}
+void CALLBACK SIO1__writeMode16(u16 val) {}
+void CALLBACK SIO1__writeMode32(u32 val) {}
+void CALLBACK SIO1__writeCtrl16(u16 val) {}
+void CALLBACK SIO1__writeCtrl32(u32 val) {}
+void CALLBACK SIO1__writeBaud16(u16 val) {}
+void CALLBACK SIO1__writeBaud32(u32 val) {}
+u8 CALLBACK SIO1__readData8(void) { return 0; }
+u16 CALLBACK SIO1__readData16(void) { return 0; }
+u32 CALLBACK SIO1__readData32(void) { return 0; }
+u16 CALLBACK SIO1__readStat16(void) { return 0; }
+u32 CALLBACK SIO1__readStat32(void) { return 0; }
+u16 CALLBACK SIO1__readMode16(void) { return 0; }
+u32 CALLBACK SIO1__readMode32(void) { return 0; }
+u16 CALLBACK SIO1__readCtrl16(void) { return 0; }
+u32 CALLBACK SIO1__readCtrl32(void) { return 0; }
+u16 CALLBACK SIO1__readBaud16(void) { return 0; }
+u32 CALLBACK SIO1__readBaud32(void) { return 0; }
+void CALLBACK SIO1__update(uint32_t t) {};
+void CALLBACK SIO1__registerCallback(void (CALLBACK *callback)(void)) {};
+
+#define LoadSio1Sym1(dest, name) \
+ LoadSym(SIO1_##dest, SIO1##dest, name, TRUE);
+
+#define LoadSio1SymN(dest, name) \
+ LoadSym(SIO1_##dest, SIO1##dest, name, FALSE);
+
+#define LoadSio1Sym0(dest, name) \
+ LoadSym(SIO1_##dest, SIO1##dest, name, FALSE); \
+ if (SIO1_##dest == NULL) SIO1_##dest = (SIO1##dest) SIO1__##dest;
+
+static int LoadSIO1plugin(const char *SIO1dll) {
+ void *drv;
+
+ hSIO1Driver = SysLoadLibrary(SIO1dll);
+ if (hSIO1Driver == NULL) {
+		SysMessage (_("Could not load SIO1 plugin %s!\n%s"), SIO1dll, SysLibError());
+		return -1;
+ }
+ drv = hSIO1Driver;
+
+ LoadSio1Sym0(init, "SIO1init");
+ LoadSio1Sym0(shutdown, "SIO1shutdown");
+ LoadSio1Sym0(open, "SIO1open");
+ LoadSio1Sym0(close, "SIO1close");
+ LoadSio1Sym0(pause, "SIO1pause");
+ LoadSio1Sym0(resume, "SIO1resume");
+ LoadSio1Sym0(keypressed, "SIO1keypressed");
+ LoadSio1Sym0(configure, "SIO1configure");
+ LoadSio1Sym0(test, "SIO1test");
+ LoadSio1Sym0(about, "SIO1about");
+ LoadSio1Sym0(writeData8, "SIO1writeData8");
+ LoadSio1Sym0(writeData16, "SIO1writeData16");
+ LoadSio1Sym0(writeData32, "SIO1writeData32");
+ LoadSio1Sym0(writeStat16, "SIO1writeStat16");
+ LoadSio1Sym0(writeStat32, "SIO1writeStat32");
+ LoadSio1Sym0(writeMode16, "SIO1writeMode16");
+ LoadSio1Sym0(writeMode32, "SIO1writeMode32");
+ LoadSio1Sym0(writeCtrl16, "SIO1writeCtrl16");
+ LoadSio1Sym0(writeCtrl32, "SIO1writeCtrl32");
+ LoadSio1Sym0(writeBaud16, "SIO1writeBaud16");
+ LoadSio1Sym0(writeBaud32, "SIO1writeBaud32");
+	LoadSio1Sym0(readData8, "SIO1readData8");
+ LoadSio1Sym0(readData16, "SIO1readData16");
+ LoadSio1Sym0(readData32, "SIO1readData32");
+ LoadSio1Sym0(readStat16, "SIO1readStat16");
+ LoadSio1Sym0(readStat32, "SIO1readStat32");
+ LoadSio1Sym0(readMode16, "SIO1readMode16");
+ LoadSio1Sym0(readMode32, "SIO1readMode32");
+ LoadSio1Sym0(readCtrl16, "SIO1readCtrl16");
+ LoadSio1Sym0(readCtrl32, "SIO1readCtrl32");
+ LoadSio1Sym0(readBaud16, "SIO1readBaud16");
+ LoadSio1Sym0(readBaud32, "SIO1readBaud32");
+	LoadSio1Sym0(update, "SIO1update");
+ LoadSio1Sym0(registerCallback, "SIO1registerCallback");
+
+ return 0;
+}
+
+#endif
+
+void CALLBACK clearDynarec(void) {
+	psxCpu->Reset();
+}
+
+int LoadPlugins() {
+	long ret;
+	char Plugin[MAXPATHLEN];
+
+	ReleasePlugins();
+
+	if (UsingIso()) {
+		LoadCDRplugin(NULL);
+	} else {
+		sprintf(Plugin, "%s/%s", Config.PluginsDir, Config.Cdr);
+		if (LoadCDRplugin(Plugin) == -1) return -1;
+	}
+
+	sprintf(Plugin, "%s/%s", Config.PluginsDir, Config.Gpu);
+	if (LoadGPUplugin(Plugin) == -1) return -1;
+
+	sprintf(Plugin, "%s/%s", Config.PluginsDir, Config.Spu);
+	if (LoadSPUplugin(Plugin) == -1) return -1;
+
+	sprintf(Plugin, "%s/%s", Config.PluginsDir, Config.Pad1);
+	if (LoadPAD1plugin(Plugin) == -1) return -1;
+
+	sprintf(Plugin, "%s/%s", Config.PluginsDir, Config.Pad2);
+	if (LoadPAD2plugin(Plugin) == -1) return -1;
+
+	if (strcmp("Disabled", Config.Net) == 0 || strcmp("", Config.Net) == 0)
+		Config.UseNet = FALSE;
+	else {
+		Config.UseNet = TRUE;
+		sprintf(Plugin, "%s/%s", Config.PluginsDir, Config.Net);
+		if (LoadNETplugin(Plugin) == -1) Config.UseNet = FALSE;
+	}
+
+#ifdef ENABLE_SIO1API
+	sprintf(Plugin, "%s/%s", Config.PluginsDir, Config.Sio1);
+	if (LoadSIO1plugin(Plugin) == -1) return -1;
+#endif
+
+	ret = CDR_init();
+	if (ret < 0) { SysMessage (_("Error initializing CD-ROM plugin: %d"), ret); return -1; }
+	ret = GPU_init();
+	if (ret < 0) { SysMessage (_("Error initializing GPU plugin: %d"), ret); return -1; }
+	ret = SPU_init();
+	if (ret < 0) { SysMessage (_("Error initializing SPU plugin: %d"), ret); return -1; }
+	ret = PAD1_init(1);
+	if (ret < 0) { SysMessage (_("Error initializing Controller 1 plugin: %d"), ret); return -1; }
+	ret = PAD2_init(2);
+	if (ret < 0) { SysMessage (_("Error initializing Controller 2 plugin: %d"), ret); return -1; }
+
+	if (Config.UseNet) {
+		ret = NET_init();
+		if (ret < 0) { SysMessage (_("Error initializing NetPlay plugin: %d"), ret); return -1; }
+	}
+
+#ifdef ENABLE_SIO1API
+	ret = SIO1_init();
+	if (ret < 0) { SysMessage (_("Error initializing SIO1 plugin: %d"), ret); return -1; }
+#endif
+
+	SysPrintf("%s", _("Plugins loaded.\n"));
+	return 0;
+}
+
+void ReleasePlugins() {
+	if (Config.UseNet) {
+		long ret = NET_close();
+		if (ret < 0) Config.UseNet = FALSE;
+	}
+	NetOpened = FALSE;
+
+	if (hCDRDriver != NULL || cdrIsoActive()) CDR_shutdown();
+	if (hGPUDriver != NULL) GPU_shutdown();
+	if (hSPUDriver != NULL) SPU_shutdown();
+	if (hPAD1Driver != NULL) PAD1_shutdown();
+	if (hPAD2Driver != NULL) PAD2_shutdown();
+
+	if (Config.UseNet && hNETDriver != NULL) NET_shutdown();
+
+	if (hCDRDriver != NULL) SysCloseLibrary(hCDRDriver); hCDRDriver = NULL;
+	if (hGPUDriver != NULL) SysCloseLibrary(hGPUDriver); hGPUDriver = NULL;
+	if (hSPUDriver != NULL) SysCloseLibrary(hSPUDriver); hSPUDriver = NULL;
+	if (hPAD1Driver != NULL) SysCloseLibrary(hPAD1Driver); hPAD1Driver = NULL;
+	if (hPAD2Driver != NULL) SysCloseLibrary(hPAD2Driver); hPAD2Driver = NULL;
+
+	if (Config.UseNet && hNETDriver != NULL) {
+		SysCloseLibrary(hNETDriver); hNETDriver = NULL;
+	}
+
+#ifdef ENABLE_SIO1API
+	if (hSIO1Driver != NULL) {
+		SIO1_shutdown();
+		SysCloseLibrary(hSIO1Driver);
+		hSIO1Driver = NULL;
+	}
+#endif
+}
+
+void SetIsoFile(const char *filename) {
+	if (filename == NULL) {
+		IsoFile[0] = '\0';
+		return;
+	}
+	strncpy(IsoFile, filename, MAXPATHLEN);
+}
+
+const char *GetIsoFile(void) {
+	return IsoFile;
+}
+
+boolean UsingIso(void) {
+	return (IsoFile[0] != '\0' || Config.Cdr[0] == '\0');
+}
+
+void SetCdOpenCaseTime(s64 time) {
+	cdOpenCaseTime = time;
+}

pcsxr-1.9.92.tar.bz2/libpcsxcore/plugins.h -> pcsxr-1.9.93.tar.bz2/libpcsxcore/plugins.h Changed

@@ -1,411 +1,424 @@
-/***************************************************************************
- * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program; if not, write to the *
- * Free Software Foundation, Inc., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
- ***************************************************************************/
-
-#ifndef __PLUGINS_H__
-#define __PLUGINS_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "psxcommon.h"
-
-//#define ENABLE_SIO1API 1
-
-#ifndef _WIN32
-
-typedef void* HWND;
-#define CALLBACK
-
-typedef long (*GPUopen)(unsigned long *, char *, char *);
-typedef long (*SPUopen)(void);
-typedef long (*PADopen)(unsigned long *);
-typedef long (*NETopen)(unsigned long *);
-typedef long (*SIO1open)(unsigned long *);
-
-#else
-
-#include <windows.h>
-
-typedef long (CALLBACK* GPUopen)(HWND);
-typedef long (CALLBACK* SPUopen)(HWND);
-typedef long (CALLBACK* PADopen)(HWND);
-typedef long (CALLBACK* NETopen)(HWND);
-typedef long (CALLBACK* SIO1open)(HWND);
-
-#endif
-
-#include "spu.h"
-
-#include "psemu_plugin_defs.h"
-#include "decode_xa.h"
-
-int LoadPlugins();
-void ReleasePlugins();
-int OpenPlugins();
-void ClosePlugins();
-
-typedef unsigned long (CALLBACK* PSEgetLibType)(void);
-typedef unsigned long (CALLBACK* PSEgetLibVersion)(void);
-typedef char *(CALLBACK* PSEgetLibName)(void);
-
-// GPU Functions
-typedef long (CALLBACK* GPUinit)(void);
-typedef long (CALLBACK* GPUshutdown)(void);
-typedef long (CALLBACK* GPUclose)(void);
-typedef void (CALLBACK* GPUwriteStatus)(uint32_t);
-typedef void (CALLBACK* GPUwriteData)(uint32_t);
-typedef void (CALLBACK* GPUwriteDataMem)(uint32_t *, int);
-typedef uint32_t (CALLBACK* GPUreadStatus)(void);
-typedef uint32_t (CALLBACK* GPUreadData)(void);
-typedef void (CALLBACK* GPUreadDataMem)(uint32_t *, int);
-typedef long (CALLBACK* GPUdmaChain)(uint32_t *,uint32_t);
-typedef void (CALLBACK* GPUupdateLace)(void);
-typedef long (CALLBACK* GPUconfigure)(void);
-typedef long (CALLBACK* GPUtest)(void);
-typedef void (CALLBACK* GPUabout)(void);
-typedef void (CALLBACK* GPUmakeSnapshot)(void);
-typedef void (CALLBACK* GPUkeypressed)(int);
-typedef void (CALLBACK* GPUdisplayText)(char *);
-typedef struct {
-	uint32_t ulFreezeVersion;
-	uint32_t ulStatus;
-	uint32_t ulControl[256];
-	unsigned char psxVRam[1024*512*2];
-} GPUFreeze_t;
-typedef long (CALLBACK* GPUfreeze)(uint32_t, GPUFreeze_t *);
-typedef long (CALLBACK* GPUgetScreenPic)(unsigned char *);
-typedef long (CALLBACK* GPUshowScreenPic)(unsigned char *);
-typedef void (CALLBACK* GPUclearDynarec)(void (CALLBACK *callback)(void));
-typedef void (CALLBACK* GPUvBlank)(int);
-
-// GPU function pointers
-extern GPUupdateLace GPU_updateLace;
-extern GPUinit GPU_init;
-extern GPUshutdown GPU_shutdown; 
-extern GPUconfigure GPU_configure;
-extern GPUtest GPU_test;
-extern GPUabout GPU_about;
-extern GPUopen GPU_open;
-extern GPUclose GPU_close;
-extern GPUreadStatus GPU_readStatus;
-extern GPUreadData GPU_readData;
-extern GPUreadDataMem GPU_readDataMem;
-extern GPUwriteStatus GPU_writeStatus; 
-extern GPUwriteData GPU_writeData;
-extern GPUwriteDataMem GPU_writeDataMem;
-extern GPUdmaChain GPU_dmaChain;
-extern GPUkeypressed GPU_keypressed;
-extern GPUdisplayText GPU_displayText;
-extern GPUmakeSnapshot GPU_makeSnapshot;
-extern GPUfreeze GPU_freeze;
-extern GPUgetScreenPic GPU_getScreenPic;
-extern GPUshowScreenPic GPU_showScreenPic;
-extern GPUclearDynarec GPU_clearDynarec;
-extern GPUvBlank GPU_vBlank;
-
-// CD-ROM Functions
-typedef long (CALLBACK* CDRinit)(void);
-typedef long (CALLBACK* CDRshutdown)(void);
-typedef long (CALLBACK* CDRopen)(void);
-typedef long (CALLBACK* CDRclose)(void);
-typedef long (CALLBACK* CDRgetTN)(unsigned char *);
-typedef long (CALLBACK* CDRgetTD)(unsigned char, unsigned char *);
-typedef long (CALLBACK* CDRreadTrack)(unsigned char *);
-typedef unsigned char* (CALLBACK* CDRgetBuffer)(void);
-typedef unsigned char* (CALLBACK* CDRgetBufferSub)(void);
-typedef long (CALLBACK* CDRconfigure)(void);
-typedef long (CALLBACK* CDRtest)(void);
-typedef void (CALLBACK* CDRabout)(void);
-typedef long (CALLBACK* CDRplay)(unsigned char *);
-typedef long (CALLBACK* CDRstop)(void);
-typedef long (CALLBACK* CDRsetfilename)(char *);
-struct CdrStat {
-	uint32_t Type;
-	uint32_t Status;
-	unsigned char Time[3];
-};
-typedef long (CALLBACK* CDRgetStatus)(struct CdrStat *);
-typedef char* (CALLBACK* CDRgetDriveLetter)(void);
-struct SubQ {
-	char res0[12];
-	unsigned char ControlAndADR;
-	unsigned char TrackNumber;
-	unsigned char IndexNumber;
-	unsigned char TrackRelativeAddress[3];
-	unsigned char Filler;
+/***************************************************************************
+ * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
+ ***************************************************************************/
+
+#ifndef __PLUGINS_H__
+#define __PLUGINS_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "psxcommon.h"
+
+#ifndef _WIN32
+
+typedef void* HWND;
+#define CALLBACK
+
+typedef long (*GPUopen)(unsigned long *, char *, char *);
+typedef long (*SPUopen)(void);
+typedef long (*PADopen)(unsigned long *);
+typedef long (*NETopen)(unsigned long *);
+typedef long (*SIO1open)(unsigned long *);
+
+#else
+
+#include <windows.h>
+
+typedef long (CALLBACK* GPUopen)(HWND);
+typedef long (CALLBACK* SPUopen)(HWND);
+typedef long (CALLBACK* PADopen)(HWND);
+typedef long (CALLBACK* NETopen)(HWND);
+typedef long (CALLBACK* SIO1open)(HWND);
+
+#endif
+
+#include "spu.h"
+
+#include "psemu_plugin_defs.h"
+#include "decode_xa.h"
+
+int LoadPlugins();
+void ReleasePlugins();
+int OpenPlugins();
+void ClosePlugins();
+
+typedef unsigned long (CALLBACK* PSEgetLibType)(void);
+typedef unsigned long (CALLBACK* PSEgetLibVersion)(void);
+typedef char *(CALLBACK* PSEgetLibName)(void);
+
+// GPU Functions
+typedef long (CALLBACK* GPUinit)(void);
+typedef long (CALLBACK* GPUshutdown)(void);
+typedef long (CALLBACK* GPUclose)(void);
+typedef void (CALLBACK* GPUwriteStatus)(uint32_t);
+typedef void (CALLBACK* GPUwriteData)(uint32_t);
+typedef void (CALLBACK* GPUwriteDataMem)(uint32_t *, int);
+typedef uint32_t (CALLBACK* GPUreadStatus)(void);
+typedef uint32_t (CALLBACK* GPUreadData)(void);
+typedef void (CALLBACK* GPUreadDataMem)(uint32_t *, int);
+typedef long (CALLBACK* GPUdmaChain)(uint32_t *,uint32_t);
+typedef void (CALLBACK* GPUupdateLace)(void);
+typedef long (CALLBACK* GPUconfigure)(void);
+typedef long (CALLBACK* GPUtest)(void);
+typedef void (CALLBACK* GPUabout)(void);
+typedef void (CALLBACK* GPUmakeSnapshot)(void);
+typedef void (CALLBACK* GPUkeypressed)(int);
+typedef void (CALLBACK* GPUdisplayText)(char *);
+typedef struct {
+	uint32_t ulFreezeVersion;
+	uint32_t ulStatus;
+	uint32_t ulControl[256];
+	unsigned char psxVRam[1024*512*2];
+} GPUFreeze_t;
+typedef long (CALLBACK* GPUfreeze)(uint32_t, GPUFreeze_t *);
+typedef long (CALLBACK* GPUgetScreenPic)(unsigned char *);
+typedef long (CALLBACK* GPUshowScreenPic)(unsigned char *);
+typedef void (CALLBACK* GPUclearDynarec)(void (CALLBACK *callback)(void));
+typedef void (CALLBACK* GPUhSync)(int);
+typedef void (CALLBACK* GPUvBlank)(int);
+typedef void (CALLBACK* GPUvisualVibration)(uint32_t, uint32_t);
+typedef void (CALLBACK* GPUcursor)(int, int, int);
+typedef void (CALLBACK* GPUaddVertex)(short,short,s64,s64,s64);
+
+// GPU function pointers
+extern GPUupdateLace GPU_updateLace;
+extern GPUinit GPU_init;
+extern GPUshutdown GPU_shutdown;
+extern GPUconfigure GPU_configure;
+extern GPUtest GPU_test;
+extern GPUabout GPU_about;
+extern GPUopen GPU_open;
+extern GPUclose GPU_close;
+extern GPUreadStatus GPU_readStatus;
+extern GPUreadData GPU_readData;
+extern GPUreadDataMem GPU_readDataMem;
+extern GPUwriteStatus GPU_writeStatus;
+extern GPUwriteData GPU_writeData;
+extern GPUwriteDataMem GPU_writeDataMem;
+extern GPUdmaChain GPU_dmaChain;
+extern GPUkeypressed GPU_keypressed;
+extern GPUdisplayText GPU_displayText;
+extern GPUmakeSnapshot GPU_makeSnapshot;
+extern GPUfreeze GPU_freeze;
+extern GPUgetScreenPic GPU_getScreenPic;
+extern GPUshowScreenPic GPU_showScreenPic;
+extern GPUclearDynarec GPU_clearDynarec;
+extern GPUhSync GPU_hSync;
+extern GPUvBlank GPU_vBlank;
+extern GPUvisualVibration GPU_visualVibration;
+extern GPUcursor GPU_cursor;
+extern GPUaddVertex GPU_addVertex;
+
+// CD-ROM Functions
+typedef long (CALLBACK* CDRinit)(void);
+typedef long (CALLBACK* CDRshutdown)(void);
+typedef long (CALLBACK* CDRopen)(void);
+typedef long (CALLBACK* CDRclose)(void);
+typedef long (CALLBACK* CDRgetTN)(unsigned char *);
+typedef long (CALLBACK* CDRgetTD)(unsigned char, unsigned char *);
+typedef long (CALLBACK* CDRreadTrack)(unsigned char *);
+typedef unsigned char* (CALLBACK* CDRgetBuffer)(void);
+typedef unsigned char* (CALLBACK* CDRgetBufferSub)(void);
+typedef long (CALLBACK* CDRconfigure)(void);
+typedef long (CALLBACK* CDRtest)(void);
+typedef void (CALLBACK* CDRabout)(void);
+typedef long (CALLBACK* CDRplay)(unsigned char *);
+typedef long (CALLBACK* CDRstop)(void);
+typedef long (CALLBACK* CDRsetfilename)(char *);
+struct CdrStat {
+	uint32_t Type;
+	uint32_t Status;
+	unsigned char Time[3];
+};
+typedef long (CALLBACK* CDRgetStatus)(struct CdrStat *);
+typedef char* (CALLBACK* CDRgetDriveLetter)(void);
+struct SubQ {
+	char res0[12];
+	unsigned char ControlAndADR;
+	unsigned char TrackNumber;
+	unsigned char IndexNumber;
+	unsigned char TrackRelativeAddress[3];
+	unsigned char Filler;
 	unsigned char AbsoluteAddress[3];
-	unsigned char CRC[2];
-	char res1[72];
-};
-typedef long (CALLBACK* CDRreadCDDA)(unsigned char, unsigned char, unsigned char, unsigned char *);
-typedef long (CALLBACK* CDRgetTE)(unsigned char, unsigned char *, unsigned char *, unsigned char *);
-
-// CD-ROM function pointers
-extern CDRinit CDR_init;
-extern CDRshutdown CDR_shutdown;
-extern CDRopen CDR_open;
-extern CDRclose CDR_close; 
-extern CDRtest CDR_test;
-extern CDRgetTN CDR_getTN;
-extern CDRgetTD CDR_getTD;
-extern CDRreadTrack CDR_readTrack;
-extern CDRgetBuffer CDR_getBuffer;
-extern CDRgetBufferSub CDR_getBufferSub;
-extern CDRplay CDR_play;
-extern CDRstop CDR_stop;
-extern CDRgetStatus CDR_getStatus;
-extern CDRgetDriveLetter CDR_getDriveLetter;
-extern CDRconfigure CDR_configure;
-extern CDRabout CDR_about;
-extern CDRsetfilename CDR_setfilename;
-extern CDRreadCDDA CDR_readCDDA;
-extern CDRgetTE CDR_getTE;
-
-// SPU Functions
-typedef long (CALLBACK* SPUinit)(void);				
-typedef long (CALLBACK* SPUshutdown)(void);	
-typedef long (CALLBACK* SPUclose)(void);			
-typedef void (CALLBACK* SPUplaySample)(unsigned char);		
-typedef void (CALLBACK* SPUwriteRegister)(unsigned long, unsigned short);
-typedef unsigned short (CALLBACK* SPUreadRegister)(unsigned long);
-typedef void (CALLBACK* SPUwriteDMA)(unsigned short);
-typedef unsigned short (CALLBACK* SPUreadDMA)(void);
-typedef void (CALLBACK* SPUwriteDMAMem)(unsigned short *, int);
-typedef void (CALLBACK* SPUreadDMAMem)(unsigned short *, int);
-typedef void (CALLBACK* SPUplayADPCMchannel)(xa_decode_t *);
-typedef void (CALLBACK* SPUregisterCallback)(void (CALLBACK *callback)(void));
-typedef long (CALLBACK* SPUconfigure)(void);
-typedef long (CALLBACK* SPUtest)(void);
-typedef void (CALLBACK* SPUabout)(void);
-typedef struct {
-	unsigned char PluginName[8];
-	uint32_t PluginVersion;
-	uint32_t Size;
-	unsigned char SPUPorts[0x200];
-	unsigned char SPURam[0x80000];
-	xa_decode_t xa;
-	unsigned char *SPUInfo;
-} SPUFreeze_t;
-typedef long (CALLBACK* SPUfreeze)(uint32_t, SPUFreeze_t *);
-typedef void (CALLBACK* SPUasync)(uint32_t);
-typedef void (CALLBACK* SPUplayCDDAchannel)(short *, int);
-
-// SPU function pointers
-extern SPUconfigure SPU_configure;
-extern SPUabout SPU_about;
-extern SPUinit SPU_init;
-extern SPUshutdown SPU_shutdown;
-extern SPUtest SPU_test;
-extern SPUopen SPU_open;
-extern SPUclose SPU_close;
-extern SPUplaySample SPU_playSample;
-extern SPUwriteRegister SPU_writeRegister;
-extern SPUreadRegister SPU_readRegister;
-extern SPUwriteDMA SPU_writeDMA;
-extern SPUreadDMA SPU_readDMA;
-extern SPUwriteDMAMem SPU_writeDMAMem;
-extern SPUreadDMAMem SPU_readDMAMem;
-extern SPUplayADPCMchannel SPU_playADPCMchannel;
-extern SPUfreeze SPU_freeze;
-extern SPUregisterCallback SPU_registerCallback;
-extern SPUasync SPU_async;
-extern SPUplayCDDAchannel SPU_playCDDAchannel;
-
-// PAD Functions
-typedef long (CALLBACK* PADconfigure)(void);
-typedef void (CALLBACK* PADabout)(void);
-typedef long (CALLBACK* PADinit)(long);
-typedef long (CALLBACK* PADshutdown)(void);	
-typedef long (CALLBACK* PADtest)(void);		
-typedef long (CALLBACK* PADclose)(void);
-typedef long (CALLBACK* PADquery)(void);
-typedef long (CALLBACK* PADreadPort1)(PadDataS*);
-typedef long (CALLBACK* PADreadPort2)(PadDataS*);
-typedef long (CALLBACK* PADkeypressed)(void);
-typedef unsigned char (CALLBACK* PADstartPoll)(int);
-typedef unsigned char (CALLBACK* PADpoll)(unsigned char);
-typedef void (CALLBACK* PADsetSensitive)(int);
-
-// PAD function pointers
-extern PADconfigure PAD1_configure;
-extern PADabout PAD1_about;
-extern PADinit PAD1_init;
-extern PADshutdown PAD1_shutdown;
-extern PADtest PAD1_test;
-extern PADopen PAD1_open;
-extern PADclose PAD1_close;
-extern PADquery PAD1_query;
-extern PADreadPort1 PAD1_readPort1;
-extern PADkeypressed PAD1_keypressed;
-extern PADstartPoll PAD1_startPoll;
-extern PADpoll PAD1_poll;
-extern PADsetSensitive PAD1_setSensitive;
-
-extern PADconfigure PAD2_configure;
-extern PADabout PAD2_about;
-extern PADinit PAD2_init;
-extern PADshutdown PAD2_shutdown;
-extern PADtest PAD2_test;
-extern PADopen PAD2_open;
-extern PADclose PAD2_close;
-extern PADquery PAD2_query;
-extern PADreadPort2 PAD2_readPort2;
-extern PADkeypressed PAD2_keypressed;
-extern PADstartPoll PAD2_startPoll;
-extern PADpoll PAD2_poll;
-extern PADsetSensitive PAD2_setSensitive;
-
-// NET Functions
-typedef long (CALLBACK* NETinit)(void);
-typedef long (CALLBACK* NETshutdown)(void);
-typedef long (CALLBACK* NETclose)(void);
-typedef long (CALLBACK* NETconfigure)(void);
-typedef long (CALLBACK* NETtest)(void);
-typedef void (CALLBACK* NETabout)(void);
-typedef void (CALLBACK* NETpause)(void);
-typedef void (CALLBACK* NETresume)(void);
-typedef long (CALLBACK* NETqueryPlayer)(void);
-typedef long (CALLBACK* NETsendData)(void *, int, int);
-typedef long (CALLBACK* NETrecvData)(void *, int, int);
-typedef long (CALLBACK* NETsendPadData)(void *, int);
-typedef long (CALLBACK* NETrecvPadData)(void *, int);
-
-typedef struct {
-	char EmuName[32];
-	char CdromID[9];	// ie. 'SCPH12345', no \0 trailing character
-	char CdromLabel[11];
-	void *psxMem;
-	GPUshowScreenPic GPU_showScreenPic;
-	GPUdisplayText GPU_displayText;
-	PADsetSensitive PAD_setSensitive;
-	char GPUpath[256];	// paths must be absolute
-	char SPUpath[256];
-	char CDRpath[256];
-	char MCD1path[256];
-	char MCD2path[256];
-	char BIOSpath[256];	// 'HLE' for internal bios
-	char Unused[1024];
-} netInfo;
-
-typedef long (CALLBACK* NETsetInfo)(netInfo *);
-typedef long (CALLBACK* NETkeypressed)(int);
-
-// NET function pointers 
-extern NETinit NET_init;
-extern NETshutdown NET_shutdown;
-extern NETopen NET_open;
-extern NETclose NET_close; 
-extern NETtest NET_test;
-extern NETconfigure NET_configure;
-extern NETabout NET_about;
-extern NETpause NET_pause;
-extern NETresume NET_resume;
-extern NETqueryPlayer NET_queryPlayer;
-extern NETsendData NET_sendData;
-extern NETrecvData NET_recvData;
-extern NETsendPadData NET_sendPadData;
-extern NETrecvPadData NET_recvPadData;
-extern NETsetInfo NET_setInfo;
-extern NETkeypressed NET_keypressed;
-
-#ifdef ENABLE_SIO1API
-
-// SIO1 Functions (link cable)
-typedef long (CALLBACK* SIO1init)(void);
-typedef long (CALLBACK* SIO1shutdown)(void);
-typedef long (CALLBACK* SIO1close)(void);
-typedef long (CALLBACK* SIO1configure)(void);
-typedef long (CALLBACK* SIO1test)(void);
-typedef void (CALLBACK* SIO1about)(void);
-typedef void (CALLBACK* SIO1pause)(void);
-typedef void (CALLBACK* SIO1resume)(void);
-typedef long (CALLBACK* SIO1keypressed)(int);
-typedef void (CALLBACK* SIO1writeData8)(unsigned char);
-typedef void (CALLBACK* SIO1writeData16)(unsigned short);
-typedef void (CALLBACK* SIO1writeData32)(unsigned long);
-typedef void (CALLBACK* SIO1writeStat16)(unsigned short);
-typedef void (CALLBACK* SIO1writeStat32)(unsigned long);
-typedef void (CALLBACK* SIO1writeMode16)(unsigned short);
-typedef void (CALLBACK* SIO1writeMode32)(unsigned long);
-typedef void (CALLBACK* SIO1writeCtrl16)(unsigned short);
-typedef void (CALLBACK* SIO1writeCtrl32)(unsigned long);
-typedef void (CALLBACK* SIO1writeBaud16)(unsigned short);
-typedef void (CALLBACK* SIO1writeBaud32)(unsigned long);
-typedef unsigned char (CALLBACK* SIO1readData8)(void);
-typedef unsigned short (CALLBACK* SIO1readData16)(void);
-typedef unsigned long (CALLBACK* SIO1readData32)(void);
-typedef unsigned short (CALLBACK* SIO1readStat16)(void);
-typedef unsigned long (CALLBACK* SIO1readStat32)(void);
-typedef unsigned short (CALLBACK* SIO1readMode16)(void);
-typedef unsigned long (CALLBACK* SIO1readMode32)(void);
-typedef unsigned short (CALLBACK* SIO1readCtrl16)(void);
-typedef unsigned long (CALLBACK* SIO1readCtrl32)(void);
-typedef unsigned short (CALLBACK* SIO1readBaud16)(void);
-typedef unsigned long (CALLBACK* SIO1readBaud32)(void);
-typedef void (CALLBACK* SIO1registerCallback)(void (CALLBACK *callback)(void));
-
-// SIO1 function pointers 
-extern SIO1init SIO1_init;
-extern SIO1shutdown SIO1_shutdown;
-extern SIO1open SIO1_open;
-extern SIO1close SIO1_close; 
-extern SIO1test SIO1_test;
-extern SIO1configure SIO1_configure;
-extern SIO1about SIO1_about;
-extern SIO1pause SIO1_pause;
-extern SIO1resume SIO1_resume;
-extern SIO1keypressed SIO1_keypressed;
-extern SIO1writeData8 SIO1_writeData8;
-extern SIO1writeData16 SIO1_writeData16;
-extern SIO1writeData32 SIO1_writeData32;
-extern SIO1writeStat16 SIO1_writeStat16;
-extern SIO1writeStat32 SIO1_writeStat32;
-extern SIO1writeMode16 SIO1_writeMode16;
-extern SIO1writeMode32 SIO1_writeMode32;
-extern SIO1writeCtrl16 SIO1_writeCtrl16;
-extern SIO1writeCtrl32 SIO1_writeCtrl32;
-extern SIO1writeBaud16 SIO1_writeBaud16;
-extern SIO1writeBaud32 SIO1_writeBaud32;
-extern SIO1readData8 SIO1_readData8;
-extern SIO1readData16 SIO1_readData16;
-extern SIO1readData32 SIO1_readData32;
-extern SIO1readStat16 SIO1_readStat16;
-extern SIO1readStat32 SIO1_readStat32;
-extern SIO1readMode16 SIO1_readMode16;
-extern SIO1readMode32 SIO1_readMode32;
-extern SIO1readCtrl16 SIO1_readCtrl16;
-extern SIO1readCtrl32 SIO1_readCtrl32;
-extern SIO1readBaud16 SIO1_readBaud16;
-extern SIO1readBaud32 SIO1_readBaud32;
-extern SIO1registerCallback SIO1_registerCallback;
-
-#endif
-
-void CALLBACK clearDynarec(void);
-
-void SetIsoFile(const char *filename);
-const char *GetIsoFile(void);
-boolean UsingIso(void);
-void SetCdOpenCaseTime(s64 time);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
+	unsigned char CRC[2];
+	char res1[72];
+};
+typedef long (CALLBACK* CDRreadCDDA)(unsigned char, unsigned char, unsigned char, unsigned char *);
+typedef long (CALLBACK* CDRgetTE)(unsigned char, unsigned char *, unsigned char *, unsigned char *);
+
+// CD-ROM function pointers
+extern CDRinit CDR_init;
+extern CDRshutdown CDR_shutdown;
+extern CDRopen CDR_open;
+extern CDRclose CDR_close;
+extern CDRtest CDR_test;
+extern CDRgetTN CDR_getTN;
+extern CDRgetTD CDR_getTD;
+extern CDRreadTrack CDR_readTrack;
+extern CDRgetBuffer CDR_getBuffer;
+extern CDRgetBufferSub CDR_getBufferSub;
+extern CDRplay CDR_play;
+extern CDRstop CDR_stop;
+extern CDRgetStatus CDR_getStatus;
+extern CDRgetDriveLetter CDR_getDriveLetter;
+extern CDRconfigure CDR_configure;
+extern CDRabout CDR_about;
+extern CDRsetfilename CDR_setfilename;
+extern CDRreadCDDA CDR_readCDDA;
+extern CDRgetTE CDR_getTE;
+
+// SPU Functions
+typedef long (CALLBACK* SPUinit)(void);
+typedef long (CALLBACK* SPUshutdown)(void);
+typedef long (CALLBACK* SPUclose)(void);
+typedef void (CALLBACK* SPUplaySample)(unsigned char);
+typedef void (CALLBACK* SPUwriteRegister)(unsigned long, unsigned short);
+typedef unsigned short (CALLBACK* SPUreadRegister)(unsigned long);
+typedef void (CALLBACK* SPUwriteDMA)(unsigned short);
+typedef unsigned short (CALLBACK* SPUreadDMA)(void);
+typedef void (CALLBACK* SPUwriteDMAMem)(unsigned short *, int);
+typedef void (CALLBACK* SPUreadDMAMem)(unsigned short *, int);
+typedef void (CALLBACK* SPUplayADPCMchannel)(xa_decode_t *);
+typedef void (CALLBACK* SPUregisterCallback)(void (CALLBACK *callback)(void));
+typedef long (CALLBACK* SPUconfigure)(void);
+typedef long (CALLBACK* SPUtest)(void);
+typedef void (CALLBACK* SPUabout)(void);
+typedef struct {
+	unsigned char PluginName[8];
+	uint32_t PluginVersion;
+	uint32_t Size;
+	unsigned char SPUPorts[0x200];
+	unsigned char SPURam[0x80000];
+	xa_decode_t xa;
+	unsigned char *SPUInfo;
+} SPUFreeze_t;
+typedef long (CALLBACK* SPUfreeze)(uint32_t, SPUFreeze_t *);
+typedef void (CALLBACK* SPUasync)(uint32_t);
+typedef void (CALLBACK* SPUplayCDDAchannel)(short *, int);
+
+// SPU function pointers
+extern SPUconfigure SPU_configure;
+extern SPUabout SPU_about;
+extern SPUinit SPU_init;
+extern SPUshutdown SPU_shutdown;
+extern SPUtest SPU_test;
+extern SPUopen SPU_open;
+extern SPUclose SPU_close;
+extern SPUplaySample SPU_playSample;
+extern SPUwriteRegister SPU_writeRegister;
+extern SPUreadRegister SPU_readRegister;
+extern SPUwriteDMA SPU_writeDMA;
+extern SPUreadDMA SPU_readDMA;
+extern SPUwriteDMAMem SPU_writeDMAMem;
+extern SPUreadDMAMem SPU_readDMAMem;
+extern SPUplayADPCMchannel SPU_playADPCMchannel;
+extern SPUfreeze SPU_freeze;
+extern SPUregisterCallback SPU_registerCallback;
+extern SPUasync SPU_async;
+extern SPUplayCDDAchannel SPU_playCDDAchannel;
+
+// PAD Functions
+typedef long (CALLBACK* PADconfigure)(void);
+typedef void (CALLBACK* PADabout)(void);
+typedef long (CALLBACK* PADinit)(long);
+typedef long (CALLBACK* PADshutdown)(void);
+typedef long (CALLBACK* PADtest)(void);
+typedef long (CALLBACK* PADclose)(void);
+typedef long (CALLBACK* PADquery)(void);
+typedef long (CALLBACK* PADreadPort1)(PadDataS*);
+typedef long (CALLBACK* PADreadPort2)(PadDataS*);
+typedef long (CALLBACK* PADkeypressed)(void);
+typedef unsigned char (CALLBACK* PADstartPoll)(int);
+typedef unsigned char (CALLBACK* PADpoll)(unsigned char);
+typedef void (CALLBACK* PADsetSensitive)(int);
+typedef void (CALLBACK* PADregisterVibration)(void (CALLBACK *callback)(uint32_t, uint32_t));
+typedef void (CALLBACK* PADregisterCursor)(void (CALLBACK *callback)(int, int, int));
+
+// PAD function pointers
+extern PADconfigure PAD1_configure;
+extern PADabout PAD1_about;
+extern PADinit PAD1_init;
+extern PADshutdown PAD1_shutdown;
+extern PADtest PAD1_test;
+extern PADopen PAD1_open;
+extern PADclose PAD1_close;
+extern PADquery PAD1_query;
+extern PADreadPort1 PAD1_readPort1;
+extern PADkeypressed PAD1_keypressed;
+extern PADstartPoll PAD1_startPoll;
+extern PADpoll PAD1_poll;
+extern PADsetSensitive PAD1_setSensitive;
+extern PADregisterVibration PAD1_registerVibration;
+extern PADregisterCursor PAD1_registerCursor;
+extern PADconfigure PAD2_configure;
+extern PADabout PAD2_about;
+extern PADinit PAD2_init;
+extern PADshutdown PAD2_shutdown;
+extern PADtest PAD2_test;
+extern PADopen PAD2_open;
+extern PADclose PAD2_close;
+extern PADquery PAD2_query;
+extern PADreadPort2 PAD2_readPort2;
+extern PADkeypressed PAD2_keypressed;
+extern PADstartPoll PAD2_startPoll;
+extern PADpoll PAD2_poll;
+extern PADsetSensitive PAD2_setSensitive;
+extern PADregisterVibration PAD2_registerVibration;
+extern PADregisterCursor PAD2_registerCursor;
+
+// NET Functions
+typedef long (CALLBACK* NETinit)(void);
+typedef long (CALLBACK* NETshutdown)(void);
+typedef long (CALLBACK* NETclose)(void);
+typedef long (CALLBACK* NETconfigure)(void);
+typedef long (CALLBACK* NETtest)(void);
+typedef void (CALLBACK* NETabout)(void);
+typedef void (CALLBACK* NETpause)(void);
+typedef void (CALLBACK* NETresume)(void);
+typedef long (CALLBACK* NETqueryPlayer)(void);
+typedef long (CALLBACK* NETsendData)(void *, int, int);
+typedef long (CALLBACK* NETrecvData)(void *, int, int);
+typedef long (CALLBACK* NETsendPadData)(void *, int);
+typedef long (CALLBACK* NETrecvPadData)(void *, int);
+
+typedef struct {
+	char EmuName[32];
+	char CdromID[9];	// ie. 'SCPH12345', no \0 trailing character
+	char CdromLabel[11];
+	void *psxMem;
+	GPUshowScreenPic GPU_showScreenPic;
+	GPUdisplayText GPU_displayText;
+	PADsetSensitive PAD_setSensitive;
+	char GPUpath[256];	// paths must be absolute
+	char SPUpath[256];
+	char CDRpath[256];
+	char MCD1path[256];
+	char MCD2path[256];
+	char BIOSpath[256];	// 'HLE' for internal bios
+	char Unused[1024];
+} netInfo;
+
+typedef long (CALLBACK* NETsetInfo)(netInfo *);
+typedef long (CALLBACK* NETkeypressed)(int);
+
+// NET function pointers
+extern NETinit NET_init;
+extern NETshutdown NET_shutdown;
+extern NETopen NET_open;
+extern NETclose NET_close;
+extern NETtest NET_test;
+extern NETconfigure NET_configure;
+extern NETabout NET_about;
+extern NETpause NET_pause;
+extern NETresume NET_resume;
+extern NETqueryPlayer NET_queryPlayer;
+extern NETsendData NET_sendData;
+extern NETrecvData NET_recvData;
+extern NETsendPadData NET_sendPadData;
+extern NETrecvPadData NET_recvPadData;
+extern NETsetInfo NET_setInfo;
+extern NETkeypressed NET_keypressed;
+
+#ifdef ENABLE_SIO1API
+
+// SIO1 Functions (link cable)
+typedef long (CALLBACK* SIO1init)(void);
+typedef long (CALLBACK* SIO1shutdown)(void);
+typedef long (CALLBACK* SIO1close)(void);
+typedef long (CALLBACK* SIO1configure)(void);
+typedef long (CALLBACK* SIO1test)(void);
+typedef void (CALLBACK* SIO1about)(void);
+typedef void (CALLBACK* SIO1pause)(void);
+typedef void (CALLBACK* SIO1resume)(void);
+typedef long (CALLBACK* SIO1keypressed)(int);
+typedef void (CALLBACK* SIO1writeData8)(u8);
+typedef void (CALLBACK* SIO1writeData16)(u16);
+typedef void (CALLBACK* SIO1writeData32)(u32);
+typedef void (CALLBACK* SIO1writeStat16)(u16);
+typedef void (CALLBACK* SIO1writeStat32)(u32);
+typedef void (CALLBACK* SIO1writeMode16)(u16);
+typedef void (CALLBACK* SIO1writeMode32)(u32);
+typedef void (CALLBACK* SIO1writeCtrl16)(u16);
+typedef void (CALLBACK* SIO1writeCtrl32)(u32);
+typedef void (CALLBACK* SIO1writeBaud16)(u16);
+typedef void (CALLBACK* SIO1writeBaud32)(u32);
+typedef u8 (CALLBACK* SIO1readData8)(void);
+typedef u16 (CALLBACK* SIO1readData16)(void);
+typedef u32 (CALLBACK* SIO1readData32)(void);
+typedef u16 (CALLBACK* SIO1readStat16)(void);
+typedef u32 (CALLBACK* SIO1readStat32)(void);
+typedef u16 (CALLBACK* SIO1readMode16)(void);
+typedef u32 (CALLBACK* SIO1readMode32)(void);
+typedef u16 (CALLBACK* SIO1readCtrl16)(void);
+typedef u32 (CALLBACK* SIO1readCtrl32)(void);
+typedef u16 (CALLBACK* SIO1readBaud16)(void);
+typedef u32 (CALLBACK* SIO1readBaud32)(void);
+typedef void (CALLBACK* SIO1update)(uint32_t);
+typedef void (CALLBACK* SIO1registerCallback)(void (CALLBACK *callback)(void));
+
+// SIO1 function pointers
+extern SIO1init SIO1_init;
+extern SIO1shutdown SIO1_shutdown;
+extern SIO1open SIO1_open;
+extern SIO1close SIO1_close;
+extern SIO1test SIO1_test;
+extern SIO1configure SIO1_configure;
+extern SIO1about SIO1_about;
+extern SIO1pause SIO1_pause;
+extern SIO1resume SIO1_resume;
+extern SIO1keypressed SIO1_keypressed;
+extern SIO1writeData8 SIO1_writeData8;
+extern SIO1writeData16 SIO1_writeData16;
+extern SIO1writeData32 SIO1_writeData32;
+extern SIO1writeStat16 SIO1_writeStat16;
+extern SIO1writeStat32 SIO1_writeStat32;
+extern SIO1writeMode16 SIO1_writeMode16;
+extern SIO1writeMode32 SIO1_writeMode32;
+extern SIO1writeCtrl16 SIO1_writeCtrl16;
+extern SIO1writeCtrl32 SIO1_writeCtrl32;
+extern SIO1writeBaud16 SIO1_writeBaud16;
+extern SIO1writeBaud32 SIO1_writeBaud32;
+extern SIO1readData8 SIO1_readData8;
+extern SIO1readData16 SIO1_readData16;
+extern SIO1readData32 SIO1_readData32;
+extern SIO1readStat16 SIO1_readStat16;
+extern SIO1readStat32 SIO1_readStat32;
+extern SIO1readMode16 SIO1_readMode16;
+extern SIO1readMode32 SIO1_readMode32;
+extern SIO1readCtrl16 SIO1_readCtrl16;
+extern SIO1readCtrl32 SIO1_readCtrl32;
+extern SIO1readBaud16 SIO1_readBaud16;
+extern SIO1readBaud32 SIO1_readBaud32;
+extern SIO1update SIO1_update;
+extern SIO1registerCallback SIO1_registerCallback;
+
+#endif
+
+void CALLBACK clearDynarec(void);
+
+void SetIsoFile(const char *filename);
+const char *GetIsoFile(void);
+boolean UsingIso(void);
+void SetCdOpenCaseTime(s64 time);
+
+#ifdef __cplusplus
+}
+#endif
+#endif

pcsxr-1.9.92.tar.bz2/libpcsxcore/ppc/pGte.h -> pcsxr-1.9.93.tar.bz2/libpcsxcore/ppc/pGte.h Changed

pcsxr-1.9.92.tar.bz2/libpcsxcore/ppc/pR3000A.c -> pcsxr-1.9.93.tar.bz2/libpcsxcore/ppc/pR3000A.c Changed

pcsxr-1.9.92.tar.bz2/libpcsxcore/ppc/pasm.s -> pcsxr-1.9.93.tar.bz2/libpcsxcore/ppc/pasm.s Changed

@@ -1,4 +1,11 @@
 
+#if defined (__ppc__) || defined (__ppc64__) || defined (__powerpc__) || defined (__powerpc64__) || defined (__POWERPC__)
+
+#if defined (ELF) || defined (__linux__)
+#define C(label) label
+#else
+#define C(label) _##label
+#endif
 
 #define OLD_REGISTER_OFFSET	(19*4)
 #define SP_SIZE			(OLD_REGISTER_OFFSET+4+8)
@@ -6,8 +13,8 @@
 /*asm void recRun(register void (*func)(), register u32 hw1, register u32 hw2)*/
         .text
         .align  4
-        .globl  recRun
-recRun:
+        .globl  C(recRun)
+C(recRun):
 	/* prologue code */
 	mflr	r0
 	stmw	r13, -(32-13)*4(r1)
@@ -25,8 +32,8 @@
 {*/
         .text
         .align  4
-        .globl  returnPC
-returnPC:
+        .globl  C(returnPC)
+C(returnPC):
 	// end code
 	lwz		r0, (32-13)*4+8+4(r1)
 	addi	r1, r1, (32-13)*4+8
@@ -39,15 +46,15 @@
 
         .text
         .align  4
-        .globl  dynMemRead8
-dynMemRead8:
+        .globl  C(dynMemRead8)
+C(dynMemRead8):
 // assumes that memory pointer is in r30
 	addis    r2,r3,-0x1f80
 	srwi.     r4,r2,16
 	bne+     .norm8
 	cmplwi   r2,0x1000
 	blt-     .norm8
-	b        psxHwRead8
+	b        C(psxHwRead8)
 .norm8:
 	clrlwi   r5,r3,3
 	lbzx     r3,r5,r30
@@ -55,15 +62,15 @@
 
         .text
         .align  4
-        .globl  dynMemRead16
-dynMemRead16:
+        .globl  C(dynMemRead16)
+C(dynMemRead16):
 // assumes that memory pointer is in r30
 	addis    r2,r3,-0x1f80
 	srwi.     r4,r2,16
 	bne+     .norm16
 	cmplwi   r2,0x1000
 	blt-     .norm16
-	b        psxHwRead16
+	b        C(psxHwRead16)
 .norm16:
 	clrlwi   r5,r3,3
 	lhbrx    r3,r5,r30
@@ -71,15 +78,15 @@
 
         .text
         .align  4
-        .globl  dynMemRead32
-dynMemRead32:
+        .globl  C(dynMemRead32)
+C(dynMemRead32):
 // assumes that memory pointer is in r30
 	addis    r2,r3,-0x1f80
 	srwi.     r4,r2,16
 	bne+     .norm32
 	cmplwi   r2,0x1000
 	blt-     .norm32
-	b        psxHwRead32
+	b        C(psxHwRead32)
 .norm32:
 	clrlwi   r5,r3,3
 	lwbrx    r3,r5,r30
@@ -98,15 +105,15 @@
 
         .text
         .align  4
-        .globl  dynMemWrite32
-dynMemWrite32:
+        .globl  C(dynMemWrite32)
+C(dynMemWrite32):
 // assumes that memory pointer is in r30
 	addis    r2,r3,-0x1f80
 	srwi.    r5,r2,16
 	bne+     .normw32
 	cmplwi   r2,0x1000
 	blt      .normw32
-	b        psxHwWrite32
+	b        C(psxHwWrite32)
 .normw32:
 	mtcrf    0xFF, r3
 	clrlwi   r5,r3,3
@@ -122,3 +129,4 @@
 	stwbrx   r4,r5,r30
 	blr
 
+#endif

pcsxr-1.9.92.tar.bz2/libpcsxcore/ppc/ppc.c -> pcsxr-1.9.93.tar.bz2/libpcsxcore/ppc/ppc.c Changed

pcsxr-1.9.92.tar.bz2/libpcsxcore/ppc/reguse.c -> pcsxr-1.9.93.tar.bz2/libpcsxcore/ppc/reguse.c Changed

pcsxr-1.9.92.tar.bz2/libpcsxcore/ppf.c -> pcsxr-1.9.93.tar.bz2/libpcsxcore/ppf.c Changed

@@ -1,7 +1,8 @@
-/* PPF Patch Support for PCSX-Reloaded
+/* PPF/SBI Support for PCSX-Reloaded
 * Copyright (c) 2009, Wei Mingzhi <whistler_wmz@users.sf.net>.
+ * Copyright (c) 2010, shalma.
 *
- * Based on P.E.Op.S CDR Plugin by Pete Bernert.
+ * PPF code based on P.E.Op.S CDR Plugin by Pete Bernert.
 * Copyright (c) 2002, Pete Bernert.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -16,7 +17,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
 #include "psxcommon.h"
@@ -190,6 +191,8 @@
 
 	FreePPFCache();
 
+ if (CdromId[0] == '\0') return;
+
 	// Generate filename in the format of SLUS_123.45
 	buffer[0] = toupper(CdromId[0]);
 	buffer[1] = toupper(CdromId[1]);
@@ -204,7 +207,7 @@
 	buffer[10] = CdromId[8];
 	buffer[11] = '\0';
 
-	sprintf(szPPF, "%s%s", Config.PatchesDir, buffer);
+	sprintf(szPPF, "%s/%s", Config.PatchesDir, buffer);
 
 	ppffile = fopen(szPPF, "rb");
 	if (ppffile == NULL) return;
@@ -330,3 +333,73 @@
 
 	SysPrintf(_("Loaded PPF %d.0 patch: %s.\n"), method + 1, szPPF);
 }
+
+// redump.org SBI files
+static u8 sbitime[256][3], sbicount;
+
+int LoadSBI(const char *filename) {
+	FILE *sbihandle;
+	char buffer[16], sbifile[MAXPATHLEN];
+
+	if (filename == NULL) {
+		if (CdromId[0] == '\0') return -1;
+
+		// Generate filename in the format of SLUS_123.45.sbi
+		buffer[0] = toupper(CdromId[0]);
+		buffer[1] = toupper(CdromId[1]);
+		buffer[2] = toupper(CdromId[2]);
+		buffer[3] = toupper(CdromId[3]);
+		buffer[4] = '_';
+		buffer[5] = CdromId[4];
+		buffer[6] = CdromId[5];
+		buffer[7] = CdromId[6];
+		buffer[8] = '.';
+		buffer[9] = CdromId[7];
+		buffer[10] = CdromId[8];
+		buffer[11] = '.';
+		buffer[12] = 's';
+		buffer[13] = 'b';
+		buffer[14] = 'i';
+		buffer[15] = '\0';
+
+		sprintf(sbifile, "%s%s", Config.PatchesDir, buffer);
+		filename = sbifile;
+	}
+
+	sbihandle = fopen(filename, "rb");
+	if (sbihandle == NULL) return -1;
+
+	// init
+	sbicount = 0;
+
+	// 4-byte SBI header
+	fread(buffer, 1, 4, sbihandle);
+	while (!feof(sbihandle)) {
+		fread(sbitime[sbicount++], 1, 3, sbihandle);
+		fread(buffer, 1, 11, sbihandle);
+	}
+
+	fclose(sbihandle);
+
+	SysPrintf(_("Loaded SBI file: %s.\n"), filename);
+
+	return 0;
+}
+
+boolean CheckSBI(const u8 *time) {
+	int lcv;
+
+	// both BCD format
+	for (lcv = 0; lcv < sbicount; lcv++) {
+		if (time[0] == sbitime[lcv][0] && 
+				time[1] == sbitime[lcv][1] && 
+				time[2] == sbitime[lcv][2])
+			return TRUE;
+	}
+
+	return FALSE;
+}
+
+void UnloadSBI(void) {
+	sbicount = 0;
+}

pcsxr-1.9.92.tar.bz2/libpcsxcore/ppf.h -> pcsxr-1.9.93.tar.bz2/libpcsxcore/ppf.h Changed

pcsxr-1.9.92.tar.bz2/libpcsxcore/psemu_plugin_defs.h -> pcsxr-1.9.93.tar.bz2/libpcsxcore/psemu_plugin_defs.h Changed

pcsxr-1.9.92.tar.bz2/libpcsxcore/psxbios.c -> pcsxr-1.9.93.tar.bz2/libpcsxcore/psxbios.c Changed

@@ -14,15 +14,13 @@
 * You should have received a copy of the GNU General Public License *
 * along with this program; if not, write to the *
 * Free Software Foundation, Inc., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
 ***************************************************************************/
 
 /*
 * Internal simulated HLE BIOS.
 */
 
-// TODO: implement all system calls, count the exact CPU cycles of system calls.
-
 #include "psxbios.h"
 #include "psxhw.h"
 
@@ -256,6 +254,7 @@
 static TCB Thread[8];
 static int CurThread = 0;
 static FileDesc FDesc[32];
+static u32 card_active_chan = 0;
 
 boolean hleSoftCall = FALSE;
 
@@ -934,7 +933,7 @@
 	heap_end = (u32 *)((u8 *)heap_addr + size);
 	*heap_addr = SWAP32(size | 1);
 
-	SysPrintf("InitHeap %x,%x : %x %x\n",a0,a1, (uptr)heap_addr-(uptr)psxM, size);
+	SysPrintf("InitHeap %x,%x : %lx %x\n",a0,a1, (uptr)heap_addr-(uptr)psxM, size);
 
 	pc0 = ra;
 }
@@ -984,7 +983,7 @@
 					case 'g': case 'G':
 						ptmp += sprintf(ptmp, tmp2, (double)psxMu32(sp + n * 4)); n++; break;
 					case 'p':
-					case 'i':
+					case 'i': case 'u':
 					case 'd': case 'D':
 					case 'o': case 'O':
 					case 'x': case 'X':
@@ -1006,7 +1005,11 @@
 
 	memcpy((char*)PSXM(sp), save, 4 * 4);
 
-	SysPrintf(tmp);
+#ifdef PSXBIOS_LOG
+	PSXBIOS_LOG("psxBios_%s: %s\n", biosA0n[0x3f], tmp);
+#else
+	SysPrintf("%s", tmp);
+#endif
 
 	pc0 = ra;
 }
@@ -1071,6 +1074,8 @@
 	PSXBIOS_LOG("psxBios_%s\n", biosA0n[0x44]);
 #endif
 
+	psxRegs.ICache_valid = FALSE;
+
 	pc0 = ra;
 }
 
@@ -1237,6 +1242,8 @@
 	PSXBIOS_LOG("psxBios_%s: %x\n", biosA0n[0xab], a0);
 #endif
 
+	card_active_chan = a0;
+
 //	DeliverEvent(0x11, 0x2); // 0xf0000011, 0x0004
 	DeliverEvent(0x81, 0x2); // 0xf4000001, 0x0004
 
@@ -1248,6 +1255,8 @@
 	PSXBIOS_LOG("psxBios_%s: %x\n", biosA0n[0xac], a0);
 #endif
 
+	card_active_chan = a0;
+
 //	DeliverEvent(0x11, 0x2); // 0xf0000011, 0x0004
 	DeliverEvent(0x81, 0x2); // 0xf4000001, 0x0004
 
@@ -1804,13 +1813,36 @@
 	pc0 = ra;
 }
 
+#define PSXSTRBUFMAX 255
+char psxstrbuf[PSXSTRBUFMAX+1];
+unsigned short psxstrbuf_count = 0;
+
 void psxBios_putchar() { // 3d
+ char logchar = ( a0 == 0xa ? '>' : (char)a0 );
+ if (psxstrbuf_count < PSXSTRBUFMAX) psxstrbuf[psxstrbuf_count++] = logchar;
+
+#ifdef PSXBIOS_LOG
+	PSXBIOS_LOG("psxBios_%s: %x (%c)\n", biosB0n[0x3d], a0, logchar);
+#else
 	SysPrintf("%c", (char)a0);
+#endif
+ if ((a0 == 0xa && psxstrbuf_count >= 2) || psxstrbuf_count >= PSXSTRBUFMAX) {
+ psxstrbuf[psxstrbuf_count++] = '\0';
+#ifdef PSXBIOS_LOG
+ PSXBIOS_LOG("psxBios_%s: string_[%d]_cr: %s\n", biosB0n[0x3d], psxstrbuf_count, psxstrbuf);
+#endif
+ psxstrbuf_count = 0;
+ }
+
 	pc0 = ra;
 }
 
 void psxBios_puts() { // 3e/3f
-	SysPrintf(Ra0);
+#ifdef PSXBIOS_LOG
+	PSXBIOS_LOG("psxBios_%s: %s\n", biosB0n[0x3f], Ra0);
+#else
+	SysPrintf("%s", Ra0);
+#endif
 	pc0 = ra;
 }
 
@@ -1826,7 +1858,8 @@
 		if ((*ptr & 0xF0) != 0x50) continue; \
 		ptr+= 0xa; \
 		if (pfile[0] == 0) { \
-			strcpy(dir->name, ptr); \
+			strncpy(dir->name, ptr, sizeof(dir->name)); \
+			dir->name[sizeof(dir->name) - 1] = '\0'; \
 		} else for (i=0; i<20; i++) { \
 			if (pfile[i] == ptr[i]) { \
 				dir->name[i] = ptr[i]; \
@@ -1866,14 +1899,13 @@
 	nfile = 1;
 	if (!strncmp(Ra0, "bu00", 4)) {
 		bufile(1);
-		v0 = _dir;
-	}
-
-	if (!strncmp(Ra0, "bu10", 4)) {
+	} else if (!strncmp(Ra0, "bu10", 4)) {
 		bufile(2);
-		v0 = _dir;
 	}
 
+	// firstfile() calls _card_read() internally, so deliver it's event
+	DeliverEvent(0x11, 0x2);
+
 	pc0 = ra;
 }
 
@@ -2022,6 +2054,7 @@
 	PSXBIOS_LOG("psxBios_%s: %x,%x,%x\n", biosB0n[0x4e], a0, a1, a2);
 #endif
 
+	card_active_chan = a0;
 	port = a0 >> 4;
 
 	if (port == 0) {
@@ -2045,6 +2078,7 @@
 	PSXBIOS_LOG("psxBios_%s\n", biosB0n[0x4f]);
 #endif
 
+	card_active_chan = a0;
 	port = a0 >> 4;
 
 	if (port == 0) {
@@ -2126,6 +2160,15 @@
 	v0 = 0x874; pc0 = ra;
 }
 
+void psxBios__card_chan() { // 0x58
+#ifdef PSXBIOS_LOG
+	PSXBIOS_LOG("psxBios_%s\n", biosB0n[0x58]);
+#endif
+
+	v0 = card_active_chan;
+	pc0 = ra;
+}
+
 void psxBios_ChangeClearPad() { // 5b
 #ifdef PSXBIOS_LOG
 	PSXBIOS_LOG("psxBios_%s: %x\n", biosB0n[0x5b], a0);
@@ -2483,7 +2526,7 @@
 	//biosB0[0x55] = psxBios__get_error;
 	biosB0[0x56] = psxBios_GetC0Table;
 	biosB0[0x57] = psxBios_GetB0Table;
-	//biosB0[0x58] = psxBios__card_chan;
+	biosB0[0x58] = psxBios__card_chan;
 	//biosB0[0x59] = psxBios_sys_b0_59;
 	//biosB0[0x5a] = psxBios_sys_b0_5a;
 	biosB0[0x5b] = psxBios_ChangeClearPad;
@@ -2542,6 +2585,18 @@
 	memset(Thread, 0, sizeof(Thread));
 	Thread[0].status = 2; // main thread
 
+	jmp_int = NULL;
+	pad_buf = NULL;
+	pad_buf1 = NULL;
+	pad_buf2 = NULL;
+	pad_buf1len = pad_buf2len = 0;
+	heap_addr = NULL;
+	heap_end = NULL;
+	CardState = -1;
+	CurThread = 0;
+	memset(FDesc, 0, sizeof(FDesc));
+	card_active_chan = 0;
+
 	psxMu32ref(0x0150) = SWAPu32(0x160);
 	psxMu32ref(0x0154) = SWAPu32(0x320);
 	psxMu32ref(0x0160) = SWAPu32(0x248);
@@ -2807,4 +2862,5 @@
 	bfreezes(Thread);
 	bfreezel(&CurThread);
 	bfreezes(FDesc);
+	bfreezel(&card_active_chan);
 }

pcsxr-1.9.92.tar.bz2/libpcsxcore/psxbios.h -> pcsxr-1.9.93.tar.bz2/libpcsxcore/psxbios.h Changed

pcsxr-1.9.92.tar.bz2/libpcsxcore/psxcommon.c -> pcsxr-1.9.93.tar.bz2/libpcsxcore/psxcommon.c Changed

pcsxr-1.9.92.tar.bz2/libpcsxcore/psxcommon.h -> pcsxr-1.9.93.tar.bz2/libpcsxcore/psxcommon.h Changed

pcsxr-1.9.92.tar.bz2/libpcsxcore/psxcounters.c -> pcsxr-1.9.93.tar.bz2/libpcsxcore/psxcounters.c Changed

pcsxr-1.9.92.tar.bz2/libpcsxcore/psxcounters.h -> pcsxr-1.9.93.tar.bz2/libpcsxcore/psxcounters.h Changed

pcsxr-1.9.92.tar.bz2/libpcsxcore/psxdma.c -> pcsxr-1.9.93.tar.bz2/libpcsxcore/psxdma.c Changed

pcsxr-1.9.92.tar.bz2/libpcsxcore/psxdma.h -> pcsxr-1.9.93.tar.bz2/libpcsxcore/psxdma.h Changed

pcsxr-1.9.92.tar.bz2/libpcsxcore/psxhle.c -> pcsxr-1.9.93.tar.bz2/libpcsxcore/psxhle.c Changed

pcsxr-1.9.92.tar.bz2/libpcsxcore/psxhle.h -> pcsxr-1.9.93.tar.bz2/libpcsxcore/psxhle.h Changed

pcsxr-1.9.92.tar.bz2/libpcsxcore/psxhw.c -> pcsxr-1.9.93.tar.bz2/libpcsxcore/psxhw.c Changed

pcsxr-1.9.92.tar.bz2/libpcsxcore/psxhw.h -> pcsxr-1.9.93.tar.bz2/libpcsxcore/psxhw.h Changed

pcsxr-1.9.92.tar.bz2/libpcsxcore/psxinterpreter.c -> pcsxr-1.9.93.tar.bz2/libpcsxcore/psxinterpreter.c Changed

@@ -14,7 +14,7 @@
 * You should have received a copy of the GNU General Public License *
 * along with this program; if not, write to the *
 * Free Software Foundation, Inc., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
 ***************************************************************************/
 
 /*
@@ -33,12 +33,12 @@
 // These macros are used to assemble the repassembler functions
 
 #ifdef PSXCPU_LOG
-#define debugI() PSXCPU_LOG("%s\n", disR3000AF(psxRegs.code, psxRegs.pc)); 
+	#define debugI() if (Config.PsxOut) { PSXCPU_LOG("%s\n", disR3000AF(psxRegs.code, psxRegs.pc)); }
 #else
-#define debugI()
+	#define debugI()
 #endif
 
-inline void execI();
+static inline void execI();
 
 // Subsets
 void (*psxBSC[64])();
@@ -59,13 +59,13 @@
 
 	psxRegs.pc = bpc;
 
-	psxBranchTest();
+	branch = 0;
 
 	psxRegs.GPR.r[reg] = rold;
 	execI(); // first branch opcode
 	psxRegs.GPR.r[reg] = rnew;
 
-	branch = 0;
+	psxBranchTest();
 }
 
 static void delayWrite(int reg, u32 bpc) {
@@ -153,8 +153,12 @@
 
 		case 0x01: // REGIMM
 			switch (_tRt_) {
-				case 0x00: case 0x02:
-				case 0x10: case 0x12: // BLTZ/BGEZ...
+				case 0x00: case 0x01:
+				case 0x10: case 0x11: // BLTZ/BGEZ...
+					// Xenogears - lbu v0 / beq v0
+					// - no load delay (fixes battle loading)
+					break;
+
 					if (_tRs_ == reg) return 2;
 					break;
 			}
@@ -166,10 +170,18 @@
 			break;
 
 		case 0x04: case 0x05: // BEQ/BNE
+			// Xenogears - lbu v0 / beq v0
+			// - no load delay (fixes battle loading)
+			break;
+
 			if (_tRs_ == reg || _tRt_ == reg) return 2;
 			break;
 
 		case 0x06: case 0x07: // BLEZ/BGTZ
+			// Xenogears - lbu v0 / beq v0
+			// - no load delay (fixes battle loading)
+			break;
+
 			if (_tRs_ == reg) return 2;
 			break;
 
@@ -253,7 +265,9 @@
 	u32 *code;
 	u32 tmp;
 
-	code = (u32 *)PSXM(bpc);
+	// Don't execute yet - just peek
+	code = Read_ICache(bpc, TRUE);
+
 	tmp = ((code == NULL) ? 0 : SWAP32(*code));
 	branch = 1;
 
@@ -273,14 +287,142 @@
 	psxBranchTest();
 }
 
-__inline void doBranch(u32 tar) {
+static u32 psxBranchNoDelay(void) {
+	u32 *code;
+	u32 temp;
+
+	code = Read_ICache(psxRegs.pc, TRUE);
+	psxRegs.code = ((code == NULL) ? 0 : SWAP32(*code));
+	switch (_Op_) {
+		case 0x00: // SPECIAL
+			switch (_Funct_) {
+				case 0x08: // JR
+					return _u32(_rRs_);
+				case 0x09: // JALR
+					temp = _u32(_rRs_);
+					if (_Rd_) { _SetLink(_Rd_); }
+					return temp;
+			}
+			break;
+		case 0x01: // REGIMM
+			switch (_Rt_) {
+				case 0x00: // BLTZ
+					if (_i32(_rRs_) < 0)
+						return _BranchTarget_;
+					break;
+				case 0x01: // BGEZ
+					if (_i32(_rRs_) >= 0)
+						return _BranchTarget_;
+					break;
+				case 0x08: // BLTZAL
+					if (_i32(_rRs_) < 0) {
+						_SetLink(31);
+						return _BranchTarget_;
+					}
+					break;
+				case 0x09: // BGEZAL
+					if (_i32(_rRs_) >= 0) {
+						_SetLink(31);
+						return _BranchTarget_;
+					}
+					break;
+			}
+			break;
+		case 0x02: // J
+			return _JumpTarget_;
+		case 0x03: // JAL
+			_SetLink(31);
+			return _JumpTarget_;
+		case 0x04: // BEQ
+			if (_i32(_rRs_) == _i32(_rRt_))
+				return _BranchTarget_;
+			break;
+		case 0x05: // BNE
+			if (_i32(_rRs_) != _i32(_rRt_))
+				return _BranchTarget_;
+			break;
+		case 0x06: // BLEZ
+			if (_i32(_rRs_) <= 0)
+				return _BranchTarget_;
+			break;
+		case 0x07: // BGTZ
+			if (_i32(_rRs_) > 0)
+				return _BranchTarget_;
+			break;
+	}
+
+	return (u32)-1;
+}
+
+static int psxDelayBranchExec(u32 tar) {
+	execI();
+
+	branch = 0;
+	psxRegs.pc = tar;
+	psxRegs.cycle += BIAS;
+	psxBranchTest();
+	return 1;
+}
+
+static int psxDelayBranchTest(u32 tar1) {
+	u32 tar2, tmp1, tmp2;
+
+	tar2 = psxBranchNoDelay();
+	if (tar2 == (u32)-1)
+		return 0;
+
+	debugI();
+
+	/*
+	 * Branch in delay slot:
+	 * - execute 1 instruction at tar1
+	 * - jump to tar2 (target of branch in delay slot; this branch
+	 * has no normal delay slot, instruction at tar1 was fetched instead)
+	 */
+	psxRegs.pc = tar1;
+	tmp1 = psxBranchNoDelay();
+	if (tmp1 == (u32)-1) {
+		return psxDelayBranchExec(tar2);
+	}
+	debugI();
+	psxRegs.cycle += BIAS;
+
+	/*
+	 * Got a branch at tar1:
+	 * - execute 1 instruction at tar2
+	 * - jump to target of that branch (tmp1)
+	 */
+	psxRegs.pc = tar2;
+	tmp2 = psxBranchNoDelay();
+	if (tmp2 == (u32)-1) {
+		return psxDelayBranchExec(tmp1);
+	}
+	debugI();
+	psxRegs.cycle += BIAS;
+
+	/*
+	 * Got a branch at tar2:
+	 * - execute 1 instruction at tmp1
+	 * - jump to target of that branch (tmp2)
+	 */
+	psxRegs.pc = tmp1;
+	return psxDelayBranchExec(tmp2);
+}
+
+static __inline void doBranch(u32 tar) {
 	u32 *code;
 	u32 tmp;
 
 	branch2 = branch = 1;
 	branchPC = tar;
 
-	code = (u32 *)PSXM(psxRegs.pc);
+	// notaz: check for branch in delay slot
+	if (psxDelayBranchTest(tar))
+		return;
+
+	// branch delay slot
+	code = Read_ICache(psxRegs.pc, TRUE);
+
 	psxRegs.code = ((code == NULL) ? 0 : SWAP32(*code));
 
 	debugI();
@@ -366,6 +508,10 @@
 		_i32(_rLo_) = _i32(_rRs_) / _i32(_rRt_);
 		_i32(_rHi_) = _i32(_rRs_) % _i32(_rRt_);
 	}
+	else {
+		_i32(_rLo_) = 0xffffffff;
+		_i32(_rHi_) = _i32(_rRs_);
+	}
 }
 
 void psxDIVU() {
@@ -373,6 +519,10 @@
 		_rLo_ = _rRs_ / _rRt_;
 		_rHi_ = _rRs_ % _rRt_;
 	}
+	else {
+		_rLo_ = 0xffffffff;
+		_rHi_ = _rRs_;
+	}
 }
 
 void psxMULT() {
@@ -423,7 +573,7 @@
 * Load higher 16 bits of the first word in GPR with imm *
 * Format: OP rt, immediate *
 *********************************************************/
-void psxLUI() { if (!_Rt_) return; _u32(_rRt_) = psxRegs.code << 16; } // Upper halfword of Rt = Im
+void psxLUI() { if (!_Rt_) return; _u32(_rRt_) = _ImmLU_; } // Upper halfword of Rt = Im
 
 /*********************************************************
 * Move from HI/LO to GPR *
@@ -497,6 +647,18 @@
 #define _oB_ (_u32(_rRs_) + _Imm_)
 
 void psxLB() {
+	// load delay = 1 latency
+	if( branch == 0 )
+	{
+		// simulate: beq r0,r0,lw+4 / lw / (delay slot)
+		psxRegs.pc -= 4;
+		doBranch( psxRegs.pc + 4 );
+
+		return;
+	}
+
+
+
 	if (_Rt_) {
 		_i32(_rRt_) = (signed char)psxMemRead8(_oB_); 
 	} else {
@@ -505,6 +667,18 @@
 }
 
 void psxLBU() {
+	// load delay = 1 latency
+	if( branch == 0 )
+	{
+		// simulate: beq r0,r0,lw+4 / lw / (delay slot)
+		psxRegs.pc -= 4;
+		doBranch( psxRegs.pc + 4 );
+
+		return;
+	}
+
+
+
 	if (_Rt_) {
 		_u32(_rRt_) = psxMemRead8(_oB_);
 	} else {
@@ -513,6 +687,18 @@
 }
 
 void psxLH() {
+	// load delay = 1 latency
+	if( branch == 0 )
+	{
+		// simulate: beq r0,r0,lw+4 / lw / (delay slot)
+		psxRegs.pc -= 4;
+		doBranch( psxRegs.pc + 4 );
+
+		return;
+	}
+
+
+
 	if (_Rt_) {
 		_i32(_rRt_) = (short)psxMemRead16(_oB_);
 	} else {
@@ -521,6 +707,18 @@
 }
 
 void psxLHU() {
+	// load delay = 1 latency
+	if( branch == 0 )
+	{
+		// simulate: beq r0,r0,lw+4 / lw / (delay slot)
+		psxRegs.pc -= 4;
+		doBranch( psxRegs.pc + 4 );
+
+		return;
+	}
+
+
+
 	if (_Rt_) {
 		_u32(_rRt_) = psxMemRead16(_oB_);
 	} else {
@@ -529,6 +727,18 @@
 }
 
 void psxLW() {
+	// load delay = 1 latency
+	if( branch == 0 )
+	{
+		// simulate: beq r0,r0,lw+4 / lw / (delay slot)
+		psxRegs.pc -= 4;
+		doBranch( psxRegs.pc + 4 );
+
+		return;
+	}
+
+
+
 	if (_Rt_) {
 		_u32(_rRt_) = psxMemRead32(_oB_);
 	} else {
@@ -544,6 +754,18 @@
 	u32 shift = addr & 3;
 	u32 mem = psxMemRead32(addr & ~3);
 
+
+	// load delay = 1 latency
+	if( branch == 0 )
+	{
+		// simulate: beq r0,r0,lw+4 / lw / (delay slot)
+		psxRegs.pc -= 4;
+		doBranch( psxRegs.pc + 4 );
+
+		return;
+	}
+
+
 	if (!_Rt_) return;
 	_u32(_rRt_) =	( _u32(_rRt_) & LWL_MASK[shift]) | 
 					( mem << LWL_SHIFT[shift]);
@@ -566,6 +788,20 @@
 	u32 shift = addr & 3;
 	u32 mem = psxMemRead32(addr & ~3);
 
+
+	
+	// load delay = 1 latency
+	if( branch == 0 )
+	{
+		// simulate: beq r0,r0,lw+4 / lw / (delay slot)
+		psxRegs.pc -= 4;
+		doBranch( psxRegs.pc + 4 );
+
+		return;
+	}
+
+
+
 	if (!_Rt_) return;
 	_u32(_rRt_) =	( _u32(_rRt_) & LWR_MASK[shift]) | 
 					( mem >> LWR_SHIFT[shift]);
@@ -629,8 +865,41 @@
 * Moves between GPR and COPx *
 * Format: OP rt, fs *
 *********************************************************/
-void psxMFC0() { if (!_Rt_) return; _i32(_rRt_) = (int)_rFs_; }
-void psxCFC0() { if (!_Rt_) return; _i32(_rRt_) = (int)_rFs_; }
+void psxMFC0()
+{
+	// load delay = 1 latency
+	if( branch == 0 )
+	{
+		// simulate: beq r0,r0,lw+4 / lw / (delay slot)
+		psxRegs.pc -= 4;
+		doBranch( psxRegs.pc + 4 );
+
+		return;
+	}
+
+
+	if (!_Rt_) return;
+	
+	_i32(_rRt_) = (int)_rFs_;
+}
+
+void psxCFC0()
+{
+	// load delay = 1 latency
+	if( branch == 0 )
+	{
+		// simulate: beq r0,r0,lw+4 / lw / (delay slot)
+		psxRegs.pc -= 4;
+		doBranch( psxRegs.pc + 4 );
+
+		return;
+	}
+
+
+	if (!_Rt_) return;
+	
+	_i32(_rRt_) = (int)_rFs_;
+}
 
 void psxTestSWInts() {
 	// the next code is untested, if u know please
@@ -641,7 +910,7 @@
 	}
 }
 
-__inline void MTC0(int reg, u32 val) {
+static __inline void MTC0(int reg, u32 val) {
 //	SysPrintf("MTC0 %d: %x\n", reg, val);
 	switch (reg) {
 		case 12: // Status
@@ -663,6 +932,40 @@
 void psxMTC0() { MTC0(_Rd_, _u32(_rRt_)); }
 void psxCTC0() { MTC0(_Rd_, _u32(_rRt_)); }
 
+
+
+void psxMFC2()
+{
+	// load delay = 1 latency
+	if( branch == 0 )
+	{
+		// simulate: beq r0,r0,lw+4 / lw / (delay slot)
+		psxRegs.pc -= 4;
+		doBranch( psxRegs.pc + 4 );
+
+		return;
+	}
+
+	gteMFC2();
+}
+
+
+void psxCFC2()
+{
+	// load delay = 1 latency
+	if( branch == 0 )
+	{
+		// simulate: beq r0,r0,lw+4 / lw / (delay slot)
+		psxRegs.pc -= 4;
+		doBranch( psxRegs.pc + 4 );
+
+		return;
+	}
+
+	gteCFC2();
+}
+
+
 /*********************************************************
 * Unknow instruction (would generate an exception) *
 * Format: ? *
@@ -686,6 +989,9 @@
 }
 
 void psxCOP2() {
+	if ((psxRegs.CP0.n.Status & 0x40000000) == 0 )
+		return;
+
 	psxCP2[_Funct_]();
 }
 
@@ -747,7 +1053,7 @@
 };
 
 void (*psxCP2BSC[32])() = {
-	gteMFC2, psxNULL, gteCFC2, psxNULL, gteMTC2, psxNULL, gteCTC2, psxNULL,
+	psxMFC2, psxNULL, psxCFC2, psxNULL, gteMTC2, psxNULL, gteCTC2, psxNULL,
 	psxNULL, psxNULL, psxNULL, psxNULL, psxNULL, psxNULL, psxNULL, psxNULL,
 	psxNULL, psxNULL, psxNULL, psxNULL, psxNULL, psxNULL, psxNULL, psxNULL,
 	psxNULL, psxNULL, psxNULL, psxNULL, psxNULL, psxNULL, psxNULL, psxNULL
@@ -761,6 +1067,7 @@
 }
 
 static void intReset() {
+	psxRegs.ICache_valid = FALSE;
 }
 
 static void intExecute() {
@@ -780,8 +1087,8 @@
 }
 
 // interpreter execution
-inline void execI() { 
-	u32 *code = (u32 *)PSXM(psxRegs.pc);
+static inline void execI() { 
+	u32 *code = Read_ICache(psxRegs.pc, FALSE);
 	psxRegs.code = ((code == NULL) ? 0 : SWAP32(*code));
 
 	debugI();

pcsxr-1.9.92.tar.bz2/libpcsxcore/psxmem.c -> pcsxr-1.9.93.tar.bz2/libpcsxcore/psxmem.c Changed

@@ -14,15 +14,13 @@
 * You should have received a copy of the GNU General Public License *
 * along with this program; if not, write to the *
 * Free Software Foundation, Inc., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
 ***************************************************************************/
 
 /*
 * PSX memory functions.
 */
 
-// TODO: Implement caches & cycle penalty.
-
 #include "psxmem.h"
 #include "r3000a.h"
 #include "psxhw.h"
@@ -77,7 +75,7 @@
 
 	if (psxMemRLUT == NULL || psxMemWLUT == NULL || 
 		psxM == NULL || psxP == NULL || psxH == NULL) {
-		SysMessage(_("Error allocating memory!"));
+		SysMessage("%s", _("Error allocating memory!"));
 		return -1;
 	}
 
@@ -114,6 +112,7 @@
 	memset(psxM, 0, 0x00200000);
 	memset(psxP, 0, 0x00010000);
 
+	// Load BIOS
 	if (strcmp(Config.Bios, "HLE") != 0) {
 		sprintf(bios, "%s/%s", Config.BiosDir, Config.Bios);
 		f = fopen(bios, "rb");
@@ -144,9 +143,13 @@
 	char *p;
 	u32 t;
 
+
+	psxRegs.cycle += 0;
+
+
 	t = mem >> 16;
-	if (t == 0x1f80) {
-		if (mem < 0x1f801000)
+	if (t == 0x1f80 || t == 0x9f80 || t == 0xbf80) {
+		if ((mem & 0xffff) < 0x400)
 			return psxHu8(mem);
 		else
 			return psxHwRead8(mem);
@@ -154,7 +157,7 @@
 		p = (char *)(psxMemRLUT[t]);
 		if (p != NULL) {
 			if (Config.Debug)
-				DebugCheckBP((mem & 0xffffff) | 0x80000000, R1);
+				DebugCheckBP((mem & 0xffffff) | 0x80000000, BR1);
 			return *(u8 *)(p + (mem & 0xffff));
 		} else {
 #ifdef PSXMEM_LOG
@@ -169,9 +172,13 @@
 	char *p;
 	u32 t;
 
+
+	psxRegs.cycle += 1;
+
+	
 	t = mem >> 16;
-	if (t == 0x1f80) {
-		if (mem < 0x1f801000)
+	if (t == 0x1f80 || t == 0x9f80 || t == 0xbf80) {
+		if ((mem & 0xffff) < 0x400)
 			return psxHu16(mem);
 		else
 			return psxHwRead16(mem);
@@ -179,7 +186,7 @@
 		p = (char *)(psxMemRLUT[t]);
 		if (p != NULL) {
 			if (Config.Debug)
-				DebugCheckBP((mem & 0xffffff) | 0x80000000, R2);
+				DebugCheckBP((mem & 0xffffff) | 0x80000000, BR2);
 			return SWAPu16(*(u16 *)(p + (mem & 0xffff)));
 		} else {
 #ifdef PSXMEM_LOG
@@ -194,9 +201,13 @@
 	char *p;
 	u32 t;
 
+
+	psxRegs.cycle += 1;
+
+	
 	t = mem >> 16;
-	if (t == 0x1f80) {
-		if (mem < 0x1f801000)
+	if (t == 0x1f80 || t == 0x9f80 || t == 0xbf80) {
+		if ((mem & 0xffff) < 0x400)
 			return psxHu32(mem);
 		else
 			return psxHwRead32(mem);
@@ -204,7 +215,7 @@
 		p = (char *)(psxMemRLUT[t]);
 		if (p != NULL) {
 			if (Config.Debug)
-				DebugCheckBP((mem & 0xffffff) | 0x80000000, R4);
+				DebugCheckBP((mem & 0xffffff) | 0x80000000, BR4);
 			return SWAPu32(*(u32 *)(p + (mem & 0xffff)));
 		} else {
 #ifdef PSXMEM_LOG
@@ -219,9 +230,13 @@
 	char *p;
 	u32 t;
 
+
+	psxRegs.cycle += 1;
+	
+	
 	t = mem >> 16;
-	if (t == 0x1f80) {
-		if (mem < 0x1f801000)
+	if (t == 0x1f80 || t == 0x9f80 || t == 0xbf80) {
+		if ((mem & 0xffff) < 0x400)
 			psxHu8(mem) = value;
 		else
 			psxHwWrite8(mem, value);
@@ -229,7 +244,7 @@
 		p = (char *)(psxMemWLUT[t]);
 		if (p != NULL) {
 			if (Config.Debug)
-				DebugCheckBP((mem & 0xffffff) | 0x80000000, W1);
+				DebugCheckBP((mem & 0xffffff) | 0x80000000, BW1);
 			*(u8 *)(p + (mem & 0xffff)) = value;
 #ifdef PSXREC
 			psxCpu->Clear((mem & (~3)), 1);
@@ -246,9 +261,13 @@
 	char *p;
 	u32 t;
 
+
+	psxRegs.cycle += 1;
+
+		
 	t = mem >> 16;
-	if (t == 0x1f80) {
-		if (mem < 0x1f801000)
+	if (t == 0x1f80 || t == 0x9f80 || t == 0xbf80) {
+		if ((mem & 0xffff) < 0x400)
 			psxHu16ref(mem) = SWAPu16(value);
 		else
 			psxHwWrite16(mem, value);
@@ -256,10 +275,10 @@
 		p = (char *)(psxMemWLUT[t]);
 		if (p != NULL) {
 			if (Config.Debug)
-				DebugCheckBP((mem & 0xffffff) | 0x80000000, W2);
+				DebugCheckBP((mem & 0xffffff) | 0x80000000, BW2);
 			*(u16 *)(p + (mem & 0xffff)) = SWAPu16(value);
 #ifdef PSXREC
-			psxCpu->Clear((mem & (~1)), 1);
+			psxCpu->Clear((mem & (~3)), 1);
 #endif
 		} else {
 #ifdef PSXMEM_LOG
@@ -273,10 +292,14 @@
 	char *p;
 	u32 t;
 
-//	if ((mem&0x1fffff) == 0x71E18 || value == 0x48088800) SysPrintf("t2fix!!\n");
+	
+	psxRegs.cycle += 1;
+
+
+	//	if ((mem&0x1fffff) == 0x71E18 || value == 0x48088800) SysPrintf("t2fix!!\n");
 	t = mem >> 16;
-	if (t == 0x1f80) {
-		if (mem < 0x1f801000)
+	if (t == 0x1f80 || t == 0x9f80 || t == 0xbf80) {
+		if ((mem & 0xffff) < 0x400)
 			psxHu32ref(mem) = SWAPu32(value);
 		else
 			psxHwWrite32(mem, value);
@@ -284,7 +307,7 @@
 		p = (char *)(psxMemWLUT[t]);
 		if (p != NULL) {
 			if (Config.Debug)
-				DebugCheckBP((mem & 0xffffff) | 0x80000000, W4);
+				DebugCheckBP((mem & 0xffffff) | 0x80000000, BW4);
 			*(u32 *)(p + (mem & 0xffff)) = SWAPu32(value);
 #ifdef PSXREC
 			psxCpu->Clear(mem, 1);
@@ -302,6 +325,7 @@
 			} else {
 				int i;
 
+				// a0-44: used for cache flushing
 				switch (value) {
 					case 0x800: case 0x804:
 						if (writeok == 0) break;
@@ -309,6 +333,8 @@
 						memset(psxMemWLUT + 0x0000, 0, 0x80 * sizeof(void *));
 						memset(psxMemWLUT + 0x8000, 0, 0x80 * sizeof(void *));
 						memset(psxMemWLUT + 0xa000, 0, 0x80 * sizeof(void *));
+
+						psxRegs.ICache_valid = FALSE;
 						break;
 					case 0x00: case 0x1e988:
 						if (writeok == 1) break;
@@ -333,8 +359,8 @@
 	u32 t;
 
 	t = mem >> 16;
-	if (t == 0x1f80) {
-		if (mem < 0x1f801000)
+	if (t == 0x1f80 || t == 0x9f80 || t == 0xbf80) {
+		if ((mem & 0xffff) < 0x400)
 			return (void *)&psxH[mem];
 		else
 			return NULL;

pcsxr-1.9.92.tar.bz2/libpcsxcore/psxmem.h -> pcsxr-1.9.93.tar.bz2/libpcsxcore/psxmem.h Changed

pcsxr-1.9.92.tar.bz2/libpcsxcore/r3000a.c -> pcsxr-1.9.93.tar.bz2/libpcsxcore/r3000a.c Changed

pcsxr-1.9.92.tar.bz2/libpcsxcore/r3000a.h -> pcsxr-1.9.93.tar.bz2/libpcsxcore/r3000a.h Changed

pcsxr-1.9.92.tar.bz2/libpcsxcore/sio.c -> pcsxr-1.9.93.tar.bz2/libpcsxcore/sio.c Changed

@@ -14,7 +14,7 @@
 * You should have received a copy of the GNU General Public License *
 * along with this program; if not, write to the *
 * Free Software Foundation, Inc., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
 ***************************************************************************/
 
 /*
@@ -47,7 +47,15 @@
 
 // *** FOR WORKS ON PADS AND MEMORY CARDS *****
 
-static unsigned char buf[256];
+
+void LoadDongle( char *str );
+void SaveDongle( char *str );
+
+
+#define BUFFER_SIZE 0x1010
+
+static unsigned char buf[ BUFFER_SIZE ];
+
 unsigned char cardh[4] = { 0x00, 0x00, 0x5a, 0x5d };
 
 // Transfer Ready and the Buffer is Empty
@@ -62,26 +70,98 @@
 static unsigned int mcdst, rdwr;
 static unsigned char adrH, adrL;
 static unsigned int padst;
+static unsigned int gsdonglest;
 
 char Mcd1Data[MCD_SIZE], Mcd2Data[MCD_SIZE];
 
+
+#define DONGLE_SIZE 0x40 * 0x1000
+
+unsigned int DongleBank;
+unsigned char DongleData[ DONGLE_SIZE ];
+static int DongleInit;
+
+
+#if 0
+// Breaks Twisted Metal 2 intro
+#define SIO_INT(eCycle) { \
+	if (!Config.SioIrq) { \
+		psxRegs.interrupt |= (1 << PSXINT_SIO); \
+		psxRegs.intCycle[PSXINT_SIO].cycle = eCycle; \
+		psxRegs.intCycle[PSXINT_SIO].sCycle = psxRegs.cycle; \
+	} \
+	\
+	StatReg &= ~RX_RDY; \
+	StatReg &= ~TX_RDY; \
+}
+#endif
+
+#define SIO_INT(eCycle) { \
+	if (!Config.SioIrq) { \
+		psxRegs.interrupt |= (1 << PSXINT_SIO); \
+		psxRegs.intCycle[PSXINT_SIO].cycle = eCycle; \
+		psxRegs.intCycle[PSXINT_SIO].sCycle = psxRegs.cycle; \
+	} \
+}
+
+
 // clk cycle byte
 // 4us * 8bits = (PSXCLK / 1000000) * 32; (linuzappz)
-// TODO: add SioModePrescaler and BaudReg
-static inline void SIO_INT() {
-	if (!Config.Sio) {
-		psxRegs.interrupt |= 0x80;
-		psxRegs.intCycle[7 + 1] = 400;
-		psxRegs.intCycle[7] = psxRegs.cycle;
+// TODO: add SioModePrescaler
+#define SIO_CYCLES (BaudReg * 8)
+
+// rely on this for now - someone's actual testing
+//#define SIO_CYCLES (PSXCLK / 57600)
+//PCSX 1.9.91
+//#define SIO_CYCLES 200
+//PCSX 1.9.91
+//#define SIO_CYCLES 270
+// ePSXe 1.6.0
+//#define SIO_CYCLES		535
+// ePSXe 1.7.0
+//#define SIO_CYCLES 635
+
+unsigned char reverse_8( unsigned char bits )
+{
+	unsigned char tmp;
+	int lcv;
+
+	tmp = 0;
+	for( lcv = 0; lcv < 8; lcv++ )
+	{
+		tmp >>= 1;
+		tmp |= (bits & 0x80);
+
+		bits <<= 1;
 	}
+
+	return tmp;
 }
 
+
 void sioWrite8(unsigned char value) {
 #ifdef PAD_LOG
 	PAD_LOG("sio write8 %x\n", value);
 #endif
 	switch (padst) {
-		case 1: SIO_INT();
+		case 1: SIO_INT(SIO_CYCLES);
+			/*
+			$41-4F
+			$41 = Find bits in poll respones
+			$42 = Polling command
+			$43 = Config mode (Dual shock?)
+			$44 = Digital / Analog (after $F3)
+			$45 = Get status info (Dual shock?)
+
+			ID:
+			$41 = Digital
+			$73 = Analogue Red LED
+			$53 = Analogue Green LED
+
+			$23 = NegCon
+			$12 = Mouse
+			*/
+
 			if ((value & 0x40) == 0x40) {
 				padst = 2; parp = 1;
 				if (!Config.UseNet) {
@@ -102,11 +182,33 @@
 				} else {
 					bufcount = 2 + (buf[parp] & 0x0f) * 2;
 				}
+
+
+				// Digital / Dual Shock Controller
 				if (buf[parp] == 0x41) {
 					switch (value) {
+						// enter config mode
 						case 0x43:
 							buf[1] = 0x43;
 							break;
+
+						// get status
+						case 0x45:
+							buf[1] = 0xf3;
+							break;
+					}
+				}
+
+
+				// NegCon - Wipeout 3
+				if( buf[parp] == 0x23 ) {
+					switch (value) {
+						// enter config mode
+						case 0x43:
+							buf[1] = 0x79;
+							break;
+
+						// get status
 						case 0x45:
 							buf[1] = 0xf3;
 							break;
@@ -119,7 +221,7 @@
 			parp++;
 /*			if (buf[1] == 0x45) {
 				buf[parp] = 0;
-				SIO_INT();
+				SIO_INT(SIO_CYCLES);
 				return;
 			}*/
 			if (!Config.UseNet) {
@@ -130,13 +232,13 @@
 			}
 
 			if (parp == bufcount) { padst = 0; return; }
-			SIO_INT();
+			SIO_INT(SIO_CYCLES);
 			return;
 	}
 
 	switch (mcdst) {
 		case 1:
-			SIO_INT();
+			SIO_INT(SIO_CYCLES);
 			if (rdwr) { parp++; return; }
 			parp = 1;
 			switch (value) {
@@ -146,7 +248,7 @@
 			}
 			return;
 		case 2: // address H
-			SIO_INT();
+			SIO_INT(SIO_CYCLES);
 			adrH = value;
 			*buf = 0;
 			parp = 0;
@@ -154,7 +256,7 @@
 			mcdst = 3;
 			return;
 		case 3: // address L
-			SIO_INT();
+			SIO_INT(SIO_CYCLES);
 			adrL = value;
 			*buf = adrH;
 			parp = 0;
@@ -162,7 +264,7 @@
 			mcdst = 4;
 			return;
 		case 4:
-			SIO_INT();
+			SIO_INT(SIO_CYCLES);
 			parp = 0;
 			switch (rdwr) {
 				case 1: // read
@@ -204,10 +306,367 @@
 			if (rdwr == 2) {
 				if (parp < 128) buf[parp + 1] = value;
 			}
-			SIO_INT();
+			SIO_INT(SIO_CYCLES);
+			return;
+	}
+
+
+	/*
+	GameShark CDX
+	
+	ae - be - ef - 04 + [00]
+	ae - be - ef - 01 + 00 + [00] * $1000
+	ae - be - ef - 01 + 42 + [00] * $1000
+	ae - be - ef - 03 + 01,01,1f,e3,85,ae,d1,28 + [00] * 4
+	*/
+	switch (gsdonglest) {
+		// main command loop
+		case 1:
+			SIO_INT( SIO_CYCLES );
+
+			// GS CDX
+			// - unknown output
+
+			// reset device when fail?
+			if( value == 0xae )
+			{
+				StatReg |= RX_RDY;
+
+				parp = 0;
+				bufcount = parp;
+			}
+
+
+			// GS CDX
+			else if( value == 0xbe )
+			{
+				StatReg |= RX_RDY;
+
+				parp = 0;
+				bufcount = parp;
+
+
+				buf[0] = reverse_8( 0xde );
+			}
+
+
+			// GS CDX
+			else if( value == 0xef )
+			{
+				StatReg |= RX_RDY;
+
+				parp = 0;
+				bufcount = parp;
+
+
+				buf[0] = reverse_8( 0xad );
+			}
+
+
+			// GS CDX [1 in + $1000 out + $1 out]
+			else if( value == 0x01 )
+			{
+				StatReg |= RX_RDY;
+
+				parp = 0;
+				bufcount = parp;
+
+
+				// $00 = 0000 0000
+				// - (reverse) 0000 0000
+				buf[0] = 0x00;
+				gsdonglest = 2;
+			}
+
+
+			// GS CDX [1 in + $1000 in + $1 out]
+			else if( value == 0x02 )
+			{
+				StatReg |= RX_RDY;
+
+				parp = 0;
+				bufcount = parp;
+
+
+				// $00 = 0000 0000
+				// - (reverse) 0000 0000
+				buf[0] = 0x00;
+				gsdonglest = 3;
+			}
+
+
+			// GS CDX [8 in, 4 out]
+			else if( value == 0x03 )
+			{
+				StatReg |= RX_RDY;
+
+				parp = 0;
+				bufcount = parp;
+
+				// $00 = 0000 0000
+				// - (reverse) 0000 0000
+				buf[0] = 0x00;
+
+				gsdonglest = 4;
+			}
+
+
+			// GS CDX [out 1]
+			else if( value == 0x04 )
+			{
+				StatReg |= RX_RDY;
+
+				parp = 0;
+				bufcount = parp;
+
+
+				// $00 = 0000 0000
+				// - (reverse) 0000 0000
+				buf[0] = 0x00;
+				gsdonglest = 5;
+			}
+			else
+			{
+				// ERROR!!
+				StatReg |= RX_RDY;
+
+				parp = 0;
+				bufcount = parp;
+				buf[0] = 0xff;
+
+				gsdonglest = 0;
+			}
+
+			return;
+
+
+		// be - ef - 01
+		case 2: {
+			unsigned char checksum;
+			unsigned int lcv;
+
+			SIO_INT( SIO_CYCLES );
+			StatReg |= RX_RDY;
+
+
+			// read 1 byte
+			DongleBank = buf[ 0 ];
+
+
+			// write data + checksum
+			checksum = 0;
+			for( lcv = 0; lcv < 0x1000; lcv++ )
+			{
+				unsigned char data;
+
+				data = DongleData[ DongleBank * 0x1000 + lcv ];
+
+				buf[ lcv+1 ] = reverse_8( data );
+				checksum += data;
+			}
+
+
+			parp = 0;
+			bufcount = 0x1001;
+			buf[ 0x1001 ] = reverse_8( checksum );
+
+
+			gsdonglest = 255;
+			return;
+		}
+
+
+		// be - ef - 02
+		case 3:
+			SIO_INT( SIO_CYCLES );
+			StatReg |= RX_RDY;
+
+			// command start
+			if( parp < 0x1000+1 )
+			{
+				// read 1 byte
+				buf[ parp ] = value;
+				parp++;
+			}
+
+			if( parp == 0x1001 )
+			{
+				unsigned char checksum;
+				unsigned int lcv;
+
+				DongleBank = buf[0];
+				memcpy( DongleData + DongleBank * 0x1000, buf+1, 0x1000 );
+
+				// save to file
+				SaveDongle( "memcards/CDX_Dongle.bin" );
+
+
+				// write 8-bit checksum
+				checksum = 0;
+				for( lcv = 1; lcv < 0x1001; lcv++ )
+				{
+					checksum += buf[ lcv ];
+				}
+
+				parp = 0;
+				bufcount = 1;
+				buf[1] = reverse_8( checksum );
+
+
+				// flush result
+				gsdonglest = 255;
+			}
+			return;
+
+
+		// be - ef - 03
+		case 4:
+			SIO_INT( SIO_CYCLES );
+			StatReg |= RX_RDY;
+
+			// command start
+			if( parp < 8 )
+			{
+				// read 2 (?,?) + 4 (DATA?) + 2 (CRC?)
+				buf[ parp ] = value;
+				parp++;
+			}
+
+			if( parp == 8 )
+			{
+				// now write 4 bytes via -FOUR- $00 writes
+				parp = 8;
+				bufcount = 12;
+
+
+				// TODO: Solve CDX algorithm
+
+
+				// GS CDX [magic key]
+				if( buf[2] == 0x12 && buf[3] == 0x34 &&
+						buf[4] == 0x56 && buf[5] == 0x78 )
+				{
+					buf[9] = reverse_8( 0x3e );
+					buf[10] = reverse_8( 0xa0 );
+					buf[11] = reverse_8( 0x40 );
+					buf[12] = reverse_8( 0x29 );
+				}
+
+				// GS CDX [address key #2 = 6ec]
+				else if( buf[2] == 0x1f && buf[3] == 0xe3 &&
+								 buf[4] == 0x45 && buf[5] == 0x60 )
+				{
+					buf[9] = reverse_8( 0xee );
+					buf[10] = reverse_8( 0xdd );
+					buf[11] = reverse_8( 0x71 );
+					buf[12] = reverse_8( 0xa8 );
+				}
+
+				// GS CDX [address key #3 = ???]
+				else if( buf[2] == 0x1f && buf[3] == 0xe3 &&
+								 buf[4] == 0x72 && buf[5] == 0xe3 )
+				{
+					// unsolved!!
+
+					// Used here: 80090348 / 80090498
+
+					// dummy value - MSB
+					buf[9] = reverse_8( 0xfa );
+					buf[10] = reverse_8( 0xde );
+					buf[11] = reverse_8( 0x21 );
+					buf[12] = reverse_8( 0x97 );
+				}
+
+				// GS CDX [address key #4 = a00]
+				else if( buf[2] == 0x1f && buf[3] == 0xe3 &&
+								 buf[4] == 0x85 && buf[5] == 0xae )
+				{
+					buf[9] = reverse_8( 0xee );
+					buf[10] = reverse_8( 0xdd );
+					buf[11] = reverse_8( 0x7d );
+					buf[12] = reverse_8( 0x44 );
+				}
+
+				// GS CDX [address key #5 = 9ec]
+				else if( buf[2] == 0x17 && buf[3] == 0xe3 &&
+								 buf[4] == 0xb5 && buf[5] == 0x60 )
+				{
+					buf[9] = reverse_8( 0xee );
+					buf[10] = reverse_8( 0xdd );
+					buf[11] = reverse_8( 0x7e );
+					buf[12] = reverse_8( 0xa8 );
+				}
+
+				else
+				{
+					// dummy value - MSB
+					buf[9] = reverse_8( 0xfa );
+					buf[10] = reverse_8( 0xde );
+					buf[11] = reverse_8( 0x21 );
+					buf[12] = reverse_8( 0x97 );
+				}						
+
+				// flush bytes -> done
+				gsdonglest = 255;
+			}
+			return;
+
+
+		// be - ef - 04
+		case 5:
+			if( value == 0x00 )
+			{
+				SIO_INT( SIO_CYCLES );
+				StatReg |= RX_RDY;
+
+
+				// read 1 byte
+				parp = 0;
+				bufcount = parp;
+
+				// size of dongle card?
+				buf[ 0 ] = reverse_8( DONGLE_SIZE / 0x1000 );
+
+
+				// done already
+				gsdonglest = 0;
+			}
+			return;
+
+
+		// flush bytes -> done
+		case 255:
+			if( value == 0x00 )
+			{
+				//SIO_INT( SIO_CYCLES );
+				SIO_INT(1);
+				StatReg |= RX_RDY;
+
+				parp++;
+				if( parp == bufcount )
+				{
+					gsdonglest = 0;
+
+#ifdef GSDONGLE_LOG
+					PAD_LOG("(gameshark dongle) DONE!!\n" );
+#endif
+				}
+			}
+			else
+			{
+				// ERROR!!
+				StatReg |= RX_RDY;
+
+				parp = 0;
+				bufcount = parp;
+				buf[0] = 0xff;
+
+				gsdonglest = 0;
+			}
 			return;
 	}
 
+
 	switch (value) {
 		case 0x01: // start pad
 			StatReg |= RX_RDY;		// Transfer is Ready
@@ -252,16 +711,41 @@
 			bufcount = 2;
 			parp = 0;
 			padst = 1;
-			SIO_INT();
+			SIO_INT(SIO_CYCLES);
 			return;
 		case 0x81: // start memcard
 			StatReg |= RX_RDY;
+#if 0
+			// Chronicles of the Sword - no memcard = password options
+			if( Config.Memcard == 1 ) return;
+#endif
 			memcpy(buf, cardh, 4);
 			parp = 0;
 			bufcount = 3;
 			mcdst = 1;
 			rdwr = 0;
-			SIO_INT();
+			SIO_INT(SIO_CYCLES);
+			return;
+
+		case 0xae: // GameShark CDX - start dongle
+			StatReg |= RX_RDY;
+			gsdonglest = 1;
+
+			parp = 0;
+			bufcount = parp;
+
+			if( !DongleInit )
+			{
+				LoadDongle( "memcards/CDX_Dongle.bin" );
+
+				DongleInit = 1;
+			}
+
+			SIO_INT( SIO_CYCLES );
+			return;
+
+		default: // no hardware found
+			StatReg |= RX_RDY;
 			return;
 	}
 }
@@ -279,7 +763,7 @@
 	if ((CtrlReg & SIO_RESET) || (!CtrlReg)) {
 		padst = 0; mcdst = 0; parp = 0;
 		StatReg = TX_RDY | TX_EMPTY;
-		psxRegs.interrupt &= ~0x80;
+		psxRegs.interrupt &= ~(1 << PSXINT_SIO);
 	}
 }
 
@@ -325,7 +809,21 @@
 }
 
 unsigned short sioReadStat16() {
-	return StatReg;
+	u16 hard;
+
+	hard = StatReg;
+
+#if 0
+	// wait for IRQ first
+	if( psxRegs.interrupt & (1 << PSXINT_SIO) )
+	{
+		hard &= ~TX_RDY;
+		hard &= ~RX_RDY;
+		hard &= ~TX_EMPTY;
+	}
+#endif
+
+	return hard;
 }
 
 unsigned short sioReadMode16() {
@@ -342,7 +840,7 @@
 
 void netError() {
 	ClosePlugins();
-	SysMessage(_("Connection closed!\n"));
+	SysMessage("%s", _("Connection closed!\n"));
 
 	CdromId[0] = '\0';
 	CdromLabel[0] = '\0';
@@ -357,6 +855,13 @@
 //	SysPrintf("Sio Interrupt\n");
 	StatReg |= IRQ;
 	psxHu32ref(0x1070) |= SWAPu32(0x80);
+
+#if 0
+	// Rhapsody: fixes input problems
+	// Twisted Metal 2: breaks intro
+	StatReg |= TX_RDY;
+	StatReg |= RX_RDY;
+#endif
 }
 
 void LoadMcd(int mcd, char *str) {
@@ -773,3 +1278,55 @@
 
 	return 0;
 }
+
+
+void LoadDongle( char *str )
+{
+	FILE *f;
+	
+	f = fopen(str, "r+b");
+	if (f != NULL) {
+		fread( DongleData, 1, DONGLE_SIZE, f );
+		fclose( f );
+	}
+	else {
+		u32 *ptr, lcv;
+
+		ptr = (unsigned int *) DongleData;
+
+		// create temp data
+		ptr[0] = (u32) 0x02015447;
+		ptr[1] = (u32) 7;
+		ptr[2] = (u32) 1;
+		ptr[3] = (u32) 0;
+
+		for( lcv=4; lcv<0x6c / 4; lcv++ )
+		{
+			ptr[ lcv ] = 0;
+		}
+
+		ptr[ lcv ] = (u32) 0x02000100;
+		lcv++;
+
+		while( lcv < 0x1000/4 )
+		{
+			ptr[ lcv ] = (u32) 0xffffffff;
+			lcv++;
+		}
+	}
+}
+
+void SaveDongle( char *str )
+{
+	FILE *f;
+	
+	f = fopen(str, "wb");
+	if (f != NULL) {
+		fwrite( DongleData, 1, DONGLE_SIZE, f );
+		fclose( f );
+	}
+}
+
+void CALLBACK SIO1irq(void) {
+	psxHu32ref(0x1070) |= SWAPu32(0x100);
+}

pcsxr-1.9.92.tar.bz2/libpcsxcore/sio.h -> pcsxr-1.9.93.tar.bz2/libpcsxcore/sio.h Changed

pcsxr-1.9.92.tar.bz2/libpcsxcore/socket.c -> pcsxr-1.9.93.tar.bz2/libpcsxcore/socket.c Changed

pcsxr-1.9.92.tar.bz2/libpcsxcore/spu.c -> pcsxr-1.9.93.tar.bz2/libpcsxcore/spu.c Changed

pcsxr-1.9.92.tar.bz2/libpcsxcore/spu.h -> pcsxr-1.9.93.tar.bz2/libpcsxcore/spu.h Changed

pcsxr-1.9.92.tar.bz2/libpcsxcore/system.h -> pcsxr-1.9.93.tar.bz2/libpcsxcore/system.h Changed

pcsxr-1.9.93.tar.bz2/macosx/ARCBridge.h Added

pcsxr-1.9.93.tar.bz2/macosx/CheatController.h Added

@@ -0,0 +1,40 @@
+//
+// CheatController.h
+// Pcsxr
+//
+
+#import <Cocoa/Cocoa.h>
+#import "ARCBridge.h"
+
+@class PcsxrHexadecimalFormatter;
+
+@interface CheatController : NSWindowController <NSWindowDelegate, NSTableViewDelegate>
+{
+ IBOutlet NSTableView *cheatView;
+	
+	IBOutlet NSWindow *editCheatWindow;
+	IBOutlet NSTableView *editCheatView;
+	IBOutlet PcsxrHexadecimalFormatter *addressFormatter;
+	IBOutlet PcsxrHexadecimalFormatter *valueFormatter;
+	NSMutableArray *tempCheatCodes;
+	NSMutableArray *cheats;
+}
+@property (readwrite, arcretain) NSMutableArray *tempCheatCodes;
+@property (readwrite, arcretain) NSMutableArray *cheats;
+
+- (void)refresh;
+
+- (IBAction)saveCheats:(id)sender;
+- (IBAction)loadCheats:(id)sender;
+- (IBAction)clear:(id)sender;
+- (IBAction)editCheat:(id)sender;
+- (IBAction)addCheat:(id)sender;
+- (IBAction)applyCheats:(id)sender;
+- (IBAction)removeCheats:(id)sender;
+- (IBAction)changeCheat:(id)sender;
+
+- (IBAction)closeCheatEdit:(id)sender;
+- (IBAction)removeCheatValue:(id)sender;
+- (IBAction)addCheatValue:(id)sender;
+
+@end

pcsxr-1.9.93.tar.bz2/macosx/CheatController.m Added

@@ -0,0 +1,389 @@
+//
+// CheatController.m
+// Pcsxr
+//
+
+#import <Cocoa/Cocoa.h>
+#include "psxcommon.h"
+#include "cheat.h"
+#import "CheatController.h"
+#import "ARCBridge.h"
+#import "PcsxrCheatHandler.h"
+#import "PcsxrHexadecimalFormatter.h"
+
+#define kTempCheatCodesName @"tempCheatCodes"
+#define kCheatsName @"cheats"
+
+@interface PcsxrCheatTempObject : NSObject <NSCopying>
+{
+	uint32_t address;
+	uint16_t value;
+}
+@property (readwrite) uint32_t address;
+@property (readwrite, arcweak) NSNumber* addressNS;
+@property (readwrite) uint16_t value;
+@property (readwrite, arcweak) NSNumber* valueNS;
+
+- (id)initWithAddress:(uint32_t)add value:(uint16_t)val;
+- (id)initWithCheatCode:(CheatCode *)theCheat;
+@end
+
+@interface PcsxrCheatTemp : NSObject
+{
+	NSMutableArray *cheatValues;
+	NSString *cheatName;
+	BOOL enabled;
+}
+@property (readwrite, arcretain) NSMutableArray *cheatValues;
+@property (readwrite, arcretain) NSString *cheatName;
+@property (readwrite, getter = isEnabled) BOOL enabled;
+
+- (id)initWithCheat:(Cheat *)theCheat;
+@end
+
+@implementation PcsxrCheatTempObject
+@synthesize address, value;
+
+- (NSNumber *)addressNS
+{
+	return @(self.address);
+}
+- (void)setAddressNS:(NSNumber *)addressNS
+{
+	self.address = [addressNS unsignedIntValue];
+}
+
+- (NSNumber *)valueNS
+{
+	return @(self.value);
+}
+- (void)setValueNS:(NSNumber *)valueNS
+{
+	self.value = [valueNS unsignedShortValue];
+}
+
+- (id)init
+{
+	return [self initWithAddress:0x10000000 value:0];
+}
+
+- (id)initWithAddress:(uint32_t)add value:(uint16_t)val
+{
+	if (self = [super init]) {
+		self.address = add;
+		self.value = val;
+	}
+	return self;
+}
+
+- (id)initWithCheatCode:(CheatCode *)theCheat
+{
+	return [self initWithAddress:theCheat->Addr value:theCheat->Val];
+}
+
+- (NSString*)description
+{
+	return [NSString stringWithFormat:@"%08x %04x", address, value];
+}
+
+- (BOOL)isEqual:(id)object
+{
+	if ([object isKindOfClass:[PcsxrCheatTempObject class]]) {
+		if (address != [(PcsxrCheatTempObject*)object address]) {
+			return NO;
+		} else if (value != [(PcsxrCheatTempObject*)object value]) {
+			return NO;
+		} else
+			return YES;
+	} else
+		return NO;
+}
+
+- (NSUInteger)hash
+{
+	return address ^ value;
+}
+
+- (id)copyWithZone:(NSZone *)zone
+{
+	return [[[self class] allocWithZone:zone] initWithAddress:address value:value];
+}
+
+@end
+
+@implementation PcsxrCheatTemp
+@synthesize cheatName;
+@synthesize cheatValues;
+@synthesize enabled;
+
+- (id)initWithCheat:(Cheat *)theCheat
+{
+	if (self = [super init]) {
+		self.cheatName = @(theCheat->Descr);
+		self.enabled = theCheat->Enabled ? YES : NO;
+		self.cheatValues = [NSMutableArray arrayWithCapacity:theCheat->n];
+		for (int i = 0; i < theCheat->n; i++) {
+			[cheatValues addObject:AUTORELEASEOBJ([[PcsxrCheatTempObject alloc] initWithCheatCode:&CheatCodes[i+theCheat->First]])];
+		}
+	}
+	return self;
+}
+
+- (NSUInteger)hash
+{
+	return [cheatName hash] ^ [cheatValues hash];
+}
+
+- (NSString *)description
+{
+	return [NSString stringWithFormat:@"[%@%@]\n%@", enabled ? @"*" : @"", cheatName, [cheatValues componentsJoinedByString:@"\n"]];
+}
+
+#if !__has_feature(objc_arc)
+- (void)dealloc
+{
+	self.cheatName = nil;
+	self.cheatValues = nil;
+	
+	[super dealloc];
+}
+#endif
+
+@end
+
+@implementation CheatController
+@synthesize tempCheatCodes;
+@synthesize cheats;
+
+- (NSString *)windowNibName
+{
+	return @"CheatWindow";
+}
+
+- (id)init
+{
+	return self = [self initWithWindowNibName:@"CheatWindow"];
+}
+
+- (id)initWithCoder:(NSCoder *)aDecoder
+{
+	if (self = [super initWithCoder:aDecoder]) {
+		self.tempCheatCodes = [NSMutableArray array];
+	}
+	return self;
+}
+
+- (id)initWithWindow:(NSWindow *)window
+{
+	if (self = [super initWithWindow:window]) {
+		self.tempCheatCodes = [NSMutableArray array];
+	}
+	return self;
+}
+
+- (void)refreshNSCheatArray
+{
+	NSMutableArray *tmpArray = [[NSMutableArray alloc] initWithCapacity:NumCheats];
+	for (int i = 0; i < NumCheats; i++) {
+		PcsxrCheatTemp *tmpObj = [[PcsxrCheatTemp alloc] initWithCheat:&Cheats[i]];
+		[tmpArray addObject:tmpObj];
+		RELEASEOBJ(tmpObj);
+	}
+	self.cheats = tmpArray;
+	RELEASEOBJ(tmpArray);
+	[self setDocumentEdited:NO];
+}
+
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
+{
+	if ([keyPath isEqualToString:kCheatsName]) {
+		[self setDocumentEdited:YES];
+	}
+}
+
+- (void)refresh
+{
+	[cheatView reloadData];
+	[self refreshNSCheatArray];
+}
+
+- (void)awakeFromNib
+{
+	[valueFormatter setHexPadding:4];
+	[addressFormatter setHexPadding:8];
+	[self refreshNSCheatArray];
+	[self addObserver:self forKeyPath:kCheatsName options:NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld context:NULL];
+}
+
+- (IBAction)loadCheats:(id)sender
+{
+	NSOpenPanel *openDlg = RETAINOBJ([NSOpenPanel openPanel]);
+	[openDlg setCanChooseFiles:YES];
+	[openDlg setCanChooseDirectories:NO];
+	[openDlg setAllowsMultipleSelection:NO];
+	[openDlg setAllowedFileTypes:[PcsxrCheatHandler supportedUTIs]];
+	
+	if ([openDlg runModal] == NSFileHandlingPanelOKButton) {
+		NSURL *file = [openDlg URL];
+		LoadCheats([[file path] fileSystemRepresentation]);
+		[self refresh];
+	}
+	RELEASEOBJ(openDlg);
+}
+
+- (IBAction)saveCheats:(id)sender
+{
+	NSSavePanel *saveDlg = RETAINOBJ([NSSavePanel savePanel]);
+	[saveDlg setAllowedFileTypes:[PcsxrCheatHandler supportedUTIs]];
+	[saveDlg setCanSelectHiddenExtension:YES];
+	[saveDlg setCanCreateDirectories:YES];
+	[saveDlg setPrompt:NSLocalizedString(@"Save Cheats", nil)];
+	if ([saveDlg runModal] == NSFileHandlingPanelOKButton) {
+		NSURL *url = [saveDlg URL];
+		NSString *saveString = [cheats componentsJoinedByString:@"\n"];
+		[saveString writeToURL:url atomically:YES encoding:NSUTF8StringEncoding error:NULL];
+	}
+	RELEASEOBJ(saveDlg);
+}
+
+- (IBAction)clear:(id)sender
+{
+	self.cheats = [NSMutableArray array];
+}
+
+- (IBAction)closeCheatEdit:(id)sender
+{
+	[NSApp endSheet:editCheatWindow returnCode:[sender tag] == 1 ? NSCancelButton : NSOKButton];
+}
+
+- (IBAction)changeCheat:(id)sender
+{
+	[self setDocumentEdited:YES];
+}
+
+- (IBAction)removeCheatValue:(id)sender
+{
+	if ([editCheatView selectedRow] < 0) {
+		NSBeep();
+		return;
+	}
+
+	NSIndexSet *toRemoveIndex = [editCheatView selectedRowIndexes];
+	[self willChange:NSKeyValueChangeRemoval valuesAtIndexes:toRemoveIndex forKey:kTempCheatCodesName];
+	[tempCheatCodes removeObjectsAtIndexes:toRemoveIndex];
+	[self didChange:NSKeyValueChangeRemoval valuesAtIndexes:toRemoveIndex forKey:kTempCheatCodesName];	
+}
+
+- (IBAction)addCheatValue:(id)sender
+{
+	[self willChange:NSKeyValueChangeInsertion valuesAtIndexes:[NSIndexSet indexSetWithIndex:[tempCheatCodes count]] forKey:kTempCheatCodesName];
+	[tempCheatCodes addObject:AUTORELEASEOBJ([[PcsxrCheatTempObject alloc] init])];
+	[self didChange:NSKeyValueChangeInsertion valuesAtIndexes:[NSIndexSet indexSetWithIndex:[tempCheatCodes count] - 1] forKey:kTempCheatCodesName];
+}
+
+- (void)reloadCheats
+{
+	NSFileManager *manager = [NSFileManager defaultManager];
+	NSURL *tmpURL = [[manager URLForDirectory:NSItemReplacementDirectory inDomain:NSUserDomainMask appropriateForURL:[[NSBundle mainBundle] bundleURL] create:YES error:nil] URLByAppendingPathComponent:@"temp.cht" isDirectory:NO];
+	NSString *tmpStr = [cheats componentsJoinedByString:@"\n"];
+	[tmpStr writeToURL:tmpURL atomically:NO encoding:NSUTF8StringEncoding error:NULL];
+	LoadCheats([[tmpURL path] fileSystemRepresentation]);
+	[manager removeItemAtURL:tmpURL error:NULL];
+}
+
+- (void)editCheatCodeSheetDidEnd:(NSWindow *)sheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo
+{
+	if (returnCode == NSOKButton) {
+		PcsxrCheatTemp *tmpCheat = [cheats objectAtIndex:[cheatView selectedRow]];
+		if (![tmpCheat.cheatValues isEqualToArray:tempCheatCodes]) {
+			tmpCheat.cheatValues = tempCheatCodes;
+			[self setDocumentEdited:YES];
+		}
+	}
+	
+	[sheet orderOut:nil];
+}
+
+- (IBAction)editCheat:(id)sender
+{
+	if ([cheatView selectedRow] < 0) {
+		NSBeep();
+		return;
+	}
+	NSMutableArray *tmpArray = [[cheats objectAtIndex:[cheatView selectedRow]] cheatValues];
+	NSMutableArray *newCheats = [[NSMutableArray alloc] initWithArray:tmpArray copyItems:YES];
+	self.tempCheatCodes = newCheats;
+	RELEASEOBJ(newCheats);
+	[NSApp beginSheet:editCheatWindow modalForWindow:[self window] modalDelegate:self didEndSelector:@selector(editCheatCodeSheetDidEnd:returnCode:contextInfo:) contextInfo:NULL];
+}
+
+- (IBAction)addCheat:(id)sender
+{
+	[self willChange:NSKeyValueChangeInsertion valuesAtIndexes:[NSIndexSet indexSetWithIndex:[cheats count]] forKey:kCheatsName];
+	PcsxrCheatTemp *tmpCheat = [[PcsxrCheatTemp alloc] init];
+	tmpCheat.cheatName = NSLocalizedString(@"New Cheat", @"New Cheat Name" );
+	PcsxrCheatTempObject *tmpObj = [[PcsxrCheatTempObject alloc] initWithAddress:0x10000000 value:0];
+	NSMutableArray *tmpArray = [NSMutableArray arrayWithObject:tmpObj];
+	RELEASEOBJ(tmpObj);
+	tmpCheat.cheatValues = tmpArray;
+	[cheats addObject:tmpCheat];
+	RELEASEOBJ(tmpCheat);
+	[self didChange:NSKeyValueChangeInsertion valuesAtIndexes:[NSIndexSet indexSetWithIndex:[cheats count] - 1] forKey:kCheatsName];
+	[self setDocumentEdited:YES];
+}
+
+- (IBAction)applyCheats:(id)sender
+{
+	[self reloadCheats];
+	[self setDocumentEdited:NO];
+}
+
+- (void)sheetDidDismiss:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo
+{
+	switch (returnCode) {
+		case NSAlertDefaultReturn:
+			[self reloadCheats];
+			[self close];
+			break;
+			
+		default:
+			[self refreshNSCheatArray];
+			[self close];
+			break;
+			
+		case NSAlertOtherReturn:
+			break;
+	}
+}
+
+- (BOOL)windowShouldClose:(id)sender
+{
+	if (![sender isDocumentEdited] || ![[self window] isEqual:sender]) {
+		return YES;
+	} else {
+		NSBeginAlertSheet(NSLocalizedString(@"Unsaved Changes", @"Unsaved changes"),
+						 NSLocalizedString(@"Save", @"Save"),
+						 NSLocalizedString(@"Don't Save",@"Don't Save"),
+						 NSLocalizedString(@"Cancel", @"Cancel"), [self window], self,
+						 NULL, @selector(sheetDidDismiss:returnCode:contextInfo:), NULL,
+						 NSLocalizedString(@"The cheat codes have not been applied. Unapplied cheats will not run nor be saved. Do you wish to save?",nil));
+		
+		return NO;
+	}
+}
+
+- (IBAction)removeCheats:(id)sender
+{
+	if ([cheatView selectedRow] < 0) {
+		NSBeep();
+		return;
+	}
+	
+	NSIndexSet *toRemoveIndex = [cheatView selectedRowIndexes];
+	[self willChange:NSKeyValueChangeRemoval valuesAtIndexes:toRemoveIndex forKey:kCheatsName];
+	[cheats removeObjectsAtIndexes:toRemoveIndex];
+	[self didChange:NSKeyValueChangeRemoval valuesAtIndexes:toRemoveIndex forKey:kCheatsName];
+	[self setDocumentEdited:YES];
+}
+
+@end

pcsxr-1.9.93.tar.bz2/macosx/Configs Added

pcsxr-1.9.93.tar.bz2/macosx/Configs/Pcsxr-Debug.xcconfig Added

pcsxr-1.9.93.tar.bz2/macosx/Configs/Pcsxr-Instrument.xcconfig Added

pcsxr-1.9.93.tar.bz2/macosx/Configs/Pcsxr-Release.xcconfig Added

pcsxr-1.9.93.tar.bz2/macosx/Configs/Pcsxr.xcconfig Added

pcsxr-1.9.92.tar.bz2/macosx/ConfigurationController.h -> pcsxr-1.9.93.tar.bz2/macosx/ConfigurationController.h Changed

@@ -2,14 +2,24 @@
 
 #import <Cocoa/Cocoa.h>
 #import "PluginController.h"
+#import "HotkeyController.h"
 #import "PluginList.h"
 
+extern NSString *const memChangeNotifier;
+extern NSString *const memCardChangeNumberKey;
+
+@class PcsxrMemCardController;
+
 @interface ConfigurationController : NSWindowController
 {
- IBOutlet PluginController *cdromPlugin;
- IBOutlet PluginController *graphicsPlugin;
- IBOutlet PluginController *padPlugin;
- IBOutlet PluginController *soundPlugin;
+	IBOutlet PluginController *cdromPlugin;
+	IBOutlet PluginController *graphicsPlugin;
+	IBOutlet PluginController *padPlugin;
+	IBOutlet PluginController *soundPlugin;
+	IBOutlet PluginController *netPlugin;
+	IBOutlet PluginController *sio1Plugin;
+	
+	IBOutlet PcsxrMemCardController *memCardEdit;
 
 	IBOutlet id noXaAudioCell;
 	IBOutlet id sioIrqAlwaysCell;
@@ -24,18 +34,26 @@
 	IBOutlet id rCountFixCell;
 	IBOutlet id vSyncWAFixCell;
 	IBOutlet id noFastBootCell;
-
-	IBOutlet NSTextField *mcd1Label;
-	IBOutlet NSTextField *mcd2Label;
-
+	IBOutlet id enableNetPlayCell;
+	IBOutlet id widescreen;
+	
+	// Hotkeys
+	IBOutlet HotkeyController *hkController;
+	IBOutlet NSTabViewItem *hkTab;	
+	
 	NSMutableDictionary *checkBoxDefaults;
 }
 - (IBAction)setCheckbox:(id)sender;
 - (IBAction)setCheckboxInverse:(id)sender;
 - (IBAction)setVideoType:(id)sender;
-- (IBAction)mcdChangeClicked:(id)sender;
-- (IBAction)mcdNewClicked:(id)sender;
 
 - (NSString *)keyForSender:(id)sender;
++ (void)setMemoryCard:(NSInteger)theCard toPath:(NSString *)theFile;
++ (void)setMemoryCard:(NSInteger)theCard toURL:(NSURL *)theURL;
+
++ (void)mcdNewClicked:(id)sender;
++ (void)mcdChangeClicked:(id)sender;
+
+- (void)tabView:(NSTabView *)tabView didSelectTabViewItem:(NSTabViewItem *)tabViewItem;
 
 @end

pcsxr-1.9.92.tar.bz2/macosx/ConfigurationController.m -> pcsxr-1.9.93.tar.bz2/macosx/ConfigurationController.m Changed

@@ -1,12 +1,37 @@
 #import "ConfigurationController.h"
-#import "PcsxController.h"
+#import "PcsxrController.h"
 #import "PluginList.h"
-#import "PcsxPlugin.h"
+#import "PcsxrPlugin.h"
+#import "PcsxrMemCardController.h"
+#import "PcsxrMemCardHandler.h"
 #include "psxcommon.h"
 #include "plugins.h"
+#import "ARCBridge.h"
+
+NSString *const memChangeNotifier = @"PcsxrMemoryCardDidChangeNotifier";
+NSString *const memCardChangeNumberKey = @"PcsxrMemoryCardThatChangedKey";
 
 @implementation ConfigurationController
 
++ (void)setMemoryCard:(NSInteger)theCard toURL:(NSURL *)theURL;
+{
+	if (theCard == 1) {
+		[[NSUserDefaults standardUserDefaults] setURL:theURL forKey:@"Mcd1"];
+		strlcpy(Config.Mcd1, [[theURL path] fileSystemRepresentation], MAXPATHLEN );
+	} else {
+		[[NSUserDefaults standardUserDefaults] setURL:theURL forKey:@"Mcd2"];
+		strlcpy(Config.Mcd2, [[theURL path] fileSystemRepresentation], MAXPATHLEN );
+	}
+	
+	[[NSNotificationCenter defaultCenter] postNotificationName:memChangeNotifier object:nil userInfo:
+	 [NSDictionary dictionaryWithObject:@(theCard) forKey:memCardChangeNumberKey]];
+}
+
++ (void)setMemoryCard:(NSInteger)theCard toPath:(NSString *)theFile
+{
+	[self setMemoryCard:theCard toURL:[NSURL fileURLWithPath:theFile isDirectory:NO]];
+}
+
 - (IBAction)setCheckbox:(id)sender
 {
 	if ([sender isKindOfClass:[NSMatrix class]]) {
@@ -16,7 +41,7 @@
 	NSString *key = [self keyForSender:sender];
 	if (key) {
 		[[NSUserDefaults standardUserDefaults] setInteger:[sender intValue] forKey:key];
-		[PcsxController setConfigFromDefaults];
+		[PcsxrController setConfigFromDefaults];
 	}
 }
 
@@ -29,69 +54,74 @@
 	NSString *key = [self keyForSender:sender];
 	if (key) {
 		[[NSUserDefaults standardUserDefaults] setInteger:![sender intValue] forKey:key];
-		[PcsxController setConfigFromDefaults];
+		[PcsxrController setConfigFromDefaults];
 	}
 }
 
-- (IBAction)mcdChangeClicked:(id)sender
++ (void)mcdChangeClicked:(id)sender
 {
-	int tag = [sender tag];
+	NSInteger tag = [sender tag];
 	char *mcd;
-	NSTextField *label;
-	NSOpenPanel *openDlg = [NSOpenPanel openPanel];
+	NSOpenPanel *openDlg = RETAINOBJ([NSOpenPanel openPanel]);
 	NSString *path;
-
-	if (tag == 1) { mcd = Config.Mcd1; label = mcd1Label; }
-	else { mcd = Config.Mcd2; label = mcd2Label; }
-
+	
+	if (tag == 1) {
+		mcd = Config.Mcd1;
+	} else {
+		mcd = Config.Mcd2;
+	}
+	
 	[openDlg setCanChooseFiles:YES];
 	[openDlg setCanChooseDirectories:NO];
-
-	path = [NSString stringWithCString:mcd];
-
-	if ([openDlg runModalForDirectory:[path stringByDeletingLastPathComponent] file:[path lastPathComponent]] == NSOKButton) {
-		NSArray* files = [openDlg filenames];
-		strcpy(mcd, (const char *)[[files objectAtIndex:0] fileSystemRepresentation]);
-
-		[label setTitleWithMnemonic:[NSString stringWithCString:mcd]];
-
-		if (tag == 1)
-			[[NSUserDefaults standardUserDefaults] setObject:[NSString stringWithCString:mcd] forKey:@"Mcd1"];
-		else
-			[[NSUserDefaults standardUserDefaults] setObject:[NSString stringWithCString:mcd] forKey:@"Mcd2"];
+	[openDlg setAllowedFileTypes:[PcsxrMemCardHandler supportedUTIs]];
+	
+	path = [[NSFileManager defaultManager] stringWithFileSystemRepresentation:mcd length:strlen(mcd)];
+ 
+ [openDlg setDirectoryURL:[NSURL fileURLWithPath:[path stringByDeletingLastPathComponent] isDirectory:YES]];
+ [openDlg setNameFieldStringValue:[path lastPathComponent]];
+	
+	if ([openDlg runModal] == NSFileHandlingPanelOKButton) {
+		NSURL *mcdURL = [[openDlg URLs] objectAtIndex:0];
+ 
+		[ConfigurationController setMemoryCard:tag toURL:mcdURL];
 }
+	RELEASEOBJ(openDlg);	
 }
 
-- (IBAction)mcdNewClicked:(id)sender
++ (void)mcdNewClicked:(id)sender
 {
-	int tag = [sender tag];
+	NSInteger tag = [sender tag];
 	char *mcd;
-	NSTextField *label;
-	NSSavePanel *openDlg = [NSSavePanel savePanel];
+	NSSavePanel *openDlg = RETAINOBJ([NSSavePanel savePanel]);
 	NSString *path;
-
-	if (tag == 1) { mcd = Config.Mcd1; label = mcd1Label; }
-	else { mcd = Config.Mcd2; label = mcd2Label; }
-
-	path = [NSString stringWithCString:mcd];
-
-	if ([openDlg runModalForDirectory:[path stringByDeletingLastPathComponent] file:@"New Memory Card File.mcr"] == NSOKButton) {
-		strcpy(mcd, (const char *)[[openDlg filename] fileSystemRepresentation]);
-
-		[label setTitleWithMnemonic:[NSString stringWithCString:mcd]];
-
-		if (tag == 1)
-			[[NSUserDefaults standardUserDefaults] setObject:[NSString stringWithCString:mcd] forKey:@"Mcd1"];
-		else
-			[[NSUserDefaults standardUserDefaults] setObject:[NSString stringWithCString:mcd] forKey:@"Mcd2"];
-
+	
+	if (tag == 1) {
+		mcd = Config.Mcd1;
+	} else {
+		mcd = Config.Mcd2;
+	}
+	
+ path = [[NSFileManager defaultManager] stringWithFileSystemRepresentation:mcd length:strlen(mcd)];
+	
+ [openDlg setDirectoryURL:[NSURL fileURLWithPath:[path stringByDeletingLastPathComponent] isDirectory:YES]];
+ [openDlg setNameFieldStringValue:@"New Memory Card File.mcr"];
+	[openDlg setAllowedFileTypes:[PcsxrMemCardHandler supportedUTIs]];
+ 
+	if ([openDlg runModal] == NSFileHandlingPanelOKButton) {
+ NSURL *mcdURL = [openDlg URL];
+		
+		//Workaround/kludge to make sure we create a memory card before posting a notification
+		strlcpy(mcd, [[mcdURL path] fileSystemRepresentation], MAXPATHLEN);
 		CreateMcd(mcd);
+		
+		[ConfigurationController setMemoryCard:tag toURL:mcdURL];
 }
+	RELEASEOBJ(openDlg);
 }
 
 - (IBAction)setVideoType:(id)sender
 {
-	int tag = [[sender selectedItem] tag];
+	NSInteger tag = [[sender selectedItem] tag];
 
 	if (3 == tag) {
 		[[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"AutoDetectVideoType"];
@@ -101,14 +131,13 @@
 	} else {
 		return;
 	}
-	[PcsxController setConfigFromDefaults];
+	[PcsxrController setConfigFromDefaults];
 
 	if ([sender pullsDown]) {
 		NSArray *items = [sender itemArray];
-		int i;
-		
-		for (i=0; i<[items count]; i++)
-			[[items objectAtIndex:i] setState:NSOffState];
+		for (id object in items) {
+			[object setState:NSOffState];
+		}
 		
 		[[sender selectedItem] setState:NSOnState];
 	}
@@ -119,12 +148,13 @@
 	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
 
 	[[self window] center];
-
+	
 	// setup checkboxes
 	checkBoxDefaults = [[NSMutableDictionary alloc] init];
 
 	// check that the outlets are active before adding them
 	if (noXaAudioCell) [checkBoxDefaults setObject:noXaAudioCell forKey:@"NoXaAudio"];
+	if (enableNetPlayCell) [checkBoxDefaults setObject:enableNetPlayCell forKey:@"NetPlay"];
 	if (sioIrqAlwaysCell) [checkBoxDefaults setObject:sioIrqAlwaysCell forKey:@"SioIrqAlways"];
 	if (bwMdecCell) [checkBoxDefaults setObject:bwMdecCell forKey:@"BlackAndWhiteMDECVideo"];
 	if (autoVTypeCell) [checkBoxDefaults setObject:autoVTypeCell forKey:@"AutoDetectVideoType"];
@@ -137,28 +167,32 @@
 	if (rCountFixCell) [checkBoxDefaults setObject:rCountFixCell forKey:@"RootCounterFix"];
 	if (vSyncWAFixCell) [checkBoxDefaults setObject:vSyncWAFixCell forKey:@"VideoSyncWAFix"];
 	if (noFastBootCell) [checkBoxDefaults setObject:noFastBootCell forKey:@"NoFastBoot"];
+	if (widescreen) [checkBoxDefaults setObject:widescreen forKey:@"Widescreen"];
 
 	// make the visuals match the defaults
-	NSEnumerator *enumerator= [checkBoxDefaults keyEnumerator];
-	id key;
-	while ((key = [enumerator nextObject])) {
+	
+	for (NSString* key in checkBoxDefaults) {
 		if ([defaults integerForKey:key]) {
 			[[checkBoxDefaults objectForKey:key] setNextState];
 		}
 	}
-
+	
 	// special cases
-	if (![PcsxController biosAvailable]) {
+	if (![PcsxrController biosAvailable]) {
 		// no bios means always use HLE
 		[usesHleCell setState:NSOnState];
 		[usesHleCell setEnabled:NO];
 	}
+	
+#ifdef __i386__
+	//OS X on i386 doesn't like the dynarec core
+	[usesDynarecCell setState:NSOffState];
+	[usesDynarecCell setEnabled:NO];
+#endif
 
 	// setup labels
-	[mcd1Label setTitleWithMnemonic:[NSString stringWithCString:Config.Mcd1]];
-	[mcd2Label setTitleWithMnemonic:[NSString stringWithCString:Config.Mcd2]];
 
-	int tag = [defaults integerForKey:@"AutoDetectVideoType"];
+	NSInteger tag = [defaults integerForKey:@"AutoDetectVideoType"];
 	if (tag)
 		tag = 3;
 	else {
@@ -179,25 +213,42 @@
 	[soundPlugin setPluginsTo:[list pluginsForType:PSE_LT_SPU] withType: PSE_LT_SPU];
 	[padPlugin setPluginsTo:[list pluginsForType:PSE_LT_PAD] withType: PSE_LT_PAD];
 	[cdromPlugin setPluginsTo:[list pluginsForType:PSE_LT_CDR] withType: PSE_LT_CDR];
+	[netPlugin setPluginsTo:[list pluginsForType:PSE_LT_NET] withType: PSE_LT_NET];
+	[sio1Plugin setPluginsTo:[list pluginsForType:PSE_LT_SIO1] withType:PSE_LT_SIO1];
+ 
+ // Setup hotkey view
+ [hkController initialize];
 }
 
+#if !__has_feature(objc_arc)
 - (void)dealloc
 {
 	[checkBoxDefaults release];
+	
 	[super dealloc];
 }
+#endif
 
 - (NSString *)keyForSender:(id)sender
 {
-	NSEnumerator *enumerator= [checkBoxDefaults keyEnumerator];
-	id key;
-	while ((key = [enumerator nextObject])) {
+	for (NSString *key in checkBoxDefaults) {
 		id object = [checkBoxDefaults objectForKey:key];
 		if ([object isEqual:sender])
 			return key;
 	}
-
+	
 	return nil;
 }
 
+- (void)tabView:(NSTabView *)tabView didSelectTabViewItem:(NSTabViewItem *)tabViewItem
+{
+ NSWindow *window = [self window];
+ if(tabViewItem == hkTab) {
+ [window makeFirstResponder:(NSView*)hkController];
+ }
+ else if([window firstResponder] == (NSView*)hkController) {
+ [hkController resignFirstResponder];
+ }
+}
+
 @end

pcsxr-1.9.92.tar.bz2/macosx/EmuThread.h -> pcsxr-1.9.93.tar.bz2/macosx/EmuThread.h Changed

pcsxr-1.9.92.tar.bz2/macosx/EmuThread.m -> pcsxr-1.9.93.tar.bz2/macosx/EmuThread.m Changed

@@ -1,6 +1,6 @@
 //
 //  EmuThread.m
-//  Pcsx
+//  Pcsxr
 //
 //  Created by Gil Pedersen on Sun Sep 21 2003.
 //  Copyright (c) 2003 __MyCompanyName__. All rights reserved.
@@ -14,12 +14,13 @@
 #include "psxcommon.h"
 #include "plugins.h"
 #include "misc.h"
+#import "ARCBridge.h"
 
-EmuThread *emuThread;
-NSString *defrostPath = nil;
+EmuThread *emuThread = nil;
+static NSString *defrostPath = nil;
 static int safeEvent;
-static int paused;
-static int runbios;
+static BOOL paused;
+static BOOL runbios;
 
 static pthread_cond_t eventCond;
 static pthread_mutex_t eventMutex;
@@ -31,85 +32,78 @@
 
 @implementation EmuThread
 
-- (void)EmuThreadRun:(id)anObject
+- (void)setUpThread
 {
-	pool = [[NSAutoreleasePool alloc] init];
-
+	NSAssert(![[NSThread currentThread] isEqual:[NSThread mainThread]], @"This function should not be run on the main thread!");
+	
+	[[NSThread currentThread] setName:@"PSX Emu Background thread"];
+	
 	[[NSNotificationCenter defaultCenter] addObserver:self
-        selector:@selector(emuWindowDidClose:)
-        name:@"emuWindowDidClose" object:nil];
-
+											 selector:@selector(emuWindowDidClose:)
+												 name:@"emuWindowDidClose" object:nil];
+	
 	[[NSNotificationCenter defaultCenter] addObserver:self
-        selector:@selector(emuWindowWantPause:)
-        name:@"emuWindowWantPause" object:nil];
-
+											 selector:@selector(emuWindowWantPause:)
+												 name:@"emuWindowWantPause" object:nil];
+	
 	[[NSNotificationCenter defaultCenter] addObserver:self
-        selector:@selector(emuWindowWantResume:)
-        name:@"emuWindowWantResume" object:nil];
-
+											 selector:@selector(emuWindowWantResume:)
+												 name:@"emuWindowWantResume" object:nil];
+	
 	// we shouldn't change the priority, since we might depend on subthreads
 	//[NSThread setThreadPriority:1.0-((1.0-[NSThread threadPriority])/4.0)];
+}
 
+- (void)EmuThreadRun:(id)anObject
+{
+	[self setUpThread];
+	
 	// Do processing here
 	if (OpenPlugins() == -1)
 		goto done;
-
+	
 	setjmp(restartJmp);
-
-	EmuReset();
-
+	
 	int res = CheckCdrom();
 	if (res == -1) {
 		ClosePlugins();
-		SysMessage(_("Could not check CD-ROM!\n"));
+		SysMessage("%s", _("Could not check CD-ROM!\n"));
 		goto done;
 	}
-
+	
+	// Auto-detect: region first, then rcnt reset
+	EmuReset();
+	
 	LoadCdrom();
-
+	
 	if (defrostPath) {
 		LoadState([defrostPath fileSystemRepresentation]);
-		[defrostPath release]; defrostPath = nil;
+		RELEASEOBJ(defrostPath); defrostPath = nil;
 	}
-
+	
 	psxCpu->Execute();
-
+	
 done:
-	[pool release]; pool = nil;
+	AUTORELEASEOBJNORETURN(emuThread);
 	emuThread = nil;
-
+	
 	return;
 }
 
 - (void)EmuThreadRunBios:(id)anObject
 {
-	pool = [[NSAutoreleasePool alloc] init];
-
-	[[NSNotificationCenter defaultCenter] addObserver:self
-        selector:@selector(emuWindowDidClose:)
-        name:@"emuWindowDidClose" object:nil];
-
-	[[NSNotificationCenter defaultCenter] addObserver:self
-        selector:@selector(emuWindowWantPause:)
-        name:@"emuWindowWantPause" object:nil];
-
-	[[NSNotificationCenter defaultCenter] addObserver:self
-        selector:@selector(emuWindowWantResume:)
-        name:@"emuWindowWantResume" object:nil];
-
-	// we shouldn't change the priority, since we might depend on subthreads
-	//[NSThread setThreadPriority:1.0-((1.0-[NSThread threadPriority])/4.0)];
-
+	[self setUpThread];
+		
 	// Do processing here
 	if (OpenPlugins() == -1)
 		goto done;
-
+	
 	EmuReset();
-
+	
 	psxCpu->Execute();
-
+	
 done:
-	[pool release]; pool = nil;
+	AUTORELEASEOBJNORETURN(emuThread);
 	emuThread = nil;
 	
 	return;
@@ -118,12 +112,9 @@
 - (void)dealloc
 {
 	// remove all registered observers
-	[[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:nil];
+	[[NSNotificationCenter defaultCenter] removeObserver:self];
 
-	if (pool)
-		[pool release];
-
-	[super dealloc];
+	SUPERDEALLOC;
 }
 
 - (void)emuWindowDidClose:(NSNotification *)aNotification
@@ -147,19 +138,19 @@
 /* called periodically from the emulation thread */
 - (void)handleEvents
 {
-	/* only do a trylock here, since we're not interested in blocking, 
-	   and we can just handle events next time round */
+	/* only do a trylock here, since we're not interested in blocking,
+	 and we can just handle events next time round */
 	if (pthread_mutex_trylock(&eventMutex) == 0) {
 		while (safeEvent) {
 			if (safeEvent & EMUEVENT_STOP) {
 				/* signify that the emulation has stopped */
-				[emuThread autorelease];
+				AUTORELEASEOBJNORETURN(emuThread);
 				emuThread = nil;
 				paused = NO;
 				
 				/* better unlock the mutex before killing ourself */
 				pthread_mutex_unlock(&eventMutex);
-
+				
 				ClosePlugins();
 				SysClose();
 				
@@ -167,28 +158,28 @@
 				[NSThread exit];
 				return;
 			}
-
+			
 			if (safeEvent & EMUEVENT_RESET) {
 #if 0
 				/* signify that the emulation has stopped */
 				[emuThread autorelease];
 				emuThread = nil;
-
+				
 				/* better unlock the mutex before killing ourself */
 				pthread_mutex_unlock(&eventMutex);
-
+				
 				ClosePlugins();
-
+				
 				// start a new emulation thread
 				[EmuThread run];
-
+				
 				//[[NSThread currentThread] autorelease];
 				[NSThread exit];
 				return;
 #else
 				safeEvent &= ~EMUEVENT_RESET;
 				pthread_mutex_unlock(&eventMutex);
-
+				
 				longjmp(restartJmp, 0);
 #endif
 			}
@@ -311,6 +302,14 @@
 	return NO;
 }
 
++ (void)pauseSafeWithBlock:(void (^)(BOOL))theBlock
+{
+	dispatch_async(dispatch_get_global_queue(0, 0), ^{
+		BOOL wasPaused = [self pauseSafe];
+		dispatch_async(dispatch_get_main_queue(), ^{theBlock(wasPaused);});
+	});
+}
+
 + (void)resume
 {
 	if (!paused || ![EmuThread active])
@@ -338,7 +337,7 @@
 + (void)resetNow
 {
 	/* signify that the emulation has stopped */
-	[emuThread autorelease];
+	AUTORELEASEOBJNORETURN(emuThread);
 	emuThread = nil;
 
 	ClosePlugins();
@@ -368,18 +367,19 @@
 
 + (void)freezeAt:(NSString *)path which:(int)num
 {
-	BOOL emuWasPaused = [EmuThread pauseSafe];
-	char Text[256];
-
-	GPU_freeze(2, (GPUFreeze_t *)&num);
-	int ret = SaveState([path fileSystemRepresentation]);
-	if (ret == 0) sprintf (Text, _("*PCSX*: Saved State %d"), num+1);
-	else sprintf (Text, _("*PCSX*: Error Saving State %d"), num+1);
-	GPU_displayText(Text);
-
-	if (!emuWasPaused) {
-		[EmuThread resume];
-	}
+	[self pauseSafeWithBlock:^(BOOL emuWasPaused) {
+		char Text[256];
+		
+		GPU_freeze(2, (GPUFreeze_t *)&num);
+		int ret = SaveState([path fileSystemRepresentation]);
+		if (ret == 0) sprintf (Text, _("*PCSXR*: Saved State %d"), num);
+		else sprintf (Text, _("*PCSXR*: Error Saving State %d"), num);
+		GPU_displayText(Text);
+		
+		if (!emuWasPaused) {
+			[EmuThread resume];
+		}
+	}];
 }
 
 + (BOOL)defrostAt:(NSString *)path
@@ -388,10 +388,10 @@
 	if (CheckState(cPath) != 0)
 		return NO;
 
-	defrostPath = [path retain];
+	defrostPath = RETAINOBJ(path);
 	[EmuThread reset];
 
-	GPU_displayText(_("*PCSX*: Loaded State"));
+	GPU_displayText(_("*PCSXR*: Loaded State"));
 	return YES;
 }

pcsxr-1.9.93.tar.bz2/macosx/English.lproj/AddPluginSheet.xib Added

@@ -0,0 +1,1069 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
+	<data>
+		<int key="IBDocument.SystemTarget">1070</int>
+		<string key="IBDocument.SystemVersion">12E55</string>
+		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
+		<string key="IBDocument.AppKitVersion">1187.39</string>
+		<string key="IBDocument.HIToolboxVersion">626.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			<string key="NS.object.0">3084</string>
+		</object>
+		<array key="IBDocument.IntegratedClassDependencies">
+			<string>IBNSLayoutConstraint</string>
+			<string>NSButton</string>
+			<string>NSButtonCell</string>
+			<string>NSCustomObject</string>
+			<string>NSImageCell</string>
+			<string>NSImageView</string>
+			<string>NSTextField</string>
+			<string>NSTextFieldCell</string>
+			<string>NSView</string>
+			<string>NSWindowTemplate</string>
+		</array>
+		<array key="IBDocument.PluginDependencies">
+			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+		</array>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="677976933">
+			<object class="NSCustomObject" id="156968336">
+				<string key="NSClassName">PcsxrPluginHandler</string>
+			</object>
+			<object class="NSCustomObject" id="801828069">
+				<string key="NSClassName">FirstResponder</string>
+			</object>
+			<object class="NSCustomObject" id="593755307">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSWindowTemplate" id="14544256">
+				<int key="NSWindowStyleMask">1</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{177, 439}, {420, 135}}</string>
+				<int key="NSWTFlags">1881670656</int>
+				<string key="NSWindowTitle">Install Plug-in</string>
+				<string key="NSWindowClass">NSPanel</string>
+				<object class="NSMutableString" key="NSViewClass">
+					<characters key="NS.bytes">View</characters>
+				</object>
+				<nil key="NSUserInterfaceItemIdentifier"/>
+				<string key="NSWindowContentMinSize">{94, 7}</string>
+				<object class="NSView" key="NSWindowView" id="802729152">
+					<reference key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<array class="NSMutableArray" key="NSSubviews">
+						<object class="NSButton" id="227277173">
+							<reference key="NSNextResponder" ref="802729152"/>
+							<int key="NSvFlags">289</int>
+							<string key="NSFrame">{{226, 13}, {90, 34}}</string>
+							<reference key="NSSuperview" ref="802729152"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="55702062"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="17339299">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">No</string>
+								<object class="NSFont" key="NSSupport" id="642420267">
+									<string key="NSName">LucidaGrande</string>
+									<double key="NSSize">13</double>
+									<int key="NSfFlags">1558</int>
+								</object>
+								<reference key="NSControlView" ref="227277173"/>
+								<int key="NSButtonFlags">-2038284288</int>
+								<int key="NSButtonFlags2">1</int>
+								<object class="NSFont" key="NSAlternateImage" id="830326136">
+									<string key="NSName">Helvetica</string>
+									<double key="NSSize">13</double>
+									<int key="NSfFlags">16</int>
+								</object>
+								<string key="NSAlternateContents"/>
+								<string type="base64-UTF8" key="NSKeyEquivalent">Gw</string>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSButton" id="55702062">
+							<reference key="NSNextResponder" ref="802729152"/>
+							<int key="NSvFlags">289</int>
+							<string key="NSFrame">{{316, 13}, {90, 34}}</string>
+							<reference key="NSSuperview" ref="802729152"/>
+							<reference key="NSWindow"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="970797641">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Yes</string>
+								<reference key="NSSupport" ref="642420267"/>
+								<reference key="NSControlView" ref="55702062"/>
+								<int key="NSButtonFlags">-2035924992</int>
+								<int key="NSButtonFlags2">1</int>
+								<reference key="NSAlternateImage" ref="830326136"/>
+								<string key="NSAlternateContents"/>
+								<object class="NSMutableString" key="NSKeyEquivalent">
+									<bytes key="NS.bytes">DQ</bytes>
+								</object>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSImageView" id="246336878">
+							<reference key="NSNextResponder" ref="802729152"/>
+							<int key="NSvFlags">268</int>
+							<set class="NSMutableSet" key="NSDragTypes">
+								<string>Apple PDF pasteboard type</string>
+								<string>Apple PICT pasteboard type</string>
+								<string>Apple PNG pasteboard type</string>
+								<object class="NSMutableString">
+									<characters key="NS.bytes">NSFilenamesPboardType</characters>
+								</object>
+								<string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
+								<string>NeXT TIFF v4.0 pasteboard type</string>
+								<object class="NSMutableString">
+									<characters key="NS.bytes">NeXT filename pasteboard type</characters>
+								</object>
+							</set>
+							<string key="NSFrame">{{24, 51}, {64, 64}}</string>
+							<reference key="NSSuperview" ref="802729152"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="478793345"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSImageCell" key="NSCell" id="782440341">
+								<int key="NSCellFlags">134217728</int>
+								<int key="NSCellFlags2">33554432</int>
+								<object class="NSCustomResource" key="NSContents">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">psxplugin</string>
+								</object>
+								<int key="NSAlign">0</int>
+								<int key="NSScale">1</int>
+								<int key="NSStyle">0</int>
+								<bool key="NSAnimates">NO</bool>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+							<bool key="NSEditable">NO</bool>
+						</object>
+						<object class="NSTextField" id="478793345">
+							<reference key="NSNextResponder" ref="802729152"/>
+							<int key="NSvFlags">266</int>
+							<string key="NSFrame">{{104, 103}, {290, 17}}</string>
+							<reference key="NSSuperview" ref="802729152"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="748030488"/>
+							<string key="NSAntiCompressionPriority">{250, 750}</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="913120470">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">0</int>
+								<string key="NSContents">Plugin Installation</string>
+								<object class="NSFont" key="NSSupport">
+									<string key="NSName">LucidaGrande-Bold</string>
+									<double key="NSSize">13</double>
+									<int key="NSfFlags">2072</int>
+								</object>
+								<reference key="NSControlView" ref="478793345"/>
+								<object class="NSColor" key="NSBackgroundColor">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">controlBackgroundColor</string>
+									<object class="NSColor" key="NSColor" id="405084554">
+										<int key="NSColorSpace">3</int>
+										<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+									</object>
+								</object>
+								<object class="NSColor" key="NSTextColor" id="107150481">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">controlTextColor</string>
+									<object class="NSColor" key="NSColor" id="448300209">
+										<int key="NSColorSpace">3</int>
+										<bytes key="NSWhite">MAA</bytes>
+									</object>
+								</object>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSTextField" id="748030488">
+							<reference key="NSNextResponder" ref="802729152"/>
+							<int key="NSvFlags">266</int>
+							<string key="NSFrame">{{104, 76}, {290, 18}}</string>
+							<reference key="NSSuperview" ref="802729152"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="106264949"/>
+							<string key="NSAntiCompressionPriority">{250, 750}</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="947003098">
+								<int key="NSCellFlags">69206017</int>
+								<int key="NSCellFlags2">0</int>
+								<string key="NSContents">Do you want to install this plugin into PCSXR?</string>
+								<object class="NSFont" key="NSSupport">
+									<string key="NSName">LucidaGrande</string>
+									<double key="NSSize">11</double>
+									<int key="NSfFlags">3100</int>
+								</object>
+								<reference key="NSControlView" ref="748030488"/>
+								<object class="NSColor" key="NSBackgroundColor">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">controlColor</string>
+									<reference key="NSColor" ref="405084554"/>
+								</object>
+								<reference key="NSTextColor" ref="107150481"/>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSTextField" id="106264949">
+							<reference key="NSNextResponder" ref="802729152"/>
+							<int key="NSvFlags">256</int>
+							<string key="NSFrame">{{104, 51}, {296, 22}}</string>
+							<reference key="NSSuperview" ref="802729152"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="227277173"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="724352047">
+								<int key="NSCellFlags">-2073034687</int>
+								<int key="NSCellFlags2">4195328</int>
+								<string key="NSContents"/>
+								<object class="NSFont" key="NSSupport">
+									<string key="NSName">LucidaGrande</string>
+									<double key="NSSize">13</double>
+									<int key="NSfFlags">1044</int>
+								</object>
+								<reference key="NSControlView" ref="106264949"/>
+								<bool key="NSDrawsBackground">YES</bool>
+								<object class="NSColor" key="NSBackgroundColor">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">textBackgroundColor</string>
+									<object class="NSColor" key="NSColor">
+										<int key="NSColorSpace">3</int>
+										<bytes key="NSWhite">MQA</bytes>
+									</object>
+								</object>
+								<object class="NSColor" key="NSTextColor">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">textColor</string>
+									<reference key="NSColor" ref="448300209"/>
+								</object>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+					</array>
+					<string key="NSFrameSize">{420, 135}</string>
+					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
+					<reference key="NSNextKeyView" ref="246336878"/>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
+				<string key="NSMinSize">{94, 29}</string>
+				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
+				<int key="NSWindowAnimationBehavior">5</int>
+				<int key="NSWindowCollectionBehavior">2</int>
+				<bool key="NSWindowIsRestorable">YES</bool>
+			</object>
+		</array>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<array class="NSMutableArray" key="connectionRecords">
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">window</string>
+						<reference key="source" ref="156968336"/>
+						<reference key="destination" ref="14544256"/>
+					</object>
+					<int key="connectionID">49</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">pluginName</string>
+						<reference key="source" ref="156968336"/>
+						<reference key="destination" ref="106264949"/>
+					</object>
+					<int key="connectionID">51</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">closeAddPluginSheet:</string>
+						<reference key="source" ref="156968336"/>
+						<reference key="destination" ref="55702062"/>
+					</object>
+					<int key="connectionID">52</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">closeAddPluginSheet:</string>
+						<reference key="source" ref="156968336"/>
+						<reference key="destination" ref="227277173"/>
+					</object>
+					<int key="connectionID">53</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="14544256"/>
+						<reference key="destination" ref="156968336"/>
+					</object>
+					<int key="connectionID">23</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">initialFirstResponder</string>
+						<reference key="source" ref="14544256"/>
+						<reference key="destination" ref="55702062"/>
+					</object>
+					<int key="connectionID">39</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">nextKeyView</string>
+						<reference key="source" ref="55702062"/>
+						<reference key="destination" ref="227277173"/>
+					</object>
+					<int key="connectionID">40</int>
+				</object>
+			</array>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<array key="orderedObjects">
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<array key="object" id="0"/>
+						<reference key="children" ref="677976933"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="156968336"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="801828069"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">First Responder</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10</int>
+						<reference key="object" ref="14544256"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="802729152"/>
+						</array>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Plugin Install</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">7</int>
+						<reference key="object" ref="802729152"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="246336878"/>
+							<reference ref="478793345"/>
+							<reference ref="748030488"/>
+							<reference ref="106264949"/>
+							<object class="IBNSLayoutConstraint" id="906790383">
+								<reference key="firstItem" ref="802729152"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="55702062"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="802729152"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="833509942">
+								<reference key="firstItem" ref="55702062"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="106264949"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="802729152"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="793057688">
+								<reference key="firstItem" ref="802729152"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="55702062"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="802729152"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="359926287">
+								<reference key="firstItem" ref="55702062"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="227277173"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">12</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="802729152"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="45611380">
+								<reference key="firstItem" ref="802729152"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="227277173"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="802729152"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="461822473">
+								<reference key="firstItem" ref="227277173"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="106264949"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="802729152"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="304940298">
+								<reference key="firstItem" ref="802729152"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="106264949"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="802729152"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="558984305">
+								<reference key="firstItem" ref="748030488"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="478793345"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="802729152"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="183523826">
+								<reference key="firstItem" ref="748030488"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="802729152"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">41</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="802729152"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="103064802">
+								<reference key="firstItem" ref="478793345"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="748030488"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="802729152"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="470035333">
+								<reference key="firstItem" ref="478793345"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="802729152"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">107</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="802729152"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="82304855">
+								<reference key="firstItem" ref="478793345"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="802729152"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">15</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="802729152"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="577293692">
+								<reference key="firstItem" ref="246336878"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="802729152"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="802729152"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="531811319">
+								<reference key="firstItem" ref="246336878"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="802729152"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">24</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="802729152"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<reference ref="55702062"/>
+							<reference ref="227277173"/>
+						</array>
+						<reference key="parent" ref="14544256"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">11</int>
+						<reference key="object" ref="227277173"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="17339299"/>
+							<object class="IBNSLayoutConstraint" id="857021837">
+								<reference key="firstItem" ref="227277173"/>
+								<int key="firstAttribute">8</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">23</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="227277173"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="207716656">
+								<reference key="firstItem" ref="227277173"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">78</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="227277173"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="802729152"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">12</int>
+						<reference key="object" ref="55702062"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="970797641"/>
+							<object class="IBNSLayoutConstraint" id="403894163">
+								<reference key="firstItem" ref="55702062"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">78</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="55702062"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="802729152"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">29</int>
+						<reference key="object" ref="246336878"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="782440341"/>
+							<object class="IBNSLayoutConstraint" id="532130268">
+								<reference key="firstItem" ref="246336878"/>
+								<int key="firstAttribute">8</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">64</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="246336878"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="612594586">
+								<reference key="firstItem" ref="246336878"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">64</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="246336878"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="802729152"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">43</int>
+						<reference key="object" ref="478793345"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="913120470"/>
+							<object class="IBNSLayoutConstraint" id="887060326">
+								<reference key="firstItem" ref="478793345"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">284</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="478793345"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="802729152"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">44</int>
+						<reference key="object" ref="748030488"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="947003098"/>
+							<object class="IBNSLayoutConstraint" id="401030473">
+								<reference key="firstItem" ref="748030488"/>
+								<int key="firstAttribute">8</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">18</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="748030488"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="802729152"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">47</int>
+						<reference key="object" ref="106264949"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="724352047"/>
+							<object class="IBNSLayoutConstraint" id="516197716">
+								<reference key="firstItem" ref="106264949"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">296</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="106264949"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="802729152"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">55</int>
+						<reference key="object" ref="17339299"/>
+						<reference key="parent" ref="227277173"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">56</int>
+						<reference key="object" ref="970797641"/>
+						<reference key="parent" ref="55702062"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">57</int>
+						<reference key="object" ref="782440341"/>
+						<reference key="parent" ref="246336878"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">58</int>
+						<reference key="object" ref="913120470"/>
+						<reference key="parent" ref="478793345"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">59</int>
+						<reference key="object" ref="947003098"/>
+						<reference key="parent" ref="748030488"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">60</int>
+						<reference key="object" ref="724352047"/>
+						<reference key="parent" ref="106264949"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-3</int>
+						<reference key="object" ref="593755307"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Application</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">61</int>
+						<reference key="object" ref="403894163"/>
+						<reference key="parent" ref="55702062"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">62</int>
+						<reference key="object" ref="887060326"/>
+						<reference key="parent" ref="478793345"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">63</int>
+						<reference key="object" ref="207716656"/>
+						<reference key="parent" ref="227277173"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">64</int>
+						<reference key="object" ref="857021837"/>
+						<reference key="parent" ref="227277173"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">65</int>
+						<reference key="object" ref="531811319"/>
+						<reference key="parent" ref="802729152"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">67</int>
+						<reference key="object" ref="359926287"/>
+						<reference key="parent" ref="802729152"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">70</int>
+						<reference key="object" ref="793057688"/>
+						<reference key="parent" ref="802729152"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">71</int>
+						<reference key="object" ref="82304855"/>
+						<reference key="parent" ref="802729152"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">72</int>
+						<reference key="object" ref="304940298"/>
+						<reference key="parent" ref="802729152"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">73</int>
+						<reference key="object" ref="470035333"/>
+						<reference key="parent" ref="802729152"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">75</int>
+						<reference key="object" ref="103064802"/>
+						<reference key="parent" ref="802729152"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">76</int>
+						<reference key="object" ref="183523826"/>
+						<reference key="parent" ref="802729152"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">77</int>
+						<reference key="object" ref="558984305"/>
+						<reference key="parent" ref="802729152"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">79</int>
+						<reference key="object" ref="401030473"/>
+						<reference key="parent" ref="748030488"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">80</int>
+						<reference key="object" ref="612594586"/>
+						<reference key="parent" ref="246336878"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">81</int>
+						<reference key="object" ref="532130268"/>
+						<reference key="parent" ref="246336878"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">82</int>
+						<reference key="object" ref="516197716"/>
+						<reference key="parent" ref="106264949"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">84</int>
+						<reference key="object" ref="833509942"/>
+						<reference key="parent" ref="802729152"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">85</int>
+						<reference key="object" ref="906790383"/>
+						<reference key="parent" ref="802729152"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">86</int>
+						<reference key="object" ref="461822473"/>
+						<reference key="parent" ref="802729152"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">87</int>
+						<reference key="object" ref="45611380"/>
+						<reference key="parent" ref="802729152"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">88</int>
+						<reference key="object" ref="577293692"/>
+						<reference key="parent" ref="802729152"/>
+					</object>
+				</array>
+			</object>
+			<dictionary class="NSMutableDictionary" key="flattenedProperties">
+				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="10.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="11.IBNSViewMetadataConstraints">
+					<reference ref="207716656"/>
+					<reference ref="857021837"/>
+				</array>
+				<boolean value="NO" key="11.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="11.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array class="NSMutableArray" key="12.IBNSViewMetadataConstraints">
+					<reference ref="403894163"/>
+				</array>
+				<boolean value="NO" key="12.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="12.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="29.IBNSViewMetadataConstraints">
+					<reference ref="612594586"/>
+					<reference ref="532130268"/>
+				</array>
+				<boolean value="NO" key="29.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="29.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="43.IBNSViewMetadataConstraints">
+					<reference ref="887060326"/>
+				</array>
+				<boolean value="NO" key="43.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="43.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="44.IBNSViewMetadataConstraints">
+					<reference ref="401030473"/>
+				</array>
+				<boolean value="NO" key="44.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="44.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="47.IBNSViewMetadataConstraints">
+					<reference ref="516197716"/>
+				</array>
+				<boolean value="NO" key="47.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="47.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<real value="0.0" key="47.IBViewIntegration.shadowBlurRadius"/>
+				<reference key="47.IBViewIntegration.shadowColor" ref="448300209"/>
+				<real value="0.0" key="47.IBViewIntegration.shadowOffsetHeight"/>
+				<real value="0.0" key="47.IBViewIntegration.shadowOffsetWidth"/>
+				<string key="55.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="56.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="57.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="58.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="59.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="60.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="61.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="62.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="63.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="64.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="65.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="67.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array class="NSMutableArray" key="7.IBNSViewMetadataConstraints">
+					<reference ref="531811319"/>
+					<reference ref="577293692"/>
+					<reference ref="82304855"/>
+					<reference ref="470035333"/>
+					<reference ref="103064802"/>
+					<reference ref="183523826"/>
+					<reference ref="558984305"/>
+					<reference ref="304940298"/>
+					<reference ref="461822473"/>
+					<reference ref="45611380"/>
+					<reference ref="359926287"/>
+					<reference ref="793057688"/>
+					<reference ref="833509942"/>
+					<reference ref="906790383"/>
+				</array>
+				<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="70.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="71.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="72.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="73.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="75.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="76.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="77.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="79.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="80.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="81.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="82.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="84.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="85.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="86.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="87.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="88.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			</dictionary>
+			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+			<nil key="activeLocalization"/>
+			<dictionary class="NSMutableDictionary" key="localizations"/>
+			<nil key="sourceID"/>
+			<int key="maxID">88</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">NSLayoutConstraint</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/NSLayoutConstraint.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">PcsxrPluginHandler</string>
+					<string key="superclassName">NSWindowController</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">closeAddPluginSheet:</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">closeAddPluginSheet:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">closeAddPluginSheet:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">pluginName</string>
+						<string key="NS.object.0">NSTextField</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">pluginName</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">pluginName</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/PcsxrPluginHandler.h</string>
+					</object>
+				</object>
+			</array>
+		</object>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<real value="1070" key="NS.object.0"/>
+		</object>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<string key="NS.key.0">psxplugin</string>
+			<string key="NS.object.0">{128, 128}</string>
+		</object>
+		<bool key="IBDocument.UseAutolayout">YES</bool>
+	</data>
+</archive>

pcsxr-1.9.93.tar.bz2/macosx/English.lproj/CheatWindow.xib Added

@@ -0,0 +1,2445 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
+	<data>
+		<int key="IBDocument.SystemTarget">1070</int>
+		<string key="IBDocument.SystemVersion">12E55</string>
+		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
+		<string key="IBDocument.AppKitVersion">1187.39</string>
+		<string key="IBDocument.HIToolboxVersion">626.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			<string key="NS.object.0">3084</string>
+		</object>
+		<array key="IBDocument.IntegratedClassDependencies">
+			<string>IBCustomFormatter</string>
+			<string>IBNSLayoutConstraint</string>
+			<string>NSArrayController</string>
+			<string>NSButton</string>
+			<string>NSButtonCell</string>
+			<string>NSCustomObject</string>
+			<string>NSScrollView</string>
+			<string>NSScroller</string>
+			<string>NSTableColumn</string>
+			<string>NSTableHeaderView</string>
+			<string>NSTableView</string>
+			<string>NSTextFieldCell</string>
+			<string>NSView</string>
+			<string>NSWindowTemplate</string>
+		</array>
+		<array key="IBDocument.PluginDependencies">
+			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+		</array>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+			<object class="NSCustomObject" id="1001">
+				<string key="NSClassName">CheatController</string>
+			</object>
+			<object class="NSCustomObject" id="1003">
+				<string key="NSClassName">FirstResponder</string>
+			</object>
+			<object class="NSCustomObject" id="1004">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSWindowTemplate" id="1005">
+				<int key="NSWindowStyleMask">15</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{196, 153}, {698, 357}}</string>
+				<int key="NSWTFlags">1618477056</int>
+				<string key="NSWindowTitle">Cheats</string>
+				<string key="NSWindowClass">NSWindow</string>
+				<nil key="NSViewClass"/>
+				<nil key="NSUserInterfaceItemIdentifier"/>
+				<object class="NSView" key="NSWindowView" id="1006">
+					<reference key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<array class="NSMutableArray" key="NSSubviews">
+						<object class="NSButton" id="1059773594">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{145, 10}, {129, 32}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="826080325"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="710534927">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Save Cheats…</string>
+								<object class="NSFont" key="NSSupport" id="948921760">
+									<string key="NSName">LucidaGrande</string>
+									<double key="NSSize">13</double>
+									<int key="NSfFlags">1044</int>
+								</object>
+								<reference key="NSControlView" ref="1059773594"/>
+								<int key="NSButtonFlags">-2038284288</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSButton" id="9746913">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{14, 10}, {131, 32}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="1059773594"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="332020564">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Load Cheats…</string>
+								<reference key="NSSupport" ref="948921760"/>
+								<reference key="NSControlView" ref="9746913"/>
+								<int key="NSButtonFlags">-2038284288</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSScrollView" id="45503994">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<array class="NSMutableArray" key="NSSubviews">
+								<object class="NSClipView" id="789563581">
+									<reference key="NSNextResponder" ref="45503994"/>
+									<int key="NSvFlags">2304</int>
+									<array class="NSMutableArray" key="NSSubviews">
+										<object class="NSTableView" id="368269043">
+											<reference key="NSNextResponder" ref="789563581"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrameSize">{656, 266}</string>
+											<reference key="NSSuperview" ref="789563581"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="658965032"/>
+											<bool key="NSEnabled">YES</bool>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											<bool key="NSControlAllowsExpansionToolTips">YES</bool>
+											<object class="NSTableHeaderView" key="NSHeaderView" id="166632435">
+												<reference key="NSNextResponder" ref="1067501353"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrameSize">{656, 17}</string>
+												<reference key="NSSuperview" ref="1067501353"/>
+												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView" ref="789563581"/>
+												<reference key="NSTableView" ref="368269043"/>
+											</object>
+											<object class="_NSCornerView" key="NSCornerView">
+												<nil key="NSNextResponder"/>
+												<int key="NSvFlags">-2147483392</int>
+												<string key="NSFrame">{{224, 0}, {16, 17}}</string>
+												<reference key="NSNextKeyView" ref="789563581"/>
+											</object>
+											<array class="NSMutableArray" key="NSTableColumns">
+												<object class="NSTableColumn" id="567336110">
+													<string key="NSIdentifier">Enabled</string>
+													<double key="NSWidth">48.40234375</double>
+													<double key="NSMinWidth">40</double>
+													<double key="NSMaxWidth">1000</double>
+													<object class="NSTableHeaderCell" key="NSHeaderCell">
+														<int key="NSCellFlags">75497536</int>
+														<int key="NSCellFlags2">2048</int>
+														<string key="NSContents">Enabled</string>
+														<object class="NSFont" key="NSSupport" id="26">
+															<string key="NSName">LucidaGrande</string>
+															<double key="NSSize">11</double>
+															<int key="NSfFlags">3100</int>
+														</object>
+														<object class="NSColor" key="NSBackgroundColor" id="86720929">
+															<int key="NSColorSpace">3</int>
+															<bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes>
+														</object>
+														<object class="NSColor" key="NSTextColor" id="385617573">
+															<int key="NSColorSpace">6</int>
+															<string key="NSCatalogName">System</string>
+															<string key="NSColorName">headerTextColor</string>
+															<object class="NSColor" key="NSColor" id="930545005">
+																<int key="NSColorSpace">3</int>
+																<bytes key="NSWhite">MAA</bytes>
+															</object>
+														</object>
+													</object>
+													<object class="NSButtonCell" key="NSDataCell" id="1049516493">
+														<int key="NSCellFlags">67108864</int>
+														<int key="NSCellFlags2">0</int>
+														<string key="NSContents"/>
+														<reference key="NSSupport" ref="948921760"/>
+														<reference key="NSControlView" ref="368269043"/>
+														<int key="NSButtonFlags">1211912448</int>
+														<int key="NSButtonFlags2">2</int>
+														<object class="NSCustomResource" key="NSNormalImage">
+															<string key="NSClassName">NSImage</string>
+															<string key="NSResourceName">NSSwitch</string>
+														</object>
+														<object class="NSButtonImageSource" key="NSAlternateImage">
+															<string key="NSImageName">NSSwitch</string>
+														</object>
+														<string key="NSAlternateContents"/>
+														<string key="NSKeyEquivalent"/>
+														<int key="NSPeriodicDelay">200</int>
+														<int key="NSPeriodicInterval">25</int>
+													</object>
+													<int key="NSResizingMask">3</int>
+													<bool key="NSIsResizeable">YES</bool>
+													<bool key="NSIsEditable">YES</bool>
+													<reference key="NSTableView" ref="368269043"/>
+												</object>
+												<object class="NSTableColumn" id="663899919">
+													<string key="NSIdentifier">Name</string>
+													<double key="NSWidth">601.51953125</double>
+													<double key="NSMinWidth">40</double>
+													<double key="NSMaxWidth">1000</double>
+													<object class="NSTableHeaderCell" key="NSHeaderCell">
+														<int key="NSCellFlags">75497536</int>
+														<int key="NSCellFlags2">2048</int>
+														<string key="NSContents">Name</string>
+														<reference key="NSSupport" ref="26"/>
+														<reference key="NSBackgroundColor" ref="86720929"/>
+														<reference key="NSTextColor" ref="385617573"/>
+													</object>
+													<object class="NSTextFieldCell" key="NSDataCell" id="418738496">
+														<int key="NSCellFlags">337641537</int>
+														<int key="NSCellFlags2">2112</int>
+														<string key="NSContents">Text Cell</string>
+														<reference key="NSSupport" ref="948921760"/>
+														<reference key="NSControlView" ref="368269043"/>
+														<object class="NSColor" key="NSBackgroundColor" id="550161491">
+															<int key="NSColorSpace">6</int>
+															<string key="NSCatalogName">System</string>
+															<string key="NSColorName">controlBackgroundColor</string>
+															<object class="NSColor" key="NSColor">
+																<int key="NSColorSpace">3</int>
+																<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+															</object>
+														</object>
+														<object class="NSColor" key="NSTextColor" id="146064791">
+															<int key="NSColorSpace">6</int>
+															<string key="NSCatalogName">System</string>
+															<string key="NSColorName">controlTextColor</string>
+															<reference key="NSColor" ref="930545005"/>
+														</object>
+														<array key="NSAllowedInputLocales">
+															<string>NSAllRomanInputSourcesLocaleIdentifier</string>
+														</array>
+													</object>
+													<int key="NSResizingMask">3</int>
+													<bool key="NSIsResizeable">YES</bool>
+													<bool key="NSIsEditable">YES</bool>
+													<reference key="NSTableView" ref="368269043"/>
+												</object>
+											</array>
+											<double key="NSIntercellSpacingWidth">3</double>
+											<double key="NSIntercellSpacingHeight">2</double>
+											<object class="NSColor" key="NSBackgroundColor" id="639601960">
+												<int key="NSColorSpace">3</int>
+												<bytes key="NSWhite">MQA</bytes>
+											</object>
+											<object class="NSColor" key="NSGridColor" id="306411952">
+												<int key="NSColorSpace">6</int>
+												<string key="NSCatalogName">System</string>
+												<string key="NSColorName">gridColor</string>
+												<object class="NSColor" key="NSColor">
+													<int key="NSColorSpace">3</int>
+													<bytes key="NSWhite">MC41AA</bytes>
+												</object>
+											</object>
+											<double key="NSRowHeight">17</double>
+											<int key="NSTvFlags">1388314624</int>
+											<reference key="NSDelegate"/>
+											<reference key="NSDataSource"/>
+											<int key="NSColumnAutoresizingStyle">4</int>
+											<int key="NSDraggingSourceMaskForLocal">15</int>
+											<int key="NSDraggingSourceMaskForNonLocal">0</int>
+											<bool key="NSAllowsTypeSelect">NO</bool>
+											<int key="NSTableViewDraggingDestinationStyle">0</int>
+											<int key="NSTableViewGroupRowStyle">1</int>
+										</object>
+									</array>
+									<string key="NSFrame">{{1, 17}, {656, 266}}</string>
+									<reference key="NSSuperview" ref="45503994"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="368269043"/>
+									<reference key="NSDocView" ref="368269043"/>
+									<reference key="NSBGColor" ref="550161491"/>
+									<int key="NScvFlags">4</int>
+								</object>
+								<object class="NSScroller" id="658965032">
+									<reference key="NSNextResponder" ref="45503994"/>
+									<int key="NSvFlags">-2147483392</int>
+									<string key="NSFrame">{{224, 17}, {15, 102}}</string>
+									<reference key="NSSuperview" ref="45503994"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="896214539"/>
+									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+									<reference key="NSTarget" ref="45503994"/>
+									<string key="NSAction">_doScroller:</string>
+									<double key="NSPercent">0.93927125506072873</double>
+								</object>
+								<object class="NSScroller" id="896214539">
+									<reference key="NSNextResponder" ref="45503994"/>
+									<int key="NSvFlags">-2147483392</int>
+									<string key="NSFrame">{{1, 249}, {607, 15}}</string>
+									<reference key="NSSuperview" ref="45503994"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="9746913"/>
+									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+									<int key="NSsFlags">1</int>
+									<reference key="NSTarget" ref="45503994"/>
+									<string key="NSAction">_doScroller:</string>
+									<double key="NSPercent">0.98699186991869914</double>
+								</object>
+								<object class="NSClipView" id="1067501353">
+									<reference key="NSNextResponder" ref="45503994"/>
+									<int key="NSvFlags">2304</int>
+									<array class="NSMutableArray" key="NSSubviews">
+										<reference ref="166632435"/>
+									</array>
+									<string key="NSFrame">{{1, 0}, {656, 17}}</string>
+									<reference key="NSSuperview" ref="45503994"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="166632435"/>
+									<reference key="NSDocView" ref="166632435"/>
+									<reference key="NSBGColor" ref="550161491"/>
+									<int key="NScvFlags">4</int>
+								</object>
+							</array>
+							<string key="NSFrame">{{20, 53}, {658, 284}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="1067501353"/>
+							<int key="NSsFlags">133682</int>
+							<reference key="NSVScroller" ref="658965032"/>
+							<reference key="NSHScroller" ref="896214539"/>
+							<reference key="NSContentView" ref="789563581"/>
+							<reference key="NSHeaderClipView" ref="1067501353"/>
+							<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
+							<double key="NSMinMagnification">0.25</double>
+							<double key="NSMaxMagnification">4</double>
+							<double key="NSMagnification">1</double>
+						</object>
+						<object class="NSButton" id="606864501">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{611, 10}, {73, 32}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="349501695">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Clear</string>
+								<reference key="NSSupport" ref="948921760"/>
+								<string key="NSCellIdentifier">_NS:9</string>
+								<reference key="NSControlView" ref="606864501"/>
+								<int key="NSButtonFlags">-2038284288</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSButton" id="826080325">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{302, 10}, {77, 32}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="985245514"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="595634390">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Edit…</string>
+								<reference key="NSSupport" ref="948921760"/>
+								<string key="NSCellIdentifier">_NS:9</string>
+								<reference key="NSControlView" ref="826080325"/>
+								<int key="NSButtonFlags">-2038284288</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSButton" id="985245514">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{379, 10}, {66, 32}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="546225714"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="695849354">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Add</string>
+								<reference key="NSSupport" ref="948921760"/>
+								<string key="NSCellIdentifier">_NS:9</string>
+								<reference key="NSControlView" ref="985245514"/>
+								<int key="NSButtonFlags">-2038284288</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSButton" id="546225714">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{445, 10}, {90, 32}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="493097267"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="141020825">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Remove</string>
+								<reference key="NSSupport" ref="948921760"/>
+								<string key="NSCellIdentifier">_NS:9</string>
+								<reference key="NSControlView" ref="546225714"/>
+								<int key="NSButtonFlags">-2038284288</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSButton" id="493097267">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{535, 10}, {76, 32}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="606864501"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="636439128">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Apply</string>
+								<reference key="NSSupport" ref="948921760"/>
+								<string key="NSCellIdentifier">_NS:9</string>
+								<reference key="NSControlView" ref="493097267"/>
+								<int key="NSButtonFlags">-2038284288</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+					</array>
+					<string key="NSFrameSize">{698, 357}</string>
+					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
+					<reference key="NSNextKeyView" ref="45503994"/>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
+				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
+				<bool key="NSWindowIsRestorable">YES</bool>
+			</object>
+			<object class="NSWindowTemplate" id="279098783">
+				<int key="NSWindowStyleMask">15</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{196, 207}, {342, 265}}</string>
+				<int key="NSWTFlags">1685586944</int>
+				<string key="NSWindowTitle">Edit Cheat</string>
+				<string key="NSWindowClass">NSWindow</string>
+				<nil key="NSViewClass"/>
+				<nil key="NSUserInterfaceItemIdentifier"/>
+				<object class="NSView" key="NSWindowView" id="199124710">
+					<reference key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<array class="NSMutableArray" key="NSSubviews">
+						<object class="NSScrollView" id="1005365451">
+							<reference key="NSNextResponder" ref="199124710"/>
+							<int key="NSvFlags">268</int>
+							<array class="NSMutableArray" key="NSSubviews">
+								<object class="NSClipView" id="1013168205">
+									<reference key="NSNextResponder" ref="1005365451"/>
+									<int key="NSvFlags">2304</int>
+									<array class="NSMutableArray" key="NSSubviews">
+										<object class="NSTableView" id="561365494">
+											<reference key="NSNextResponder" ref="1013168205"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrameSize">{300, 171}</string>
+											<reference key="NSSuperview" ref="1013168205"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="735039775"/>
+											<string key="NSReuseIdentifierKey">_NS:13</string>
+											<bool key="NSEnabled">YES</bool>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											<bool key="NSControlAllowsExpansionToolTips">YES</bool>
+											<object class="NSTableHeaderView" key="NSHeaderView" id="70039629">
+												<reference key="NSNextResponder" ref="761915648"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrameSize">{300, 17}</string>
+												<reference key="NSSuperview" ref="761915648"/>
+												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView" ref="1013168205"/>
+												<string key="NSReuseIdentifierKey">_NS:16</string>
+												<reference key="NSTableView" ref="561365494"/>
+											</object>
+											<object class="_NSCornerView" key="NSCornerView">
+												<nil key="NSNextResponder"/>
+												<int key="NSvFlags">-2147483392</int>
+												<string key="NSFrame">{{224, 0}, {16, 17}}</string>
+												<reference key="NSNextKeyView" ref="1013168205"/>
+												<string key="NSReuseIdentifierKey">_NS:19</string>
+											</object>
+											<array class="NSMutableArray" key="NSTableColumns">
+												<object class="NSTableColumn" id="227933991">
+													<string key="NSIdentifier">Address</string>
+													<double key="NSWidth">150</double>
+													<double key="NSMinWidth">40</double>
+													<double key="NSMaxWidth">1000</double>
+													<object class="NSTableHeaderCell" key="NSHeaderCell">
+														<int key="NSCellFlags">75497536</int>
+														<int key="NSCellFlags2">2048</int>
+														<string key="NSContents">Address</string>
+														<reference key="NSSupport" ref="26"/>
+														<object class="NSColor" key="NSBackgroundColor" id="130845878">
+															<int key="NSColorSpace">3</int>
+															<bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes>
+														</object>
+														<reference key="NSTextColor" ref="385617573"/>
+													</object>
+													<object class="NSTextFieldCell" key="NSDataCell" id="382860235">
+														<int key="NSCellFlags">337641536</int>
+														<int key="NSCellFlags2">-2147481600</int>
+														<string key="NSContents">Text Cell</string>
+														<reference key="NSSupport" ref="948921760"/>
+														<object class="IBCustomFormatter" key="NSFormatter" id="916821671"/>
+														<reference key="NSControlView" ref="561365494"/>
+														<reference key="NSBackgroundColor" ref="550161491"/>
+														<reference key="NSTextColor" ref="146064791"/>
+													</object>
+													<int key="NSResizingMask">3</int>
+													<bool key="NSIsResizeable">YES</bool>
+													<bool key="NSIsEditable">YES</bool>
+													<reference key="NSTableView" ref="561365494"/>
+												</object>
+												<object class="NSTableColumn" id="304062529">
+													<string key="NSIdentifier">Value</string>
+													<double key="NSWidth">144</double>
+													<double key="NSMinWidth">40</double>
+													<double key="NSMaxWidth">1000</double>
+													<object class="NSTableHeaderCell" key="NSHeaderCell">
+														<int key="NSCellFlags">75497536</int>
+														<int key="NSCellFlags2">2048</int>
+														<string key="NSContents">Value</string>
+														<reference key="NSSupport" ref="26"/>
+														<reference key="NSBackgroundColor" ref="130845878"/>
+														<reference key="NSTextColor" ref="385617573"/>
+													</object>
+													<object class="NSTextFieldCell" key="NSDataCell" id="1054013317">
+														<int key="NSCellFlags">337641536</int>
+														<int key="NSCellFlags2">-2147481600</int>
+														<string key="NSContents">Text Cell</string>
+														<reference key="NSSupport" ref="948921760"/>
+														<object class="IBCustomFormatter" key="NSFormatter" id="865518372"/>
+														<reference key="NSControlView" ref="561365494"/>
+														<reference key="NSBackgroundColor" ref="550161491"/>
+														<reference key="NSTextColor" ref="146064791"/>
+													</object>
+													<int key="NSResizingMask">3</int>
+													<bool key="NSIsResizeable">YES</bool>
+													<bool key="NSIsEditable">YES</bool>
+													<reference key="NSTableView" ref="561365494"/>
+												</object>
+											</array>
+											<double key="NSIntercellSpacingWidth">3</double>
+											<double key="NSIntercellSpacingHeight">2</double>
+											<reference key="NSBackgroundColor" ref="639601960"/>
+											<reference key="NSGridColor" ref="306411952"/>
+											<double key="NSRowHeight">17</double>
+											<int key="NSTvFlags">-700448768</int>
+											<reference key="NSDelegate"/>
+											<reference key="NSDataSource"/>
+											<int key="NSColumnAutoresizingStyle">4</int>
+											<int key="NSDraggingSourceMaskForLocal">15</int>
+											<int key="NSDraggingSourceMaskForNonLocal">0</int>
+											<bool key="NSAllowsTypeSelect">YES</bool>
+											<int key="NSTableViewDraggingDestinationStyle">0</int>
+											<int key="NSTableViewGroupRowStyle">1</int>
+										</object>
+									</array>
+									<string key="NSFrame">{{1, 17}, {300, 171}}</string>
+									<reference key="NSSuperview" ref="1005365451"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="561365494"/>
+									<string key="NSReuseIdentifierKey">_NS:11</string>
+									<reference key="NSDocView" ref="561365494"/>
+									<reference key="NSBGColor" ref="550161491"/>
+									<int key="NScvFlags">4</int>
+								</object>
+								<object class="NSScroller" id="735039775">
+									<reference key="NSNextResponder" ref="1005365451"/>
+									<int key="NSvFlags">-2147483392</int>
+									<string key="NSFrame">{{224, 17}, {15, 102}}</string>
+									<reference key="NSSuperview" ref="1005365451"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="676091532"/>
+									<string key="NSReuseIdentifierKey">_NS:58</string>
+									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+									<reference key="NSTarget" ref="1005365451"/>
+									<string key="NSAction">_doScroller:</string>
+									<double key="NSCurValue">37</double>
+									<double key="NSPercent">0.1947367936372757</double>
+								</object>
+								<object class="NSScroller" id="676091532">
+									<reference key="NSNextResponder" ref="1005365451"/>
+									<int key="NSvFlags">-2147483392</int>
+									<string key="NSFrame">{{1, 120}, {143, 16}}</string>
+									<reference key="NSSuperview" ref="1005365451"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="568487906"/>
+									<string key="NSReuseIdentifierKey">_NS:60</string>
+									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+									<int key="NSsFlags">1</int>
+									<reference key="NSTarget" ref="1005365451"/>
+									<string key="NSAction">_doScroller:</string>
+									<double key="NSPercent">0.88271604938271608</double>
+								</object>
+								<object class="NSClipView" id="761915648">
+									<reference key="NSNextResponder" ref="1005365451"/>
+									<int key="NSvFlags">2304</int>
+									<array class="NSMutableArray" key="NSSubviews">
+										<reference ref="70039629"/>
+									</array>
+									<string key="NSFrame">{{1, 0}, {300, 17}}</string>
+									<reference key="NSSuperview" ref="1005365451"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="70039629"/>
+									<string key="NSReuseIdentifierKey">_NS:15</string>
+									<reference key="NSDocView" ref="70039629"/>
+									<reference key="NSBGColor" ref="550161491"/>
+									<int key="NScvFlags">4</int>
+								</object>
+							</array>
+							<string key="NSFrame">{{20, 56}, {302, 189}}</string>
+							<reference key="NSSuperview" ref="199124710"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="761915648"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<int key="NSsFlags">133682</int>
+							<reference key="NSVScroller" ref="735039775"/>
+							<reference key="NSHScroller" ref="676091532"/>
+							<reference key="NSContentView" ref="1013168205"/>
+							<reference key="NSHeaderClipView" ref="761915648"/>
+							<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
+							<double key="NSMinMagnification">0.25</double>
+							<double key="NSMaxMagnification">4</double>
+							<double key="NSMagnification">1</double>
+						</object>
+						<object class="NSButton" id="57583972">
+							<reference key="NSNextResponder" ref="199124710"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{269, 13}, {59, 32}}</string>
+							<reference key="NSSuperview" ref="199124710"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="447610302">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">OK</string>
+								<reference key="NSSupport" ref="948921760"/>
+								<string key="NSCellIdentifier">_NS:9</string>
+								<reference key="NSControlView" ref="57583972"/>
+								<int key="NSButtonFlags">-2038284288</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSButton" id="435790162">
+							<reference key="NSNextResponder" ref="199124710"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{187, 13}, {82, 32}}</string>
+							<reference key="NSSuperview" ref="199124710"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="57583972"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<int key="NSTag">1</int>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="135784125">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Cancel</string>
+								<reference key="NSSupport" ref="948921760"/>
+								<string key="NSCellIdentifier">_NS:9</string>
+								<reference key="NSControlView" ref="435790162"/>
+								<int key="NSButtonFlags">-2038284288</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string type="base64-UTF8" key="NSKeyEquivalent">Gw</string>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSButton" id="568487906">
+							<reference key="NSNextResponder" ref="199124710"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{20, 20}, {25, 25}}</string>
+							<reference key="NSSuperview" ref="199124710"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="700724018"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="386712492">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents"/>
+								<reference key="NSSupport" ref="948921760"/>
+								<string key="NSCellIdentifier">_NS:9</string>
+								<reference key="NSControlView" ref="568487906"/>
+								<int key="NSButtonFlags">-2033958912</int>
+								<int key="NSButtonFlags2">134</int>
+								<object class="NSCustomResource" key="NSNormalImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">NSAddTemplate</string>
+								</object>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSButton" id="700724018">
+							<reference key="NSNextResponder" ref="199124710"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{44, 20}, {25, 25}}</string>
+							<reference key="NSSuperview" ref="199124710"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="435790162"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="770183666">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents"/>
+								<reference key="NSSupport" ref="948921760"/>
+								<string key="NSCellIdentifier">_NS:9</string>
+								<reference key="NSControlView" ref="700724018"/>
+								<int key="NSButtonFlags">-2033958912</int>
+								<int key="NSButtonFlags2">134</int>
+								<object class="NSCustomResource" key="NSNormalImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">NSRemoveTemplate</string>
+								</object>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+					</array>
+					<string key="NSFrameSize">{342, 265}</string>
+					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
+					<reference key="NSNextKeyView" ref="1005365451"/>
+					<string key="NSReuseIdentifierKey">_NS:20</string>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
+				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
+				<bool key="NSWindowIsRestorable">YES</bool>
+			</object>
+			<object class="NSArrayController" id="1036217935">
+				<string key="NSObjectClassName">NSMutableArray</string>
+				<bool key="NSEditable">YES</bool>
+				<object class="_NSManagedProxy" key="_NSManagedProxy"/>
+				<bool key="NSPreservesSelection">YES</bool>
+				<bool key="NSSelectsInsertedObjects">YES</bool>
+				<bool key="NSFilterRestrictsInsertion">YES</bool>
+				<bool key="NSClearsFilterPredicateOnInsertion">YES</bool>
+			</object>
+			<object class="NSArrayController" id="522679847">
+				<string key="NSObjectClassName">NSMutableArray</string>
+				<bool key="NSEditable">YES</bool>
+				<object class="_NSManagedProxy" key="_NSManagedProxy"/>
+				<bool key="NSPreservesSelection">YES</bool>
+				<bool key="NSSelectsInsertedObjects">YES</bool>
+				<bool key="NSFilterRestrictsInsertion">YES</bool>
+				<bool key="NSClearsFilterPredicateOnInsertion">YES</bool>
+			</object>
+		</array>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<array class="NSMutableArray" key="connectionRecords">
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">cheatView</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="368269043"/>
+					</object>
+					<int key="connectionID">105</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">window</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="1005"/>
+					</object>
+					<int key="connectionID">106</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">clear:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="606864501"/>
+					</object>
+					<int key="connectionID">109</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">editCheat:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="826080325"/>
+					</object>
+					<int key="connectionID">163</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">editCheatWindow</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="279098783"/>
+					</object>
+					<int key="connectionID">164</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">editCheatView</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="561365494"/>
+					</object>
+					<int key="connectionID">166</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">closeCheatEdit:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="57583972"/>
+					</object>
+					<int key="connectionID">169</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">closeCheatEdit:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="435790162"/>
+					</object>
+					<int key="connectionID">170</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">loadCheats:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="9746913"/>
+					</object>
+					<int key="connectionID">211</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">saveCheats:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="1059773594"/>
+					</object>
+					<int key="connectionID">212</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">addCheat:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="985245514"/>
+					</object>
+					<int key="connectionID">213</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">removeCheatValue:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="700724018"/>
+					</object>
+					<int key="connectionID">215</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">addCheatValue:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="568487906"/>
+					</object>
+					<int key="connectionID">218</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">removeCheats:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="546225714"/>
+					</object>
+					<int key="connectionID">253</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">applyCheats:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="493097267"/>
+					</object>
+					<int key="connectionID">262</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">changeCheat:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="1049516493"/>
+					</object>
+					<int key="connectionID">266</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">changeCheat:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="418738496"/>
+					</object>
+					<int key="connectionID">267</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">addressFormatter</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="916821671"/>
+					</object>
+					<int key="connectionID">273</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">valueFormatter</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="865518372"/>
+					</object>
+					<int key="connectionID">274</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="1005"/>
+						<reference key="destination" ref="1001"/>
+					</object>
+					<int key="connectionID">108</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="368269043"/>
+						<reference key="destination" ref="1001"/>
+					</object>
+					<int key="connectionID">242</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: arrangedObjects.cheatName</string>
+						<reference key="source" ref="663899919"/>
+						<reference key="destination" ref="522679847"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="663899919"/>
+							<reference key="NSDestination" ref="522679847"/>
+							<string key="NSLabel">value: arrangedObjects.cheatName</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">arrangedObjects.cheatName</string>
+							<dictionary key="NSOptions">
+								<boolean value="NO" key="NSAllowsEditingMultipleValuesSelection"/>
+								<boolean value="YES" key="NSConditionallySetsEditable"/>
+							</dictionary>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">270</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: arrangedObjects.enabled</string>
+						<reference key="source" ref="567336110"/>
+						<reference key="destination" ref="522679847"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="567336110"/>
+							<reference key="NSDestination" ref="522679847"/>
+							<string key="NSLabel">value: arrangedObjects.enabled</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">arrangedObjects.enabled</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">240</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="561365494"/>
+						<reference key="destination" ref="1001"/>
+					</object>
+					<int key="connectionID">174</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: arrangedObjects.addressNS</string>
+						<reference key="source" ref="227933991"/>
+						<reference key="destination" ref="1036217935"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="227933991"/>
+							<reference key="NSDestination" ref="1036217935"/>
+							<string key="NSLabel">value: arrangedObjects.addressNS</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">arrangedObjects.addressNS</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">244</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: arrangedObjects.valueNS</string>
+						<reference key="source" ref="304062529"/>
+						<reference key="destination" ref="1036217935"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="304062529"/>
+							<reference key="NSDestination" ref="1036217935"/>
+							<string key="NSLabel">value: arrangedObjects.valueNS</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">arrangedObjects.valueNS</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">245</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">contentArray: self.tempCheatCodes</string>
+						<reference key="source" ref="1036217935"/>
+						<reference key="destination" ref="1001"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="1036217935"/>
+							<reference key="NSDestination" ref="1001"/>
+							<string key="NSLabel">contentArray: self.tempCheatCodes</string>
+							<string key="NSBinding">contentArray</string>
+							<string key="NSKeyPath">self.tempCheatCodes</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">222</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">contentArray: self.cheats</string>
+						<reference key="source" ref="522679847"/>
+						<reference key="destination" ref="1001"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="522679847"/>
+							<reference key="NSDestination" ref="1001"/>
+							<string key="NSLabel">contentArray: self.cheats</string>
+							<string key="NSBinding">contentArray</string>
+							<string key="NSKeyPath">self.cheats</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">238</int>
+				</object>
+			</array>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<array key="orderedObjects">
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<array key="object" id="0"/>
+						<reference key="children" ref="1000"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="1001"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="1003"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">First Responder</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-3</int>
+						<reference key="object" ref="1004"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Application</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1</int>
+						<reference key="object" ref="1005"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1006"/>
+						</array>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2</int>
+						<reference key="object" ref="1006"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="45503994"/>
+							<reference ref="9746913"/>
+							<object class="IBNSLayoutConstraint" id="93006757">
+								<reference key="firstItem" ref="606864501"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="493097267"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">12</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1006"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="950122774">
+								<reference key="firstItem" ref="1006"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="606864501"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1006"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="334700348">
+								<reference key="firstItem" ref="493097267"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="546225714"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">12</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1006"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="814687615">
+								<reference key="firstItem" ref="493097267"/>
+								<int key="firstAttribute">11</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="606864501"/>
+								<int key="secondAttribute">11</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1006"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="95231187">
+								<reference key="firstItem" ref="493097267"/>
+								<int key="firstAttribute">11</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="546225714"/>
+								<int key="secondAttribute">11</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1006"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="645683314">
+								<reference key="firstItem" ref="546225714"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="985245514"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">12</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1006"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="310970590">
+								<reference key="firstItem" ref="546225714"/>
+								<int key="firstAttribute">11</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="985245514"/>
+								<int key="secondAttribute">11</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1006"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="462358503">
+								<reference key="firstItem" ref="985245514"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="826080325"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">12</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1006"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="561640744">
+								<reference key="firstItem" ref="985245514"/>
+								<int key="firstAttribute">11</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="826080325"/>
+								<int key="secondAttribute">11</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1006"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="387004865">
+								<reference key="firstItem" ref="826080325"/>
+								<int key="firstAttribute">11</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1059773594"/>
+								<int key="secondAttribute">11</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1006"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="1007311341">
+								<reference key="firstItem" ref="1059773594"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="9746913"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">12</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1006"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="866546206">
+								<reference key="firstItem" ref="1006"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="9746913"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">17</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1006"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="979484367">
+								<reference key="firstItem" ref="9746913"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1006"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1006"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="646183372">
+								<reference key="firstItem" ref="9746913"/>
+								<int key="firstAttribute">11</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1059773594"/>
+								<int key="secondAttribute">11</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1006"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="470267410">
+								<reference key="firstItem" ref="45503994"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1006"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1006"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="1006238045">
+								<reference key="firstItem" ref="45503994"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1006"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1006"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="29580348">
+								<reference key="firstItem" ref="1006"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="45503994"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">53</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1006"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="1045634882">
+								<reference key="firstItem" ref="1006"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="45503994"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1006"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<reference ref="1059773594"/>
+							<reference ref="606864501"/>
+							<reference ref="493097267"/>
+							<reference ref="826080325"/>
+							<reference ref="985245514"/>
+							<reference ref="546225714"/>
+						</array>
+						<reference key="parent" ref="1005"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">4</int>
+						<reference key="object" ref="1059773594"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="710534927"/>
+						</array>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5</int>
+						<reference key="object" ref="710534927"/>
+						<reference key="parent" ref="1059773594"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6</int>
+						<reference key="object" ref="9746913"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="332020564"/>
+						</array>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">7</int>
+						<reference key="object" ref="332020564"/>
+						<reference key="parent" ref="9746913"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">23</int>
+						<reference key="object" ref="45503994"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="658965032"/>
+							<reference ref="896214539"/>
+							<reference ref="368269043"/>
+							<reference ref="166632435"/>
+						</array>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">24</int>
+						<reference key="object" ref="658965032"/>
+						<reference key="parent" ref="45503994"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">25</int>
+						<reference key="object" ref="896214539"/>
+						<reference key="parent" ref="45503994"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">26</int>
+						<reference key="object" ref="368269043"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="663899919"/>
+							<reference ref="567336110"/>
+						</array>
+						<reference key="parent" ref="45503994"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">27</int>
+						<reference key="object" ref="166632435"/>
+						<reference key="parent" ref="45503994"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">28</int>
+						<reference key="object" ref="663899919"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="418738496"/>
+						</array>
+						<reference key="parent" ref="368269043"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">29</int>
+						<reference key="object" ref="567336110"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1049516493"/>
+						</array>
+						<reference key="parent" ref="368269043"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">31</int>
+						<reference key="object" ref="418738496"/>
+						<reference key="parent" ref="663899919"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">32</int>
+						<reference key="object" ref="1049516493"/>
+						<reference key="parent" ref="567336110"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">78</int>
+						<reference key="object" ref="606864501"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="349501695"/>
+						</array>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">79</int>
+						<reference key="object" ref="349501695"/>
+						<reference key="parent" ref="606864501"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">115</int>
+						<reference key="object" ref="646183372"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">116</int>
+						<reference key="object" ref="1045634882"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">117</int>
+						<reference key="object" ref="29580348"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">118</int>
+						<reference key="object" ref="1006238045"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">121</int>
+						<reference key="object" ref="979484367"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">122</int>
+						<reference key="object" ref="866546206"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">124</int>
+						<reference key="object" ref="470267410"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">125</int>
+						<reference key="object" ref="1007311341"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">128</int>
+						<reference key="object" ref="950122774"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">129</int>
+						<reference key="object" ref="826080325"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="595634390"/>
+						</array>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">130</int>
+						<reference key="object" ref="595634390"/>
+						<reference key="parent" ref="826080325"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">131</int>
+						<reference key="object" ref="387004865"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">134</int>
+						<reference key="object" ref="279098783"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="199124710"/>
+						</array>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">135</int>
+						<reference key="object" ref="199124710"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1005365451"/>
+							<object class="IBNSLayoutConstraint" id="84137960">
+								<reference key="firstItem" ref="57583972"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="435790162"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">12</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="199124710"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="645028415">
+								<reference key="firstItem" ref="199124710"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="57583972"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="199124710"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="596516289">
+								<reference key="firstItem" ref="199124710"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="57583972"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="199124710"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="2693554">
+								<reference key="firstItem" ref="199124710"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="435790162"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="199124710"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="417333777">
+								<reference key="firstItem" ref="700724018"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="568487906"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">-1</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="199124710"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="276712223">
+								<reference key="firstItem" ref="199124710"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="700724018"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="199124710"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="533093812">
+								<reference key="firstItem" ref="568487906"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="700724018"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="199124710"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="550474461">
+								<reference key="firstItem" ref="199124710"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="568487906"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="199124710"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="666311847">
+								<reference key="firstItem" ref="568487906"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="199124710"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="199124710"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="214982838">
+								<reference key="firstItem" ref="199124710"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1005365451"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="199124710"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="281845918">
+								<reference key="firstItem" ref="199124710"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1005365451"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">56</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="199124710"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="983732462">
+								<reference key="firstItem" ref="1005365451"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="199124710"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="199124710"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="657091907">
+								<reference key="firstItem" ref="1005365451"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="199124710"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="199124710"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<reference ref="57583972"/>
+							<reference ref="435790162"/>
+							<reference ref="568487906"/>
+							<reference ref="700724018"/>
+						</array>
+						<reference key="parent" ref="279098783"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">136</int>
+						<reference key="object" ref="1005365451"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="561365494"/>
+							<reference ref="676091532"/>
+							<reference ref="70039629"/>
+							<reference ref="735039775"/>
+						</array>
+						<reference key="parent" ref="199124710"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">137</int>
+						<reference key="object" ref="561365494"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="227933991"/>
+							<reference ref="304062529"/>
+						</array>
+						<reference key="parent" ref="1005365451"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">138</int>
+						<reference key="object" ref="676091532"/>
+						<reference key="parent" ref="1005365451"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">139</int>
+						<reference key="object" ref="70039629"/>
+						<reference key="parent" ref="1005365451"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">140</int>
+						<reference key="object" ref="735039775"/>
+						<reference key="parent" ref="1005365451"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">141</int>
+						<reference key="object" ref="227933991"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="382860235"/>
+						</array>
+						<reference key="parent" ref="561365494"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">142</int>
+						<reference key="object" ref="304062529"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1054013317"/>
+						</array>
+						<reference key="parent" ref="561365494"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">143</int>
+						<reference key="object" ref="1054013317"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="865518372"/>
+						</array>
+						<reference key="parent" ref="304062529"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">144</int>
+						<reference key="object" ref="382860235"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="916821671"/>
+						</array>
+						<reference key="parent" ref="227933991"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">145</int>
+						<reference key="object" ref="657091907"/>
+						<reference key="parent" ref="199124710"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">148</int>
+						<reference key="object" ref="983732462"/>
+						<reference key="parent" ref="199124710"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">152</int>
+						<reference key="object" ref="57583972"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="447610302"/>
+						</array>
+						<reference key="parent" ref="199124710"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">153</int>
+						<reference key="object" ref="447610302"/>
+						<reference key="parent" ref="57583972"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">154</int>
+						<reference key="object" ref="596516289"/>
+						<reference key="parent" ref="199124710"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">155</int>
+						<reference key="object" ref="645028415"/>
+						<reference key="parent" ref="199124710"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">156</int>
+						<reference key="object" ref="435790162"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="135784125"/>
+						</array>
+						<reference key="parent" ref="199124710"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">157</int>
+						<reference key="object" ref="135784125"/>
+						<reference key="parent" ref="435790162"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">158</int>
+						<reference key="object" ref="84137960"/>
+						<reference key="parent" ref="199124710"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">159</int>
+						<reference key="object" ref="2693554"/>
+						<reference key="parent" ref="199124710"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">160</int>
+						<reference key="object" ref="281845918"/>
+						<reference key="parent" ref="199124710"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">161</int>
+						<reference key="object" ref="214982838"/>
+						<reference key="parent" ref="199124710"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">175</int>
+						<reference key="object" ref="568487906"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="386712492"/>
+							<object class="IBNSLayoutConstraint" id="826159586">
+								<reference key="firstItem" ref="568487906"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">25</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="568487906"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="720845299">
+								<reference key="firstItem" ref="568487906"/>
+								<int key="firstAttribute">8</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">25</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="568487906"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="199124710"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">176</int>
+						<reference key="object" ref="386712492"/>
+						<reference key="parent" ref="568487906"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">179</int>
+						<reference key="object" ref="700724018"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="770183666"/>
+							<object class="IBNSLayoutConstraint" id="861100117">
+								<reference key="firstItem" ref="700724018"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">25</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="700724018"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="199124710"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">180</int>
+						<reference key="object" ref="770183666"/>
+						<reference key="parent" ref="700724018"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">182</int>
+						<reference key="object" ref="276712223"/>
+						<reference key="parent" ref="199124710"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">193</int>
+						<reference key="object" ref="666311847"/>
+						<reference key="parent" ref="199124710"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">198</int>
+						<reference key="object" ref="550474461"/>
+						<reference key="parent" ref="199124710"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">199</int>
+						<reference key="object" ref="720845299"/>
+						<reference key="parent" ref="568487906"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">203</int>
+						<reference key="object" ref="533093812"/>
+						<reference key="parent" ref="199124710"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">206</int>
+						<reference key="object" ref="985245514"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="695849354"/>
+						</array>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">207</int>
+						<reference key="object" ref="695849354"/>
+						<reference key="parent" ref="985245514"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">208</int>
+						<reference key="object" ref="561640744"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">209</int>
+						<reference key="object" ref="462358503"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">219</int>
+						<reference key="object" ref="1036217935"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Cheat Values</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">227</int>
+						<reference key="object" ref="546225714"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="141020825"/>
+						</array>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">228</int>
+						<reference key="object" ref="141020825"/>
+						<reference key="parent" ref="546225714"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">229</int>
+						<reference key="object" ref="310970590"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">231</int>
+						<reference key="object" ref="645683314"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">233</int>
+						<reference key="object" ref="826159586"/>
+						<reference key="parent" ref="568487906"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">235</int>
+						<reference key="object" ref="861100117"/>
+						<reference key="parent" ref="700724018"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">236</int>
+						<reference key="object" ref="417333777"/>
+						<reference key="parent" ref="199124710"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">237</int>
+						<reference key="object" ref="522679847"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Cheats</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">256</int>
+						<reference key="object" ref="493097267"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="636439128"/>
+						</array>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">257</int>
+						<reference key="object" ref="636439128"/>
+						<reference key="parent" ref="493097267"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">258</int>
+						<reference key="object" ref="95231187"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">259</int>
+						<reference key="object" ref="93006757"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">260</int>
+						<reference key="object" ref="814687615"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">261</int>
+						<reference key="object" ref="334700348"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">271</int>
+						<reference key="object" ref="916821671"/>
+						<reference key="parent" ref="382860235"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">272</int>
+						<reference key="object" ref="865518372"/>
+						<reference key="parent" ref="1054013317"/>
+					</object>
+				</array>
+			</object>
+			<dictionary class="NSMutableDictionary" key="flattenedProperties">
+				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1.IBWindowTemplateEditedContentRect">{{649, 658}, {649, 357}}</string>
+				<boolean value="NO" key="1.NSWindowTemplate.visibleAtLaunch"/>
+				<string key="115.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="116.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="117.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="118.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="121.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="122.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="124.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="125.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="128.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="129.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="129.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="130.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="131.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="134.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="134.NSWindowTemplate.visibleAtLaunch"/>
+				<array class="NSMutableArray" key="135.IBNSViewMetadataConstraints">
+					<reference ref="657091907"/>
+					<reference ref="983732462"/>
+					<reference ref="281845918"/>
+					<reference ref="214982838"/>
+					<reference ref="666311847"/>
+					<reference ref="550474461"/>
+					<reference ref="533093812"/>
+					<reference ref="276712223"/>
+					<reference ref="417333777"/>
+					<reference ref="2693554"/>
+					<reference ref="596516289"/>
+					<reference ref="645028415"/>
+					<reference ref="84137960"/>
+				</array>
+				<string key="135.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="136.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="136.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="137.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="138.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="139.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="140.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="141.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="142.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="143.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="144.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="145.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="148.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="152.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="152.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="153.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="154.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="155.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="156.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="156.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="157.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="158.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="159.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="160.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="161.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array class="NSMutableArray" key="175.IBNSViewMetadataConstraints">
+					<reference ref="720845299"/>
+					<reference ref="826159586"/>
+				</array>
+				<boolean value="NO" key="175.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="175.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="176.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array class="NSMutableArray" key="179.IBNSViewMetadataConstraints">
+					<reference ref="861100117"/>
+				</array>
+				<boolean value="NO" key="179.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="179.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="180.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="182.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="193.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="198.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="199.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array class="NSMutableArray" key="2.IBNSViewMetadataConstraints">
+					<reference ref="1045634882"/>
+					<reference ref="29580348"/>
+					<reference ref="1006238045"/>
+					<reference ref="470267410"/>
+					<reference ref="646183372"/>
+					<reference ref="979484367"/>
+					<reference ref="866546206"/>
+					<reference ref="1007311341"/>
+					<reference ref="387004865"/>
+					<reference ref="561640744"/>
+					<reference ref="462358503"/>
+					<reference ref="310970590"/>
+					<reference ref="645683314"/>
+					<reference ref="95231187"/>
+					<reference ref="814687615"/>
+					<reference ref="334700348"/>
+					<reference ref="950122774"/>
+					<reference ref="93006757"/>
+				</array>
+				<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="203.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="206.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="206.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="207.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="208.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="209.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="219.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="227.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="227.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="228.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="229.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="23.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="23.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="231.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="233.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="235.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="236.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="237.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="24.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="25.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="256.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="256.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="257.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="258.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="259.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="26.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="260.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="261.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="27.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="271.CustomClassName">PcsxrHexadecimalFormatter</string>
+				<string key="271.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="272.CustomClassName">PcsxrHexadecimalFormatter</string>
+				<string key="272.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="28.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="29.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="31.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="32.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="4.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="6.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="78.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="78.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="79.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			</dictionary>
+			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+			<nil key="activeLocalization"/>
+			<dictionary class="NSMutableDictionary" key="localizations"/>
+			<nil key="sourceID"/>
+			<int key="maxID">274</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">CheatController</string>
+					<string key="superclassName">NSWindowController</string>
+					<dictionary class="NSMutableDictionary" key="actions">
+						<string key="addCheat:">id</string>
+						<string key="addCheatValue:">id</string>
+						<string key="applyCheats:">id</string>
+						<string key="changeCheat:">id</string>
+						<string key="clear:">id</string>
+						<string key="closeCheatEdit:">id</string>
+						<string key="editCheat:">id</string>
+						<string key="loadCheats:">id</string>
+						<string key="removeCheatValue:">id</string>
+						<string key="removeCheats:">id</string>
+						<string key="saveCheats:">id</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="actionInfosByName">
+						<object class="IBActionInfo" key="addCheat:">
+							<string key="name">addCheat:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="addCheatValue:">
+							<string key="name">addCheatValue:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="applyCheats:">
+							<string key="name">applyCheats:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="changeCheat:">
+							<string key="name">changeCheat:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="clear:">
+							<string key="name">clear:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="closeCheatEdit:">
+							<string key="name">closeCheatEdit:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="editCheat:">
+							<string key="name">editCheat:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="loadCheats:">
+							<string key="name">loadCheats:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="removeCheatValue:">
+							<string key="name">removeCheatValue:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="removeCheats:">
+							<string key="name">removeCheats:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="saveCheats:">
+							<string key="name">saveCheats:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="addressFormatter">PcsxrHexadecimalFormatter</string>
+						<string key="cheatView">NSTableView</string>
+						<string key="editCheatView">NSTableView</string>
+						<string key="editCheatWindow">NSWindow</string>
+						<string key="valueFormatter">PcsxrHexadecimalFormatter</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="addressFormatter">
+							<string key="name">addressFormatter</string>
+							<string key="candidateClassName">PcsxrHexadecimalFormatter</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="cheatView">
+							<string key="name">cheatView</string>
+							<string key="candidateClassName">NSTableView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="editCheatView">
+							<string key="name">editCheatView</string>
+							<string key="candidateClassName">NSTableView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="editCheatWindow">
+							<string key="name">editCheatWindow</string>
+							<string key="candidateClassName">NSWindow</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="valueFormatter">
+							<string key="name">valueFormatter</string>
+							<string key="candidateClassName">PcsxrHexadecimalFormatter</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/CheatController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSLayoutConstraint</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/NSLayoutConstraint.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">PcsxrHexadecimalFormatter</string>
+					<string key="superclassName">NSFormatter</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/PcsxrHexadecimalFormatter.h</string>
+					</object>
+				</object>
+			</array>
+		</object>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<real value="1070" key="NS.object.0"/>
+		</object>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<string key="NSAddTemplate">{8, 8}</string>
+			<string key="NSRemoveTemplate">{8, 8}</string>
+			<string key="NSSwitch">{15, 15}</string>
+		</dictionary>
+		<bool key="IBDocument.UseAutolayout">YES</bool>
+	</data>
+	<classes>
+		<class name="IBCustomFormatter">
+			<fallbacks>
+				<name>NSFormatter</name>
+			</fallbacks>
+		</class>
+	</classes>
+</archive>

pcsxr-1.9.93.tar.bz2/macosx/English.lproj/Configuration.xib Added

@@ -0,0 +1,5764 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
+	<data>
+		<int key="IBDocument.SystemTarget">1070</int>
+		<string key="IBDocument.SystemVersion">12E55</string>
+		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
+		<string key="IBDocument.AppKitVersion">1187.39</string>
+		<string key="IBDocument.HIToolboxVersion">626.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			<string key="NS.object.0">3084</string>
+		</object>
+		<array key="IBDocument.IntegratedClassDependencies">
+			<string>NSArrayController</string>
+			<string>NSBox</string>
+			<string>NSButton</string>
+			<string>NSButtonCell</string>
+			<string>NSCollectionView</string>
+			<string>NSCollectionViewItem</string>
+			<string>NSCustomObject</string>
+			<string>NSCustomView</string>
+			<string>NSImageCell</string>
+			<string>NSImageView</string>
+			<string>NSMatrix</string>
+			<string>NSMenu</string>
+			<string>NSMenuItem</string>
+			<string>NSPopUpButton</string>
+			<string>NSPopUpButtonCell</string>
+			<string>NSScrollView</string>
+			<string>NSScroller</string>
+			<string>NSTabView</string>
+			<string>NSTabViewItem</string>
+			<string>NSTextField</string>
+			<string>NSTextFieldCell</string>
+			<string>NSView</string>
+			<string>NSViewController</string>
+			<string>NSWindowTemplate</string>
+		</array>
+		<array key="IBDocument.PluginDependencies">
+			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+		</array>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="157976658">
+			<object class="NSCustomObject" id="974938689">
+				<string key="NSClassName">ConfigurationController</string>
+			</object>
+			<object class="NSCustomObject" id="713881283">
+				<string key="NSClassName">FirstResponder</string>
+			</object>
+			<object class="NSCustomObject" id="423003959">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSWindowTemplate" id="379363543">
+				<int key="NSWindowStyleMask">15</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{55, 345}, {551, 407}}</string>
+				<int key="NSWTFlags">807927808</int>
+				<string key="NSWindowTitle">PCSXR Preferences</string>
+				<string key="NSWindowClass">NSWindow</string>
+				<object class="NSMutableString" key="NSViewClass">
+					<characters key="NS.bytes">View</characters>
+				</object>
+				<nil key="NSUserInterfaceItemIdentifier"/>
+				<string key="NSWindowContentMaxSize">{2000, 407}</string>
+				<string key="NSWindowContentMinSize">{551, 407}</string>
+				<object class="NSView" key="NSWindowView" id="644483536">
+					<reference key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<array class="NSMutableArray" key="NSSubviews">
+						<object class="NSTabView" id="145760790">
+							<reference key="NSNextResponder" ref="644483536"/>
+							<int key="NSvFlags">274</int>
+							<string key="NSFrame">{{13, 10}, {525, 391}}</string>
+							<reference key="NSSuperview" ref="644483536"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="782866499"/>
+							<array class="NSMutableArray" key="NSTabViewItems">
+								<object class="NSTabViewItem" id="150404821">
+									<object class="NSMutableString" key="NSIdentifier">
+										<characters key="NS.bytes">1</characters>
+									</object>
+									<object class="NSView" key="NSView" id="309207255">
+										<nil key="NSNextResponder"/>
+										<int key="NSvFlags">256</int>
+										<array class="NSMutableArray" key="NSSubviews">
+											<object class="NSBox" id="324328678">
+												<reference key="NSNextResponder" ref="309207255"/>
+												<int key="NSvFlags">268</int>
+												<array class="NSMutableArray" key="NSSubviews">
+													<object class="NSView" id="501435377">
+														<reference key="NSNextResponder" ref="324328678"/>
+														<int key="NSvFlags">274</int>
+														<array class="NSMutableArray" key="NSSubviews">
+															<object class="NSMatrix" id="260387224">
+																<reference key="NSNextResponder" ref="501435377"/>
+																<int key="NSvFlags">274</int>
+																<string key="NSFrame">{{20, 42}, {135, 172}}</string>
+																<reference key="NSSuperview" ref="501435377"/>
+																<reference key="NSNextKeyView" ref="197815183"/>
+																<bool key="NSEnabled">YES</bool>
+																<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+																<int key="NSNumRows">8</int>
+																<int key="NSNumCols">1</int>
+																<array class="NSMutableArray" key="NSCells">
+																	<object class="NSButtonCell" id="1001969866">
+																		<int key="NSCellFlags">-2080374784</int>
+																		<int key="NSCellFlags2">0</int>
+																		<string key="NSContents">Dynarec CPU core</string>
+																		<object class="NSFont" key="NSSupport" id="113129670">
+																			<string key="NSName">LucidaGrande</string>
+																			<double key="NSSize">13</double>
+																			<int key="NSfFlags">1044</int>
+																		</object>
+																		<reference key="NSControlView" ref="260387224"/>
+																		<int key="NSButtonFlags">1211912448</int>
+																		<int key="NSButtonFlags2">2</int>
+																		<object class="NSImage" key="NSNormalImage" id="165975504">
+																			<int key="NSImageFlags">549453824</int>
+																			<string key="NSSize">{18, 18}</string>
+																			<array class="NSMutableArray" key="NSReps">
+																				<array>
+																					<integer value="0"/>
+																					<object class="NSBitmapImageRep">
+																						<object class="NSData" key="NSTIFFRepresentation">
+																							<bytes key="NS.bytes">TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAQAAAAEAAAADAAAAAwAAAAMAAAAD
+AAAAAwAAAAMAAAABAAAAAQAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABE1NTW4ZmZm/29vb/9zc3P/
+c3Nz/3Jycv9ycnL/cnJy/3Jycv9vb2//ZWVl/yUlJZ8AAAAiAAAAAAAAAAAAAAAAAAAAAkNDQ5W3t7f/
++fn5//z8/P/8/Pz//Pz8//z8/P/8/Pz//Pz8//z8/P/8/Pz/+fn5/8DAwP9UVFS7AAAAAgAAAAAAAAAB
+AAAACJGRkf/c3Nz/8/Pz//T09P/19fX/9fX1//T09P/09PT/9PT0//T09P/09PT/8/Pz/97e3v+JiYn/
+AAAACAAAAAEAAAABAAAAEIGBgf/f39//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//u7u7/
+7u7u/9/f3/+SkpL/AAAAEAAAAAEAAAABAAAAFZGRkf/d3d3/7Ozs/+zs7P/t7e3/7e3t/+3t7f/t7e3/
+7Ozs/+7u7v/t7e3/7Ozs/9/f3/+QkJD/AAAAFAAAAAEAAAABAAAAGJ6env/b29v/6enp/+np6f/q6ur/
+6+vr/+rq6v/q6ur/6urq/+rq6v/q6ur/6Ojo/9jY2P+bm5v/AAAAGAAAAAEAAAABAAAAG6CgoP/T09P/
+2tra/9ra2v/b29v/29vb/9vb2//Z2dn/29vb/9nZ2f/a2tr/2tra/9HR0f+ioqL/AAAAGwAAAAEAAAAB
+AAAAHKurq//a2tr/39/f/9/f3//g4OD/4ODg/+Dg4P/h4eH/39/f/9/f3//f39//4ODg/9fX1/+mpqb/
+AAAAHAAAAAEAAAACAAAAHrS0tP/j4+P/5ubm/+Xl5f/m5ub/5+fn/+fn5//n5+f/6enp/+fn5//n5+f/
+6Ojo/93d3f+tra3/AAAAHgAAAAIAAAACAAAAILi4uP/p6en/7e3t//Dw8P/w8PD/8PDw/+3t7f/t7e3/
+8fHx/+zs7P/v7+//7e3t/+bm5v+0tLT/AAAAIAAAAAIAAAABAAAAILu7u//v7+//9/f3//b29v/4+Pj/
+9vb2//b29v/29vb/9/f3//f39//39/f/9/f3//Dw8P+7u7v/AAAAIAAAAAEAAAABAAAAHY2Njej4+Pj/
+/////////////////////////////////////////////////v7+//n5+f+Tk5PoAAAAHQAAAAEAAAAB
+AAAAEjo6Oq28vLz3/////////////////////////////////////////////////////7u7u/c/Pz+r
+AAAAEgAAAAEAAAAAAAAACAAAAEEAAACZAAAAxgAAANMAAADVAAAA1gAAANQAAADWAAAA2AAAANgAAADT
+AAAAxQAAAJkAAABBAAAACAAAAAAAAAAAAAAAAgAAAA0AAAAlAAAANgAAAEEAAABDAAAAQwAAAEMAAABE
+AAAAQwAAAEQAAABBAAAANgAAACUAAAANAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAwAAAAYAAAAG
+AAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAAAwAAAAMAAAAAAAAAAAAAAAAADQEAAAMAAAABABIAAAEB
+AAMAAAABABIAAAECAAMAAAAEAAAFugEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES
+AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS
+AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
+																						</object>
+																					</object>
+																				</array>
+																			</array>
+																			<object class="NSColor" key="NSColor" id="898518986">
+																				<int key="NSColorSpace">3</int>
+																				<bytes key="NSWhite">MCAwAA</bytes>
+																			</object>
+																		</object>
+																		<object class="NSButtonImageSource" key="NSAlternateImage" id="890331736">
+																			<string key="NSImageName">NSSwitch</string>
+																		</object>
+																		<string key="NSAlternateContents"/>
+																		<string key="NSKeyEquivalent"/>
+																		<int key="NSPeriodicDelay">200</int>
+																		<int key="NSPeriodicInterval">25</int>
+																	</object>
+																	<object class="NSButtonCell" id="323048264">
+																		<int key="NSCellFlags">67108864</int>
+																		<int key="NSCellFlags2">0</int>
+																		<string key="NSContents">Simulate PSX BIOS</string>
+																		<reference key="NSSupport" ref="113129670"/>
+																		<reference key="NSControlView" ref="260387224"/>
+																		<int key="NSTag">2</int>
+																		<int key="NSButtonFlags">1211912448</int>
+																		<int key="NSButtonFlags2">2</int>
+																		<reference key="NSNormalImage" ref="165975504"/>
+																		<reference key="NSAlternateImage" ref="890331736"/>
+																		<string key="NSAlternateContents"/>
+																		<string key="NSKeyEquivalent"/>
+																		<int key="NSPeriodicDelay">200</int>
+																		<int key="NSPeriodicInterval">25</int>
+																	</object>
+																	<object class="NSButtonCell" id="878205730">
+																		<int key="NSCellFlags">67108864</int>
+																		<int key="NSCellFlags2">0</int>
+																		<string key="NSContents">No CD audio</string>
+																		<reference key="NSSupport" ref="113129670"/>
+																		<reference key="NSControlView" ref="260387224"/>
+																		<int key="NSTag">1</int>
+																		<int key="NSButtonFlags">1211912448</int>
+																		<int key="NSButtonFlags2">2</int>
+																		<reference key="NSNormalImage" ref="165975504"/>
+																		<reference key="NSAlternateImage" ref="890331736"/>
+																		<string key="NSAlternateContents"/>
+																		<string key="NSKeyEquivalent"/>
+																		<int key="NSPeriodicDelay">200</int>
+																		<int key="NSPeriodicInterval">25</int>
+																	</object>
+																	<object class="NSButtonCell" id="41079268">
+																		<int key="NSCellFlags">67108864</int>
+																		<int key="NSCellFlags2">0</int>
+																		<string key="NSContents">No XA audio</string>
+																		<reference key="NSSupport" ref="113129670"/>
+																		<reference key="NSControlView" ref="260387224"/>
+																		<int key="NSTag">3</int>
+																		<int key="NSButtonFlags">1211912448</int>
+																		<int key="NSButtonFlags2">2</int>
+																		<reference key="NSNormalImage" ref="165975504"/>
+																		<reference key="NSAlternateImage" ref="890331736"/>
+																		<string key="NSAlternateContents"/>
+																		<string key="NSKeyEquivalent"/>
+																		<int key="NSPeriodicDelay">200</int>
+																		<int key="NSPeriodicInterval">25</int>
+																	</object>
+																	<object class="NSButtonCell" id="322742106">
+																		<int key="NSCellFlags">67108864</int>
+																		<int key="NSCellFlags2">0</int>
+																		<string key="NSContents">Enable NetPlay</string>
+																		<reference key="NSSupport" ref="113129670"/>
+																		<reference key="NSControlView" ref="260387224"/>
+																		<int key="NSTag">-1</int>
+																		<int key="NSButtonFlags">1211912448</int>
+																		<int key="NSButtonFlags2">2</int>
+																		<reference key="NSAlternateImage" ref="890331736"/>
+																		<string key="NSAlternateContents"/>
+																		<int key="NSPeriodicDelay">200</int>
+																		<int key="NSPeriodicInterval">25</int>
+																	</object>
+																	<object class="NSButtonCell" id="874223654">
+																		<int key="NSCellFlags">67108864</int>
+																		<int key="NSCellFlags2">0</int>
+																		<string key="NSContents">Widescreen</string>
+																		<reference key="NSSupport" ref="113129670"/>
+																		<reference key="NSControlView" ref="260387224"/>
+																		<int key="NSTag">-1</int>
+																		<int key="NSButtonFlags">1211912448</int>
+																		<int key="NSButtonFlags2">2</int>
+																		<reference key="NSAlternateImage" ref="890331736"/>
+																		<string key="NSAlternateContents"/>
+																		<int key="NSPeriodicDelay">200</int>
+																		<int key="NSPeriodicInterval">25</int>
+																	</object>
+																	<object class="NSButtonCell" id="772916223">
+																		<int key="NSCellFlags">67108864</int>
+																		<int key="NSCellFlags2">0</int>
+																		<string key="NSContents">Logging</string>
+																		<reference key="NSSupport" ref="113129670"/>
+																		<reference key="NSControlView" ref="260387224"/>
+																		<int key="NSTag">-1</int>
+																		<int key="NSButtonFlags">1211912448</int>
+																		<int key="NSButtonFlags2">2</int>
+																		<reference key="NSAlternateImage" ref="890331736"/>
+																		<string key="NSAlternateContents"/>
+																		<int key="NSPeriodicDelay">200</int>
+																		<int key="NSPeriodicInterval">25</int>
+																	</object>
+																	<object class="NSButtonCell" id="85343827">
+																		<int key="NSCellFlags">-2080374784</int>
+																		<int key="NSCellFlags2">0</int>
+																		<string key="NSContents">Fast boot</string>
+																		<reference key="NSSupport" ref="113129670"/>
+																		<reference key="NSControlView" ref="260387224"/>
+																		<int key="NSTag">-1</int>
+																		<int key="NSButtonFlags">1211912448</int>
+																		<int key="NSButtonFlags2">2</int>
+																		<reference key="NSAlternateImage" ref="890331736"/>
+																		<string key="NSAlternateContents"/>
+																		<int key="NSPeriodicDelay">200</int>
+																		<int key="NSPeriodicInterval">25</int>
+																	</object>
+																</array>
+																<string key="NSCellSize">{135, 18}</string>
+																<string key="NSIntercellSpacing">{4, 4}</string>
+																<int key="NSMatrixFlags">-2080374784</int>
+																<string key="NSCellClass">NSActionCell</string>
+																<object class="NSButtonCell" key="NSProtoCell" id="629475661">
+																	<int key="NSCellFlags">67108864</int>
+																	<int key="NSCellFlags2">0</int>
+																	<string key="NSContents">Switch</string>
+																	<reference key="NSSupport" ref="113129670"/>
+																	<int key="NSTag">-1</int>
+																	<int key="NSButtonFlags">1211912448</int>
+																	<int key="NSButtonFlags2">2</int>
+																	<object class="NSImage" key="NSNormalImage" id="1058349568">
+																		<int key="NSImageFlags">549453824</int>
+																		<string key="NSSize">{18, 18}</string>
+																		<array class="NSMutableArray" key="NSReps">
+																			<array>
+																				<integer value="0"/>
+																				<object class="NSBitmapImageRep">
+																					<object class="NSData" key="NSTIFFRepresentation">
+																						<bytes key="NS.bytes">TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAQAAAAEAAAADAAAAAwAAAAMAAAAD
+AAAAAwAAAAMAAAABAAAAAQAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABE1NTW4ZmZm/29vb/9zc3P/
+c3Nz/3Jycv9ycnL/cnJy/3Jycv9vb2//ZWVl/yUlJZ8AAAAiAAAAAAAAAAAAAAAAAAAAAkNDQ5W3t7f/
++fn5//z8/P/8/Pz//Pz8//z8/P/8/Pz//Pz8//z8/P/8/Pz/+fn5/8DAwP9UVFS7AAAAAgAAAAAAAAAB
+AAAACJGRkf/c3Nz/8/Pz//T09P/19fX/9fX1//T09P/09PT/9PT0//T09P/09PT/8/Pz/97e3v+JiYn/
+AAAACAAAAAEAAAABAAAAEIGBgf/f39//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//u7u7/
+7u7u/9/f3/+SkpL/AAAAEAAAAAEAAAABAAAAFZGRkf/d3d3/7Ozs/+zs7P/t7e3/7e3t/+3t7f/t7e3/
+7Ozs/+7u7v/t7e3/7Ozs/9/f3/+QkJD/AAAAFAAAAAEAAAABAAAAGJ6env/b29v/6enp/+np6f/q6ur/
+6+vr/+rq6v/q6ur/6urq/+rq6v/q6ur/6Ojo/9jY2P+bm5v/AAAAGAAAAAEAAAABAAAAG6CgoP/T09P/
+2tra/9ra2v/b29v/29vb/9vb2//Z2dn/29vb/9nZ2f/a2tr/2tra/9HR0f+ioqL/AAAAGwAAAAEAAAAB
+AAAAHKurq//a2tr/39/f/9/f3//g4OD/4ODg/+Dg4P/h4eH/39/f/9/f3//f39//4ODg/9fX1/+mpqb/
+AAAAHAAAAAEAAAACAAAAHrS0tP/j4+P/5ubm/+Xl5f/m5ub/5+fn/+fn5//n5+f/6enp/+fn5//n5+f/
+6Ojo/93d3f+tra3/AAAAHgAAAAIAAAACAAAAILi4uP/p6en/7e3t//Dw8P/w8PD/8PDw/+3t7f/t7e3/
+8fHx/+zs7P/v7+//7e3t/+bm5v+0tLT/AAAAIAAAAAIAAAABAAAAILu7u//v7+//9/f3//b29v/4+Pj/
+9vb2//b29v/29vb/9/f3//f39//39/f/9/f3//Dw8P+7u7v/AAAAIAAAAAEAAAABAAAAHY2Njej4+Pj/
+/////////////////////////////////////////////////v7+//n5+f+Tk5PoAAAAHQAAAAEAAAAB
+AAAAEjo6Oq28vLz3/////////////////////////////////////////////////////7u7u/c/Pz+r
+AAAAEgAAAAEAAAAAAAAACAAAAEEAAACZAAAAxgAAANMAAADVAAAA1gAAANQAAADWAAAA2AAAANgAAADT
+AAAAxQAAAJkAAABBAAAACAAAAAAAAAAAAAAAAgAAAA0AAAAlAAAANgAAAEEAAABDAAAAQwAAAEMAAABE
+AAAAQwAAAEQAAABBAAAANgAAACUAAAANAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAwAAAAYAAAAG
+AAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAAAwAAAAMAAAAAAAAAAAAAAAAADQEAAAMAAAABABIAAAEB
+AAMAAAABABIAAAECAAMAAAAEAAAFugEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES
+AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS
+AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
+																					</object>
+																				</object>
+																			</array>
+																		</array>
+																		<reference key="NSColor" ref="898518986"/>
+																	</object>
+																	<reference key="NSAlternateImage" ref="890331736"/>
+																	<string key="NSAlternateContents"/>
+																	<int key="NSPeriodicDelay">200</int>
+																	<int key="NSPeriodicInterval">25</int>
+																</object>
+																<int key="NSSelectedRow">-1</int>
+																<int key="NSSelectedCol">-1</int>
+																<object class="NSColor" key="NSBackgroundColor" id="243535788">
+																	<int key="NSColorSpace">6</int>
+																	<string key="NSCatalogName">System</string>
+																	<string key="NSColorName">controlColor</string>
+																	<object class="NSColor" key="NSColor" id="511312022">
+																		<int key="NSColorSpace">3</int>
+																		<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+																	</object>
+																</object>
+																<reference key="NSCellBackgroundColor" ref="243535788"/>
+															</object>
+															<object class="NSPopUpButton" id="197815183">
+																<reference key="NSNextResponder" ref="501435377"/>
+																<int key="NSvFlags">290</int>
+																<string key="NSFrame">{{19, 10}, {137, 26}}</string>
+																<reference key="NSSuperview" ref="501435377"/>
+																<reference key="NSNextKeyView" ref="715888890"/>
+																<bool key="NSEnabled">YES</bool>
+																<object class="NSPopUpButtonCell" key="NSCell" id="27092767">
+																	<int key="NSCellFlags">-2076180416</int>
+																	<int key="NSCellFlags2">1024</int>
+																	<reference key="NSSupport" ref="113129670"/>
+																	<reference key="NSControlView" ref="197815183"/>
+																	<int key="NSButtonFlags">109199360</int>
+																	<int key="NSButtonFlags2">1</int>
+																	<object class="NSFont" key="NSAlternateImage" id="983951697">
+																		<string key="NSName">LucidaGrande</string>
+																		<double key="NSSize">13</double>
+																		<int key="NSfFlags">16</int>
+																	</object>
+																	<object class="NSMutableString" key="NSAlternateContents">
+																		<characters key="NS.bytes"/>
+																	</object>
+																	<object class="NSMutableString" key="NSKeyEquivalent">
+																		<characters key="NS.bytes"/>
+																	</object>
+																	<int key="NSPeriodicDelay">400</int>
+																	<int key="NSPeriodicInterval">75</int>
+																	<object class="NSMenuItem" key="NSMenuItem" id="305309789">
+																		<reference key="NSMenu" ref="780475521"/>
+																		<bool key="NSIsHidden">YES</bool>
+																		<string key="NSTitle">System Region</string>
+																		<string key="NSKeyEquiv"/>
+																		<int key="NSKeyEquivModMask">1048576</int>
+																		<int key="NSMnemonicLoc">2147483647</int>
+																		<object class="NSCustomResource" key="NSOnImage" id="853204695">
+																			<string key="NSClassName">NSImage</string>
+																			<string key="NSResourceName">NSMenuCheckmark</string>
+																		</object>
+																		<object class="NSCustomResource" key="NSMixedImage" id="607321304">
+																			<string key="NSClassName">NSImage</string>
+																			<string key="NSResourceName">NSMenuMixedState</string>
+																		</object>
+																		<string key="NSAction">_popUpItemAction:</string>
+																		<reference key="NSTarget" ref="27092767"/>
+																	</object>
+																	<bool key="NSMenuItemRespectAlignment">YES</bool>
+																	<object class="NSMenu" key="NSMenu" id="780475521">
+																		<object class="NSMutableString" key="NSTitle">
+																			<characters key="NS.bytes">OtherViews</characters>
+																		</object>
+																		<array class="NSMutableArray" key="NSMenuItems">
+																			<reference ref="305309789"/>
+																			<object class="NSMenuItem" id="810398986">
+																				<reference key="NSMenu" ref="780475521"/>
+																				<string key="NSTitle">Autodetect</string>
+																				<string key="NSKeyEquiv"/>
+																				<int key="NSKeyEquivModMask">1048576</int>
+																				<int key="NSMnemonicLoc">2147483647</int>
+																				<reference key="NSOnImage" ref="853204695"/>
+																				<reference key="NSMixedImage" ref="607321304"/>
+																				<string key="NSAction">_popUpItemAction:</string>
+																				<int key="NSTag">3</int>
+																				<reference key="NSTarget" ref="27092767"/>
+																			</object>
+																			<object class="NSMenuItem" id="173586156">
+																				<reference key="NSMenu" ref="780475521"/>
+																				<bool key="NSIsDisabled">YES</bool>
+																				<bool key="NSIsSeparator">YES</bool>
+																				<string key="NSTitle"/>
+																				<string key="NSKeyEquiv"/>
+																				<int key="NSKeyEquivModMask">1048576</int>
+																				<int key="NSMnemonicLoc">2147483647</int>
+																				<reference key="NSOnImage" ref="853204695"/>
+																				<reference key="NSMixedImage" ref="607321304"/>
+																				<string key="NSAction">_popUpItemAction:</string>
+																				<reference key="NSTarget" ref="27092767"/>
+																			</object>
+																			<object class="NSMenuItem" id="791751653">
+																				<reference key="NSMenu" ref="780475521"/>
+																				<string key="NSTitle">NTSC (USA/Japan)</string>
+																				<string key="NSKeyEquiv"/>
+																				<int key="NSKeyEquivModMask">1048576</int>
+																				<int key="NSMnemonicLoc">2147483647</int>
+																				<reference key="NSOnImage" ref="853204695"/>
+																				<reference key="NSMixedImage" ref="607321304"/>
+																				<string key="NSAction">_popUpItemAction:</string>
+																				<int key="NSTag">1</int>
+																				<reference key="NSTarget" ref="27092767"/>
+																			</object>
+																			<object class="NSMenuItem" id="847210295">
+																				<reference key="NSMenu" ref="780475521"/>
+																				<string key="NSTitle">PAL (Europe)</string>
+																				<string key="NSKeyEquiv"/>
+																				<int key="NSKeyEquivModMask">1048576</int>
+																				<int key="NSMnemonicLoc">2147483647</int>
+																				<reference key="NSOnImage" ref="853204695"/>
+																				<reference key="NSMixedImage" ref="607321304"/>
+																				<string key="NSAction">_popUpItemAction:</string>
+																				<int key="NSTag">2</int>
+																				<reference key="NSTarget" ref="27092767"/>
+																			</object>
+																		</array>
+																	</object>
+																	<bool key="NSPullDown">YES</bool>
+																	<int key="NSPreferredEdge">3</int>
+																	<bool key="NSUsesItemFromMenu">YES</bool>
+																	<bool key="NSAltersState">YES</bool>
+																	<int key="NSArrowPosition">1</int>
+																</object>
+																<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+															</object>
+														</array>
+														<string key="NSFrame">{{2, 2}, {175, 224}}</string>
+														<reference key="NSSuperview" ref="324328678"/>
+														<reference key="NSNextKeyView" ref="260387224"/>
+													</object>
+												</array>
+												<string key="NSFrame">{{17, 98}, {179, 241}}</string>
+												<reference key="NSSuperview" ref="309207255"/>
+												<reference key="NSNextKeyView" ref="501435377"/>
+												<string key="NSOffsets">{0, 0}</string>
+												<object class="NSTextFieldCell" key="NSTitleCell">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Options</string>
+													<object class="NSFont" key="NSSupport" id="26">
+														<string key="NSName">LucidaGrande</string>
+														<double key="NSSize">11</double>
+														<int key="NSfFlags">3100</int>
+													</object>
+													<object class="NSColor" key="NSBackgroundColor" id="767300285">
+														<int key="NSColorSpace">6</int>
+														<string key="NSCatalogName">System</string>
+														<string key="NSColorName">textBackgroundColor</string>
+														<object class="NSColor" key="NSColor" id="271765176">
+															<int key="NSColorSpace">3</int>
+															<bytes key="NSWhite">MQA</bytes>
+														</object>
+													</object>
+													<object class="NSColor" key="NSTextColor">
+														<int key="NSColorSpace">3</int>
+														<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
+													</object>
+												</object>
+												<reference key="NSContentView" ref="501435377"/>
+												<int key="NSBorderType">3</int>
+												<int key="NSBoxType">0</int>
+												<int key="NSTitlePosition">2</int>
+												<bool key="NSTransparent">NO</bool>
+											</object>
+											<object class="NSBox" id="715888890">
+												<reference key="NSNextResponder" ref="309207255"/>
+												<int key="NSvFlags">266</int>
+												<array class="NSMutableArray" key="NSSubviews">
+													<object class="NSView" id="593482660">
+														<reference key="NSNextResponder" ref="715888890"/>
+														<int key="NSvFlags">274</int>
+														<array class="NSMutableArray" key="NSSubviews">
+															<object class="NSMatrix" id="263292685">
+																<reference key="NSNextResponder" ref="593482660"/>
+																<int key="NSvFlags">306</int>
+																<string key="NSFrame">{{18, 16}, {238, 40}}</string>
+																<reference key="NSSuperview" ref="593482660"/>
+																<reference key="NSNextKeyView" ref="776429699"/>
+																<bool key="NSEnabled">YES</bool>
+																<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+																<int key="NSNumRows">2</int>
+																<int key="NSNumCols">1</int>
+																<array class="NSMutableArray" key="NSCells">
+																	<object class="NSButtonCell" id="45210481">
+																		<int key="NSCellFlags">67108864</int>
+																		<int key="NSCellFlags2">0</int>
+																		<string key="NSContents">InuYasha Sengoku Battle</string>
+																		<reference key="NSSupport" ref="113129670"/>
+																		<reference key="NSControlView" ref="263292685"/>
+																		<int key="NSButtonFlags">1211912448</int>
+																		<int key="NSButtonFlags2">2</int>
+																		<reference key="NSNormalImage" ref="1058349568"/>
+																		<reference key="NSAlternateImage" ref="890331736"/>
+																		<string key="NSAlternateContents"/>
+																		<string key="NSKeyEquivalent"/>
+																		<int key="NSPeriodicDelay">200</int>
+																		<int key="NSPeriodicInterval">25</int>
+																	</object>
+																	<object class="NSButtonCell" id="736164492">
+																		<int key="NSCellFlags">67633152</int>
+																		<int key="NSCellFlags2">0</int>
+																		<string key="NSContents">Parasite Eve 2, Vandal Hearts 1/2</string>
+																		<reference key="NSSupport" ref="113129670"/>
+																		<reference key="NSControlView" ref="263292685"/>
+																		<int key="NSTag">2</int>
+																		<int key="NSButtonFlags">1211912448</int>
+																		<int key="NSButtonFlags2">2</int>
+																		<object class="NSCustomResource" key="NSNormalImage">
+																			<string key="NSClassName">NSImage</string>
+																			<string key="NSResourceName">NSSwitch</string>
+																		</object>
+																		<reference key="NSAlternateImage" ref="890331736"/>
+																		<string key="NSAlternateContents"/>
+																		<string key="NSKeyEquivalent"/>
+																		<int key="NSPeriodicDelay">200</int>
+																		<int key="NSPeriodicInterval">25</int>
+																	</object>
+																</array>
+																<string key="NSCellSize">{238, 18}</string>
+																<string key="NSIntercellSpacing">{4, 4}</string>
+																<int key="NSMatrixFlags">-2080374784</int>
+																<string key="NSCellClass">NSActionCell</string>
+																<object class="NSButtonCell" key="NSProtoCell" id="1070705223">
+																	<int key="NSCellFlags">67108864</int>
+																	<int key="NSCellFlags2">0</int>
+																	<string key="NSContents">Switch</string>
+																	<reference key="NSSupport" ref="113129670"/>
+																	<int key="NSTag">-1</int>
+																	<int key="NSButtonFlags">1211912448</int>
+																	<int key="NSButtonFlags2">2</int>
+																	<reference key="NSNormalImage" ref="1058349568"/>
+																	<reference key="NSAlternateImage" ref="890331736"/>
+																	<string key="NSAlternateContents"/>
+																	<int key="NSPeriodicDelay">200</int>
+																	<int key="NSPeriodicInterval">25</int>
+																</object>
+																<int key="NSSelectedRow">-1</int>
+																<int key="NSSelectedCol">-1</int>
+																<reference key="NSBackgroundColor" ref="243535788"/>
+																<reference key="NSCellBackgroundColor" ref="243535788"/>
+															</object>
+														</array>
+														<string key="NSFrame">{{2, 2}, {273, 74}}</string>
+														<reference key="NSSuperview" ref="715888890"/>
+														<reference key="NSNextKeyView" ref="263292685"/>
+													</object>
+												</array>
+												<string key="NSFrame">{{212, 248}, {277, 91}}</string>
+												<reference key="NSSuperview" ref="309207255"/>
+												<reference key="NSNextKeyView" ref="593482660"/>
+												<string key="NSOffsets">{0, 0}</string>
+												<object class="NSTextFieldCell" key="NSTitleCell">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Game Fixes</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSBackgroundColor" ref="767300285"/>
+													<object class="NSColor" key="NSTextColor">
+														<int key="NSColorSpace">3</int>
+														<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
+													</object>
+												</object>
+												<reference key="NSContentView" ref="593482660"/>
+												<int key="NSBorderType">3</int>
+												<int key="NSBoxType">0</int>
+												<int key="NSTitlePosition">2</int>
+												<bool key="NSTransparent">NO</bool>
+											</object>
+											<object class="NSBox" id="776429699">
+												<reference key="NSNextResponder" ref="309207255"/>
+												<int key="NSvFlags">266</int>
+												<array class="NSMutableArray" key="NSSubviews">
+													<object class="NSView" id="584348218">
+														<reference key="NSNextResponder" ref="776429699"/>
+														<int key="NSvFlags">274</int>
+														<array class="NSMutableArray" key="NSSubviews">
+															<object class="NSMatrix" id="874213588">
+																<reference key="NSNextResponder" ref="584348218"/>
+																<int key="NSvFlags">256</int>
+																<string key="NSFrame">{{18, 16}, {232, 40}}</string>
+																<reference key="NSSuperview" ref="584348218"/>
+																<bool key="NSEnabled">YES</bool>
+																<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+																<int key="NSNumRows">2</int>
+																<int key="NSNumCols">1</int>
+																<array class="NSMutableArray" key="NSCells">
+																	<object class="NSButtonCell" id="544319498">
+																		<int key="NSCellFlags">67108864</int>
+																		<int key="NSCellFlags2">0</int>
+																		<string key="NSContents">SIO IRQ always enabled</string>
+																		<reference key="NSSupport" ref="113129670"/>
+																		<reference key="NSControlView" ref="874213588"/>
+																		<int key="NSButtonFlags">1211912448</int>
+																		<int key="NSButtonFlags2">2</int>
+																		<object class="NSImage" key="NSNormalImage" id="1022034374">
+																			<int key="NSImageFlags">549453824</int>
+																			<string key="NSSize">{18, 18}</string>
+																			<array class="NSMutableArray" key="NSReps">
+																				<array>
+																					<integer value="0"/>
+																					<object class="NSBitmapImageRep">
+																						<object class="NSData" key="NSTIFFRepresentation">
+																							<bytes key="NS.bytes">TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAQAAAAEAAAADAAAAAwAAAAMAAAAD
+AAAAAwAAAAMAAAABAAAAAQAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABE1NTW4ZmZm/29vb/9zc3P/
+c3Nz/3Jycv9ycnL/cnJy/3Jycv9vb2//ZWVl/yUlJZ8AAAAiAAAAAAAAAAAAAAAAAAAAAkNDQ5W3t7f/
++fn5//z8/P/8/Pz//Pz8//z8/P/8/Pz//Pz8//z8/P/8/Pz/+fn5/8DAwP9UVFS7AAAAAgAAAAAAAAAB
+AAAACJGRkf/c3Nz/8/Pz//T09P/19fX/9fX1//T09P/09PT/9PT0//T09P/09PT/8/Pz/97e3v+JiYn/
+AAAACAAAAAEAAAABAAAAEIGBgf/f39//7+/v/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//u7u7/
+7u7u/9/f3/+SkpL/AAAAEAAAAAEAAAABAAAAFZGRkf/d3d3/7Ozs/+zs7P/t7e3/7e3t/+3t7f/t7e3/
+7Ozs/+7u7v/t7e3/7Ozs/9/f3/+QkJD/AAAAFAAAAAEAAAABAAAAGJ6env/b29v/6enp/+np6f/q6ur/
+6+vr/+rq6v/q6ur/6urq/+rq6v/q6ur/6Ojo/9jY2P+bm5v/AAAAGAAAAAEAAAABAAAAG6CgoP/T09P/
+2tra/9ra2v/b29v/29vb/9vb2//Z2dn/29vb/9nZ2f/a2tr/2tra/9HR0f+ioqL/AAAAGwAAAAEAAAAB
+AAAAHKurq//a2tr/39/f/9/f3//g4OD/4ODg/+Dg4P/h4eH/39/f/9/f3//f39//4ODg/9fX1/+mpqb/
+AAAAHAAAAAEAAAACAAAAHrS0tP/j4+P/5ubm/+Xl5f/m5ub/5+fn/+fn5//n5+f/6enp/+fn5//n5+f/
+6Ojo/93d3f+tra3/AAAAHgAAAAIAAAACAAAAILi4uP/p6en/7e3t//Dw8P/w8PD/8PDw/+3t7f/t7e3/
+8fHx/+zs7P/v7+//7e3t/+bm5v+0tLT/AAAAIAAAAAIAAAABAAAAILu7u//v7+//9/f3//b29v/4+Pj/
+9vb2//b29v/29vb/9/f3//f39//39/f/9/f3//Dw8P+7u7v/AAAAIAAAAAEAAAABAAAAHY2Njej4+Pj/
+/////////////////////////////////////////////////v7+//n5+f+Tk5PoAAAAHQAAAAEAAAAB
+AAAAEjo6Oq28vLz3/////////////////////////////////////////////////////7u7u/c/Pz+r
+AAAAEgAAAAEAAAAAAAAACAAAAEEAAACZAAAAxgAAANMAAADVAAAA1gAAANQAAADWAAAA2AAAANgAAADT
+AAAAxQAAAJkAAABBAAAACAAAAAAAAAAAAAAAAgAAAA0AAAAlAAAANgAAAEEAAABDAAAAQwAAAEMAAABE
+AAAAQwAAAEQAAABBAAAANgAAACUAAAANAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAwAAAAYAAAAG
+AAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAAAwAAAAMAAAAAAAAAAAAAAAAADQEAAAMAAAABABIAAAEB
+AAMAAAABABIAAAECAAMAAAAEAAAFugEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES
+AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS
+AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
+																						</object>
+																					</object>
+																				</array>
+																			</array>
+																			<reference key="NSColor" ref="898518986"/>
+																		</object>
+																		<reference key="NSAlternateImage" ref="890331736"/>
+																		<string key="NSAlternateContents"/>
+																		<string key="NSKeyEquivalent"/>
+																		<int key="NSPeriodicDelay">200</int>
+																		<int key="NSPeriodicInterval">25</int>
+																	</object>
+																	<object class="NSButtonCell" id="746537141">
+																		<int key="NSCellFlags">67108864</int>
+																		<int key="NSCellFlags2">0</int>
+																		<string key="NSContents">SPU IRQ always enabled</string>
+																		<reference key="NSSupport" ref="113129670"/>
+																		<reference key="NSControlView" ref="874213588"/>
+																		<int key="NSTag">1</int>
+																		<int key="NSButtonFlags">1211912448</int>
+																		<int key="NSButtonFlags2">2</int>
+																		<reference key="NSNormalImage" ref="1022034374"/>
+																		<reference key="NSAlternateImage" ref="890331736"/>
+																		<string key="NSAlternateContents"/>
+																		<string key="NSKeyEquivalent"/>
+																		<int key="NSPeriodicDelay">200</int>
+																		<int key="NSPeriodicInterval">25</int>
+																	</object>
+																</array>
+																<string key="NSCellSize">{232, 18}</string>
+																<string key="NSIntercellSpacing">{4, 4}</string>
+																<int key="NSMatrixFlags">-2080374784</int>
+																<string key="NSCellClass">NSActionCell</string>
+																<object class="NSButtonCell" key="NSProtoCell" id="2811783">
+																	<int key="NSCellFlags">67108864</int>
+																	<int key="NSCellFlags2">0</int>
+																	<string key="NSContents">Switch</string>
+																	<reference key="NSSupport" ref="113129670"/>
+																	<int key="NSTag">-1</int>
+																	<int key="NSButtonFlags">1211912448</int>
+																	<int key="NSButtonFlags2">2</int>
+																	<reference key="NSNormalImage" ref="1022034374"/>
+																	<reference key="NSAlternateImage" ref="890331736"/>
+																	<string key="NSAlternateContents"/>
+																	<int key="NSPeriodicDelay">200</int>
+																	<int key="NSPeriodicInterval">25</int>
+																</object>
+																<int key="NSSelectedRow">-1</int>
+																<int key="NSSelectedCol">-1</int>
+																<reference key="NSBackgroundColor" ref="243535788"/>
+																<reference key="NSCellBackgroundColor" ref="243535788"/>
+															</object>
+														</array>
+														<string key="NSFrame">{{2, 2}, {273, 74}}</string>
+														<reference key="NSSuperview" ref="776429699"/>
+														<reference key="NSNextKeyView" ref="874213588"/>
+													</object>
+												</array>
+												<string key="NSFrame">{{212, 98}, {277, 91}}</string>
+												<reference key="NSSuperview" ref="309207255"/>
+												<reference key="NSNextKeyView" ref="584348218"/>
+												<string key="NSOffsets">{0, 0}</string>
+												<object class="NSTextFieldCell" key="NSTitleCell">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Hacks</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSBackgroundColor" ref="767300285"/>
+													<object class="NSColor" key="NSTextColor">
+														<int key="NSColorSpace">3</int>
+														<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
+													</object>
+												</object>
+												<reference key="NSContentView" ref="584348218"/>
+												<int key="NSBorderType">3</int>
+												<int key="NSBoxType">0</int>
+												<int key="NSTitlePosition">2</int>
+												<bool key="NSTransparent">NO</bool>
+											</object>
+										</array>
+										<string key="NSFrame">{{10, 33}, {505, 345}}</string>
+										<reference key="NSNextKeyView" ref="324328678"/>
+									</object>
+									<string key="NSLabel">Emulation</string>
+									<reference key="NSColor" ref="243535788"/>
+									<reference key="NSTabView" ref="145760790"/>
+								</object>
+								<object class="NSTabViewItem" id="869045919">
+									<object class="NSMutableString" key="NSIdentifier">
+										<characters key="NS.bytes">2</characters>
+									</object>
+									<object class="NSView" key="NSView" id="494923943">
+										<nil key="NSNextResponder"/>
+										<int key="NSvFlags">256</int>
+										<array class="NSMutableArray" key="NSSubviews">
+											<object class="NSBox" id="30192545">
+												<reference key="NSNextResponder" ref="494923943"/>
+												<int key="NSvFlags">269</int>
+												<array class="NSMutableArray" key="NSSubviews">
+													<object class="NSView" id="613304714">
+														<reference key="NSNextResponder" ref="30192545"/>
+														<int key="NSvFlags">274</int>
+														<array class="NSMutableArray" key="NSSubviews">
+															<object class="NSBox" id="711664786">
+																<reference key="NSNextResponder" ref="613304714"/>
+																<int key="NSvFlags">268</int>
+																<array class="NSMutableArray" key="NSSubviews">
+																	<object class="NSView" id="674673083">
+																		<reference key="NSNextResponder" ref="711664786"/>
+																		<int key="NSvFlags">274</int>
+																		<array class="NSMutableArray" key="NSSubviews">
+																			<object class="NSButton" id="659624019">
+																				<reference key="NSNextResponder" ref="674673083"/>
+																				<int key="NSvFlags">259</int>
+																				<string key="NSFrame">{{98, 7}, {111, 28}}</string>
+																				<reference key="NSSuperview" ref="674673083"/>
+																				<reference key="NSNextKeyView" ref="23337545"/>
+																				<bool key="NSEnabled">YES</bool>
+																				<object class="NSButtonCell" key="NSCell" id="1054541347">
+																					<int key="NSCellFlags">67108864</int>
+																					<int key="NSCellFlags2">134348800</int>
+																					<string key="NSContents">Configure</string>
+																					<reference key="NSSupport" ref="26"/>
+																					<reference key="NSControlView" ref="659624019"/>
+																					<int key="NSButtonFlags">-2038284288</int>
+																					<int key="NSButtonFlags2">1</int>
+																					<reference key="NSAlternateImage" ref="26"/>
+																					<string key="NSAlternateContents"/>
+																					<object class="NSMutableString" key="NSKeyEquivalent">
+																						<characters key="NS.bytes"/>
+																					</object>
+																					<int key="NSPeriodicDelay">200</int>
+																					<int key="NSPeriodicInterval">25</int>
+																				</object>
+																				<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+																			</object>
+																			<object class="NSButton" id="857424577">
+																				<reference key="NSNextResponder" ref="674673083"/>
+																				<int key="NSvFlags">262</int>
+																				<string key="NSFrame">{{9, 7}, {90, 28}}</string>
+																				<reference key="NSSuperview" ref="674673083"/>
+																				<reference key="NSNextKeyView" ref="659624019"/>
+																				<bool key="NSEnabled">YES</bool>
+																				<object class="NSButtonCell" key="NSCell" id="299254513">
+																					<int key="NSCellFlags">67108864</int>
+																					<int key="NSCellFlags2">134348800</int>
+																					<string key="NSContents">About</string>
+																					<reference key="NSSupport" ref="26"/>
+																					<reference key="NSControlView" ref="857424577"/>
+																					<int key="NSButtonFlags">-2038022144</int>
+																					<int key="NSButtonFlags2">1</int>
+																					<reference key="NSAlternateImage" ref="26"/>
+																					<string key="NSAlternateContents"/>
+																					<object class="NSMutableString" key="NSKeyEquivalent">
+																						<characters key="NS.bytes"/>
+																					</object>
+																					<int key="NSPeriodicDelay">200</int>
+																					<int key="NSPeriodicInterval">25</int>
+																				</object>
+																				<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+																			</object>
+																			<object class="NSPopUpButton" id="983879338">
+																				<reference key="NSNextResponder" ref="674673083"/>
+																				<int key="NSvFlags">258</int>
+																				<string key="NSFrame">{{11, 35}, {196, 26}}</string>
+																				<reference key="NSSuperview" ref="674673083"/>
+																				<reference key="NSNextKeyView" ref="857424577"/>
+																				<bool key="NSEnabled">YES</bool>
+																				<object class="NSPopUpButtonCell" key="NSCell" id="170522740">
+																					<int key="NSCellFlags">-2076180416</int>
+																					<int key="NSCellFlags2">1024</int>
+																					<reference key="NSSupport" ref="113129670"/>
+																					<reference key="NSControlView" ref="983879338"/>
+																					<int key="NSButtonFlags">109199360</int>
+																					<int key="NSButtonFlags2">1</int>
+																					<reference key="NSAlternateImage" ref="983951697"/>
+																					<object class="NSMutableString" key="NSAlternateContents">
+																						<characters key="NS.bytes"/>
+																					</object>
+																					<object class="NSMutableString" key="NSKeyEquivalent">
+																						<characters key="NS.bytes"/>
+																					</object>
+																					<int key="NSPeriodicDelay">400</int>
+																					<int key="NSPeriodicInterval">75</int>
+																					<object class="NSMenuItem" key="NSMenuItem" id="283125048">
+																						<reference key="NSMenu" ref="285116131"/>
+																						<string key="NSTitle">Graphics Plugin</string>
+																						<string key="NSKeyEquiv"/>
+																						<int key="NSKeyEquivModMask">1048576</int>
+																						<int key="NSMnemonicLoc">2147483647</int>
+																						<int key="NSState">1</int>
+																						<reference key="NSOnImage" ref="853204695"/>
+																						<reference key="NSMixedImage" ref="607321304"/>
+																						<string key="NSAction">_popUpItemAction:</string>
+																						<reference key="NSTarget" ref="170522740"/>
+																					</object>
+																					<bool key="NSMenuItemRespectAlignment">YES</bool>
+																					<object class="NSMenu" key="NSMenu" id="285116131">
+																						<object class="NSMutableString" key="NSTitle">
+																							<characters key="NS.bytes">OtherViews</characters>
+																						</object>
+																						<array class="NSMutableArray" key="NSMenuItems">
+																							<reference ref="283125048"/>
+																						</array>
+																					</object>
+																					<int key="NSSelectedIndex">-1</int>
+																					<int key="NSPreferredEdge">3</int>
+																					<bool key="NSUsesItemFromMenu">YES</bool>
+																					<bool key="NSAltersState">YES</bool>
+																					<int key="NSArrowPosition">1</int>
+																				</object>
+																				<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+																			</object>
+																		</array>
+																		<string key="NSFrame">{{2, 2}, {218, 73}}</string>
+																		<reference key="NSSuperview" ref="711664786"/>
+																		<reference key="NSNextKeyView" ref="983879338"/>
+																	</object>
+																</array>
+																<string key="NSFrame">{{13, 200}, {222, 90}}</string>
+																<reference key="NSSuperview" ref="613304714"/>
+																<reference key="NSNextKeyView" ref="674673083"/>
+																<string key="NSOffsets">{0, 0}</string>
+																<object class="NSTextFieldCell" key="NSTitleCell">
+																	<int key="NSCellFlags">67108864</int>
+																	<int key="NSCellFlags2">0</int>
+																	<string key="NSContents">Graphics</string>
+																	<reference key="NSSupport" ref="26"/>
+																	<reference key="NSBackgroundColor" ref="767300285"/>
+																	<object class="NSColor" key="NSTextColor">
+																		<int key="NSColorSpace">3</int>
+																		<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
+																	</object>
+																</object>
+																<reference key="NSContentView" ref="674673083"/>
+																<int key="NSBorderType">3</int>
+																<int key="NSBoxType">0</int>
+																<int key="NSTitlePosition">2</int>
+																<bool key="NSTransparent">NO</bool>
+															</object>
+															<object class="NSBox" id="23337545">
+																<reference key="NSNextResponder" ref="613304714"/>
+																<int key="NSvFlags">265</int>
+																<array class="NSMutableArray" key="NSSubviews">
+																	<object class="NSView" id="451090636">
+																		<reference key="NSNextResponder" ref="23337545"/>
+																		<int key="NSvFlags">274</int>
+																		<array class="NSMutableArray" key="NSSubviews">
+																			<object class="NSButton" id="1060851478">
+																				<reference key="NSNextResponder" ref="451090636"/>
+																				<int key="NSvFlags">259</int>
+																				<string key="NSFrame">{{98, 7}, {111, 28}}</string>
+																				<reference key="NSSuperview" ref="451090636"/>
+																				<reference key="NSNextKeyView" ref="490231628"/>
+																				<bool key="NSEnabled">YES</bool>
+																				<object class="NSButtonCell" key="NSCell" id="175241227">
+																					<int key="NSCellFlags">67108864</int>
+																					<int key="NSCellFlags2">138018816</int>
+																					<string key="NSContents">Configure</string>
+																					<reference key="NSSupport" ref="26"/>
+																					<reference key="NSControlView" ref="1060851478"/>
+																					<int key="NSButtonFlags">-2038284288</int>
+																					<int key="NSButtonFlags2">1</int>
+																					<object class="NSFont" key="NSAlternateImage" id="694625424">
+																						<string key="NSName">Helvetica</string>
+																						<double key="NSSize">11</double>
+																						<int key="NSfFlags">16</int>
+																					</object>
+																					<string key="NSAlternateContents"/>
+																					<object class="NSMutableString" key="NSKeyEquivalent">
+																						<characters key="NS.bytes"/>
+																					</object>
+																					<int key="NSPeriodicDelay">200</int>
+																					<int key="NSPeriodicInterval">25</int>
+																				</object>
+																				<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+																			</object>
+																			<object class="NSButton" id="921855531">
+																				<reference key="NSNextResponder" ref="451090636"/>
+																				<int key="NSvFlags">262</int>
+																				<string key="NSFrame">{{9, 7}, {90, 28}}</string>
+																				<reference key="NSSuperview" ref="451090636"/>
+																				<reference key="NSNextKeyView" ref="1060851478"/>
+																				<bool key="NSEnabled">YES</bool>
+																				<object class="NSButtonCell" key="NSCell" id="449658334">
+																					<int key="NSCellFlags">67108864</int>
+																					<int key="NSCellFlags2">138018816</int>
+																					<string key="NSContents">About</string>
+																					<reference key="NSSupport" ref="26"/>
+																					<reference key="NSControlView" ref="921855531"/>
+																					<int key="NSButtonFlags">-2038284288</int>
+																					<int key="NSButtonFlags2">1</int>
+																					<reference key="NSAlternateImage" ref="694625424"/>
+																					<string key="NSAlternateContents"/>
+																					<object class="NSMutableString" key="NSKeyEquivalent">
+																						<characters key="NS.bytes"/>
+																					</object>
+																					<int key="NSPeriodicDelay">200</int>
+																					<int key="NSPeriodicInterval">25</int>
+																				</object>
+																				<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+																			</object>
+																			<object class="NSPopUpButton" id="184922838">
+																				<reference key="NSNextResponder" ref="451090636"/>
+																				<int key="NSvFlags">258</int>
+																				<string key="NSFrame">{{11, 35}, {196, 26}}</string>
+																				<reference key="NSSuperview" ref="451090636"/>
+																				<reference key="NSNextKeyView" ref="921855531"/>
+																				<int key="NSTag">1</int>
+																				<bool key="NSEnabled">YES</bool>
+																				<object class="NSPopUpButtonCell" key="NSCell" id="721717191">
+																					<int key="NSCellFlags">-2076180416</int>
+																					<int key="NSCellFlags2">1024</int>
+																					<reference key="NSSupport" ref="113129670"/>
+																					<reference key="NSControlView" ref="184922838"/>
+																					<int key="NSButtonFlags">109199360</int>
+																					<int key="NSButtonFlags2">1</int>
+																					<reference key="NSAlternateImage" ref="983951697"/>
+																					<object class="NSMutableString" key="NSAlternateContents">
+																						<characters key="NS.bytes"/>
+																					</object>
+																					<object class="NSMutableString" key="NSKeyEquivalent">
+																						<characters key="NS.bytes"/>
+																					</object>
+																					<int key="NSPeriodicDelay">400</int>
+																					<int key="NSPeriodicInterval">75</int>
+																					<object class="NSMenuItem" key="NSMenuItem" id="184321912">
+																						<reference key="NSMenu" ref="628587229"/>
+																						<string key="NSTitle">Sound Plugin</string>
+																						<string key="NSKeyEquiv"/>
+																						<int key="NSKeyEquivModMask">1048576</int>
+																						<int key="NSMnemonicLoc">2147483647</int>
+																						<int key="NSState">1</int>
+																						<reference key="NSOnImage" ref="853204695"/>
+																						<reference key="NSMixedImage" ref="607321304"/>
+																						<string key="NSAction">_popUpItemAction:</string>
+																						<reference key="NSTarget" ref="721717191"/>
+																					</object>
+																					<bool key="NSMenuItemRespectAlignment">YES</bool>
+																					<object class="NSMenu" key="NSMenu" id="628587229">
+																						<object class="NSMutableString" key="NSTitle">
+																							<characters key="NS.bytes">OtherViews</characters>
+																						</object>
+																						<array class="NSMutableArray" key="NSMenuItems">
+																							<reference ref="184321912"/>
+																						</array>
+																					</object>
+																					<int key="NSSelectedIndex">-1</int>
+																					<int key="NSPreferredEdge">3</int>
+																					<bool key="NSUsesItemFromMenu">YES</bool>
+																					<bool key="NSAltersState">YES</bool>
+																					<int key="NSArrowPosition">1</int>
+																				</object>
+																				<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+																			</object>
+																		</array>
+																		<string key="NSFrame">{{2, 2}, {218, 73}}</string>
+																		<reference key="NSSuperview" ref="23337545"/>
+																		<reference key="NSNextKeyView" ref="184922838"/>
+																	</object>
+																</array>
+																<string key="NSFrame">{{256, 200}, {222, 90}}</string>
+																<reference key="NSSuperview" ref="613304714"/>
+																<reference key="NSNextKeyView" ref="451090636"/>
+																<string key="NSOffsets">{0, 0}</string>
+																<object class="NSTextFieldCell" key="NSTitleCell">
+																	<int key="NSCellFlags">67108864</int>
+																	<int key="NSCellFlags2">0</int>
+																	<string key="NSContents">Sound</string>
+																	<reference key="NSSupport" ref="26"/>
+																	<reference key="NSBackgroundColor" ref="767300285"/>
+																	<object class="NSColor" key="NSTextColor">
+																		<int key="NSColorSpace">3</int>
+																		<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
+																	</object>
+																</object>
+																<reference key="NSContentView" ref="451090636"/>
+																<int key="NSBorderType">3</int>
+																<int key="NSBoxType">0</int>
+																<int key="NSTitlePosition">2</int>
+																<bool key="NSTransparent">NO</bool>
+															</object>
+															<object class="NSBox" id="490231628">
+																<reference key="NSNextResponder" ref="613304714"/>
+																<int key="NSvFlags">300</int>
+																<array class="NSMutableArray" key="NSSubviews">
+																	<object class="NSView" id="408048101">
+																		<reference key="NSNextResponder" ref="490231628"/>
+																		<int key="NSvFlags">274</int>
+																		<array class="NSMutableArray" key="NSSubviews">
+																			<object class="NSButton" id="255294672">
+																				<reference key="NSNextResponder" ref="408048101"/>
+																				<int key="NSvFlags">259</int>
+																				<string key="NSFrame">{{98, 7}, {111, 28}}</string>
+																				<reference key="NSSuperview" ref="408048101"/>
+																				<reference key="NSNextKeyView" ref="695086223"/>
+																				<bool key="NSEnabled">YES</bool>
+																				<object class="NSButtonCell" key="NSCell" id="554603770">
+																					<int key="NSCellFlags">67108864</int>
+																					<int key="NSCellFlags2">138018816</int>
+																					<string key="NSContents">Configure</string>
+																					<reference key="NSSupport" ref="26"/>
+																					<reference key="NSControlView" ref="255294672"/>
+																					<int key="NSButtonFlags">-2038284288</int>
+																					<int key="NSButtonFlags2">1</int>
+																					<reference key="NSAlternateImage" ref="694625424"/>
+																					<string key="NSAlternateContents"/>
+																					<object class="NSMutableString" key="NSKeyEquivalent">
+																						<characters key="NS.bytes"/>
+																					</object>
+																					<int key="NSPeriodicDelay">200</int>
+																					<int key="NSPeriodicInterval">25</int>
+																				</object>
+																				<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+																			</object>
+																			<object class="NSButton" id="132376695">
+																				<reference key="NSNextResponder" ref="408048101"/>
+																				<int key="NSvFlags">262</int>
+																				<string key="NSFrame">{{9, 7}, {90, 28}}</string>
+																				<reference key="NSSuperview" ref="408048101"/>
+																				<reference key="NSNextKeyView" ref="255294672"/>
+																				<bool key="NSEnabled">YES</bool>
+																				<object class="NSButtonCell" key="NSCell" id="154903563">
+																					<int key="NSCellFlags">67108864</int>
+																					<int key="NSCellFlags2">138018816</int>
+																					<string key="NSContents">About</string>
+																					<reference key="NSSupport" ref="26"/>
+																					<reference key="NSControlView" ref="132376695"/>
+																					<int key="NSButtonFlags">-2038284288</int>
+																					<int key="NSButtonFlags2">1</int>
+																					<reference key="NSAlternateImage" ref="694625424"/>
+																					<string key="NSAlternateContents"/>
+																					<object class="NSMutableString" key="NSKeyEquivalent">
+																						<characters key="NS.bytes"/>
+																					</object>
+																					<int key="NSPeriodicDelay">200</int>
+																					<int key="NSPeriodicInterval">25</int>
+																				</object>
+																				<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+																			</object>
+																			<object class="NSPopUpButton" id="1001529761">
+																				<reference key="NSNextResponder" ref="408048101"/>
+																				<int key="NSvFlags">258</int>
+																				<string key="NSFrame">{{11, 35}, {196, 26}}</string>
+																				<reference key="NSSuperview" ref="408048101"/>
+																				<reference key="NSNextKeyView" ref="132376695"/>
+																				<int key="NSTag">2</int>
+																				<bool key="NSEnabled">YES</bool>
+																				<object class="NSPopUpButtonCell" key="NSCell" id="116982440">
+																					<int key="NSCellFlags">-2076180416</int>
+																					<int key="NSCellFlags2">1024</int>
+																					<reference key="NSSupport" ref="113129670"/>
+																					<reference key="NSControlView" ref="1001529761"/>
+																					<int key="NSButtonFlags">109199360</int>
+																					<int key="NSButtonFlags2">1</int>
+																					<reference key="NSAlternateImage" ref="983951697"/>
+																					<object class="NSMutableString" key="NSAlternateContents">
+																						<characters key="NS.bytes"/>
+																					</object>
+																					<object class="NSMutableString" key="NSKeyEquivalent">
+																						<characters key="NS.bytes"/>
+																					</object>
+																					<int key="NSPeriodicDelay">400</int>
+																					<int key="NSPeriodicInterval">75</int>
+																					<object class="NSMenuItem" key="NSMenuItem" id="807232970">
+																						<reference key="NSMenu" ref="518586357"/>
+																						<string key="NSTitle">Controller Plugin</string>
+																						<string key="NSKeyEquiv"/>
+																						<int key="NSKeyEquivModMask">1048576</int>
+																						<int key="NSMnemonicLoc">2147483647</int>
+																						<int key="NSState">1</int>
+																						<reference key="NSOnImage" ref="853204695"/>
+																						<reference key="NSMixedImage" ref="607321304"/>
+																						<string key="NSAction">_popUpItemAction:</string>
+																						<reference key="NSTarget" ref="116982440"/>
+																					</object>
+																					<bool key="NSMenuItemRespectAlignment">YES</bool>
+																					<object class="NSMenu" key="NSMenu" id="518586357">
+																						<object class="NSMutableString" key="NSTitle">
+																							<characters key="NS.bytes">OtherViews</characters>
+																						</object>
+																						<array class="NSMutableArray" key="NSMenuItems">
+																							<reference ref="807232970"/>
+																						</array>
+																					</object>
+																					<int key="NSSelectedIndex">-1</int>
+																					<int key="NSPreferredEdge">3</int>
+																					<bool key="NSUsesItemFromMenu">YES</bool>
+																					<bool key="NSAltersState">YES</bool>
+																					<int key="NSArrowPosition">1</int>
+																				</object>
+																				<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+																			</object>
+																		</array>
+																		<string key="NSFrame">{{2, 2}, {218, 73}}</string>
+																		<reference key="NSSuperview" ref="490231628"/>
+																		<reference key="NSNextKeyView" ref="1001529761"/>
+																	</object>
+																</array>
+																<string key="NSFrame">{{13, 106}, {222, 90}}</string>
+																<reference key="NSSuperview" ref="613304714"/>
+																<reference key="NSNextKeyView" ref="408048101"/>
+																<string key="NSOffsets">{0, 0}</string>
+																<object class="NSTextFieldCell" key="NSTitleCell">
+																	<int key="NSCellFlags">67108864</int>
+																	<int key="NSCellFlags2">0</int>
+																	<string key="NSContents">Controller</string>
+																	<reference key="NSSupport" ref="26"/>
+																	<reference key="NSBackgroundColor" ref="767300285"/>
+																	<object class="NSColor" key="NSTextColor">
+																		<int key="NSColorSpace">3</int>
+																		<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
+																	</object>
+																</object>
+																<reference key="NSContentView" ref="408048101"/>
+																<int key="NSBorderType">3</int>
+																<int key="NSBoxType">0</int>
+																<int key="NSTitlePosition">2</int>
+																<bool key="NSTransparent">NO</bool>
+															</object>
+															<object class="NSBox" id="950422833">
+																<reference key="NSNextResponder" ref="613304714"/>
+																<int key="NSvFlags">292</int>
+																<array class="NSMutableArray" key="NSSubviews">
+																	<object class="NSView" id="143420558">
+																		<reference key="NSNextResponder" ref="950422833"/>
+																		<int key="NSvFlags">274</int>
+																		<array class="NSMutableArray" key="NSSubviews">
+																			<object class="NSButton" id="986737125">
+																				<reference key="NSNextResponder" ref="143420558"/>
+																				<int key="NSvFlags">259</int>
+																				<string key="NSFrame">{{98, 7}, {111, 28}}</string>
+																				<reference key="NSSuperview" ref="143420558"/>
+																				<reference key="NSNextKeyView" ref="721006038"/>
+																				<bool key="NSEnabled">YES</bool>
+																				<object class="NSButtonCell" key="NSCell" id="933521081">
+																					<int key="NSCellFlags">67108864</int>
+																					<int key="NSCellFlags2">138018816</int>
+																					<string key="NSContents">Configure</string>
+																					<reference key="NSSupport" ref="26"/>
+																					<reference key="NSControlView" ref="986737125"/>
+																					<int key="NSButtonFlags">-2038284288</int>
+																					<int key="NSButtonFlags2">1</int>
+																					<reference key="NSAlternateImage" ref="694625424"/>
+																					<string key="NSAlternateContents"/>
+																					<object class="NSMutableString" key="NSKeyEquivalent">
+																						<characters key="NS.bytes"/>
+																					</object>
+																					<int key="NSPeriodicDelay">200</int>
+																					<int key="NSPeriodicInterval">25</int>
+																				</object>
+																				<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+																			</object>
+																			<object class="NSButton" id="181214375">
+																				<reference key="NSNextResponder" ref="143420558"/>
+																				<int key="NSvFlags">262</int>
+																				<string key="NSFrame">{{9, 7}, {90, 28}}</string>
+																				<reference key="NSSuperview" ref="143420558"/>
+																				<reference key="NSNextKeyView" ref="986737125"/>
+																				<bool key="NSEnabled">YES</bool>
+																				<object class="NSButtonCell" key="NSCell" id="773749244">
+																					<int key="NSCellFlags">67108864</int>
+																					<int key="NSCellFlags2">138018816</int>
+																					<string key="NSContents">About</string>
+																					<reference key="NSSupport" ref="26"/>
+																					<reference key="NSControlView" ref="181214375"/>
+																					<int key="NSButtonFlags">-2038284288</int>
+																					<int key="NSButtonFlags2">1</int>
+																					<reference key="NSAlternateImage" ref="694625424"/>
+																					<string key="NSAlternateContents"/>
+																					<object class="NSMutableString" key="NSKeyEquivalent">
+																						<characters key="NS.bytes"/>
+																					</object>
+																					<int key="NSPeriodicDelay">200</int>
+																					<int key="NSPeriodicInterval">25</int>
+																				</object>
+																				<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+																			</object>
+																			<object class="NSPopUpButton" id="99318986">
+																				<reference key="NSNextResponder" ref="143420558"/>
+																				<int key="NSvFlags">258</int>
+																				<string key="NSFrame">{{11, 35}, {196, 26}}</string>
+																				<reference key="NSSuperview" ref="143420558"/>
+																				<reference key="NSNextKeyView" ref="181214375"/>
+																				<int key="NSTag">2</int>
+																				<bool key="NSEnabled">YES</bool>
+																				<object class="NSPopUpButtonCell" key="NSCell" id="52904758">
+																					<int key="NSCellFlags">-2076180416</int>
+																					<int key="NSCellFlags2">1024</int>
+																					<reference key="NSSupport" ref="113129670"/>
+																					<reference key="NSControlView" ref="99318986"/>
+																					<int key="NSButtonFlags">109199360</int>
+																					<int key="NSButtonFlags2">1</int>
+																					<reference key="NSAlternateImage" ref="983951697"/>
+																					<object class="NSMutableString" key="NSAlternateContents">
+																						<characters key="NS.bytes"/>
+																					</object>
+																					<object class="NSMutableString" key="NSKeyEquivalent">
+																						<characters key="NS.bytes"/>
+																					</object>
+																					<int key="NSPeriodicDelay">400</int>
+																					<int key="NSPeriodicInterval">75</int>
+																					<object class="NSMenuItem" key="NSMenuItem" id="1055625937">
+																						<reference key="NSMenu" ref="871032713"/>
+																						<string key="NSTitle">Net Plugin</string>
+																						<string key="NSKeyEquiv"/>
+																						<int key="NSKeyEquivModMask">1048576</int>
+																						<int key="NSMnemonicLoc">2147483647</int>
+																						<int key="NSState">1</int>
+																						<reference key="NSOnImage" ref="853204695"/>
+																						<reference key="NSMixedImage" ref="607321304"/>
+																						<string key="NSAction">_popUpItemAction:</string>
+																						<reference key="NSTarget" ref="52904758"/>
+																					</object>
+																					<bool key="NSMenuItemRespectAlignment">YES</bool>
+																					<object class="NSMenu" key="NSMenu" id="871032713">
+																						<object class="NSMutableString" key="NSTitle">
+																							<characters key="NS.bytes">OtherViews</characters>
+																						</object>
+																						<array class="NSMutableArray" key="NSMenuItems">
+																							<reference ref="1055625937"/>
+																						</array>
+																					</object>
+																					<int key="NSPreferredEdge">3</int>
+																					<bool key="NSUsesItemFromMenu">YES</bool>
+																					<bool key="NSAltersState">YES</bool>
+																					<int key="NSArrowPosition">1</int>
+																				</object>
+																				<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+																			</object>
+																		</array>
+																		<string key="NSFrame">{{2, 2}, {218, 73}}</string>
+																		<reference key="NSSuperview" ref="950422833"/>
+																		<reference key="NSNextKeyView" ref="99318986"/>
+																	</object>
+																</array>
+																<string key="NSFrame">{{13, 12}, {222, 90}}</string>
+																<reference key="NSSuperview" ref="613304714"/>
+																<reference key="NSNextKeyView" ref="143420558"/>
+																<string key="NSOffsets">{0, 0}</string>
+																<object class="NSTextFieldCell" key="NSTitleCell">
+																	<int key="NSCellFlags">67108864</int>
+																	<int key="NSCellFlags2">0</int>
+																	<string key="NSContents">Network</string>
+																	<reference key="NSSupport" ref="26"/>
+																	<reference key="NSBackgroundColor" ref="767300285"/>
+																	<object class="NSColor" key="NSTextColor">
+																		<int key="NSColorSpace">3</int>
+																		<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
+																	</object>
+																</object>
+																<reference key="NSContentView" ref="143420558"/>
+																<int key="NSBorderType">3</int>
+																<int key="NSBoxType">0</int>
+																<int key="NSTitlePosition">2</int>
+																<bool key="NSTransparent">NO</bool>
+															</object>
+															<object class="NSBox" id="695086223">
+																<reference key="NSNextResponder" ref="613304714"/>
+																<int key="NSvFlags">297</int>
+																<array class="NSMutableArray" key="NSSubviews">
+																	<object class="NSView" id="221272233">
+																		<reference key="NSNextResponder" ref="695086223"/>
+																		<int key="NSvFlags">274</int>
+																		<array class="NSMutableArray" key="NSSubviews">
+																			<object class="NSButton" id="701329658">
+																				<reference key="NSNextResponder" ref="221272233"/>
+																				<int key="NSvFlags">259</int>
+																				<string key="NSFrame">{{98, 7}, {111, 28}}</string>
+																				<reference key="NSSuperview" ref="221272233"/>
+																				<reference key="NSNextKeyView" ref="950422833"/>
+																				<bool key="NSEnabled">YES</bool>
+																				<object class="NSButtonCell" key="NSCell" id="350454119">
+																					<int key="NSCellFlags">67108864</int>
+																					<int key="NSCellFlags2">138018816</int>
+																					<string key="NSContents">Configure</string>
+																					<reference key="NSSupport" ref="26"/>
+																					<reference key="NSControlView" ref="701329658"/>
+																					<int key="NSButtonFlags">-2038284288</int>
+																					<int key="NSButtonFlags2">1</int>
+																					<reference key="NSAlternateImage" ref="694625424"/>
+																					<string key="NSAlternateContents"/>
+																					<object class="NSMutableString" key="NSKeyEquivalent">
+																						<characters key="NS.bytes"/>
+																					</object>
+																					<int key="NSPeriodicDelay">200</int>
+																					<int key="NSPeriodicInterval">25</int>
+																				</object>
+																				<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+																			</object>
+																			<object class="NSButton" id="495555989">
+																				<reference key="NSNextResponder" ref="221272233"/>
+																				<int key="NSvFlags">262</int>
+																				<string key="NSFrame">{{9, 7}, {90, 28}}</string>
+																				<reference key="NSSuperview" ref="221272233"/>
+																				<reference key="NSNextKeyView" ref="701329658"/>
+																				<bool key="NSEnabled">YES</bool>
+																				<object class="NSButtonCell" key="NSCell" id="268195893">
+																					<int key="NSCellFlags">67108864</int>
+																					<int key="NSCellFlags2">138018816</int>
+																					<string key="NSContents">About</string>
+																					<reference key="NSSupport" ref="26"/>
+																					<reference key="NSControlView" ref="495555989"/>
+																					<int key="NSButtonFlags">-2038284288</int>
+																					<int key="NSButtonFlags2">1</int>
+																					<reference key="NSAlternateImage" ref="694625424"/>
+																					<string key="NSAlternateContents"/>
+																					<object class="NSMutableString" key="NSKeyEquivalent">
+																						<characters key="NS.bytes"/>
+																					</object>
+																					<int key="NSPeriodicDelay">200</int>
+																					<int key="NSPeriodicInterval">25</int>
+																				</object>
+																				<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+																			</object>
+																			<object class="NSPopUpButton" id="169562785">
+																				<reference key="NSNextResponder" ref="221272233"/>
+																				<int key="NSvFlags">258</int>
+																				<string key="NSFrame">{{11, 35}, {196, 26}}</string>
+																				<reference key="NSSuperview" ref="221272233"/>
+																				<reference key="NSNextKeyView" ref="495555989"/>
+																				<int key="NSTag">3</int>
+																				<bool key="NSEnabled">YES</bool>
+																				<object class="NSPopUpButtonCell" key="NSCell" id="525747534">
+																					<int key="NSCellFlags">-2076180416</int>
+																					<int key="NSCellFlags2">1024</int>
+																					<reference key="NSSupport" ref="113129670"/>
+																					<reference key="NSControlView" ref="169562785"/>
+																					<int key="NSButtonFlags">109199360</int>
+																					<int key="NSButtonFlags2">1</int>
+																					<reference key="NSAlternateImage" ref="983951697"/>
+																					<object class="NSMutableString" key="NSAlternateContents">
+																						<characters key="NS.bytes"/>
+																					</object>
+																					<object class="NSMutableString" key="NSKeyEquivalent">
+																						<characters key="NS.bytes"/>
+																					</object>
+																					<int key="NSPeriodicDelay">400</int>
+																					<int key="NSPeriodicInterval">75</int>
+																					<object class="NSMenuItem" key="NSMenuItem" id="611694877">
+																						<reference key="NSMenu" ref="122509778"/>
+																						<string key="NSTitle">CDROM Plugin</string>
+																						<string key="NSKeyEquiv"/>
+																						<int key="NSKeyEquivModMask">1048576</int>
+																						<int key="NSMnemonicLoc">2147483647</int>
+																						<int key="NSState">1</int>
+																						<reference key="NSOnImage" ref="853204695"/>
+																						<reference key="NSMixedImage" ref="607321304"/>
+																						<string key="NSAction">_popUpItemAction:</string>
+																						<reference key="NSTarget" ref="525747534"/>
+																					</object>
+																					<bool key="NSMenuItemRespectAlignment">YES</bool>
+																					<object class="NSMenu" key="NSMenu" id="122509778">
+																						<object class="NSMutableString" key="NSTitle">
+																							<characters key="NS.bytes">OtherViews</characters>
+																						</object>
+																						<array class="NSMutableArray" key="NSMenuItems">
+																							<reference ref="611694877"/>
+																						</array>
+																					</object>
+																					<int key="NSSelectedIndex">-1</int>
+																					<int key="NSPreferredEdge">3</int>
+																					<bool key="NSUsesItemFromMenu">YES</bool>
+																					<bool key="NSAltersState">YES</bool>
+																					<int key="NSArrowPosition">1</int>
+																				</object>
+																				<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+																			</object>
+																		</array>
+																		<string key="NSFrame">{{2, 2}, {218, 73}}</string>
+																		<reference key="NSSuperview" ref="695086223"/>
+																		<reference key="NSNextKeyView" ref="169562785"/>
+																	</object>
+																</array>
+																<string key="NSFrame">{{256, 106}, {222, 90}}</string>
+																<reference key="NSSuperview" ref="613304714"/>
+																<reference key="NSNextKeyView" ref="221272233"/>
+																<string key="NSOffsets">{0, 0}</string>
+																<object class="NSTextFieldCell" key="NSTitleCell">
+																	<int key="NSCellFlags">67108864</int>
+																	<int key="NSCellFlags2">0</int>
+																	<string key="NSContents">CD-ROM</string>
+																	<reference key="NSSupport" ref="26"/>
+																	<reference key="NSBackgroundColor" ref="767300285"/>
+																	<object class="NSColor" key="NSTextColor">
+																		<int key="NSColorSpace">3</int>
+																		<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
+																	</object>
+																</object>
+																<reference key="NSContentView" ref="221272233"/>
+																<int key="NSBorderType">3</int>
+																<int key="NSBoxType">0</int>
+																<int key="NSTitlePosition">2</int>
+																<bool key="NSTransparent">NO</bool>
+															</object>
+															<object class="NSBox" id="721006038">
+																<reference key="NSNextResponder" ref="613304714"/>
+																<int key="NSvFlags">289</int>
+																<array class="NSMutableArray" key="NSSubviews">
+																	<object class="NSView" id="693248790">
+																		<reference key="NSNextResponder" ref="721006038"/>
+																		<int key="NSvFlags">274</int>
+																		<array class="NSMutableArray" key="NSSubviews">
+																			<object class="NSButton" id="155594978">
+																				<reference key="NSNextResponder" ref="693248790"/>
+																				<int key="NSvFlags">259</int>
+																				<string key="NSFrame">{{98, 7}, {111, 28}}</string>
+																				<reference key="NSSuperview" ref="693248790"/>
+																				<reference key="NSNextKeyView" ref="145760790"/>
+																				<bool key="NSEnabled">YES</bool>
+																				<object class="NSButtonCell" key="NSCell" id="905819877">
+																					<int key="NSCellFlags">67108864</int>
+																					<int key="NSCellFlags2">138018816</int>
+																					<string key="NSContents">Configure</string>
+																					<reference key="NSSupport" ref="26"/>
+																					<reference key="NSControlView" ref="155594978"/>
+																					<int key="NSButtonFlags">-2038284288</int>
+																					<int key="NSButtonFlags2">1</int>
+																					<reference key="NSAlternateImage" ref="694625424"/>
+																					<string key="NSAlternateContents"/>
+																					<object class="NSMutableString" key="NSKeyEquivalent">
+																						<characters key="NS.bytes"/>
+																					</object>
+																					<int key="NSPeriodicDelay">200</int>
+																					<int key="NSPeriodicInterval">25</int>
+																				</object>
+																				<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+																			</object>
+																			<object class="NSButton" id="524369892">
+																				<reference key="NSNextResponder" ref="693248790"/>
+																				<int key="NSvFlags">262</int>
+																				<string key="NSFrame">{{9, 7}, {90, 28}}</string>
+																				<reference key="NSSuperview" ref="693248790"/>
+																				<reference key="NSNextKeyView" ref="155594978"/>
+																				<bool key="NSEnabled">YES</bool>
+																				<object class="NSButtonCell" key="NSCell" id="774833876">
+																					<int key="NSCellFlags">67108864</int>
+																					<int key="NSCellFlags2">138018816</int>
+																					<string key="NSContents">About</string>
+																					<reference key="NSSupport" ref="26"/>
+																					<reference key="NSControlView" ref="524369892"/>
+																					<int key="NSButtonFlags">-2038284288</int>
+																					<int key="NSButtonFlags2">1</int>
+																					<reference key="NSAlternateImage" ref="694625424"/>
+																					<string key="NSAlternateContents"/>
+																					<object class="NSMutableString" key="NSKeyEquivalent">
+																						<characters key="NS.bytes"/>
+																					</object>
+																					<int key="NSPeriodicDelay">200</int>
+																					<int key="NSPeriodicInterval">25</int>
+																				</object>
+																				<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+																			</object>
+																			<object class="NSPopUpButton" id="341120868">
+																				<reference key="NSNextResponder" ref="693248790"/>
+																				<int key="NSvFlags">258</int>
+																				<string key="NSFrame">{{11, 35}, {196, 26}}</string>
+																				<reference key="NSSuperview" ref="693248790"/>
+																				<reference key="NSNextKeyView" ref="524369892"/>
+																				<int key="NSTag">2</int>
+																				<bool key="NSEnabled">YES</bool>
+																				<object class="NSPopUpButtonCell" key="NSCell" id="777720704">
+																					<int key="NSCellFlags">-2076180416</int>
+																					<int key="NSCellFlags2">1024</int>
+																					<reference key="NSSupport" ref="113129670"/>
+																					<reference key="NSControlView" ref="341120868"/>
+																					<int key="NSButtonFlags">109199360</int>
+																					<int key="NSButtonFlags2">1</int>
+																					<reference key="NSAlternateImage" ref="983951697"/>
+																					<object class="NSMutableString" key="NSAlternateContents">
+																						<characters key="NS.bytes"/>
+																					</object>
+																					<object class="NSMutableString" key="NSKeyEquivalent">
+																						<characters key="NS.bytes"/>
+																					</object>
+																					<int key="NSPeriodicDelay">400</int>
+																					<int key="NSPeriodicInterval">75</int>
+																					<object class="NSMenuItem" key="NSMenuItem" id="245690467">
+																						<reference key="NSMenu" ref="771695632"/>
+																						<string key="NSTitle">Net Plugin</string>
+																						<string key="NSKeyEquiv"/>
+																						<int key="NSKeyEquivModMask">1048576</int>
+																						<int key="NSMnemonicLoc">2147483647</int>
+																						<int key="NSState">1</int>
+																						<reference key="NSOnImage" ref="853204695"/>
+																						<reference key="NSMixedImage" ref="607321304"/>
+																						<string key="NSAction">_popUpItemAction:</string>
+																						<reference key="NSTarget" ref="777720704"/>
+																					</object>
+																					<bool key="NSMenuItemRespectAlignment">YES</bool>
+																					<object class="NSMenu" key="NSMenu" id="771695632">
+																						<object class="NSMutableString" key="NSTitle">
+																							<characters key="NS.bytes">OtherViews</characters>
+																						</object>
+																						<array class="NSMutableArray" key="NSMenuItems">
+																							<reference ref="245690467"/>
+																						</array>
+																					</object>
+																					<int key="NSSelectedIndex">-1</int>
+																					<int key="NSPreferredEdge">3</int>
+																					<bool key="NSUsesItemFromMenu">YES</bool>
+																					<bool key="NSAltersState">YES</bool>
+																					<int key="NSArrowPosition">1</int>
+																				</object>
+																				<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+																			</object>
+																		</array>
+																		<string key="NSFrame">{{2, 2}, {218, 73}}</string>
+																		<reference key="NSSuperview" ref="721006038"/>
+																		<reference key="NSNextKeyView" ref="341120868"/>
+																	</object>
+																</array>
+																<string key="NSFrame">{{256, 12}, {222, 90}}</string>
+																<reference key="NSSuperview" ref="613304714"/>
+																<reference key="NSNextKeyView" ref="693248790"/>
+																<string key="NSOffsets">{0, 0}</string>
+																<object class="NSTextFieldCell" key="NSTitleCell">
+																	<int key="NSCellFlags">67108864</int>
+																	<int key="NSCellFlags2">0</int>
+																	<string key="NSContents">SIO1</string>
+																	<reference key="NSSupport" ref="26"/>
+																	<reference key="NSBackgroundColor" ref="767300285"/>
+																	<object class="NSColor" key="NSTextColor">
+																		<int key="NSColorSpace">3</int>
+																		<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
+																	</object>
+																</object>
+																<reference key="NSContentView" ref="693248790"/>
+																<int key="NSBorderType">3</int>
+																<int key="NSBoxType">0</int>
+																<int key="NSTitlePosition">2</int>
+																<bool key="NSTransparent">NO</bool>
+															</object>
+														</array>
+														<string key="NSFrameSize">{491, 293}</string>
+														<reference key="NSSuperview" ref="30192545"/>
+														<reference key="NSNextKeyView" ref="711664786"/>
+													</object>
+												</array>
+												<string key="NSFrame">{{7, 49}, {491, 293}}</string>
+												<reference key="NSSuperview" ref="494923943"/>
+												<reference key="NSNextKeyView" ref="613304714"/>
+												<string key="NSOffsets">{0, 0}</string>
+												<object class="NSTextFieldCell" key="NSTitleCell">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Box</string>
+													<reference key="NSSupport" ref="113129670"/>
+													<reference key="NSBackgroundColor" ref="767300285"/>
+													<object class="NSColor" key="NSTextColor">
+														<int key="NSColorSpace">3</int>
+														<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
+													</object>
+												</object>
+												<reference key="NSContentView" ref="613304714"/>
+												<int key="NSBorderType">0</int>
+												<int key="NSBoxType">3</int>
+												<int key="NSTitlePosition">0</int>
+												<bool key="NSTransparent">NO</bool>
+											</object>
+										</array>
+										<string key="NSFrame">{{10, 33}, {505, 345}}</string>
+										<reference key="NSNextKeyView" ref="30192545"/>
+									</object>
+									<string key="NSLabel">Plugins</string>
+									<reference key="NSColor" ref="243535788"/>
+									<reference key="NSTabView" ref="145760790"/>
+								</object>
+								<object class="NSTabViewItem" id="683723192">
+									<string key="NSIdentifier">3</string>
+									<object class="NSView" key="NSView" id="782866499">
+										<reference key="NSNextResponder" ref="145760790"/>
+										<int key="NSvFlags">256</int>
+										<array class="NSMutableArray" key="NSSubviews">
+											<object class="NSButton" id="38178535">
+												<reference key="NSNextResponder" ref="782866499"/>
+												<int key="NSvFlags">269</int>
+												<string key="NSFrame">{{221, 209}, {63, 32}}</string>
+												<reference key="NSSuperview" ref="782866499"/>
+												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView" ref="854313175"/>
+												<string key="NSReuseIdentifierKey">_NS:687</string>
+												<int key="NSTag">1</int>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="380110803">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">134217728</int>
+													<string key="NSContents">&lt;-</string>
+													<reference key="NSSupport" ref="113129670"/>
+													<string key="NSCellIdentifier">_NS:687</string>
+													<reference key="NSControlView" ref="38178535"/>
+													<int key="NSButtonFlags">-2038284288</int>
+													<int key="NSButtonFlags2">129</int>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											</object>
+											<object class="NSButton" id="854313175">
+												<reference key="NSNextResponder" ref="782866499"/>
+												<int key="NSvFlags">293</int>
+												<string key="NSFrame">{{221, 75}, {63, 32}}</string>
+												<reference key="NSSuperview" ref="782866499"/>
+												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView" ref="463534292"/>
+												<string key="NSReuseIdentifierKey">_NS:687</string>
+												<int key="NSTag">2</int>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="366352918">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">134217728</int>
+													<string key="NSContents">-&gt;</string>
+													<reference key="NSSupport" ref="113129670"/>
+													<string key="NSCellIdentifier">_NS:687</string>
+													<reference key="NSControlView" ref="854313175"/>
+													<int key="NSButtonFlags">-2038284288</int>
+													<int key="NSButtonFlags2">129</int>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											</object>
+											<object class="NSScrollView" id="463534292">
+												<reference key="NSNextResponder" ref="782866499"/>
+												<int key="NSvFlags">275</int>
+												<array class="NSMutableArray" key="NSSubviews">
+													<object class="NSClipView" id="781852938">
+														<reference key="NSNextResponder" ref="463534292"/>
+														<int key="NSvFlags">2304</int>
+														<array class="NSMutableArray" key="NSSubviews">
+															<object class="NSCollectionView" id="628077157">
+																<reference key="NSNextResponder" ref="781852938"/>
+																<int key="NSvFlags">274</int>
+																<string key="NSFrameSize">{179, 246}</string>
+																<reference key="NSSuperview" ref="781852938"/>
+																<reference key="NSWindow"/>
+																<reference key="NSNextKeyView" ref="913433103"/>
+																<string key="NSReuseIdentifierKey">_NS:3367</string>
+																<string key="NSMinGridSize">{0, 0}</string>
+																<string key="NSMaxGridSize">{0, 0}</string>
+																<int key="NSMaxNumberOfGridRows">0</int>
+																<int key="NSMaxNumberOfGridColumns">0</int>
+																<array key="NSBackgroundColors">
+																	<object class="NSColor" id="415434404">
+																		<int key="NSColorSpace">6</int>
+																		<string key="NSCatalogName">System</string>
+																		<string key="NSColorName">controlBackgroundColor</string>
+																		<reference key="NSColor" ref="511312022"/>
+																	</object>
+																</array>
+																<bool key="NSSelectable">YES</bool>
+																<int key="NSDraggingSourceMaskForLocal">-1</int>
+																<int key="NSDraggingSourceMaskForNonLocal">0</int>
+															</object>
+														</array>
+														<string key="NSFrame">{{1, 1}, {179, 246}}</string>
+														<reference key="NSSuperview" ref="463534292"/>
+														<reference key="NSWindow"/>
+														<reference key="NSNextKeyView" ref="628077157"/>
+														<string key="NSReuseIdentifierKey">_NS:3365</string>
+														<reference key="NSDocView" ref="628077157"/>
+														<reference key="NSBGColor" ref="243535788"/>
+														<int key="NScvFlags">4</int>
+													</object>
+													<object class="NSScroller" id="913433103">
+														<reference key="NSNextResponder" ref="463534292"/>
+														<int key="NSvFlags">-2147483392</int>
+														<string key="NSFrame">{{234, 1}, {15, 143}}</string>
+														<reference key="NSSuperview" ref="463534292"/>
+														<reference key="NSWindow"/>
+														<reference key="NSNextKeyView" ref="677138134"/>
+														<string key="NSReuseIdentifierKey">_NS:3372</string>
+														<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+														<reference key="NSTarget" ref="463534292"/>
+														<string key="NSAction">_doScroller:</string>
+														<double key="NSCurValue">1</double>
+														<double key="NSPercent">0.89655172824859619</double>
+													</object>
+													<object class="NSScroller" id="677138134">
+														<reference key="NSNextResponder" ref="463534292"/>
+														<int key="NSvFlags">-2147483392</int>
+														<string key="NSFrame">{{1, 144}, {233, 15}}</string>
+														<reference key="NSSuperview" ref="463534292"/>
+														<reference key="NSWindow"/>
+														<reference key="NSNextKeyView" ref="985208313"/>
+														<string key="NSReuseIdentifierKey">_NS:3374</string>
+														<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+														<int key="NSsFlags">1</int>
+														<reference key="NSTarget" ref="463534292"/>
+														<string key="NSAction">_doScroller:</string>
+														<double key="NSPercent">0.63157892227172852</double>
+													</object>
+												</array>
+												<string key="NSFrame">{{286, 42}, {181, 248}}</string>
+												<reference key="NSSuperview" ref="782866499"/>
+												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView" ref="781852938"/>
+												<string key="NSReuseIdentifierKey">_NS:3363</string>
+												<int key="NSsFlags">133682</int>
+												<reference key="NSVScroller" ref="913433103"/>
+												<reference key="NSHScroller" ref="677138134"/>
+												<reference key="NSContentView" ref="781852938"/>
+												<double key="NSMinMagnification">0.25</double>
+												<double key="NSMaxMagnification">4</double>
+												<double key="NSMagnification">1</double>
+											</object>
+											<object class="NSScrollView" id="137614947">
+												<reference key="NSNextResponder" ref="782866499"/>
+												<int key="NSvFlags">278</int>
+												<array class="NSMutableArray" key="NSSubviews">
+													<object class="NSClipView" id="171112102">
+														<reference key="NSNextResponder" ref="137614947"/>
+														<int key="NSvFlags">2304</int>
+														<array class="NSMutableArray" key="NSSubviews">
+															<object class="NSCollectionView" id="855568378">
+																<reference key="NSNextResponder" ref="171112102"/>
+																<int key="NSvFlags">274</int>
+																<string key="NSFrameSize">{179, 246}</string>
+																<reference key="NSSuperview" ref="171112102"/>
+																<reference key="NSWindow"/>
+																<reference key="NSNextKeyView" ref="617745638"/>
+																<string key="NSReuseIdentifierKey">_NS:3367</string>
+																<string key="NSMinGridSize">{0, 0}</string>
+																<string key="NSMaxGridSize">{0, 0}</string>
+																<int key="NSMaxNumberOfGridRows">0</int>
+																<int key="NSMaxNumberOfGridColumns">0</int>
+																<array key="NSBackgroundColors">
+																	<reference ref="415434404"/>
+																</array>
+																<bool key="NSSelectable">YES</bool>
+																<int key="NSDraggingSourceMaskForLocal">-1</int>
+																<int key="NSDraggingSourceMaskForNonLocal">0</int>
+															</object>
+														</array>
+														<string key="NSFrame">{{1, 1}, {179, 246}}</string>
+														<reference key="NSSuperview" ref="137614947"/>
+														<reference key="NSWindow"/>
+														<reference key="NSNextKeyView" ref="855568378"/>
+														<string key="NSReuseIdentifierKey">_NS:3365</string>
+														<reference key="NSDocView" ref="855568378"/>
+														<reference key="NSBGColor" ref="243535788"/>
+														<int key="NScvFlags">4</int>
+													</object>
+													<object class="NSScroller" id="617745638">
+														<reference key="NSNextResponder" ref="137614947"/>
+														<int key="NSvFlags">-2147483392</int>
+														<string key="NSFrame">{{234, 1}, {15, 143}}</string>
+														<reference key="NSSuperview" ref="137614947"/>
+														<reference key="NSWindow"/>
+														<reference key="NSNextKeyView" ref="24365741"/>
+														<string key="NSReuseIdentifierKey">_NS:3372</string>
+														<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+														<reference key="NSTarget" ref="137614947"/>
+														<string key="NSAction">_doScroller:</string>
+														<double key="NSCurValue">1</double>
+														<double key="NSPercent">0.89655172824859619</double>
+													</object>
+													<object class="NSScroller" id="24365741">
+														<reference key="NSNextResponder" ref="137614947"/>
+														<int key="NSvFlags">-2147483392</int>
+														<string key="NSFrame">{{1, 144}, {233, 15}}</string>
+														<reference key="NSSuperview" ref="137614947"/>
+														<reference key="NSWindow"/>
+														<reference key="NSNextKeyView" ref="91368854"/>
+														<string key="NSReuseIdentifierKey">_NS:3374</string>
+														<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+														<int key="NSsFlags">1</int>
+														<reference key="NSTarget" ref="137614947"/>
+														<string key="NSAction">_doScroller:</string>
+														<double key="NSPercent">0.63157892227172852</double>
+													</object>
+												</array>
+												<string key="NSFrame">{{38, 42}, {181, 248}}</string>
+												<reference key="NSSuperview" ref="782866499"/>
+												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView" ref="171112102"/>
+												<string key="NSReuseIdentifierKey">_NS:3363</string>
+												<int key="NSsFlags">133682</int>
+												<reference key="NSVScroller" ref="617745638"/>
+												<reference key="NSHScroller" ref="24365741"/>
+												<reference key="NSContentView" ref="171112102"/>
+												<double key="NSMinMagnification">0.25</double>
+												<double key="NSMaxMagnification">4</double>
+												<double key="NSMagnification">1</double>
+											</object>
+											<object class="NSButton" id="682387256">
+												<reference key="NSNextResponder" ref="782866499"/>
+												<int key="NSvFlags">289</int>
+												<string key="NSFrame">{{280, 6}, {98, 32}}</string>
+												<reference key="NSSuperview" ref="782866499"/>
+												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView" ref="73572364"/>
+												<string key="NSReuseIdentifierKey">_NS:687</string>
+												<int key="NSTag">2</int>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="528944351">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">134217728</int>
+													<string key="NSContents">Format…</string>
+													<reference key="NSSupport" ref="113129670"/>
+													<string key="NSCellIdentifier">_NS:687</string>
+													<reference key="NSControlView" ref="682387256"/>
+													<int key="NSButtonFlags">-2038284288</int>
+													<int key="NSButtonFlags2">129</int>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											</object>
+											<object class="NSButton" id="985208313">
+												<reference key="NSNextResponder" ref="782866499"/>
+												<int key="NSvFlags">292</int>
+												<string key="NSFrame">{{32, 6}, {98, 32}}</string>
+												<reference key="NSSuperview" ref="782866499"/>
+												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView" ref="397679595"/>
+												<string key="NSReuseIdentifierKey">_NS:687</string>
+												<int key="NSTag">1</int>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="434465099">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">134217728</int>
+													<string key="NSContents">Format…</string>
+													<reference key="NSSupport" ref="113129670"/>
+													<string key="NSCellIdentifier">_NS:687</string>
+													<reference key="NSControlView" ref="985208313"/>
+													<int key="NSButtonFlags">-2038284288</int>
+													<int key="NSButtonFlags2">129</int>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											</object>
+											<object class="NSButton" id="397679595">
+												<reference key="NSNextResponder" ref="782866499"/>
+												<int key="NSvFlags">292</int>
+												<string key="NSFrame">{{132, 6}, {93, 32}}</string>
+												<reference key="NSSuperview" ref="782866499"/>
+												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView" ref="682387256"/>
+												<string key="NSReuseIdentifierKey">_NS:687</string>
+												<int key="NSTag">1</int>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="37322934">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">134217728</int>
+													<string key="NSContents">Delete…</string>
+													<reference key="NSSupport" ref="113129670"/>
+													<string key="NSCellIdentifier">_NS:687</string>
+													<reference key="NSControlView" ref="397679595"/>
+													<int key="NSButtonFlags">-2038284288</int>
+													<int key="NSButtonFlags2">129</int>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											</object>
+											<object class="NSButton" id="73572364">
+												<reference key="NSNextResponder" ref="782866499"/>
+												<int key="NSvFlags">289</int>
+												<string key="NSFrame">{{380, 6}, {93, 32}}</string>
+												<reference key="NSSuperview" ref="782866499"/>
+												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView" ref="145760790"/>
+												<string key="NSReuseIdentifierKey">_NS:687</string>
+												<int key="NSTag">2</int>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="695425235">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">134217728</int>
+													<string key="NSContents">Delete…</string>
+													<reference key="NSSupport" ref="113129670"/>
+													<string key="NSCellIdentifier">_NS:687</string>
+													<reference key="NSControlView" ref="73572364"/>
+													<int key="NSButtonFlags">-2038284288</int>
+													<int key="NSButtonFlags2">129</int>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											</object>
+											<object class="NSButton" id="960369332">
+												<reference key="NSNextResponder" ref="782866499"/>
+												<int key="NSvFlags">268</int>
+												<string key="NSFrame">{{32, 289}, {80, 32}}</string>
+												<reference key="NSSuperview" ref="782866499"/>
+												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView" ref="137614947"/>
+												<string key="NSReuseIdentifierKey">_NS:9</string>
+												<int key="NSTag">1</int>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="434622955">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">134217728</int>
+													<string key="NSContents">New…</string>
+													<reference key="NSSupport" ref="113129670"/>
+													<string key="NSCellIdentifier">_NS:9</string>
+													<reference key="NSControlView" ref="960369332"/>
+													<int key="NSButtonFlags">-2038284288</int>
+													<int key="NSButtonFlags2">129</int>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											</object>
+											<object class="NSButton" id="91368854">
+												<reference key="NSNextResponder" ref="782866499"/>
+												<int key="NSvFlags">268</int>
+												<string key="NSFrame">{{124, 289}, {101, 32}}</string>
+												<reference key="NSSuperview" ref="782866499"/>
+												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView" ref="816469593"/>
+												<string key="NSReuseIdentifierKey">_NS:9</string>
+												<int key="NSTag">1</int>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="891635109">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">134217728</int>
+													<string key="NSContents">Change…</string>
+													<reference key="NSSupport" ref="113129670"/>
+													<string key="NSCellIdentifier">_NS:9</string>
+													<reference key="NSControlView" ref="91368854"/>
+													<int key="NSButtonFlags">-2038284288</int>
+													<int key="NSButtonFlags2">129</int>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											</object>
+											<object class="NSTextField" id="364230398">
+												<reference key="NSNextResponder" ref="782866499"/>
+												<int key="NSvFlags">268</int>
+												<string key="NSFrame">{{35, 325}, {187, 17}}</string>
+												<reference key="NSSuperview" ref="782866499"/>
+												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView" ref="805254006"/>
+												<string key="NSReuseIdentifierKey">_NS:1535</string>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="733600772">
+													<int key="NSCellFlags">68157504</int>
+													<int key="NSCellFlags2">272630784</int>
+													<string key="NSContents">Label</string>
+													<reference key="NSSupport" ref="113129670"/>
+													<string key="NSCellIdentifier">_NS:1535</string>
+													<reference key="NSControlView" ref="364230398"/>
+													<reference key="NSBackgroundColor" ref="243535788"/>
+													<object class="NSColor" key="NSTextColor" id="302293113">
+														<int key="NSColorSpace">6</int>
+														<string key="NSCatalogName">System</string>
+														<string key="NSColorName">controlTextColor</string>
+														<object class="NSColor" key="NSColor" id="1050813769">
+															<int key="NSColorSpace">3</int>
+															<bytes key="NSWhite">MAA</bytes>
+														</object>
+													</object>
+												</object>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											</object>
+											<object class="NSButton" id="816469593">
+												<reference key="NSNextResponder" ref="782866499"/>
+												<int key="NSvFlags">268</int>
+												<string key="NSFrame">{{280, 289}, {80, 32}}</string>
+												<reference key="NSSuperview" ref="782866499"/>
+												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView" ref="903286001"/>
+												<string key="NSReuseIdentifierKey">_NS:9</string>
+												<int key="NSTag">2</int>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="898156247">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">134217728</int>
+													<string key="NSContents">New…</string>
+													<reference key="NSSupport" ref="113129670"/>
+													<string key="NSCellIdentifier">_NS:9</string>
+													<reference key="NSControlView" ref="816469593"/>
+													<int key="NSButtonFlags">-2038284288</int>
+													<int key="NSButtonFlags2">129</int>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											</object>
+											<object class="NSButton" id="903286001">
+												<reference key="NSNextResponder" ref="782866499"/>
+												<int key="NSvFlags">268</int>
+												<string key="NSFrame">{{372, 289}, {101, 32}}</string>
+												<reference key="NSSuperview" ref="782866499"/>
+												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView" ref="38178535"/>
+												<string key="NSReuseIdentifierKey">_NS:9</string>
+												<int key="NSTag">2</int>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="599744224">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">134217728</int>
+													<string key="NSContents">Change…</string>
+													<reference key="NSSupport" ref="113129670"/>
+													<string key="NSCellIdentifier">_NS:9</string>
+													<reference key="NSControlView" ref="903286001"/>
+													<int key="NSButtonFlags">-2038284288</int>
+													<int key="NSButtonFlags2">129</int>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											</object>
+											<object class="NSTextField" id="805254006">
+												<reference key="NSNextResponder" ref="782866499"/>
+												<int key="NSvFlags">268</int>
+												<string key="NSFrame">{{283, 325}, {187, 17}}</string>
+												<reference key="NSSuperview" ref="782866499"/>
+												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView" ref="960369332"/>
+												<string key="NSReuseIdentifierKey">_NS:1535</string>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="573290052">
+													<int key="NSCellFlags">68157504</int>
+													<int key="NSCellFlags2">272630784</int>
+													<string key="NSContents">Label</string>
+													<reference key="NSSupport" ref="113129670"/>
+													<string key="NSCellIdentifier">_NS:1535</string>
+													<reference key="NSControlView" ref="805254006"/>
+													<reference key="NSBackgroundColor" ref="243535788"/>
+													<reference key="NSTextColor" ref="302293113"/>
+												</object>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											</object>
+										</array>
+										<string key="NSFrame">{{10, 33}, {505, 345}}</string>
+										<reference key="NSSuperview" ref="145760790"/>
+										<reference key="NSWindow"/>
+										<reference key="NSNextKeyView" ref="364230398"/>
+									</object>
+									<string key="NSLabel">Memory Cards</string>
+									<reference key="NSColor" ref="243535788"/>
+									<reference key="NSTabView" ref="145760790"/>
+								</object>
+								<object class="NSTabViewItem" id="185355004">
+									<string key="NSIdentifier">4</string>
+									<object class="NSView" key="NSView" id="958294119">
+										<nil key="NSNextResponder"/>
+										<int key="NSvFlags">256</int>
+										<array class="NSMutableArray" key="NSSubviews">
+											<object class="NSButton" id="195305356">
+												<reference key="NSNextResponder" ref="958294119"/>
+												<int key="NSvFlags">268</int>
+												<string key="NSFrame">{{11, 314}, {121, 32}}</string>
+												<reference key="NSSuperview" ref="958294119"/>
+												<reference key="NSNextKeyView" ref="911328747"/>
+												<string key="NSReuseIdentifierKey">_NS:9</string>
+												<int key="NSTag">100</int>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="542220430">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">134217728</int>
+													<string key="NSContents">Fast Forward</string>
+													<reference key="NSSupport" ref="113129670"/>
+													<string key="NSCellIdentifier">_NS:9</string>
+													<reference key="NSControlView" ref="195305356"/>
+													<int key="NSTag">100</int>
+													<int key="NSButtonFlags">-1232977920</int>
+													<int key="NSButtonFlags2">129</int>
+													<reference key="NSAlternateImage" ref="983951697"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											</object>
+											<object class="NSTextField" id="911328747">
+												<reference key="NSNextResponder" ref="958294119"/>
+												<int key="NSvFlags">268</int>
+												<string key="NSFrame">{{134, 320}, {310, 22}}</string>
+												<reference key="NSSuperview" ref="958294119"/>
+												<reference key="NSNextKeyView" ref="168188758"/>
+												<string key="NSReuseIdentifierKey">_NS:9</string>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="665963726">
+													<int key="NSCellFlags">-2075131840</int>
+													<int key="NSCellFlags2">272634880</int>
+													<string key="NSContents"/>
+													<reference key="NSSupport" ref="113129670"/>
+													<string key="NSPlaceholderString">None...</string>
+													<string key="NSCellIdentifier">_NS:9</string>
+													<reference key="NSControlView" ref="911328747"/>
+													<bool key="NSDrawsBackground">YES</bool>
+													<int key="NSTextBezelStyle">1</int>
+													<object class="NSColor" key="NSBackgroundColor" id="663213200">
+														<int key="NSColorSpace">6</int>
+														<string key="NSCatalogName">System</string>
+														<string key="NSColorName">headerColor</string>
+														<reference key="NSColor" ref="271765176"/>
+													</object>
+													<object class="NSColor" key="NSTextColor">
+														<int key="NSColorSpace">1</int>
+														<bytes key="NSRGB">MC4xNzQwOTY0ODI5IDAuMzI3ODI0MzQ2NSAwLjY1NzM3NTE2OTgAA</bytes>
+													</object>
+												</object>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											</object>
+											<object class="NSButton" id="168188758">
+												<reference key="NSNextResponder" ref="958294119"/>
+												<int key="NSvFlags">268</int>
+												<string key="NSFrame">{{11, 284}, {121, 32}}</string>
+												<reference key="NSSuperview" ref="958294119"/>
+												<reference key="NSNextKeyView" ref="823878691"/>
+												<string key="NSReuseIdentifierKey">_NS:9</string>
+												<int key="NSTag">101</int>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="548509436">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">134217728</int>
+													<string key="NSContents">Frame Limit</string>
+													<reference key="NSSupport" ref="113129670"/>
+													<string key="NSCellIdentifier">_NS:9</string>
+													<reference key="NSControlView" ref="168188758"/>
+													<int key="NSTag">100</int>
+													<int key="NSButtonFlags">-1232977920</int>
+													<int key="NSButtonFlags2">129</int>
+													<reference key="NSAlternateImage" ref="983951697"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											</object>
+											<object class="NSTextField" id="823878691">
+												<reference key="NSNextResponder" ref="958294119"/>
+												<int key="NSvFlags">268</int>
+												<string key="NSFrame">{{134, 290}, {310, 22}}</string>
+												<reference key="NSSuperview" ref="958294119"/>
+												<reference key="NSNextKeyView" ref="795957481"/>
+												<string key="NSReuseIdentifierKey">_NS:9</string>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="266713574">
+													<int key="NSCellFlags">-2075131840</int>
+													<int key="NSCellFlags2">272634880</int>
+													<string key="NSContents"/>
+													<reference key="NSSupport" ref="113129670"/>
+													<string key="NSPlaceholderString">None...</string>
+													<string key="NSCellIdentifier">_NS:9</string>
+													<reference key="NSControlView" ref="823878691"/>
+													<bool key="NSDrawsBackground">YES</bool>
+													<int key="NSTextBezelStyle">1</int>
+													<reference key="NSBackgroundColor" ref="663213200"/>
+													<object class="NSColor" key="NSTextColor">
+														<int key="NSColorSpace">1</int>
+														<bytes key="NSRGB">MC4xNzQwOTY0ODI5IDAuMzI3ODI0MzQ2NSAwLjY1NzM3NTE2OTgAA</bytes>
+													</object>
+												</object>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											</object>
+											<object class="NSButton" id="795957481">
+												<reference key="NSNextResponder" ref="958294119"/>
+												<int key="NSvFlags">268</int>
+												<string key="NSFrame">{{11, 252}, {121, 32}}</string>
+												<reference key="NSSuperview" ref="958294119"/>
+												<reference key="NSNextKeyView" ref="341191480"/>
+												<string key="NSReuseIdentifierKey">_NS:9</string>
+												<int key="NSTag">102</int>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="305408243">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">134217728</int>
+													<string key="NSContents">Save State</string>
+													<reference key="NSSupport" ref="113129670"/>
+													<string key="NSCellIdentifier">_NS:9</string>
+													<reference key="NSControlView" ref="795957481"/>
+													<int key="NSTag">100</int>
+													<int key="NSButtonFlags">-1232977920</int>
+													<int key="NSButtonFlags2">129</int>
+													<reference key="NSAlternateImage" ref="983951697"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											</object>
+											<object class="NSTextField" id="341191480">
+												<reference key="NSNextResponder" ref="958294119"/>
+												<int key="NSvFlags">268</int>
+												<string key="NSFrame">{{134, 259}, {310, 22}}</string>
+												<reference key="NSSuperview" ref="958294119"/>
+												<reference key="NSNextKeyView" ref="659547625"/>
+												<string key="NSReuseIdentifierKey">_NS:9</string>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="470562697">
+													<int key="NSCellFlags">-2075131840</int>
+													<int key="NSCellFlags2">272634880</int>
+													<string key="NSContents"/>
+													<reference key="NSSupport" ref="113129670"/>
+													<string key="NSPlaceholderString">None...</string>
+													<string key="NSCellIdentifier">_NS:9</string>
+													<reference key="NSControlView" ref="341191480"/>
+													<bool key="NSDrawsBackground">YES</bool>
+													<int key="NSTextBezelStyle">1</int>
+													<reference key="NSBackgroundColor" ref="663213200"/>
+													<object class="NSColor" key="NSTextColor">
+														<int key="NSColorSpace">1</int>
+														<bytes key="NSRGB">MC4xNzQwOTY0ODI5IDAuMzI3ODI0MzQ2NSAwLjY1NzM3NTE2OTgAA</bytes>
+													</object>
+												</object>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											</object>
+											<object class="NSButton" id="659547625">
+												<reference key="NSNextResponder" ref="958294119"/>
+												<int key="NSvFlags">268</int>
+												<string key="NSFrame">{{11, 220}, {121, 32}}</string>
+												<reference key="NSSuperview" ref="958294119"/>
+												<reference key="NSNextKeyView" ref="364881091"/>
+												<string key="NSReuseIdentifierKey">_NS:9</string>
+												<int key="NSTag">103</int>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="968300061">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">134217728</int>
+													<string key="NSContents">Load State</string>
+													<reference key="NSSupport" ref="113129670"/>
+													<string key="NSCellIdentifier">_NS:9</string>
+													<reference key="NSControlView" ref="659547625"/>
+													<int key="NSTag">100</int>
+													<int key="NSButtonFlags">-1232977920</int>
+													<int key="NSButtonFlags2">129</int>
+													<reference key="NSAlternateImage" ref="983951697"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											</object>
+											<object class="NSTextField" id="364881091">
+												<reference key="NSNextResponder" ref="958294119"/>
+												<int key="NSvFlags">268</int>
+												<string key="NSFrame">{{134, 227}, {310, 22}}</string>
+												<reference key="NSSuperview" ref="958294119"/>
+												<reference key="NSNextKeyView" ref="246038820"/>
+												<string key="NSReuseIdentifierKey">_NS:9</string>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="629053056">
+													<int key="NSCellFlags">-2075131840</int>
+													<int key="NSCellFlags2">272634880</int>
+													<string key="NSContents"/>
+													<reference key="NSSupport" ref="113129670"/>
+													<string key="NSPlaceholderString">None...</string>
+													<string key="NSCellIdentifier">_NS:9</string>
+													<reference key="NSControlView" ref="364881091"/>
+													<bool key="NSDrawsBackground">YES</bool>
+													<int key="NSTextBezelStyle">1</int>
+													<reference key="NSBackgroundColor" ref="663213200"/>
+													<object class="NSColor" key="NSTextColor">
+														<int key="NSColorSpace">1</int>
+														<bytes key="NSRGB">MC4xNzQwOTY0ODI5IDAuMzI3ODI0MzQ2NSAwLjY1NzM3NTE2OTgAA</bytes>
+													</object>
+												</object>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											</object>
+											<object class="NSButton" id="246038820">
+												<reference key="NSNextResponder" ref="958294119"/>
+												<int key="NSvFlags">268</int>
+												<string key="NSFrame">{{11, 188}, {121, 32}}</string>
+												<reference key="NSSuperview" ref="958294119"/>
+												<reference key="NSNextKeyView" ref="1072290452"/>
+												<string key="NSReuseIdentifierKey">_NS:9</string>
+												<int key="NSTag">104</int>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="10554974">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">134217728</int>
+													<string key="NSContents">Next State</string>
+													<reference key="NSSupport" ref="113129670"/>
+													<string key="NSCellIdentifier">_NS:9</string>
+													<reference key="NSControlView" ref="246038820"/>
+													<int key="NSTag">100</int>
+													<int key="NSButtonFlags">-1232977920</int>
+													<int key="NSButtonFlags2">129</int>
+													<reference key="NSAlternateImage" ref="983951697"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											</object>
+											<object class="NSTextField" id="1072290452">
+												<reference key="NSNextResponder" ref="958294119"/>
+												<int key="NSvFlags">268</int>
+												<string key="NSFrame">{{134, 195}, {310, 22}}</string>
+												<reference key="NSSuperview" ref="958294119"/>
+												<reference key="NSNextKeyView" ref="860331374"/>
+												<string key="NSReuseIdentifierKey">_NS:9</string>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="720605472">
+													<int key="NSCellFlags">-2075131840</int>
+													<int key="NSCellFlags2">272634880</int>
+													<string key="NSContents"/>
+													<reference key="NSSupport" ref="113129670"/>
+													<string key="NSPlaceholderString">None...</string>
+													<string key="NSCellIdentifier">_NS:9</string>
+													<reference key="NSControlView" ref="1072290452"/>
+													<bool key="NSDrawsBackground">YES</bool>
+													<int key="NSTextBezelStyle">1</int>
+													<reference key="NSBackgroundColor" ref="663213200"/>
+													<object class="NSColor" key="NSTextColor">
+														<int key="NSColorSpace">1</int>
+														<bytes key="NSRGB">MC4xNzQwOTY0ODI5IDAuMzI3ODI0MzQ2NSAwLjY1NzM3NTE2OTgAA</bytes>
+													</object>
+												</object>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											</object>
+											<object class="NSButton" id="860331374">
+												<reference key="NSNextResponder" ref="958294119"/>
+												<int key="NSvFlags">268</int>
+												<string key="NSFrame">{{11, 156}, {121, 32}}</string>
+												<reference key="NSSuperview" ref="958294119"/>
+												<reference key="NSNextKeyView" ref="205239960"/>
+												<string key="NSReuseIdentifierKey">_NS:9</string>
+												<int key="NSTag">105</int>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="744386199">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">134217728</int>
+													<string key="NSContents">Previous State</string>
+													<reference key="NSSupport" ref="113129670"/>
+													<string key="NSCellIdentifier">_NS:9</string>
+													<reference key="NSControlView" ref="860331374"/>
+													<int key="NSTag">100</int>
+													<int key="NSButtonFlags">-1232977920</int>
+													<int key="NSButtonFlags2">129</int>
+													<reference key="NSAlternateImage" ref="983951697"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											</object>
+											<object class="NSTextField" id="205239960">
+												<reference key="NSNextResponder" ref="958294119"/>
+												<int key="NSvFlags">268</int>
+												<string key="NSFrame">{{134, 164}, {310, 22}}</string>
+												<reference key="NSSuperview" ref="958294119"/>
+												<reference key="NSNextKeyView" ref="32956648"/>
+												<string key="NSReuseIdentifierKey">_NS:9</string>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="725698940">
+													<int key="NSCellFlags">-2075131840</int>
+													<int key="NSCellFlags2">272634880</int>
+													<string key="NSContents"/>
+													<reference key="NSSupport" ref="113129670"/>
+													<string key="NSPlaceholderString">None...</string>
+													<string key="NSCellIdentifier">_NS:9</string>
+													<reference key="NSControlView" ref="205239960"/>
+													<bool key="NSDrawsBackground">YES</bool>
+													<int key="NSTextBezelStyle">1</int>
+													<reference key="NSBackgroundColor" ref="663213200"/>
+													<object class="NSColor" key="NSTextColor">
+														<int key="NSColorSpace">1</int>
+														<bytes key="NSRGB">MC4xNzQwOTY0ODI5IDAuMzI3ODI0MzQ2NSAwLjY1NzM3NTE2OTgAA</bytes>
+													</object>
+												</object>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											</object>
+											<object class="NSBox" id="32956648">
+												<reference key="NSNextResponder" ref="958294119"/>
+												<int key="NSvFlags">42</int>
+												<string key="NSFrame">{{3, 148}, {500, 5}}</string>
+												<reference key="NSSuperview" ref="958294119"/>
+												<reference key="NSNextKeyView" ref="267389414"/>
+												<string key="NSReuseIdentifierKey">_NS:9</string>
+												<string key="NSOffsets">{0, 0}</string>
+												<object class="NSTextFieldCell" key="NSTitleCell">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Box</string>
+													<reference key="NSSupport" ref="113129670"/>
+													<reference key="NSBackgroundColor" ref="767300285"/>
+													<object class="NSColor" key="NSTextColor">
+														<int key="NSColorSpace">3</int>
+														<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
+													</object>
+												</object>
+												<int key="NSBorderType">3</int>
+												<int key="NSBoxType">2</int>
+												<int key="NSTitlePosition">0</int>
+												<bool key="NSTransparent">NO</bool>
+											</object>
+											<object class="NSTextField" id="267389414">
+												<reference key="NSNextResponder" ref="958294119"/>
+												<int key="NSvFlags">268</int>
+												<string key="NSFrame">{{14, 125}, {113, 17}}</string>
+												<reference key="NSSuperview" ref="958294119"/>
+												<reference key="NSNextKeyView" ref="465452774"/>
+												<string key="NSReuseIdentifierKey">_NS:1535</string>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="27919550">
+													<int key="NSCellFlags">68157504</int>
+													<int key="NSCellFlags2">272630784</int>
+													<string key="NSContents">GPU Key Modifier</string>
+													<reference key="NSSupport" ref="113129670"/>
+													<string key="NSCellIdentifier">_NS:1535</string>
+													<reference key="NSControlView" ref="267389414"/>
+													<reference key="NSBackgroundColor" ref="243535788"/>
+													<reference key="NSTextColor" ref="302293113"/>
+												</object>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											</object>
+											<object class="NSPopUpButton" id="465452774">
+												<reference key="NSNextResponder" ref="958294119"/>
+												<int key="NSvFlags">268</int>
+												<string key="NSFrame">{{131, 119}, {153, 26}}</string>
+												<reference key="NSSuperview" ref="958294119"/>
+												<string key="NSReuseIdentifierKey">_NS:9</string>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSPopUpButtonCell" key="NSCell" id="465026198">
+													<int key="NSCellFlags">-2076180416</int>
+													<int key="NSCellFlags2">2048</int>
+													<reference key="NSSupport" ref="113129670"/>
+													<string key="NSCellIdentifier">_NS:9</string>
+													<reference key="NSControlView" ref="465452774"/>
+													<int key="NSButtonFlags">109199360</int>
+													<int key="NSButtonFlags2">129</int>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">400</int>
+													<int key="NSPeriodicInterval">75</int>
+													<object class="NSMenuItem" key="NSMenuItem" id="336696263">
+														<reference key="NSMenu" ref="1009410357"/>
+														<string key="NSTitle">Control ⌃</string>
+														<string key="NSKeyEquiv"/>
+														<int key="NSKeyEquivModMask">262144</int>
+														<int key="NSMnemonicLoc">2147483647</int>
+														<int key="NSState">1</int>
+														<reference key="NSOnImage" ref="853204695"/>
+														<reference key="NSMixedImage" ref="607321304"/>
+														<string key="NSAction">_popUpItemAction:</string>
+														<reference key="NSTarget" ref="465026198"/>
+													</object>
+													<bool key="NSMenuItemRespectAlignment">YES</bool>
+													<object class="NSMenu" key="NSMenu" id="1009410357">
+														<string key="NSTitle">OtherViews</string>
+														<array class="NSMutableArray" key="NSMenuItems">
+															<reference ref="336696263"/>
+															<object class="NSMenuItem" id="724874125">
+																<reference key="NSMenu" ref="1009410357"/>
+																<string key="NSTitle">Shift ⇧</string>
+																<string key="NSKeyEquiv"/>
+																<int key="NSKeyEquivModMask">131072</int>
+																<int key="NSMnemonicLoc">2147483647</int>
+																<reference key="NSOnImage" ref="853204695"/>
+																<reference key="NSMixedImage" ref="607321304"/>
+																<string key="NSAction">_popUpItemAction:</string>
+																<reference key="NSTarget" ref="465026198"/>
+															</object>
+															<object class="NSMenuItem" id="1066195432">
+																<reference key="NSMenu" ref="1009410357"/>
+																<string key="NSTitle">Alt / Option ⌥</string>
+																<string key="NSKeyEquiv"/>
+																<int key="NSKeyEquivModMask">524288</int>
+																<int key="NSMnemonicLoc">2147483647</int>
+																<reference key="NSOnImage" ref="853204695"/>
+																<reference key="NSMixedImage" ref="607321304"/>
+																<string key="NSAction">_popUpItemAction:</string>
+																<reference key="NSTarget" ref="465026198"/>
+															</object>
+															<object class="NSMenuItem" id="949142848">
+																<reference key="NSMenu" ref="1009410357"/>
+																<string key="NSTitle">Command ⌘</string>
+																<string key="NSKeyEquiv"/>
+																<int key="NSKeyEquivModMask">1048576</int>
+																<int key="NSMnemonicLoc">2147483647</int>
+																<reference key="NSOnImage" ref="853204695"/>
+																<reference key="NSMixedImage" ref="607321304"/>
+																<string key="NSAction">_popUpItemAction:</string>
+																<reference key="NSTarget" ref="465026198"/>
+															</object>
+														</array>
+														<reference key="NSMenuFont" ref="113129670"/>
+													</object>
+													<int key="NSPreferredEdge">1</int>
+													<bool key="NSUsesItemFromMenu">YES</bool>
+													<bool key="NSAltersState">YES</bool>
+													<int key="NSArrowPosition">2</int>
+												</object>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											</object>
+										</array>
+										<string key="NSFrame">{{10, 33}, {505, 345}}</string>
+										<reference key="NSNextKeyView" ref="195305356"/>
+									</object>
+									<string key="NSLabel">Hotkeys</string>
+									<reference key="NSColor" ref="243535788"/>
+									<reference key="NSTabView" ref="145760790"/>
+								</object>
+							</array>
+							<reference key="NSSelectedTabViewItem" ref="683723192"/>
+							<reference key="NSFont" ref="113129670"/>
+							<int key="NSTvFlags">0</int>
+							<bool key="NSAllowTruncatedLabels">YES</bool>
+							<bool key="NSDrawsBackground">YES</bool>
+							<array class="NSMutableArray" key="NSSubviews">
+								<reference ref="782866499"/>
+							</array>
+						</object>
+					</array>
+					<string key="NSFrameSize">{551, 407}</string>
+					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
+					<reference key="NSNextKeyView" ref="145760790"/>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
+				<string key="NSMinSize">{551, 429}</string>
+				<string key="NSMaxSize">{2000, 429}</string>
+				<bool key="NSWindowIsRestorable">YES</bool>
+			</object>
+			<object class="NSView" id="128798333">
+				<reference key="NSNextResponder"/>
+				<int key="NSvFlags">256</int>
+				<array class="NSMutableArray" key="NSSubviews">
+					<object class="NSBox" id="369120847">
+						<reference key="NSNextResponder" ref="128798333"/>
+						<int key="NSvFlags">18</int>
+						<array class="NSMutableArray" key="NSSubviews">
+							<object class="NSView" id="873539094">
+								<reference key="NSNextResponder" ref="369120847"/>
+								<int key="NSvFlags">274</int>
+								<array class="NSMutableArray" key="NSSubviews">
+									<object class="NSImageView" id="547270477">
+										<reference key="NSNextResponder" ref="873539094"/>
+										<int key="NSvFlags">269</int>
+										<set class="NSMutableSet" key="NSDragTypes">
+											<string>Apple PDF pasteboard type</string>
+											<string>Apple PICT pasteboard type</string>
+											<string>Apple PNG pasteboard type</string>
+											<string>NSFilenamesPboardType</string>
+											<string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
+											<string>NeXT TIFF v4.0 pasteboard type</string>
+										</set>
+										<string key="NSFrame">{{65, 79}, {48, 48}}</string>
+										<reference key="NSSuperview" ref="873539094"/>
+										<reference key="NSWindow"/>
+										<reference key="NSNextKeyView" ref="534715842"/>
+										<string key="NSReuseIdentifierKey">_NS:2141</string>
+										<bool key="NSEnabled">YES</bool>
+										<object class="NSImageCell" key="NSCell" id="544613766">
+											<int key="NSCellFlags">134217728</int>
+											<int key="NSCellFlags2">33554432</int>
+											<object class="NSCustomResource" key="NSContents">
+												<string key="NSClassName">NSImage</string>
+												<string key="NSResourceName">NSAdvanced</string>
+											</object>
+											<string key="NSCellIdentifier">_NS:2141</string>
+											<int key="NSAlign">0</int>
+											<int key="NSScale">0</int>
+											<int key="NSStyle">0</int>
+											<bool key="NSAnimates">NO</bool>
+										</object>
+										<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										<bool key="NSEditable">YES</bool>
+									</object>
+									<object class="NSTextField" id="979844614">
+										<reference key="NSNextResponder" ref="873539094"/>
+										<int key="NSvFlags">266</int>
+										<string key="NSFrame">{{0, 54}, {178, 17}}</string>
+										<reference key="NSSuperview" ref="873539094"/>
+										<reference key="NSWindow"/>
+										<reference key="NSNextKeyView" ref="938529027"/>
+										<string key="NSReuseIdentifierKey">_NS:3944</string>
+										<bool key="NSEnabled">YES</bool>
+										<object class="NSTextFieldCell" key="NSCell" id="6532882">
+											<int key="NSCellFlags">68157504</int>
+											<int key="NSCellFlags2">138413056</int>
+											<string key="NSContents">English name</string>
+											<reference key="NSSupport" ref="113129670"/>
+											<string key="NSCellIdentifier">_NS:3944</string>
+											<reference key="NSControlView" ref="979844614"/>
+											<reference key="NSBackgroundColor" ref="243535788"/>
+											<reference key="NSTextColor" ref="302293113"/>
+										</object>
+										<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+									</object>
+									<object class="NSTextField" id="938529027">
+										<reference key="NSNextResponder" ref="873539094"/>
+										<int key="NSvFlags">266</int>
+										<string key="NSFrame">{{0, 29}, {178, 17}}</string>
+										<reference key="NSSuperview" ref="873539094"/>
+										<reference key="NSWindow"/>
+										<reference key="NSNextKeyView" ref="462204898"/>
+										<string key="NSReuseIdentifierKey">_NS:3944</string>
+										<bool key="NSEnabled">YES</bool>
+										<object class="NSTextFieldCell" key="NSCell" id="384948753">
+											<int key="NSCellFlags">68157504</int>
+											<int key="NSCellFlags2">138413056</int>
+											<string key="NSContents">SJIS name</string>
+											<reference key="NSSupport" ref="113129670"/>
+											<string key="NSCellIdentifier">_NS:3944</string>
+											<reference key="NSControlView" ref="938529027"/>
+											<reference key="NSBackgroundColor" ref="243535788"/>
+											<reference key="NSTextColor" ref="302293113"/>
+										</object>
+										<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+									</object>
+									<object class="NSTextField" id="462204898">
+										<reference key="NSNextResponder" ref="873539094"/>
+										<int key="NSvFlags">266</int>
+										<string key="NSFrame">{{0, 7}, {178, 14}}</string>
+										<reference key="NSSuperview" ref="873539094"/>
+										<reference key="NSWindow"/>
+										<string key="NSReuseIdentifierKey">_NS:3944</string>
+										<bool key="NSEnabled">YES</bool>
+										<object class="NSTextFieldCell" key="NSCell" id="809754268">
+											<int key="NSCellFlags">67108928</int>
+											<int key="NSCellFlags2">1212291584</int>
+											<string key="NSContents">DELETED</string>
+											<reference key="NSSupport" ref="26"/>
+											<string key="NSCellIdentifier">_NS:3944</string>
+											<reference key="NSControlView" ref="462204898"/>
+											<reference key="NSBackgroundColor" ref="243535788"/>
+											<object class="NSColor" key="NSTextColor">
+												<int key="NSColorSpace">6</int>
+												<string key="NSCatalogName">System</string>
+												<string key="NSColorName">textColor</string>
+												<reference key="NSColor" ref="1050813769"/>
+											</object>
+										</object>
+										<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+									</object>
+									<object class="NSCustomView" id="534715842">
+										<reference key="NSNextResponder" ref="873539094"/>
+										<int key="NSvFlags">4365</int>
+										<array class="NSMutableArray" key="NSSubviews">
+											<object class="NSTextField" id="370252462">
+												<reference key="NSNextResponder" ref="534715842"/>
+												<int key="NSvFlags">274</int>
+												<string key="NSFrame">{{2, 5}, {20, 14}}</string>
+												<reference key="NSSuperview" ref="534715842"/>
+												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView" ref="979844614"/>
+												<string key="NSReuseIdentifierKey">_NS:1535</string>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="502243962">
+													<int key="NSCellFlags">68157504</int>
+													<int key="NSCellFlags2">138544128</int>
+													<string key="NSContents">0</string>
+													<reference key="NSSupport" ref="26"/>
+													<string key="NSCellIdentifier">_NS:1535</string>
+													<reference key="NSControlView" ref="370252462"/>
+													<reference key="NSBackgroundColor" ref="243535788"/>
+													<reference key="NSTextColor" ref="271765176"/>
+												</object>
+												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											</object>
+										</array>
+										<string key="NSFrame">{{89, 103}, {24, 24}}</string>
+										<reference key="NSSuperview" ref="873539094"/>
+										<reference key="NSWindow"/>
+										<reference key="NSNextKeyView" ref="370252462"/>
+										<string key="NSReuseIdentifierKey">_NS:9</string>
+										<string key="NSClassName">MemBadgeView</string>
+									</object>
+								</array>
+								<string key="NSFrameSize">{179, 130}</string>
+								<reference key="NSSuperview" ref="369120847"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="547270477"/>
+								<string key="NSReuseIdentifierKey">_NS:11</string>
+							</object>
+						</array>
+						<string key="NSFrameSize">{179, 130}</string>
+						<reference key="NSSuperview" ref="128798333"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="873539094"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<string key="NSOffsets">{0, 0}</string>
+						<object class="NSTextFieldCell" key="NSTitleCell">
+							<int key="NSCellFlags">67108864</int>
+							<int key="NSCellFlags2">0</int>
+							<string key="NSContents">Box</string>
+							<reference key="NSSupport" ref="26"/>
+							<reference key="NSBackgroundColor" ref="767300285"/>
+							<object class="NSColor" key="NSTextColor">
+								<int key="NSColorSpace">3</int>
+								<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
+							</object>
+						</object>
+						<reference key="NSContentView" ref="873539094"/>
+						<int key="NSBorderType">0</int>
+						<int key="NSBoxType">4</int>
+						<int key="NSTitlePosition">0</int>
+						<bool key="NSTransparent">NO</bool>
+						<object class="NSColor" key="NSFillColor2">
+							<int key="NSColorSpace">6</int>
+							<string key="NSCatalogName">System</string>
+							<string key="NSColorName">selectedControlColor</string>
+							<reference key="NSColor" ref="271765176"/>
+						</object>
+					</object>
+				</array>
+				<string key="NSFrameSize">{179, 130}</string>
+				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
+				<reference key="NSNextKeyView" ref="369120847"/>
+			</object>
+			<object class="NSCollectionViewItem" id="1047165271"/>
+			<object class="NSArrayController" id="94388034">
+				<array class="NSMutableArray" key="NSDeclaredKeys">
+					<string>englishName</string>
+					<string>sjisName</string>
+					<string>memImage</string>
+				</array>
+				<string key="NSObjectClassName">PcsxrMemoryObject</string>
+				<bool key="NSEditable">YES</bool>
+				<object class="_NSManagedProxy" key="_NSManagedProxy"/>
+				<bool key="NSAvoidsEmptySelection">YES</bool>
+				<bool key="NSPreservesSelection">YES</bool>
+				<bool key="NSSelectsInsertedObjects">YES</bool>
+				<bool key="NSFilterRestrictsInsertion">YES</bool>
+				<bool key="NSClearsFilterPredicateOnInsertion">YES</bool>
+			</object>
+			<object class="NSArrayController" id="104514835">
+				<array class="NSMutableArray" key="NSDeclaredKeys">
+					<string>englishName</string>
+					<string>sjisName</string>
+					<string>memImage</string>
+				</array>
+				<string key="NSObjectClassName">PcsxrMemoryObject</string>
+				<bool key="NSEditable">YES</bool>
+				<object class="_NSManagedProxy" key="_NSManagedProxy"/>
+				<bool key="NSAvoidsEmptySelection">YES</bool>
+				<bool key="NSPreservesSelection">YES</bool>
+				<bool key="NSSelectsInsertedObjects">YES</bool>
+				<bool key="NSFilterRestrictsInsertion">YES</bool>
+				<bool key="NSClearsFilterPredicateOnInsertion">YES</bool>
+			</object>
+			<object class="NSCustomObject" id="622912057">
+				<string key="NSClassName">PluginController</string>
+			</object>
+			<object class="NSCustomObject" id="113293330">
+				<string key="NSClassName">PluginController</string>
+			</object>
+			<object class="NSCustomObject" id="869594171">
+				<string key="NSClassName">PluginController</string>
+			</object>
+			<object class="NSCustomObject" id="778989052">
+				<string key="NSClassName">PluginController</string>
+			</object>
+			<object class="NSCustomObject" id="248585311">
+				<string key="NSClassName">PluginController</string>
+			</object>
+			<object class="NSCustomObject" id="251882331">
+				<string key="NSClassName">PluginController</string>
+			</object>
+			<object class="NSViewController" id="363971326"/>
+		</array>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<array class="NSMutableArray" key="connectionRecords">
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">window</string>
+						<reference key="source" ref="974938689"/>
+						<reference key="destination" ref="379363543"/>
+					</object>
+					<int key="connectionID">345</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">cdromPlugin</string>
+						<reference key="source" ref="974938689"/>
+						<reference key="destination" ref="778989052"/>
+					</object>
+					<int key="connectionID">401</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">graphicsPlugin</string>
+						<reference key="source" ref="974938689"/>
+						<reference key="destination" ref="622912057"/>
+					</object>
+					<int key="connectionID">402</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">padPlugin</string>
+						<reference key="source" ref="974938689"/>
+						<reference key="destination" ref="869594171"/>
+					</object>
+					<int key="connectionID">403</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">soundPlugin</string>
+						<reference key="source" ref="974938689"/>
+						<reference key="destination" ref="113293330"/>
+					</object>
+					<int key="connectionID">404</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">setCheckbox:</string>
+						<reference key="source" ref="974938689"/>
+						<reference key="destination" ref="878205730"/>
+					</object>
+					<int key="connectionID">555</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">noCDAudioCell</string>
+						<reference key="source" ref="974938689"/>
+						<reference key="destination" ref="878205730"/>
+					</object>
+					<int key="connectionID">547</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">usesDynarecCell</string>
+						<reference key="source" ref="974938689"/>
+						<reference key="destination" ref="1001969866"/>
+					</object>
+					<int key="connectionID">546</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">setCheckboxInverse:</string>
+						<reference key="source" ref="974938689"/>
+						<reference key="destination" ref="1001969866"/>
+					</object>
+					<int key="connectionID">553</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">setCheckbox:</string>
+						<reference key="source" ref="974938689"/>
+						<reference key="destination" ref="41079268"/>
+					</object>
+					<int key="connectionID">556</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">noXaAudioCell</string>
+						<reference key="source" ref="974938689"/>
+						<reference key="destination" ref="41079268"/>
+					</object>
+					<int key="connectionID">548</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">usesHleCell</string>
+						<reference key="source" ref="974938689"/>
+						<reference key="destination" ref="323048264"/>
+					</object>
+					<int key="connectionID">577</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">setCheckbox:</string>
+						<reference key="source" ref="974938689"/>
+						<reference key="destination" ref="323048264"/>
+					</object>
+					<int key="connectionID">554</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">vTypePALCell</string>
+						<reference key="source" ref="974938689"/>
+						<reference key="destination" ref="197815183"/>
+					</object>
+					<int key="connectionID">569</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">setVideoType:</string>
+						<reference key="source" ref="974938689"/>
+						<reference key="destination" ref="197815183"/>
+					</object>
+					<int key="connectionID">578</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">rCountFixCell</string>
+						<reference key="source" ref="974938689"/>
+						<reference key="destination" ref="45210481"/>
+					</object>
+					<int key="connectionID">549</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">vSyncWAFixCell</string>
+						<reference key="source" ref="974938689"/>
+						<reference key="destination" ref="736164492"/>
+					</object>
+					<int key="connectionID">550</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">setCheckbox:</string>
+						<reference key="source" ref="974938689"/>
+						<reference key="destination" ref="263292685"/>
+					</object>
+					<int key="connectionID">558</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">spuIrqAlwaysCell</string>
+						<reference key="source" ref="974938689"/>
+						<reference key="destination" ref="544319498"/>
+					</object>
+					<int key="connectionID">551</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">setCheckbox:</string>
+						<reference key="source" ref="974938689"/>
+						<reference key="destination" ref="874213588"/>
+					</object>
+					<int key="connectionID">559</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">sioIrqAlwaysCell</string>
+						<reference key="source" ref="974938689"/>
+						<reference key="destination" ref="746537141"/>
+					</object>
+					<int key="connectionID">552</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">netPlugin</string>
+						<reference key="source" ref="974938689"/>
+						<reference key="destination" ref="248585311"/>
+					</object>
+					<int key="connectionID">621</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">setCheckbox:</string>
+						<reference key="source" ref="974938689"/>
+						<reference key="destination" ref="322742106"/>
+					</object>
+					<int key="connectionID">650</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">enableNetPlayCell</string>
+						<reference key="source" ref="974938689"/>
+						<reference key="destination" ref="322742106"/>
+					</object>
+					<int key="connectionID">651</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">widescreen</string>
+						<reference key="source" ref="974938689"/>
+						<reference key="destination" ref="874223654"/>
+					</object>
+					<int key="connectionID">653</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">setCheckbox:</string>
+						<reference key="source" ref="974938689"/>
+						<reference key="destination" ref="874223654"/>
+					</object>
+					<int key="connectionID">654</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">hkTab</string>
+						<reference key="source" ref="974938689"/>
+						<reference key="destination" ref="185355004"/>
+					</object>
+					<int key="connectionID">781</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">hkController</string>
+						<reference key="source" ref="974938689"/>
+						<reference key="destination" ref="958294119"/>
+					</object>
+					<int key="connectionID">832</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">sio1Plugin</string>
+						<reference key="source" ref="974938689"/>
+						<reference key="destination" ref="251882331"/>
+					</object>
+					<int key="connectionID">915</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">memCardEdit</string>
+						<reference key="source" ref="974938689"/>
+						<reference key="destination" ref="363971326"/>
+					</object>
+					<int key="connectionID">956</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">noFastBootCell</string>
+						<reference key="source" ref="974938689"/>
+						<reference key="destination" ref="85343827"/>
+					</object>
+					<int key="connectionID">1280</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">consoleOutputCell</string>
+						<reference key="source" ref="974938689"/>
+						<reference key="destination" ref="772916223"/>
+					</object>
+					<int key="connectionID">1281</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">setCheckbox:</string>
+						<reference key="source" ref="974938689"/>
+						<reference key="destination" ref="772916223"/>
+					</object>
+					<int key="connectionID">1282</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">setCheckboxInverse:</string>
+						<reference key="source" ref="974938689"/>
+						<reference key="destination" ref="85343827"/>
+					</object>
+					<int key="connectionID">1283</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="379363543"/>
+						<reference key="destination" ref="974938689"/>
+					</object>
+					<int key="connectionID">478</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="145760790"/>
+						<reference key="destination" ref="974938689"/>
+					</object>
+					<int key="connectionID">780</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">configureButton</string>
+						<reference key="source" ref="622912057"/>
+						<reference key="destination" ref="659624019"/>
+					</object>
+					<int key="connectionID">470</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">doConfigure:</string>
+						<reference key="source" ref="622912057"/>
+						<reference key="destination" ref="659624019"/>
+					</object>
+					<int key="connectionID">387</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">aboutButton</string>
+						<reference key="source" ref="622912057"/>
+						<reference key="destination" ref="857424577"/>
+					</object>
+					<int key="connectionID">469</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">doAbout:</string>
+						<reference key="source" ref="622912057"/>
+						<reference key="destination" ref="857424577"/>
+					</object>
+					<int key="connectionID">386</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">pluginMenu</string>
+						<reference key="source" ref="622912057"/>
+						<reference key="destination" ref="983879338"/>
+					</object>
+					<int key="connectionID">385</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">selectPlugin:</string>
+						<reference key="source" ref="622912057"/>
+						<reference key="destination" ref="983879338"/>
+					</object>
+					<int key="connectionID">465</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">doConfigure:</string>
+						<reference key="source" ref="113293330"/>
+						<reference key="destination" ref="1060851478"/>
+					</object>
+					<int key="connectionID">391</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">configureButton</string>
+						<reference key="source" ref="113293330"/>
+						<reference key="destination" ref="1060851478"/>
+					</object>
+					<int key="connectionID">472</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">aboutButton</string>
+						<reference key="source" ref="113293330"/>
+						<reference key="destination" ref="921855531"/>
+					</object>
+					<int key="connectionID">471</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">doAbout:</string>
+						<reference key="source" ref="113293330"/>
+						<reference key="destination" ref="921855531"/>
+					</object>
+					<int key="connectionID">390</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">pluginMenu</string>
+						<reference key="source" ref="113293330"/>
+						<reference key="destination" ref="184922838"/>
+					</object>
+					<int key="connectionID">389</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">selectPlugin:</string>
+						<reference key="source" ref="113293330"/>
+						<reference key="destination" ref="184922838"/>
+					</object>
+					<int key="connectionID">466</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">configureButton</string>
+						<reference key="source" ref="869594171"/>
+						<reference key="destination" ref="255294672"/>
+					</object>
+					<int key="connectionID">474</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">doConfigure:</string>
+						<reference key="source" ref="869594171"/>
+						<reference key="destination" ref="255294672"/>
+					</object>
+					<int key="connectionID">394</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">aboutButton</string>
+						<reference key="source" ref="869594171"/>
+						<reference key="destination" ref="132376695"/>
+					</object>
+					<int key="connectionID">473</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">doAbout:</string>
+						<reference key="source" ref="869594171"/>
+						<reference key="destination" ref="132376695"/>
+					</object>
+					<int key="connectionID">393</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">pluginMenu</string>
+						<reference key="source" ref="869594171"/>
+						<reference key="destination" ref="1001529761"/>
+					</object>
+					<int key="connectionID">396</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">selectPlugin:</string>
+						<reference key="source" ref="869594171"/>
+						<reference key="destination" ref="1001529761"/>
+					</object>
+					<int key="connectionID">467</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">doConfigure:</string>
+						<reference key="source" ref="778989052"/>
+						<reference key="destination" ref="701329658"/>
+					</object>
+					<int key="connectionID">400</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">configureButton</string>
+						<reference key="source" ref="778989052"/>
+						<reference key="destination" ref="701329658"/>
+					</object>
+					<int key="connectionID">476</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">aboutButton</string>
+						<reference key="source" ref="778989052"/>
+						<reference key="destination" ref="495555989"/>
+					</object>
+					<int key="connectionID">475</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">doAbout:</string>
+						<reference key="source" ref="778989052"/>
+						<reference key="destination" ref="495555989"/>
+					</object>
+					<int key="connectionID">399</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">selectPlugin:</string>
+						<reference key="source" ref="778989052"/>
+						<reference key="destination" ref="169562785"/>
+					</object>
+					<int key="connectionID">468</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">pluginMenu</string>
+						<reference key="source" ref="778989052"/>
+						<reference key="destination" ref="169562785"/>
+					</object>
+					<int key="connectionID">398</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">aboutButton</string>
+						<reference key="source" ref="248585311"/>
+						<reference key="destination" ref="181214375"/>
+					</object>
+					<int key="connectionID">634</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">configureButton</string>
+						<reference key="source" ref="248585311"/>
+						<reference key="destination" ref="986737125"/>
+					</object>
+					<int key="connectionID">635</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">pluginMenu</string>
+						<reference key="source" ref="248585311"/>
+						<reference key="destination" ref="99318986"/>
+					</object>
+					<int key="connectionID">636</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">selectPlugin:</string>
+						<reference key="source" ref="248585311"/>
+						<reference key="destination" ref="99318986"/>
+					</object>
+					<int key="connectionID">637</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">doAbout:</string>
+						<reference key="source" ref="248585311"/>
+						<reference key="destination" ref="181214375"/>
+					</object>
+					<int key="connectionID">638</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">doConfigure:</string>
+						<reference key="source" ref="248585311"/>
+						<reference key="destination" ref="986737125"/>
+					</object>
+					<int key="connectionID">639</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">hotkeySet:</string>
+						<reference key="source" ref="958294119"/>
+						<reference key="destination" ref="195305356"/>
+					</object>
+					<int key="connectionID">784</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">FastForward</string>
+						<reference key="source" ref="958294119"/>
+						<reference key="destination" ref="911328747"/>
+					</object>
+					<int key="connectionID">849</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">hotkeySet:</string>
+						<reference key="source" ref="958294119"/>
+						<reference key="destination" ref="795957481"/>
+					</object>
+					<int key="connectionID">854</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">hotkeySet:</string>
+						<reference key="source" ref="958294119"/>
+						<reference key="destination" ref="659547625"/>
+					</object>
+					<int key="connectionID">857</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">hotkeySet:</string>
+						<reference key="source" ref="958294119"/>
+						<reference key="destination" ref="246038820"/>
+					</object>
+					<int key="connectionID">863</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">hotkeySet:</string>
+						<reference key="source" ref="958294119"/>
+						<reference key="destination" ref="860331374"/>
+					</object>
+					<int key="connectionID">869</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">SaveState</string>
+						<reference key="source" ref="958294119"/>
+						<reference key="destination" ref="341191480"/>
+					</object>
+					<int key="connectionID">876</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">LoadState</string>
+						<reference key="source" ref="958294119"/>
+						<reference key="destination" ref="364881091"/>
+					</object>
+					<int key="connectionID">877</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">NextState</string>
+						<reference key="source" ref="958294119"/>
+						<reference key="destination" ref="1072290452"/>
+					</object>
+					<int key="connectionID">878</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">PrevState</string>
+						<reference key="source" ref="958294119"/>
+						<reference key="destination" ref="205239960"/>
+					</object>
+					<int key="connectionID">879</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">hotkeySet:</string>
+						<reference key="source" ref="958294119"/>
+						<reference key="destination" ref="168188758"/>
+					</object>
+					<int key="connectionID">900</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">FrameLimit</string>
+						<reference key="source" ref="958294119"/>
+						<reference key="destination" ref="823878691"/>
+					</object>
+					<int key="connectionID">901</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">aboutButton</string>
+						<reference key="source" ref="251882331"/>
+						<reference key="destination" ref="524369892"/>
+					</object>
+					<int key="connectionID">916</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">configureButton</string>
+						<reference key="source" ref="251882331"/>
+						<reference key="destination" ref="155594978"/>
+					</object>
+					<int key="connectionID">917</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">pluginMenu</string>
+						<reference key="source" ref="251882331"/>
+						<reference key="destination" ref="341120868"/>
+					</object>
+					<int key="connectionID">918</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">doAbout:</string>
+						<reference key="source" ref="251882331"/>
+						<reference key="destination" ref="524369892"/>
+					</object>
+					<int key="connectionID">919</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">doConfigure:</string>
+						<reference key="source" ref="251882331"/>
+						<reference key="destination" ref="155594978"/>
+					</object>
+					<int key="connectionID">920</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">selectPlugin:</string>
+						<reference key="source" ref="251882331"/>
+						<reference key="destination" ref="341120868"/>
+					</object>
+					<int key="connectionID">921</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">itemPrototype</string>
+						<reference key="source" ref="855568378"/>
+						<reference key="destination" ref="1047165271"/>
+					</object>
+					<int key="connectionID">996</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">content: arrangedObjects</string>
+						<reference key="source" ref="855568378"/>
+						<reference key="destination" ref="104514835"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="855568378"/>
+							<reference key="NSDestination" ref="104514835"/>
+							<string key="NSLabel">content: arrangedObjects</string>
+							<string key="NSBinding">content</string>
+							<string key="NSKeyPath">arrangedObjects</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">1000</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">content: arrangedObjects</string>
+						<reference key="source" ref="628077157"/>
+						<reference key="destination" ref="94388034"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="628077157"/>
+							<reference key="NSDestination" ref="94388034"/>
+							<string key="NSLabel">content: arrangedObjects</string>
+							<string key="NSBinding">content</string>
+							<string key="NSKeyPath">arrangedObjects</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">1002</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">itemPrototype</string>
+						<reference key="source" ref="628077157"/>
+						<reference key="destination" ref="1047165271"/>
+					</object>
+					<int key="connectionID">1015</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">view</string>
+						<reference key="source" ref="363971326"/>
+						<reference key="destination" ref="782866499"/>
+					</object>
+					<int key="connectionID">993</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">memCard1view</string>
+						<reference key="source" ref="363971326"/>
+						<reference key="destination" ref="855568378"/>
+					</object>
+					<int key="connectionID">997</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">memCard2view</string>
+						<reference key="source" ref="363971326"/>
+						<reference key="destination" ref="628077157"/>
+					</object>
+					<int key="connectionID">998</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">memCard1Label</string>
+						<reference key="source" ref="363971326"/>
+						<reference key="destination" ref="364230398"/>
+					</object>
+					<int key="connectionID">1003</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">memCard2Label</string>
+						<reference key="source" ref="363971326"/>
+						<reference key="destination" ref="805254006"/>
+					</object>
+					<int key="connectionID">1004</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">changeMemCard:</string>
+						<reference key="source" ref="363971326"/>
+						<reference key="destination" ref="91368854"/>
+					</object>
+					<int key="connectionID">1005</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">deleteMemoryObject:</string>
+						<reference key="source" ref="363971326"/>
+						<reference key="destination" ref="397679595"/>
+					</object>
+					<int key="connectionID">1006</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">formatCard:</string>
+						<reference key="source" ref="363971326"/>
+						<reference key="destination" ref="985208313"/>
+					</object>
+					<int key="connectionID">1007</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">moveBlock:</string>
+						<reference key="source" ref="363971326"/>
+						<reference key="destination" ref="38178535"/>
+					</object>
+					<int key="connectionID">1008</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">moveBlock:</string>
+						<reference key="source" ref="363971326"/>
+						<reference key="destination" ref="854313175"/>
+					</object>
+					<int key="connectionID">1009</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">newMemCard:</string>
+						<reference key="source" ref="363971326"/>
+						<reference key="destination" ref="816469593"/>
+					</object>
+					<int key="connectionID">1010</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">newMemCard:</string>
+						<reference key="source" ref="363971326"/>
+						<reference key="destination" ref="960369332"/>
+					</object>
+					<int key="connectionID">1011</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">changeMemCard:</string>
+						<reference key="source" ref="363971326"/>
+						<reference key="destination" ref="903286001"/>
+					</object>
+					<int key="connectionID">1012</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">deleteMemoryObject:</string>
+						<reference key="source" ref="363971326"/>
+						<reference key="destination" ref="73572364"/>
+					</object>
+					<int key="connectionID">1013</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">formatCard:</string>
+						<reference key="source" ref="363971326"/>
+						<reference key="destination" ref="682387256"/>
+					</object>
+					<int key="connectionID">1014</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">view</string>
+						<reference key="source" ref="1047165271"/>
+						<reference key="destination" ref="128798333"/>
+					</object>
+					<int key="connectionID">987</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">contentArray: self.memCard2Array.memoryArray</string>
+						<reference key="source" ref="94388034"/>
+						<reference key="destination" ref="363971326"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="94388034"/>
+							<reference key="NSDestination" ref="363971326"/>
+							<string key="NSLabel">contentArray: self.memCard2Array.memoryArray</string>
+							<string key="NSBinding">contentArray</string>
+							<string key="NSKeyPath">self.memCard2Array.memoryArray</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">1033</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">contentArray: self.memCard1Array.memoryArray</string>
+						<reference key="source" ref="104514835"/>
+						<reference key="destination" ref="363971326"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="104514835"/>
+							<reference key="NSDestination" ref="363971326"/>
+							<string key="NSLabel">contentArray: self.memCard1Array.memoryArray</string>
+							<string key="NSBinding">contentArray</string>
+							<string key="NSKeyPath">self.memCard1Array.memoryArray</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">1034</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">transparent: selected</string>
+						<reference key="source" ref="369120847"/>
+						<reference key="destination" ref="1047165271"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="369120847"/>
+							<reference key="NSDestination" ref="1047165271"/>
+							<string key="NSLabel">transparent: selected</string>
+							<string key="NSBinding">transparent</string>
+							<string key="NSKeyPath">selected</string>
+							<object class="NSDictionary" key="NSOptions">
+								<string key="NS.key.0">NSValueTransformerName</string>
+								<string key="NS.object.0">NSNegateBoolean</string>
+							</object>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">991</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: representedObject.memImage</string>
+						<reference key="source" ref="547270477"/>
+						<reference key="destination" ref="1047165271"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="547270477"/>
+							<reference key="NSDestination" ref="1047165271"/>
+							<string key="NSLabel">value: representedObject.memImage</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">representedObject.memImage</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">1057</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: representedObject.attributedFlagName</string>
+						<reference key="source" ref="462204898"/>
+						<reference key="destination" ref="1047165271"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="462204898"/>
+							<reference key="NSDestination" ref="1047165271"/>
+							<string key="NSLabel">value: representedObject.attributedFlagName</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">representedObject.attributedFlagName</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">1018</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: representedObject.sjisName</string>
+						<reference key="source" ref="938529027"/>
+						<reference key="destination" ref="1047165271"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="938529027"/>
+							<reference key="NSDestination" ref="1047165271"/>
+							<string key="NSLabel">value: representedObject.sjisName</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">representedObject.sjisName</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">990</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: representedObject.englishName</string>
+						<reference key="source" ref="979844614"/>
+						<reference key="destination" ref="1047165271"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="979844614"/>
+							<reference key="NSDestination" ref="1047165271"/>
+							<string key="NSLabel">value: representedObject.englishName</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">representedObject.englishName</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">989</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">hidden: representedObject.isBiggerThanOne</string>
+						<reference key="source" ref="534715842"/>
+						<reference key="destination" ref="1047165271"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="534715842"/>
+							<reference key="NSDestination" ref="1047165271"/>
+							<string key="NSLabel">hidden: representedObject.isBiggerThanOne</string>
+							<string key="NSBinding">hidden</string>
+							<string key="NSKeyPath">representedObject.isBiggerThanOne</string>
+							<object class="NSDictionary" key="NSOptions">
+								<string key="NS.key.0">NSValueTransformerName</string>
+								<string key="NS.object.0">NSNegateBoolean</string>
+							</object>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">1044</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: representedObject.blockSize</string>
+						<reference key="source" ref="370252462"/>
+						<reference key="destination" ref="1047165271"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="370252462"/>
+							<reference key="NSDestination" ref="1047165271"/>
+							<string key="NSLabel">value: representedObject.blockSize</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">representedObject.blockSize</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">1052</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">hidden: representedObject.isBiggerThanOne</string>
+						<reference key="source" ref="370252462"/>
+						<reference key="destination" ref="1047165271"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="370252462"/>
+							<reference key="NSDestination" ref="1047165271"/>
+							<string key="NSLabel">hidden: representedObject.isBiggerThanOne</string>
+							<string key="NSBinding">hidden</string>
+							<string key="NSKeyPath">representedObject.isBiggerThanOne</string>
+							<object class="NSDictionary" key="NSOptions">
+								<string key="NS.key.0">NSValueTransformerName</string>
+								<string key="NS.object.0">NSNegateBoolean</string>
+							</object>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">1055</int>
+				</object>
+			</array>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<array key="orderedObjects">
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<array key="object" id="0"/>
+						<reference key="children" ref="157976658"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="974938689"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="713881283"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">First Responder</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">21</int>
+						<reference key="object" ref="379363543"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="644483536"/>
+						</array>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Window</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2</int>
+						<reference key="object" ref="644483536"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="145760790"/>
+						</array>
+						<reference key="parent" ref="379363543"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">238</int>
+						<reference key="object" ref="145760790"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="150404821"/>
+							<reference ref="869045919"/>
+							<reference ref="683723192"/>
+							<reference ref="185355004"/>
+						</array>
+						<reference key="parent" ref="644483536"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">240</int>
+						<reference key="object" ref="150404821"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="309207255"/>
+						</array>
+						<reference key="parent" ref="145760790"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">239</int>
+						<reference key="object" ref="309207255"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="324328678"/>
+							<reference ref="715888890"/>
+							<reference ref="776429699"/>
+						</array>
+						<reference key="parent" ref="150404821"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">502</int>
+						<reference key="object" ref="324328678"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="260387224"/>
+							<reference ref="197815183"/>
+						</array>
+						<reference key="parent" ref="309207255"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">509</int>
+						<reference key="object" ref="715888890"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="263292685"/>
+						</array>
+						<reference key="parent" ref="309207255"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">542</int>
+						<reference key="object" ref="776429699"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="874213588"/>
+						</array>
+						<reference key="parent" ref="309207255"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">241</int>
+						<reference key="object" ref="869045919"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="494923943"/>
+						</array>
+						<reference key="parent" ref="145760790"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">242</int>
+						<reference key="object" ref="494923943"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="30192545"/>
+						</array>
+						<reference key="parent" ref="869045919"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">254</int>
+						<reference key="object" ref="30192545"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="711664786"/>
+							<reference ref="490231628"/>
+							<reference ref="695086223"/>
+							<reference ref="23337545"/>
+							<reference ref="950422833"/>
+							<reference ref="721006038"/>
+						</array>
+						<reference key="parent" ref="494923943"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">579</int>
+						<reference key="object" ref="683723192"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="782866499"/>
+						</array>
+						<reference key="parent" ref="145760790"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">580</int>
+						<reference key="object" ref="782866499"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="38178535"/>
+							<reference ref="854313175"/>
+							<reference ref="463534292"/>
+							<reference ref="137614947"/>
+							<reference ref="682387256"/>
+							<reference ref="985208313"/>
+							<reference ref="397679595"/>
+							<reference ref="73572364"/>
+							<reference ref="960369332"/>
+							<reference ref="91368854"/>
+							<reference ref="364230398"/>
+							<reference ref="816469593"/>
+							<reference ref="903286001"/>
+							<reference ref="805254006"/>
+						</array>
+						<reference key="parent" ref="683723192"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">384</int>
+						<reference key="object" ref="622912057"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">GraphicsController</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">388</int>
+						<reference key="object" ref="113293330"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">SoundController</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">392</int>
+						<reference key="object" ref="869594171"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">PadController</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">397</int>
+						<reference key="object" ref="778989052"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">CdromController</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-3</int>
+						<reference key="object" ref="423003959"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Application</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">505</int>
+						<reference key="object" ref="260387224"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="629475661"/>
+							<reference ref="41079268"/>
+							<reference ref="323048264"/>
+							<reference ref="878205730"/>
+							<reference ref="1001969866"/>
+							<reference ref="322742106"/>
+							<reference ref="874223654"/>
+							<reference ref="772916223"/>
+							<reference ref="85343827"/>
+						</array>
+						<reference key="parent" ref="324328678"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">617</int>
+						<reference key="object" ref="629475661"/>
+						<reference key="parent" ref="260387224"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">519</int>
+						<reference key="object" ref="41079268"/>
+						<reference key="parent" ref="260387224"/>
+						<string key="objectName">No XA audio</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">518</int>
+						<reference key="object" ref="323048264"/>
+						<reference key="parent" ref="260387224"/>
+						<string key="objectName">Simulate BIOS</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">517</int>
+						<reference key="object" ref="878205730"/>
+						<reference key="parent" ref="260387224"/>
+						<string key="objectName">No CD audio</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">516</int>
+						<reference key="object" ref="1001969866"/>
+						<reference key="parent" ref="260387224"/>
+						<string key="objectName">Dynarec Core</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">560</int>
+						<reference key="object" ref="197815183"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="27092767"/>
+						</array>
+						<reference key="parent" ref="324328678"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">598</int>
+						<reference key="object" ref="27092767"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="780475521"/>
+						</array>
+						<reference key="parent" ref="197815183"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">561</int>
+						<reference key="object" ref="780475521"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="305309789"/>
+							<reference ref="810398986"/>
+							<reference ref="791751653"/>
+							<reference ref="173586156"/>
+							<reference ref="847210295"/>
+						</array>
+						<reference key="parent" ref="27092767"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">562</int>
+						<reference key="object" ref="305309789"/>
+						<reference key="parent" ref="780475521"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">563</int>
+						<reference key="object" ref="810398986"/>
+						<reference key="parent" ref="780475521"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">564</int>
+						<reference key="object" ref="791751653"/>
+						<reference key="parent" ref="780475521"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">565</int>
+						<reference key="object" ref="173586156"/>
+						<reference key="parent" ref="780475521"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">566</int>
+						<reference key="object" ref="847210295"/>
+						<reference key="parent" ref="780475521"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">512</int>
+						<reference key="object" ref="263292685"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1070705223"/>
+							<reference ref="736164492"/>
+							<reference ref="45210481"/>
+						</array>
+						<reference key="parent" ref="715888890"/>
+						<string key="objectName">Game Fixes</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">618</int>
+						<reference key="object" ref="1070705223"/>
+						<reference key="parent" ref="263292685"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">540</int>
+						<reference key="object" ref="736164492"/>
+						<reference key="parent" ref="263292685"/>
+						<string key="objectName">Parasite Eve 2</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">539</int>
+						<reference key="object" ref="45210481"/>
+						<reference key="parent" ref="263292685"/>
+						<string key="objectName">InuYasha</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">544</int>
+						<reference key="object" ref="874213588"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="2811783"/>
+							<reference ref="544319498"/>
+							<reference ref="746537141"/>
+						</array>
+						<reference key="parent" ref="776429699"/>
+						<string key="objectName">Hacks</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">619</int>
+						<reference key="object" ref="2811783"/>
+						<reference key="parent" ref="874213588"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">545</int>
+						<reference key="object" ref="544319498"/>
+						<reference key="parent" ref="874213588"/>
+						<string key="objectName">SIO IRQ</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">543</int>
+						<reference key="object" ref="746537141"/>
+						<reference key="parent" ref="874213588"/>
+						<string key="objectName">SPU IRQ</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">620</int>
+						<reference key="object" ref="248585311"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Net Plugin</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">640</int>
+						<reference key="object" ref="322742106"/>
+						<reference key="parent" ref="260387224"/>
+						<string key="objectName">NetPlay</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">652</int>
+						<reference key="object" ref="874223654"/>
+						<reference key="parent" ref="260387224"/>
+						<string key="objectName">Widescreen</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">655</int>
+						<reference key="object" ref="185355004"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="958294119"/>
+						</array>
+						<reference key="parent" ref="145760790"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">656</int>
+						<reference key="object" ref="958294119"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="32956648"/>
+							<reference ref="195305356"/>
+							<reference ref="911328747"/>
+							<reference ref="168188758"/>
+							<reference ref="823878691"/>
+							<reference ref="795957481"/>
+							<reference ref="341191480"/>
+							<reference ref="659547625"/>
+							<reference ref="364881091"/>
+							<reference ref="246038820"/>
+							<reference ref="1072290452"/>
+							<reference ref="860331374"/>
+							<reference ref="205239960"/>
+							<reference ref="267389414"/>
+							<reference ref="465452774"/>
+						</array>
+						<reference key="parent" ref="185355004"/>
+						<string key="objectName">Hotkey View</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">769</int>
+						<reference key="object" ref="195305356"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="542220430"/>
+						</array>
+						<reference key="parent" ref="958294119"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">770</int>
+						<reference key="object" ref="542220430"/>
+						<reference key="parent" ref="195305356"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">771</int>
+						<reference key="object" ref="911328747"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="665963726"/>
+						</array>
+						<reference key="parent" ref="958294119"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">772</int>
+						<reference key="object" ref="665963726"/>
+						<reference key="parent" ref="911328747"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">850</int>
+						<reference key="object" ref="795957481"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="305408243"/>
+						</array>
+						<reference key="parent" ref="958294119"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">851</int>
+						<reference key="object" ref="341191480"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="470562697"/>
+						</array>
+						<reference key="parent" ref="958294119"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">852</int>
+						<reference key="object" ref="470562697"/>
+						<reference key="parent" ref="341191480"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">853</int>
+						<reference key="object" ref="305408243"/>
+						<reference key="parent" ref="795957481"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">855</int>
+						<reference key="object" ref="659547625"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="968300061"/>
+						</array>
+						<reference key="parent" ref="958294119"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">856</int>
+						<reference key="object" ref="968300061"/>
+						<reference key="parent" ref="659547625"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">861</int>
+						<reference key="object" ref="246038820"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="10554974"/>
+						</array>
+						<reference key="parent" ref="958294119"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">862</int>
+						<reference key="object" ref="10554974"/>
+						<reference key="parent" ref="246038820"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">867</int>
+						<reference key="object" ref="860331374"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="744386199"/>
+						</array>
+						<reference key="parent" ref="958294119"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">868</int>
+						<reference key="object" ref="744386199"/>
+						<reference key="parent" ref="860331374"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">870</int>
+						<reference key="object" ref="364881091"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="629053056"/>
+						</array>
+						<reference key="parent" ref="958294119"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">871</int>
+						<reference key="object" ref="629053056"/>
+						<reference key="parent" ref="364881091"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">872</int>
+						<reference key="object" ref="1072290452"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="720605472"/>
+						</array>
+						<reference key="parent" ref="958294119"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">873</int>
+						<reference key="object" ref="720605472"/>
+						<reference key="parent" ref="1072290452"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">874</int>
+						<reference key="object" ref="205239960"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="725698940"/>
+						</array>
+						<reference key="parent" ref="958294119"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">875</int>
+						<reference key="object" ref="725698940"/>
+						<reference key="parent" ref="205239960"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">884</int>
+						<reference key="object" ref="32956648"/>
+						<reference key="parent" ref="958294119"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">885</int>
+						<reference key="object" ref="267389414"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="27919550"/>
+						</array>
+						<reference key="parent" ref="958294119"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">886</int>
+						<reference key="object" ref="27919550"/>
+						<reference key="parent" ref="267389414"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">887</int>
+						<reference key="object" ref="465452774"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="465026198"/>
+						</array>
+						<reference key="parent" ref="958294119"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">888</int>
+						<reference key="object" ref="465026198"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1009410357"/>
+						</array>
+						<reference key="parent" ref="465452774"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">889</int>
+						<reference key="object" ref="1009410357"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="336696263"/>
+							<reference ref="724874125"/>
+							<reference ref="949142848"/>
+							<reference ref="1066195432"/>
+						</array>
+						<reference key="parent" ref="465026198"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">890</int>
+						<reference key="object" ref="336696263"/>
+						<reference key="parent" ref="1009410357"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">891</int>
+						<reference key="object" ref="724874125"/>
+						<reference key="parent" ref="1009410357"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">892</int>
+						<reference key="object" ref="949142848"/>
+						<reference key="parent" ref="1009410357"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">893</int>
+						<reference key="object" ref="1066195432"/>
+						<reference key="parent" ref="1009410357"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">896</int>
+						<reference key="object" ref="168188758"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="548509436"/>
+						</array>
+						<reference key="parent" ref="958294119"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">897</int>
+						<reference key="object" ref="823878691"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="266713574"/>
+						</array>
+						<reference key="parent" ref="958294119"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">898</int>
+						<reference key="object" ref="266713574"/>
+						<reference key="parent" ref="823878691"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">899</int>
+						<reference key="object" ref="548509436"/>
+						<reference key="parent" ref="168188758"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">914</int>
+						<reference key="object" ref="251882331"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Sio1 Plugin</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">922</int>
+						<reference key="object" ref="38178535"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="380110803"/>
+						</array>
+						<reference key="parent" ref="782866499"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">923</int>
+						<reference key="object" ref="854313175"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="366352918"/>
+						</array>
+						<reference key="parent" ref="782866499"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">924</int>
+						<reference key="object" ref="463534292"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="913433103"/>
+							<reference ref="677138134"/>
+							<reference ref="628077157"/>
+						</array>
+						<reference key="parent" ref="782866499"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">925</int>
+						<reference key="object" ref="137614947"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="855568378"/>
+							<reference ref="24365741"/>
+							<reference ref="617745638"/>
+						</array>
+						<reference key="parent" ref="782866499"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">926</int>
+						<reference key="object" ref="682387256"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="528944351"/>
+						</array>
+						<reference key="parent" ref="782866499"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">927</int>
+						<reference key="object" ref="985208313"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="434465099"/>
+						</array>
+						<reference key="parent" ref="782866499"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">928</int>
+						<reference key="object" ref="397679595"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="37322934"/>
+						</array>
+						<reference key="parent" ref="782866499"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">929</int>
+						<reference key="object" ref="73572364"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="695425235"/>
+						</array>
+						<reference key="parent" ref="782866499"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">930</int>
+						<reference key="object" ref="960369332"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="434622955"/>
+						</array>
+						<reference key="parent" ref="782866499"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">931</int>
+						<reference key="object" ref="91368854"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="891635109"/>
+						</array>
+						<reference key="parent" ref="782866499"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">932</int>
+						<reference key="object" ref="364230398"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="733600772"/>
+						</array>
+						<reference key="parent" ref="782866499"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">933</int>
+						<reference key="object" ref="816469593"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="898156247"/>
+						</array>
+						<reference key="parent" ref="782866499"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">934</int>
+						<reference key="object" ref="903286001"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="599744224"/>
+						</array>
+						<reference key="parent" ref="782866499"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">935</int>
+						<reference key="object" ref="805254006"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="573290052"/>
+						</array>
+						<reference key="parent" ref="782866499"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">936</int>
+						<reference key="object" ref="573290052"/>
+						<reference key="parent" ref="805254006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">937</int>
+						<reference key="object" ref="599744224"/>
+						<reference key="parent" ref="903286001"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">938</int>
+						<reference key="object" ref="898156247"/>
+						<reference key="parent" ref="816469593"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">939</int>
+						<reference key="object" ref="733600772"/>
+						<reference key="parent" ref="364230398"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">940</int>
+						<reference key="object" ref="891635109"/>
+						<reference key="parent" ref="91368854"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">941</int>
+						<reference key="object" ref="434622955"/>
+						<reference key="parent" ref="960369332"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">942</int>
+						<reference key="object" ref="695425235"/>
+						<reference key="parent" ref="73572364"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">943</int>
+						<reference key="object" ref="37322934"/>
+						<reference key="parent" ref="397679595"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">944</int>
+						<reference key="object" ref="434465099"/>
+						<reference key="parent" ref="985208313"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">945</int>
+						<reference key="object" ref="528944351"/>
+						<reference key="parent" ref="682387256"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">946</int>
+						<reference key="object" ref="855568378"/>
+						<reference key="parent" ref="137614947"/>
+						<string key="objectName">Memory Card 1 view</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">947</int>
+						<reference key="object" ref="24365741"/>
+						<reference key="parent" ref="137614947"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">948</int>
+						<reference key="object" ref="617745638"/>
+						<reference key="parent" ref="137614947"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">949</int>
+						<reference key="object" ref="913433103"/>
+						<reference key="parent" ref="463534292"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">950</int>
+						<reference key="object" ref="677138134"/>
+						<reference key="parent" ref="463534292"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">951</int>
+						<reference key="object" ref="628077157"/>
+						<reference key="parent" ref="463534292"/>
+						<string key="objectName">Memory Card 2 view</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">952</int>
+						<reference key="object" ref="366352918"/>
+						<reference key="parent" ref="854313175"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">954</int>
+						<reference key="object" ref="380110803"/>
+						<reference key="parent" ref="38178535"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">955</int>
+						<reference key="object" ref="363971326"/>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">957</int>
+						<reference key="object" ref="128798333"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="369120847"/>
+						</array>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">MemCardObjectView</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">958</int>
+						<reference key="object" ref="1047165271"/>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">959</int>
+						<reference key="object" ref="94388034"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">MemCard2</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">960</int>
+						<reference key="object" ref="104514835"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">MemCard1</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">965</int>
+						<reference key="object" ref="369120847"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="547270477"/>
+							<reference ref="534715842"/>
+							<reference ref="979844614"/>
+							<reference ref="938529027"/>
+							<reference ref="462204898"/>
+						</array>
+						<reference key="parent" ref="128798333"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">976</int>
+						<reference key="object" ref="547270477"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="544613766"/>
+						</array>
+						<reference key="parent" ref="369120847"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">977</int>
+						<reference key="object" ref="462204898"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="809754268"/>
+						</array>
+						<reference key="parent" ref="369120847"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">978</int>
+						<reference key="object" ref="938529027"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="384948753"/>
+						</array>
+						<reference key="parent" ref="369120847"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">979</int>
+						<reference key="object" ref="979844614"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="6532882"/>
+						</array>
+						<reference key="parent" ref="369120847"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">981</int>
+						<reference key="object" ref="6532882"/>
+						<reference key="parent" ref="979844614"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">982</int>
+						<reference key="object" ref="384948753"/>
+						<reference key="parent" ref="938529027"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">983</int>
+						<reference key="object" ref="809754268"/>
+						<reference key="parent" ref="462204898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">986</int>
+						<reference key="object" ref="544613766"/>
+						<reference key="parent" ref="547270477"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1021</int>
+						<reference key="object" ref="534715842"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="370252462"/>
+						</array>
+						<reference key="parent" ref="369120847"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1047</int>
+						<reference key="object" ref="370252462"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="502243962"/>
+						</array>
+						<reference key="parent" ref="534715842"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1048</int>
+						<reference key="object" ref="502243962"/>
+						<reference key="parent" ref="370252462"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">902</int>
+						<reference key="object" ref="721006038"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="155594978"/>
+							<reference ref="524369892"/>
+							<reference ref="341120868"/>
+						</array>
+						<reference key="parent" ref="30192545"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">905</int>
+						<reference key="object" ref="341120868"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="777720704"/>
+						</array>
+						<reference key="parent" ref="721006038"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">906</int>
+						<reference key="object" ref="777720704"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="771695632"/>
+						</array>
+						<reference key="parent" ref="341120868"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">907</int>
+						<reference key="object" ref="771695632"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="245690467"/>
+						</array>
+						<reference key="parent" ref="777720704"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">908</int>
+						<reference key="object" ref="245690467"/>
+						<reference key="parent" ref="771695632"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">904</int>
+						<reference key="object" ref="524369892"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="774833876"/>
+						</array>
+						<reference key="parent" ref="721006038"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">909</int>
+						<reference key="object" ref="774833876"/>
+						<reference key="parent" ref="524369892"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">903</int>
+						<reference key="object" ref="155594978"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="905819877"/>
+						</array>
+						<reference key="parent" ref="721006038"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">910</int>
+						<reference key="object" ref="905819877"/>
+						<reference key="parent" ref="155594978"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">622</int>
+						<reference key="object" ref="950422833"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="99318986"/>
+							<reference ref="181214375"/>
+							<reference ref="986737125"/>
+						</array>
+						<reference key="parent" ref="30192545"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">625</int>
+						<reference key="object" ref="986737125"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="933521081"/>
+						</array>
+						<reference key="parent" ref="950422833"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">626</int>
+						<reference key="object" ref="933521081"/>
+						<reference key="parent" ref="986737125"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">624</int>
+						<reference key="object" ref="181214375"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="773749244"/>
+						</array>
+						<reference key="parent" ref="950422833"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">627</int>
+						<reference key="object" ref="773749244"/>
+						<reference key="parent" ref="181214375"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">623</int>
+						<reference key="object" ref="99318986"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="52904758"/>
+						</array>
+						<reference key="parent" ref="950422833"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">628</int>
+						<reference key="object" ref="52904758"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="871032713"/>
+						</array>
+						<reference key="parent" ref="99318986"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">629</int>
+						<reference key="object" ref="871032713"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1055625937"/>
+						</array>
+						<reference key="parent" ref="52904758"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">630</int>
+						<reference key="object" ref="1055625937"/>
+						<reference key="parent" ref="871032713"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">302</int>
+						<reference key="object" ref="695086223"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="701329658"/>
+							<reference ref="495555989"/>
+							<reference ref="169562785"/>
+						</array>
+						<reference key="parent" ref="30192545"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">377</int>
+						<reference key="object" ref="169562785"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="525747534"/>
+						</array>
+						<reference key="parent" ref="695086223"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">610</int>
+						<reference key="object" ref="525747534"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="122509778"/>
+						</array>
+						<reference key="parent" ref="169562785"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">378</int>
+						<reference key="object" ref="122509778"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="611694877"/>
+						</array>
+						<reference key="parent" ref="525747534"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">379</int>
+						<reference key="object" ref="611694877"/>
+						<reference key="parent" ref="122509778"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">296</int>
+						<reference key="object" ref="495555989"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="268195893"/>
+						</array>
+						<reference key="parent" ref="695086223"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">608</int>
+						<reference key="object" ref="268195893"/>
+						<reference key="parent" ref="495555989"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">297</int>
+						<reference key="object" ref="701329658"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="350454119"/>
+						</array>
+						<reference key="parent" ref="695086223"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">609</int>
+						<reference key="object" ref="350454119"/>
+						<reference key="parent" ref="701329658"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">299</int>
+						<reference key="object" ref="490231628"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="255294672"/>
+							<reference ref="132376695"/>
+							<reference ref="1001529761"/>
+						</array>
+						<reference key="parent" ref="30192545"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">374</int>
+						<reference key="object" ref="1001529761"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="116982440"/>
+						</array>
+						<reference key="parent" ref="490231628"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">607</int>
+						<reference key="object" ref="116982440"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="518586357"/>
+						</array>
+						<reference key="parent" ref="1001529761"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">375</int>
+						<reference key="object" ref="518586357"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="807232970"/>
+						</array>
+						<reference key="parent" ref="116982440"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">376</int>
+						<reference key="object" ref="807232970"/>
+						<reference key="parent" ref="518586357"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">303</int>
+						<reference key="object" ref="132376695"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="154903563"/>
+						</array>
+						<reference key="parent" ref="490231628"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">606</int>
+						<reference key="object" ref="154903563"/>
+						<reference key="parent" ref="132376695"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">301</int>
+						<reference key="object" ref="255294672"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="554603770"/>
+						</array>
+						<reference key="parent" ref="490231628"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">605</int>
+						<reference key="object" ref="554603770"/>
+						<reference key="parent" ref="255294672"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">291</int>
+						<reference key="object" ref="23337545"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1060851478"/>
+							<reference ref="921855531"/>
+							<reference ref="184922838"/>
+						</array>
+						<reference key="parent" ref="30192545"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">371</int>
+						<reference key="object" ref="184922838"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="721717191"/>
+						</array>
+						<reference key="parent" ref="23337545"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">604</int>
+						<reference key="object" ref="721717191"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="628587229"/>
+						</array>
+						<reference key="parent" ref="184922838"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">372</int>
+						<reference key="object" ref="628587229"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="184321912"/>
+						</array>
+						<reference key="parent" ref="721717191"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">373</int>
+						<reference key="object" ref="184321912"/>
+						<reference key="parent" ref="628587229"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">290</int>
+						<reference key="object" ref="921855531"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="449658334"/>
+						</array>
+						<reference key="parent" ref="23337545"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">602</int>
+						<reference key="object" ref="449658334"/>
+						<reference key="parent" ref="921855531"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">292</int>
+						<reference key="object" ref="1060851478"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="175241227"/>
+						</array>
+						<reference key="parent" ref="23337545"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">603</int>
+						<reference key="object" ref="175241227"/>
+						<reference key="parent" ref="1060851478"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">257</int>
+						<reference key="object" ref="711664786"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="659624019"/>
+							<reference ref="857424577"/>
+							<reference ref="983879338"/>
+						</array>
+						<reference key="parent" ref="30192545"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">368</int>
+						<reference key="object" ref="983879338"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="170522740"/>
+						</array>
+						<reference key="parent" ref="711664786"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">601</int>
+						<reference key="object" ref="170522740"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="285116131"/>
+						</array>
+						<reference key="parent" ref="983879338"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">369</int>
+						<reference key="object" ref="285116131"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="283125048"/>
+						</array>
+						<reference key="parent" ref="170522740"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">370</int>
+						<reference key="object" ref="283125048"/>
+						<reference key="parent" ref="285116131"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">260</int>
+						<reference key="object" ref="857424577"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="299254513"/>
+						</array>
+						<reference key="parent" ref="711664786"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">599</int>
+						<reference key="object" ref="299254513"/>
+						<reference key="parent" ref="857424577"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">262</int>
+						<reference key="object" ref="659624019"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1054541347"/>
+						</array>
+						<reference key="parent" ref="711664786"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">600</int>
+						<reference key="object" ref="1054541347"/>
+						<reference key="parent" ref="659624019"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1278</int>
+						<reference key="object" ref="772916223"/>
+						<reference key="parent" ref="260387224"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1279</int>
+						<reference key="object" ref="85343827"/>
+						<reference key="parent" ref="260387224"/>
+					</object>
+				</array>
+			</object>
+			<dictionary class="NSMutableDictionary" key="flattenedProperties">
+				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1021.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1047.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1048.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1278.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1279.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="21.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="238.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">InitialTabViewItem</string>
+					<object class="IBInitialTabViewItemAttribute" key="NS.object.0">
+						<string key="name">InitialTabViewItem</string>
+						<reference key="object" ref="145760790"/>
+						<reference key="initialTabViewItem" ref="150404821"/>
+					</object>
+				</object>
+				<string key="238.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="239.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="240.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="241.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="242.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="254.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="257.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="260.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="262.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="290.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="291.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="292.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="296.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="297.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="299.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="301.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="302.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="303.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="368.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="369.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="370.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="371.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="372.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="373.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="374.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="375.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="376.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="377.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="378.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="379.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="384.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="388.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="392.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="397.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="502.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="505.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="509.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="512.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="516.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="1001969866"/>
+						<string key="toolTip">When enabled the emulation will be faster, but possibly more unstable</string>
+					</object>
+				</object>
+				<string key="516.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="517.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="878205730"/>
+						<string key="toolTip">Disables decoding of CD audio tracks</string>
+					</object>
+				</object>
+				<string key="517.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="518.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="323048264"/>
+						<string key="toolTip">Enables the emulator to run without using an actual Playstation BIOS file. The compatibility might also decrease</string>
+					</object>
+				</object>
+				<string key="518.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="519.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="41079268"/>
+						<string key="toolTip">Disables decoding of streamed XA audio</string>
+					</object>
+				</object>
+				<string key="519.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="539.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="540.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="542.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="543.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="746537141"/>
+						<string key="toolTip">This should generally be disabled, though it might help to enable it if you are having sound problems</string>
+					</object>
+				</object>
+				<string key="543.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="544.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="545.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="544319498"/>
+						<string key="toolTip">This should generally be disabled, though it might help to enable it if you are having controller problems</string>
+					</object>
+				</object>
+				<string key="545.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="560.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="561.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="562.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="563.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="564.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="565.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="566.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="579.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="580.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="598.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="599.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="600.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="601.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="602.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="603.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="604.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="605.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="606.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="607.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="608.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="609.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="610.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="617.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="618.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="619.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="620.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="622.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="623.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="624.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="625.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="626.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="627.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="628.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="629.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="630.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="640.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="652.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="655.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="656.CustomClassName">HotkeyController</string>
+				<string key="656.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="769.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="769.userInterfaceItemIdentifier">FastForward</string>
+				<string key="770.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="771.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="772.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="850.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="850.userInterfaceItemIdentifier">SaveState</string>
+				<string key="851.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="852.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="853.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="855.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="855.userInterfaceItemIdentifier">LoadState</string>
+				<string key="856.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="861.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="861.userInterfaceItemIdentifier">NextState</string>
+				<string key="862.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="867.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="867.userInterfaceItemIdentifier">PrevState</string>
+				<string key="868.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="870.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="871.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="872.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="873.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="874.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="875.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="884.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<dictionary class="NSMutableDictionary" key="885.IBAttributePlaceholdersKey"/>
+				<string key="885.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="886.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="887.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="465452774"/>
+						<string key="toolTip">Any key pressed at the same time as the GPU Key Modifier will be sent directly to the GPU Plugin. This is useful for plugins with menus. Control (ctrl) is the recommended modifier; command (cmd or apple key) should not be used unless you absolutely want to.</string>
+					</object>
+				</object>
+				<string key="887.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="888.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="889.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="890.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="891.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="892.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="893.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="896.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="896.userInterfaceItemIdentifier">FrameLimit</string>
+				<string key="897.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="898.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="899.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="902.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="903.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="904.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="905.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="906.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="907.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="908.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="909.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="910.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="914.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="922.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="923.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="924.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="925.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="926.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="927.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="928.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="929.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="930.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="931.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="932.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="933.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="934.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="935.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="936.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="937.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="938.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="939.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="940.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="941.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="942.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="943.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="944.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="945.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="946.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="947.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="948.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="949.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="950.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="951.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="952.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="954.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="955.CustomClassName">PcsxrMemCardController</string>
+				<string key="955.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="957.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="958.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="959.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="960.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="965.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="976.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<real value="0.0" key="976.IBViewIntegration.shadowBlurRadius"/>
+				<reference key="976.IBViewIntegration.shadowColor" ref="1050813769"/>
+				<real value="0.0" key="976.IBViewIntegration.shadowOffsetHeight"/>
+				<real value="0.0" key="976.IBViewIntegration.shadowOffsetWidth"/>
+				<string key="977.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="978.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="979.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="981.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="982.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="983.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="986.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			</dictionary>
+			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+			<nil key="activeLocalization"/>
+			<dictionary class="NSMutableDictionary" key="localizations"/>
+			<nil key="sourceID"/>
+			<int key="maxID">1283</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">ConfigurationController</string>
+					<string key="superclassName">NSWindowController</string>
+					<dictionary class="NSMutableDictionary" key="actions">
+						<string key="setCheckbox:">id</string>
+						<string key="setCheckboxInverse:">id</string>
+						<string key="setVideoType:">id</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="actionInfosByName">
+						<object class="IBActionInfo" key="setCheckbox:">
+							<string key="name">setCheckbox:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="setCheckboxInverse:">
+							<string key="name">setCheckboxInverse:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="setVideoType:">
+							<string key="name">setVideoType:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="autoVTypeCell">id</string>
+						<string key="bwMdecCell">id</string>
+						<string key="cdromPlugin">PluginController</string>
+						<string key="consoleOutputCell">id</string>
+						<string key="enableNetPlayCell">id</string>
+						<string key="graphicsPlugin">PluginController</string>
+						<string key="hkController">HotkeyController</string>
+						<string key="hkTab">NSTabViewItem</string>
+						<string key="memCardEdit">PcsxrMemCardController</string>
+						<string key="netPlugin">PluginController</string>
+						<string key="noCDAudioCell">id</string>
+						<string key="noFastBootCell">id</string>
+						<string key="noXaAudioCell">id</string>
+						<string key="padPlugin">PluginController</string>
+						<string key="rCountFixCell">id</string>
+						<string key="sio1Plugin">PluginController</string>
+						<string key="sioIrqAlwaysCell">id</string>
+						<string key="soundPlugin">PluginController</string>
+						<string key="spuIrqAlwaysCell">id</string>
+						<string key="usesDynarecCell">id</string>
+						<string key="usesHleCell">id</string>
+						<string key="vSyncWAFixCell">id</string>
+						<string key="vTypePALCell">id</string>
+						<string key="widescreen">id</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="autoVTypeCell">
+							<string key="name">autoVTypeCell</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="bwMdecCell">
+							<string key="name">bwMdecCell</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="cdromPlugin">
+							<string key="name">cdromPlugin</string>
+							<string key="candidateClassName">PluginController</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="consoleOutputCell">
+							<string key="name">consoleOutputCell</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="enableNetPlayCell">
+							<string key="name">enableNetPlayCell</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="graphicsPlugin">
+							<string key="name">graphicsPlugin</string>
+							<string key="candidateClassName">PluginController</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="hkController">
+							<string key="name">hkController</string>
+							<string key="candidateClassName">HotkeyController</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="hkTab">
+							<string key="name">hkTab</string>
+							<string key="candidateClassName">NSTabViewItem</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="memCardEdit">
+							<string key="name">memCardEdit</string>
+							<string key="candidateClassName">PcsxrMemCardController</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="netPlugin">
+							<string key="name">netPlugin</string>
+							<string key="candidateClassName">PluginController</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="noCDAudioCell">
+							<string key="name">noCDAudioCell</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="noFastBootCell">
+							<string key="name">noFastBootCell</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="noXaAudioCell">
+							<string key="name">noXaAudioCell</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="padPlugin">
+							<string key="name">padPlugin</string>
+							<string key="candidateClassName">PluginController</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="rCountFixCell">
+							<string key="name">rCountFixCell</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="sio1Plugin">
+							<string key="name">sio1Plugin</string>
+							<string key="candidateClassName">PluginController</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="sioIrqAlwaysCell">
+							<string key="name">sioIrqAlwaysCell</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="soundPlugin">
+							<string key="name">soundPlugin</string>
+							<string key="candidateClassName">PluginController</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="spuIrqAlwaysCell">
+							<string key="name">spuIrqAlwaysCell</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="usesDynarecCell">
+							<string key="name">usesDynarecCell</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="usesHleCell">
+							<string key="name">usesHleCell</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="vSyncWAFixCell">
+							<string key="name">vSyncWAFixCell</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="vTypePALCell">
+							<string key="name">vTypePALCell</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="widescreen">
+							<string key="name">widescreen</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/ConfigurationController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">HotkeyController</string>
+					<string key="superclassName">NSView</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">hotkeySet:</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">hotkeySet:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">hotkeySet:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="FastForward">NSTextField</string>
+						<string key="FrameLimit">NSTextField</string>
+						<string key="LoadState">NSTextField</string>
+						<string key="NextState">NSTextField</string>
+						<string key="PrevState">NSTextField</string>
+						<string key="SaveState">NSTextField</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="FastForward">
+							<string key="name">FastForward</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="FrameLimit">
+							<string key="name">FrameLimit</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="LoadState">
+							<string key="name">LoadState</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="NextState">
+							<string key="name">NextState</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="PrevState">
+							<string key="name">PrevState</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="SaveState">
+							<string key="name">SaveState</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/HotkeyController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">MemBadgeView</string>
+					<string key="superclassName">NSView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/MemBadgeView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">PcsxrMemCardController</string>
+					<string key="superclassName">NSViewController</string>
+					<dictionary class="NSMutableDictionary" key="actions">
+						<string key="changeMemCard:">id</string>
+						<string key="deleteMemoryObject:">id</string>
+						<string key="formatCard:">id</string>
+						<string key="moveBlock:">id</string>
+						<string key="newMemCard:">id</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="actionInfosByName">
+						<object class="IBActionInfo" key="changeMemCard:">
+							<string key="name">changeMemCard:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="deleteMemoryObject:">
+							<string key="name">deleteMemoryObject:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="formatCard:">
+							<string key="name">formatCard:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="moveBlock:">
+							<string key="name">moveBlock:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="newMemCard:">
+							<string key="name">newMemCard:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="memCard1Label">NSTextField</string>
+						<string key="memCard1view">NSCollectionView</string>
+						<string key="memCard2Label">NSTextField</string>
+						<string key="memCard2view">NSCollectionView</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="memCard1Label">
+							<string key="name">memCard1Label</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="memCard1view">
+							<string key="name">memCard1view</string>
+							<string key="candidateClassName">NSCollectionView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="memCard2Label">
+							<string key="name">memCard2Label</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="memCard2view">
+							<string key="name">memCard2view</string>
+							<string key="candidateClassName">NSCollectionView</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/PcsxrMemCardController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">PluginController</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/PluginController.h</string>
+					</object>
+				</object>
+			</array>
+		</object>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<real value="1070" key="NS.object.0"/>
+		</object>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<string key="NSAdvanced">{32, 32}</string>
+			<string key="NSMenuCheckmark">{11, 11}</string>
+			<string key="NSMenuMixedState">{10, 3}</string>
+			<string key="NSSwitch">{15, 15}</string>
+		</dictionary>
+	</data>
+</archive>

pcsxr-1.9.92.tar.bz2/macosx/English.lproj/Credits.rtf -> pcsxr-1.9.93.tar.bz2/macosx/English.lproj/Credits.rtf Changed

@@ -1,28 +1,31 @@
-{\rtf1\mac\ansicpg10000\cocoartf102
-{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;}
+{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf510
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+\vieww10800\viewh8400\viewkind0
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
 \f0\b\fs24 \cf0 Macintosh Port:
-\f1\b0 \
+\b0 \
 	Gil Pedersen\
+	Madd the Sane\
+	Nicolas P\'e9pin-Perreault\
 \
 
-\f0\b Icon Design:
-\f1\b0 \
+\b Icon Design:
+\b0 \
 	Romain Lafourcade\
 \
 
-\f0\b Original Coders:
-\f1\b0 \
+\b Original Coders:
+\b0 \
 	Linuzappz\
-         Shadow\
-         Pete Bernert\
-         NoComp\
-         Nik3d\
+	Shadow\
+	Pete Bernert\
+	NoComp\
+	Nik3d\
 \
 
-\f0\b Macintosh Testing:
-\f1\b0 \
+\b Macintosh Testing:
+\b0 \
 	Richard Banister\
 	Many others}
\ No newline at end of file

pcsxr-1.9.92.tar.bz2/macosx/English.lproj/InfoPlist.strings -> pcsxr-1.9.93.tar.bz2/macosx/English.lproj/InfoPlist.strings Changed

pcsxr-1.9.93.tar.bz2/macosx/English.lproj/KeyNames.plist Added

@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>12</key>
+	<string>Q</string>
+	<key>13</key>
+	<string>W</string>
+	<key>14</key>
+	<string>E</string>
+	<key>15</key>
+	<string>R</string>
+	<key>17</key>
+	<string>T</string>
+	<key>16</key>
+	<string>Y</string>
+	<key>32</key>
+	<string>U</string>
+	<key>34</key>
+	<string>I</string>
+	<key>31</key>
+	<string>O</string>
+	<key>35</key>
+	<string>P</string>
+	<key>0</key>
+	<string>A</string>
+	<key>1</key>
+	<string>S</string>
+	<key>2</key>
+	<string>D</string>
+	<key>3</key>
+	<string>F</string>
+	<key>5</key>
+	<string>G</string>
+	<key>4</key>
+	<string>H</string>
+	<key>38</key>
+	<string>J</string>
+	<key>40</key>
+	<string>K</string>
+	<key>37</key>
+	<string>L</string>
+	<key>6</key>
+	<string>Z</string>
+	<key>7</key>
+	<string>X</string>
+	<key>8</key>
+	<string>C</string>
+	<key>9</key>
+	<string>V</string>
+	<key>11</key>
+	<string>B</string>
+	<key>45</key>
+	<string>N</string>
+	<key>46</key>
+	<string>M</string>
+	<key>18</key>
+	<string>1</string>
+	<key>19</key>
+	<string>2</string>
+	<key>20</key>
+	<string>3</string>
+	<key>21</key>
+	<string>4</string>
+	<key>23</key>
+	<string>5</string>
+	<key>22</key>
+	<string>6</string>
+	<key>26</key>
+	<string>7</string>
+	<key>28</key>
+	<string>8</string>
+	<key>25</key>
+	<string>9</string>
+	<key>29</key>
+	<string>0</string>
+	<key>122</key>
+	<string>F1</string>
+	<key>120</key>
+	<string>F2</string>
+	<key>99</key>
+	<string>F3</string>
+	<key>118</key>
+	<string>F4</string>
+	<key>96</key>
+	<string>F5</string>
+	<key>97</key>
+	<string>F6</string>
+	<key>98</key>
+	<string>F7</string>
+	<key>100</key>
+	<string>F8</string>
+	<key>101</key>
+	<string>F9</string>
+	<key>109</key>
+	<string>F10</string>
+	<key>103</key>
+	<string>F11</string>
+	<key>111</key>
+	<string>F12</string>
+	<key>105</key>
+	<string>F13</string>
+	<key>107</key>
+	<string>F14</string>
+	<key>113</key>
+	<string>F15</string>
+	<key>106</key>
+	<string>F16</string>
+	<key>64</key>
+	<string>F17</string>
+	<key>79</key>
+	<string>F18</string>
+	<key>80</key>
+	<string>F19</string>
+	<key>50</key>
+	<string>`</string>
+	<key>27</key>
+	<string>-</string>
+	<key>24</key>
+	<string>=</string>
+	<key>51</key>
+	<string>Delete (Backspace)</string>
+	<key>48</key>
+	<string>Tab</string>
+	<key>33</key>
+	<string>[</string>
+	<key>30</key>
+	<string>]</string>
+	<key>42</key>
+	<string>\</string>
+	<key>41</key>
+	<string>; (Semicolon)</string>
+	<key>39</key>
+	<string>&apos; (Quote)</string>
+	<key>36</key>
+	<string>Return</string>
+	<key>43</key>
+	<string>, (Comma)</string>
+	<key>47</key>
+	<string>. (Period)</string>
+	<key>44</key>
+	<string>/</string>
+	<key>49</key>
+	<string>Space</string>
+	<key>114</key>
+	<string>Insert</string>
+	<key>115</key>
+	<string>Home</string>
+	<key>119</key>
+	<string>End</string>
+	<key>116</key>
+	<string>Page Up</string>
+	<key>121</key>
+	<string>Page Down</string>
+	<key>117</key>
+	<string>Forward Delete</string>
+	<key>126</key>
+	<string>Up Arrow</string>
+	<key>125</key>
+	<string>Down Arrow</string>
+	<key>123</key>
+	<string>Left Arrow</string>
+	<key>124</key>
+	<string>Right Arrow</string>
+	<key>82</key>
+	<string>NumPad 0</string>
+	<key>83</key>
+	<string>NumPad 1</string>
+	<key>84</key>
+	<string>NumPad 2</string>
+	<key>85</key>
+	<string>NumPad 3</string>
+	<key>86</key>
+	<string>NumPad 4</string>
+	<key>87</key>
+	<string>NumPad 5</string>
+	<key>88</key>
+	<string>NumPad 6</string>
+	<key>89</key>
+	<string>NumPad 7</string>
+	<key>91</key>
+	<string>NumPad 8</string>
+	<key>92</key>
+	<string>NumPad 9</string>
+	<key>71</key>
+	<string>NumPad Clear</string>
+	<key>81</key>
+	<string>NumPad =</string>
+	<key>75</key>
+	<string>NumPad /</string>
+	<key>67</key>
+	<string>NumPad *</string>
+	<key>78</key>
+	<string>NumPad -</string>
+	<key>69</key>
+	<string>NumPad +</string>
+	<key>65</key>
+	<string>NumPad .</string>
+	<key>76</key>
+	<string>NumPad Enter</string>
+	<key>53</key>
+	<string>Escape</string>
+</dict>
+</plist>

pcsxr-1.9.93.tar.bz2/macosx/English.lproj/Localizable.strings Added

@@ -0,0 +1,84 @@
+/* 
+  Localizable.strings
+  Pcsx
+
+  Created by C.W. Betts on 4/23/11.
+  Copyright 2011 __MyCompanyName__. All rights reserved.
+*/
+
+"Plugin Initialization Failed!" = "Plugin Initialization Failed!";
+"Pcsxr failed to initialize the selected %@ plugin (error=%i).\nThe plugin might not work with your system." = "Pcsxr failed to initialize the selected %@ plugin (error=%i).\nThe plugin might not work with your system.";
+"Error!" = "Error!";
+"Installation Succesfull" = "Installation Succesfull";
+"Installation Failed!" = "Installation Failed!";
+"The installation of the specified plugin was succesfull. In order to use it, please restart the application." = "The installation of the specified plugin was succesfull. In order to use it, please restart the application.";
+"The installation of the specified plugin failed. Please try again, or make a manual install." ="The installation of the specified plugin failed. Please try again, or make a manual install.";
+"Missing plugins!" = "Missing plugins!";
+"Pcsxr is missing one or more critical plugins. You will need to install these in order to play games." = "Pcsx is missing one or more critical plugins. You will need to install these in order to play games.";
+"Missing BIOS!" = "Missing BIOS!";
+"Pcsxr wasn't able to locate any Playstation BIOS ROM files. This means that it will run in BIOS simulation mode which is less stable and compatible than using a real Playstation BIOS.\nIf you have a BIOS available, please copy it to\n~/Library/Application Support/Pcsxr/Bios/" = "Pcsxr wasn't able to locate any Playstation BIOS ROM files. This means that it will run in BIOS simulation mode which is less stable and compatible than using a real Playstation BIOS.\nIf you have a BIOS available, please copy it to\n~/Library/Application Support/Pcsxr/Bios/";
+"Error Opening CDR Plugin" = "Error Opening CDR Plugin";
+"Error Opening SPU Plugin" = "Error Opening SPU Plugin";
+"Error Opening GPU Plugin" = "Error Opening GPU Plugin";
+"Error Opening PAD1 Plugin" = "Error Opening PAD1 Plugin";
+"Error Opening PAD2 Plugin" = "Error Opening PAD2 Plugin";
+"Error Closing CDR Plugin" = "Error Closing CDR Plugin";
+"Error Closing SPU Plugin" = "Error Closing SPU Plugin";
+"Error Closing PAD1 Plugin" = "Error Closing PAD1 Plugin";
+"Error Closing PAD2 Plugin" = "Error Closing PAD2 Plugin";
+"Error Closing GPU Plugin" = "Error Closing GPU Plugin";
+"CDRinit error: %d" = "CDRinit error: %d";
+"GPUinit error: %d" = "GPUinit error: %d";
+"SPUinit error: %d" = "SPUinit error: %d";
+"PAD1init error: %d" = "PAD1init error: %d";
+"PAD2init error: %d" = "PAD2init error: %d";
+"NETinit error: %d" = "NETinit error: %d";
+"Could not open BIOS:\"%s\". Enabling HLE Bios!\n" = "Could not open BIOS:\"%s\". Enabling HLE Bios!\n";
+"Error allocating memory!" = "Error allocating memory!";
+"Running PCSXR Version %s (%s).\n" = "Running PCSXR Version %s (%s).\n";
+"No memory card value was specified - creating a default card %s\n" = "No memory card value was specified - creating a default card %s\n";
+"Memory card %s failed to load!\n" = "Memory card %s failed to load!\n";
+"Loading memory card %s\n" = "Loading memory card %s\n";
+"Track %.2d (%s) - Start %.2d:%.2d:%.2d, Length %.2d:%.2d:%.2d\n" = "Track %.2d (%s) - Start %.2d:%.2d:%.2d, Length %.2d:%.2d:%.2d\n";
+"Loaded CD Image: %s" = "Loaded CD Image: %s";
+"(Untitled)" = "(Untitled)";
+"Cheats saved to: %s\n" = "Cheats saved to: %s\n";
+"Cheats loaded from: %s\n" = "Cheats loaded from: %s\n";
+"Error allocating memory" = "Error allocating memory";
+"Unable to start debug server.\n" = "Unable to start debug server.\n";
+"Debugger started.\n" = "Debugger started.\n";
+"Debugger stopped.\n" = "Debugger stopped.\n";
+"CD-ROM Label: %.32s\n" = "CD-ROM Label: %.32s\n";
+"CD-ROM ID: %.9s\n" = "CD-ROM ID: %.9s\n";
+"Error opening file: %s.\n" = "Error opening file: %s.\n";
+"Unknown CPE opcode %02x at poiition %08x.\n" = "Unknown CPE opcode %02x at position %08x.\n";
+
+"Error opening file" = "Error opening file.";
+"Unable to open %@: %@" = "Unable to open %@: %@.";
+
+
+//Memory card management
+"Format Card" = "Format Card";
+"Free Size" = "Free Size";
+"Format" = "Format";
+"Formatting a memory card will remove all data on it.\n\nThis cannot be undone." = "Formatting a memory card will remove all data on it.\n\nThis cannot be undone.";
+"Delete Block" = "Delete Block";
+"Deleting a block will remove all saved data on that block.\n\nThis cannot be undone." = "Deleting a memory card object will set the blocks to not be readable by the emulator, and may result in the data being overwritten.";
+"No Free Space" = "No Free Space";
+"Memory card %d doesn't have %d free consecutive blocks on it. Please remove some blocks on that card to continue" = "Memory card %d doesn't have %d free blocks on it. Please remove some blocks on that card to continue.";
+"Memory card %i does not have enough free consecutive blocks.\n\nIn order to copy over \"%@ (%@),\" memory card %i must be compressed. Compressing memory cards will make deleted blocks unrecoverable.\n\nDo you want to continue?" = "Memory card %i does not have enough free consecutive blocks.\n\nIn order to copy over \"%@ (%@),\" memory card %i must be compressed. Compressing memory cards will make deleted blocks unrecoverable.\n\nDo you want to continue?";
+
+//General buttons
+"Okay" = "Okay";
+"Cancel" = "Cancel";
+"Yes" = "Yes";
+"No" = "No";
+"Delete" = "Delete";
+
+//Mem card flags
+"MemCard_Deleted" = "Deleted";
+"MemCard_Free" = "Free";
+"MemCard_Used" = "Used";
+"MemCard_Link" = "Link";
+"MemCard_EndLink" = "End Link";
+

pcsxr-1.9.93.tar.bz2/macosx/English.lproj/PCSXR.xib Added

@@ -0,0 +1,2540 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
+	<data>
+		<int key="IBDocument.SystemTarget">1070</int>
+		<string key="IBDocument.SystemVersion">12E55</string>
+		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
+		<string key="IBDocument.AppKitVersion">1187.39</string>
+		<string key="IBDocument.HIToolboxVersion">626.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			<string key="NS.object.0">3084</string>
+		</object>
+		<array key="IBDocument.IntegratedClassDependencies">
+			<string>NSCustomObject</string>
+			<string>NSMenu</string>
+			<string>NSMenuItem</string>
+		</array>
+		<array key="IBDocument.PluginDependencies">
+			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+		</array>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1052055471">
+			<object class="NSCustomObject" id="489548945">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSCustomObject" id="687968813">
+				<string key="NSClassName">FirstResponder</string>
+			</object>
+			<object class="NSCustomObject" id="544582716">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSMenu" id="67636175">
+				<string key="NSTitle">PCSXR</string>
+				<array class="NSMutableArray" key="NSMenuItems">
+					<object class="NSMenuItem" id="201125624">
+						<reference key="NSMenu" ref="67636175"/>
+						<string key="NSTitle">PCSXR</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<object class="NSCustomResource" key="NSOnImage" id="926047672">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">NSMenuCheckmark</string>
+						</object>
+						<object class="NSCustomResource" key="NSMixedImage" id="645484985">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">NSMenuMixedState</string>
+						</object>
+						<string key="NSAction">submenuAction:</string>
+						<object class="NSMenu" key="NSSubmenu" id="474241117">
+							<string key="NSTitle">PCSXR</string>
+							<array class="NSMutableArray" key="NSMenuItems">
+								<object class="NSMenuItem" id="713959643">
+									<reference key="NSMenu" ref="474241117"/>
+									<string key="NSTitle">About PCSXR</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+								</object>
+								<object class="NSMenuItem" id="994850327">
+									<reference key="NSMenu" ref="474241117"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+								</object>
+								<object class="NSMenuItem" id="971794455">
+									<reference key="NSMenu" ref="474241117"/>
+									<string key="NSTitle">Preferences...</string>
+									<string key="NSKeyEquiv">,</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+								</object>
+								<object class="NSMenuItem" id="643142854">
+									<reference key="NSMenu" ref="474241117"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+								</object>
+								<object class="NSMenuItem" id="951743966">
+									<reference key="NSMenu" ref="474241117"/>
+									<string key="NSTitle">Services</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+									<string key="NSAction">submenuAction:</string>
+									<object class="NSMenu" key="NSSubmenu" id="900344810">
+										<object class="NSMutableString" key="NSTitle">
+											<characters key="NS.bytes">Services</characters>
+										</object>
+										<array class="NSMutableArray" key="NSMenuItems"/>
+										<string key="NSName">_NSServicesMenu</string>
+									</object>
+								</object>
+								<object class="NSMenuItem" id="1002294178">
+									<reference key="NSMenu" ref="474241117"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+								</object>
+								<object class="NSMenuItem" id="59221501">
+									<reference key="NSMenu" ref="474241117"/>
+									<string key="NSTitle">Hide PCSXR</string>
+									<string key="NSKeyEquiv">h</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+								</object>
+								<object class="NSMenuItem" id="328899864">
+									<reference key="NSMenu" ref="474241117"/>
+									<string key="NSTitle">Hide Others</string>
+									<string key="NSKeyEquiv">h</string>
+									<int key="NSKeyEquivModMask">1572864</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+								</object>
+								<object class="NSMenuItem" id="230436915">
+									<reference key="NSMenu" ref="474241117"/>
+									<string key="NSTitle">Show All</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+								</object>
+								<object class="NSMenuItem" id="1065569173">
+									<reference key="NSMenu" ref="474241117"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+								</object>
+								<object class="NSMenuItem" id="570733638">
+									<reference key="NSMenu" ref="474241117"/>
+									<string key="NSTitle">Quit PCSXR</string>
+									<string key="NSKeyEquiv">q</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+								</object>
+							</array>
+							<string key="NSName">_NSAppleMenu</string>
+						</object>
+					</object>
+					<object class="NSMenuItem" id="622845102">
+						<reference key="NSMenu" ref="67636175"/>
+						<string key="NSTitle">File</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="926047672"/>
+						<reference key="NSMixedImage" ref="645484985"/>
+						<string key="NSAction">submenuAction:</string>
+						<object class="NSMenu" key="NSSubmenu" id="164090988">
+							<object class="NSMutableString" key="NSTitle">
+								<characters key="NS.bytes">File</characters>
+							</object>
+							<array class="NSMutableArray" key="NSMenuItems">
+								<object class="NSMenuItem" id="998122505">
+									<reference key="NSMenu" ref="164090988"/>
+									<string key="NSTitle">Run CD</string>
+									<string key="NSKeyEquiv">r</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+								</object>
+								<object class="NSMenuItem" id="771918864">
+									<reference key="NSMenu" ref="164090988"/>
+									<string key="NSTitle">Run ISO...</string>
+									<string key="NSKeyEquiv">i</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+								</object>
+								<object class="NSMenuItem" id="471681869">
+									<reference key="NSMenu" ref="164090988"/>
+									<string key="NSTitle">Run BIOS</string>
+									<string key="NSKeyEquiv">b</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+								</object>
+								<object class="NSMenuItem" id="74319449">
+									<reference key="NSMenu" ref="164090988"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+								</object>
+								<object class="NSMenuItem" id="435063348">
+									<reference key="NSMenu" ref="164090988"/>
+									<string key="NSTitle">Run Recent...</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+									<string key="NSAction">submenuAction:</string>
+									<object class="NSMenu" key="NSSubmenu" id="689397059">
+										<string key="NSTitle">Run Recent...</string>
+										<array class="NSMutableArray" key="NSMenuItems">
+											<object class="NSMenuItem" id="989763883">
+												<reference key="NSMenu" ref="689397059"/>
+												<bool key="NSIsDisabled">YES</bool>
+												<bool key="NSIsSeparator">YES</bool>
+												<string key="NSTitle"/>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="926047672"/>
+												<reference key="NSMixedImage" ref="645484985"/>
+												<int key="NSTag">1</int>
+											</object>
+											<object class="NSMenuItem" id="861298428">
+												<reference key="NSMenu" ref="689397059"/>
+												<string key="NSTitle">Clear recent list</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="926047672"/>
+												<reference key="NSMixedImage" ref="645484985"/>
+												<int key="NSTag">1</int>
+											</object>
+										</array>
+									</object>
+								</object>
+								<object class="NSMenuItem" id="160118245">
+									<reference key="NSMenu" ref="164090988"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+								</object>
+								<object class="NSMenuItem" id="297547826">
+									<reference key="NSMenu" ref="164090988"/>
+									<string key="NSTitle">Pause</string>
+									<string key="NSKeyEquiv">p</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+								</object>
+								<object class="NSMenuItem" id="927940433">
+									<reference key="NSMenu" ref="164090988"/>
+									<string key="NSTitle">Pause When Inactive</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+								</object>
+								<object class="NSMenuItem" id="392373865">
+									<reference key="NSMenu" ref="164090988"/>
+									<string key="NSTitle">Cheats</string>
+									<string key="NSKeyEquiv">c</string>
+									<int key="NSKeyEquivModMask">1572864</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+								</object>
+								<object class="NSMenuItem" id="705784993">
+									<reference key="NSMenu" ref="164090988"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+								</object>
+								<object class="NSMenuItem" id="81274320">
+									<reference key="NSMenu" ref="164090988"/>
+									<string key="NSTitle">Eject CD</string>
+									<string key="NSKeyEquiv">e</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+								</object>
+								<object class="NSMenuItem" id="679906586">
+									<reference key="NSMenu" ref="164090988"/>
+									<string key="NSTitle">Close</string>
+									<string key="NSKeyEquiv">w</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+								</object>
+								<object class="NSMenuItem" id="311949754">
+									<reference key="NSMenu" ref="164090988"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+								</object>
+								<object class="NSMenuItem" id="124150811">
+									<reference key="NSMenu" ref="164090988"/>
+									<string key="NSTitle">Freeze State</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+									<string key="NSAction">submenuAction:</string>
+									<object class="NSMenu" key="NSSubmenu" id="186554230">
+										<string key="NSTitle">Freeze State</string>
+										<array class="NSMutableArray" key="NSMenuItems">
+											<object class="NSMenuItem" id="1023912461">
+												<reference key="NSMenu" ref="186554230"/>
+												<string key="NSTitle">Slot 0</string>
+												<string key="NSKeyEquiv">0</string>
+												<int key="NSKeyEquivModMask">1048576</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="926047672"/>
+												<reference key="NSMixedImage" ref="645484985"/>
+											</object>
+											<object class="NSMenuItem" id="659838401">
+												<reference key="NSMenu" ref="186554230"/>
+												<string key="NSTitle">Slot 1</string>
+												<string key="NSKeyEquiv">1</string>
+												<int key="NSKeyEquivModMask">1048576</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="926047672"/>
+												<reference key="NSMixedImage" ref="645484985"/>
+												<int key="NSTag">1</int>
+											</object>
+											<object class="NSMenuItem" id="232633961">
+												<reference key="NSMenu" ref="186554230"/>
+												<string key="NSTitle">Slot 2</string>
+												<string key="NSKeyEquiv">2</string>
+												<int key="NSKeyEquivModMask">1048576</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="926047672"/>
+												<reference key="NSMixedImage" ref="645484985"/>
+												<int key="NSTag">2</int>
+											</object>
+											<object class="NSMenuItem" id="747940602">
+												<reference key="NSMenu" ref="186554230"/>
+												<string key="NSTitle">Slot 3</string>
+												<string key="NSKeyEquiv">3</string>
+												<int key="NSKeyEquivModMask">1048576</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="926047672"/>
+												<reference key="NSMixedImage" ref="645484985"/>
+												<int key="NSTag">3</int>
+											</object>
+											<object class="NSMenuItem" id="245364309">
+												<reference key="NSMenu" ref="186554230"/>
+												<string key="NSTitle">Slot 4</string>
+												<string key="NSKeyEquiv">4</string>
+												<int key="NSKeyEquivModMask">1048576</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="926047672"/>
+												<reference key="NSMixedImage" ref="645484985"/>
+												<int key="NSTag">4</int>
+											</object>
+											<object class="NSMenuItem" id="958472095">
+												<reference key="NSMenu" ref="186554230"/>
+												<string key="NSTitle">Slot 5</string>
+												<string key="NSKeyEquiv">5</string>
+												<int key="NSKeyEquivModMask">1048576</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="926047672"/>
+												<reference key="NSMixedImage" ref="645484985"/>
+												<int key="NSTag">5</int>
+											</object>
+										</array>
+									</object>
+								</object>
+								<object class="NSMenuItem" id="1070611541">
+									<reference key="NSMenu" ref="164090988"/>
+									<string key="NSTitle">Defrost State</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+									<string key="NSAction">submenuAction:</string>
+									<object class="NSMenu" key="NSSubmenu" id="8470546">
+										<string key="NSTitle">Defrost State</string>
+										<array class="NSMutableArray" key="NSMenuItems">
+											<object class="NSMenuItem" id="832305532">
+												<reference key="NSMenu" ref="8470546"/>
+												<string key="NSTitle">Slot 0</string>
+												<string key="NSKeyEquiv">0</string>
+												<int key="NSKeyEquivModMask">1572864</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="926047672"/>
+												<reference key="NSMixedImage" ref="645484985"/>
+											</object>
+											<object class="NSMenuItem" id="781033990">
+												<reference key="NSMenu" ref="8470546"/>
+												<string key="NSTitle">Slot 1</string>
+												<string key="NSKeyEquiv">1</string>
+												<int key="NSKeyEquivModMask">1572864</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="926047672"/>
+												<reference key="NSMixedImage" ref="645484985"/>
+												<int key="NSTag">1</int>
+											</object>
+											<object class="NSMenuItem" id="680777026">
+												<reference key="NSMenu" ref="8470546"/>
+												<string key="NSTitle">Slot 2</string>
+												<string key="NSKeyEquiv">2</string>
+												<int key="NSKeyEquivModMask">1572864</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="926047672"/>
+												<reference key="NSMixedImage" ref="645484985"/>
+												<int key="NSTag">2</int>
+											</object>
+											<object class="NSMenuItem" id="919615015">
+												<reference key="NSMenu" ref="8470546"/>
+												<string key="NSTitle">Slot 3</string>
+												<string key="NSKeyEquiv">3</string>
+												<int key="NSKeyEquivModMask">1572864</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="926047672"/>
+												<reference key="NSMixedImage" ref="645484985"/>
+												<int key="NSTag">3</int>
+											</object>
+											<object class="NSMenuItem" id="480149417">
+												<reference key="NSMenu" ref="8470546"/>
+												<string key="NSTitle">Slot 4</string>
+												<string key="NSKeyEquiv">4</string>
+												<int key="NSKeyEquivModMask">1572864</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="926047672"/>
+												<reference key="NSMixedImage" ref="645484985"/>
+												<int key="NSTag">4</int>
+											</object>
+											<object class="NSMenuItem" id="220857467">
+												<reference key="NSMenu" ref="8470546"/>
+												<string key="NSTitle">Slot 5</string>
+												<string key="NSKeyEquiv">5</string>
+												<int key="NSKeyEquivModMask">1572864</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="926047672"/>
+												<reference key="NSMixedImage" ref="645484985"/>
+												<int key="NSTag">5</int>
+											</object>
+										</array>
+									</object>
+								</object>
+								<object class="NSMenuItem" id="72490035">
+									<reference key="NSMenu" ref="164090988"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+								</object>
+								<object class="NSMenuItem" id="351708473">
+									<reference key="NSMenu" ref="164090988"/>
+									<string key="NSTitle">Reset</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+								</object>
+							</array>
+						</object>
+					</object>
+					<object class="NSMenuItem" id="673234762">
+						<reference key="NSMenu" ref="67636175"/>
+						<string key="NSTitle">Edit</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="926047672"/>
+						<reference key="NSMixedImage" ref="645484985"/>
+						<string key="NSAction">submenuAction:</string>
+						<object class="NSMenu" key="NSSubmenu" id="533756997">
+							<string key="NSTitle">Edit</string>
+							<array class="NSMutableArray" key="NSMenuItems">
+								<object class="NSMenuItem" id="565183070">
+									<reference key="NSMenu" ref="533756997"/>
+									<string key="NSTitle">Undo</string>
+									<string key="NSKeyEquiv">z</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+								</object>
+								<object class="NSMenuItem" id="765134954">
+									<reference key="NSMenu" ref="533756997"/>
+									<string key="NSTitle">Redo</string>
+									<string key="NSKeyEquiv">Z</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+								</object>
+								<object class="NSMenuItem" id="776941354">
+									<reference key="NSMenu" ref="533756997"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+								</object>
+								<object class="NSMenuItem" id="954724636">
+									<reference key="NSMenu" ref="533756997"/>
+									<string key="NSTitle">Cut</string>
+									<string key="NSKeyEquiv">x</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+								</object>
+								<object class="NSMenuItem" id="176343978">
+									<reference key="NSMenu" ref="533756997"/>
+									<string key="NSTitle">Copy</string>
+									<string key="NSKeyEquiv">c</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+								</object>
+								<object class="NSMenuItem" id="783530629">
+									<reference key="NSMenu" ref="533756997"/>
+									<string key="NSTitle">Paste</string>
+									<string key="NSKeyEquiv">v</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+								</object>
+								<object class="NSMenuItem" id="680570886">
+									<reference key="NSMenu" ref="533756997"/>
+									<string key="NSTitle">Paste and Match Style</string>
+									<string key="NSKeyEquiv">V</string>
+									<int key="NSKeyEquivModMask">1572864</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+								</object>
+								<object class="NSMenuItem" id="229289704">
+									<reference key="NSMenu" ref="533756997"/>
+									<string key="NSTitle">Delete</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+								</object>
+								<object class="NSMenuItem" id="516638779">
+									<reference key="NSMenu" ref="533756997"/>
+									<string key="NSTitle">Select All</string>
+									<string key="NSKeyEquiv">a</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+								</object>
+								<object class="NSMenuItem" id="173003378">
+									<reference key="NSMenu" ref="533756997"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+								</object>
+								<object class="NSMenuItem" id="244499010">
+									<reference key="NSMenu" ref="533756997"/>
+									<string key="NSTitle">Find</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+									<string key="NSAction">submenuAction:</string>
+									<object class="NSMenu" key="NSSubmenu" id="664623024">
+										<string key="NSTitle">Find</string>
+										<array class="NSMutableArray" key="NSMenuItems">
+											<object class="NSMenuItem" id="254096546">
+												<reference key="NSMenu" ref="664623024"/>
+												<string key="NSTitle">Find…</string>
+												<string key="NSKeyEquiv">f</string>
+												<int key="NSKeyEquivModMask">1048576</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="926047672"/>
+												<reference key="NSMixedImage" ref="645484985"/>
+												<int key="NSTag">1</int>
+											</object>
+											<object class="NSMenuItem" id="600600373">
+												<reference key="NSMenu" ref="664623024"/>
+												<string key="NSTitle">Find and Replace…</string>
+												<string key="NSKeyEquiv">f</string>
+												<int key="NSKeyEquivModMask">1572864</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="926047672"/>
+												<reference key="NSMixedImage" ref="645484985"/>
+												<string key="NSAction">performTextFinderAction:</string>
+												<int key="NSTag">12</int>
+											</object>
+											<object class="NSMenuItem" id="25196245">
+												<reference key="NSMenu" ref="664623024"/>
+												<string key="NSTitle">Find Next</string>
+												<string key="NSKeyEquiv">g</string>
+												<int key="NSKeyEquivModMask">1048576</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="926047672"/>
+												<reference key="NSMixedImage" ref="645484985"/>
+												<int key="NSTag">2</int>
+											</object>
+											<object class="NSMenuItem" id="292022565">
+												<reference key="NSMenu" ref="664623024"/>
+												<string key="NSTitle">Find Previous</string>
+												<string key="NSKeyEquiv">G</string>
+												<int key="NSKeyEquivModMask">1048576</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="926047672"/>
+												<reference key="NSMixedImage" ref="645484985"/>
+												<int key="NSTag">3</int>
+											</object>
+											<object class="NSMenuItem" id="674131538">
+												<reference key="NSMenu" ref="664623024"/>
+												<string key="NSTitle">Use Selection for Find</string>
+												<string key="NSKeyEquiv">e</string>
+												<int key="NSKeyEquivModMask">1048576</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="926047672"/>
+												<reference key="NSMixedImage" ref="645484985"/>
+												<int key="NSTag">7</int>
+											</object>
+											<object class="NSMenuItem" id="432214437">
+												<reference key="NSMenu" ref="664623024"/>
+												<string key="NSTitle">Jump to Selection</string>
+												<string key="NSKeyEquiv">j</string>
+												<int key="NSKeyEquivModMask">1048576</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="926047672"/>
+												<reference key="NSMixedImage" ref="645484985"/>
+											</object>
+										</array>
+									</object>
+								</object>
+								<object class="NSMenuItem" id="127680397">
+									<reference key="NSMenu" ref="533756997"/>
+									<string key="NSTitle">Spelling and Grammar</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+									<string key="NSAction">submenuAction:</string>
+									<object class="NSMenu" key="NSSubmenu" id="647269483">
+										<string key="NSTitle">Spelling</string>
+										<array class="NSMutableArray" key="NSMenuItems">
+											<object class="NSMenuItem" id="281214337">
+												<reference key="NSMenu" ref="647269483"/>
+												<string key="NSTitle">Show Spelling and Grammar</string>
+												<string key="NSKeyEquiv">:</string>
+												<int key="NSKeyEquivModMask">1048576</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="926047672"/>
+												<reference key="NSMixedImage" ref="645484985"/>
+											</object>
+											<object class="NSMenuItem" id="985465568">
+												<reference key="NSMenu" ref="647269483"/>
+												<string key="NSTitle">Check Document Now</string>
+												<string key="NSKeyEquiv">;</string>
+												<int key="NSKeyEquivModMask">1048576</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="926047672"/>
+												<reference key="NSMixedImage" ref="645484985"/>
+											</object>
+											<object class="NSMenuItem" id="782448234">
+												<reference key="NSMenu" ref="647269483"/>
+												<bool key="NSIsDisabled">YES</bool>
+												<bool key="NSIsSeparator">YES</bool>
+												<string key="NSTitle"/>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="926047672"/>
+												<reference key="NSMixedImage" ref="645484985"/>
+											</object>
+											<object class="NSMenuItem" id="414874021">
+												<reference key="NSMenu" ref="647269483"/>
+												<string key="NSTitle">Check Spelling While Typing</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="926047672"/>
+												<reference key="NSMixedImage" ref="645484985"/>
+											</object>
+											<object class="NSMenuItem" id="1027637061">
+												<reference key="NSMenu" ref="647269483"/>
+												<string key="NSTitle">Check Grammar With Spelling</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="926047672"/>
+												<reference key="NSMixedImage" ref="645484985"/>
+											</object>
+											<object class="NSMenuItem" id="645006073">
+												<reference key="NSMenu" ref="647269483"/>
+												<string key="NSTitle">Correct Spelling Automatically</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="926047672"/>
+												<reference key="NSMixedImage" ref="645484985"/>
+											</object>
+										</array>
+									</object>
+								</object>
+								<object class="NSMenuItem" id="84727121">
+									<reference key="NSMenu" ref="533756997"/>
+									<string key="NSTitle">Substitutions</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+									<string key="NSAction">submenuAction:</string>
+									<object class="NSMenu" key="NSSubmenu" id="407019192">
+										<string key="NSTitle">Substitutions</string>
+										<array class="NSMutableArray" key="NSMenuItems">
+											<object class="NSMenuItem" id="724718165">
+												<reference key="NSMenu" ref="407019192"/>
+												<string key="NSTitle">Show Substitutions</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="926047672"/>
+												<reference key="NSMixedImage" ref="645484985"/>
+											</object>
+											<object class="NSMenuItem" id="680766614">
+												<reference key="NSMenu" ref="407019192"/>
+												<bool key="NSIsDisabled">YES</bool>
+												<bool key="NSIsSeparator">YES</bool>
+												<string key="NSTitle"/>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="926047672"/>
+												<reference key="NSMixedImage" ref="645484985"/>
+											</object>
+											<object class="NSMenuItem" id="424480868">
+												<reference key="NSMenu" ref="407019192"/>
+												<string key="NSTitle">Smart Copy/Paste</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="926047672"/>
+												<reference key="NSMixedImage" ref="645484985"/>
+											</object>
+											<object class="NSMenuItem" id="613047479">
+												<reference key="NSMenu" ref="407019192"/>
+												<string key="NSTitle">Smart Quotes</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="926047672"/>
+												<reference key="NSMixedImage" ref="645484985"/>
+											</object>
+											<object class="NSMenuItem" id="9511511">
+												<reference key="NSMenu" ref="407019192"/>
+												<string key="NSTitle">Smart Dashes</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="926047672"/>
+												<reference key="NSMixedImage" ref="645484985"/>
+											</object>
+											<object class="NSMenuItem" id="642077044">
+												<reference key="NSMenu" ref="407019192"/>
+												<string key="NSTitle">Smart Links</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="926047672"/>
+												<reference key="NSMixedImage" ref="645484985"/>
+											</object>
+											<object class="NSMenuItem" id="596040493">
+												<reference key="NSMenu" ref="407019192"/>
+												<string key="NSTitle">Data Detectors</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="926047672"/>
+												<reference key="NSMixedImage" ref="645484985"/>
+											</object>
+											<object class="NSMenuItem" id="123077202">
+												<reference key="NSMenu" ref="407019192"/>
+												<string key="NSTitle">Text Replacement</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="926047672"/>
+												<reference key="NSMixedImage" ref="645484985"/>
+											</object>
+										</array>
+									</object>
+								</object>
+								<object class="NSMenuItem" id="659372032">
+									<reference key="NSMenu" ref="533756997"/>
+									<string key="NSTitle">Transformations</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+									<string key="NSAction">submenuAction:</string>
+									<object class="NSMenu" key="NSSubmenu" id="1000210660">
+										<string key="NSTitle">Transformations</string>
+										<array class="NSMutableArray" key="NSMenuItems">
+											<object class="NSMenuItem" id="531098726">
+												<reference key="NSMenu" ref="1000210660"/>
+												<string key="NSTitle">Make Upper Case</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="926047672"/>
+												<reference key="NSMixedImage" ref="645484985"/>
+											</object>
+											<object class="NSMenuItem" id="655714324">
+												<reference key="NSMenu" ref="1000210660"/>
+												<string key="NSTitle">Make Lower Case</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="926047672"/>
+												<reference key="NSMixedImage" ref="645484985"/>
+											</object>
+											<object class="NSMenuItem" id="807625103">
+												<reference key="NSMenu" ref="1000210660"/>
+												<string key="NSTitle">Capitalize</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="926047672"/>
+												<reference key="NSMixedImage" ref="645484985"/>
+											</object>
+										</array>
+									</object>
+								</object>
+								<object class="NSMenuItem" id="911210026">
+									<reference key="NSMenu" ref="533756997"/>
+									<string key="NSTitle">Speech</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+									<string key="NSAction">submenuAction:</string>
+									<object class="NSMenu" key="NSSubmenu" id="37927018">
+										<string key="NSTitle">Speech</string>
+										<array class="NSMutableArray" key="NSMenuItems">
+											<object class="NSMenuItem" id="241021325">
+												<reference key="NSMenu" ref="37927018"/>
+												<string key="NSTitle">Start Speaking</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="926047672"/>
+												<reference key="NSMixedImage" ref="645484985"/>
+											</object>
+											<object class="NSMenuItem" id="331389887">
+												<reference key="NSMenu" ref="37927018"/>
+												<string key="NSTitle">Stop Speaking</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="926047672"/>
+												<reference key="NSMixedImage" ref="645484985"/>
+											</object>
+										</array>
+									</object>
+								</object>
+							</array>
+						</object>
+					</object>
+					<object class="NSMenuItem" id="94376406">
+						<reference key="NSMenu" ref="67636175"/>
+						<string key="NSTitle">Window</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="926047672"/>
+						<reference key="NSMixedImage" ref="645484985"/>
+						<string key="NSAction">submenuAction:</string>
+						<object class="NSMenu" key="NSSubmenu" id="1049236981">
+							<object class="NSMutableString" key="NSTitle">
+								<characters key="NS.bytes">Window</characters>
+							</object>
+							<array class="NSMutableArray" key="NSMenuItems">
+								<object class="NSMenuItem" id="1054009981">
+									<reference key="NSMenu" ref="1049236981"/>
+									<string key="NSTitle">Minimize</string>
+									<string key="NSKeyEquiv">m</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+								</object>
+								<object class="NSMenuItem" id="899940707">
+									<reference key="NSMenu" ref="1049236981"/>
+									<string key="NSTitle">Fullscreen</string>
+									<string type="base64-UTF8" key="NSKeyEquiv">Gw</string>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+								</object>
+								<object class="NSMenuItem" id="771858262">
+									<reference key="NSMenu" ref="1049236981"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+								</object>
+								<object class="NSMenuItem" id="644533453">
+									<reference key="NSMenu" ref="1049236981"/>
+									<string key="NSTitle">Bring All to Front</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+								</object>
+							</array>
+							<string key="NSName">_NSWindowsMenu</string>
+						</object>
+					</object>
+					<object class="NSMenuItem" id="583922353">
+						<reference key="NSMenu" ref="67636175"/>
+						<string key="NSTitle">Help</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="926047672"/>
+						<reference key="NSMixedImage" ref="645484985"/>
+						<string key="NSAction">submenuAction:</string>
+						<object class="NSMenu" key="NSSubmenu" id="93586374">
+							<object class="NSMutableString" key="NSTitle">
+								<characters key="NS.bytes">Help</characters>
+							</object>
+							<array class="NSMutableArray" key="NSMenuItems">
+								<object class="NSMenuItem" id="151383531">
+									<reference key="NSMenu" ref="93586374"/>
+									<string key="NSTitle">PCSXR Help</string>
+									<string key="NSKeyEquiv">?</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="926047672"/>
+									<reference key="NSMixedImage" ref="645484985"/>
+								</object>
+							</array>
+						</object>
+					</object>
+				</array>
+				<string key="NSName">_NSMainMenu</string>
+			</object>
+			<object class="NSCustomObject" id="113826207">
+				<string key="NSClassName">PcsxrController</string>
+			</object>
+			<object class="NSMenuItem" id="126713148">
+				<string key="NSTitle">Menu</string>
+				<string key="NSKeyEquiv"/>
+				<int key="NSMnemonicLoc">2147483647</int>
+				<reference key="NSOnImage" ref="926047672"/>
+				<reference key="NSMixedImage" ref="645484985"/>
+				<string key="NSAction">submenuAction:</string>
+				<object class="NSMenu" key="NSSubmenu" id="37407557">
+					<string key="NSTitle">Menu</string>
+					<array class="NSMutableArray" key="NSMenuItems"/>
+				</object>
+			</object>
+		</array>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<array class="NSMutableArray" key="connectionRecords">
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">terminate:</string>
+						<reference key="source" ref="489548945"/>
+						<reference key="destination" ref="570733638"/>
+					</object>
+					<int key="connectionID">139</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">hideOtherApplications:</string>
+						<reference key="source" ref="489548945"/>
+						<reference key="destination" ref="328899864"/>
+					</object>
+					<int key="connectionID">146</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">hide:</string>
+						<reference key="source" ref="489548945"/>
+						<reference key="destination" ref="59221501"/>
+					</object>
+					<int key="connectionID">152</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">unhideAllApplications:</string>
+						<reference key="source" ref="489548945"/>
+						<reference key="destination" ref="230436915"/>
+					</object>
+					<int key="connectionID">153</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">orderFrontStandardAboutPanel:</string>
+						<reference key="source" ref="489548945"/>
+						<reference key="destination" ref="713959643"/>
+					</object>
+					<int key="connectionID">264</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">showHelp:</string>
+						<reference key="source" ref="489548945"/>
+						<reference key="destination" ref="151383531"/>
+					</object>
+					<int key="connectionID">265</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="489548945"/>
+						<reference key="destination" ref="113826207"/>
+					</object>
+					<int key="connectionID">302</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">performMiniaturize:</string>
+						<reference key="source" ref="687968813"/>
+						<reference key="destination" ref="1054009981"/>
+					</object>
+					<int key="connectionID">37</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">arrangeInFront:</string>
+						<reference key="source" ref="687968813"/>
+						<reference key="destination" ref="644533453"/>
+					</object>
+					<int key="connectionID">39</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">performClose:</string>
+						<reference key="source" ref="687968813"/>
+						<reference key="destination" ref="679906586"/>
+					</object>
+					<int key="connectionID">272</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">startSpeaking:</string>
+						<reference key="source" ref="687968813"/>
+						<reference key="destination" ref="241021325"/>
+					</object>
+					<int key="connectionID">431</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">copy:</string>
+						<reference key="source" ref="687968813"/>
+						<reference key="destination" ref="176343978"/>
+					</object>
+					<int key="connectionID">432</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">cut:</string>
+						<reference key="source" ref="687968813"/>
+						<reference key="destination" ref="954724636"/>
+					</object>
+					<int key="connectionID">433</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleAutomaticSpellingCorrection:</string>
+						<reference key="source" ref="687968813"/>
+						<reference key="destination" ref="645006073"/>
+					</object>
+					<int key="connectionID">434</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleSmartInsertDelete:</string>
+						<reference key="source" ref="687968813"/>
+						<reference key="destination" ref="424480868"/>
+					</object>
+					<int key="connectionID">435</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">checkSpelling:</string>
+						<reference key="source" ref="687968813"/>
+						<reference key="destination" ref="985465568"/>
+					</object>
+					<int key="connectionID">436</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleContinuousSpellChecking:</string>
+						<reference key="source" ref="687968813"/>
+						<reference key="destination" ref="414874021"/>
+					</object>
+					<int key="connectionID">437</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">paste:</string>
+						<reference key="source" ref="687968813"/>
+						<reference key="destination" ref="783530629"/>
+					</object>
+					<int key="connectionID">438</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleAutomaticDataDetection:</string>
+						<reference key="source" ref="687968813"/>
+						<reference key="destination" ref="596040493"/>
+					</object>
+					<int key="connectionID">439</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleAutomaticTextReplacement:</string>
+						<reference key="source" ref="687968813"/>
+						<reference key="destination" ref="123077202"/>
+					</object>
+					<int key="connectionID">440</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">orderFrontSubstitutionsPanel:</string>
+						<reference key="source" ref="687968813"/>
+						<reference key="destination" ref="724718165"/>
+					</object>
+					<int key="connectionID">441</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleAutomaticLinkDetection:</string>
+						<reference key="source" ref="687968813"/>
+						<reference key="destination" ref="642077044"/>
+					</object>
+					<int key="connectionID">442</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">uppercaseWord:</string>
+						<reference key="source" ref="687968813"/>
+						<reference key="destination" ref="531098726"/>
+					</object>
+					<int key="connectionID">443</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">lowercaseWord:</string>
+						<reference key="source" ref="687968813"/>
+						<reference key="destination" ref="655714324"/>
+					</object>
+					<int key="connectionID">444</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleGrammarChecking:</string>
+						<reference key="source" ref="687968813"/>
+						<reference key="destination" ref="1027637061"/>
+					</object>
+					<int key="connectionID">445</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">showGuessPanel:</string>
+						<reference key="source" ref="687968813"/>
+						<reference key="destination" ref="281214337"/>
+					</object>
+					<int key="connectionID">446</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">redo:</string>
+						<reference key="source" ref="687968813"/>
+						<reference key="destination" ref="765134954"/>
+					</object>
+					<int key="connectionID">447</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">delete:</string>
+						<reference key="source" ref="687968813"/>
+						<reference key="destination" ref="229289704"/>
+					</object>
+					<int key="connectionID">448</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleAutomaticQuoteSubstitution:</string>
+						<reference key="source" ref="687968813"/>
+						<reference key="destination" ref="613047479"/>
+					</object>
+					<int key="connectionID">449</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">capitalizeWord:</string>
+						<reference key="source" ref="687968813"/>
+						<reference key="destination" ref="807625103"/>
+					</object>
+					<int key="connectionID">450</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">selectAll:</string>
+						<reference key="source" ref="687968813"/>
+						<reference key="destination" ref="516638779"/>
+					</object>
+					<int key="connectionID">451</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">stopSpeaking:</string>
+						<reference key="source" ref="687968813"/>
+						<reference key="destination" ref="331389887"/>
+					</object>
+					<int key="connectionID">452</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">undo:</string>
+						<reference key="source" ref="687968813"/>
+						<reference key="destination" ref="565183070"/>
+					</object>
+					<int key="connectionID">453</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleAutomaticDashSubstitution:</string>
+						<reference key="source" ref="687968813"/>
+						<reference key="destination" ref="9511511"/>
+					</object>
+					<int key="connectionID">454</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">pasteAsPlainText:</string>
+						<reference key="source" ref="687968813"/>
+						<reference key="destination" ref="680570886"/>
+					</object>
+					<int key="connectionID">455</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">performFindPanelAction:</string>
+						<reference key="source" ref="687968813"/>
+						<reference key="destination" ref="25196245"/>
+					</object>
+					<int key="connectionID">457</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">performFindPanelAction:</string>
+						<reference key="source" ref="687968813"/>
+						<reference key="destination" ref="674131538"/>
+					</object>
+					<int key="connectionID">458</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">performFindPanelAction:</string>
+						<reference key="source" ref="687968813"/>
+						<reference key="destination" ref="254096546"/>
+					</object>
+					<int key="connectionID">459</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">centerSelectionInVisibleArea:</string>
+						<reference key="source" ref="687968813"/>
+						<reference key="destination" ref="432214437"/>
+					</object>
+					<int key="connectionID">460</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">performTextFinderAction:</string>
+						<reference key="source" ref="687968813"/>
+						<reference key="destination" ref="600600373"/>
+					</object>
+					<int key="connectionID">461</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">performFindPanelAction:</string>
+						<reference key="source" ref="687968813"/>
+						<reference key="destination" ref="292022565"/>
+					</object>
+					<int key="connectionID">462</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">reset:</string>
+						<reference key="source" ref="113826207"/>
+						<reference key="destination" ref="351708473"/>
+					</object>
+					<int key="connectionID">255</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">preferences:</string>
+						<reference key="source" ref="113826207"/>
+						<reference key="destination" ref="971794455"/>
+					</object>
+					<int key="connectionID">263</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">pause:</string>
+						<reference key="source" ref="113826207"/>
+						<reference key="destination" ref="297547826"/>
+					</object>
+					<int key="connectionID">269</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">runCD:</string>
+						<reference key="source" ref="113826207"/>
+						<reference key="destination" ref="998122505"/>
+					</object>
+					<int key="connectionID">275</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">freeze:</string>
+						<reference key="source" ref="113826207"/>
+						<reference key="destination" ref="1023912461"/>
+					</object>
+					<int key="connectionID">294</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">freeze:</string>
+						<reference key="source" ref="113826207"/>
+						<reference key="destination" ref="232633961"/>
+					</object>
+					<int key="connectionID">295</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">freeze:</string>
+						<reference key="source" ref="113826207"/>
+						<reference key="destination" ref="747940602"/>
+					</object>
+					<int key="connectionID">296</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">defrost:</string>
+						<reference key="source" ref="113826207"/>
+						<reference key="destination" ref="832305532"/>
+					</object>
+					<int key="connectionID">297</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">defrost:</string>
+						<reference key="source" ref="113826207"/>
+						<reference key="destination" ref="680777026"/>
+					</object>
+					<int key="connectionID">298</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">defrost:</string>
+						<reference key="source" ref="113826207"/>
+						<reference key="destination" ref="919615015"/>
+					</object>
+					<int key="connectionID">299</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">fullscreen:</string>
+						<reference key="source" ref="113826207"/>
+						<reference key="destination" ref="899940707"/>
+					</object>
+					<int key="connectionID">301</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">ejectCD:</string>
+						<reference key="source" ref="113826207"/>
+						<reference key="destination" ref="81274320"/>
+					</object>
+					<int key="connectionID">304</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">runIso:</string>
+						<reference key="source" ref="113826207"/>
+						<reference key="destination" ref="771918864"/>
+					</object>
+					<int key="connectionID">305</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">runBios:</string>
+						<reference key="source" ref="113826207"/>
+						<reference key="destination" ref="471681869"/>
+					</object>
+					<int key="connectionID">307</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">freeze:</string>
+						<reference key="source" ref="113826207"/>
+						<reference key="destination" ref="245364309"/>
+					</object>
+					<int key="connectionID">313</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">freeze:</string>
+						<reference key="source" ref="113826207"/>
+						<reference key="destination" ref="958472095"/>
+					</object>
+					<int key="connectionID">314</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">defrost:</string>
+						<reference key="source" ref="113826207"/>
+						<reference key="destination" ref="480149417"/>
+					</object>
+					<int key="connectionID">315</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">defrost:</string>
+						<reference key="source" ref="113826207"/>
+						<reference key="destination" ref="220857467"/>
+					</object>
+					<int key="connectionID">316</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">pauseInBackground:</string>
+						<reference key="source" ref="113826207"/>
+						<reference key="destination" ref="927940433"/>
+					</object>
+					<int key="connectionID">319</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">freeze:</string>
+						<reference key="source" ref="113826207"/>
+						<reference key="destination" ref="659838401"/>
+					</object>
+					<int key="connectionID">321</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">defrost:</string>
+						<reference key="source" ref="113826207"/>
+						<reference key="destination" ref="781033990"/>
+					</object>
+					<int key="connectionID">323</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">recentItems</string>
+						<reference key="source" ref="113826207"/>
+						<reference key="destination" ref="689397059"/>
+					</object>
+					<int key="connectionID">364</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">showCheatsWindow:</string>
+						<reference key="source" ref="113826207"/>
+						<reference key="destination" ref="392373865"/>
+					</object>
+					<int key="connectionID">373</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">pcsxr</string>
+						<reference key="source" ref="689397059"/>
+						<reference key="destination" ref="113826207"/>
+					</object>
+					<int key="connectionID">365</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">clearRecentDocuments:</string>
+						<reference key="source" ref="689397059"/>
+						<reference key="destination" ref="861298428"/>
+					</object>
+					<int key="connectionID">368</int>
+				</object>
+			</array>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<array key="orderedObjects">
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<array key="object" id="0"/>
+						<reference key="children" ref="1052055471"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="489548945"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="687968813"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">First Responder</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">29</int>
+						<reference key="object" ref="67636175"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="94376406"/>
+							<reference ref="201125624"/>
+							<reference ref="622845102"/>
+							<reference ref="583922353"/>
+							<reference ref="673234762"/>
+						</array>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">MainMenu</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">19</int>
+						<reference key="object" ref="94376406"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1049236981"/>
+						</array>
+						<reference key="parent" ref="67636175"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">56</int>
+						<reference key="object" ref="201125624"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="474241117"/>
+						</array>
+						<reference key="parent" ref="67636175"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">57</int>
+						<reference key="object" ref="474241117"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="713959643"/>
+							<reference ref="971794455"/>
+							<reference ref="951743966"/>
+							<reference ref="59221501"/>
+							<reference ref="570733638"/>
+							<reference ref="643142854"/>
+							<reference ref="1002294178"/>
+							<reference ref="328899864"/>
+							<reference ref="1065569173"/>
+							<reference ref="230436915"/>
+							<reference ref="994850327"/>
+						</array>
+						<reference key="parent" ref="201125624"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">58</int>
+						<reference key="object" ref="713959643"/>
+						<reference key="parent" ref="474241117"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">129</int>
+						<reference key="object" ref="971794455"/>
+						<reference key="parent" ref="474241117"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">131</int>
+						<reference key="object" ref="951743966"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="900344810"/>
+						</array>
+						<reference key="parent" ref="474241117"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">130</int>
+						<reference key="object" ref="900344810"/>
+						<reference key="parent" ref="951743966"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">134</int>
+						<reference key="object" ref="59221501"/>
+						<reference key="parent" ref="474241117"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">136</int>
+						<reference key="object" ref="570733638"/>
+						<reference key="parent" ref="474241117"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">143</int>
+						<reference key="object" ref="643142854"/>
+						<reference key="parent" ref="474241117"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">144</int>
+						<reference key="object" ref="1002294178"/>
+						<reference key="parent" ref="474241117"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">145</int>
+						<reference key="object" ref="328899864"/>
+						<reference key="parent" ref="474241117"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">149</int>
+						<reference key="object" ref="1065569173"/>
+						<reference key="parent" ref="474241117"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">150</int>
+						<reference key="object" ref="230436915"/>
+						<reference key="parent" ref="474241117"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">266</int>
+						<reference key="object" ref="994850327"/>
+						<reference key="parent" ref="474241117"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">83</int>
+						<reference key="object" ref="622845102"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="164090988"/>
+						</array>
+						<reference key="parent" ref="67636175"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">81</int>
+						<reference key="object" ref="164090988"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="351708473"/>
+							<reference ref="297547826"/>
+							<reference ref="705784993"/>
+							<reference ref="679906586"/>
+							<reference ref="72490035"/>
+							<reference ref="998122505"/>
+							<reference ref="124150811"/>
+							<reference ref="311949754"/>
+							<reference ref="1070611541"/>
+							<reference ref="771918864"/>
+							<reference ref="81274320"/>
+							<reference ref="471681869"/>
+							<reference ref="74319449"/>
+							<reference ref="927940433"/>
+							<reference ref="160118245"/>
+							<reference ref="435063348"/>
+							<reference ref="392373865"/>
+						</array>
+						<reference key="parent" ref="622845102"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">244</int>
+						<reference key="object" ref="351708473"/>
+						<reference key="parent" ref="164090988"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">267</int>
+						<reference key="object" ref="297547826"/>
+						<reference key="parent" ref="164090988"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">268</int>
+						<reference key="object" ref="705784993"/>
+						<reference key="parent" ref="164090988"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">270</int>
+						<reference key="object" ref="679906586"/>
+						<reference key="parent" ref="164090988"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">271</int>
+						<reference key="object" ref="72490035"/>
+						<reference key="parent" ref="164090988"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">273</int>
+						<reference key="object" ref="998122505"/>
+						<reference key="parent" ref="164090988"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">280</int>
+						<reference key="object" ref="124150811"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="186554230"/>
+						</array>
+						<reference key="parent" ref="164090988"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">278</int>
+						<reference key="object" ref="186554230"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1023912461"/>
+							<reference ref="232633961"/>
+							<reference ref="747940602"/>
+							<reference ref="245364309"/>
+							<reference ref="958472095"/>
+							<reference ref="659838401"/>
+						</array>
+						<reference key="parent" ref="124150811"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">281</int>
+						<reference key="object" ref="1023912461"/>
+						<reference key="parent" ref="186554230"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">286</int>
+						<reference key="object" ref="232633961"/>
+						<reference key="parent" ref="186554230"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">292</int>
+						<reference key="object" ref="747940602"/>
+						<reference key="parent" ref="186554230"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">309</int>
+						<reference key="object" ref="245364309"/>
+						<reference key="parent" ref="186554230"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">310</int>
+						<reference key="object" ref="958472095"/>
+						<reference key="parent" ref="186554230"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">282</int>
+						<reference key="object" ref="311949754"/>
+						<reference key="parent" ref="164090988"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">284</int>
+						<reference key="object" ref="1070611541"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="8470546"/>
+						</array>
+						<reference key="parent" ref="164090988"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">285</int>
+						<reference key="object" ref="8470546"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="832305532"/>
+							<reference ref="680777026"/>
+							<reference ref="919615015"/>
+							<reference ref="480149417"/>
+							<reference ref="220857467"/>
+							<reference ref="781033990"/>
+						</array>
+						<reference key="parent" ref="1070611541"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">287</int>
+						<reference key="object" ref="832305532"/>
+						<reference key="parent" ref="8470546"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">289</int>
+						<reference key="object" ref="680777026"/>
+						<reference key="parent" ref="8470546"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">293</int>
+						<reference key="object" ref="919615015"/>
+						<reference key="parent" ref="8470546"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">311</int>
+						<reference key="object" ref="480149417"/>
+						<reference key="parent" ref="8470546"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">312</int>
+						<reference key="object" ref="220857467"/>
+						<reference key="parent" ref="8470546"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">290</int>
+						<reference key="object" ref="771918864"/>
+						<reference key="parent" ref="164090988"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">303</int>
+						<reference key="object" ref="81274320"/>
+						<reference key="parent" ref="164090988"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">306</int>
+						<reference key="object" ref="471681869"/>
+						<reference key="parent" ref="164090988"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">308</int>
+						<reference key="object" ref="74319449"/>
+						<array class="NSMutableArray" key="children"/>
+						<reference key="parent" ref="164090988"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">103</int>
+						<reference key="object" ref="583922353"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="93586374"/>
+						</array>
+						<reference key="parent" ref="67636175"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">106</int>
+						<reference key="object" ref="93586374"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="151383531"/>
+						</array>
+						<reference key="parent" ref="583922353"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">111</int>
+						<reference key="object" ref="151383531"/>
+						<reference key="parent" ref="93586374"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">253</int>
+						<reference key="object" ref="113826207"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">PcsxrController</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-3</int>
+						<reference key="object" ref="544582716"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Application</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">318</int>
+						<reference key="object" ref="927940433"/>
+						<reference key="parent" ref="164090988"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">320</int>
+						<reference key="object" ref="659838401"/>
+						<reference key="parent" ref="186554230"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">322</int>
+						<reference key="object" ref="781033990"/>
+						<reference key="parent" ref="8470546"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">324</int>
+						<reference key="object" ref="160118245"/>
+						<reference key="parent" ref="164090988"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">329</int>
+						<reference key="object" ref="435063348"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="689397059"/>
+						</array>
+						<reference key="parent" ref="164090988"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">330</int>
+						<reference key="object" ref="689397059"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="861298428"/>
+							<reference ref="989763883"/>
+						</array>
+						<reference key="parent" ref="435063348"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">366</int>
+						<reference key="object" ref="861298428"/>
+						<reference key="parent" ref="689397059"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">367</int>
+						<reference key="object" ref="989763883"/>
+						<reference key="parent" ref="689397059"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">369</int>
+						<reference key="object" ref="126713148"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="37407557"/>
+						</array>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">370</int>
+						<reference key="object" ref="37407557"/>
+						<array class="NSMutableArray" key="children"/>
+						<reference key="parent" ref="126713148"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">371</int>
+						<reference key="object" ref="392373865"/>
+						<reference key="parent" ref="164090988"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">24</int>
+						<reference key="object" ref="1049236981"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="644533453"/>
+							<reference ref="1054009981"/>
+							<reference ref="771858262"/>
+							<reference ref="899940707"/>
+						</array>
+						<reference key="parent" ref="94376406"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300</int>
+						<reference key="object" ref="899940707"/>
+						<reference key="parent" ref="1049236981"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">92</int>
+						<reference key="object" ref="771858262"/>
+						<reference key="parent" ref="1049236981"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">23</int>
+						<reference key="object" ref="1054009981"/>
+						<reference key="parent" ref="1049236981"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5</int>
+						<reference key="object" ref="644533453"/>
+						<reference key="parent" ref="1049236981"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">385</int>
+						<reference key="object" ref="673234762"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="533756997"/>
+						</array>
+						<reference key="parent" ref="67636175"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">386</int>
+						<reference key="object" ref="533756997"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="565183070"/>
+							<reference ref="765134954"/>
+							<reference ref="776941354"/>
+							<reference ref="954724636"/>
+							<reference ref="176343978"/>
+							<reference ref="783530629"/>
+							<reference ref="680570886"/>
+							<reference ref="229289704"/>
+							<reference ref="516638779"/>
+							<reference ref="173003378"/>
+							<reference ref="244499010"/>
+							<reference ref="127680397"/>
+							<reference ref="84727121"/>
+							<reference ref="659372032"/>
+							<reference ref="911210026"/>
+						</array>
+						<reference key="parent" ref="673234762"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">387</int>
+						<reference key="object" ref="565183070"/>
+						<reference key="parent" ref="533756997"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">388</int>
+						<reference key="object" ref="765134954"/>
+						<reference key="parent" ref="533756997"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">389</int>
+						<reference key="object" ref="776941354"/>
+						<reference key="parent" ref="533756997"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">390</int>
+						<reference key="object" ref="954724636"/>
+						<reference key="parent" ref="533756997"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">391</int>
+						<reference key="object" ref="176343978"/>
+						<reference key="parent" ref="533756997"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">392</int>
+						<reference key="object" ref="783530629"/>
+						<reference key="parent" ref="533756997"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">393</int>
+						<reference key="object" ref="680570886"/>
+						<reference key="parent" ref="533756997"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">394</int>
+						<reference key="object" ref="229289704"/>
+						<reference key="parent" ref="533756997"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">395</int>
+						<reference key="object" ref="516638779"/>
+						<reference key="parent" ref="533756997"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">396</int>
+						<reference key="object" ref="173003378"/>
+						<reference key="parent" ref="533756997"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">397</int>
+						<reference key="object" ref="244499010"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="664623024"/>
+						</array>
+						<reference key="parent" ref="533756997"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">398</int>
+						<reference key="object" ref="127680397"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="647269483"/>
+						</array>
+						<reference key="parent" ref="533756997"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">399</int>
+						<reference key="object" ref="84727121"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="407019192"/>
+						</array>
+						<reference key="parent" ref="533756997"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">400</int>
+						<reference key="object" ref="659372032"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1000210660"/>
+						</array>
+						<reference key="parent" ref="533756997"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">401</int>
+						<reference key="object" ref="911210026"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="37927018"/>
+						</array>
+						<reference key="parent" ref="533756997"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">402</int>
+						<reference key="object" ref="37927018"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="241021325"/>
+							<reference ref="331389887"/>
+						</array>
+						<reference key="parent" ref="911210026"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">403</int>
+						<reference key="object" ref="241021325"/>
+						<reference key="parent" ref="37927018"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">404</int>
+						<reference key="object" ref="331389887"/>
+						<reference key="parent" ref="37927018"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">405</int>
+						<reference key="object" ref="1000210660"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="531098726"/>
+							<reference ref="655714324"/>
+							<reference ref="807625103"/>
+						</array>
+						<reference key="parent" ref="659372032"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">406</int>
+						<reference key="object" ref="531098726"/>
+						<reference key="parent" ref="1000210660"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">407</int>
+						<reference key="object" ref="655714324"/>
+						<reference key="parent" ref="1000210660"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">408</int>
+						<reference key="object" ref="807625103"/>
+						<reference key="parent" ref="1000210660"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">409</int>
+						<reference key="object" ref="407019192"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="724718165"/>
+							<reference ref="680766614"/>
+							<reference ref="424480868"/>
+							<reference ref="613047479"/>
+							<reference ref="9511511"/>
+							<reference ref="642077044"/>
+							<reference ref="596040493"/>
+							<reference ref="123077202"/>
+						</array>
+						<reference key="parent" ref="84727121"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">410</int>
+						<reference key="object" ref="724718165"/>
+						<reference key="parent" ref="407019192"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">411</int>
+						<reference key="object" ref="680766614"/>
+						<reference key="parent" ref="407019192"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">412</int>
+						<reference key="object" ref="424480868"/>
+						<reference key="parent" ref="407019192"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">413</int>
+						<reference key="object" ref="613047479"/>
+						<reference key="parent" ref="407019192"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">414</int>
+						<reference key="object" ref="9511511"/>
+						<reference key="parent" ref="407019192"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">415</int>
+						<reference key="object" ref="642077044"/>
+						<reference key="parent" ref="407019192"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">416</int>
+						<reference key="object" ref="596040493"/>
+						<reference key="parent" ref="407019192"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">417</int>
+						<reference key="object" ref="123077202"/>
+						<reference key="parent" ref="407019192"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">418</int>
+						<reference key="object" ref="647269483"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="281214337"/>
+							<reference ref="985465568"/>
+							<reference ref="782448234"/>
+							<reference ref="414874021"/>
+							<reference ref="1027637061"/>
+							<reference ref="645006073"/>
+						</array>
+						<reference key="parent" ref="127680397"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">419</int>
+						<reference key="object" ref="281214337"/>
+						<reference key="parent" ref="647269483"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">420</int>
+						<reference key="object" ref="985465568"/>
+						<reference key="parent" ref="647269483"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">421</int>
+						<reference key="object" ref="782448234"/>
+						<reference key="parent" ref="647269483"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">422</int>
+						<reference key="object" ref="414874021"/>
+						<reference key="parent" ref="647269483"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">423</int>
+						<reference key="object" ref="1027637061"/>
+						<reference key="parent" ref="647269483"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">424</int>
+						<reference key="object" ref="645006073"/>
+						<reference key="parent" ref="647269483"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">425</int>
+						<reference key="object" ref="664623024"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="254096546"/>
+							<reference ref="25196245"/>
+							<reference ref="292022565"/>
+							<reference ref="674131538"/>
+							<reference ref="432214437"/>
+							<reference ref="600600373"/>
+						</array>
+						<reference key="parent" ref="244499010"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">426</int>
+						<reference key="object" ref="254096546"/>
+						<reference key="parent" ref="664623024"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">427</int>
+						<reference key="object" ref="25196245"/>
+						<reference key="parent" ref="664623024"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">428</int>
+						<reference key="object" ref="292022565"/>
+						<reference key="parent" ref="664623024"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">429</int>
+						<reference key="object" ref="674131538"/>
+						<reference key="parent" ref="664623024"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">430</int>
+						<reference key="object" ref="432214437"/>
+						<reference key="parent" ref="664623024"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">456</int>
+						<reference key="object" ref="600600373"/>
+						<reference key="parent" ref="664623024"/>
+					</object>
+				</array>
+			</object>
+			<dictionary class="NSMutableDictionary" key="flattenedProperties">
+				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="103.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="106.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="111.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="129.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="130.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="131.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="134.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="136.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="143.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="144.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="145.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="149.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="150.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="19.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="23.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="24.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="244.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="253.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="266.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="267.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="268.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="270.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="271.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="273.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="278.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="280.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="281.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="282.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="284.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="285.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="286.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="287.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="289.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="29.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="290.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="292.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="293.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="300.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="303.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="306.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="308.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="309.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="310.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="311.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="312.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="318.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="320.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="322.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="324.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="329.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="330.CustomClassName">RecentItemsMenu</string>
+				<string key="330.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="366.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="367.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="369.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="370.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="371.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="385.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="386.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="387.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="388.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="389.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="390.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="391.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="392.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="393.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="394.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="395.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="396.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="397.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="398.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="399.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="400.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="401.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="402.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="403.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="404.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="405.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="406.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="407.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="408.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="409.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="410.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="411.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="412.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="413.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="414.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="415.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="416.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="417.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="418.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="419.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="420.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="421.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="422.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="423.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="424.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="425.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="426.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="427.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="428.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="429.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="430.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="456.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="56.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="57.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="58.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="81.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="83.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="92.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			</dictionary>
+			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+			<nil key="activeLocalization"/>
+			<dictionary class="NSMutableDictionary" key="localizations"/>
+			<nil key="sourceID"/>
+			<int key="maxID">462</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">PcsxrController</string>
+					<string key="superclassName">NSObject</string>
+					<dictionary class="NSMutableDictionary" key="actions">
+						<string key="defrost:">id</string>
+						<string key="ejectCD:">id</string>
+						<string key="freeze:">id</string>
+						<string key="fullscreen:">id</string>
+						<string key="pause:">id</string>
+						<string key="pauseInBackground:">id</string>
+						<string key="preferences:">id</string>
+						<string key="reset:">id</string>
+						<string key="runBios:">id</string>
+						<string key="runCD:">id</string>
+						<string key="runIso:">id</string>
+						<string key="showCheatsWindow:">id</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="actionInfosByName">
+						<object class="IBActionInfo" key="defrost:">
+							<string key="name">defrost:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="ejectCD:">
+							<string key="name">ejectCD:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="freeze:">
+							<string key="name">freeze:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="fullscreen:">
+							<string key="name">fullscreen:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="pause:">
+							<string key="name">pause:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="pauseInBackground:">
+							<string key="name">pauseInBackground:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="preferences:">
+							<string key="name">preferences:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="reset:">
+							<string key="name">reset:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="runBios:">
+							<string key="name">runBios:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="runCD:">
+							<string key="name">runCD:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="runIso:">
+							<string key="name">runIso:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="showCheatsWindow:">
+							<string key="name">showCheatsWindow:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="cheatWindow">NSWindow</string>
+						<string key="preferenceWindow">NSWindow</string>
+						<string key="recentItems">RecentItemsMenu</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="cheatWindow">
+							<string key="name">cheatWindow</string>
+							<string key="candidateClassName">NSWindow</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="preferenceWindow">
+							<string key="name">preferenceWindow</string>
+							<string key="candidateClassName">NSWindow</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="recentItems">
+							<string key="name">recentItems</string>
+							<string key="candidateClassName">RecentItemsMenu</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/PcsxrController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">RecentItemsMenu</string>
+					<string key="superclassName">NSMenu</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">clearRecentDocuments:</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">clearRecentDocuments:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">clearRecentDocuments:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">pcsxr</string>
+						<string key="NS.object.0">PcsxrController</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">pcsxr</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">pcsxr</string>
+							<string key="candidateClassName">PcsxrController</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/RecentItemsMenu.h</string>
+					</object>
+				</object>
+			</array>
+		</object>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<real value="1070" key="NS.object.0"/>
+		</object>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<string key="NSMenuCheckmark">{11, 11}</string>
+			<string key="NSMenuMixedState">{10, 3}</string>
+		</dictionary>
+		<bool key="IBDocument.UseAutolayout">YES</bool>
+	</data>
+</archive>

pcsxr-1.9.93.tar.bz2/macosx/English.lproj/PcsxrMemCardDocument.xib Added

@@ -0,0 +1,1203 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
+	<data>
+		<int key="IBDocument.SystemTarget">1070</int>
+		<string key="IBDocument.SystemVersion">12E55</string>
+		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
+		<string key="IBDocument.AppKitVersion">1187.39</string>
+		<string key="IBDocument.HIToolboxVersion">626.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			<string key="NS.object.0">3084</string>
+		</object>
+		<array key="IBDocument.IntegratedClassDependencies">
+			<string>IBNSLayoutConstraint</string>
+			<string>NSButton</string>
+			<string>NSButtonCell</string>
+			<string>NSCustomObject</string>
+			<string>NSImageCell</string>
+			<string>NSImageView</string>
+			<string>NSTextField</string>
+			<string>NSTextFieldCell</string>
+			<string>NSView</string>
+			<string>NSWindowTemplate</string>
+		</array>
+		<array key="IBDocument.PluginDependencies">
+			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+		</array>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="580458321">
+			<object class="NSCustomObject" id="512844837">
+				<string key="NSClassName">PcsxrMemCardHandler</string>
+			</object>
+			<object class="NSCustomObject" id="613418571">
+				<string key="NSClassName">FirstResponder</string>
+			</object>
+			<object class="NSWindowTemplate" id="275939982">
+				<int key="NSWindowStyleMask">1</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{133, 235}, {416, 148}}</string>
+				<int key="NSWTFlags">1886913536</int>
+				<string key="NSWindowTitle">Memory Card</string>
+				<string key="NSWindowClass">NSWindow</string>
+				<string key="NSViewClass">View</string>
+				<nil key="NSUserInterfaceItemIdentifier"/>
+				<string key="NSWindowContentMaxSize">{416, 155}</string>
+				<string key="NSWindowContentMinSize">{416, 86}</string>
+				<object class="NSView" key="NSWindowView" id="568628114">
+					<reference key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<array class="NSMutableArray" key="NSSubviews">
+						<object class="NSButton" id="665473807">
+							<reference key="NSNextResponder" ref="568628114"/>
+							<int key="NSvFlags">289</int>
+							<string key="NSFrame">{{14, 13}, {90, 34}}</string>
+							<reference key="NSSuperview" ref="568628114"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="678958260"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="300791902">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Cancel</string>
+								<object class="NSFont" key="NSSupport" id="867415120">
+									<string key="NSName">LucidaGrande</string>
+									<double key="NSSize">13</double>
+									<int key="NSfFlags">1558</int>
+								</object>
+								<reference key="NSControlView" ref="665473807"/>
+								<int key="NSButtonFlags">-2038284288</int>
+								<int key="NSButtonFlags2">1</int>
+								<object class="NSFont" key="NSAlternateImage" id="265803471">
+									<string key="NSName">Helvetica</string>
+									<double key="NSSize">13</double>
+									<int key="NSfFlags">16</int>
+								</object>
+								<string key="NSAlternateContents"/>
+								<string type="base64-UTF8" key="NSKeyEquivalent">Gw</string>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSButton" id="678958260">
+							<reference key="NSNextResponder" ref="568628114"/>
+							<int key="NSvFlags">289</int>
+							<string key="NSFrame">{{222, 13}, {90, 34}}</string>
+							<reference key="NSSuperview" ref="568628114"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="128155738"/>
+							<int key="NSTag">1</int>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="492161327">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Slot 1</string>
+								<reference key="NSSupport" ref="867415120"/>
+								<reference key="NSControlView" ref="678958260"/>
+								<int key="NSButtonFlags">-2035924992</int>
+								<int key="NSButtonFlags2">1</int>
+								<reference key="NSAlternateImage" ref="265803471"/>
+								<string key="NSAlternateContents"/>
+								<string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSImageView" id="762837022">
+							<reference key="NSNextResponder" ref="568628114"/>
+							<int key="NSvFlags">268</int>
+							<set class="NSMutableSet" key="NSDragTypes">
+								<string>Apple PDF pasteboard type</string>
+								<string>Apple PICT pasteboard type</string>
+								<string>Apple PNG pasteboard type</string>
+								<object class="NSMutableString">
+									<characters key="NS.bytes">NSFilenamesPboardType</characters>
+								</object>
+								<string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
+								<string>NeXT TIFF v4.0 pasteboard type</string>
+								<object class="NSMutableString">
+									<characters key="NS.bytes">NeXT filename pasteboard type</characters>
+								</object>
+							</set>
+							<string key="NSFrame">{{20, 63}, {64, 64}}</string>
+							<reference key="NSSuperview" ref="568628114"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="540719925"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSImageCell" key="NSCell" id="1016542061">
+								<int key="NSCellFlags">134217728</int>
+								<int key="NSCellFlags2">33554432</int>
+								<object class="NSCustomResource" key="NSContents">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">pcsxrmemcard</string>
+								</object>
+								<int key="NSAlign">0</int>
+								<int key="NSScale">1</int>
+								<int key="NSStyle">0</int>
+								<bool key="NSAnimates">NO</bool>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+							<bool key="NSEditable">NO</bool>
+						</object>
+						<object class="NSTextField" id="540719925">
+							<reference key="NSNextResponder" ref="568628114"/>
+							<int key="NSvFlags">266</int>
+							<string key="NSFrame">{{89, 111}, {310, 17}}</string>
+							<reference key="NSSuperview" ref="568628114"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="141278915"/>
+							<string key="NSAntiCompressionPriority">{250, 750}</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="374738302">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">0</int>
+								<string key="NSContents">Memory Card Selection</string>
+								<object class="NSFont" key="NSSupport">
+									<string key="NSName">LucidaGrande-Bold</string>
+									<double key="NSSize">13</double>
+									<int key="NSfFlags">2072</int>
+								</object>
+								<reference key="NSControlView" ref="540719925"/>
+								<object class="NSColor" key="NSBackgroundColor">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">controlBackgroundColor</string>
+									<object class="NSColor" key="NSColor" id="541592704">
+										<int key="NSColorSpace">3</int>
+										<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+									</object>
+								</object>
+								<object class="NSColor" key="NSTextColor" id="132234883">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">controlTextColor</string>
+									<object class="NSColor" key="NSColor">
+										<int key="NSColorSpace">3</int>
+										<bytes key="NSWhite">MAA</bytes>
+									</object>
+								</object>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSTextField" id="399829104">
+							<reference key="NSNextResponder" ref="568628114"/>
+							<int key="NSvFlags">266</int>
+							<string key="NSFrame">{{89, 44}, {310, 34}}</string>
+							<reference key="NSSuperview" ref="568628114"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="665473807"/>
+							<string key="NSAntiCompressionPriority">{250, 750}</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="878757412">
+								<int key="NSCellFlags">69206017</int>
+								<int key="NSCellFlags2">0</int>
+								<string key="NSContents">Select which memory card slot you want to put this card in?</string>
+								<object class="NSFont" key="NSSupport">
+									<string key="NSName">LucidaGrande</string>
+									<double key="NSSize">11</double>
+									<int key="NSfFlags">3100</int>
+								</object>
+								<reference key="NSControlView" ref="399829104"/>
+								<object class="NSColor" key="NSBackgroundColor" id="767541651">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">controlColor</string>
+									<reference key="NSColor" ref="541592704"/>
+								</object>
+								<reference key="NSTextColor" ref="132234883"/>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSTextField" id="141278915">
+							<reference key="NSNextResponder" ref="568628114"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{89, 86}, {310, 17}}</string>
+							<reference key="NSSuperview" ref="568628114"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="399829104"/>
+							<string key="NSReuseIdentifierKey">_NS:3944</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="745195555">
+								<int key="NSCellFlags">68157504</int>
+								<int key="NSCellFlags2">272630784</int>
+								<string key="NSContents">Label</string>
+								<object class="NSFont" key="NSSupport">
+									<string key="NSName">LucidaGrande</string>
+									<double key="NSSize">13</double>
+									<int key="NSfFlags">1044</int>
+								</object>
+								<string key="NSCellIdentifier">_NS:3944</string>
+								<reference key="NSControlView" ref="141278915"/>
+								<reference key="NSBackgroundColor" ref="767541651"/>
+								<reference key="NSTextColor" ref="132234883"/>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSButton" id="128155738">
+							<reference key="NSNextResponder" ref="568628114"/>
+							<int key="NSvFlags">289</int>
+							<string key="NSFrame">{{312, 13}, {90, 34}}</string>
+							<reference key="NSSuperview" ref="568628114"/>
+							<reference key="NSWindow"/>
+							<int key="NSTag">2</int>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="911160075">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Slot 2</string>
+								<reference key="NSSupport" ref="867415120"/>
+								<reference key="NSControlView" ref="128155738"/>
+								<int key="NSButtonFlags">-2035924992</int>
+								<int key="NSButtonFlags2">1</int>
+								<reference key="NSAlternateImage" ref="265803471"/>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+					</array>
+					<string key="NSFrameSize">{416, 148}</string>
+					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
+					<reference key="NSNextKeyView" ref="762837022"/>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
+				<string key="NSMinSize">{416, 108}</string>
+				<string key="NSMaxSize">{416, 177}</string>
+				<int key="NSWindowAnimationBehavior">5</int>
+				<int key="NSWindowCollectionBehavior">2</int>
+				<bool key="NSWindowIsRestorable">YES</bool>
+			</object>
+			<object class="NSCustomObject" id="796877042">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+		</array>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<array class="NSMutableArray" key="connectionRecords">
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">window</string>
+						<reference key="source" ref="512844837"/>
+						<reference key="destination" ref="275939982"/>
+					</object>
+					<int key="connectionID">18</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">setMemCard:</string>
+						<reference key="source" ref="512844837"/>
+						<reference key="destination" ref="678958260"/>
+					</object>
+					<int key="connectionID">100039</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">setMemCard:</string>
+						<reference key="source" ref="512844837"/>
+						<reference key="destination" ref="128155738"/>
+					</object>
+					<int key="connectionID">100040</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">cardPath</string>
+						<reference key="source" ref="512844837"/>
+						<reference key="destination" ref="141278915"/>
+					</object>
+					<int key="connectionID">100042</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">setMemCard:</string>
+						<reference key="source" ref="512844837"/>
+						<reference key="destination" ref="665473807"/>
+					</object>
+					<int key="connectionID">100044</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="275939982"/>
+						<reference key="destination" ref="512844837"/>
+					</object>
+					<int key="connectionID">17</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">nextKeyView</string>
+						<reference key="source" ref="665473807"/>
+						<reference key="destination" ref="678958260"/>
+					</object>
+					<int key="connectionID">100047</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">nextKeyView</string>
+						<reference key="source" ref="678958260"/>
+						<reference key="destination" ref="128155738"/>
+					</object>
+					<int key="connectionID">100046</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">nextKeyView</string>
+						<reference key="source" ref="128155738"/>
+						<reference key="destination" ref="665473807"/>
+					</object>
+					<int key="connectionID">100038</int>
+				</object>
+			</array>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<array key="orderedObjects">
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<array key="object" id="0"/>
+						<reference key="children" ref="580458321"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="512844837"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="613418571"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">First Responder</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5</int>
+						<reference key="object" ref="275939982"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="568628114"/>
+						</array>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Window</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6</int>
+						<reference key="object" ref="568628114"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="762837022"/>
+							<object class="IBNSLayoutConstraint" id="837194237">
+								<reference key="firstItem" ref="568628114"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="128155738"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="568628114"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="746271169">
+								<reference key="firstItem" ref="128155738"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="678958260"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">12</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="568628114"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="160364154">
+								<reference key="firstItem" ref="128155738"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="678958260"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="568628114"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="779027697">
+								<reference key="firstItem" ref="568628114"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="128155738"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="568628114"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="197686230">
+								<reference key="firstItem" ref="568628114"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="678958260"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="568628114"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="368544597">
+								<reference key="firstItem" ref="678958260"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="665473807"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="568628114"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="523424939">
+								<reference key="firstItem" ref="399829104"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="141278915"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="568628114"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="994414560">
+								<reference key="firstItem" ref="568628114"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="399829104"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="568628114"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="321560929">
+								<reference key="firstItem" ref="399829104"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="762837022"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="568628114"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="958055674">
+								<reference key="firstItem" ref="568628114"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="665473807"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="568628114"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="818172259">
+								<reference key="firstItem" ref="665473807"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="762837022"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="568628114"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="1006935917">
+								<reference key="firstItem" ref="665473807"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="568628114"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="568628114"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="714419246">
+								<reference key="firstItem" ref="568628114"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="141278915"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="568628114"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="1013055263">
+								<reference key="firstItem" ref="141278915"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="762837022"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="568628114"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="968404520">
+								<reference key="firstItem" ref="141278915"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="540719925"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="568628114"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="407674996">
+								<reference key="firstItem" ref="568628114"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="540719925"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="568628114"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="384705128">
+								<reference key="firstItem" ref="540719925"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="762837022"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="568628114"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="22767444">
+								<reference key="firstItem" ref="540719925"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="568628114"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="568628114"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="1046328096">
+								<reference key="firstItem" ref="762837022"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="568628114"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="568628114"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<reference ref="540719925"/>
+							<reference ref="141278915"/>
+							<reference ref="399829104"/>
+							<reference ref="665473807"/>
+							<reference ref="128155738"/>
+							<reference ref="678958260"/>
+						</array>
+						<reference key="parent" ref="275939982"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-3</int>
+						<reference key="object" ref="796877042"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Application</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100021</int>
+						<reference key="object" ref="665473807"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="300791902"/>
+							<object class="IBNSLayoutConstraint" id="373690341">
+								<reference key="firstItem" ref="665473807"/>
+								<int key="firstAttribute">8</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">23</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="665473807"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="137120130">
+								<reference key="firstItem" ref="665473807"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">78</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="665473807"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="568628114"/>
+						<string key="objectName">Cancel Button</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100022</int>
+						<reference key="object" ref="678958260"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="492161327"/>
+							<object class="IBNSLayoutConstraint" id="178654933">
+								<reference key="firstItem" ref="678958260"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">78</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="678958260"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="568628114"/>
+						<string key="objectName">Slot 1 Button</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100023</int>
+						<reference key="object" ref="762837022"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1016542061"/>
+							<object class="IBNSLayoutConstraint" id="369230169">
+								<reference key="firstItem" ref="762837022"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">64</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="762837022"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="815863359">
+								<reference key="firstItem" ref="762837022"/>
+								<int key="firstAttribute">8</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">64</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="762837022"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="568628114"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100024</int>
+						<reference key="object" ref="540719925"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="374738302"/>
+						</array>
+						<reference key="parent" ref="568628114"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100025</int>
+						<reference key="object" ref="399829104"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="878757412"/>
+							<object class="IBNSLayoutConstraint" id="245183837">
+								<reference key="firstItem" ref="399829104"/>
+								<int key="firstAttribute">8</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">34</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="399829104"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="568628114"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100028</int>
+						<reference key="object" ref="878757412"/>
+						<reference key="parent" ref="399829104"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100029</int>
+						<reference key="object" ref="374738302"/>
+						<reference key="parent" ref="540719925"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100030</int>
+						<reference key="object" ref="1016542061"/>
+						<reference key="parent" ref="762837022"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100031</int>
+						<reference key="object" ref="492161327"/>
+						<reference key="parent" ref="678958260"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100032</int>
+						<reference key="object" ref="300791902"/>
+						<reference key="parent" ref="665473807"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100034</int>
+						<reference key="object" ref="141278915"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="745195555"/>
+						</array>
+						<reference key="parent" ref="568628114"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100035</int>
+						<reference key="object" ref="745195555"/>
+						<reference key="parent" ref="141278915"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100036</int>
+						<reference key="object" ref="128155738"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="911160075"/>
+							<object class="IBNSLayoutConstraint" id="763887153">
+								<reference key="firstItem" ref="128155738"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">78</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="128155738"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="568628114"/>
+						<string key="objectName">Slot 2 Button</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100037</int>
+						<reference key="object" ref="911160075"/>
+						<reference key="parent" ref="128155738"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100050</int>
+						<reference key="object" ref="178654933"/>
+						<reference key="parent" ref="678958260"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100056</int>
+						<reference key="object" ref="1046328096"/>
+						<reference key="parent" ref="568628114"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100061</int>
+						<reference key="object" ref="968404520"/>
+						<reference key="parent" ref="568628114"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100062</int>
+						<reference key="object" ref="22767444"/>
+						<reference key="parent" ref="568628114"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100069</int>
+						<reference key="object" ref="763887153"/>
+						<reference key="parent" ref="128155738"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100071</int>
+						<reference key="object" ref="815863359"/>
+						<reference key="parent" ref="762837022"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100072</int>
+						<reference key="object" ref="245183837"/>
+						<reference key="parent" ref="399829104"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100073</int>
+						<reference key="object" ref="137120130"/>
+						<reference key="parent" ref="665473807"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100081</int>
+						<reference key="object" ref="1006935917"/>
+						<reference key="parent" ref="568628114"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100082</int>
+						<reference key="object" ref="384705128"/>
+						<reference key="parent" ref="568628114"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100086</int>
+						<reference key="object" ref="1013055263"/>
+						<reference key="parent" ref="568628114"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100092</int>
+						<reference key="object" ref="321560929"/>
+						<reference key="parent" ref="568628114"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100094</int>
+						<reference key="object" ref="994414560"/>
+						<reference key="parent" ref="568628114"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100095</int>
+						<reference key="object" ref="369230169"/>
+						<reference key="parent" ref="762837022"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100096</int>
+						<reference key="object" ref="714419246"/>
+						<reference key="parent" ref="568628114"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100097</int>
+						<reference key="object" ref="407674996"/>
+						<reference key="parent" ref="568628114"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100098</int>
+						<reference key="object" ref="523424939"/>
+						<reference key="parent" ref="568628114"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100110</int>
+						<reference key="object" ref="818172259"/>
+						<reference key="parent" ref="568628114"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100111</int>
+						<reference key="object" ref="368544597"/>
+						<reference key="parent" ref="568628114"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100117</int>
+						<reference key="object" ref="779027697"/>
+						<reference key="parent" ref="568628114"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100118</int>
+						<reference key="object" ref="160364154"/>
+						<reference key="parent" ref="568628114"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100119</int>
+						<reference key="object" ref="746271169"/>
+						<reference key="parent" ref="568628114"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100120</int>
+						<reference key="object" ref="958055674"/>
+						<reference key="parent" ref="568628114"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100121</int>
+						<reference key="object" ref="197686230"/>
+						<reference key="parent" ref="568628114"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100122</int>
+						<reference key="object" ref="837194237"/>
+						<reference key="parent" ref="568628114"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100123</int>
+						<reference key="object" ref="373690341"/>
+						<reference key="parent" ref="665473807"/>
+					</object>
+				</array>
+			</object>
+			<dictionary class="NSMutableDictionary" key="flattenedProperties">
+				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="100021.IBNSViewMetadataConstraints">
+					<reference ref="137120130"/>
+					<reference ref="373690341"/>
+				</array>
+				<boolean value="NO" key="100021.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="100021.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array class="NSMutableArray" key="100022.IBNSViewMetadataConstraints">
+					<reference ref="178654933"/>
+				</array>
+				<boolean value="NO" key="100022.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="100022.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="100023.IBNSViewMetadataConstraints">
+					<reference ref="815863359"/>
+					<reference ref="369230169"/>
+				</array>
+				<boolean value="NO" key="100023.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="100023.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="100024.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="100024.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array class="NSMutableArray" key="100025.IBNSViewMetadataConstraints">
+					<reference ref="245183837"/>
+				</array>
+				<boolean value="NO" key="100025.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="100025.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100028.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100029.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100030.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100031.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100032.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="100034.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="100034.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100035.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array class="NSMutableArray" key="100036.IBNSViewMetadataConstraints">
+					<reference ref="763887153"/>
+				</array>
+				<boolean value="NO" key="100036.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="100036.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100037.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100050.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100056.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100061.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100062.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100069.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100071.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100072.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100073.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100081.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100082.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100086.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100092.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100094.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100095.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100096.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100097.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100098.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100110.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100111.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100117.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100118.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100119.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100120.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100121.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100122.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100123.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="5.IBWindowTemplateEditedContentRect">{{133, 170}, {507, 413}}</string>
+				<array class="NSMutableArray" key="6.IBNSViewMetadataConstraints">
+					<reference ref="1046328096"/>
+					<reference ref="22767444"/>
+					<reference ref="384705128"/>
+					<reference ref="407674996"/>
+					<reference ref="968404520"/>
+					<reference ref="1013055263"/>
+					<reference ref="714419246"/>
+					<reference ref="1006935917"/>
+					<reference ref="818172259"/>
+					<reference ref="958055674"/>
+					<reference ref="321560929"/>
+					<reference ref="994414560"/>
+					<reference ref="523424939"/>
+					<reference ref="368544597"/>
+					<reference ref="197686230"/>
+					<reference ref="779027697"/>
+					<reference ref="160364154"/>
+					<reference ref="746271169"/>
+					<reference ref="837194237"/>
+				</array>
+				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			</dictionary>
+			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+			<nil key="activeLocalization"/>
+			<dictionary class="NSMutableDictionary" key="localizations"/>
+			<nil key="sourceID"/>
+			<int key="maxID">100123</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">NSLayoutConstraint</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/NSLayoutConstraint.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">PcsxrMemCardHandler</string>
+					<string key="superclassName">NSWindowController</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">setMemCard:</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">setMemCard:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">setMemCard:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">cardPath</string>
+						<string key="NS.object.0">NSTextField</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">cardPath</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">cardPath</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/PcsxrMemCardHandler.h</string>
+					</object>
+				</object>
+			</array>
+		</object>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<real value="1070" key="NS.object.0"/>
+		</object>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<string key="NS.key.0">pcsxrmemcard</string>
+			<string key="NS.object.0">{128, 128}</string>
+		</object>
+		<bool key="IBDocument.UseAutolayout">YES</bool>
+	</data>
+</archive>

pcsxr-1.9.92.tar.bz2/macosx/ExtendedKeys.h -> pcsxr-1.9.93.tar.bz2/macosx/ExtendedKeys.h Changed

pcsxr-1.9.93.tar.bz2/macosx/HotkeyController.h Added

pcsxr-1.9.93.tar.bz2/macosx/HotkeyController.m Added

@@ -0,0 +1,210 @@
+/**
+ *  HotkeyController.m
+ *  Pcsxr
+ *
+ *  Created by Nicolas Pepin-Perreault on 12-12-10.
+ *
+ * Adapted from the Cocoa port of DeSMuMe
+ */
+
+#import "HotkeyController.h"
+#import "ARCBridge.h"
+
+#define INPUT_HOLD_TIME		0.1
+
+@implementation HotkeyController
+
+@synthesize configInput;
+
+- (void)initialize
+{
+	lastConfigButton = nil;
+	configInput = 0;
+	hotkeysList = [[NSMutableDictionary alloc] initWithCapacity:16];
+    keyNameTable = [[NSDictionary alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"KeyNames" ofType:@"plist"]];
+    hotkeyOutlets = [[NSMutableDictionary alloc] initWithCapacity:8];
+    
+    [self mapOutletToIdentifier:FastForward forIdentifier:@"FastForward"];
+	[self mapOutletToIdentifier:SaveState forIdentifier:@"SaveState"];
+    [self mapOutletToIdentifier:LoadState forIdentifier:@"LoadState"];
+    [self mapOutletToIdentifier:NextState forIdentifier:@"NextState"];
+    [self mapOutletToIdentifier:PrevState forIdentifier:@"PrevState"];
+    [self mapOutletToIdentifier:FrameLimit forIdentifier:@"FrameLimit"];
+}
+
+- (void)dealloc
+{
+	[[NSNotificationCenter defaultCenter] removeObserver:self];
+
+#if !__has_feature(objc_arc)
+	[hotkeysList release];
+	[keyNameTable release];
+    [hotkeyOutlets release];
+	
+	[super dealloc];
+#endif
+}
+
+- (void)mapOutletToIdentifier:(id)outlet forIdentifier:(NSString*)identifier
+{
+    [hotkeyOutlets setObject:outlet forKey:identifier];
+    [self setHotkeyDisplay:identifier];
+}
+
+- (void)setHotkeyDisplay:(NSString*)keyIdent
+{
+    NSString *label = [self parseMappingDisplayString:keyIdent];
+    NSTextField *displayField = [hotkeyOutlets objectForKey:keyIdent];
+    
+    if(displayField) {
+        [[displayField cell] setStringValue:label];
+    }
+}
+
+- (void)mouseDown:(NSEvent *)theEvent
+{
+	BOOL isHandled = [self handleMouseDown:theEvent];
+	if (!isHandled)
+	{
+		[super mouseDown:theEvent];
+	}
+}
+
+- (void)mouseDragged:(NSEvent *)theEvent
+{
+	[self mouseDown:theEvent];
+}
+
+- (void)rightMouseDown:(NSEvent *)theEvent
+{
+	BOOL isHandled = [self handleMouseDown:theEvent];
+	if (!isHandled)
+	{
+		[super rightMouseDown:theEvent];
+	}
+}
+
+- (void)rightMouseDragged:(NSEvent *)theEvent
+{
+	[self rightMouseDown:theEvent];
+}
+
+- (void)otherMouseDown:(NSEvent *)theEvent
+{
+	BOOL isHandled = [self handleMouseDown:theEvent];
+	if (!isHandled)
+	{
+		[super otherMouseDown:theEvent];
+	}
+}
+
+- (void)otherMouseDragged:(NSEvent *)theEvent
+{
+	[self otherMouseDown:theEvent];
+}
+
+- (BOOL) handleMouseDown:(NSEvent *)mouseEvent
+{
+	if (configInput != 0)
+	{
+		[self hotkeyCancel];
+	}
+	
+	return YES;
+}
+
+- (void)keyDown:(NSEvent *)theEvent
+{
+	NSString *keyCode = [NSString stringWithFormat:@"%d", [theEvent keyCode]];
+	NSString *keyLabel = (NSString *)[keyNameTable valueForKey:keyCode];
+	
+	if (configInput != 0)
+	{
+		// Save input
+        NSString *ident = [lastConfigButton identifier];
+        [self saveHotkey:ident device:@"NSEventKeyboard" deviceLabel:@"Keyboard" code:keyCode label:keyLabel];
+        [self setHotkeyDisplay:ident];
+		[self hotkeyCancel];
+	}
+}
+
+- (void)saveHotkey:(NSString*)keyIdent device:(NSString*)device deviceLabel:(NSString*)deviceLabel code:(NSString*)keyCode label:(NSString*)keyLabel
+{
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults] ;
+	NSMutableDictionary *tempUserMappings = [NSMutableDictionary dictionaryWithDictionary:[defaults dictionaryForKey:@"HotkeyBindings"]];
+	[tempUserMappings setValue:[NSDictionary dictionaryWithObjectsAndKeys:
+        device, @"device",
+        deviceLabel, @"deviceName",
+        keyCode, @"keyCode",
+        keyLabel, @"keyLabel",
+        nil] forKey:keyIdent];
+	[defaults setValue:tempUserMappings forKey:@"HotkeyBindings"];
+}
+
+- (NSString *) parseMappingDisplayString:(NSString *)keyString
+{
+	NSDictionary *userMappings = [[NSUserDefaults standardUserDefaults] dictionaryForKey:@"HotkeyBindings"];
+	NSDictionary *binding = (NSDictionary *)[userMappings valueForKey:keyString];
+	
+    NSString *displayString = @"";
+    if(binding) {
+        NSString *deviceLabel = (NSString *)[binding valueForKey:@"deviceName"];
+        NSString *keyLabel = (NSString *)[binding valueForKey:@"keyLabel"];
+    
+        displayString = [NSString stringWithString:deviceLabel];
+        displayString = [displayString stringByAppendingString:@": "];
+        displayString = [displayString stringByAppendingString:keyLabel];
+	}
+    
+	return displayString;
+}
+
+- (IBAction) hotkeySet:(id)sender
+{
+	NSButton *theButton = (NSButton *)sender;
+	
+	if (configInput && lastConfigButton != theButton)
+	{
+		[lastConfigButton setState:NSOffState];
+	}
+	
+	if ([theButton state] == NSOnState)
+	{
+		lastConfigButton = theButton;
+		[hotkeysList removeAllObjects];
+		configInput = [theButton tag];
+	}
+	else
+	{
+		[self hotkeyCancel];
+	}
+    
+}
+
+- (void) hotkeyCancel
+{
+	if (lastConfigButton != nil)
+	{
+		[lastConfigButton setState:NSOffState];
+		lastConfigButton = nil;
+	}
+	
+	configInput = 0;
+}
+
+- (BOOL)acceptsFirstResponder
+{
+	return YES;
+}
+
+- (BOOL)becomeFirstResponder
+{
+	return YES;
+}
+
+- (BOOL)resignFirstResponder
+{
+	return YES;
+}
+
+@end

pcsxr-1.9.92.tar.bz2/macosx/Info.plist -> pcsxr-1.9.93.tar.bz2/macosx/Info.plist Changed

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
@@ -12,7 +12,7 @@
 				<string>psxplugin</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
-			<string>psxplugin.icns</string>
+			<string>psxplugin</string>
 			<key>CFBundleTypeName</key>
 			<string>Playstation Emulator Plug-in</string>
 			<key>CFBundleTypeOSTypes</key>
@@ -21,10 +21,12 @@
 			</array>
 			<key>CFBundleTypeRole</key>
 			<string>Viewer</string>
+			<key>LSItemContentTypes</key>
+			<array>
+				<string>com.codeplex.pcsxr.plugin</string>
+			</array>
 			<key>LSTypeIsPackage</key>
 			<true/>
-			<key>NSDocumentClass</key>
-			<string>PcsxPluginDocument</string>
 		</dict>
 		<dict>
 			<key>CFBundleTypeExtensions</key>
@@ -32,7 +34,7 @@
 				<string>bin</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
-			<string>psxbios.icns</string>
+			<string>psxbios</string>
 			<key>CFBundleTypeName</key>
 			<string>Playstation BIOS Image</string>
 			<key>CFBundleTypeOSTypes</key>
@@ -48,60 +50,302 @@
 			<key>CFBundleTypeExtensions</key>
 			<array>
 				<string>mcr</string>
+				<string>mc</string>
+				<string>mem</string>
+				<string>vgs</string>
+				<string>mcd</string>
+				<string>gme</string>
+				<string>ddf</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
-			<string>pcsxmemcard</string>
+			<string>pcsxrmemcard</string>
 			<key>CFBundleTypeName</key>
-			<string>PCSX Memory Card</string>
+			<string>PCSXR Memory Card</string>
 			<key>CFBundleTypeOSTypes</key>
 			<array>
 				<string>Pmcr</string>
 			</array>
 			<key>CFBundleTypeRole</key>
-			<string>Viewer</string>
+			<string>Editor</string>
+			<key>LSItemContentTypes</key>
+			<array>
+				<string>com.codeplex.pcsxr.memcard</string>
+			</array>
 			<key>LSTypeIsPackage</key>
 			<false/>
 		</dict>
 		<dict>
 			<key>CFBundleTypeExtensions</key>
 			<array>
-				<string>pcsxstate</string>
+				<string>pcsxrstate</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
-			<string>pcsxfreeze</string>
+			<string>pcsxrfreeze</string>
 			<key>CFBundleTypeName</key>
-			<string>PCSX Freeze State</string>
+			<string>PCSXR Freeze State</string>
 			<key>CFBundleTypeOSTypes</key>
 			<array>
 				<string>Pfrz</string>
 			</array>
 			<key>CFBundleTypeRole</key>
 			<string>Viewer</string>
+			<key>LSItemContentTypes</key>
+			<array>
+				<string>com.codeplex.pcsxr.freeze</string>
+			</array>
 			<key>LSTypeIsPackage</key>
 			<false/>
 		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>iso</string>
+				<string>bin</string>
+				<string>cue</string>
+				<string>mdf</string>
+				<string>img</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>PlayStation Disc</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+			<key>LSItemContentTypes</key>
+			<array>
+				<string>com.sony.psp.firmware</string>
+				<string>com.codeplex.pcsxr.compressed-bin-image</string>
+				<string>com.alcohol-soft.mdfdisc</string>
+				<string>com.apple.disk-image-ndif</string>
+				<string>com.goldenhawk.cdrwin-cuesheet</string>
+				<string>public.iso-image</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>cht</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>Playstation Cheat</string>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>LSItemContentTypes</key>
+			<array>
+				<string>com.codeplex.pcsxr.cheat</string>
+			</array>
+		</dict>
 	</array>
 	<key>CFBundleExecutable</key>
-	<string>PCSX</string>
+	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIconFile</key>
-	<string>PCSX.icns</string>
+	<string>PCSXR</string>
 	<key>CFBundleIdentifier</key>
 	<string>com.codeplex.pcsxr</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>PCSX</string>
+	<string>PCSXR</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>PCSX-Reloaded 1.9.92</string>
+	<string>1.9.93</string>
 	<key>CFBundleSignature</key>
 	<string>Pcsx</string>
 	<key>CFBundleVersion</key>
-	<string>1.9.92</string>
+	<string>SVNREVISION</string>
+	<key>LSApplicationCategoryType</key>
+	<string>public.app-category.games</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.7.0</string>
 	<key>NSMainNibFile</key>
-	<string>PCSX.nib</string>
+	<string>PCSXR</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
+	<key>UTExportedTypeDeclarations</key>
+	<array>
+		<dict>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>com.apple.package</string>
+				<string>com.apple.bundle</string>
+			</array>
+			<key>UTTypeDescription</key>
+			<string>Playstation Emulator Plug-in</string>
+			<key>UTTypeIconFile</key>
+			<string>psxplugin</string>
+			<key>UTTypeIdentifier</key>
+			<string>com.codeplex.pcsxr.plugin</string>
+			<key>UTTypeReferenceURL</key>
+			<string>http://pcsxr.codeplex.com/</string>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>com.apple.ostype</key>
+				<array>
+					<string>PsxP</string>
+				</array>
+				<key>public.filename-extension</key>
+				<array>
+					<string>psxplugin</string>
+				</array>
+			</dict>
+		</dict>
+		<dict>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.data</string>
+				<string>public.content</string>
+			</array>
+			<key>UTTypeDescription</key>
+			<string>PCSXR Memory Card</string>
+			<key>UTTypeIconFile</key>
+			<string>pcsxrmemcard</string>
+			<key>UTTypeIdentifier</key>
+			<string>com.codeplex.pcsxr.memcard</string>
+			<key>UTTypeReferenceURL</key>
+			<string>http://pcsxr.codeplex.com/</string>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>com.apple.ostype</key>
+				<array>
+					<string>Pmcr</string>
+				</array>
+				<key>public.filename-extension</key>
+				<array>
+					<string>mcr</string>
+					<string>mc</string>
+					<string>mem</string>
+					<string>vgs</string>
+					<string>mcd</string>
+					<string>gme</string>
+					<string>ddf</string>
+				</array>
+			</dict>
+		</dict>
+		<dict>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.data</string>
+				<string>public.content</string>
+			</array>
+			<key>UTTypeDescription</key>
+			<string>PCSXR Freeze State</string>
+			<key>UTTypeIconFile</key>
+			<string>pcsxrfreeze</string>
+			<key>UTTypeIdentifier</key>
+			<string>com.codeplex.pcsxr.freeze</string>
+			<key>UTTypeReferenceURL</key>
+			<string>http://pcsxr.codeplex.com/</string>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>com.apple.ostype</key>
+				<array>
+					<string>Pfrz</string>
+				</array>
+				<key>public.filename-extension</key>
+				<array>
+					<string>pcsxrstate</string>
+				</array>
+			</dict>
+		</dict>
+		<dict>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.text</string>
+				<string>public.data</string>
+			</array>
+			<key>UTTypeDescription</key>
+			<string>PCSXR Cheat</string>
+			<key>UTTypeIdentifier</key>
+			<string>com.codeplex.pcsxr.cheat</string>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>cht</string>
+				</array>
+			</dict>
+		</dict>
+	</array>
+	<key>UTImportedTypeDeclarations</key>
+	<array>
+		<dict>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.plain-text</string>
+				<string>public.disk-image</string>
+			</array>
+			<key>UTTypeDescription</key>
+			<string>bin/cue Disc Image</string>
+			<key>UTTypeIdentifier</key>
+			<string>com.goldenhawk.cdrwin-cuesheet</string>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>cue</string>
+					<string>inst</string>
+				</array>
+				<key>public.mime-type</key>
+				<string>application/x-cue</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.disk-image</string>
+				<string>public.data</string>
+			</array>
+			<key>UTTypeDescription</key>
+			<string>Alcohol Disc Image</string>
+			<key>UTTypeIdentifier</key>
+			<string>com.alcohol-soft.mdfdisc</string>
+			<key>UTTypeReferenceURL</key>
+			<string>http://www.alcohol-soft.com</string>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>mdf</string>
+				</array>
+			</dict>
+		</dict>
+		<dict>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.disk-image</string>
+				<string>public.data</string>
+			</array>
+			<key>UTTypeDescription</key>
+			<string>PSP firmware dump</string>
+			<key>UTTypeIdentifier</key>
+			<string>com.sony.psp.firmware</string>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>pbp</string>
+				</array>
+			</dict>
+		</dict>
+		<dict>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.disk-image</string>
+				<string>public.data</string>
+				<string>public.archive</string>
+			</array>
+			<key>UTTypeDescription</key>
+			<string>Compressed bin Disc Image</string>
+			<key>UTTypeIdentifier</key>
+			<string>com.codeplex.pcsxr.compressed-bin-image</string>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>cbin</string>
+					<string>cbn</string>
+				</array>
+			</dict>
+		</dict>
+	</array>
 </dict>
 </plist>

pcsxr-1.9.93.tar.bz2/macosx/LaunchArg.h Added

pcsxr-1.9.93.tar.bz2/macosx/LaunchArg.m Added

@@ -0,0 +1,71 @@
+//
+//  LaunchArg.m
+//  Pcsxr
+//
+//  Created by C.W. Betts on 7/8/13.
+//
+//
+
+#import "LaunchArg.h"
+
+@interface LaunchArg ()
+@property (readwrite) LaunchArgOrder launchOrder;
+@property (readwrite, copy, nonatomic) dispatch_block_t theBlock;
+@property (readwrite, arcretain) NSString *argument;
+
+@end
+
+@implementation LaunchArg
+@synthesize argument = _argument;
+@synthesize launchOrder = _launchOrder;
+@synthesize theBlock = _theBlock;
+- (void)setTheBlock:(dispatch_block_t)theBlock
+{
+#if __has_feature(objc_arc)
+	_theBlock = [theBlock copy];
+#else
+	if (_theBlock == theBlock) {
+		return;
+	}
+	dispatch_block_t tmpBlock = _theBlock;
+	_theBlock = [theBlock copy];
+	[tmpBlock release];
+#endif
+}
+
+- (id)initWithLaunchOrder:(LaunchArgOrder)order argument:(NSString*)arg block:(dispatch_block_t)block
+{
+	return [self initWithLaunchOrder:order block:block argument:arg];
+}
+
+- (id)initWithLaunchOrder:(LaunchArgOrder)order block:(dispatch_block_t)block argument:(NSString*)arg
+{
+	if (self = [super init]) {
+		self.launchOrder = order;
+		self.theBlock = block;
+		self.argument = arg;
+	}
+	return self;
+}
+
+- (void)addToDictionary:(NSMutableDictionary*)toAdd
+{
+	[toAdd setObject:self forKey:self.argument];
+}
+
+- (NSString*)description
+{
+	return [NSString stringWithFormat:@"Arg: %@, order: %u, block addr: %p", _argument, _launchOrder, _theBlock];
+}
+
+#if !__has_feature(objc_arc)
+- (void)dealloc
+{
+	self.theBlock = nil;
+	self.argument = nil;
+	
+	[super dealloc];
+}
+#endif
+
+@end

pcsxr-1.9.93.tar.bz2/macosx/MemBadgeView.h Added

pcsxr-1.9.93.tar.bz2/macosx/MemBadgeView.m Added

@@ -0,0 +1,54 @@
+//
+//  MemBadgeView.m
+//  Pcsxr
+//
+//  Created by C.W. Betts on 7/6/13.
+//
+//
+
+#import "MemBadgeView.h"
+#import "ARCBridge.h"
+
+@implementation MemBadgeView
+
+//TODO: also include the memory count in the view as well.
+- (id)initWithFrame:(NSRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        // Initialization code here.
+    }
+    
+    return self;
+}
+
+- (void)drawRect:(NSRect)dirtyRect
+{
+	NSRect drawToRect = dirtyRect;
+	NSImage *tmpDraw = nil;
+	if (!NSEqualSizes(self.frame.size, dirtyRect.size)) {
+		drawToRect = (NSRect) {NSZeroPoint, self.frame.size};
+		tmpDraw = [[NSImage alloc] initWithSize:drawToRect.size];
+		[tmpDraw lockFocus];
+	}
+	
+	[[NSColor whiteColor] set];
+	[[NSBezierPath bezierPathWithOvalInRect:drawToRect] fill];
+	[[NSColor redColor] set];
+	NSRect smallerRect = drawToRect;
+	smallerRect.origin.x += 2;
+	smallerRect.origin.y += 2;
+	smallerRect.size.height -= 4;
+	smallerRect.size.width -= 4;
+	[[NSBezierPath bezierPathWithOvalInRect:smallerRect] fill];
+
+	if (tmpDraw) {
+		[tmpDraw unlockFocus];
+		
+		[tmpDraw drawInRect:dirtyRect fromRect:dirtyRect operation:NSCompositeSourceOver fraction:1.0];
+		
+		RELEASEOBJ(tmpDraw);
+	}
+}
+
+@end

pcsxr-1.9.93.tar.bz2/macosx/OSXPlugLocalization.h Added

pcsxr-1.9.93.tar.bz2/macosx/Pcsxr.xcodeproj Added

pcsxr-1.9.93.tar.bz2/macosx/Pcsxr.xcodeproj/project.pbxproj Added

@@ -0,0 +1,3363 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXAggregateTarget section */
+		55906B1717C28E490057F60D /* Make SVN revision */ = {
+			isa = PBXAggregateTarget;
+			buildConfigurationList = 55906B1817C28E490057F60D /* Build configuration list for PBXAggregateTarget "Make SVN revision" */;
+			buildPhases = (
+				55906B1C17C28E530057F60D /* ShellScript */,
+			);
+			dependencies = (
+			);
+			name = "Make SVN revision";
+			productName = "Make SVN revision";
+		};
+/* End PBXAggregateTarget section */
+
+/* Begin PBXBuildFile section */
+		02717968167884C9004AED62 /* hotkeys.m in Sources */ = {isa = PBXBuildFile; fileRef = 02717967167884C9004AED62 /* hotkeys.m */; };
+		0280B7AD16764CC5007B8001 /* HotkeyController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0280B7AC16764CC3007B8001 /* HotkeyController.m */; };
+		02FE55E816765F9400205CF2 /* KeyNames.plist in Resources */ = {isa = PBXBuildFile; fileRef = 02FE55E616765F9400205CF2 /* KeyNames.plist */; };
+		28F0C3C6146521A700A90285 /* Configuration.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28F0C3C4146521A700A90285 /* Configuration.xib */; };
+		28F0C3C9146521B000A90285 /* PCSXR.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28F0C3C7146521B000A90285 /* PCSXR.xib */; };
+		28F0C3CC146521B700A90285 /* AddPluginSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28F0C3CA146521B700A90285 /* AddPluginSheet.xib */; };
+		2B143D06078A2CBD00AF745A /* PCSXR.icns in Resources */ = {isa = PBXBuildFile; fileRef = 2B143D01078A2CBD00AF745A /* PCSXR.icns */; };
+		2B143D07078A2CBD00AF745A /* pcsxrfreeze.icns in Resources */ = {isa = PBXBuildFile; fileRef = 2B143D02078A2CBD00AF745A /* pcsxrfreeze.icns */; };
+		2B143D08078A2CBD00AF745A /* pcsxrmemcard.icns in Resources */ = {isa = PBXBuildFile; fileRef = 2B143D03078A2CBD00AF745A /* pcsxrmemcard.icns */; };
+		2B143D09078A2CBD00AF745A /* psxbios.icns in Resources */ = {isa = PBXBuildFile; fileRef = 2B143D04078A2CBD00AF745A /* psxbios.icns */; };
+		2B143D0A078A2CBD00AF745A /* psxplugin.icns in Resources */ = {isa = PBXBuildFile; fileRef = 2B143D05078A2CBD00AF745A /* psxplugin.icns */; };
+		2B4DE99205FF9307003EFEF0 /* PluginController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B4DE98E05FF9307003EFEF0 /* PluginController.m */; };
+		2BB3D6A405427FE200831ACB /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2BA178B20514CE260026D74D /* InfoPlist.strings */; };
+		2BB3D6A705427FE200831ACB /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 2BBB1786051E0D9700B84448 /* Credits.rtf */; };
+		2BB3D6BE05427FE200831ACB /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 2BA178A505148D9D0026D74D /* main.m */; };
+		2BB3D6BF05427FE200831ACB /* PcsxrController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B75FD3D051C56D200D12034 /* PcsxrController.m */; };
+		2BB3D6C005427FE200831ACB /* ConfigurationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B75FD4B051C8A7400D12034 /* ConfigurationController.m */; };
+		2BB3D6C105427FE200831ACB /* PluginList.m in Sources */ = {isa = PBXBuildFile; fileRef = 2BBB1127051DC00500B84448 /* PluginList.m */; };
+		2BB3D6C205427FE200831ACB /* EmuThread.m in Sources */ = {isa = PBXBuildFile; fileRef = 2BBB1792051E113B00B84448 /* EmuThread.m */; };
+		2BB3D6C305427FE200831ACB /* Plugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BBB17DA051E4D0F00B84448 /* Plugin.c */; };
+		2BB3D6C405427FE200831ACB /* PcsxrPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 2BA44361052DB2EA00E21DDD /* PcsxrPlugin.m */; };
+		550F023D17BFFD97002594DF /* PcsxrHexadecimalFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 550F023C17BFFD97002594DF /* PcsxrHexadecimalFormatter.m */; };
+		551A75C917868C4E0052D185 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 551A749E17868B110052D185 /* Cocoa.framework */; };
+		551A75CF17868C860052D185 /* Bladesio1PluginConfig.xib in Resources */ = {isa = PBXBuildFile; fileRef = 551A74B417868BEA0052D185 /* Bladesio1PluginConfig.xib */; };
+		551A75D017868C860052D185 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 551A74B617868BEA0052D185 /* Credits.rtf */; };
+		551A75D117868C860052D185 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 551A74B817868BEA0052D185 /* InfoPlist.strings */; };
+		551A75D217868C860052D185 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 551A74BA17868BEA0052D185 /* Localizable.strings */; };
+		551A75D317868D0C0052D185 /* cfg.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A74BF17868BEA0052D185 /* cfg.c */; };
+		551A75D417868D1A0052D185 /* PluginConfigController.m in Sources */ = {isa = PBXBuildFile; fileRef = 551A74C117868BEA0052D185 /* PluginConfigController.m */; };
+		551A75D517868D390052D185 /* connection.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A75BC17868C400052D185 /* connection.c */; };
+		551A75D617868D390052D185 /* fifo.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A75BE17868C400052D185 /* fifo.c */; };
+		551A75D717868D390052D185 /* sio1.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A75C217868C400052D185 /* sio1.c */; };
+		551A7675178690500052D185 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 551A749E17868B110052D185 /* Cocoa.framework */; };
+		551A767B178690AD0052D185 /* cdr-macosx.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A751317868BEB0052D185 /* cdr-macosx.c */; };
+		551A767C178690AD0052D185 /* cfg.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A751417868BEB0052D185 /* cfg.c */; };
+		551A767D178690AD0052D185 /* PluginConfigController.m in Sources */ = {isa = PBXBuildFile; fileRef = 551A751617868BEB0052D185 /* PluginConfigController.m */; };
+		551A767E178690B80052D185 /* cdr.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A75F417868E640052D185 /* cdr.c */; };
+		551A767F178690B80052D185 /* util.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A75FB17868E640052D185 /* util.c */; };
+		551A7680178690EE0052D185 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 551A750917868BEB0052D185 /* Credits.rtf */; };
+		551A7681178690EE0052D185 /* DFCdromPluginConfig.xib in Resources */ = {isa = PBXBuildFile; fileRef = 551A750B17868BEB0052D185 /* DFCdromPluginConfig.xib */; };
+		551A7682178690EE0052D185 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 551A750D17868BEB0052D185 /* InfoPlist.strings */; };
+		551A7683178690EE0052D185 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 551A750F17868BEB0052D185 /* Localizable.strings */; };
+		551A7685178691170052D185 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 551A7684178691170052D185 /* IOKit.framework */; };
+		551A76891786919F0052D185 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 551A749E17868B110052D185 /* Cocoa.framework */; };
+		551A76921786922A0052D185 /* sdljoy.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A766D1786901F0052D185 /* sdljoy.c */; };
+		551A7693178692330052D185 /* analog.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A76661786901F0052D185 /* analog.c */; };
+		551A7694178692330052D185 /* pad.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A766B1786901F0052D185 /* pad.c */; };
+		551A76951786923E0052D185 /* cfg.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A752717868BEB0052D185 /* cfg.c */; };
+		551A76961786923E0052D185 /* ControllerList.m in Sources */ = {isa = PBXBuildFile; fileRef = 551A752A17868BEB0052D185 /* ControllerList.m */; };
+		551A76971786923E0052D185 /* MappingCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 551A752C17868BEB0052D185 /* MappingCell.m */; };
+		551A76981786923E0052D185 /* PadController.m in Sources */ = {isa = PBXBuildFile; fileRef = 551A752E17868BEB0052D185 /* PadController.m */; };
+		551A76991786923E0052D185 /* PadView.m in Sources */ = {isa = PBXBuildFile; fileRef = 551A753017868BEB0052D185 /* PadView.m */; };
+		551A769A1786923E0052D185 /* xkb.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A753117868BEB0052D185 /* xkb.c */; };
+		551A769B178692470052D185 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 551A751D17868BEB0052D185 /* Credits.rtf */; };
+		551A769C178692470052D185 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 551A751F17868BEB0052D185 /* InfoPlist.strings */; };
+		551A769D178692470052D185 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 551A752117868BEB0052D185 /* Localizable.strings */; };
+		551A769E178692470052D185 /* NetPcsxrHIDInputPluginMain.xib in Resources */ = {isa = PBXBuildFile; fileRef = 551A752317868BEB0052D185 /* NetPcsxrHIDInputPluginMain.xib */; };
+		551A76B7178693FF0052D185 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 551A749E17868B110052D185 /* Cocoa.framework */; };
+		551A76BD1786953B0052D185 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 551A756817868BEC0052D185 /* Credits.rtf */; };
+		551A76BE1786953B0052D185 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 551A756A17868BEC0052D185 /* InfoPlist.strings */; };
+		551A76BF1786953B0052D185 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 551A756C17868BEC0052D185 /* Localizable.strings */; };
+		551A76C01786953B0052D185 /* NetSfPeopsSoftGPUConfig.xib in Resources */ = {isa = PBXBuildFile; fileRef = 551A756E17868BEC0052D185 /* NetSfPeopsSoftGPUConfig.xib */; };
+		551A76C11786953F0052D185 /* gpuPeteOGL2.slf in Resources */ = {isa = PBXBuildFile; fileRef = 551A757017868BEC0052D185 /* gpuPeteOGL2.slf */; };
+		551A76C21786953F0052D185 /* gpuPeteOGL2.slv in Resources */ = {isa = PBXBuildFile; fileRef = 551A757117868BEC0052D185 /* gpuPeteOGL2.slv */; };
+		551A76C31786953F0052D185 /* NetSfPeopsSoftGPUInterface.xib in Resources */ = {isa = PBXBuildFile; fileRef = 551A757F17868BED0052D185 /* NetSfPeopsSoftGPUInterface.xib */; };
+		551A76C41786954B0052D185 /* drawgl.m in Sources */ = {isa = PBXBuildFile; fileRef = 551A757417868BEC0052D185 /* drawgl.m */; };
+		551A76C51786954B0052D185 /* PluginConfigController.m in Sources */ = {isa = PBXBuildFile; fileRef = 551A757717868BEC0052D185 /* PluginConfigController.m */; };
+		551A76C61786954B0052D185 /* PluginGLView.m in Sources */ = {isa = PBXBuildFile; fileRef = 551A757917868BEC0052D185 /* PluginGLView.m */; };
+		551A76C71786954B0052D185 /* PluginWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 551A757B17868BEC0052D185 /* PluginWindow.m */; };
+		551A76C81786954B0052D185 /* PluginWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 551A757D17868BEC0052D185 /* PluginWindowController.m */; };
+		551A76CA178695840052D185 /* fps.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A763017868F270052D185 /* fps.c */; };
+		551A76CB178695840052D185 /* gpu.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A763217868F270052D185 /* gpu.c */; };
+		551A76CC178695840052D185 /* key.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A763B17868F280052D185 /* key.c */; };
+		551A76CD178695840052D185 /* menu.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A763F17868F280052D185 /* menu.c */; };
+		551A76CE178695840052D185 /* prim.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A764117868F280052D185 /* prim.c */; };
+		551A76CF178695840052D185 /* soft.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A764317868F280052D185 /* soft.c */; };
+		551A76D0178695840052D185 /* zn.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A764617868F280052D185 /* zn.c */; };
+		551A76D3178695D10052D185 /* GLUT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 551A76D1178695BD0052D185 /* GLUT.framework */; };
+		551A76D4178695D20052D185 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 551A76D2178695C70052D185 /* OpenGL.framework */; };
+		551A76D61786960C0052D185 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 551A749E17868B110052D185 /* Cocoa.framework */; };
+		551A76D7178696110052D185 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 551A7684178691170052D185 /* IOKit.framework */; };
+		551A76D9178696810052D185 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 551A76D8178696810052D185 /* libz.dylib */; };
+		551A76DD178696BD0052D185 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 551A749E17868B110052D185 /* Cocoa.framework */; };
+		551A76E81786971B0052D185 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 551A749E17868B110052D185 /* Cocoa.framework */; };
+		551A76F2178697A50052D185 /* NamedSlider.m in Sources */ = {isa = PBXBuildFile; fileRef = 551A755017868BEC0052D185 /* NamedSlider.m */; };
+		551A76F3178697A50052D185 /* SPUPluginController.m in Sources */ = {isa = PBXBuildFile; fileRef = 551A755417868BEC0052D185 /* SPUPluginController.m */; };
+		551A76F6178697D70052D185 /* libSPUSharedCode.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 551A76E71786971B0052D185 /* libSPUSharedCode.dylib */; };
+		551A76F7178697E70052D185 /* PluginController.m in Sources */ = {isa = PBXBuildFile; fileRef = 551A755217868BEC0052D185 /* PluginController.m */; };
+		551A76F8178698130052D185 /* sdl.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A762117868EF00052D185 /* sdl.c */; };
+		551A76F9178698130052D185 /* spu.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A762217868EF00052D185 /* spu.c */; };
+		551A76FA178698130052D185 /* xa.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A762817868EF00052D185 /* xa.c */; };
+		551A76FB178698160052D185 /* reverb.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A761F17868EF00052D185 /* reverb.c */; };
+		551A76FC1786981A0052D185 /* registers.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A761C17868EF00052D185 /* registers.c */; };
+		551A76FD178698230052D185 /* freeze.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A761417868EF00052D185 /* freeze.c */; };
+		551A76FF178698390052D185 /* dma.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A760F17868EF00052D185 /* dma.c */; };
+		551A77001786983C0052D185 /* adsr.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A760A17868EF00052D185 /* adsr.c */; };
+		551A7701178698600052D185 /* externals.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A761217868EF00052D185 /* externals.c */; };
+		551A7702178698980052D185 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 551A755D17868BEC0052D185 /* InfoPlist.strings */; };
+		551A7703178698980052D185 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 551A756017868BEC0052D185 /* Credits.rtf */; };
+		551A7704178698980052D185 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 551A756217868BEC0052D185 /* Localizable.strings */; };
+		551A7705178698980052D185 /* NetSfPeopsSpuPluginMain.xib in Resources */ = {isa = PBXBuildFile; fileRef = 551A756417868BEC0052D185 /* NetSfPeopsSpuPluginMain.xib */; };
+		551A770A178698C60052D185 /* PluginController.m in Sources */ = {isa = PBXBuildFile; fileRef = 551A755217868BEC0052D185 /* PluginController.m */; };
+		551A770C178698C60052D185 /* spu.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A762217868EF00052D185 /* spu.c */; };
+		551A770D178698C60052D185 /* xa.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A762817868EF00052D185 /* xa.c */; };
+		551A770E178698C60052D185 /* reverb.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A761F17868EF00052D185 /* reverb.c */; };
+		551A770F178698C60052D185 /* registers.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A761C17868EF00052D185 /* registers.c */; };
+		551A7710178698C60052D185 /* freeze.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A761417868EF00052D185 /* freeze.c */; };
+		551A7711178698C60052D185 /* dma.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A760F17868EF00052D185 /* dma.c */; };
+		551A7712178698C60052D185 /* adsr.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A760A17868EF00052D185 /* adsr.c */; };
+		551A7713178698C60052D185 /* externals.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A761217868EF00052D185 /* externals.c */; };
+		551A7715178698C60052D185 /* libSPUSharedCode.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 551A76E71786971B0052D185 /* libSPUSharedCode.dylib */; };
+		551A7716178698C60052D185 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 551A749E17868B110052D185 /* Cocoa.framework */; };
+		551A7719178698C60052D185 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 551A756017868BEC0052D185 /* Credits.rtf */; };
+		551A771A178698C60052D185 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 551A756217868BEC0052D185 /* Localizable.strings */; };
+		551A771B178698C60052D185 /* NetSfPeopsSpuPluginMain.xib in Resources */ = {isa = PBXBuildFile; fileRef = 551A756417868BEC0052D185 /* NetSfPeopsSpuPluginMain.xib */; };
+		551A7721178698E60052D185 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 551A755A17868BEC0052D185 /* InfoPlist.strings */; };
+		551A77221786990E0052D185 /* openal.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A761817868EF00052D185 /* openal.c */; };
+		551A7724178699250052D185 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 551A7723178699250052D185 /* OpenAL.framework */; };
+		551A774A17869C280052D185 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 551A749E17868B110052D185 /* Cocoa.framework */; };
+		551A775017869C3C0052D185 /* GLUT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 551A76D1178695BD0052D185 /* GLUT.framework */; };
+		551A775117869C3C0052D185 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 551A76D2178695C70052D185 /* OpenGL.framework */; };
+		551A775217869C8B0052D185 /* draw.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A764B17868F570052D185 /* draw.c */; };
+		551A775317869C8D0052D185 /* fps.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A764E17868F570052D185 /* fps.c */; };
+		551A775417869C900052D185 /* gpu.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A765117868F570052D185 /* gpu.c */; };
+		551A775517869C950052D185 /* gte_accuracy.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A765617868F570052D185 /* gte_accuracy.c */; };
+		551A775617869C970052D185 /* key.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A765817868F570052D185 /* key.c */; };
+		551A775717869C9A0052D185 /* menu.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A765B17868F570052D185 /* menu.c */; };
+		551A775817869C9C0052D185 /* prim.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A765D17868F570052D185 /* prim.c */; };
+		551A775917869C9F0052D185 /* soft.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A765F17868F570052D185 /* soft.c */; };
+		551A775A17869CA10052D185 /* texture.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A766217868F570052D185 /* texture.c */; };
+		551A775B17869CA50052D185 /* drawgl.m in Sources */ = {isa = PBXBuildFile; fileRef = 551A759017868BED0052D185 /* drawgl.m */; };
+		551A775C17869CA80052D185 /* NetSfPeopsOpenGLPluginConfigController.m in Sources */ = {isa = PBXBuildFile; fileRef = 551A759317868BED0052D185 /* NetSfPeopsOpenGLPluginConfigController.m */; };
+		551A775D17869CAB0052D185 /* PluginGLView.m in Sources */ = {isa = PBXBuildFile; fileRef = 551A759517868BED0052D185 /* PluginGLView.m */; };
+		551A775E17869CAE0052D185 /* PluginWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 551A759717868BED0052D185 /* PluginWindow.m */; };
+		551A775F17869CB10052D185 /* PluginWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 551A759917868BED0052D185 /* PluginWindowController.m */; };
+		551A776017869CBE0052D185 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 551A758517868BED0052D185 /* Credits.rtf */; };
+		551A776117869CBE0052D185 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 551A758717868BED0052D185 /* InfoPlist.strings */; };
+		551A776217869CBE0052D185 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 551A758917868BED0052D185 /* Localizable.strings */; };
+		551A776317869CBE0052D185 /* NetSfPeopsOpenGLConfig.xib in Resources */ = {isa = PBXBuildFile; fileRef = 551A758B17868BED0052D185 /* NetSfPeopsOpenGLConfig.xib */; };
+		551A776417869CC20052D185 /* NetSfPeopsOpenGLGPUInterface.xib in Resources */ = {isa = PBXBuildFile; fileRef = 551A759A17868BED0052D185 /* NetSfPeopsOpenGLGPUInterface.xib */; };
+		551A776817869E430052D185 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 551A749E17868B110052D185 /* Cocoa.framework */; };
+		551A776E17869E640052D185 /* cfg.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A754317868BEC0052D185 /* cfg.c */; };
+		551A776F17869E640052D185 /* PluginConfigController.m in Sources */ = {isa = PBXBuildFile; fileRef = 551A754517868BEC0052D185 /* PluginConfigController.m */; };
+		551A777017869E640052D185 /* SockDialog.m in Sources */ = {isa = PBXBuildFile; fileRef = 551A754717868BEC0052D185 /* SockDialog.m */; };
+		551A777A17869E830052D185 /* dfnet.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A777317869E830052D185 /* dfnet.c */; };
+		551A777E17869E830052D185 /* unix.c in Sources */ = {isa = PBXBuildFile; fileRef = 551A777817869E830052D185 /* unix.c */; };
+		551A777F17869EAE0052D185 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 551A753617868BEB0052D185 /* Credits.rtf */; };
+		551A778017869EAE0052D185 /* DFNet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 551A753817868BEB0052D185 /* DFNet.xib */; };
+		551A778117869EAE0052D185 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 551A753A17868BEB0052D185 /* InfoPlist.strings */; };
+		551A778217869EAE0052D185 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 551A753C17868BEB0052D185 /* Localizable.strings */; };
+		551A778317869EAE0052D185 /* SockDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = 551A753E17868BEB0052D185 /* SockDialog.xib */; };
+		551A779417869F610052D185 /* Bladesio1.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 551A75CE17868C4E0052D185 /* Bladesio1.psxplugin */; };
+		551A779517869F610052D185 /* DFCdrom.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 551A767A178690500052D185 /* DFCdrom.psxplugin */; };
+		551A779617869F610052D185 /* DFInput.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 551A768E1786919F0052D185 /* DFInput.psxplugin */; };
+		551A779717869F610052D185 /* PeopsSoftGPU.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 551A76BC178693FF0052D185 /* PeopsSoftGPU.psxplugin */; };
+		551A779817869F610052D185 /* PeopsSpuSDL.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 551A76E2178696BD0052D185 /* PeopsSpuSDL.psxplugin */; };
+		551A779917869F610052D185 /* PeopsSpuAL.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 551A771F178698C60052D185 /* PeopsSpuAL.psxplugin */; };
+		551A779A17869F610052D185 /* PeopsXGL.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 551A774F17869C280052D185 /* PeopsXGL.psxplugin */; };
+		551A779B17869F610052D185 /* DFNet.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 551A776D17869E430052D185 /* DFNet.psxplugin */; };
+		551A779E17869FC70052D185 /* libSPUSharedCode.dylib in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 551A76E71786971B0052D185 /* libSPUSharedCode.dylib */; };
+		551A77A017869FED0052D185 /* libSPUSharedCode.dylib in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 551A76E71786971B0052D185 /* libSPUSharedCode.dylib */; };
+		551A77AC1786A10D0052D185 /* ForceFeedback.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 551A768F178691E60052D185 /* ForceFeedback.framework */; };
+		551A77E71786A4DD0052D185 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 551A76AC178693C60052D185 /* Carbon.framework */; };
+		5529EA11169CBE3400BAA2A5 /* RecentItemsMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = 5550D2721683C923006C56B5 /* RecentItemsMenu.m */; };
+		554FD70917C6A13E0056CF66 /* SDL2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 554FD70817C6A13E0056CF66 /* SDL2.framework */; };
+		554FD70A17C6A14B0056CF66 /* SDL2.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 554FD70817C6A13E0056CF66 /* SDL2.framework */; };
+		554FD70B17C6A1EF0056CF66 /* SDL2.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 554FD70817C6A13E0056CF66 /* SDL2.framework */; };
+		554FD70C17C6A1F10056CF66 /* SDL2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 554FD70817C6A13E0056CF66 /* SDL2.framework */; };
+		5581463917AABCD100862DBF /* PcsxrCheatHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 5581463817AABCD100862DBF /* PcsxrCheatHandler.m */; };
+		559366CA12B694DF004ACC1E /* iR3000A-64.c in Sources */ = {isa = PBXBuildFile; fileRef = 559366C112B694DF004ACC1E /* iR3000A-64.c */; };
+		559366CB12B694DF004ACC1E /* ix86-64.c in Sources */ = {isa = PBXBuildFile; fileRef = 559366C212B694DF004ACC1E /* ix86-64.c */; };
+		559366CD12B694DF004ACC1E /* ix86_cpudetect.c in Sources */ = {isa = PBXBuildFile; fileRef = 559366C512B694DF004ACC1E /* ix86_cpudetect.c */; };
+		559366CE12B694DF004ACC1E /* ix86_fpu.c in Sources */ = {isa = PBXBuildFile; fileRef = 559366C612B694DF004ACC1E /* ix86_fpu.c */; };
+		559366CF12B694DF004ACC1E /* ix86_mmx.c in Sources */ = {isa = PBXBuildFile; fileRef = 559366C712B694DF004ACC1E /* ix86_mmx.c */; };
+		559366D012B694DF004ACC1E /* ix86_sse.c in Sources */ = {isa = PBXBuildFile; fileRef = 559366C812B694DF004ACC1E /* ix86_sse.c */; };
+		559DACEE146C72FF00C5DF71 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 559DACEC146C72FF00C5DF71 /* Localizable.strings */; };
+		55A90220147D7C380037E18F /* PcsxrMemCardController.m in Sources */ = {isa = PBXBuildFile; fileRef = 55A9021F147D7C380037E18F /* PcsxrMemCardController.m */; };
+		55A90229147D89380037E18F /* PcsxrMemoryObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 55A90228147D89380037E18F /* PcsxrMemoryObject.m */; };
+		55BBA693149455E1003B2CEC /* PcsxrMemCardHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 55BBA692149455E1003B2CEC /* PcsxrMemCardHandler.m */; };
+		55BBA69614945628003B2CEC /* PcsxrPluginHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 55BBA69514945628003B2CEC /* PcsxrPluginHandler.m */; };
+		55BBA69914953887003B2CEC /* PcsxrDiscHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 55BBA69814953887003B2CEC /* PcsxrDiscHandler.m */; };
+		55BBA69C1495839A003B2CEC /* PcsxrFreezeStateHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 55BBA69B1495839A003B2CEC /* PcsxrFreezeStateHandler.m */; };
+		55C7A214148B2B3800C22ABC /* PcsxrMemCardDocument.xib in Resources */ = {isa = PBXBuildFile; fileRef = 55C7A216148B2B3800C22ABC /* PcsxrMemCardDocument.xib */; };
+		55E0ACE0178B69620005C945 /* LaunchArg.m in Sources */ = {isa = PBXBuildFile; fileRef = 55E0ACDF178B69600005C945 /* LaunchArg.m */; };
+		55EC05FB1788B1230053AC23 /* PcsxrMemCardArray.m in Sources */ = {isa = PBXBuildFile; fileRef = 55EC05FA1788B1230053AC23 /* PcsxrMemCardArray.m */; };
+		55EC05FE178916E80053AC23 /* MemBadgeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 55EC05FD178916E70053AC23 /* MemBadgeView.m */; };
+		712FD1E81093096F00575A92 /* debug.c in Sources */ = {isa = PBXBuildFile; fileRef = 712FD1E51093096F00575A92 /* debug.c */; };
+		712FD1E91093096F00575A92 /* socket.c in Sources */ = {isa = PBXBuildFile; fileRef = 712FD1E61093096F00575A92 /* socket.c */; };
+		713B530E110B75650002F164 /* ppf.c in Sources */ = {isa = PBXBuildFile; fileRef = 713B530C110B75650002F164 /* ppf.c */; };
+		7192F42A129C412E0042D946 /* gpu.c in Sources */ = {isa = PBXBuildFile; fileRef = 7192F428129C412E0042D946 /* gpu.c */; };
+		719594B211AEFE8C004AD686 /* psxcommon.c in Sources */ = {isa = PBXBuildFile; fileRef = 719594B011AEFE8C004AD686 /* psxcommon.c */; };
+		71F4C5890FDED12800529849 /* cdriso.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5600FDED12800529849 /* cdriso.c */; };
+		71F4C58B0FDED12800529849 /* cdrom.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5620FDED12800529849 /* cdrom.c */; };
+		71F4C58D0FDED12800529849 /* cheat.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5640FDED12800529849 /* cheat.c */; };
+		71F4C5910FDED12800529849 /* decode_xa.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5680FDED12800529849 /* decode_xa.c */; };
+		71F4C5930FDED12800529849 /* disr3000a.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C56A0FDED12800529849 /* disr3000a.c */; };
+		71F4C5940FDED12800529849 /* gte.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C56B0FDED12800529849 /* gte.c */; };
+		71F4C5960FDED12800529849 /* mdec.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C56D0FDED12800529849 /* mdec.c */; };
+		71F4C5980FDED12800529849 /* misc.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C56F0FDED12800529849 /* misc.c */; };
+		71F4C59A0FDED12800529849 /* plugins.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5710FDED12800529849 /* plugins.c */; };
+		71F4C59D0FDED12800529849 /* psxbios.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5740FDED12800529849 /* psxbios.c */; };
+		71F4C5A00FDED12800529849 /* psxcounters.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5770FDED12800529849 /* psxcounters.c */; };
+		71F4C5A20FDED12800529849 /* psxdma.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5790FDED12800529849 /* psxdma.c */; };
+		71F4C5A40FDED12800529849 /* psxhle.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C57B0FDED12800529849 /* psxhle.c */; };
+		71F4C5A60FDED12800529849 /* psxhw.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C57D0FDED12800529849 /* psxhw.c */; };
+		71F4C5A80FDED12800529849 /* psxinterpreter.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C57F0FDED12800529849 /* psxinterpreter.c */; };
+		71F4C5A90FDED12800529849 /* psxmem.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5800FDED12800529849 /* psxmem.c */; };
+		71F4C5AB0FDED12800529849 /* r3000a.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5820FDED12800529849 /* r3000a.c */; };
+		71F4C5AD0FDED12800529849 /* sio.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5840FDED12800529849 /* sio.c */; };
+		71F4C5AF0FDED12800529849 /* spu.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5860FDED12800529849 /* spu.c */; };
+		71F4C5B90FDED16D00529849 /* iR3000A.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5B50FDED16D00529849 /* iR3000A.c */; };
+		71F4C5BA0FDED16D00529849 /* ix86.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5B60FDED16D00529849 /* ix86.c */; };
+		D422E66E16DC48D000526DCF /* CheatWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = D422E66C16DC48D000526DCF /* CheatWindow.xib */; };
+		D422E67A16DC495800526DCF /* CheatController.m in Sources */ = {isa = PBXBuildFile; fileRef = D422E67916DC495800526DCF /* CheatController.m */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXBuildRule section */
+		2BB3D6D005427FE200831ACB /* PBXBuildRule */ = {
+			isa = PBXBuildRule;
+			compilerSpec = com.apple.compilers.gcc;
+			fileType = sourcecode.c;
+			isEditable = 1;
+			outputFiles = (
+			);
+		};
+		2BD707B705559AE300CB5D9B /* PBXBuildRule */ = {
+			isa = PBXBuildRule;
+			compilerSpec = com.apple.compilers.gcc;
+			filePatterns = pasm.s;
+			fileType = sourcecode.asm;
+			isEditable = 1;
+			outputFiles = (
+				"$(DERIVED_FILES_DIR)/$(INPUT_FILE_BASE).o",
+			);
+			script = "as -o $(DERIVED_FILES_DIR)/$(INPUT_FILE_BASE).o $(INPUT_FILE_PATH)";
+		};
+/* End PBXBuildRule section */
+
+/* Begin PBXContainerItemProxy section */
+		551A76F4178697CF0052D185 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 551A76E61786971B0052D185;
+			remoteInfo = SPUSharedCode;
+		};
+		551A7708178698C60052D185 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 551A76E61786971B0052D185;
+			remoteInfo = SPUSharedCode;
+		};
+		551A778417869F4B0052D185 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 551A75C617868C4E0052D185;
+			remoteInfo = Bladesio1;
+		};
+		551A778617869F4B0052D185 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 551A7672178690500052D185;
+			remoteInfo = DFCdrom;
+		};
+		551A778817869F4B0052D185 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 551A76861786919F0052D185;
+			remoteInfo = DFInput;
+		};
+		551A778A17869F4B0052D185 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 551A76B4178693FF0052D185;
+			remoteInfo = DFXVideo;
+		};
+		551A778C17869F4B0052D185 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 551A76DA178696BD0052D185;
+			remoteInfo = PeopsSpuSDL;
+		};
+		551A778E17869F4B0052D185 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 551A7706178698C60052D185;
+			remoteInfo = PeopsSpuAL;
+		};
+		551A779017869F4B0052D185 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 551A774717869C280052D185;
+			remoteInfo = PeopsXgl;
+		};
+		551A779217869F4B0052D185 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 551A776517869E430052D185;
+			remoteInfo = DFNet;
+		};
+		55906B1D17C28EE40057F60D /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 55906B1717C28E490057F60D;
+			remoteInfo = "Make SVN revision";
+		};
+/* End PBXContainerItemProxy section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		551A779C17869FB10052D185 /* Copy Frameworks */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				551A779E17869FC70052D185 /* libSPUSharedCode.dylib in Copy Frameworks */,
+				554FD70A17C6A14B0056CF66 /* SDL2.framework in Copy Frameworks */,
+			);
+			name = "Copy Frameworks";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		551A779F17869FD60052D185 /* Copy Frameworks */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				551A77A017869FED0052D185 /* libSPUSharedCode.dylib in Copy Frameworks */,
+			);
+			name = "Copy Frameworks";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		551A77BA1786A1DC0052D185 /* Copy Frameworks */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				554FD70B17C6A1EF0056CF66 /* SDL2.framework in Copy Frameworks */,
+			);
+			name = "Copy Frameworks";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		71AD2DF010C3573400365243 /* Copy PlugIns */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 13;
+			files = (
+				551A779417869F610052D185 /* Bladesio1.psxplugin in Copy PlugIns */,
+				551A779517869F610052D185 /* DFCdrom.psxplugin in Copy PlugIns */,
+				551A779617869F610052D185 /* DFInput.psxplugin in Copy PlugIns */,
+				551A779717869F610052D185 /* PeopsSoftGPU.psxplugin in Copy PlugIns */,
+				551A779817869F610052D185 /* PeopsSpuSDL.psxplugin in Copy PlugIns */,
+				551A779917869F610052D185 /* PeopsSpuAL.psxplugin in Copy PlugIns */,
+				551A779A17869F610052D185 /* PeopsXGL.psxplugin in Copy PlugIns */,
+				551A779B17869F610052D185 /* DFNet.psxplugin in Copy PlugIns */,
+			);
+			name = "Copy PlugIns";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+		02717967167884C9004AED62 /* hotkeys.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = hotkeys.m; sourceTree = "<group>"; usesTabs = 1; };
+		02717969167884DF004AED62 /* hotkeys.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = hotkeys.h; sourceTree = "<group>"; };
+		0280B7AB16764CC3007B8001 /* HotkeyController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HotkeyController.h; sourceTree = "<group>"; };
+		0280B7AC16764CC3007B8001 /* HotkeyController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HotkeyController.m; sourceTree = "<group>"; usesTabs = 1; };
+		02FE55E716765F9400205CF2 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = English; path = KeyNames.plist; sourceTree = "<group>"; };
+		28F0C3C5146521A700A90285 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Configuration.xib; sourceTree = "<group>"; };
+		28F0C3C8146521B000A90285 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = PCSXR.xib; sourceTree = "<group>"; };
+		28F0C3CB146521B700A90285 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = AddPluginSheet.xib; sourceTree = "<group>"; };
+		2B143D01078A2CBD00AF745A /* PCSXR.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = PCSXR.icns; sourceTree = "<group>"; };
+		2B143D02078A2CBD00AF745A /* pcsxrfreeze.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = pcsxrfreeze.icns; sourceTree = "<group>"; };
+		2B143D03078A2CBD00AF745A /* pcsxrmemcard.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = pcsxrmemcard.icns; sourceTree = "<group>"; };
+		2B143D04078A2CBD00AF745A /* psxbios.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = psxbios.icns; sourceTree = "<group>"; };
+		2B143D05078A2CBD00AF745A /* psxplugin.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = psxplugin.icns; sourceTree = "<group>"; };
+		2B4DE98D05FF9307003EFEF0 /* PluginController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginController.h; sourceTree = "<group>"; };
+		2B4DE98E05FF9307003EFEF0 /* PluginController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PluginController.m; sourceTree = "<group>"; usesTabs = 1; };
+		2B690C760635C65C00CDA575 /* ExceptionHandling.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ExceptionHandling.framework; path = /System/Library/Frameworks/ExceptionHandling.framework; sourceTree = "<absolute>"; };
+		2B75FD3C051C56D200D12034 /* PcsxrController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PcsxrController.h; sourceTree = "<group>"; };
+		2B75FD3D051C56D200D12034 /* PcsxrController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = PcsxrController.m; sourceTree = "<group>"; usesTabs = 1; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+		2B75FD4A051C8A7400D12034 /* ConfigurationController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ConfigurationController.h; sourceTree = "<group>"; };
+		2B75FD4B051C8A7400D12034 /* ConfigurationController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = ConfigurationController.m; sourceTree = "<group>"; usesTabs = 1; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+		2B976C00074C14B4007C050A /* Kernel.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Kernel.framework; path = /System/Library/Frameworks/Kernel.framework; sourceTree = "<absolute>"; };
+		2BA178A505148D9D0026D74D /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = main.m; sourceTree = "<group>"; usesTabs = 1; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+		2BA178B30514CE260026D74D /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = InfoPlist.strings; sourceTree = "<group>"; };
+		2BA44360052DB2EA00E21DDD /* PcsxrPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = PcsxrPlugin.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+		2BA44361052DB2EA00E21DDD /* PcsxrPlugin.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = PcsxrPlugin.m; sourceTree = "<group>"; tabWidth = 4; usesTabs = 1; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+		2BB3D6CF05427FE200831ACB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		2BB3D6D105427FE200831ACB /* PCSXR.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PCSXR.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		2BBB1126051DC00500B84448 /* PluginList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginList.h; sourceTree = "<group>"; };
+		2BBB1127051DC00500B84448 /* PluginList.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = PluginList.m; sourceTree = "<group>"; usesTabs = 1; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+		2BBB1787051E0D9700B84448 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = Credits.rtf; sourceTree = "<group>"; };
+		2BBB1791051E113B00B84448 /* EmuThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EmuThread.h; sourceTree = "<group>"; };
+		2BBB1792051E113B00B84448 /* EmuThread.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = EmuThread.m; sourceTree = "<group>"; usesTabs = 1; };
+		2BBB17DA051E4D0F00B84448 /* Plugin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = Plugin.c; sourceTree = SOURCE_ROOT; usesTabs = 1; };
+		550F023B17BFFD97002594DF /* PcsxrHexadecimalFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PcsxrHexadecimalFormatter.h; sourceTree = "<group>"; };
+		550F023C17BFFD97002594DF /* PcsxrHexadecimalFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PcsxrHexadecimalFormatter.m; sourceTree = "<group>"; };
+		551A749E17868B110052D185 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
+		551A74A117868B110052D185 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
+		551A74A217868B110052D185 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
+		551A74A317868B110052D185 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
+		551A74B517868BEA0052D185 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/Bladesio1PluginConfig.xib; sourceTree = "<group>"; };
+		551A74B717868BEA0052D185 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = English.lproj/Credits.rtf; sourceTree = "<group>"; };
+		551A74B917868BEA0052D185 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		551A74BB17868BEA0052D185 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Localizable.strings; sourceTree = "<group>"; };
+		551A74BC17868BEA0052D185 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		551A74BF17868BEA0052D185 /* cfg.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = cfg.c; sourceTree = "<group>"; };
+		551A74C017868BEA0052D185 /* PluginConfigController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PluginConfigController.h; sourceTree = "<group>"; };
+		551A74C117868BEA0052D185 /* PluginConfigController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PluginConfigController.m; sourceTree = "<group>"; };
+		551A74C217868BEA0052D185 /* version.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = version.plist; sourceTree = "<group>"; };
+		551A750A17868BEB0052D185 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = English.lproj/Credits.rtf; sourceTree = "<group>"; };
+		551A750C17868BEB0052D185 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/DFCdromPluginConfig.xib; sourceTree = "<group>"; };
+		551A750E17868BEB0052D185 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		551A751017868BEB0052D185 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Localizable.strings; sourceTree = "<group>"; };
+		551A751117868BEB0052D185 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		551A751317868BEB0052D185 /* cdr-macosx.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = "cdr-macosx.c"; sourceTree = "<group>"; };
+		551A751417868BEB0052D185 /* cfg.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = cfg.c; sourceTree = "<group>"; };
+		551A751517868BEB0052D185 /* PluginConfigController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PluginConfigController.h; sourceTree = "<group>"; };
+		551A751617868BEB0052D185 /* PluginConfigController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PluginConfigController.m; sourceTree = "<group>"; };
+		551A751717868BEB0052D185 /* version.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = version.plist; sourceTree = "<group>"; };
+		551A751E17868BEB0052D185 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = English.lproj/Credits.rtf; sourceTree = "<group>"; };
+		551A752017868BEB0052D185 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		551A752217868BEB0052D185 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Localizable.strings; sourceTree = "<group>"; };
+		551A752417868BEB0052D185 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/NetPcsxrHIDInputPluginMain.xib; sourceTree = "<group>"; };
+		551A752517868BEB0052D185 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		551A752717868BEB0052D185 /* cfg.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = cfg.c; sourceTree = "<group>"; };
+		551A752817868BEB0052D185 /* cfg.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cfg.h; sourceTree = "<group>"; };
+		551A752917868BEB0052D185 /* ControllerList.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ControllerList.h; sourceTree = "<group>"; };
+		551A752A17868BEB0052D185 /* ControllerList.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ControllerList.m; sourceTree = "<group>"; };
+		551A752B17868BEB0052D185 /* MappingCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MappingCell.h; sourceTree = "<group>"; };
+		551A752C17868BEB0052D185 /* MappingCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MappingCell.m; sourceTree = "<group>"; };
+		551A752D17868BEB0052D185 /* PadController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PadController.h; sourceTree = "<group>"; };
+		551A752E17868BEB0052D185 /* PadController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PadController.m; sourceTree = "<group>"; };
+		551A752F17868BEB0052D185 /* PadView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PadView.h; sourceTree = "<group>"; };
+		551A753017868BEB0052D185 /* PadView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PadView.m; sourceTree = "<group>"; };
+		551A753117868BEB0052D185 /* xkb.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = xkb.c; sourceTree = "<group>"; };
+		551A753717868BEB0052D185 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = English.lproj/Credits.rtf; sourceTree = "<group>"; };
+		551A753917868BEB0052D185 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/DFNet.xib; sourceTree = "<group>"; };
+		551A753B17868BEB0052D185 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		551A753D17868BEB0052D185 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Localizable.strings; sourceTree = "<group>"; };
+		551A753F17868BEC0052D185 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/SockDialog.xib; sourceTree = "<group>"; };
+		551A754017868BEC0052D185 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		551A754317868BEC0052D185 /* cfg.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = cfg.c; sourceTree = "<group>"; };
+		551A754417868BEC0052D185 /* PluginConfigController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PluginConfigController.h; sourceTree = "<group>"; };
+		551A754517868BEC0052D185 /* PluginConfigController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PluginConfigController.m; sourceTree = "<group>"; };
+		551A754617868BEC0052D185 /* SockDialog.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SockDialog.h; sourceTree = "<group>"; };
+		551A754717868BEC0052D185 /* SockDialog.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SockDialog.m; sourceTree = "<group>"; };
+		551A754817868BEC0052D185 /* version.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = version.plist; sourceTree = "<group>"; };
+		551A754A17868BEC0052D185 /* Info-AL.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Info-AL.plist"; path = "../../Info-AL.plist"; sourceTree = "<group>"; };
+		551A754B17868BEC0052D185 /* Info-SDL.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Info-SDL.plist"; path = "../../Info-SDL.plist"; sourceTree = "<group>"; };
+		551A754E17868BEC0052D185 /* maccfg.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = maccfg.h; sourceTree = "<group>"; };
+		551A754F17868BEC0052D185 /* NamedSlider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = NamedSlider.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+		551A755017868BEC0052D185 /* NamedSlider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NamedSlider.m; sourceTree = "<group>"; };
+		551A755117868BEC0052D185 /* PluginController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PluginController.h; sourceTree = "<group>"; };
+		551A755217868BEC0052D185 /* PluginController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = PluginController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+		551A755317868BEC0052D185 /* SPUPluginController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SPUPluginController.h; sourceTree = "<group>"; };
+		551A755417868BEC0052D185 /* SPUPluginController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SPUPluginController.m; sourceTree = "<group>"; };
+		551A755B17868BEC0052D185 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		551A755E17868BEC0052D185 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		551A756117868BEC0052D185 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = English.lproj/Credits.rtf; sourceTree = "<group>"; };
+		551A756317868BEC0052D185 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Localizable.strings; sourceTree = "<group>"; };
+		551A756517868BEC0052D185 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/NetSfPeopsSpuPluginMain.xib; sourceTree = "<group>"; };
+		551A756917868BEC0052D185 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = English.lproj/Credits.rtf; sourceTree = "<group>"; };
+		551A756B17868BEC0052D185 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		551A756D17868BEC0052D185 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Localizable.strings; sourceTree = "<group>"; };
+		551A756F17868BEC0052D185 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/NetSfPeopsSoftGPUConfig.xib; sourceTree = "<group>"; };
+		551A757017868BEC0052D185 /* gpuPeteOGL2.slf */ = {isa = PBXFileReference; lastKnownFileType = text; path = gpuPeteOGL2.slf; sourceTree = "<group>"; };
+		551A757117868BEC0052D185 /* gpuPeteOGL2.slv */ = {isa = PBXFileReference; lastKnownFileType = text; path = gpuPeteOGL2.slv; sourceTree = "<group>"; };
+		551A757217868BEC0052D185 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		551A757417868BEC0052D185 /* drawgl.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = drawgl.m; sourceTree = "<group>"; };
+		551A757517868BEC0052D185 /* ExtendedKeys.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ExtendedKeys.h; sourceTree = "<group>"; };
+		551A757617868BEC0052D185 /* PluginConfigController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PluginConfigController.h; sourceTree = "<group>"; };
+		551A757717868BEC0052D185 /* PluginConfigController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = PluginConfigController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+		551A757817868BEC0052D185 /* PluginGLView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PluginGLView.h; sourceTree = "<group>"; };
+		551A757917868BEC0052D185 /* PluginGLView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PluginGLView.m; sourceTree = "<group>"; };
+		551A757A17868BEC0052D185 /* PluginWindow.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PluginWindow.h; sourceTree = "<group>"; };
+		551A757B17868BEC0052D185 /* PluginWindow.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PluginWindow.m; sourceTree = "<group>"; };
+		551A757C17868BEC0052D185 /* PluginWindowController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PluginWindowController.h; sourceTree = "<group>"; };
+		551A757D17868BEC0052D185 /* PluginWindowController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PluginWindowController.m; sourceTree = "<group>"; };
+		551A757E17868BEC0052D185 /* SGPUPreferences.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SGPUPreferences.h; sourceTree = "<group>"; };
+		551A757F17868BED0052D185 /* NetSfPeopsSoftGPUInterface.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NetSfPeopsSoftGPUInterface.xib; sourceTree = "<group>"; };
+		551A758617868BED0052D185 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = English.lproj/Credits.rtf; sourceTree = "<group>"; };
+		551A758817868BED0052D185 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		551A758A17868BED0052D185 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Localizable.strings; sourceTree = "<group>"; };
+		551A758C17868BED0052D185 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/NetSfPeopsOpenGLConfig.xib; sourceTree = "<group>"; };
+		551A758D17868BED0052D185 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		551A758F17868BED0052D185 /* drawgl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = drawgl.h; sourceTree = "<group>"; };
+		551A759017868BED0052D185 /* drawgl.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = drawgl.m; sourceTree = "<group>"; };
+		551A759117868BED0052D185 /* ExtendedKeys.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ExtendedKeys.h; sourceTree = "<group>"; };
+		551A759217868BED0052D185 /* NetSfPeopsOpenGLPluginConfigController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NetSfPeopsOpenGLPluginConfigController.h; sourceTree = "<group>"; };
+		551A759317868BED0052D185 /* NetSfPeopsOpenGLPluginConfigController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = NetSfPeopsOpenGLPluginConfigController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+		551A759417868BED0052D185 /* PluginGLView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PluginGLView.h; sourceTree = "<group>"; };
+		551A759517868BED0052D185 /* PluginGLView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PluginGLView.m; sourceTree = "<group>"; };
+		551A759617868BED0052D185 /* PluginWindow.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PluginWindow.h; sourceTree = "<group>"; };
+		551A759717868BED0052D185 /* PluginWindow.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PluginWindow.m; sourceTree = "<group>"; };
+		551A759817868BED0052D185 /* PluginWindowController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PluginWindowController.h; sourceTree = "<group>"; };
+		551A759917868BED0052D185 /* PluginWindowController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PluginWindowController.m; sourceTree = "<group>"; };
+		551A759A17868BED0052D185 /* NetSfPeopsOpenGLGPUInterface.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NetSfPeopsOpenGLGPUInterface.xib; sourceTree = "<group>"; };
+		551A75BC17868C400052D185 /* connection.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = connection.c; sourceTree = "<group>"; };
+		551A75BD17868C400052D185 /* connection.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = connection.h; sourceTree = "<group>"; };
+		551A75BE17868C400052D185 /* fifo.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = fifo.c; sourceTree = "<group>"; };
+		551A75BF17868C400052D185 /* fifo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = fifo.h; sourceTree = "<group>"; };
+		551A75C217868C400052D185 /* sio1.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = sio1.c; sourceTree = "<group>"; };
+		551A75C317868C400052D185 /* sio1.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = sio1.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+		551A75C517868C400052D185 /* typedefs.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = typedefs.h; sourceTree = "<group>"; };
+		551A75CE17868C4E0052D185 /* Bladesio1.psxplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Bladesio1.psxplugin; sourceTree = BUILT_PRODUCTS_DIR; };
+		551A75F417868E640052D185 /* cdr.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = cdr.c; sourceTree = "<group>"; };
+		551A75F517868E640052D185 /* cdr.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = cdr.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+		551A75FB17868E640052D185 /* util.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = util.c; sourceTree = "<group>"; };
+		551A760A17868EF00052D185 /* adsr.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = adsr.c; sourceTree = "<group>"; };
+		551A760B17868EF00052D185 /* adsr.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = adsr.h; sourceTree = "<group>"; };
+		551A760F17868EF00052D185 /* dma.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = dma.c; sourceTree = "<group>"; };
+		551A761017868EF00052D185 /* dma.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = dma.h; sourceTree = "<group>"; };
+		551A761117868EF00052D185 /* dsoundoss.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = dsoundoss.h; sourceTree = "<group>"; };
+		551A761217868EF00052D185 /* externals.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = externals.c; sourceTree = "<group>"; };
+		551A761317868EF00052D185 /* externals.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = externals.h; sourceTree = "<group>"; };
+		551A761417868EF00052D185 /* freeze.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = freeze.c; sourceTree = "<group>"; };
+		551A761517868EF00052D185 /* gauss_i.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = gauss_i.h; sourceTree = "<group>"; };
+		551A761817868EF00052D185 /* openal.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = openal.c; sourceTree = "<group>"; };
+		551A761A17868EF00052D185 /* psemuxa.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = psemuxa.h; sourceTree = "<group>"; };
+		551A761C17868EF00052D185 /* registers.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = registers.c; sourceTree = "<group>"; };
+		551A761D17868EF00052D185 /* registers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = registers.h; sourceTree = "<group>"; };
+		551A761E17868EF00052D185 /* regs.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = regs.h; sourceTree = "<group>"; };
+		551A761F17868EF00052D185 /* reverb.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = reverb.c; sourceTree = "<group>"; };
+		551A762017868EF00052D185 /* reverb.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = reverb.h; sourceTree = "<group>"; };
+		551A762117868EF00052D185 /* sdl.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = sdl.c; sourceTree = "<group>"; };
+		551A762217868EF00052D185 /* spu.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; lineEnding = 0; path = spu.c; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.c; };
+		551A762317868EF00052D185 /* spu.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = spu.h; sourceTree = "<group>"; };
+		551A762717868EF00052D185 /* stdafx.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = stdafx.h; sourceTree = "<group>"; };
+		551A762817868EF00052D185 /* xa.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = xa.c; sourceTree = "<group>"; };
+		551A762917868EF00052D185 /* xa.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = xa.h; sourceTree = "<group>"; };
+		551A762B17868F270052D185 /* cfg.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = cfg.c; sourceTree = "<group>"; };
+		551A762C17868F270052D185 /* cfg.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cfg.h; sourceTree = "<group>"; };
+		551A762D17868F270052D185 /* draw.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = draw.c; sourceTree = "<group>"; };
+		551A762E17868F270052D185 /* draw.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = draw.h; sourceTree = "<group>"; };
+		551A762F17868F270052D185 /* externals.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = externals.h; sourceTree = "<group>"; };
+		551A763017868F270052D185 /* fps.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = fps.c; sourceTree = "<group>"; };
+		551A763117868F270052D185 /* fps.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = fps.h; sourceTree = "<group>"; };
+		551A763217868F270052D185 /* gpu.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; lineEnding = 0; path = gpu.c; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.c; };
+		551A763317868F270052D185 /* gpu.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = gpu.h; sourceTree = "<group>"; };
+		551A763717868F270052D185 /* hq2x.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = hq2x.h; sourceTree = "<group>"; };
+		551A763817868F270052D185 /* hq3x.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = hq3x.h; sourceTree = "<group>"; };
+		551A763A17868F280052D185 /* interp.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = interp.h; sourceTree = "<group>"; };
+		551A763B17868F280052D185 /* key.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = key.c; sourceTree = "<group>"; };
+		551A763C17868F280052D185 /* key.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = key.h; sourceTree = "<group>"; };
+		551A763F17868F280052D185 /* menu.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = menu.c; sourceTree = "<group>"; };
+		551A764017868F280052D185 /* menu.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = menu.h; sourceTree = "<group>"; };
+		551A764117868F280052D185 /* prim.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = prim.c; sourceTree = "<group>"; };
+		551A764217868F280052D185 /* prim.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = prim.h; sourceTree = "<group>"; };
+		551A764317868F280052D185 /* soft.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = soft.c; sourceTree = "<group>"; };
+		551A764417868F280052D185 /* soft.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = soft.h; sourceTree = "<group>"; };
+		551A764517868F280052D185 /* swap.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = swap.h; sourceTree = "<group>"; };
+		551A764617868F280052D185 /* zn.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = zn.c; sourceTree = "<group>"; };
+		551A764B17868F570052D185 /* draw.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = draw.c; sourceTree = "<group>"; };
+		551A764C17868F570052D185 /* draw.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = draw.h; sourceTree = "<group>"; };
+		551A764D17868F570052D185 /* externals.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = externals.h; sourceTree = "<group>"; };
+		551A764E17868F570052D185 /* fps.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = fps.c; sourceTree = "<group>"; };
+		551A764F17868F570052D185 /* fps.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = fps.h; sourceTree = "<group>"; };
+		551A765017868F570052D185 /* gl_ext.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = gl_ext.h; sourceTree = "<group>"; };
+		551A765117868F570052D185 /* gpu.c */ = {isa = PBXFileReference; indentWidth = 1; lastKnownFileType = sourcecode.c.c; lineEnding = 0; path = gpu.c; sourceTree = "<group>"; usesTabs = 0; xcLanguageSpecificationIdentifier = xcode.lang.c; };
+		551A765217868F570052D185 /* gpu.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = gpu.h; sourceTree = "<group>"; };
+		551A765617868F570052D185 /* gte_accuracy.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = gte_accuracy.c; sourceTree = "<group>"; };
+		551A765717868F570052D185 /* gte_accuracy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = gte_accuracy.h; sourceTree = "<group>"; };
+		551A765817868F570052D185 /* key.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = key.c; sourceTree = "<group>"; };
+		551A765917868F570052D185 /* key.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = key.h; sourceTree = "<group>"; };
+		551A765B17868F570052D185 /* menu.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = menu.c; sourceTree = "<group>"; };
+		551A765C17868F570052D185 /* menu.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = menu.h; sourceTree = "<group>"; };
+		551A765D17868F570052D185 /* prim.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = prim.c; sourceTree = "<group>"; };
+		551A765E17868F570052D185 /* prim.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = prim.h; sourceTree = "<group>"; };
+		551A765F17868F570052D185 /* soft.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = soft.c; sourceTree = "<group>"; };
+		551A766017868F570052D185 /* soft.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = soft.h; sourceTree = "<group>"; };
+		551A766117868F570052D185 /* stdafx.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = stdafx.h; sourceTree = "<group>"; };
+		551A766217868F570052D185 /* texture.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = texture.c; sourceTree = "<group>"; };
+		551A766317868F570052D185 /* texture.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = texture.h; sourceTree = "<group>"; };
+		551A76661786901F0052D185 /* analog.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = analog.c; sourceTree = "<group>"; };
+		551A766B1786901F0052D185 /* pad.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = pad.c; sourceTree = "<group>"; };
+		551A766C1786901F0052D185 /* pad.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = pad.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+		551A766D1786901F0052D185 /* sdljoy.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = sdljoy.c; sourceTree = "<group>"; };
+		551A766E1786901F0052D185 /* util.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = util.c; sourceTree = "<group>"; };
+		551A766F1786901F0052D185 /* util.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = util.h; sourceTree = "<group>"; };
+		551A76701786901F0052D185 /* xkb.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = xkb.c; sourceTree = "<group>"; };
+		551A767A178690500052D185 /* DFCdrom.psxplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DFCdrom.psxplugin; sourceTree = BUILT_PRODUCTS_DIR; };
+		551A7684178691170052D185 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
+		551A768E1786919F0052D185 /* DFInput.psxplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DFInput.psxplugin; sourceTree = BUILT_PRODUCTS_DIR; };
+		551A768F178691E60052D185 /* ForceFeedback.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ForceFeedback.framework; path = System/Library/Frameworks/ForceFeedback.framework; sourceTree = SDKROOT; };
+		551A76AC178693C60052D185 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = SDKROOT; };
+		551A76AE178693D60052D185 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = System/Library/Frameworks/ApplicationServices.framework; sourceTree = SDKROOT; };
+		551A76AF178693D60052D185 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = System/Library/Frameworks/CoreServices.framework; sourceTree = SDKROOT; };
+		551A76B2178693EA0052D185 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
+		551A76BC178693FF0052D185 /* PeopsSoftGPU.psxplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PeopsSoftGPU.psxplugin; sourceTree = BUILT_PRODUCTS_DIR; };
+		551A76D1178695BD0052D185 /* GLUT.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLUT.framework; path = System/Library/Frameworks/GLUT.framework; sourceTree = SDKROOT; };
+		551A76D2178695C70052D185 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
+		551A76D8178696810052D185 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
+		551A76E2178696BD0052D185 /* PeopsSpuSDL.psxplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PeopsSpuSDL.psxplugin; sourceTree = BUILT_PRODUCTS_DIR; };
+		551A76E71786971B0052D185 /* libSPUSharedCode.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libSPUSharedCode.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+		551A771F178698C60052D185 /* PeopsSpuAL.psxplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PeopsSpuAL.psxplugin; sourceTree = BUILT_PRODUCTS_DIR; };
+		551A7723178699250052D185 /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; };
+		551A774217869BD40052D185 /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = System/Library/Frameworks/AudioUnit.framework; sourceTree = SDKROOT; };
+		551A774317869BD50052D185 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; };
+		551A774F17869C280052D185 /* PeopsXGL.psxplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PeopsXGL.psxplugin; sourceTree = BUILT_PRODUCTS_DIR; };
+		551A776D17869E430052D185 /* DFNet.psxplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DFNet.psxplugin; sourceTree = BUILT_PRODUCTS_DIR; };
+		551A777317869E830052D185 /* dfnet.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dfnet.c; sourceTree = "<group>"; };
+		551A777417869E830052D185 /* dfnet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = dfnet.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+		551A777817869E830052D185 /* unix.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = unix.c; sourceTree = "<group>"; };
+		5539965D178BB1B100859644 /* OSXPlugLocalization.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OSXPlugLocalization.h; sourceTree = "<group>"; };
+		554572F217CBC69600FB7D19 /* SPUShared-info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "SPUShared-info.plist"; sourceTree = "<group>"; };
+		554FD70817C6A13E0056CF66 /* SDL2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2.framework; path = /Library/Frameworks/SDL2.framework; sourceTree = "<absolute>"; };
+		5550D2711683C923006C56B5 /* RecentItemsMenu.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RecentItemsMenu.h; sourceTree = "<group>"; };
+		5550D2721683C923006C56B5 /* RecentItemsMenu.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RecentItemsMenu.m; sourceTree = "<group>"; usesTabs = 1; };
+		5581463717AABCD100862DBF /* PcsxrCheatHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PcsxrCheatHandler.h; sourceTree = "<group>"; };
+		5581463817AABCD100862DBF /* PcsxrCheatHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PcsxrCheatHandler.m; sourceTree = "<group>"; };
+		55858D2817864D140068B8FC /* Pcsxr.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Pcsxr.xcconfig; sourceTree = "<group>"; };
+		55858D2A17864DC80068B8FC /* Pcsxr-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Pcsxr-Debug.xcconfig"; sourceTree = "<group>"; };
+		55858D2B17864DC90068B8FC /* Pcsxr-Instrument.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Pcsxr-Instrument.xcconfig"; sourceTree = "<group>"; };
+		55858D2C17864DC90068B8FC /* Pcsxr-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Pcsxr-Release.xcconfig"; sourceTree = "<group>"; };
+		559366C012B694DF004ACC1E /* iGte.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iGte.h; sourceTree = "<group>"; };
+		559366C112B694DF004ACC1E /* iR3000A-64.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "iR3000A-64.c"; sourceTree = "<group>"; };
+		559366C212B694DF004ACC1E /* ix86-64.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "ix86-64.c"; sourceTree = "<group>"; };
+		559366C312B694DF004ACC1E /* ix86-64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "ix86-64.h"; sourceTree = "<group>"; };
+		559366C412B694DF004ACC1E /* ix86_3dnow.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ix86_3dnow.c; sourceTree = "<group>"; };
+		559366C512B694DF004ACC1E /* ix86_cpudetect.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ix86_cpudetect.c; sourceTree = "<group>"; };
+		559366C612B694DF004ACC1E /* ix86_fpu.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ix86_fpu.c; sourceTree = "<group>"; };
+		559366C712B694DF004ACC1E /* ix86_mmx.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ix86_mmx.c; sourceTree = "<group>"; };
+		559366C812B694DF004ACC1E /* ix86_sse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ix86_sse.c; sourceTree = "<group>"; };
+		559DACED146C72FF00C5DF71 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; path = Localizable.strings; sourceTree = "<group>"; };
+		55A9021E147D7C380037E18F /* PcsxrMemCardController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PcsxrMemCardController.h; sourceTree = "<group>"; };
+		55A9021F147D7C380037E18F /* PcsxrMemCardController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PcsxrMemCardController.m; sourceTree = "<group>"; usesTabs = 1; };
+		55A90227147D89380037E18F /* PcsxrMemoryObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = PcsxrMemoryObject.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+		55A90228147D89380037E18F /* PcsxrMemoryObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = PcsxrMemoryObject.m; sourceTree = "<group>"; usesTabs = 1; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+		55BB3493169CD42500850200 /* ARCBridge.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = ARCBridge.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+		55BBA690149454DE003B2CEC /* PcsxrFileHandle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PcsxrFileHandle.h; sourceTree = "<group>"; };
+		55BBA691149455E1003B2CEC /* PcsxrMemCardHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PcsxrMemCardHandler.h; sourceTree = "<group>"; };
+		55BBA692149455E1003B2CEC /* PcsxrMemCardHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PcsxrMemCardHandler.m; sourceTree = "<group>"; usesTabs = 1; };
+		55BBA69414945628003B2CEC /* PcsxrPluginHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PcsxrPluginHandler.h; sourceTree = "<group>"; };
+		55BBA69514945628003B2CEC /* PcsxrPluginHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PcsxrPluginHandler.m; sourceTree = "<group>"; usesTabs = 1; };
+		55BBA69714953887003B2CEC /* PcsxrDiscHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PcsxrDiscHandler.h; sourceTree = "<group>"; };
+		55BBA69814953887003B2CEC /* PcsxrDiscHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = PcsxrDiscHandler.m; sourceTree = "<group>"; usesTabs = 1; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+		55BBA69A14958399003B2CEC /* PcsxrFreezeStateHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PcsxrFreezeStateHandler.h; sourceTree = "<group>"; };
+		55BBA69B1495839A003B2CEC /* PcsxrFreezeStateHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PcsxrFreezeStateHandler.m; sourceTree = "<group>"; usesTabs = 1; };
+		55C7A215148B2B3800C22ABC /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/PcsxrMemCardDocument.xib; sourceTree = "<group>"; };
+		55E0ACDE178B695F0005C945 /* LaunchArg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LaunchArg.h; sourceTree = "<group>"; };
+		55E0ACDF178B69600005C945 /* LaunchArg.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LaunchArg.m; sourceTree = "<group>"; usesTabs = 1; };
+		55EC05F91788B1230053AC23 /* PcsxrMemCardArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PcsxrMemCardArray.h; sourceTree = "<group>"; };
+		55EC05FA1788B1230053AC23 /* PcsxrMemCardArray.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PcsxrMemCardArray.m; sourceTree = "<group>"; usesTabs = 1; };
+		55EC05FC178916E70053AC23 /* MemBadgeView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MemBadgeView.h; sourceTree = "<group>"; };
+		55EC05FD178916E70053AC23 /* MemBadgeView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MemBadgeView.m; sourceTree = "<group>"; usesTabs = 1; };
+		712FD1E51093096F00575A92 /* debug.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; path = debug.c; sourceTree = "<group>"; };
+		712FD1E61093096F00575A92 /* socket.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; path = socket.c; sourceTree = "<group>"; };
+		712FD1E71093096F00575A92 /* socket.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; path = socket.h; sourceTree = "<group>"; };
+		713B530C110B75650002F164 /* ppf.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; path = ppf.c; sourceTree = "<group>"; };
+		713B530D110B75650002F164 /* ppf.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; path = ppf.h; sourceTree = "<group>"; };
+		7161C2810FDED6D000225F97 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
+		7161C2970FDED75300225F97 /* ExtendedKeys.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExtendedKeys.h; sourceTree = "<group>"; };
+		7192F428129C412E0042D946 /* gpu.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; path = gpu.c; sourceTree = "<group>"; };
+		7192F429129C412E0042D946 /* gpu.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; path = gpu.h; sourceTree = "<group>"; };
+		719594AF11AEFE8C004AD686 /* gte_divider.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; path = gte_divider.h; sourceTree = "<group>"; };
+		719594B011AEFE8C004AD686 /* psxcommon.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; path = psxcommon.c; sourceTree = "<group>"; };
+		71F4C5600FDED12800529849 /* cdriso.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; lineEnding = 2; path = cdriso.c; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.c; };
+		71F4C5610FDED12800529849 /* cdriso.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cdriso.h; sourceTree = "<group>"; };
+		71F4C5620FDED12800529849 /* cdrom.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; lineEnding = 2; path = cdrom.c; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.c; };
+		71F4C5630FDED12800529849 /* cdrom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cdrom.h; sourceTree = "<group>"; };
+		71F4C5640FDED12800529849 /* cheat.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cheat.c; sourceTree = "<group>"; };
+		71F4C5650FDED12800529849 /* cheat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cheat.h; sourceTree = "<group>"; };
+		71F4C5660FDED12800529849 /* coff.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = coff.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+		71F4C5670FDED12800529849 /* debug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = debug.h; sourceTree = "<group>"; };
+		71F4C5680FDED12800529849 /* decode_xa.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = decode_xa.c; sourceTree = "<group>"; };
+		71F4C5690FDED12800529849 /* decode_xa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = decode_xa.h; sourceTree = "<group>"; };
+		71F4C56A0FDED12800529849 /* disr3000a.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = disr3000a.c; sourceTree = "<group>"; };
+		71F4C56B0FDED12800529849 /* gte.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gte.c; sourceTree = "<group>"; };
+		71F4C56C0FDED12800529849 /* gte.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gte.h; sourceTree = "<group>"; };
+		71F4C56D0FDED12800529849 /* mdec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mdec.c; sourceTree = "<group>"; };
+		71F4C56E0FDED12800529849 /* mdec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mdec.h; sourceTree = "<group>"; };
+		71F4C56F0FDED12800529849 /* misc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = misc.c; sourceTree = "<group>"; };
+		71F4C5700FDED12800529849 /* misc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = misc.h; sourceTree = "<group>"; };
+		71F4C5710FDED12800529849 /* plugins.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = plugins.c; sourceTree = "<group>"; };
+		71F4C5720FDED12800529849 /* plugins.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = plugins.h; sourceTree = "<group>"; };
+		71F4C5730FDED12800529849 /* psemu_plugin_defs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = psemu_plugin_defs.h; sourceTree = "<group>"; };
+		71F4C5740FDED12800529849 /* psxbios.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = psxbios.c; sourceTree = "<group>"; };
+		71F4C5750FDED12800529849 /* psxbios.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = psxbios.h; sourceTree = "<group>"; };
+		71F4C5760FDED12800529849 /* psxcommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = psxcommon.h; sourceTree = "<group>"; };
+		71F4C5770FDED12800529849 /* psxcounters.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = psxcounters.c; sourceTree = "<group>"; };
+		71F4C5780FDED12800529849 /* psxcounters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = psxcounters.h; sourceTree = "<group>"; };
+		71F4C5790FDED12800529849 /* psxdma.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = psxdma.c; sourceTree = "<group>"; };
+		71F4C57A0FDED12800529849 /* psxdma.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = psxdma.h; sourceTree = "<group>"; };
+		71F4C57B0FDED12800529849 /* psxhle.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = psxhle.c; sourceTree = "<group>"; };
+		71F4C57C0FDED12800529849 /* psxhle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = psxhle.h; sourceTree = "<group>"; };
+		71F4C57D0FDED12800529849 /* psxhw.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = psxhw.c; sourceTree = "<group>"; };
+		71F4C57E0FDED12800529849 /* psxhw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = psxhw.h; sourceTree = "<group>"; };
+		71F4C57F0FDED12800529849 /* psxinterpreter.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = psxinterpreter.c; sourceTree = "<group>"; };
+		71F4C5800FDED12800529849 /* psxmem.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = psxmem.c; sourceTree = "<group>"; };
+		71F4C5810FDED12800529849 /* psxmem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = psxmem.h; sourceTree = "<group>"; };
+		71F4C5820FDED12800529849 /* r3000a.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = r3000a.c; sourceTree = "<group>"; };
+		71F4C5830FDED12800529849 /* r3000a.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = r3000a.h; sourceTree = "<group>"; };
+		71F4C5840FDED12800529849 /* sio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sio.c; sourceTree = "<group>"; };
+		71F4C5850FDED12800529849 /* sio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sio.h; sourceTree = "<group>"; };
+		71F4C5860FDED12800529849 /* spu.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = spu.c; sourceTree = "<group>"; };
+		71F4C5870FDED12800529849 /* spu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = spu.h; sourceTree = "<group>"; };
+		71F4C5880FDED12800529849 /* system.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = system.h; sourceTree = "<group>"; };
+		71F4C5B40FDED16D00529849 /* iGte.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iGte.h; sourceTree = "<group>"; };
+		71F4C5B50FDED16D00529849 /* iR3000A.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = iR3000A.c; sourceTree = "<group>"; };
+		71F4C5B60FDED16D00529849 /* ix86.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ix86.c; sourceTree = "<group>"; };
+		71F4C5B70FDED16D00529849 /* ix86.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ix86.h; sourceTree = "<group>"; };
+		71F703A611B3A673007DD5C5 /* sjisfont.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; path = sjisfont.h; sourceTree = "<group>"; };
+		D422E66D16DC48D000526DCF /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/CheatWindow.xib; sourceTree = "<group>"; };
+		D422E67816DC495800526DCF /* CheatController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CheatController.h; sourceTree = "<group>"; };
+		D422E67916DC495800526DCF /* CheatController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CheatController.m; sourceTree = "<group>"; usesTabs = 1; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		2BB3D6C505427FE200831ACB /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				551A76D9178696810052D185 /* libz.dylib in Frameworks */,
+				551A76D61786960C0052D185 /* Cocoa.framework in Frameworks */,
+				551A76D7178696110052D185 /* IOKit.framework in Frameworks */,
+				551A77AC1786A10D0052D185 /* ForceFeedback.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		551A75C817868C4E0052D185 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				551A75C917868C4E0052D185 /* Cocoa.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		551A7674178690500052D185 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				551A7685178691170052D185 /* IOKit.framework in Frameworks */,
+				551A7675178690500052D185 /* Cocoa.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		551A76881786919F0052D185 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				551A76891786919F0052D185 /* Cocoa.framework in Frameworks */,
+				551A77E71786A4DD0052D185 /* Carbon.framework in Frameworks */,
+				554FD70C17C6A1F10056CF66 /* SDL2.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		551A76B6178693FF0052D185 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				551A76D3178695D10052D185 /* GLUT.framework in Frameworks */,
+				551A76D4178695D20052D185 /* OpenGL.framework in Frameworks */,
+				551A76B7178693FF0052D185 /* Cocoa.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		551A76DC178696BD0052D185 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				554FD70917C6A13E0056CF66 /* SDL2.framework in Frameworks */,
+				551A76F6178697D70052D185 /* libSPUSharedCode.dylib in Frameworks */,
+				551A76DD178696BD0052D185 /* Cocoa.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		551A76E41786971B0052D185 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				551A76E81786971B0052D185 /* Cocoa.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		551A7714178698C60052D185 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				551A7724178699250052D185 /* OpenAL.framework in Frameworks */,
+				551A7715178698C60052D185 /* libSPUSharedCode.dylib in Frameworks */,
+				551A7716178698C60052D185 /* Cocoa.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		551A774917869C280052D185 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				551A774A17869C280052D185 /* Cocoa.framework in Frameworks */,
+				551A775017869C3C0052D185 /* GLUT.framework in Frameworks */,
+				551A775117869C3C0052D185 /* OpenGL.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		551A776717869E430052D185 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				551A776817869E430052D185 /* Cocoa.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		08FB7794FE84155DC02AAC07 /* Pcsxr */ = {
+			isa = PBXGroup;
+			children = (
+				55858D2F178652F90068B8FC /* Configs */,
+				08FB7795FE84155DC02AAC07 /* PCSXR */,
+				551A74AF17868BE90052D185 /* plugins */,
+				551A749D17868B110052D185 /* Frameworks */,
+				1AB674ADFE9D54B511CA2CBB /* Products */,
+			);
+			name = Pcsxr;
+			sourceTree = "<group>";
+		};
+		08FB7795FE84155DC02AAC07 /* PCSXR */ = {
+			isa = PBXGroup;
+			children = (
+				2BCE23B204C6B52C007C2DA3 /* libpcsxcore */,
+				2BC4787804C7FDBD00CAB520 /* MacOSX */,
+				2BA178AD0514CE260026D74D /* Resources */,
+			);
+			name = PCSXR;
+			sourceTree = "<group>";
+		};
+		1AB674ADFE9D54B511CA2CBB /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				2BBD6C1D04C893F500A83E33 /* PlugIns */,
+				2BB3D6D105427FE200831ACB /* PCSXR.app */,
+				551A75CE17868C4E0052D185 /* Bladesio1.psxplugin */,
+				551A767A178690500052D185 /* DFCdrom.psxplugin */,
+				551A768E1786919F0052D185 /* DFInput.psxplugin */,
+				551A76BC178693FF0052D185 /* PeopsSoftGPU.psxplugin */,
+				551A76E2178696BD0052D185 /* PeopsSpuSDL.psxplugin */,
+				551A76E71786971B0052D185 /* libSPUSharedCode.dylib */,
+				551A771F178698C60052D185 /* PeopsSpuAL.psxplugin */,
+				551A774F17869C280052D185 /* PeopsXGL.psxplugin */,
+				551A776D17869E430052D185 /* DFNet.psxplugin */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		2B143D00078A2CBD00AF745A /* icons */ = {
+			isa = PBXGroup;
+			children = (
+				2B143D01078A2CBD00AF745A /* PCSXR.icns */,
+				2B143D02078A2CBD00AF745A /* pcsxrfreeze.icns */,
+				2B143D03078A2CBD00AF745A /* pcsxrmemcard.icns */,
+				2B143D04078A2CBD00AF745A /* psxbios.icns */,
+				2B143D05078A2CBD00AF745A /* psxplugin.icns */,
+			);
+			path = icons;
+			sourceTree = "<group>";
+		};
+		2BA178AD0514CE260026D74D /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				2B143D00078A2CBD00AF745A /* icons */,
+				2BB3D6CF05427FE200831ACB /* Info.plist */,
+				02FE55E616765F9400205CF2 /* KeyNames.plist */,
+				2BBB1786051E0D9700B84448 /* Credits.rtf */,
+				28F0C3C4146521A700A90285 /* Configuration.xib */,
+				2BA178B20514CE260026D74D /* InfoPlist.strings */,
+				559DACEC146C72FF00C5DF71 /* Localizable.strings */,
+				28F0C3C7146521B000A90285 /* PCSXR.xib */,
+				28F0C3CA146521B700A90285 /* AddPluginSheet.xib */,
+				55C7A216148B2B3800C22ABC /* PcsxrMemCardDocument.xib */,
+				D422E66C16DC48D000526DCF /* CheatWindow.xib */,
+			);
+			name = Resources;
+			sourceTree = "<group>";
+		};
+		2BBD6C1D04C893F500A83E33 /* PlugIns */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			name = PlugIns;
+			sourceTree = "<group>";
+		};
+		2BC4787804C7FDBD00CAB520 /* MacOSX */ = {
+			isa = PBXGroup;
+			children = (
+				557649B61786AF6F007C4457 /* File Handlers */,
+				557649B71786AF92007C4457 /* Plug-in handling */,
+				557649B81786AFB7007C4457 /* Controllers */,
+				55E0ACE1178B850B0005C945 /* Helper Classes */,
+				55BB3493169CD42500850200 /* ARCBridge.h */,
+				7161C2810FDED6D000225F97 /* config.h */,
+				2BA178A505148D9D0026D74D /* main.m */,
+				2BBB17DA051E4D0F00B84448 /* Plugin.c */,
+				7161C2970FDED75300225F97 /* ExtendedKeys.h */,
+				02717969167884DF004AED62 /* hotkeys.h */,
+				02717967167884C9004AED62 /* hotkeys.m */,
+				5539965D178BB1B100859644 /* OSXPlugLocalization.h */,
+			);
+			name = MacOSX;
+			sourceTree = "<group>";
+		};
+		2BCE23B204C6B52C007C2DA3 /* libpcsxcore */ = {
+			isa = PBXGroup;
+			children = (
+				71F4C5B30FDED15800529849 /* ix86 */,
+				559366BF12B694DF004ACC1E /* ix86_64 */,
+				71F4C5600FDED12800529849 /* cdriso.c */,
+				71F4C5610FDED12800529849 /* cdriso.h */,
+				71F4C5620FDED12800529849 /* cdrom.c */,
+				71F4C5630FDED12800529849 /* cdrom.h */,
+				71F4C5640FDED12800529849 /* cheat.c */,
+				71F4C5650FDED12800529849 /* cheat.h */,
+				71F4C5660FDED12800529849 /* coff.h */,
+				712FD1E51093096F00575A92 /* debug.c */,
+				71F4C5670FDED12800529849 /* debug.h */,
+				71F4C5680FDED12800529849 /* decode_xa.c */,
+				71F4C5690FDED12800529849 /* decode_xa.h */,
+				71F4C56A0FDED12800529849 /* disr3000a.c */,
+				7192F428129C412E0042D946 /* gpu.c */,
+				7192F429129C412E0042D946 /* gpu.h */,
+				71F4C56B0FDED12800529849 /* gte.c */,
+				71F4C56C0FDED12800529849 /* gte.h */,
+				719594AF11AEFE8C004AD686 /* gte_divider.h */,
+				71F4C56D0FDED12800529849 /* mdec.c */,
+				71F4C56E0FDED12800529849 /* mdec.h */,
+				71F4C56F0FDED12800529849 /* misc.c */,
+				71F4C5700FDED12800529849 /* misc.h */,
+				71F4C5710FDED12800529849 /* plugins.c */,
+				71F4C5720FDED12800529849 /* plugins.h */,
+				713B530C110B75650002F164 /* ppf.c */,
+				713B530D110B75650002F164 /* ppf.h */,
+				71F4C5730FDED12800529849 /* psemu_plugin_defs.h */,
+				71F4C5740FDED12800529849 /* psxbios.c */,
+				71F4C5750FDED12800529849 /* psxbios.h */,
+				719594B011AEFE8C004AD686 /* psxcommon.c */,
+				71F4C5760FDED12800529849 /* psxcommon.h */,
+				71F4C5770FDED12800529849 /* psxcounters.c */,
+				71F4C5780FDED12800529849 /* psxcounters.h */,
+				71F4C5790FDED12800529849 /* psxdma.c */,
+				71F4C57A0FDED12800529849 /* psxdma.h */,
+				71F4C57B0FDED12800529849 /* psxhle.c */,
+				71F4C57C0FDED12800529849 /* psxhle.h */,
+				71F4C57D0FDED12800529849 /* psxhw.c */,
+				71F4C57E0FDED12800529849 /* psxhw.h */,
+				71F4C57F0FDED12800529849 /* psxinterpreter.c */,
+				71F4C5800FDED12800529849 /* psxmem.c */,
+				71F4C5810FDED12800529849 /* psxmem.h */,
+				71F4C5820FDED12800529849 /* r3000a.c */,
+				71F4C5830FDED12800529849 /* r3000a.h */,
+				71F4C5840FDED12800529849 /* sio.c */,
+				71F4C5850FDED12800529849 /* sio.h */,
+				71F703A611B3A673007DD5C5 /* sjisfont.h */,
+				712FD1E61093096F00575A92 /* socket.c */,
+				712FD1E71093096F00575A92 /* socket.h */,
+				71F4C5860FDED12800529849 /* spu.c */,
+				71F4C5870FDED12800529849 /* spu.h */,
+				71F4C5880FDED12800529849 /* system.h */,
+			);
+			name = libpcsxcore;
+			path = ../libpcsxcore;
+			sourceTree = "<group>";
+		};
+		551A749D17868B110052D185 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				554FD70817C6A13E0056CF66 /* SDL2.framework */,
+				551A774217869BD40052D185 /* AudioUnit.framework */,
+				551A774317869BD50052D185 /* CoreAudio.framework */,
+				551A7723178699250052D185 /* OpenAL.framework */,
+				551A76D1178695BD0052D185 /* GLUT.framework */,
+				551A76D2178695C70052D185 /* OpenGL.framework */,
+				2B690C760635C65C00CDA575 /* ExceptionHandling.framework */,
+				2B976C00074C14B4007C050A /* Kernel.framework */,
+				551A76AC178693C60052D185 /* Carbon.framework */,
+				551A749E17868B110052D185 /* Cocoa.framework */,
+				551A768F178691E60052D185 /* ForceFeedback.framework */,
+				551A7684178691170052D185 /* IOKit.framework */,
+				551A76D8178696810052D185 /* libz.dylib */,
+				551A74A017868B110052D185 /* Other Frameworks */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		551A74A017868B110052D185 /* Other Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				551A76B2178693EA0052D185 /* CoreFoundation.framework */,
+				551A76AE178693D60052D185 /* ApplicationServices.framework */,
+				551A76AF178693D60052D185 /* CoreServices.framework */,
+				551A74A117868B110052D185 /* AppKit.framework */,
+				551A74A217868B110052D185 /* CoreData.framework */,
+				551A74A317868B110052D185 /* Foundation.framework */,
+			);
+			name = "Other Frameworks";
+			sourceTree = "<group>";
+		};
+		551A74AF17868BE90052D185 /* plugins */ = {
+			isa = PBXGroup;
+			children = (
+				551A74B017868BE90052D185 /* Bladesio1 */,
+				551A750417868BEA0052D185 /* DFCdrom */,
+				551A751817868BEB0052D185 /* DFInput */,
+				551A753217868BEB0052D185 /* DFNet */,
+				551A754917868BEC0052D185 /* DFSound */,
+				551A756617868BEC0052D185 /* DFXVideo */,
+				551A758317868BED0052D185 /* PeopsXgl */,
+			);
+			path = plugins;
+			sourceTree = "<group>";
+		};
+		551A74B017868BE90052D185 /* Bladesio1 */ = {
+			isa = PBXGroup;
+			children = (
+				551A75BA17868C400052D185 /* src */,
+				551A74BD17868BEA0052D185 /* macsrc */,
+				551A75B917868C200052D185 /* Resources */,
+			);
+			path = Bladesio1;
+			sourceTree = "<group>";
+		};
+		551A74BD17868BEA0052D185 /* macsrc */ = {
+			isa = PBXGroup;
+			children = (
+				551A74BF17868BEA0052D185 /* cfg.c */,
+				551A74C017868BEA0052D185 /* PluginConfigController.h */,
+				551A74C117868BEA0052D185 /* PluginConfigController.m */,
+			);
+			path = macsrc;
+			sourceTree = "<group>";
+		};
+		551A750417868BEA0052D185 /* DFCdrom */ = {
+			isa = PBXGroup;
+			children = (
+				551A75F017868E640052D185 /* src */,
+				551A751217868BEB0052D185 /* macsrc */,
+				551A75D817868E180052D185 /* Resources */,
+			);
+			path = DFCdrom;
+			sourceTree = "<group>";
+		};
+		551A751217868BEB0052D185 /* macsrc */ = {
+			isa = PBXGroup;
+			children = (
+				551A751317868BEB0052D185 /* cdr-macosx.c */,
+				551A751417868BEB0052D185 /* cfg.c */,
+				551A751517868BEB0052D185 /* PluginConfigController.h */,
+				551A751617868BEB0052D185 /* PluginConfigController.m */,
+			);
+			path = macsrc;
+			sourceTree = "<group>";
+		};
+		551A751817868BEB0052D185 /* DFInput */ = {
+			isa = PBXGroup;
+			children = (
+				551A76651786901F0052D185 /* src */,
+				551A752617868BEB0052D185 /* macsrc */,
+				551A7671178690280052D185 /* Resources */,
+			);
+			path = DFInput;
+			sourceTree = "<group>";
+		};
+		551A752617868BEB0052D185 /* macsrc */ = {
+			isa = PBXGroup;
+			children = (
+				551A752717868BEB0052D185 /* cfg.c */,
+				551A752817868BEB0052D185 /* cfg.h */,
+				551A752917868BEB0052D185 /* ControllerList.h */,
+				551A752A17868BEB0052D185 /* ControllerList.m */,
+				551A752B17868BEB0052D185 /* MappingCell.h */,
+				551A752C17868BEB0052D185 /* MappingCell.m */,
+				551A752D17868BEB0052D185 /* PadController.h */,
+				551A752E17868BEB0052D185 /* PadController.m */,
+				551A752F17868BEB0052D185 /* PadView.h */,
+				551A753017868BEB0052D185 /* PadView.m */,
+				551A753117868BEB0052D185 /* xkb.c */,
+			);
+			path = macsrc;
+			sourceTree = "<group>";
+		};
+		551A753217868BEB0052D185 /* DFNet */ = {
+			isa = PBXGroup;
+			children = (
+				551A777117869E830052D185 /* src */,
+				551A754117868BEC0052D185 /* macsrc */,
+				551A760817868EC10052D185 /* Resoruces */,
+			);
+			path = DFNet;
+			sourceTree = "<group>";
+		};
+		551A754117868BEC0052D185 /* macsrc */ = {
+			isa = PBXGroup;
+			children = (
+				551A754317868BEC0052D185 /* cfg.c */,
+				551A754417868BEC0052D185 /* PluginConfigController.h */,
+				551A754517868BEC0052D185 /* PluginConfigController.m */,
+				551A754617868BEC0052D185 /* SockDialog.h */,
+				551A754717868BEC0052D185 /* SockDialog.m */,
+			);
+			path = macsrc;
+			sourceTree = "<group>";
+		};
+		551A754917868BEC0052D185 /* DFSound */ = {
+			isa = PBXGroup;
+			children = (
+				551A760917868EF00052D185 /* src */,
+				551A754C17868BEC0052D185 /* macsrc */,
+				551A755817868BEC0052D185 /* Resorces */,
+			);
+			path = DFSound;
+			sourceTree = "<group>";
+		};
+		551A754C17868BEC0052D185 /* macsrc */ = {
+			isa = PBXGroup;
+			children = (
+				551A754E17868BEC0052D185 /* maccfg.h */,
+				551A754F17868BEC0052D185 /* NamedSlider.h */,
+				551A755017868BEC0052D185 /* NamedSlider.m */,
+				551A755117868BEC0052D185 /* PluginController.h */,
+				551A755217868BEC0052D185 /* PluginController.m */,
+				551A755317868BEC0052D185 /* SPUPluginController.h */,
+				551A755417868BEC0052D185 /* SPUPluginController.m */,
+			);
+			path = macsrc;
+			sourceTree = "<group>";
+		};
+		551A755817868BEC0052D185 /* Resorces */ = {
+			isa = PBXGroup;
+			children = (
+				551A755917868BEC0052D185 /* OpenAL */,
+				551A755C17868BEC0052D185 /* SDL */,
+				551A755F17868BEC0052D185 /* Shared */,
+			);
+			path = Resorces;
+			sourceTree = "<group>";
+		};
+		551A755917868BEC0052D185 /* OpenAL */ = {
+			isa = PBXGroup;
+			children = (
+				551A754A17868BEC0052D185 /* Info-AL.plist */,
+				551A755A17868BEC0052D185 /* InfoPlist.strings */,
+			);
+			path = OpenAL;
+			sourceTree = "<group>";
+		};
+		551A755C17868BEC0052D185 /* SDL */ = {
+			isa = PBXGroup;
+			children = (
+				551A754B17868BEC0052D185 /* Info-SDL.plist */,
+				551A755D17868BEC0052D185 /* InfoPlist.strings */,
+			);
+			path = SDL;
+			sourceTree = "<group>";
+		};
+		551A755F17868BEC0052D185 /* Shared */ = {
+			isa = PBXGroup;
+			children = (
+				554572F217CBC69600FB7D19 /* SPUShared-info.plist */,
+				551A756017868BEC0052D185 /* Credits.rtf */,
+				551A756217868BEC0052D185 /* Localizable.strings */,
+				551A756417868BEC0052D185 /* NetSfPeopsSpuPluginMain.xib */,
+			);
+			path = Shared;
+			sourceTree = "<group>";
+		};
+		551A756617868BEC0052D185 /* DFXVideo */ = {
+			isa = PBXGroup;
+			children = (
+				551A762A17868F270052D185 /* src */,
+				551A757317868BEC0052D185 /* macsrc */,
+				551A764717868F3D0052D185 /* Resources */,
+			);
+			path = DFXVideo;
+			sourceTree = "<group>";
+		};
+		551A757317868BEC0052D185 /* macsrc */ = {
+			isa = PBXGroup;
+			children = (
+				551A757417868BEC0052D185 /* drawgl.m */,
+				551A757517868BEC0052D185 /* ExtendedKeys.h */,
+				551A757617868BEC0052D185 /* PluginConfigController.h */,
+				551A757717868BEC0052D185 /* PluginConfigController.m */,
+				551A757817868BEC0052D185 /* PluginGLView.h */,
+				551A757917868BEC0052D185 /* PluginGLView.m */,
+				551A757A17868BEC0052D185 /* PluginWindow.h */,
+				551A757B17868BEC0052D185 /* PluginWindow.m */,
+				551A757C17868BEC0052D185 /* PluginWindowController.h */,
+				551A757D17868BEC0052D185 /* PluginWindowController.m */,
+				551A757E17868BEC0052D185 /* SGPUPreferences.h */,
+			);
+			path = macsrc;
+			sourceTree = "<group>";
+		};
+		551A758317868BED0052D185 /* PeopsXgl */ = {
+			isa = PBXGroup;
+			children = (
+				551A764817868F570052D185 /* src */,
+				551A758E17868BED0052D185 /* macsrc */,
+				551A766417868F870052D185 /* Resources */,
+			);
+			path = PeopsXgl;
+			sourceTree = "<group>";
+		};
+		551A758E17868BED0052D185 /* macsrc */ = {
+			isa = PBXGroup;
+			children = (
+				551A758F17868BED0052D185 /* drawgl.h */,
+				551A759017868BED0052D185 /* drawgl.m */,
+				551A759117868BED0052D185 /* ExtendedKeys.h */,
+				551A759217868BED0052D185 /* NetSfPeopsOpenGLPluginConfigController.h */,
+				551A759317868BED0052D185 /* NetSfPeopsOpenGLPluginConfigController.m */,
+				551A759417868BED0052D185 /* PluginGLView.h */,
+				551A759517868BED0052D185 /* PluginGLView.m */,
+				551A759617868BED0052D185 /* PluginWindow.h */,
+				551A759717868BED0052D185 /* PluginWindow.m */,
+				551A759817868BED0052D185 /* PluginWindowController.h */,
+				551A759917868BED0052D185 /* PluginWindowController.m */,
+			);
+			path = macsrc;
+			sourceTree = "<group>";
+		};
+		551A75B917868C200052D185 /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				551A74B417868BEA0052D185 /* Bladesio1PluginConfig.xib */,
+				551A74B617868BEA0052D185 /* Credits.rtf */,
+				551A74B817868BEA0052D185 /* InfoPlist.strings */,
+				551A74BA17868BEA0052D185 /* Localizable.strings */,
+				551A74BC17868BEA0052D185 /* Info.plist */,
+				551A74C217868BEA0052D185 /* version.plist */,
+			);
+			name = Resources;
+			sourceTree = "<group>";
+		};
+		551A75BA17868C400052D185 /* src */ = {
+			isa = PBXGroup;
+			children = (
+				551A75BC17868C400052D185 /* connection.c */,
+				551A75BD17868C400052D185 /* connection.h */,
+				551A75BE17868C400052D185 /* fifo.c */,
+				551A75BF17868C400052D185 /* fifo.h */,
+				551A75C217868C400052D185 /* sio1.c */,
+				551A75C317868C400052D185 /* sio1.h */,
+				551A75C517868C400052D185 /* typedefs.h */,
+			);
+			name = src;
+			path = ../../../plugins/bladesio1;
+			sourceTree = "<group>";
+		};
+		551A75D817868E180052D185 /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				551A750917868BEB0052D185 /* Credits.rtf */,
+				551A750B17868BEB0052D185 /* DFCdromPluginConfig.xib */,
+				551A750D17868BEB0052D185 /* InfoPlist.strings */,
+				551A750F17868BEB0052D185 /* Localizable.strings */,
+				551A751117868BEB0052D185 /* Info.plist */,
+				551A751717868BEB0052D185 /* version.plist */,
+			);
+			name = Resources;
+			sourceTree = "<group>";
+		};
+		551A75F017868E640052D185 /* src */ = {
+			isa = PBXGroup;
+			children = (
+				551A75F417868E640052D185 /* cdr.c */,
+				551A75F517868E640052D185 /* cdr.h */,
+				551A75FB17868E640052D185 /* util.c */,
+			);
+			name = src;
+			path = ../../../plugins/dfcdrom;
+			sourceTree = "<group>";
+		};
+		551A760817868EC10052D185 /* Resoruces */ = {
+			isa = PBXGroup;
+			children = (
+				551A753617868BEB0052D185 /* Credits.rtf */,
+				551A753817868BEB0052D185 /* DFNet.xib */,
+				551A753A17868BEB0052D185 /* InfoPlist.strings */,
+				551A753C17868BEB0052D185 /* Localizable.strings */,
+				551A753E17868BEB0052D185 /* SockDialog.xib */,
+				551A754017868BEC0052D185 /* Info.plist */,
+				551A754817868BEC0052D185 /* version.plist */,
+			);
+			name = Resoruces;
+			sourceTree = "<group>";
+		};
+		551A760917868EF00052D185 /* src */ = {
+			isa = PBXGroup;
+			children = (
+				551A760A17868EF00052D185 /* adsr.c */,
+				551A760B17868EF00052D185 /* adsr.h */,
+				551A760F17868EF00052D185 /* dma.c */,
+				551A761017868EF00052D185 /* dma.h */,
+				551A761117868EF00052D185 /* dsoundoss.h */,
+				551A761217868EF00052D185 /* externals.c */,
+				551A761317868EF00052D185 /* externals.h */,
+				551A761417868EF00052D185 /* freeze.c */,
+				551A761517868EF00052D185 /* gauss_i.h */,
+				551A761817868EF00052D185 /* openal.c */,
+				551A761A17868EF00052D185 /* psemuxa.h */,
+				551A761C17868EF00052D185 /* registers.c */,
+				551A761D17868EF00052D185 /* registers.h */,
+				551A761E17868EF00052D185 /* regs.h */,
+				551A761F17868EF00052D185 /* reverb.c */,
+				551A762017868EF00052D185 /* reverb.h */,
+				551A762117868EF00052D185 /* sdl.c */,
+				551A762217868EF00052D185 /* spu.c */,
+				551A762317868EF00052D185 /* spu.h */,
+				551A762717868EF00052D185 /* stdafx.h */,
+				551A762817868EF00052D185 /* xa.c */,
+				551A762917868EF00052D185 /* xa.h */,
+			);
+			name = src;
+			path = ../../../plugins/dfsound;
+			sourceTree = "<group>";
+		};
+		551A762A17868F270052D185 /* src */ = {
+			isa = PBXGroup;
+			children = (
+				551A762B17868F270052D185 /* cfg.c */,
+				551A762C17868F270052D185 /* cfg.h */,
+				551A762D17868F270052D185 /* draw.c */,
+				551A762E17868F270052D185 /* draw.h */,
+				551A762F17868F270052D185 /* externals.h */,
+				551A763017868F270052D185 /* fps.c */,
+				551A763117868F270052D185 /* fps.h */,
+				551A763217868F270052D185 /* gpu.c */,
+				551A763317868F270052D185 /* gpu.h */,
+				551A763717868F270052D185 /* hq2x.h */,
+				551A763817868F270052D185 /* hq3x.h */,
+				551A763A17868F280052D185 /* interp.h */,
+				551A763B17868F280052D185 /* key.c */,
+				551A763C17868F280052D185 /* key.h */,
+				551A763F17868F280052D185 /* menu.c */,
+				551A764017868F280052D185 /* menu.h */,
+				551A764117868F280052D185 /* prim.c */,
+				551A764217868F280052D185 /* prim.h */,
+				551A764317868F280052D185 /* soft.c */,
+				551A764417868F280052D185 /* soft.h */,
+				551A764517868F280052D185 /* swap.h */,
+				551A764617868F280052D185 /* zn.c */,
+			);
+			name = src;
+			path = ../../../plugins/dfxvideo;
+			sourceTree = "<group>";
+		};
+		551A764717868F3D0052D185 /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				551A756817868BEC0052D185 /* Credits.rtf */,
+				551A756A17868BEC0052D185 /* InfoPlist.strings */,
+				551A756C17868BEC0052D185 /* Localizable.strings */,
+				551A756E17868BEC0052D185 /* NetSfPeopsSoftGPUConfig.xib */,
+				551A757017868BEC0052D185 /* gpuPeteOGL2.slf */,
+				551A757117868BEC0052D185 /* gpuPeteOGL2.slv */,
+				551A757217868BEC0052D185 /* Info.plist */,
+				551A757F17868BED0052D185 /* NetSfPeopsSoftGPUInterface.xib */,
+			);
+			name = Resources;
+			sourceTree = "<group>";
+		};
+		551A764817868F570052D185 /* src */ = {
+			isa = PBXGroup;
+			children = (
+				551A764B17868F570052D185 /* draw.c */,
+				551A764C17868F570052D185 /* draw.h */,
+				551A764D17868F570052D185 /* externals.h */,
+				551A764E17868F570052D185 /* fps.c */,
+				551A764F17868F570052D185 /* fps.h */,
+				551A765017868F570052D185 /* gl_ext.h */,
+				551A765117868F570052D185 /* gpu.c */,
+				551A765217868F570052D185 /* gpu.h */,
+				551A765617868F570052D185 /* gte_accuracy.c */,
+				551A765717868F570052D185 /* gte_accuracy.h */,
+				551A765817868F570052D185 /* key.c */,
+				551A765917868F570052D185 /* key.h */,
+				551A765B17868F570052D185 /* menu.c */,
+				551A765C17868F570052D185 /* menu.h */,
+				551A765D17868F570052D185 /* prim.c */,
+				551A765E17868F570052D185 /* prim.h */,
+				551A765F17868F570052D185 /* soft.c */,
+				551A766017868F570052D185 /* soft.h */,
+				551A766117868F570052D185 /* stdafx.h */,
+				551A766217868F570052D185 /* texture.c */,
+				551A766317868F570052D185 /* texture.h */,
+			);
+			indentWidth = 1;
+			name = src;
+			path = ../../../plugins/peopsxgl;
+			sourceTree = "<group>";
+			usesTabs = 0;
+		};
+		551A766417868F870052D185 /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				551A758517868BED0052D185 /* Credits.rtf */,
+				551A758717868BED0052D185 /* InfoPlist.strings */,
+				551A758917868BED0052D185 /* Localizable.strings */,
+				551A758B17868BED0052D185 /* NetSfPeopsOpenGLConfig.xib */,
+				551A758D17868BED0052D185 /* Info.plist */,
+				551A759A17868BED0052D185 /* NetSfPeopsOpenGLGPUInterface.xib */,
+			);
+			name = Resources;
+			sourceTree = "<group>";
+		};
+		551A76651786901F0052D185 /* src */ = {
+			isa = PBXGroup;
+			children = (
+				551A76661786901F0052D185 /* analog.c */,
+				551A766B1786901F0052D185 /* pad.c */,
+				551A766C1786901F0052D185 /* pad.h */,
+				551A766D1786901F0052D185 /* sdljoy.c */,
+				551A766E1786901F0052D185 /* util.c */,
+				551A766F1786901F0052D185 /* util.h */,
+				551A76701786901F0052D185 /* xkb.c */,
+			);
+			name = src;
+			path = ../../../plugins/dfinput;
+			sourceTree = "<group>";
+		};
+		551A7671178690280052D185 /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				551A751D17868BEB0052D185 /* Credits.rtf */,
+				551A751F17868BEB0052D185 /* InfoPlist.strings */,
+				551A752117868BEB0052D185 /* Localizable.strings */,
+				551A752317868BEB0052D185 /* NetPcsxrHIDInputPluginMain.xib */,
+				551A752517868BEB0052D185 /* Info.plist */,
+			);
+			name = Resources;
+			sourceTree = "<group>";
+		};
+		551A777117869E830052D185 /* src */ = {
+			isa = PBXGroup;
+			children = (
+				551A777317869E830052D185 /* dfnet.c */,
+				551A777417869E830052D185 /* dfnet.h */,
+				551A777817869E830052D185 /* unix.c */,
+			);
+			name = src;
+			path = ../../../plugins/dfnet;
+			sourceTree = "<group>";
+		};
+		557649B61786AF6F007C4457 /* File Handlers */ = {
+			isa = PBXGroup;
+			children = (
+				55BBA690149454DE003B2CEC /* PcsxrFileHandle.h */,
+				55BBA691149455E1003B2CEC /* PcsxrMemCardHandler.h */,
+				55BBA692149455E1003B2CEC /* PcsxrMemCardHandler.m */,
+				55BBA69414945628003B2CEC /* PcsxrPluginHandler.h */,
+				55BBA69514945628003B2CEC /* PcsxrPluginHandler.m */,
+				55BBA69714953887003B2CEC /* PcsxrDiscHandler.h */,
+				55BBA69814953887003B2CEC /* PcsxrDiscHandler.m */,
+				55BBA69A14958399003B2CEC /* PcsxrFreezeStateHandler.h */,
+				55BBA69B1495839A003B2CEC /* PcsxrFreezeStateHandler.m */,
+				5581463717AABCD100862DBF /* PcsxrCheatHandler.h */,
+				5581463817AABCD100862DBF /* PcsxrCheatHandler.m */,
+			);
+			name = "File Handlers";
+			sourceTree = "<group>";
+		};
+		557649B71786AF92007C4457 /* Plug-in handling */ = {
+			isa = PBXGroup;
+			children = (
+				2BBB1126051DC00500B84448 /* PluginList.h */,
+				2BBB1127051DC00500B84448 /* PluginList.m */,
+				2BA44360052DB2EA00E21DDD /* PcsxrPlugin.h */,
+				2BA44361052DB2EA00E21DDD /* PcsxrPlugin.m */,
+			);
+			name = "Plug-in handling";
+			sourceTree = "<group>";
+		};
+		557649B81786AFB7007C4457 /* Controllers */ = {
+			isa = PBXGroup;
+			children = (
+				2B4DE98D05FF9307003EFEF0 /* PluginController.h */,
+				2B4DE98E05FF9307003EFEF0 /* PluginController.m */,
+				2B75FD3C051C56D200D12034 /* PcsxrController.h */,
+				2B75FD3D051C56D200D12034 /* PcsxrController.m */,
+				2B75FD4A051C8A7400D12034 /* ConfigurationController.h */,
+				2B75FD4B051C8A7400D12034 /* ConfigurationController.m */,
+				55A9021E147D7C380037E18F /* PcsxrMemCardController.h */,
+				55A9021F147D7C380037E18F /* PcsxrMemCardController.m */,
+				D422E67816DC495800526DCF /* CheatController.h */,
+				D422E67916DC495800526DCF /* CheatController.m */,
+				0280B7AB16764CC3007B8001 /* HotkeyController.h */,
+				0280B7AC16764CC3007B8001 /* HotkeyController.m */,
+			);
+			name = Controllers;
+			sourceTree = "<group>";
+		};
+		55858D2F178652F90068B8FC /* Configs */ = {
+			isa = PBXGroup;
+			children = (
+				55858D2A17864DC80068B8FC /* Pcsxr-Debug.xcconfig */,
+				55858D2B17864DC90068B8FC /* Pcsxr-Instrument.xcconfig */,
+				55858D2C17864DC90068B8FC /* Pcsxr-Release.xcconfig */,
+				55858D2817864D140068B8FC /* Pcsxr.xcconfig */,
+			);
+			path = Configs;
+			sourceTree = "<group>";
+		};
+		559366BF12B694DF004ACC1E /* ix86_64 */ = {
+			isa = PBXGroup;
+			children = (
+				559366C012B694DF004ACC1E /* iGte.h */,
+				559366C112B694DF004ACC1E /* iR3000A-64.c */,
+				559366C212B694DF004ACC1E /* ix86-64.c */,
+				559366C312B694DF004ACC1E /* ix86-64.h */,
+				559366C412B694DF004ACC1E /* ix86_3dnow.c */,
+				559366C512B694DF004ACC1E /* ix86_cpudetect.c */,
+				559366C612B694DF004ACC1E /* ix86_fpu.c */,
+				559366C712B694DF004ACC1E /* ix86_mmx.c */,
+				559366C812B694DF004ACC1E /* ix86_sse.c */,
+			);
+			path = ix86_64;
+			sourceTree = "<group>";
+		};
+		55E0ACE1178B850B0005C945 /* Helper Classes */ = {
+			isa = PBXGroup;
+			children = (
+				2BBB1791051E113B00B84448 /* EmuThread.h */,
+				2BBB1792051E113B00B84448 /* EmuThread.m */,
+				55A90227147D89380037E18F /* PcsxrMemoryObject.h */,
+				55A90228147D89380037E18F /* PcsxrMemoryObject.m */,
+				55EC05F91788B1230053AC23 /* PcsxrMemCardArray.h */,
+				55EC05FA1788B1230053AC23 /* PcsxrMemCardArray.m */,
+				55E0ACDE178B695F0005C945 /* LaunchArg.h */,
+				55E0ACDF178B69600005C945 /* LaunchArg.m */,
+				55EC05FC178916E70053AC23 /* MemBadgeView.h */,
+				55EC05FD178916E70053AC23 /* MemBadgeView.m */,
+				5550D2711683C923006C56B5 /* RecentItemsMenu.h */,
+				5550D2721683C923006C56B5 /* RecentItemsMenu.m */,
+				550F023B17BFFD97002594DF /* PcsxrHexadecimalFormatter.h */,
+				550F023C17BFFD97002594DF /* PcsxrHexadecimalFormatter.m */,
+			);
+			name = "Helper Classes";
+			sourceTree = "<group>";
+		};
+		71F4C5B30FDED15800529849 /* ix86 */ = {
+			isa = PBXGroup;
+			children = (
+				71F4C5B40FDED16D00529849 /* iGte.h */,
+				71F4C5B50FDED16D00529849 /* iR3000A.c */,
+				71F4C5B60FDED16D00529849 /* ix86.c */,
+				71F4C5B70FDED16D00529849 /* ix86.h */,
+			);
+			path = ix86;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXHeadersBuildPhase section */
+		551A76E51786971B0052D185 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXHeadersBuildPhase section */
+
+/* Begin PBXNativeTarget section */
+		2BB3D68205427FE200831ACB /* PCSXR */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 71F353F30FD98DFE00CBEC28 /* Build configuration list for PBXNativeTarget "PCSXR" */;
+			buildPhases = (
+				2BB3D6A205427FE200831ACB /* Resources */,
+				2BB3D6A805427FE200831ACB /* Sources */,
+				2BB3D6C505427FE200831ACB /* Frameworks */,
+				71AD2DF010C3573400365243 /* Copy PlugIns */,
+			);
+			buildRules = (
+				2BD707B705559AE300CB5D9B /* PBXBuildRule */,
+				2BB3D6D005427FE200831ACB /* PBXBuildRule */,
+			);
+			dependencies = (
+				55906B1E17C28EE40057F60D /* PBXTargetDependency */,
+				551A778517869F4B0052D185 /* PBXTargetDependency */,
+				551A778717869F4B0052D185 /* PBXTargetDependency */,
+				551A778917869F4B0052D185 /* PBXTargetDependency */,
+				551A778B17869F4B0052D185 /* PBXTargetDependency */,
+				551A778D17869F4B0052D185 /* PBXTargetDependency */,
+				551A778F17869F4B0052D185 /* PBXTargetDependency */,
+				551A779117869F4B0052D185 /* PBXTargetDependency */,
+				551A779317869F4B0052D185 /* PBXTargetDependency */,
+			);
+			name = PCSXR;
+			productInstallPath = "$(USER_APPS_DIR)";
+			productName = "Pcsxr-MacOSX";
+			productReference = 2BB3D6D105427FE200831ACB /* PCSXR.app */;
+			productType = "com.apple.product-type.application";
+		};
+		551A75C617868C4E0052D185 /* Bladesio1 */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 551A75CB17868C4E0052D185 /* Build configuration list for PBXNativeTarget "Bladesio1" */;
+			buildPhases = (
+				551A75C717868C4E0052D185 /* Sources */,
+				551A75C817868C4E0052D185 /* Frameworks */,
+				551A75CA17868C4E0052D185 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = Bladesio1;
+			productName = BasePlugin;
+			productReference = 551A75CE17868C4E0052D185 /* Bladesio1.psxplugin */;
+			productType = "com.apple.product-type.bundle";
+		};
+		551A7672178690500052D185 /* DFCdrom */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 551A7677178690500052D185 /* Build configuration list for PBXNativeTarget "DFCdrom" */;
+			buildPhases = (
+				551A7673178690500052D185 /* Sources */,
+				551A7674178690500052D185 /* Frameworks */,
+				551A7676178690500052D185 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = DFCdrom;
+			productName = BasePlugin;
+			productReference = 551A767A178690500052D185 /* DFCdrom.psxplugin */;
+			productType = "com.apple.product-type.bundle";
+		};
+		551A76861786919F0052D185 /* DFInput */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 551A768B1786919F0052D185 /* Build configuration list for PBXNativeTarget "DFInput" */;
+			buildPhases = (
+				551A76871786919F0052D185 /* Sources */,
+				551A76881786919F0052D185 /* Frameworks */,
+				551A768A1786919F0052D185 /* Resources */,
+				551A77BA1786A1DC0052D185 /* Copy Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = DFInput;
+			productName = BasePlugin;
+			productReference = 551A768E1786919F0052D185 /* DFInput.psxplugin */;
+			productType = "com.apple.product-type.bundle";
+		};
+		551A76B4178693FF0052D185 /* DFXVideo */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 551A76B9178693FF0052D185 /* Build configuration list for PBXNativeTarget "DFXVideo" */;
+			buildPhases = (
+				551A76B5178693FF0052D185 /* Sources */,
+				551A76B6178693FF0052D185 /* Frameworks */,
+				551A76B8178693FF0052D185 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = DFXVideo;
+			productName = BasePlugin;
+			productReference = 551A76BC178693FF0052D185 /* PeopsSoftGPU.psxplugin */;
+			productType = "com.apple.product-type.bundle";
+		};
+		551A76DA178696BD0052D185 /* PeopsSpuSDL */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 551A76DF178696BD0052D185 /* Build configuration list for PBXNativeTarget "PeopsSpuSDL" */;
+			buildPhases = (
+				551A76DB178696BD0052D185 /* Sources */,
+				551A76DC178696BD0052D185 /* Frameworks */,
+				551A76DE178696BD0052D185 /* Resources */,
+				551A779C17869FB10052D185 /* Copy Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				551A76F5178697CF0052D185 /* PBXTargetDependency */,
+			);
+			name = PeopsSpuSDL;
+			productName = BasePlugin;
+			productReference = 551A76E2178696BD0052D185 /* PeopsSpuSDL.psxplugin */;
+			productType = "com.apple.product-type.bundle";
+		};
+		551A76E61786971B0052D185 /* SPUSharedCode */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 551A76EF1786971B0052D185 /* Build configuration list for PBXNativeTarget "SPUSharedCode" */;
+			buildPhases = (
+				551A76E31786971B0052D185 /* Sources */,
+				551A76E41786971B0052D185 /* Frameworks */,
+				551A76E51786971B0052D185 /* Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = SPUSharedCode;
+			productName = SPUSharedCode;
+			productReference = 551A76E71786971B0052D185 /* libSPUSharedCode.dylib */;
+			productType = "com.apple.product-type.library.dynamic";
+		};
+		551A7706178698C60052D185 /* PeopsSpuAL */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 551A771C178698C60052D185 /* Build configuration list for PBXNativeTarget "PeopsSpuAL" */;
+			buildPhases = (
+				551A7709178698C60052D185 /* Sources */,
+				551A7714178698C60052D185 /* Frameworks */,
+				551A7717178698C60052D185 /* Resources */,
+				551A779F17869FD60052D185 /* Copy Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				551A7707178698C60052D185 /* PBXTargetDependency */,
+			);
+			name = PeopsSpuAL;
+			productName = BasePlugin;
+			productReference = 551A771F178698C60052D185 /* PeopsSpuAL.psxplugin */;
+			productType = "com.apple.product-type.bundle";
+		};
+		551A774717869C280052D185 /* PeopsXgl */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 551A774C17869C280052D185 /* Build configuration list for PBXNativeTarget "PeopsXgl" */;
+			buildPhases = (
+				551A774817869C280052D185 /* Sources */,
+				551A774917869C280052D185 /* Frameworks */,
+				551A774B17869C280052D185 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = PeopsXgl;
+			productName = BasePlugin;
+			productReference = 551A774F17869C280052D185 /* PeopsXGL.psxplugin */;
+			productType = "com.apple.product-type.bundle";
+		};
+		551A776517869E430052D185 /* DFNet */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 551A776A17869E430052D185 /* Build configuration list for PBXNativeTarget "DFNet" */;
+			buildPhases = (
+				551A776617869E430052D185 /* Sources */,
+				551A776717869E430052D185 /* Frameworks */,
+				551A776917869E430052D185 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = DFNet;
+			productName = BasePlugin;
+			productReference = 551A776D17869E430052D185 /* DFNet.psxplugin */;
+			productType = "com.apple.product-type.bundle";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		08FB7793FE84155DC02AAC07 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0460;
+			};
+			buildConfigurationList = 71F353F80FD98DFE00CBEC28 /* Build configuration list for PBXProject "Pcsxr" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 1;
+			knownRegions = (
+				English,
+				Japanese,
+				French,
+				German,
+				en,
+			);
+			mainGroup = 08FB7794FE84155DC02AAC07 /* Pcsxr */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				2BB3D68205427FE200831ACB /* PCSXR */,
+				551A76E61786971B0052D185 /* SPUSharedCode */,
+				551A7672178690500052D185 /* DFCdrom */,
+				551A76861786919F0052D185 /* DFInput */,
+				551A76B4178693FF0052D185 /* DFXVideo */,
+				551A774717869C280052D185 /* PeopsXgl */,
+				551A76DA178696BD0052D185 /* PeopsSpuSDL */,
+				551A7706178698C60052D185 /* PeopsSpuAL */,
+				551A776517869E430052D185 /* DFNet */,
+				551A75C617868C4E0052D185 /* Bladesio1 */,
+				55906B1717C28E490057F60D /* Make SVN revision */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		2BB3D6A205427FE200831ACB /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				2BB3D6A405427FE200831ACB /* InfoPlist.strings in Resources */,
+				2BB3D6A705427FE200831ACB /* Credits.rtf in Resources */,
+				2B143D06078A2CBD00AF745A /* PCSXR.icns in Resources */,
+				2B143D07078A2CBD00AF745A /* pcsxrfreeze.icns in Resources */,
+				2B143D08078A2CBD00AF745A /* pcsxrmemcard.icns in Resources */,
+				2B143D09078A2CBD00AF745A /* psxbios.icns in Resources */,
+				2B143D0A078A2CBD00AF745A /* psxplugin.icns in Resources */,
+				28F0C3C6146521A700A90285 /* Configuration.xib in Resources */,
+				28F0C3C9146521B000A90285 /* PCSXR.xib in Resources */,
+				28F0C3CC146521B700A90285 /* AddPluginSheet.xib in Resources */,
+				559DACEE146C72FF00C5DF71 /* Localizable.strings in Resources */,
+				55C7A214148B2B3800C22ABC /* PcsxrMemCardDocument.xib in Resources */,
+				02FE55E816765F9400205CF2 /* KeyNames.plist in Resources */,
+				D422E66E16DC48D000526DCF /* CheatWindow.xib in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		551A75CA17868C4E0052D185 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				551A75CF17868C860052D185 /* Bladesio1PluginConfig.xib in Resources */,
+				551A75D017868C860052D185 /* Credits.rtf in Resources */,
+				551A75D117868C860052D185 /* InfoPlist.strings in Resources */,
+				551A75D217868C860052D185 /* Localizable.strings in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		551A7676178690500052D185 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				551A7680178690EE0052D185 /* Credits.rtf in Resources */,
+				551A7681178690EE0052D185 /* DFCdromPluginConfig.xib in Resources */,
+				551A7682178690EE0052D185 /* InfoPlist.strings in Resources */,
+				551A7683178690EE0052D185 /* Localizable.strings in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		551A768A1786919F0052D185 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				551A769B178692470052D185 /* Credits.rtf in Resources */,
+				551A769C178692470052D185 /* InfoPlist.strings in Resources */,
+				551A769D178692470052D185 /* Localizable.strings in Resources */,
+				551A769E178692470052D185 /* NetPcsxrHIDInputPluginMain.xib in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		551A76B8178693FF0052D185 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				551A76BD1786953B0052D185 /* Credits.rtf in Resources */,
+				551A76BE1786953B0052D185 /* InfoPlist.strings in Resources */,
+				551A76BF1786953B0052D185 /* Localizable.strings in Resources */,
+				551A76C01786953B0052D185 /* NetSfPeopsSoftGPUConfig.xib in Resources */,
+				551A76C11786953F0052D185 /* gpuPeteOGL2.slf in Resources */,
+				551A76C21786953F0052D185 /* gpuPeteOGL2.slv in Resources */,
+				551A76C31786953F0052D185 /* NetSfPeopsSoftGPUInterface.xib in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		551A76DE178696BD0052D185 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				551A7702178698980052D185 /* InfoPlist.strings in Resources */,
+				551A7703178698980052D185 /* Credits.rtf in Resources */,
+				551A7704178698980052D185 /* Localizable.strings in Resources */,
+				551A7705178698980052D185 /* NetSfPeopsSpuPluginMain.xib in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		551A7717178698C60052D185 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				551A7719178698C60052D185 /* Credits.rtf in Resources */,
+				551A771A178698C60052D185 /* Localizable.strings in Resources */,
+				551A771B178698C60052D185 /* NetSfPeopsSpuPluginMain.xib in Resources */,
+				551A7721178698E60052D185 /* InfoPlist.strings in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		551A774B17869C280052D185 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				551A776017869CBE0052D185 /* Credits.rtf in Resources */,
+				551A776117869CBE0052D185 /* InfoPlist.strings in Resources */,
+				551A776217869CBE0052D185 /* Localizable.strings in Resources */,
+				551A776317869CBE0052D185 /* NetSfPeopsOpenGLConfig.xib in Resources */,
+				551A776417869CC20052D185 /* NetSfPeopsOpenGLGPUInterface.xib in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		551A776917869E430052D185 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				551A777F17869EAE0052D185 /* Credits.rtf in Resources */,
+				551A778017869EAE0052D185 /* DFNet.xib in Resources */,
+				551A778117869EAE0052D185 /* InfoPlist.strings in Resources */,
+				551A778217869EAE0052D185 /* Localizable.strings in Resources */,
+				551A778317869EAE0052D185 /* SockDialog.xib in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXShellScriptBuildPhase section */
+		55906B1C17C28E530057F60D /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"$(SRCROOT)/../.svn/dir-wcprops",
+				"$(SRCROOT)/.svn/dir-wcprops",
+			);
+			outputPaths = (
+				"$(TARGET_BUILD_DIR)/SVNRevision.h",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "# Xcode auto-versioning script for Subversion\n# by Axel Andersson, modified by Daniel Jalkut to add\n# \"--revision HEAD\" to the svn info line, which allows\n# the latest revision to always be used.\n\n# further modified by Augie Fackler to be gross and sh-based in places\n# so that you can have svn installed anywhere\nPATH=/sw/bin:/opt/local/bin:/usr/local/bin:/usr/bin:$PATH\nREV=86936\necho $REV\n\ncat > $SCRIPT_OUTPUT_FILE_0.tmp <<EOF\n#define SVNREVISION $REV\n#define SVNREVISION_C_STRING \"$REV\"\nEOF\n\ncmp -s $SCRIPT_OUTPUT_FILE_0 $SCRIPT_OUTPUT_FILE_0.tmp || mv $SCRIPT_OUTPUT_FILE_0.tmp $SCRIPT_OUTPUT_FILE_0\n";
+		};
+/* End PBXShellScriptBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		2BB3D6A805427FE200831ACB /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				2BB3D6BE05427FE200831ACB /* main.m in Sources */,
+				2BB3D6BF05427FE200831ACB /* PcsxrController.m in Sources */,
+				2BB3D6C005427FE200831ACB /* ConfigurationController.m in Sources */,
+				2BB3D6C105427FE200831ACB /* PluginList.m in Sources */,
+				2BB3D6C205427FE200831ACB /* EmuThread.m in Sources */,
+				2BB3D6C305427FE200831ACB /* Plugin.c in Sources */,
+				2BB3D6C405427FE200831ACB /* PcsxrPlugin.m in Sources */,
+				2B4DE99205FF9307003EFEF0 /* PluginController.m in Sources */,
+				71F4C5890FDED12800529849 /* cdriso.c in Sources */,
+				71F4C58B0FDED12800529849 /* cdrom.c in Sources */,
+				71F4C58D0FDED12800529849 /* cheat.c in Sources */,
+				71F4C5910FDED12800529849 /* decode_xa.c in Sources */,
+				71F4C5930FDED12800529849 /* disr3000a.c in Sources */,
+				71F4C5940FDED12800529849 /* gte.c in Sources */,
+				71F4C5960FDED12800529849 /* mdec.c in Sources */,
+				71F4C5980FDED12800529849 /* misc.c in Sources */,
+				71F4C59A0FDED12800529849 /* plugins.c in Sources */,
+				71F4C59D0FDED12800529849 /* psxbios.c in Sources */,
+				71F4C5A00FDED12800529849 /* psxcounters.c in Sources */,
+				71F4C5A20FDED12800529849 /* psxdma.c in Sources */,
+				71F4C5A40FDED12800529849 /* psxhle.c in Sources */,
+				71F4C5A60FDED12800529849 /* psxhw.c in Sources */,
+				71F4C5A80FDED12800529849 /* psxinterpreter.c in Sources */,
+				71F4C5A90FDED12800529849 /* psxmem.c in Sources */,
+				71F4C5AB0FDED12800529849 /* r3000a.c in Sources */,
+				71F4C5AD0FDED12800529849 /* sio.c in Sources */,
+				71F4C5AF0FDED12800529849 /* spu.c in Sources */,
+				71F4C5B90FDED16D00529849 /* iR3000A.c in Sources */,
+				71F4C5BA0FDED16D00529849 /* ix86.c in Sources */,
+				712FD1E81093096F00575A92 /* debug.c in Sources */,
+				712FD1E91093096F00575A92 /* socket.c in Sources */,
+				713B530E110B75650002F164 /* ppf.c in Sources */,
+				719594B211AEFE8C004AD686 /* psxcommon.c in Sources */,
+				7192F42A129C412E0042D946 /* gpu.c in Sources */,
+				559366CA12B694DF004ACC1E /* iR3000A-64.c in Sources */,
+				559366CB12B694DF004ACC1E /* ix86-64.c in Sources */,
+				559366CD12B694DF004ACC1E /* ix86_cpudetect.c in Sources */,
+				559366CE12B694DF004ACC1E /* ix86_fpu.c in Sources */,
+				559366CF12B694DF004ACC1E /* ix86_mmx.c in Sources */,
+				559366D012B694DF004ACC1E /* ix86_sse.c in Sources */,
+				55A90220147D7C380037E18F /* PcsxrMemCardController.m in Sources */,
+				55A90229147D89380037E18F /* PcsxrMemoryObject.m in Sources */,
+				55BBA693149455E1003B2CEC /* PcsxrMemCardHandler.m in Sources */,
+				55BBA69614945628003B2CEC /* PcsxrPluginHandler.m in Sources */,
+				55BBA69914953887003B2CEC /* PcsxrDiscHandler.m in Sources */,
+				55BBA69C1495839A003B2CEC /* PcsxrFreezeStateHandler.m in Sources */,
+				0280B7AD16764CC5007B8001 /* HotkeyController.m in Sources */,
+				02717968167884C9004AED62 /* hotkeys.m in Sources */,
+				5529EA11169CBE3400BAA2A5 /* RecentItemsMenu.m in Sources */,
+				D422E67A16DC495800526DCF /* CheatController.m in Sources */,
+				55EC05FB1788B1230053AC23 /* PcsxrMemCardArray.m in Sources */,
+				55EC05FE178916E80053AC23 /* MemBadgeView.m in Sources */,
+				55E0ACE0178B69620005C945 /* LaunchArg.m in Sources */,
+				5581463917AABCD100862DBF /* PcsxrCheatHandler.m in Sources */,
+				550F023D17BFFD97002594DF /* PcsxrHexadecimalFormatter.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		551A75C717868C4E0052D185 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				551A75D317868D0C0052D185 /* cfg.c in Sources */,
+				551A75D417868D1A0052D185 /* PluginConfigController.m in Sources */,
+				551A75D517868D390052D185 /* connection.c in Sources */,
+				551A75D617868D390052D185 /* fifo.c in Sources */,
+				551A75D717868D390052D185 /* sio1.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		551A7673178690500052D185 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				551A767B178690AD0052D185 /* cdr-macosx.c in Sources */,
+				551A767C178690AD0052D185 /* cfg.c in Sources */,
+				551A767D178690AD0052D185 /* PluginConfigController.m in Sources */,
+				551A767E178690B80052D185 /* cdr.c in Sources */,
+				551A767F178690B80052D185 /* util.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		551A76871786919F0052D185 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				551A76921786922A0052D185 /* sdljoy.c in Sources */,
+				551A7693178692330052D185 /* analog.c in Sources */,
+				551A7694178692330052D185 /* pad.c in Sources */,
+				551A76951786923E0052D185 /* cfg.c in Sources */,
+				551A76961786923E0052D185 /* ControllerList.m in Sources */,
+				551A76971786923E0052D185 /* MappingCell.m in Sources */,
+				551A76981786923E0052D185 /* PadController.m in Sources */,
+				551A76991786923E0052D185 /* PadView.m in Sources */,
+				551A769A1786923E0052D185 /* xkb.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		551A76B5178693FF0052D185 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				551A76C41786954B0052D185 /* drawgl.m in Sources */,
+				551A76C51786954B0052D185 /* PluginConfigController.m in Sources */,
+				551A76C61786954B0052D185 /* PluginGLView.m in Sources */,
+				551A76C71786954B0052D185 /* PluginWindow.m in Sources */,
+				551A76C81786954B0052D185 /* PluginWindowController.m in Sources */,
+				551A76CA178695840052D185 /* fps.c in Sources */,
+				551A76CB178695840052D185 /* gpu.c in Sources */,
+				551A76CC178695840052D185 /* key.c in Sources */,
+				551A76CD178695840052D185 /* menu.c in Sources */,
+				551A76CE178695840052D185 /* prim.c in Sources */,
+				551A76CF178695840052D185 /* soft.c in Sources */,
+				551A76D0178695840052D185 /* zn.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		551A76DB178696BD0052D185 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				551A76F7178697E70052D185 /* PluginController.m in Sources */,
+				551A76F8178698130052D185 /* sdl.c in Sources */,
+				551A76F9178698130052D185 /* spu.c in Sources */,
+				551A76FA178698130052D185 /* xa.c in Sources */,
+				551A76FB178698160052D185 /* reverb.c in Sources */,
+				551A76FC1786981A0052D185 /* registers.c in Sources */,
+				551A76FD178698230052D185 /* freeze.c in Sources */,
+				551A76FF178698390052D185 /* dma.c in Sources */,
+				551A77001786983C0052D185 /* adsr.c in Sources */,
+				551A7701178698600052D185 /* externals.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		551A76E31786971B0052D185 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				551A76F2178697A50052D185 /* NamedSlider.m in Sources */,
+				551A76F3178697A50052D185 /* SPUPluginController.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		551A7709178698C60052D185 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				551A770A178698C60052D185 /* PluginController.m in Sources */,
+				551A770C178698C60052D185 /* spu.c in Sources */,
+				551A770D178698C60052D185 /* xa.c in Sources */,
+				551A770E178698C60052D185 /* reverb.c in Sources */,
+				551A770F178698C60052D185 /* registers.c in Sources */,
+				551A7710178698C60052D185 /* freeze.c in Sources */,
+				551A7711178698C60052D185 /* dma.c in Sources */,
+				551A7712178698C60052D185 /* adsr.c in Sources */,
+				551A7713178698C60052D185 /* externals.c in Sources */,
+				551A77221786990E0052D185 /* openal.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		551A774817869C280052D185 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				551A775217869C8B0052D185 /* draw.c in Sources */,
+				551A775317869C8D0052D185 /* fps.c in Sources */,
+				551A775417869C900052D185 /* gpu.c in Sources */,
+				551A775517869C950052D185 /* gte_accuracy.c in Sources */,
+				551A775617869C970052D185 /* key.c in Sources */,
+				551A775717869C9A0052D185 /* menu.c in Sources */,
+				551A775817869C9C0052D185 /* prim.c in Sources */,
+				551A775917869C9F0052D185 /* soft.c in Sources */,
+				551A775A17869CA10052D185 /* texture.c in Sources */,
+				551A775B17869CA50052D185 /* drawgl.m in Sources */,
+				551A775C17869CA80052D185 /* NetSfPeopsOpenGLPluginConfigController.m in Sources */,
+				551A775D17869CAB0052D185 /* PluginGLView.m in Sources */,
+				551A775E17869CAE0052D185 /* PluginWindow.m in Sources */,
+				551A775F17869CB10052D185 /* PluginWindowController.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		551A776617869E430052D185 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				551A776E17869E640052D185 /* cfg.c in Sources */,
+				551A776F17869E640052D185 /* PluginConfigController.m in Sources */,
+				551A777017869E640052D185 /* SockDialog.m in Sources */,
+				551A777A17869E830052D185 /* dfnet.c in Sources */,
+				551A777E17869E830052D185 /* unix.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXTargetDependency section */
+		551A76F5178697CF0052D185 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 551A76E61786971B0052D185 /* SPUSharedCode */;
+			targetProxy = 551A76F4178697CF0052D185 /* PBXContainerItemProxy */;
+		};
+		551A7707178698C60052D185 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 551A76E61786971B0052D185 /* SPUSharedCode */;
+			targetProxy = 551A7708178698C60052D185 /* PBXContainerItemProxy */;
+		};
+		551A778517869F4B0052D185 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 551A75C617868C4E0052D185 /* Bladesio1 */;
+			targetProxy = 551A778417869F4B0052D185 /* PBXContainerItemProxy */;
+		};
+		551A778717869F4B0052D185 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 551A7672178690500052D185 /* DFCdrom */;
+			targetProxy = 551A778617869F4B0052D185 /* PBXContainerItemProxy */;
+		};
+		551A778917869F4B0052D185 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 551A76861786919F0052D185 /* DFInput */;
+			targetProxy = 551A778817869F4B0052D185 /* PBXContainerItemProxy */;
+		};
+		551A778B17869F4B0052D185 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 551A76B4178693FF0052D185 /* DFXVideo */;
+			targetProxy = 551A778A17869F4B0052D185 /* PBXContainerItemProxy */;
+		};
+		551A778D17869F4B0052D185 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 551A76DA178696BD0052D185 /* PeopsSpuSDL */;
+			targetProxy = 551A778C17869F4B0052D185 /* PBXContainerItemProxy */;
+		};
+		551A778F17869F4B0052D185 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 551A7706178698C60052D185 /* PeopsSpuAL */;
+			targetProxy = 551A778E17869F4B0052D185 /* PBXContainerItemProxy */;
+		};
+		551A779117869F4B0052D185 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 551A774717869C280052D185 /* PeopsXgl */;
+			targetProxy = 551A779017869F4B0052D185 /* PBXContainerItemProxy */;
+		};
+		551A779317869F4B0052D185 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 551A776517869E430052D185 /* DFNet */;
+			targetProxy = 551A779217869F4B0052D185 /* PBXContainerItemProxy */;
+		};
+		55906B1E17C28EE40057F60D /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 55906B1717C28E490057F60D /* Make SVN revision */;
+			targetProxy = 55906B1D17C28EE40057F60D /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
+/* Begin PBXVariantGroup section */
+		02FE55E616765F9400205CF2 /* KeyNames.plist */ = {
+			isa = PBXVariantGroup;
+			children = (
+				02FE55E716765F9400205CF2 /* English */,
+			);
+			name = KeyNames.plist;
+			path = English.lproj;
+			sourceTree = "<group>";
+		};
+		28F0C3C4146521A700A90285 /* Configuration.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				28F0C3C5146521A700A90285 /* English */,
+			);
+			name = Configuration.xib;
+			path = English.lproj;
+			sourceTree = "<group>";
+		};
+		28F0C3C7146521B000A90285 /* PCSXR.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				28F0C3C8146521B000A90285 /* English */,
+			);
+			name = PCSXR.xib;
+			path = English.lproj;
+			sourceTree = "<group>";
+		};
+		28F0C3CA146521B700A90285 /* AddPluginSheet.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				28F0C3CB146521B700A90285 /* English */,
+			);
+			name = AddPluginSheet.xib;
+			path = English.lproj;
+			sourceTree = "<group>";
+		};
+		2BA178B20514CE260026D74D /* InfoPlist.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				2BA178B30514CE260026D74D /* English */,
+			);
+			name = InfoPlist.strings;
+			path = English.lproj;
+			sourceTree = "<group>";
+		};
+		2BBB1786051E0D9700B84448 /* Credits.rtf */ = {
+			isa = PBXVariantGroup;
+			children = (
+				2BBB1787051E0D9700B84448 /* English */,
+			);
+			name = Credits.rtf;
+			path = English.lproj;
+			sourceTree = "<group>";
+		};
+		551A74B417868BEA0052D185 /* Bladesio1PluginConfig.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				551A74B517868BEA0052D185 /* English */,
+			);
+			name = Bladesio1PluginConfig.xib;
+			sourceTree = "<group>";
+		};
+		551A74B617868BEA0052D185 /* Credits.rtf */ = {
+			isa = PBXVariantGroup;
+			children = (
+				551A74B717868BEA0052D185 /* English */,
+			);
+			name = Credits.rtf;
+			sourceTree = "<group>";
+		};
+		551A74B817868BEA0052D185 /* InfoPlist.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				551A74B917868BEA0052D185 /* English */,
+			);
+			name = InfoPlist.strings;
+			sourceTree = "<group>";
+		};
+		551A74BA17868BEA0052D185 /* Localizable.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				551A74BB17868BEA0052D185 /* English */,
+			);
+			name = Localizable.strings;
+			sourceTree = "<group>";
+		};
+		551A750917868BEB0052D185 /* Credits.rtf */ = {
+			isa = PBXVariantGroup;
+			children = (
+				551A750A17868BEB0052D185 /* English */,
+			);
+			name = Credits.rtf;
+			sourceTree = "<group>";
+		};
+		551A750B17868BEB0052D185 /* DFCdromPluginConfig.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				551A750C17868BEB0052D185 /* English */,
+			);
+			name = DFCdromPluginConfig.xib;
+			sourceTree = "<group>";
+		};
+		551A750D17868BEB0052D185 /* InfoPlist.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				551A750E17868BEB0052D185 /* English */,
+			);
+			name = InfoPlist.strings;
+			sourceTree = "<group>";
+		};
+		551A750F17868BEB0052D185 /* Localizable.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				551A751017868BEB0052D185 /* English */,
+			);
+			name = Localizable.strings;
+			sourceTree = "<group>";
+		};
+		551A751D17868BEB0052D185 /* Credits.rtf */ = {
+			isa = PBXVariantGroup;
+			children = (
+				551A751E17868BEB0052D185 /* English */,
+			);
+			name = Credits.rtf;
+			sourceTree = "<group>";
+		};
+		551A751F17868BEB0052D185 /* InfoPlist.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				551A752017868BEB0052D185 /* English */,
+			);
+			name = InfoPlist.strings;
+			sourceTree = "<group>";
+		};
+		551A752117868BEB0052D185 /* Localizable.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				551A752217868BEB0052D185 /* English */,
+			);
+			name = Localizable.strings;
+			sourceTree = "<group>";
+		};
+		551A752317868BEB0052D185 /* NetPcsxrHIDInputPluginMain.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				551A752417868BEB0052D185 /* English */,
+			);
+			name = NetPcsxrHIDInputPluginMain.xib;
+			sourceTree = "<group>";
+		};
+		551A753617868BEB0052D185 /* Credits.rtf */ = {
+			isa = PBXVariantGroup;
+			children = (
+				551A753717868BEB0052D185 /* English */,
+			);
+			name = Credits.rtf;
+			sourceTree = "<group>";
+		};
+		551A753817868BEB0052D185 /* DFNet.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				551A753917868BEB0052D185 /* English */,
+			);
+			name = DFNet.xib;
+			sourceTree = "<group>";
+		};
+		551A753A17868BEB0052D185 /* InfoPlist.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				551A753B17868BEB0052D185 /* English */,
+			);
+			name = InfoPlist.strings;
+			sourceTree = "<group>";
+		};
+		551A753C17868BEB0052D185 /* Localizable.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				551A753D17868BEB0052D185 /* English */,
+			);
+			name = Localizable.strings;
+			sourceTree = "<group>";
+		};
+		551A753E17868BEB0052D185 /* SockDialog.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				551A753F17868BEC0052D185 /* English */,
+			);
+			name = SockDialog.xib;
+			sourceTree = "<group>";
+		};
+		551A755A17868BEC0052D185 /* InfoPlist.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				551A755B17868BEC0052D185 /* English */,
+			);
+			name = InfoPlist.strings;
+			sourceTree = "<group>";
+		};
+		551A755D17868BEC0052D185 /* InfoPlist.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				551A755E17868BEC0052D185 /* English */,
+			);
+			name = InfoPlist.strings;
+			sourceTree = "<group>";
+		};
+		551A756017868BEC0052D185 /* Credits.rtf */ = {
+			isa = PBXVariantGroup;
+			children = (
+				551A756117868BEC0052D185 /* English */,
+			);
+			name = Credits.rtf;
+			sourceTree = "<group>";
+		};
+		551A756217868BEC0052D185 /* Localizable.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				551A756317868BEC0052D185 /* English */,
+			);
+			name = Localizable.strings;
+			sourceTree = "<group>";
+		};
+		551A756417868BEC0052D185 /* NetSfPeopsSpuPluginMain.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				551A756517868BEC0052D185 /* English */,
+			);
+			name = NetSfPeopsSpuPluginMain.xib;
+			sourceTree = "<group>";
+		};
+		551A756817868BEC0052D185 /* Credits.rtf */ = {
+			isa = PBXVariantGroup;
+			children = (
+				551A756917868BEC0052D185 /* English */,
+			);
+			name = Credits.rtf;
+			sourceTree = "<group>";
+		};
+		551A756A17868BEC0052D185 /* InfoPlist.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				551A756B17868BEC0052D185 /* English */,
+			);
+			name = InfoPlist.strings;
+			sourceTree = "<group>";
+		};
+		551A756C17868BEC0052D185 /* Localizable.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				551A756D17868BEC0052D185 /* English */,
+			);
+			name = Localizable.strings;
+			sourceTree = "<group>";
+		};
+		551A756E17868BEC0052D185 /* NetSfPeopsSoftGPUConfig.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				551A756F17868BEC0052D185 /* English */,
+			);
+			name = NetSfPeopsSoftGPUConfig.xib;
+			sourceTree = "<group>";
+		};
+		551A758517868BED0052D185 /* Credits.rtf */ = {
+			isa = PBXVariantGroup;
+			children = (
+				551A758617868BED0052D185 /* English */,
+			);
+			name = Credits.rtf;
+			sourceTree = "<group>";
+		};
+		551A758717868BED0052D185 /* InfoPlist.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				551A758817868BED0052D185 /* English */,
+			);
+			name = InfoPlist.strings;
+			sourceTree = "<group>";
+		};
+		551A758917868BED0052D185 /* Localizable.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				551A758A17868BED0052D185 /* English */,
+			);
+			name = Localizable.strings;
+			sourceTree = "<group>";
+		};
+		551A758B17868BED0052D185 /* NetSfPeopsOpenGLConfig.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				551A758C17868BED0052D185 /* English */,
+			);
+			name = NetSfPeopsOpenGLConfig.xib;
+			sourceTree = "<group>";
+		};
+		559DACEC146C72FF00C5DF71 /* Localizable.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				559DACED146C72FF00C5DF71 /* English */,
+			);
+			name = Localizable.strings;
+			path = English.lproj;
+			sourceTree = "<group>";
+		};
+		55C7A216148B2B3800C22ABC /* PcsxrMemCardDocument.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				55C7A215148B2B3800C22ABC /* English */,
+			);
+			name = PcsxrMemCardDocument.xib;
+			sourceTree = "<group>";
+		};
+		D422E66C16DC48D000526DCF /* CheatWindow.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				D422E66D16DC48D000526DCF /* English */,
+			);
+			name = CheatWindow.xib;
+			sourceTree = "<group>";
+		};
+/* End PBXVariantGroup section */
+
+/* Begin XCBuildConfiguration section */
+		551A75CC17868C4E0052D185 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_WARN_EMPTY_BODY = YES;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"PCSXRPLUG=Bladesio1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
+				WRAPPER_EXTENSION = psxplugin;
+			};
+			name = Debug;
+		};
+		551A75CD17868C4E0052D185 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_WARN_EMPTY_BODY = YES;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"PCSXRPLUG=Bladesio1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
+				WRAPPER_EXTENSION = psxplugin;
+			};
+			name = Release;
+		};
+		551A7678178690500052D185 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_WARN_EMPTY_BODY = YES;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"PCSXRPLUG=DFCdrom",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
+				WRAPPER_EXTENSION = psxplugin;
+			};
+			name = Debug;
+		};
+		551A7679178690500052D185 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_WARN_EMPTY_BODY = YES;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"PCSXRPLUG=DFCdrom",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
+				WRAPPER_EXTENSION = psxplugin;
+			};
+			name = Release;
+		};
+		551A768C1786919F0052D185 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_WARN_EMPTY_BODY = YES;
+				FRAMEWORK_SEARCH_PATHS = /Library/Frameworks;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"PCSXRPLUG=DFInput",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				HEADER_SEARCH_PATHS = (
+					/Library/Frameworks/SDL2.framework/Headers,
+					"$(inherited)",
+				);
+				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
+				WRAPPER_EXTENSION = psxplugin;
+			};
+			name = Debug;
+		};
+		551A768D1786919F0052D185 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_WARN_EMPTY_BODY = YES;
+				FRAMEWORK_SEARCH_PATHS = /Library/Frameworks;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"PCSXRPLUG=DFInput",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				HEADER_SEARCH_PATHS = (
+					/Library/Frameworks/SDL2.framework/Headers,
+					"$(inherited)",
+				);
+				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
+				WRAPPER_EXTENSION = psxplugin;
+			};
+			name = Release;
+		};
+		551A76BA178693FF0052D185 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_WARN_EMPTY_BODY = YES;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"PCSXRPLUG=SoftGL",
+					_MACGL,
+					_DARWIN,
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
+				OTHER_CFLAGS = "$(OPTIMIZATION_CFLAGS)";
+				PRODUCT_NAME = PeopsSoftGPU;
+				WRAPPER_EXTENSION = psxplugin;
+			};
+			name = Debug;
+		};
+		551A76BB178693FF0052D185 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_WARN_EMPTY_BODY = YES;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"PCSXRPLUG=SoftGL",
+					_MACGL,
+					_DARWIN,
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
+				OTHER_CFLAGS = "$(OPTIMIZATION_CFLAGS)";
+				PRODUCT_NAME = PeopsSoftGPU;
+				WRAPPER_EXTENSION = psxplugin;
+			};
+			name = Release;
+		};
+		551A76E0178696BD0052D185 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_WARN_EMPTY_BODY = YES;
+				FRAMEWORK_SEARCH_PATHS = /Library/Frameworks;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"PCSXRPLUG=SDLSound",
+					USESDL,
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				HEADER_SEARCH_PATHS = (
+					/Library/Frameworks/SDL2.framework/Headers,
+					"$(inherited)",
+				);
+				INFOPLIST_FILE = "plugins/DFSound/Info-SDL.plist";
+				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
+				WRAPPER_EXTENSION = psxplugin;
+			};
+			name = Debug;
+		};
+		551A76E1178696BD0052D185 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_WARN_EMPTY_BODY = YES;
+				FRAMEWORK_SEARCH_PATHS = /Library/Frameworks;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"PCSXRPLUG=SDLSound",
+					USESDL,
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				HEADER_SEARCH_PATHS = (
+					/Library/Frameworks/SDL2.framework/Headers,
+					"$(inherited)",
+				);
+				INFOPLIST_FILE = "plugins/DFSound/Info-SDL.plist";
+				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
+				WRAPPER_EXTENSION = psxplugin;
+			};
+			name = Release;
+		};
+		551A76F01786971B0052D185 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_WARN_EMPTY_BODY = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				EXECUTABLE_PREFIX = lib;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GENERATE_PKGINFO_FILE = NO;
+				INSTALL_PATH = "@rpath";
+				OTHER_LDFLAGS = (
+					"-sectcreate",
+					__TEXT,
+					__info_plist,
+					"plugins/DFSound/Resorces/Shared/SPUShared-info.plist",
+				);
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		551A76F11786971B0052D185 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_WARN_EMPTY_BODY = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				EXECUTABLE_PREFIX = lib;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GENERATE_PKGINFO_FILE = NO;
+				INSTALL_PATH = "@rpath";
+				OTHER_LDFLAGS = (
+					"-sectcreate",
+					__TEXT,
+					__info_plist,
+					"plugins/DFSound/Resorces/Shared/SPUShared-info.plist",
+				);
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
+		551A771D178698C60052D185 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_WARN_EMPTY_BODY = YES;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"PCSXRPLUG=ALSound",
+					USEOPENAL,
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				INFOPLIST_FILE = "plugins/DFSound/Info-AL.plist";
+				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
+				WRAPPER_EXTENSION = psxplugin;
+			};
+			name = Debug;
+		};
+		551A771E178698C60052D185 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_WARN_EMPTY_BODY = YES;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"PCSXRPLUG=ALSound",
+					USEOPENAL,
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				INFOPLIST_FILE = "plugins/DFSound/Info-AL.plist";
+				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
+				WRAPPER_EXTENSION = psxplugin;
+			};
+			name = Release;
+		};
+		551A774D17869C280052D185 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_WARN_EMPTY_BODY = YES;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"PCSXRPLUG=PeopsXGL",
+					_MACGL,
+					_DARWIN,
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
+				OTHER_CFLAGS = "$(OPTIMIZATION_CFLAGS)";
+				PRODUCT_NAME = PeopsXGL;
+				WRAPPER_EXTENSION = psxplugin;
+			};
+			name = Debug;
+		};
+		551A774E17869C280052D185 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_WARN_EMPTY_BODY = YES;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"PCSXRPLUG=PeopsXGL",
+					_MACGL,
+					_DARWIN,
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
+				OTHER_CFLAGS = "$(OPTIMIZATION_CFLAGS)";
+				PRODUCT_NAME = PeopsXGL;
+				WRAPPER_EXTENSION = psxplugin;
+			};
+			name = Release;
+		};
+		551A776B17869E430052D185 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_WARN_EMPTY_BODY = YES;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"PCSXRPLUG=DFNet",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
+				WRAPPER_EXTENSION = psxplugin;
+			};
+			name = Debug;
+		};
+		551A776C17869E430052D185 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_WARN_EMPTY_BODY = YES;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"PCSXRPLUG=DFNet",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
+				WRAPPER_EXTENSION = psxplugin;
+			};
+			name = Release;
+		};
+		557649B91786B09E007C4457 /* Instrument */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 55858D2B17864DC90068B8FC /* Pcsxr-Instrument.xcconfig */;
+			buildSettings = {
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				GENERATE_PKGINFO_FILE = YES;
+				HEADER_SEARCH_PATHS = (
+					../include,
+					../libpcsxcore,
+					../macosx,
+				);
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
+			};
+			name = Instrument;
+		};
+		557649BA1786B09E007C4457 /* Instrument */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				GCC_ENABLE_ASM_KEYWORD = YES;
+				GCC_ENABLE_CPP_EXCEPTIONS = NO;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					PCSXRCORE,
+					"PCSXR_VERSION=\\\"1.5\\\"",
+					"XA_HACK=1",
+					__MACOSX__,
+					"ENABLE_SIO1API=1",
+					"$(inherited)",
+				);
+				GCC_WARN_UNKNOWN_PRAGMAS = NO;
+				INFOPLIST_FILE = Info.plist;
+				INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-C";
+				INFOPLIST_PREFIX_HEADER = "$(TARGET_BUILD_DIR)/SVNRevision.h";
+				INFOPLIST_PREPROCESS = YES;
+				LD_NO_PIE = YES;
+				OTHER_CFLAGS = (
+					"-funroll-loops",
+					"$(inherited)",
+				);
+				PRODUCT_NAME = PCSXR;
+				WRAPPER_EXTENSION = app;
+			};
+			name = Instrument;
+		};
+		557649BB1786B09E007C4457 /* Instrument */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_WARN_EMPTY_BODY = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				EXECUTABLE_PREFIX = lib;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GENERATE_PKGINFO_FILE = NO;
+				INSTALL_PATH = "@rpath";
+				OTHER_LDFLAGS = (
+					"-sectcreate",
+					__TEXT,
+					__info_plist,
+					"plugins/DFSound/Resorces/Shared/SPUShared-info.plist",
+				);
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Instrument;
+		};
+		557649BD1786B09E007C4457 /* Instrument */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_WARN_EMPTY_BODY = YES;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"PCSXRPLUG=DFCdrom",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
+				WRAPPER_EXTENSION = psxplugin;
+			};
+			name = Instrument;
+		};
+		557649BE1786B09E007C4457 /* Instrument */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_WARN_EMPTY_BODY = YES;
+				FRAMEWORK_SEARCH_PATHS = /Library/Frameworks;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"PCSXRPLUG=DFInput",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				HEADER_SEARCH_PATHS = (
+					/Library/Frameworks/SDL2.framework/Headers,
+					"$(inherited)",
+				);
+				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
+				WRAPPER_EXTENSION = psxplugin;
+			};
+			name = Instrument;
+		};
+		557649BF1786B09E007C4457 /* Instrument */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_WARN_EMPTY_BODY = YES;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"PCSXRPLUG=SoftGL",
+					_MACGL,
+					_DARWIN,
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
+				OTHER_CFLAGS = "$(OPTIMIZATION_CFLAGS)";
+				PRODUCT_NAME = PeopsSoftGPU;
+				WRAPPER_EXTENSION = psxplugin;
+			};
+			name = Instrument;
+		};
+		557649C01786B09E007C4457 /* Instrument */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_WARN_EMPTY_BODY = YES;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"PCSXRPLUG=PeopsXGL",
+					_MACGL,
+					_DARWIN,
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
+				OTHER_CFLAGS = "$(OPTIMIZATION_CFLAGS)";
+				PRODUCT_NAME = PeopsXGL;
+				WRAPPER_EXTENSION = psxplugin;
+			};
+			name = Instrument;
+		};
+		557649C11786B09E007C4457 /* Instrument */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_WARN_EMPTY_BODY = YES;
+				FRAMEWORK_SEARCH_PATHS = /Library/Frameworks;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"PCSXRPLUG=SDLSound",
+					USESDL,
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				HEADER_SEARCH_PATHS = (
+					/Library/Frameworks/SDL2.framework/Headers,
+					"$(inherited)",
+				);
+				INFOPLIST_FILE = "plugins/DFSound/Info-SDL.plist";
+				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
+				WRAPPER_EXTENSION = psxplugin;
+			};
+			name = Instrument;
+		};
+		557649C21786B09E007C4457 /* Instrument */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_WARN_EMPTY_BODY = YES;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"PCSXRPLUG=ALSound",
+					USEOPENAL,
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				INFOPLIST_FILE = "plugins/DFSound/Info-AL.plist";
+				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
+				WRAPPER_EXTENSION = psxplugin;
+			};
+			name = Instrument;
+		};
+		557649C31786B09E007C4457 /* Instrument */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_WARN_EMPTY_BODY = YES;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"PCSXRPLUG=DFNet",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
+				WRAPPER_EXTENSION = psxplugin;
+			};
+			name = Instrument;
+		};
+		557649C41786B09E007C4457 /* Instrument */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_WARN_EMPTY_BODY = YES;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"PCSXRPLUG=Bladesio1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
+				WRAPPER_EXTENSION = psxplugin;
+			};
+			name = Instrument;
+		};
+		55906B1917C28E490057F60D /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		55906B1A17C28E490057F60D /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
+		55906B1B17C28E490057F60D /* Instrument */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Instrument;
+		};
+		71F353F40FD98DFE00CBEC28 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				DEBUG_PREPROCESSOR_DEFINITIONS = "DEBUG=1 EMU_LOG=__Log";
+				GCC_ENABLE_ASM_KEYWORD = YES;
+				GCC_ENABLE_CPP_EXCEPTIONS = NO;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					PCSXRCORE,
+					"PCSXR_VERSION=\\\"1.5\\\"",
+					"XA_HACK=1",
+					__MACOSX__,
+					"ENABLE_SIO1API=1",
+					"$(inherited)",
+				);
+				GCC_WARN_UNKNOWN_PRAGMAS = NO;
+				INFOPLIST_FILE = Info.plist;
+				INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-C";
+				INFOPLIST_PREFIX_HEADER = "$(TARGET_BUILD_DIR)/SVNRevision.h";
+				INFOPLIST_PREPROCESS = YES;
+				LD_NO_PIE = YES;
+				OTHER_CFLAGS = "$(inherited)";
+				PRODUCT_NAME = PCSXR;
+				WRAPPER_EXTENSION = app;
+			};
+			name = Debug;
+		};
+		71F353F50FD98DFE00CBEC28 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				GCC_ENABLE_ASM_KEYWORD = YES;
+				GCC_ENABLE_CPP_EXCEPTIONS = NO;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					PCSXRCORE,
+					"PCSXR_VERSION=\\\"1.5\\\"",
+					"XA_HACK=1",
+					__MACOSX__,
+					"ENABLE_SIO1API=1",
+					"$(inherited)",
+				);
+				GCC_WARN_UNKNOWN_PRAGMAS = NO;
+				INFOPLIST_FILE = Info.plist;
+				INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-C";
+				INFOPLIST_PREFIX_HEADER = "$(TARGET_BUILD_DIR)/SVNRevision.h";
+				INFOPLIST_PREPROCESS = YES;
+				LD_NO_PIE = YES;
+				OTHER_CFLAGS = (
+					"-funroll-loops",
+					"-fomit-frame-pointer",
+					"$(inherited)",
+				);
+				PRODUCT_NAME = PCSXR;
+				WRAPPER_EXTENSION = app;
+			};
+			name = Release;
+		};
+		71F353F90FD98DFE00CBEC28 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 55858D2A17864DC80068B8FC /* Pcsxr-Debug.xcconfig */;
+			buildSettings = {
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				GENERATE_PKGINFO_FILE = YES;
+				HEADER_SEARCH_PATHS = (
+					../include,
+					../libpcsxcore,
+					../macosx,
+				);
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
+			};
+			name = Debug;
+		};
+		71F353FA0FD98DFE00CBEC28 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 55858D2C17864DC90068B8FC /* Pcsxr-Release.xcconfig */;
+			buildSettings = {
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "PCSX-R Developer";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				GENERATE_PKGINFO_FILE = YES;
+				HEADER_SEARCH_PATHS = (
+					../include,
+					../libpcsxcore,
+					../macosx,
+				);
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		551A75CB17868C4E0052D185 /* Build configuration list for PBXNativeTarget "Bladesio1" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				551A75CC17868C4E0052D185 /* Debug */,
+				551A75CD17868C4E0052D185 /* Release */,
+				557649C41786B09E007C4457 /* Instrument */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		551A7677178690500052D185 /* Build configuration list for PBXNativeTarget "DFCdrom" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				551A7678178690500052D185 /* Debug */,
+				551A7679178690500052D185 /* Release */,
+				557649BD1786B09E007C4457 /* Instrument */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		551A768B1786919F0052D185 /* Build configuration list for PBXNativeTarget "DFInput" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				551A768C1786919F0052D185 /* Debug */,
+				551A768D1786919F0052D185 /* Release */,
+				557649BE1786B09E007C4457 /* Instrument */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		551A76B9178693FF0052D185 /* Build configuration list for PBXNativeTarget "DFXVideo" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				551A76BA178693FF0052D185 /* Debug */,
+				551A76BB178693FF0052D185 /* Release */,
+				557649BF1786B09E007C4457 /* Instrument */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		551A76DF178696BD0052D185 /* Build configuration list for PBXNativeTarget "PeopsSpuSDL" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				551A76E0178696BD0052D185 /* Debug */,
+				551A76E1178696BD0052D185 /* Release */,
+				557649C11786B09E007C4457 /* Instrument */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		551A76EF1786971B0052D185 /* Build configuration list for PBXNativeTarget "SPUSharedCode" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				551A76F01786971B0052D185 /* Debug */,
+				551A76F11786971B0052D185 /* Release */,
+				557649BB1786B09E007C4457 /* Instrument */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		551A771C178698C60052D185 /* Build configuration list for PBXNativeTarget "PeopsSpuAL" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				551A771D178698C60052D185 /* Debug */,
+				551A771E178698C60052D185 /* Release */,
+				557649C21786B09E007C4457 /* Instrument */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		551A774C17869C280052D185 /* Build configuration list for PBXNativeTarget "PeopsXgl" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				551A774D17869C280052D185 /* Debug */,
+				551A774E17869C280052D185 /* Release */,
+				557649C01786B09E007C4457 /* Instrument */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		551A776A17869E430052D185 /* Build configuration list for PBXNativeTarget "DFNet" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				551A776B17869E430052D185 /* Debug */,
+				551A776C17869E430052D185 /* Release */,
+				557649C31786B09E007C4457 /* Instrument */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		55906B1817C28E490057F60D /* Build configuration list for PBXAggregateTarget "Make SVN revision" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				55906B1917C28E490057F60D /* Debug */,
+				55906B1A17C28E490057F60D /* Release */,
+				55906B1B17C28E490057F60D /* Instrument */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		71F353F30FD98DFE00CBEC28 /* Build configuration list for PBXNativeTarget "PCSXR" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				71F353F40FD98DFE00CBEC28 /* Debug */,
+				71F353F50FD98DFE00CBEC28 /* Release */,
+				557649BA1786B09E007C4457 /* Instrument */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		71F353F80FD98DFE00CBEC28 /* Build configuration list for PBXProject "Pcsxr" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				71F353F90FD98DFE00CBEC28 /* Debug */,
+				71F353FA0FD98DFE00CBEC28 /* Release */,
+				557649B91786B09E007C4457 /* Instrument */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 08FB7793FE84155DC02AAC07 /* Project object */;
+}

pcsxr-1.9.93.tar.bz2/macosx/Pcsxr.xcworkspace Added

pcsxr-1.9.93.tar.bz2/macosx/Pcsxr.xcworkspace/contents.xcworkspacedata Added

pcsxr-1.9.93.tar.bz2/macosx/Pcsxr.xcworkspace/xcuserdata Added

pcsxr-1.9.93.tar.bz2/macosx/PcsxrCheatHandler.h Added

pcsxr-1.9.93.tar.bz2/macosx/PcsxrCheatHandler.m Added

pcsxr-1.9.93.tar.bz2/macosx/PcsxrController.h Added

@@ -0,0 +1,57 @@
+/* PcsxrController */
+
+#import <Cocoa/Cocoa.h>
+#import "EmuThread.h"
+#import "PluginList.h"
+#import "RecentItemsMenu.h"
+
+@class ConfigurationController;
+@class CheatController;
+
+void ShowHelpAndExit(FILE* output, int exitCode);
+
+@interface PcsxrController : NSObject <NSApplicationDelegate>
+{
+	ConfigurationController *preferencesController;
+	CheatController *cheatController;
+	PluginList *pluginList;
+	
+	NSWindow *preferenceWindow;
+	NSWindow *cheatWindow;
+	IBOutlet RecentItemsMenu *recentItems;
+	
+	struct _PSXflags {
+		unsigned int sleepInBackground:1;
+		unsigned int wasPausedBeforeBGSwitch:1;
+		unsigned int endAtEmuClose:1;
+		unsigned int reserved:25;
+	} PSXflags;
+	
+	NSMutableArray *skipFiles;
+}
+@property (readonly) RecentItemsMenu *recentItems;
+@property (readonly) CheatController *cheatController;
+@property (readonly) BOOL endAtEmuClose;
+
+- (IBAction)ejectCD:(id)sender;
+- (IBAction)pause:(id)sender;
+- (IBAction)showCheatsWindow:(id)sender;
+- (IBAction)preferences:(id)sender;
+- (IBAction)reset:(id)sender;
+- (IBAction)runCD:(id)sender;
+- (IBAction)runIso:(id)sender;
+- (IBAction)runBios:(id)sender;
+- (IBAction)freeze:(id)sender;
+- (IBAction)defrost:(id)sender;
+- (IBAction)fullscreen:(id)sender;
+- (IBAction)pauseInBackground:(id)sender;
+- (void)runURL:(NSURL*)url;
+
++ (void)setConfigFromDefaults;
++ (void)setDefaultFromConfig:(NSString *)defaultKey;
++ (BOOL)biosAvailable;
++ (NSString*)saveStatePath:(int)slot;
++ (void)saveState:(int)num;
++ (void)loadState:(int)num;
+
+@end

pcsxr-1.9.93.tar.bz2/macosx/PcsxrController.m Added

@@ -0,0 +1,883 @@
+#import <Cocoa/Cocoa.h>
+#import "PcsxrController.h"
+#import "ConfigurationController.h"
+#import "CheatController.h"
+#import "EmuThread.h"
+#import "PcsxrMemCardHandler.h"
+#import "PcsxrPluginHandler.h"
+#import "PcsxrDiscHandler.h"
+#import "PcsxrFreezeStateHandler.h"
+#import "PcsxrCheatHandler.h"
+#import "LaunchArg.h"
+#include "psxcommon.h"
+#include "plugins.h"
+#include "misc.h"
+#include "cdrom.h"
+#include "ExtendedKeys.h"
+#import "ARCBridge.h"
+
+NSDictionary *prefStringKeys;
+NSDictionary *prefByteKeys;
+NSDictionary *prefURLKeys;
+NSMutableArray *biosList;
+NSString *saveStatePath;
+
+#define HELPSTR "\n" \
+"At least one of these must be passed:\n"\
+"\t--iso path \tlaunch with selected ISO\n" \
+"\t--cdrom \tlaunch with a CD-ROM\n" \
+"\t--bios \tlaunch into the BIOS\n\n" \
+"Additional options:\n" \
+"\t--exitAtClose \tcloses PCSX-R at when the emulation has ended\n" \
+"\t--mcd1 path \tsets the fist memory card to path\n" \
+"\t--mcd2 path \tsets the second memory card to path\n" \
+"\t--freeze path \tloads freeze state from path\n\n" \
+"Help:\n" \
+"\t--help \tshows this message\n\n" \
+
+
+void ShowHelpAndExit(FILE* output, int exitCode)
+{
+	fprintf(output, HELPSTR);
+	if (!NSApp) {
+		exit(exitCode);
+	} else {
+		[NSApp stop:nil];
+	}
+}
+
+@interface PcsxrController ()
+@property (readwrite) BOOL endAtEmuClose;
+@property BOOL sleepInBackground;
+@property BOOL wasPausedBeforeBGSwitch;
+@property (arcstrong) NSMutableArray *skipFiles;
+@end
+
+@implementation PcsxrController
+
+@synthesize recentItems;
+@synthesize skipFiles;
+@synthesize cheatController;
+
+- (BOOL)endAtEmuClose
+{
+	return PSXflags.endAtEmuClose;
+}
+
+- (void)setEndAtEmuClose:(BOOL)endAtEmuClose
+{
+	PSXflags.endAtEmuClose = endAtEmuClose;
+}
+
+- (BOOL)sleepInBackground
+{
+	return PSXflags.sleepInBackground;
+}
+
+- (void)setSleepInBackground:(BOOL)sleepInBackground
+{
+	PSXflags.sleepInBackground = sleepInBackground;
+}
+
+- (BOOL)wasPausedBeforeBGSwitch
+{
+	return PSXflags.wasPausedBeforeBGSwitch;
+}
+
+- (void)setWasPausedBeforeBGSwitch:(BOOL)wasPausedBeforeBGSwitch
+{
+	PSXflags.wasPausedBeforeBGSwitch = wasPausedBeforeBGSwitch;
+}
+
+- (IBAction)ejectCD:(id)sender
+{
+	NSMutableString *deviceName;
+	NSTask *ejectTask;
+	NSRange rdiskRange;
+
+	BOOL wasPaused = [EmuThread pauseSafe];
+
+	/* close connection to current cd */
+	if ([EmuThread active])
+		CDR_close();
+
+	// switch to another ISO if using internal image reader, otherwise eject the CD
+	if (UsingIso()) {
+		NSOpenPanel* openDlg = RETAINOBJ([NSOpenPanel openPanel]);
+
+		[openDlg setCanChooseFiles:YES];
+		[openDlg setCanChooseDirectories:NO];
+		[openDlg setAllowedFileTypes:[PcsxrDiscHandler supportedUTIs]];
+
+		if ([openDlg runModal] == NSFileHandlingPanelOKButton) {
+			NSArray* files = [openDlg URLs];
+			SetIsoFile((const char *)[[[files objectAtIndex:0] path] fileSystemRepresentation]);
+			SetCdOpenCaseTime(time(NULL) + 2);
+			LidInterrupt();
+		}
+		RELEASEOBJ(openDlg);
+	} else {
+ char *driveLetter = CDR_getDriveLetter();
+ 
+		if (driveLetter != nil) {
+			deviceName = [NSMutableString stringWithString:[[NSFileManager defaultManager] stringWithFileSystemRepresentation:driveLetter length:strlen(driveLetter)]];
+
+			// delete the 'r' in 'rdisk'
+			rdiskRange = [deviceName rangeOfString:@"rdisk"];
+			if (rdiskRange.length != 0) {
+				rdiskRange.length = 1;
+				[deviceName deleteCharactersInRange:rdiskRange];
+			}
+			// execute hdiutil to eject the device
+			ejectTask = [NSTask launchedTaskWithLaunchPath:@"/usr/bin/hdiutil" arguments:@[@"eject", deviceName]];
+			[ejectTask waitUntilExit];
+		}
+	}
+
+	/* and open new cd */
+	if ([EmuThread active])
+		CDR_open();
+
+	if (!wasPaused) {
+		[EmuThread resume];
+	}
+}
+
+- (IBAction)pause:(id)sender
+{
+ if ([EmuThread isPaused]) {
+ //[sender setState:NSOffState];
+ [EmuThread resume];
+ }
+ else {
+ //[sender setState:NSOnState];
+ [EmuThread pause];
+ }
+}
+
+- (IBAction)showCheatsWindow:(id)sender
+{
+	/* load the nib if it hasn't yet */
+	if (cheatWindow == nil) {
+		if (cheatController == nil) {
+			cheatController = [[CheatController alloc] initWithWindowNibName:@"CheatWindow"];
+		}
+		cheatWindow = [cheatController window];
+	}
+ 
+	/* show the window */
+	[cheatController showWindow:sender];
+}
+
+- (IBAction)preferences:(id)sender
+{
+	/* load the nib if it hasn't yet */
+	if (preferenceWindow == nil) {
+		if (preferencesController == nil) {
+			preferencesController = [[ConfigurationController alloc] initWithWindowNibName:@"Configuration"];
+		}
+		preferenceWindow = [preferencesController window];
+	}
+
+	/* show the window */
+	[preferencesController showWindow:sender];
+}
+
+- (IBAction)reset:(id)sender
+{
+ [EmuThread reset];
+}
+
+- (IBAction)runCD:(id)sender
+{
+	SetIsoFile(NULL);
+	if ([[NSUserDefaults standardUserDefaults] boolForKey:@"NetPlay"]) {
+		[pluginList enableNetPlug];
+	} else {
+		[pluginList disableNetPlug];
+	}
+	[EmuThread run];
+}
+
+- (IBAction)runIso:(id)sender
+{
+	NSOpenPanel* openDlg = RETAINOBJ([NSOpenPanel openPanel]);
+
+	[openDlg setCanChooseFiles:YES];
+	[openDlg setCanChooseDirectories:NO];
+	[openDlg setAllowedFileTypes:[PcsxrDiscHandler supportedUTIs]];
+
+	if ([openDlg runModal] == NSFileHandlingPanelOKButton) {
+ NSURL *url = [[openDlg URLs] objectAtIndex:0];
+ [recentItems addRecentItem:url];
+		[self runURL:url];
+ }
+	RELEASEOBJ(openDlg);
+}
+
+- (IBAction)runBios:(id)sender
+{
+	SetIsoFile(NULL);
+	[pluginList disableNetPlug];
+	[EmuThread runBios];
+}
+
+- (void)runURL:(NSURL*)url
+{
+	if ([EmuThread active] == YES) {
+		if (UsingIso()) {
+			SetIsoFile([[url path] fileSystemRepresentation]);
+			SetCdOpenCaseTime(time(NULL) + 2);
+			LidInterrupt();
+		} else {
+			NSBeep();
+		}
+	} else {
+		if ([[NSUserDefaults standardUserDefaults] boolForKey:@"NetPlay"]) {
+			[pluginList enableNetPlug];
+		} else {
+			[pluginList disableNetPlug];
+		}
+		SetIsoFile([[url path] fileSystemRepresentation]);
+		[EmuThread run];
+	}
+}
+
+- (IBAction)freeze:(id)sender
+{
+	NSInteger num = [sender tag];
+	[PcsxrController saveState:(int)num];
+}
+
++ (void)saveState:(int)num
+{
+	[EmuThread freezeAt:[PcsxrController saveStatePath:num] which:num];
+}
+
+- (IBAction)defrost:(id)sender
+{
+	NSInteger num = [sender tag];
+	[PcsxrController loadState:(int)num];
+}
+
++ (void)loadState:(int)num
+{
+	[EmuThread defrostAt:[PcsxrController saveStatePath:num]];
+}
+
+- (IBAction)fullscreen:(id)sender
+{
+	GPU_keypressed(GPU_FULLSCREEN_KEY);
+}
+
+- (IBAction)pauseInBackground:(id)sender
+{
+	self.sleepInBackground = !self.sleepInBackground;
+	[[NSUserDefaults standardUserDefaults] setBool:self.sleepInBackground forKey:@"PauseInBackground"];
+}
+
+- (BOOL)validateMenuItem:(NSMenuItem *)menuItem
+{
+	if ([menuItem action] == @selector(pause:)) {
+		[menuItem setState:([EmuThread isPaused] ? NSOnState : NSOffState)];
+	}
+
+	if ([menuItem action] == @selector(pause:) || [menuItem action] == @selector(fullscreen:))
+		return [EmuThread active];
+
+	if ([menuItem action] == @selector(reset:) || [menuItem action] == @selector(ejectCD:) ||
+		 [menuItem action] == @selector(freeze:))
+		return [EmuThread active] && ![EmuThread isRunBios];
+
+	if ([menuItem action] == @selector(runCD:) || [menuItem action] == @selector(runIso:) ||
+		 [menuItem action] == @selector(runBios:)) {
+		if (preferenceWindow != nil)
+			if ([preferenceWindow isVisible])
+				return NO;
+
+ if (cheatWindow != nil)
+ if ([cheatWindow isVisible])
+ return NO;
+		
+		if ([menuItem action] == @selector(runBios:) && strcmp(Config.Bios, "HLE") == 0)
+			return NO;
+
+		return ![EmuThread active];
+	}
+
+	if ([menuItem action] == @selector(defrost:)) {
+		if (![EmuThread active] || [EmuThread isRunBios])
+			return NO;
+
+		NSString *path = [saveStatePath stringByAppendingPathComponent:[NSString stringWithFormat:@"%s-%3.3ld.pcsxrstate", CdromId, (long)[menuItem tag]]];
+		return (CheckState((char *)[path fileSystemRepresentation]) == 0);
+	}
+
+	if ([menuItem action] == @selector(preferences:))
+		return ![EmuThread active];
+
+	if ([menuItem action] == @selector(pauseInBackground:)) {
+		[menuItem setState:(self.sleepInBackground ? NSOnState : NSOffState)];
+		return YES;
+	}
+
+	return YES;
+}
+
+- (void)applicationWillResignActive:(NSNotification *)aNotification
+{
+	self.wasPausedBeforeBGSwitch = [EmuThread isPaused];
+
+	if (self.sleepInBackground) {
+		 [EmuThread pause];
+	}
+}
+
+- (void)applicationDidBecomeActive:(NSNotification *)aNotification
+{
+	if (self.sleepInBackground && !self.wasPausedBeforeBGSwitch) {
+		[EmuThread resume];
+	}
+}
+
+- (void)applicationDidFinishLaunching:(NSNotification *)notification
+{
+	self.skipFiles = nil;
+}
+
+static void ParseErrorStr(NSString *errStr)
+{
+	NSLog(@"Parse error: %@", errStr);
+	NSRunCriticalAlertPanel(@"Parsing error", @"%@\n\nPlease check the command line options and try again.\n\nPCSXR will now quit.", nil, nil, nil, errStr);
+	ShowHelpAndExit(stderr, EXIT_FAILURE);
+}
+
+//DO NOT END THIS MACRO WITH A SIMICOLON! it will break the if-else if process
+#define HandleArg(arg, launchable, otherblock) \
+if ([[progArgs objectAtIndex:i] compare:arg options:NSCaseInsensitiveSearch] == NSOrderedSame) { \
+HandleArgBase(arg, launchable, otherblock)
+
+#define HandleArgElse(arg, launchable, otherblock) \
+else if ([[progArgs objectAtIndex:i] compare:arg options:NSCaseInsensitiveSearch] == NSOrderedSame) { \
+HandleArgBase(arg, launchable, otherblock)
+
+#define HandleArgBase(arg, launchable, otherblock) \
+if (isLaunchable && launchable) { \
+ParseErrorStr([NSString stringWithFormat:@"The options %@ and %@ are exclusive.", arg, runtimeStr]); \
+} \
+if(launchable) { \
+isLaunchable = YES; \
+runtimeStr = arg; \
+} \
+otherblock();\
+}
+
+#define kPCSXRArgumentCDROM @"--cdrom"
+#define kPCSXRArgumentBIOS @"--bios"
+#define kPCSXRArgumentISO @"--iso"
+#define kPCSXRArgumentMcd @"--mcd"
+#define kPCSXRArgumentMcd1 kPCSXRArgumentMcd @"1"
+#define kPCSXRArgumentMcd2 kPCSXRArgumentMcd @"2"
+#define kPCSXRArgumentFreeze @"--freeze"
+#define kPCSXRArgumentExitAtClose @"--exitAtClose"
+
+- (void)awakeFromNib
+{
+	pluginList = [[PluginList alloc] init];
+	if (![pluginList configured] /*!Config.Gpu[0] || !Config.Spu[0] || !Config.Pad1[0] || !Config.Cdr[0]*/) {
+		// configure plugins
+		[self preferences:nil];
+
+		NSRunCriticalAlertPanel(NSLocalizedString(@"Missing plugins!", nil),
+				NSLocalizedString(@"Pcsxr is missing one or more critical plugins. You will need to install these in order to play games.", nil), 
+				nil, nil, nil);
+	}
+
+	if (![PcsxrController biosAvailable]) {
+		NSFileManager *manager = [NSFileManager defaultManager];
+		NSURL *supportURL = [manager URLForDirectory:NSApplicationSupportDirectory inDomain:NSUserDomainMask appropriateForURL:nil create:YES error:NULL];
+		NSURL *biosURL = [[supportURL URLByAppendingPathComponent:@"Pcsxr"] URLByAppendingPathComponent:@"Bios"];
+		NSInteger retVal = NSRunInformationalAlertPanel(NSLocalizedString(@"Missing BIOS!", nil),
+				NSLocalizedString(@"Pcsxr wasn't able to locate any Playstation BIOS ROM files. This means that it will run in BIOS simulation mode which is less stable and compatible than using a real Playstation BIOS.\nIf you have a BIOS available, please copy it to\n%@", nil), 
+				NSLocalizedString(@"OK", @"OK"), NSLocalizedString(@"Show Folder", @"Show Folder"), nil, [[biosURL path] stringByAbbreviatingWithTildeInPath]);
+		if (retVal == NSAlertAlternateReturn) {
+			[[NSWorkspace sharedWorkspace] activateFileViewerSelectingURLs:@[biosURL]];
+		}
+	}
+
+	self.sleepInBackground = [[NSUserDefaults standardUserDefaults] boolForKey:@"PauseInBackground"];
+	
+	NSArray *progArgs = [[NSProcessInfo processInfo] arguments];
+	if ([progArgs count] > 1 && ![[progArgs objectAtIndex:1] hasPrefix:@"-psn"]) {
+		self.skipFiles = [NSMutableArray array];
+		
+		BOOL isLaunchable = NO;
+		NSString *runtimeStr = nil;
+		
+		__block short memcardHandled = 0;
+		__block BOOL hasParsedAnArgument = NO;
+		__block NSString *(^FileTestBlock)() = NULL;
+		__block NSMutableDictionary *argDict = [[NSMutableDictionary alloc] initWithCapacity:[progArgs count]];
+		
+		
+		NSMutableArray *unknownOptions = [NSMutableArray array];
+		
+		dispatch_block_t cdromBlock = ^{
+			hasParsedAnArgument = YES;
+			LaunchArg *larg = [[LaunchArg alloc] initWithLaunchOrder:LaunchArgRun argument:kPCSXRArgumentCDROM block:^{
+				[self runCD:nil];
+			}];
+			[larg addToDictionary:argDict];
+			RELEASEOBJ(larg);
+		};
+		
+		dispatch_block_t biosBlock = ^{
+			hasParsedAnArgument = YES;
+			LaunchArg *larg = [[LaunchArg alloc] initWithLaunchOrder:LaunchArgRun argument:kPCSXRArgumentBIOS block:^{
+				[self runBios:nil];
+			}];
+			[larg addToDictionary:argDict];
+			RELEASEOBJ(larg);
+		};
+		
+		//This block/argument does not need to be sorted
+		dispatch_block_t emuCloseAtEnd = ^{
+			hasParsedAnArgument = YES;
+			LaunchArg *larg = [[LaunchArg alloc] initWithLaunchOrder:LaunchArgPreRun argument:kPCSXRArgumentExitAtClose block:^{
+				self.endAtEmuClose = YES;
+			}];
+			[larg addToDictionary:argDict];
+			RELEASEOBJ(larg);
+		};
+		
+		dispatch_block_t isoBlock = ^{
+			hasParsedAnArgument = YES;
+			NSString *path = FileTestBlock();
+			LaunchArg *larg = [[LaunchArg alloc] initWithLaunchOrder:LaunchArgRun argument:kPCSXRArgumentISO block:^{
+				[self runURL:[NSURL fileURLWithPath:path isDirectory:NO]];
+			}];
+			[larg addToDictionary:argDict];
+			RELEASEOBJ(larg);
+		};
+		
+		void (^mcdBlock)(int mcdNumber) = ^(int mcdnumber){
+			hasParsedAnArgument = YES;
+			if (memcardHandled & (1 << mcdnumber)) {
+				NSLog(@"Memory card %i has already been defined. The latest one passed will be used.", mcdnumber);
+			} else {
+				memcardHandled |= (1 << mcdnumber);
+			}
+			
+			NSString *path = FileTestBlock();
+			NSString *mcdArg = [kPCSXRArgumentMcd stringByAppendingFormat:@"%i", mcdnumber];
+			LaunchArg *larg = [[LaunchArg alloc] initWithLaunchOrder:LaunchArgPreRun argument:mcdArg block:^{
+				LoadMcd(mcdnumber, (char*)[path fileSystemRepresentation]);
+			}];
+			[larg addToDictionary:argDict];
+			RELEASEOBJ(larg);
+		};
+		
+		dispatch_block_t freezeBlock = ^{
+			hasParsedAnArgument = YES;
+			NSString *path = FileTestBlock();
+			LaunchArg *larg = [[LaunchArg alloc] initWithLaunchOrder:LaunchArgPostRun argument:kPCSXRArgumentFreeze block:^{
+				if (![EmuThread isRunBios]) {
+					//Make sure the emulator is running
+					sleep(5);
+					[EmuThread defrostAt:path];
+				}
+			}];
+			[larg addToDictionary:argDict];
+			RELEASEOBJ(larg);
+		};
+
+		BOOL hasFileTestBlock = NO;
+		
+		for (__block int i = 1; i < [progArgs count]; i++) {
+			if (!hasFileTestBlock)
+			{
+				FileTestBlock = ^NSString *(){
+					if ([progArgs count] <= ++i) {
+						ParseErrorStr(@"Not enough arguments.");
+					}
+					NSString *path = [[progArgs objectAtIndex:i] stringByExpandingTildeInPath];
+					if (![[NSFileManager defaultManager] fileExistsAtPath:path])
+					{
+						ParseErrorStr([NSString stringWithFormat:@"The file \"%@\" does not exist.", path]);
+						return nil;
+					}
+					[skipFiles addObject:path];
+					return path;
+				};
+				hasFileTestBlock = YES;
+			}
+			
+			//DO NOT END these MACROS WITH A SIMICOLON! it will break the if-else if process
+			HandleArg(kPCSXRArgumentISO, YES, isoBlock)
+			HandleArgElse(kPCSXRArgumentCDROM, YES, cdromBlock)
+			HandleArgElse(kPCSXRArgumentBIOS, YES, biosBlock)
+			HandleArgElse(kPCSXRArgumentExitAtClose, NO, emuCloseAtEnd)
+			HandleArgElse(kPCSXRArgumentMcd1, NO, ^{mcdBlock(1);})
+			HandleArgElse(kPCSXRArgumentMcd2, NO, ^{mcdBlock(2);})
+			HandleArgElse(kPCSXRArgumentFreeze, NO, freezeBlock)
+			else {
+				[unknownOptions addObject:[progArgs objectAtIndex:i]];
+			}
+		}
+#ifdef DEBUG
+		if ([unknownOptions count]) {			
+			//As there doesn't seem to be a Cocoa/Objective-C method like this...
+			NSString *unknownString = CFBridgingRelease(CFStringCreateByCombiningStrings(kCFAllocatorDefault, BRIDGE(CFArrayRef, unknownOptions), CFSTR(" ")));
+			
+			NSLog(@"The following options weren't recognized by PCSX-R: %@. This may be due to extra arguments passed by the OS or debugger.", unknownString);
+		}
+#endif
+		unknownOptions = nil;
+		if (!isLaunchable && hasParsedAnArgument) {
+			NSMutableArray *mutProgArgs = [NSMutableArray arrayWithArray:progArgs];
+			NSString *appRawPath = RETAINOBJ([mutProgArgs objectAtIndex:0]);
+			//Remove the app file path from the array
+			[mutProgArgs removeObjectAtIndex:0];
+			NSString *arg = [mutProgArgs componentsJoinedByString:@" "];
+			NSString *recognizedArgs = [[argDict allKeys] componentsJoinedByString:@" "];
+			
+			NSString *tmpStr = [NSString stringWithFormat:@"A launch command wasn't found in the command line and one or more arguments that PCSX-R recognizes were: %@.\nThe following command line arguments were passed with the application launch file at %@: %@.\n\nThe valid launch commands are %@, %@, and %@.", recognizedArgs, appRawPath, arg, kPCSXRArgumentISO, kPCSXRArgumentCDROM, kPCSXRArgumentBIOS];
+			RELEASEOBJ(appRawPath);
+			ParseErrorStr(tmpStr);
+		} else if (hasParsedAnArgument){
+			NSArray *argArray = [[argDict allValues] sortedArrayWithOptions:NSSortStable usingComparator:^NSComparisonResult(id obj1, id obj2) {
+				LaunchArg *LA1 = obj1;
+				LaunchArg *LA2 = obj2;
+				if (LA1.launchOrder > LA2.launchOrder) {
+					return NSOrderedDescending;
+				} else if (LA1.launchOrder < LA2.launchOrder) {
+					return NSOrderedAscending;
+				} else {
+					return NSOrderedSame;
+				}
+			}];
+			for (LaunchArg *arg in argArray) {
+				arg.theBlock();
+			}
+		}
+		RELEASEOBJ(argDict);
+	}
+}
+
+#if !__has_feature(objc_arc)
+- (void)dealloc
+{
+	[pluginList release];
+	self.skipFiles = nil;
+	
+	[super dealloc];
+}
+#endif
+
++ (void)setConfigFromDefaults
+{
+	const char *str;
+	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+
+	/*
+	enumerator = [prefStringKeys keyEnumerator];
+	while ((key = [enumerator nextObject])) {
+		str = [[defaults stringForKey:key] fileSystemRepresentation];
+		char *dst = (char *)[[prefStringKeys objectForKey:key] pointerValue];
+		if (str != nil && dst != nil) strncpy(dst, str, 255);
+	}*/
+
+	for (NSString *key in prefByteKeys) {
+		u8 *dst = (u8 *)[[prefByteKeys objectForKey:key] pointerValue];
+		if (dst != NULL) *dst = [defaults boolForKey:key];
+#ifdef __i386__
+		//i386 on OS X doesn't like the dynarec core
+		if ([key isEqualToString:@"NoDynarec"]) {
+			if (dst != NULL) *dst = 1;
+			[defaults setBool:YES forKey:key];
+		}
+#endif
+	}
+
+	// special cases
+	//str = [[defaults stringForKey:@"PluginPAD"] fileSystemRepresentation];
+	//if (str != nil) strncpy(Config.Pad2, str, 255);
+
+	str = [[defaults stringForKey:@"Bios"] fileSystemRepresentation];
+	if (str) {
+		NSString *path = [defaults stringForKey:@"Bios"];
+		NSInteger index = [biosList indexOfObject:path];
+
+		if (-1 == index) {
+			[biosList insertObject:path atIndex:0];
+		} else if (0 < index) {
+			[biosList exchangeObjectAtIndex:index withObjectAtIndex:0];
+		}
+	}
+
+	{
+		NSFileManager *manager = [NSFileManager defaultManager];
+		NSURL *memoryURL = [[[manager URLForDirectory:NSApplicationSupportDirectory inDomain:NSUserDomainMask appropriateForURL:nil create:YES error:NULL] URLByAppendingPathComponent:@"Pcsxr"] URLByAppendingPathComponent:@"Memory Cards"];
+		
+		str = [[[defaults URLForKey:@"Mcd1"] path] fileSystemRepresentation];
+		if (str) {
+			strlcpy(Config.Mcd1, str, MAXPATHLEN);
+		} else {
+			NSURL *url = [memoryURL URLByAppendingPathComponent:@"Mcd001.mcr"];
+			[defaults setURL:url forKey:@"Mcd1"];
+			str = [[url path] fileSystemRepresentation];
+			if (str != nil) strlcpy(Config.Mcd1, str, MAXPATHLEN);
+		}
+		
+		str = [[[defaults URLForKey:@"Mcd2"] path] fileSystemRepresentation];
+		if (str) {
+			strlcpy(Config.Mcd2, str, MAXPATHLEN);
+		} else {
+			NSURL *url = [memoryURL URLByAppendingPathComponent:@"Mcd002.mcr"];
+			[defaults setURL:url forKey:@"Mcd2"];
+			str = [[url path] fileSystemRepresentation];
+			if (str != nil) strlcpy(Config.Mcd2, str, MAXPATHLEN);
+		}
+	}
+
+	if ([defaults boolForKey:@"UseHLE"] || 0 == [biosList count]) {
+		strcpy(Config.Bios, "HLE");
+	} else {
+		str = [(NSString *)[biosList objectAtIndex:0] fileSystemRepresentation];
+		if (str != nil) strlcpy(Config.Bios, str, MAXPATHLEN);
+		else strcpy(Config.Bios, "HLE");
+	}
+
+	str = [[defaults stringForKey:@"Net"] fileSystemRepresentation];
+	if (str) strlcpy(Config.Net, str, MAXPATHLEN);
+	else {
+			strcpy(Config.Net, "Disabled");
+	}
+}
+
++ (void)setDefaultFromConfig:(NSString *)defaultKey
+{
+	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+
+	char *str = (char *)[[prefStringKeys objectForKey:defaultKey] pointerValue];
+	if (str) {
+		NSString *tmpNSStr = [[NSFileManager defaultManager] stringWithFileSystemRepresentation:str length:strlen(str)];
+		if (!tmpNSStr) {
+			tmpNSStr = @(str);
+		}
+		
+		[defaults setObject:tmpNSStr forKey:defaultKey];
+		return;
+	}
+	
+	str = (char *)[[prefURLKeys objectForKey:defaultKey] pointerValue];
+	if (str) {
+		NSString *tmpNSStr = [[NSFileManager defaultManager] stringWithFileSystemRepresentation:str length:strlen(str)];
+		if (!tmpNSStr) {
+			tmpNSStr = @(str);
+		}
+		[defaults setURL:[NSURL fileURLWithPath:tmpNSStr isDirectory:NO] forKey:defaultKey];
+		return;
+	}
+
+	u8 *val = (u8 *)[[prefByteKeys objectForKey:defaultKey] pointerValue];
+	if (val) {
+		[defaults setInteger:*val forKey:defaultKey];
+		return;
+	}
+}
+
++ (BOOL)biosAvailable
+{
+	return ([biosList count] > 0);
+}
+
+// called when class is initialized
++ (void)initialize
+{
+	NSString *path;
+	const char *str;
+	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+	NSDictionary *appDefaults = [NSDictionary dictionaryWithObjectsAndKeys:
+								 @YES, @"NoDynarec",
+								 @YES, @"AutoDetectVideoType",
+								 @NO, @"UseHLE",
+								 @YES, @"PauseInBackground",
+								 @NO, @"Widescreen",
+								 @NO, @"NetPlay",
+								 nil];
+	
+	[defaults registerDefaults:appDefaults];
+
+	prefStringKeys = [[NSDictionary alloc] initWithObjectsAndKeys:
+		[NSValue valueWithPointer:Config.Gpu], @"PluginGPU",
+		[NSValue valueWithPointer:Config.Spu], @"PluginSPU",
+		[NSValue valueWithPointer:Config.Pad1], @"PluginPAD",
+		[NSValue valueWithPointer:Config.Cdr], @"PluginCDR",
+		[NSValue valueWithPointer:Config.Net], @"PluginNET",
+		[NSValue valueWithPointer:Config.Sio1], @"PluginSIO1",
+		nil];
+	
+	prefURLKeys = [[NSDictionary alloc] initWithObjectsAndKeys:
+				 [NSValue valueWithPointer:Config.Mcd1], @"Mcd1",
+				 [NSValue valueWithPointer:Config.Mcd2], @"Mcd2",
+				 nil];
+
+	prefByteKeys = [[NSDictionary alloc] initWithObjectsAndKeys:
+		[NSValue valueWithPointer:&Config.Xa], @"NoXaAudio",
+		//[NSValue valueWithPointer:&Config.UseNet], @"NetPlay",
+		[NSValue valueWithPointer:&Config.SioIrq], @"SioIrqAlways",
+		[NSValue valueWithPointer:&Config.Mdec], @"BlackAndWhiteMDECVideo",
+		[NSValue valueWithPointer:&Config.PsxAuto], @"AutoDetectVideoType",
+		[NSValue valueWithPointer:&Config.PsxType], @"VideoTypePAL",
+		[NSValue valueWithPointer:&Config.Cdda], @"NoCDAudio",
+		[NSValue valueWithPointer:&Config.Cpu], @"NoDynarec",
+		[NSValue valueWithPointer:&Config.PsxOut], @"ConsoleOutput",
+		[NSValue valueWithPointer:&Config.SpuIrq], @"SpuIrqAlways",
+		[NSValue valueWithPointer:&Config.RCntFix], @"RootCounterFix",
+		[NSValue valueWithPointer:&Config.VSyncWA], @"VideoSyncWAFix",
+		[NSValue valueWithPointer:&Config.Widescreen], @"Widescreen",
+		nil];
+
+	// setup application support paths
+ NSFileManager *manager = [NSFileManager defaultManager];
+ NSURL *supportURL = [manager URLForDirectory:NSApplicationSupportDirectory inDomain:NSUserDomainMask appropriateForURL:nil create:YES error:NULL];
+ 
+ if(supportURL != nil) {
+		NSURL *PcsxrAppSupport;
+		NSURL *MemCardPath;
+		NSURL *url;
+		BOOL dir;
+		
+		PcsxrAppSupport = [supportURL URLByAppendingPathComponent:@"Pcsxr"];
+
+		// create them if needed
+ url = [PcsxrAppSupport URLByAppendingPathComponent:@"Bios"];
+		if (![url checkResourceIsReachableAndReturnError:NULL])
+			[manager createDirectoryAtPath:[url path] withIntermediateDirectories:YES attributes:nil error:NULL];
+
+ MemCardPath = [PcsxrAppSupport URLByAppendingPathComponent:@"Memory Cards"];
+		url = MemCardPath;
+		if (![url checkResourceIsReachableAndReturnError:NULL])
+ [manager createDirectoryAtPath:[url path] withIntermediateDirectories:YES attributes:nil error:NULL];
+
+ url = [PcsxrAppSupport URLByAppendingPathComponent:@"Patches"];
+		if (![url checkResourceIsReachableAndReturnError:NULL])
+ [manager createDirectoryAtPath:[url path] withIntermediateDirectories:YES attributes:nil error:NULL];
+		
+		url = [PcsxrAppSupport URLByAppendingPathComponent:@"PlugIns"];
+		if (![url checkResourceIsReachableAndReturnError:NULL])
+ [manager createDirectoryAtPath:[url path] withIntermediateDirectories:YES attributes:nil error:NULL];
+ 
+ saveStatePath = [[[PcsxrAppSupport URLByAppendingPathComponent:@"Save States"] path] copy];
+		if (![manager fileExistsAtPath:saveStatePath isDirectory:&dir])
+			[manager createDirectoryAtPath:saveStatePath withIntermediateDirectories:YES attributes:nil error:NULL];
+
+ url = [MemCardPath URLByAppendingPathComponent:@"Mcd001.mcr"];
+		str = [[url path] fileSystemRepresentation];
+		if (str != nil) strlcpy(Config.Mcd1, str, MAXPATHLEN);
+
+		url = [MemCardPath URLByAppendingPathComponent:@"Mcd002.mcr"];
+		str = [[url path] fileSystemRepresentation];
+		if (str != nil) strlcpy(Config.Mcd2, str, MAXPATHLEN);
+
+		url = [PcsxrAppSupport URLByAppendingPathComponent:@"Bios"];
+		str = [[url path] fileSystemRepresentation];
+		if (str != nil) strlcpy(Config.BiosDir, str, MAXPATHLEN);
+
+		url = [PcsxrAppSupport URLByAppendingPathComponent:@"Patches"];
+		str = [[url path] fileSystemRepresentation];
+		if (str != nil) {
+			strlcpy(Config.PatchesDir, str, MAXPATHLEN);
+		}
+	} else {
+		strcpy(Config.BiosDir, "Bios/");
+		strcpy(Config.PatchesDir, "Patches/");
+
+		//NSString constants don't need to be retained/released. In fact, retain/releasing them does nothing.
+		saveStatePath = @"sstates";
+	}
+
+	// set plugin path
+	path = [[NSBundle mainBundle] builtInPlugInsPath];
+	str = [path fileSystemRepresentation];
+	if (str != nil) strlcpy(Config.PluginsDir, str, MAXPATHLEN);
+
+	// locate a bios
+	biosList = [[NSMutableArray alloc] init];
+	
+ NSString *biosDir = [manager stringWithFileSystemRepresentation:Config.BiosDir length:strlen(Config.BiosDir)];
+ NSArray *bioses = [manager contentsOfDirectoryAtPath:biosDir error:NULL];
+	if (bioses) {
+		for (NSString *file in bioses) {
+ NSDictionary *attrib = [manager attributesOfItemAtPath:[[biosDir stringByAppendingPathComponent:file] stringByResolvingSymlinksInPath] error:NULL];
+
+			if ([[attrib fileType] isEqualToString:NSFileTypeRegular]) {
+				unsigned long long size = [attrib fileSize];
+				if ((size % (256 * 1024)) == 0 && size > 0) {
+					[biosList addObject:file];
+				}
+			}
+		}
+	}
+
+	[PcsxrController setConfigFromDefaults];
+}
+
++ (NSString*)saveStatePath:(int)slot
+{
+ if(slot >= 0) {
+ return [saveStatePath stringByAppendingPathComponent:[NSString stringWithFormat:@"%s-%3.3d.pcsxrstate", CdromId, slot]];
+ }
+ 
+ return saveStatePath;
+}
+
+- (BOOL)application:(NSApplication *)theApplication openFile:(NSString *)filename
+{
+	if (skipFiles && [skipFiles count]) {
+		for (NSString *parsedFile in skipFiles) {
+			if ([filename isEqualToString:parsedFile]) {
+				return YES;
+			}
+		}
+	}
+	
+	if (![[NSFileManager defaultManager] fileExistsAtPath:filename]) {
+		NSLog(@"Nonexistant file %@ was passed to open.", filename );
+		return NO;
+	}
+	
+	NSError *err = nil;
+	NSString *utiFile = [[NSWorkspace sharedWorkspace] typeOfFile:filename error:&err];
+	if (err) {
+		NSRunAlertPanel(NSLocalizedString(@"Error opening file", nil), NSLocalizedString(@"Unable to open %@: %@", nil), nil, nil, nil, [filename lastPathComponent], err);
+		return NO;
+	}
+	static NSArray *handlers = nil;
+	if (handlers == nil) {
+		handlers = @[[PcsxrPluginHandler class], [PcsxrMemCardHandler class], [PcsxrFreezeStateHandler class], [PcsxrDiscHandler class], [PcsxrCheatHandler class]];
+		RETAINOBJNORETURN(handlers);
+	}
+	BOOL isHandled = NO;
+	for (Class fileHandler in handlers) {
+		NSObject<PcsxrFileHandle> *hand = [[fileHandler alloc] init];
+		BOOL canHandle = NO;
+		for (NSString *uti in [fileHandler supportedUTIs]) {
+			if ([[NSWorkspace sharedWorkspace] type:utiFile conformsToType:uti]) {
+				canHandle = YES;
+				break;
+			}
+		}			
+		if (canHandle) {
+			isHandled = [hand handleFile:filename];
+			RELEASEOBJ(hand);
+			break;
+		}
+		RELEASEOBJ(hand);
+	}
+	
+	return isHandled;
+}
+
+@end

pcsxr-1.9.93.tar.bz2/macosx/PcsxrDiscHandler.h Added

pcsxr-1.9.93.tar.bz2/macosx/PcsxrDiscHandler.m Added

@@ -0,0 +1,66 @@
+//
+//  PcsxrDiscHandler.m
+//  Pcsxr
+//
+//  Created by Charles Betts on 12/11/11.
+//  Copyright (c) 2011 __MyCompanyName__. All rights reserved.
+//
+
+#import "PcsxrDiscHandler.h"
+#import "EmuThread.h"
+#include "psxcommon.h"
+#include "plugins.h"
+#include "cdrom.h"
+#import "RecentItemsMenu.h"
+#import "PcsxrController.h"
+#import "ARCBridge.h"
+
+@interface PcsxrDiscHandler ()
+@property (nonatomic, arcstrong) NSURL *discURL;
+@property (arcweak) NSString *discPath;
+@end
+
+@implementation PcsxrDiscHandler
+@synthesize discURL = _discURL;
+- (NSURL*)discURL
+{
+	if (!_discURL) {
+		self.discURL = [NSURL fileURLWithPath:discPath isDirectory:NO];
+	}
+	return _discURL;
+}
+
+@synthesize discPath;
+
++ (NSArray *)supportedUTIs
+{
+	static NSArray *utisupport = nil;
+	if (utisupport == nil) {
+		utisupport = @[@"com.alcohol-soft.mdfdisc", @"com.goldenhawk.cdrwin-cuesheet", @"com.apple.disk-image-ndif", @"public.iso-image", @"com.sony.psp.firmware", @"com.codeplex.pcsxr.compressed-bin-image"];
+		RETAINOBJNORETURN(utisupport);
+	}
+	return utisupport;
+}
+
+- (BOOL)handleFile:(NSString *)theFile
+{
+	self.discPath = theFile;
+	PcsxrController *appDelegate = [NSApp delegate];
+	if ([EmuThread active] == YES && !UsingIso()) {
+		return NO;
+	}
+	[appDelegate runURL:[self discURL]];
+	[[appDelegate recentItems] addRecentItem:[self discURL]];
+	return YES;
+}
+
+#if !__has_feature(objc_arc)
+- (void)dealloc
+{
+	self.discURL = nil;
+	
+	[super dealloc];
+}
+#endif
+
+@end

pcsxr-1.9.93.tar.bz2/macosx/PcsxrFileHandle.h Added

pcsxr-1.9.93.tar.bz2/macosx/PcsxrFreezeStateHandler.h Added

pcsxr-1.9.93.tar.bz2/macosx/PcsxrFreezeStateHandler.m Added

pcsxr-1.9.93.tar.bz2/macosx/PcsxrHexadecimalFormatter.h Added

pcsxr-1.9.93.tar.bz2/macosx/PcsxrHexadecimalFormatter.m Added

@@ -0,0 +1,82 @@
+//
+//  PcsxrHexadecimalFormatter.m
+//  Pcsxr
+//
+//  Created by C.W. Betts on 8/17/13.
+//
+//
+
+#import "PcsxrHexadecimalFormatter.h"
+
+@interface PcsxrHexadecimalFormatter ()
+@property (readwrite, retain) NSString *hexFormatString;
+
+@end
+
+@implementation PcsxrHexadecimalFormatter
+@synthesize hexPadding;
+- (void)setHexPadding:(char)_hexPadding
+{
+	hexPadding = _hexPadding;
+	self.hexFormatString = [NSString stringWithFormat:@"0x%%0%ilx", hexPadding];
+}
+
+@synthesize hexFormatString;
+
+- (id)init
+{
+	if (self = [super init]) {
+#ifdef __LP64__
+		self.hexPadding = 16;
+#else
+		self.hexPadding = 8;
+#endif
+	}
+	return self;
+}
+
+- (id)initWithCoder:(NSCoder *)aDecoder
+{
+	if (self = [super initWithCoder:aDecoder]) {
+#ifdef __LP64__
+		self.hexPadding = 16;
+#else
+		self.hexPadding = 8;
+#endif
+	}
+	return self;
+}
+
+- (NSString *)stringForObjectValue:(id)obj
+{
+	if ([obj isKindOfClass:[NSNumber class]]) {
+		return [NSString stringWithFormat:self.hexFormatString, (long)[obj integerValue]];
+	} else return nil;
+}
+
+- (NSString *)editingStringForObjectValue:(id)obj
+{
+	if ([obj isKindOfClass:[NSNumber class]]) {
+		return [NSString stringWithFormat:@"%lx", (long)[obj integerValue]];
+	} else return nil;
+}
+
+- (BOOL)getObjectValue:(out id *)obj forString:(NSString *)string errorDescription:(out NSString **)error
+{
+	NSString *tmpstr = nil;
+	if ([string hasPrefix:@"0x"]) {
+		NSRange zeroXRange = [string rangeOfString:@"0x"];
+		tmpstr = [string stringByReplacingCharactersInRange:zeroXRange withString:@""];
+	}else {
+		tmpstr = string;
+	}
+	long tmpNum = 0;
+	if (sscanf([tmpstr UTF8String], "%lx", &tmpNum) == 1) {
+		*obj = @(tmpNum);
+		return YES;
+	} else {
+		return NO;
+	}
+}
+
+@end

pcsxr-1.9.93.tar.bz2/macosx/PcsxrMemCardArray.h Added

pcsxr-1.9.93.tar.bz2/macosx/PcsxrMemCardArray.m Added

@@ -0,0 +1,357 @@
+//
+// PcsxrMemCardArray.m
+// Pcsxr
+//
+// Created by C.W. Betts on 7/6/13.
+//
+//
+
+#import "PcsxrMemCardArray.h"
+#import "ARCBridge.h"
+#import "ConfigurationController.h"
+#include "sio.h"
+
+#define MAX_MEMCARD_BLOCKS 15
+
+static inline void CopyMemcardData(char *from, char *to, int srci, int dsti, char *str)
+{
+	// header
+	memmove(to + (dsti + 1) * 128, from + (srci + 1) * 128, 128);
+	SaveMcd(str, to, (dsti + 1) * 128, 128);
+	
+	// data
+	memmove(to + (dsti + 1) * 1024 * 8, from + (srci+1) * 1024 * 8, 1024 * 8);
+	SaveMcd(str, to, (dsti + 1) * 1024 * 8, 1024 * 8);
+}
+
+static inline char* BlankHeader()
+{
+	struct PSXMemHeader {
+		unsigned int allocState;
+		unsigned int fileSize;
+		unsigned short nextBlock;
+		char fileName[21];
+		unsigned char garbage[96];
+		unsigned char checksum;
+	};
+	
+	static struct PSXMemHeader *toReturn = NULL;
+	if (!toReturn) {
+		toReturn = calloc(sizeof(struct PSXMemHeader), 1);
+		
+		//FIXME: Which value is right?
+		toReturn->allocState = 0x000000a0;
+		//toReturn->allocState = 0xa0000000;
+		toReturn->nextBlock = 0xFFFF;
+		unsigned char *bytePtr = (unsigned char*)toReturn;
+		for (int i = 0; i < sizeof(struct PSXMemHeader) - sizeof(unsigned char); i++) {
+			toReturn->checksum = toReturn->checksum ^ bytePtr[i];
+		}
+	}
+	
+	return (char*)toReturn;
+}
+
+static inline void ClearMemcardData(char *to, int dsti, char *str)
+{
+	// header
+	char *header = BlankHeader();
+	memcpy(to + (dsti + 1) * 128, header, 128);
+	SaveMcd(str, to, (dsti + 1) * 128, 128);
+	
+	// data
+	memset(to + (dsti + 1) * 1024 * 8, 0, 1024 * 8);
+	SaveMcd(str, to, (dsti + 1) * 1024 * 8, 1024 * 8);
+}
+
+@interface PcsxrMemCardArray ()
+@property (arcretain) NSArray *rawArray;
+@property (readonly) char* memDataPtr;
+
+@end
+
+@implementation PcsxrMemCardArray
+@synthesize rawArray;
+
+- (char*)memDataPtr
+{
+	if (cardNumber == 1) {
+		return Mcd1Data;
+	} else {
+		return Mcd2Data;
+	}
+}
+
+- (const char *)memCardCPath
+{
+	if (cardNumber == 1) {
+		return Config.Mcd1;
+	} else {
+		return Config.Mcd2;
+	}
+}
+
+- (id)initWithMemoryCardNumber:(int)carNum
+{
+	NSParameterAssert(carNum == 1 || carNum == 2);
+	if (self = [super init]) {
+		NSMutableArray *tmpMemArray = [[NSMutableArray alloc] initWithCapacity:MAX_MEMCARD_BLOCKS];
+		cardNumber = carNum;
+		int i, x;
+		i = 0;
+		while (i < MAX_MEMCARD_BLOCKS) {
+			x = 1;
+			McdBlock memBlock;
+			GetMcdBlockInfo(carNum, i + 1, &memBlock);
+			
+			if ([PcsxrMemoryObject memFlagsFromBlockFlags:memBlock.Flags] == memFlagFree) {
+				//Free space: ignore
+				i++;
+				continue;
+			}
+			do {
+				McdBlock tmpBlock;
+				GetMcdBlockInfo(carNum, i + x + 1, &tmpBlock);
+				if ((tmpBlock.Flags & 0x3) == 0x3) {
+					x++;
+					break;
+				} else if ((tmpBlock.Flags & 0x2) == 0x2) {
+					x++;
+				} else {
+					break;
+				}
+			} while (i + x - 1 < MAX_MEMCARD_BLOCKS);
+			@autoreleasepool {
+				PcsxrMemoryObject *obj = [[PcsxrMemoryObject alloc] initWithMcdBlock:&memBlock startingIndex:i size:x];
+				[tmpMemArray addObject:obj];
+				RELEASEOBJ(obj);
+			}
+			i += x;
+		}
+		self.rawArray = [NSArray arrayWithArray:tmpMemArray];
+		RELEASEOBJ(tmpMemArray);
+	}
+	return self;
+}
+
+- (int)indexOfFreeBlocksWithSize:(int)asize
+{
+	int foundcount = 0, i = 0;
+	
+	McdBlock obj;
+	// search for empty (formatted) blocks first
+	while (i < MAX_MEMCARD_BLOCKS && foundcount < asize) {
+		GetMcdBlockInfo(cardNumber, 1 + i++, &obj);
+		//&Blocks[target_card][++i];
+		if ((obj.Flags & 0xFF) == 0xA0) { // if A0 but not A1
+			foundcount++;
+		} else if (foundcount >= 1) { // need to find n count consecutive blocks
+			foundcount = 0;
+		} else {
+			//i++;
+		}
+		//printf("formatstatus=%x\n", Info->Flags);
+ 	}
+	
+	if (foundcount == asize)
+		return (i-foundcount);
+	
+	// no free formatted slots, try to find a deleted one
+	foundcount = i = 0;
+	while (i < MAX_MEMCARD_BLOCKS && foundcount < asize) {
+		GetMcdBlockInfo(cardNumber, 1 + i++, &obj);
+		if ((obj.Flags & 0xF0) == 0xA0) { // A2 or A6 f.e.
+			foundcount++;
+		} else if (foundcount >= 1) { // need to find n count consecutive blocks
+			foundcount = 0;
+		} else {
+			//i++;
+		}
+		//printf("delstatus=%x\n", Info->Flags);
+ 	}
+	
+	if (foundcount == asize)
+		return (i-foundcount);
+	
+ 	return -1;
+}
+
+- (BOOL)moveBlockAtIndex:(int)idx toMemoryCard:(PcsxrMemCardArray*)otherCard
+{
+	if (idx == [rawArray count]) {
+#ifdef DEBUG
+		NSLog(@"Trying to get an object one more than the length of the raw array. Perhaps you were trying to \"move\" the free blocks. We don't want to do this.");
+#endif
+		return NO;
+	}
+	PcsxrMemoryObject *tmpObj = [rawArray objectAtIndex:idx];
+
+	int memSize = tmpObj.blockSize;
+	
+	if ([otherCard availableBlocks] < memSize) {
+		NSLog(@"Failing because the other card does not have enough space!");
+		return NO;
+	}
+	
+	int toCopy = [otherCard indexOfFreeBlocksWithSize:memSize];
+	if (toCopy == -1) {
+		NSLog(@"Not enough consecutive blocks. Compacting the other card.");
+		[otherCard compactMemory];
+		//Since we're accessing the mem card data directly (instead of via PcsxrMemoryObject objects) using the following calls, we don't need to reload the data.
+		toCopy = [otherCard indexOfFreeBlocksWithSize:memSize];
+		NSAssert(toCopy != -1, @"Compacting the card should have made space!");
+	}
+	
+	int memIdx = tmpObj.startingIndex;
+	for (int i = 0; i < memSize; i++) {
+		CopyMemcardData([self memDataPtr], [otherCard memDataPtr], (memIdx+i), (toCopy+i), (char*)otherCard.memCardCPath);
+	}
+	
+	return YES;
+}
+
+- (int)freeBlocks
+{
+	int memSize = 15;
+	for (PcsxrMemoryObject *memObj in rawArray) {
+		memSize -= memObj.blockSize;
+	}
+	return memSize;
+}
+
+- (int)availableBlocks
+{
+	int memSize = MAX_MEMCARD_BLOCKS;
+	for (PcsxrMemoryObject *memObj in rawArray) {
+		if (memObj.flagNameIndex != memFlagDeleted) {
+			memSize -= memObj.blockSize;
+		}
+	}
+	return memSize;
+}
+
+- (NSArray*)memoryArray
+{
+	int freeSize = [self freeBlocks];
+	
+	if (freeSize) {
+		McdBlock theBlock;
+		//Create a blank "block" that will be used for
+		theBlock.Flags = 0xA0;
+		theBlock.IconCount = 0;
+		PcsxrMemoryObject *freeObj = [[PcsxrMemoryObject alloc] initWithMcdBlock:&theBlock startingIndex:MAX_MEMCARD_BLOCKS - 1 - freeSize size:freeSize];
+		return [rawArray arrayByAddingObject:AUTORELEASEOBJ(freeObj)];
+	} else
+		return rawArray;
+}
+
+- (NSURL*)memCardURL
+{
+	if (cardNumber == 1) {
+		return [[NSUserDefaults standardUserDefaults] URLForKey:@"Mcd1"];
+	} else {
+		return [[NSUserDefaults standardUserDefaults] URLForKey:@"Mcd2"];
+	}
+}
+
+- (int)memorySizeAtIndex:(int)idx
+{
+	if (idx == [rawArray count]) {
+#ifdef DEBUG
+		NSLog(@"Trying to get an object one more than the length of the raw array. Perhaps you were trying to \"count\" the free blocks.");
+#endif
+		return [self freeBlocks];
+	}
+
+	return [[rawArray objectAtIndex:idx] blockSize];
+}
+
+- (void)compactMemory
+{
+	int i = 0, x = 1;
+	while (i < MAX_MEMCARD_BLOCKS && x < MAX_MEMCARD_BLOCKS) {
+		x = i;
+		McdBlock baseBlock;
+		GetMcdBlockInfo(cardNumber, i+1, &baseBlock);
+		PCSXRMemFlags theFlags = [PcsxrMemoryObject memFlagsFromBlockFlags:baseBlock.Flags];
+		
+		if (theFlags == memFlagDeleted || theFlags == memFlagFree) {
+			PCSXRMemFlags up1Flags = theFlags;
+			while ((up1Flags == memFlagDeleted || up1Flags == memFlagFree) && x < MAX_MEMCARD_BLOCKS){
+				x++;
+				McdBlock up1Block;
+				GetMcdBlockInfo(cardNumber, x+1, &up1Block);
+				up1Flags = [PcsxrMemoryObject memFlagsFromBlockFlags:up1Block.Flags];
+			}
+			if (x >= MAX_MEMCARD_BLOCKS) {
+				
+				break;
+			}
+			CopyMemcardData(self.memDataPtr, self.memDataPtr, x, i, (char*)[[self.memCardURL path] fileSystemRepresentation]);
+			ClearMemcardData(self.memDataPtr, x, (char*)self.memCardCPath );
+		}
+		i++;
+	}
+	
+	while (i < MAX_MEMCARD_BLOCKS) {
+		ClearMemcardData(self.memDataPtr, i, (char*)self.memCardCPath);
+		i++;
+	}
+	
+	LoadMcd(cardNumber, (char*)self.memCardCPath);
+}
+
+- (void)deleteMemoryBlocksAtIndex:(int)slotnum
+{
+	int xor = 0, i, j;
+	char *data, *ptr, *filename;
+	if (cardNumber == 1) {
+		filename = Config.Mcd1;
+		data = Mcd1Data;
+	} else {
+		filename = Config.Mcd2;
+		data = Mcd2Data;
+	}
+	
+	if (slotnum == [rawArray count]) {
+#ifdef DEBUG
+		NSLog(@"Trying to get an object one more than the length of the raw array. Perhaps you were trying to \"delete\" the free blocks.");
+#endif
+		return;
+	}
+	
+	PcsxrMemoryObject *theObj = [rawArray objectAtIndex:slotnum];
+	
+	McdBlock flagBlock;
+	
+	for(i = theObj.startingIndex +1; i < (theObj.startingIndex + theObj.blockSize +1); i++)
+	{
+		GetMcdBlockInfo(cardNumber, i, &flagBlock);
+		ptr = data + i * 128;
+		
+		if ((flagBlock.Flags & 0xF0) == 0xA0) {
+			if ((flagBlock.Flags & 0xF) >= 1 &&
+				(flagBlock.Flags & 0xF) <= 3) { // deleted
+				*ptr = 0x50 | (flagBlock.Flags & 0xF);
+			} else return;
+		} else if ((flagBlock.Flags & 0xF0) == 0x50) { // used
+			*ptr = 0xA0 | (flagBlock.Flags & 0xF);
+		} else { continue; }
+		
+		for (j = 0; j < 127; j++) xor ^= *ptr++;
+		*ptr = xor;
+		
+		SaveMcd(filename, data, i * 128, 128);
+	}
+}
+
+#if !__has_feature(objc_arc)
+- (void)dealloc
+{
+	self.rawArray = nil;
+	
+	[super dealloc];
+}
+#endif
+
+@end

pcsxr-1.9.93.tar.bz2/macosx/PcsxrMemCardController.h Added

pcsxr-1.9.93.tar.bz2/macosx/PcsxrMemCardController.m Added

@@ -0,0 +1,256 @@
+//
+// PcsxrMemCardManager.m
+// Pcsxr
+//
+// Created by Charles Betts on 11/23/11.
+// Copyright (c) 2011 __MyCompanyName__. All rights reserved.
+//
+
+#import "PcsxrMemCardController.h"
+#import "PcsxrMemoryObject.h"
+#import "ConfigurationController.h"
+#import "PcsxrMemCardHandler.h"
+#import "PcsxrMemCardArray.h"
+#include "sio.h"
+#import "ARCBridge.h"
+
+#define MAX_MEMCARD_BLOCKS 15
+
+@interface PcsxrMemCardController ()
+@property (readwrite, arcretain) PcsxrMemCardArray *memCard1Array;
+@property (readwrite, arcretain) PcsxrMemCardArray *memCard2Array;
+@end
+
+@implementation PcsxrMemCardController
+
+@synthesize memCard1Array, memCard2Array;
+
+- (void)setupValues:(int)theCards
+{
+	NSParameterAssert(theCards < 4 && theCards > 0);
+	if (theCards == 3) {
+		LoadMcds(Config.Mcd1, Config.Mcd2);
+	} else {
+		LoadMcd(theCards, theCards == 1 ? Config.Mcd1 : Config.Mcd2);
+	}
+	NSFileManager *fm = [NSFileManager defaultManager];
+	NSUserDefaults *def = [NSUserDefaults standardUserDefaults];
+	NSString *fullPath = nil;
+	NSString *fileName = nil;
+	
+	if (theCards & 1) {
+		fullPath = [[def URLForKey:@"Mcd1"] path];
+		fileName = [fm displayNameAtPath:fullPath];
+		
+		[memCard1Label setTitleWithMnemonic:fileName];
+		[memCard1Label setToolTip:fullPath];
+		
+		[self loadMemoryCardInfoForCard:1];
+	}
+	
+	if (theCards & 2) {
+		fullPath = [[def URLForKey:@"Mcd2"] path];
+		fileName = [fm displayNameAtPath:fullPath];
+		
+		[memCard2Label setTitleWithMnemonic:fileName];
+		[memCard2Label setToolTip:fullPath];
+		
+		[self loadMemoryCardInfoForCard:2];
+	}
+}
+
+#if 0
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil;
+{
+ self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+ if (self) {
+ //LoadMcds(Config.Mcd1, Config.Mcd2);
+ }
+ 
+ return self;
+}
+#endif
+
+- (void)loadMemoryCardInfoForCard:(int)theCard
+{
+	PcsxrMemCardArray *newArray = [[PcsxrMemCardArray alloc] initWithMemoryCardNumber:theCard];
+	
+	if (theCard == 1) {
+		[self setMemCard1Array:newArray];
+	} else {
+		[self setMemCard2Array:newArray];
+	}
+	RELEASEOBJ(newArray);
+}
+
+- (void)memoryCardDidChangeNotification:(NSNotification *)aNote
+{
+	NSDictionary *dict = [aNote userInfo];
+	NSNumber *theNum = [dict objectForKey:memCardChangeNumberKey];
+	[self setupValues: theNum ? [theNum intValue] : 3];
+}
+
+- (void)awakeFromNib
+{
+	[super awakeFromNib];
+	[self setupValues:3];
+ 
+	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(memoryCardDidChangeNotification:) name:memChangeNotifier object:nil];
+
+	imageAnimateTimer = [[NSTimer alloc] initWithFireDate:[NSDate date] interval:3.0/10.0 target:self selector:@selector(animateMemCards:) userInfo:nil repeats:YES];
+	[[NSRunLoop mainRunLoop] addTimer:imageAnimateTimer forMode:NSRunLoopCommonModes];
+}
+
+- (void)animateMemCards:(NSTimer*)theTimer
+{
+	[[NSNotificationCenter defaultCenter] postNotificationName:memoryAnimateTimerKey object:self];
+}
+
+- (IBAction)moveBlock:(id)sender
+{
+	NSInteger memCardSelect = [sender tag];
+	NSCollectionView *cardView;
+	NSIndexSet *selection;
+	PcsxrMemCardArray *toCard, *fromCard;
+	int cardnum;
+	if (memCardSelect == 1) {
+		cardView = memCard2view;
+		toCard = memCard1Array;
+		fromCard = memCard2Array;
+		cardnum = 1;
+	} else {
+		cardView = memCard1view;
+		toCard = memCard2Array;
+		fromCard = memCard1Array;
+		cardnum = 2;
+	}
+	selection = [cardView selectionIndexes];
+	if (!selection || [selection count] == 0) {
+		NSBeep();
+		return;
+	}
+	NSInteger selectedIndex = [selection firstIndex];
+	
+	int cardSize, freeConsBlocks, availBlocks;
+	
+	if ([[[fromCard memoryArray] objectAtIndex:selectedIndex] flagNameIndex] == memFlagFree) {
+		NSBeep();
+		return;
+	}
+	
+	cardSize = [fromCard memorySizeAtIndex:(int)selectedIndex];
+	freeConsBlocks = [toCard indexOfFreeBlocksWithSize:cardSize];
+	availBlocks = [toCard availableBlocks];
+	if (freeConsBlocks == -1 && availBlocks >= cardSize) {
+		PcsxrMemoryObject *tmpmemobj = [fromCard.memoryArray objectAtIndex:selectedIndex];
+		NSInteger copyOK = NSRunInformationalAlertPanel(NSLocalizedString(@"Free Size", nil), NSLocalizedString(@"Memory card %i does not have enough free consecutive blocks.\n\nIn order to copy over \"%@ (%@),\" memory card %i must be compressed. Compressing memory cards will make deleted blocks unrecoverable.\n\nDo you want to continue?", nil), NSLocalizedString(@"Yes", nil), NSLocalizedString(@"No", nil), nil, cardnum, tmpmemobj.englishName, tmpmemobj.sjisName, cardnum);
+		if (copyOK != NSAlertDefaultReturn) {
+			return;
+		}
+	} else if (cardSize > availBlocks) {
+		NSRunCriticalAlertPanel(NSLocalizedString(@"No Free Space", nil), NSLocalizedString(@"Memory card %d doesn't have %d free consecutive blocks on it. Please remove some blocks on that card to continue", nil), nil, nil, nil, availBlocks, cardnum);
+		return;
+	}
+	
+	[fromCard moveBlockAtIndex:(int)selectedIndex toMemoryCard:toCard];
+	
+	if (cardnum == 1) {
+		LoadMcd(1, Config.Mcd1);
+	} else {
+		LoadMcd(2, Config.Mcd2);
+	}
+	[self loadMemoryCardInfoForCard:cardnum];
+}
+
+- (IBAction)formatCard:(id)sender
+{
+	NSInteger formatOkay = NSRunAlertPanel(NSLocalizedString(@"Format Card", nil), NSLocalizedString(@"Formatting a memory card will remove all data on it.\n\nThis cannot be undone.", nil), NSLocalizedString(@"Cancel", nil), NSLocalizedString(@"Format", nil), nil);
+	if (formatOkay == NSAlertAlternateReturn) {
+		NSInteger memCardSelect = [sender tag];
+		if (memCardSelect == 1) {
+			CreateMcd(Config.Mcd1);
+			LoadMcd(1, Config.Mcd1);
+		} else {
+			CreateMcd(Config.Mcd2);
+			LoadMcd(2, Config.Mcd2);
+		}
+		[self loadMemoryCardInfoForCard:(int)memCardSelect];
+	}
+}
+
+- (void)deleteMemoryBlocksAtIndex:(int)slotnum card:(int)cardNum
+{
+	PcsxrMemCardArray *cardArray;
+	if (cardNum == 1) {
+		cardArray = [self memCard1Array];
+	} else {
+		cardArray = [self memCard2Array];
+	}
+	[cardArray deleteMemoryBlocksAtIndex:slotnum];
+}
+
+- (IBAction)deleteMemoryObject:(id)sender
+{
+	PcsxrMemCardArray *curCard;
+	NSInteger memCardSelect = [sender tag];
+	NSIndexSet *selected;
+	if (memCardSelect == 1) {
+		curCard = memCard1Array;
+		selected = [memCard1view selectionIndexes];
+	} else {
+		curCard = memCard2Array;
+		selected = [memCard2view selectionIndexes];
+	}
+	
+	if (!selected || [selected count] == 0) {
+		NSBeep();
+		return;
+	}
+	
+	NSInteger selectedIndex = [selected firstIndex];
+
+	PcsxrMemoryObject *tmpObj = [[curCard memoryArray] objectAtIndex:selectedIndex];
+	
+	if (tmpObj.flagNameIndex == memFlagFree) {
+		NSBeep();
+		return;
+	}
+	
+	NSInteger deleteOkay = NSRunAlertPanel(NSLocalizedString(@"Delete Block", nil), NSLocalizedString(@"Deleting a block will remove all saved data on that block.\n\nThis cannot be undone.", nil), NSLocalizedString(@"Cancel", nil), NSLocalizedString(@"Delete", nil), nil);
+	if (deleteOkay == NSAlertAlternateReturn) {
+		[self deleteMemoryBlocksAtIndex:(int)selectedIndex card:(int)memCardSelect];
+		
+		if (memCardSelect == 1) {
+			LoadMcd(1, Config.Mcd1);
+		} else {
+			LoadMcd(2, Config.Mcd2);
+		}
+		[self loadMemoryCardInfoForCard:(int)memCardSelect];
+	}
+}
+
+- (IBAction)changeMemCard:(id)sender
+{
+	[ConfigurationController mcdChangeClicked:sender];
+}
+
+- (IBAction)newMemCard:(id)sender
+{
+	[ConfigurationController mcdNewClicked:sender];
+}
+
+- (void)dealloc
+{
+	[[NSNotificationCenter defaultCenter] removeObserver:self];
+	[imageAnimateTimer invalidate];
+	
+#if !__has_feature(objc_arc)
+	[imageAnimateTimer release];
+	self.memCard1Array = nil;
+	self.memCard2Array = nil;
+
+	[super dealloc];
+#endif
+}
+
+@end

pcsxr-1.9.93.tar.bz2/macosx/PcsxrMemCardHandler.h Added

pcsxr-1.9.93.tar.bz2/macosx/PcsxrMemCardHandler.m Added

@@ -0,0 +1,75 @@
+//
+//  PcsxrMemCardHandler.m
+//  Pcsxr
+//
+//  Created by Charles Betts on 12/10/11.
+//  Copyright (c) 2011 __MyCompanyName__. All rights reserved.
+//
+
+#import "PcsxrMemCardHandler.h"
+#import "ConfigurationController.h"
+#import "EmuThread.h"
+#import "ARCBridge.h"
+
+@implementation PcsxrMemCardHandler
+
++ (NSArray *)supportedUTIs
+{
+	static NSArray *utisupport = nil;
+	if (utisupport == nil) {
+		utisupport = @[@"com.codeplex.pcsxr.memcard"];
+		RETAINOBJNORETURN(utisupport);
+	}
+	return utisupport;
+}
+
+- (id)initWithWindow:(NSWindow *)window
+{
+    self = [super initWithWindow:window];
+    if (self) {
+		memChosen = 0;
+	}
+    
+    return self;
+}
+
+- (id)init
+{
+	return self = [self initWithWindowNibName:@"PcsxrMemCardDocument"];
+}
+
+- (void)windowDidLoad
+{
+    [super windowDidLoad];
+    
+    // Implement this method to handle any initialization after your window controller's window has been loaded from its nib file.
+}
+
+- (IBAction)setMemCard:(id)sender
+{
+	memChosen = [sender tag];
+	
+	[NSApp stopModal];
+}
+
+- (BOOL)handleFile:(NSString *)theFile
+{
+	if ([EmuThread active]) {
+		return NO;
+	}
+	if (![self window]) {
+		[NSBundle loadNibNamed:@"PcsxrMemCardDocument" owner:self];
+	}
+	[cardPath setObjectValue:[[NSFileManager defaultManager] displayNameAtPath:theFile]];
+	
+	[NSApp runModalForWindow:[self window]];
+	
+	[[self window] orderOut:nil];
+	
+	if (memChosen != 0) {
+		[ConfigurationController setMemoryCard:(int)memChosen toPath:theFile];
+	}
+	return YES;
+}
+
+@end

pcsxr-1.9.93.tar.bz2/macosx/PcsxrMemoryObject.h Added

@@ -0,0 +1,63 @@
+//
+// PcsxrMemoryObject.h
+// Pcsxr
+//
+// Created by Charles Betts on 11/23/11.
+// Copyright (c) 2011 __MyCompanyName__. All rights reserved.
+//
+
+#import <Foundation/NSObject.h>
+#include "sio.h"
+#import "ARCBridge.h"
+
+@class NSImage;
+@class NSString;
+@class NSArray;
+@class NSAttributedString;
+
+extern NSString *const memoryAnimateTimerKey;
+
+typedef enum _PCSXRMemFlags {
+	memFlagDeleted,
+	memFlagFree,
+	memFlagUsed,
+	memFlagLink,
+	memFlagEndLink
+} PCSXRMemFlags;
+
+@interface PcsxrMemoryObject : NSObject
+{
+	NSString *englishName;
+	NSString *sjisName;
+	NSString *memName;
+	NSString *memID;
+	
+	NSArray			*memImages;
+	NSInteger		memImageIndex;
+	uint8_t			startingIndex;
+	uint8_t			blockSize;
+	PCSXRMemFlags	flagNameIndex;
+}
++ (NSArray *)imagesFromMcd:(McdBlock *)block;
++ (NSString*)memoryLabelFromFlag:(PCSXRMemFlags)flagNameIndex;
++ (NSImage *)blankImage;
++ (PCSXRMemFlags)memFlagsFromBlockFlags:(unsigned char)blockFlags;
+
+- (id)initWithMcdBlock:(McdBlock *)infoBlockc startingIndex:(uint8_t)startIdx;
+- (id)initWithMcdBlock:(McdBlock *)infoBlockc startingIndex:(uint8_t)startIdx size:(uint8_t)memSize;
+
+@property (readonly, arcstrong) NSString *englishName;
+@property (readonly, arcstrong) NSString *sjisName;
+@property (readonly, arcstrong) NSString *memName;
+@property (readonly, arcstrong) NSString *memID;
+@property (readonly) PCSXRMemFlags flagNameIndex;
+@property (readonly) uint8_t startingIndex;
+@property (readonly) uint8_t blockSize;
+
+@property (readonly, unsafe_unretained, nonatomic) NSImage *memImage;
+@property (readonly, nonatomic) unsigned memIconCount;
+@property (readonly, unsafe_unretained, nonatomic) NSString *flagName;
+@property (readonly, unsafe_unretained, nonatomic) NSAttributedString *attributedFlagName;
+@property (readonly, nonatomic) BOOL isBiggerThanOne;
+
+@end

pcsxr-1.9.93.tar.bz2/macosx/PcsxrMemoryObject.m Added

@@ -0,0 +1,352 @@
+//
+// PcsxrMemoryObject.m
+// Pcsxr
+//
+// Created by Charles Betts on 11/23/11.
+// Copyright (c) 2011 __MyCompanyName__. All rights reserved.
+//
+
+#import "PcsxrMemoryObject.h"
+#import <Foundation/NSString.h>
+#import <Foundation/NSArray.h>
+#import <AppKit/NSColor.h>
+#import <AppKit/NSImage.h>
+#import <AppKit/NSBezierPath.h>
+#import <AppKit/NSAttributedString.h>
+#import "ARCBridge.h"
+
+NSString *const memoryAnimateTimerKey = @"PCSXR Memory Card Image Animate";
+
+@interface PcsxrMemoryObject ()
+@property (readwrite, arcstrong) NSString *englishName;
+@property (readwrite, arcstrong) NSString *sjisName;
+@property (readwrite, arcstrong) NSString *memName;
+@property (readwrite, arcstrong) NSString *memID;
+@property (readwrite) uint8_t startingIndex;
+@property (readwrite) uint8_t blockSize;
+
+@property (readwrite, nonatomic) NSInteger memImageIndex;
+@property (arcstrong) NSArray *memImages;
+@property (readwrite) PCSXRMemFlags flagNameIndex;
+@end
+
+@implementation PcsxrMemoryObject
+
++ (NSArray *)imagesFromMcd:(McdBlock *)block
+{
+	NSMutableArray *imagesArray = [[NSMutableArray alloc] initWithCapacity:block->IconCount];
+	for (int i = 0; i < block->IconCount; i++) {
+		NSImage *memImage = nil;
+		{
+			NSBitmapImageRep *imageRep = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:NULL pixelsWide:16 pixelsHigh:16 bitsPerSample:8 samplesPerPixel:3 hasAlpha:NO isPlanar:NO colorSpaceName:NSCalibratedRGBColorSpace bytesPerRow:0 bitsPerPixel:0];
+			
+			short *icon = block->Icon;
+			
+			int x, y, c, v, r, g, b;
+			for (v = 0; v < 256; v++) {
+				x = (v % 16);
+				y = (v / 16);
+				c = icon[(i * 256) + v];
+				r = (c & 0x001f) << 3;
+				g = ((c & 0x03e0) >> 5) << 3;
+				b = ((c & 0x7c00) >> 10) << 3;
+				[imageRep setColor:[NSColor colorWithCalibratedRed:r/255.0 green:g/255.0 blue:b/255.0 alpha:1.0] atX:x y:y];
+			}
+			memImage = [[NSImage alloc] init];
+			[memImage addRepresentation:imageRep];
+			RELEASEOBJ(imageRep);
+			[memImage setSize:NSMakeSize(32, 32)];
+		}
+		[imagesArray addObject:memImage];
+		RELEASEOBJ(memImage);
+	}
+	NSArray *retArray = [NSArray arrayWithArray:imagesArray];
+	RELEASEOBJ(imagesArray);
+	return retArray;
+}
+
+static NSString *MemLabelDeleted;
+static NSString *MemLabelFree;
+static NSString *MemLabelUsed;
+static NSString *MemLabelLink;
+static NSString *MemLabelEndLink;
+
++ (void)initialize
+{
+	static dispatch_once_t onceToken;
+	dispatch_once(&onceToken, ^{
+		NSBundle *mainBundle = [NSBundle mainBundle];
+		MemLabelDeleted = [[mainBundle localizedStringForKey:@"MemCard_Deleted" value:@"" table:((void *)0)] copy];
+		MemLabelFree = [[mainBundle localizedStringForKey:@"MemCard_Free" value:@"" table:((void *)0)] copy];
+		MemLabelUsed = [[mainBundle localizedStringForKey:@"MemCard_Used" value:@"" table:((void *)0)] copy];
+		MemLabelLink = [[mainBundle localizedStringForKey:@"MemCard_Link" value:@"" table:((void *)0)] copy];
+		MemLabelEndLink = [[mainBundle localizedStringForKey:@"MemCard_EndLink" value:@"" table:((void *)0)] copy];
+	});
+}
+
++ (NSString*)memoryLabelFromFlag:(PCSXRMemFlags)flagNameIndex
+{
+	switch (flagNameIndex) {
+		default:
+		case memFlagFree:
+			return MemLabelFree;
+			break;
+			
+		case memFlagEndLink:
+			return MemLabelEndLink;
+			break;
+			
+		case memFlagLink:
+			return MemLabelLink;
+			break;
+			
+		case memFlagUsed:
+			return MemLabelUsed;
+			break;
+			
+		case memFlagDeleted:
+			return MemLabelDeleted;
+			break;
+	}
+}
+
++ (NSImage *)blankImage
+{
+	static NSImage *imageBlank = nil;
+	if (imageBlank == nil) {
+		NSRect imageRect = NSMakeRect(0, 0, 32, 32);
+		imageBlank = [[NSImage alloc] initWithSize:imageRect.size];
+		[imageBlank lockFocus];
+		[[NSColor blackColor] set];
+		[NSBezierPath fillRect:imageRect];
+		[imageBlank unlockFocus];
+	}
+	return imageBlank;
+}
+
+- (id)initWithMcdBlock:(McdBlock *)infoBlock startingIndex:(uint8_t)startIdx
+{
+	return [self initWithMcdBlock:infoBlock startingIndex:startIdx size:1];
+}
+
++ (PCSXRMemFlags)memFlagsFromBlockFlags:(unsigned char)blockFlags
+{
+	if ((blockFlags & 0xF0) == 0xA0) {
+		if ((blockFlags & 0xF) >= 1 && (blockFlags & 0xF) <= 3)
+			return memFlagDeleted;
+		else
+			return memFlagFree;
+	} else if ((blockFlags & 0xF0) == 0x50) {
+		if ((blockFlags & 0xF) == 0x1)
+			return memFlagUsed;
+		else if ((blockFlags & 0xF) == 0x2)
+			return memFlagLink;
+		else if ((blockFlags & 0xF) == 0x3)
+			return memFlagEndLink;
+	} else
+		return memFlagFree;
+	
+	//Xcode complains unless we do this...
+	NSLog(@"Unknown flag %x", blockFlags);
+	return memFlagFree;
+}
+
+- (id)initWithMcdBlock:(McdBlock *)infoBlock startingIndex:(uint8_t)startIdx size:(uint8_t)memSize
+{
+	if (self = [super init]) {
+		self.startingIndex = startIdx;
+		self.blockSize = memSize;
+		self.flagNameIndex = [PcsxrMemoryObject memFlagsFromBlockFlags:infoBlock->Flags];
+		if (self.flagNameIndex == memFlagFree) {
+			self.memImages = @[];
+			self.memImageIndex = -1;
+			self.englishName = self.sjisName = @"Free block";
+			self.memID = self.memName = @"";
+		} else {
+			self.englishName = @(infoBlock->Title);
+			self.sjisName = [NSString stringWithCString:infoBlock->sTitle encoding:NSShiftJISStringEncoding];
+			
+			if ([englishName isEqualToString:sjisName]) {
+#if 0
+				if (![englishName isEqualToString:@""])
+					NSLog(@"English name and sjis name are the same: %s. Replacing the sjis string with the English string.", [englishName UTF8String]);
+#endif
+				self.sjisName = self.englishName;
+			}
+			@autoreleasepool {
+				self.memImages = [PcsxrMemoryObject imagesFromMcd:infoBlock];
+			}
+			if ([memImages count] == 0) {
+				self.memImageIndex = -1;
+			} else if ([memImages count] == 1) {
+				self.memImageIndex = 0;
+			} else {
+				self.memImageIndex = 0;
+				[[NSNotificationCenter defaultCenter] addObserverForName:memoryAnimateTimerKey object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *note) {
+					NSInteger index = memImageIndex;
+					if (++index >= [memImages count]) {
+						index = 0;
+					}
+					self.memImageIndex = index;
+				}];
+			}
+			self.memName = @(infoBlock->Name);
+			self.memID = @(infoBlock->ID);
+		}
+	}
+	return self;
+}
+
+#pragma mark - Property Synthesizers
+@synthesize englishName;
+@synthesize sjisName;
+@synthesize memImageIndex;
+- (void)setMemImageIndex:(NSInteger)theMemImageIndex
+{
+	[self willChangeValueForKey:@"memImage"];
+	memImageIndex = theMemImageIndex;
+	[self didChangeValueForKey:@"memImage"];
+}
+
+@synthesize memName;
+@synthesize memID;
+@synthesize memImages;
+@synthesize flagNameIndex;
+@synthesize blockSize;
+@synthesize startingIndex;
+
+#pragma mark Non-synthesize Properties
+- (unsigned)memIconCount
+{
+	return (unsigned)[memImages count];
+}
+
+- (NSImage*)memImage
+{
+	if (memImageIndex == -1) {
+		return [PcsxrMemoryObject blankImage];
+	}
+	return [memImages objectAtIndex:memImageIndex];
+}
+
+- (NSString*)flagName
+{
+	return [PcsxrMemoryObject memoryLabelFromFlag:flagNameIndex];
+}
+
+NS_INLINE void SetupAttrStr(NSMutableAttributedString *mutStr, NSColor *txtclr)
+{
+	NSRange wholeStrRange = NSMakeRange(0, mutStr.string.length);
+	[mutStr addAttribute:NSFontAttributeName value:[NSFont userFontOfSize:[NSFont systemFontSizeForControlSize:NSSmallControlSize]] range:wholeStrRange];
+	[mutStr addAttribute:NSForegroundColorAttributeName value:txtclr range:wholeStrRange];
+	[mutStr setAlignment:NSCenterTextAlignment range:wholeStrRange];
+}
+
+- (NSAttributedString*)attributedFlagName
+{
+	static NSAttributedString *attribMemLabelDeleted;
+	static NSAttributedString *attribMemLabelFree;
+	static NSAttributedString *attribMemLabelUsed;
+	static NSAttributedString *attribMemLabelLink;
+	static NSAttributedString *attribMemLabelEndLink;
+	
+	static dispatch_once_t attrStrSetOnceToken;
+	dispatch_once(&attrStrSetOnceToken, ^{
+		NSMutableAttributedString *tmpStr = [[NSMutableAttributedString alloc] initWithString:MemLabelFree];
+		SetupAttrStr(tmpStr, [NSColor greenColor]);
+		attribMemLabelFree = [tmpStr copy];
+		RELEASEOBJ(tmpStr);
+		
+#ifdef DEBUG
+		tmpStr = [[NSMutableAttributedString alloc] initWithString:MemLabelEndLink];
+		SetupAttrStr(tmpStr, [NSColor blueColor]);
+		attribMemLabelEndLink = [tmpStr copy];
+		RELEASEOBJ(tmpStr);
+		
+		tmpStr = [[NSMutableAttributedString alloc] initWithString:MemLabelLink];
+		SetupAttrStr(tmpStr, [NSColor blueColor]);
+		attribMemLabelLink = [tmpStr copy];
+		RELEASEOBJ(tmpStr);
+		
+		tmpStr = [[NSMutableAttributedString alloc] initWithString:MemLabelUsed];
+		SetupAttrStr(tmpStr, [NSColor controlTextColor]);
+		attribMemLabelUsed = [tmpStr copy];
+		RELEASEOBJ(tmpStr);
+#else
+		tmpStr = [[NSMutableAttributedString alloc] initWithString:@"Multi-save"];
+		SetupAttrStr(tmpStr, [NSColor blueColor]);
+		attribMemLabelEndLink = [tmpStr copy];
+		RELEASEOBJ(tmpStr);
+		
+		//tmpStr = [[NSMutableAttributedString alloc] initWithString:@"Multi-save"];
+		//SetupAttrStr(tmpStr, [NSColor blueColor]);
+		//attribMemLabelLink = [tmpStr copy];
+		//RELEASEOBJ(tmpStr);
+		attribMemLabelLink = attribMemLabelEndLink;
+		
+		//display nothing
+		attribMemLabelUsed = [[NSAttributedString alloc] initWithString:@""];
+#endif
+		
+		tmpStr = [[NSMutableAttributedString alloc] initWithString:MemLabelDeleted];
+		SetupAttrStr(tmpStr, [NSColor redColor]);
+		attribMemLabelDeleted = [tmpStr copy];
+		RELEASEOBJ(tmpStr);
+	});
+	
+	switch (flagNameIndex) {
+		default:
+		case memFlagFree:
+			return attribMemLabelFree;
+			break;
+			
+		case memFlagEndLink:
+			return attribMemLabelEndLink;
+			break;
+			
+		case memFlagLink:
+			return attribMemLabelLink;
+			break;
+			
+		case memFlagUsed:
+			return attribMemLabelUsed;
+			break;
+			
+		case memFlagDeleted:
+			return attribMemLabelDeleted;
+			break;
+	}
+}
+
+- (BOOL)isBiggerThanOne
+{
+	if (flagNameIndex == memFlagFree) {
+		//Always show the size of the free blocks
+		return YES;
+	} else {
+		return blockSize != 1;
+	}
+}
+
+#pragma mark -
+
+- (void)dealloc
+{
+	[[NSNotificationCenter defaultCenter] removeObserver:self];
+#if !__has_feature(objc_arc)
+	self.englishName = nil;
+	self.sjisName = nil;
+	self.memName = nil;
+	self.memID = nil;
+	self.memImages = nil;
+	
+	[super dealloc];
+#endif
+}
+
+- (NSString *)description
+{
+	return [NSString stringWithFormat:@"%@ (%@): Name: %@ ID: %@, type: %@ start: %i size: %i", englishName, sjisName, memName, memID, self.flagName, startingIndex, blockSize];
+}
+
+@end

pcsxr-1.9.93.tar.bz2/macosx/PcsxrPlugin.h Added

@@ -0,0 +1,46 @@
+//
+// PcsxrPlugin.h
+// Pcsxr
+//
+// Created by Gil Pedersen on Fri Oct 03 2003.
+// Copyright (c) 2003 __MyCompanyName__. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "ARCBridge.h"
+
+@interface PcsxrPlugin : NSObject {
+	void *pluginRef;
+	
+	NSString *path;
+	NSDate *modDate;
+	NSString *name;
+	NSString *fullPlugPath;
+	long version;
+	int type;
+	int active;
+}
+
+@property (readonly, copy) NSString *path;
+@property (readonly, arcstrong) NSString *name;
+
++ (NSString *)prefixForType:(int)type;
++ (NSString *)defaultKeyForType:(int)type;
++ (char **)configEntriesForType:(int)type;
++ (NSArray *)pluginsPaths;
+
+- (id)initWithPath:(NSString *)aPath;
+
+- (NSString *)displayVersion;
+- (int)type;
+- (NSUInteger)hash;
+- (NSString *)description;
+- (BOOL)hasAboutAs:(int)type;
+- (BOOL)hasConfigureAs:(int)type;
+- (long)runAs:(int)aType;
+- (long)shutdownAs:(int)aType;
+- (void)aboutAs:(int)type;
+- (void)configureAs:(int)type;
+- (BOOL)verifyOK;
+
+@end

pcsxr-1.9.93.tar.bz2/macosx/PcsxrPlugin.m Added

@@ -0,0 +1,424 @@
+//
+// PcsxrPlugin.m
+// Pcsxr
+//
+// Created by Gil Pedersen on Fri Oct 03 2003.
+// Copyright (c) 2003 __MyCompanyName__. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+#import "PcsxrPlugin.h"
+#include "psxcommon.h"
+#include "plugins.h"
+#import "ARCBridge.h"
+
+#define kPCSXRGetLibName "PSEgetLibName"
+#define kPCSXRGetLibVersion "PSEgetLibVersion"
+#define kPCSXRGetLibType "PSEgetLibType"
+
+@interface PcsxrPlugin ()
+@property (readwrite, copy) NSString *path;
+@property (readwrite, arcstrong) NSDate *modDate;
+@property (readwrite, arcstrong) NSString *name;
+@property (readwrite, arcstrong) NSString *fullPlugPath;
+@end
+
+@implementation PcsxrPlugin
+
+@synthesize path;
+@synthesize name;
+@synthesize fullPlugPath;
+@synthesize modDate;
+
++ (NSString *)prefixForType:(int)aType
+{
+	switch (aType) {
+		case PSE_LT_GPU: return @"GPU"; break;
+		case PSE_LT_CDR: return @"CDR"; break;
+		case PSE_LT_SPU: return @"SPU"; break;
+		case PSE_LT_PAD: return @"PAD"; break;
+		case PSE_LT_NET: return @"NET"; break;
+		case PSE_LT_SIO1: return @"SIO1"; break;
+	}
+	
+	return @"";
+}
+
++ (NSString *)defaultKeyForType:(int)aType
+{
+	//return @"Plugin" [PcsxrPlugin prefixForType:aType];
+	switch (aType) {
+		case PSE_LT_GPU:
+		case PSE_LT_CDR:
+		case PSE_LT_SPU:
+		case PSE_LT_PAD:
+		case PSE_LT_NET:
+		case PSE_LT_SIO1:
+			return [NSString stringWithFormat:@"Plugin%@", [self prefixForType:aType]];
+			break;
+		default:
+			return @"";
+			break;
+	}
+}
+
++ (char **)configEntriesForType:(int)aType
+{
+	static char *gpu[2] = {(char *)&Config.Gpu, NULL};
+	static char *cdr[2] = {(char *)&Config.Cdr, NULL};
+	static char *spu[2] = {(char *)&Config.Spu, NULL};
+	static char *pad[3] = {(char *)&Config.Pad1, (char *)&Config.Pad2, NULL};
+	static char *net[2] = {(char *)&Config.Net, NULL};
+	static char *sio1[2] = {(char *)&Config.Sio1, NULL};
+	
+	switch (aType) {
+		case PSE_LT_GPU: return (char **)gpu;
+		case PSE_LT_CDR: return (char **)cdr;
+		case PSE_LT_SPU: return (char **)spu;
+		case PSE_LT_PAD: return (char **)pad;
+		case PSE_LT_NET: return (char **)net;
+		case PSE_LT_SIO1: return (char **)sio1;
+	}
+	
+	return nil;
+}
+
++ (NSArray *)pluginsPaths
+{
+	static NSArray *returnArray = nil;
+	if (returnArray == nil)
+	{
+		NSURL *supportURL = [[NSFileManager defaultManager] URLForDirectory:NSApplicationSupportDirectory inDomain:NSUserDomainMask appropriateForURL:nil create:YES error:NULL];
+		NSURL *libraryURL = [[NSFileManager defaultManager] URLForDirectory:NSLibraryDirectory inDomain:NSUserDomainMask appropriateForURL:nil create:YES error:NULL];
+		NSURL *localSupportURL = [[NSFileManager defaultManager] URLForDirectory:NSApplicationSupportDirectory inDomain:NSLocalDomainMask appropriateForURL:nil create:YES error:NULL];
+		NSURL *localLibraryURL = [[NSFileManager defaultManager] URLForDirectory:NSLibraryDirectory inDomain:NSLocalDomainMask appropriateForURL:nil create:YES error:NULL];
+		
+		NSMutableArray *mutArray = [NSMutableArray arrayWithCapacity:5];
+		
+		[mutArray addObject:[[NSFileManager defaultManager] stringWithFileSystemRepresentation:Config.PluginsDir length:strlen(Config.PluginsDir)]];
+		NSURL *url = [localLibraryURL URLByAppendingPathComponent:@"Playstation Emulator Plugins"];
+		if ([url checkResourceIsReachableAndReturnError:NULL])
+			[mutArray addObject:[url path]];
+		url = [[localSupportURL URLByAppendingPathComponent:@"Pcsxr"] URLByAppendingPathComponent:@"PlugIns"];
+		if ([url checkResourceIsReachableAndReturnError:NULL])
+			[mutArray addObject:[url path]];
+		url = [libraryURL URLByAppendingPathComponent:@"Playstation Emulator Plugins"];
+		if ([url checkResourceIsReachableAndReturnError:NULL])
+			[mutArray addObject:[url path]];
+		url = [[supportURL URLByAppendingPathComponent:@"Pcsxr"] URLByAppendingPathComponent:@"PlugIns"];
+		if ([url checkResourceIsReachableAndReturnError:NULL])
+			[mutArray addObject:[url path]];
+		returnArray = [[NSArray alloc] initWithArray:mutArray];
+	}
+	return returnArray;
+}
+
+- (id)initWithPath:(NSString *)aPath
+{
+	if (!(self = [super init])) {
+		return nil;
+	}
+	
+	PSEgetLibType PSE_getLibType = NULL;
+	PSEgetLibVersion PSE_getLibVersion = NULL;
+	PSEgetLibName PSE_getLibName = NULL;
+	
+	NSFileManager *fm = [NSFileManager defaultManager];
+	
+	pluginRef = NULL;
+	name = nil;
+	self.path = aPath;
+	NSString *goodPath = nil;
+	if ([aPath isAbsolutePath]) {
+		goodPath = aPath;
+	} else {
+		long tempVers = 0;
+		for (NSString *plugDir in [PcsxrPlugin pluginsPaths])
+		{
+			NSString *fullPath = [plugDir stringByAppendingPathComponent:path];
+			if ([fm fileExistsAtPath:fullPath]) {
+				void *tempHandle = SysLoadLibrary([fullPath fileSystemRepresentation]);
+				if (tempHandle != NULL)
+				{
+					PSEgetLibVersion tempLibVersion = SysLoadSym(tempHandle, kPCSXRGetLibVersion);
+					if (SysLibError() == NULL)
+					{
+						long tempVers2 = tempLibVersion();
+						if (tempVers < tempVers2 ){
+							goodPath = fullPath;
+							tempVers = tempVers2;
+							if (![plugDir isEqualToString:[fm stringWithFileSystemRepresentation:Config.PluginsDir length:strlen(Config.PluginsDir)]]) {
+								self.path = goodPath;
+							}
+						}
+					}
+					SysCloseLibrary(tempHandle);
+				} else {
+					SysLibError();
+				}
+			}
+		}
+	}
+	
+	if (goodPath == nil) {
+		AUTORELEASEOBJNORETURN(self);
+		return nil;
+	}
+	
+	pluginRef = SysLoadLibrary([goodPath fileSystemRepresentation]);
+	if (pluginRef == NULL) {
+		SysLibError();
+		AUTORELEASEOBJNORETURN(self);
+		return nil;
+	}
+	
+	// TODO: add support for plugins with multiple functionalities???
+	PSE_getLibType = (PSEgetLibType) SysLoadSym(pluginRef, kPCSXRGetLibType);
+	if (SysLibError() != nil) {
+		if (([path rangeOfString: @"gpu" options:NSCaseInsensitiveSearch]).length != 0)
+			type = PSE_LT_GPU;
+		else if (([path rangeOfString: @"cdr" options:NSCaseInsensitiveSearch]).length != 0)
+			type = PSE_LT_CDR;
+		else if (([path rangeOfString: @"spu" options:NSCaseInsensitiveSearch]).length != 0)
+			type = PSE_LT_SPU;
+		else if (([path rangeOfString: @"pad" options:NSCaseInsensitiveSearch]).length != 0)
+			type = PSE_LT_PAD;
+		else if (([path rangeOfString: @"net" options:NSCaseInsensitiveSearch]).length != 0)
+			type = PSE_LT_NET;
+		else if (([path rangeOfString: @"sio1" options:NSCaseInsensitiveSearch]).length != 0)
+			type = PSE_LT_SIO1;
+		else {
+			AUTORELEASEOBJNORETURN(self);
+			return nil;
+		}
+	} else {
+		type = (int)PSE_getLibType();
+		if (type != PSE_LT_GPU && type != PSE_LT_CDR && type != PSE_LT_SPU && type != PSE_LT_PAD && type != PSE_LT_NET && type != PSE_LT_SIO1) {
+			AUTORELEASEOBJNORETURN(self);
+			return nil;
+		}
+	}
+	
+	PSE_getLibName = (PSEgetLibName) SysLoadSym(pluginRef, kPCSXRGetLibName);
+	if (SysLibError() == nil) {
+		self.name = @(PSE_getLibName());
+	}
+	
+	PSE_getLibVersion = (PSEgetLibVersion) SysLoadSym(pluginRef, kPCSXRGetLibVersion);
+	if (SysLibError() == nil) {
+		version = PSE_getLibVersion();
+	} else {
+		version = -1;
+	}
+	
+	// save the current modification date
+	NSDictionary *fattrs = [fm attributesOfItemAtPath:[goodPath stringByResolvingSymlinksInPath] error:NULL];
+	self.modDate = [fattrs fileModificationDate];
+	self.fullPlugPath = goodPath;
+	
+	active = 0;
+	
+	return self;
+}
+
+- (void)dealloc
+{
+	int i;
+	
+	// shutdown if we had previously been inited
+	for (i=0; i<32; i++) {
+		if (active & (1 << i)) {
+			[self shutdownAs:(1 << i)];
+		}
+	}
+	
+	if (pluginRef) {
+		SysCloseLibrary(pluginRef);
+		pluginRef = NULL;
+	}
+	
+#if !__has_feature(objc_arc)
+	self.modDate = nil;
+	self.path = nil;
+	self.name = nil;
+	self.fullPlugPath = nil;
+	
+	[super dealloc];
+#endif
+}
+
+#define PluginSymbolName(type, theName) [[PcsxrPlugin prefixForType:type] stringByAppendingString:theName]
+
+- (void)runCommand:(id)arg
+{
+	@autoreleasepool {
+		NSString *funcName = [arg objectAtIndex:0];
+		long (*func)(void);
+		
+		func = SysLoadSym(pluginRef, [funcName cStringUsingEncoding:NSASCIIStringEncoding]);
+		if (SysLibError() == nil) {
+			func();
+		} else {
+			NSBeep();
+		}
+		
+		RELEASEOBJ(arg);
+		return;
+	}
+}
+
+- (long)runAs:(int)aType
+{
+	long (*init)();
+	long (*initArg)(long arg);
+	long res = PSE_ERR_FATAL;
+	
+	if ((active & aType) == aType) {
+		return 0;
+	}
+	
+	init = initArg = SysLoadSym(pluginRef, [PluginSymbolName(aType, @"init")
+											cStringUsingEncoding:NSASCIIStringEncoding]);
+	if (SysLibError() == nil) {
+		if (aType != PSE_LT_PAD) {
+			res = init();
+		} else {
+			res = initArg(1|2);
+		}
+	}
+	
+	if (0 == res) {
+		active |= aType;
+	} else {
+		NSRunCriticalAlertPanel(NSLocalizedString(@"Plugin Initialization Failed!", nil),
+								NSLocalizedString(@"Pcsxr failed to initialize the selected %@ plugin (error=%i).\nThe plugin might not work with your system.", nil),
+								nil, nil, nil, [PcsxrPlugin prefixForType:aType], res);
+		return res;
+	}
+	
+	//Prevent a memory leak.
+	long (*shutdown)(void);
+	shutdown = SysLoadSym(pluginRef, [PluginSymbolName(aType, @"shutdown")
+									 cStringUsingEncoding:NSASCIIStringEncoding]);
+	if (SysLibError() == nil) {
+		shutdown();
+	}
+
+	return res;
+}
+
+- (long)shutdownAs:(int)aType
+{
+#if 0
+	long (*shutdown)(void);
+	
+	shutdown = SysLoadSym(pluginRef, [PluginSymbolName(aType, @"shutdown")
+									 cStringUsingEncoding:NSASCIIStringEncoding]);
+	if (SysLibError() == nil) {
+		active &= ~aType;
+		return shutdown();
+	}
+	
+	return PSE_ERR_FATAL;
+#else 
+	active &= ~aType;
+	return PSE_ERR_SUCCESS;
+#endif
+}
+
+#define PluginSymbolNameConfigure(type) PluginSymbolName(type, @"configure")
+#define PluginSymbolNameAbout(type) PluginSymbolName(type, @"about")
+
+- (BOOL)hasAboutAs:(int)aType
+{
+	SysLoadSym(pluginRef, [PluginSymbolNameAbout(aType)
+						 cStringUsingEncoding:NSASCIIStringEncoding]);
+	
+	return (SysLibError() == nil);
+}
+
+- (BOOL)hasConfigureAs:(int)aType
+{
+	SysLoadSym(pluginRef, [PluginSymbolNameConfigure(aType)
+						 cStringUsingEncoding:NSASCIIStringEncoding]);
+	
+	return (SysLibError() == nil);
+}
+
+- (void)aboutAs:(int)aType
+{
+	NSArray *arg;
+	
+	NSString *aboutSym = PluginSymbolNameAbout(aType);
+	arg = @[aboutSym, @0];
+	RETAINOBJNORETURN(arg);
+	
+	// detach a new thread
+	[NSThread detachNewThreadSelector:@selector(runCommand:) toTarget:self
+						 withObject:arg];
+	//NOTE: the runCommand releases the arg command. Probably not the best way to do it...
+	//This is not an issue with ARC (64-bit) code
+}
+
+- (void)configureAs:(int)aType
+{
+	NSArray *arg;
+	
+	NSString *configSym = PluginSymbolNameConfigure(aType);
+	arg = @[configSym, @1];
+	RETAINOBJNORETURN(arg);
+	
+	// detach a new thread
+	[NSThread detachNewThreadSelector:@selector(runCommand:) toTarget:self
+						 withObject:arg];
+	//NOTE: the runCommand releases the arg command. Probably not the best way to do it...
+	//This is not an issue with ARC (64-bit) code
+}
+
+- (NSString *)displayVersion
+{
+	if (version == -1)
+		return @"";
+	
+	return [NSString stringWithFormat:@"v%ld.%ld.%ld", version>>16,(version>>8)&0xff,version&0xff];
+}
+
+- (int)type
+{
+	return type;
+}
+
+- (NSUInteger)hash
+{
+	return [path hash];
+}
+
+- (NSString *)description
+{
+	if (name == nil)
+		return [path lastPathComponent];
+	
+	return [NSString stringWithFormat:@"%@ %@ [%@]", name, [self displayVersion], [path lastPathComponent]];
+}
+
+- (NSString*)debugDescription
+{
+	if (name == nil) {
+		return fullPlugPath;
+	}
+	return [NSString stringWithFormat:@"%@, %@ [%@]", name, [self displayVersion], fullPlugPath];
+}
+
+// the plugin will check if it's still valid and return the status
+- (BOOL)verifyOK
+{
+	// check that the file is still there with the same modification date
+	NSFileManager *dfm = [NSFileManager defaultManager];
+	if (![dfm fileExistsAtPath:fullPlugPath])
+		return NO;
+	
+	NSDictionary *fattrs = [dfm attributesOfItemAtPath:[fullPlugPath stringByResolvingSymlinksInPath] error:NULL];
+	return [[fattrs fileModificationDate] isEqualToDate:modDate];
+}
+
+@end

pcsxr-1.9.93.tar.bz2/macosx/PcsxrPluginHandler.h Added

pcsxr-1.9.93.tar.bz2/macosx/PcsxrPluginHandler.m Added

@@ -0,0 +1,93 @@
+//
+//  PcsxrPluginHandler.m
+//  Pcsxr
+//
+//  Created by Charles Betts on 12/10/11.
+//  Copyright (c) 2011 __MyCompanyName__. All rights reserved.
+//
+
+#import "PcsxrPluginHandler.h"
+#import "EmuThread.h"
+#import "ARCBridge.h"
+
+@implementation PcsxrPluginHandler
+
++ (NSArray *)supportedUTIs
+{
+	static NSArray *utisupport = nil;
+	if (utisupport == nil) {
+		utisupport = @[@"com.codeplex.pcsxr.plugin"];
+		RETAINOBJNORETURN(utisupport);
+	}
+	return utisupport;
+}
+
+- (id)initWithWindow:(NSWindow *)window
+{
+    self = [super initWithWindow:window];
+    if (self) {
+        moveOK = NO;
+    }
+    
+    return self;
+}
+
+- (id)init
+{
+	self = [self initWithWindowNibName:@"AddPluginSheet"];
+	return self;
+}
+
+- (void)windowDidLoad
+{
+    [super windowDidLoad];
+    
+    // Implement this method to handle any initialization after your window controller's window has been loaded from its nib file.
+}
+
+- (IBAction)closeAddPluginSheet:(id)sender
+{
+	if ([[sender keyEquivalent] isEqualToString:@"\r"]) {
+		moveOK = YES;
+	} else {
+		moveOK = NO;
+	}
+	[NSApp stopModal];
+}
+
+- (BOOL)handleFile:(NSString *)theFile
+{
+	if ([EmuThread active]) {
+		return NO;
+	}
+
+	if (![self window])
+		[NSBundle loadNibNamed:@"AddPluginSheet" owner:self];
+	
+	[pluginName setObjectValue:[theFile lastPathComponent]];
+	
+	[NSApp runModalForWindow:[self window]];
+	
+	[[self window] orderOut:nil];
+	if (moveOK == YES) {
+		NSURL *supportURL = [[NSFileManager defaultManager] URLForDirectory:NSApplicationSupportDirectory inDomain:NSUserDomainMask appropriateForURL:nil create:YES error:NULL];
+		NSURL *url = [[supportURL URLByAppendingPathComponent:@"Pcsxr"] URLByAppendingPathComponent:@"PlugIns"];
+
+		NSFileWrapper *wrapper = [[NSFileWrapper alloc] initWithPath:theFile];
+		NSString *dst = [[url URLByAppendingPathComponent:[wrapper filename]] path];
+		if ([wrapper writeToFile:dst atomically:NO updateFilenames:NO]) {
+			[[NSWorkspace sharedWorkspace] noteFileSystemChanged:[url path]];
+			NSRunInformationalAlertPanel(NSLocalizedString(@"Installation Succesfull", nil),
+										 NSLocalizedString(@"The installation of the specified plugin was succesfull. In order to use it, please restart the application.", nil), 
+										 nil, nil, nil);
+		} else {
+			NSRunAlertPanel(NSLocalizedString(@"Installation Failed!", nil),
+							NSLocalizedString(@"The installation of the specified plugin failed. Please try again, or make a manual install.", nil), 
+							nil, nil, nil);
+		}
+		RELEASEOBJ(wrapper);
+	}
+	return YES;
+}
+
+@end

pcsxr-1.9.92.tar.bz2/macosx/Plugin.c -> pcsxr-1.9.93.tar.bz2/macosx/Plugin.c Changed

@@ -1,4 +1,4 @@
-/* Pcsx - Pc Psx Emulator
+/* Pcsxr - Pc Psx Emulator
 * Copyright (C) 1999-2002 Pcsx Team
 *
 * This program is free software; you can redistribute it and/or modify
@@ -13,7 +13,7 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
 #import <CoreFoundation/CoreFoundation.h>
@@ -42,6 +42,13 @@
 }
 
 void PADhandleKey(int key) {
+	//TODO: get these set up properly!
+	GPU_keypressed(key);
+#ifdef ENABLE_SIO1API
+	SIO1_keypressed(key);
+#endif
+	if (Config.UseNet) NET_keypressed(key);
+
 }
 
 long PAD1__open(void) {
@@ -52,8 +59,6 @@
 	return PAD2_open(&gpuDisp);
 }
 
-void OnFile_Exit();
-
 void SignalExit(int sig) {
 	ClosePlugins();
 	OnFile_Exit();
@@ -69,30 +74,86 @@
 	}
 
 int _OpenPlugins() {
-	static char path[1024];
-	CFURLRef pathUrl;
-	int ret;
-
-	//signal(SIGINT, SignalExit);
-	//signal(SIGPIPE, SignalExit);
+	long ret;
 
 	GPU_clearDynarec(clearDynarec);
-	
-	pathUrl = CFBundleCopyResourceURL(CFBundleGetMainBundle(), CFSTR("gpuPeopsSoftX.cfg"), NULL, NULL);
-	if (pathUrl)
-		CFURLGetFileSystemRepresentation(pathUrl, true, path, 1024);
-	
+
 	ret = CDR_open();
-	if (ret < 0) { SysMessage(_("Error Opening CDR Plugin")); return -1; }
+	if (ret < 0) { SysMessage("%s", _("Error Opening CDR Plugin")); return -1; }
 	ret = SPU_open();
-	if (ret < 0) { SysMessage(_("Error Opening SPU Plugin")); return -1; }
+	if (ret < 0) { SysMessage("%s", _("Error Opening SPU Plugin")); return -1; }
 	SPU_registerCallback(SPUirq);
-	ret = GPU_open(&gpuDisp, "PCSX", /*pathUrl ? path :*/ NULL);
-	if (ret < 0) { SysMessage(_("Error Opening GPU Plugin")); return -1; }
+	ret = GPU_open(&gpuDisp, "PCSXR", NULL);
+	if (ret < 0) { SysMessage("%s", _("Error Opening GPU Plugin")); return -1; }
 	ret = PAD1_open(&gpuDisp);
-	if (ret < 0) { SysMessage(_("Error Opening PAD1 Plugin")); return -1; }
+	if (ret < 0) { SysMessage("%s", _("Error Opening PAD1 Plugin")); return -1; }
+ PAD1_registerVibration(GPU_visualVibration);
+ PAD1_registerCursor(GPU_cursor);
 	ret = PAD2_open(&gpuDisp);
-	if (ret < 0) { SysMessage(_("Error Opening PAD2 Plugin")); return -1; }
+	if (ret < 0) { SysMessage("%s", _("Error Opening PAD2 Plugin")); return -1; }
+ PAD2_registerVibration(GPU_visualVibration);
+ PAD2_registerCursor(GPU_cursor);
+#ifdef ENABLE_SIO1API
+	ret = SIO1_open(&gpuDisp);
+	if (ret < 0) { SysMessage("%s", _("Error opening SIO1 plugin!")); return -1; }
+	SIO1_registerCallback(SIO1irq);
+#endif
+
+	if (Config.UseNet && !NetOpened) {
+		netInfo info;
+		char path[MAXPATHLEN];
+
+		strcpy(info.EmuName, "PCSX " PACKAGE_VERSION);
+		strncpy(info.CdromID, CdromId, 9);
+		strncpy(info.CdromLabel, CdromLabel, 11);
+		info.psxMem = psxM;
+		info.GPU_showScreenPic = GPU_showScreenPic;
+		info.GPU_displayText = GPU_displayText;
+		info.GPU_showScreenPic = GPU_showScreenPic;
+		info.PAD_setSensitive = PAD1_setSensitive;
+		sprintf(path, "%s%s", Config.BiosDir, Config.Bios);
+		strcpy(info.BIOSpath, path);
+		strcpy(info.MCD1path, Config.Mcd1);
+		strcpy(info.MCD2path, Config.Mcd2);
+		sprintf(path, "%s%s", Config.PluginsDir, Config.Gpu);
+		strcpy(info.GPUpath, path);
+		sprintf(path, "%s%s", Config.PluginsDir, Config.Spu);
+		strcpy(info.SPUpath, path);
+		sprintf(path, "%s%s", Config.PluginsDir, Config.Cdr);
+		strcpy(info.CDRpath, path);
+		NET_setInfo(&info);
+
+		ret = NET_open(&gpuDisp);
+		if (ret < 0) {
+			if (ret == -2) {
+				// -2 is returned when something in the info
+				// changed and needs to be synced
+				char *ptr;
+
+				PARSEPATH(Config.Bios, info.BIOSpath);
+				PARSEPATH(Config.Gpu, info.GPUpath);
+				PARSEPATH(Config.Spu, info.SPUpath);
+				PARSEPATH(Config.Cdr, info.CDRpath);
+
+				strcpy(Config.Mcd1, info.MCD1path);
+				strcpy(Config.Mcd2, info.MCD2path);
+				return -2;
+			} else {
+				Config.UseNet = FALSE;
+			}
+		} else {
+
+			if (NET_queryPlayer() == 1) {
+				if (SendPcsxInfo() == -1) Config.UseNet = FALSE;
+			} else {
+				if (RecvPcsxInfo() == -1) Config.UseNet = FALSE;
+			}
+
+		}
+		NetOpened = TRUE;
+	} else if (Config.UseNet) {
+		NET_resume();
+	}
 
 	return 0;
 }
@@ -105,34 +166,46 @@
 		LoadMcds(Config.Mcd1, Config.Mcd2);
 		if (LoadPlugins() == -1) return -1;
 	}
-	return ret;	
+	return ret;
 }
 
 void ClosePlugins() {
-	int ret;
+	long ret;
 
 	//signal(SIGINT, SIG_DFL);
 	//signal(SIGPIPE, SIG_DFL);
 	ret = CDR_close();
-	if (ret < 0) { SysMessage(_("Error Closing CDR Plugin")); return; }
+	if (ret < 0) { SysMessage("%s", _("Error Closing CDR Plugin")); return; }
 	ret = SPU_close();
-	if (ret < 0) { SysMessage(_("Error Closing SPU Plugin")); return; }
+	if (ret < 0) { SysMessage("%s", _("Error Closing SPU Plugin")); return; }
 	ret = PAD1_close();
-	if (ret < 0) { SysMessage(_("Error Closing PAD1 Plugin")); return; }
+	if (ret < 0) { SysMessage("%s", _("Error Closing PAD1 Plugin")); return; }
 	ret = PAD2_close();
-	if (ret < 0) { SysMessage(_("Error Closing PAD2 Plugin")); return; }
+	if (ret < 0) { SysMessage("%s", _("Error Closing PAD2 Plugin")); return; }
 	ret = GPU_close();
-	if (ret < 0) { SysMessage(_("Error Closing GPU Plugin")); return; }
+	if (ret < 0) { SysMessage("%s", _("Error Closing GPU Plugin")); return; }
+#ifdef ENABLE_SIO1API
+	ret = SIO1_close();
+	if (ret < 0) { SysMessage("%s", _("Error closing SIO1 plugin!")); return; }
+#endif
+
+	if (Config.UseNet) {
+		NET_pause();
+	}
 }
 
 void ResetPlugins() {
-	int ret;
+	long ret;
 
 	CDR_shutdown();
 	GPU_shutdown();
 	SPU_shutdown();
 	PAD1_shutdown();
 	PAD2_shutdown();
+#ifdef ENABLE_SIO1API
+	SIO1_shutdown();
+#endif
+	if (Config.UseNet) NET_shutdown();
 
 	ret = CDR_init();
 	if (ret < 0) { SysMessage(_("CDRinit error: %d"), ret); return; }
@@ -144,7 +217,15 @@
 	if (ret < 0) { SysMessage(_("PAD1init error: %d"), ret); return; }
 	ret = PAD2_init(2);
 	if (ret < 0) { SysMessage(_("PAD2init error: %d"), ret); return; }
+#ifdef ENABLE_SIO1API
+	ret = SIO1_init();
+	if (ret < 0) { SysMessage(_("SIO1init error: %d!"), ret); return; }
+#endif
+
+	if (Config.UseNet) {
+		ret = NET_init();
+		if (ret < 0) { SysMessage(_("NETinit error: %d"), ret); return; }
+	}
 
 	NetOpened = FALSE;
 }
-

pcsxr-1.9.92.tar.bz2/macosx/PluginController.h -> pcsxr-1.9.93.tar.bz2/macosx/PluginController.h Changed

pcsxr-1.9.92.tar.bz2/macosx/PluginController.m -> pcsxr-1.9.93.tar.bz2/macosx/PluginController.m Changed

@@ -1,28 +1,35 @@
 #import "PluginController.h"
-#import "PcsxPlugin.h"
-#import "PcsxController.h"
+#import "PcsxrPlugin.h"
+#import "PcsxrController.h"
+#import "ARCBridge.h"
+
+@interface PluginController ()
+@property (arcstrong) NSArray *plugins;
+@property (arcstrong) NSString *defaultKey;
+@end
 
 @implementation PluginController
+@synthesize defaultKey;
+@synthesize plugins;
 
 - (IBAction)doAbout:(id)sender
 {
-	 PcsxPlugin *plugin = [plugins objectAtIndex:[pluginMenu indexOfSelectedItem]];
+	 PcsxrPlugin *plugin = [plugins objectAtIndex:[pluginMenu indexOfSelectedItem]];
 	 [plugin aboutAs:pluginType];
 }
 
 - (IBAction)doConfigure:(id)sender
 {
-	 PcsxPlugin *plugin = [plugins objectAtIndex:[pluginMenu indexOfSelectedItem]];
-
+	 PcsxrPlugin *plugin = [plugins objectAtIndex:[pluginMenu indexOfSelectedItem]];
 	 [plugin configureAs:pluginType];
 }
 
 - (IBAction)selectPlugin:(id)sender
 {
-	if (sender==pluginMenu) {
-		int index = [pluginMenu indexOfSelectedItem];
+	if (sender == pluginMenu) {
+		NSInteger index = [pluginMenu indexOfSelectedItem];
 		if (index != -1) {
-			PcsxPlugin *plugin = [plugins objectAtIndex:index];
+			PcsxrPlugin *plugin = [plugins objectAtIndex:index];
 
 			if (![[PluginList list] setActivePlugin:plugin forType:pluginType]) {
 				/* plugin won't initialize */
@@ -46,12 +53,11 @@
 - (void)setPluginsTo:(NSArray *)list withType:(int)type
 {
 	NSString *sel;
-	int i;
 
 	// remember the list
 	pluginType = type;
-	plugins = [list retain];
-	defaultKey = [[PcsxPlugin getDefaultKeyForType:pluginType] retain];
+	self.plugins = list;
+	self.defaultKey = [PcsxrPlugin defaultKeyForType:pluginType];
 
 	// clear the previous menu items
 	[pluginMenu removeAllItems];
@@ -60,22 +66,27 @@
 	sel = [[NSUserDefaults standardUserDefaults] stringForKey:defaultKey];
 
 	// add the menu entries
-	for (i = 0; i < [plugins count]; i++) {
-		[pluginMenu addItemWithTitle:[[plugins objectAtIndex:i] description]];
-
+	for (PcsxrPlugin *plug in plugins) {
+		NSString *description = [plug description];
+		[pluginMenu addItemWithTitle:description];
+		
 		// make sure the currently selected is set as such
-		if ([sel isEqualToString:[[plugins objectAtIndex:i] path]]) {
-			[pluginMenu selectItemAtIndex:i];
+		if ([sel isEqualToString:[plug path]]) {
+			[pluginMenu selectItemWithTitle:description];
 		}
 	}
 
 	[self selectPlugin:pluginMenu];
 }
 
+#if !__has_feature(objc_arc)
 - (void)dealloc
 {
-	if (plugins) [plugins release];
-	if (defaultKey) [defaultKey release];
+	self.plugins = nil;
+	self.defaultKey = nil;
+	
+	[super dealloc];
 }
+#endif
 
 @end

pcsxr-1.9.92.tar.bz2/macosx/PluginList.h -> pcsxr-1.9.93.tar.bz2/macosx/PluginList.h Changed

@@ -1,27 +1,28 @@
 //
 // PluginList.h
-// Pcsx
+// Pcsxr
 //
 // Created by Gil Pedersen on Sun Sep 21 2003.
 // Copyright (c) 2003 __MyCompanyName__. All rights reserved.
 //
 
 #import <Cocoa/Cocoa.h>
-#import "PcsxPlugin.h"
+#import "PcsxrPlugin.h"
 
 //extern NSMutableArray *plugins;
 
 @interface PluginList : NSObject {
- 
 @private
 NSMutableArray *pluginList;
 	 
-	 PcsxPlugin *activeGpuPlugin;
-	 PcsxPlugin *activeSpuPlugin;
-	 PcsxPlugin *activeCdrPlugin;
-	 PcsxPlugin *activePadPlugin;
+	PcsxrPlugin *activeGpuPlugin;
+	PcsxrPlugin *activeSpuPlugin;
+	PcsxrPlugin *activeCdrPlugin;
+	PcsxrPlugin *activePadPlugin;
+	PcsxrPlugin *activeNetPlugin;
+	PcsxrPlugin *activeSIO1Plugin;
 	 
-	 BOOL missingPlugins;
+	BOOL missingPlugins;
 }
 
 + (PluginList *)list;
@@ -30,7 +31,10 @@
 - (NSArray *)pluginsForType:(int)typeMask;
 - (BOOL)hasPluginAtPath:(NSString *)path;
 - (BOOL)configured;
-- (PcsxPlugin *)activePluginForType:(int)type;
-- (BOOL)setActivePlugin:(PcsxPlugin *)plugin forType:(int)type;
+- (PcsxrPlugin *)activePluginForType:(int)type;
+- (BOOL)setActivePlugin:(PcsxrPlugin *)plugin forType:(int)type;
+
+- (void)disableNetPlug;
+- (void)enableNetPlug;
 
 @end

pcsxr-1.9.92.tar.bz2/macosx/PluginList.m -> pcsxr-1.9.93.tar.bz2/macosx/PluginList.m Changed

@@ -1,6 +1,6 @@
 //
 // PluginList.m
-// Pcsx
+// Pcsxr
 //
 // Created by Gil Pedersen on Sun Sep 21 2003.
 // Copyright (c) 2003 __MyCompanyName__. All rights reserved.
@@ -8,13 +8,14 @@
 
 #import "EmuThread.h"
 #import "PluginList.h"
-#import "PcsxPlugin.h"
+#import "PcsxrPlugin.h"
 #include "psxcommon.h"
 #include "plugins.h"
+#import "ARCBridge.h"
 
 //NSMutableArray *plugins;
-static PluginList *sPluginList = nil;
-const static int typeList[4] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD};
+static PluginList __arcweak *sPluginList = nil;
+const static int typeList[] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD, PSE_LT_NET, PSE_LT_SIO1};
 
 @implementation PluginList
 
@@ -23,83 +24,23 @@
 	return sPluginList;
 }
 
-#if 0
-+ (void)loadPlugins
-{
- NSDirectoryEnumerator *dirEnum;
- NSString *pname, *dir;
- 
- // Make sure we only load the plugins once
- if (plugins != nil)
- return;
- 
- plugins = [[NSMutableArray alloc] initWithCapacity: 20];
-
- dir = [NSString stringWithCString:Config.PluginsDir];
- dirEnum = [[NSFileManager defaultManager] enumeratorAtPath:dir];
- 
- while (pname = [dirEnum nextObject]) {
- if ([[pname pathExtension] isEqualToString:@"psxplugin"] || 
- [[pname pathExtension] isEqualToString:@"so"]) {
- [dirEnum skipDescendents]; /* don't enumerate this
- directory */
- 
- PcsxPlugin *plugin = [[PcsxPlugin alloc] initWithPath:pname];
- if (plugin != nil) {
- [plugins addObject:plugin];
- }
- }
- }
-}
-
-- (id)initWithType:(int)typeMask
-{
- unsigned int i;
- 
- self = [super init];
-
- [PluginList loadPlugins];
- list = [[NSMutableArray alloc] initWithCapacity: 5];
- 
- type = typeMask;
- for (i=0; i<[plugins count]; i++) {
- PcsxPlugin *plugin = [plugins objectAtIndex:i];
- if ([plugin getType] == type) {
- [list addObject:plugin];
- }
- }
- 
- return self;
-}
-
-- (int)numberOfItems
-{
- return [list count];
-}
-
-- (id)objectAtIndex:(unsigned)index
-{
-	return [list objectAtIndex:index];
-}
-#endif
-
-
-
 - (id)init
 {
-	int i;
+	NSUInteger i;
 	
 	if (!(self = [super init]))
+	{
 		return nil;
+	}
 	
 	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
 	pluginList = [[NSMutableArray alloc] initWithCapacity:20];
 
-	activeGpuPlugin = activeSpuPlugin = activeCdrPlugin = activePadPlugin = nil;
+	activeGpuPlugin = activeSpuPlugin = activeCdrPlugin = activePadPlugin = activeNetPlugin = activeSIO1Plugin = nil;
 	
 	missingPlugins = NO;
-	for (i=0; i<sizeof(*typeList); i++) {
-		NSString *path = [defaults stringForKey:[PcsxPlugin getDefaultKeyForType:typeList[i]]];
+	for (i = 0; i < sizeof(typeList) / sizeof(typeList[0]); i++) {
+		NSString *path = [defaults stringForKey:[PcsxrPlugin defaultKeyForType:typeList[i]]];
 		if (nil == path) {
 			missingPlugins = YES;
 			continue;
@@ -108,17 +49,20 @@
 			continue;
 		
 		if (![self hasPluginAtPath:path]) {
-			PcsxPlugin *plugin = [[PcsxPlugin alloc] initWithPath:path];
-			if (plugin) {
-				[pluginList addObject:plugin];
-				if (![self setActivePlugin:plugin forType:typeList[i]])
+			@autoreleasepool {
+				PcsxrPlugin *plugin = [[PcsxrPlugin alloc] initWithPath:path];
+				if (plugin) {
+					[pluginList addObject:plugin];
+					if (![self setActivePlugin:plugin forType:typeList[i]])
+						missingPlugins = YES;
+					RELEASEOBJ(plugin);
+				} else {
 					missingPlugins = YES;
-			} else {
-				missingPlugins = YES;
+				}
 			}
 		}
 	}
-	
+		
 	if (missingPlugins) {
 		[self refreshPlugins];
 	}
@@ -128,48 +72,57 @@
 	return self;
 }
 
+#if !__has_feature(objc_arc)
 - (void)dealloc
 {
+	if (sPluginList == self)
+		sPluginList = nil;
+
 	[activeGpuPlugin release];
 	[activeSpuPlugin release];
 	[activeCdrPlugin release];
 	[activePadPlugin release];
+	[activeNetPlugin release];
+	[activeSIO1Plugin release];
 	
 	[pluginList release];
 	
-	if (sPluginList == self)
-		sPluginList = nil;
-	
 	[super dealloc];
 }
+#endif
 
 - (void)refreshPlugins
 {
 	NSDirectoryEnumerator *dirEnum;
-	NSString *pname, *dir;
-	int i;
+	NSString *pname;
+	NSUInteger i;
 	
 	// verify that the ones that are in list still works
-	for (i=0; i<[pluginList count]; i++) {
+	for (i=0; i < [pluginList count]; i++) {
 		if (![[pluginList objectAtIndex:i] verifyOK]) {
 			[pluginList removeObjectAtIndex:i]; i--;
 		}
 	}
 	
-	// look for new ones in the plugin directory
-	dir = [NSString stringWithCString:Config.PluginsDir];
-	dirEnum = [[NSFileManager defaultManager] enumeratorAtPath:dir];
-	
-	while (pname = [dirEnum nextObject]) {
-		if ([[pname pathExtension] isEqualToString:@"psxplugin"] || 
-			[[pname pathExtension] isEqualToString:@"so"]) {
-			[dirEnum skipDescendents]; /* don't enumerate this
-														directory */
-			
-			if (![self hasPluginAtPath:pname]) {
-				PcsxPlugin *plugin = [[PcsxPlugin alloc] initWithPath:pname];
-				if (plugin != nil) {
-					[pluginList addObject:plugin];
+	for (NSString *plugDir in [PcsxrPlugin pluginsPaths])
+	{
+		// look for new ones in the plugin directory
+		dirEnum = [[NSFileManager defaultManager] enumeratorAtPath:plugDir];
+		
+		while ((pname = [dirEnum nextObject])) {
+			if ([[pname pathExtension] isEqualToString:@"psxplugin"] || 
+				[[pname pathExtension] isEqualToString:@"so"]) {
+				[dirEnum skipDescendents]; /* don't enumerate this
+											directory */
+				
+				if (![self hasPluginAtPath:pname]) {
+					@autoreleasepool {
+						PcsxrPlugin *plugin = [[PcsxrPlugin alloc] initWithPath:pname];
+						if (plugin != nil) {
+							[pluginList addObject:plugin];
+							RELEASEOBJ(plugin);
+						}
+					}
 				}
 			}
 		}
@@ -177,13 +130,13 @@
 	
 	// check the we have the needed plugins
 	missingPlugins = NO;
-	for (i=0; i<sizeof(*typeList); i++) {
-		PcsxPlugin *plugin = [self activePluginForType:typeList[i]];
+	for (i=0; i < 4 /*sizeof(*typeList)*/; i++) {
+		PcsxrPlugin *plugin = [self activePluginForType:typeList[i]];
 		if (nil == plugin) {
 			NSArray *list = [self pluginsForType:typeList[i]];
-			int j;
+			NSUInteger j;
 			
-			for (j=0; j<[list count]; j++) {
+			for (j=0; j < [list count]; j++) {
 				if ([self setActivePlugin:[list objectAtIndex:j] forType:typeList[i]])
 					break;
 			}
@@ -196,16 +149,13 @@
 - (NSArray *)pluginsForType:(int)typeMask
 {
 	NSMutableArray *types = [NSMutableArray array];
-	int i;
 	
-	for (i=0; i<[pluginList count]; i++) {
-		PcsxPlugin *plugin = [pluginList objectAtIndex:i];
-		
-		if ([plugin getType] & typeMask) {
+	for (PcsxrPlugin *plugin in pluginList) {
+		if ([plugin type] & typeMask) {
 			[types addObject:plugin];
 		}
 	}
-	
+		
 	return types;
 }
 
@@ -214,12 +164,11 @@
 	if (nil == path)
 		return NO;
 	
-	int i;
-	for (i=0; i<[pluginList count]; i++) {
-		if ([[[pluginList objectAtIndex:i] path] isEqualToString:path])
+	for (PcsxrPlugin *plugin in pluginList) {
+		if ([[plugin path] isEqualToString:path])
 			return YES;
 	}
-	
+		
 	return NO;
 }
 
@@ -233,43 +182,48 @@
 {
 	BOOL bad = NO;
 	
-	if ([activeGpuPlugin initAs:PSE_LT_GPU] != 0) bad = YES;
-	if ([activeSpuPlugin initAs:PSE_LT_SPU] != 0) bad = YES;
-	if ([activeCdrPlugin initAs:PSE_LT_CDR] != 0) bad = YES;
-	if ([activePadPlugin initAs:PSE_LT_PAD] != 0) bad = YES;
+	if ([activeGpuPlugin runAs:PSE_LT_GPU] != 0) bad = YES;
+	if ([activeSpuPlugin runAs:PSE_LT_SPU] != 0) bad = YES;
+	if ([activeCdrPlugin runAs:PSE_LT_CDR] != 0) bad = YES;
+	if ([activePadPlugin runAs:PSE_LT_PAD] != 0) bad = YES;
+	if ([activeNetPlugin runAs:PSE_LT_NET] != 0) bad = YES;
+	if ([activeSIO1Plugin runAs:PSE_LT_SIO1] != 0) bad = YES;
 	
 	return !bad;
 }
 
-- (PcsxPlugin *)activePluginForType:(int)type
+- (PcsxrPlugin *)activePluginForType:(int)type
 {
 	switch (type) {
-		case PSE_LT_GPU: return activeGpuPlugin;
-		case PSE_LT_CDR: return activeCdrPlugin;
-		case PSE_LT_SPU: return activeSpuPlugin;
-		case PSE_LT_PAD: return activePadPlugin;
-//		case PSE_LT_NET: return activeNetPlugin;
+		case PSE_LT_GPU: return activeGpuPlugin; break;
+		case PSE_LT_CDR: return activeCdrPlugin; break;
+		case PSE_LT_SPU: return activeSpuPlugin; break;
+		case PSE_LT_PAD: return activePadPlugin; break;
+		case PSE_LT_NET: return activeNetPlugin; break;
+		case PSE_LT_SIO1: return activeSIO1Plugin; break;
 	}
 	
 	return nil;
 }
 
-- (BOOL)setActivePlugin:(PcsxPlugin *)plugin forType:(int)type
+- (BOOL)setActivePlugin:(PcsxrPlugin *)plugin forType:(int)type
 {
-	PcsxPlugin **pluginPtr;
+	PcsxrPlugin *pluginPtr = nil;
+	
 	switch (type) {
-		case PSE_LT_GPU: pluginPtr = &activeGpuPlugin; break;
-		case PSE_LT_CDR: pluginPtr = &activeCdrPlugin; break;
-		case PSE_LT_SPU: pluginPtr = &activeSpuPlugin; break;
-		case PSE_LT_PAD: pluginPtr = &activePadPlugin; break;
-//		case PSE_LT_NET: pluginPtr = &activeNetPlugin; break;
-		default: return NO;
+		case PSE_LT_SIO1:
+		case PSE_LT_GPU:
+		case PSE_LT_CDR:
+		case PSE_LT_SPU:
+		case PSE_LT_PAD:
+		case PSE_LT_NET: pluginPtr = [self activePluginForType:type]; break;
+		default: return NO; break;
 	}
-	
-	if (plugin == *pluginPtr)
+	if (plugin == pluginPtr) {
 		return YES;
-	
-	BOOL active = (*pluginPtr) && [EmuThread active];
+	}
+
+	BOOL active = pluginPtr && [EmuThread active];
 	BOOL wasPaused = NO;
 	if (active) {
 		// TODO: temporary freeze?
@@ -277,35 +231,52 @@
 		ClosePlugins();
 		ReleasePlugins();
 	}
-	
+
 	// stop the old plugin and start the new one
-	if (*pluginPtr) {
-		[*pluginPtr shutdownAs:type];
-		
-		[*pluginPtr release];
+	if (pluginPtr) {
+		[pluginPtr shutdownAs:type];
+		//NOTE: We can ignore Clang's "Incorrect Decrement" here
+		RELEASEOBJ(pluginPtr);
 	}
-	*pluginPtr = [plugin retain];
-	if (*pluginPtr) {
-		if ([*pluginPtr initAs:type] != 0) {
-			[*pluginPtr release];
-			*pluginPtr = nil;
-		}
+	
+	if ([plugin runAs:type] != 0) {
+		plugin = nil;
+	}
+		switch (type) {
+			case PSE_LT_GPU:
+				activeGpuPlugin = RETAINOBJ(plugin);
+				break;
+			case PSE_LT_CDR:
+				activeCdrPlugin = RETAINOBJ(plugin);
+				break;
+			case PSE_LT_SPU:
+				activeSpuPlugin = RETAINOBJ(plugin);
+				break;
+			case PSE_LT_PAD:
+				activePadPlugin = RETAINOBJ(plugin);
+				break;
+			case PSE_LT_NET:
+				activeNetPlugin = RETAINOBJ(plugin);
+				break;
+			case PSE_LT_SIO1:
+				activeSIO1Plugin = RETAINOBJ(plugin);
+				break;
 	}
 	
 	// write path to the correct config entry
 	const char *str;
-	if (*pluginPtr != nil) {
+	if (plugin != nil) {
 		str = [[plugin path] fileSystemRepresentation];
-		if (str == nil) {
+		if (str == NULL) {
 			str = "Invalid Plugin";
 		}
 	} else {
 		str = "Invalid Plugin";
 	}
 	
-	char **dst = [PcsxPlugin getConfigEntriesForType:type];
+	char **dst = [PcsxrPlugin configEntriesForType:type];
 	while (*dst) {
-		strncpy(*dst, str, 255);
+		strlcpy(*dst, str, MAXPATHLEN);
 		dst++;
 	}
 	
@@ -318,7 +289,34 @@
 		}
 	}
 	
-	return *pluginPtr != nil;
+	return plugin != nil;
+}
+
+- (void)disableNetPlug
+{
+	char **dst = [PcsxrPlugin configEntriesForType:PSE_LT_NET];
+	while (*dst) {
+		strcpy(*dst, "Disabled");
+		dst++;
+	}
+}
+
+- (void)enableNetPlug
+{
+	PcsxrPlugin *netPlug = [self activePluginForType:PSE_LT_NET];
+	
+	const char *str = NULL;
+	if (netPlug) {
+		str = [[netPlug path] fileSystemRepresentation];
+	}
+	if (str) {
+		char **dst = [PcsxrPlugin configEntriesForType:PSE_LT_NET];
+		while (*dst) {
+			strlcpy(*dst, str, MAXPATHLEN);
+			dst++;
+		}
+	}
+	
 }
 
 @end

pcsxr-1.9.93.tar.bz2/macosx/RecentItemsMenu.h Added

pcsxr-1.9.93.tar.bz2/macosx/RecentItemsMenu.m Added

@@ -0,0 +1,117 @@
+//
+//  RecentItemsMenu.m
+//  Pcsxr
+//
+//  Created by Nicolas Pepin-Perreault on 12-12-16.
+//
+//
+
+#import "RecentItemsMenu.h"
+#import "PcsxrController.h"
+#import "ARCBridge.h"
+
+@implementation RecentItemsMenu
+
+// Initialization
+- (void)awakeFromNib
+{
+    [self setAutoenablesItems:YES];
+    
+    // Populate the menu
+    NSArray* recentDocuments = [[NSDocumentController sharedDocumentController] recentDocumentURLs];
+    NSInteger index = 0;
+    for (NSURL* url in recentDocuments) {
+		NSMenuItem *tempItem = [self newMenuItem:url];
+        [self addMenuItem:tempItem atIndex:index];
+		RELEASEOBJ(tempItem);
+        index++;
+    }
+}
+
+- (void)addRecentItem:(NSURL*)documentURL
+{
+    [[NSDocumentController sharedDocumentController] noteNewRecentDocumentURL:documentURL];
+    
+    NSMenuItem* item = RETAINOBJ([self findMenuItemByURL:documentURL]);
+    if (item != nil) {
+        [self removeItem:item];
+        [self insertItem:item atIndex:0];
+		RELEASEOBJ(item);
+    } else {
+		NSMenuItem *newitem = [self newMenuItem:documentURL];
+        [self addMenuItem:newitem];
+		RELEASEOBJ(newitem);
+    }
+}
+
+- (void)addMenuItem:(NSMenuItem*)item
+{
+    [self addMenuItem:item atIndex:0];
+    
+    // Prevent menu from overflowing; the -2 accounts for the "Clear..." and the separator items
+    NSInteger maxNumItems = [[NSDocumentController sharedDocumentController] maximumRecentDocumentCount];
+    if (([self numberOfItems] - 2) > maxNumItems) {
+        [self removeItemAtIndex:maxNumItems];
+    }
+}
+
+- (NSMenuItem*)findMenuItemByURL:(NSURL*)url
+{
+    for(NSMenuItem* item in [self itemArray]) {
+        if([[item representedObject] isEqual:url]) {
+            return item;
+        }
+    }
+    
+    return nil;
+}
+
+- (void)addMenuItem:(NSMenuItem*)item atIndex:(NSInteger)index
+{
+    [self insertItem:item atIndex:index]; // insert at the top
+}
+
+- (NSMenuItem*)newMenuItem:(NSURL*)documentURL
+{
+    NSString *lastName = nil;
+	[documentURL getResourceValue:&lastName forKey:NSURLLocalizedNameKey error:NULL];
+	if (!lastName) {
+		lastName = [documentURL lastPathComponent];
+	}
+	
+	NSMenuItem *newItem = [[NSMenuItem alloc] initWithTitle:lastName action:@selector(openRecentItem:) keyEquivalent:@""];
+    [newItem setRepresentedObject:documentURL];
+    [newItem setTarget:self];
+    
+    return newItem;
+}
+
+- (void)openRecentItem:(NSMenuItem*)sender
+{
+    NSURL* url = [sender representedObject];
+    [self addRecentItem:url];
+    [pcsxr runURL:url];
+}
+
+- (IBAction)clearRecentDocuments:(id)sender
+{
+    [self removeDocumentItems];
+    [[NSDocumentController sharedDocumentController] clearRecentDocuments:sender];
+}
+
+// Document items are menu items with tag 0
+- (void)removeDocumentItems
+{
+	NSMutableArray *removeItemsArray = [[NSMutableArray alloc] initWithCapacity:10];
+	for (NSMenuItem* item in [self itemArray]) {
+		if([item tag] == 0) {
+			[removeItemsArray addObject:item];
+		}
+	}
+	for (NSMenuItem *item in removeItemsArray) {
+		[self removeItem:item];
+	}
+	RELEASEOBJ(removeItemsArray);
+}
+
+@end

pcsxr-1.9.92.tar.bz2/macosx/config.h -> pcsxr-1.9.93.tar.bz2/macosx/config.h Changed

pcsxr-1.9.93.tar.bz2/macosx/hotkeys.h Added

pcsxr-1.9.93.tar.bz2/macosx/hotkeys.m Added

@@ -0,0 +1,135 @@
+//
+// hotkeys.m
+// Pcsxr
+//
+// Created by Nicolas Pepin-Perreault on 12-12-12.
+//
+//
+
+#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
+#import "hotkeys.h"
+#import "EmuThread.h"
+#include "plugins.h"
+#include "ExtendedKeys.h"
+#import "PcsxrController.h"
+#import "ARCBridge.h"
+
+#define HK_MAX_STATE 10
+static id monitor;
+static id gpuMonitor;
+static int currentState = 0;
+static NSMutableDictionary *hotkeys = nil;
+enum {
+ HK_FAST_FORWARD,
+ HK_SAVE_STATE,
+ HK_LOAD_STATE,
+ HK_NEXT_STATE,
+ HK_PREV_STATE,
+ HK_FRAME_LIMIT
+};
+
+void nextState() {
+ currentState++;
+ if(currentState == HK_MAX_STATE) {
+ currentState = 0;
+ }
+}
+
+void prevState() {
+ currentState--;
+ if(currentState < 0) {
+ currentState = HK_MAX_STATE-1;
+ }
+}
+
+BOOL handleHotkey(NSString* keyCode) {
+ if([EmuThread active]) { // Don't catch hotkeys if there is no emulation
+ NSNumber *ident = [hotkeys objectForKey:keyCode];
+
+ if(ident != nil) {
+ switch([ident intValue]) {
+ case HK_FAST_FORWARD:
+ // We ignore FastForward requests if the emulation is paused
+ if(![EmuThread isPaused]) {
+ GPU_keypressed(GPU_FAST_FORWARD);
+ }
+ break;
+ case HK_FRAME_LIMIT:
+ // Ignore FrameLimit requests if paused
+ if(![EmuThread isPaused]) {
+ GPU_keypressed(GPU_FRAME_LIMIT);
+ }
+ break;
+ case HK_SAVE_STATE:
+ [PcsxrController saveState:currentState];
+ break;
+ case HK_LOAD_STATE:
+ [PcsxrController loadState:currentState];
+ break;
+ case HK_NEXT_STATE:
+ nextState();
+ GPU_displayText((char*)[[NSString stringWithFormat:@"State Slot: %d", currentState] UTF8String]);
+ break;
+ case HK_PREV_STATE:
+ prevState();
+ GPU_displayText((char*)[[NSString stringWithFormat:@"State Slot: %d", currentState] UTF8String]);
+ break;
+ default:
+ NSLog(@"Invalid hotkey identifier %i.", [ident intValue]);
+ }
+ 
+ return YES;
+ }
+ }
+ 
+ return NO;
+}
+
+void setupHotkey(int hk, NSString *label, NSDictionary *binding) {
+	if(binding != nil)
+		[hotkeys setObject:@(hk) forKey:[binding objectForKey:@"keyCode"]];
+}
+
+void setupHotkeys() {
+ NSDictionary *bindings = [[NSUserDefaults standardUserDefaults] objectForKey:@"HotkeyBindings"];
+ hotkeys = [[NSMutableDictionary alloc] initWithCapacity:[bindings count]];
+ 
+ setupHotkey(HK_FAST_FORWARD, @"FastForward", [bindings objectForKey:@"FastForward"]);
+ setupHotkey(HK_SAVE_STATE, @"SaveState", [bindings objectForKey:@"SaveState"]);
+ setupHotkey(HK_LOAD_STATE, @"LoadState", [bindings objectForKey:@"LoadState"]);
+ setupHotkey(HK_NEXT_STATE, @"NextState", [bindings objectForKey:@"NextState"]);
+ setupHotkey(HK_PREV_STATE, @"PrevState", [bindings objectForKey:@"PrevState"]);
+ setupHotkey(HK_FRAME_LIMIT, @"FrameLimit", [bindings objectForKey:@"FrameLimit"]);
+ 
+ currentState = 0;
+}
+
+void attachHotkeys() {
+ // Configurable hotkeys
+ NSEvent* (^handler)(NSEvent*) = ^(NSEvent *event) {
+ if(handleHotkey([NSString stringWithFormat:@"%d", [event keyCode]])) {
+ return (NSEvent*)nil; // handled
+ }
+ 
+ // Not handled
+ return event;
+ };
+ setupHotkeys();
+ monitor = [NSEvent addLocalMonitorForEventsMatchingMask:NSKeyUpMask handler:handler];
+ 
+ // GPU key presses
+ NSEvent* (^gpuKeypress)(NSEvent*) = ^(NSEvent *event) {
+ GPU_keypressed([event keyCode]);
+ return (NSEvent*)nil;
+ };
+ gpuMonitor = [NSEvent addLocalMonitorForEventsMatchingMask:(NSKeyUpMask | NSControlKeyMask) handler:gpuKeypress];
+}
+
+void detachHotkeys() {
+	RELEASEOBJ(hotkeys); hotkeys = nil;
+ [NSEvent removeMonitor:monitor];
+ [NSEvent removeMonitor:gpuMonitor];
+ monitor = nil;
+ gpuMonitor = nil;
+}

pcsxr-1.9.93.tar.bz2/macosx/icons/PCSXR.icns Added

pcsxr-1.9.93.tar.bz2/macosx/icons/pcsxrfreeze.icns Changed

pcsxr-1.9.93.tar.bz2/macosx/icons/pcsxrmemcard.icns Changed

pcsxr-1.9.92.tar.bz2/macosx/main.m -> pcsxr-1.9.93.tar.bz2/macosx/main.m Changed

@@ -6,23 +6,39 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import <Carbon/Carbon.h>
 #import "EmuThread.h"
+#import "PcsxrController.h"
+#import "ConfigurationController.h"
 #include <dlfcn.h>
 //#import <sys/param.h>
 #import <unistd.h>
 #include "psxcommon.h"
 #include "sio.h"
+#include <IOKit/pwr_mgt/IOPMLib.h>
+#import "hotkeys.h"
+#import "ARCBridge.h"
+
+static inline void RunOnMainThreadSync(dispatch_block_t block)
+{
+	if ([NSThread isMainThread]) {
+		block();
+	} else {
+		dispatch_sync(dispatch_get_main_queue(), block);
+	}
+}
 
 static BOOL sysInited = NO;
 //#define EMU_LOG
+static IOPMAssertionID powerAssertion = kIOPMNullAssertionID;
+
+void PADhandleKey(int key);
 
 int main(int argc, const char *argv[]) {
 if ( argc >= 2 && strncmp (argv[1], "-psn", 4) == 0 ) {
 char parentdir[MAXPATHLEN];
 char *c;
 
- strncpy ( parentdir, argv[0], sizeof(parentdir) );
+ strlcpy ( parentdir, argv[0], sizeof(parentdir) );
 c = (char*) parentdir;
 
 while (*c != '\0') /* go to end */
@@ -35,7 +51,15 @@
 
 assert ( chdir (parentdir) == 0 ); /* chdir to the binary app's parent */
 assert ( chdir ("../../../") == 0 ); /* chdir to the .app's parent */
- }
+ } else {
+		for (int i = 1; i < argc; i++) {
+			//All the other option will be handled in the app delegate's awakeFromNib
+			if (!strcasecmp("--help", argv[i])) {
+				fprintf(stdout, "%s\n", argv[0]);
+				ShowHelpAndExit(stdout, EXIT_SUCCESS);
+			}
+		}
+	}
 
 strcpy(Config.BiosDir, "Bios/");
 strcpy(Config.PatchesDir, "Patches/");
@@ -51,67 +75,103 @@
 	if (!sysInited) {
 #ifdef EMU_LOG
 #ifndef LOG_STDOUT
-		emuLog = fopen("emuLog.txt","wb");
+		NSFileManager *manager = [NSFileManager defaultManager];
+		NSURL *supportURL = [manager URLForDirectory:NSLibraryDirectory inDomain:NSUserDomainMask appropriateForURL:nil create:YES error:NULL];
+		NSURL *logFolderURL = [supportURL URLByAppendingPathComponent:@"Logs/PCSXR"];
+		if (![logFolderURL checkResourceIsReachableAndReturnError:NULL])
+			[manager createDirectoryAtPath:[logFolderURL path] withIntermediateDirectories:YES attributes:nil error:NULL];
+		//We use the log extension so that OS X's console app can open it by default.
+		NSURL *logFileURL = [logFolderURL URLByAppendingPathComponent:@"emuLog.log"];
+		
+		emuLog = fopen([[logFileURL path] fileSystemRepresentation],"wb");
 #else
 		emuLog = stdout;
 #endif
 		setvbuf(emuLog, NULL, _IONBF, 0);
 #endif
-
+		
 		if (EmuInit() != 0)
 			return -1;
-
+		
 		sysInited = YES;
 	}
-
+	
 	if (LoadPlugins() == -1) {
 		return -1;
 	}
-
+	
 	LoadMcds(Config.Mcd1, Config.Mcd2);
-
+	
+	IOReturn success = IOPMAssertionCreateWithName(kIOPMAssertionTypeNoDisplaySleep, kIOPMAssertionLevelOn, CFSTR("PSX Emu Running"), &powerAssertion);
+	if (success != kIOReturnSuccess) {
+		NSLog(@"Unable to stop sleep, error code %d", success);
+	}
+	
+	attachHotkeys();
+	
 	return 0;
 }
 
 void SysReset() {
- [EmuThread resetNow];
- //EmuReset();
+	[EmuThread resetNow];
+	//EmuReset();
 }
 
-void SysPrintf(const char *fmt, ...) {
- va_list list;
- char msg[512];
-
- va_start(list, fmt);
- vsprintf(msg, fmt, list);
- va_end(list);
+#ifdef EMU_LOG
+#ifndef LOG_STDOUT
+static NSDateFormatter* debugDateFormatter()
+{
+	static NSDateFormatter* theFormatter = nil;
+	if (theFormatter == nil) {
+		theFormatter = [[NSDateFormatter alloc] init];
+		[theFormatter setDateFormat:@"yyyy-MM-dd HH:mm:ss:SSS"];
+	}
+	return theFormatter;
+}
+#endif
+#endif
 
- if (Config.PsxOut) printf ("%s", msg);
+void SysPrintf(const char *fmt, ...) {
+	va_list list;
+	char *msg = calloc(sizeof(char), 512);
+	
+	va_start(list, fmt);
+	vsnprintf(msg, 512, fmt, list);
+	va_end(list);
+		
+	RunOnMainThreadSync(^{
+		if (Config.PsxOut) NSLog (@"%s", msg);
 #ifdef EMU_LOG
 #ifndef LOG_STDOUT
- fprintf(emuLog, "%s", msg);
+		if (emuLog) fprintf(emuLog, "%s %s: %s",[[debugDateFormatter() stringFromDate:[NSDate date]] UTF8String],
+							[[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleName"] UTF8String], msg);
 #endif
 #endif
+	});
+	free(msg);
 }
 
 void SysMessage(const char *fmt, ...) {
 	va_list list;
-	char msg[512];
-
-	NSString *locFmtString = NSLocalizedString([NSString stringWithCString:fmt], nil);
-
+	
+	NSString *locFmtString = NSLocalizedString(@(fmt), nil);
+	
 	va_start(list, fmt);
-	vsprintf(msg, [locFmtString lossyCString], list);
+	NSString *msg = [[NSString alloc] initWithFormat:locFmtString arguments:list];
 	va_end(list);
-
-	NSRunAlertPanel(NSLocalizedString(@"Error!", nil),
-		[NSString stringWithCString:msg], 
-		nil, nil, nil);
+	
+	NSDictionary *userInfo = [NSDictionary dictionaryWithObject:msg forKey:NSLocalizedFailureReasonErrorKey];
+	RELEASEOBJ(msg);
+	
+	RunOnMainThreadSync(^{
+		[NSApp presentError:[NSError errorWithDomain:@"Unknown Domain" code:-1 userInfo:userInfo]];
+	});
 }
 
 void *SysLoadLibrary(const char *lib) {
-	NSBundle *bundle = [NSBundle bundleWithPath:[NSString stringWithCString:lib]];
+	NSBundle *bundle = [[NSBundle alloc] initWithPath:[[NSFileManager defaultManager] stringWithFileSystemRepresentation:lib length:strlen(lib)]];
 	if (bundle != nil) {
+		AUTORELEASEOBJNORETURN(bundle);
 		return dlopen([[bundle executablePath] fileSystemRepresentation], RTLD_LAZY /*RTLD_NOW*/);
 	}
 	return dlopen(lib, RTLD_LAZY);
@@ -122,7 +182,15 @@
 }
 
 const char *SysLibError() {
+#ifdef DEBUG
+	const char *theErr = dlerror();
+	if (theErr) {
+		NSLog(@"Error loading binary: %s.", theErr);
+	}
+	return theErr;
+#else
 	return dlerror();
+#endif
 }
 
 void SysCloseLibrary(void *lib) {
@@ -131,26 +199,59 @@
 
 // Called periodically from the emu thread
 void SysUpdate() {
-	UpdateSystemActivity(UsrActivity);
-
+#if 0
+	PADhandleKey(PAD1_keypressed() & 0xffffffff);
+	PADhandleKey(PAD2_keypressed() & 0xffffffff);
+#else
+	PAD1_keypressed();
+	PAD2_keypressed();
+#endif
 	[emuThread handleEvents];
 }
 
 // Returns to the Gui
 void SysRunGui() {
+	if (powerAssertion != kIOPMNullAssertionID) {
+		IOPMAssertionRelease(powerAssertion);
+		powerAssertion = kIOPMNullAssertionID;
+	}
 }
 
 // Close mem and plugins
 void SysClose() {
- EmuShutdown();
- ReleasePlugins();
-
- if (emuLog != NULL) fclose(emuLog);
-
- sysInited = NO;
+	EmuShutdown();
+	//ReleasePlugins();
+	
+	if (powerAssertion != kIOPMNullAssertionID) {
+		IOPMAssertionRelease(powerAssertion);
+		powerAssertion = kIOPMNullAssertionID;
+	}
+	
+	if (emuLog != NULL) {
+		fclose(emuLog);
+		emuLog = NULL;
+	}
+	
+	sysInited = NO;
+	detachHotkeys();
+	
+	if (((PcsxrController *)[NSApp delegate]).endAtEmuClose) {
+		[NSApp stop:nil];
+	}
+	
+	//Tell the memory card manager that the memory cards changed.
+	//The number three tells the mem card manager to update both cards 1 and 2.
+	[[NSNotificationCenter defaultCenter] postNotificationName:memChangeNotifier object:nil userInfo:[NSDictionary dictionaryWithObject:@3 forKey:memCardChangeNumberKey]];
 }
 
 void OnFile_Exit() {
 SysClose();
- exit(0);
+	[NSApp stop:nil];
+}
+
+char* Pcsxr_locale_text(char* toloc){
+	NSBundle *mainBundle = [NSBundle mainBundle];
+	NSString *origString = @(toloc), *transString = nil;
+	transString = [mainBundle localizedStringForKey:origString value:@"" table:nil];
+	return (char*)[transString UTF8String];
 }

pcsxr-1.9.93.tar.bz2/macosx/plugins/Bladesio1 Added

pcsxr-1.9.93.tar.bz2/macosx/plugins/Bladesio1/English.lproj Added

pcsxr-1.9.93.tar.bz2/macosx/plugins/Bladesio1/English.lproj/Bladesio1PluginConfig.xib Added

@@ -0,0 +1,1693 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
+	<data>
+		<int key="IBDocument.SystemTarget">1070</int>
+		<string key="IBDocument.SystemVersion">12E55</string>
+		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
+		<string key="IBDocument.AppKitVersion">1187.39</string>
+		<string key="IBDocument.HIToolboxVersion">626.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			<string key="NS.object.0">3084</string>
+		</object>
+		<array key="IBDocument.IntegratedClassDependencies">
+			<string>IBNSLayoutConstraint</string>
+			<string>NSBox</string>
+			<string>NSButton</string>
+			<string>NSButtonCell</string>
+			<string>NSCustomObject</string>
+			<string>NSMenu</string>
+			<string>NSMenuItem</string>
+			<string>NSNumberFormatter</string>
+			<string>NSPopUpButton</string>
+			<string>NSPopUpButtonCell</string>
+			<string>NSTextField</string>
+			<string>NSTextFieldCell</string>
+			<string>NSView</string>
+			<string>NSWindowTemplate</string>
+		</array>
+		<array key="IBDocument.PluginDependencies">
+			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+		</array>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1058953981">
+			<object class="NSCustomObject" id="509300364">
+				<string key="NSClassName">Bladesio1PluginConfigController</string>
+			</object>
+			<object class="NSCustomObject" id="141927618">
+				<string key="NSClassName">FirstResponder</string>
+			</object>
+			<object class="NSCustomObject" id="44201914">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSWindowTemplate" id="151678379">
+				<int key="NSWindowStyleMask">1</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{131, 362}, {315, 203}}</string>
+				<int key="NSWTFlags">1886912512</int>
+				<string key="NSWindowTitle">BladeSIO1 Configuration</string>
+				<string key="NSWindowClass">NSWindow</string>
+				<object class="NSMutableString" key="NSViewClass">
+					<characters key="NS.bytes">View</characters>
+				</object>
+				<nil key="NSUserInterfaceItemIdentifier"/>
+				<string key="NSWindowContentMinSize">{315, 203}</string>
+				<object class="NSView" key="NSWindowView" id="127793487">
+					<reference key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<array class="NSMutableArray" key="NSSubviews">
+						<object class="NSButton" id="348063277">
+							<reference key="NSNextResponder" ref="127793487"/>
+							<int key="NSvFlags">256</int>
+							<string key="NSFrame">{{154, 13}, {82, 32}}</string>
+							<reference key="NSSuperview" ref="127793487"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="45529240"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="921967453">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Cancel</string>
+								<object class="NSFont" key="NSSupport" id="918131184">
+									<string key="NSName">LucidaGrande</string>
+									<double key="NSSize">13</double>
+									<int key="NSfFlags">1044</int>
+								</object>
+								<reference key="NSControlView" ref="348063277"/>
+								<int key="NSButtonFlags">-2038284288</int>
+								<int key="NSButtonFlags2">1</int>
+								<reference key="NSAlternateImage" ref="918131184"/>
+								<string key="NSAlternateContents"/>
+								<string type="base64-UTF8" key="NSKeyEquivalent">Gw</string>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSButton" id="45529240">
+							<reference key="NSNextResponder" ref="127793487"/>
+							<int key="NSvFlags">256</int>
+							<string key="NSFrame">{{236, 13}, {65, 32}}</string>
+							<reference key="NSSuperview" ref="127793487"/>
+							<reference key="NSWindow"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="764681236">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">OK</string>
+								<reference key="NSSupport" ref="918131184"/>
+								<reference key="NSControlView" ref="45529240"/>
+								<int key="NSButtonFlags">-2038284288</int>
+								<int key="NSButtonFlags2">1</int>
+								<reference key="NSAlternateImage" ref="918131184"/>
+								<string key="NSAlternateContents"/>
+								<string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSBox" id="82652069">
+							<reference key="NSNextResponder" ref="127793487"/>
+							<int key="NSvFlags">12</int>
+							<array class="NSMutableArray" key="NSSubviews">
+								<object class="NSView" id="382228618">
+									<reference key="NSNextResponder" ref="82652069"/>
+									<int key="NSvFlags">274</int>
+									<array class="NSMutableArray" key="NSSubviews">
+										<object class="NSTextField" id="83047673">
+											<reference key="NSNextResponder" ref="382228618"/>
+											<int key="NSvFlags">268</int>
+											<string key="NSFrame">{{15, 79}, {85, 17}}</string>
+											<reference key="NSSuperview" ref="382228618"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="817504184"/>
+											<string key="NSReuseIdentifierKey">_NS:1535</string>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTextFieldCell" key="NSCell" id="546071709">
+												<int key="NSCellFlags">68157504</int>
+												<int key="NSCellFlags2">272630784</int>
+												<string key="NSContents">IP Address:</string>
+												<reference key="NSSupport" ref="918131184"/>
+												<string key="NSCellIdentifier">_NS:1535</string>
+												<reference key="NSControlView" ref="83047673"/>
+												<object class="NSColor" key="NSBackgroundColor" id="66730619">
+													<int key="NSColorSpace">6</int>
+													<string key="NSCatalogName">System</string>
+													<string key="NSColorName">controlColor</string>
+													<object class="NSColor" key="NSColor">
+														<int key="NSColorSpace">3</int>
+														<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+													</object>
+												</object>
+												<object class="NSColor" key="NSTextColor" id="177609207">
+													<int key="NSColorSpace">6</int>
+													<string key="NSCatalogName">System</string>
+													<string key="NSColorName">controlTextColor</string>
+													<object class="NSColor" key="NSColor" id="503112956">
+														<int key="NSColorSpace">3</int>
+														<bytes key="NSWhite">MAA</bytes>
+													</object>
+												</object>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSTextField" id="704624630">
+											<reference key="NSNextResponder" ref="382228618"/>
+											<int key="NSvFlags">268</int>
+											<string key="NSFrame">{{15, 48}, {85, 17}}</string>
+											<reference key="NSSuperview" ref="382228618"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="723933460"/>
+											<string key="NSReuseIdentifierKey">_NS:1535</string>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTextFieldCell" key="NSCell" id="486886176">
+												<int key="NSCellFlags">68157504</int>
+												<int key="NSCellFlags2">272630784</int>
+												<string key="NSContents">Player:</string>
+												<reference key="NSSupport" ref="918131184"/>
+												<string key="NSCellIdentifier">_NS:1535</string>
+												<reference key="NSControlView" ref="704624630"/>
+												<reference key="NSBackgroundColor" ref="66730619"/>
+												<reference key="NSTextColor" ref="177609207"/>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSTextField" id="764848078">
+											<reference key="NSNextResponder" ref="382228618"/>
+											<int key="NSvFlags">268</int>
+											<string key="NSFrame">{{15, 20}, {85, 17}}</string>
+											<reference key="NSSuperview" ref="382228618"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="471354310"/>
+											<string key="NSReuseIdentifierKey">_NS:1535</string>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTextFieldCell" key="NSCell" id="870814783">
+												<int key="NSCellFlags">68157504</int>
+												<int key="NSCellFlags2">272630784</int>
+												<string key="NSContents">Port</string>
+												<reference key="NSSupport" ref="918131184"/>
+												<string key="NSCellIdentifier">_NS:1535</string>
+												<reference key="NSControlView" ref="764848078"/>
+												<reference key="NSBackgroundColor" ref="66730619"/>
+												<reference key="NSTextColor" ref="177609207"/>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSTextField" id="817504184">
+											<reference key="NSNextResponder" ref="382228618"/>
+											<int key="NSvFlags">268</int>
+											<string key="NSFrame">{{105, 77}, {156, 22}}</string>
+											<reference key="NSSuperview" ref="382228618"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="704624630"/>
+											<string key="NSReuseIdentifierKey">_NS:9</string>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTextFieldCell" key="NSCell" id="407033884">
+												<int key="NSCellFlags">-1804599231</int>
+												<int key="NSCellFlags2">272630784</int>
+												<string key="NSContents"/>
+												<reference key="NSSupport" ref="918131184"/>
+												<string key="NSCellIdentifier">_NS:9</string>
+												<reference key="NSControlView" ref="817504184"/>
+												<bool key="NSDrawsBackground">YES</bool>
+												<object class="NSColor" key="NSBackgroundColor" id="305691350">
+													<int key="NSColorSpace">6</int>
+													<string key="NSCatalogName">System</string>
+													<string key="NSColorName">textBackgroundColor</string>
+													<object class="NSColor" key="NSColor">
+														<int key="NSColorSpace">3</int>
+														<bytes key="NSWhite">MQA</bytes>
+													</object>
+												</object>
+												<object class="NSColor" key="NSTextColor" id="37020862">
+													<int key="NSColorSpace">6</int>
+													<string key="NSCatalogName">System</string>
+													<string key="NSColorName">textColor</string>
+													<reference key="NSColor" ref="503112956"/>
+												</object>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSTextField" id="471354310">
+											<reference key="NSNextResponder" ref="382228618"/>
+											<int key="NSvFlags">268</int>
+											<string key="NSFrame">{{105, 18}, {156, 22}}</string>
+											<reference key="NSSuperview" ref="382228618"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="497434569"/>
+											<string key="NSReuseIdentifierKey">_NS:9</string>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTextFieldCell" key="NSCell" id="843862144">
+												<int key="NSCellFlags">-1804599231</int>
+												<int key="NSCellFlags2">-1874852864</int>
+												<string key="NSContents"/>
+												<reference key="NSSupport" ref="918131184"/>
+												<object class="NSNumberFormatter" key="NSFormatter" id="1041323832">
+													<dictionary class="NSMutableDictionary" key="NS.attributes">
+														<boolean value="YES" key="allowsFloats"/>
+														<integer value="1040" key="formatterBehavior"/>
+														<object class="NSLocale" key="locale">
+															<string key="NS.identifier"/>
+														</object>
+														<integer value="65535" key="maximum"/>
+														<real value="0.0" key="minimum"/>
+														<string key="negativeInfinitySymbol">-∞</string>
+														<string key="nilSymbol"/>
+														<string key="positiveInfinitySymbol">+∞</string>
+													</dictionary>
+													<string key="NS.positiveformat">#</string>
+													<string key="NS.negativeformat">#</string>
+													<nil key="NS.positiveattrs"/>
+													<nil key="NS.negativeattrs"/>
+													<nil key="NS.zero"/>
+													<object class="NSAttributedString" key="NS.nil">
+														<string key="NSString"/>
+													</object>
+													<object class="NSAttributedString" key="NS.nan">
+														<string key="NSString">NaN</string>
+														<dictionary key="NSAttributes"/>
+													</object>
+													<real value="0.0" key="NS.min"/>
+													<integer value="65535" key="NS.max"/>
+													<object class="NSDecimalNumberHandler" key="NS.rounding">
+														<int key="NS.roundingmode">3</int>
+														<bool key="NS.raise.overflow">YES</bool>
+														<bool key="NS.raise.underflow">YES</bool>
+														<bool key="NS.raise.dividebyzero">YES</bool>
+													</object>
+													<string key="NS.decimal">.</string>
+													<string key="NS.thousand">,</string>
+													<bool key="NS.hasthousands">NO</bool>
+													<bool key="NS.localized">NO</bool>
+													<bool key="NS.allowsfloats">YES</bool>
+												</object>
+												<string key="NSCellIdentifier">_NS:9</string>
+												<reference key="NSControlView" ref="471354310"/>
+												<bool key="NSDrawsBackground">YES</bool>
+												<reference key="NSBackgroundColor" ref="305691350"/>
+												<reference key="NSTextColor" ref="37020862"/>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSPopUpButton" id="723933460">
+											<reference key="NSNextResponder" ref="382228618"/>
+											<int key="NSvFlags">268</int>
+											<string key="NSFrame">{{103, 45}, {161, 26}}</string>
+											<reference key="NSSuperview" ref="382228618"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="764848078"/>
+											<string key="NSReuseIdentifierKey">_NS:9</string>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSPopUpButtonCell" key="NSCell" id="296493741">
+												<int key="NSCellFlags">-2076180416</int>
+												<int key="NSCellFlags2">2048</int>
+												<reference key="NSSupport" ref="918131184"/>
+												<string key="NSCellIdentifier">_NS:9</string>
+												<reference key="NSControlView" ref="723933460"/>
+												<int key="NSButtonFlags">109199360</int>
+												<int key="NSButtonFlags2">129</int>
+												<string key="NSAlternateContents"/>
+												<string key="NSKeyEquivalent"/>
+												<int key="NSPeriodicDelay">400</int>
+												<int key="NSPeriodicInterval">75</int>
+												<object class="NSMenuItem" key="NSMenuItem" id="932251294">
+													<reference key="NSMenu" ref="261034311"/>
+													<string key="NSTitle">Disabled</string>
+													<string key="NSKeyEquiv"/>
+													<int key="NSKeyEquivModMask">1048576</int>
+													<int key="NSMnemonicLoc">2147483647</int>
+													<int key="NSState">1</int>
+													<object class="NSCustomResource" key="NSOnImage" id="939390407">
+														<string key="NSClassName">NSImage</string>
+														<string key="NSResourceName">NSMenuCheckmark</string>
+													</object>
+													<object class="NSCustomResource" key="NSMixedImage" id="254824687">
+														<string key="NSClassName">NSImage</string>
+														<string key="NSResourceName">NSMenuMixedState</string>
+													</object>
+													<string key="NSAction">_popUpItemAction:</string>
+													<reference key="NSTarget" ref="296493741"/>
+												</object>
+												<bool key="NSMenuItemRespectAlignment">YES</bool>
+												<object class="NSMenu" key="NSMenu" id="261034311">
+													<string key="NSTitle">OtherViews</string>
+													<array class="NSMutableArray" key="NSMenuItems">
+														<reference ref="932251294"/>
+														<object class="NSMenuItem" id="92975853">
+															<reference key="NSMenu" ref="261034311"/>
+															<string key="NSTitle">Master</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSKeyEquivModMask">1048576</int>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="939390407"/>
+															<reference key="NSMixedImage" ref="254824687"/>
+															<string key="NSAction">_popUpItemAction:</string>
+															<reference key="NSTarget" ref="296493741"/>
+														</object>
+														<object class="NSMenuItem" id="712227471">
+															<reference key="NSMenu" ref="261034311"/>
+															<string key="NSTitle">Slave</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSKeyEquivModMask">1048576</int>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="939390407"/>
+															<reference key="NSMixedImage" ref="254824687"/>
+															<string key="NSAction">_popUpItemAction:</string>
+															<reference key="NSTarget" ref="296493741"/>
+														</object>
+													</array>
+													<reference key="NSMenuFont" ref="918131184"/>
+												</object>
+												<int key="NSPreferredEdge">1</int>
+												<bool key="NSUsesItemFromMenu">YES</bool>
+												<bool key="NSAltersState">YES</bool>
+												<int key="NSArrowPosition">2</int>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+									</array>
+									<string key="NSFrame">{{1, 1}, {279, 108}}</string>
+									<reference key="NSSuperview" ref="82652069"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="83047673"/>
+									<string key="NSReuseIdentifierKey">_NS:11</string>
+								</object>
+							</array>
+							<string key="NSFrame">{{17, 57}, {281, 110}}</string>
+							<reference key="NSSuperview" ref="127793487"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="382228618"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<string key="NSOffsets">{0, 0}</string>
+							<object class="NSTextFieldCell" key="NSTitleCell">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">0</int>
+								<string key="NSContents">Box</string>
+								<object class="NSFont" key="NSSupport">
+									<string key="NSName">LucidaGrande</string>
+									<double key="NSSize">11</double>
+									<int key="NSfFlags">3100</int>
+								</object>
+								<reference key="NSBackgroundColor" ref="305691350"/>
+								<object class="NSColor" key="NSTextColor">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
+								</object>
+							</object>
+							<reference key="NSContentView" ref="382228618"/>
+							<int key="NSBorderType">1</int>
+							<int key="NSBoxType">0</int>
+							<int key="NSTitlePosition">0</int>
+							<bool key="NSTransparent">NO</bool>
+						</object>
+						<object class="NSButton" id="537116407">
+							<reference key="NSNextResponder" ref="127793487"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{16, 170}, {61, 18}}</string>
+							<reference key="NSSuperview" ref="127793487"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="82652069"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="683031745">
+								<int key="NSCellFlags">-2080374784</int>
+								<int key="NSCellFlags2">268697600</int>
+								<string key="NSContents">Enabled</string>
+								<object class="NSFont" key="NSSupport">
+									<string key="NSName">LucidaGrande</string>
+									<double key="NSSize">9</double>
+									<int key="NSfFlags">3614</int>
+								</object>
+								<string key="NSCellIdentifier">_NS:9</string>
+								<reference key="NSControlView" ref="537116407"/>
+								<int key="NSButtonFlags">1211912448</int>
+								<int key="NSButtonFlags2">2</int>
+								<object class="NSCustomResource" key="NSNormalImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">NSSwitch</string>
+								</object>
+								<object class="NSButtonImageSource" key="NSAlternateImage">
+									<string key="NSImageName">NSSwitch</string>
+								</object>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSButton" id="497434569">
+							<reference key="NSNextResponder" ref="127793487"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{14, 13}, {75, 32}}</string>
+							<reference key="NSSuperview" ref="127793487"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="348063277"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="982900033">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Reset</string>
+								<reference key="NSSupport" ref="918131184"/>
+								<string key="NSCellIdentifier">_NS:9</string>
+								<reference key="NSControlView" ref="497434569"/>
+								<int key="NSButtonFlags">-2038284288</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+					</array>
+					<string key="NSFrameSize">{315, 203}</string>
+					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
+					<reference key="NSNextKeyView" ref="537116407"/>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
+				<string key="NSMinSize">{315, 225}</string>
+				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
+				<bool key="NSWindowIsRestorable">YES</bool>
+			</object>
+		</array>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<array class="NSMutableArray" key="connectionRecords">
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">ok:</string>
+						<reference key="source" ref="509300364"/>
+						<reference key="destination" ref="45529240"/>
+					</object>
+					<int key="connectionID">133</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">cancel:</string>
+						<reference key="source" ref="509300364"/>
+						<reference key="destination" ref="348063277"/>
+					</object>
+					<int key="connectionID">134</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">window</string>
+						<reference key="source" ref="509300364"/>
+						<reference key="destination" ref="151678379"/>
+					</object>
+					<int key="connectionID">141</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">enabledButton</string>
+						<reference key="source" ref="509300364"/>
+						<reference key="destination" ref="537116407"/>
+					</object>
+					<int key="connectionID">196</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleEnabled:</string>
+						<reference key="source" ref="509300364"/>
+						<reference key="destination" ref="537116407"/>
+					</object>
+					<int key="connectionID">197</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">portField</string>
+						<reference key="source" ref="509300364"/>
+						<reference key="destination" ref="471354310"/>
+					</object>
+					<int key="connectionID">215</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">ipAddressField</string>
+						<reference key="source" ref="509300364"/>
+						<reference key="destination" ref="817504184"/>
+					</object>
+					<int key="connectionID">217</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">configBox</string>
+						<reference key="source" ref="509300364"/>
+						<reference key="destination" ref="82652069"/>
+					</object>
+					<int key="connectionID">218</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">playerMenu</string>
+						<reference key="source" ref="509300364"/>
+						<reference key="destination" ref="723933460"/>
+					</object>
+					<int key="connectionID">219</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">resetPreferences:</string>
+						<reference key="source" ref="509300364"/>
+						<reference key="destination" ref="497434569"/>
+					</object>
+					<int key="connectionID">223</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="151678379"/>
+						<reference key="destination" ref="509300364"/>
+					</object>
+					<int key="connectionID">158</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">nextKeyView</string>
+						<reference key="source" ref="45529240"/>
+						<reference key="destination" ref="348063277"/>
+					</object>
+					<int key="connectionID">9</int>
+				</object>
+			</array>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<array key="orderedObjects">
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<array key="object" id="0"/>
+						<reference key="children" ref="1058953981"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="509300364"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="141927618"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">First Responder</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5</int>
+						<reference key="object" ref="151678379"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="127793487"/>
+						</array>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Window</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6</int>
+						<reference key="object" ref="127793487"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="537116407"/>
+							<reference ref="497434569"/>
+							<reference ref="45529240"/>
+							<reference ref="348063277"/>
+							<object class="IBNSLayoutConstraint" id="1036876179">
+								<reference key="firstItem" ref="127793487"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="45529240"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="127793487"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="842829921">
+								<reference key="firstItem" ref="127793487"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="45529240"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="127793487"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="674129625">
+								<reference key="firstItem" ref="45529240"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="348063277"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">12</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="127793487"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="870181243">
+								<reference key="firstItem" ref="127793487"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="348063277"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="127793487"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="499697857">
+								<reference key="firstItem" ref="497434569"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="127793487"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="127793487"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="447479180">
+								<reference key="firstItem" ref="127793487"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="497434569"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="127793487"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="290637930">
+								<reference key="firstItem" ref="497434569"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="82652069"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="127793487"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="427946131">
+								<reference key="firstItem" ref="82652069"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="127793487"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="127793487"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="906287637">
+								<reference key="firstItem" ref="127793487"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="82652069"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="127793487"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="391278904">
+								<reference key="firstItem" ref="82652069"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="537116407"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="127793487"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="900601962">
+								<reference key="firstItem" ref="537116407"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="127793487"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="127793487"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="919721277">
+								<reference key="firstItem" ref="537116407"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="127793487"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="127793487"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<reference ref="82652069"/>
+						</array>
+						<reference key="parent" ref="151678379"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">7</int>
+						<reference key="object" ref="348063277"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="921967453"/>
+						</array>
+						<reference key="parent" ref="127793487"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">8</int>
+						<reference key="object" ref="45529240"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="764681236"/>
+							<object class="IBNSLayoutConstraint" id="245057345">
+								<reference key="firstItem" ref="45529240"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">53</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="45529240"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="127793487"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">186</int>
+						<reference key="object" ref="921967453"/>
+						<reference key="parent" ref="348063277"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">187</int>
+						<reference key="object" ref="764681236"/>
+						<reference key="parent" ref="45529240"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-3</int>
+						<reference key="object" ref="44201914"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Application</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">193</int>
+						<reference key="object" ref="82652069"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="83047673"/>
+							<reference ref="817504184"/>
+							<reference ref="704624630"/>
+							<reference ref="723933460"/>
+							<object class="IBNSLayoutConstraint" id="40692612">
+								<reference key="firstItem" ref="471354310"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="82652069"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">67</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="82652069"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="846592300">
+								<reference key="firstItem" ref="471354310"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="764848078"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="82652069"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="60527276">
+								<reference key="firstItem" ref="82652069"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="471354310"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="82652069"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="513515301">
+								<reference key="firstItem" ref="723933460"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="704624630"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="82652069"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="887624534">
+								<reference key="firstItem" ref="723933460"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="817504184"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="82652069"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="89759382">
+								<reference key="firstItem" ref="82652069"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="723933460"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="82652069"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="145126621">
+								<reference key="firstItem" ref="723933460"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="817504184"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="82652069"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="318007249">
+								<reference key="firstItem" ref="723933460"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="471354310"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="82652069"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="885502674">
+								<reference key="firstItem" ref="723933460"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="704624630"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="82652069"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="132721671">
+								<reference key="firstItem" ref="82652069"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="817504184"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="82652069"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="335368693">
+								<reference key="firstItem" ref="817504184"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="83047673"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="82652069"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="666704347">
+								<reference key="firstItem" ref="817504184"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="82652069"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="82652069"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="227679458">
+								<reference key="firstItem" ref="764848078"/>
+								<int key="firstAttribute">11</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="471354310"/>
+								<int key="secondAttribute">11</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="82652069"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="380664884">
+								<reference key="firstItem" ref="764848078"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="82652069"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="82652069"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="290329374">
+								<reference key="firstItem" ref="704624630"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="82652069"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="82652069"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="506743589">
+								<reference key="firstItem" ref="83047673"/>
+								<int key="firstAttribute">11</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="817504184"/>
+								<int key="secondAttribute">11</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="82652069"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="462314221">
+								<reference key="firstItem" ref="83047673"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="82652069"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="82652069"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<reference ref="764848078"/>
+							<reference ref="471354310"/>
+						</array>
+						<reference key="parent" ref="127793487"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">194</int>
+						<reference key="object" ref="537116407"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="683031745"/>
+							<object class="IBNSLayoutConstraint" id="406789566">
+								<reference key="firstItem" ref="537116407"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">55</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="537116407"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="127793487"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">195</int>
+						<reference key="object" ref="683031745"/>
+						<reference key="parent" ref="537116407"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">198</int>
+						<reference key="object" ref="83047673"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="546071709"/>
+							<object class="IBNSLayoutConstraint" id="997131426">
+								<reference key="firstItem" ref="83047673"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">79</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="83047673"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="82652069"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">199</int>
+						<reference key="object" ref="546071709"/>
+						<reference key="parent" ref="83047673"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">200</int>
+						<reference key="object" ref="704624630"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="486886176"/>
+						</array>
+						<reference key="parent" ref="82652069"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">201</int>
+						<reference key="object" ref="486886176"/>
+						<reference key="parent" ref="704624630"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">202</int>
+						<reference key="object" ref="764848078"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="870814783"/>
+						</array>
+						<reference key="parent" ref="82652069"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">203</int>
+						<reference key="object" ref="870814783"/>
+						<reference key="parent" ref="764848078"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">204</int>
+						<reference key="object" ref="817504184"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="407033884"/>
+						</array>
+						<reference key="parent" ref="82652069"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">205</int>
+						<reference key="object" ref="407033884"/>
+						<reference key="parent" ref="817504184"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">206</int>
+						<reference key="object" ref="471354310"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="843862144"/>
+						</array>
+						<reference key="parent" ref="82652069"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">207</int>
+						<reference key="object" ref="843862144"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1041323832"/>
+						</array>
+						<reference key="parent" ref="471354310"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">208</int>
+						<reference key="object" ref="723933460"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="296493741"/>
+						</array>
+						<reference key="parent" ref="82652069"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">209</int>
+						<reference key="object" ref="296493741"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="261034311"/>
+						</array>
+						<reference key="parent" ref="723933460"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">210</int>
+						<reference key="object" ref="261034311"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="92975853"/>
+							<reference ref="712227471"/>
+							<reference ref="932251294"/>
+						</array>
+						<reference key="parent" ref="296493741"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">211</int>
+						<reference key="object" ref="92975853"/>
+						<reference key="parent" ref="261034311"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">212</int>
+						<reference key="object" ref="712227471"/>
+						<reference key="parent" ref="261034311"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">213</int>
+						<reference key="object" ref="932251294"/>
+						<reference key="parent" ref="261034311"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">220</int>
+						<reference key="object" ref="1041323832"/>
+						<reference key="parent" ref="843862144"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">221</int>
+						<reference key="object" ref="497434569"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="982900033"/>
+						</array>
+						<reference key="parent" ref="127793487"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">222</int>
+						<reference key="object" ref="982900033"/>
+						<reference key="parent" ref="497434569"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">253</int>
+						<reference key="object" ref="1036876179"/>
+						<reference key="parent" ref="127793487"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">246</int>
+						<reference key="object" ref="842829921"/>
+						<reference key="parent" ref="127793487"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">245</int>
+						<reference key="object" ref="674129625"/>
+						<reference key="parent" ref="127793487"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">244</int>
+						<reference key="object" ref="870181243"/>
+						<reference key="parent" ref="127793487"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">252</int>
+						<reference key="object" ref="499697857"/>
+						<reference key="parent" ref="127793487"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">248</int>
+						<reference key="object" ref="447479180"/>
+						<reference key="parent" ref="127793487"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">247</int>
+						<reference key="object" ref="290637930"/>
+						<reference key="parent" ref="127793487"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">251</int>
+						<reference key="object" ref="427946131"/>
+						<reference key="parent" ref="127793487"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">249</int>
+						<reference key="object" ref="906287637"/>
+						<reference key="parent" ref="127793487"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">243</int>
+						<reference key="object" ref="391278904"/>
+						<reference key="parent" ref="127793487"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">250</int>
+						<reference key="object" ref="900601962"/>
+						<reference key="parent" ref="127793487"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">242</int>
+						<reference key="object" ref="919721277"/>
+						<reference key="parent" ref="127793487"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">256</int>
+						<reference key="object" ref="40692612"/>
+						<reference key="parent" ref="82652069"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">239</int>
+						<reference key="object" ref="846592300"/>
+						<reference key="parent" ref="82652069"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">233</int>
+						<reference key="object" ref="60527276"/>
+						<reference key="parent" ref="82652069"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">240</int>
+						<reference key="object" ref="513515301"/>
+						<reference key="parent" ref="82652069"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">238</int>
+						<reference key="object" ref="887624534"/>
+						<reference key="parent" ref="82652069"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">236</int>
+						<reference key="object" ref="89759382"/>
+						<reference key="parent" ref="82652069"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">234</int>
+						<reference key="object" ref="145126621"/>
+						<reference key="parent" ref="82652069"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">228</int>
+						<reference key="object" ref="318007249"/>
+						<reference key="parent" ref="82652069"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">227</int>
+						<reference key="object" ref="885502674"/>
+						<reference key="parent" ref="82652069"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">235</int>
+						<reference key="object" ref="132721671"/>
+						<reference key="parent" ref="82652069"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">230</int>
+						<reference key="object" ref="335368693"/>
+						<reference key="parent" ref="82652069"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">229</int>
+						<reference key="object" ref="666704347"/>
+						<reference key="parent" ref="82652069"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">237</int>
+						<reference key="object" ref="227679458"/>
+						<reference key="parent" ref="82652069"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">232</int>
+						<reference key="object" ref="380664884"/>
+						<reference key="parent" ref="82652069"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">226</int>
+						<reference key="object" ref="290329374"/>
+						<reference key="parent" ref="82652069"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">241</int>
+						<reference key="object" ref="506743589"/>
+						<reference key="parent" ref="82652069"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">225</int>
+						<reference key="object" ref="462314221"/>
+						<reference key="parent" ref="82652069"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">255</int>
+						<reference key="object" ref="997131426"/>
+						<reference key="parent" ref="83047673"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">254</int>
+						<reference key="object" ref="245057345"/>
+						<reference key="parent" ref="45529240"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">224</int>
+						<reference key="object" ref="406789566"/>
+						<reference key="parent" ref="537116407"/>
+					</object>
+				</array>
+			</object>
+			<dictionary class="NSMutableDictionary" key="flattenedProperties">
+				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="186.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="187.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array class="NSMutableArray" key="193.IBNSViewMetadataConstraints">
+					<reference ref="462314221"/>
+					<reference ref="506743589"/>
+					<reference ref="290329374"/>
+					<reference ref="380664884"/>
+					<reference ref="227679458"/>
+					<reference ref="666704347"/>
+					<reference ref="335368693"/>
+					<reference ref="132721671"/>
+					<reference ref="885502674"/>
+					<reference ref="318007249"/>
+					<reference ref="145126621"/>
+					<reference ref="89759382"/>
+					<reference ref="887624534"/>
+					<reference ref="513515301"/>
+					<reference ref="60527276"/>
+					<reference ref="846592300"/>
+					<reference ref="40692612"/>
+				</array>
+				<boolean value="NO" key="193.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="193.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="194.IBNSViewMetadataConstraints">
+					<reference ref="406789566"/>
+				</array>
+				<boolean value="NO" key="194.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="194.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="195.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="198.IBNSViewMetadataConstraints">
+					<reference ref="997131426"/>
+				</array>
+				<boolean value="NO" key="198.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="198.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="199.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="200.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="200.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="201.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="202.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="202.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="203.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="204.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="204.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="205.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="206.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="206.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="207.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="208.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="208.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="209.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="210.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="211.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="212.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="213.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1041" key="220.IBNumberFormatterBehaviorMetadataKey"/>
+				<boolean value="NO" key="220.IBNumberFormatterLocalizesFormatMetadataKey"/>
+				<string key="220.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="221.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="221.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="222.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="224.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="225.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="226.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="227.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="228.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="229.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="230.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="232.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="233.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="234.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="235.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="236.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="237.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="238.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="239.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="240.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="241.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="242.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="243.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="244.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="245.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="246.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="247.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="248.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="249.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="250.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="251.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="252.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="253.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="254.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="255.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="256.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="6.IBNSViewMetadataConstraints">
+					<reference ref="919721277"/>
+					<reference ref="900601962"/>
+					<reference ref="391278904"/>
+					<reference ref="906287637"/>
+					<reference ref="427946131"/>
+					<reference ref="290637930"/>
+					<reference ref="447479180"/>
+					<reference ref="499697857"/>
+					<reference ref="870181243"/>
+					<reference ref="674129625"/>
+					<reference ref="842829921"/>
+					<reference ref="1036876179"/>
+				</array>
+				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="7.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="8.IBNSViewMetadataConstraints">
+					<reference ref="245057345"/>
+				</array>
+				<boolean value="NO" key="8.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="8.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			</dictionary>
+			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+			<nil key="activeLocalization"/>
+			<dictionary class="NSMutableDictionary" key="localizations"/>
+			<nil key="sourceID"/>
+			<int key="maxID">259</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">Bladesio1PluginConfigController</string>
+					<string key="superclassName">NSWindowController</string>
+					<dictionary class="NSMutableDictionary" key="actions">
+						<string key="cancel:">id</string>
+						<string key="ok:">id</string>
+						<string key="resetPreferences:">id</string>
+						<string key="toggleEnabled:">id</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="actionInfosByName">
+						<object class="IBActionInfo" key="cancel:">
+							<string key="name">cancel:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="ok:">
+							<string key="name">ok:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="resetPreferences:">
+							<string key="name">resetPreferences:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="toggleEnabled:">
+							<string key="name">toggleEnabled:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="configBox">NSBox</string>
+						<string key="enabledButton">NSButton</string>
+						<string key="ipAddressField">NSTextField</string>
+						<string key="playerMenu">NSPopUpButton</string>
+						<string key="portField">NSTextField</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="configBox">
+							<string key="name">configBox</string>
+							<string key="candidateClassName">NSBox</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="enabledButton">
+							<string key="name">enabledButton</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="ipAddressField">
+							<string key="name">ipAddressField</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="playerMenu">
+							<string key="name">playerMenu</string>
+							<string key="candidateClassName">NSPopUpButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="portField">
+							<string key="name">portField</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/Bladesio1PluginConfigController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSLayoutConstraint</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/NSLayoutConstraint.h</string>
+					</object>
+				</object>
+			</array>
+		</object>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<real value="1070" key="NS.object.0"/>
+		</object>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<string key="NSMenuCheckmark">{11, 11}</string>
+			<string key="NSMenuMixedState">{10, 3}</string>
+			<string key="NSSwitch">{15, 15}</string>
+		</dictionary>
+		<bool key="IBDocument.UseAutolayout">YES</bool>
+	</data>
+</archive>

pcsxr-1.9.93.tar.bz2/macosx/plugins/Bladesio1/English.lproj/Credits.rtf Added

pcsxr-1.9.93.tar.bz2/macosx/plugins/Bladesio1/English.lproj/InfoPlist.strings Added

pcsxr-1.9.93.tar.bz2/macosx/plugins/Bladesio1/English.lproj/Localizable.strings Added

pcsxr-1.9.93.tar.bz2/macosx/plugins/Bladesio1/Info.plist Added

pcsxr-1.9.93.tar.bz2/macosx/plugins/Bladesio1/macsrc Added

pcsxr-1.9.93.tar.bz2/macosx/plugins/Bladesio1/macsrc/PluginConfigController.h Added

pcsxr-1.9.93.tar.bz2/macosx/plugins/Bladesio1/macsrc/PluginConfigController.m Added

@@ -0,0 +1,220 @@
+/*
+ * Copyright (c) 2010, Wei Mingzhi <whistler@openoffice.org>.
+ * All Rights Reserved.
+ *
+ * Based on: Cdrom for Psemu Pro like Emulators
+ * By: linuzappz <linuzappz@hotmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses>.
+ */
+
+#import "PluginConfigController.h"
+#include "typedefs.h"
+#include "sio1.h"
+#import "ARCBridge.h"
+
+#define APP_ID @"net.pcsxr.Bladesio1"
+#define PrefsKey APP_ID @" Settings"
+
+static PluginConfigController *windowController = nil;
+
+#define kSioEnabled @"SIO Enabled"
+#define kSioPort @"Port"
+#define kSioPlayer @"Player"
+#define kSioIPAddress @"IP address"
+
+void AboutDlgProc()
+{
+	// Get parent application instance
+	NSBundle *bundle = [NSBundle bundleWithIdentifier:APP_ID];
+
+	// Get Credits.rtf
+	NSString *path = [bundle pathForResource:@"Credits" ofType:@"rtf"];
+	NSAttributedString *credits;
+	if (path) {
+		credits = [[NSAttributedString alloc] initWithPath: path
+				documentAttributes:NULL];
+		AUTORELEASEOBJNORETURN(credits);
+		
+	} else {
+		credits = AUTORELEASEOBJ([[NSAttributedString alloc] initWithString:@""]);
+	}
+
+	// Get Application Icon
+	NSImage *icon = [[NSWorkspace sharedWorkspace] iconForFile:[bundle bundlePath]];
+	NSSize size = NSMakeSize(64, 64);
+	[icon setSize:size];
+
+	NSDictionary *infoPaneDict =
+	[[NSDictionary alloc] initWithObjectsAndKeys:
+	 [bundle objectForInfoDictionaryKey:@"CFBundleName"], @"ApplicationName",
+	 icon, @"ApplicationIcon",
+	 [bundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"], @"ApplicationVersion",
+	 [bundle objectForInfoDictionaryKey:@"CFBundleVersion"], @"Version",
+	 [bundle objectForInfoDictionaryKey:@"NSHumanReadableCopyright"], @"Copyright",
+	 credits, @"Credits",
+	 nil];
+	dispatch_async(dispatch_get_main_queue(), ^{
+		[NSApp orderFrontStandardAboutPanelWithOptions:infoPaneDict];
+	});
+	RELEASEOBJ(infoPaneDict);
+}
+
+static inline void RunOnMainThreadSync(dispatch_block_t block)
+{
+	if ([NSThread isMainThread]) {
+		block();
+	} else {
+		dispatch_sync(dispatch_get_main_queue(), block);
+	}
+}
+
+void ConfDlgProc()
+{
+	//We need this block due to the xib's use of auto layout
+	RunOnMainThreadSync(^{
+		NSWindow *window;
+		if (windowController == nil) {
+			windowController = [[PluginConfigController alloc] initWithWindowNibName:@"Bladesio1PluginConfig"];
+		}
+		window = [windowController window];
+		
+		[windowController loadValues];
+		
+		[window center];
+		[window makeKeyAndOrderFront:nil];
+	});
+}
+
+void ReadConfig()
+{
+	NSDictionary *keyValues;
+	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+	[defaults registerDefaults:[NSDictionary dictionaryWithObjectsAndKeys:
+								[NSDictionary dictionaryWithObjectsAndKeys:
+								 @NO, kSioEnabled,
+								 @33307, kSioPort,
+								 @"127.0.0.1", kSioIPAddress,
+								 @(PLAYER_DISABLED), kSioPlayer,
+								 nil], PrefsKey, nil]];
+
+	keyValues = [defaults dictionaryForKey:PrefsKey];
+
+	settings.enabled = [[keyValues objectForKey:kSioEnabled] boolValue];
+	settings.port = [[keyValues objectForKey:kSioPort] unsignedShortValue];
+	settings.player = [[keyValues objectForKey:kSioPlayer] intValue];
+	strlcpy(settings.ip, [[keyValues objectForKey:kSioIPAddress] cStringUsingEncoding:NSASCIIStringEncoding], sizeof(settings.ip));
+}
+
+@implementation Bladesio1PluginConfigController
+
+- (IBAction)cancel:(id)sender
+{
+	[self close];
+}
+
+- (IBAction)ok:(id)sender
+{
+	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+
+	NSMutableDictionary *writeDic = [NSMutableDictionary dictionaryWithDictionary:keyValues];
+
+	NSString *theAddress = [ipAddressField stringValue];
+	NSInteger asciiLen = [theAddress lengthOfBytesUsingEncoding:NSASCIIStringEncoding];
+	if (asciiLen > (sizeof(settings.ip) - 1)) {
+		NSBeginAlertSheet(@"Address too long", nil, nil, nil, [self window], nil, NULL, NULL, NULL, @"The address is too long.\n\nTry to use only the IP address and not a host name.");
+		return;
+	} else if (asciiLen == 0) {
+		NSBeginAlertSheet(@"Blank address", nil, nil, nil, [self window], nil, NULL, NULL, NULL, @"The address specified is either blank, or can't be converted to ASCII.\n\nTry connecting directly using the IP address using latin numerals.");
+		return;
+	}
+	
+	[writeDic setObject:(([enabledButton state] == NSOnState) ? @YES : @NO) forKey:kSioEnabled];
+	[writeDic setObject:theAddress forKey:kSioIPAddress];
+	[writeDic setObject:@((u16)[portField intValue]) forKey:kSioPort];
+	
+	{
+		int player;
+		switch ([playerMenu indexOfSelectedItem]) {
+			default:
+			case 0: player = PLAYER_DISABLED; break;
+			case 1: player = PLAYER_MASTER; break;
+			case 2: player = PLAYER_SLAVE; break;
+		}
+		[writeDic setObject:@(player) forKey:kSioPlayer];
+	}
+
+	// write to defaults
+	[defaults setObject:writeDic forKey:PrefsKey];
+	[defaults synchronize];
+
+	// and set global values accordingly
+	ReadConfig();
+
+	[self close];
+}
+
+- (IBAction)toggleEnabled:(id)sender
+{
+	BOOL isEnabled = [enabledButton state] == NSOnState ? YES : NO;
+	
+	for (NSView *subView in [[[configBox subviews] objectAtIndex:0] subviews]) {
+		if ([subView isKindOfClass:[NSTextField class]] && ![(NSTextField*)subView isEditable]) {
+				[(NSTextField*)subView setTextColor:isEnabled ? [NSColor controlTextColor] : [NSColor disabledControlTextColor]];
+		} else {
+			if ([subView respondsToSelector:@selector(setEnabled:)]) {
+				[(NSControl*)subView setEnabled:isEnabled];
+			}
+		}
+	}
+}
+
+- (IBAction)resetPreferences:(id)sender
+{
+	[[NSUserDefaults standardUserDefaults] removeObjectForKey:PrefsKey];
+	[self loadValues];
+}
+
+- (void)loadValues
+{
+	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+
+	ReadConfig();
+
+	// load from preferences
+	RELEASEOBJ(keyValues);
+	keyValues = [[defaults dictionaryForKey:PrefsKey] mutableCopy];
+
+	[enabledButton setState: [[keyValues objectForKey:kSioEnabled] boolValue] ? NSOnState : NSOffState];
+	[ipAddressField setTitleWithMnemonic:[keyValues objectForKey:kSioIPAddress]];
+	[portField setIntValue:[[keyValues objectForKey:kSioPort] intValue]];
+	
+	switch ([[keyValues objectForKey:kSioPlayer] integerValue]) {
+		default:
+		case PLAYER_DISABLED: [playerMenu selectItemAtIndex:0]; break;
+		case PLAYER_MASTER: [playerMenu selectItemAtIndex:1]; break;
+		case PLAYER_SLAVE: [playerMenu selectItemAtIndex:2]; break;
+	}
+	
+	[self toggleEnabled:nil];
+}
+
+- (void)awakeFromNib
+{
+}
+
+@end
+
+#import "OSXPlugLocalization.h"
+PLUGLOCIMP([PluginConfigController class]);

pcsxr-1.9.93.tar.bz2/macosx/plugins/Bladesio1/macsrc/cfg.c Added

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2010, Wei Mingzhi <whistler@openoffice.org>.
+ * All Rights Reserved.
+ *
+ * Based on: Cdrom for Psemu Pro like Emulators
+ * By: linuzappz <linuzappz@hotmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses>.
+ */
+
+#include <string.h>
+#include <stdint.h>
+#include "typedefs.h"
+#include "sio1.h"
+
+void AboutDlgProc();
+void ConfDlgProc();
+void ReadConfig();
+
+Settings settings;
+
+void settingsRead() {
+	settings.player = PLAYER_DISABLED;
+	strcpy(settings.ip, "127.0.0.1");
+	settings.port = 33307;
+
+	ReadConfig();
+}

pcsxr-1.9.93.tar.bz2/macosx/plugins/Bladesio1/version.plist Added

pcsxr-1.9.93.tar.bz2/macosx/plugins/DFCdrom/English.lproj/DFCdromPluginConfig.xib Added

@@ -0,0 +1,1418 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
+	<data>
+		<int key="IBDocument.SystemTarget">1070</int>
+		<string key="IBDocument.SystemVersion">12E55</string>
+		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
+		<string key="IBDocument.AppKitVersion">1187.39</string>
+		<string key="IBDocument.HIToolboxVersion">626.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			<string key="NS.object.0">3084</string>
+		</object>
+		<array key="IBDocument.IntegratedClassDependencies">
+			<string>IBNSLayoutConstraint</string>
+			<string>NSBox</string>
+			<string>NSButton</string>
+			<string>NSButtonCell</string>
+			<string>NSCustomObject</string>
+			<string>NSMenu</string>
+			<string>NSMenuItem</string>
+			<string>NSPopUpButton</string>
+			<string>NSPopUpButtonCell</string>
+			<string>NSSlider</string>
+			<string>NSSliderCell</string>
+			<string>NSTextField</string>
+			<string>NSTextFieldCell</string>
+			<string>NSView</string>
+			<string>NSWindowTemplate</string>
+		</array>
+		<array key="IBDocument.PluginDependencies">
+			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+		</array>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1058953981">
+			<object class="NSCustomObject" id="509300364">
+				<string key="NSClassName">DFCdromPluginConfigController</string>
+			</object>
+			<object class="NSCustomObject" id="141927618">
+				<string key="NSClassName">FirstResponder</string>
+			</object>
+			<object class="NSCustomObject" id="44201914">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSWindowTemplate" id="151678379">
+				<int key="NSWindowStyleMask">1</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{131, 362}, {377, 238}}</string>
+				<int key="NSWTFlags">1886912512</int>
+				<string key="NSWindowTitle">CDR Configuration</string>
+				<string key="NSWindowClass">NSWindow</string>
+				<object class="NSMutableString" key="NSViewClass">
+					<characters key="NS.bytes">View</characters>
+				</object>
+				<nil key="NSUserInterfaceItemIdentifier"/>
+				<string key="NSWindowContentMinSize">{377, 238}</string>
+				<object class="NSView" key="NSWindowView" id="127793487">
+					<reference key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<array class="NSMutableArray" key="NSSubviews">
+						<object class="NSBox" id="548324376">
+							<reference key="NSNextResponder" ref="127793487"/>
+							<int key="NSvFlags">256</int>
+							<array class="NSMutableArray" key="NSSubviews">
+								<object class="NSView" id="418330975">
+									<reference key="NSNextResponder" ref="548324376"/>
+									<int key="NSvFlags">274</int>
+									<array class="NSMutableArray" key="NSSubviews">
+										<object class="NSButton" id="496450943">
+											<reference key="NSNextResponder" ref="418330975"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrame">{{15, 21}, {151, 18}}</string>
+											<reference key="NSSuperview" ref="418330975"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="115811219"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSButtonCell" key="NSCell" id="1007528481">
+												<int key="NSCellFlags">67108864</int>
+												<int key="NSCellFlags2">0</int>
+												<string key="NSContents">Use Cached Reading</string>
+												<object class="NSFont" key="NSSupport" id="918131184">
+													<string key="NSName">LucidaGrande</string>
+													<double key="NSSize">13</double>
+													<int key="NSfFlags">1044</int>
+												</object>
+												<reference key="NSControlView" ref="496450943"/>
+												<int key="NSButtonFlags">1211912448</int>
+												<int key="NSButtonFlags2">2</int>
+												<object class="NSCustomResource" key="NSNormalImage">
+													<string key="NSClassName">NSImage</string>
+													<string key="NSResourceName">NSSwitch</string>
+												</object>
+												<object class="NSButtonImageSource" key="NSAlternateImage">
+													<string key="NSImageName">NSSwitch</string>
+												</object>
+												<string key="NSAlternateContents"/>
+												<string key="NSKeyEquivalent"/>
+												<int key="NSPeriodicDelay">200</int>
+												<int key="NSPeriodicInterval">25</int>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSPopUpButton" id="261802645">
+											<reference key="NSNextResponder" ref="418330975"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrame">{{128, 40}, {197, 26}}</string>
+											<reference key="NSSuperview" ref="418330975"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="496450943"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSPopUpButtonCell" key="NSCell" id="255050593">
+												<int key="NSCellFlags">-2076180416</int>
+												<int key="NSCellFlags2">2048</int>
+												<reference key="NSSupport" ref="918131184"/>
+												<reference key="NSControlView" ref="261802645"/>
+												<int key="NSButtonFlags">109199360</int>
+												<int key="NSButtonFlags2">1</int>
+												<object class="NSFont" key="NSAlternateImage">
+													<string key="NSName">LucidaGrande</string>
+													<double key="NSSize">13</double>
+													<int key="NSfFlags">16</int>
+												</object>
+												<string key="NSAlternateContents"/>
+												<object class="NSMutableString" key="NSKeyEquivalent">
+													<characters key="NS.bytes"/>
+												</object>
+												<int key="NSPeriodicDelay">400</int>
+												<int key="NSPeriodicInterval">75</int>
+												<object class="NSMenuItem" key="NSMenuItem" id="1063899678">
+													<reference key="NSMenu" ref="145165516"/>
+													<string key="NSTitle">Default</string>
+													<string key="NSKeyEquiv"/>
+													<int key="NSKeyEquivModMask">1048576</int>
+													<int key="NSMnemonicLoc">2147483647</int>
+													<int key="NSState">1</int>
+													<object class="NSCustomResource" key="NSOnImage" id="95901124">
+														<string key="NSClassName">NSImage</string>
+														<string key="NSResourceName">NSMenuCheckmark</string>
+													</object>
+													<object class="NSCustomResource" key="NSMixedImage" id="155122072">
+														<string key="NSClassName">NSImage</string>
+														<string key="NSResourceName">NSMenuMixedState</string>
+													</object>
+													<string key="NSAction">_popUpItemAction:</string>
+													<reference key="NSTarget" ref="255050593"/>
+												</object>
+												<bool key="NSMenuItemRespectAlignment">YES</bool>
+												<object class="NSMenu" key="NSMenu" id="145165516">
+													<object class="NSMutableString" key="NSTitle">
+														<characters key="NS.bytes">OtherViews</characters>
+													</object>
+													<array class="NSMutableArray" key="NSMenuItems">
+														<reference ref="1063899678"/>
+														<object class="NSMenuItem" id="1059898521">
+															<reference key="NSMenu" ref="145165516"/>
+															<string key="NSTitle">1 X</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSKeyEquivModMask">1048576</int>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="95901124"/>
+															<reference key="NSMixedImage" ref="155122072"/>
+															<string key="NSAction">_popUpItemAction:</string>
+															<int key="NSTag">1</int>
+															<reference key="NSTarget" ref="255050593"/>
+														</object>
+														<object class="NSMenuItem" id="527290898">
+															<reference key="NSMenu" ref="145165516"/>
+															<string key="NSTitle">2 X</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSKeyEquivModMask">1048576</int>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="95901124"/>
+															<reference key="NSMixedImage" ref="155122072"/>
+															<string key="NSAction">_popUpItemAction:</string>
+															<int key="NSTag">2</int>
+															<reference key="NSTarget" ref="255050593"/>
+														</object>
+														<object class="NSMenuItem" id="908287039">
+															<reference key="NSMenu" ref="145165516"/>
+															<string key="NSTitle">4 X</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSKeyEquivModMask">1048576</int>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="95901124"/>
+															<reference key="NSMixedImage" ref="155122072"/>
+															<string key="NSAction">_popUpItemAction:</string>
+															<int key="NSTag">4</int>
+															<reference key="NSTarget" ref="255050593"/>
+														</object>
+														<object class="NSMenuItem" id="875353175">
+															<reference key="NSMenu" ref="145165516"/>
+															<string key="NSTitle">8 X</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSKeyEquivModMask">1048576</int>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="95901124"/>
+															<reference key="NSMixedImage" ref="155122072"/>
+															<string key="NSAction">_popUpItemAction:</string>
+															<int key="NSTag">8</int>
+															<reference key="NSTarget" ref="255050593"/>
+														</object>
+														<object class="NSMenuItem" id="31683939">
+															<reference key="NSMenu" ref="145165516"/>
+															<string key="NSTitle">16 X</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSKeyEquivModMask">1048576</int>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="95901124"/>
+															<reference key="NSMixedImage" ref="155122072"/>
+															<string key="NSAction">_popUpItemAction:</string>
+															<int key="NSTag">16</int>
+															<reference key="NSTarget" ref="255050593"/>
+														</object>
+														<object class="NSMenuItem" id="349933729">
+															<reference key="NSMenu" ref="145165516"/>
+															<string key="NSTitle">32 X</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSKeyEquivModMask">1048576</int>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="95901124"/>
+															<reference key="NSMixedImage" ref="155122072"/>
+															<string key="NSAction">_popUpItemAction:</string>
+															<int key="NSTag">32</int>
+															<reference key="NSTarget" ref="255050593"/>
+														</object>
+													</array>
+												</object>
+												<int key="NSSelectedIndex">-1</int>
+												<int key="NSPreferredEdge">3</int>
+												<bool key="NSUsesItemFromMenu">YES</bool>
+												<bool key="NSAltersState">YES</bool>
+												<int key="NSArrowPosition">1</int>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSTextField" id="407025464">
+											<reference key="NSNextResponder" ref="418330975"/>
+											<int key="NSvFlags">268</int>
+											<string key="NSFrame">{{14, 46}, {106, 17}}</string>
+											<reference key="NSSuperview" ref="418330975"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="261802645"/>
+											<string key="NSReuseIdentifierKey">_NS:1535</string>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTextFieldCell" key="NSCell" id="19359913">
+												<int key="NSCellFlags">68157504</int>
+												<int key="NSCellFlags2">272630784</int>
+												<string key="NSContents">CD-ROM Speed:</string>
+												<reference key="NSSupport" ref="918131184"/>
+												<string key="NSCellIdentifier">_NS:1535</string>
+												<reference key="NSControlView" ref="407025464"/>
+												<object class="NSColor" key="NSBackgroundColor" id="898725700">
+													<int key="NSColorSpace">6</int>
+													<string key="NSCatalogName">System</string>
+													<string key="NSColorName">controlColor</string>
+													<object class="NSColor" key="NSColor">
+														<int key="NSColorSpace">3</int>
+														<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+													</object>
+												</object>
+												<object class="NSColor" key="NSTextColor" id="930899956">
+													<int key="NSColorSpace">6</int>
+													<string key="NSCatalogName">System</string>
+													<string key="NSColorName">controlTextColor</string>
+													<object class="NSColor" key="NSColor">
+														<int key="NSColorSpace">3</int>
+														<bytes key="NSWhite">MAA</bytes>
+													</object>
+												</object>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+									</array>
+									<string key="NSFrame">{{2, 2}, {339, 73}}</string>
+									<reference key="NSSuperview" ref="548324376"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="407025464"/>
+								</object>
+							</array>
+							<string key="NSFrame">{{17, 128}, {343, 90}}</string>
+							<reference key="NSSuperview" ref="127793487"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="418330975"/>
+							<string key="NSOffsets">{0, 0}</string>
+							<object class="NSTextFieldCell" key="NSTitleCell">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">0</int>
+								<string key="NSContents">General Settings</string>
+								<object class="NSFont" key="NSSupport" id="26">
+									<string key="NSName">LucidaGrande</string>
+									<double key="NSSize">11</double>
+									<int key="NSfFlags">3100</int>
+								</object>
+								<object class="NSColor" key="NSBackgroundColor" id="724614546">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">textBackgroundColor</string>
+									<object class="NSColor" key="NSColor">
+										<int key="NSColorSpace">3</int>
+										<bytes key="NSWhite">MQA</bytes>
+									</object>
+								</object>
+								<object class="NSColor" key="NSTextColor">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
+								</object>
+							</object>
+							<reference key="NSContentView" ref="418330975"/>
+							<int key="NSBorderType">3</int>
+							<int key="NSBoxType">0</int>
+							<int key="NSTitlePosition">2</int>
+							<bool key="NSTransparent">NO</bool>
+						</object>
+						<object class="NSBox" id="115811219">
+							<reference key="NSNextResponder" ref="127793487"/>
+							<int key="NSvFlags">256</int>
+							<array class="NSMutableArray" key="NSSubviews">
+								<object class="NSView" id="201726531">
+									<reference key="NSNextResponder" ref="115811219"/>
+									<int key="NSvFlags">274</int>
+									<array class="NSMutableArray" key="NSSubviews">
+										<object class="NSTextField" id="273919177">
+											<reference key="NSNextResponder" ref="201726531"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrame">{{14, 21}, {114, 17}}</string>
+											<reference key="NSSuperview" ref="201726531"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="875846271"/>
+											<string key="NSAntiCompressionPriority">{250, 750}</string>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTextFieldCell" key="NSCell" id="252874191">
+												<int key="NSCellFlags">67108864</int>
+												<int key="NSCellFlags2">272629760</int>
+												<string type="base64-UTF8" key="NSContents">Q2FjaGUgU2l6ZToKA</string>
+												<reference key="NSSupport" ref="918131184"/>
+												<reference key="NSControlView" ref="273919177"/>
+												<reference key="NSBackgroundColor" ref="898725700"/>
+												<reference key="NSTextColor" ref="930899956"/>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSSlider" id="875846271">
+											<reference key="NSNextResponder" ref="201726531"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrame">{{129, 15}, {195, 25}}</string>
+											<reference key="NSSuperview" ref="201726531"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="1063312421"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSSliderCell" key="NSCell" id="456056995">
+												<int key="NSCellFlags">67108864</int>
+												<int key="NSCellFlags2">0</int>
+												<object class="NSMutableString" key="NSContents">
+													<characters key="NS.bytes"/>
+												</object>
+												<object class="NSFont" key="NSSupport">
+													<string key="NSName">Helvetica</string>
+													<double key="NSSize">12</double>
+													<int key="NSfFlags">16</int>
+												</object>
+												<reference key="NSControlView" ref="875846271"/>
+												<double key="NSMaxValue">512</double>
+												<double key="NSMinValue">32</double>
+												<double key="NSValue">64</double>
+												<double key="NSAltIncValue">0.0</double>
+												<int key="NSNumberOfTickMarks">16</int>
+												<int key="NSTickMarkPosition">0</int>
+												<bool key="NSAllowsTickMarkValuesOnly">YES</bool>
+												<bool key="NSVertical">NO</bool>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+									</array>
+									<string key="NSFrame">{{2, 2}, {339, 51}}</string>
+									<reference key="NSSuperview" ref="115811219"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="273919177"/>
+								</object>
+							</array>
+							<string key="NSFrame">{{17, 56}, {343, 68}}</string>
+							<reference key="NSSuperview" ref="127793487"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="201726531"/>
+							<string key="NSOffsets">{0, 0}</string>
+							<object class="NSTextFieldCell" key="NSTitleCell">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">0</int>
+								<string key="NSContents">Misc</string>
+								<reference key="NSSupport" ref="26"/>
+								<reference key="NSBackgroundColor" ref="724614546"/>
+								<object class="NSColor" key="NSTextColor">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
+								</object>
+							</object>
+							<reference key="NSContentView" ref="201726531"/>
+							<int key="NSBorderType">3</int>
+							<int key="NSBoxType">0</int>
+							<int key="NSTitlePosition">2</int>
+							<bool key="NSTransparent">NO</bool>
+						</object>
+						<object class="NSButton" id="365515886">
+							<reference key="NSNextResponder" ref="127793487"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{304, 13}, {59, 32}}</string>
+							<reference key="NSSuperview" ref="127793487"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="730105092">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">OK</string>
+								<reference key="NSSupport" ref="918131184"/>
+								<string key="NSCellIdentifier">_NS:9</string>
+								<reference key="NSControlView" ref="365515886"/>
+								<int key="NSButtonFlags">-2038284288</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSButton" id="1063312421">
+							<reference key="NSNextResponder" ref="127793487"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{222, 13}, {82, 32}}</string>
+							<reference key="NSSuperview" ref="127793487"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="365515886"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="663420633">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Cancel</string>
+								<reference key="NSSupport" ref="918131184"/>
+								<string key="NSCellIdentifier">_NS:9</string>
+								<reference key="NSControlView" ref="1063312421"/>
+								<int key="NSButtonFlags">-2038284288</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string type="base64-UTF8" key="NSKeyEquivalent">Gw</string>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+					</array>
+					<string key="NSFrameSize">{377, 238}</string>
+					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
+					<reference key="NSNextKeyView" ref="548324376"/>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
+				<string key="NSMinSize">{377, 260}</string>
+				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
+				<bool key="NSWindowIsRestorable">YES</bool>
+			</object>
+		</array>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<array class="NSMutableArray" key="connectionRecords">
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">window</string>
+						<reference key="source" ref="509300364"/>
+						<reference key="destination" ref="151678379"/>
+					</object>
+					<int key="connectionID">141</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">Cached</string>
+						<reference key="source" ref="509300364"/>
+						<reference key="destination" ref="496450943"/>
+					</object>
+					<int key="connectionID">183</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">CdSpeed</string>
+						<reference key="source" ref="509300364"/>
+						<reference key="destination" ref="261802645"/>
+					</object>
+					<int key="connectionID">182</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">CacheSize</string>
+						<reference key="source" ref="509300364"/>
+						<reference key="destination" ref="875846271"/>
+					</object>
+					<int key="connectionID">184</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">ok:</string>
+						<reference key="source" ref="509300364"/>
+						<reference key="destination" ref="365515886"/>
+					</object>
+					<int key="connectionID">246</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">cancel:</string>
+						<reference key="source" ref="509300364"/>
+						<reference key="destination" ref="1063312421"/>
+					</object>
+					<int key="connectionID">254</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="151678379"/>
+						<reference key="destination" ref="509300364"/>
+					</object>
+					<int key="connectionID">158</int>
+				</object>
+			</array>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<array key="orderedObjects">
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<array key="object" id="0"/>
+						<reference key="children" ref="1058953981"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="509300364"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="141927618"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">First Responder</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5</int>
+						<reference key="object" ref="151678379"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="127793487"/>
+						</array>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Window</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6</int>
+						<reference key="object" ref="127793487"/>
+						<array class="NSMutableArray" key="children">
+							<object class="IBNSLayoutConstraint" id="411335159">
+								<reference key="firstItem" ref="365515886"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1063312421"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">12</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="127793487"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="306783264">
+								<reference key="firstItem" ref="127793487"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="365515886"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="127793487"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="1037500697">
+								<reference key="firstItem" ref="127793487"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="365515886"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="127793487"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="208283560">
+								<reference key="firstItem" ref="127793487"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1063312421"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="127793487"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="507253574">
+								<reference key="firstItem" ref="127793487"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="115811219"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">60</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="127793487"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="601640147">
+								<reference key="firstItem" ref="115811219"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="127793487"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">114</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="127793487"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="605450428">
+								<reference key="firstItem" ref="115811219"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="548324376"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="127793487"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="217102302">
+								<reference key="firstItem" ref="127793487"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="115811219"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="127793487"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="620410134">
+								<reference key="firstItem" ref="115811219"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="127793487"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="127793487"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="451730366">
+								<reference key="firstItem" ref="548324376"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="127793487"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="127793487"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="1015122418">
+								<reference key="firstItem" ref="127793487"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="548324376"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="127793487"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="581634083">
+								<reference key="firstItem" ref="548324376"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="127793487"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="127793487"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<reference ref="115811219"/>
+							<reference ref="548324376"/>
+							<reference ref="365515886"/>
+							<reference ref="1063312421"/>
+						</array>
+						<reference key="parent" ref="151678379"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">162</int>
+						<reference key="object" ref="548324376"/>
+						<array class="NSMutableArray" key="children">
+							<object class="IBNSLayoutConstraint" id="426382379">
+								<reference key="firstItem" ref="261802645"/>
+								<int key="firstAttribute">11</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="407025464"/>
+								<int key="secondAttribute">11</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="548324376"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="1033821477">
+								<reference key="firstItem" ref="548324376"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="261802645"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="548324376"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="988114732">
+								<reference key="firstItem" ref="261802645"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="548324376"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">24</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="548324376"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="1005115902">
+								<reference key="firstItem" ref="548324376"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="496450943"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">21</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="548324376"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="337351356">
+								<reference key="firstItem" ref="496450943"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="548324376"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="548324376"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="994684500">
+								<reference key="firstItem" ref="407025464"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="548324376"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="548324376"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<reference ref="496450943"/>
+							<reference ref="261802645"/>
+							<reference ref="407025464"/>
+						</array>
+						<reference key="parent" ref="127793487"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">164</int>
+						<reference key="object" ref="115811219"/>
+						<array class="NSMutableArray" key="children">
+							<object class="IBNSLayoutConstraint" id="39424559">
+								<reference key="firstItem" ref="115811219"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="875846271"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="115811219"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="607122518">
+								<reference key="firstItem" ref="875846271"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="273919177"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="115811219"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="734043226">
+								<reference key="firstItem" ref="273919177"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="115811219"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">28</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="115811219"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="651660950">
+								<reference key="firstItem" ref="273919177"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="115811219"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="115811219"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<reference ref="273919177"/>
+							<reference ref="875846271"/>
+						</array>
+						<reference key="parent" ref="127793487"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-3</int>
+						<reference key="object" ref="44201914"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Application</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">169</int>
+						<reference key="object" ref="496450943"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1007528481"/>
+						</array>
+						<reference key="parent" ref="548324376"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">189</int>
+						<reference key="object" ref="1007528481"/>
+						<reference key="parent" ref="496450943"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">173</int>
+						<reference key="object" ref="261802645"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="255050593"/>
+							<object class="IBNSLayoutConstraint" id="507785914">
+								<reference key="firstItem" ref="261802645"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">192</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="261802645"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="548324376"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">190</int>
+						<reference key="object" ref="255050593"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="145165516"/>
+						</array>
+						<reference key="parent" ref="261802645"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">174</int>
+						<reference key="object" ref="145165516"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="527290898"/>
+							<reference ref="1063899678"/>
+							<reference ref="1059898521"/>
+							<reference ref="875353175"/>
+							<reference ref="908287039"/>
+							<reference ref="31683939"/>
+							<reference ref="349933729"/>
+						</array>
+						<reference key="parent" ref="255050593"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">175</int>
+						<reference key="object" ref="527290898"/>
+						<reference key="parent" ref="145165516"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">176</int>
+						<reference key="object" ref="1063899678"/>
+						<reference key="parent" ref="145165516"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">177</int>
+						<reference key="object" ref="1059898521"/>
+						<reference key="parent" ref="145165516"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">178</int>
+						<reference key="object" ref="875353175"/>
+						<reference key="parent" ref="145165516"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">179</int>
+						<reference key="object" ref="908287039"/>
+						<reference key="parent" ref="145165516"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">180</int>
+						<reference key="object" ref="31683939"/>
+						<reference key="parent" ref="145165516"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">181</int>
+						<reference key="object" ref="349933729"/>
+						<reference key="parent" ref="145165516"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">171</int>
+						<reference key="object" ref="273919177"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="252874191"/>
+							<object class="IBNSLayoutConstraint" id="918930772">
+								<reference key="firstItem" ref="273919177"/>
+								<int key="firstAttribute">8</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">17</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="273919177"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="779760641">
+								<reference key="firstItem" ref="273919177"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">108</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="273919177"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="115811219"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">191</int>
+						<reference key="object" ref="252874191"/>
+						<reference key="parent" ref="273919177"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">172</int>
+						<reference key="object" ref="875846271"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="456056995"/>
+							<object class="IBNSLayoutConstraint" id="642626949">
+								<reference key="firstItem" ref="875846271"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">191</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="875846271"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="115811219"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">192</int>
+						<reference key="object" ref="456056995"/>
+						<reference key="parent" ref="875846271"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">212</int>
+						<reference key="object" ref="581634083"/>
+						<reference key="parent" ref="127793487"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">213</int>
+						<reference key="object" ref="1015122418"/>
+						<reference key="parent" ref="127793487"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">215</int>
+						<reference key="object" ref="620410134"/>
+						<reference key="parent" ref="127793487"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">216</int>
+						<reference key="object" ref="217102302"/>
+						<reference key="parent" ref="127793487"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">217</int>
+						<reference key="object" ref="451730366"/>
+						<reference key="parent" ref="127793487"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">220</int>
+						<reference key="object" ref="779760641"/>
+						<reference key="parent" ref="273919177"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">221</int>
+						<reference key="object" ref="918930772"/>
+						<reference key="parent" ref="273919177"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">222</int>
+						<reference key="object" ref="642626949"/>
+						<reference key="parent" ref="875846271"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">224</int>
+						<reference key="object" ref="605450428"/>
+						<reference key="parent" ref="127793487"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">236</int>
+						<reference key="object" ref="337351356"/>
+						<reference key="parent" ref="548324376"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">238</int>
+						<reference key="object" ref="607122518"/>
+						<reference key="parent" ref="115811219"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">239</int>
+						<reference key="object" ref="651660950"/>
+						<reference key="parent" ref="115811219"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">240</int>
+						<reference key="object" ref="734043226"/>
+						<reference key="parent" ref="115811219"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">241</int>
+						<reference key="object" ref="39424559"/>
+						<reference key="parent" ref="115811219"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">242</int>
+						<reference key="object" ref="365515886"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="730105092"/>
+						</array>
+						<reference key="parent" ref="127793487"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">243</int>
+						<reference key="object" ref="730105092"/>
+						<reference key="parent" ref="365515886"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">245</int>
+						<reference key="object" ref="1037500697"/>
+						<reference key="parent" ref="127793487"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">247</int>
+						<reference key="object" ref="507253574"/>
+						<reference key="parent" ref="127793487"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">249</int>
+						<reference key="object" ref="306783264"/>
+						<reference key="parent" ref="127793487"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">250</int>
+						<reference key="object" ref="1063312421"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="663420633"/>
+						</array>
+						<reference key="parent" ref="127793487"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">251</int>
+						<reference key="object" ref="663420633"/>
+						<reference key="parent" ref="1063312421"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">252</int>
+						<reference key="object" ref="411335159"/>
+						<reference key="parent" ref="127793487"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">253</int>
+						<reference key="object" ref="208283560"/>
+						<reference key="parent" ref="127793487"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">232</int>
+						<reference key="object" ref="988114732"/>
+						<reference key="parent" ref="548324376"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">234</int>
+						<reference key="object" ref="1033821477"/>
+						<reference key="parent" ref="548324376"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">225</int>
+						<reference key="object" ref="601640147"/>
+						<reference key="parent" ref="127793487"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">266</int>
+						<reference key="object" ref="407025464"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="19359913"/>
+						</array>
+						<reference key="parent" ref="548324376"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">267</int>
+						<reference key="object" ref="19359913"/>
+						<reference key="parent" ref="407025464"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">270</int>
+						<reference key="object" ref="1005115902"/>
+						<reference key="parent" ref="548324376"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">271</int>
+						<reference key="object" ref="507785914"/>
+						<reference key="parent" ref="261802645"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">272</int>
+						<reference key="object" ref="426382379"/>
+						<reference key="parent" ref="548324376"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">273</int>
+						<reference key="object" ref="994684500"/>
+						<reference key="parent" ref="548324376"/>
+					</object>
+				</array>
+			</object>
+			<dictionary class="NSMutableDictionary" key="flattenedProperties">
+				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array class="NSMutableArray" key="162.IBNSViewMetadataConstraints">
+					<reference ref="994684500"/>
+					<reference ref="337351356"/>
+					<reference ref="1005115902"/>
+					<reference ref="988114732"/>
+					<reference ref="1033821477"/>
+					<reference ref="426382379"/>
+				</array>
+				<boolean value="NO" key="162.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="162.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array class="NSMutableArray" key="164.IBNSViewMetadataConstraints">
+					<reference ref="651660950"/>
+					<reference ref="734043226"/>
+					<reference ref="607122518"/>
+					<reference ref="39424559"/>
+				</array>
+				<boolean value="NO" key="164.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="164.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="169.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="169.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="171.IBNSViewMetadataConstraints">
+					<reference ref="779760641"/>
+					<reference ref="918930772"/>
+				</array>
+				<boolean value="NO" key="171.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="171.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="172.IBNSViewMetadataConstraints">
+					<reference ref="642626949"/>
+				</array>
+				<boolean value="NO" key="172.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="172.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="173.IBNSViewMetadataConstraints">
+					<reference ref="507785914"/>
+				</array>
+				<boolean value="NO" key="173.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="173.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="174.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="175.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="176.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="177.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="178.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="179.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="180.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="181.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="189.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="190.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="191.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="192.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="212.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="213.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="215.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="216.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="217.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="220.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="221.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="222.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="224.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="225.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="232.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="234.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="236.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="238.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="239.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="240.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="241.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="242.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="242.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="243.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="245.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="247.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="249.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="250.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="250.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="251.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="252.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="253.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="266.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="266.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="267.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="270.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="271.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="272.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="273.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="6.IBNSViewMetadataConstraints">
+					<reference ref="581634083"/>
+					<reference ref="1015122418"/>
+					<reference ref="451730366"/>
+					<reference ref="620410134"/>
+					<reference ref="217102302"/>
+					<reference ref="605450428"/>
+					<reference ref="601640147"/>
+					<reference ref="507253574"/>
+					<reference ref="208283560"/>
+					<reference ref="1037500697"/>
+					<reference ref="306783264"/>
+					<reference ref="411335159"/>
+				</array>
+				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			</dictionary>
+			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+			<nil key="activeLocalization"/>
+			<dictionary class="NSMutableDictionary" key="localizations"/>
+			<nil key="sourceID"/>
+			<int key="maxID">273</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">NSLayoutConstraint</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/NSLayoutConstraint.h</string>
+					</object>
+				</object>
+			</array>
+		</object>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<real value="1070" key="NS.object.0"/>
+		</object>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<string key="NSMenuCheckmark">{11, 11}</string>
+			<string key="NSMenuMixedState">{10, 3}</string>
+			<string key="NSSwitch">{15, 15}</string>
+		</dictionary>
+		<bool key="IBDocument.UseAutolayout">YES</bool>
+	</data>
+</archive>

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFCdrom/English.lproj/InfoPlist.strings -> pcsxr-1.9.93.tar.bz2/macosx/plugins/DFCdrom/English.lproj/InfoPlist.strings Changed

pcsxr-1.9.93.tar.bz2/macosx/plugins/DFCdrom/English.lproj/Localizable.strings Added

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFCdrom/Info.plist -> pcsxr-1.9.93.tar.bz2/macosx/plugins/DFCdrom/Info.plist Changed

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFCdrom/macsrc/PluginConfigController.m -> pcsxr-1.9.93.tar.bz2/macosx/plugins/DFCdrom/macsrc/PluginConfigController.m Changed

@@ -21,26 +21,37 @@
 
 #import "PluginConfigController.h"
 #include "cdr.h"
+#import "ARCBridge.h"
 
-#define APP_ID @"net.pcsx.DFCdrom"
+#define APP_ID @"net.pcsxr.DFCdrom"
 #define PrefsKey APP_ID @" Settings"
 
-static PluginConfigController *windowController;
+static inline void RunOnMainThreadSync(dispatch_block_t block)
+{
+	if ([NSThread isMainThread]) {
+		block();
+	} else {
+		dispatch_sync(dispatch_get_main_queue(), block);
+	}
+}
+
+static PluginConfigController *windowController = nil;
 
 void AboutDlgProc()
 {
 	// Get parent application instance
-	NSApplication *app = [NSApplication sharedApplication];
 	NSBundle *bundle = [NSBundle bundleWithIdentifier:APP_ID];
 
 	// Get Credits.rtf
 	NSString *path = [bundle pathForResource:@"Credits" ofType:@"rtf"];
 	NSAttributedString *credits;
 	if (path) {
-		credits = [[[NSAttributedString alloc] initWithPath: path
-				documentAttributes:NULL] autorelease];
+		credits = [[NSAttributedString alloc] initWithPath: path
+				documentAttributes:NULL];
+		AUTORELEASEOBJNORETURN(credits);
+		
 	} else {
-		credits = [[[NSAttributedString alloc] initWithString:@""] autorelease];
+		credits = AUTORELEASEOBJ([[NSAttributedString alloc] initWithString:@""]);
 	}
 
 	// Get Application Icon
@@ -48,29 +59,36 @@
 	NSSize size = NSMakeSize(64, 64);
 	[icon setSize:size];
 
-	[app orderFrontStandardAboutPanelWithOptions:[NSDictionary dictionaryWithObjectsAndKeys:
-			[bundle objectForInfoDictionaryKey:@"CFBundleName"], @"ApplicationName",
-			icon, @"ApplicationIcon",
-			[bundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"], @"ApplicationVersion",
-			[bundle objectForInfoDictionaryKey:@"CFBundleVersion"], @"Version",
-			[bundle objectForInfoDictionaryKey:@"NSHumanReadableCopyright"], @"Copyright",
-			credits, @"Credits",
-			nil]];
+	NSDictionary *infoPaneDict =
+	[[NSDictionary alloc] initWithObjectsAndKeys:
+	 [bundle objectForInfoDictionaryKey:@"CFBundleName"], @"ApplicationName",
+	 icon, @"ApplicationIcon",
+	 [bundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"], @"ApplicationVersion",
+	 [bundle objectForInfoDictionaryKey:@"CFBundleVersion"], @"Version",
+	 [bundle objectForInfoDictionaryKey:@"NSHumanReadableCopyright"], @"Copyright",
+	 credits, @"Credits",
+	 nil];
+	dispatch_async(dispatch_get_main_queue(), ^{
+		[NSApp orderFrontStandardAboutPanelWithOptions:infoPaneDict];
+	});
+	RELEASEOBJ(infoPaneDict);
 }
 
 void ConfDlgProc()
 {
-	NSWindow *window;
-
-	if (windowController == nil) {
-		windowController = [[PluginConfigController alloc] initWithWindowNibName:@"DFCdromPluginConfig"];
-	}
-	window = [windowController window];
-
-	[windowController loadValues];
-
-	[window center];
-	[window makeKeyAndOrderFront:nil];
+	RunOnMainThreadSync(^{
+		NSWindow *window;
+		
+		if (windowController == nil) {
+			windowController = [[PluginConfigController alloc] initWithWindowNibName:@"DFCdromPluginConfig"];
+		}
+		window = [windowController window];
+		
+		[windowController loadValues];
+		
+		[window center];
+		[window makeKeyAndOrderFront:nil];
+	});
 }
 
 void ReadConfig()
@@ -78,10 +96,10 @@
 	NSDictionary *keyValues;
 	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
 	[defaults registerDefaults:[NSDictionary dictionaryWithObjectsAndKeys:
-		[[NSMutableDictionary alloc] initWithObjectsAndKeys:
-			[NSNumber numberWithBool:YES], @"Threaded",
-			[NSNumber numberWithInt:64], @"Cache Size",
-			[NSNumber numberWithInt:0], @"Speed",
+		[NSDictionary dictionaryWithObjectsAndKeys:
+			@YES, @"Threaded",
+			@64, @"Cache Size",
+			@0, @"Speed",
 			nil], PrefsKey, nil]];
 
 	keyValues = [defaults dictionaryForKey:PrefsKey];
@@ -104,17 +122,17 @@
 
 	NSMutableDictionary *writeDic = [NSMutableDictionary dictionaryWithDictionary:keyValues];
 
-	[writeDic setObject:[NSNumber numberWithInt:[Cached intValue]] forKey:@"Threaded"];
-	[writeDic setObject:[NSNumber numberWithInt:[CacheSize intValue]] forKey:@"Cache Size"];
+	[writeDic setObject:@((BOOL)[Cached intValue]) forKey:@"Threaded"];
+	[writeDic setObject:@([CacheSize intValue]) forKey:@"Cache Size"];
 
 	switch ([CdSpeed indexOfSelectedItem]) {
-		case 1: [writeDic setObject:[NSNumber numberWithInt:1] forKey:@"Speed"]; break;
-		case 2: [writeDic setObject:[NSNumber numberWithInt:2] forKey:@"Speed"]; break;
-		case 3: [writeDic setObject:[NSNumber numberWithInt:4] forKey:@"Speed"]; break;
-		case 4: [writeDic setObject:[NSNumber numberWithInt:8] forKey:@"Speed"]; break;
-		case 5: [writeDic setObject:[NSNumber numberWithInt:16] forKey:@"Speed"]; break;
-		case 6: [writeDic setObject:[NSNumber numberWithInt:32] forKey:@"Speed"]; break;
-		default: [writeDic setObject:[NSNumber numberWithInt:0] forKey:@"Speed"]; break;
+		case 1: [writeDic setObject:@1 forKey:@"Speed"]; break;
+		case 2: [writeDic setObject:@2 forKey:@"Speed"]; break;
+		case 3: [writeDic setObject:@4 forKey:@"Speed"]; break;
+		case 4: [writeDic setObject:@8 forKey:@"Speed"]; break;
+		case 5: [writeDic setObject:@16 forKey:@"Speed"]; break;
+		case 6: [writeDic setObject:@32 forKey:@"Speed"]; break;
+		default: [writeDic setObject:@0 forKey:@"Speed"]; break;
 	}
 
 	// write to defaults
@@ -134,8 +152,8 @@
 	ReadConfig();
 
 	// load from preferences
-	[keyValues release];
-	keyValues = [[defaults dictionaryForKey:PrefsKey] retain];
+	RELEASEOBJ(keyValues);
+	keyValues = [[defaults dictionaryForKey:PrefsKey] mutableCopy];
 
 	[Cached setIntValue:[[keyValues objectForKey:@"Threaded"] intValue]];
 	[CacheSize setIntValue:[[keyValues objectForKey:@"Cache Size"] intValue]];
@@ -156,3 +174,6 @@
 }
 
 @end
+
+#import "OSXPlugLocalization.h"
+PLUGLOCIMP([PluginConfigController class]);

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFCdrom/macsrc/cdr-macosx.c -> pcsxr-1.9.93.tar.bz2/macosx/plugins/DFCdrom/macsrc/cdr-macosx.c Changed

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/English.lproj/Credits.rtf -> pcsxr-1.9.93.tar.bz2/macosx/plugins/DFInput/English.lproj/Credits.rtf Changed

@@ -1,17 +1,18 @@
-{\rtf1\mac\ansicpg10025\cocoartf824\cocoasubrtf420
-{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;}
+{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf510
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
 \vieww9000\viewh9000\viewkind0
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
 \f0\b\fs24 \cf0 Macintosh Port:
-\f1\b0 \
+\b0 \
   Wei Mingzhi\
   Gil Pedersen\
+  Nicolas P\'e9pin-Perreault\
 \
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
-\f0\b \cf0 Original coder:
-\f1\b0 \
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+\b \cf0 Original coder:
+\b0 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 \cf0   Wei Mingzhi}
\ No newline at end of file

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/English.lproj/InfoPlist.strings -> pcsxr-1.9.93.tar.bz2/macosx/plugins/DFInput/English.lproj/InfoPlist.strings Changed

pcsxr-1.9.93.tar.bz2/macosx/plugins/DFInput/English.lproj/Localizable.strings Added

pcsxr-1.9.93.tar.bz2/macosx/plugins/DFInput/English.lproj/NetPcsxrHIDInputPluginMain.xib Added

@@ -0,0 +1,1921 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
+	<data>
+		<int key="IBDocument.SystemTarget">1070</int>
+		<string key="IBDocument.SystemVersion">12E55</string>
+		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
+		<string key="IBDocument.AppKitVersion">1187.39</string>
+		<string key="IBDocument.HIToolboxVersion">626.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			<string key="NS.object.0">3084</string>
+		</object>
+		<array key="IBDocument.IntegratedClassDependencies">
+			<string>IBNSLayoutConstraint</string>
+			<string>NSButton</string>
+			<string>NSButtonCell</string>
+			<string>NSCustomObject</string>
+			<string>NSCustomView</string>
+			<string>NSMenu</string>
+			<string>NSMenuItem</string>
+			<string>NSPopUpButton</string>
+			<string>NSPopUpButtonCell</string>
+			<string>NSScrollView</string>
+			<string>NSScroller</string>
+			<string>NSTabView</string>
+			<string>NSTabViewItem</string>
+			<string>NSTableColumn</string>
+			<string>NSTableHeaderView</string>
+			<string>NSTableView</string>
+			<string>NSTextField</string>
+			<string>NSTextFieldCell</string>
+			<string>NSView</string>
+			<string>NSWindowTemplate</string>
+		</array>
+		<array key="IBDocument.PluginDependencies">
+			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+		</array>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="46740775">
+			<object class="NSCustomObject" id="155314287">
+				<string key="NSClassName">NetPcsxrHIDInputPluginPadController</string>
+			</object>
+			<object class="NSCustomObject" id="880630677">
+				<string key="NSClassName">FirstResponder</string>
+			</object>
+			<object class="NSCustomObject" id="911229603">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSWindowTemplate" id="254157282">
+				<int key="NSWindowStyleMask">9</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{87, 281}, {463, 424}}</string>
+				<int key="NSWTFlags">813170688</int>
+				<string key="NSWindowTitle">Input Configuration</string>
+				<string key="NSWindowClass">NSWindow</string>
+				<object class="NSMutableString" key="NSViewClass">
+					<characters key="NS.bytes">View</characters>
+				</object>
+				<nil key="NSUserInterfaceItemIdentifier"/>
+				<string key="NSWindowContentMinSize">{310, 160}</string>
+				<object class="NSView" key="NSWindowView" id="608407176">
+					<reference key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<array class="NSMutableArray" key="NSSubviews">
+						<object class="NSTabView" id="1024964375">
+							<reference key="NSNextResponder" ref="608407176"/>
+							<int key="NSvFlags">274</int>
+							<string key="NSFrame">{{13, 40}, {437, 378}}</string>
+							<reference key="NSSuperview" ref="608407176"/>
+							<reference key="NSNextKeyView" ref="483107053"/>
+							<array class="NSMutableArray" key="NSTabViewItems">
+								<object class="NSTabViewItem" id="370841406">
+									<string key="NSIdentifier">pad1</string>
+									<object class="NSView" key="NSView" id="483107053">
+										<reference key="NSNextResponder" ref="1024964375"/>
+										<int key="NSvFlags">256</int>
+										<array class="NSMutableArray" key="NSSubviews">
+											<object class="NSCustomView" id="95744455">
+												<reference key="NSNextResponder" ref="483107053"/>
+												<int key="NSvFlags">274</int>
+												<string key="NSFrameSize">{417, 332}</string>
+												<reference key="NSSuperview" ref="483107053"/>
+												<reference key="NSNextKeyView" ref="539611283"/>
+												<string key="NSClassName">NSView</string>
+												<string key="NSExtension">NSResponder</string>
+											</object>
+										</array>
+										<string key="NSFrame">{{10, 33}, {417, 332}}</string>
+										<reference key="NSSuperview" ref="1024964375"/>
+										<reference key="NSNextKeyView" ref="95744455"/>
+									</object>
+									<string key="NSLabel">Controller 1</string>
+									<object class="NSColor" key="NSColor" id="809892731">
+										<int key="NSColorSpace">6</int>
+										<string key="NSCatalogName">System</string>
+										<string key="NSColorName">controlColor</string>
+										<object class="NSColor" key="NSColor" id="379011159">
+											<int key="NSColorSpace">3</int>
+											<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+										</object>
+									</object>
+									<reference key="NSTabView" ref="1024964375"/>
+								</object>
+								<object class="NSTabViewItem" id="1051126204">
+									<string key="NSIdentifier">pad2</string>
+									<object class="NSView" key="NSView" id="675134940">
+										<nil key="NSNextResponder"/>
+										<int key="NSvFlags">256</int>
+										<array class="NSMutableArray" key="NSSubviews">
+											<object class="NSCustomView" id="972925744">
+												<reference key="NSNextResponder" ref="675134940"/>
+												<int key="NSvFlags">274</int>
+												<string key="NSFrameSize">{417, 332}</string>
+												<reference key="NSSuperview" ref="675134940"/>
+												<string key="NSClassName">NSView</string>
+												<string key="NSExtension">NSResponder</string>
+											</object>
+										</array>
+										<string key="NSFrame">{{10, 33}, {417, 332}}</string>
+									</object>
+									<string key="NSLabel">Controller 2</string>
+									<reference key="NSColor" ref="809892731"/>
+									<reference key="NSTabView" ref="1024964375"/>
+								</object>
+							</array>
+							<reference key="NSSelectedTabViewItem" ref="370841406"/>
+							<object class="NSFont" key="NSFont" id="495247254">
+								<string key="NSName">LucidaGrande</string>
+								<double key="NSSize">13</double>
+								<int key="NSfFlags">1044</int>
+							</object>
+							<int key="NSTvFlags">0</int>
+							<bool key="NSAllowTruncatedLabels">YES</bool>
+							<bool key="NSDrawsBackground">YES</bool>
+							<array class="NSMutableArray" key="NSSubviews">
+								<reference ref="483107053"/>
+							</array>
+						</object>
+						<object class="NSButton" id="80448981">
+							<reference key="NSNextResponder" ref="608407176"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{390, 13}, {59, 32}}</string>
+							<reference key="NSSuperview" ref="608407176"/>
+							<reference key="NSNextKeyView"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="259742336">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">OK</string>
+								<reference key="NSSupport" ref="495247254"/>
+								<string key="NSCellIdentifier">_NS:9</string>
+								<reference key="NSControlView" ref="80448981"/>
+								<int key="NSButtonFlags">-2038284288</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSButton" id="539611283">
+							<reference key="NSNextResponder" ref="608407176"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{308, 13}, {82, 32}}</string>
+							<reference key="NSSuperview" ref="608407176"/>
+							<reference key="NSNextKeyView" ref="80448981"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="496221559">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Cancel</string>
+								<reference key="NSSupport" ref="495247254"/>
+								<string key="NSCellIdentifier">_NS:9</string>
+								<reference key="NSControlView" ref="539611283"/>
+								<int key="NSButtonFlags">-2038284288</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string type="base64-UTF8" key="NSKeyEquivalent">Gw</string>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+					</array>
+					<string key="NSFrameSize">{463, 424}</string>
+					<reference key="NSSuperview"/>
+					<reference key="NSNextKeyView" ref="1024964375"/>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
+				<string key="NSMinSize">{310, 182}</string>
+				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
+				<bool key="NSWindowIsRestorable">YES</bool>
+			</object>
+			<object class="NSCustomView" id="610373624">
+				<reference key="NSNextResponder"/>
+				<int key="NSvFlags">274</int>
+				<array class="NSMutableArray" key="NSSubviews">
+					<object class="NSScrollView" id="11581300">
+						<reference key="NSNextResponder" ref="610373624"/>
+						<int key="NSvFlags">314</int>
+						<array class="NSMutableArray" key="NSSubviews">
+							<object class="NSClipView" id="675379878">
+								<reference key="NSNextResponder" ref="11581300"/>
+								<int key="NSvFlags">2304</int>
+								<array class="NSMutableArray" key="NSSubviews">
+									<object class="NSTableView" id="1024738144">
+										<reference key="NSNextResponder" ref="675379878"/>
+										<int key="NSvFlags">256</int>
+										<string key="NSFrameSize">{381, 244}</string>
+										<reference key="NSSuperview" ref="675379878"/>
+										<reference key="NSWindow"/>
+										<reference key="NSNextKeyView" ref="917222594"/>
+										<int key="NSTag">1</int>
+										<bool key="NSEnabled">YES</bool>
+										<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										<bool key="NSControlAllowsExpansionToolTips">YES</bool>
+										<object class="NSTableHeaderView" key="NSHeaderView" id="901683476">
+											<reference key="NSNextResponder" ref="98843995"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrameSize">{381, 17}</string>
+											<reference key="NSSuperview" ref="98843995"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="675379878"/>
+											<reference key="NSTableView" ref="1024738144"/>
+										</object>
+										<object class="_NSCornerView" key="NSCornerView">
+											<nil key="NSNextResponder"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrame">{{367, 0}, {16, 17}}</string>
+										</object>
+										<array class="NSMutableArray" key="NSTableColumns">
+											<object class="NSTableColumn" id="559669958">
+												<string key="NSIdentifier">key</string>
+												<double key="NSWidth">120</double>
+												<double key="NSMinWidth">100</double>
+												<double key="NSMaxWidth">1000</double>
+												<object class="NSTableHeaderCell" key="NSHeaderCell">
+													<int key="NSCellFlags">75497536</int>
+													<int key="NSCellFlags2">2048</int>
+													<string key="NSContents">Key</string>
+													<object class="NSFont" key="NSSupport" id="26">
+														<string key="NSName">LucidaGrande</string>
+														<double key="NSSize">11</double>
+														<int key="NSfFlags">3100</int>
+													</object>
+													<object class="NSColor" key="NSBackgroundColor" id="657075319">
+														<int key="NSColorSpace">3</int>
+														<bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes>
+													</object>
+													<object class="NSColor" key="NSTextColor" id="1004386429">
+														<int key="NSColorSpace">6</int>
+														<string key="NSCatalogName">System</string>
+														<string key="NSColorName">headerTextColor</string>
+														<object class="NSColor" key="NSColor" id="981446757">
+															<int key="NSColorSpace">3</int>
+															<bytes key="NSWhite">MAA</bytes>
+														</object>
+													</object>
+												</object>
+												<object class="NSTextFieldCell" key="NSDataCell" id="62608614">
+													<int key="NSCellFlags">338690112</int>
+													<int key="NSCellFlags2">1024</int>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="1024738144"/>
+													<object class="NSColor" key="NSBackgroundColor" id="373772945">
+														<int key="NSColorSpace">3</int>
+														<bytes key="NSWhite">MQA</bytes>
+													</object>
+													<object class="NSColor" key="NSTextColor" id="364572425">
+														<int key="NSColorSpace">6</int>
+														<string key="NSCatalogName">System</string>
+														<string key="NSColorName">controlTextColor</string>
+														<reference key="NSColor" ref="981446757"/>
+													</object>
+												</object>
+												<reference key="NSTableView" ref="1024738144"/>
+											</object>
+											<object class="NSTableColumn" id="486323483">
+												<string key="NSIdentifier">button</string>
+												<double key="NSWidth">254.96499633789062</double>
+												<double key="NSMinWidth">46.965000152587891</double>
+												<double key="NSMaxWidth">1000</double>
+												<object class="NSTableHeaderCell" key="NSHeaderCell">
+													<int key="NSCellFlags">75497536</int>
+													<int key="NSCellFlags2">134219776</int>
+													<string key="NSContents">Button</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSBackgroundColor" ref="657075319"/>
+													<reference key="NSTextColor" ref="1004386429"/>
+												</object>
+												<object class="NSTextFieldCell" key="NSDataCell" id="29999856">
+													<int key="NSCellFlags">69206017</int>
+													<int key="NSCellFlags2">134348800</int>
+													<reference key="NSSupport" ref="26"/>
+													<string key="NSPlaceholderString">Double-Click to Set</string>
+													<reference key="NSControlView" ref="1024738144"/>
+													<object class="NSColor" key="NSBackgroundColor">
+														<int key="NSColorSpace">6</int>
+														<string key="NSCatalogName">System</string>
+														<string key="NSColorName">textBackgroundColor</string>
+														<reference key="NSColor" ref="373772945"/>
+													</object>
+													<reference key="NSTextColor" ref="364572425"/>
+												</object>
+												<int key="NSResizingMask">3</int>
+												<bool key="NSIsResizeable">YES</bool>
+												<bool key="NSIsEditable">YES</bool>
+												<reference key="NSTableView" ref="1024738144"/>
+											</object>
+										</array>
+										<double key="NSIntercellSpacingWidth">3</double>
+										<double key="NSIntercellSpacingHeight">2</double>
+										<reference key="NSBackgroundColor" ref="373772945"/>
+										<object class="NSColor" key="NSGridColor">
+											<int key="NSColorSpace">6</int>
+											<string key="NSCatalogName">System</string>
+											<string key="NSColorName">gridColor</string>
+											<object class="NSColor" key="NSColor">
+												<int key="NSColorSpace">3</int>
+												<bytes key="NSWhite">MC41AA</bytes>
+											</object>
+										</object>
+										<double key="NSRowHeight">14</double>
+										<int key="NSTvFlags">1925185536</int>
+										<reference key="NSDelegate"/>
+										<reference key="NSDataSource"/>
+										<int key="NSGridStyleMask">1</int>
+										<int key="NSColumnAutoresizingStyle">4</int>
+										<int key="NSDraggingSourceMaskForLocal">15</int>
+										<int key="NSDraggingSourceMaskForNonLocal">0</int>
+										<bool key="NSAllowsTypeSelect">YES</bool>
+										<int key="NSTableViewDraggingDestinationStyle">0</int>
+										<int key="NSTableViewGroupRowStyle">1</int>
+									</object>
+								</array>
+								<string key="NSFrame">{{1, 17}, {381, 244}}</string>
+								<reference key="NSSuperview" ref="11581300"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="1024738144"/>
+								<reference key="NSDocView" ref="1024738144"/>
+								<object class="NSColor" key="NSBGColor" id="650028954">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">controlBackgroundColor</string>
+									<reference key="NSColor" ref="379011159"/>
+								</object>
+								<int key="NScvFlags">4</int>
+							</object>
+							<object class="NSScroller" id="917222594">
+								<reference key="NSNextResponder" ref="11581300"/>
+								<int key="NSvFlags">256</int>
+								<string key="NSFrame">{{366, 17}, {16, 244}}</string>
+								<reference key="NSSuperview" ref="11581300"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="1037715050"/>
+								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+								<reference key="NSTarget" ref="11581300"/>
+								<string key="NSAction">_doScroller:</string>
+								<double key="NSPercent">0.95625001192092896</double>
+							</object>
+							<object class="NSScroller" id="229079282">
+								<reference key="NSNextResponder" ref="11581300"/>
+								<int key="NSvFlags">-2147483392</int>
+								<string key="NSFrame">{{-100, -100}, {375, 15}}</string>
+								<reference key="NSSuperview" ref="11581300"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="98843995"/>
+								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+								<int key="NSsFlags">1</int>
+								<reference key="NSTarget" ref="11581300"/>
+								<string key="NSAction">_doScroller:</string>
+								<double key="NSPercent">0.99047619104385376</double>
+							</object>
+							<object class="NSClipView" id="98843995">
+								<reference key="NSNextResponder" ref="11581300"/>
+								<int key="NSvFlags">2304</int>
+								<array class="NSMutableArray" key="NSSubviews">
+									<reference ref="901683476"/>
+								</array>
+								<string key="NSFrame">{{1, 0}, {381, 17}}</string>
+								<reference key="NSSuperview" ref="11581300"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="901683476"/>
+								<reference key="NSDocView" ref="901683476"/>
+								<reference key="NSBGColor" ref="650028954"/>
+								<int key="NScvFlags">4</int>
+							</object>
+						</array>
+						<string key="NSFrame">{{20, 30}, {383, 262}}</string>
+						<reference key="NSSuperview" ref="610373624"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="229079282"/>
+						<int key="NSsFlags">133138</int>
+						<reference key="NSVScroller" ref="917222594"/>
+						<reference key="NSHScroller" ref="229079282"/>
+						<reference key="NSContentView" ref="675379878"/>
+						<reference key="NSHeaderClipView" ref="98843995"/>
+						<bytes key="NSScrollAmts">QSAAAEEgAABBgAAAQYAAAA</bytes>
+						<double key="NSMinMagnification">0.25</double>
+						<double key="NSMaxMagnification">4</double>
+						<double key="NSMagnification">1</double>
+					</object>
+					<object class="NSPopUpButton" id="633744190">
+						<reference key="NSNextResponder" ref="610373624"/>
+						<int key="NSvFlags">303</int>
+						<string key="NSFrame">{{301, 297}, {105, 22}}</string>
+						<reference key="NSSuperview" ref="610373624"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="11581300"/>
+						<int key="NSTag">2</int>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSPopUpButtonCell" key="NSCell" id="528313974">
+							<int key="NSCellFlags">-2076180416</int>
+							<int key="NSCellFlags2">132096</int>
+							<reference key="NSSupport" ref="26"/>
+							<reference key="NSControlView" ref="633744190"/>
+							<int key="NSButtonFlags">109199360</int>
+							<int key="NSButtonFlags2">1</int>
+							<object class="NSFont" key="NSAlternateImage" id="831636252">
+								<string key="NSName">LucidaGrande</string>
+								<double key="NSSize">11</double>
+								<int key="NSfFlags">16</int>
+							</object>
+							<string key="NSAlternateContents"/>
+							<object class="NSMutableString" key="NSKeyEquivalent">
+								<characters key="NS.bytes"/>
+							</object>
+							<int key="NSPeriodicDelay">400</int>
+							<int key="NSPeriodicInterval">75</int>
+							<object class="NSMenuItem" key="NSMenuItem" id="70523969">
+								<reference key="NSMenu" ref="1019945643"/>
+								<string key="NSTitle">Digital Pad</string>
+								<string key="NSKeyEquiv"/>
+								<int key="NSKeyEquivModMask">1048576</int>
+								<int key="NSMnemonicLoc">2147483647</int>
+								<int key="NSState">1</int>
+								<object class="NSCustomResource" key="NSOnImage" id="554608996">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">NSMenuCheckmark</string>
+								</object>
+								<object class="NSCustomResource" key="NSMixedImage" id="522047114">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">NSMenuMixedState</string>
+								</object>
+								<string key="NSAction">_popUpItemAction:</string>
+								<reference key="NSTarget" ref="528313974"/>
+							</object>
+							<bool key="NSMenuItemRespectAlignment">YES</bool>
+							<object class="NSMenu" key="NSMenu" id="1019945643">
+								<object class="NSMutableString" key="NSTitle">
+									<characters key="NS.bytes">OtherViews</characters>
+								</object>
+								<array class="NSMutableArray" key="NSMenuItems">
+									<reference ref="70523969"/>
+									<object class="NSMenuItem" id="721098753">
+										<reference key="NSMenu" ref="1019945643"/>
+										<string key="NSTitle">Analog Pad</string>
+										<string key="NSKeyEquiv"/>
+										<int key="NSKeyEquivModMask">1048576</int>
+										<int key="NSMnemonicLoc">2147483647</int>
+										<reference key="NSOnImage" ref="554608996"/>
+										<reference key="NSMixedImage" ref="522047114"/>
+										<string key="NSAction">_popUpItemAction:</string>
+										<reference key="NSTarget" ref="528313974"/>
+									</object>
+								</array>
+							</object>
+							<int key="NSPreferredEdge">3</int>
+							<bool key="NSUsesItemFromMenu">YES</bool>
+							<bool key="NSAltersState">YES</bool>
+							<int key="NSArrowPosition">1</int>
+						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+					</object>
+					<object class="NSTextField" id="21744521">
+						<reference key="NSNextResponder" ref="610373624"/>
+						<int key="NSvFlags">303</int>
+						<string key="NSFrame">{{265, 302}, {34, 14}}</string>
+						<reference key="NSSuperview" ref="610373624"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="633744190"/>
+						<string key="NSAntiCompressionPriority">{250, 750}</string>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSTextFieldCell" key="NSCell" id="947219452">
+							<int key="NSCellFlags">67108864</int>
+							<int key="NSCellFlags2">4325376</int>
+							<string key="NSContents">Type:</string>
+							<reference key="NSSupport" ref="26"/>
+							<reference key="NSControlView" ref="21744521"/>
+							<reference key="NSBackgroundColor" ref="809892731"/>
+							<reference key="NSTextColor" ref="364572425"/>
+						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+					</object>
+					<object class="NSTextField" id="1037715050">
+						<reference key="NSNextResponder" ref="610373624"/>
+						<int key="NSvFlags">303</int>
+						<string key="NSFrame">{{59, 8}, {304, 14}}</string>
+						<reference key="NSSuperview" ref="610373624"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView"/>
+						<string key="NSAntiCompressionPriority">{250, 750}</string>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSTextFieldCell" key="NSCell" id="291686896">
+							<int key="NSCellFlags">67108864</int>
+							<int key="NSCellFlags2">4194304</int>
+							<string key="NSContents">To reset an entry: Select it and press the delete '←' key</string>
+							<reference key="NSSupport" ref="26"/>
+							<reference key="NSControlView" ref="1037715050"/>
+							<reference key="NSBackgroundColor" ref="809892731"/>
+							<object class="NSColor" key="NSTextColor">
+								<int key="NSColorSpace">3</int>
+								<bytes key="NSWhite">MC4yNQA</bytes>
+							</object>
+						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+					</object>
+					<object class="NSPopUpButton" id="123438231">
+						<reference key="NSNextResponder" ref="610373624"/>
+						<int key="NSvFlags">303</int>
+						<string key="NSFrame">{{68, 297}, {195, 22}}</string>
+						<reference key="NSSuperview" ref="610373624"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="21744521"/>
+						<int key="NSTag">1</int>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSPopUpButtonCell" key="NSCell" id="618684485">
+							<int key="NSCellFlags">-2076180416</int>
+							<int key="NSCellFlags2">132096</int>
+							<reference key="NSSupport" ref="26"/>
+							<reference key="NSControlView" ref="123438231"/>
+							<int key="NSButtonFlags">109199360</int>
+							<int key="NSButtonFlags2">1</int>
+							<reference key="NSAlternateImage" ref="831636252"/>
+							<string key="NSAlternateContents"/>
+							<object class="NSMutableString" key="NSKeyEquivalent">
+								<characters key="NS.bytes"/>
+							</object>
+							<int key="NSPeriodicDelay">400</int>
+							<int key="NSPeriodicInterval">75</int>
+							<object class="NSMenuItem" key="NSMenuItem" id="84166153">
+								<reference key="NSMenu" ref="334814631"/>
+								<string key="NSTitle">(Keyboard only)</string>
+								<string key="NSKeyEquiv"/>
+								<int key="NSKeyEquivModMask">1048576</int>
+								<int key="NSMnemonicLoc">2147483647</int>
+								<int key="NSState">1</int>
+								<reference key="NSOnImage" ref="554608996"/>
+								<reference key="NSMixedImage" ref="522047114"/>
+								<string key="NSAction">_popUpItemAction:</string>
+								<reference key="NSTarget" ref="618684485"/>
+							</object>
+							<bool key="NSMenuItemRespectAlignment">YES</bool>
+							<object class="NSMenu" key="NSMenu" id="334814631">
+								<object class="NSMutableString" key="NSTitle">
+									<characters key="NS.bytes">OtherViews</characters>
+								</object>
+								<array class="NSMutableArray" key="NSMenuItems">
+									<reference ref="84166153"/>
+								</array>
+							</object>
+							<int key="NSPreferredEdge">3</int>
+							<bool key="NSUsesItemFromMenu">YES</bool>
+							<bool key="NSAltersState">YES</bool>
+							<int key="NSArrowPosition">1</int>
+						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+					</object>
+					<object class="NSTextField" id="297546866">
+						<reference key="NSNextResponder" ref="610373624"/>
+						<int key="NSvFlags">303</int>
+						<string key="NSFrame">{{17, 302}, {49, 14}}</string>
+						<reference key="NSSuperview" ref="610373624"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="123438231"/>
+						<string key="NSAntiCompressionPriority">{250, 750}</string>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSTextFieldCell" key="NSCell" id="281099121">
+							<int key="NSCellFlags">67108864</int>
+							<int key="NSCellFlags2">4325376</int>
+							<string key="NSContents">Device:</string>
+							<reference key="NSSupport" ref="26"/>
+							<reference key="NSControlView" ref="297546866"/>
+							<reference key="NSBackgroundColor" ref="809892731"/>
+							<reference key="NSTextColor" ref="364572425"/>
+						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+					</object>
+				</array>
+				<string key="NSFrameSize">{423, 336}</string>
+				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
+				<reference key="NSNextKeyView" ref="297546866"/>
+				<string key="NSClassName">NetPcsxrHIDInputPluginPadView</string>
+				<string key="NSExtension">NSView</string>
+			</object>
+		</array>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<array class="NSMutableArray" key="connectionRecords">
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">controllerView</string>
+						<reference key="source" ref="155314287"/>
+						<reference key="destination" ref="610373624"/>
+					</object>
+					<int key="connectionID">152</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">controllerView1</string>
+						<reference key="source" ref="155314287"/>
+						<reference key="destination" ref="95744455"/>
+					</object>
+					<int key="connectionID">168</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">controllerView2</string>
+						<reference key="source" ref="155314287"/>
+						<reference key="destination" ref="972925744"/>
+					</object>
+					<int key="connectionID">154</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">window</string>
+						<reference key="source" ref="155314287"/>
+						<reference key="destination" ref="254157282"/>
+					</object>
+					<int key="connectionID">26</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">ok:</string>
+						<reference key="source" ref="155314287"/>
+						<reference key="destination" ref="80448981"/>
+					</object>
+					<int key="connectionID">260</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">cancel:</string>
+						<reference key="source" ref="155314287"/>
+						<reference key="destination" ref="539611283"/>
+					</object>
+					<int key="connectionID">265</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="1024964375"/>
+						<reference key="destination" ref="155314287"/>
+					</object>
+					<int key="connectionID">169</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">deviceMenu</string>
+						<reference key="source" ref="610373624"/>
+						<reference key="destination" ref="123438231"/>
+					</object>
+					<int key="connectionID">200</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">tableView</string>
+						<reference key="source" ref="610373624"/>
+						<reference key="destination" ref="1024738144"/>
+					</object>
+					<int key="connectionID">133</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">typeMenu</string>
+						<reference key="source" ref="610373624"/>
+						<reference key="destination" ref="633744190"/>
+					</object>
+					<int key="connectionID">134</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">setType:</string>
+						<reference key="source" ref="610373624"/>
+						<reference key="destination" ref="633744190"/>
+					</object>
+					<int key="connectionID">131</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">setDevice:</string>
+						<reference key="source" ref="610373624"/>
+						<reference key="destination" ref="123438231"/>
+					</object>
+					<int key="connectionID">197</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="1024738144"/>
+						<reference key="destination" ref="610373624"/>
+					</object>
+					<int key="connectionID">158</int>
+				</object>
+			</array>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<array key="orderedObjects">
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<array key="object" id="0"/>
+						<reference key="children" ref="46740775"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="155314287"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="880630677"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">First Responder</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-3</int>
+						<reference key="object" ref="911229603"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Application</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5</int>
+						<reference key="object" ref="254157282"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="608407176"/>
+						</array>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Configuration</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6</int>
+						<reference key="object" ref="608407176"/>
+						<array class="NSMutableArray" key="children">
+							<object class="IBNSLayoutConstraint" id="1044408221">
+								<reference key="firstItem" ref="608407176"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="80448981"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="608407176"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="340190318">
+								<reference key="firstItem" ref="80448981"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="539611283"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">12</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="608407176"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="893860101">
+								<reference key="firstItem" ref="608407176"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="80448981"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="608407176"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="975733021">
+								<reference key="firstItem" ref="608407176"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="539611283"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="608407176"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="1030354098">
+								<reference key="firstItem" ref="608407176"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1024964375"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">50</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="608407176"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="75858514">
+								<reference key="firstItem" ref="1024964375"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="608407176"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="608407176"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="793234594">
+								<reference key="firstItem" ref="1024964375"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="608407176"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">12</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="608407176"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="141750896">
+								<reference key="firstItem" ref="608407176"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1024964375"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="608407176"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<reference ref="1024964375"/>
+							<reference ref="80448981"/>
+							<reference ref="539611283"/>
+						</array>
+						<reference key="parent" ref="254157282"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">11</int>
+						<reference key="object" ref="1024964375"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1051126204"/>
+							<reference ref="370841406"/>
+						</array>
+						<reference key="parent" ref="608407176"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">8</int>
+						<reference key="object" ref="1051126204"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="675134940"/>
+						</array>
+						<reference key="parent" ref="1024964375"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10</int>
+						<reference key="object" ref="675134940"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="972925744"/>
+							<object class="IBNSLayoutConstraint" id="611239890">
+								<reference key="firstItem" ref="972925744"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="675134940"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="675134940"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="548276590">
+								<reference key="firstItem" ref="972925744"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="675134940"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="675134940"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="444584855">
+								<reference key="firstItem" ref="972925744"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="675134940"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="675134940"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="230217553">
+								<reference key="firstItem" ref="972925744"/>
+								<int key="firstAttribute">9</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="675134940"/>
+								<int key="secondAttribute">9</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="675134940"/>
+								<int key="scoringType">5</int>
+								<float key="scoringTypeFloat">22</float>
+								<int key="contentType">2</int>
+							</object>
+						</array>
+						<reference key="parent" ref="1051126204"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">153</int>
+						<reference key="object" ref="972925744"/>
+						<reference key="parent" ref="675134940"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">9</int>
+						<reference key="object" ref="370841406"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="483107053"/>
+						</array>
+						<reference key="parent" ref="1024964375"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">7</int>
+						<reference key="object" ref="483107053"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="95744455"/>
+							<object class="IBNSLayoutConstraint" id="923412689">
+								<reference key="firstItem" ref="95744455"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="483107053"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="483107053"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="344087040">
+								<reference key="firstItem" ref="95744455"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="483107053"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="483107053"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="167185787">
+								<reference key="firstItem" ref="95744455"/>
+								<int key="firstAttribute">9</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="483107053"/>
+								<int key="secondAttribute">9</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="483107053"/>
+								<int key="scoringType">5</int>
+								<float key="scoringTypeFloat">22</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="24764848">
+								<reference key="firstItem" ref="95744455"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="483107053"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="483107053"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+						</array>
+						<reference key="parent" ref="370841406"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">167</int>
+						<reference key="object" ref="95744455"/>
+						<reference key="parent" ref="483107053"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">16</int>
+						<reference key="object" ref="610373624"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="633744190"/>
+							<reference ref="21744521"/>
+							<reference ref="123438231"/>
+							<object class="IBNSLayoutConstraint" id="399049747">
+								<reference key="firstItem" ref="1037715050"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="11581300"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="610373624"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="266867564">
+								<reference key="firstItem" ref="610373624"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1037715050"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="610373624"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="695233997">
+								<reference key="firstItem" ref="1037715050"/>
+								<int key="firstAttribute">9</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="11581300"/>
+								<int key="secondAttribute">9</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="610373624"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="22523826">
+								<reference key="firstItem" ref="610373624"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="633744190"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="610373624"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="123755440">
+								<reference key="firstItem" ref="633744190"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="21744521"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="610373624"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="109463517">
+								<reference key="firstItem" ref="21744521"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="610373624"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="610373624"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="1065254880">
+								<reference key="firstItem" ref="21744521"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="123438231"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="610373624"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="413614044">
+								<reference key="firstItem" ref="21744521"/>
+								<int key="firstAttribute">11</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="633744190"/>
+								<int key="secondAttribute">11</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="610373624"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="845565131">
+								<reference key="firstItem" ref="123438231"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="297546866"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="610373624"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="638240250">
+								<reference key="firstItem" ref="123438231"/>
+								<int key="firstAttribute">11</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="21744521"/>
+								<int key="secondAttribute">11</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="610373624"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="125117667">
+								<reference key="firstItem" ref="11581300"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="123438231"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="610373624"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="301110535">
+								<reference key="firstItem" ref="11581300"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="610373624"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="610373624"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="732551703">
+								<reference key="firstItem" ref="610373624"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="11581300"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="610373624"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="820801283">
+								<reference key="firstItem" ref="297546866"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="610373624"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="610373624"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="124630689">
+								<reference key="firstItem" ref="297546866"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="610373624"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="610373624"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<reference ref="297546866"/>
+							<reference ref="11581300"/>
+							<reference ref="1037715050"/>
+						</array>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Controller View</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">121</int>
+						<reference key="object" ref="11581300"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1024738144"/>
+							<reference ref="917222594"/>
+							<reference ref="229079282"/>
+							<reference ref="901683476"/>
+						</array>
+						<reference key="parent" ref="610373624"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">123</int>
+						<reference key="object" ref="1024738144"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="486323483"/>
+							<reference ref="559669958"/>
+						</array>
+						<reference key="parent" ref="11581300"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">124</int>
+						<reference key="object" ref="486323483"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="29999856"/>
+						</array>
+						<reference key="parent" ref="1024738144"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">166</int>
+						<reference key="object" ref="29999856"/>
+						<reference key="parent" ref="486323483"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">128</int>
+						<reference key="object" ref="559669958"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="62608614"/>
+						</array>
+						<reference key="parent" ref="1024738144"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">209</int>
+						<reference key="object" ref="62608614"/>
+						<reference key="parent" ref="559669958"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">210</int>
+						<reference key="object" ref="917222594"/>
+						<reference key="parent" ref="11581300"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">211</int>
+						<reference key="object" ref="229079282"/>
+						<reference key="parent" ref="11581300"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">212</int>
+						<reference key="object" ref="901683476"/>
+						<reference key="parent" ref="11581300"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">126</int>
+						<reference key="object" ref="633744190"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="528313974"/>
+							<object class="IBNSLayoutConstraint" id="674277236">
+								<reference key="firstItem" ref="633744190"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">99</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="633744190"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="610373624"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">204</int>
+						<reference key="object" ref="528313974"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1019945643"/>
+						</array>
+						<reference key="parent" ref="633744190"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">127</int>
+						<reference key="object" ref="1019945643"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="70523969"/>
+							<reference ref="721098753"/>
+						</array>
+						<reference key="parent" ref="528313974"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">130</int>
+						<reference key="object" ref="70523969"/>
+						<reference key="parent" ref="1019945643"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">198</int>
+						<reference key="object" ref="721098753"/>
+						<reference key="parent" ref="1019945643"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">132</int>
+						<reference key="object" ref="21744521"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="947219452"/>
+							<object class="IBNSLayoutConstraint" id="335470937">
+								<reference key="firstItem" ref="21744521"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">28</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="21744521"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="610373624"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">205</int>
+						<reference key="object" ref="947219452"/>
+						<reference key="parent" ref="21744521"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">185</int>
+						<reference key="object" ref="1037715050"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="291686896"/>
+							<object class="IBNSLayoutConstraint" id="679556977">
+								<reference key="firstItem" ref="1037715050"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">298</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1037715050"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="610373624"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">206</int>
+						<reference key="object" ref="291686896"/>
+						<reference key="parent" ref="1037715050"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">189</int>
+						<reference key="object" ref="123438231"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="618684485"/>
+						</array>
+						<reference key="parent" ref="610373624"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">207</int>
+						<reference key="object" ref="618684485"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="334814631"/>
+						</array>
+						<reference key="parent" ref="123438231"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">190</int>
+						<reference key="object" ref="334814631"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="84166153"/>
+						</array>
+						<reference key="parent" ref="618684485"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">192</int>
+						<reference key="object" ref="84166153"/>
+						<reference key="parent" ref="334814631"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">194</int>
+						<reference key="object" ref="297546866"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="281099121"/>
+							<object class="IBNSLayoutConstraint" id="1031673705">
+								<reference key="firstItem" ref="297546866"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">43</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="297546866"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="610373624"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">208</int>
+						<reference key="object" ref="281099121"/>
+						<reference key="parent" ref="297546866"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">216</int>
+						<reference key="object" ref="24764848"/>
+						<reference key="parent" ref="483107053"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">217</int>
+						<reference key="object" ref="167185787"/>
+						<reference key="parent" ref="483107053"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">218</int>
+						<reference key="object" ref="344087040"/>
+						<reference key="parent" ref="483107053"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">219</int>
+						<reference key="object" ref="923412689"/>
+						<reference key="parent" ref="483107053"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">220</int>
+						<reference key="object" ref="141750896"/>
+						<reference key="parent" ref="608407176"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">223</int>
+						<reference key="object" ref="793234594"/>
+						<reference key="parent" ref="608407176"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">225</int>
+						<reference key="object" ref="75858514"/>
+						<reference key="parent" ref="608407176"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">228</int>
+						<reference key="object" ref="230217553"/>
+						<reference key="parent" ref="675134940"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">229</int>
+						<reference key="object" ref="444584855"/>
+						<reference key="parent" ref="675134940"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">230</int>
+						<reference key="object" ref="548276590"/>
+						<reference key="parent" ref="675134940"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">231</int>
+						<reference key="object" ref="611239890"/>
+						<reference key="parent" ref="675134940"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">236</int>
+						<reference key="object" ref="674277236"/>
+						<reference key="parent" ref="633744190"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">238</int>
+						<reference key="object" ref="123755440"/>
+						<reference key="parent" ref="610373624"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">240</int>
+						<reference key="object" ref="732551703"/>
+						<reference key="parent" ref="610373624"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">243</int>
+						<reference key="object" ref="638240250"/>
+						<reference key="parent" ref="610373624"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">244</int>
+						<reference key="object" ref="413614044"/>
+						<reference key="parent" ref="610373624"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">246</int>
+						<reference key="object" ref="301110535"/>
+						<reference key="parent" ref="610373624"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">247</int>
+						<reference key="object" ref="22523826"/>
+						<reference key="parent" ref="610373624"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">248</int>
+						<reference key="object" ref="1065254880"/>
+						<reference key="parent" ref="610373624"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">250</int>
+						<reference key="object" ref="109463517"/>
+						<reference key="parent" ref="610373624"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">252</int>
+						<reference key="object" ref="1030354098"/>
+						<reference key="parent" ref="608407176"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">256</int>
+						<reference key="object" ref="80448981"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="259742336"/>
+						</array>
+						<reference key="parent" ref="608407176"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">257</int>
+						<reference key="object" ref="259742336"/>
+						<reference key="parent" ref="80448981"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">259</int>
+						<reference key="object" ref="893860101"/>
+						<reference key="parent" ref="608407176"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">261</int>
+						<reference key="object" ref="539611283"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="496221559"/>
+						</array>
+						<reference key="parent" ref="608407176"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">262</int>
+						<reference key="object" ref="496221559"/>
+						<reference key="parent" ref="539611283"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">263</int>
+						<reference key="object" ref="340190318"/>
+						<reference key="parent" ref="608407176"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">264</int>
+						<reference key="object" ref="975733021"/>
+						<reference key="parent" ref="608407176"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">267</int>
+						<reference key="object" ref="1044408221"/>
+						<reference key="parent" ref="608407176"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">273</int>
+						<reference key="object" ref="124630689"/>
+						<reference key="parent" ref="610373624"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">274</int>
+						<reference key="object" ref="820801283"/>
+						<reference key="parent" ref="610373624"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">275</int>
+						<reference key="object" ref="1031673705"/>
+						<reference key="parent" ref="297546866"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">276</int>
+						<reference key="object" ref="335470937"/>
+						<reference key="parent" ref="21744521"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">277</int>
+						<reference key="object" ref="845565131"/>
+						<reference key="parent" ref="610373624"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">279</int>
+						<reference key="object" ref="125117667"/>
+						<reference key="parent" ref="610373624"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">282</int>
+						<reference key="object" ref="679556977"/>
+						<reference key="parent" ref="1037715050"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">284</int>
+						<reference key="object" ref="695233997"/>
+						<reference key="parent" ref="610373624"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">290</int>
+						<reference key="object" ref="266867564"/>
+						<reference key="parent" ref="610373624"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">291</int>
+						<reference key="object" ref="399049747"/>
+						<reference key="parent" ref="610373624"/>
+					</object>
+				</array>
+			</object>
+			<dictionary class="NSMutableDictionary" key="flattenedProperties">
+				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="10.IBNSViewMetadataConstraints">
+					<reference ref="230217553"/>
+					<reference ref="444584855"/>
+					<reference ref="548276590"/>
+					<reference ref="611239890"/>
+				</array>
+				<string key="10.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="11.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="11.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="121.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="121.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="123.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="124.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="126.IBNSViewMetadataConstraints">
+					<reference ref="674277236"/>
+				</array>
+				<boolean value="NO" key="126.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="126.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="127.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="128.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="130.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="132.IBNSViewMetadataConstraints">
+					<reference ref="335470937"/>
+				</array>
+				<boolean value="NO" key="132.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="132.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="153.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="153.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array class="NSMutableArray" key="16.IBNSViewMetadataConstraints">
+					<reference ref="124630689"/>
+					<reference ref="820801283"/>
+					<reference ref="732551703"/>
+					<reference ref="301110535"/>
+					<reference ref="125117667"/>
+					<reference ref="638240250"/>
+					<reference ref="845565131"/>
+					<reference ref="413614044"/>
+					<reference ref="1065254880"/>
+					<reference ref="109463517"/>
+					<reference ref="123755440"/>
+					<reference ref="22523826"/>
+					<reference ref="695233997"/>
+					<reference ref="266867564"/>
+					<reference ref="399049747"/>
+				</array>
+				<string key="16.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="166.CustomClassName">NetPcsxrHIDInputPluginMappingCell</string>
+				<string key="166.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="167.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="167.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array class="NSMutableArray" key="185.IBNSViewMetadataConstraints">
+					<reference ref="679556977"/>
+				</array>
+				<boolean value="NO" key="185.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="185.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="189.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="189.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="190.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="192.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array class="NSMutableArray" key="194.IBNSViewMetadataConstraints">
+					<reference ref="1031673705"/>
+				</array>
+				<boolean value="NO" key="194.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="194.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="198.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="204.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="205.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="206.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="207.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="208.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="209.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="210.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="211.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="212.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="216.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="217.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="218.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="219.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="220.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="223.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="225.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="228.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="229.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="230.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="231.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="236.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="238.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="240.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="243.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="244.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="246.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="247.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="248.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="250.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="252.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="256.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="256.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="257.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="259.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="261.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="261.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="262.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="263.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="264.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="267.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="273.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="274.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="275.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="276.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="277.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="279.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="282.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="284.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="290.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="291.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array class="NSMutableArray" key="6.IBNSViewMetadataConstraints">
+					<reference ref="141750896"/>
+					<reference ref="793234594"/>
+					<reference ref="75858514"/>
+					<reference ref="1030354098"/>
+					<reference ref="975733021"/>
+					<reference ref="893860101"/>
+					<reference ref="340190318"/>
+					<reference ref="1044408221"/>
+				</array>
+				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="7.IBNSViewMetadataConstraints">
+					<reference ref="24764848"/>
+					<reference ref="167185787"/>
+					<reference ref="344087040"/>
+					<reference ref="923412689"/>
+				</array>
+				<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="8.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="9.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			</dictionary>
+			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+			<nil key="activeLocalization"/>
+			<dictionary class="NSMutableDictionary" key="localizations"/>
+			<nil key="sourceID"/>
+			<int key="maxID">291</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">NSLayoutConstraint</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/NSLayoutConstraint.h</string>
+					</object>
+				</object>
+			</array>
+		</object>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<real value="1070" key="NS.object.0"/>
+		</object>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<string key="NSMenuCheckmark">{11, 11}</string>
+			<string key="NSMenuMixedState">{10, 3}</string>
+		</dictionary>
+		<bool key="IBDocument.UseAutolayout">YES</bool>
+	</data>
+</archive>

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/Info.plist -> pcsxr-1.9.93.tar.bz2/macosx/plugins/DFInput/Info.plist Changed

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/macsrc/ControllerList.h -> pcsxr-1.9.93.tar.bz2/macosx/plugins/DFInput/macsrc/ControllerList.h Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Wei Mingzhi <whistler@openoffice.org>.
+ * Copyright (c) 2010, Wei Mingzhi <whistler_wmz@users.sf.net>.
 * All Rights Reserved.
 *
 * Based on HIDInput by Gil Pedersen.
@@ -19,24 +19,23 @@
 * along with this program; if not, see <http://www.gnu.org/licenses>.
 */
 
-#define ControllerList NetPcsxHIDInputPluginControllerList
+#define ControllerList NetPcsxrHIDInputPluginControllerList
 
-#import <Foundation/Foundation.h>
-#import <AppKit/NSTableView.h>
+#import <Cocoa/Cocoa.h>
 #include "cfg.h"
 
 @class KeyConfig;
 
-@interface ControllerList : NSObject {
+@interface ControllerList : NSObject <NSTableViewDataSource> {
 }
 
 - (id)initWithConfig;
 
 + (void)setCurrentController:(int)which;
 + (int)currentController;
-+ (int)getButtonOfRow:(int)row;
-- (int)numberOfRowsInTableView:(NSTableView *)aTableView;
-- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex;
-- (void)deleteRow:(int)which;
++ (int)buttonOfRow:(NSInteger)row;
+- (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView;
+- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex;
+- (void)deleteRow:(NSInteger)which;
 
 @end

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/macsrc/ControllerList.m -> pcsxr-1.9.93.tar.bz2/macosx/plugins/DFInput/macsrc/ControllerList.m Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Wei Mingzhi <whistler@openoffice.org>.
+ * Copyright (c) 2010, Wei Mingzhi <whistler_wmz@users.sf.net>.
 * All Rights Reserved.
 *
 * Based on HIDInput by Gil Pedersen.
@@ -29,14 +29,18 @@
 
 - (id)initWithConfig
 {
-	if (!(self = [super init])) return nil;
+	if (self = [super init]) {
+		
+	}
 	return self;
 }
 
+#if !__has_feature(objc_arc)
 - (void)dealloc
 {
 	[super dealloc];
 }
+#endif
 
 /* sets current controller data returned by data source */
 + (void)setCurrentController:(int)which
@@ -50,9 +54,9 @@
 }
 
 /* NSDataSource */
-- (int)numberOfRowsInTableView:(NSTableView *)aTableView
+- (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView
 {
-	return DKEY_TOTAL + (g.cfg.PadDef[currentController].Type == PSE_PAD_TYPE_ANALOGPAD ? 8 : -2);
+	return DKEY_TOTAL + (g.cfg.PadDef[currentController].Type == PSE_PAD_TYPE_ANALOGPAD ? 8 : -3);
 }
 
 static const NSString *LabelText[DKEY_TOTAL + 8] = {
@@ -72,6 +76,7 @@
 	@"Start",
 	@"L3",
 	@"R3",
+	@"Analog",
 	@"L-Stick Right",
 	@"L-Stick Left",
 	@"L-Stick Down",
@@ -98,16 +103,17 @@
 	DKEY_SELECT,
 	DKEY_START,
 	DKEY_L3,
-	DKEY_R3
+	DKEY_R3,
+	DKEY_ANALOG
 };
 
-+ (int)getButtonOfRow:(int)row
++ (int)buttonOfRow:(NSInteger)row
 {
 	return DPad[row];
 }
 
 - (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn 
-		row:(int)rowIndex
+		row:(NSInteger)rowIndex
 {
 	char buf[256];
 
@@ -119,14 +125,14 @@
 			GetKeyDescription(buf, currentController, DPad[rowIndex]);
 		} else {
 			rowIndex -= DKEY_TOTAL;
-			GetAnalogDescription(buf, currentController, rowIndex / 4, rowIndex % 4);
+			GetAnalogDescription(buf, currentController, (int)(rowIndex / 4), rowIndex % 4);
 		}
 
-		return [NSString stringWithUTF8String:buf];
+		return @(buf);
 	}
 }
 
-- (void)deleteRow:(int)which
+- (void)deleteRow:(NSInteger)which
 {
 	if (which < DKEY_TOTAL) {
 		g.cfg.PadDef[currentController].KeyDef[DPad[which]].Key = 0;

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/macsrc/MappingCell.h -> pcsxr-1.9.93.tar.bz2/macosx/plugins/DFInput/macsrc/MappingCell.h Changed

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/macsrc/MappingCell.m -> pcsxr-1.9.93.tar.bz2/macosx/plugins/DFInput/macsrc/MappingCell.m Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Wei Mingzhi <whistler@openoffice.org>.
+ * Copyright (c) 2010, Wei Mingzhi <whistler_wmz@users.sf.net>.
 * All Rights Reserved.
 *
 * Based on: HIDInput by Gil Pedersen.
@@ -31,13 +31,13 @@
 	return self;
 }
 
-- (void)selectWithFrame:(NSRect)aRect inView:(NSView *)controlView editor:(NSText *)textObj delegate:(id)anObject start:(int)selStart length:(int)selLength
+- (void)selectWithFrame:(NSRect)aRect inView:(NSView *)controlView editor:(NSText *)textObj delegate:(id)anObject start:(NSInteger)selStart length:(NSInteger)selLength
 {
 	[super selectWithFrame:aRect inView:controlView editor:textObj delegate:anObject start:selStart length:selLength];
 
 	int whichPad = [ControllerList currentController];
 	NSTableView *tableView = (NSTableView *)[self controlView];
-	int i, changed = 0, row;
+	long i, changed = 0, row;
 	NSEvent *endEvent;
 	NSPoint where = {0.0, 0.0};
 
@@ -55,10 +55,10 @@
 		[NSApp runModalSession:session];
 		row = [tableView selectedRow];
 		if (row < DKEY_TOTAL) {
-			changed = ReadDKeyEvent(whichPad, [ControllerList getButtonOfRow:row]);
+			changed = ReadDKeyEvent(whichPad, [ControllerList buttonOfRow:row]);
 		} else {
 			row -= DKEY_TOTAL;
-			changed = ReadAnalogEvent(whichPad, row / 4, row % 4);
+			changed = ReadAnalogEvent(whichPad, (int)(row / 4), row % 4);
 		}
 
 		if (changed) break;
@@ -69,12 +69,12 @@
 	/* move selection to the next list element */
 	[self endEditing:textObj];
 	if (changed == 1) {
-		int nextRow = [tableView selectedRow] + 1;
+		int nextRow = (int)[tableView selectedRow] + 1;
 		if (nextRow >= [tableView numberOfRows]) {
 			[tableView deselectAll:self];
 			return;
 		}
-		[tableView selectRow:nextRow byExtendingSelection:NO];
+		[tableView selectRowIndexes:[NSIndexSet indexSetWithIndex:nextRow] byExtendingSelection:NO];
 
 		/* discard any events we have received while waiting for the button press */
 		endEvent = [NSEvent otherEventWithType:NSApplicationDefined location:where

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/macsrc/PadController.h -> pcsxr-1.9.93.tar.bz2/macosx/plugins/DFInput/macsrc/PadController.h Changed

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/macsrc/PadController.m -> pcsxr-1.9.93.tar.bz2/macosx/plugins/DFInput/macsrc/PadController.m Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Wei Mingzhi <whistler@openoffice.org>.
+ * Copyright (c) 2010, Wei Mingzhi <whistler_wmz@users.sf.net>.
 * All Rights Reserved.
 *
 * Based on: HIDInput by Gil Pedersen.
@@ -22,25 +22,36 @@
 #import <Cocoa/Cocoa.h>
 #import "PadController.h"
 #include "pad.h"
+#import "ARCBridge.h"
 
-static NSWindow *padWindow;
-static PadController *padController;
+static inline void RunOnMainThreadSync(dispatch_block_t block)
+{
+	if ([NSThread isMainThread]) {
+		block();
+	} else {
+		dispatch_sync(dispatch_get_main_queue(), block);
+	}
+}
+
+static NSWindow *padWindow = nil;
+static PadController *padController = nil;
 
-#define APP_ID @"net.pcsx.DFInputPlugin"
+#define APP_ID @"net.pcsxr.DFInputPlugin"
 
-void DoAbout() {
+void DoAbout()
+{
 	// Get parent application instance
-	NSApplication *app = [NSApplication sharedApplication];
 	NSBundle *bundle = [NSBundle bundleWithIdentifier:APP_ID];
 
 	// Get Credits.rtf
 	NSString *path = [bundle pathForResource:@"Credits" ofType:@"rtf"];
 	NSAttributedString *credits;
 	if (path) {
-		credits = [[[NSAttributedString alloc] initWithPath: path
-				documentAttributes:NULL] autorelease];
+		credits = [[NSAttributedString alloc] initWithPath: path
+				documentAttributes:NULL];
+		AUTORELEASEOBJNORETURN(credits);
 	} else {
-		credits = [[[NSAttributedString alloc] initWithString:@""] autorelease];
+		credits = AUTORELEASEOBJ([[NSAttributedString alloc] initWithString:@""]);
 	}
 
 	// Get Application Icon
@@ -48,28 +59,41 @@
 	NSSize size = NSMakeSize(64, 64);
 	[icon setSize:size];
 
-	[app orderFrontStandardAboutPanelWithOptions:[NSDictionary dictionaryWithObjectsAndKeys:
-		[bundle objectForInfoDictionaryKey:@"CFBundleName"], @"ApplicationName",
-		icon, @"ApplicationIcon",
-		[bundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"], @"ApplicationVersion",
-		[bundle objectForInfoDictionaryKey:@"CFBundleVersion"], @"Version",
-		[bundle objectForInfoDictionaryKey:@"NSHumanReadableCopyright"], @"Copyright",
-		credits, @"Credits", nil]];
+	NSDictionary *infoPaneDict =
+	[[NSDictionary alloc] initWithObjectsAndKeys:
+	 [bundle objectForInfoDictionaryKey:@"CFBundleName"], @"ApplicationName",
+	 icon, @"ApplicationIcon",
+	 [bundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"], @"ApplicationVersion",
+	 [bundle objectForInfoDictionaryKey:@"CFBundleVersion"], @"Version",
+	 [bundle objectForInfoDictionaryKey:@"NSHumanReadableCopyright"], @"Copyright",
+	 credits, @"Credits",
+	 nil];
+	dispatch_async(dispatch_get_main_queue(), ^{
+		[NSApp orderFrontStandardAboutPanelWithOptions:infoPaneDict];
+	});
+	RELEASEOBJ(infoPaneDict);
 }
 
-long DoConfiguration() {
-	SDL_Init(SDL_INIT_JOYSTICK | SDL_INIT_NOPARACHUTE);
-	LoadPADConfig();
-
-	if (padWindow == nil) {
-		if (padController == nil) {
-			padController = [[PadController alloc] initWithWindowNibName:@"NetPcsxHIDInputPluginMain"];
+long DoConfiguration()
+{
+	RunOnMainThreadSync(^{
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+		SDL_InitSubSystem(SDL_INIT_JOYSTICK);
+#else
+		SDL_Init(SDL_INIT_JOYSTICK | SDL_INIT_NOPARACHUTE);
+#endif
+		LoadPADConfig();
+		
+		if (padWindow == nil) {
+			if (padController == nil) {
+				padController = [[PadController alloc] initWithWindowNibName:@"NetPcsxrHIDInputPluginMain"];
+			}
+			padWindow = [padController window];
 		}
-		padWindow = [padController window];
-	}
-
-	[padWindow center];
-	[padWindow makeKeyAndOrderFront:nil];
+		
+		[padWindow center];
+		[padWindow makeKeyAndOrderFront:nil];
+	});
 
 	return 0;
 }
@@ -78,14 +102,22 @@
 
 - (IBAction)cancel:(id)sender
 {
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+	SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
+#else
 	SDL_Quit();
+#endif
 	[self close];
 }
 
 - (IBAction)ok:(id)sender
 {
 	SavePADConfig();
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+	SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
+#else
 	SDL_Quit();
+#endif
 	[self close];
 }
 
@@ -135,4 +167,7 @@
 	}
 }
 
-@end
\ No newline at end of file
+@end
+
+#import "OSXPlugLocalization.h"
+PLUGLOCIMP([padController class]);

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/macsrc/PadView.h -> pcsxr-1.9.93.tar.bz2/macosx/plugins/DFInput/macsrc/PadView.h Changed

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/macsrc/PadView.m -> pcsxr-1.9.93.tar.bz2/macosx/plugins/DFInput/macsrc/PadView.m Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Wei Mingzhi <whistler@openoffice.org>.
+ * Copyright (c) 2010, Wei Mingzhi <whistler_wmz@users.sf.net>.
 * All Rights Reserved.
 *
 * Based on: HIDInput by Gil Pedersen.
@@ -21,6 +21,7 @@
 
 #import "PadView.h"
 #include "pad.h"
+#import "ARCBridge.h"
 
 @implementation PadView
 
@@ -33,11 +34,13 @@
 	return self;
 }
 
+#if !__has_feature(objc_arc)
 - (void)dealloc
 {
 	[controller release];
 	[super dealloc];
 }
+#endif
 
 - (void)drawRect:(NSRect)rect
 {
@@ -67,7 +70,17 @@
 	[deviceMenu addItemWithTitle:@"(Keyboard only)"];
 
 	for (i = 0; i < SDL_NumJoysticks(); i++) {
-		[deviceMenu addItemWithTitle:[NSString stringWithUTF8String:SDL_JoystickName(i)]];
+		NSMenuItem *joystickItem = nil;
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+		SDL_Joystick *tmpJoy = SDL_JoystickOpen(i);
+		joystickItem = [[NSMenuItem alloc] initWithTitle:@(SDL_JoystickName(tmpJoy)) action:NULL keyEquivalent:@""];
+		SDL_JoystickClose(tmpJoy);
+#else
+		joystickItem = [[NSMenuItem alloc] initWithTitle:@(SDL_JoystickName(i)) action:NULL keyEquivalent:@""];
+#endif
+		[joystickItem setTag:i + 1];
+ [[deviceMenu menu] addItem:joystickItem];
+		RELEASEOBJ(joystickItem);
 	}
 
 	if (g.cfg.PadDef[which].DevNum >= SDL_NumJoysticks()) {
@@ -80,7 +93,6 @@
 	[tableView reloadData];
 }
 
-
 - (BOOL)control:(NSControl *)control textShouldBeginEditing:(NSText *)fieldEditor
 {
 	return false;
@@ -89,7 +101,7 @@
 /* handles key events on the pad list */
 - (void)keyDown:(NSEvent *)theEvent
 {
-	int key = [theEvent keyCode];
+	unsigned short key = [theEvent keyCode];
 
 	if ([[theEvent window] firstResponder] == tableView) {
 		if (key == 51 || key == 117) {

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/macsrc/cfg.c -> pcsxr-1.9.93.tar.bz2/macosx/plugins/DFInput/macsrc/cfg.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Wei Mingzhi <whistler@openoffice.org>.
+ * Copyright (c) 2010, Wei Mingzhi <whistler_wmz@users.sf.net>.
 * All Rights Reserved.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -17,6 +17,7 @@
 */
 
 #include "pad.h"
+#include <sys/param.h>
 
 GLOBALDATA			g;
 
@@ -49,6 +50,7 @@
 	g.cfg.PadDef[0].KeyDef[DKEY_CIRCLE].Key = 8;
 	g.cfg.PadDef[0].KeyDef[DKEY_CROSS].Key = 7;
 	g.cfg.PadDef[0].KeyDef[DKEY_SQUARE].Key = 2;
+	g.cfg.PadDef[0].KeyDef[DKEY_ANALOG].Key = 12;
 
 	// Pad1 joystick
 	g.cfg.PadDef[0].KeyDef[DKEY_SELECT].JoyEvType = BUTTON;
@@ -113,12 +115,12 @@
 
 void LoadPADConfig() {
 	FILE		*fp;
-	char		buf[256];
+	char		buf[PATH_MAX];
 	int			current, a, b, c;
 
 	SetDefaultConfig();
 
-	sprintf(buf, "%s/Library/Preferences/net.pcsx.DFInput.plist", getenv("HOME"));
+	sprintf(buf, "%s/Library/Preferences/net.pcsxr.DFInput.plist", getenv("HOME"));
 
 	fp = fopen(buf, "r");
 	if (fp == NULL) {
@@ -156,6 +158,11 @@
 			g.cfg.PadDef[current].KeyDef[DKEY_R3].Key = a;
 			g.cfg.PadDef[current].KeyDef[DKEY_R3].JoyEvType = b;
 			g.cfg.PadDef[current].KeyDef[DKEY_R3].J.d = c;
+		} else if (strncmp(buf, "Analog=", 7) == 0) {
+			sscanf(buf, "Analog=%d,%d,%d", &a, &b, &c);
+			g.cfg.PadDef[current].KeyDef[DKEY_ANALOG].Key = a;
+			g.cfg.PadDef[current].KeyDef[DKEY_ANALOG].JoyEvType = b;
+			g.cfg.PadDef[current].KeyDef[DKEY_ANALOG].J.d = c;
 		} else if (strncmp(buf, "Start=", 6) == 0) {
 			sscanf(buf, "Start=%d,%d,%d", &a, &b, &c);
 			g.cfg.PadDef[current].KeyDef[DKEY_START].Key = a;
@@ -270,9 +277,9 @@
 void SavePADConfig() {
 	FILE		*fp;
 	int			i;
-	char		buf[256];
+	char		buf[PATH_MAX];
 
-	sprintf(buf, "%s/Library/Preferences/net.pcsx.DFInput.plist", getenv("HOME"));
+	sprintf(buf, "%s/Library/Preferences/net.pcsxr.DFInput.plist", getenv("HOME"));
 
 	fp = fopen(buf, "w");
 	if (fp == NULL) {
@@ -294,6 +301,8 @@
 			g.cfg.PadDef[i].KeyDef[DKEY_L3].JoyEvType, g.cfg.PadDef[i].KeyDef[DKEY_L3].J.d);
 		fprintf(fp, "R3=%d,%d,%d\n", g.cfg.PadDef[i].KeyDef[DKEY_R3].Key,
 			g.cfg.PadDef[i].KeyDef[DKEY_R3].JoyEvType, g.cfg.PadDef[i].KeyDef[DKEY_R3].J.d);
+		fprintf(fp, "Analog=%d,%d,%d\n", g.cfg.PadDef[i].KeyDef[DKEY_ANALOG].Key,
+				g.cfg.PadDef[i].KeyDef[DKEY_ANALOG].JoyEvType, g.cfg.PadDef[i].KeyDef[DKEY_ANALOG].J.d);
 		fprintf(fp, "Start=%d,%d,%d\n", g.cfg.PadDef[i].KeyDef[DKEY_START].Key,
 			g.cfg.PadDef[i].KeyDef[DKEY_START].JoyEvType, g.cfg.PadDef[i].KeyDef[DKEY_START].J.d);
 		fprintf(fp, "Up=%d,%d,%d\n", g.cfg.PadDef[i].KeyDef[DKEY_UP].Key,
@@ -367,87 +376,103 @@
 	uint16_t code;
 	const char *desc;
 } KeyString[] = {
-	{ 0x01, "A" },
-	{ 0x0C, "B" },
-	{ 0x09, "C" },
-	{ 0x03, "D" },
-	{ 0x0F, "E" },
-	{ 0x04, "F" },
-	{ 0x06, "G" },
-	{ 0x05, "H" },
-	{ 0x23, "I" },
-	{ 0x27, "J" },
-	{ 0x29, "K" },
-	{ 0x26, "L" },
-	{ 0x2F, "M" },
-	{ 0x2E, "N" },
-	{ 0x20, "O" },
-	{ 0x24, "P" },
-	{ 0x0D, "Q" },
-	{ 0x10, "R" },
-	{ 0x02, "S" },
-	{ 0x12, "T" },
-	{ 0x21, "U" },
-	{ 0x0A, "V" },
-	{ 0x0E, "W" },
-	{ 0x08, "X" },
-	{ 0x11, "Y" },
-	{ 0x07, "Z" },
-	{ 0x22, "[" },
-	{ 0x1F, "]" },
-	{ 0x2A, ";" },
-	{ 0x28, "'" },
-	{ 0x2C, "," },
-	{ 0x30, "." },
-	{ 0x2D, "/" },
-	{ 0x33, "`" },
-	{ 0x13, "1" },
-	{ 0x14, "2" },
-	{ 0x15, "3" },
-	{ 0x16, "4" },
-	{ 0x18, "5" },
-	{ 0x17, "6" },
-	{ 0x1B, "7" },
-	{ 0x1D, "8" },
-	{ 0x1A, "9" },
-	{ 0x1E, "0" },
-	{ 0x1C, "-" },
-	{ 0x19, "=" },
-	{ 0x2B, "\\" },
-	{ 0x31, "Tab" },
-	{ 0x39, "Shift" },
-	{ 0x3C, "Control" },
-	{ 0x38, "Command" },
-	{ 0x32, "Spacebar" },
-	{ 0x34, "Backspace" },
-	{ 0x25, "Enter" },
-	{ 0x7F, "Up" },
-	{ 0x7E, "Down" },
-	{ 0x7C, "Left" },
-	{ 0x7D, "Right" },
-	{ 0x73, "Insert" },
-	{ 0x76, "Delete" },
-	{ 0x74, "Home" },
-	{ 0x78, "End" },
-	{ 0x75, "Page Up" },
-	{ 0x7A, "Page Down" },
-	{ 0x48, "Num Lock" },
-	{ 0x4C, "Keypad /" },
-	{ 0x44, "Keypad *" },
-	{ 0x4F, "Keypad -" },
-	{ 0x46, "Keypad +" },
-	{ 0x4D, "Keypad Enter" },
-	{ 0x53, "Keypad 0" },
-	{ 0x54, "Keypad 1" },
-	{ 0x55, "Keypad 2" },
-	{ 0x56, "Keypad 3" },
-	{ 0x57, "Keypad 4" },
-	{ 0x58, "Keypad 5" },
-	{ 0x59, "Keypad 6" },
-	{ 0x5A, "Keypad 7" },
-	{ 0x5C, "Keypad 8" },
-	{ 0x5D, "Keypad 9" },
-	{ 0x42, "Keypad ." },
+	{ kVK_ANSI_A + 1, "A" },
+	{ kVK_ANSI_B + 1, "B" },
+	{ kVK_ANSI_C + 1, "C" },
+	{ kVK_ANSI_D + 1, "D" },
+	{ kVK_ANSI_E + 1, "E" },
+	{ kVK_ANSI_F + 1, "F" },
+	{ kVK_ANSI_G + 1, "G" },
+	{ kVK_ANSI_H + 1, "H" },
+	{ kVK_ANSI_I + 1, "I" },
+	{ kVK_ANSI_J + 1, "J" },
+	{ kVK_ANSI_K + 1, "K" },
+	{ kVK_ANSI_L + 1, "L" },
+	{ kVK_ANSI_M + 1, "M" },
+	{ kVK_ANSI_N + 1, "N" },
+	{ kVK_ANSI_O + 1, "O" },
+	{ kVK_ANSI_P + 1, "P" },
+	{ kVK_ANSI_Q + 1, "Q" },
+	{ kVK_ANSI_R + 1, "R" },
+	{ kVK_ANSI_S + 1, "S" },
+	{ kVK_ANSI_T + 1, "T" },
+	{ kVK_ANSI_U + 1, "U" },
+	{ kVK_ANSI_V + 1, "V" },
+	{ kVK_ANSI_W + 1, "W" },
+	{ kVK_ANSI_X + 1, "X" },
+	{ kVK_ANSI_Y + 1, "Y" },
+	{ kVK_ANSI_Z + 1, "Z" },
+	{ kVK_ANSI_LeftBracket + 1, "[" },
+	{ kVK_ANSI_RightBracket + 1, "]" },
+	{ kVK_ANSI_Semicolon + 1, ";" },
+	{ kVK_ANSI_Quote + 1, "'" },
+	{ kVK_ANSI_Comma + 1, "," },
+	{ kVK_ANSI_Period + 1, "." },
+	{ kVK_ANSI_Slash + 1, "/" },
+	{ kVK_ANSI_Grave + 1, "`" },
+	{ kVK_ANSI_1 + 1, "1" },
+	{ kVK_ANSI_2 + 1, "2" },
+	{ kVK_ANSI_3 + 1, "3" },
+	{ kVK_ANSI_4 + 1, "4" },
+	{ kVK_ANSI_5 + 1, "5" },
+	{ kVK_ANSI_6 + 1, "6" },
+	{ kVK_ANSI_7 + 1, "7" },
+	{ kVK_ANSI_8 + 1, "8" },
+	{ kVK_ANSI_9 + 1, "9" },
+	{ kVK_ANSI_0 + 1, "0" },
+	{ kVK_ANSI_Minus + 1, "-" },
+	{ kVK_ANSI_Equal + 1, "=" },
+	{ kVK_ANSI_Backslash + 1, "\\" },
+	{ kVK_Tab + 1, "Tab" },
+	{ kVK_Shift + 1, "Shift" },
+	{ kVK_Option + 1, "Option" },
+	{ kVK_Control + 1, "Control" },
+	{ kVK_Command + 1, "Command" },
+	{ kVK_Space + 1, "Spacebar" },
+	{ kVK_Delete + 1, "Delete" },
+	{ kVK_Return + 1, "Return" },
+	{ kVK_UpArrow + 1, "Up" },
+	{ kVK_DownArrow + 1, "Down" },
+	{ kVK_LeftArrow + 1, "Left" },
+	{ kVK_RightArrow + 1, "Right" },
+	{ kVK_Help + 1, "Help" },
+	{ kVK_ForwardDelete + 1, "Forward Delete" },
+	{ kVK_Home + 1, "Home" },
+	{ kVK_End + 1, "End" },
+	{ kVK_PageUp + 1, "Page Up" },
+	{ kVK_PageDown + 1, "Page Down" },
+	{ kVK_ANSI_KeypadClear + 1, "Keypad Clear" },
+	{ kVK_ANSI_KeypadDivide + 1, "Keypad /" },
+	{ kVK_ANSI_KeypadMultiply + 1, "Keypad *" },
+	{ kVK_ANSI_KeypadMinus + 1, "Keypad -" },
+	{ kVK_ANSI_KeypadPlus + 1, "Keypad +" },
+	{ kVK_ANSI_KeypadEnter + 1, "Keypad Enter" },
+	{ kVK_ANSI_Keypad0 + 1, "Keypad 0" },
+	{ kVK_ANSI_Keypad1 + 1, "Keypad 1" },
+	{ kVK_ANSI_Keypad2 + 1, "Keypad 2" },
+	{ kVK_ANSI_Keypad3 + 1, "Keypad 3" },
+	{ kVK_ANSI_Keypad4 + 1, "Keypad 4" },
+	{ kVK_ANSI_Keypad5 + 1, "Keypad 5" },
+	{ kVK_ANSI_Keypad6 + 1, "Keypad 6" },
+	{ kVK_ANSI_Keypad7 + 1, "Keypad 7" },
+	{ kVK_ANSI_Keypad8 + 1, "Keypad 8" },
+	{ kVK_ANSI_Keypad9 + 1, "Keypad 9" },
+	{ kVK_ANSI_KeypadDecimal + 1, "Keypad ." },
+	{ kVK_F1 + 1, "F1" },
+	{ kVK_F2 + 1, "F2" },
+	{ kVK_F3 + 1, "F3" },
+	{ kVK_F4 + 1, "F4" },
+	{ kVK_F5 + 1, "F5" },
+	{ kVK_F6 + 1, "F6" },
+	{ kVK_F7 + 1, "F7" },
+	{ kVK_F8 + 1, "F8" },
+	{ kVK_F9 + 1, "F9" },
+	{ kVK_F10 + 1, "F10" },
+	{ kVK_F11 + 1, "F11" },
+	{ kVK_F12 + 1, "F12" },
+	{ kVK_F13 + 1, "F13" },
+	{ kVK_F14 + 1, "F14" },
+	{ kVK_F15 + 1, "F15" },
 	{ 0x00, NULL }
 };
 
@@ -550,7 +575,7 @@
 	keybytes = (unsigned char *) theKeys;
 
 	for (i = 0; i < 128; i++) {
-		if (i == 0x3A) continue; // Ignore capslock
+		if (i == kVK_CapsLock) continue; // Ignore capslock
 
 		if (keybytes[i >> 3] & (1 << (i & 7)))
 			return i + 1;
@@ -642,13 +667,13 @@
 		// check keyboard events
 		i = CheckKeyDown();
 		if (i != 0) {
-			if (i != 0x36) g.cfg.PadDef[padnum].KeyDef[key].Key = i;
+			if (i != (kVK_Escape + 1)) g.cfg.PadDef[padnum].KeyDef[key].Key = i;
 			changed = 1;
 			goto end;
 		}
 
 		// check mouse events
-		if (Button()) {
+		if (GetCurrentButtonState()) {
 			changed = 2;
 			goto end;
 		}
@@ -725,13 +750,13 @@
 		// check keyboard events
 		i = CheckKeyDown();
 		if (i != 0) {
-			if (i != 0x36) g.cfg.PadDef[padnum].AnalogDef[analognum][analogdir].Key = i;
+			if (i != (kVK_Escape + 1)) g.cfg.PadDef[padnum].AnalogDef[analognum][analogdir].Key = i;
 			changed = 1;
 			goto end;
 		}
 
 		// check mouse events
-		if (Button()) {
+		if (GetCurrentButtonState()) {
 			changed = 2;
 			goto end;
 		}

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/macsrc/cfg.h -> pcsxr-1.9.93.tar.bz2/macosx/plugins/DFInput/macsrc/cfg.h Changed

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFInput/macsrc/xkb.c -> pcsxr-1.9.93.tar.bz2/macosx/plugins/DFInput/macsrc/xkb.c Changed

pcsxr-1.9.93.tar.bz2/macosx/plugins/DFNet Added

pcsxr-1.9.93.tar.bz2/macosx/plugins/DFNet/English.lproj Added

pcsxr-1.9.93.tar.bz2/macosx/plugins/DFNet/English.lproj/Credits.rtf Added

pcsxr-1.9.93.tar.bz2/macosx/plugins/DFNet/English.lproj/DFNet.xib Added

@@ -0,0 +1,1091 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
+	<data>
+		<int key="IBDocument.SystemTarget">1070</int>
+		<string key="IBDocument.SystemVersion">12E55</string>
+		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
+		<string key="IBDocument.AppKitVersion">1187.39</string>
+		<string key="IBDocument.HIToolboxVersion">626.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			<string key="NS.object.0">3084</string>
+		</object>
+		<array key="IBDocument.IntegratedClassDependencies">
+			<string>IBNSLayoutConstraint</string>
+			<string>NSButton</string>
+			<string>NSButtonCell</string>
+			<string>NSCustomObject</string>
+			<string>NSNumberFormatter</string>
+			<string>NSTextField</string>
+			<string>NSTextFieldCell</string>
+			<string>NSView</string>
+			<string>NSWindowTemplate</string>
+		</array>
+		<array key="IBDocument.PluginDependencies">
+			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+		</array>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+			<object class="NSCustomObject" id="1001">
+				<string key="NSClassName">DFNetPlayPluginConfigController</string>
+			</object>
+			<object class="NSCustomObject" id="1003">
+				<string key="NSClassName">FirstResponder</string>
+			</object>
+			<object class="NSCustomObject" id="1004">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSWindowTemplate" id="1005">
+				<int key="NSWindowStyleMask">15</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{196, 240}, {340, 160}}</string>
+				<int key="NSWTFlags">544735232</int>
+				<string key="NSWindowTitle">Settings</string>
+				<string key="NSWindowClass">NSWindow</string>
+				<nil key="NSViewClass"/>
+				<nil key="NSUserInterfaceItemIdentifier"/>
+				<string key="NSWindowContentMinSize">{340, 151}</string>
+				<object class="NSView" key="NSWindowView" id="1006">
+					<reference key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<array class="NSMutableArray" key="NSSubviews">
+						<object class="NSTextField" id="898087221">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{126, 118}, {194, 22}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="578306678"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="642817145">
+								<int key="NSCellFlags">-1804599231</int>
+								<int key="NSCellFlags2">272630784</int>
+								<string key="NSContents">127.0.0.1</string>
+								<object class="NSFont" key="NSSupport" id="638482190">
+									<string key="NSName">LucidaGrande</string>
+									<double key="NSSize">13</double>
+									<int key="NSfFlags">1044</int>
+								</object>
+								<reference key="NSControlView" ref="898087221"/>
+								<bool key="NSDrawsBackground">YES</bool>
+								<object class="NSColor" key="NSBackgroundColor" id="14663110">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">textBackgroundColor</string>
+									<object class="NSColor" key="NSColor">
+										<int key="NSColorSpace">3</int>
+										<bytes key="NSWhite">MQA</bytes>
+									</object>
+								</object>
+								<object class="NSColor" key="NSTextColor" id="202277391">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">textColor</string>
+									<object class="NSColor" key="NSColor" id="922126131">
+										<int key="NSColorSpace">3</int>
+										<bytes key="NSWhite">MAA</bytes>
+									</object>
+								</object>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSTextField" id="241801086">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{126, 86}, {194, 22}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="762877023"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="994761013">
+								<int key="NSCellFlags">-1804599231</int>
+								<int key="NSCellFlags2">-1874852864</int>
+								<string key="NSContents">33306</string>
+								<reference key="NSSupport" ref="638482190"/>
+								<object class="NSNumberFormatter" key="NSFormatter" id="268768333">
+									<dictionary class="NSMutableDictionary" key="NS.attributes">
+										<boolean value="YES" key="allowsFloats"/>
+										<integer value="1040" key="formatterBehavior"/>
+										<object class="NSLocale" key="locale" id="258451440">
+											<string key="NS.identifier"/>
+										</object>
+										<integer value="65535" key="maximum"/>
+										<integer value="1" key="minimum"/>
+										<string key="negativeInfinitySymbol">-∞</string>
+										<string key="nilSymbol"/>
+										<string key="positiveInfinitySymbol">+∞</string>
+									</dictionary>
+									<string key="NS.positiveformat">#</string>
+									<string key="NS.negativeformat">#</string>
+									<nil key="NS.positiveattrs"/>
+									<nil key="NS.negativeattrs"/>
+									<nil key="NS.zero"/>
+									<object class="NSAttributedString" key="NS.nil">
+										<string key="NSString"/>
+									</object>
+									<object class="NSAttributedString" key="NS.nan">
+										<string key="NSString">NaN</string>
+										<dictionary key="NSAttributes" id="24888233"/>
+									</object>
+									<integer value="1" key="NS.min"/>
+									<integer value="65535" key="NS.max"/>
+									<object class="NSDecimalNumberHandler" key="NS.rounding">
+										<int key="NS.roundingmode">3</int>
+										<bool key="NS.raise.overflow">YES</bool>
+										<bool key="NS.raise.underflow">YES</bool>
+										<bool key="NS.raise.dividebyzero">YES</bool>
+									</object>
+									<string key="NS.decimal">.</string>
+									<string key="NS.thousand">,</string>
+									<bool key="NS.hasthousands">NO</bool>
+									<bool key="NS.localized">NO</bool>
+									<bool key="NS.allowsfloats">YES</bool>
+								</object>
+								<reference key="NSControlView" ref="241801086"/>
+								<bool key="NSDrawsBackground">YES</bool>
+								<reference key="NSBackgroundColor" ref="14663110"/>
+								<reference key="NSTextColor" ref="202277391"/>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSTextField" id="300903308">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{17, 120}, {75, 17}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="898087221"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="871000838">
+								<int key="NSCellFlags">68157504</int>
+								<int key="NSCellFlags2">272630784</int>
+								<string key="NSContents">IP Address:</string>
+								<reference key="NSSupport" ref="638482190"/>
+								<reference key="NSControlView" ref="300903308"/>
+								<object class="NSColor" key="NSBackgroundColor" id="865466005">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">controlColor</string>
+									<object class="NSColor" key="NSColor">
+										<int key="NSColorSpace">3</int>
+										<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+									</object>
+								</object>
+								<object class="NSColor" key="NSTextColor" id="2780984">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">controlTextColor</string>
+									<reference key="NSColor" ref="922126131"/>
+								</object>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSTextField" id="578306678">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{17, 88}, {38, 17}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="241801086"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="820109644">
+								<int key="NSCellFlags">68157504</int>
+								<int key="NSCellFlags2">272630784</int>
+								<string key="NSContents">Port:</string>
+								<reference key="NSSupport" ref="638482190"/>
+								<reference key="NSControlView" ref="578306678"/>
+								<reference key="NSBackgroundColor" ref="865466005"/>
+								<reference key="NSTextColor" ref="2780984"/>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSTextField" id="762877023">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{17, 56}, {101, 17}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="975640728"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="295724552">
+								<int key="NSCellFlags">68157504</int>
+								<int key="NSCellFlags2">272630784</int>
+								<string key="NSContents">Player Number:</string>
+								<reference key="NSSupport" ref="638482190"/>
+								<reference key="NSControlView" ref="762877023"/>
+								<reference key="NSBackgroundColor" ref="865466005"/>
+								<reference key="NSTextColor" ref="2780984"/>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSTextField" id="975640728">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{126, 54}, {194, 22}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="12981668"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="123591098">
+								<int key="NSCellFlags">-1804599231</int>
+								<int key="NSCellFlags2">-1874852864</int>
+								<string key="NSContents">1</string>
+								<reference key="NSSupport" ref="638482190"/>
+								<object class="NSNumberFormatter" key="NSFormatter" id="630529634">
+									<dictionary class="NSMutableDictionary" key="NS.attributes">
+										<boolean value="YES" key="allowsFloats"/>
+										<integer value="1040" key="formatterBehavior"/>
+										<reference key="locale" ref="258451440"/>
+										<integer value="2" key="maximum"/>
+										<real value="1" key="minimum"/>
+										<string key="negativeInfinitySymbol">-∞</string>
+										<string key="nilSymbol"/>
+										<string key="positiveInfinitySymbol">+∞</string>
+									</dictionary>
+									<string key="NS.positiveformat">#</string>
+									<string key="NS.negativeformat">#</string>
+									<nil key="NS.positiveattrs"/>
+									<nil key="NS.negativeattrs"/>
+									<nil key="NS.zero"/>
+									<object class="NSAttributedString" key="NS.nil">
+										<string key="NSString"/>
+									</object>
+									<object class="NSAttributedString" key="NS.nan">
+										<string key="NSString">NaN</string>
+										<reference key="NSAttributes" ref="24888233"/>
+									</object>
+									<real value="1" key="NS.min"/>
+									<integer value="2" key="NS.max"/>
+									<object class="NSDecimalNumberHandler" key="NS.rounding">
+										<int key="NS.roundingmode">3</int>
+										<bool key="NS.raise.overflow">YES</bool>
+										<bool key="NS.raise.underflow">YES</bool>
+										<bool key="NS.raise.dividebyzero">YES</bool>
+									</object>
+									<string key="NS.decimal">.</string>
+									<string key="NS.thousand">,</string>
+									<bool key="NS.hasthousands">NO</bool>
+									<bool key="NS.localized">NO</bool>
+									<bool key="NS.allowsfloats">YES</bool>
+								</object>
+								<reference key="NSControlView" ref="975640728"/>
+								<bool key="NSDrawsBackground">YES</bool>
+								<reference key="NSBackgroundColor" ref="14663110"/>
+								<reference key="NSTextColor" ref="202277391"/>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSButton" id="982924147">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{267, 13}, {59, 32}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="587230592">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">OK</string>
+								<reference key="NSSupport" ref="638482190"/>
+								<string key="NSCellIdentifier">_NS:9</string>
+								<reference key="NSControlView" ref="982924147"/>
+								<int key="NSButtonFlags">-2038284288</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSButton" id="12981668">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{185, 13}, {82, 32}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="982924147"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="822815376">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Cancel</string>
+								<reference key="NSSupport" ref="638482190"/>
+								<string key="NSCellIdentifier">_NS:9</string>
+								<reference key="NSControlView" ref="12981668"/>
+								<int key="NSButtonFlags">-2038284288</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string type="base64-UTF8" key="NSKeyEquivalent">Gw</string>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+					</array>
+					<string key="NSFrameSize">{340, 160}</string>
+					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
+					<reference key="NSNextKeyView" ref="300903308"/>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
+				<string key="NSMinSize">{340, 173}</string>
+				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
+				<bool key="NSWindowIsRestorable">YES</bool>
+			</object>
+		</array>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<array class="NSMutableArray" key="connectionRecords">
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">window</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="1005"/>
+					</object>
+					<int key="connectionID">3</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">ipAddress</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="898087221"/>
+					</object>
+					<int key="connectionID">16</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">portNum</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="241801086"/>
+					</object>
+					<int key="connectionID">23</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">playerNum</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="975640728"/>
+					</object>
+					<int key="connectionID">28</int>
+				</object>
+			</array>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<array key="orderedObjects">
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<array key="object" id="0"/>
+						<reference key="children" ref="1000"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="1001"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="1003"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">First Responder</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-3</int>
+						<reference key="object" ref="1004"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Application</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1</int>
+						<reference key="object" ref="1005"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1006"/>
+						</array>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2</int>
+						<reference key="object" ref="1006"/>
+						<array class="NSMutableArray" key="children">
+							<object class="IBNSLayoutConstraint" id="607530085">
+								<reference key="firstItem" ref="982924147"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="12981668"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">12</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1006"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="60268086">
+								<reference key="firstItem" ref="1006"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="982924147"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1006"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="985329394">
+								<reference key="firstItem" ref="1006"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="982924147"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1006"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="174744355">
+								<reference key="firstItem" ref="1006"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="12981668"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1006"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="199902621">
+								<reference key="firstItem" ref="975640728"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="241801086"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">10</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1006"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="111964840">
+								<reference key="firstItem" ref="1006"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="975640728"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1006"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="981157019">
+								<reference key="firstItem" ref="975640728"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="241801086"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1006"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="900117726">
+								<reference key="firstItem" ref="241801086"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="898087221"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">10</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1006"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="16050748">
+								<reference key="firstItem" ref="1006"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="241801086"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1006"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="691459314">
+								<reference key="firstItem" ref="241801086"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="898087221"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1006"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="817333537">
+								<reference key="firstItem" ref="898087221"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1006"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1006"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="507420871">
+								<reference key="firstItem" ref="1006"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="898087221"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1006"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="525649460">
+								<reference key="firstItem" ref="762877023"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1006"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1006"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="882355438">
+								<reference key="firstItem" ref="762877023"/>
+								<int key="firstAttribute">11</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="975640728"/>
+								<int key="secondAttribute">11</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1006"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="783618282">
+								<reference key="firstItem" ref="578306678"/>
+								<int key="firstAttribute">11</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="241801086"/>
+								<int key="secondAttribute">11</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1006"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="234850664">
+								<reference key="firstItem" ref="578306678"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1006"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1006"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="734377393">
+								<reference key="firstItem" ref="300903308"/>
+								<int key="firstAttribute">11</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="898087221"/>
+								<int key="secondAttribute">11</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1006"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="635544654">
+								<reference key="firstItem" ref="300903308"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1006"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1006"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<reference ref="982924147"/>
+							<reference ref="12981668"/>
+							<reference ref="898087221"/>
+							<reference ref="300903308"/>
+							<reference ref="241801086"/>
+							<reference ref="578306678"/>
+							<reference ref="975640728"/>
+							<reference ref="762877023"/>
+						</array>
+						<reference key="parent" ref="1005"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">9</int>
+						<reference key="object" ref="898087221"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="642817145"/>
+							<object class="IBNSLayoutConstraint" id="532443336">
+								<reference key="firstItem" ref="898087221"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">194</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="898087221"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10</int>
+						<reference key="object" ref="642817145"/>
+						<reference key="parent" ref="898087221"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">17</int>
+						<reference key="object" ref="241801086"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="994761013"/>
+						</array>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">18</int>
+						<reference key="object" ref="994761013"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="268768333"/>
+						</array>
+						<reference key="parent" ref="241801086"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">19</int>
+						<reference key="object" ref="300903308"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="871000838"/>
+						</array>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">20</int>
+						<reference key="object" ref="871000838"/>
+						<reference key="parent" ref="300903308"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">21</int>
+						<reference key="object" ref="578306678"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="820109644"/>
+							<object class="IBNSLayoutConstraint" id="734382180">
+								<reference key="firstItem" ref="578306678"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">32</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="578306678"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">22</int>
+						<reference key="object" ref="820109644"/>
+						<reference key="parent" ref="578306678"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">24</int>
+						<reference key="object" ref="762877023"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="295724552"/>
+						</array>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">25</int>
+						<reference key="object" ref="295724552"/>
+						<reference key="parent" ref="762877023"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">26</int>
+						<reference key="object" ref="975640728"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="123591098"/>
+						</array>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">27</int>
+						<reference key="object" ref="123591098"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="630529634"/>
+						</array>
+						<reference key="parent" ref="975640728"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">29</int>
+						<reference key="object" ref="268768333"/>
+						<reference key="parent" ref="994761013"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">30</int>
+						<reference key="object" ref="630529634"/>
+						<reference key="parent" ref="123591098"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">32</int>
+						<reference key="object" ref="734382180"/>
+						<reference key="parent" ref="578306678"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">35</int>
+						<reference key="object" ref="981157019"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">46</int>
+						<reference key="object" ref="691459314"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">47</int>
+						<reference key="object" ref="234850664"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">48</int>
+						<reference key="object" ref="635544654"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">49</int>
+						<reference key="object" ref="16050748"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">52</int>
+						<reference key="object" ref="111964840"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">54</int>
+						<reference key="object" ref="982924147"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="587230592"/>
+						</array>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">55</int>
+						<reference key="object" ref="587230592"/>
+						<reference key="parent" ref="982924147"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">57</int>
+						<reference key="object" ref="985329394"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">58</int>
+						<reference key="object" ref="60268086"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">59</int>
+						<reference key="object" ref="12981668"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="822815376"/>
+						</array>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">60</int>
+						<reference key="object" ref="822815376"/>
+						<reference key="parent" ref="12981668"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">61</int>
+						<reference key="object" ref="174744355"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">63</int>
+						<reference key="object" ref="607530085"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">45</int>
+						<reference key="object" ref="507420871"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">31</int>
+						<reference key="object" ref="532443336"/>
+						<reference key="parent" ref="898087221"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">72</int>
+						<reference key="object" ref="817333537"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">74</int>
+						<reference key="object" ref="734377393"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">78</int>
+						<reference key="object" ref="900117726"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">79</int>
+						<reference key="object" ref="783618282"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">82</int>
+						<reference key="object" ref="199902621"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">83</int>
+						<reference key="object" ref="882355438"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">84</int>
+						<reference key="object" ref="525649460"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+				</array>
+			</object>
+			<dictionary class="NSMutableDictionary" key="flattenedProperties">
+				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1.IBWindowTemplateEditedContentRect">{{577, 640}, {372, 270}}</string>
+				<integer value="1" key="1.NSWindowTemplate.visibleAtLaunch"/>
+				<string key="10.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="17.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="17.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="18.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="19.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="19.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array class="NSMutableArray" key="2.IBNSViewMetadataConstraints">
+					<reference ref="635544654"/>
+					<reference ref="734377393"/>
+					<reference ref="234850664"/>
+					<reference ref="783618282"/>
+					<reference ref="882355438"/>
+					<reference ref="525649460"/>
+					<reference ref="507420871"/>
+					<reference ref="817333537"/>
+					<reference ref="691459314"/>
+					<reference ref="16050748"/>
+					<reference ref="900117726"/>
+					<reference ref="981157019"/>
+					<reference ref="111964840"/>
+					<reference ref="199902621"/>
+					<reference ref="174744355"/>
+					<reference ref="985329394"/>
+					<reference ref="60268086"/>
+					<reference ref="607530085"/>
+				</array>
+				<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array class="NSMutableArray" key="2.IBUserGuides"/>
+				<string key="20.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="21.IBNSViewMetadataConstraints">
+					<reference ref="734382180"/>
+				</array>
+				<boolean value="NO" key="21.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="21.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="22.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="24.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="24.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="25.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="26.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="26.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="27.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1041" key="29.IBNumberFormatterBehaviorMetadataKey"/>
+				<boolean value="NO" key="29.IBNumberFormatterLocalizesFormatMetadataKey"/>
+				<string key="29.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1041" key="30.IBNumberFormatterBehaviorMetadataKey"/>
+				<boolean value="NO" key="30.IBNumberFormatterLocalizesFormatMetadataKey"/>
+				<string key="30.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="31.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="32.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="35.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="45.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="46.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="47.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="48.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="49.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="52.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="54.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="54.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="55.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="57.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="58.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="59.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="59.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="60.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="61.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="63.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="72.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="74.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="78.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="79.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="82.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="83.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="84.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="9.IBNSViewMetadataConstraints">
+					<reference ref="532443336"/>
+				</array>
+				<boolean value="NO" key="9.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="9.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			</dictionary>
+			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+			<nil key="activeLocalization"/>
+			<dictionary class="NSMutableDictionary" key="localizations"/>
+			<nil key="sourceID"/>
+			<int key="maxID">84</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">DFNetPlayPluginConfigController</string>
+					<string key="superclassName">NSWindowController</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/DFNetPlayPluginConfigController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSLayoutConstraint</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/NSLayoutConstraint.h</string>
+					</object>
+				</object>
+			</array>
+		</object>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<real value="1070" key="NS.object.0"/>
+		</object>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<bool key="IBDocument.UseAutolayout">YES</bool>
+	</data>
+</archive>

pcsxr-1.9.93.tar.bz2/macosx/plugins/DFNet/English.lproj/InfoPlist.strings Added

pcsxr-1.9.93.tar.bz2/macosx/plugins/DFNet/English.lproj/Localizable.strings Added

pcsxr-1.9.93.tar.bz2/macosx/plugins/DFNet/English.lproj/SockDialog.xib Added

@@ -0,0 +1,513 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
+	<data>
+		<int key="IBDocument.SystemTarget">1070</int>
+		<string key="IBDocument.SystemVersion">12E55</string>
+		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
+		<string key="IBDocument.AppKitVersion">1187.39</string>
+		<string key="IBDocument.HIToolboxVersion">626.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			<string key="NS.object.0">3084</string>
+		</object>
+		<array key="IBDocument.IntegratedClassDependencies">
+			<string>IBNSLayoutConstraint</string>
+			<string>NSButton</string>
+			<string>NSButtonCell</string>
+			<string>NSCustomObject</string>
+			<string>NSProgressIndicator</string>
+			<string>NSTextField</string>
+			<string>NSTextFieldCell</string>
+			<string>NSView</string>
+			<string>NSWindowTemplate</string>
+		</array>
+		<array key="IBDocument.PluginDependencies">
+			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+		</array>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+			<object class="NSCustomObject" id="1001">
+				<string key="NSClassName">SockDialog</string>
+			</object>
+			<object class="NSCustomObject" id="1003">
+				<string key="NSClassName">FirstResponder</string>
+			</object>
+			<object class="NSCustomObject" id="1004">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSWindowTemplate" id="1005">
+				<int key="NSWindowStyleMask">15</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{196, 371}, {380, 124}}</string>
+				<int key="NSWTFlags">544735232</int>
+				<string key="NSWindowTitle">Window</string>
+				<string key="NSWindowClass">NSWindow</string>
+				<nil key="NSViewClass"/>
+				<nil key="NSUserInterfaceItemIdentifier"/>
+				<string key="NSWindowContentMaxSize">{380, 140}</string>
+				<string key="NSWindowContentMinSize">{380, 140}</string>
+				<object class="NSView" key="NSWindowView" id="1006">
+					<reference key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<array class="NSMutableArray" key="NSSubviews">
+						<object class="NSTextField" id="150785340">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{78, 87}, {225, 17}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="308883112"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="993388181">
+								<int key="NSCellFlags">68157504</int>
+								<int key="NSCellFlags2">138413056</int>
+								<string key="NSContents">Waiting for connections...</string>
+								<object class="NSFont" key="NSSupport" id="596705607">
+									<string key="NSName">LucidaGrande</string>
+									<double key="NSSize">13</double>
+									<int key="NSfFlags">1044</int>
+								</object>
+								<reference key="NSControlView" ref="150785340"/>
+								<object class="NSColor" key="NSBackgroundColor">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">controlColor</string>
+									<object class="NSColor" key="NSColor">
+										<int key="NSColorSpace">3</int>
+										<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+									</object>
+								</object>
+								<object class="NSColor" key="NSTextColor">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">controlTextColor</string>
+									<object class="NSColor" key="NSColor">
+										<int key="NSColorSpace">3</int>
+										<bytes key="NSWhite">MAA</bytes>
+									</object>
+								</object>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSProgressIndicator" id="308883112">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{103, 60}, {174, 20}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="796798766"/>
+							<int key="NSpiFlags">24586</int>
+							<double key="NSMaxValue">100</double>
+						</object>
+						<object class="NSButton" id="796798766">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{149, 13}, {82, 32}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="1054752594">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Cancel</string>
+								<reference key="NSSupport" ref="596705607"/>
+								<string key="NSCellIdentifier">_NS:9</string>
+								<reference key="NSControlView" ref="796798766"/>
+								<int key="NSButtonFlags">-2038284288</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string type="base64-UTF8" key="NSKeyEquivalent">Gw</string>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+					</array>
+					<string key="NSFrameSize">{380, 124}</string>
+					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
+					<reference key="NSNextKeyView" ref="150785340"/>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
+				<string key="NSMinSize">{380, 162}</string>
+				<string key="NSMaxSize">{380, 162}</string>
+				<bool key="NSWindowIsRestorable">YES</bool>
+			</object>
+		</array>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<array class="NSMutableArray" key="connectionRecords">
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">window</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="1005"/>
+					</object>
+					<int key="connectionID">9</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">cancel:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="796798766"/>
+					</object>
+					<int key="connectionID">31</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">spinningBar</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="308883112"/>
+					</object>
+					<int key="connectionID">32</int>
+				</object>
+			</array>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<array key="orderedObjects">
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<array key="object" id="0"/>
+						<reference key="children" ref="1000"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="1001"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="1003"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">First Responder</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-3</int>
+						<reference key="object" ref="1004"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Application</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1</int>
+						<reference key="object" ref="1005"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1006"/>
+						</array>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2</int>
+						<reference key="object" ref="1006"/>
+						<array class="NSMutableArray" key="children">
+							<object class="IBNSLayoutConstraint" id="715386164">
+								<reference key="firstItem" ref="796798766"/>
+								<int key="firstAttribute">9</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="308883112"/>
+								<int key="secondAttribute">9</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1006"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="134441829">
+								<reference key="firstItem" ref="1006"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="796798766"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1006"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="871977271">
+								<reference key="firstItem" ref="796798766"/>
+								<int key="firstAttribute">9</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1006"/>
+								<int key="secondAttribute">9</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1006"/>
+								<int key="scoringType">5</int>
+								<float key="scoringTypeFloat">22</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="390852115">
+								<reference key="firstItem" ref="308883112"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="150785340"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1006"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="547332722">
+								<reference key="firstItem" ref="150785340"/>
+								<int key="firstAttribute">9</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="308883112"/>
+								<int key="secondAttribute">9</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1006"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="857063854">
+								<reference key="firstItem" ref="150785340"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1006"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1006"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<reference ref="150785340"/>
+							<reference ref="308883112"/>
+							<reference ref="796798766"/>
+						</array>
+						<reference key="parent" ref="1005"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">3</int>
+						<reference key="object" ref="150785340"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="993388181"/>
+							<object class="IBNSLayoutConstraint" id="164791579">
+								<reference key="firstItem" ref="150785340"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">219</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="150785340"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">4</int>
+						<reference key="object" ref="993388181"/>
+						<reference key="parent" ref="150785340"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6</int>
+						<reference key="object" ref="308883112"/>
+						<array class="NSMutableArray" key="children">
+							<object class="IBNSLayoutConstraint" id="339534934">
+								<reference key="firstItem" ref="308883112"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">174</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="308883112"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">11</int>
+						<reference key="object" ref="164791579"/>
+						<reference key="parent" ref="150785340"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">14</int>
+						<reference key="object" ref="857063854"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">17</int>
+						<reference key="object" ref="547332722"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">19</int>
+						<reference key="object" ref="339534934"/>
+						<reference key="parent" ref="308883112"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">21</int>
+						<reference key="object" ref="390852115"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">26</int>
+						<reference key="object" ref="796798766"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1054752594"/>
+						</array>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">27</int>
+						<reference key="object" ref="1054752594"/>
+						<reference key="parent" ref="796798766"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">28</int>
+						<reference key="object" ref="871977271"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">29</int>
+						<reference key="object" ref="134441829"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">30</int>
+						<reference key="object" ref="715386164"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+				</array>
+			</object>
+			<dictionary class="NSMutableDictionary" key="flattenedProperties">
+				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1.IBWindowTemplateEditedContentRect">{{322, 765}, {382, 139}}</string>
+				<integer value="1" key="1.NSWindowTemplate.visibleAtLaunch"/>
+				<string key="11.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="14.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="17.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="19.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array class="NSMutableArray" key="2.IBNSViewMetadataConstraints">
+					<reference ref="857063854"/>
+					<reference ref="547332722"/>
+					<reference ref="390852115"/>
+					<reference ref="871977271"/>
+					<reference ref="134441829"/>
+					<reference ref="715386164"/>
+				</array>
+				<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="21.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="26.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="26.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="27.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="28.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="29.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="3.IBNSViewMetadataConstraints">
+					<reference ref="164791579"/>
+				</array>
+				<boolean value="NO" key="3.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="30.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="6.IBNSViewMetadataConstraints">
+					<reference ref="339534934"/>
+				</array>
+				<boolean value="NO" key="6.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			</dictionary>
+			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+			<nil key="activeLocalization"/>
+			<dictionary class="NSMutableDictionary" key="localizations"/>
+			<nil key="sourceID"/>
+			<int key="maxID">32</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">NSLayoutConstraint</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/NSLayoutConstraint.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">SockDialog</string>
+					<string key="superclassName">NSWindowController</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">cancel:</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">cancel:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">cancel:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">spinningBar</string>
+						<string key="NS.object.0">NSProgressIndicator</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">spinningBar</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">spinningBar</string>
+							<string key="candidateClassName">NSProgressIndicator</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/SockDialog.h</string>
+					</object>
+				</object>
+			</array>
+		</object>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<real value="1070" key="NS.object.0"/>
+		</object>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<bool key="IBDocument.UseAutolayout">YES</bool>
+	</data>
+</archive>

pcsxr-1.9.93.tar.bz2/macosx/plugins/DFNet/Info.plist Added

pcsxr-1.9.93.tar.bz2/macosx/plugins/DFNet/macsrc Added

pcsxr-1.9.93.tar.bz2/macosx/plugins/DFNet/macsrc/PluginConfigController.h Added

pcsxr-1.9.93.tar.bz2/macosx/plugins/DFNet/macsrc/PluginConfigController.m Added

@@ -0,0 +1,166 @@
+/*
+ * Copyright (c) 2010, Wei Mingzhi <whistler@openoffice.org>.
+ * All Rights Reserved.
+ *
+ * Based on: Cdrom for Psemu Pro like Emulators
+ * By: linuzappz <linuzappz@hotmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses>.
+ */
+
+#import "PluginConfigController.h"
+#include "dfnet.h"
+#import "ARCBridge.h"
+
+#define kIPADDRKEY @"IP Address"
+#define kIPPORT @"IP Port"
+#define kPLAYERNUM @"Player Number"
+
+#define APP_ID @"net.codeplex.pcsxr.DFNet"
+#define PrefsKey APP_ID @" Settings"
+
+static PluginConfigController *windowController = nil;
+
+static inline void RunOnMainThreadSync(dispatch_block_t block)
+{
+	if ([NSThread isMainThread]) {
+		block();
+	} else {
+		dispatch_sync(dispatch_get_main_queue(), block);
+	}
+}
+
+void AboutDlgProc()
+{
+	// Get parent application instance
+	NSBundle *bundle = [NSBundle bundleWithIdentifier:APP_ID];
+
+	// Get Credits.rtf
+	NSString *path = [bundle pathForResource:@"Credits" ofType:@"rtf"];
+	NSAttributedString *credits;
+	if (path) {
+		credits = [[NSAttributedString alloc] initWithPath: path
+				documentAttributes:NULL];
+		AUTORELEASEOBJNORETURN(credits);
+	} else {
+		credits = AUTORELEASEOBJ([[NSAttributedString alloc] initWithString:@""]);
+	}
+
+	// Get Application Icon
+	NSImage *icon = [[NSWorkspace sharedWorkspace] iconForFile:[bundle bundlePath]];
+	[icon setSize:NSMakeSize(64, 64)];
+
+	NSDictionary *infoPaneDict =
+	[[NSDictionary alloc] initWithObjectsAndKeys:
+	 [bundle objectForInfoDictionaryKey:@"CFBundleName"], @"ApplicationName",
+	 icon, @"ApplicationIcon",
+	 [bundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"], @"ApplicationVersion",
+	 [bundle objectForInfoDictionaryKey:@"CFBundleVersion"], @"Version",
+	 [bundle objectForInfoDictionaryKey:@"NSHumanReadableCopyright"], @"Copyright",
+	 credits, @"Credits",
+	 nil];
+	dispatch_async(dispatch_get_main_queue(), ^{
+		[NSApp orderFrontStandardAboutPanelWithOptions:infoPaneDict];
+	});
+	RELEASEOBJ(infoPaneDict);
+}
+
+void ConfDlgProc()
+{
+	RunOnMainThreadSync(^{
+		NSWindow *window;
+		
+		if (windowController == nil) {
+			windowController = [[PluginConfigController alloc] initWithWindowNibName:@"DFNet"];
+		}
+		window = [windowController window];
+		
+		[windowController loadValues];
+		
+		[window center];
+		[window makeKeyAndOrderFront:nil];
+	});
+}
+
+void ReadConfig()
+{
+	NSDictionary *keyValues;
+	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+	
+	[defaults registerDefaults:[NSDictionary dictionaryWithObjectsAndKeys:
+								[NSDictionary dictionaryWithObjectsAndKeys:
+								 @"127.0.0.1", kIPADDRKEY,
+								 @((unsigned short)33306), kIPPORT,
+								 @1, kPLAYERNUM,
+								 nil], PrefsKey, nil]];
+	
+	keyValues = [defaults dictionaryForKey:PrefsKey];
+
+	conf.PortNum = [[keyValues objectForKey:kIPPORT] intValue];
+	conf.PlayerNum = [[keyValues objectForKey:kPLAYERNUM] intValue];
+	strlcpy(conf.ipAddress, [[keyValues objectForKey:kIPADDRKEY] cStringUsingEncoding:NSASCIIStringEncoding], sizeof(conf.ipAddress));
+}
+
+@implementation PluginConfigController
+
+- (IBAction)cancel:(id)sender
+{
+	[self close];
+}
+
+- (IBAction)ok:(id)sender
+{
+	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+	
+	NSString *theAddress = [ipAddress stringValue];
+	NSInteger asciiLen = [theAddress lengthOfBytesUsingEncoding:NSASCIIStringEncoding];
+	if (asciiLen > (sizeof(conf.ipAddress) - 1)) {
+		NSBeginAlertSheet(@"Address too long", nil, nil, nil, [self window], nil, NULL, NULL, NULL, @"The address is too long.\n\nTry to use only the IP address and not a host name.");
+		return;
+	} else if (asciiLen == 0) {
+		NSBeginAlertSheet(@"Blank address", nil, nil, nil, [self window], nil, NULL, NULL, NULL, @"The address specified is either blank, or can't be converted to ASCII.\n\nTry connecting directly using the IP address using latin numerals.");
+		return;
+	}
+
+	
+	NSMutableDictionary *writeDic = [NSMutableDictionary dictionaryWithDictionary:[defaults dictionaryForKey:PrefsKey]];
+	[writeDic setObject:@((unsigned short)[portNum intValue]) forKey:kIPPORT];
+	[writeDic setObject:@([playerNum intValue]) forKey:kPLAYERNUM];
+	[writeDic setObject:theAddress forKey:kIPADDRKEY];
+
+	// write to defaults
+	[defaults setObject:writeDic forKey:PrefsKey];
+	[defaults synchronize];
+
+	// and set global values accordingly
+	ReadConfig();
+
+	[self close];
+}
+
+- (void)loadValues
+{
+	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+	ReadConfig();
+	NSDictionary *keyValues = [defaults dictionaryForKey:PrefsKey];
+
+	[ipAddress setStringValue:[keyValues objectForKey:kIPADDRKEY]];
+	[portNum setIntValue:[[keyValues objectForKey:kIPPORT] unsignedShortValue]];
+	[playerNum setIntValue:[[keyValues objectForKey:kPLAYERNUM] intValue]];
+}
+
+@end
+
+#import "OSXPlugLocalization.h"
+PLUGLOCIMP([PluginConfigController class]);

pcsxr-1.9.93.tar.bz2/macosx/plugins/DFNet/macsrc/SockDialog.h Added

pcsxr-1.9.93.tar.bz2/macosx/plugins/DFNet/macsrc/SockDialog.m Added

@@ -0,0 +1,113 @@
+//
+//  SockDialog.m
+//  DFNet
+//
+//  Created by C.W. Betts on 2/18/11.
+//  Copyright 2011 __MyCompanyName__. All rights reserved.
+//
+
+#import "SockDialog.h"
+#include "dfnet.h"
+
+#import "EmuThread.h"
+#import "ARCBridge.h"
+
+void SysMessage(const char *fmt, ...)
+{
+	va_list list;
+	char msg[512];
+	//char cmd[512];
+	
+	va_start(list, fmt);
+	vsprintf(msg, fmt, list);
+	va_end(list);
+	
+	//sprintf(cmd, "message %s\n", msg);
+	NSString *errString = @(msg);
+	fprintf(stderr, "%s", msg);
+	NSAlert *alert = [NSAlert alertWithMessageText:@"Error" defaultButton:@"Exit" alternateButton:nil otherButton:nil informativeTextWithFormat:@"%@", errString];
+	[alert setAlertStyle:NSCriticalAlertStyle];
+	//NSInteger result = NSRunAlertPanel(errString, nil, @"Okay", nil, nil);
+	NSInteger result = [alert runModal];
+	if (result == NSAlertDefaultReturn)
+	{
+		Class theEmuClass = NSClassFromString(@"EmuThread");
+		if (theEmuClass) {
+			[theEmuClass stop];
+		} else {
+			NSLog(@"Unable to stop emulation because the Objective-C class \"EmuThreaed\" was not found. Are you using a different emulator than PCSXR?");
+		}
+	}
+}
+
+static inline void RunOnMainThreadSync(dispatch_block_t block)
+{
+	if ([NSThread isMainThread]) {
+		block();
+	} else {
+		dispatch_sync(dispatch_get_main_queue(), block);
+	}
+}
+
+static SockDialog *globalSock = nil;
+
+void sockCreateWaitDlg()
+{
+	RunOnMainThreadSync(^{
+		if (globalSock == nil) {
+			globalSock = [[SockDialog alloc] init];
+		}
+		NSWindow *tempWindow = [globalSock window];
+		[tempWindow center];
+		[globalSock showWindow:nil];
+		[tempWindow makeKeyAndOrderFront:nil];
+	});
+}
+
+void sockDlgUpdate()
+{
+	
+}
+
+long sockOpen()
+{
+	LoadConf();
+	
+	return 0;
+}
+
+void sockDestroyWaitDlg()
+{
+	RunOnMainThreadSync(^{
+		if (globalSock != nil) {
+			[globalSock close];
+			
+			RELEASEOBJ(globalSock);
+			globalSock = nil;
+		}
+	});
+}
+
+@implementation SockDialog
+
+- (IBAction)cancel:(id)sender {
+	WaitCancel = 1;
+}
+
+- (id)init
+{
+	if ((self = [super initWithWindowNibName:@"SockDialog"])) {
+		
+	}
+	return self;
+}
+
+#if !__has_feature(objc_arc)
+-(void)dealloc
+{
+	
+	[super dealloc];
+}
+#endif
+
+@end

pcsxr-1.9.93.tar.bz2/macosx/plugins/DFNet/macsrc/cfg.c Added

pcsxr-1.9.93.tar.bz2/macosx/plugins/DFNet/version.plist Added

pcsxr-1.9.93.tar.bz2/macosx/plugins/DFSound/Info-AL.plist Added

pcsxr-1.9.93.tar.bz2/macosx/plugins/DFSound/Info-SDL.plist Added

pcsxr-1.9.93.tar.bz2/macosx/plugins/DFSound/Resorces Added

pcsxr-1.9.93.tar.bz2/macosx/plugins/DFSound/Resorces/OpenAL Added

pcsxr-1.9.93.tar.bz2/macosx/plugins/DFSound/Resorces/OpenAL/English.lproj Added

pcsxr-1.9.93.tar.bz2/macosx/plugins/DFSound/Resorces/OpenAL/English.lproj/InfoPlist.strings Added

pcsxr-1.9.93.tar.bz2/macosx/plugins/DFSound/Resorces/SDL Added

pcsxr-1.9.93.tar.bz2/macosx/plugins/DFSound/Resorces/SDL/English.lproj Added

pcsxr-1.9.93.tar.bz2/macosx/plugins/DFSound/Resorces/SDL/English.lproj/InfoPlist.strings Added

pcsxr-1.9.93.tar.bz2/macosx/plugins/DFSound/Resorces/Shared Added

pcsxr-1.9.93.tar.bz2/macosx/plugins/DFSound/Resorces/Shared/English.lproj Added

pcsxr-1.9.93.tar.bz2/macosx/plugins/DFSound/Resorces/Shared/English.lproj/Credits.rtf Added

pcsxr-1.9.93.tar.bz2/macosx/plugins/DFSound/Resorces/Shared/English.lproj/Localizable.strings Added

pcsxr-1.9.93.tar.bz2/macosx/plugins/DFSound/Resorces/Shared/English.lproj/NetSfPeopsSpuPluginMain.xib Added

@@ -0,0 +1,2489 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
+	<data>
+		<int key="IBDocument.SystemTarget">1070</int>
+		<string key="IBDocument.SystemVersion">12E55</string>
+		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
+		<string key="IBDocument.AppKitVersion">1187.39</string>
+		<string key="IBDocument.HIToolboxVersion">626.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			<string key="NS.object.0">3084</string>
+		</object>
+		<array key="IBDocument.IntegratedClassDependencies">
+			<string>IBNSLayoutConstraint</string>
+			<string>NSBox</string>
+			<string>NSButton</string>
+			<string>NSButtonCell</string>
+			<string>NSCustomObject</string>
+			<string>NSMatrix</string>
+			<string>NSSlider</string>
+			<string>NSSliderCell</string>
+			<string>NSTextField</string>
+			<string>NSTextFieldCell</string>
+			<string>NSView</string>
+			<string>NSWindowTemplate</string>
+		</array>
+		<array key="IBDocument.PluginDependencies">
+			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+		</array>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1003241861">
+			<object class="NSCustomObject" id="758282330">
+				<string key="NSClassName">SPUPluginController</string>
+			</object>
+			<object class="NSCustomObject" id="438626275">
+				<string key="NSClassName">FirstResponder</string>
+			</object>
+			<object class="NSCustomObject" id="225882746">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSWindowTemplate" id="980713848">
+				<int key="NSWindowStyleMask">1</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{128, 348}, {466, 337}}</string>
+				<int key="NSWTFlags">1886912512</int>
+				<string key="NSWindowTitle">SPU Configuration</string>
+				<string key="NSWindowClass">NSWindow</string>
+				<object class="NSMutableString" key="NSViewClass">
+					<characters key="NS.bytes">View</characters>
+				</object>
+				<nil key="NSUserInterfaceItemIdentifier"/>
+				<string key="NSWindowContentMinSize">{213, 107}</string>
+				<object class="NSView" key="NSWindowView" id="335490069">
+					<reference key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<array class="NSMutableArray" key="NSSubviews">
+						<object class="NSBox" id="988321145">
+							<reference key="NSNextResponder" ref="335490069"/>
+							<int key="NSvFlags">256</int>
+							<array class="NSMutableArray" key="NSSubviews">
+								<object class="NSView" id="517400347">
+									<reference key="NSNextResponder" ref="988321145"/>
+									<int key="NSvFlags">274</int>
+									<array class="NSMutableArray" key="NSSubviews">
+										<object class="NSTextField" id="121836166">
+											<reference key="NSNextResponder" ref="517400347"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrame">{{13, 86}, {96, 17}}</string>
+											<reference key="NSSuperview" ref="517400347"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="1507912"/>
+											<string key="NSAntiCompressionPriority">{250, 750}</string>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTextFieldCell" key="NSCell" id="429556832">
+												<int key="NSCellFlags">67108864</int>
+												<int key="NSCellFlags2">4194304</int>
+												<string key="NSContents">Reverb:</string>
+												<object class="NSFont" key="NSSupport" id="535632823">
+													<string key="NSName">LucidaGrande</string>
+													<double key="NSSize">13</double>
+													<int key="NSfFlags">1044</int>
+												</object>
+												<reference key="NSControlView" ref="121836166"/>
+												<object class="NSColor" key="NSBackgroundColor" id="498551882">
+													<int key="NSColorSpace">6</int>
+													<string key="NSCatalogName">System</string>
+													<string key="NSColorName">controlColor</string>
+													<object class="NSColor" key="NSColor">
+														<int key="NSColorSpace">3</int>
+														<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+													</object>
+												</object>
+												<object class="NSColor" key="NSTextColor" id="823702402">
+													<int key="NSColorSpace">6</int>
+													<string key="NSCatalogName">System</string>
+													<string key="NSColorName">controlTextColor</string>
+													<object class="NSColor" key="NSColor">
+														<int key="NSColorSpace">3</int>
+														<bytes key="NSWhite">MAA</bytes>
+													</object>
+												</object>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSSlider" id="1507912">
+											<reference key="NSNextResponder" ref="517400347"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrame">{{127, 84}, {144, 26}}</string>
+											<reference key="NSSuperview" ref="517400347"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="184943800"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSSliderCell" key="NSCell" id="724216678">
+												<int key="NSCellFlags">67371264</int>
+												<int key="NSCellFlags2">0</int>
+												<object class="NSMutableString" key="NSContents">
+													<characters key="NS.bytes"/>
+												</object>
+												<object class="NSFont" key="NSSupport" id="922333135">
+													<string key="NSName">Helvetica</string>
+													<double key="NSSize">12</double>
+													<int key="NSfFlags">16</int>
+												</object>
+												<reference key="NSControlView" ref="1507912"/>
+												<double key="NSMaxValue">2</double>
+												<double key="NSMinValue">0.0</double>
+												<double key="NSValue">1</double>
+												<double key="NSAltIncValue">0.0</double>
+												<int key="NSNumberOfTickMarks">3</int>
+												<int key="NSTickMarkPosition">1</int>
+												<bool key="NSAllowsTickMarkValuesOnly">YES</bool>
+												<bool key="NSVertical">NO</bool>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSTextField" id="197077555">
+											<reference key="NSNextResponder" ref="517400347"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrame">{{13, 54}, {96, 17}}</string>
+											<reference key="NSSuperview" ref="517400347"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="398137737"/>
+											<string key="NSAntiCompressionPriority">{250, 750}</string>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTextFieldCell" key="NSCell" id="74472058">
+												<int key="NSCellFlags">67108864</int>
+												<int key="NSCellFlags2">4194304</int>
+												<string key="NSContents">Interpolation:</string>
+												<reference key="NSSupport" ref="535632823"/>
+												<reference key="NSControlView" ref="197077555"/>
+												<reference key="NSBackgroundColor" ref="498551882"/>
+												<reference key="NSTextColor" ref="823702402"/>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSSlider" id="398137737">
+											<reference key="NSNextResponder" ref="517400347"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrame">{{127, 52}, {144, 26}}</string>
+											<reference key="NSSuperview" ref="517400347"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="261829518"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSSliderCell" key="NSCell" id="827693569">
+												<int key="NSCellFlags">67371264</int>
+												<int key="NSCellFlags2">0</int>
+												<object class="NSMutableString" key="NSContents">
+													<characters key="NS.bytes"/>
+												</object>
+												<reference key="NSSupport" ref="922333135"/>
+												<reference key="NSControlView" ref="398137737"/>
+												<double key="NSMaxValue">3</double>
+												<double key="NSMinValue">0.0</double>
+												<double key="NSValue">1</double>
+												<double key="NSAltIncValue">0.0</double>
+												<int key="NSNumberOfTickMarks">4</int>
+												<int key="NSTickMarkPosition">1</int>
+												<bool key="NSAllowsTickMarkValuesOnly">YES</bool>
+												<bool key="NSVertical">NO</bool>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSTextField" id="184943800">
+											<reference key="NSNextResponder" ref="517400347"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrame">{{274, 86}, {133, 17}}</string>
+											<reference key="NSSuperview" ref="517400347"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="197077555"/>
+											<string key="NSAntiCompressionPriority">{250, 750}</string>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTextFieldCell" key="NSCell" id="909159478">
+												<int key="NSCellFlags">67108864</int>
+												<int key="NSCellFlags2">71303168</int>
+												<string key="NSContents">(Simple Reverb)</string>
+												<object class="NSFont" key="NSSupport" id="26">
+													<string key="NSName">LucidaGrande</string>
+													<double key="NSSize">11</double>
+													<int key="NSfFlags">3100</int>
+												</object>
+												<reference key="NSControlView" ref="184943800"/>
+												<reference key="NSBackgroundColor" ref="498551882"/>
+												<reference key="NSTextColor" ref="823702402"/>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSTextField" id="261829518">
+											<reference key="NSNextResponder" ref="517400347"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrame">{{274, 54}, {133, 17}}</string>
+											<reference key="NSSuperview" ref="517400347"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="74783790"/>
+											<string key="NSAntiCompressionPriority">{250, 750}</string>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTextFieldCell" key="NSCell" id="336300577">
+												<int key="NSCellFlags">67108864</int>
+												<int key="NSCellFlags2">71303168</int>
+												<string key="NSContents">(Simple Interpolation)</string>
+												<reference key="NSSupport" ref="26"/>
+												<reference key="NSControlView" ref="261829518"/>
+												<reference key="NSBackgroundColor" ref="498551882"/>
+												<reference key="NSTextColor" ref="823702402"/>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSTextField" id="74783790">
+											<reference key="NSNextResponder" ref="517400347"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrame">{{14, 26}, {96, 17}}</string>
+											<reference key="NSSuperview" ref="517400347"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="1011324224"/>
+											<string key="NSAntiCompressionPriority">{250, 750}</string>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTextFieldCell" key="NSCell" id="902474361">
+												<int key="NSCellFlags">67108864</int>
+												<int key="NSCellFlags2">4194304</int>
+												<string key="NSContents">Volume:</string>
+												<reference key="NSSupport" ref="535632823"/>
+												<reference key="NSControlView" ref="74783790"/>
+												<reference key="NSBackgroundColor" ref="498551882"/>
+												<reference key="NSTextColor" ref="823702402"/>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSSlider" id="1011324224">
+											<reference key="NSNextResponder" ref="517400347"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrame">{{127, 20}, {144, 26}}</string>
+											<reference key="NSSuperview" ref="517400347"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="387662915"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSSliderCell" key="NSCell" id="846739879">
+												<int key="NSCellFlags">67371264</int>
+												<int key="NSCellFlags2">0</int>
+												<object class="NSMutableString" key="NSContents">
+													<characters key="NS.bytes"/>
+												</object>
+												<reference key="NSSupport" ref="922333135"/>
+												<reference key="NSControlView" ref="1011324224"/>
+												<double key="NSMaxValue">4</double>
+												<double key="NSMinValue">0.0</double>
+												<double key="NSValue">3</double>
+												<double key="NSAltIncValue">0.0</double>
+												<int key="NSNumberOfTickMarks">5</int>
+												<int key="NSTickMarkPosition">1</int>
+												<bool key="NSAllowsTickMarkValuesOnly">YES</bool>
+												<bool key="NSVertical">NO</bool>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSTextField" id="387662915">
+											<reference key="NSNextResponder" ref="517400347"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrame">{{274, 26}, {133, 17}}</string>
+											<reference key="NSSuperview" ref="517400347"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="759155340"/>
+											<string key="NSAntiCompressionPriority">{250, 750}</string>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTextFieldCell" key="NSCell" id="723960494">
+												<int key="NSCellFlags">67108864</int>
+												<int key="NSCellFlags2">71303168</int>
+												<string key="NSContents">(Loud)</string>
+												<reference key="NSSupport" ref="26"/>
+												<reference key="NSControlView" ref="387662915"/>
+												<reference key="NSBackgroundColor" ref="498551882"/>
+												<reference key="NSTextColor" ref="823702402"/>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+									</array>
+									<string key="NSFrame">{{2, 2}, {428, 127}}</string>
+									<reference key="NSSuperview" ref="988321145"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="121836166"/>
+								</object>
+							</array>
+							<string key="NSFrame">{{17, 173}, {432, 144}}</string>
+							<reference key="NSSuperview" ref="335490069"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="517400347"/>
+							<string key="NSOffsets">{0, 0}</string>
+							<object class="NSTextFieldCell" key="NSTitleCell">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">0</int>
+								<string key="NSContents">General Settings</string>
+								<reference key="NSSupport" ref="26"/>
+								<object class="NSColor" key="NSBackgroundColor" id="597649983">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">textBackgroundColor</string>
+									<object class="NSColor" key="NSColor">
+										<int key="NSColorSpace">3</int>
+										<bytes key="NSWhite">MQA</bytes>
+									</object>
+								</object>
+								<object class="NSColor" key="NSTextColor">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
+								</object>
+							</object>
+							<reference key="NSContentView" ref="517400347"/>
+							<int key="NSBorderType">3</int>
+							<int key="NSBoxType">0</int>
+							<int key="NSTitlePosition">2</int>
+							<bool key="NSTransparent">NO</bool>
+						</object>
+						<object class="NSBox" id="773092047">
+							<reference key="NSNextResponder" ref="335490069"/>
+							<int key="NSvFlags">256</int>
+							<array class="NSMutableArray" key="NSSubviews">
+								<object class="NSView" id="757061322">
+									<reference key="NSNextResponder" ref="773092047"/>
+									<int key="NSvFlags">274</int>
+									<array class="NSMutableArray" key="NSSubviews">
+										<object class="NSButton" id="759409224">
+											<reference key="NSNextResponder" ref="757061322"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrame">{{15, 57}, {153, 18}}</string>
+											<reference key="NSSuperview" ref="757061322"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="780106098"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSButtonCell" key="NSCell" id="601824583">
+												<int key="NSCellFlags">67108864</int>
+												<int key="NSCellFlags2">0</int>
+												<string key="NSContents">Change XA Speed</string>
+												<reference key="NSSupport" ref="535632823"/>
+												<reference key="NSControlView" ref="759409224"/>
+												<int key="NSButtonFlags">1211912448</int>
+												<int key="NSButtonFlags2">2</int>
+												<object class="NSButtonImageSource" key="NSAlternateImage" id="665587898">
+													<string key="NSImageName">NSSwitch</string>
+												</object>
+												<string key="NSAlternateContents"/>
+												<string key="NSKeyEquivalent"/>
+												<int key="NSPeriodicDelay">200</int>
+												<int key="NSPeriodicInterval">25</int>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+									</array>
+									<string key="NSFrame">{{2, 2}, {199, 83}}</string>
+									<reference key="NSSuperview" ref="773092047"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="759409224"/>
+								</object>
+							</array>
+							<string key="NSFrame">{{246, 69}, {203, 100}}</string>
+							<reference key="NSSuperview" ref="335490069"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="757061322"/>
+							<string key="NSOffsets">{0, 0}</string>
+							<object class="NSTextFieldCell" key="NSTitleCell">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">0</int>
+								<string key="NSContents">XA Music</string>
+								<reference key="NSSupport" ref="26"/>
+								<reference key="NSBackgroundColor" ref="597649983"/>
+								<object class="NSColor" key="NSTextColor">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
+								</object>
+							</object>
+							<reference key="NSContentView" ref="757061322"/>
+							<int key="NSBorderType">3</int>
+							<int key="NSBoxType">0</int>
+							<int key="NSTitlePosition">2</int>
+							<bool key="NSTransparent">NO</bool>
+						</object>
+						<object class="NSBox" id="759155340">
+							<reference key="NSNextResponder" ref="335490069"/>
+							<int key="NSvFlags">256</int>
+							<array class="NSMutableArray" key="NSSubviews">
+								<object class="NSView" id="945237963">
+									<reference key="NSNextResponder" ref="759155340"/>
+									<int key="NSvFlags">274</int>
+									<array class="NSMutableArray" key="NSSubviews">
+										<object class="NSMatrix" id="754874250">
+											<reference key="NSNextResponder" ref="945237963"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrame">{{17, 13}, {199, 60}}</string>
+											<reference key="NSSuperview" ref="945237963"/>
+											<reference key="NSWindow"/>
+											<bool key="NSEnabled">YES</bool>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											<int key="NSNumRows">3</int>
+											<int key="NSNumCols">1</int>
+											<array class="NSMutableArray" key="NSCells">
+												<object class="NSButtonCell" id="530057379">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">High Compatibility Mode</string>
+													<reference key="NSSupport" ref="535632823"/>
+													<reference key="NSControlView" ref="754874250"/>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<object class="NSCustomResource" key="NSNormalImage" id="179046743">
+														<string key="NSClassName">NSImage</string>
+														<string key="NSResourceName">NSSwitch</string>
+													</object>
+													<reference key="NSAlternateImage" ref="665587898"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="409625895">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">SPU IRQ Wait</string>
+													<reference key="NSSupport" ref="535632823"/>
+													<reference key="NSControlView" ref="754874250"/>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="179046743"/>
+													<reference key="NSAlternateImage" ref="665587898"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="125730743">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Mono Sound</string>
+													<reference key="NSSupport" ref="535632823"/>
+													<reference key="NSControlView" ref="754874250"/>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="665587898"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</array>
+											<string key="NSCellSize">{199, 18}</string>
+											<string key="NSIntercellSpacing">{0, 3}</string>
+											<int key="NSMatrixFlags">-2080366592</int>
+											<nil key="NSCellClass"/>
+											<object class="NSButtonCell" key="NSProtoCell" id="795134582">
+												<int key="NSCellFlags">67108864</int>
+												<int key="NSCellFlags2">0</int>
+												<string key="NSContents">High Compatibility Mode</string>
+												<reference key="NSSupport" ref="535632823"/>
+												<int key="NSButtonFlags">1211912448</int>
+												<int key="NSButtonFlags2">2</int>
+												<reference key="NSAlternateImage" ref="665587898"/>
+												<string key="NSAlternateContents"/>
+												<int key="NSPeriodicDelay">200</int>
+												<int key="NSPeriodicInterval">25</int>
+											</object>
+											<int key="NSSelectedRow">-1</int>
+											<int key="NSSelectedCol">-1</int>
+											<reference key="NSBackgroundColor" ref="498551882"/>
+											<reference key="NSCellBackgroundColor" ref="498551882"/>
+										</object>
+									</array>
+									<string key="NSFrame">{{2, 2}, {223, 83}}</string>
+									<reference key="NSSuperview" ref="759155340"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView"/>
+								</object>
+							</array>
+							<string key="NSFrame">{{17, 69}, {227, 100}}</string>
+							<reference key="NSSuperview" ref="335490069"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="945237963"/>
+							<string key="NSOffsets">{0, 0}</string>
+							<object class="NSTextFieldCell" key="NSTitleCell">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">0</int>
+								<string key="NSContents">Misc</string>
+								<reference key="NSSupport" ref="26"/>
+								<reference key="NSBackgroundColor" ref="597649983"/>
+								<object class="NSColor" key="NSTextColor">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
+								</object>
+							</object>
+							<reference key="NSContentView" ref="945237963"/>
+							<int key="NSBorderType">3</int>
+							<int key="NSBoxType">0</int>
+							<int key="NSTitlePosition">2</int>
+							<bool key="NSTransparent">NO</bool>
+						</object>
+						<object class="NSButton" id="357594249">
+							<reference key="NSNextResponder" ref="335490069"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{393, 13}, {59, 32}}</string>
+							<reference key="NSSuperview" ref="335490069"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="387624435">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">OK</string>
+								<reference key="NSSupport" ref="535632823"/>
+								<string key="NSCellIdentifier">_NS:9</string>
+								<reference key="NSControlView" ref="357594249"/>
+								<int key="NSButtonFlags">-2038284288</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSButton" id="129568570">
+							<reference key="NSNextResponder" ref="335490069"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{311, 13}, {82, 32}}</string>
+							<reference key="NSSuperview" ref="335490069"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="357594249"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="1031291435">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Cancel</string>
+								<reference key="NSSupport" ref="535632823"/>
+								<string key="NSCellIdentifier">_NS:9</string>
+								<reference key="NSControlView" ref="129568570"/>
+								<int key="NSButtonFlags">-2038284288</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string type="base64-UTF8" key="NSKeyEquivalent">Gw</string>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSButton" id="780106098">
+							<reference key="NSNextResponder" ref="335490069"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{14, 13}, {75, 32}}</string>
+							<reference key="NSSuperview" ref="335490069"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="129568570"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="232731104">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Reset</string>
+								<reference key="NSSupport" ref="535632823"/>
+								<string key="NSCellIdentifier">_NS:9</string>
+								<reference key="NSControlView" ref="780106098"/>
+								<int key="NSButtonFlags">-2038284288</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+					</array>
+					<string key="NSFrameSize">{466, 337}</string>
+					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
+					<reference key="NSNextKeyView" ref="988321145"/>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
+				<string key="NSMinSize">{213, 129}</string>
+				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
+				<bool key="NSWindowIsRestorable">YES</bool>
+			</object>
+		</array>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<array class="NSMutableArray" key="connectionRecords">
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">window</string>
+						<reference key="source" ref="758282330"/>
+						<reference key="destination" ref="980713848"/>
+					</object>
+					<int key="connectionID">39</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">reverbValue</string>
+						<reference key="source" ref="758282330"/>
+						<reference key="destination" ref="1507912"/>
+					</object>
+					<int key="connectionID">58</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">interpolValue</string>
+						<reference key="source" ref="758282330"/>
+						<reference key="destination" ref="398137737"/>
+					</object>
+					<int key="connectionID">55</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">volumeValue</string>
+						<reference key="source" ref="758282330"/>
+						<reference key="destination" ref="1011324224"/>
+					</object>
+					<int key="connectionID">75</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">xaSpeedBox</string>
+						<reference key="source" ref="758282330"/>
+						<reference key="destination" ref="759409224"/>
+					</object>
+					<int key="connectionID">66</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">reset:</string>
+						<reference key="source" ref="758282330"/>
+						<reference key="destination" ref="780106098"/>
+					</object>
+					<int key="connectionID">175</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">ok:</string>
+						<reference key="source" ref="758282330"/>
+						<reference key="destination" ref="357594249"/>
+					</object>
+					<int key="connectionID">176</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">cancel:</string>
+						<reference key="source" ref="758282330"/>
+						<reference key="destination" ref="129568570"/>
+					</object>
+					<int key="connectionID">177</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">hiCompBox</string>
+						<reference key="source" ref="758282330"/>
+						<reference key="destination" ref="530057379"/>
+					</object>
+					<int key="connectionID">203</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">irqWaitBox</string>
+						<reference key="source" ref="758282330"/>
+						<reference key="destination" ref="409625895"/>
+					</object>
+					<int key="connectionID">204</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">monoSoundBox</string>
+						<reference key="source" ref="758282330"/>
+						<reference key="destination" ref="125730743"/>
+					</object>
+					<int key="connectionID">205</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="980713848"/>
+						<reference key="destination" ref="758282330"/>
+					</object>
+					<int key="connectionID">43</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">initialFirstResponder</string>
+						<reference key="source" ref="980713848"/>
+						<reference key="destination" ref="1507912"/>
+					</object>
+					<int key="connectionID">53</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">nextKeyView</string>
+						<reference key="source" ref="1507912"/>
+						<reference key="destination" ref="398137737"/>
+					</object>
+					<int key="connectionID">44</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">takeStringValueFrom:</string>
+						<reference key="source" ref="184943800"/>
+						<reference key="destination" ref="1507912"/>
+					</object>
+					<int key="connectionID">41</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">takeStringValueFrom:</string>
+						<reference key="source" ref="261829518"/>
+						<reference key="destination" ref="398137737"/>
+					</object>
+					<int key="connectionID">42</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">nextKeyView</string>
+						<reference key="source" ref="1011324224"/>
+						<reference key="destination" ref="398137737"/>
+					</object>
+					<int key="connectionID">76</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">takeStringValueFrom:</string>
+						<reference key="source" ref="387662915"/>
+						<reference key="destination" ref="1011324224"/>
+					</object>
+					<int key="connectionID">78</int>
+				</object>
+			</array>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<array key="orderedObjects">
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<array key="object" id="0"/>
+						<reference key="children" ref="1003241861"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="758282330"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="438626275"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">First Responder</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6</int>
+						<reference key="object" ref="980713848"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="335490069"/>
+						</array>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Configuration</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5</int>
+						<reference key="object" ref="335490069"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="773092047"/>
+							<object class="IBNSLayoutConstraint" id="686965984">
+								<reference key="firstItem" ref="357594249"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="129568570"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">12</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="335490069"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="949964607">
+								<reference key="firstItem" ref="335490069"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="357594249"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="335490069"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="329372734">
+								<reference key="firstItem" ref="335490069"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="357594249"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="335490069"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="5789354">
+								<reference key="firstItem" ref="335490069"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="129568570"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="335490069"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="562284763">
+								<reference key="firstItem" ref="773092047"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="335490069"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">249</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="335490069"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="1010014513">
+								<reference key="firstItem" ref="773092047"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="759155340"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="335490069"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="708815831">
+								<reference key="firstItem" ref="773092047"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="988321145"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="335490069"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="558041630">
+								<reference key="firstItem" ref="335490069"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="773092047"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="335490069"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="750753059">
+								<reference key="firstItem" ref="335490069"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="780106098"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="335490069"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="171265789">
+								<reference key="firstItem" ref="780106098"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="335490069"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="335490069"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="33237787">
+								<reference key="firstItem" ref="759155340"/>
+								<int key="firstAttribute">11</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="773092047"/>
+								<int key="secondAttribute">11</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="335490069"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="263892534">
+								<reference key="firstItem" ref="759155340"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="988321145"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="335490069"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="275183491">
+								<reference key="firstItem" ref="759155340"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="335490069"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="335490069"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="505181088">
+								<reference key="firstItem" ref="988321145"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="335490069"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="335490069"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="498683704">
+								<reference key="firstItem" ref="988321145"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="335490069"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="335490069"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="744964704">
+								<reference key="firstItem" ref="335490069"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="988321145"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="335490069"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<reference ref="988321145"/>
+							<reference ref="357594249"/>
+							<reference ref="129568570"/>
+							<reference ref="780106098"/>
+							<reference ref="759155340"/>
+						</array>
+						<reference key="parent" ref="980713848"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">9</int>
+						<reference key="object" ref="988321145"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="121836166"/>
+							<reference ref="1507912"/>
+							<reference ref="197077555"/>
+							<reference ref="398137737"/>
+							<object class="IBNSLayoutConstraint" id="2745058">
+								<reference key="firstItem" ref="387662915"/>
+								<int key="firstAttribute">11</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="74783790"/>
+								<int key="secondAttribute">11</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="988321145"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="339074982">
+								<reference key="firstItem" ref="387662915"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="261829518"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="988321145"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="444083121">
+								<reference key="firstItem" ref="387662915"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1011324224"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="988321145"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="393593304">
+								<reference key="firstItem" ref="261829518"/>
+								<int key="firstAttribute">11</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="398137737"/>
+								<int key="secondAttribute">11</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="988321145"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="676445877">
+								<reference key="firstItem" ref="261829518"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1011324224"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="988321145"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="964665808">
+								<reference key="firstItem" ref="261829518"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="398137737"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="988321145"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="140533858">
+								<reference key="firstItem" ref="261829518"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="184943800"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="988321145"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="79155130">
+								<reference key="firstItem" ref="184943800"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="121836166"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="988321145"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="623364289">
+								<reference key="firstItem" ref="184943800"/>
+								<int key="firstAttribute">11</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1507912"/>
+								<int key="secondAttribute">11</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="988321145"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="598544207">
+								<reference key="firstItem" ref="184943800"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1507912"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="988321145"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="702235891">
+								<reference key="firstItem" ref="184943800"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="261829518"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="988321145"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="466154982">
+								<reference key="firstItem" ref="988321145"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1011324224"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="988321145"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="136783247">
+								<reference key="firstItem" ref="1011324224"/>
+								<int key="firstAttribute">10</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="74783790"/>
+								<int key="secondAttribute">10</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="988321145"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="731413808">
+								<reference key="firstItem" ref="1011324224"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="398137737"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="988321145"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="942117436">
+								<reference key="firstItem" ref="1011324224"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="398137737"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="988321145"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="648242307">
+								<reference key="firstItem" ref="398137737"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1507912"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="988321145"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="528161191">
+								<reference key="firstItem" ref="398137737"/>
+								<int key="firstAttribute">11</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="197077555"/>
+								<int key="secondAttribute">11</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="988321145"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="681262160">
+								<reference key="firstItem" ref="1507912"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="398137737"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="988321145"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="245275154">
+								<reference key="firstItem" ref="1507912"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="988321145"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">32</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="988321145"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="715982450">
+								<reference key="firstItem" ref="1507912"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="988321145"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">128</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="988321145"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="257351407">
+								<reference key="firstItem" ref="1507912"/>
+								<int key="firstAttribute">11</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="121836166"/>
+								<int key="secondAttribute">11</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="988321145"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="123359675">
+								<reference key="firstItem" ref="74783790"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="988321145"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="988321145"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="126524274">
+								<reference key="firstItem" ref="197077555"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="261829518"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="988321145"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="360356517">
+								<reference key="firstItem" ref="121836166"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="197077555"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="988321145"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="340464515">
+								<reference key="firstItem" ref="121836166"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="988321145"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">15</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="988321145"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="242350796">
+								<reference key="firstItem" ref="121836166"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="197077555"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="988321145"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<reference ref="1011324224"/>
+							<reference ref="184943800"/>
+							<reference ref="261829518"/>
+							<reference ref="74783790"/>
+							<reference ref="387662915"/>
+						</array>
+						<reference key="parent" ref="335490069"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">19</int>
+						<reference key="object" ref="773092047"/>
+						<array class="NSMutableArray" key="children">
+							<object class="IBNSLayoutConstraint" id="1042446465">
+								<reference key="firstItem" ref="759409224"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="773092047"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="773092047"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="521242941">
+								<reference key="firstItem" ref="759409224"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="773092047"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">25</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="773092047"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<reference ref="759409224"/>
+						</array>
+						<reference key="parent" ref="335490069"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">24</int>
+						<reference key="object" ref="759155340"/>
+						<array class="NSMutableArray" key="children">
+							<object class="IBNSLayoutConstraint" id="1037484378">
+								<reference key="firstItem" ref="759155340"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="754874250"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">11</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="759155340"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="307779622">
+								<reference key="firstItem" ref="754874250"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="759155340"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="759155340"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="766517095">
+								<reference key="firstItem" ref="754874250"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="759155340"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">25</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="759155340"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<reference ref="754874250"/>
+						</array>
+						<reference key="parent" ref="335490069"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-3</int>
+						<reference key="object" ref="225882746"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Application</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">11</int>
+						<reference key="object" ref="121836166"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="429556832"/>
+							<object class="IBNSLayoutConstraint" id="514288272">
+								<reference key="firstItem" ref="121836166"/>
+								<int key="firstAttribute">8</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">17</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="121836166"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="806674793">
+								<reference key="firstItem" ref="121836166"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">90</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="121836166"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="988321145"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">80</int>
+						<reference key="object" ref="429556832"/>
+						<reference key="parent" ref="121836166"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">12</int>
+						<reference key="object" ref="1507912"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="724216678"/>
+							<object class="IBNSLayoutConstraint" id="89688161">
+								<reference key="firstItem" ref="1507912"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">140</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1507912"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="988321145"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">81</int>
+						<reference key="object" ref="724216678"/>
+						<reference key="parent" ref="1507912"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">15</int>
+						<reference key="object" ref="197077555"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="74472058"/>
+							<object class="IBNSLayoutConstraint" id="1005156286">
+								<reference key="firstItem" ref="197077555"/>
+								<int key="firstAttribute">8</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">17</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="197077555"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="988321145"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">82</int>
+						<reference key="object" ref="74472058"/>
+						<reference key="parent" ref="197077555"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">16</int>
+						<reference key="object" ref="398137737"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="827693569"/>
+						</array>
+						<reference key="parent" ref="988321145"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">83</int>
+						<reference key="object" ref="827693569"/>
+						<reference key="parent" ref="398137737"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">17</int>
+						<reference key="object" ref="184943800"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="909159478"/>
+							<object class="IBNSLayoutConstraint" id="1020662235">
+								<reference key="firstItem" ref="184943800"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">127</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="184943800"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="988321145"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">84</int>
+						<reference key="object" ref="909159478"/>
+						<reference key="parent" ref="184943800"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">18</int>
+						<reference key="object" ref="261829518"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="336300577"/>
+						</array>
+						<reference key="parent" ref="988321145"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">85</int>
+						<reference key="object" ref="336300577"/>
+						<reference key="parent" ref="261829518"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">69</int>
+						<reference key="object" ref="74783790"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="902474361"/>
+							<object class="IBNSLayoutConstraint" id="840440220">
+								<reference key="firstItem" ref="74783790"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">90</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="74783790"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="988321145"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">86</int>
+						<reference key="object" ref="902474361"/>
+						<reference key="parent" ref="74783790"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">70</int>
+						<reference key="object" ref="1011324224"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="846739879"/>
+						</array>
+						<reference key="parent" ref="988321145"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">87</int>
+						<reference key="object" ref="846739879"/>
+						<reference key="parent" ref="1011324224"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">71</int>
+						<reference key="object" ref="387662915"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="723960494"/>
+							<object class="IBNSLayoutConstraint" id="617532850">
+								<reference key="firstItem" ref="387662915"/>
+								<int key="firstAttribute">8</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">17</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="387662915"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="988321145"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">88</int>
+						<reference key="object" ref="723960494"/>
+						<reference key="parent" ref="387662915"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">22</int>
+						<reference key="object" ref="759409224"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="601824583"/>
+							<object class="IBNSLayoutConstraint" id="465689690">
+								<reference key="firstItem" ref="759409224"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">149</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="759409224"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="773092047"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">89</int>
+						<reference key="object" ref="601824583"/>
+						<reference key="parent" ref="759409224"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">107</int>
+						<reference key="object" ref="275183491"/>
+						<reference key="parent" ref="335490069"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">108</int>
+						<reference key="object" ref="558041630"/>
+						<reference key="parent" ref="335490069"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">109</int>
+						<reference key="object" ref="744964704"/>
+						<reference key="parent" ref="335490069"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">111</int>
+						<reference key="object" ref="498683704"/>
+						<reference key="parent" ref="335490069"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">112</int>
+						<reference key="object" ref="505181088"/>
+						<reference key="parent" ref="335490069"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">122</int>
+						<reference key="object" ref="89688161"/>
+						<reference key="parent" ref="1507912"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">127</int>
+						<reference key="object" ref="465689690"/>
+						<reference key="parent" ref="759409224"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">129</int>
+						<reference key="object" ref="1020662235"/>
+						<reference key="parent" ref="184943800"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">131</int>
+						<reference key="object" ref="942117436"/>
+						<reference key="parent" ref="988321145"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">133</int>
+						<reference key="object" ref="140533858"/>
+						<reference key="parent" ref="988321145"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">134</int>
+						<reference key="object" ref="964665808"/>
+						<reference key="parent" ref="988321145"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">136</int>
+						<reference key="object" ref="444083121"/>
+						<reference key="parent" ref="988321145"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">137</int>
+						<reference key="object" ref="257351407"/>
+						<reference key="parent" ref="988321145"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">140</int>
+						<reference key="object" ref="528161191"/>
+						<reference key="parent" ref="988321145"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">141</int>
+						<reference key="object" ref="715982450"/>
+						<reference key="parent" ref="988321145"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">145</int>
+						<reference key="object" ref="245275154"/>
+						<reference key="parent" ref="988321145"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">147</int>
+						<reference key="object" ref="339074982"/>
+						<reference key="parent" ref="988321145"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">148</int>
+						<reference key="object" ref="242350796"/>
+						<reference key="parent" ref="988321145"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">149</int>
+						<reference key="object" ref="340464515"/>
+						<reference key="parent" ref="988321145"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">150</int>
+						<reference key="object" ref="702235891"/>
+						<reference key="parent" ref="988321145"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">151</int>
+						<reference key="object" ref="598544207"/>
+						<reference key="parent" ref="988321145"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">152</int>
+						<reference key="object" ref="360356517"/>
+						<reference key="parent" ref="988321145"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">153</int>
+						<reference key="object" ref="681262160"/>
+						<reference key="parent" ref="988321145"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">154</int>
+						<reference key="object" ref="648242307"/>
+						<reference key="parent" ref="988321145"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">157</int>
+						<reference key="object" ref="806674793"/>
+						<reference key="parent" ref="121836166"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">162</int>
+						<reference key="object" ref="357594249"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="387624435"/>
+						</array>
+						<reference key="parent" ref="335490069"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">163</int>
+						<reference key="object" ref="387624435"/>
+						<reference key="parent" ref="357594249"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">164</int>
+						<reference key="object" ref="329372734"/>
+						<reference key="parent" ref="335490069"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">165</int>
+						<reference key="object" ref="949964607"/>
+						<reference key="parent" ref="335490069"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">166</int>
+						<reference key="object" ref="129568570"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1031291435"/>
+						</array>
+						<reference key="parent" ref="335490069"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">167</int>
+						<reference key="object" ref="1031291435"/>
+						<reference key="parent" ref="129568570"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">169</int>
+						<reference key="object" ref="686965984"/>
+						<reference key="parent" ref="335490069"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">170</int>
+						<reference key="object" ref="5789354"/>
+						<reference key="parent" ref="335490069"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">171</int>
+						<reference key="object" ref="780106098"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="232731104"/>
+						</array>
+						<reference key="parent" ref="335490069"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">172</int>
+						<reference key="object" ref="232731104"/>
+						<reference key="parent" ref="780106098"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">173</int>
+						<reference key="object" ref="171265789"/>
+						<reference key="parent" ref="335490069"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">174</int>
+						<reference key="object" ref="750753059"/>
+						<reference key="parent" ref="335490069"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">180</int>
+						<reference key="object" ref="731413808"/>
+						<reference key="parent" ref="988321145"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">181</int>
+						<reference key="object" ref="676445877"/>
+						<reference key="parent" ref="988321145"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">182</int>
+						<reference key="object" ref="840440220"/>
+						<reference key="parent" ref="74783790"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">183</int>
+						<reference key="object" ref="123359675"/>
+						<reference key="parent" ref="988321145"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">186</int>
+						<reference key="object" ref="623364289"/>
+						<reference key="parent" ref="988321145"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">188</int>
+						<reference key="object" ref="708815831"/>
+						<reference key="parent" ref="335490069"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">189</int>
+						<reference key="object" ref="263892534"/>
+						<reference key="parent" ref="335490069"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">191</int>
+						<reference key="object" ref="514288272"/>
+						<reference key="parent" ref="121836166"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">193</int>
+						<reference key="object" ref="79155130"/>
+						<reference key="parent" ref="988321145"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">194</int>
+						<reference key="object" ref="521242941"/>
+						<reference key="parent" ref="773092047"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">195</int>
+						<reference key="object" ref="1042446465"/>
+						<reference key="parent" ref="773092047"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">196</int>
+						<reference key="object" ref="754874250"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="795134582"/>
+							<reference ref="125730743"/>
+							<reference ref="409625895"/>
+							<reference ref="530057379"/>
+						</array>
+						<reference key="parent" ref="759155340"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">197</int>
+						<reference key="object" ref="795134582"/>
+						<reference key="parent" ref="754874250"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">92</int>
+						<reference key="object" ref="125730743"/>
+						<reference key="parent" ref="754874250"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">91</int>
+						<reference key="object" ref="409625895"/>
+						<reference key="parent" ref="754874250"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">90</int>
+						<reference key="object" ref="530057379"/>
+						<reference key="parent" ref="754874250"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">206</int>
+						<reference key="object" ref="766517095"/>
+						<reference key="parent" ref="759155340"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">207</int>
+						<reference key="object" ref="307779622"/>
+						<reference key="parent" ref="759155340"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">209</int>
+						<reference key="object" ref="1037484378"/>
+						<reference key="parent" ref="759155340"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">210</int>
+						<reference key="object" ref="33237787"/>
+						<reference key="parent" ref="335490069"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">213</int>
+						<reference key="object" ref="1010014513"/>
+						<reference key="parent" ref="335490069"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">214</int>
+						<reference key="object" ref="562284763"/>
+						<reference key="parent" ref="335490069"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">222</int>
+						<reference key="object" ref="393593304"/>
+						<reference key="parent" ref="988321145"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">224</int>
+						<reference key="object" ref="617532850"/>
+						<reference key="parent" ref="387662915"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">225</int>
+						<reference key="object" ref="136783247"/>
+						<reference key="parent" ref="988321145"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">226</int>
+						<reference key="object" ref="126524274"/>
+						<reference key="parent" ref="988321145"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">227</int>
+						<reference key="object" ref="1005156286"/>
+						<reference key="parent" ref="197077555"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">228</int>
+						<reference key="object" ref="466154982"/>
+						<reference key="parent" ref="988321145"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">229</int>
+						<reference key="object" ref="2745058"/>
+						<reference key="parent" ref="988321145"/>
+					</object>
+				</array>
+			</object>
+			<dictionary class="NSMutableDictionary" key="flattenedProperties">
+				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="107.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="108.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="109.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="11.IBNSViewMetadataConstraints">
+					<reference ref="806674793"/>
+					<reference ref="514288272"/>
+				</array>
+				<boolean value="NO" key="11.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="11.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="111.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="112.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="12.CustomClassName">NamedSlider</string>
+				<array key="12.IBNSViewMetadataConstraints">
+					<reference ref="89688161"/>
+				</array>
+				<boolean value="NO" key="12.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="12.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="122.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="127.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="129.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="131.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="133.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="134.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="136.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="137.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="140.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="141.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="145.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="147.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="148.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="149.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="15.IBNSViewMetadataConstraints">
+					<reference ref="1005156286"/>
+				</array>
+				<boolean value="NO" key="15.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="15.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="150.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="151.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="152.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="153.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="154.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="157.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="16.CustomClassName">NamedSlider</string>
+				<boolean value="NO" key="16.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="16.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="162.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="162.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="163.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="164.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="165.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="166.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="166.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="167.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="169.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array class="NSMutableArray" key="17.IBNSViewMetadataConstraints">
+					<reference ref="1020662235"/>
+				</array>
+				<boolean value="NO" key="17.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="17.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="170.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="171.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="171.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="172.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="173.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="174.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="18.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="18.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="180.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="181.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="182.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="183.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="186.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="188.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="189.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array class="NSMutableArray" key="19.IBNSViewMetadataConstraints">
+					<reference ref="521242941"/>
+					<reference ref="1042446465"/>
+				</array>
+				<boolean value="NO" key="19.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="19.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="191.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="193.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="194.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="195.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="196.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="196.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="197.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="206.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="207.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="209.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="210.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="213.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="214.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="22.IBNSViewMetadataConstraints">
+					<reference ref="465689690"/>
+				</array>
+				<boolean value="NO" key="22.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="22.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="222.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="224.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="225.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="226.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="227.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="228.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="229.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="24.IBNSViewMetadataConstraints">
+					<reference ref="766517095"/>
+					<reference ref="307779622"/>
+					<reference ref="1037484378"/>
+				</array>
+				<boolean value="NO" key="24.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="24.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array class="NSMutableArray" key="5.IBNSViewMetadataConstraints">
+					<reference ref="744964704"/>
+					<reference ref="498683704"/>
+					<reference ref="505181088"/>
+					<reference ref="275183491"/>
+					<reference ref="263892534"/>
+					<reference ref="33237787"/>
+					<reference ref="171265789"/>
+					<reference ref="750753059"/>
+					<reference ref="558041630"/>
+					<reference ref="708815831"/>
+					<reference ref="1010014513"/>
+					<reference ref="562284763"/>
+					<reference ref="5789354"/>
+					<reference ref="329372734"/>
+					<reference ref="949964607"/>
+					<reference ref="686965984"/>
+				</array>
+				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array class="NSMutableArray" key="69.IBNSViewMetadataConstraints">
+					<reference ref="840440220"/>
+				</array>
+				<boolean value="NO" key="69.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="69.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="70.CustomClassName">NamedSlider</string>
+				<boolean value="NO" key="70.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="70.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="71.IBNSViewMetadataConstraints">
+					<reference ref="617532850"/>
+				</array>
+				<boolean value="NO" key="71.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="71.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="80.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="81.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="82.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="83.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="84.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="85.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="86.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="87.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="88.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="89.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array class="NSMutableArray" key="9.IBNSViewMetadataConstraints">
+					<reference ref="242350796"/>
+					<reference ref="340464515"/>
+					<reference ref="360356517"/>
+					<reference ref="126524274"/>
+					<reference ref="123359675"/>
+					<reference ref="257351407"/>
+					<reference ref="715982450"/>
+					<reference ref="245275154"/>
+					<reference ref="681262160"/>
+					<reference ref="528161191"/>
+					<reference ref="648242307"/>
+					<reference ref="942117436"/>
+					<reference ref="731413808"/>
+					<reference ref="136783247"/>
+					<reference ref="466154982"/>
+					<reference ref="702235891"/>
+					<reference ref="598544207"/>
+					<reference ref="623364289"/>
+					<reference ref="79155130"/>
+					<reference ref="140533858"/>
+					<reference ref="964665808"/>
+					<reference ref="676445877"/>
+					<reference ref="393593304"/>
+					<reference ref="444083121"/>
+					<reference ref="339074982"/>
+					<reference ref="2745058"/>
+				</array>
+				<boolean value="NO" key="9.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="9.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="90.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="91.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="92.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			</dictionary>
+			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+			<nil key="activeLocalization"/>
+			<dictionary class="NSMutableDictionary" key="localizations"/>
+			<nil key="sourceID"/>
+			<int key="maxID">232</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">NSLayoutConstraint</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/NSLayoutConstraint.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NamedSlider</string>
+					<string key="superclassName">NSSlider</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/NamedSlider.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">SPUPluginController</string>
+					<string key="superclassName">NSWindowController</string>
+					<dictionary class="NSMutableDictionary" key="actions">
+						<string key="cancel:">id</string>
+						<string key="ok:">id</string>
+						<string key="reset:">id</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="actionInfosByName">
+						<object class="IBActionInfo" key="cancel:">
+							<string key="name">cancel:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="ok:">
+							<string key="name">ok:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="reset:">
+							<string key="name">reset:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="hiCompBox">NSCell</string>
+						<string key="interpolValue">NamedSlider</string>
+						<string key="irqWaitBox">NSCell</string>
+						<string key="monoSoundBox">NSCell</string>
+						<string key="reverbValue">NamedSlider</string>
+						<string key="volumeValue">NamedSlider</string>
+						<string key="xaEnableBox">NSControl</string>
+						<string key="xaSpeedBox">NSControl</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="hiCompBox">
+							<string key="name">hiCompBox</string>
+							<string key="candidateClassName">NSCell</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="interpolValue">
+							<string key="name">interpolValue</string>
+							<string key="candidateClassName">NamedSlider</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="irqWaitBox">
+							<string key="name">irqWaitBox</string>
+							<string key="candidateClassName">NSCell</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="monoSoundBox">
+							<string key="name">monoSoundBox</string>
+							<string key="candidateClassName">NSCell</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="reverbValue">
+							<string key="name">reverbValue</string>
+							<string key="candidateClassName">NamedSlider</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="volumeValue">
+							<string key="name">volumeValue</string>
+							<string key="candidateClassName">NamedSlider</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="xaEnableBox">
+							<string key="name">xaEnableBox</string>
+							<string key="candidateClassName">NSControl</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="xaSpeedBox">
+							<string key="name">xaSpeedBox</string>
+							<string key="candidateClassName">NSControl</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/SPUPluginController.h</string>
+					</object>
+				</object>
+			</array>
+		</object>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<real value="1070" key="NS.object.0"/>
+		</object>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<string key="NS.key.0">NSSwitch</string>
+			<string key="NS.object.0">{15, 15}</string>
+		</object>
+		<bool key="IBDocument.UseAutolayout">YES</bool>
+	</data>
+</archive>

pcsxr-1.9.93.tar.bz2/macosx/plugins/DFSound/Resorces/Shared/SPUShared-info.plist Added

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFSound/macsrc/NamedSlider.h -> pcsxr-1.9.93.tar.bz2/macosx/plugins/DFSound/macsrc/NamedSlider.h Changed

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFSound/macsrc/NamedSlider.m -> pcsxr-1.9.93.tar.bz2/macosx/plugins/DFSound/macsrc/NamedSlider.m Changed

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFSound/macsrc/PluginController.h -> pcsxr-1.9.93.tar.bz2/macosx/plugins/DFSound/macsrc/PluginController.h Changed

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFSound/macsrc/PluginController.m -> pcsxr-1.9.93.tar.bz2/macosx/plugins/DFSound/macsrc/PluginController.m Changed

@@ -1,27 +1,70 @@
 #import "PluginController.h"
 #include "stdafx.h"
 #include "externals.h"
-
-#define APP_ID @"net.sf.peops.SPUPlugin"
+#include "maccfg.h"
+#include "ARCBridge.h"
+
+#ifdef ENABLE_NLS
+#include <libintl.h>
+#include <locale.h>
+#define _(x) gettext(x)
+#define N_(x) (x)
+//If running under Mac OS X, use the Localizable.strings file instead.
+#elif defined(_MACOSX)
+#ifdef PCSXRCORE
+__private_extern__ char* Pcsxr_locale_text(char* toloc);
+#define _(String) Pcsxr_locale_text(String)
+#define N_(String) String
+#else
+#ifndef PCSXRPLUG
+#warning please define the plug being built to use Mac OS X localization!
+#define _(msgid) msgid
+#define N_(msgid) msgid
+#else
+//Kludge to get the preprocessor to accept PCSXRPLUG as a variable.
+#define PLUGLOC_x(x,y) x ## y
+#define PLUGLOC_y(x,y) PLUGLOC_x(x,y)
+#define PLUGLOC PLUGLOC_y(PCSXRPLUG,_locale_text)
+__private_extern__ char* PLUGLOC(char* toloc);
+#define _(String) PLUGLOC(String)
+#define N_(String) String
+#endif
+#endif
+#else
+#define _(x) (x)
+#define N_(x) (x)
+#endif
+
+#ifdef USEOPENAL
+#define APP_ID @"net.sf.peops.SPUALPlugin"
+#else
+#define APP_ID @"net.sf.peops.SPUSDLPlugin"
+#endif
 #define PrefsKey APP_ID @" Settings"
 
-static PluginController *pluginController;
-char * pConfigFile=NULL;
+static SPUPluginController *pluginController = nil;
+
+static inline void RunOnMainThreadSync(dispatch_block_t block)
+{
+	if ([NSThread isMainThread]) {
+		block();
+	} else {
+		dispatch_sync(dispatch_get_main_queue(), block);
+	}
+}
 
 void DoAbout()
 {
 	// Get parent application instance
-	NSApplication *app = [NSApplication sharedApplication];
 	NSBundle *bundle = [NSBundle bundleWithIdentifier:APP_ID];
 
 	// Get Credits.rtf
 	NSString *path = [bundle pathForResource:@"Credits" ofType:@"rtf"];
 	NSAttributedString *credits;
 	if (path) {
-		credits = [[[NSAttributedString alloc] initWithPath: path
-				documentAttributes:NULL] autorelease];
+		credits = AUTORELEASEOBJ([[NSAttributedString alloc] initWithPath: path documentAttributes:NULL]);
 	} else {
-		credits = [[[NSAttributedString alloc] initWithString:@""] autorelease];
+		credits = AUTORELEASEOBJ([[NSAttributedString alloc] initWithString:@""]);
 	}
 	
 	// Get Application Icon
@@ -29,32 +72,38 @@
 	NSSize size = NSMakeSize(64, 64);
 	[icon setSize:size];
 		
-	[app orderFrontStandardAboutPanelWithOptions:[NSDictionary dictionaryWithObjectsAndKeys:
-			[bundle objectForInfoDictionaryKey:@"CFBundleName"], @"ApplicationName",
-			icon, @"ApplicationIcon",
-			[bundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"], @"ApplicationVersion",
-			[bundle objectForInfoDictionaryKey:@"CFBundleVersion"], @"Version",
-			[bundle objectForInfoDictionaryKey:@"NSHumanReadableCopyright"], @"Copyright",
-			credits, @"Credits",
-			nil]];
+	NSDictionary *infoPaneDict =
+	[[NSDictionary alloc] initWithObjectsAndKeys:
+	 [bundle objectForInfoDictionaryKey:@"CFBundleName"], @"ApplicationName",
+	 icon, @"ApplicationIcon",
+	 [bundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"], @"ApplicationVersion",
+	 [bundle objectForInfoDictionaryKey:@"CFBundleVersion"], @"Version",
+	 [bundle objectForInfoDictionaryKey:@"NSHumanReadableCopyright"], @"Copyright",
+	 credits, @"Credits",
+	 nil];
+	dispatch_async(dispatch_get_main_queue(), ^{
+		[NSApp orderFrontStandardAboutPanelWithOptions:infoPaneDict];
+	});
+	RELEASEOBJ(infoPaneDict);
 }
 
-
 long DoConfiguration()
 {
-	NSWindow *window;
-	
-	if (pluginController == nil) {
-		pluginController = [[PluginController alloc] initWithWindowNibName:@"NetSfPeopsSpuPluginMain"];
-	}
-	window = [pluginController window];
-	
-	/* load values */
-	[pluginController loadValues];
-	
-	[window center];
-	[window makeKeyAndOrderFront:nil];
-	
+	RunOnMainThreadSync(^{
+		NSWindow *window;
+		
+		if (pluginController == nil) {
+			pluginController = [[PluginController alloc] initWithWindowNibName:@"NetSfPeopsSpuPluginMain"];
+		}
+		window = [pluginController window];
+		
+		/* load values */
+		[pluginController loadValues];
+		
+		[window center];
+		[window makeKeyAndOrderFront:nil];
+	});
+
 	return 0;
 }
 
@@ -63,14 +112,16 @@
 	NSDictionary *keyValues;
 	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
 	[defaults registerDefaults:[NSDictionary dictionaryWithObjectsAndKeys:
-			[[NSMutableDictionary alloc] initWithObjectsAndKeys:
-					[NSNumber numberWithBool:YES], @"High Compatibility Mode",
-					[NSNumber numberWithBool:YES], @"SPU IRQ Wait",
-					[NSNumber numberWithBool:NO], @"XA Pitch",
-					[NSNumber numberWithInt:0], @"Interpolation Quality",
-					[NSNumber numberWithInt:1], @"Reverb Quality",
-					nil], PrefsKey,
-			nil]];
+								[NSDictionary dictionaryWithObjectsAndKeys:
+								 @YES, @"High Compatibility Mode",
+								 @YES, @"SPU IRQ Wait",
+								 @NO, @"XA Pitch",
+								 @NO, @"Mono Sound Output",
+								 @0, @"Interpolation Quality",
+								 @1, @"Reverb Quality",
+								 @3, @"Volume",
+								 nil], PrefsKey,
+								nil]];
 
 	keyValues = [defaults dictionaryForKey:PrefsKey];
 
@@ -82,7 +133,7 @@
 	iUseInterpolation = [[keyValues objectForKey:@"Interpolation Quality"] intValue];
 	iUseReverb = [[keyValues objectForKey:@"Reverb Quality"] intValue];
 
-	iVolume=1; 
+	iVolume = 5 - [[keyValues objectForKey:@"Volume"] intValue];
 }
 
 @implementation PluginController
@@ -95,23 +146,25 @@
 - (IBAction)ok:(id)sender
 {
 	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-	
-	NSMutableDictionary *writeDic = [NSMutableDictionary dictionaryWithDictionary:keyValues];
-	[writeDic setObject:[NSNumber numberWithInt:[hiCompBox intValue]] forKey:@"High Compatibility Mode"];
-	[writeDic setObject:[NSNumber numberWithInt:[irqWaitBox intValue]] forKey:@"SPU IRQ Wait"];
-	[writeDic setObject:[NSNumber numberWithInt:[monoSoundBox intValue]] forKey:@"Mono Sound Output"];
-	[writeDic setObject:[NSNumber numberWithInt:[xaSpeedBox intValue]] forKey:@"XA Pitch"];
-
-	[writeDic setObject:[NSNumber numberWithInt:[interpolValue intValue]] forKey:@"Interpolation Quality"];
-	[writeDic setObject:[NSNumber numberWithInt:[reverbValue intValue]] forKey:@"Reverb Quality"];
-	
+
+	NSMutableDictionary *writeDic = [NSMutableDictionary dictionaryWithDictionary:self.keyValues];
+	[writeDic setObject:@((BOOL)[hiCompBox intValue]) forKey:@"High Compatibility Mode"];
+	[writeDic setObject:@((BOOL)[irqWaitBox intValue]) forKey:@"SPU IRQ Wait"];
+	[writeDic setObject:@((BOOL)[monoSoundBox intValue]) forKey:@"Mono Sound Output"];
+	[writeDic setObject:@((BOOL)[xaSpeedBox intValue]) forKey:@"XA Pitch"];
+
+	[writeDic setObject:@([interpolValue intValue]) forKey:@"Interpolation Quality"];
+	[writeDic setObject:@([reverbValue intValue]) forKey:@"Reverb Quality"];
+
+	[writeDic setObject:@([volumeValue intValue]) forKey:@"Volume"];
+
 	// write to defaults
 	[defaults setObject:writeDic forKey:PrefsKey];
 	[defaults synchronize];
-	
+
 	// and set global values accordingly
 	ReadConfig();
-	
+
 	[self close];
 }
 
@@ -125,36 +178,51 @@
 - (void)loadValues
 {
 	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-	
+
 	ReadConfig();
-	
+
 	/* load from preferences */
-	[keyValues release];
-	keyValues = [[defaults dictionaryForKey:PrefsKey] retain];
-	
-	[hiCompBox setIntValue:[[keyValues objectForKey:@"High Compatibility Mode"] intValue]];
-	[irqWaitBox setIntValue:[[keyValues objectForKey:@"SPU IRQ Wait"] intValue]];
-	[monoSoundBox setIntValue:[[keyValues objectForKey:@"Mono Sound Output"] intValue]];
-	[xaSpeedBox setIntValue:[[keyValues objectForKey:@"XA Pitch"] intValue]];
+	self.keyValues = [NSMutableDictionary dictionaryWithDictionary:[defaults dictionaryForKey:PrefsKey]];
+
+	[hiCompBox setIntValue:[[keyValues objectForKey:@"High Compatibility Mode"] boolValue]];
+	[irqWaitBox setIntValue:[[keyValues objectForKey:@"SPU IRQ Wait"] boolValue]];
+	[monoSoundBox setIntValue:[[keyValues objectForKey:@"Mono Sound Output"] boolValue]];
+	[xaSpeedBox setIntValue:[[keyValues objectForKey:@"XA Pitch"] boolValue]];
 
 	[interpolValue setIntValue:[[keyValues objectForKey:@"Interpolation Quality"] intValue]];
 	[reverbValue setIntValue:[[keyValues objectForKey:@"Reverb Quality"] intValue]];
+	[volumeValue setIntValue:[[keyValues objectForKey:@"Volume"] intValue]];
 }
 
 - (void)awakeFromNib
 {
-	[interpolValue setStrings:[NSArray arrayWithObjects:
-		@"(No Interpolation)",
-		@"(Simple Interpolation)",
-		@"(Gaussian Interpolation)",
-		@"(Cubic Interpolation)",
-		nil]];
-
-	[reverbValue setStrings:[NSArray arrayWithObjects:
-		@"(No Reverb)",
-		@"(Simple Reverb)",
-		@"(PSX Reverb)",
-		nil]];
+	Class thisClass = [self class];
+	
+	NSBundle *spuBundle = [NSBundle bundleForClass:thisClass];
+	
+	[interpolValue setStrings:@[
+		[spuBundle localizedStringForKey:@"(No Interpolation)" value:@"" table:nil],
+		[spuBundle localizedStringForKey:@"(Simple Interpolation)" value:@"" table:nil],
+		[spuBundle localizedStringForKey:@"(Gaussian Interpolation)" value:@"" table:nil],
+		[spuBundle localizedStringForKey:@"(Cubic Interpolation)" value:@"" table:nil]]];
+	interpolValue.pluginClass = thisClass;
+
+	[reverbValue setStrings:@[
+		[spuBundle localizedStringForKey:@"(No Reverb)" value:@"" table:nil],
+		[spuBundle localizedStringForKey:@"(Simple Reverb)" value:@"" table:nil],
+		[spuBundle localizedStringForKey:@"(PSX Reverb)" value:@"" table:nil]]];
+	reverbValue.pluginClass = thisClass;
+
+	[volumeValue setStrings:@[
+		[spuBundle localizedStringForKey:@"(Muted)" value:@"" table:nil],
+		[spuBundle localizedStringForKey:@"(Low)" value:@"" table:nil],
+		[spuBundle localizedStringForKey:@"(Medium)" value:@"" table:nil],
+		[spuBundle localizedStringForKey:@"(Loud)" value:@"" table:nil],
+		[spuBundle localizedStringForKey:@"(Loudest)" value:@"" table:nil]]];
+	volumeValue.pluginClass = thisClass;
 }
 
 @end
+
+#import "OSXPlugLocalization.h"
+PLUGLOCIMP([PluginController class]);

pcsxr-1.9.93.tar.bz2/macosx/plugins/DFSound/macsrc/SPUPluginController.h Added

pcsxr-1.9.93.tar.bz2/macosx/plugins/DFSound/macsrc/SPUPluginController.m Added

@@ -0,0 +1,72 @@
+//
+//  SPUPluginController.m
+//  PeopsSPU
+//
+//  Created by C.W. Betts on 7/2/13.
+//
+//
+
+#import "SPUPluginController.h"
+
+static inline Class GetSPUBaseClass()
+{
+	static Class spuBaseClass;
+	if (!spuBaseClass) {
+		spuBaseClass = [SPUPluginController class];
+	}
+	return spuBaseClass;
+}
+
+static void FuncNotAvailable(id sel, id sender, SEL theCmd)
+{
+#ifdef DEBUG
+	NSString *selString = NSStringFromSelector(theCmd);
+	if (sender) {
+		NSLog(@"Class %@ does not implement %@, and was sent a(n) %@ with the description %@", [sel class], selString, [sender class], [sender description]);
+	} else {
+		NSLog(@"Class %@ does not implement %@", [sel class], selString);
+	}
+	if ([sel class] == GetSPUBaseClass()) {
+		NSLog(@"For one thing, the class %@ isn't supposed to be accessed directly, just subclassed!", GetSPUBaseClass()); \
+	} else {
+		NSLog(@"You should implement %@ for your class %@. As it is, you are calling %@ from the superclass %@.", selString, [sel class], selString, GetSPUBaseClass());
+	}
+#endif
+	[sel doesNotRecognizeSelector:theCmd];
+}
+
+#define NotAvailableWarn(sender) FuncNotAvailable(self, sender, _cmd)
+
+@implementation SPUPluginController
+@synthesize keyValues;
+
+- (IBAction)cancel:(id)sender
+{
+	NotAvailableWarn(sender);
+}
+
+- (IBAction)ok:(id)sender
+{
+	NotAvailableWarn(sender);
+}
+
+- (IBAction)reset:(id)sender
+{
+	NotAvailableWarn(sender);
+}
+
+- (void)loadValues
+{
+	NotAvailableWarn(nil);
+}
+
+#if !__has_feature(objc_arc)
+- (void)dealloc
+{
+	self.keyValues = nil;
+	
+	[super dealloc];
+}
+#endif
+
+@end

pcsxr-1.9.93.tar.bz2/macosx/plugins/DFSound/macsrc/maccfg.h Added

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFXVideo/English.lproj/InfoPlist.strings -> pcsxr-1.9.93.tar.bz2/macosx/plugins/DFXVideo/English.lproj/InfoPlist.strings Changed

pcsxr-1.9.93.tar.bz2/macosx/plugins/DFXVideo/English.lproj/Localizable.strings Added

pcsxr-1.9.93.tar.bz2/macosx/plugins/DFXVideo/English.lproj/NetSfPeopsSoftGPUConfig.xib Added

@@ -0,0 +1,3652 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
+	<data>
+		<int key="IBDocument.SystemTarget">1070</int>
+		<string key="IBDocument.SystemVersion">12E55</string>
+		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
+		<string key="IBDocument.AppKitVersion">1187.39</string>
+		<string key="IBDocument.HIToolboxVersion">626.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			<string key="NS.object.0">3084</string>
+		</object>
+		<array key="IBDocument.IntegratedClassDependencies">
+			<string>IBNSLayoutConstraint</string>
+			<string>NSBox</string>
+			<string>NSButton</string>
+			<string>NSButtonCell</string>
+			<string>NSCustomObject</string>
+			<string>NSMatrix</string>
+			<string>NSMenu</string>
+			<string>NSMenuItem</string>
+			<string>NSPopUpButton</string>
+			<string>NSPopUpButtonCell</string>
+			<string>NSTextField</string>
+			<string>NSTextFieldCell</string>
+			<string>NSView</string>
+			<string>NSWindowTemplate</string>
+		</array>
+		<array key="IBDocument.PluginDependencies">
+			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+		</array>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="906065362">
+			<object class="NSCustomObject" id="331818130">
+				<string key="NSClassName">NetSfPeopsSoftGPUPluginConfigController</string>
+			</object>
+			<object class="NSCustomObject" id="973896135">
+				<string key="NSClassName">FirstResponder</string>
+			</object>
+			<object class="NSCustomObject" id="162766117">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSWindowTemplate" id="367816088">
+				<int key="NSWindowStyleMask">1</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{411, 163}, {466, 564}}</string>
+				<int key="NSWTFlags">1886912512</int>
+				<string key="NSWindowTitle">GPU Configuration</string>
+				<string key="NSWindowClass">NSWindow</string>
+				<object class="NSMutableString" key="NSViewClass">
+					<characters key="NS.bytes">View</characters>
+				</object>
+				<nil key="NSUserInterfaceItemIdentifier"/>
+				<string key="NSWindowContentMinSize">{283.34100000000001, 107}</string>
+				<object class="NSView" key="NSWindowView" id="683836898">
+					<reference key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<array class="NSMutableArray" key="NSSubviews">
+						<object class="NSBox" id="863974442">
+							<reference key="NSNextResponder" ref="683836898"/>
+							<int key="NSvFlags">256</int>
+							<array class="NSMutableArray" key="NSSubviews">
+								<object class="NSView" id="550029143">
+									<reference key="NSNextResponder" ref="863974442"/>
+									<int key="NSvFlags">274</int>
+									<array class="NSMutableArray" key="NSSubviews">
+										<object class="NSTextField" id="116814744">
+											<reference key="NSNextResponder" ref="550029143"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrame">{{33, 137}, {362, 28}}</string>
+											<reference key="NSSuperview" ref="550029143"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="777359600"/>
+											<string key="NSAntiCompressionPriority">{250, 750}</string>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTextFieldCell" key="NSCell" id="161898211">
+												<int key="NSCellFlags">67108864</int>
+												<int key="NSCellFlags2">4325376</int>
+												<string type="base64-UTF8" key="NSContents">T25seSBlbmFibGUgYSBoYWNrIHRvIGZpeCBhIHNwZWNpZmljIHByb2JsZW0gaW4gYSBnYW1lLgpIb2xk
+IHRoZSBtb3VzZSBvdmVyIGEgY2hlY2tib3ggdG8gZ2V0IG1vcmUgaW5mb3JtYXRpb24gYWJvdXQgaXQu
+A</string>
+												<object class="NSFont" key="NSSupport" id="26">
+													<string key="NSName">LucidaGrande</string>
+													<double key="NSSize">11</double>
+													<int key="NSfFlags">3100</int>
+												</object>
+												<reference key="NSControlView" ref="116814744"/>
+												<object class="NSColor" key="NSBackgroundColor" id="523712963">
+													<int key="NSColorSpace">6</int>
+													<string key="NSCatalogName">System</string>
+													<string key="NSColorName">controlColor</string>
+													<object class="NSColor" key="NSColor">
+														<int key="NSColorSpace">3</int>
+														<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+													</object>
+												</object>
+												<object class="NSColor" key="NSTextColor" id="172448668">
+													<int key="NSColorSpace">6</int>
+													<string key="NSCatalogName">System</string>
+													<string key="NSColorName">controlTextColor</string>
+													<object class="NSColor" key="NSColor">
+														<int key="NSColorSpace">3</int>
+														<bytes key="NSWhite">MAA</bytes>
+													</object>
+												</object>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSMatrix" id="777359600">
+											<reference key="NSNextResponder" ref="550029143"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrame">{{20, 31}, {388, 98}}</string>
+											<reference key="NSSuperview" ref="550029143"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="318614234"/>
+											<bool key="NSEnabled">YES</bool>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											<int key="NSNumRows">5</int>
+											<int key="NSNumCols">2</int>
+											<array class="NSMutableArray" key="NSCells">
+												<object class="NSButtonCell" id="367879922">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">131072</int>
+													<string key="NSContents">Odd/even bit hack</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="777359600"/>
+													<int key="NSTag">1</int>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<object class="NSButtonImageSource" key="NSAlternateImage" id="642079005">
+														<string key="NSImageName">NSSwitch</string>
+													</object>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="487164406">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">131072</int>
+													<string key="NSContents">Lazy screen updates</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="777359600"/>
+													<int key="NSTag">7</int>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="642079005"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="818004199">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">131072</int>
+													<string key="NSContents">Expand screen width</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="777359600"/>
+													<int key="NSTag">2</int>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="642079005"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="114998115">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">131072</int>
+													<string key="NSContents">Use old frame skipping</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="777359600"/>
+													<int key="NSTag">8</int>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="642079005"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="998491539">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">131072</int>
+													<string key="NSContents">Ignore black brightness color</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="777359600"/>
+													<int key="NSTag">3</int>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="642079005"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="89478486">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">131072</int>
+													<string key="NSContents">Repeated flat tex triangles</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="777359600"/>
+													<int key="NSTag">9</int>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="642079005"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="459195947">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">131072</int>
+													<string key="NSContents">Disable coord check</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="777359600"/>
+													<int key="NSTag">4</int>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="642079005"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="154283413">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">131072</int>
+													<string key="NSContents">Draw tex-quads as triangles</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="777359600"/>
+													<int key="NSTag">10</int>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="642079005"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="48017917">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">131072</int>
+													<string key="NSContents">Use PC FPS calculation</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="777359600"/>
+													<int key="NSTag">6</int>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="642079005"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="352584485">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">131072</int>
+													<string key="NSContents">Fake 'gpu busy' states</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="777359600"/>
+													<int key="NSTag">11</int>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="642079005"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</array>
+											<string key="NSCellSize">{192, 18}</string>
+											<string key="NSIntercellSpacing">{4, 2}</string>
+											<int key="NSMatrixFlags">-2080366592</int>
+											<nil key="NSCellClass"/>
+											<object class="NSButtonCell" key="NSProtoCell" id="325618545">
+												<int key="NSCellFlags">67108864</int>
+												<int key="NSCellFlags2">131072</int>
+												<string key="NSContents">Odd/even bit hack</string>
+												<reference key="NSSupport" ref="26"/>
+												<int key="NSTag">1</int>
+												<int key="NSButtonFlags">1211912448</int>
+												<int key="NSButtonFlags2">2</int>
+												<reference key="NSAlternateImage" ref="642079005"/>
+												<string key="NSAlternateContents"/>
+												<int key="NSPeriodicDelay">200</int>
+												<int key="NSPeriodicInterval">25</int>
+											</object>
+											<int key="NSSelectedRow">-1</int>
+											<int key="NSSelectedCol">-1</int>
+											<reference key="NSBackgroundColor" ref="523712963"/>
+											<reference key="NSCellBackgroundColor" ref="523712963"/>
+										</object>
+									</array>
+									<string key="NSFrame">{{2, 2}, {428, 175}}</string>
+									<reference key="NSSuperview" ref="863974442"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="116814744"/>
+								</object>
+							</array>
+							<string key="NSFrame">{{17, 213}, {432, 192}}</string>
+							<reference key="NSSuperview" ref="683836898"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="550029143"/>
+							<string key="NSOffsets">{0, 0}</string>
+							<object class="NSTextFieldCell" key="NSTitleCell">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">0</int>
+								<string key="NSContents">Hacks</string>
+								<reference key="NSSupport" ref="26"/>
+								<object class="NSColor" key="NSBackgroundColor" id="807301086">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">textBackgroundColor</string>
+									<object class="NSColor" key="NSColor">
+										<int key="NSColorSpace">3</int>
+										<bytes key="NSWhite">MQA</bytes>
+									</object>
+								</object>
+								<object class="NSColor" key="NSTextColor">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
+								</object>
+							</object>
+							<reference key="NSContentView" ref="550029143"/>
+							<int key="NSBorderType">3</int>
+							<int key="NSBoxType">0</int>
+							<int key="NSTitlePosition">2</int>
+							<bool key="NSTransparent">NO</bool>
+						</object>
+						<object class="NSBox" id="883494424">
+							<reference key="NSNextResponder" ref="683836898"/>
+							<int key="NSvFlags">256</int>
+							<array class="NSMutableArray" key="NSSubviews">
+								<object class="NSView" id="748477628">
+									<reference key="NSNextResponder" ref="883494424"/>
+									<int key="NSvFlags">274</int>
+									<array class="NSMutableArray" key="NSSubviews">
+										<object class="NSButton" id="982425799">
+											<reference key="NSNextResponder" ref="748477628"/>
+											<int key="NSvFlags">-2147483392</int>
+											<string key="NSFrame">{{18, 32}, {189, 18}}</string>
+											<reference key="NSSuperview" ref="748477628"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="956302290"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSButtonCell" key="NSCell" id="961583499">
+												<int key="NSCellFlags">67108864</int>
+												<int key="NSCellFlags2">0</int>
+												<string key="NSContents">Sync to Monitor Refresh</string>
+												<object class="NSFont" key="NSSupport" id="85522599">
+													<string key="NSName">LucidaGrande</string>
+													<double key="NSSize">13</double>
+													<int key="NSfFlags">1044</int>
+												</object>
+												<reference key="NSControlView" ref="982425799"/>
+												<int key="NSButtonFlags">1211912448</int>
+												<int key="NSButtonFlags2">2</int>
+												<reference key="NSAlternateImage" ref="642079005"/>
+												<string key="NSAlternateContents"/>
+												<string key="NSKeyEquivalent"/>
+												<int key="NSPeriodicDelay">200</int>
+												<int key="NSPeriodicInterval">25</int>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSButton" id="229535697">
+											<reference key="NSNextResponder" ref="748477628"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrame">{{18, 72}, {147, 18}}</string>
+											<reference key="NSSuperview" ref="748477628"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="1058448386"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSButtonCell" key="NSCell" id="1045777778">
+												<int key="NSCellFlags">67108864</int>
+												<int key="NSCellFlags2">0</int>
+												<string key="NSContents">Use Frame Skipping</string>
+												<reference key="NSSupport" ref="85522599"/>
+												<reference key="NSControlView" ref="229535697"/>
+												<int key="NSButtonFlags">1211912448</int>
+												<int key="NSButtonFlags2">2</int>
+												<reference key="NSAlternateImage" ref="642079005"/>
+												<string key="NSAlternateContents"/>
+												<string key="NSKeyEquivalent"/>
+												<int key="NSPeriodicDelay">200</int>
+												<int key="NSPeriodicInterval">25</int>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSButton" id="1001322100">
+											<reference key="NSNextResponder" ref="748477628"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrame">{{18, 92}, {148, 18}}</string>
+											<reference key="NSSuperview" ref="748477628"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="229535697"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSButtonCell" key="NSCell" id="914939078">
+												<int key="NSCellFlags">67108864</int>
+												<int key="NSCellFlags2">0</int>
+												<string key="NSContents">Display FPS Counter</string>
+												<reference key="NSSupport" ref="85522599"/>
+												<reference key="NSControlView" ref="1001322100"/>
+												<int key="NSButtonFlags">1211912448</int>
+												<int key="NSButtonFlags2">2</int>
+												<reference key="NSAlternateImage" ref="642079005"/>
+												<string key="NSAlternateContents"/>
+												<string key="NSKeyEquivalent"/>
+												<int key="NSPeriodicDelay">200</int>
+												<int key="NSPeriodicInterval">25</int>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSButton" id="1058448386">
+											<reference key="NSNextResponder" ref="748477628"/>
+											<int key="NSvFlags">-2147483392</int>
+											<string key="NSFrame">{{18, 52}, {125, 18}}</string>
+											<reference key="NSSuperview" ref="748477628"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="982425799"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSButtonCell" key="NSCell" id="462155792">
+												<int key="NSCellFlags">67108864</int>
+												<int key="NSCellFlags2">0</int>
+												<string key="NSContents">Auto Full Screen</string>
+												<reference key="NSSupport" ref="85522599"/>
+												<reference key="NSControlView" ref="1058448386"/>
+												<int key="NSButtonFlags">1211912448</int>
+												<int key="NSButtonFlags2">2</int>
+												<reference key="NSAlternateImage" ref="642079005"/>
+												<string key="NSAlternateContents"/>
+												<string key="NSKeyEquivalent"/>
+												<int key="NSPeriodicDelay">200</int>
+												<int key="NSPeriodicInterval">25</int>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+									</array>
+									<string key="NSFrame">{{2, 2}, {216, 118}}</string>
+									<reference key="NSSuperview" ref="883494424"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="1001322100"/>
+								</object>
+							</array>
+							<string key="NSFrame">{{17, 409}, {220, 135}}</string>
+							<reference key="NSSuperview" ref="683836898"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="748477628"/>
+							<string key="NSOffsets">{0, 0}</string>
+							<object class="NSTextFieldCell" key="NSTitleCell">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">0</int>
+								<string key="NSContents">Display Settings</string>
+								<reference key="NSSupport" ref="26"/>
+								<reference key="NSBackgroundColor" ref="807301086"/>
+								<object class="NSColor" key="NSTextColor">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
+								</object>
+							</object>
+							<reference key="NSContentView" ref="748477628"/>
+							<int key="NSBorderType">3</int>
+							<int key="NSBoxType">0</int>
+							<int key="NSTitlePosition">2</int>
+							<bool key="NSTransparent">NO</bool>
+						</object>
+						<object class="NSBox" id="956302290">
+							<reference key="NSNextResponder" ref="683836898"/>
+							<int key="NSvFlags">256</int>
+							<array class="NSMutableArray" key="NSSubviews">
+								<object class="NSView" id="562355593">
+									<reference key="NSNextResponder" ref="956302290"/>
+									<int key="NSvFlags">274</int>
+									<array class="NSMutableArray" key="NSSubviews">
+										<object class="NSTextField" id="574316115">
+											<reference key="NSNextResponder" ref="562355593"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrame">{{14, 95}, {144, 17}}</string>
+											<reference key="NSSuperview" ref="562355593"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="851261397"/>
+											<string key="NSAntiCompressionPriority">{250, 750}</string>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTextFieldCell" key="NSCell" id="495746919">
+												<int key="NSCellFlags">67108864</int>
+												<int key="NSCellFlags2">4194304</int>
+												<string key="NSContents">Dither Graphics:</string>
+												<reference key="NSSupport" ref="85522599"/>
+												<reference key="NSControlView" ref="574316115"/>
+												<reference key="NSBackgroundColor" ref="523712963"/>
+												<reference key="NSTextColor" ref="172448668"/>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSPopUpButton" id="851261397">
+											<reference key="NSNextResponder" ref="562355593"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrame">{{15, 63}, {174, 26}}</string>
+											<reference key="NSSuperview" ref="562355593"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="48200887"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSPopUpButtonCell" key="NSCell" id="257968269">
+												<int key="NSCellFlags">-2076180416</int>
+												<int key="NSCellFlags2">1024</int>
+												<reference key="NSSupport" ref="85522599"/>
+												<reference key="NSControlView" ref="851261397"/>
+												<int key="NSButtonFlags">109199360</int>
+												<int key="NSButtonFlags2">1</int>
+												<object class="NSFont" key="NSAlternateImage">
+													<string key="NSName">LucidaGrande</string>
+													<double key="NSSize">13</double>
+													<int key="NSfFlags">16</int>
+												</object>
+												<object class="NSMutableString" key="NSAlternateContents">
+													<characters key="NS.bytes"/>
+												</object>
+												<object class="NSMutableString" key="NSKeyEquivalent">
+													<characters key="NS.bytes"/>
+												</object>
+												<int key="NSPeriodicDelay">400</int>
+												<int key="NSPeriodicInterval">75</int>
+												<object class="NSMenuItem" key="NSMenuItem" id="13643923">
+													<reference key="NSMenu" ref="535817339"/>
+													<string key="NSTitle">Never</string>
+													<string key="NSKeyEquiv"/>
+													<int key="NSKeyEquivModMask">1048576</int>
+													<int key="NSMnemonicLoc">2147483647</int>
+													<int key="NSState">1</int>
+													<object class="NSCustomResource" key="NSOnImage" id="855532810">
+														<string key="NSClassName">NSImage</string>
+														<string key="NSResourceName">NSMenuCheckmark</string>
+													</object>
+													<object class="NSCustomResource" key="NSMixedImage" id="613505175">
+														<string key="NSClassName">NSImage</string>
+														<string key="NSResourceName">NSMenuMixedState</string>
+													</object>
+													<string key="NSAction">_popUpItemAction:</string>
+													<reference key="NSTarget" ref="257968269"/>
+												</object>
+												<bool key="NSMenuItemRespectAlignment">YES</bool>
+												<object class="NSMenu" key="NSMenu" id="535817339">
+													<object class="NSMutableString" key="NSTitle">
+														<characters key="NS.bytes">OtherViews</characters>
+													</object>
+													<array class="NSMutableArray" key="NSMenuItems">
+														<reference ref="13643923"/>
+														<object class="NSMenuItem" id="1031563258">
+															<reference key="NSMenu" ref="535817339"/>
+															<string key="NSTitle">When Hinted</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSKeyEquivModMask">1048576</int>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="855532810"/>
+															<reference key="NSMixedImage" ref="613505175"/>
+															<string key="NSAction">_popUpItemAction:</string>
+															<reference key="NSTarget" ref="257968269"/>
+														</object>
+														<object class="NSMenuItem" id="239673366">
+															<reference key="NSMenu" ref="535817339"/>
+															<string key="NSTitle">Always</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSKeyEquivModMask">1048576</int>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="855532810"/>
+															<reference key="NSMixedImage" ref="613505175"/>
+															<string key="NSAction">_popUpItemAction:</string>
+															<reference key="NSTarget" ref="257968269"/>
+														</object>
+													</array>
+												</object>
+												<int key="NSSelectedIndex">-1</int>
+												<int key="NSPreferredEdge">3</int>
+												<bool key="NSUsesItemFromMenu">YES</bool>
+												<bool key="NSAltersState">YES</bool>
+												<int key="NSArrowPosition">1</int>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSButton" id="48200887">
+											<reference key="NSNextResponder" ref="562355593"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrame">{{15, 44}, {118, 18}}</string>
+											<reference key="NSSuperview" ref="562355593"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="1070447769"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSButtonCell" key="NSCell" id="271611192">
+												<int key="NSCellFlags">67108864</int>
+												<int key="NSCellFlags2">0</int>
+												<string key="NSContents">Enable Hacks</string>
+												<reference key="NSSupport" ref="85522599"/>
+												<reference key="NSControlView" ref="48200887"/>
+												<int key="NSButtonFlags">1211912448</int>
+												<int key="NSButtonFlags2">2</int>
+												<reference key="NSAlternateImage" ref="642079005"/>
+												<string key="NSAlternateContents"/>
+												<string key="NSKeyEquivalent"/>
+												<int key="NSPeriodicDelay">200</int>
+												<int key="NSPeriodicInterval">25</int>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSButton" id="1070447769">
+											<reference key="NSNextResponder" ref="562355593"/>
+											<int key="NSvFlags">268</int>
+											<string key="NSFrame">{{15, 24}, {118, 18}}</string>
+											<reference key="NSSuperview" ref="562355593"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="863974442"/>
+											<string key="NSReuseIdentifierKey">_NS:9</string>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSButtonCell" key="NSCell" id="1021627436">
+												<int key="NSCellFlags">67108864</int>
+												<int key="NSCellFlags2">268435456</int>
+												<string key="NSContents">Enable Shaders</string>
+												<reference key="NSSupport" ref="85522599"/>
+												<string key="NSCellIdentifier">_NS:9</string>
+												<reference key="NSControlView" ref="1070447769"/>
+												<int key="NSButtonFlags">1211912448</int>
+												<int key="NSButtonFlags2">2</int>
+												<object class="NSCustomResource" key="NSNormalImage">
+													<string key="NSClassName">NSImage</string>
+													<string key="NSResourceName">NSSwitch</string>
+												</object>
+												<reference key="NSAlternateImage" ref="642079005"/>
+												<string key="NSAlternateContents"/>
+												<string key="NSKeyEquivalent"/>
+												<int key="NSPeriodicDelay">200</int>
+												<int key="NSPeriodicInterval">25</int>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+									</array>
+									<string key="NSFrame">{{2, 2}, {203, 118}}</string>
+									<reference key="NSSuperview" ref="956302290"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="574316115"/>
+								</object>
+							</array>
+							<string key="NSFrame">{{242, 409}, {207, 135}}</string>
+							<reference key="NSSuperview" ref="683836898"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="562355593"/>
+							<string key="NSOffsets">{0, 0}</string>
+							<object class="NSTextFieldCell" key="NSTitleCell">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">0</int>
+								<string key="NSContents">Rendering</string>
+								<reference key="NSSupport" ref="26"/>
+								<reference key="NSBackgroundColor" ref="807301086"/>
+								<object class="NSColor" key="NSTextColor">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
+								</object>
+							</object>
+							<reference key="NSContentView" ref="562355593"/>
+							<int key="NSBorderType">3</int>
+							<int key="NSBoxType">0</int>
+							<int key="NSTitlePosition">2</int>
+							<bool key="NSTransparent">NO</bool>
+						</object>
+						<object class="NSBox" id="318614234">
+							<reference key="NSNextResponder" ref="683836898"/>
+							<int key="NSvFlags">12</int>
+							<array class="NSMutableArray" key="NSSubviews">
+								<object class="NSView" id="931431086">
+									<reference key="NSNextResponder" ref="318614234"/>
+									<int key="NSvFlags">274</int>
+									<array class="NSMutableArray" key="NSSubviews">
+										<object class="NSButton" id="374928377">
+											<reference key="NSNextResponder" ref="931431086"/>
+											<int key="NSvFlags">268</int>
+											<string key="NSFrame">{{333, 88}, {89, 32}}</string>
+											<reference key="NSSuperview" ref="931431086"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="929478763"/>
+											<string key="NSReuseIdentifierKey">_NS:9</string>
+											<int key="NSTag">1</int>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSButtonCell" key="NSCell" id="579472173">
+												<int key="NSCellFlags">67108864</int>
+												<int key="NSCellFlags2">134217728</int>
+												<string key="NSContents">Select...</string>
+												<reference key="NSSupport" ref="85522599"/>
+												<string key="NSCellIdentifier">_NS:9</string>
+												<reference key="NSControlView" ref="374928377"/>
+												<int key="NSButtonFlags">-2038284288</int>
+												<int key="NSButtonFlags2">129</int>
+												<string key="NSAlternateContents"/>
+												<string key="NSKeyEquivalent"/>
+												<int key="NSPeriodicDelay">200</int>
+												<int key="NSPeriodicInterval">25</int>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSButton" id="285922344">
+											<reference key="NSNextResponder" ref="931431086"/>
+											<int key="NSvFlags">268</int>
+											<string key="NSFrame">{{333, 55}, {89, 32}}</string>
+											<reference key="NSSuperview" ref="931431086"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="637092375"/>
+											<string key="NSReuseIdentifierKey">_NS:9</string>
+											<int key="NSTag">2</int>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSButtonCell" key="NSCell" id="1068900992">
+												<int key="NSCellFlags">67108864</int>
+												<int key="NSCellFlags2">134217728</int>
+												<string key="NSContents">Select...</string>
+												<reference key="NSSupport" ref="85522599"/>
+												<string key="NSCellIdentifier">_NS:9</string>
+												<reference key="NSControlView" ref="285922344"/>
+												<int key="NSButtonFlags">-2038284288</int>
+												<int key="NSButtonFlags2">129</int>
+												<string key="NSAlternateContents"/>
+												<string key="NSKeyEquivalent"/>
+												<int key="NSPeriodicDelay">200</int>
+												<int key="NSPeriodicInterval">25</int>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSTextField" id="1013340557">
+											<reference key="NSNextResponder" ref="931431086"/>
+											<int key="NSvFlags">268</int>
+											<string key="NSFrame">{{85, 98}, {249, 17}}</string>
+											<reference key="NSSuperview" ref="931431086"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="374928377"/>
+											<string key="NSReuseIdentifierKey">_NS:1535</string>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTextFieldCell" key="NSCell" id="195480730">
+												<int key="NSCellFlags">68157504</int>
+												<int key="NSCellFlags2">272630784</int>
+												<string key="NSContents">Label</string>
+												<reference key="NSSupport" ref="85522599"/>
+												<string key="NSCellIdentifier">_NS:1535</string>
+												<reference key="NSControlView" ref="1013340557"/>
+												<reference key="NSBackgroundColor" ref="523712963"/>
+												<reference key="NSTextColor" ref="172448668"/>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSTextField" id="145781561">
+											<reference key="NSNextResponder" ref="931431086"/>
+											<int key="NSvFlags">268</int>
+											<string key="NSFrame">{{85, 65}, {249, 17}}</string>
+											<reference key="NSSuperview" ref="931431086"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="524625855"/>
+											<string key="NSReuseIdentifierKey">_NS:1535</string>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTextFieldCell" key="NSCell" id="469973994">
+												<int key="NSCellFlags">68157504</int>
+												<int key="NSCellFlags2">272630784</int>
+												<string key="NSContents">Label</string>
+												<reference key="NSSupport" ref="85522599"/>
+												<string key="NSCellIdentifier">_NS:1535</string>
+												<reference key="NSControlView" ref="145781561"/>
+												<reference key="NSBackgroundColor" ref="523712963"/>
+												<reference key="NSTextColor" ref="172448668"/>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSTextField" id="828910870">
+											<reference key="NSNextResponder" ref="931431086"/>
+											<int key="NSvFlags">268</int>
+											<string key="NSFrame">{{15, 98}, {50, 17}}</string>
+											<reference key="NSSuperview" ref="931431086"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="1013340557"/>
+											<string key="NSReuseIdentifierKey">_NS:1535</string>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTextFieldCell" key="NSCell" id="666204887">
+												<int key="NSCellFlags">68157504</int>
+												<int key="NSCellFlags2">272630784</int>
+												<string key="NSContents">Vertex:</string>
+												<reference key="NSSupport" ref="85522599"/>
+												<string key="NSCellIdentifier">_NS:1535</string>
+												<reference key="NSControlView" ref="828910870"/>
+												<reference key="NSBackgroundColor" ref="523712963"/>
+												<reference key="NSTextColor" ref="172448668"/>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSTextField" id="929478763">
+											<reference key="NSNextResponder" ref="931431086"/>
+											<int key="NSvFlags">268</int>
+											<string key="NSFrame">{{15, 65}, {68, 17}}</string>
+											<reference key="NSSuperview" ref="931431086"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="145781561"/>
+											<string key="NSReuseIdentifierKey">_NS:1535</string>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTextFieldCell" key="NSCell" id="810864245">
+												<int key="NSCellFlags">68157504</int>
+												<int key="NSCellFlags2">272630784</int>
+												<string key="NSContents">Fragment:</string>
+												<reference key="NSSupport" ref="85522599"/>
+												<string key="NSCellIdentifier">_NS:1535</string>
+												<reference key="NSControlView" ref="929478763"/>
+												<reference key="NSBackgroundColor" ref="523712963"/>
+												<reference key="NSTextColor" ref="172448668"/>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSPopUpButton" id="637092375">
+											<reference key="NSNextResponder" ref="931431086"/>
+											<int key="NSvFlags">268</int>
+											<string key="NSFrame">{{86, 26}, {100, 26}}</string>
+											<reference key="NSSuperview" ref="931431086"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="619692665"/>
+											<string key="NSReuseIdentifierKey">_NS:9</string>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSPopUpButtonCell" key="NSCell" id="377783502">
+												<int key="NSCellFlags">-2076180416</int>
+												<int key="NSCellFlags2">2048</int>
+												<reference key="NSSupport" ref="85522599"/>
+												<string key="NSCellIdentifier">_NS:9</string>
+												<reference key="NSControlView" ref="637092375"/>
+												<int key="NSButtonFlags">109199360</int>
+												<int key="NSButtonFlags2">129</int>
+												<string key="NSAlternateContents"/>
+												<string key="NSKeyEquivalent"/>
+												<int key="NSPeriodicDelay">400</int>
+												<int key="NSPeriodicInterval">75</int>
+												<object class="NSMenuItem" key="NSMenuItem" id="922750945">
+													<reference key="NSMenu" ref="111861017"/>
+													<string key="NSTitle">1.0</string>
+													<string key="NSKeyEquiv"/>
+													<int key="NSMnemonicLoc">2147483647</int>
+													<int key="NSState">1</int>
+													<reference key="NSOnImage" ref="855532810"/>
+													<reference key="NSMixedImage" ref="613505175"/>
+													<string key="NSAction">_popUpItemAction:</string>
+													<int key="NSTag">1</int>
+													<reference key="NSTarget" ref="377783502"/>
+												</object>
+												<bool key="NSMenuItemRespectAlignment">YES</bool>
+												<object class="NSMenu" key="NSMenu" id="111861017">
+													<string key="NSTitle">OtherViews</string>
+													<array class="NSMutableArray" key="NSMenuItems">
+														<reference ref="922750945"/>
+														<object class="NSMenuItem" id="406832684">
+															<reference key="NSMenu" ref="111861017"/>
+															<string key="NSTitle">2.0</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="855532810"/>
+															<reference key="NSMixedImage" ref="613505175"/>
+															<string key="NSAction">_popUpItemAction:</string>
+															<int key="NSTag">2</int>
+															<reference key="NSTarget" ref="377783502"/>
+														</object>
+														<object class="NSMenuItem" id="458639587">
+															<reference key="NSMenu" ref="111861017"/>
+															<string key="NSTitle">3.0</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSKeyEquivModMask">1048576</int>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="855532810"/>
+															<reference key="NSMixedImage" ref="613505175"/>
+															<string key="NSAction">_popUpItemAction:</string>
+															<reference key="NSTarget" ref="377783502"/>
+														</object>
+														<object class="NSMenuItem" id="445311213">
+															<reference key="NSMenu" ref="111861017"/>
+															<string key="NSTitle">4.0</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="855532810"/>
+															<reference key="NSMixedImage" ref="613505175"/>
+															<string key="NSAction">_popUpItemAction:</string>
+															<reference key="NSTarget" ref="377783502"/>
+														</object>
+													</array>
+													<reference key="NSMenuFont" ref="85522599"/>
+												</object>
+												<int key="NSSelectedIndex">-1</int>
+												<int key="NSPreferredEdge">1</int>
+												<bool key="NSUsesItemFromMenu">YES</bool>
+												<bool key="NSAltersState">YES</bool>
+												<int key="NSArrowPosition">2</int>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSTextField" id="524625855">
+											<reference key="NSNextResponder" ref="931431086"/>
+											<int key="NSvFlags">268</int>
+											<string key="NSFrame">{{15, 32}, {53, 17}}</string>
+											<reference key="NSSuperview" ref="931431086"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="285922344"/>
+											<string key="NSReuseIdentifierKey">_NS:1535</string>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTextFieldCell" key="NSCell" id="848824354">
+												<int key="NSCellFlags">68157504</int>
+												<int key="NSCellFlags2">272630784</int>
+												<string key="NSContents">Quality:</string>
+												<reference key="NSSupport" ref="85522599"/>
+												<string key="NSCellIdentifier">_NS:1535</string>
+												<reference key="NSControlView" ref="524625855"/>
+												<reference key="NSBackgroundColor" ref="523712963"/>
+												<reference key="NSTextColor" ref="172448668"/>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+									</array>
+									<string key="NSFrame">{{1, 1}, {430, 126}}</string>
+									<reference key="NSSuperview" ref="318614234"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="828910870"/>
+									<string key="NSReuseIdentifierKey">_NS:11</string>
+								</object>
+							</array>
+							<string key="NSFrame">{{17, 67}, {432, 142}}</string>
+							<reference key="NSSuperview" ref="683836898"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="931431086"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<string key="NSOffsets">{0, 0}</string>
+							<object class="NSTextFieldCell" key="NSTitleCell">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">0</int>
+								<string key="NSContents">Shaders</string>
+								<reference key="NSSupport" ref="26"/>
+								<reference key="NSBackgroundColor" ref="807301086"/>
+								<object class="NSColor" key="NSTextColor">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
+								</object>
+							</object>
+							<reference key="NSContentView" ref="931431086"/>
+							<int key="NSBorderType">1</int>
+							<int key="NSBoxType">0</int>
+							<int key="NSTitlePosition">2</int>
+							<bool key="NSTransparent">NO</bool>
+						</object>
+						<object class="NSButton" id="484880929">
+							<reference key="NSNextResponder" ref="683836898"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{393, 13}, {59, 32}}</string>
+							<reference key="NSSuperview" ref="683836898"/>
+							<reference key="NSWindow"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="1013802244">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">OK</string>
+								<reference key="NSSupport" ref="85522599"/>
+								<string key="NSCellIdentifier">_NS:9</string>
+								<reference key="NSControlView" ref="484880929"/>
+								<int key="NSButtonFlags">-2038284288</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSButton" id="680584236">
+							<reference key="NSNextResponder" ref="683836898"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{311, 13}, {82, 32}}</string>
+							<reference key="NSSuperview" ref="683836898"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="484880929"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="907298013">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Cancel</string>
+								<reference key="NSSupport" ref="85522599"/>
+								<string key="NSCellIdentifier">_NS:9</string>
+								<reference key="NSControlView" ref="680584236"/>
+								<int key="NSButtonFlags">-2038284288</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string type="base64-UTF8" key="NSKeyEquivalent">Gw</string>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSButton" id="619692665">
+							<reference key="NSNextResponder" ref="683836898"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{14, 13}, {75, 32}}</string>
+							<reference key="NSSuperview" ref="683836898"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="680584236"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="391924434">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Reset</string>
+								<reference key="NSSupport" ref="85522599"/>
+								<string key="NSCellIdentifier">_NS:9</string>
+								<reference key="NSControlView" ref="619692665"/>
+								<int key="NSButtonFlags">-2038284288</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+					</array>
+					<string key="NSFrameSize">{466, 564}</string>
+					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
+					<reference key="NSNextKeyView" ref="883494424"/>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
+				<string key="NSMinSize">{283.34100000000001, 129}</string>
+				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
+				<bool key="NSWindowIsRestorable">YES</bool>
+			</object>
+		</array>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<array class="NSMutableArray" key="connectionRecords">
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">hacksView</string>
+						<reference key="source" ref="331818130"/>
+						<reference key="destination" ref="863974442"/>
+					</object>
+					<int key="connectionID">139</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">window</string>
+						<reference key="source" ref="331818130"/>
+						<reference key="destination" ref="367816088"/>
+					</object>
+					<int key="connectionID">141</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">vSync</string>
+						<reference key="source" ref="331818130"/>
+						<reference key="destination" ref="982425799"/>
+					</object>
+					<int key="connectionID">140</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">frameSkipping</string>
+						<reference key="source" ref="331818130"/>
+						<reference key="destination" ref="229535697"/>
+					</object>
+					<int key="connectionID">138</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">fpsCounter</string>
+						<reference key="source" ref="331818130"/>
+						<reference key="destination" ref="1001322100"/>
+					</object>
+					<int key="connectionID">136</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">autoFullScreen</string>
+						<reference key="source" ref="331818130"/>
+						<reference key="destination" ref="1058448386"/>
+					</object>
+					<int key="connectionID">137</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">ditherMode</string>
+						<reference key="source" ref="331818130"/>
+						<reference key="destination" ref="851261397"/>
+					</object>
+					<int key="connectionID">143</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">hackEnable</string>
+						<reference key="source" ref="331818130"/>
+						<reference key="destination" ref="48200887"/>
+					</object>
+					<int key="connectionID">144</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">hackToggle:</string>
+						<reference key="source" ref="331818130"/>
+						<reference key="destination" ref="48200887"/>
+					</object>
+					<int key="connectionID">146</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">fragmentShaderViewablePath</string>
+						<reference key="source" ref="331818130"/>
+						<reference key="destination" ref="145781561"/>
+					</object>
+					<int key="connectionID">198</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">vertexShaderViewablePath</string>
+						<reference key="source" ref="331818130"/>
+						<reference key="destination" ref="1013340557"/>
+					</object>
+					<int key="connectionID">199</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">fragmentChooser</string>
+						<reference key="source" ref="331818130"/>
+						<reference key="destination" ref="285922344"/>
+					</object>
+					<int key="connectionID">201</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">vertexChooser</string>
+						<reference key="source" ref="331818130"/>
+						<reference key="destination" ref="374928377"/>
+					</object>
+					<int key="connectionID">203</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">selectShader:</string>
+						<reference key="source" ref="331818130"/>
+						<reference key="destination" ref="285922344"/>
+					</object>
+					<int key="connectionID">205</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">shaders</string>
+						<reference key="source" ref="331818130"/>
+						<reference key="destination" ref="1070447769"/>
+					</object>
+					<int key="connectionID">193</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleShader:</string>
+						<reference key="source" ref="331818130"/>
+						<reference key="destination" ref="1070447769"/>
+					</object>
+					<int key="connectionID">200</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">shadersView</string>
+						<reference key="source" ref="331818130"/>
+						<reference key="destination" ref="318614234"/>
+					</object>
+					<int key="connectionID">206</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">shaderQualitySelector</string>
+						<reference key="source" ref="331818130"/>
+						<reference key="destination" ref="637092375"/>
+					</object>
+					<int key="connectionID">233</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">selectShader:</string>
+						<reference key="source" ref="331818130"/>
+						<reference key="destination" ref="374928377"/>
+					</object>
+					<int key="connectionID">234</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">reset:</string>
+						<reference key="source" ref="331818130"/>
+						<reference key="destination" ref="619692665"/>
+					</object>
+					<int key="connectionID">391</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">cancel:</string>
+						<reference key="source" ref="331818130"/>
+						<reference key="destination" ref="680584236"/>
+					</object>
+					<int key="connectionID">392</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">ok:</string>
+						<reference key="source" ref="331818130"/>
+						<reference key="destination" ref="484880929"/>
+					</object>
+					<int key="connectionID">393</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">hacksMatrix</string>
+						<reference key="source" ref="331818130"/>
+						<reference key="destination" ref="777359600"/>
+					</object>
+					<int key="connectionID">606</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="367816088"/>
+						<reference key="destination" ref="331818130"/>
+					</object>
+					<int key="connectionID">142</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">initialFirstResponder</string>
+						<reference key="source" ref="367816088"/>
+						<reference key="destination" ref="1001322100"/>
+					</object>
+					<int key="connectionID">145</int>
+				</object>
+			</array>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<array key="orderedObjects">
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<array key="object" id="0"/>
+						<reference key="children" ref="906065362"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="331818130"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="973896135"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">First Responder</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5</int>
+						<reference key="object" ref="367816088"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="683836898"/>
+						</array>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Window</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6</int>
+						<reference key="object" ref="683836898"/>
+						<array class="NSMutableArray" key="children">
+							<object class="IBNSLayoutConstraint" id="76343754">
+								<reference key="firstItem" ref="484880929"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="680584236"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">12</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="683836898"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="365869440">
+								<reference key="firstItem" ref="683836898"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="484880929"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="683836898"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="891689175">
+								<reference key="firstItem" ref="683836898"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="484880929"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="683836898"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="78758977">
+								<reference key="firstItem" ref="683836898"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="680584236"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="683836898"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="879969680">
+								<reference key="firstItem" ref="683836898"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="619692665"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="683836898"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="699144108">
+								<reference key="firstItem" ref="619692665"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="683836898"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="683836898"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="230637279">
+								<reference key="firstItem" ref="683836898"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="318614234"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">71</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="683836898"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="967936593">
+								<reference key="firstItem" ref="318614234"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="863974442"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="683836898"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="146632946">
+								<reference key="firstItem" ref="318614234"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="683836898"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">355</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="683836898"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="220377133">
+								<reference key="firstItem" ref="318614234"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="683836898"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="683836898"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="887117513">
+								<reference key="firstItem" ref="683836898"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="318614234"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="683836898"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="3999403">
+								<reference key="firstItem" ref="956302290"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="683836898"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">245</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="683836898"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="14804683">
+								<reference key="firstItem" ref="683836898"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="956302290"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="683836898"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="823335103">
+								<reference key="firstItem" ref="956302290"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="683836898"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="683836898"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="166580245">
+								<reference key="firstItem" ref="683836898"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="863974442"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="683836898"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="1071787734">
+								<reference key="firstItem" ref="863974442"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="683836898"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">159</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="683836898"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="800422064">
+								<reference key="firstItem" ref="863974442"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="683836898"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="683836898"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="556810728">
+								<reference key="firstItem" ref="863974442"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="883494424"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="683836898"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="71261534">
+								<reference key="firstItem" ref="683836898"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="883494424"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">232</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="683836898"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="696447352">
+								<reference key="firstItem" ref="883494424"/>
+								<int key="firstAttribute">11</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="956302290"/>
+								<int key="secondAttribute">11</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="683836898"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="333219008">
+								<reference key="firstItem" ref="883494424"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="683836898"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="683836898"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="36160955">
+								<reference key="firstItem" ref="883494424"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="683836898"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="683836898"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<reference ref="484880929"/>
+							<reference ref="680584236"/>
+							<reference ref="619692665"/>
+							<reference ref="883494424"/>
+							<reference ref="863974442"/>
+							<reference ref="318614234"/>
+							<reference ref="956302290"/>
+						</array>
+						<reference key="parent" ref="367816088"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">76</int>
+						<reference key="object" ref="863974442"/>
+						<array class="NSMutableArray" key="children">
+							<object class="IBNSLayoutConstraint" id="361778500">
+								<reference key="firstItem" ref="777359600"/>
+								<int key="firstAttribute">9</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="116814744"/>
+								<int key="secondAttribute">9</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="863974442"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="367009079">
+								<reference key="firstItem" ref="777359600"/>
+								<int key="firstAttribute">9</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="863974442"/>
+								<int key="secondAttribute">9</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="863974442"/>
+								<int key="scoringType">5</int>
+								<float key="scoringTypeFloat">22</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="457907902">
+								<reference key="firstItem" ref="777359600"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="116814744"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="863974442"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="644534212">
+								<reference key="firstItem" ref="116814744"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="863974442"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">25</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="863974442"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<reference ref="777359600"/>
+							<reference ref="116814744"/>
+						</array>
+						<reference key="parent" ref="683836898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">89</int>
+						<reference key="object" ref="883494424"/>
+						<array class="NSMutableArray" key="children">
+							<object class="IBNSLayoutConstraint" id="477021466">
+								<reference key="firstItem" ref="982425799"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1058448386"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">6</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="883494424"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="873575955">
+								<reference key="firstItem" ref="1058448386"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="229535697"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">6</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="883494424"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="204167271">
+								<reference key="firstItem" ref="1058448386"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="982425799"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="883494424"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="47544967">
+								<reference key="firstItem" ref="229535697"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1001322100"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">6</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="883494424"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="667983891">
+								<reference key="firstItem" ref="229535697"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1058448386"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="883494424"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="970464449">
+								<reference key="firstItem" ref="1001322100"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="883494424"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">25</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="883494424"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="1027953460">
+								<reference key="firstItem" ref="1001322100"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="229535697"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="883494424"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="462217783">
+								<reference key="firstItem" ref="1001322100"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="883494424"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">19</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="883494424"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<reference ref="1001322100"/>
+							<reference ref="982425799"/>
+							<reference ref="229535697"/>
+							<reference ref="1058448386"/>
+						</array>
+						<reference key="parent" ref="683836898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">107</int>
+						<reference key="object" ref="956302290"/>
+						<array class="NSMutableArray" key="children">
+							<object class="IBNSLayoutConstraint" id="938511662">
+								<reference key="firstItem" ref="1070447769"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="48200887"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="956302290"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="271321341">
+								<reference key="firstItem" ref="1070447769"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="48200887"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">6</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="956302290"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="650656989">
+								<reference key="firstItem" ref="1070447769"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="956302290"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="956302290"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="546588228">
+								<reference key="firstItem" ref="48200887"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="956302290"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">73</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="956302290"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="331262919">
+								<reference key="firstItem" ref="48200887"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="956302290"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="956302290"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="229597616">
+								<reference key="firstItem" ref="956302290"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="851261397"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="956302290"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="334669851">
+								<reference key="firstItem" ref="851261397"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="956302290"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="956302290"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="229464180">
+								<reference key="firstItem" ref="851261397"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="574316115"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="956302290"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="396043426">
+								<reference key="firstItem" ref="574316115"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="956302290"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="956302290"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="652395458">
+								<reference key="firstItem" ref="574316115"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="956302290"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">21</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="956302290"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<reference ref="851261397"/>
+							<reference ref="574316115"/>
+							<reference ref="48200887"/>
+							<reference ref="1070447769"/>
+						</array>
+						<reference key="parent" ref="683836898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-3</int>
+						<reference key="object" ref="162766117"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Application</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">74</int>
+						<reference key="object" ref="116814744"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="161898211"/>
+							<object class="IBNSLayoutConstraint" id="50241852">
+								<reference key="firstItem" ref="116814744"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">356</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="116814744"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="863974442"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">162</int>
+						<reference key="object" ref="161898211"/>
+						<reference key="parent" ref="116814744"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">93</int>
+						<reference key="object" ref="982425799"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="961583499"/>
+							<object class="IBNSLayoutConstraint" id="721537428">
+								<reference key="firstItem" ref="982425799"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">185</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="982425799"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="883494424"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">172</int>
+						<reference key="object" ref="961583499"/>
+						<reference key="parent" ref="982425799"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">96</int>
+						<reference key="object" ref="229535697"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1045777778"/>
+						</array>
+						<reference key="parent" ref="883494424"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">173</int>
+						<reference key="object" ref="1045777778"/>
+						<reference key="parent" ref="229535697"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">97</int>
+						<reference key="object" ref="1001322100"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="914939078"/>
+						</array>
+						<reference key="parent" ref="883494424"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">174</int>
+						<reference key="object" ref="914939078"/>
+						<reference key="parent" ref="1001322100"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">99</int>
+						<reference key="object" ref="1058448386"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="462155792"/>
+						</array>
+						<reference key="parent" ref="883494424"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">175</int>
+						<reference key="object" ref="462155792"/>
+						<reference key="parent" ref="1058448386"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">112</int>
+						<reference key="object" ref="574316115"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="495746919"/>
+							<object class="IBNSLayoutConstraint" id="70292189">
+								<reference key="firstItem" ref="574316115"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">138</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="574316115"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="956302290"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">176</int>
+						<reference key="object" ref="495746919"/>
+						<reference key="parent" ref="574316115"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">116</int>
+						<reference key="object" ref="851261397"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="257968269"/>
+						</array>
+						<reference key="parent" ref="956302290"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">177</int>
+						<reference key="object" ref="257968269"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="535817339"/>
+						</array>
+						<reference key="parent" ref="851261397"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">113</int>
+						<reference key="object" ref="535817339"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="13643923"/>
+							<reference ref="239673366"/>
+							<reference ref="1031563258"/>
+						</array>
+						<reference key="parent" ref="257968269"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">111</int>
+						<reference key="object" ref="13643923"/>
+						<reference key="parent" ref="535817339"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">114</int>
+						<reference key="object" ref="239673366"/>
+						<reference key="parent" ref="535817339"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">115</int>
+						<reference key="object" ref="1031563258"/>
+						<reference key="parent" ref="535817339"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">117</int>
+						<reference key="object" ref="48200887"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="271611192"/>
+						</array>
+						<reference key="parent" ref="956302290"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">178</int>
+						<reference key="object" ref="271611192"/>
+						<reference key="parent" ref="48200887"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">179</int>
+						<reference key="object" ref="318614234"/>
+						<array class="NSMutableArray" key="children">
+							<object class="IBNSLayoutConstraint" id="796423661">
+								<reference key="firstItem" ref="285922344"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="374928377"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">12</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="318614234"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="759085687">
+								<reference key="firstItem" ref="285922344"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="145781561"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="318614234"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="167515528">
+								<reference key="firstItem" ref="374928377"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="318614234"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">25</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="318614234"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="979897562">
+								<reference key="firstItem" ref="374928377"/>
+								<int key="firstAttribute">11</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1013340557"/>
+								<int key="secondAttribute">11</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="318614234"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="1047688829">
+								<reference key="firstItem" ref="374928377"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="285922344"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="318614234"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="813270801">
+								<reference key="firstItem" ref="374928377"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1013340557"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="318614234"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="36865134">
+								<reference key="firstItem" ref="637092375"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="145781561"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="318614234"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="123885723">
+								<reference key="firstItem" ref="637092375"/>
+								<int key="firstAttribute">11</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="524625855"/>
+								<int key="secondAttribute">11</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="318614234"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="1000527200">
+								<reference key="firstItem" ref="145781561"/>
+								<int key="firstAttribute">11</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="285922344"/>
+								<int key="secondAttribute">11</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="318614234"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="1058134985">
+								<reference key="firstItem" ref="145781561"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="929478763"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="318614234"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="677836831">
+								<reference key="firstItem" ref="1013340557"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="145781561"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="318614234"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="1049222427">
+								<reference key="firstItem" ref="524625855"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="929478763"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="318614234"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="565776234">
+								<reference key="firstItem" ref="524625855"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="318614234"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="318614234"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="683513340">
+								<reference key="firstItem" ref="929478763"/>
+								<int key="firstAttribute">11</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="145781561"/>
+								<int key="secondAttribute">11</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="318614234"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="453358692">
+								<reference key="firstItem" ref="929478763"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="318614234"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="318614234"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="514101239">
+								<reference key="firstItem" ref="828910870"/>
+								<int key="firstAttribute">11</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1013340557"/>
+								<int key="secondAttribute">11</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="318614234"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="258396404">
+								<reference key="firstItem" ref="828910870"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="318614234"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="318614234"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<reference ref="1013340557"/>
+							<reference ref="145781561"/>
+							<reference ref="828910870"/>
+							<reference ref="929478763"/>
+							<reference ref="374928377"/>
+							<reference ref="285922344"/>
+							<reference ref="524625855"/>
+							<reference ref="637092375"/>
+						</array>
+						<reference key="parent" ref="683836898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">182</int>
+						<reference key="object" ref="374928377"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="579472173"/>
+						</array>
+						<reference key="parent" ref="318614234"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">183</int>
+						<reference key="object" ref="579472173"/>
+						<reference key="parent" ref="374928377"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">184</int>
+						<reference key="object" ref="285922344"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1068900992"/>
+						</array>
+						<reference key="parent" ref="318614234"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">185</int>
+						<reference key="object" ref="1068900992"/>
+						<reference key="parent" ref="285922344"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">186</int>
+						<reference key="object" ref="1013340557"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="195480730"/>
+							<object class="IBNSLayoutConstraint" id="519390690">
+								<reference key="firstItem" ref="1013340557"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">243</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1013340557"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="318614234"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">187</int>
+						<reference key="object" ref="195480730"/>
+						<reference key="parent" ref="1013340557"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">188</int>
+						<reference key="object" ref="145781561"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="469973994"/>
+						</array>
+						<reference key="parent" ref="318614234"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">189</int>
+						<reference key="object" ref="469973994"/>
+						<reference key="parent" ref="145781561"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">194</int>
+						<reference key="object" ref="828910870"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="666204887"/>
+						</array>
+						<reference key="parent" ref="318614234"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">195</int>
+						<reference key="object" ref="666204887"/>
+						<reference key="parent" ref="828910870"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">196</int>
+						<reference key="object" ref="929478763"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="810864245"/>
+						</array>
+						<reference key="parent" ref="318614234"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">197</int>
+						<reference key="object" ref="810864245"/>
+						<reference key="parent" ref="929478763"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">180</int>
+						<reference key="object" ref="1070447769"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1021627436"/>
+						</array>
+						<reference key="parent" ref="956302290"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">181</int>
+						<reference key="object" ref="1021627436"/>
+						<reference key="parent" ref="1070447769"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">219</int>
+						<reference key="object" ref="637092375"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="377783502"/>
+							<object class="IBNSLayoutConstraint" id="365430198">
+								<reference key="firstItem" ref="637092375"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">95</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="637092375"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="318614234"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">220</int>
+						<reference key="object" ref="377783502"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="111861017"/>
+						</array>
+						<reference key="parent" ref="637092375"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">221</int>
+						<reference key="object" ref="111861017"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="922750945"/>
+							<reference ref="406832684"/>
+							<reference ref="458639587"/>
+							<reference ref="445311213"/>
+						</array>
+						<reference key="parent" ref="377783502"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">222</int>
+						<reference key="object" ref="922750945"/>
+						<reference key="parent" ref="111861017"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">223</int>
+						<reference key="object" ref="406832684"/>
+						<reference key="parent" ref="111861017"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">224</int>
+						<reference key="object" ref="458639587"/>
+						<reference key="parent" ref="111861017"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">225</int>
+						<reference key="object" ref="524625855"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="848824354"/>
+						</array>
+						<reference key="parent" ref="318614234"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">226</int>
+						<reference key="object" ref="848824354"/>
+						<reference key="parent" ref="524625855"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">227</int>
+						<reference key="object" ref="445311213"/>
+						<reference key="parent" ref="111861017"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">237</int>
+						<reference key="object" ref="677836831"/>
+						<reference key="parent" ref="318614234"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">240</int>
+						<reference key="object" ref="813270801"/>
+						<reference key="parent" ref="318614234"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">241</int>
+						<reference key="object" ref="759085687"/>
+						<reference key="parent" ref="318614234"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">242</int>
+						<reference key="object" ref="1058134985"/>
+						<reference key="parent" ref="318614234"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">244</int>
+						<reference key="object" ref="1047688829"/>
+						<reference key="parent" ref="318614234"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">247</int>
+						<reference key="object" ref="453358692"/>
+						<reference key="parent" ref="318614234"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">248</int>
+						<reference key="object" ref="258396404"/>
+						<reference key="parent" ref="318614234"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">250</int>
+						<reference key="object" ref="514101239"/>
+						<reference key="parent" ref="318614234"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">251</int>
+						<reference key="object" ref="565776234"/>
+						<reference key="parent" ref="318614234"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">254</int>
+						<reference key="object" ref="70292189"/>
+						<reference key="parent" ref="574316115"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">255</int>
+						<reference key="object" ref="519390690"/>
+						<reference key="parent" ref="1013340557"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">258</int>
+						<reference key="object" ref="887117513"/>
+						<reference key="parent" ref="683836898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">261</int>
+						<reference key="object" ref="220377133"/>
+						<reference key="parent" ref="683836898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">268</int>
+						<reference key="object" ref="36160955"/>
+						<reference key="parent" ref="683836898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">279</int>
+						<reference key="object" ref="365430198"/>
+						<reference key="parent" ref="637092375"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">308</int>
+						<reference key="object" ref="721537428"/>
+						<reference key="parent" ref="982425799"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">311</int>
+						<reference key="object" ref="334669851"/>
+						<reference key="parent" ref="956302290"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">318</int>
+						<reference key="object" ref="50241852"/>
+						<reference key="parent" ref="116814744"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">319</int>
+						<reference key="object" ref="462217783"/>
+						<reference key="parent" ref="883494424"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">320</int>
+						<reference key="object" ref="1027953460"/>
+						<reference key="parent" ref="883494424"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">321</int>
+						<reference key="object" ref="204167271"/>
+						<reference key="parent" ref="883494424"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">324</int>
+						<reference key="object" ref="667983891"/>
+						<reference key="parent" ref="883494424"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">333</int>
+						<reference key="object" ref="979897562"/>
+						<reference key="parent" ref="318614234"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">336</int>
+						<reference key="object" ref="796423661"/>
+						<reference key="parent" ref="318614234"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">337</int>
+						<reference key="object" ref="1000527200"/>
+						<reference key="parent" ref="318614234"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">339</int>
+						<reference key="object" ref="683513340"/>
+						<reference key="parent" ref="318614234"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">347</int>
+						<reference key="object" ref="167515528"/>
+						<reference key="parent" ref="318614234"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">358</int>
+						<reference key="object" ref="333219008"/>
+						<reference key="parent" ref="683836898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">310</int>
+						<reference key="object" ref="229464180"/>
+						<reference key="parent" ref="956302290"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">309</int>
+						<reference key="object" ref="652395458"/>
+						<reference key="parent" ref="956302290"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">371</int>
+						<reference key="object" ref="484880929"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1013802244"/>
+						</array>
+						<reference key="parent" ref="683836898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">372</int>
+						<reference key="object" ref="1013802244"/>
+						<reference key="parent" ref="484880929"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">375</int>
+						<reference key="object" ref="680584236"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="907298013"/>
+						</array>
+						<reference key="parent" ref="683836898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">376</int>
+						<reference key="object" ref="907298013"/>
+						<reference key="parent" ref="680584236"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">381</int>
+						<reference key="object" ref="619692665"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="391924434"/>
+						</array>
+						<reference key="parent" ref="683836898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">382</int>
+						<reference key="object" ref="391924434"/>
+						<reference key="parent" ref="619692665"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">383</int>
+						<reference key="object" ref="699144108"/>
+						<reference key="parent" ref="683836898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">386</int>
+						<reference key="object" ref="891689175"/>
+						<reference key="parent" ref="683836898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">387</int>
+						<reference key="object" ref="365869440"/>
+						<reference key="parent" ref="683836898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">388</int>
+						<reference key="object" ref="78758977"/>
+						<reference key="parent" ref="683836898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">389</int>
+						<reference key="object" ref="76343754"/>
+						<reference key="parent" ref="683836898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">390</int>
+						<reference key="object" ref="879969680"/>
+						<reference key="parent" ref="683836898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">396</int>
+						<reference key="object" ref="644534212"/>
+						<reference key="parent" ref="863974442"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">517</int>
+						<reference key="object" ref="146632946"/>
+						<reference key="parent" ref="683836898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">530</int>
+						<reference key="object" ref="777359600"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="325618545"/>
+							<reference ref="48017917"/>
+							<reference ref="352584485"/>
+							<reference ref="459195947"/>
+							<reference ref="154283413"/>
+							<reference ref="998491539"/>
+							<reference ref="89478486"/>
+							<reference ref="818004199"/>
+							<reference ref="114998115"/>
+							<reference ref="367879922"/>
+							<reference ref="487164406"/>
+						</array>
+						<reference key="parent" ref="863974442"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">531</int>
+						<reference key="object" ref="325618545"/>
+						<reference key="parent" ref="777359600"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">163</int>
+						<reference key="object" ref="48017917"/>
+						<reference key="parent" ref="777359600"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">171</int>
+						<reference key="object" ref="352584485"/>
+						<reference key="parent" ref="777359600"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">164</int>
+						<reference key="object" ref="459195947"/>
+						<reference key="parent" ref="777359600"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">169</int>
+						<reference key="object" ref="154283413"/>
+						<reference key="parent" ref="777359600"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">161</int>
+						<reference key="object" ref="998491539"/>
+						<reference key="parent" ref="777359600"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">170</int>
+						<reference key="object" ref="89478486"/>
+						<reference key="parent" ref="777359600"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">166</int>
+						<reference key="object" ref="818004199"/>
+						<reference key="parent" ref="777359600"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">165</int>
+						<reference key="object" ref="114998115"/>
+						<reference key="parent" ref="777359600"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">168</int>
+						<reference key="object" ref="367879922"/>
+						<reference key="parent" ref="777359600"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">167</int>
+						<reference key="object" ref="487164406"/>
+						<reference key="parent" ref="777359600"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">545</int>
+						<reference key="object" ref="457907902"/>
+						<reference key="parent" ref="863974442"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">548</int>
+						<reference key="object" ref="367009079"/>
+						<reference key="parent" ref="863974442"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">549</int>
+						<reference key="object" ref="361778500"/>
+						<reference key="parent" ref="863974442"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">560</int>
+						<reference key="object" ref="823335103"/>
+						<reference key="parent" ref="683836898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">561</int>
+						<reference key="object" ref="14804683"/>
+						<reference key="parent" ref="683836898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">563</int>
+						<reference key="object" ref="696447352"/>
+						<reference key="parent" ref="683836898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">565</int>
+						<reference key="object" ref="873575955"/>
+						<reference key="parent" ref="883494424"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">566</int>
+						<reference key="object" ref="477021466"/>
+						<reference key="parent" ref="883494424"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">574</int>
+						<reference key="object" ref="650656989"/>
+						<reference key="parent" ref="956302290"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">575</int>
+						<reference key="object" ref="3999403"/>
+						<reference key="parent" ref="683836898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">576</int>
+						<reference key="object" ref="71261534"/>
+						<reference key="parent" ref="683836898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">577</int>
+						<reference key="object" ref="556810728"/>
+						<reference key="parent" ref="683836898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">578</int>
+						<reference key="object" ref="800422064"/>
+						<reference key="parent" ref="683836898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">579</int>
+						<reference key="object" ref="1071787734"/>
+						<reference key="parent" ref="683836898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">580</int>
+						<reference key="object" ref="166580245"/>
+						<reference key="parent" ref="683836898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">581</int>
+						<reference key="object" ref="967936593"/>
+						<reference key="parent" ref="683836898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">582</int>
+						<reference key="object" ref="331262919"/>
+						<reference key="parent" ref="956302290"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">583</int>
+						<reference key="object" ref="396043426"/>
+						<reference key="parent" ref="956302290"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">590</int>
+						<reference key="object" ref="546588228"/>
+						<reference key="parent" ref="956302290"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">591</int>
+						<reference key="object" ref="271321341"/>
+						<reference key="parent" ref="956302290"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">592</int>
+						<reference key="object" ref="229597616"/>
+						<reference key="parent" ref="956302290"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">593</int>
+						<reference key="object" ref="938511662"/>
+						<reference key="parent" ref="956302290"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">594</int>
+						<reference key="object" ref="970464449"/>
+						<reference key="parent" ref="883494424"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">595</int>
+						<reference key="object" ref="47544967"/>
+						<reference key="parent" ref="883494424"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">600</int>
+						<reference key="object" ref="230637279"/>
+						<reference key="parent" ref="683836898"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">602</int>
+						<reference key="object" ref="1049222427"/>
+						<reference key="parent" ref="318614234"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">604</int>
+						<reference key="object" ref="123885723"/>
+						<reference key="parent" ref="318614234"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">605</int>
+						<reference key="object" ref="36865134"/>
+						<reference key="parent" ref="318614234"/>
+					</object>
+				</array>
+			</object>
+			<dictionary class="NSMutableDictionary" key="flattenedProperties">
+				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="107.IBNSViewMetadataConstraints">
+					<reference ref="652395458"/>
+					<reference ref="396043426"/>
+					<reference ref="229464180"/>
+					<reference ref="334669851"/>
+					<reference ref="229597616"/>
+					<reference ref="331262919"/>
+					<reference ref="546588228"/>
+					<reference ref="650656989"/>
+					<reference ref="271321341"/>
+					<reference ref="938511662"/>
+				</array>
+				<boolean value="NO" key="107.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="107.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="111.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="112.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="574316115"/>
+						<string key="toolTip">Specify when to use dithering to render colors</string>
+					</object>
+				</object>
+				<array key="112.IBNSViewMetadataConstraints">
+					<reference ref="70292189"/>
+				</array>
+				<boolean value="NO" key="112.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="112.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="113.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="114.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="115.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="116.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="851261397"/>
+						<string key="toolTip">Specify when to use dithering to render colors</string>
+					</object>
+				</object>
+				<boolean value="NO" key="116.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="116.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="117.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="48200887"/>
+						<string key="toolTip">Enable use of the hacks specified below</string>
+					</object>
+				</object>
+				<boolean value="NO" key="117.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="117.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="161.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="998491539"/>
+						<string key="toolTip">Fixes black screens in Lunar</string>
+					</object>
+				</object>
+				<string key="161.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="162.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="163.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="48017917"/>
+						<string key="toolTip">Better fps limitation with some games</string>
+					</object>
+				</object>
+				<string key="163.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="164.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="459195947"/>
+						<string key="toolTip">Old compatibility mode</string>
+					</object>
+				</object>
+				<string key="164.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="165.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="114998115"/>
+						<string key="toolTip">Better fps limitation with some games</string>
+					</object>
+				</object>
+				<string key="165.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="166.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="818004199"/>
+						<string key="toolTip">Shows the full area in Capcom 2D fighters</string>
+					</object>
+				</object>
+				<string key="166.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="167.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="487164406"/>
+						<string key="toolTip">Maybe faster, needed for Pandemonium 2</string>
+					</object>
+				</object>
+				<string key="167.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="168.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="367879922"/>
+						<string key="toolTip">Chrono Cross</string>
+					</object>
+				</object>
+				<string key="168.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="169.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="154283413"/>
+						<string key="toolTip">Slightly distorted textures can happen</string>
+					</object>
+				</object>
+				<string key="169.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="170.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="89478486"/>
+						<string key="toolTip">Needed by Dark Forces</string>
+					</object>
+				</object>
+				<string key="170.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="171.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="352584485"/>
+						<string key="toolTip">Toggles busy flags after drawing</string>
+					</object>
+				</object>
+				<string key="171.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="172.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="173.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="174.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="175.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="176.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="177.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="178.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array class="NSMutableArray" key="179.IBNSViewMetadataConstraints">
+					<reference ref="258396404"/>
+					<reference ref="514101239"/>
+					<reference ref="453358692"/>
+					<reference ref="683513340"/>
+					<reference ref="565776234"/>
+					<reference ref="1049222427"/>
+					<reference ref="677836831"/>
+					<reference ref="1058134985"/>
+					<reference ref="1000527200"/>
+					<reference ref="123885723"/>
+					<reference ref="36865134"/>
+					<reference ref="813270801"/>
+					<reference ref="1047688829"/>
+					<reference ref="979897562"/>
+					<reference ref="167515528"/>
+					<reference ref="759085687"/>
+					<reference ref="796423661"/>
+				</array>
+				<boolean value="NO" key="179.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="179.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="180.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="180.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="181.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="182.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="182.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="183.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="184.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="184.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="185.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="186.IBNSViewMetadataConstraints">
+					<reference ref="519390690"/>
+				</array>
+				<boolean value="NO" key="186.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="186.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="187.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="188.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="188.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="189.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="194.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="194.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="195.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="196.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="196.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="197.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="219.IBNSViewMetadataConstraints">
+					<reference ref="365430198"/>
+				</array>
+				<boolean value="NO" key="219.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="219.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="220.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="221.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="222.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="223.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="224.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="225.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="225.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="226.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="227.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="237.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="240.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="241.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="242.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="244.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="247.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="248.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="250.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="251.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="254.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="255.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="258.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="261.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="268.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="279.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="308.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="309.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="310.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="311.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="318.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="319.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="320.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="321.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="324.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="333.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="336.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="337.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="339.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="347.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="358.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="371.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="371.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="372.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="375.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="375.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="376.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="381.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="381.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="382.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="383.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="386.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="387.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="388.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="389.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="390.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="396.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="517.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="530.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="530.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="531.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="545.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="548.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="549.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="560.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="561.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="563.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="565.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="566.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="574.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="575.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="576.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="577.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="578.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="579.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="580.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="581.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="582.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="583.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="590.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="591.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="592.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="593.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="594.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="595.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array class="NSMutableArray" key="6.IBNSViewMetadataConstraints">
+					<reference ref="36160955"/>
+					<reference ref="333219008"/>
+					<reference ref="696447352"/>
+					<reference ref="71261534"/>
+					<reference ref="556810728"/>
+					<reference ref="800422064"/>
+					<reference ref="1071787734"/>
+					<reference ref="166580245"/>
+					<reference ref="823335103"/>
+					<reference ref="14804683"/>
+					<reference ref="3999403"/>
+					<reference ref="887117513"/>
+					<reference ref="220377133"/>
+					<reference ref="146632946"/>
+					<reference ref="967936593"/>
+					<reference ref="230637279"/>
+					<reference ref="699144108"/>
+					<reference ref="879969680"/>
+					<reference ref="78758977"/>
+					<reference ref="891689175"/>
+					<reference ref="365869440"/>
+					<reference ref="76343754"/>
+				</array>
+				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="600.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="602.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="604.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="605.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="74.IBNSViewMetadataConstraints">
+					<reference ref="50241852"/>
+				</array>
+				<boolean value="NO" key="74.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="74.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array class="NSMutableArray" key="76.IBNSViewMetadataConstraints">
+					<reference ref="644534212"/>
+					<reference ref="457907902"/>
+					<reference ref="367009079"/>
+					<reference ref="361778500"/>
+				</array>
+				<boolean value="NO" key="76.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="76.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array class="NSMutableArray" key="89.IBNSViewMetadataConstraints">
+					<reference ref="462217783"/>
+					<reference ref="1027953460"/>
+					<reference ref="970464449"/>
+					<reference ref="667983891"/>
+					<reference ref="47544967"/>
+					<reference ref="204167271"/>
+					<reference ref="873575955"/>
+					<reference ref="477021466"/>
+				</array>
+				<boolean value="NO" key="89.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="89.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="93.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="982425799"/>
+						<string key="toolTip">Removes tearing artifacts by waiting for the monitor to sync. Will cause a slight performance loss. This setting has no effect on LCD monitors.</string>
+					</object>
+				</object>
+				<array key="93.IBNSViewMetadataConstraints">
+					<reference ref="721537428"/>
+				</array>
+				<boolean value="NO" key="93.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="93.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="96.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="229535697"/>
+						<string key="toolTip">Skip rendering frames to improve overall speed when needed. This setting might cause compatibility problems</string>
+					</object>
+				</object>
+				<boolean value="NO" key="96.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="96.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="97.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="1001322100"/>
+						<string key="toolTip">When Enabled a small counter will show the current performance of the rendering measured in Frames Per Second (FPS)</string>
+					</object>
+				</object>
+				<boolean value="NO" key="97.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="97.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="99.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="1058448386"/>
+						<string key="toolTip">Automatically enter full screen mode</string>
+					</object>
+				</object>
+				<boolean value="NO" key="99.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="99.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			</dictionary>
+			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+			<nil key="activeLocalization"/>
+			<dictionary class="NSMutableDictionary" key="localizations"/>
+			<nil key="sourceID"/>
+			<int key="maxID">606</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">NSLayoutConstraint</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/NSLayoutConstraint.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NetSfPeopsSoftGPUPluginConfigController</string>
+					<string key="superclassName">NSWindowController</string>
+					<dictionary class="NSMutableDictionary" key="actions">
+						<string key="cancel:">id</string>
+						<string key="hackToggle:">id</string>
+						<string key="ok:">id</string>
+						<string key="reset:">id</string>
+						<string key="selectShader:">id</string>
+						<string key="toggleShader:">id</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="actionInfosByName">
+						<object class="IBActionInfo" key="cancel:">
+							<string key="name">cancel:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="hackToggle:">
+							<string key="name">hackToggle:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="ok:">
+							<string key="name">ok:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="reset:">
+							<string key="name">reset:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="selectShader:">
+							<string key="name">selectShader:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="toggleShader:">
+							<string key="name">toggleShader:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="autoFullScreen">NSControl</string>
+						<string key="ditherMode">NSPopUpButton</string>
+						<string key="fpsCounter">NSControl</string>
+						<string key="fragmentChooser">NSControl</string>
+						<string key="fragmentShaderViewablePath">NSTextField</string>
+						<string key="frameSkipping">NSControl</string>
+						<string key="hackEnable">NSControl</string>
+						<string key="hacksMatrix">NSMatrix</string>
+						<string key="hacksView">NSView</string>
+						<string key="shaderQualitySelector">NSPopUpButton</string>
+						<string key="shaders">NSControl</string>
+						<string key="shadersView">NSView</string>
+						<string key="vSync">NSControl</string>
+						<string key="vertexChooser">NSControl</string>
+						<string key="vertexShaderViewablePath">NSTextField</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="autoFullScreen">
+							<string key="name">autoFullScreen</string>
+							<string key="candidateClassName">NSControl</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="ditherMode">
+							<string key="name">ditherMode</string>
+							<string key="candidateClassName">NSPopUpButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="fpsCounter">
+							<string key="name">fpsCounter</string>
+							<string key="candidateClassName">NSControl</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="fragmentChooser">
+							<string key="name">fragmentChooser</string>
+							<string key="candidateClassName">NSControl</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="fragmentShaderViewablePath">
+							<string key="name">fragmentShaderViewablePath</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="frameSkipping">
+							<string key="name">frameSkipping</string>
+							<string key="candidateClassName">NSControl</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="hackEnable">
+							<string key="name">hackEnable</string>
+							<string key="candidateClassName">NSControl</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="hacksMatrix">
+							<string key="name">hacksMatrix</string>
+							<string key="candidateClassName">NSMatrix</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="hacksView">
+							<string key="name">hacksView</string>
+							<string key="candidateClassName">NSView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="shaderQualitySelector">
+							<string key="name">shaderQualitySelector</string>
+							<string key="candidateClassName">NSPopUpButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="shaders">
+							<string key="name">shaders</string>
+							<string key="candidateClassName">NSControl</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="shadersView">
+							<string key="name">shadersView</string>
+							<string key="candidateClassName">NSView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="vSync">
+							<string key="name">vSync</string>
+							<string key="candidateClassName">NSControl</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="vertexChooser">
+							<string key="name">vertexChooser</string>
+							<string key="candidateClassName">NSControl</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="vertexShaderViewablePath">
+							<string key="name">vertexShaderViewablePath</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/NetSfPeopsSoftGPUPluginConfigController.h</string>
+					</object>
+				</object>
+			</array>
+		</object>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<real value="1070" key="NS.object.0"/>
+		</object>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<string key="NSMenuCheckmark">{11, 11}</string>
+			<string key="NSMenuMixedState">{10, 3}</string>
+			<string key="NSSwitch">{15, 15}</string>
+		</dictionary>
+		<bool key="IBDocument.UseAutolayout">YES</bool>
+	</data>
+</archive>

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFXVideo/Info.plist -> pcsxr-1.9.93.tar.bz2/macosx/plugins/DFXVideo/Info.plist Changed

pcsxr-1.9.93.tar.bz2/macosx/plugins/DFXVideo/NetSfPeopsSoftGPUInterface.xib Added

@@ -0,0 +1,301 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
+	<data>
+		<int key="IBDocument.SystemTarget">1070</int>
+		<string key="IBDocument.SystemVersion">12E55</string>
+		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
+		<string key="IBDocument.AppKitVersion">1187.39</string>
+		<string key="IBDocument.HIToolboxVersion">626.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			<string key="NS.object.0">3084</string>
+		</object>
+		<array key="IBDocument.IntegratedClassDependencies">
+			<string>IBNSLayoutConstraint</string>
+			<string>NSCustomObject</string>
+			<string>NSOpenGLView</string>
+			<string>NSView</string>
+			<string>NSWindowTemplate</string>
+		</array>
+		<array key="IBDocument.PluginDependencies">
+			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+		</array>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1009041965">
+			<object class="NSCustomObject" id="894596679">
+				<string key="NSClassName">NetSfPeopsSoftGPUPluginWindowController</string>
+			</object>
+			<object class="NSCustomObject" id="1036539384">
+				<string key="NSClassName">FirstResponder</string>
+			</object>
+			<object class="NSCustomObject" id="18064786">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSWindowTemplate" id="663103883">
+				<int key="NSWindowStyleMask">271</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{6, 240}, {648, 484}}</string>
+				<int key="NSWTFlags">544735232</int>
+				<string key="NSWindowTitle">PeopsSoftGL Display</string>
+				<string key="NSWindowClass">NetSfPeopsSoftGPUPluginWindow</string>
+				<object class="NSMutableString" key="NSViewClass">
+					<characters key="NS.bytes">View</characters>
+				</object>
+				<nil key="NSUserInterfaceItemIdentifier"/>
+				<string key="NSWindowContentMinSize">{213, 107}</string>
+				<object class="NSView" key="NSWindowView" id="421016096">
+					<reference key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<array class="NSMutableArray" key="NSSubviews">
+						<object class="NSOpenGLView" id="169050778">
+							<reference key="NSNextResponder" ref="421016096"/>
+							<int key="NSvFlags">274</int>
+							<string key="NSFrame">{{4, 4}, {640, 480}}</string>
+							<reference key="NSSuperview" ref="421016096"/>
+							<reference key="NSWindow"/>
+							<object class="NSOpenGLPixelFormat" key="NSPixelFormat">
+								<object class="NSMutableData" key="NSPixelAttributes">
+									<bytes key="NS.bytes">AAAACAAAABgAAAAAA</bytes>
+								</object>
+							</object>
+						</object>
+					</array>
+					<string key="NSFrameSize">{648, 484}</string>
+					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
+				<string key="NSMinSize">{213, 129}</string>
+				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
+				<bool key="NSWindowIsRestorable">YES</bool>
+			</object>
+		</array>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<array class="NSMutableArray" key="connectionRecords">
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">window</string>
+						<reference key="source" ref="894596679"/>
+						<reference key="destination" ref="663103883"/>
+					</object>
+					<int key="connectionID">8</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">glView</string>
+						<reference key="source" ref="894596679"/>
+						<reference key="destination" ref="169050778"/>
+					</object>
+					<int key="connectionID">16</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="663103883"/>
+						<reference key="destination" ref="894596679"/>
+					</object>
+					<int key="connectionID">13</int>
+				</object>
+			</array>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<array key="orderedObjects">
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<array key="object" id="0"/>
+						<reference key="children" ref="1009041965"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="894596679"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="1036539384"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">First Responder</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5</int>
+						<reference key="object" ref="663103883"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="421016096"/>
+						</array>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Window</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6</int>
+						<reference key="object" ref="421016096"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="169050778"/>
+							<object class="IBNSLayoutConstraint" id="1014403038">
+								<reference key="firstItem" ref="169050778"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="421016096"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="421016096"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="1599615">
+								<reference key="firstItem" ref="169050778"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="421016096"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">4</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="421016096"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="1047065543">
+								<reference key="firstItem" ref="421016096"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="169050778"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">4</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="421016096"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="574511182">
+								<reference key="firstItem" ref="169050778"/>
+								<int key="firstAttribute">9</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="421016096"/>
+								<int key="secondAttribute">9</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="421016096"/>
+								<int key="scoringType">5</int>
+								<float key="scoringTypeFloat">22</float>
+								<int key="contentType">2</int>
+							</object>
+						</array>
+						<reference key="parent" ref="663103883"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">15</int>
+						<reference key="object" ref="169050778"/>
+						<reference key="parent" ref="421016096"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-3</int>
+						<reference key="object" ref="18064786"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Application</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">18</int>
+						<reference key="object" ref="574511182"/>
+						<reference key="parent" ref="421016096"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">19</int>
+						<reference key="object" ref="1047065543"/>
+						<reference key="parent" ref="421016096"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">20</int>
+						<reference key="object" ref="1599615"/>
+						<reference key="parent" ref="421016096"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">21</int>
+						<reference key="object" ref="1014403038"/>
+						<reference key="parent" ref="421016096"/>
+					</object>
+				</array>
+			</object>
+			<dictionary class="NSMutableDictionary" key="flattenedProperties">
+				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="15.CustomClassName">NetSfPeopsSoftGPUPluginGLView</string>
+				<boolean value="NO" key="15.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="15.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="18.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="19.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="20.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="21.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="6.IBNSViewMetadataConstraints">
+					<reference ref="574511182"/>
+					<reference ref="1047065543"/>
+					<reference ref="1599615"/>
+					<reference ref="1014403038"/>
+				</array>
+				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			</dictionary>
+			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+			<nil key="activeLocalization"/>
+			<dictionary class="NSMutableDictionary" key="localizations"/>
+			<nil key="sourceID"/>
+			<int key="maxID">21</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">NSLayoutConstraint</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/NSLayoutConstraint.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NetSfPeopsSoftGPUPluginWindow</string>
+					<string key="superclassName">NSWindow</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/NetSfPeopsSoftGPUPluginWindow.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NetSfPeopsSoftGPUPluginWindowController</string>
+					<string key="superclassName">NSWindowController</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/NetSfPeopsSoftGPUPluginWindowController.h</string>
+					</object>
+				</object>
+			</array>
+		</object>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<real value="1070" key="NS.object.0"/>
+		</object>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<bool key="IBDocument.UseAutolayout">YES</bool>
+	</data>
+</archive>

pcsxr-1.9.93.tar.bz2/macosx/plugins/DFXVideo/gpuPeteOGL2.slf Added

@@ -0,0 +1,35 @@
+// ColoredStorybook shader
+// by guest(r)
+// License: GNU-GPL
+
+uniform sampler2D OGL2Texture;
+uniform sampler2D OGL2TMU1;
+
+void main()
+{
+	vec3 paper = texture2D(OGL2TMU1, gl_TexCoord[6].zw).xyz;
+	vec3 c00 = texture2D(OGL2Texture, gl_TexCoord[5].xy).xyz; 
+	vec3 c10 = texture2D(OGL2Texture, gl_TexCoord[1].xy).xyz; 
+	vec3 c20 = texture2D(OGL2Texture, gl_TexCoord[2].zw).xyz; 
+	vec3 c01 = texture2D(OGL2Texture, gl_TexCoord[3].xy).xyz; 
+	vec3 c11 = texture2D(OGL2Texture, gl_TexCoord[0].xy).xyz; 
+	vec3 c21 = texture2D(OGL2Texture, gl_TexCoord[4].xy).xyz; 
+	vec3 c02 = texture2D(OGL2Texture, gl_TexCoord[1].zw).xyz; 
+	vec3 c12 = texture2D(OGL2Texture, gl_TexCoord[2].xy).xyz; 
+	vec3 c22 = texture2D(OGL2Texture, gl_TexCoord[6].xy).xyz; 
+	vec3 dt = vec3(1.0,1.0,1.0); 
+
+	c11 = 0.25*(c11+0.5*(c10+c01+c12+c21)+0.25*(c02+c20+c00+c22));
+
+	float d1=dot(abs(c00-c22),dt);
+	float d2=dot(abs(c20-c02),dt);
+	float hl=dot(abs(c01-c21),dt);
+	float vl=dot(abs(c10-c12),dt);
+
+	float d = 0.60*(d1+d2+hl+vl)/(dot(c11,dt)+0.5); 
+
+	d =  0.5*pow(d,0.5) + d;
+	c11 = (1.0-0.6*d)*c11;
+
+	gl_FragColor.xyz = mix(paper, c11, pow(max(min(d,1.1)-0.1,0.0),0.5));
+}

pcsxr-1.9.93.tar.bz2/macosx/plugins/DFXVideo/gpuPeteOGL2.slv Added

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFXVideo/macsrc/ExtendedKeys.h -> pcsxr-1.9.93.tar.bz2/macosx/plugins/DFXVideo/macsrc/ExtendedKeys.h Changed

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFXVideo/macsrc/PluginConfigController.h -> pcsxr-1.9.93.tar.bz2/macosx/plugins/DFXVideo/macsrc/PluginConfigController.h Changed

@@ -3,8 +3,9 @@
 #define PluginConfigController NetSfPeopsSoftGPUPluginConfigController
 
 #import <Cocoa/Cocoa.h>
+#import "ARCBridge.h"
 
-@interface PluginConfigController : NSWindowController
+@interface NetSfPeopsSoftGPUPluginConfigController : NSWindowController
 {
 IBOutlet NSControl *autoFullScreen;
 IBOutlet NSPopUpButton *ditherMode;
@@ -12,14 +13,31 @@
 IBOutlet NSControl *frameSkipping;
 IBOutlet NSControl *hackEnable;
 IBOutlet NSView *hacksView;
+	IBOutlet NSMatrix *hacksMatrix;
 IBOutlet NSControl *vSync;
+	IBOutlet NSControl *shaders;
+	IBOutlet NSTextField *vertexShaderViewablePath;
+	IBOutlet NSTextField *fragmentShaderViewablePath;
+	IBOutlet NSControl *vertexChooser;
+	IBOutlet NSControl *fragmentChooser;
+	IBOutlet NSView *shadersView;
+	IBOutlet NSPopUpButton *shaderQualitySelector;
+	
+	NSURL *vertexPath;
+	NSURL *fragmentPath;
 	 
-	 NSMutableDictionary *keyValues;
+	NSMutableDictionary *keyValues;
 }
+
+@property (arcretain) NSURL *vertexPath;
+@property (arcretain) NSURL *fragmentPath;
+
 - (IBAction)cancel:(id)sender;
 - (IBAction)ok:(id)sender;
 - (IBAction)reset:(id)sender;
 - (IBAction)hackToggle:(id)sender;
+- (IBAction)toggleShader:(id)sender;
+- (IBAction)selectShader:(id)sender;
 
 - (void)loadValues;

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m -> pcsxr-1.9.93.tar.bz2/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m Changed

@@ -3,27 +3,60 @@
 #include "cfg.h"
 #include "menu.h"
 #include "externals.h"
+#import "SGPUPreferences.h"
+#import "ARCBridge.h"
+#import "PluginGLView.h"
+
+#ifdef ENABLE_NLS
+#include <libintl.h>
+#include <locale.h>
+#define _(x) gettext(x)
+#define N_(x) (x)
+//If running under Mac OS X, use the Localizable.strings file instead.
+#elif defined(_MACOSX)
+#ifdef PCSXRCORE
+__private_extern__ char* Pcsxr_locale_text(char* toloc);
+#define _(String) Pcsxr_locale_text(String)
+#define N_(String) String
+#else
+#ifndef PCSXRPLUG
+#warning please define the plug being built to use Mac OS X localization!
+#define _(msgid) msgid
+#define N_(msgid) msgid
+#else
+//Kludge to get the preprocessor to accept PCSXRPLUG as a variable.
+#define PLUGLOC_x(x,y) x ## y
+#define PLUGLOC_y(x,y) PLUGLOC_x(x,y)
+#define PLUGLOC PLUGLOC_y(PCSXRPLUG,_locale_text)
+__private_extern__ char* PLUGLOC(char* toloc);
+#define _(String) PLUGLOC(String)
+#define N_(String) String
+#endif
+#endif
+#else
+#define _(x) (x)
+#define N_(x) (x)
+#endif
 
 #define APP_ID @"net.sf.peops.SoftGpuGLPlugin"
 #define PrefsKey APP_ID @" Settings"
 
-static PluginConfigController *windowController;
-char * pConfigFile=NULL;
+static PluginConfigController *windowController = nil;
 
 void AboutDlgProc()
 {
 	// Get parent application instance
-	NSApplication *app = [NSApplication sharedApplication];
 	NSBundle *bundle = [NSBundle bundleWithIdentifier:APP_ID];
 
 	// Get Credits.rtf
 	NSString *path = [bundle pathForResource:@"Credits" ofType:@"rtf"];
 	NSAttributedString *credits;
 	if (path) {
-		credits = [[[NSAttributedString alloc] initWithPath: path
-				documentAttributes:NULL] autorelease];
+		credits = [[NSAttributedString alloc] initWithPath: path
+				documentAttributes:NULL];
+		AUTORELEASEOBJNORETURN(credits);
 	} else {
-		credits = [[[NSAttributedString alloc] initWithString:@""] autorelease];
+		credits = AUTORELEASEOBJ([[NSAttributedString alloc] initWithString:@""]);
 	}
 	
 	// Get Application Icon
@@ -31,49 +64,88 @@
 	NSSize size = NSMakeSize(64, 64);
 	[icon setSize:size];
 		
-	[app orderFrontStandardAboutPanelWithOptions:[NSDictionary dictionaryWithObjectsAndKeys:
-			[bundle objectForInfoDictionaryKey:@"CFBundleName"], @"ApplicationName",
-			icon, @"ApplicationIcon",
-			[bundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"], @"ApplicationVersion",
-			[bundle objectForInfoDictionaryKey:@"CFBundleVersion"], @"Version",
-			[bundle objectForInfoDictionaryKey:@"NSHumanReadableCopyright"], @"Copyright",
-			credits, @"Credits",
-			nil]];
+	NSDictionary *infoPaneDict =
+	[[NSDictionary alloc] initWithObjectsAndKeys:
+	 [bundle objectForInfoDictionaryKey:@"CFBundleName"], @"ApplicationName",
+	 icon, @"ApplicationIcon",
+	 [bundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"], @"ApplicationVersion",
+	 [bundle objectForInfoDictionaryKey:@"CFBundleVersion"], @"Version",
+	 [bundle objectForInfoDictionaryKey:@"NSHumanReadableCopyright"], @"Copyright",
+	 credits, @"Credits",
+	 nil];
+	dispatch_async(dispatch_get_main_queue(), ^{
+		[NSApp orderFrontStandardAboutPanelWithOptions:infoPaneDict];
+	});
+	RELEASEOBJ(infoPaneDict);
 }
 
-
 void SoftDlgProc()
 {
-	NSWindow *window;
-	
-	if (windowController == nil) {
-		windowController = [[PluginConfigController alloc] initWithWindowNibName:@"NetSfPeopsSoftGPUConfig"];
-	}
-	window = [windowController window];
-	
-	/* load values */
-	[windowController loadValues];
-	
-	[window center];
-	[window makeKeyAndOrderFront:nil];
+	RunOnMainThreadSync(^{
+		NSWindow *window;
+		
+		if (windowController == nil) {
+			windowController = [[PluginConfigController alloc] initWithWindowNibName:@"NetSfPeopsSoftGPUConfig"];
+		}
+		window = [windowController window];
+		
+		/* load values */
+		[windowController loadValues];
+		
+		[window center];
+		[window makeKeyAndOrderFront:nil];
+	});
+}
+
+BOOL isShaderEnabled()
+{
+	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+	NSDictionary *keyValues = [defaults dictionaryForKey:PrefsKey];
+	return [[keyValues objectForKey:@"UseShader"] boolValue];
+}
+
+NSURL *PSXVertexShader()
+{
+	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+	NSDictionary *keyValues = [defaults dictionaryForKey:PrefsKey];
+	return [NSURL URLByResolvingBookmarkData:[keyValues objectForKey:@"VertexShader"] options:NSURLBookmarkResolutionWithoutUI relativeToURL:nil bookmarkDataIsStale:NULL error:nil];
+}
+
+NSURL *PSXFragmentShader()
+{
+	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+	NSDictionary *keyValues = [defaults dictionaryForKey:PrefsKey];
+	return [NSURL URLByResolvingBookmarkData:[keyValues objectForKey:@"FragmentShader"] options:NSURLBookmarkResolutionWithoutUI relativeToURL:nil bookmarkDataIsStale:NULL error:nil];
+}
+
+float PSXShaderQuality()
+{
+	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+	NSDictionary *keyValues = [defaults dictionaryForKey:PrefsKey];
+	return (float)[[keyValues objectForKey:@"ShaderQuality"] intValue];
 }
 
 void ReadConfig(void)
 {
 	NSDictionary *keyValues;
+	NSBundle *selfBundle = [NSBundle bundleWithIdentifier:APP_ID];
 	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
 	[defaults registerDefaults:[NSDictionary dictionaryWithObjectsAndKeys:
-			[[NSMutableDictionary alloc] initWithObjectsAndKeys:
-					[NSNumber numberWithBool:NO], @"FPS Counter",
-					[NSNumber numberWithBool:NO], @"Auto Full Screen",
-					[NSNumber numberWithBool:NO], @"Frame Skipping",
-					[NSNumber numberWithBool:YES], @"Frame Limit",
-					[NSNumber numberWithBool:NO], @"VSync",
-					[NSNumber numberWithBool:NO], @"Enable Hacks",
-					[NSNumber numberWithInt:1], @"Dither Mode",
-					[NSNumber numberWithLong:0], @"Hacks",
-					nil], PrefsKey,
-			nil]];
+								[NSDictionary dictionaryWithObjectsAndKeys:
+								 @NO, @"FPS Counter",
+								 @NO, @"Auto Full Screen",
+								 @NO, @"Frame Skipping",
+								 @YES, @"Frame Limit",
+								 @NO, @"VSync",
+								 @NO, @"Enable Hacks",
+								 @1, @"Dither Mode",
+								 @((unsigned int)0), @"Hacks",
+								 [[selfBundle URLForResource:@"gpuPeteOGL2" withExtension:@"slv"] bookmarkDataWithOptions:NSURLBookmarkCreationPreferFileIDResolution includingResourceValuesForKeys:nil relativeToURL:nil error:nil], @"VertexShader",
+								 [[selfBundle URLForResource:@"gpuPeteOGL2" withExtension:@"slf"] bookmarkDataWithOptions:NSURLBookmarkCreationPreferFileIDResolution includingResourceValuesForKeys:nil relativeToURL:nil error:nil], @"FragmentShader",
+								 @NO, @"UseShader",
+								 @4, @"ShaderQuality",
+								 nil], PrefsKey,
+								nil]];
 	
 	keyValues = [defaults dictionaryForKey:PrefsKey];
 
@@ -85,7 +157,7 @@
 	iUseFixes = [[keyValues objectForKey:@"Enable Hacks"] boolValue];
 
 	iUseDither = [[keyValues objectForKey:@"Dither Mode"] intValue];
-	dwCfgFixes = [[keyValues objectForKey:@"Hacks"] longValue];
+	dwCfgFixes = [[keyValues objectForKey:@"Hacks"] unsignedIntValue];
 	
 	iResX = 640;
 	iResY = 480;
@@ -95,24 +167,30 @@
 	iFrameLimit = 2;
 	
 	if (iShowFPS)
-		ulKeybits|=KEY_SHOWFPS;
+		ulKeybits |= KEY_SHOWFPS;
 	else
-		ulKeybits&=~KEY_SHOWFPS;
-
- // additional checks
- if(!iColDepth) iColDepth=32;
- if(iUseFixes) dwActFixes=dwCfgFixes;
- else						 dwActFixes=0;
- SetFixes();
- 
- if(iFrameLimit==2) SetAutoFrameCap();
- bSkipNextFrame = FALSE;
- 
- szDispBuf[0]=0;
- BuildDispMenu(0);
+		ulKeybits &= ~KEY_SHOWFPS;
+	
+	// additional checks
+	if(!iColDepth) iColDepth = 32;
+	if(iUseFixes) {
+		dwActFixes = dwCfgFixes;
+	} else {
+		dwActFixes = 0;
+	}
+	SetFixes();
+	
+	if(iFrameLimit == 2) SetAutoFrameCap();
+	bSkipNextFrame = FALSE;
+	
+	szDispBuf[0] = 0;
+	BuildDispMenu(0);
 }
 
-@implementation PluginConfigController
+@implementation NetSfPeopsSoftGPUPluginConfigController
+
+@synthesize fragmentPath;
+@synthesize vertexPath;
 
 - (IBAction)cancel:(id)sender
 {
@@ -124,26 +202,25 @@
 	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
 	
 	NSMutableDictionary *writeDic = [NSMutableDictionary dictionaryWithDictionary:keyValues];
-	[writeDic setObject:[NSNumber numberWithInt:[fpsCounter intValue]] forKey:@"FPS Counter"];
-	[writeDic setObject:[NSNumber numberWithInt:[autoFullScreen intValue]] forKey:@"Auto Full Screen"];
-	[writeDic setObject:[NSNumber numberWithInt:[frameSkipping intValue]] forKey:@"Frame Skipping"];
-	//[writeDic setObject:[NSNumber numberWithInt:[frameLimit intValue]] forKey:@"Frame Limit"];
-	[writeDic setObject:[NSNumber numberWithInt:[vSync intValue]] forKey:@"VSync"];
-	[writeDic setObject:[NSNumber numberWithInt:[hackEnable intValue]] forKey:@"Enable Hacks"];
-
-	[writeDic setObject:[NSNumber numberWithInt:[ditherMode indexOfSelectedItem]] forKey:@"Dither Mode"];
-	
-	unsigned long hackValues = 0;
-	int i;
-	NSArray *views = [hacksView subviews];
-	for (i=0; i<[views count]; i++) {
-	 NSView *control = [views objectAtIndex:i];
-		if ([control isKindOfClass:[NSButton class]]) {
-			hackValues |= [(NSControl *)control intValue] << ([control tag] - 1);
-		}
+	[writeDic setObject:@((BOOL)[fpsCounter intValue]) forKey:@"FPS Counter"];
+	[writeDic setObject:@((BOOL)[autoFullScreen intValue]) forKey:@"Auto Full Screen"];
+	[writeDic setObject:@((BOOL)[frameSkipping intValue]) forKey:@"Frame Skipping"];
+	//[writeDic setObject:@([frameLimit intValue]) forKey:@"Frame Limit"];
+	[writeDic setObject:@((BOOL)[vSync intValue]) forKey:@"VSync"];
+	[writeDic setObject:@((BOOL)[hackEnable intValue]) forKey:@"Enable Hacks"];
+	[writeDic setObject:@((BOOL)[shaders intValue]) forKey:@"UseShader"];
+	[writeDic setObject:@([shaderQualitySelector indexOfSelectedItem] + 1) forKey:@"ShaderQuality"];
+	[writeDic setObject:@([ditherMode indexOfSelectedItem]) forKey:@"Dither Mode"];
+	
+	unsigned int hackValues = 0;
+	for (NSCell *control in [hacksMatrix cells]) {
+			hackValues |= [control intValue] << ([control tag] - 1);
 	}
 	
-	[writeDic setObject:[NSNumber numberWithLong:hackValues] forKey:@"Hacks"];
+	[writeDic setObject:@(hackValues) forKey:@"Hacks"];
+
+	[writeDic setObject:[vertexPath bookmarkDataWithOptions:NSURLBookmarkCreationPreferFileIDResolution includingResourceValuesForKeys:nil relativeToURL:nil error:nil] forKey:@"VertexShader"];
+	[writeDic setObject:[fragmentPath bookmarkDataWithOptions:NSURLBookmarkCreationPreferFileIDResolution includingResourceValuesForKeys:nil relativeToURL:nil error:nil] forKey:@"FragmentShader"];
 	
 	// write to defaults
 	[defaults setObject:writeDic forKey:PrefsKey];
@@ -165,17 +242,67 @@
 - (IBAction)hackToggle:(id)sender
 {
 	BOOL enable = [sender intValue] ? YES : NO;
-	int i;
-	NSArray *views = [hacksView subviews];
+	NSArray *views = [[[hacksView subviews] objectAtIndex:0] subviews];
 
-	for (i=0; i<[views count]; i++) {
-	 NSView *control = [views objectAtIndex:i];
-		if ([control isKindOfClass:[NSButton class]]) {
+	for (NSView *control in views) {
+		if ([control isKindOfClass:[NSControl class]]) {
+			if ([control isKindOfClass:[NSTextField class]]) {
+				[(NSTextField*)control setTextColor:enable ? [NSColor controlTextColor] : [NSColor disabledControlTextColor] ];
+			}
+			[(NSControl *)control setEnabled:enable];
+		}
+	}
+}
+
+- (IBAction)toggleShader:(id)sender {
+	BOOL enable = [sender intValue] ? YES : NO;
+	NSArray *views = [[[shadersView subviews] objectAtIndex:0] subviews];
+	
+	for (NSView *control in views) {
+		if ([control isKindOfClass:[NSControl class]]) {
+			if ([control isKindOfClass:[NSTextField class]]) {
+				[(NSTextField*)control setTextColor:enable ? [NSColor controlTextColor] : [NSColor disabledControlTextColor] ];
+			}
 			[(NSControl *)control setEnabled:enable];
 		}
 	}
 }
 
+- (void)setFragmentPathInfo:(NSURL *)_fragmentPath
+{
+	self.fragmentPath = _fragmentPath;
+	if (_fragmentPath) {
+		[fragmentShaderViewablePath setTitleWithMnemonic:[fragmentPath lastPathComponent]];
+		[fragmentShaderViewablePath setToolTip:[fragmentPath path]];
+	}
+}
+
+- (void)setVertexPathInfo:(NSURL *)_vertexPath
+{
+	self.vertexPath = _vertexPath;
+	if (_vertexPath) {
+		[vertexShaderViewablePath setTitleWithMnemonic:[vertexPath lastPathComponent]];
+		[vertexShaderViewablePath setToolTip:[vertexPath path]];
+	}
+}
+
+- (IBAction)selectShader:(id)sender {
+	NSOpenPanel *openPanel = RETAINOBJ([NSOpenPanel openPanel]);
+	[openPanel setAllowsMultipleSelection:NO];
+	[openPanel setCanChooseDirectories:NO];
+	[openPanel setCanChooseFiles:YES];
+	if ([openPanel runModal] == NSFileHandlingPanelOKButton)
+	{
+		if ([sender tag] == 1) {
+			[self setVertexPathInfo:[openPanel URL]];
+		} else {
+			[self setFragmentPathInfo:[openPanel URL]];
+		}
+	}
+	
+	RELEASEOBJ(openPanel);
+}
+
 - (void)loadValues
 {
 	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
@@ -183,34 +310,57 @@
 	ReadConfig();
 	
 	/* load from preferences */
-	[keyValues release];
-	keyValues = [[defaults dictionaryForKey:PrefsKey] retain];
+	RELEASEOBJ(keyValues);
+	keyValues = [[defaults dictionaryForKey:PrefsKey] mutableCopy];
 	
+	{
+		BOOL resetPrefs = NO;
+		[self setVertexPathInfo:[NSURL URLByResolvingBookmarkData:[keyValues objectForKey:@"VertexShader"] options:NSURLBookmarkResolutionWithoutUI relativeToURL:nil bookmarkDataIsStale:NULL error:nil]];
+		if (!vertexPath) {
+			resetPrefs = YES;
+		}
+		[self setFragmentPathInfo:[NSURL URLByResolvingBookmarkData:[keyValues objectForKey:@"FragmentShader"] options:NSURLBookmarkResolutionWithoutUI relativeToURL:nil bookmarkDataIsStale:NULL error:nil]];
+		if (!fragmentPath) {
+			resetPrefs = YES;
+		}
+		if (resetPrefs) {
+			NSBundle *selfBundle = [NSBundle bundleForClass:[self class]];
+			[self setVertexPathInfo:[selfBundle URLForResource:@"gpuPeteOGL2" withExtension:@"slv"]];
+			[self setFragmentPathInfo:[selfBundle URLForResource:@"gpuPeteOGL2" withExtension:@"slf"]];
+		}
+	}
 	[fpsCounter setIntValue:[[keyValues objectForKey:@"FPS Counter"] intValue]];
 	[autoFullScreen setIntValue:[[keyValues objectForKey:@"Auto Full Screen"] intValue]];
 	[frameSkipping setIntValue:[[keyValues objectForKey:@"Frame Skipping"] intValue]];
 	[vSync setIntValue:[[keyValues objectForKey:@"VSync"] intValue]];
 	[hackEnable setIntValue:[[keyValues objectForKey:@"Enable Hacks"] intValue]];
+	[shaders setIntValue:[[keyValues objectForKey:@"UseShader"] intValue]];
 
 	[ditherMode selectItemAtIndex:[[keyValues objectForKey:@"Dither Mode"] intValue]];
-
-	unsigned long hackValues = [[keyValues objectForKey:@"Hacks"] longValue];
+	[shaderQualitySelector selectItemAtIndex:[[keyValues objectForKey:@"ShaderQuality"] intValue] - 1];
 	
-	int i;
-	NSArray *views = [hacksView subviews];
-	for (i=0; i<[views count]; i++) {
-	 NSView *control = [views objectAtIndex:i];
-		if ([control isKindOfClass:[NSButton class]]) {
-			[(NSControl *)control setIntValue:(hackValues >> ([control tag] - 1)) & 1];
-		}
+	unsigned int hackValues = [[keyValues objectForKey:@"Hacks"] unsignedIntValue];
+	
+	for (NSCell *control in [hacksMatrix cells]) {
+			[control setIntValue:(hackValues >> ([control tag] - 1)) & 1];
 	}
 	
 	[self hackToggle:hackEnable];
+	[self toggleShader:shaders];
 }
 
-- (void)awakeFromNib
+#if !__has_feature(objc_arc)
+- (void)dealloc
 {
-	hacksView = [[hacksView subviews] objectAtIndex:0];
+	[vertexPath release];
+	[fragmentPath release];
+	[keyValues release];
+	
+	[super dealloc];
 }
+#endif
 
 @end
+
+#import "OSXPlugLocalization.h"
+PLUGLOCIMP([PluginConfigController class]);

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFXVideo/macsrc/PluginGLView.h -> pcsxr-1.9.93.tar.bz2/macosx/plugins/DFXVideo/macsrc/PluginGLView.h Changed

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFXVideo/macsrc/PluginGLView.m -> pcsxr-1.9.93.tar.bz2/macosx/plugins/DFXVideo/macsrc/PluginGLView.m Changed

@@ -20,12 +20,13 @@
 #import <OpenGL/glext.h>
 #import <OpenGL/glu.h>
 #import <GLUT/glut.h>
-#import <Carbon/Carbon.h>
 #import "PluginGLView.h"
+#import "SGPUPreferences.h"
 #include "externals.h"
 #undef BOOL
 #include "gpu.h"
 #include "swap.h"
+#import "ARCBridge.h"
 
 #include <time.h>
 extern time_t tStart;
@@ -90,7 +91,7 @@
 
 	glLock = [[NSLock alloc] init];
 	if (nil == glLock) {
-		[self release];
+		AUTORELEASEOBJNORETURN(self);
 		return nil;
 	}
 
@@ -120,12 +121,12 @@
 		if (!pixFmt) {
 			NSLog(@"No OpenGL pixel format found!\n");
 			
-			[self release];
+			AUTORELEASEOBJNORETURN(self);
 			return nil;
 		}
 	}
 	
-	[self setPixelFormat:[pixFmt autorelease]];
+	[self setPixelFormat:AUTORELEASEOBJ(pixFmt)];
 
 	/*
 	long swapInterval = 1 ;
@@ -142,14 +143,32 @@
 	texture_hint = GL_STORAGE_SHARED_APPLE ;
 	client_storage = gluCheckExtension ((const unsigned char *)"GL_APPLE_client_storage", strExt) ? GL_TRUE : GL_FALSE;
 	rect_texture = gluCheckExtension((const unsigned char *)"GL_EXT_texture_rectangle", strExt) ? GL_TRUE : GL_FALSE;
-
+	
 	// Setup some basic OpenGL stuff
 	glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
 	glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
 	glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
 	glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
 	glClear(GL_COLOR_BUFFER_BIT);
-
+	
+	// Loads the shaders
+
+	if(isShaderEnabled()){
+		rect_texture = GL_FALSE;
+		// --- Params ---
+		shaderQuality = PSXShaderQuality();
+		vertexShader = [self loadShader:GL_VERTEX_SHADER location:PSXVertexShader()];
+		fragmentShader = [self loadShader:GL_FRAGMENT_SHADER location:PSXFragmentShader()];
+		
+		//--- shader loading ---
+		program = glCreateProgram();
+		glAttachShader(program, vertexShader);
+		glAttachShader(program, fragmentShader);
+		glLinkProgram(program);
+		glUseProgram(program);
+	}
+	 
+	
 	[NSOpenGLContext clearCurrentContext];
 	[glLock unlock];
 
@@ -160,7 +179,7 @@
 	image_type = GL_UNSIGNED_SHORT_1_5_5_5_REV;
 	image_base = (GLubyte *) calloc(((IMAGE_COUNT * image_width * image_height) / 3) * 4, image_depth >> 3);
 	if (image_base == nil) {
-		[self release];
+		AUTORELEASEOBJNORETURN(self);
 		return nil;
 	}
 
@@ -175,7 +194,7 @@
 	// Call for a redisplay
 	noDisplay = YES;
 	PSXDisplay.Disabled = 1;
-	[self setNeedsDisplay:true];
+	[self setNeedsDisplay:YES];
 	
 	return self;
 }
@@ -196,12 +215,15 @@
 
 	[NSOpenGLContext clearCurrentContext];
 	[glLock unlock];
-	[glLock release];
-
+	
 	if (image_base)
 		free(image_base);
+	
+#if !__has_feature(objc_arc)
+	[glLock release];
 
 	[super dealloc];
+#endif
 }
 
 - (BOOL)isOpaque
@@ -218,18 +240,18 @@
 {
 	// Check if an update has occured to the buffer
 	if ([self lockFocusIfCanDraw]) {
-
-	// Make this context current
-	if (drawBG) {
-		[[NSColor blackColor] setFill];
-		[NSBezierPath fillRect:[self visibleRect]];
-	}
-
-	//glFinish() ;
-	// Swap buffer to screen
-	//[[self openGLContext] flushBuffer];
-
-	[self unlockFocus];
+		
+		// Make this context current
+		if (drawBG) {
+			[[NSColor blackColor] setFill];
+			[NSBezierPath fillRect:[self visibleRect]];
+		}
+		
+		//glFinish() ;
+		// Swap buffer to screen
+		//[[self openGLContext] flushBuffer];
+		
+		[self unlockFocus];
 	}
 }
 
@@ -292,19 +314,36 @@
 - (void)renderScreen
 {
 	int bufferIndex = whichImage;
-
+	
 	if (1/*[glLock tryLock]*/) {
 		// Make this context current
 		[[self openGLContext] makeCurrentContext];
+		
+		// Loads the shaders
+		//shader=LoadShader(GL_VERTEX_SHADER,"/Users/alexandremathieu/vertex.c");
+		//program=glCreateProgram();
+		//glAttachShader(program, shader);
+		//glLinkProgram(program);
+		//if(program == 0){
+		//	printf("Program invalide bourdel\n");
+		//}
+		
 		if (PSXDisplay.Disabled) {
 			glClear(GL_COLOR_BUFFER_BIT);
 		} else {
 			// Bind, update and draw new image
-			if(rect_texture)
+			if(rect_texture && isShaderEnabled() == NO) // cant go in there if we use shaders
 			{
+				//printf("Texture Rectangle\n");
+				//glActiveTexture(bufferIndex+1);
+				glActiveTexture(GL_TEXTURE0);
 				glBindTexture(GL_TEXTURE_RECTANGLE_EXT, bufferIndex+1);
-
+				
+				
+				
 				glTexSubImage2D(GL_TEXTURE_RECTANGLE_EXT, 0, 0, 0, image_width, image_height, GL_BGRA, image_type, image[bufferIndex]);
+				
+				
 				glBegin(GL_QUADS);
 					glTexCoord2f(0.0f, 0.0f);
 					glVertex2f(-1.0f, 1.0f);
@@ -321,9 +360,45 @@
 			}
 			else
 			{
+				NSRect rect = [[[self openGLContext] view] bounds];
+				//printf("Texture 2D normale de taille : %d, %d sur un ecran : %f x %f \n",image_width,image_height,rect.size.width,rect.size.height);
+				//glActiveTexture(whichImage+1);
 				glBindTexture(GL_TEXTURE_2D, whichImage+1);
 				
 				glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, image_width2, image_height2, GL_BGRA, image_type, image[bufferIndex]);
+				
+				
+				if(isShaderEnabled()){
+					glUseProgram(program);
+					
+					int loc = glGetUniformLocation(program, "OGL2Texture");
+					glUniform1i(loc,0);
+					int loc2 = glGetUniformLocation(program, "OGL2Param");
+					float param[4];
+					param[2] = shaderQuality;
+					param[0] = param[2] / image_width;
+					param[1] = param[2] / image_height;
+					//param[2]=2.0;
+					param[3] = 0.0;
+					int loc3 = glGetUniformLocation(program, "OGL2Size");
+					float size[4];
+					//NSRect rect = [[[self openGLContext] view] bounds];
+					size[0] = image_width;
+					size[1] = image_height;
+					size[2] = rect.size.width;
+					size[3] = rect.size.height;
+					int loc4 = glGetUniformLocation(program, "OGL2InvSize");
+					float invSize[4];
+					invSize[0] = 1.0/size[0];
+					invSize[1] = 1.0/size[1];
+					invSize[2] = 1.0/size[2];
+					invSize[3] = 1.0/size[3];
+					//invSize[4]=1.0/size[4]; //Did we goof here?
+					glUniform4fv(loc2, 1, param);
+					glUniform4fv(loc3, 1, size);
+					glUniform4fv(loc4, 1, invSize);
+				}
+				
 				glBegin(GL_QUADS);
 					glTexCoord2f(0.0f, 0.0f);
 					glVertex2f(-1.0f, 1.0f);
@@ -346,7 +421,7 @@
 			int len, i;
 			if(szDebugText[0] && ((time(NULL) - tStart) < 2))
 			{
-				strncpy(szDispBuf, szDebugText, 63);
+				strlcpy(szDispBuf, szDebugText, 63);
 			}
 			else 
 			{
@@ -377,11 +452,12 @@
 				glutBitmapCharacter(GLUT_BITMAP_HELVETICA_12, szDispBuf[i]);
 			}
 
-
 			glEnable(rect_texture ? GL_TEXTURE_RECTANGLE_EXT : GL_TEXTURE_2D);
 			glPopMatrix();
 		}
 	
+		//printProgramInfoLog(program);
+		//printf("\n\n\n");
 		[[self openGLContext] flushBuffer];
 		[NSOpenGLContext clearCurrentContext];
 		//[glLock unlock];
@@ -391,7 +467,7 @@
 - (void)loadTextures:(GLboolean)first
 {
 	GLint i;
-	
+	printf("Loading texture\n");
 	//[glLock lock];
 	[[self openGLContext] makeCurrentContext];
 	
@@ -465,9 +541,11 @@
 			}
 
 			glDisable(GL_TEXTURE_2D);
+			glActiveTexture(GL_TEXTURE0);
 			glEnable(GL_TEXTURE_RECTANGLE_EXT);
 			glBindTexture(GL_TEXTURE_RECTANGLE_EXT, i+1);
-
+			
+			
 			glTexParameteri(GL_TEXTURE_RECTANGLE_EXT, GL_TEXTURE_STORAGE_HINT_APPLE , texture_hint);
 			glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, client_storage);
 			glTexParameteri(GL_TEXTURE_RECTANGLE_EXT, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
@@ -505,7 +583,7 @@
 
 			//if(texture_range) glTextureRangeAPPLE(GL_TEXTURE_2D, IMAGE_COUNT * image_width2 * image_height2 * (image_depth >> 3), image_base);
 			//else glTextureRangeAPPLE(GL_TEXTURE_2D, 0, NULL);
-
+			
 			glTexParameteri(GL_TEXTURE_RECTANGLE_EXT, GL_TEXTURE_STORAGE_HINT_APPLE , texture_hint);
 			glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, client_storage);
 			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
@@ -525,131 +603,134 @@
 
 - (void)swapBuffer
 {
-	unsigned char * surf;
-	long x = PSXDisplay.DisplayPosition.x;
-	long y = PSXDisplay.DisplayPosition.y;
-	unsigned long lu;
-	unsigned short row,column;
-	unsigned short dx=(unsigned short)PSXDisplay.DisplayEnd.x;//PreviousPSXDisplay.Range.x1;
-	unsigned short dy=(unsigned short)PSXDisplay.DisplayEnd.y;//PreviousPSXDisplay.DisplayMode.y;
-	long lPitch;
 
 	//printf("y=%i",PSXDisplay.DisplayPosition.y);
 
-	if ([glLock tryLock]) {
-		// make sure the texture area is ready to be written to
-		glFinishObjectAPPLE(GL_TEXTURE, 2-whichImage);
-
-		if ((image_width != PreviousPSXDisplay.Range.x1) || 
-			(image_height != PreviousPSXDisplay.DisplayMode.y) ||
-			((PSXDisplay.RGB24 ? 32 : 16) != image_depth)) {
-			[self loadTextures:NO];
-		}
- 
-		surf = image[1-whichImage];
-		lPitch=image_width2<<(image_depth >> 4);
-
-		if(PreviousPSXDisplay.Range.y0) // centering needed?
-		{
-			surf+=PreviousPSXDisplay.Range.y0*lPitch;
-			dy-=PreviousPSXDisplay.Range.y0;
-		}
-
-		if(PSXDisplay.RGB24)
-		{
-			unsigned char * pD;unsigned int startxy;
-
-			surf+=PreviousPSXDisplay.Range.x0<<2;
-
-			for(column=0;column<dy;column++)
-			{ 
-				startxy = (1024 * (column + y)) + x;
-				pD = (unsigned char *)&psxVuw[startxy];
-
-				row = 0;
-				// make sure the reads are aligned
-				while ((int)pD & 0x3) {
-					*((unsigned long *)((surf)+(column*lPitch)+(row<<2))) =
-						(*(pD+0)<<16)|(*(pD+1)<<8)|*(pD+2);
-
-					pD+=3;
-					row++;
-				}
-
-				for(;row<dx;row+=4)
+	RunOnMainThreadSync(^{
+		unsigned char * surf;
+		long x = PSXDisplay.DisplayPosition.x;
+		long y = PSXDisplay.DisplayPosition.y;
+		GLuint lu;
+		unsigned short row,column;
+		unsigned short dx=PreviousPSXDisplay.Range.x1;
+		unsigned short dy=PreviousPSXDisplay.DisplayMode.y;
+		long lPitch;
+		
+		if ([glLock tryLock]) {
+			// make sure the texture area is ready to be written to
+			glFinishObjectAPPLE(GL_TEXTURE, 2-whichImage);
+			
+			if ((image_width != PreviousPSXDisplay.Range.x1) ||
+				(image_height != PreviousPSXDisplay.DisplayMode.y) ||
+				((PSXDisplay.RGB24 ? 32 : 16) != image_depth)) {
+				[self loadTextures:NO];
+			}
+			
+			surf = image[1-whichImage];
+			lPitch=image_width2<<(image_depth >> 4);
+			
+			if(PreviousPSXDisplay.Range.y0) // centering needed?
+			{
+				surf+=PreviousPSXDisplay.Range.y0*lPitch;
+				dy-=PreviousPSXDisplay.Range.y0;
+			}
+			
+			if(PSXDisplay.RGB24)
+			{
+				unsigned char * pD;unsigned int startxy;
+				
+				surf+=PreviousPSXDisplay.Range.x0<<2;
+				
+				for(column=0;column<dy;column++)
 				{
-					unsigned long lu1 = *((unsigned long *)pD);
-					unsigned long lu2 = *((unsigned long *)pD+1);
-					unsigned long lu3 = *((unsigned long *)pD+2);
-					unsigned long *dst = ((unsigned long *)((surf)+(column*lPitch)+(row<<2)));
-#ifdef __POWERPC__
-					*(dst)=
+					startxy = (1024 * (column + y)) + x;
+					pD = (unsigned char *)&psxVuw[startxy];
+					
+					row = 0;
+					// make sure the reads are aligned
+					while ((intptr_t)pD & 0x3) {
+						*((unsigned long *)((surf)+(column*lPitch)+(row<<2))) =
+						(*(pD+0)<<16)|(*(pD+1)<<8)|*(pD+2);
+						
+						pD+=3;
+						row++;
+					}
+					
+					for(;row<dx;row+=4)
+					{
+						GLuint lu1 = *((GLuint *)pD);
+						GLuint lu2 = *((GLuint *)pD+1);
+						GLuint lu3 = *((GLuint *)pD+2);
+						GLuint *dst = ((GLuint *)((surf)+(column*lPitch)+(row<<2)));
+#ifdef __BIG_ENDIAN__
+						*(dst)=
 						(((lu1>>24)&0xff)<<16)|(((lu1>>16)&0xff)<<8)|(((lu1>>8)&0xff));
-					*(dst+1)=
+						*(dst+1)=
 						(((lu1>>0)&0xff)<<16)|(((lu2>>24)&0xff)<<8)|(((lu2>>16)&0xff));
-					*(dst+2)=
+						*(dst+2)=
 						(((lu2>>8)&0xff)<<16)|(((lu2>>0)&0xff)<<8)|(((lu3>>24)&0xff));
-					*(dst+3)=
+						*(dst+3)=
 						(((lu3>>16)&0xff)<<16)|(((lu3>>8)&0xff)<<8)|(((lu3>>0)&0xff));
 #else
-					*(dst)=
+						*(dst)=
 						(((lu1>>0)&0xff)<<16)|(((lu1>>8)&0xff)<<8)|(((lu1>>16)&0xff));
-					*(dst+1)=
+						*(dst+1)=
 						(((lu1>>24)&0xff)<<16)|(((lu2>>0)&0xff)<<8)|(((lu2>>8)&0xff));
-					*(dst+2)=
+						*(dst+2)=
 						(((lu2>>16)&0xff)<<16)|(((lu2>>24)&0xff)<<8)|(((lu3>>0)&0xff));
-					*(dst+3)=
+						*(dst+3)=
 						(((lu3>>8)&0xff)<<16)|(((lu3>>16)&0xff)<<8)|(((lu3>>24)&0xff));
 #endif
-					pD+=12;
+						pD+=12;
+					}
+					
+					//for(;row<dx;row+=4)
+					/*while (pD&0x3) {
+					 *((unsigned long *)((surf)+(column*lPitch)+(row<<2)))=
+					 (*(pD+0)<<16)|(*(pD+1)<<8)|(*(pD+2)&0xff));
+					 pD+=3;
+					 row++;
+					 }*/
 				}
-
-				//for(;row<dx;row+=4)
-				/*while (pD&0x3) {
-					*((unsigned long *)((surf)+(column*lPitch)+(row<<2)))=
-						(*(pD+0)<<16)|(*(pD+1)<<8)|(*(pD+2)&0xff));
-					pD+=3;
-					row++;
-				}*/
 			}
-		}
-		else
-		{
-			int LineOffset,SurfOffset;
-			unsigned long * SRCPtr = (unsigned long *)(psxVuw + (y << 10) + x);
-			unsigned long * DSTPtr =
-				((unsigned long *)surf) + (PreviousPSXDisplay.Range.x0 >> 1);
-
-			dx >>= 1;
-
-			LineOffset = 512 - dx;
-			SurfOffset = (lPitch >> 2) - dx;
-
-			for(column=0;column<dy;column++)
+			else
 			{
-				for(row=0;row<dx;row++)
+				long LineOffset,SurfOffset;
+				GLuint * SRCPtr = (GLuint *)(psxVuw + (y << 10) + x);
+				GLuint * DSTPtr =
+				((GLuint *)surf) + (PreviousPSXDisplay.Range.x0 >> 1);
+				
+				dx >>= 1;
+				
+				LineOffset = 512 - dx;
+				SurfOffset = (lPitch >> 2) - dx;
+				
+				for(column=0;column<dy;column++)
 				{
-#ifdef __POWERPC__
-					lu=GETLE16D(SRCPtr++);
+					for(row=0;row<dx;row++)
+					{
+#ifdef __BIG_ENDIAN__
+						lu=GETLE16D(SRCPtr++);
 #else
-					lu=*SRCPtr++;
+						lu=*SRCPtr++;
 #endif
-					*DSTPtr++=
+						*DSTPtr++=
 						((lu << 10) & 0x7c007c00)|
 						((lu) & 0x3e003e0)|
 						((lu >> 10) & 0x1f001f);
+					}
+					SRCPtr += LineOffset;
+					DSTPtr += SurfOffset;
 				}
-				SRCPtr += LineOffset;
-				DSTPtr += SurfOffset;
 			}
+			
+			// Swap image buffer
+			whichImage = 1 - whichImage;
+			
+			[self renderScreen];
+			[glLock unlock];
 		}
-
-	// Swap image buffer
-		whichImage = 1 - whichImage;
-
-		[self renderScreen];
-		[glLock unlock];
-	}
+	});
 }
 
 - (void)clearBuffer:(BOOL)display
@@ -689,4 +770,105 @@
 	lastTime = time;
 }*/
 
+- (GLuint)loadShader:(GLenum)type location:(NSURL*)filename
+{
+	GLuint myShader = 0;
+	
+	GLsizei logsize = 0;
+	GLint compile_status = GL_TRUE;
+	char *log = NULL;
+	char *src = NULL;
+	
+	/* creation d'un shader de sommet */
+	myShader = glCreateShader(type);
+	if(myShader == 0)
+	{
+		fprintf(stderr, "impossible de creer le shader\n");
+		return 0;
+	}
+	
+	/* chargement du code source */
+	src = [self loadSource:filename];
+	if(src == NULL)
+	{
+		/* theoriquement, la fonction LoadSource a deja affiche un message
+		 d'erreur, nous nous contenterons de supprimer notre shader
+		 et de retourner 0 */
+		
+		glDeleteShader(myShader);
+		return 0;
+	}
+	
+	/* assignation du code source */
+	glShaderSource(myShader, 1, (const GLchar**)&src, NULL);
+	
+	/* compilation du shader */
+	glCompileShader(myShader);
+	
+	/* liberation de la memoire du code source */
+	free(src);
+	src = NULL;
+	
+	/* verification du succes de la compilation */
+	glGetShaderiv(myShader, GL_COMPILE_STATUS, &compile_status);
+	if(compile_status != GL_TRUE)
+	{
+		/* erreur a la compilation recuperation du log d'erreur */
+		
+		/* on recupere la taille du message d'erreur */
+		glGetShaderiv(myShader, GL_INFO_LOG_LENGTH, &logsize);
+		
+		/* on alloue un espace memoire dans lequel OpenGL ecrira le message */
+		log = malloc(logsize + 1);
+		if(log == NULL)
+		{
+			fprintf(stderr, "impossible d'allouer de la memoire !\n");
+			return 0;
+		}
+		/* initialisation du contenu */
+		memset(log, '\0', logsize + 1);
+		
+		glGetShaderInfoLog(myShader, logsize, &logsize, log);
+		fprintf(stderr, "impossible de compiler le shader '%s' :\n%s",
+				[[filename path] UTF8String], log);
+		
+		/* ne pas oublier de liberer la memoire et notre shader */
+		free(log);
+		glDeleteShader(myShader);
+		
+		return 0;
+	}
+ return myShader;
+}
+
+- (char*)loadSource:(NSURL *)filename
+{
+	//Since we're passing Cocoa NSURLs, let's use Cocoa's methods
+	if (filename == nil) {
+		return NULL;
+	}
+	NSMutableData *shaderData = [NSMutableData dataWithContentsOfURL:filename];
+	[shaderData appendBytes:"\0" length:1];
+	char *shaderText = malloc([shaderData length]);
+	[shaderData getBytes:shaderText length:[shaderData length]];
+	return shaderText;
+}
+
+void printProgramInfoLog(GLuint obj)
+{
+	int infologLength = 0;
+	int charsWritten = 0;
+	char *infoLog;
+	
+	glGetProgramiv(obj, GL_INFO_LOG_LENGTH, &infologLength);
+	
+	if (infologLength > 0)
+	{
+		infoLog = (char *)malloc(infologLength);
+		glGetProgramInfoLog(obj, infologLength, &charsWritten, infoLog);
+		printf("%s\n",infoLog);
+		free(infoLog);
+	}
+}
+
 @end

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFXVideo/macsrc/PluginWindow.m -> pcsxr-1.9.93.tar.bz2/macosx/plugins/DFXVideo/macsrc/PluginWindow.m Changed

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFXVideo/macsrc/PluginWindowController.h -> pcsxr-1.9.93.tar.bz2/macosx/plugins/DFXVideo/macsrc/PluginWindowController.h Changed

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFXVideo/macsrc/PluginWindowController.m -> pcsxr-1.9.93.tar.bz2/macosx/plugins/DFXVideo/macsrc/PluginWindowController.m Changed

@@ -18,8 +18,8 @@
 
 #import "PluginWindowController.h"
 #import "PluginWindow.h"
-#import "Carbon/Carbon.h"
 #include "externals.h"
+#import "ARCBridge.h"
 #undef BOOL
 
 NSWindow *gameWindow;
@@ -46,7 +46,7 @@
 	[gameWindow makeKeyAndOrderFront:nil];
 	[gameController showWindow:nil];
 	
-	CGDirectDisplayID display = (CGDirectDisplayID)[[[[gameWindow screen] deviceDescription] objectForKey:@"NSScreenNumber"] longValue];
+	CGDirectDisplayID display = (CGDirectDisplayID)[[[[gameWindow screen] deviceDescription] objectForKey:@"NSScreenNumber"] unsignedIntValue];
 	if (CGDisplayIsCaptured(display)) {
 		[gameController setFullscreen:YES];
 	}
@@ -54,7 +54,7 @@
 	return gameController;
 }
 
-- (PluginGLView *)getOpenGLView
+- (PluginGLView *)openGLView
 {
 	return (PluginGLView *)glView;
 }
@@ -63,13 +63,18 @@
 {
 	if (fullWindow) {
 		[fullWindow orderOut:self];
+#if !__has_feature(objc_arc)
+
 		[fullWindow autorelease];
 		fullWindow = nil;
+#endif
 	}
 	
 	windowFrame = [[self window] frame];
 	
+#if !__has_feature(objc_arc)
 	[super dealloc];
+#endif
 }
 
 // forget keyDownEvents
@@ -94,7 +99,7 @@
 {
 	NSWindow *window = [self window];
 	NSScreen *screen = [window screen];
-	CGDirectDisplayID display = (CGDirectDisplayID)[[[screen deviceDescription] objectForKey:@"NSScreenNumber"] longValue];
+	CGDirectDisplayID display = (CGDirectDisplayID)[[[screen deviceDescription] objectForKey:@"NSScreenNumber"] unsignedIntValue];
 	
 	NSDisableScreenUpdates();
 	
@@ -113,8 +118,8 @@
 			//[window orderOut:self];
 		}
 		
-		int width = CGDisplayPixelsWide(display);
-		int height = CGDisplayPixelsHigh(display);
+		size_t width = CGDisplayPixelsWide(display);
+		size_t height = CGDisplayPixelsHigh(display);
 		
 		// assume square pixel ratio on the monitor
 		if ((width*3)/4 < height) {
@@ -154,7 +159,7 @@
 
 		if (fullWindow) {
 			[fullWindow orderOut:self];
-			[fullWindow autorelease];
+			AUTORELEASEOBJNORETURN(fullWindow);
 			fullWindow = nil;
 			
 			[[glView openGLContext] setView:glView];
@@ -217,7 +222,7 @@
 		return NO;
 	}
 	[[NSNotificationCenter defaultCenter] postNotificationName:@"emuWindowDidClose" object:self];
-	[gameController autorelease];
+	AUTORELEASEOBJNORETURN(gameController);
 	gameController = nil;
 	gameWindow = nil;

pcsxr-1.9.93.tar.bz2/macosx/plugins/DFXVideo/macsrc/SGPUPreferences.h Added

pcsxr-1.9.92.tar.bz2/macosx/plugins/DFXVideo/macsrc/drawgl.m -> pcsxr-1.9.93.tar.bz2/macosx/plugins/DFXVideo/macsrc/drawgl.m Changed

@@ -23,30 +23,31 @@
 #include "draw.h"
 #include "gpu.h"
 #include "menu.h"
+#include "ARCBridge.h"
 
 ////////////////////////////////////////////////////////////////////////////////////
 // misc globals
 ////////////////////////////////////////////////////////////////////////////////////
 
-int            iResX;
-int            iResY;
-long           lLowerpart;
-BOOL           bIsFirstFrame = TRUE;
-BOOL           bCheckMask=FALSE;
-unsigned short sSetMask=0;
-unsigned long  lSetMask=0;
-int            iDesktopCol=16;
-int            iShowFPS=0;
-int            iWinSize; 
-int            iUseScanLines=0;
-int            iUseNoStretchBlt=0;
-int            iFastFwd=0;
-int            iDebugMode=0;
-int            iFVDisplay=0;
-PSXPoint_t     ptCursorPoint[8];
-unsigned short usCursorActive=0;
+int				iResX;
+int				iResY;
+long			lLowerpart;
+BOOL			bIsFirstFrame = TRUE;
+BOOL			bCheckMask=FALSE;
+unsigned short	sSetMask=0;
+unsigned long	lSetMask=0;
+int				iDesktopCol=16;
+int				iShowFPS=0;
+int				iWinSize;
+int				iUseScanLines=0;
+int				iUseNoStretchBlt=0;
+int				iFastFwd=0;
+int				iDebugMode=0;
+int				iFVDisplay=0;
+PSXPoint_t		ptCursorPoint[8];
+unsigned short	usCursorActive=0;
 char *			Xpixels;
-char *         pCaptionText;
+char *			pCaptionText;
 
 //static PluginWindowController *windowController;
 static PluginGLView *glView;
@@ -99,26 +100,30 @@
 
 unsigned long ulInitDisplay(void)	// OPEN GAME WINDOW
 {
-	bUsingTWin=FALSE;                          
+	bUsingTWin = FALSE;
 
-	InitMenu();                
+	InitMenu();
 
 	bIsFirstFrame = FALSE;
 
 	if(iShowFPS)
 	{
-		//iShowFPS=0;
-		ulKeybits|=KEY_SHOWFPS;
-		szDispBuf[0]=0;
+		//iShowFPS = 0;
+		ulKeybits |= KEY_SHOWFPS;
+		szDispBuf[0] = 0;
 		BuildDispMenu(0);
 	}
+	__block NSWindow *window = nil;
+	RunOnMainThreadSync(^{
+		PluginWindowController *windowController = [PluginWindowController openGameView];
+		glView = [windowController openGLView];
+		
+		NSString *title = @(pCaptionText);
+		[[windowController window] setTitle:title];
+		window = [windowController window];
+	});
 	
-	PluginWindowController *windowController = [PluginWindowController openGameView];
-	glView = [windowController getOpenGLView];
-	
-	[[windowController window] setTitle:[NSString stringWithCString:pCaptionText]];
-	
-	return (unsigned long)[windowController window];
+	return (unsigned long)window;
 }
 
 
@@ -128,7 +133,7 @@
 {
 	if (gameController) {
 		[gameController close];
-		[gameController release];
+		RELEASEOBJ(gameController);
 		gameController = nil;
 		gameWindow = nil;
 	}
@@ -170,10 +175,35 @@
 	// this is the default implementation...
 }
 
-
 void HandleKey(int keycode)
 {
 	switch (keycode) {
+        case GPU_FRAME_LIMIT:
+            if(UseFrameLimit) {
+                UseFrameLimit = 0;
+                iFrameLimit = 1;
+            }
+            else {
+                UseFrameLimit = 1;
+                iFrameLimit = 2;
+            }
+            SetAutoFrameCap();
+            break;
+        case GPU_FAST_FORWARD:
+            if(UseFrameLimit) {
+                UseFrameLimit = 0;
+                iFrameLimit = 1;
+                UseFrameSkip = 1;
+                iFastFwd = 0;
+            }
+            else {
+                UseFrameLimit = 1;
+                iFrameLimit = 2;
+                UseFrameSkip = 0;
+                iFastFwd = 0;
+            }
+            bSkipNextFrame = FALSE;
+            break;
 		case GPU_FULLSCREEN_KEY:
 			[gameController setFullscreen:![gameController fullscreen]];
 			break;

pcsxr-1.9.93.tar.bz2/macosx/plugins/PeopsXgl Added

pcsxr-1.9.93.tar.bz2/macosx/plugins/PeopsXgl/English.lproj Added

pcsxr-1.9.93.tar.bz2/macosx/plugins/PeopsXgl/English.lproj/Credits.rtf Added

pcsxr-1.9.93.tar.bz2/macosx/plugins/PeopsXgl/English.lproj/InfoPlist.strings Added

pcsxr-1.9.93.tar.bz2/macosx/plugins/PeopsXgl/English.lproj/Localizable.strings Added

pcsxr-1.9.93.tar.bz2/macosx/plugins/PeopsXgl/English.lproj/NetSfPeopsOpenGLConfig.xib Added

@@ -0,0 +1,6007 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
+	<data>
+		<int key="IBDocument.SystemTarget">1070</int>
+		<string key="IBDocument.SystemVersion">12E55</string>
+		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
+		<string key="IBDocument.AppKitVersion">1187.39</string>
+		<string key="IBDocument.HIToolboxVersion">626.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			<string key="NS.object.0">3084</string>
+		</object>
+		<array key="IBDocument.IntegratedClassDependencies">
+			<string>IBNSLayoutConstraint</string>
+			<string>NSBox</string>
+			<string>NSButton</string>
+			<string>NSButtonCell</string>
+			<string>NSColorWell</string>
+			<string>NSCustomObject</string>
+			<string>NSForm</string>
+			<string>NSFormCell</string>
+			<string>NSMatrix</string>
+			<string>NSMenu</string>
+			<string>NSMenuItem</string>
+			<string>NSNumberFormatter</string>
+			<string>NSPopUpButton</string>
+			<string>NSPopUpButtonCell</string>
+			<string>NSSlider</string>
+			<string>NSSliderCell</string>
+			<string>NSTextField</string>
+			<string>NSTextFieldCell</string>
+			<string>NSView</string>
+			<string>NSWindowTemplate</string>
+		</array>
+		<array key="IBDocument.PluginDependencies">
+			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+		</array>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="950051212">
+			<object class="NSCustomObject" id="499690858">
+				<string key="NSClassName">NetSfPeopsOpenGLPluginConfigController</string>
+			</object>
+			<object class="NSCustomObject" id="827476947">
+				<string key="NSClassName">FirstResponder</string>
+			</object>
+			<object class="NSCustomObject" id="1061884829">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSWindowTemplate" id="484943445">
+				<int key="NSWindowStyleMask">1</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{2, 373}, {611, 554}}</string>
+				<int key="NSWTFlags">1886912512</int>
+				<string key="NSWindowTitle">GPU Configuration</string>
+				<string key="NSWindowClass">NSWindow</string>
+				<object class="NSMutableString" key="NSViewClass">
+					<characters key="NS.bytes">View</characters>
+				</object>
+				<nil key="NSUserInterfaceItemIdentifier"/>
+				<string key="NSWindowContentMinSize">{283.34100000000001, 107}</string>
+				<object class="NSView" key="NSWindowView" id="675926718">
+					<reference key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<array class="NSMutableArray" key="NSSubviews">
+						<object class="NSBox" id="93048329">
+							<reference key="NSNextResponder" ref="675926718"/>
+							<int key="NSvFlags">256</int>
+							<array class="NSMutableArray" key="NSSubviews">
+								<object class="NSView" id="4931296">
+									<reference key="NSNextResponder" ref="93048329"/>
+									<int key="NSvFlags">274</int>
+									<array class="NSMutableArray" key="NSSubviews">
+										<object class="NSMatrix" id="474244763">
+											<reference key="NSNextResponder" ref="4931296"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrame">{{367, 26}, {189, 98}}</string>
+											<reference key="NSSuperview" ref="4931296"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="809921113"/>
+											<bool key="NSEnabled">YES</bool>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											<int key="NSNumRows">5</int>
+											<int key="NSNumCols">1</int>
+											<array class="NSMutableArray" key="NSCells">
+												<object class="NSButtonCell" id="1018906851">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Limit Frame Rate</string>
+													<object class="NSFont" key="NSSupport" id="917501388">
+														<string key="NSName">LucidaGrande</string>
+														<double key="NSSize">13</double>
+														<int key="NSfFlags">1044</int>
+													</object>
+													<reference key="NSControlView" ref="474244763"/>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<object class="NSCustomResource" key="NSNormalImage" id="812453537">
+														<string key="NSClassName">NSImage</string>
+														<string key="NSResourceName">NSSwitch</string>
+													</object>
+													<object class="NSButtonImageSource" key="NSAlternateImage" id="283478431">
+														<string key="NSImageName">NSSwitch</string>
+													</object>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="73527718">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Display FPS Counter</string>
+													<reference key="NSSupport" ref="917501388"/>
+													<reference key="NSControlView" ref="474244763"/>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="283478431"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="249046253">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Use Frame Skipping</string>
+													<reference key="NSSupport" ref="917501388"/>
+													<reference key="NSControlView" ref="474244763"/>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="283478431"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="774322141">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Auto Full Screen</string>
+													<reference key="NSSupport" ref="917501388"/>
+													<reference key="NSControlView" ref="474244763"/>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="283478431"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="88136440">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Sync to Monitor Refresh</string>
+													<reference key="NSSupport" ref="917501388"/>
+													<reference key="NSControlView" ref="474244763"/>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="283478431"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</array>
+											<string key="NSCellSize">{189, 18}</string>
+											<string key="NSIntercellSpacing">{0, 2}</string>
+											<int key="NSMatrixFlags">-2080366592</int>
+											<nil key="NSCellClass"/>
+											<object class="NSButtonCell" key="NSProtoCell" id="681794258">
+												<int key="NSCellFlags">67108864</int>
+												<int key="NSCellFlags2">0</int>
+												<string key="NSContents">Limit Frame Rate</string>
+												<reference key="NSSupport" ref="917501388"/>
+												<int key="NSButtonFlags">1211912448</int>
+												<int key="NSButtonFlags2">2</int>
+												<reference key="NSAlternateImage" ref="283478431"/>
+												<string key="NSAlternateContents"/>
+												<int key="NSPeriodicDelay">200</int>
+												<int key="NSPeriodicInterval">25</int>
+											</object>
+											<int key="NSSelectedRow">-1</int>
+											<int key="NSSelectedCol">-1</int>
+											<object class="NSColor" key="NSBackgroundColor" id="747736659">
+												<int key="NSColorSpace">6</int>
+												<string key="NSCatalogName">System</string>
+												<string key="NSColorName">controlColor</string>
+												<object class="NSColor" key="NSColor">
+													<int key="NSColorSpace">3</int>
+													<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+												</object>
+											</object>
+											<reference key="NSCellBackgroundColor" ref="747736659"/>
+										</object>
+										<object class="NSPopUpButton" id="126384619">
+											<reference key="NSNextResponder" ref="4931296"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrame">{{148, 100}, {135, 26}}</string>
+											<reference key="NSSuperview" ref="4931296"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="560326422"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSPopUpButtonCell" key="NSCell" id="690636832">
+												<int key="NSCellFlags">-2076180416</int>
+												<int key="NSCellFlags2">2048</int>
+												<reference key="NSSupport" ref="917501388"/>
+												<reference key="NSControlView" ref="126384619"/>
+												<int key="NSButtonFlags">109199360</int>
+												<int key="NSButtonFlags2">1</int>
+												<object class="NSFont" key="NSAlternateImage" id="838376703">
+													<string key="NSName">LucidaGrande</string>
+													<double key="NSSize">13</double>
+													<int key="NSfFlags">16</int>
+												</object>
+												<string key="NSAlternateContents"/>
+												<object class="NSMutableString" key="NSKeyEquivalent">
+													<characters key="NS.bytes"/>
+												</object>
+												<int key="NSPeriodicDelay">400</int>
+												<int key="NSPeriodicInterval">75</int>
+												<object class="NSMenuItem" key="NSMenuItem" id="668485086">
+													<reference key="NSMenu" ref="401915791"/>
+													<string key="NSTitle">Current</string>
+													<string key="NSKeyEquiv"/>
+													<int key="NSKeyEquivModMask">1048576</int>
+													<int key="NSMnemonicLoc">2147483647</int>
+													<int key="NSState">1</int>
+													<object class="NSCustomResource" key="NSOnImage" id="589532376">
+														<string key="NSClassName">NSImage</string>
+														<string key="NSResourceName">NSMenuCheckmark</string>
+													</object>
+													<object class="NSCustomResource" key="NSMixedImage" id="700034629">
+														<string key="NSClassName">NSImage</string>
+														<string key="NSResourceName">NSMenuMixedState</string>
+													</object>
+													<string key="NSAction">_popUpItemAction:</string>
+													<reference key="NSTarget" ref="690636832"/>
+												</object>
+												<bool key="NSMenuItemRespectAlignment">YES</bool>
+												<object class="NSMenu" key="NSMenu" id="401915791">
+													<object class="NSMutableString" key="NSTitle">
+														<characters key="NS.bytes">OtherViews</characters>
+													</object>
+													<array class="NSMutableArray" key="NSMenuItems">
+														<reference ref="668485086"/>
+														<object class="NSMenuItem" id="208414338">
+															<reference key="NSMenu" ref="401915791"/>
+															<string key="NSTitle">640 x 480</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSKeyEquivModMask">1048576</int>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="589532376"/>
+															<reference key="NSMixedImage" ref="700034629"/>
+															<string key="NSAction">_popUpItemAction:</string>
+															<reference key="NSTarget" ref="690636832"/>
+														</object>
+														<object class="NSMenuItem" id="167039163">
+															<reference key="NSMenu" ref="401915791"/>
+															<string key="NSTitle">800 x 600</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSKeyEquivModMask">1048576</int>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="589532376"/>
+															<reference key="NSMixedImage" ref="700034629"/>
+															<string key="NSAction">_popUpItemAction:</string>
+															<reference key="NSTarget" ref="690636832"/>
+														</object>
+														<object class="NSMenuItem" id="302573869">
+															<reference key="NSMenu" ref="401915791"/>
+															<string key="NSTitle">1024 x 768</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSKeyEquivModMask">1048576</int>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="589532376"/>
+															<reference key="NSMixedImage" ref="700034629"/>
+															<string key="NSAction">_popUpItemAction:</string>
+															<reference key="NSTarget" ref="690636832"/>
+														</object>
+														<object class="NSMenuItem" id="826589095">
+															<reference key="NSMenu" ref="401915791"/>
+															<string key="NSTitle">1152 x 864</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSKeyEquivModMask">1048576</int>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="589532376"/>
+															<reference key="NSMixedImage" ref="700034629"/>
+															<string key="NSAction">_popUpItemAction:</string>
+															<reference key="NSTarget" ref="690636832"/>
+														</object>
+														<object class="NSMenuItem" id="548208244">
+															<reference key="NSMenu" ref="401915791"/>
+															<string key="NSTitle">1280 x1024</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSKeyEquivModMask">1048576</int>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="589532376"/>
+															<reference key="NSMixedImage" ref="700034629"/>
+															<string key="NSAction">_popUpItemAction:</string>
+															<reference key="NSTarget" ref="690636832"/>
+														</object>
+														<object class="NSMenuItem" id="489438689">
+															<reference key="NSMenu" ref="401915791"/>
+															<string key="NSTitle">1600 x 1200</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSKeyEquivModMask">1048576</int>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="589532376"/>
+															<reference key="NSMixedImage" ref="700034629"/>
+															<string key="NSAction">_popUpItemAction:</string>
+															<reference key="NSTarget" ref="690636832"/>
+														</object>
+													</array>
+												</object>
+												<int key="NSPreferredEdge">3</int>
+												<bool key="NSUsesItemFromMenu">YES</bool>
+												<bool key="NSAltersState">YES</bool>
+												<int key="NSArrowPosition">1</int>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSTextField" id="1001794195">
+											<reference key="NSNextResponder" ref="4931296"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrame">{{14, 106}, {136, 18}}</string>
+											<reference key="NSSuperview" ref="4931296"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="126384619"/>
+											<string key="NSAntiCompressionPriority">{250, 750}</string>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTextFieldCell" key="NSCell" id="871459334">
+												<int key="NSCellFlags">67108864</int>
+												<int key="NSCellFlags2">272629760</int>
+												<string key="NSContents">Fullscreen size</string>
+												<reference key="NSSupport" ref="917501388"/>
+												<reference key="NSControlView" ref="1001794195"/>
+												<reference key="NSBackgroundColor" ref="747736659"/>
+												<object class="NSColor" key="NSTextColor" id="165518464">
+													<int key="NSColorSpace">6</int>
+													<string key="NSCatalogName">System</string>
+													<string key="NSColorName">controlTextColor</string>
+													<object class="NSColor" key="NSColor">
+														<int key="NSColorSpace">3</int>
+														<bytes key="NSWhite">MAA</bytes>
+													</object>
+												</object>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSButton" id="560326422">
+											<reference key="NSNextResponder" ref="4931296"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrame">{{15, 82}, {155, 18}}</string>
+											<reference key="NSSuperview" ref="4931296"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="684085592"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSButtonCell" key="NSCell" id="93056172">
+												<int key="NSCellFlags">67108864</int>
+												<int key="NSCellFlags2">0</int>
+												<string key="NSContents">Resize Proportionally</string>
+												<reference key="NSSupport" ref="917501388"/>
+												<reference key="NSControlView" ref="560326422"/>
+												<int key="NSButtonFlags">1211912448</int>
+												<int key="NSButtonFlags2">2</int>
+												<reference key="NSNormalImage" ref="812453537"/>
+												<reference key="NSAlternateImage" ref="283478431"/>
+												<string key="NSAlternateContents"/>
+												<string key="NSKeyEquivalent"/>
+												<int key="NSPeriodicDelay">200</int>
+												<int key="NSPeriodicInterval">25</int>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSButton" id="755753305">
+											<reference key="NSNextResponder" ref="4931296"/>
+											<int key="NSvFlags">268</int>
+											<string key="NSFrame">{{195, 17}, {91, 32}}</string>
+											<reference key="NSSuperview" ref="4931296"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="474244763"/>
+											<string key="NSReuseIdentifierKey">_NS:9</string>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSButtonCell" key="NSCell" id="554182456">
+												<int key="NSCellFlags">67108864</int>
+												<int key="NSCellFlags2">134217728</int>
+												<string key="NSContents">Hacks…</string>
+												<reference key="NSSupport" ref="917501388"/>
+												<string key="NSCellIdentifier">_NS:9</string>
+												<reference key="NSControlView" ref="755753305"/>
+												<int key="NSButtonFlags">-2038284288</int>
+												<int key="NSButtonFlags2">129</int>
+												<string key="NSAlternateContents"/>
+												<string key="NSKeyEquivalent"/>
+												<int key="NSPeriodicDelay">200</int>
+												<int key="NSPeriodicInterval">25</int>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSForm" id="684085592">
+											<reference key="NSNextResponder" ref="4931296"/>
+											<int key="NSvFlags">268</int>
+											<string key="NSFrame">{{17, 24}, {126, 52}}</string>
+											<reference key="NSSuperview" ref="4931296"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="755753305"/>
+											<string key="NSReuseIdentifierKey">_NS:9</string>
+											<bool key="NSEnabled">YES</bool>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											<int key="NSNumRows">2</int>
+											<int key="NSNumCols">1</int>
+											<array class="NSMutableArray" key="NSCells">
+												<object class="NSFormCell" id="396747105">
+													<int key="NSCellFlags">342884417</int>
+													<int key="NSCellFlags2">-1941961728</int>
+													<string key="NSContents"/>
+													<reference key="NSSupport" ref="917501388"/>
+													<object class="NSNumberFormatter" key="NSFormatter" id="885458706">
+														<dictionary class="NSMutableDictionary" key="NS.attributes">
+															<boolean value="YES" key="allowsFloats"/>
+															<integer value="1040" key="formatterBehavior"/>
+															<object class="NSLocale" key="locale" id="844456800">
+																<string key="NS.identifier"/>
+															</object>
+															<integer value="0" key="minimum"/>
+															<string key="negativeInfinitySymbol">-∞</string>
+															<string key="nilSymbol"/>
+															<string key="positiveInfinitySymbol">+∞</string>
+														</dictionary>
+														<string key="NS.positiveformat">#</string>
+														<string key="NS.negativeformat">#</string>
+														<nil key="NS.positiveattrs"/>
+														<nil key="NS.negativeattrs"/>
+														<nil key="NS.zero"/>
+														<object class="NSAttributedString" key="NS.nil">
+															<string key="NSString"/>
+														</object>
+														<object class="NSAttributedString" key="NS.nan">
+															<string key="NSString">NaN</string>
+															<dictionary key="NSAttributes" id="111994185"/>
+														</object>
+														<integer value="0" key="NS.min"/>
+														<object class="NSDecimalNumberPlaceholder" key="NS.max" id="663873840">
+															<int key="NS.exponent">0</int>
+															<int key="NS.length">0</int>
+															<bool key="NS.negative">YES</bool>
+															<bool key="NS.compact">NO</bool>
+															<int key="NS.mantissa.bo">1</int>
+															<bytes key="NS.mantissa">AAAAAAAAAAAAAAAAAAAAAA</bytes>
+														</object>
+														<object class="NSDecimalNumberHandler" key="NS.rounding">
+															<int key="NS.roundingmode">3</int>
+															<bool key="NS.raise.overflow">YES</bool>
+															<bool key="NS.raise.underflow">YES</bool>
+															<bool key="NS.raise.dividebyzero">YES</bool>
+														</object>
+														<string key="NS.decimal">.</string>
+														<string key="NS.thousand">,</string>
+														<bool key="NS.hasthousands">NO</bool>
+														<bool key="NS.localized">NO</bool>
+														<bool key="NS.allowsfloats">YES</bool>
+													</object>
+													<reference key="NSControlView" ref="684085592"/>
+													<double key="NSTitleWidth">49.703125</double>
+													<object class="NSCell" key="NSTitleCell">
+														<int key="NSCellFlags">67108864</int>
+														<int key="NSCellFlags2">67108864</int>
+														<string key="NSContents">Width:</string>
+														<reference key="NSSupport" ref="917501388"/>
+														<reference key="NSControlView" ref="684085592"/>
+													</object>
+												</object>
+												<object class="NSFormCell" id="599157939">
+													<int key="NSCellFlags">342884417</int>
+													<int key="NSCellFlags2">-1941961728</int>
+													<string key="NSContents"/>
+													<reference key="NSSupport" ref="917501388"/>
+													<object class="NSNumberFormatter" key="NSFormatter" id="767949309">
+														<dictionary class="NSMutableDictionary" key="NS.attributes">
+															<boolean value="YES" key="allowsFloats"/>
+															<integer value="1040" key="formatterBehavior"/>
+															<reference key="locale" ref="844456800"/>
+															<integer value="0" key="minimum"/>
+															<string key="negativeInfinitySymbol">-∞</string>
+															<string key="nilSymbol"/>
+															<integer value="0" key="numberStyle"/>
+															<string key="positiveInfinitySymbol">+∞</string>
+														</dictionary>
+														<string key="NS.positiveformat">#</string>
+														<string key="NS.negativeformat">#</string>
+														<nil key="NS.positiveattrs"/>
+														<nil key="NS.negativeattrs"/>
+														<nil key="NS.zero"/>
+														<object class="NSAttributedString" key="NS.nil">
+															<string key="NSString"/>
+														</object>
+														<object class="NSAttributedString" key="NS.nan">
+															<string key="NSString">NaN</string>
+															<reference key="NSAttributes" ref="111994185"/>
+														</object>
+														<integer value="0" key="NS.min"/>
+														<reference key="NS.max" ref="663873840"/>
+														<object class="NSDecimalNumberHandler" key="NS.rounding">
+															<int key="NS.roundingmode">3</int>
+															<bool key="NS.raise.overflow">YES</bool>
+															<bool key="NS.raise.underflow">YES</bool>
+															<bool key="NS.raise.dividebyzero">YES</bool>
+														</object>
+														<string key="NS.decimal">.</string>
+														<string key="NS.thousand">,</string>
+														<bool key="NS.hasthousands">NO</bool>
+														<bool key="NS.localized">NO</bool>
+														<bool key="NS.allowsfloats">YES</bool>
+													</object>
+													<reference key="NSControlView" ref="684085592"/>
+													<int key="NSTag">1</int>
+													<double key="NSTitleWidth">49.703125</double>
+													<object class="NSCell" key="NSTitleCell">
+														<int key="NSCellFlags">67108864</int>
+														<int key="NSCellFlags2">67108864</int>
+														<string key="NSContents">Height:</string>
+														<reference key="NSSupport" ref="917501388"/>
+														<reference key="NSControlView" ref="684085592"/>
+													</object>
+												</object>
+											</array>
+											<string key="NSCellSize">{126, 22}</string>
+											<string key="NSIntercellSpacing">{1, 8}</string>
+											<int key="NSMatrixFlags">76021760</int>
+											<string key="NSCellClass">NSActionCell</string>
+											<object class="NSFormCell" key="NSProtoCell" id="114194526">
+												<int key="NSCellFlags">342884416</int>
+												<int key="NSCellFlags2">205521920</int>
+												<string key="NSContents"/>
+												<reference key="NSSupport" ref="917501388"/>
+												<double key="NSTitleWidth">49.703125</double>
+												<object class="NSCell" key="NSTitleCell">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">67108864</int>
+													<string key="NSContents">Field:</string>
+													<reference key="NSSupport" ref="917501388"/>
+												</object>
+											</object>
+											<int key="NSSelectedRow">-1</int>
+											<int key="NSSelectedCol">-1</int>
+											<reference key="NSBackgroundColor" ref="747736659"/>
+											<object class="NSColor" key="NSCellBackgroundColor" id="471669827">
+												<int key="NSColorSpace">3</int>
+												<bytes key="NSWhite">MQA</bytes>
+											</object>
+											<reference key="NSFont" ref="917501388"/>
+										</object>
+									</array>
+									<string key="NSFrame">{{2, 2}, {573, 134}}</string>
+									<reference key="NSSuperview" ref="93048329"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="1001794195"/>
+								</object>
+							</array>
+							<string key="NSFrame">{{17, 383}, {577, 151}}</string>
+							<reference key="NSSuperview" ref="675926718"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="4931296"/>
+							<string key="NSOffsets">{0, 0}</string>
+							<object class="NSTextFieldCell" key="NSTitleCell">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">0</int>
+								<string key="NSContents">Display Settings</string>
+								<object class="NSFont" key="NSSupport" id="26">
+									<string key="NSName">LucidaGrande</string>
+									<double key="NSSize">11</double>
+									<int key="NSfFlags">3100</int>
+								</object>
+								<object class="NSColor" key="NSBackgroundColor" id="394867751">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">textBackgroundColor</string>
+									<reference key="NSColor" ref="471669827"/>
+								</object>
+								<object class="NSColor" key="NSTextColor">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
+								</object>
+							</object>
+							<reference key="NSContentView" ref="4931296"/>
+							<int key="NSBorderType">3</int>
+							<int key="NSBoxType">0</int>
+							<int key="NSTitlePosition">2</int>
+							<bool key="NSTransparent">NO</bool>
+						</object>
+						<object class="NSBox" id="809921113">
+							<reference key="NSNextResponder" ref="675926718"/>
+							<int key="NSvFlags">256</int>
+							<array class="NSMutableArray" key="NSSubviews">
+								<object class="NSView" id="154181273">
+									<reference key="NSNextResponder" ref="809921113"/>
+									<int key="NSvFlags">274</int>
+									<array class="NSMutableArray" key="NSSubviews">
+										<object class="NSTextField" id="528429323">
+											<reference key="NSNextResponder" ref="154181273"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrame">{{14, 260}, {121, 17}}</string>
+											<reference key="NSSuperview" ref="154181273"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="811906754"/>
+											<string key="NSAntiCompressionPriority">{250, 750}</string>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTextFieldCell" key="NSCell" id="965214932">
+												<int key="NSCellFlags">67108864</int>
+												<int key="NSCellFlags2">4194304</int>
+												<string key="NSContents">Dither Graphics:</string>
+												<reference key="NSSupport" ref="917501388"/>
+												<reference key="NSControlView" ref="528429323"/>
+												<reference key="NSBackgroundColor" ref="747736659"/>
+												<reference key="NSTextColor" ref="165518464"/>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSPopUpButton" id="811906754">
+											<reference key="NSNextResponder" ref="154181273"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrame">{{138, 254}, {174, 26}}</string>
+											<reference key="NSSuperview" ref="154181273"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="258095043"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSPopUpButtonCell" key="NSCell" id="255572913">
+												<int key="NSCellFlags">-2076180416</int>
+												<int key="NSCellFlags2">1024</int>
+												<reference key="NSSupport" ref="917501388"/>
+												<reference key="NSControlView" ref="811906754"/>
+												<int key="NSButtonFlags">109199360</int>
+												<int key="NSButtonFlags2">1</int>
+												<reference key="NSAlternateImage" ref="838376703"/>
+												<object class="NSMutableString" key="NSAlternateContents">
+													<characters key="NS.bytes"/>
+												</object>
+												<object class="NSMutableString" key="NSKeyEquivalent">
+													<characters key="NS.bytes"/>
+												</object>
+												<int key="NSPeriodicDelay">400</int>
+												<int key="NSPeriodicInterval">75</int>
+												<object class="NSMenuItem" key="NSMenuItem" id="344994821">
+													<reference key="NSMenu" ref="731759952"/>
+													<string key="NSTitle">When Hinted</string>
+													<string key="NSKeyEquiv"/>
+													<int key="NSKeyEquivModMask">1048576</int>
+													<int key="NSMnemonicLoc">2147483647</int>
+													<int key="NSState">1</int>
+													<reference key="NSOnImage" ref="589532376"/>
+													<reference key="NSMixedImage" ref="700034629"/>
+													<string key="NSAction">_popUpItemAction:</string>
+													<reference key="NSTarget" ref="255572913"/>
+												</object>
+												<bool key="NSMenuItemRespectAlignment">YES</bool>
+												<object class="NSMenu" key="NSMenu" id="731759952">
+													<object class="NSMutableString" key="NSTitle">
+														<characters key="NS.bytes">OtherViews</characters>
+													</object>
+													<array class="NSMutableArray" key="NSMenuItems">
+														<object class="NSMenuItem" id="456783183">
+															<reference key="NSMenu" ref="731759952"/>
+															<string key="NSTitle">Never</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSKeyEquivModMask">1048576</int>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="589532376"/>
+															<reference key="NSMixedImage" ref="700034629"/>
+															<string key="NSAction">_popUpItemAction:</string>
+															<reference key="NSTarget" ref="255572913"/>
+														</object>
+														<reference ref="344994821"/>
+														<object class="NSMenuItem" id="170738631">
+															<reference key="NSMenu" ref="731759952"/>
+															<string key="NSTitle">Always</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSKeyEquivModMask">1048576</int>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="589532376"/>
+															<reference key="NSMixedImage" ref="700034629"/>
+															<string key="NSAction">_popUpItemAction:</string>
+															<reference key="NSTarget" ref="255572913"/>
+														</object>
+													</array>
+												</object>
+												<int key="NSSelectedIndex">1</int>
+												<int key="NSPreferredEdge">3</int>
+												<bool key="NSUsesItemFromMenu">YES</bool>
+												<bool key="NSAltersState">YES</bool>
+												<int key="NSArrowPosition">1</int>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSPopUpButton" id="1019936731">
+											<reference key="NSNextResponder" ref="154181273"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrame">{{138, 227}, {174, 22}}</string>
+											<reference key="NSSuperview" ref="154181273"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="582698674"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSPopUpButtonCell" key="NSCell" id="505058769">
+												<int key="NSCellFlags">-2076180416</int>
+												<int key="NSCellFlags2">2048</int>
+												<reference key="NSSupport" ref="917501388"/>
+												<reference key="NSControlView" ref="1019936731"/>
+												<int key="NSButtonFlags">109199360</int>
+												<int key="NSButtonFlags2">1</int>
+												<reference key="NSAlternateImage" ref="838376703"/>
+												<string key="NSAlternateContents"/>
+												<object class="NSMutableString" key="NSKeyEquivalent">
+													<characters key="NS.bytes"/>
+												</object>
+												<int key="NSPeriodicDelay">400</int>
+												<int key="NSPeriodicInterval">75</int>
+												<object class="NSMenuItem" key="NSMenuItem" id="588916550">
+													<reference key="NSMenu" ref="931509582"/>
+													<string key="NSTitle">Default</string>
+													<string key="NSKeyEquiv"/>
+													<int key="NSKeyEquivModMask">1048576</int>
+													<int key="NSMnemonicLoc">2147483647</int>
+													<int key="NSState">1</int>
+													<reference key="NSOnImage" ref="589532376"/>
+													<reference key="NSMixedImage" ref="700034629"/>
+													<string key="NSAction">_popUpItemAction:</string>
+													<reference key="NSTarget" ref="505058769"/>
+												</object>
+												<bool key="NSMenuItemRespectAlignment">YES</bool>
+												<object class="NSMenu" key="NSMenu" id="931509582">
+													<object class="NSMutableString" key="NSTitle">
+														<characters key="NS.bytes">OtherViews</characters>
+													</object>
+													<array class="NSMutableArray" key="NSMenuItems">
+														<object class="NSMenuItem" id="239192959">
+															<reference key="NSMenu" ref="931509582"/>
+															<string key="NSTitle">None</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSKeyEquivModMask">1048576</int>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="589532376"/>
+															<reference key="NSMixedImage" ref="700034629"/>
+															<string key="NSAction">_popUpItemAction:</string>
+															<reference key="NSTarget" ref="505058769"/>
+														</object>
+														<object class="NSMenuItem" id="88774635">
+															<reference key="NSMenu" ref="931509582"/>
+															<string key="NSTitle">Some</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSKeyEquivModMask">1048576</int>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="589532376"/>
+															<reference key="NSMixedImage" ref="700034629"/>
+															<string key="NSAction">_popUpItemAction:</string>
+															<reference key="NSTarget" ref="505058769"/>
+														</object>
+														<reference ref="588916550"/>
+														<object class="NSMenuItem" id="1004057130">
+															<reference key="NSMenu" ref="931509582"/>
+															<string key="NSTitle">More</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSKeyEquivModMask">1048576</int>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="589532376"/>
+															<reference key="NSMixedImage" ref="700034629"/>
+															<string key="NSAction">_popUpItemAction:</string>
+															<reference key="NSTarget" ref="505058769"/>
+														</object>
+														<object class="NSMenuItem" id="1009937097">
+															<reference key="NSMenu" ref="931509582"/>
+															<string key="NSTitle">Aggressive</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSKeyEquivModMask">1048576</int>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="589532376"/>
+															<reference key="NSMixedImage" ref="700034629"/>
+															<string key="NSAction">_popUpItemAction:</string>
+															<reference key="NSTarget" ref="505058769"/>
+														</object>
+													</array>
+												</object>
+												<int key="NSSelectedIndex">2</int>
+												<int key="NSPreferredEdge">3</int>
+												<bool key="NSUsesItemFromMenu">YES</bool>
+												<bool key="NSAltersState">YES</bool>
+												<int key="NSArrowPosition">1</int>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSTextField" id="22212234">
+											<reference key="NSNextResponder" ref="154181273"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrame">{{14, 231}, {121, 21}}</string>
+											<reference key="NSSuperview" ref="154181273"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="1019936731"/>
+											<string key="NSAntiCompressionPriority">{250, 750}</string>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTextFieldCell" key="NSCell" id="230144169">
+												<int key="NSCellFlags">67108864</int>
+												<int key="NSCellFlags2">272629760</int>
+												<string key="NSContents">Offscreen Drawing</string>
+												<reference key="NSSupport" ref="917501388"/>
+												<reference key="NSControlView" ref="22212234"/>
+												<reference key="NSBackgroundColor" ref="747736659"/>
+												<reference key="NSTextColor" ref="165518464"/>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSBox" id="870362045">
+											<reference key="NSNextResponder" ref="154181273"/>
+											<int key="NSvFlags">256</int>
+											<array class="NSMutableArray" key="NSSubviews">
+												<object class="NSView" id="700769802">
+													<reference key="NSNextResponder" ref="870362045"/>
+													<int key="NSvFlags">274</int>
+													<array class="NSMutableArray" key="NSSubviews">
+														<object class="NSPopUpButton" id="966350560">
+															<reference key="NSNextResponder" ref="700769802"/>
+															<int key="NSvFlags">256</int>
+															<string key="NSFrame">{{145, 77}, {188, 26}}</string>
+															<reference key="NSSuperview" ref="700769802"/>
+															<reference key="NSWindow"/>
+															<reference key="NSNextKeyView" ref="263002935"/>
+															<bool key="NSEnabled">YES</bool>
+															<object class="NSPopUpButtonCell" key="NSCell" id="414807946">
+																<int key="NSCellFlags">-2076180416</int>
+																<int key="NSCellFlags2">2048</int>
+																<reference key="NSSupport" ref="917501388"/>
+																<reference key="NSControlView" ref="966350560"/>
+																<int key="NSButtonFlags">109199360</int>
+																<int key="NSButtonFlags2">1</int>
+																<reference key="NSAlternateImage" ref="838376703"/>
+																<string key="NSAlternateContents"/>
+																<object class="NSMutableString" key="NSKeyEquivalent">
+																	<characters key="NS.bytes"/>
+																</object>
+																<int key="NSPeriodicDelay">400</int>
+																<int key="NSPeriodicInterval">75</int>
+																<object class="NSMenuItem" key="NSMenuItem" id="58794692">
+																	<reference key="NSMenu" ref="107932296"/>
+																	<string key="NSTitle">default</string>
+																	<string key="NSKeyEquiv"/>
+																	<int key="NSKeyEquivModMask">1048576</int>
+																	<int key="NSMnemonicLoc">2147483647</int>
+																	<int key="NSState">1</int>
+																	<reference key="NSOnImage" ref="589532376"/>
+																	<reference key="NSMixedImage" ref="700034629"/>
+																	<string key="NSAction">_popUpItemAction:</string>
+																	<reference key="NSTarget" ref="414807946"/>
+																</object>
+																<bool key="NSMenuItemRespectAlignment">YES</bool>
+																<object class="NSMenu" key="NSMenu" id="107932296">
+																	<object class="NSMutableString" key="NSTitle">
+																		<characters key="NS.bytes">OtherViews</characters>
+																	</object>
+																	<array class="NSMutableArray" key="NSMenuItems">
+																		<reference ref="58794692"/>
+																		<object class="NSMenuItem" id="601605275">
+																			<reference key="NSMenu" ref="107932296"/>
+																			<string key="NSTitle">RGBA 16</string>
+																			<string key="NSKeyEquiv"/>
+																			<int key="NSKeyEquivModMask">1048576</int>
+																			<int key="NSMnemonicLoc">2147483647</int>
+																			<reference key="NSOnImage" ref="589532376"/>
+																			<reference key="NSMixedImage" ref="700034629"/>
+																			<string key="NSAction">_popUpItemAction:</string>
+																			<reference key="NSTarget" ref="414807946"/>
+																		</object>
+																		<object class="NSMenuItem" id="523728554">
+																			<reference key="NSMenu" ref="107932296"/>
+																			<string key="NSTitle">R5 G5 B5 A1</string>
+																			<string key="NSKeyEquiv"/>
+																			<int key="NSKeyEquivModMask">1048576</int>
+																			<int key="NSMnemonicLoc">2147483647</int>
+																			<reference key="NSOnImage" ref="589532376"/>
+																			<reference key="NSMixedImage" ref="700034629"/>
+																			<string key="NSAction">_popUpItemAction:</string>
+																			<reference key="NSTarget" ref="414807946"/>
+																		</object>
+																		<object class="NSMenuItem" id="798650856">
+																			<reference key="NSMenu" ref="107932296"/>
+																			<string key="NSTitle">RGBA 32</string>
+																			<string key="NSKeyEquiv"/>
+																			<int key="NSKeyEquivModMask">1048576</int>
+																			<int key="NSMnemonicLoc">2147483647</int>
+																			<reference key="NSOnImage" ref="589532376"/>
+																			<reference key="NSMixedImage" ref="700034629"/>
+																			<string key="NSAction">_popUpItemAction:</string>
+																			<reference key="NSTarget" ref="414807946"/>
+																		</object>
+																		<object class="NSMenuItem" id="498777223">
+																			<reference key="NSMenu" ref="107932296"/>
+																			<string key="NSTitle">BGRA 32</string>
+																			<string key="NSKeyEquiv"/>
+																			<int key="NSKeyEquivModMask">1048576</int>
+																			<int key="NSMnemonicLoc">2147483647</int>
+																			<reference key="NSOnImage" ref="589532376"/>
+																			<reference key="NSMixedImage" ref="700034629"/>
+																			<string key="NSAction">_popUpItemAction:</string>
+																			<reference key="NSTarget" ref="414807946"/>
+																		</object>
+																	</array>
+																</object>
+																<int key="NSSelectedIndex">-1</int>
+																<int key="NSPreferredEdge">3</int>
+																<bool key="NSUsesItemFromMenu">YES</bool>
+																<bool key="NSAltersState">YES</bool>
+																<int key="NSArrowPosition">1</int>
+															</object>
+															<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+														</object>
+														<object class="NSTextField" id="263002935">
+															<reference key="NSNextResponder" ref="700769802"/>
+															<int key="NSvFlags">256</int>
+															<string key="NSFrame">{{13, 51}, {114, 17}}</string>
+															<reference key="NSSuperview" ref="700769802"/>
+															<reference key="NSWindow"/>
+															<reference key="NSNextKeyView" ref="542707641"/>
+															<string key="NSAntiCompressionPriority">{250, 750}</string>
+															<bool key="NSEnabled">YES</bool>
+															<object class="NSTextFieldCell" key="NSCell" id="388326571">
+																<int key="NSCellFlags">67108864</int>
+																<int key="NSCellFlags2">272629760</int>
+																<string key="NSContents">Enhancement</string>
+																<reference key="NSSupport" ref="917501388"/>
+																<reference key="NSControlView" ref="263002935"/>
+																<reference key="NSBackgroundColor" ref="747736659"/>
+																<reference key="NSTextColor" ref="165518464"/>
+															</object>
+															<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+														</object>
+														<object class="NSTextField" id="809674697">
+															<reference key="NSNextResponder" ref="700769802"/>
+															<int key="NSvFlags">256</int>
+															<string key="NSFrame">{{14, 23}, {114, 17}}</string>
+															<reference key="NSSuperview" ref="700769802"/>
+															<reference key="NSWindow"/>
+															<reference key="NSNextKeyView" ref="417181210"/>
+															<string key="NSAntiCompressionPriority">{250, 750}</string>
+															<bool key="NSEnabled">YES</bool>
+															<object class="NSTextFieldCell" key="NSCell" id="1067959541">
+																<int key="NSCellFlags">67108864</int>
+																<int key="NSCellFlags2">272629760</int>
+																<string key="NSContents">Filtering</string>
+																<reference key="NSSupport" ref="917501388"/>
+																<reference key="NSControlView" ref="809674697"/>
+																<reference key="NSBackgroundColor" ref="747736659"/>
+																<reference key="NSTextColor" ref="165518464"/>
+															</object>
+															<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+														</object>
+														<object class="NSTextField" id="868714805">
+															<reference key="NSNextResponder" ref="700769802"/>
+															<int key="NSvFlags">256</int>
+															<string key="NSFrame">{{14, 83}, {114, 17}}</string>
+															<reference key="NSSuperview" ref="700769802"/>
+															<reference key="NSWindow"/>
+															<reference key="NSNextKeyView" ref="966350560"/>
+															<string key="NSAntiCompressionPriority">{250, 750}</string>
+															<bool key="NSEnabled">YES</bool>
+															<object class="NSTextFieldCell" key="NSCell" id="115632950">
+																<int key="NSCellFlags">67108864</int>
+																<int key="NSCellFlags2">272629760</int>
+																<string key="NSContents">Color Depth</string>
+																<reference key="NSSupport" ref="917501388"/>
+																<reference key="NSControlView" ref="868714805"/>
+																<reference key="NSBackgroundColor" ref="747736659"/>
+																<reference key="NSTextColor" ref="165518464"/>
+															</object>
+															<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+														</object>
+														<object class="NSSlider" id="417181210">
+															<reference key="NSNextResponder" ref="700769802"/>
+															<int key="NSvFlags">256</int>
+															<string key="NSFrame">{{145, 17}, {187, 26}}</string>
+															<reference key="NSSuperview" ref="700769802"/>
+															<reference key="NSWindow"/>
+															<reference key="NSNextKeyView" ref="322419177"/>
+															<bool key="NSEnabled">YES</bool>
+															<object class="NSSliderCell" key="NSCell" id="1070282742">
+																<int key="NSCellFlags">67108864</int>
+																<int key="NSCellFlags2">0</int>
+																<object class="NSMutableString" key="NSContents">
+																	<characters key="NS.bytes"/>
+																</object>
+																<object class="NSFont" key="NSSupport" id="264360198">
+																	<string key="NSName">Helvetica</string>
+																	<double key="NSSize">12</double>
+																	<int key="NSfFlags">16</int>
+																</object>
+																<reference key="NSControlView" ref="417181210"/>
+																<double key="NSMaxValue">6</double>
+																<double key="NSMinValue">0.0</double>
+																<double key="NSValue">0.0</double>
+																<double key="NSAltIncValue">0.0</double>
+																<int key="NSNumberOfTickMarks">7</int>
+																<int key="NSTickMarkPosition">1</int>
+																<bool key="NSAllowsTickMarkValuesOnly">YES</bool>
+																<bool key="NSVertical">NO</bool>
+															</object>
+															<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+														</object>
+														<object class="NSSlider" id="542707641">
+															<reference key="NSNextResponder" ref="700769802"/>
+															<int key="NSvFlags">256</int>
+															<string key="NSFrame">{{145, 49}, {187, 26}}</string>
+															<reference key="NSSuperview" ref="700769802"/>
+															<reference key="NSWindow"/>
+															<reference key="NSNextKeyView" ref="809674697"/>
+															<bool key="NSEnabled">YES</bool>
+															<object class="NSSliderCell" key="NSCell" id="860867881">
+																<int key="NSCellFlags">67108864</int>
+																<int key="NSCellFlags2">0</int>
+																<object class="NSMutableString" key="NSContents">
+																	<characters key="NS.bytes"/>
+																</object>
+																<reference key="NSSupport" ref="264360198"/>
+																<reference key="NSControlView" ref="542707641"/>
+																<double key="NSMaxValue">2</double>
+																<double key="NSMinValue">0.0</double>
+																<double key="NSValue">0.0</double>
+																<double key="NSAltIncValue">0.0</double>
+																<int key="NSNumberOfTickMarks">3</int>
+																<int key="NSTickMarkPosition">1</int>
+																<bool key="NSAllowsTickMarkValuesOnly">YES</bool>
+																<bool key="NSVertical">NO</bool>
+															</object>
+															<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+														</object>
+													</array>
+													<string key="NSFrame">{{2, 2}, {347, 111}}</string>
+													<reference key="NSSuperview" ref="870362045"/>
+													<reference key="NSWindow"/>
+													<reference key="NSNextKeyView" ref="868714805"/>
+												</object>
+											</array>
+											<string key="NSFrame">{{14, 95}, {351, 128}}</string>
+											<reference key="NSSuperview" ref="154181273"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="700769802"/>
+											<string key="NSOffsets">{0, 0}</string>
+											<object class="NSTextFieldCell" key="NSTitleCell">
+												<int key="NSCellFlags">67108864</int>
+												<int key="NSCellFlags2">0</int>
+												<string key="NSContents">Textures</string>
+												<object class="NSFont" key="NSSupport">
+													<string key="NSName">LucidaGrande</string>
+													<double key="NSSize">11</double>
+													<int key="NSfFlags">16</int>
+												</object>
+												<reference key="NSBackgroundColor" ref="394867751"/>
+												<object class="NSColor" key="NSTextColor">
+													<int key="NSColorSpace">3</int>
+													<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
+												</object>
+											</object>
+											<reference key="NSContentView" ref="700769802"/>
+											<int key="NSBorderType">3</int>
+											<int key="NSBoxType">0</int>
+											<int key="NSTitlePosition">2</int>
+											<bool key="NSTransparent">NO</bool>
+										</object>
+										<object class="NSPopUpButton" id="582698674">
+											<reference key="NSNextResponder" ref="154181273"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrame">{{414, 225}, {130, 26}}</string>
+											<reference key="NSSuperview" ref="154181273"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="870362045"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSPopUpButtonCell" key="NSCell" id="307340522">
+												<int key="NSCellFlags">-2076180416</int>
+												<int key="NSCellFlags2">2048</int>
+												<reference key="NSSupport" ref="917501388"/>
+												<reference key="NSControlView" ref="582698674"/>
+												<int key="NSButtonFlags">109199360</int>
+												<int key="NSButtonFlags2">1</int>
+												<reference key="NSAlternateImage" ref="838376703"/>
+												<string key="NSAlternateContents"/>
+												<object class="NSMutableString" key="NSKeyEquivalent">
+													<characters key="NS.bytes"/>
+												</object>
+												<int key="NSPeriodicDelay">400</int>
+												<int key="NSPeriodicInterval">75</int>
+												<object class="NSMenuItem" key="NSMenuItem" id="240714803">
+													<reference key="NSMenu" ref="2523129"/>
+													<string key="NSTitle">Item1</string>
+													<string key="NSKeyEquiv"/>
+													<int key="NSKeyEquivModMask">1048576</int>
+													<int key="NSMnemonicLoc">2147483647</int>
+													<int key="NSState">1</int>
+													<reference key="NSOnImage" ref="589532376"/>
+													<reference key="NSMixedImage" ref="700034629"/>
+													<string key="NSAction">_popUpItemAction:</string>
+													<reference key="NSTarget" ref="307340522"/>
+												</object>
+												<bool key="NSMenuItemRespectAlignment">YES</bool>
+												<object class="NSMenu" key="NSMenu" id="2523129">
+													<object class="NSMutableString" key="NSTitle">
+														<characters key="NS.bytes">OtherViews</characters>
+													</object>
+													<array class="NSMutableArray" key="NSMenuItems">
+														<reference ref="240714803"/>
+														<object class="NSMenuItem" id="425250505">
+															<reference key="NSMenu" ref="2523129"/>
+															<string key="NSTitle">Item2</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSKeyEquivModMask">1048576</int>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="589532376"/>
+															<reference key="NSMixedImage" ref="700034629"/>
+															<string key="NSAction">_popUpItemAction:</string>
+															<reference key="NSTarget" ref="307340522"/>
+														</object>
+														<object class="NSMenuItem" id="24331712">
+															<reference key="NSMenu" ref="2523129"/>
+															<string key="NSTitle">Item3</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSKeyEquivModMask">1048576</int>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="589532376"/>
+															<reference key="NSMixedImage" ref="700034629"/>
+															<string key="NSAction">_popUpItemAction:</string>
+															<reference key="NSTarget" ref="307340522"/>
+														</object>
+													</array>
+												</object>
+												<int key="NSPreferredEdge">3</int>
+												<bool key="NSUsesItemFromMenu">YES</bool>
+												<bool key="NSAltersState">YES</bool>
+												<int key="NSArrowPosition">1</int>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSTextField" id="258095043">
+											<reference key="NSNextResponder" ref="154181273"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrame">{{398, 260}, {161, 17}}</string>
+											<reference key="NSSuperview" ref="154181273"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="22212234"/>
+											<string key="NSAntiCompressionPriority">{250, 750}</string>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTextFieldCell" key="NSCell" id="479187425">
+												<int key="NSCellFlags">67108864</int>
+												<int key="NSCellFlags2">138412032</int>
+												<string key="NSContents">Frame Buffer Effects</string>
+												<reference key="NSSupport" ref="917501388"/>
+												<reference key="NSControlView" ref="258095043"/>
+												<reference key="NSBackgroundColor" ref="747736659"/>
+												<reference key="NSTextColor" ref="165518464"/>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSColorWell" id="322419177">
+											<reference key="NSNextResponder" ref="154181273"/>
+											<int key="NSvFlags">256</int>
+											<set class="NSMutableSet" key="NSDragTypes">
+												<object class="NSMutableString">
+													<characters key="NS.bytes">NSColor pasteboard type</characters>
+												</object>
+											</set>
+											<string key="NSFrame">{{370, 186}, {23, 22}}</string>
+											<reference key="NSSuperview" ref="154181273"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="144180805"/>
+											<bool key="NSEnabled">YES</bool>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											<bool key="NSIsBordered">YES</bool>
+											<object class="NSColor" key="NSColor">
+												<int key="NSColorSpace">1</int>
+												<bytes key="NSRGB">MCAwIDAgMC4yMzk5OTk5OTQ2AA</bytes>
+											</object>
+										</object>
+										<object class="NSMatrix" id="144180805">
+											<reference key="NSNextResponder" ref="154181273"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrame">{{401, 18}, {155, 190}}</string>
+											<reference key="NSSuperview" ref="154181273"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="638464855"/>
+											<bool key="NSEnabled">YES</bool>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											<int key="NSNumRows">9</int>
+											<int key="NSNumCols">1</int>
+											<array class="NSMutableArray" key="NSCells">
+												<object class="NSButtonCell" id="250761880">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">131072</int>
+													<string key="NSContents">Draw scan lines</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="144180805"/>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="283478431"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="247908544">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">131072</int>
+													<string key="NSContents">Use Advanced Blending</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="144180805"/>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="283478431"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="902764097">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">131072</int>
+													<string key="NSContents">Perform Opaque Pass</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="144180805"/>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="283478431"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="526689999">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">131072</int>
+													<string key="NSContents">Use Clipping Z-Masks</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="144180805"/>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="283478431"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="538548992">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">131072</int>
+													<string key="NSContents">Draw Wireframes Only</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="144180805"/>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="283478431"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="816460454">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">131072</int>
+													<string key="NSContents">Add Blur</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="144180805"/>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="283478431"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="97827596">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">131072</int>
+													<string key="NSContents">Motion JPEG decoder</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="144180805"/>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="283478431"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="824050672">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">131072</int>
+													<string key="NSContents">15bit Motion JPEGs</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="144180805"/>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="283478431"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="60795979">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">131072</int>
+													<string key="NSContents">GTE Accuracy</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="144180805"/>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="283478431"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</array>
+											<string key="NSCellSize">{155, 14}</string>
+											<string key="NSIntercellSpacing">{0, 3}</string>
+											<int key="NSMatrixFlags">-2080366592</int>
+											<nil key="NSCellClass"/>
+											<object class="NSButtonCell" key="NSProtoCell" id="926431522">
+												<int key="NSCellFlags">67108864</int>
+												<int key="NSCellFlags2">131072</int>
+												<string key="NSContents">Draw scan lines</string>
+												<reference key="NSSupport" ref="26"/>
+												<int key="NSButtonFlags">1211912448</int>
+												<int key="NSButtonFlags2">2</int>
+												<reference key="NSAlternateImage" ref="283478431"/>
+												<string key="NSAlternateContents"/>
+												<int key="NSPeriodicDelay">200</int>
+												<int key="NSPeriodicInterval">25</int>
+											</object>
+											<int key="NSSelectedRow">-1</int>
+											<int key="NSSelectedCol">-1</int>
+											<reference key="NSBackgroundColor" ref="747736659"/>
+											<reference key="NSCellBackgroundColor" ref="747736659"/>
+										</object>
+									</array>
+									<string key="NSFrame">{{2, 2}, {573, 288}}</string>
+									<reference key="NSSuperview" ref="809921113"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="528429323"/>
+								</object>
+							</array>
+							<string key="NSFrame">{{17, 74}, {577, 305}}</string>
+							<reference key="NSSuperview" ref="675926718"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="154181273"/>
+							<string key="NSOffsets">{0, 0}</string>
+							<object class="NSTextFieldCell" key="NSTitleCell">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">0</int>
+								<string key="NSContents">Rendering</string>
+								<reference key="NSSupport" ref="26"/>
+								<reference key="NSBackgroundColor" ref="394867751"/>
+								<object class="NSColor" key="NSTextColor">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
+								</object>
+							</object>
+							<reference key="NSContentView" ref="154181273"/>
+							<int key="NSBorderType">3</int>
+							<int key="NSBoxType">0</int>
+							<int key="NSTitlePosition">2</int>
+							<bool key="NSTransparent">NO</bool>
+						</object>
+						<object class="NSButton" id="638464855">
+							<reference key="NSNextResponder" ref="675926718"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{14, 13}, {75, 32}}</string>
+							<reference key="NSSuperview" ref="675926718"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="394234374"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="792297439">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Reset</string>
+								<reference key="NSSupport" ref="917501388"/>
+								<string key="NSCellIdentifier">_NS:9</string>
+								<reference key="NSControlView" ref="638464855"/>
+								<int key="NSButtonFlags">-2038284288</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSButton" id="612723633">
+							<reference key="NSNextResponder" ref="675926718"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{538, 13}, {59, 32}}</string>
+							<reference key="NSSuperview" ref="675926718"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="331279247">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">OK</string>
+								<reference key="NSSupport" ref="917501388"/>
+								<string key="NSCellIdentifier">_NS:9</string>
+								<reference key="NSControlView" ref="612723633"/>
+								<int key="NSButtonFlags">-2038284288</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSButton" id="394234374">
+							<reference key="NSNextResponder" ref="675926718"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{456, 13}, {82, 32}}</string>
+							<reference key="NSSuperview" ref="675926718"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="612723633"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="728025352">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Cancel</string>
+								<reference key="NSSupport" ref="917501388"/>
+								<string key="NSCellIdentifier">_NS:9</string>
+								<reference key="NSControlView" ref="394234374"/>
+								<int key="NSButtonFlags">-2038284288</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string type="base64-UTF8" key="NSKeyEquivalent">Gw</string>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+					</array>
+					<string key="NSFrameSize">{611, 554}</string>
+					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
+					<reference key="NSNextKeyView" ref="93048329"/>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
+				<string key="NSMinSize">{283.34100000000001, 129}</string>
+				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
+				<bool key="NSWindowIsRestorable">YES</bool>
+			</object>
+			<object class="NSWindowTemplate" id="987163106">
+				<int key="NSWindowStyleMask">15</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{196, 207}, {497, 367}}</string>
+				<int key="NSWTFlags">1685586944</int>
+				<string key="NSWindowTitle">Hacks</string>
+				<string key="NSWindowClass">NSWindow</string>
+				<nil key="NSViewClass"/>
+				<nil key="NSUserInterfaceItemIdentifier"/>
+				<object class="NSView" key="NSWindowView" id="713073715">
+					<reference key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<array class="NSMutableArray" key="NSSubviews">
+						<object class="NSBox" id="671483095">
+							<reference key="NSNextResponder" ref="713073715"/>
+							<int key="NSvFlags">269</int>
+							<array class="NSMutableArray" key="NSSubviews">
+								<object class="NSView" id="138033641">
+									<reference key="NSNextResponder" ref="671483095"/>
+									<int key="NSvFlags">274</int>
+									<array class="NSMutableArray" key="NSSubviews">
+										<object class="NSMatrix" id="232960397">
+											<reference key="NSNextResponder" ref="138033641"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrame">{{17, 13}, {420, 178}}</string>
+											<reference key="NSSuperview" ref="138033641"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="599923"/>
+											<bool key="NSEnabled">YES</bool>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+											<int key="NSNumRows">9</int>
+											<int key="NSNumCols">2</int>
+											<array class="NSMutableArray" key="NSCells">
+												<object class="NSButtonCell" id="601226499">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">131072</int>
+													<string key="NSContents">Adjust framebuffer access</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="232960397"/>
+													<int key="NSTag">1</int>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="812453537"/>
+													<reference key="NSAlternateImage" ref="283478431"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="876785218">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">131072</int>
+													<string key="NSContents">G4 polygon cache</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="232960397"/>
+													<int key="NSTag">10</int>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="283478431"/>
+													<string key="NSAlternateContents"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="877662516">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">131072</int>
+													<string key="NSContents">Direct framebuffer updates</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="232960397"/>
+													<int key="NSTag">2</int>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="812453537"/>
+													<reference key="NSAlternateImage" ref="283478431"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="53473145">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">131072</int>
+													<string key="NSContents">Fake subtractive blending</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="232960397"/>
+													<int key="NSTag">11</int>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="283478431"/>
+													<string key="NSAlternateContents"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="196368836">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">131072</int>
+													<string key="NSContents">Ignore black brightness color</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="232960397"/>
+													<int key="NSTag">3</int>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="812453537"/>
+													<reference key="NSAlternateImage" ref="283478431"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="757070565">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">131072</int>
+													<string key="NSContents">Lazy upload detection</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="232960397"/>
+													<int key="NSTag">12</int>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="283478431"/>
+													<string key="NSAlternateContents"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="11594003">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">131072</int>
+													<string key="NSContents">Swap front/back detection</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="232960397"/>
+													<int key="NSTag">4</int>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="812453537"/>
+													<reference key="NSAlternateImage" ref="283478431"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="372830145">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">131072</int>
+													<string key="NSContents">Odd/even bit hack</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="232960397"/>
+													<int key="NSTag">13</int>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="283478431"/>
+													<string key="NSAlternateContents"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="467507890">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">131072</int>
+													<string key="NSContents">Disable coord check</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="232960397"/>
+													<int key="NSTag">5</int>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSNormalImage" ref="812453537"/>
+													<reference key="NSAlternateImage" ref="283478431"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="854561282">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">131072</int>
+													<string key="NSContents">Expand screen width</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="232960397"/>
+													<int key="NSTag">14</int>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="283478431"/>
+													<string key="NSAlternateContents"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="70620311">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">131072</int>
+													<string key="NSContents">Remove blue glitches</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="232960397"/>
+													<int key="NSTag">6</int>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="283478431"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="949439378">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">131072</int>
+													<string key="NSContents">Use old texture filtering</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="232960397"/>
+													<int key="NSTag">15</int>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="283478431"/>
+													<string key="NSAlternateContents"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="376960548">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">131072</int>
+													<string key="NSContents">Mixed software FB access</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="232960397"/>
+													<int key="NSTag">7</int>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="283478431"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="306324820">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">131072</int>
+													<string key="NSContents">Special upload detection</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="232960397"/>
+													<int key="NSTag">16</int>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="283478431"/>
+													<string key="NSAlternateContents"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="206217604">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">131072</int>
+													<string key="NSContents">Use PC FPS calculation</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="232960397"/>
+													<int key="NSTag">8</int>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="283478431"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="16264460">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">131072</int>
+													<string key="NSContents">Use low-res FPS timer</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="232960397"/>
+													<int key="NSTag">17</int>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="283478431"/>
+													<string key="NSAlternateContents"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="879332229">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">131072</int>
+													<string key="NSContents">Use old frame skipping</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="232960397"/>
+													<int key="NSTag">9</int>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="283478431"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+												<object class="NSButtonCell" id="806892743">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">131072</int>
+													<string key="NSContents">Fake "GPU busy" states</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="232960397"/>
+													<int key="NSTag">18</int>
+													<int key="NSButtonFlags">1211912448</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="283478431"/>
+													<string key="NSAlternateContents"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</array>
+											<string key="NSCellSize">{210, 18}</string>
+											<string key="NSIntercellSpacing">{0, 2}</string>
+											<int key="NSMatrixFlags">-2080366592</int>
+											<nil key="NSCellClass"/>
+											<object class="NSButtonCell" key="NSProtoCell" id="16290440">
+												<int key="NSCellFlags">67108864</int>
+												<int key="NSCellFlags2">131072</int>
+												<string key="NSContents">Odd/even bit hack</string>
+												<reference key="NSSupport" ref="26"/>
+												<int key="NSTag">1</int>
+												<int key="NSButtonFlags">1211912448</int>
+												<int key="NSButtonFlags2">2</int>
+												<reference key="NSAlternateImage" ref="283478431"/>
+												<string key="NSAlternateContents"/>
+												<int key="NSPeriodicDelay">200</int>
+												<int key="NSPeriodicInterval">25</int>
+											</object>
+											<int key="NSSelectedRow">-1</int>
+											<int key="NSSelectedCol">-1</int>
+											<reference key="NSBackgroundColor" ref="747736659"/>
+											<reference key="NSCellBackgroundColor" ref="747736659"/>
+										</object>
+									</array>
+									<string key="NSFrame">{{2, 2}, {459, 202}}</string>
+									<reference key="NSSuperview" ref="671483095"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="232960397"/>
+								</object>
+							</array>
+							<string key="NSFrame">{{17, 57}, {463, 206}}</string>
+							<reference key="NSSuperview" ref="713073715"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="138033641"/>
+							<string key="NSOffsets">{0, 0}</string>
+							<object class="NSTextFieldCell" key="NSTitleCell">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">0</int>
+								<string key="NSContents"/>
+								<reference key="NSSupport" ref="26"/>
+								<reference key="NSBackgroundColor" ref="394867751"/>
+								<object class="NSColor" key="NSTextColor">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
+								</object>
+							</object>
+							<reference key="NSContentView" ref="138033641"/>
+							<int key="NSBorderType">3</int>
+							<int key="NSBoxType">0</int>
+							<int key="NSTitlePosition">0</int>
+							<bool key="NSTransparent">NO</bool>
+						</object>
+						<object class="NSTextField" id="320711766">
+							<reference key="NSNextResponder" ref="713073715"/>
+							<int key="NSvFlags">269</int>
+							<string key="NSFrame">{{143, 269}, {211, 56}}</string>
+							<reference key="NSSuperview" ref="713073715"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="671483095"/>
+							<string key="NSAntiCompressionPriority">{250, 750}</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="688135460">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">138543104</int>
+								<string type="base64-UTF8" key="NSContents">T25seSBlbmFibGUgYSBoYWNrIHRvIGZpeCBhIHNwZWNpZmljIHByb2JsZW0gaW4gYSBnYW1lLgpIb2xk
+IHRoZSBtb3VzZSBvdmVyIGEgY2hlY2tib3ggdG8gZ2V0IG1vcmUgaW5mb3JtYXRpb24gYWJvdXQgaXQu
+A</string>
+								<reference key="NSSupport" ref="26"/>
+								<reference key="NSControlView" ref="320711766"/>
+								<bool key="NSDrawsBackground">YES</bool>
+								<reference key="NSBackgroundColor" ref="747736659"/>
+								<reference key="NSTextColor" ref="165518464"/>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSButton" id="1031376586">
+							<reference key="NSNextResponder" ref="713073715"/>
+							<int key="NSvFlags">269</int>
+							<string key="NSFrame">{{195, 331}, {106, 18}}</string>
+							<reference key="NSSuperview" ref="713073715"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="320711766"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="46903452">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Enable Hacks</string>
+								<reference key="NSSupport" ref="917501388"/>
+								<reference key="NSControlView" ref="1031376586"/>
+								<int key="NSButtonFlags">1211912448</int>
+								<int key="NSButtonFlags2">2</int>
+								<reference key="NSAlternateImage" ref="283478431"/>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSButton" id="91253578">
+							<reference key="NSNextResponder" ref="713073715"/>
+							<int key="NSvFlags">269</int>
+							<string key="NSFrame">{{424, 13}, {59, 32}}</string>
+							<reference key="NSSuperview" ref="713073715"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<int key="NSTag">1</int>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="877699699">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">OK</string>
+								<reference key="NSSupport" ref="917501388"/>
+								<string key="NSCellIdentifier">_NS:9</string>
+								<reference key="NSControlView" ref="91253578"/>
+								<int key="NSButtonFlags">-2038284288</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSButton" id="599923">
+							<reference key="NSNextResponder" ref="713073715"/>
+							<int key="NSvFlags">269</int>
+							<string key="NSFrame">{{342, 13}, {82, 32}}</string>
+							<reference key="NSSuperview" ref="713073715"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="91253578"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="1017364871">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Cancel</string>
+								<reference key="NSSupport" ref="917501388"/>
+								<string key="NSCellIdentifier">_NS:9</string>
+								<reference key="NSControlView" ref="599923"/>
+								<int key="NSButtonFlags">-2038284288</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string type="base64-UTF8" key="NSKeyEquivalent">Gw</string>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+					</array>
+					<string key="NSFrameSize">{497, 367}</string>
+					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
+					<reference key="NSNextKeyView" ref="1031376586"/>
+					<string key="NSReuseIdentifierKey">_NS:20</string>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
+				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
+				<bool key="NSWindowIsRestorable">YES</bool>
+			</object>
+		</array>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<array class="NSMutableArray" key="connectionRecords">
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">window</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="484943445"/>
+					</object>
+					<int key="connectionID">141</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">ditherMode</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="811906754"/>
+					</object>
+					<int key="connectionID">143</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">offscreenDrawing</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="1019936731"/>
+					</object>
+					<int key="connectionID">232</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">frameBufferEffects</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="582698674"/>
+					</object>
+					<int key="connectionID">233</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">texColorDepth</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="966350560"/>
+					</object>
+					<int key="connectionID">242</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">texEnhancment</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="542707641"/>
+					</object>
+					<int key="connectionID">276</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">texFiltering</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="417181210"/>
+					</object>
+					<int key="connectionID">277</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">hackToggle:</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="1031376586"/>
+					</object>
+					<int key="connectionID">500</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">hacksWindow</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="987163106"/>
+					</object>
+					<int key="connectionID">505</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">hackEnable</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="1031376586"/>
+					</object>
+					<int key="connectionID">506</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">hacksMatrix</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="232960397"/>
+					</object>
+					<int key="connectionID">509</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">scanlineColorWell</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="322419177"/>
+					</object>
+					<int key="connectionID">516</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">closeHacks:</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="91253578"/>
+					</object>
+					<int key="connectionID">526</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">closeHacks:</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="599923"/>
+					</object>
+					<int key="connectionID">527</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">reset:</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="638464855"/>
+					</object>
+					<int key="connectionID">669</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">ok:</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="612723633"/>
+					</object>
+					<int key="connectionID">678</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">cancel:</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="394234374"/>
+					</object>
+					<int key="connectionID">679</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleCheck:</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="60795979"/>
+					</object>
+					<int key="connectionID">713</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleCheck:</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="824050672"/>
+					</object>
+					<int key="connectionID">714</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleCheck:</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="97827596"/>
+					</object>
+					<int key="connectionID">715</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleCheck:</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="816460454"/>
+					</object>
+					<int key="connectionID">716</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleCheck:</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="538548992"/>
+					</object>
+					<int key="connectionID">717</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleCheck:</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="526689999"/>
+					</object>
+					<int key="connectionID">718</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleCheck:</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="902764097"/>
+					</object>
+					<int key="connectionID">719</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleCheck:</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="247908544"/>
+					</object>
+					<int key="connectionID">720</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleCheck:</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="250761880"/>
+					</object>
+					<int key="connectionID">721</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleCheck:</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="88136440"/>
+					</object>
+					<int key="connectionID">792</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleCheck:</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="774322141"/>
+					</object>
+					<int key="connectionID">793</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleCheck:</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="249046253"/>
+					</object>
+					<int key="connectionID">794</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleCheck:</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="73527718"/>
+					</object>
+					<int key="connectionID">795</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleCheck:</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="1018906851"/>
+					</object>
+					<int key="connectionID">796</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">showHacks:</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="755753305"/>
+					</object>
+					<int key="connectionID">933</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">gteAccuracy</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="60795979"/>
+					</object>
+					<int key="connectionID">956</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">mjpegDecoder15bit</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="824050672"/>
+					</object>
+					<int key="connectionID">957</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">mjpegDecoder</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="97827596"/>
+					</object>
+					<int key="connectionID">958</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">blurEffect</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="816460454"/>
+					</object>
+					<int key="connectionID">959</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">wireframeOnly</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="538548992"/>
+					</object>
+					<int key="connectionID">960</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">zMaskClipping</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="526689999"/>
+					</object>
+					<int key="connectionID">961</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">opaquePass</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="902764097"/>
+					</object>
+					<int key="connectionID">962</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">advancedBlending</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="247908544"/>
+					</object>
+					<int key="connectionID">963</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">drawScanlines</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="250761880"/>
+					</object>
+					<int key="connectionID">964</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">autoFullScreen</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="774322141"/>
+					</object>
+					<int key="connectionID">967</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">fpsCounter</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="73527718"/>
+					</object>
+					<int key="connectionID">968</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">proportionalResize</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="560326422"/>
+					</object>
+					<int key="connectionID">969</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">fullscreenSize</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="126384619"/>
+					</object>
+					<int key="connectionID">970</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">windowWidth</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="396747105"/>
+					</object>
+					<int key="connectionID">971</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">windowHeighth</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="599157939"/>
+					</object>
+					<int key="connectionID">972</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">vSync</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="88136440"/>
+					</object>
+					<int key="connectionID">973</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">frameSkipping</string>
+						<reference key="source" ref="499690858"/>
+						<reference key="destination" ref="249046253"/>
+					</object>
+					<int key="connectionID">974</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="484943445"/>
+						<reference key="destination" ref="499690858"/>
+					</object>
+					<int key="connectionID">142</int>
+				</object>
+			</array>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<array key="orderedObjects">
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<array key="object" id="0"/>
+						<reference key="children" ref="950051212"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="499690858"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="827476947"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">First Responder</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5</int>
+						<reference key="object" ref="484943445"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="675926718"/>
+						</array>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Window</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6</int>
+						<reference key="object" ref="675926718"/>
+						<array class="NSMutableArray" key="children">
+							<object class="IBNSLayoutConstraint" id="487201551">
+								<reference key="firstItem" ref="612723633"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="394234374"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">12</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="675926718"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="799775192">
+								<reference key="firstItem" ref="675926718"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="612723633"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="675926718"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="961787435">
+								<reference key="firstItem" ref="675926718"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="612723633"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="675926718"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="54228565">
+								<reference key="firstItem" ref="675926718"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="394234374"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="675926718"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="674894137">
+								<reference key="firstItem" ref="675926718"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="638464855"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="675926718"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="316479015">
+								<reference key="firstItem" ref="638464855"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="675926718"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="675926718"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="864078760">
+								<reference key="firstItem" ref="675926718"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="809921113"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">78</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="675926718"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="740083102">
+								<reference key="firstItem" ref="809921113"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="675926718"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">175</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="675926718"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="754287637">
+								<reference key="firstItem" ref="809921113"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="93048329"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="675926718"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="679724350">
+								<reference key="firstItem" ref="809921113"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="675926718"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="675926718"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="399676453">
+								<reference key="firstItem" ref="675926718"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="809921113"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="675926718"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="835626842">
+								<reference key="firstItem" ref="93048329"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="675926718"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="675926718"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="886877005">
+								<reference key="firstItem" ref="675926718"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="93048329"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="675926718"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="286849860">
+								<reference key="firstItem" ref="93048329"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="675926718"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="675926718"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<reference ref="638464855"/>
+							<reference ref="612723633"/>
+							<reference ref="394234374"/>
+							<reference ref="93048329"/>
+							<reference ref="809921113"/>
+						</array>
+						<reference key="parent" ref="484943445"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">89</int>
+						<reference key="object" ref="93048329"/>
+						<array class="NSMutableArray" key="children">
+							<object class="IBNSLayoutConstraint" id="30506148">
+								<reference key="firstItem" ref="474244763"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="93048329"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">25</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="93048329"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="949214693">
+								<reference key="firstItem" ref="93048329"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="474244763"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="93048329"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="248664546">
+								<reference key="firstItem" ref="126384619"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="93048329"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">149</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="93048329"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="730197785">
+								<reference key="firstItem" ref="126384619"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="93048329"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">25</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="93048329"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="1032234245">
+								<reference key="firstItem" ref="126384619"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="755753305"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="93048329"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="735877365">
+								<reference key="firstItem" ref="684085592"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="93048329"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="93048329"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="521745551">
+								<reference key="firstItem" ref="684085592"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="755753305"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="93048329"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="155261569">
+								<reference key="firstItem" ref="684085592"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="560326422"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="93048329"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="573791310">
+								<reference key="firstItem" ref="560326422"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="93048329"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="93048329"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="777888020">
+								<reference key="firstItem" ref="560326422"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1001794195"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="93048329"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="669467068">
+								<reference key="firstItem" ref="1001794195"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="93048329"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="93048329"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="94672714">
+								<reference key="firstItem" ref="1001794195"/>
+								<int key="firstAttribute">11</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="126384619"/>
+								<int key="secondAttribute">11</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="93048329"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<reference ref="474244763"/>
+							<reference ref="126384619"/>
+							<reference ref="1001794195"/>
+							<reference ref="560326422"/>
+							<reference ref="755753305"/>
+							<reference ref="684085592"/>
+						</array>
+						<reference key="parent" ref="675926718"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">107</int>
+						<reference key="object" ref="809921113"/>
+						<array class="NSMutableArray" key="children">
+							<object class="IBNSLayoutConstraint" id="1035529973">
+								<reference key="firstItem" ref="582698674"/>
+								<int key="firstAttribute">10</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1019936731"/>
+								<int key="secondAttribute">10</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="809921113"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="980509424">
+								<reference key="firstItem" ref="582698674"/>
+								<int key="firstAttribute">11</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="22212234"/>
+								<int key="secondAttribute">11</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="809921113"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="117147557">
+								<reference key="firstItem" ref="582698674"/>
+								<int key="firstAttribute">9</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="258095043"/>
+								<int key="secondAttribute">9</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="809921113"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="324823124">
+								<reference key="firstItem" ref="144180805"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="582698674"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="809921113"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="860313105">
+								<reference key="firstItem" ref="144180805"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="322419177"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="809921113"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="611649558">
+								<reference key="firstItem" ref="809921113"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="144180805"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="809921113"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="32236618">
+								<reference key="firstItem" ref="258095043"/>
+								<int key="firstAttribute">11</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="811906754"/>
+								<int key="secondAttribute">11</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="809921113"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="296406824">
+								<reference key="firstItem" ref="809921113"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="258095043"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="809921113"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="592065484">
+								<reference key="firstItem" ref="258095043"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="144180805"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="809921113"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="698777160">
+								<reference key="firstItem" ref="322419177"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="144180805"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="809921113"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="254897246">
+								<reference key="firstItem" ref="322419177"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="870362045"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="809921113"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="569474682">
+								<reference key="firstItem" ref="1019936731"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="811906754"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">10</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="809921113"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="978272286">
+								<reference key="firstItem" ref="811906754"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="809921113"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">25</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="809921113"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="723782489">
+								<reference key="firstItem" ref="811906754"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="528429323"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="809921113"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="39555517">
+								<reference key="firstItem" ref="811906754"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1019936731"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="809921113"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="127343032">
+								<reference key="firstItem" ref="811906754"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1019936731"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="809921113"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="18275174">
+								<reference key="firstItem" ref="809921113"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="870362045"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">97</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="809921113"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="509994394">
+								<reference key="firstItem" ref="870362045"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="22212234"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="809921113"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="847342809">
+								<reference key="firstItem" ref="870362045"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="809921113"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="809921113"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="220521735">
+								<reference key="firstItem" ref="22212234"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="809921113"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="809921113"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="1066361251">
+								<reference key="firstItem" ref="22212234"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="528429323"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="809921113"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="541550294">
+								<reference key="firstItem" ref="528429323"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="809921113"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="809921113"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="733949917">
+								<reference key="firstItem" ref="528429323"/>
+								<int key="firstAttribute">11</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="811906754"/>
+								<int key="secondAttribute">11</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="809921113"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<reference ref="528429323"/>
+							<reference ref="811906754"/>
+							<reference ref="1019936731"/>
+							<reference ref="22212234"/>
+							<reference ref="582698674"/>
+							<reference ref="258095043"/>
+							<reference ref="870362045"/>
+							<reference ref="144180805"/>
+							<reference ref="322419177"/>
+						</array>
+						<reference key="parent" ref="675926718"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-3</int>
+						<reference key="object" ref="1061884829"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Application</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">112</int>
+						<reference key="object" ref="528429323"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="965214932"/>
+							<object class="IBNSLayoutConstraint" id="978198084">
+								<reference key="firstItem" ref="528429323"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">115</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="528429323"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="809921113"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">383</int>
+						<reference key="object" ref="965214932"/>
+						<reference key="parent" ref="528429323"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">116</int>
+						<reference key="object" ref="811906754"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="255572913"/>
+							<object class="IBNSLayoutConstraint" id="587186482">
+								<reference key="firstItem" ref="811906754"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">169</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="811906754"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="809921113"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">384</int>
+						<reference key="object" ref="255572913"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="731759952"/>
+						</array>
+						<reference key="parent" ref="811906754"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">113</int>
+						<reference key="object" ref="731759952"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="456783183"/>
+							<reference ref="170738631"/>
+							<reference ref="344994821"/>
+						</array>
+						<reference key="parent" ref="255572913"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">111</int>
+						<reference key="object" ref="456783183"/>
+						<reference key="parent" ref="731759952"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">114</int>
+						<reference key="object" ref="170738631"/>
+						<reference key="parent" ref="731759952"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">115</int>
+						<reference key="object" ref="344994821"/>
+						<reference key="parent" ref="731759952"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">202</int>
+						<reference key="object" ref="1019936731"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="505058769"/>
+							<object class="IBNSLayoutConstraint" id="414191892">
+								<reference key="firstItem" ref="1019936731"/>
+								<int key="firstAttribute">8</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">17</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1019936731"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="809921113"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">393</int>
+						<reference key="object" ref="505058769"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="931509582"/>
+						</array>
+						<reference key="parent" ref="1019936731"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">203</int>
+						<reference key="object" ref="931509582"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="88774635"/>
+							<reference ref="239192959"/>
+							<reference ref="588916550"/>
+							<reference ref="1004057130"/>
+							<reference ref="1009937097"/>
+						</array>
+						<reference key="parent" ref="505058769"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">204</int>
+						<reference key="object" ref="88774635"/>
+						<reference key="parent" ref="931509582"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">205</int>
+						<reference key="object" ref="239192959"/>
+						<reference key="parent" ref="931509582"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">206</int>
+						<reference key="object" ref="588916550"/>
+						<reference key="parent" ref="931509582"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">254</int>
+						<reference key="object" ref="1004057130"/>
+						<reference key="parent" ref="931509582"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">255</int>
+						<reference key="object" ref="1009937097"/>
+						<reference key="parent" ref="931509582"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">207</int>
+						<reference key="object" ref="22212234"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="230144169"/>
+						</array>
+						<reference key="parent" ref="809921113"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">394</int>
+						<reference key="object" ref="230144169"/>
+						<reference key="parent" ref="22212234"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">212</int>
+						<reference key="object" ref="870362045"/>
+						<array class="NSMutableArray" key="children">
+							<object class="IBNSLayoutConstraint" id="302037459">
+								<reference key="firstItem" ref="417181210"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="542707641"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="870362045"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="854035731">
+								<reference key="firstItem" ref="870362045"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="417181210"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="870362045"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="718407732">
+								<reference key="firstItem" ref="417181210"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="542707641"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="870362045"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="208453234">
+								<reference key="firstItem" ref="870362045"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="542707641"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="870362045"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="396204290">
+								<reference key="firstItem" ref="542707641"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="868714805"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="870362045"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="586531004">
+								<reference key="firstItem" ref="966350560"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="542707641"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="870362045"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="112135928">
+								<reference key="firstItem" ref="966350560"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="870362045"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">25</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="870362045"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="641205651">
+								<reference key="firstItem" ref="870362045"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="966350560"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="870362045"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="571975854">
+								<reference key="firstItem" ref="966350560"/>
+								<int key="firstAttribute">11</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="868714805"/>
+								<int key="secondAttribute">11</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="870362045"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="491859289">
+								<reference key="firstItem" ref="809674697"/>
+								<int key="firstAttribute">10</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="417181210"/>
+								<int key="secondAttribute">10</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="870362045"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="639952861">
+								<reference key="firstItem" ref="809674697"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="868714805"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="870362045"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="949516016">
+								<reference key="firstItem" ref="809674697"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="870362045"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="870362045"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="978066067">
+								<reference key="firstItem" ref="263002935"/>
+								<int key="firstAttribute">11</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="542707641"/>
+								<int key="secondAttribute">11</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="870362045"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="366484982">
+								<reference key="firstItem" ref="263002935"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="870362045"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">15</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="870362045"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="965322871">
+								<reference key="firstItem" ref="868714805"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="870362045"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="870362045"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<reference ref="868714805"/>
+							<reference ref="966350560"/>
+							<reference ref="542707641"/>
+							<reference ref="263002935"/>
+							<reference ref="417181210"/>
+							<reference ref="809674697"/>
+						</array>
+						<reference key="parent" ref="809921113"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">215</int>
+						<reference key="object" ref="582698674"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="307340522"/>
+							<object class="IBNSLayoutConstraint" id="909266590">
+								<reference key="firstItem" ref="582698674"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">125</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="582698674"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="809921113"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">401</int>
+						<reference key="object" ref="307340522"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="2523129"/>
+						</array>
+						<reference key="parent" ref="582698674"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">216</int>
+						<reference key="object" ref="2523129"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="425250505"/>
+							<reference ref="240714803"/>
+							<reference ref="24331712"/>
+						</array>
+						<reference key="parent" ref="307340522"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">217</int>
+						<reference key="object" ref="425250505"/>
+						<reference key="parent" ref="2523129"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">218</int>
+						<reference key="object" ref="240714803"/>
+						<reference key="parent" ref="2523129"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">219</int>
+						<reference key="object" ref="24331712"/>
+						<reference key="parent" ref="2523129"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">220</int>
+						<reference key="object" ref="258095043"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="479187425"/>
+						</array>
+						<reference key="parent" ref="809921113"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">402</int>
+						<reference key="object" ref="479187425"/>
+						<reference key="parent" ref="258095043"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">341</int>
+						<reference key="object" ref="322419177"/>
+						<array class="NSMutableArray" key="children">
+							<object class="IBNSLayoutConstraint" id="632568330">
+								<reference key="firstItem" ref="322419177"/>
+								<int key="firstAttribute">8</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">22</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="322419177"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="328197195">
+								<reference key="firstItem" ref="322419177"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">23</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="322419177"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="809921113"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">169</int>
+						<reference key="object" ref="966350560"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="414807946"/>
+							<object class="IBNSLayoutConstraint" id="422551929">
+								<reference key="firstItem" ref="966350560"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">183</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="966350560"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="870362045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">395</int>
+						<reference key="object" ref="414807946"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="107932296"/>
+						</array>
+						<reference key="parent" ref="966350560"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">170</int>
+						<reference key="object" ref="107932296"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="498777223"/>
+							<reference ref="798650856"/>
+							<reference ref="523728554"/>
+							<reference ref="58794692"/>
+							<reference ref="601605275"/>
+						</array>
+						<reference key="parent" ref="414807946"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">251</int>
+						<reference key="object" ref="498777223"/>
+						<reference key="parent" ref="107932296"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">250</int>
+						<reference key="object" ref="798650856"/>
+						<reference key="parent" ref="107932296"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">173</int>
+						<reference key="object" ref="523728554"/>
+						<reference key="parent" ref="107932296"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">172</int>
+						<reference key="object" ref="58794692"/>
+						<reference key="parent" ref="107932296"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">171</int>
+						<reference key="object" ref="601605275"/>
+						<reference key="parent" ref="107932296"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">201</int>
+						<reference key="object" ref="263002935"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="388326571"/>
+							<object class="IBNSLayoutConstraint" id="1001377374">
+								<reference key="firstItem" ref="263002935"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">108</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="263002935"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="870362045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">398</int>
+						<reference key="object" ref="388326571"/>
+						<reference key="parent" ref="263002935"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">193</int>
+						<reference key="object" ref="809674697"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1067959541"/>
+						</array>
+						<reference key="parent" ref="870362045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">397</int>
+						<reference key="object" ref="1067959541"/>
+						<reference key="parent" ref="809674697"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">174</int>
+						<reference key="object" ref="868714805"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="115632950"/>
+							<object class="IBNSLayoutConstraint" id="617100070">
+								<reference key="firstItem" ref="868714805"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">108</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="868714805"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="870362045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">396</int>
+						<reference key="object" ref="115632950"/>
+						<reference key="parent" ref="868714805"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">252</int>
+						<reference key="object" ref="417181210"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1070282742"/>
+						</array>
+						<reference key="parent" ref="870362045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">399</int>
+						<reference key="object" ref="1070282742"/>
+						<reference key="parent" ref="417181210"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">253</int>
+						<reference key="object" ref="542707641"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="860867881"/>
+						</array>
+						<reference key="parent" ref="870362045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">400</int>
+						<reference key="object" ref="860867881"/>
+						<reference key="parent" ref="542707641"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">472</int>
+						<reference key="object" ref="987163106"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="713073715"/>
+						</array>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">473</int>
+						<reference key="object" ref="713073715"/>
+						<array class="NSMutableArray" key="children">
+							<object class="IBNSLayoutConstraint" id="992114042">
+								<reference key="firstItem" ref="713073715"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="91253578"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="713073715"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="12744196">
+								<reference key="firstItem" ref="91253578"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="599923"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">12</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="713073715"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="395851187">
+								<reference key="firstItem" ref="713073715"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="91253578"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="713073715"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="308311365">
+								<reference key="firstItem" ref="713073715"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="599923"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="713073715"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="332115623">
+								<reference key="firstItem" ref="1031376586"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="713073715"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="713073715"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="236363735">
+								<reference key="firstItem" ref="1031376586"/>
+								<int key="firstAttribute">9</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="320711766"/>
+								<int key="secondAttribute">9</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="713073715"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="713570101">
+								<reference key="firstItem" ref="320711766"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="1031376586"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="713073715"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="41842397">
+								<reference key="firstItem" ref="713073715"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="671483095"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="713073715"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="712777825">
+								<reference key="firstItem" ref="671483095"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="320711766"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="713073715"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="431500627">
+								<reference key="firstItem" ref="671483095"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="713073715"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="713073715"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="915712074">
+								<reference key="firstItem" ref="671483095"/>
+								<int key="firstAttribute">9</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="320711766"/>
+								<int key="secondAttribute">9</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="713073715"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<reference ref="1031376586"/>
+							<reference ref="320711766"/>
+							<reference ref="671483095"/>
+							<reference ref="91253578"/>
+							<reference ref="599923"/>
+						</array>
+						<reference key="parent" ref="987163106"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">474</int>
+						<reference key="object" ref="671483095"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="232960397"/>
+							<object class="IBNSLayoutConstraint" id="62551024">
+								<reference key="firstItem" ref="671483095"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="232960397"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">11</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="671483095"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="995988463">
+								<reference key="firstItem" ref="232960397"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="671483095"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">16</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="671483095"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="153835582">
+								<reference key="firstItem" ref="232960397"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="671483095"/>
+								<int key="secondAttribute">3</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">11</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="671483095"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+						</array>
+						<reference key="parent" ref="713073715"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">475</int>
+						<reference key="object" ref="320711766"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="688135460"/>
+							<object class="IBNSLayoutConstraint" id="513797283">
+								<reference key="firstItem" ref="320711766"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">205</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="320711766"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="713073715"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">476</int>
+						<reference key="object" ref="1031376586"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="46903452"/>
+						</array>
+						<reference key="parent" ref="713073715"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">477</int>
+						<reference key="object" ref="46903452"/>
+						<reference key="parent" ref="1031376586"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">478</int>
+						<reference key="object" ref="688135460"/>
+						<reference key="parent" ref="320711766"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">479</int>
+						<reference key="object" ref="232960397"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="16264460"/>
+							<reference ref="372830145"/>
+							<reference ref="53473145"/>
+							<reference ref="757070565"/>
+							<reference ref="949439378"/>
+							<reference ref="806892743"/>
+							<reference ref="854561282"/>
+							<reference ref="876785218"/>
+							<reference ref="306324820"/>
+							<reference ref="601226499"/>
+							<reference ref="877662516"/>
+							<reference ref="196368836"/>
+							<reference ref="11594003"/>
+							<reference ref="467507890"/>
+							<reference ref="70620311"/>
+							<reference ref="376960548"/>
+							<reference ref="206217604"/>
+							<reference ref="879332229"/>
+							<reference ref="16290440"/>
+						</array>
+						<reference key="parent" ref="671483095"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">480</int>
+						<reference key="object" ref="16264460"/>
+						<reference key="parent" ref="232960397"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">481</int>
+						<reference key="object" ref="372830145"/>
+						<reference key="parent" ref="232960397"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">482</int>
+						<reference key="object" ref="53473145"/>
+						<reference key="parent" ref="232960397"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">483</int>
+						<reference key="object" ref="757070565"/>
+						<reference key="parent" ref="232960397"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">484</int>
+						<reference key="object" ref="949439378"/>
+						<reference key="parent" ref="232960397"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">485</int>
+						<reference key="object" ref="806892743"/>
+						<reference key="parent" ref="232960397"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">486</int>
+						<reference key="object" ref="854561282"/>
+						<reference key="parent" ref="232960397"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">487</int>
+						<reference key="object" ref="876785218"/>
+						<reference key="parent" ref="232960397"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">488</int>
+						<reference key="object" ref="306324820"/>
+						<reference key="parent" ref="232960397"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">489</int>
+						<reference key="object" ref="601226499"/>
+						<reference key="parent" ref="232960397"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">490</int>
+						<reference key="object" ref="877662516"/>
+						<reference key="parent" ref="232960397"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">491</int>
+						<reference key="object" ref="196368836"/>
+						<reference key="parent" ref="232960397"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">492</int>
+						<reference key="object" ref="11594003"/>
+						<reference key="parent" ref="232960397"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">493</int>
+						<reference key="object" ref="467507890"/>
+						<reference key="parent" ref="232960397"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">494</int>
+						<reference key="object" ref="70620311"/>
+						<reference key="parent" ref="232960397"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">495</int>
+						<reference key="object" ref="376960548"/>
+						<reference key="parent" ref="232960397"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">496</int>
+						<reference key="object" ref="206217604"/>
+						<reference key="parent" ref="232960397"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">497</int>
+						<reference key="object" ref="879332229"/>
+						<reference key="parent" ref="232960397"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">498</int>
+						<reference key="object" ref="16290440"/>
+						<reference key="parent" ref="232960397"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">501</int>
+						<reference key="object" ref="91253578"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="877699699"/>
+						</array>
+						<reference key="parent" ref="713073715"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">502</int>
+						<reference key="object" ref="877699699"/>
+						<reference key="parent" ref="91253578"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">503</int>
+						<reference key="object" ref="599923"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1017364871"/>
+						</array>
+						<reference key="parent" ref="713073715"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">504</int>
+						<reference key="object" ref="1017364871"/>
+						<reference key="parent" ref="599923"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">563</int>
+						<reference key="object" ref="328197195"/>
+						<reference key="parent" ref="322419177"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">564</int>
+						<reference key="object" ref="632568330"/>
+						<reference key="parent" ref="322419177"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">566</int>
+						<reference key="object" ref="399676453"/>
+						<reference key="parent" ref="675926718"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">567</int>
+						<reference key="object" ref="679724350"/>
+						<reference key="parent" ref="675926718"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">600</int>
+						<reference key="object" ref="127343032"/>
+						<reference key="parent" ref="809921113"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">607</int>
+						<reference key="object" ref="39555517"/>
+						<reference key="parent" ref="809921113"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">623</int>
+						<reference key="object" ref="909266590"/>
+						<reference key="parent" ref="582698674"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">624</int>
+						<reference key="object" ref="587186482"/>
+						<reference key="parent" ref="811906754"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">650</int>
+						<reference key="object" ref="513797283"/>
+						<reference key="parent" ref="320711766"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">651</int>
+						<reference key="object" ref="395851187"/>
+						<reference key="parent" ref="713073715"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">652</int>
+						<reference key="object" ref="713570101"/>
+						<reference key="parent" ref="713073715"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">653</int>
+						<reference key="object" ref="915712074"/>
+						<reference key="parent" ref="713073715"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">654</int>
+						<reference key="object" ref="12744196"/>
+						<reference key="parent" ref="713073715"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">655</int>
+						<reference key="object" ref="308311365"/>
+						<reference key="parent" ref="713073715"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">656</int>
+						<reference key="object" ref="431500627"/>
+						<reference key="parent" ref="713073715"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">657</int>
+						<reference key="object" ref="712777825"/>
+						<reference key="parent" ref="713073715"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">658</int>
+						<reference key="object" ref="236363735"/>
+						<reference key="parent" ref="713073715"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">659</int>
+						<reference key="object" ref="41842397"/>
+						<reference key="parent" ref="713073715"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">660</int>
+						<reference key="object" ref="332115623"/>
+						<reference key="parent" ref="713073715"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">661</int>
+						<reference key="object" ref="992114042"/>
+						<reference key="parent" ref="713073715"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">662</int>
+						<reference key="object" ref="153835582"/>
+						<reference key="parent" ref="671483095"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">663</int>
+						<reference key="object" ref="995988463"/>
+						<reference key="parent" ref="671483095"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">664</int>
+						<reference key="object" ref="62551024"/>
+						<reference key="parent" ref="671483095"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">665</int>
+						<reference key="object" ref="638464855"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="792297439"/>
+						</array>
+						<reference key="parent" ref="675926718"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">666</int>
+						<reference key="object" ref="792297439"/>
+						<reference key="parent" ref="638464855"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">667</int>
+						<reference key="object" ref="316479015"/>
+						<reference key="parent" ref="675926718"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">668</int>
+						<reference key="object" ref="674894137"/>
+						<reference key="parent" ref="675926718"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">670</int>
+						<reference key="object" ref="612723633"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="331279247"/>
+						</array>
+						<reference key="parent" ref="675926718"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">671</int>
+						<reference key="object" ref="331279247"/>
+						<reference key="parent" ref="612723633"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">672</int>
+						<reference key="object" ref="961787435"/>
+						<reference key="parent" ref="675926718"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">673</int>
+						<reference key="object" ref="799775192"/>
+						<reference key="parent" ref="675926718"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">674</int>
+						<reference key="object" ref="394234374"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="728025352"/>
+						</array>
+						<reference key="parent" ref="675926718"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">675</int>
+						<reference key="object" ref="728025352"/>
+						<reference key="parent" ref="394234374"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">676</int>
+						<reference key="object" ref="487201551"/>
+						<reference key="parent" ref="675926718"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">677</int>
+						<reference key="object" ref="54228565"/>
+						<reference key="parent" ref="675926718"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">680</int>
+						<reference key="object" ref="286849860"/>
+						<reference key="parent" ref="675926718"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">682</int>
+						<reference key="object" ref="886877005"/>
+						<reference key="parent" ref="675926718"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">692</int>
+						<reference key="object" ref="733949917"/>
+						<reference key="parent" ref="809921113"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">701</int>
+						<reference key="object" ref="414191892"/>
+						<reference key="parent" ref="1019936731"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">702</int>
+						<reference key="object" ref="144180805"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="926431522"/>
+							<reference ref="60795979"/>
+							<reference ref="824050672"/>
+							<reference ref="97827596"/>
+							<reference ref="816460454"/>
+							<reference ref="538548992"/>
+							<reference ref="526689999"/>
+							<reference ref="902764097"/>
+							<reference ref="247908544"/>
+							<reference ref="250761880"/>
+						</array>
+						<reference key="parent" ref="809921113"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">703</int>
+						<reference key="object" ref="926431522"/>
+						<reference key="parent" ref="144180805"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">406</int>
+						<reference key="object" ref="60795979"/>
+						<reference key="parent" ref="144180805"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">390</int>
+						<reference key="object" ref="824050672"/>
+						<reference key="parent" ref="144180805"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">389</int>
+						<reference key="object" ref="97827596"/>
+						<reference key="parent" ref="144180805"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">392</int>
+						<reference key="object" ref="816460454"/>
+						<reference key="parent" ref="144180805"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">385</int>
+						<reference key="object" ref="538548992"/>
+						<reference key="parent" ref="144180805"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">388</int>
+						<reference key="object" ref="526689999"/>
+						<reference key="parent" ref="144180805"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">387</int>
+						<reference key="object" ref="902764097"/>
+						<reference key="parent" ref="144180805"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">386</int>
+						<reference key="object" ref="247908544"/>
+						<reference key="parent" ref="144180805"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">391</int>
+						<reference key="object" ref="250761880"/>
+						<reference key="parent" ref="144180805"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">694</int>
+						<reference key="object" ref="569474682"/>
+						<reference key="parent" ref="809921113"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">734</int>
+						<reference key="object" ref="1001377374"/>
+						<reference key="parent" ref="263002935"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">735</int>
+						<reference key="object" ref="366484982"/>
+						<reference key="parent" ref="870362045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">736</int>
+						<reference key="object" ref="965322871"/>
+						<reference key="parent" ref="870362045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">741</int>
+						<reference key="object" ref="641205651"/>
+						<reference key="parent" ref="870362045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">748</int>
+						<reference key="object" ref="208453234"/>
+						<reference key="parent" ref="870362045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">749</int>
+						<reference key="object" ref="978066067"/>
+						<reference key="parent" ref="870362045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">754</int>
+						<reference key="object" ref="949516016"/>
+						<reference key="parent" ref="870362045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">755</int>
+						<reference key="object" ref="639952861"/>
+						<reference key="parent" ref="870362045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">758</int>
+						<reference key="object" ref="617100070"/>
+						<reference key="parent" ref="868714805"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">767</int>
+						<reference key="object" ref="112135928"/>
+						<reference key="parent" ref="870362045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">785</int>
+						<reference key="object" ref="474244763"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="681794258"/>
+							<reference ref="88136440"/>
+							<reference ref="774322141"/>
+							<reference ref="249046253"/>
+							<reference ref="73527718"/>
+							<reference ref="1018906851"/>
+						</array>
+						<reference key="parent" ref="93048329"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">786</int>
+						<reference key="object" ref="681794258"/>
+						<reference key="parent" ref="474244763"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">374</int>
+						<reference key="object" ref="88136440"/>
+						<reference key="parent" ref="474244763"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">377</int>
+						<reference key="object" ref="774322141"/>
+						<reference key="parent" ref="474244763"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">375</int>
+						<reference key="object" ref="249046253"/>
+						<reference key="parent" ref="474244763"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">376</int>
+						<reference key="object" ref="73527718"/>
+						<reference key="parent" ref="474244763"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">380</int>
+						<reference key="object" ref="1018906851"/>
+						<reference key="parent" ref="474244763"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">799</int>
+						<reference key="object" ref="949214693"/>
+						<reference key="parent" ref="93048329"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">814</int>
+						<reference key="object" ref="30506148"/>
+						<reference key="parent" ref="93048329"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">907</int>
+						<reference key="object" ref="835626842"/>
+						<reference key="parent" ref="675926718"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">908</int>
+						<reference key="object" ref="126384619"/>
+						<array class="NSMutableArray" key="children">
+							<object class="IBNSLayoutConstraint" id="539740235">
+								<reference key="firstItem" ref="126384619"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">130</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="126384619"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+							<reference ref="690636832"/>
+						</array>
+						<reference key="parent" ref="93048329"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">909</int>
+						<reference key="object" ref="1001794195"/>
+						<array class="NSMutableArray" key="children">
+							<object class="IBNSLayoutConstraint" id="2238138">
+								<reference key="firstItem" ref="1001794195"/>
+								<int key="firstAttribute">8</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">18</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1001794195"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="493980679">
+								<reference key="firstItem" ref="1001794195"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">130</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1001794195"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+							<reference ref="871459334"/>
+						</array>
+						<reference key="parent" ref="93048329"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">910</int>
+						<reference key="object" ref="560326422"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="93056172"/>
+						</array>
+						<reference key="parent" ref="93048329"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">911</int>
+						<reference key="object" ref="755753305"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="554182456"/>
+						</array>
+						<reference key="parent" ref="93048329"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">912</int>
+						<reference key="object" ref="684085592"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="599157939"/>
+							<reference ref="396747105"/>
+							<reference ref="114194526"/>
+						</array>
+						<reference key="parent" ref="93048329"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">913</int>
+						<reference key="object" ref="599157939"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="767949309"/>
+						</array>
+						<reference key="parent" ref="684085592"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">914</int>
+						<reference key="object" ref="396747105"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="885458706"/>
+						</array>
+						<reference key="parent" ref="684085592"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">915</int>
+						<reference key="object" ref="114194526"/>
+						<reference key="parent" ref="684085592"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">916</int>
+						<reference key="object" ref="885458706"/>
+						<reference key="parent" ref="396747105"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">917</int>
+						<reference key="object" ref="767949309"/>
+						<reference key="parent" ref="599157939"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">918</int>
+						<reference key="object" ref="554182456"/>
+						<reference key="parent" ref="755753305"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">919</int>
+						<reference key="object" ref="93056172"/>
+						<reference key="parent" ref="560326422"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">920</int>
+						<reference key="object" ref="2238138"/>
+						<reference key="parent" ref="1001794195"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">921</int>
+						<reference key="object" ref="493980679"/>
+						<reference key="parent" ref="1001794195"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">922</int>
+						<reference key="object" ref="871459334"/>
+						<reference key="parent" ref="1001794195"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">923</int>
+						<reference key="object" ref="539740235"/>
+						<reference key="parent" ref="126384619"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">924</int>
+						<reference key="object" ref="690636832"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="401915791"/>
+						</array>
+						<reference key="parent" ref="126384619"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">925</int>
+						<reference key="object" ref="401915791"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="668485086"/>
+							<reference ref="489438689"/>
+							<reference ref="548208244"/>
+							<reference ref="826589095"/>
+							<reference ref="302573869"/>
+							<reference ref="208414338"/>
+							<reference ref="167039163"/>
+						</array>
+						<reference key="parent" ref="690636832"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">926</int>
+						<reference key="object" ref="668485086"/>
+						<reference key="parent" ref="401915791"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">927</int>
+						<reference key="object" ref="489438689"/>
+						<reference key="parent" ref="401915791"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">928</int>
+						<reference key="object" ref="548208244"/>
+						<reference key="parent" ref="401915791"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">929</int>
+						<reference key="object" ref="826589095"/>
+						<reference key="parent" ref="401915791"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">930</int>
+						<reference key="object" ref="302573869"/>
+						<reference key="parent" ref="401915791"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">931</int>
+						<reference key="object" ref="208414338"/>
+						<reference key="parent" ref="401915791"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">932</int>
+						<reference key="object" ref="167039163"/>
+						<reference key="parent" ref="401915791"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">936</int>
+						<reference key="object" ref="155261569"/>
+						<reference key="parent" ref="93048329"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">939</int>
+						<reference key="object" ref="777888020"/>
+						<reference key="parent" ref="93048329"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">940</int>
+						<reference key="object" ref="94672714"/>
+						<reference key="parent" ref="93048329"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">943</int>
+						<reference key="object" ref="521745551"/>
+						<reference key="parent" ref="93048329"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">944</int>
+						<reference key="object" ref="669467068"/>
+						<reference key="parent" ref="93048329"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">945</int>
+						<reference key="object" ref="735877365"/>
+						<reference key="parent" ref="93048329"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">946</int>
+						<reference key="object" ref="730197785"/>
+						<reference key="parent" ref="93048329"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">948</int>
+						<reference key="object" ref="573791310"/>
+						<reference key="parent" ref="93048329"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">965</int>
+						<reference key="object" ref="611649558"/>
+						<reference key="parent" ref="809921113"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">977</int>
+						<reference key="object" ref="296406824"/>
+						<reference key="parent" ref="809921113"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">978</int>
+						<reference key="object" ref="117147557"/>
+						<reference key="parent" ref="809921113"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">980</int>
+						<reference key="object" ref="723782489"/>
+						<reference key="parent" ref="809921113"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">981</int>
+						<reference key="object" ref="978198084"/>
+						<reference key="parent" ref="528429323"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">983</int>
+						<reference key="object" ref="1066361251"/>
+						<reference key="parent" ref="809921113"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">985</int>
+						<reference key="object" ref="754287637"/>
+						<reference key="parent" ref="675926718"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">986</int>
+						<reference key="object" ref="740083102"/>
+						<reference key="parent" ref="675926718"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">987</int>
+						<reference key="object" ref="864078760"/>
+						<reference key="parent" ref="675926718"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">989</int>
+						<reference key="object" ref="847342809"/>
+						<reference key="parent" ref="809921113"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">991</int>
+						<reference key="object" ref="220521735"/>
+						<reference key="parent" ref="809921113"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">993</int>
+						<reference key="object" ref="978272286"/>
+						<reference key="parent" ref="809921113"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">995</int>
+						<reference key="object" ref="541550294"/>
+						<reference key="parent" ref="809921113"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">997</int>
+						<reference key="object" ref="32236618"/>
+						<reference key="parent" ref="809921113"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1000</int>
+						<reference key="object" ref="980509424"/>
+						<reference key="parent" ref="809921113"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1001</int>
+						<reference key="object" ref="1035529973"/>
+						<reference key="parent" ref="809921113"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">739</int>
+						<reference key="object" ref="571975854"/>
+						<reference key="parent" ref="870362045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">745</int>
+						<reference key="object" ref="396204290"/>
+						<reference key="parent" ref="870362045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1013</int>
+						<reference key="object" ref="509994394"/>
+						<reference key="parent" ref="809921113"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1016</int>
+						<reference key="object" ref="324823124"/>
+						<reference key="parent" ref="809921113"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1017</int>
+						<reference key="object" ref="698777160"/>
+						<reference key="parent" ref="809921113"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1025</int>
+						<reference key="object" ref="718407732"/>
+						<reference key="parent" ref="870362045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1028</int>
+						<reference key="object" ref="491859289"/>
+						<reference key="parent" ref="870362045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1029</int>
+						<reference key="object" ref="854035731"/>
+						<reference key="parent" ref="870362045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1030</int>
+						<reference key="object" ref="422551929"/>
+						<reference key="parent" ref="966350560"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1031</int>
+						<reference key="object" ref="586531004"/>
+						<reference key="parent" ref="870362045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1032</int>
+						<reference key="object" ref="302037459"/>
+						<reference key="parent" ref="870362045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1033</int>
+						<reference key="object" ref="18275174"/>
+						<reference key="parent" ref="809921113"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">947</int>
+						<reference key="object" ref="248664546"/>
+						<reference key="parent" ref="93048329"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">938</int>
+						<reference key="object" ref="1032234245"/>
+						<reference key="parent" ref="93048329"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">975</int>
+						<reference key="object" ref="592065484"/>
+						<reference key="parent" ref="809921113"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1006</int>
+						<reference key="object" ref="860313105"/>
+						<reference key="parent" ref="809921113"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1009</int>
+						<reference key="object" ref="254897246"/>
+						<reference key="parent" ref="809921113"/>
+					</object>
+				</array>
+			</object>
+			<dictionary class="NSMutableDictionary" key="flattenedProperties">
+				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1000.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1001.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1006.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1009.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1013.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1016.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1017.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1025.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1028.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1029.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1030.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1031.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1032.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1033.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="107.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="809921113"/>
+						<string key="toolTip">If your card supports it, will mix textures more accurately</string>
+					</object>
+				</object>
+				<array class="NSMutableArray" key="107.IBNSViewMetadataConstraints">
+					<reference ref="733949917"/>
+					<reference ref="541550294"/>
+					<reference ref="1066361251"/>
+					<reference ref="220521735"/>
+					<reference ref="847342809"/>
+					<reference ref="509994394"/>
+					<reference ref="18275174"/>
+					<reference ref="127343032"/>
+					<reference ref="39555517"/>
+					<reference ref="723782489"/>
+					<reference ref="978272286"/>
+					<reference ref="569474682"/>
+					<reference ref="254897246"/>
+					<reference ref="698777160"/>
+					<reference ref="592065484"/>
+					<reference ref="296406824"/>
+					<reference ref="32236618"/>
+					<reference ref="611649558"/>
+					<reference ref="860313105"/>
+					<reference ref="324823124"/>
+					<reference ref="117147557"/>
+					<reference ref="980509424"/>
+					<reference ref="1035529973"/>
+				</array>
+				<boolean value="NO" key="107.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="107.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="111.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="112.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="528429323"/>
+						<string key="toolTip">Specify when to use dithering to render colors</string>
+					</object>
+				</object>
+				<array class="NSMutableArray" key="112.IBNSViewMetadataConstraints">
+					<reference ref="978198084"/>
+				</array>
+				<boolean value="NO" key="112.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="112.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="113.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="114.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="115.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="116.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="811906754"/>
+						<string key="toolTip">Specify when to use dithering to render colors</string>
+					</object>
+				</object>
+				<array key="116.IBNSViewMetadataConstraints">
+					<reference ref="587186482"/>
+				</array>
+				<boolean value="NO" key="116.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="116.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="169.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="966350560"/>
+						<string key="toolTip">The color depth of stored textures.</string>
+					</object>
+				</object>
+				<array key="169.IBNSViewMetadataConstraints">
+					<reference ref="422551929"/>
+				</array>
+				<boolean value="NO" key="169.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="169.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="170.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="171.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="172.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="173.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="174.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="868714805"/>
+						<string key="toolTip">The color depth of stored textures.</string>
+					</object>
+				</object>
+				<array key="174.IBNSViewMetadataConstraints">
+					<reference ref="617100070"/>
+				</array>
+				<boolean value="NO" key="174.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="174.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="193.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="809674697"/>
+						<string key="toolTip">Filter textures when scaled. Higher values filter more kinds of textures, i.e. sprites.</string>
+					</object>
+				</object>
+				<boolean value="NO" key="193.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="193.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="201.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="263002935"/>
+						<string key="toolTip">Select a quality level of texture scaling</string>
+					</object>
+				</object>
+				<array key="201.IBNSViewMetadataConstraints">
+					<reference ref="1001377374"/>
+				</array>
+				<boolean value="NO" key="201.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="201.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="202.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="1019936731"/>
+						<string key="toolTip">Use offscreen drawing to remove some graphics glitches</string>
+					</object>
+				</object>
+				<array key="202.IBNSViewMetadataConstraints">
+					<reference ref="414191892"/>
+				</array>
+				<boolean value="NO" key="202.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="202.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="203.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="204.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="205.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="206.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="207.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="22212234"/>
+						<string key="toolTip">Use offscreen drawing to remove some graphics glitches</string>
+					</object>
+				</object>
+				<boolean value="NO" key="207.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="207.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array class="NSMutableArray" key="212.IBNSViewMetadataConstraints">
+					<reference ref="965322871"/>
+					<reference ref="366484982"/>
+					<reference ref="978066067"/>
+					<reference ref="949516016"/>
+					<reference ref="639952861"/>
+					<reference ref="491859289"/>
+					<reference ref="571975854"/>
+					<reference ref="641205651"/>
+					<reference ref="112135928"/>
+					<reference ref="586531004"/>
+					<reference ref="396204290"/>
+					<reference ref="208453234"/>
+					<reference ref="718407732"/>
+					<reference ref="854035731"/>
+					<reference ref="302037459"/>
+				</array>
+				<boolean value="NO" key="212.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="212.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array class="NSMutableArray" key="215.IBNSViewMetadataConstraints">
+					<reference ref="909266590"/>
+				</array>
+				<boolean value="NO" key="215.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="215.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="216.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="217.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="218.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="219.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="220.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="258095043"/>
+						<string key="toolTip">Select the method the PSX uses to read the contents of the screen</string>
+					</object>
+				</object>
+				<boolean value="NO" key="220.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="220.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="250.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="251.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="252.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="417181210"/>
+						<string key="toolTip">Filter textures when scaled. Higher values filter more kinds of textures, i.e. sprites.</string>
+					</object>
+				</object>
+				<boolean value="NO" key="252.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="252.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="253.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="542707641"/>
+						<string key="toolTip">Select a quality level of texture scaling</string>
+					</object>
+				</object>
+				<boolean value="NO" key="253.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="253.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="254.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="255.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="341.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="322419177"/>
+						<string key="toolTip">Select a color and transparency for the scanlines</string>
+					</object>
+				</object>
+				<array key="341.IBNSViewMetadataConstraints">
+					<reference ref="328197195"/>
+					<reference ref="632568330"/>
+				</array>
+				<boolean value="NO" key="341.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="341.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="374.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="375.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="376.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="377.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="380.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="383.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="384.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="385.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="386.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="387.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="388.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="389.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="390.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="391.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="392.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="393.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="394.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="395.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="396.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="397.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="398.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="399.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="400.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="401.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="402.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="406.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="472.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="472.NSWindowTemplate.visibleAtLaunch"/>
+				<array key="473.IBNSViewMetadataConstraints">
+					<reference ref="915712074"/>
+					<reference ref="431500627"/>
+					<reference ref="712777825"/>
+					<reference ref="41842397"/>
+					<reference ref="713570101"/>
+					<reference ref="236363735"/>
+					<reference ref="332115623"/>
+					<reference ref="308311365"/>
+					<reference ref="395851187"/>
+					<reference ref="12744196"/>
+					<reference ref="992114042"/>
+				</array>
+				<string key="473.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="474.IBNSViewMetadataConstraints">
+					<reference ref="153835582"/>
+					<reference ref="995988463"/>
+					<reference ref="62551024"/>
+				</array>
+				<boolean value="NO" key="474.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="474.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="475.IBNSViewMetadataConstraints">
+					<reference ref="513797283"/>
+				</array>
+				<boolean value="NO" key="475.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="475.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="476.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="476.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="477.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="478.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="479.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="479.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="480.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="16264460"/>
+						<string key="toolTip">For buggy motherboard chipsets</string>
+					</object>
+				</object>
+				<string key="480.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="481.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="372830145"/>
+						<string key="toolTip">Needed with epsxe 1.5.2 and older, Chrono Cross</string>
+					</object>
+				</object>
+				<string key="481.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="482.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="53473145"/>
+						<string key="toolTip">Needed by some (buggy) OpenGL ICDs</string>
+					</object>
+				</object>
+				<string key="482.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="483.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="757070565"/>
+						<string key="toolTip">DW7 fix (not 100% perfect...)</string>
+					</object>
+				</object>
+				<string key="483.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="484.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="949439378"/>
+						<string key="toolTip">Fixes black areas with some cards</string>
+					</object>
+				</object>
+				<string key="484.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="485.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="806892743"/>
+						<string key="toolTip">Toggles busy flags after drawing</string>
+					</object>
+				</object>
+				<string key="485.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="486.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="854561282"/>
+						<string key="toolTip">Shows the full area in Capcom 2D fighters</string>
+					</object>
+				</object>
+				<string key="486.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="487.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="876785218"/>
+						<string key="toolTip">ONLY for FF9 battle mode... yellow rect</string>
+					</object>
+				</object>
+				<string key="487.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="488.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="306324820"/>
+						<string key="toolTip">May show some additional splash screens</string>
+					</object>
+				</object>
+				<string key="488.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="489.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="601226499"/>
+						<string key="toolTip">ONLY for FF7 battle cursor/battle swirl</string>
+					</object>
+				</object>
+				<string key="489.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="490.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="877662516"/>
+						<string key="toolTip">Speed up in nasty frame upload situations</string>
+					</object>
+				</object>
+				<string key="490.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="491.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="196368836"/>
+						<string key="toolTip">Fixes black screens in Lunar</string>
+					</object>
+				</object>
+				<string key="491.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="492.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="11594003"/>
+						<string key="toolTip">Speed freaks, Killer Loop</string>
+					</object>
+				</object>
+				<string key="492.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="493.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="467507890"/>
+						<string key="toolTip">Old coord compatibility mode</string>
+					</object>
+				</object>
+				<string key="493.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="494.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="70620311"/>
+						<string key="toolTip">Leg. o. Dragoon, Alpha Multipass needed</string>
+					</object>
+				</object>
+				<string key="494.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="495.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="376960548"/>
+						<string key="toolTip">Faster FB access on some systems/ATI</string>
+					</object>
+				</object>
+				<string key="495.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="496.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="206217604"/>
+						<string key="toolTip">Better fps limitation with some games</string>
+					</object>
+				</object>
+				<string key="496.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="497.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="879332229"/>
+						<string key="toolTip">Skips only every second frame</string>
+					</object>
+				</object>
+				<string key="497.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="498.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="5.IBWindowTemplateEditedContentRect">{{329, 362}, {781, 483}}</string>
+				<boolean value="NO" key="501.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="501.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="502.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="503.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="503.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="504.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="563.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="564.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="566.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="567.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="6.IBNSViewMetadataConstraints">
+					<reference ref="286849860"/>
+					<reference ref="886877005"/>
+					<reference ref="835626842"/>
+					<reference ref="399676453"/>
+					<reference ref="679724350"/>
+					<reference ref="754287637"/>
+					<reference ref="740083102"/>
+					<reference ref="864078760"/>
+					<reference ref="316479015"/>
+					<reference ref="674894137"/>
+					<reference ref="54228565"/>
+					<reference ref="961787435"/>
+					<reference ref="799775192"/>
+					<reference ref="487201551"/>
+				</array>
+				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="600.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="607.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="623.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="624.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="650.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="651.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="652.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="653.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="654.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="655.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="656.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="657.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="658.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="659.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="660.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="661.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="662.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="663.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="664.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="665.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="665.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="666.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="667.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="668.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="670.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="670.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="671.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="672.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="673.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="674.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="674.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="675.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="676.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="677.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="680.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="682.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="692.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="694.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="701.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="702.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="702.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="703.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="734.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="735.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="736.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="739.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="741.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="745.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="748.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="749.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="754.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="755.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="758.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="767.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="785.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="785.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="786.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="799.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="814.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array class="NSMutableArray" key="89.IBNSViewMetadataConstraints">
+					<reference ref="94672714"/>
+					<reference ref="669467068"/>
+					<reference ref="777888020"/>
+					<reference ref="573791310"/>
+					<reference ref="155261569"/>
+					<reference ref="521745551"/>
+					<reference ref="735877365"/>
+					<reference ref="1032234245"/>
+					<reference ref="730197785"/>
+					<reference ref="248664546"/>
+					<reference ref="949214693"/>
+					<reference ref="30506148"/>
+				</array>
+				<boolean value="NO" key="89.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="89.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="907.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="908.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="126384619"/>
+						<string key="toolTip">Change resolution to this when going full screen</string>
+					</object>
+				</object>
+				<array key="908.IBNSViewMetadataConstraints">
+					<reference ref="539740235"/>
+				</array>
+				<boolean value="NO" key="908.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="908.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="909.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="1001794195"/>
+						<string key="toolTip">Change resolution to this when going full screen</string>
+					</object>
+				</object>
+				<array key="909.IBNSViewMetadataConstraints">
+					<reference ref="2238138"/>
+					<reference ref="493980679"/>
+				</array>
+				<boolean value="NO" key="909.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="909.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="910.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="560326422"/>
+						<string key="toolTip">When checked, will keep the PSX display at natural aspect ratio</string>
+					</object>
+				</object>
+				<boolean value="NO" key="910.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="910.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="911.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="911.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="912.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="912.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="913.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="914.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="915.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1041" key="916.IBNumberFormatterBehaviorMetadataKey"/>
+				<boolean value="YES" key="916.IBNumberFormatterLocalizesFormatMetadataKey"/>
+				<string key="916.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="1041" key="917.IBNumberFormatterBehaviorMetadataKey"/>
+				<boolean value="YES" key="917.IBNumberFormatterLocalizesFormatMetadataKey"/>
+				<string key="917.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="918.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="919.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="920.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="921.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="922.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="923.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="924.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="925.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="926.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="927.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="928.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="929.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="930.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="931.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="932.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="936.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="938.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="939.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="940.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="943.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="944.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="945.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="946.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="947.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="948.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="965.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="975.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="977.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="978.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="980.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="981.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="983.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="985.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="986.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="987.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="989.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="991.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="993.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="995.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="997.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			</dictionary>
+			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+			<nil key="activeLocalization"/>
+			<dictionary class="NSMutableDictionary" key="localizations"/>
+			<nil key="sourceID"/>
+			<int key="maxID">1041</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">FirstResponder</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">:</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBUserSource</string>
+						<string key="minorKey"/>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSLayoutConstraint</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/NSLayoutConstraint.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NetSfPeopsOpenGLPluginConfigController</string>
+					<string key="superclassName">NSWindowController</string>
+					<dictionary class="NSMutableDictionary" key="actions">
+						<string key="cancel:">id</string>
+						<string key="closeHacks:">id</string>
+						<string key="hackToggle:">id</string>
+						<string key="ok:">id</string>
+						<string key="reset:">id</string>
+						<string key="showHacks:">id</string>
+						<string key="toggleCheck:">id</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="actionInfosByName">
+						<object class="IBActionInfo" key="cancel:">
+							<string key="name">cancel:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="closeHacks:">
+							<string key="name">closeHacks:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="hackToggle:">
+							<string key="name">hackToggle:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="ok:">
+							<string key="name">ok:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="reset:">
+							<string key="name">reset:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="showHacks:">
+							<string key="name">showHacks:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="toggleCheck:">
+							<string key="name">toggleCheck:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="advancedBlending">NSCell</string>
+						<string key="autoFullScreen">NSCell</string>
+						<string key="blurEffect">NSCell</string>
+						<string key="ditherMode">NSPopUpButton</string>
+						<string key="drawScanlines">NSCell</string>
+						<string key="fpsCounter">NSCell</string>
+						<string key="frameBufferEffects">NSPopUpButton</string>
+						<string key="frameSkipping">NSCell</string>
+						<string key="fullscreenSize">NSPopUpButton</string>
+						<string key="gteAccuracy">NSCell</string>
+						<string key="hackEnable">NSControl</string>
+						<string key="hacksMatrix">NSMatrix</string>
+						<string key="hacksWindow">NSWindow</string>
+						<string key="mjpegDecoder">NSCell</string>
+						<string key="mjpegDecoder15bit">NSCell</string>
+						<string key="offscreenDrawing">NSPopUpButton</string>
+						<string key="opaquePass">NSCell</string>
+						<string key="proportionalResize">NSControl</string>
+						<string key="scanlineColorWell">NSColorWell</string>
+						<string key="texColorDepth">NSPopUpButton</string>
+						<string key="texEnhancment">NSSlider</string>
+						<string key="texFiltering">NSSlider</string>
+						<string key="vSync">NSCell</string>
+						<string key="windowHeighth">NSFormCell</string>
+						<string key="windowWidth">NSFormCell</string>
+						<string key="wireframeOnly">NSCell</string>
+						<string key="zMaskClipping">NSCell</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="advancedBlending">
+							<string key="name">advancedBlending</string>
+							<string key="candidateClassName">NSCell</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="autoFullScreen">
+							<string key="name">autoFullScreen</string>
+							<string key="candidateClassName">NSCell</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="blurEffect">
+							<string key="name">blurEffect</string>
+							<string key="candidateClassName">NSCell</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="ditherMode">
+							<string key="name">ditherMode</string>
+							<string key="candidateClassName">NSPopUpButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="drawScanlines">
+							<string key="name">drawScanlines</string>
+							<string key="candidateClassName">NSCell</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="fpsCounter">
+							<string key="name">fpsCounter</string>
+							<string key="candidateClassName">NSCell</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="frameBufferEffects">
+							<string key="name">frameBufferEffects</string>
+							<string key="candidateClassName">NSPopUpButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="frameSkipping">
+							<string key="name">frameSkipping</string>
+							<string key="candidateClassName">NSCell</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="fullscreenSize">
+							<string key="name">fullscreenSize</string>
+							<string key="candidateClassName">NSPopUpButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="gteAccuracy">
+							<string key="name">gteAccuracy</string>
+							<string key="candidateClassName">NSCell</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="hackEnable">
+							<string key="name">hackEnable</string>
+							<string key="candidateClassName">NSControl</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="hacksMatrix">
+							<string key="name">hacksMatrix</string>
+							<string key="candidateClassName">NSMatrix</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="hacksWindow">
+							<string key="name">hacksWindow</string>
+							<string key="candidateClassName">NSWindow</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="mjpegDecoder">
+							<string key="name">mjpegDecoder</string>
+							<string key="candidateClassName">NSCell</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="mjpegDecoder15bit">
+							<string key="name">mjpegDecoder15bit</string>
+							<string key="candidateClassName">NSCell</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="offscreenDrawing">
+							<string key="name">offscreenDrawing</string>
+							<string key="candidateClassName">NSPopUpButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="opaquePass">
+							<string key="name">opaquePass</string>
+							<string key="candidateClassName">NSCell</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="proportionalResize">
+							<string key="name">proportionalResize</string>
+							<string key="candidateClassName">NSControl</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="scanlineColorWell">
+							<string key="name">scanlineColorWell</string>
+							<string key="candidateClassName">NSColorWell</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="texColorDepth">
+							<string key="name">texColorDepth</string>
+							<string key="candidateClassName">NSPopUpButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="texEnhancment">
+							<string key="name">texEnhancment</string>
+							<string key="candidateClassName">NSSlider</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="texFiltering">
+							<string key="name">texFiltering</string>
+							<string key="candidateClassName">NSSlider</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="vSync">
+							<string key="name">vSync</string>
+							<string key="candidateClassName">NSCell</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="windowHeighth">
+							<string key="name">windowHeighth</string>
+							<string key="candidateClassName">NSFormCell</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="windowWidth">
+							<string key="name">windowWidth</string>
+							<string key="candidateClassName">NSFormCell</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="wireframeOnly">
+							<string key="name">wireframeOnly</string>
+							<string key="candidateClassName">NSCell</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="zMaskClipping">
+							<string key="name">zMaskClipping</string>
+							<string key="candidateClassName">NSCell</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/NetSfPeopsOpenGLPluginConfigController.h</string>
+					</object>
+				</object>
+			</array>
+		</object>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<real value="1070" key="NS.object.0"/>
+		</object>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<string key="NSMenuCheckmark">{11, 11}</string>
+			<string key="NSMenuMixedState">{10, 3}</string>
+			<string key="NSSwitch">{15, 15}</string>
+		</dictionary>
+		<bool key="IBDocument.UseAutolayout">YES</bool>
+	</data>
+</archive>

pcsxr-1.9.93.tar.bz2/macosx/plugins/PeopsXgl/Info.plist Added

pcsxr-1.9.93.tar.bz2/macosx/plugins/PeopsXgl/NetSfPeopsOpenGLGPUInterface.xib Added

@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
+	<data>
+		<int key="IBDocument.SystemTarget">1070</int>
+		<string key="IBDocument.SystemVersion">12E55</string>
+		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
+		<string key="IBDocument.AppKitVersion">1187.39</string>
+		<string key="IBDocument.HIToolboxVersion">626.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			<string key="NS.object.0">3084</string>
+		</object>
+		<array key="IBDocument.IntegratedClassDependencies">
+			<string>NSCustomObject</string>
+			<string>NSOpenGLView</string>
+			<string>NSView</string>
+			<string>NSWindowTemplate</string>
+		</array>
+		<array key="IBDocument.PluginDependencies">
+			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+		</array>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="859867644">
+			<object class="NSCustomObject" id="85182862">
+				<string key="NSClassName">NetSfPeopsSoftGPUPluginWindowController</string>
+			</object>
+			<object class="NSCustomObject" id="566580896">
+				<string key="NSClassName">FirstResponder</string>
+			</object>
+			<object class="NSCustomObject" id="226993472">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSWindowTemplate" id="620154068">
+				<int key="NSWindowStyleMask">11</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{108, 331}, {640, 480}}</string>
+				<int key="NSWTFlags">544735232</int>
+				<string key="NSWindowTitle">PeopsOpenGL Display</string>
+				<string key="NSWindowClass">NetSfPeopsOpenGLGPUPluginWindow</string>
+				<object class="NSMutableString" key="NSViewClass">
+					<characters key="NS.bytes">View</characters>
+				</object>
+				<nil key="NSUserInterfaceItemIdentifier"/>
+				<string key="NSWindowContentMinSize">{213, 107}</string>
+				<object class="NSView" key="NSWindowView" id="342853515">
+					<reference key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<array class="NSMutableArray" key="NSSubviews">
+						<object class="NSOpenGLView" id="622673132">
+							<reference key="NSNextResponder" ref="342853515"/>
+							<int key="NSvFlags">256</int>
+							<string key="NSFrameSize">{640, 480}</string>
+							<reference key="NSSuperview" ref="342853515"/>
+							<reference key="NSWindow"/>
+							<object class="NSOpenGLPixelFormat" key="NSPixelFormat">
+								<object class="NSMutableData" key="NSPixelAttributes">
+									<bytes key="NS.bytes">AAAACAAAACAAAAAAA</bytes>
+								</object>
+							</object>
+						</object>
+					</array>
+					<string key="NSFrameSize">{640, 480}</string>
+					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
+				<string key="NSMinSize">{213, 129}</string>
+				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
+				<bool key="NSWindowIsRestorable">YES</bool>
+			</object>
+		</array>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<array class="NSMutableArray" key="connectionRecords">
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">window</string>
+						<reference key="source" ref="85182862"/>
+						<reference key="destination" ref="620154068"/>
+					</object>
+					<int key="connectionID">8</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">glView</string>
+						<reference key="source" ref="85182862"/>
+						<reference key="destination" ref="622673132"/>
+					</object>
+					<int key="connectionID">16</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="620154068"/>
+						<reference key="destination" ref="85182862"/>
+					</object>
+					<int key="connectionID">13</int>
+				</object>
+			</array>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<array key="orderedObjects">
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<array key="object" id="0"/>
+						<reference key="children" ref="859867644"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="85182862"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="566580896"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">First Responder</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5</int>
+						<reference key="object" ref="620154068"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="342853515"/>
+						</array>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Window</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6</int>
+						<reference key="object" ref="342853515"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="622673132"/>
+						</array>
+						<reference key="parent" ref="620154068"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">15</int>
+						<reference key="object" ref="622673132"/>
+						<reference key="parent" ref="342853515"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-3</int>
+						<reference key="object" ref="226993472"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Application</string>
+					</object>
+				</array>
+			</object>
+			<dictionary class="NSMutableDictionary" key="flattenedProperties">
+				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="15.CustomClassName">NetSfPeopsOpenGLGPUPluginGLView</string>
+				<string key="15.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			</dictionary>
+			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+			<nil key="activeLocalization"/>
+			<dictionary class="NSMutableDictionary" key="localizations"/>
+			<nil key="sourceID"/>
+			<int key="maxID">17</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">NetSfPeopsOpenGLGPUPluginGLView</string>
+					<string key="superclassName">NSOpenGLView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/NetSfPeopsOpenGLGPUPluginGLView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NetSfPeopsOpenGLGPUPluginWindow</string>
+					<string key="superclassName">NSWindow</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/NetSfPeopsOpenGLGPUPluginWindow.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NetSfPeopsSoftGPUPluginWindowController</string>
+					<string key="superclassName">NSWindowController</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">glView</string>
+						<string key="NS.object.0">NSOpenGLView</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">glView</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">glView</string>
+							<string key="candidateClassName">NSOpenGLView</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/NetSfPeopsSoftGPUPluginWindowController.h</string>
+					</object>
+				</object>
+			</array>
+		</object>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<real value="1070" key="NS.object.0"/>
+		</object>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+	</data>
+</archive>

pcsxr-1.9.93.tar.bz2/macosx/plugins/PeopsXgl/macsrc Added

pcsxr-1.9.93.tar.bz2/macosx/plugins/PeopsXgl/macsrc/ExtendedKeys.h Added

pcsxr-1.9.93.tar.bz2/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.h Added

@@ -0,0 +1,68 @@
+/* NetSfPeopsSoftGPUPluginConfigController */
+/* All the various stuff needed for configuration is done here, including reading 
+ the preferences and displaying a dialog box for the user
+*/
+
+#define PluginConfigController NetSfPeopsOpenGLPluginConfigController
+
+#import <Cocoa/Cocoa.h>
+
+@interface NetSfPeopsOpenGLPluginConfigController : NSWindowController
+{
+ // buncha controls.
+ // most aren't worthy as IBOutlets since the IB interface
+ // uses bindings to magically set user defaults.
+ // But you can look at their grandness if you like:
+ 
+ IBOutlet NSCell *autoFullScreen;
+ IBOutlet NSPopUpButton *ditherMode;
+ IBOutlet NSCell *fpsCounter;
+ IBOutlet NSCell *frameSkipping;
+ IBOutlet NSCell *vSync;
+ 
+ IBOutlet NSControl *proportionalResize;
+ IBOutlet NSPopUpButton *fullscreenSize;
+	IBOutlet NSFormCell *windowWidth;
+	IBOutlet NSFormCell *windowHeighth;
+ IBOutlet NSPopUpButton *offscreenDrawing;
+ 
+ IBOutlet NSPopUpButton *texColorDepth;
+ IBOutlet NSSlider *texFiltering;
+ IBOutlet NSSlider *texEnhancment;
+ 
+ IBOutlet NSPopUpButton *frameBufferEffects;
+
+ IBOutlet NSCell *drawScanlines;
+ IBOutlet NSCell *advancedBlending;
+ IBOutlet NSCell *opaquePass;
+ IBOutlet NSCell *zMaskClipping;
+ IBOutlet NSCell *wireframeOnly;
+ IBOutlet NSCell *blurEffect;
+ IBOutlet NSCell *mjpegDecoder;
+ IBOutlet NSCell *mjpegDecoder15bit;
+	IBOutlet NSCell *gteAccuracy;
+	IBOutlet NSColorWell *scanlineColorWell;
+	
+	IBOutlet NSMatrix *hacksMatrix;
+	IBOutlet NSControl *hackEnable;
+ IBOutlet NSWindow *hacksWindow;
+ 
+	NSMutableDictionary *keyValues;
+}
+@property (readwrite, retain) NSMutableDictionary *keyValues;
+
+- (IBAction)cancel:(id)sender;
+- (IBAction)ok:(id)sender;
+- (IBAction)reset:(id)sender;
+- (IBAction)toggleCheck:(id)sender;
+
+- (IBAction)hackToggle:(id)sender;
+- (IBAction)showHacks:(id)sender;
+- (IBAction)closeHacks:(id)sender;
+
+- (void)loadValues;
+
+@end
+
+void PrepFactoryDefaultPreferences(void);
+

pcsxr-1.9.93.tar.bz2/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m Added

@@ -0,0 +1,470 @@
+
+/* All the various stuff needed for configuration is done here, 
+ including reading the Config file and displaying a dialog box
+ AboutDlgProc() is a plug-in function called from the PCSXR app, as is
+ DlgProc()
+*/
+
+#import "NetSfPeopsOpenGLPluginConfigController.h"
+#include "gpu.h"
+#include "cfg.h"
+#include "menu.h"
+#include <OpenGL/gl.h> // bah, "externals.h" thinks include files are for wimps; OpenGL header, in fact, is needed
+#include "externals.h"
+#import "ARCBridge.h"
+#import "PluginGLView.h"
+
+#ifdef ENABLE_NLS
+#include <libintl.h>
+#include <locale.h>
+#define _(x) gettext(x)
+#define N_(x) (x)
+//If running under Mac OS X, use the Localizable.strings file instead.
+#elif defined(_MACOSX)
+#ifdef PCSXRCORE
+__private_extern__ char* Pcsxr_locale_text(char* toloc);
+#define _(String) Pcsxr_locale_text(String)
+#define N_(String) String
+#else
+#ifndef PCSXRPLUG
+#warning please define the plug being built to use Mac OS X localization!
+#define _(msgid) msgid
+#define N_(msgid) msgid
+#else
+//Kludge to get the preprocessor to accept PCSXRPLUG as a variable.
+#define PLUGLOC_x(x,y) x ## y
+#define PLUGLOC_y(x,y) PLUGLOC_x(x,y)
+#define PLUGLOC PLUGLOC_y(PCSXRPLUG,_locale_text)
+__private_extern__ char* PLUGLOC(char* toloc);
+#define _(String) PLUGLOC(String)
+#define N_(String) String
+#endif
+#endif
+#else
+#define _(x) (x)
+#define N_(x) (x)
+#endif
+
+#define APP_ID @"net.sf.peops.GpuOpenGLPlugin"
+#define PrefsKey APP_ID @" Settings"
+
+static NetSfPeopsOpenGLPluginConfigController *windowController = nil;
+
+void AboutDlgProc()
+{
+	// Get parent application instance
+	NSBundle *bundle = [NSBundle bundleWithIdentifier:APP_ID];
+	
+	// Get Credits.rtf
+	NSString *path = [bundle pathForResource:@"Credits" ofType:@"rtf"];
+	NSAttributedString *credits;
+	if (path) {
+		credits = AUTORELEASEOBJ([[NSAttributedString alloc] initWithPath:path documentAttributes:NULL]);
+	} else {
+		credits = AUTORELEASEOBJ([[NSAttributedString alloc] initWithString:@""]);
+	}
+	
+	// Get Application Icon
+	NSImage *icon = [[NSWorkspace sharedWorkspace] iconForFile:[bundle bundlePath]];
+	NSSize size = NSMakeSize(64, 64);
+	[icon setSize:size];
+	
+	NSDictionary *infoPaneDict =
+	[[NSDictionary alloc] initWithObjectsAndKeys:
+	 [bundle objectForInfoDictionaryKey:@"CFBundleName"], @"ApplicationName",
+	 icon, @"ApplicationIcon",
+	 [bundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"], @"ApplicationVersion",
+	 [bundle objectForInfoDictionaryKey:@"CFBundleVersion"], @"Version",
+	 [bundle objectForInfoDictionaryKey:@"NSHumanReadableCopyright"], @"Copyright",
+	 credits, @"Credits",
+	 nil];
+	dispatch_async(dispatch_get_main_queue(), ^{
+		[NSApp orderFrontStandardAboutPanelWithOptions:infoPaneDict];
+	});
+	RELEASEOBJ(infoPaneDict);
+}
+
+void DlgProc()
+{
+	RunOnMainThreadSync(^{
+		NSWindow *window;
+		
+		PrepFactoryDefaultPreferences(); // Must do here to avoid a "when does such-and-such bind" issue
+		
+		if (windowController == nil) {
+			windowController = [[PluginConfigController alloc] initWithWindowNibName:@"NetSfPeopsOpenGLConfig"];
+		}
+		window = [windowController window];
+		
+		/* load values */
+		[windowController loadValues];
+		
+		[window center];
+		[window makeKeyAndOrderFront:nil];
+	});
+}
+
+#define kFPSCounter @"FPS Counter"
+#define kHacks @"Hacks"
+#define kAutoFullScreen @"Auto Full Screen"
+#define kFrameSkipping @"Frame Skipping"
+#define kFrameLimit @"Frame Limit"
+#define kVSync @"VSync"
+#define kHacksEnable @"Enable Hacks"
+#define kWindowSize @"Window Size"
+
+void PrepFactoryDefaultPreferences(void)
+{
+ // THE place to find the names of settings.
+ // If it's not here, you can't set it.
+
+ // create or read a sub-dictionary beneath the main PCSXR app prefs.
+ // dictionary is named "net.sf.GpuOpenGLPlugin Settings"
+ // and contains all our key/values
+ // the prefs .plist will store this dictionary ("net.sf...") as an object
+ 
+	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+
+	NSDictionary* keyValues = [defaults dictionaryForKey:PrefsKey];
+	BOOL windowSizeNeedsReset = NO;
+	if (keyValues) {
+		NSSize size = NSSizeFromString([keyValues objectForKey:kWindowSize]);
+		if (![keyValues objectForKey:kWindowSize]) {
+			windowSizeNeedsReset = YES;
+		} else if ([[keyValues objectForKey:kWindowSize] isKindOfClass:[NSNumber class]]) {
+			windowSizeNeedsReset = YES;
+		} else if (size.height == 0 || size.width == 0) {
+			windowSizeNeedsReset = YES;
+		}
+	}
+	if (windowSizeNeedsReset) {
+		NSMutableDictionary *tmpDict = [[NSMutableDictionary alloc] initWithDictionary:keyValues];
+		[tmpDict setObject:NSStringFromSize(NSMakeSize(800, 600)) forKey:kWindowSize];
+		[defaults setObject:tmpDict forKey:PrefsKey];
+		[defaults synchronize];
+		RELEASEOBJ(tmpDict);
+	}
+	keyValues = nil;
+	
+	[defaults registerDefaults:[NSDictionary dictionaryWithObjectsAndKeys:
+								 [NSDictionary dictionaryWithObjectsAndKeys:
+								 @NO, kFPSCounter,
+								 @NO, kAutoFullScreen,
+								 @NO, kFrameSkipping,
+								 @YES, kFrameLimit,
+								 @NO, kVSync,
+								 @NO, kHacksEnable,
+								 @0, @"Dither Mode",
+								 @0, kHacks,
+								 
+								 @YES, @"Proportional Resize",
+								 //[NSSize stringWithCString: @"default"], @"Fullscreen Resolution",
+								 @2, @"Offscreen Drawing Level",
+								 @0, @"Texture Color Depth Level",
+								 @0, @"Texture Enhancement Level",
+								 @0, @"Texture Filter Level",
+								 @0, @"Frame Buffer Level",
+								 NSStringFromSize(NSMakeSize(800, 600)), kWindowSize,
+								 @NO, @"Draw Scanlines",
+								 // nasty:
+								 [NSArchiver archivedDataWithRootObject: [NSColor colorWithCalibratedRed:0 green:0 blue:0 alpha:0.25]], @"Scanline Color",
+								 @NO, @"Advanced Blending",
+								 @NO, @"Opaque Pass",
+								 @NO, @"Blur",
+								 @YES, @"Z Mask Clipping",
+								 @NO, @"Wireframe Mode",
+								 @YES, @"Emulate mjpeg decoder", // helps remove unsightly vertical line in movies
+								 @NO, @"Fast mjpeg decoder",
+								 @YES, @"GteAccuracy",
+								 nil], PrefsKey, nil]];
+}
+
+void ReadConfig(void)
+{
+ // set up PCSXR GPU plug's global variables according to user preferences.
+ // this is called from the PCSXR GPU plugin thread via GPUOpen.
+ 
+ // has nothing to do with the Configuration dialog box, btw., other than the
+ // fact that the config dialog writes to user prefs. This only reads, which
+ // is important because PCSXR will change its globals on the fly
+ // and saving those new ad hoc changes is Bad for the user.
+ 
+ PrepFactoryDefaultPreferences(); // in case user deletes, or on new startup
+	
+ NSDictionary* keyValues = [[NSUserDefaults standardUserDefaults] dictionaryForKey:PrefsKey];
+		
+ // bind all prefs settings to their PCSXR counterparts
+ // with a little finagling to make it work as expected
+	iShowFPS = [[keyValues objectForKey:kFPSCounter] boolValue];
+ 
+ if ([[keyValues objectForKey:kFrameLimit] boolValue]){
+ bUseFrameLimit = 1;
+ iFrameLimit = 2; // required
+ fFrameRate = 60; // required (some number, 60 seems ok)
+ }
+	
+	// Dithering is either on or off in OpenGL plug, but hey
+	bDrawDither = [[keyValues objectForKey:@"Dither Mode"] intValue];
+	
+	bChangeWinMode = [[keyValues objectForKey:kAutoFullScreen] boolValue] ? 2 : 1;
+	bUseFrameSkip = [[keyValues objectForKey:kFrameSkipping] boolValue];
+	
+	bUseFixes = [[keyValues objectForKey:kHacksEnable] boolValue];
+	dwCfgFixes = [[keyValues objectForKey:kHacks] unsignedIntValue];
+ 
+	
+	// we always start out at 800x600 (at least until resizing the window is implemented)
+	NSSize winSize = NSSizeFromString([keyValues objectForKey:kWindowSize]);
+	if (bChangeWinMode == 1) {
+		iResX = winSize.width;
+		iResY = winSize.height;
+	} else {
+		iResX = 800;
+		iResY = 600;
+	}
+	
+ iBlurBuffer = [[keyValues objectForKey:@"Blur"] boolValue]; // not noticeable, but doesn't harm
+ iUseScanLines = [[keyValues objectForKey:@"Draw Scanlines"] boolValue]; // works
+ NSColor* scanColor = [NSUnarchiver unarchiveObjectWithData:[keyValues objectForKey:@"Scanline Color"]];
+	scanColor = [scanColor colorUsingColorSpace:[NSColorSpace deviceRGBColorSpace]];
+ iScanlineColor[0] = [scanColor redComponent];
+ iScanlineColor[1] = [scanColor greenComponent];
+ iScanlineColor[2] = [scanColor blueComponent];
+ iScanlineColor[3] = [scanColor alphaComponent];
+ 
+ iScanBlend = 0; // we always draw nice since it costs nothing.
+ iUseMask = [[keyValues objectForKey:@"Z Mask Clipping"] boolValue]; // works, clips polygons with primitive "Z" buffer
+ bUseLines = [[keyValues objectForKey:@"Wireframe Mode"] boolValue]; // works, aka "Wireframe" mode
+ iOffscreenDrawing = [[keyValues objectForKey:@"Offscreen Drawing Level"] intValue]; // draw offscreen for texture building?
+ if (iOffscreenDrawing > 4) iOffscreenDrawing = 4;
+ if (iOffscreenDrawing < 0) iOffscreenDrawing = 0;
+ 
+	
+	// texture quality, whatever that means (doesn't hurt), more like "texture handling" or "texture performance"
+ iFrameTexType = [[keyValues objectForKey:@"Frame Buffer Level"] intValue];
+ if (iFrameTexType > 3) iFrameTexType = 3;
+ if (iFrameTexType < 0) iFrameTexType = 0;
+ 
+ iTexQuality = [[keyValues objectForKey:@"Texture Color Depth Level"] intValue];
+ if (iTexQuality > 4) iTexQuality = 4;
+ if (iTexQuality < 0) iTexQuality = 0;
+	
+	// MAG_FILTER = LINEAR, etc.
+ iFilterType = [[keyValues objectForKey:@"Texture Filter Level"] intValue];
+ if (iFilterType > 2) iFilterType = 2;
+ if (iFilterType < 0) iFilterType = 0;
+ 
+	// stretches textures (more detail). You'd think it would look great, but it's not massively better. NEEDS iFilterType to be of any use.
+ iHiResTextures = [[keyValues objectForKey:@"Texture Enhancement Level"] intValue];
+ if (iHiResTextures > 2) iHiResTextures = 2;
+ if (iHiResTextures < 0) iHiResTextures = 0;
+ 
+ // well actually, the "SaI" mode is best, but is #1, so swap qualities:
+ if (iHiResTextures != 0)
+ iHiResTextures = 3 - iHiResTextures;
+ 
+ if (iHiResTextures && !iFilterType)
+ iFilterType = 1; // needed to see any real effect
+ 
+ bUseFastMdec = [[keyValues objectForKey:@"Emulate mjpeg decoder"] boolValue];
+ bUse15bitMdec = [[keyValues objectForKey:@"Fast mjpeg decoder"] boolValue];
+ bGteAccuracy = [[keyValues objectForKey:@"GteAccuracy"] boolValue];
+	
+	if (iShowFPS)
+		ulKeybits |= KEY_SHOWFPS;
+	else
+		ulKeybits &=~ KEY_SHOWFPS;
+	
+	// additional checks
+	if(!iColDepth)
+		iColDepth=32;
+	if(bUseFixes) {
+		dwActFixes = dwCfgFixes;
+	} else {
+		dwActFixes = 0;
+	}
+	
+	SetFixes();
+	
+	// need this or you'll be playing at light speed:
+	if(iFrameLimit == 2) SetAutoFrameCap();
+	bSkipNextFrame = FALSE;
+	
+	szDispBuf[0] = 0;
+	BuildDispMenu(0);
+}
+
+@implementation NetSfPeopsOpenGLPluginConfigController
+
+@synthesize keyValues;
+
+- (IBAction)cancel:(id)sender
+{
+	[self close];
+}
+
+- (IBAction)ok:(id)sender
+{
+	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+	
+	NSMutableDictionary *writeDic = [NSMutableDictionary dictionaryWithDictionary:keyValues];
+	[writeDic setObject:([fpsCounter integerValue] ? @YES : @NO) forKey:kFPSCounter];
+	[writeDic setObject:[NSArchiver archivedDataWithRootObject:[scanlineColorWell color]] forKey:@"Scanline Color"];
+	[writeDic setObject:([frameSkipping integerValue] ? @YES : @NO) forKey:kFrameSkipping];
+	[writeDic setObject:([autoFullScreen integerValue] ? @YES : @NO) forKey:kAutoFullScreen];
+	//[writeDic setObject:([frameLimit integerValue] ? @YES : @NO) forKey:kFrameLimit];
+	[writeDic setObject:([proportionalResize integerValue] ? @YES : @NO) forKey:@"Proportional Resize"];
+	[writeDic setObject:@([ditherMode indexOfSelectedItem]) forKey:@"Dither Mode"];
+	[writeDic setObject:@([offscreenDrawing indexOfSelectedItem]) forKey:@"Offscreen Drawing Level"];
+	[writeDic setObject:@([texColorDepth indexOfSelectedItem]) forKey:@"Texture Color Depth Level"];
+	[writeDic setObject:@([texEnhancment integerValue]) forKey:@"Texture Enhancement Level"];
+	[writeDic setObject:@([texFiltering integerValue]) forKey:@"Texture Filter Level"];
+	[writeDic setObject:@([frameBufferEffects indexOfSelectedItem]) forKey:@"Frame Buffer Level"];
+	[writeDic setObject:([drawScanlines integerValue] ? @YES : @NO) forKey:@"Draw Scanlines"];
+	[writeDic setObject:([advancedBlending integerValue] ? @YES : @NO) forKey:@"Advanced Blending"];
+	[writeDic setObject:([opaquePass integerValue] ? @YES : @NO) forKey:@"Opaque Pass"];
+	[writeDic setObject:([blurEffect integerValue] ? @YES : @NO) forKey:@"Blur"];
+	[writeDic setObject:([zMaskClipping integerValue] ? @YES : @NO) forKey:@"Z Mask Clipping"];
+	[writeDic setObject:([wireframeOnly integerValue] ? @YES : @NO) forKey:@"Wireframe Mode"];
+	[writeDic setObject:([mjpegDecoder integerValue] ? @YES : @NO) forKey:@"Emulate mjpeg decoder"];
+	[writeDic setObject:([mjpegDecoder15bit integerValue] ? @YES : @NO) forKey:@"Fast mjpeg decoder"];
+	[writeDic setObject:([gteAccuracy integerValue] ? @YES : @NO) forKey:@"GteAccuracy"];
+	[writeDic setObject:([vSync integerValue] ? @YES : @NO) forKey:kVSync];
+	[writeDic setObject:NSStringFromSize(NSMakeSize([windowWidth integerValue], [windowHeighth integerValue])) forKey:kWindowSize];
+	
+	[defaults setObject:writeDic forKey:PrefsKey];
+	[defaults synchronize];
+	
+	[self close];
+}
+
+- (IBAction)reset:(id)sender
+{
+	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+	[defaults removeObjectForKey:PrefsKey];
+	[self loadValues];
+}
+
+- (IBAction)hackToggle:(id)sender
+{
+ // enable the "hacks" checkboxes 
+	BOOL enable = [sender intValue] ? YES : NO;
+	NSArray *views = [hacksMatrix cells];
+
+	for (NSControl *control in views) {
+		[control setEnabled:enable];
+	}
+}
+
+- (void)loadHacksValues
+{
+	unsigned int hackValues = [[self.keyValues objectForKey:kHacks] unsignedIntValue];
+	[hackEnable setIntegerValue:[[self.keyValues objectForKey:kHacksEnable] boolValue]];
+
+ // build refs to hacks checkboxes
+	for (NSControl *control in [hacksMatrix cells]) {
+		[control setIntValue:(hackValues >> ([control tag] - 1)) & 1];
+	}
+	
+	[self hackToggle:hackEnable];
+}
+
+- (void)loadValues
+{
+// set up the window with the values in the .plist
+
+ PrepFactoryDefaultPreferences(); // in case we're starting anew
+
+	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+
+	/* load from preferences */
+	self.keyValues = [NSMutableDictionary dictionaryWithDictionary: [defaults dictionaryForKey:PrefsKey]];
+
+	[self loadHacksValues];
+	
+	[autoFullScreen setIntegerValue:[[keyValues objectForKey:kAutoFullScreen] boolValue]];
+	[ditherMode selectItemAtIndex:[[keyValues objectForKey:@"Dither Mode"] integerValue]];
+	[fpsCounter setIntegerValue:[[keyValues objectForKey:kFPSCounter] boolValue]];
+	[scanlineColorWell setColor:[NSUnarchiver unarchiveObjectWithData: [keyValues objectForKey:@"Scanline Color"]]];
+	[frameSkipping setIntegerValue:[[keyValues objectForKey:kFrameSkipping] boolValue]];
+	[advancedBlending setIntegerValue:[[keyValues objectForKey:@"Advanced Blending"] boolValue]];
+	[texFiltering setIntegerValue:[[keyValues objectForKey:@"Texture Filter Level"] integerValue]];
+	[texEnhancment setIntegerValue:[[keyValues objectForKey:@"Texture Enhancement Level"] integerValue]];
+	[zMaskClipping setIntegerValue:[[keyValues objectForKey:@"Z Mask Clipping"] integerValue]];
+	[mjpegDecoder setIntegerValue:[[keyValues objectForKey:@"Emulate mjpeg decoder"] boolValue]];
+	[mjpegDecoder15bit setIntegerValue:[[keyValues objectForKey:@"Fast mjpeg decoder"] boolValue]];
+	[drawScanlines setIntegerValue:[[keyValues objectForKey:@"Draw Scanlines"] boolValue]];
+	[offscreenDrawing selectItemAtIndex:[[keyValues objectForKey:@"Offscreen Drawing Level"] integerValue]];
+	[advancedBlending setIntegerValue:[[keyValues objectForKey:@"Advanced Blending"] boolValue]];
+	[opaquePass setIntegerValue:[[keyValues objectForKey:@"Opaque Pass"] boolValue]];
+	[wireframeOnly setIntegerValue:[[keyValues objectForKey:@"Wireframe Mode"] boolValue]];
+	[blurEffect setIntegerValue:[[keyValues objectForKey:@"Blur"] boolValue]];
+	[texColorDepth selectItemAtIndex:[[keyValues objectForKey:@"Texture Color Depth Level"] integerValue]];
+	[gteAccuracy setIntegerValue:[[keyValues objectForKey:@"GteAccuracy"] boolValue]];
+	[scanlineColorWell setEnabled:[[keyValues objectForKey:@"Draw Scanlines"] boolValue]];
+	[frameBufferEffects selectItemAtIndex:[[keyValues objectForKey:@"Frame Buffer Level"] integerValue]];
+	[vSync setIntegerValue:[[keyValues objectForKey:kVSync] boolValue]];
+	[proportionalResize setIntegerValue:[[keyValues objectForKey:@"Proportional Resize"] boolValue]];
+	NSSize winSize = NSSizeFromString([keyValues objectForKey:kWindowSize]);
+	[windowWidth setIntegerValue:winSize.width];
+	[windowHeighth setIntegerValue:winSize.height];
+}
+
+- (void)awakeFromNib
+{
+ [[NSColorPanel sharedColorPanel] setShowsAlpha:YES]; // eliminate dumb behavior!
+}
+
+- (void)hacksSheetDidEnd:(NSWindow *)sheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo
+{
+	NSParameterAssert(sheet == hacksWindow);
+	if (returnCode == NSCancelButton) {
+		//Reset hack preferences.
+		[self loadHacksValues];
+	} else {
+		unsigned int hackValues = 0;		
+		for (NSControl *control in [hacksMatrix cells]) {
+			hackValues |= [control intValue] << ([control tag] - 1);
+		}
+		NSMutableDictionary *writeDic = self.keyValues;
+		[writeDic setObject:@(hackValues) forKey:kHacks];
+		[writeDic setObject:([hackEnable integerValue] ? @YES : @NO) forKey:kHacksEnable];
+	}
+	[sheet orderOut:nil];
+}
+
+- (IBAction)closeHacks:(id)sender
+{
+	if ([sender tag] == 1) {
+		[NSApp endSheet:hacksWindow returnCode:NSOKButton];
+	} else {
+		[NSApp endSheet:hacksWindow returnCode:NSCancelButton];
+	}
+}
+
+- (IBAction)showHacks:(id)sender
+{
+	[NSApp beginSheet:hacksWindow modalForWindow:[self window] modalDelegate:self
+	 didEndSelector:@selector(hacksSheetDidEnd:returnCode:contextInfo:) contextInfo:NULL];
+}
+
+- (IBAction)toggleCheck:(id)sender
+{
+	if([sender tag] == 1) {
+		[scanlineColorWell setEnabled: [sender intValue] ? YES : NO];
+	}
+}
+
+#if !__has_feature(objc_arc)
+- (void)dealloc
+{
+	self.keyValues = nil;
+	
+	[super dealloc];
+}
+#endif
+
+@end
+
+#import "OSXPlugLocalization.h"
+PLUGLOCIMP([PluginConfigController class]);

pcsxr-1.9.93.tar.bz2/macosx/plugins/PeopsXgl/macsrc/PluginGLView.h Added

@@ -0,0 +1,55 @@
+/***************************************************************************
+ PluginGLView.h -- a view within game window, rudimentary OpenGL setup + maintainence
+ PeopsOpenGPU
+ 
+ Created by Gil Pedersen on Sun April 18 2004.
+ Copyright (c) 2004 Gil Pedersen.
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+#define PluginGLView NetSfPeopsOpenGLGPUPluginGLView
+
+#import <Cocoa/Cocoa.h>
+#import <OpenGL/gl.h>
+#include <sys/time.h>
+
+#define IMAGE_COUNT 2
+
+static inline void RunOnMainThreadSync(dispatch_block_t block)
+{
+	if ([NSThread isMainThread]) {
+		block();
+	} else {
+		dispatch_sync(dispatch_get_main_queue(), block);
+	}
+}
+
+@interface PluginGLView : NSOpenGLView
+{
+	struct timeval cycle_time;
+	
+	NSLock *glLock; // FIXME: wha?
+	BOOL noDisplay;
+	BOOL drawBG;
+
+}
+
+- (void)swapBuffer; // I wonder what this does ;-)
+- (void)clearBuffer:(BOOL)display;
+
+// overrides:
+- (id) initWithCoder: (NSCoder *) coder;
+- (BOOL)isOpaque;
+- (BOOL)acceptsFirstResponder;
+- (void)reshape;
+
+@end

pcsxr-1.9.93.tar.bz2/macosx/plugins/PeopsXgl/macsrc/PluginGLView.m Added

@@ -0,0 +1,155 @@
+/***************************************************************************
+ PluginGLView.m
+ a view within game window, rudimentary OpenGL setup + maintainence
+ Also, I clear the gl screen with a beautiful yellow color for
+ debugging purposes.
+ 
+ PeopsOpenGLGPU
+ 
+ Created by Gil Pedersen on Sun April 18 2004.
+ Copyright (c) 2004 Gil Pedersen.
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+#import <OpenGL/gl.h>
+#import <OpenGL/glext.h>
+#import <OpenGL/glu.h>
+//#import <GLUT/glut.h>
+//#import <Carbon/Carbon.h>
+#import "PluginGLView.h"
+#include "externals.h" // for PSXDisplay.disable -- should move it elsewhere really
+#undef BOOL
+
+#import "ARCBridge.h"
+
+@implementation PluginGLView
+
+- (BOOL)isOpaque
+{
+	return YES;
+}
+- (BOOL)acceptsFirstResponder
+{
+	return NO;
+}
+
+- (id) initWithCoder: (NSCoder *) coder
+{
+	// Set up pixel format on creation
+	// and, well, that's about it.
+	if ((self = [super initWithCoder:coder]) == nil)
+		return nil;
+	
+	glLock = [[NSLock alloc] init];
+	if (nil == glLock) {
+		AUTORELEASEOBJNORETURN(self);
+		return nil;
+	}
+	
+	// Init pixel format attribs
+	NSOpenGLPixelFormatAttribute attrs[] =
+	{
+		NSOpenGLPFAAccelerated,
+		NSOpenGLPFANoRecovery,
+		NSOpenGLPFADoubleBuffer,
+		//NSOpenGLPFASampleBuffers, 1, // For full screen AA when implemented
+		//NSOpenGLPFASamples, 2,
+		0
+	};
+	
+	// Get pixel format from OpenGL
+	NSOpenGLPixelFormat* pixFmt = [[NSOpenGLPixelFormat alloc] initWithAttributes:attrs];
+	if (!pixFmt)
+	{
+		NSLog(@"No Accelerated OpenGL pixel format found\n");
+		
+		NSOpenGLPixelFormatAttribute attrs2[] =
+		{
+			NSOpenGLPFANoRecovery,
+			0
+		};
+		
+		// Get pixel format from OpenGL
+		pixFmt = [[NSOpenGLPixelFormat alloc] initWithAttributes:attrs2];
+		if (!pixFmt) {
+			NSLog(@"No OpenGL pixel format found!\n");
+			
+			AUTORELEASEOBJNORETURN(self);
+			return nil;
+		}
+	}
+	
+	[self setPixelFormat:AUTORELEASEOBJ(pixFmt)];
+	
+	[[self openGLContext] makeCurrentContext];
+	
+	// we're done, dude.
+	
+	// Call for a redisplay
+	noDisplay = YES; // hm, this can be deleted I think
+	PSXDisplay.Disabled = 1;
+	[self setNeedsDisplay:true];
+	
+	return self;
+}
+
+- (void)dealloc
+{
+	[[self openGLContext] makeCurrentContext]; // just in case
+	[NSOpenGLContext clearCurrentContext];
+#if !__has_feature(objc_arc)
+	[glLock release];
+	[super dealloc];
+#endif
+}
+
+- (void)reshape	// scrolled, moved or resized
+{
+	[super reshape];
+	
+	[glLock lock]; // not sure if needed, but hey
+	[[self openGLContext] makeCurrentContext];
+	
+	NSRect rect = [self bounds];
+	rect.size = [self convertSize:rect.size toView:nil];
+	glViewport(0.0, 0.0, NSWidth(rect), NSHeight(rect));
+	
+	glClearColor (1.0, 0.5, 0.0, 0.0);
+	glClear(GL_COLOR_BUFFER_BIT);
+	[[self openGLContext] flushBuffer];
+	
+	//[NSOpenGLContext clearCurrentContext]; // this makes bad things happen, so screw it.
+	[glLock unlock];
+	return;
+}
+
+- (void)swapBuffer
+{
+ // actually not much to do here.
+	[[self openGLContext] flushBuffer];
+ return;
+}
+
+// don't know what this does, pasted it in from PeopsSoftGPU's PluginGLView because something was calling it
+- (void)clearBuffer:(BOOL)display
+{
+	if (display == NO) {
+		//[[self openGLContext] makeCurrentContext];
+		//glClear(GL_COLOR_BUFFER_BIT);
+		//[self loadTextures:NO];
+	} else {
+		noDisplay = YES;
+		//		[self setNeedsDisplay:true];
+	}
+}
+
+@end

pcsxr-1.9.93.tar.bz2/macosx/plugins/PeopsXgl/macsrc/PluginWindow.h Added

@@ -0,0 +1,53 @@
+/***************************************************************************
+ PluginWindow.h - Specialization of the main game window (borderless)
+ PeopsSoftGPU
+ 
+ Created by Gil Pedersen on Wed April 21 2004.
+ Copyright (c) 2004 Gil Pedersen.
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+ 
+ /* this is a borderless window that can be dragged about. Also, holds a GLView */
+#import <Cocoa/Cocoa.h>
+#import <AppKit/NSMenu.h>
+
+@interface NetSfPeopsOpenGLGPUPluginWindow : NSWindow
+{
+ NSWindow* myParent; 
+ NSPoint initialLocation;
+}
+
+- (id) initWithContentRect: (NSRect) contentRect
+ styleMask: (NSUInteger) aStyle
+ backing: (NSBackingStoreType) bufferingType
+ defer: (BOOL) flag ;
+
+
+- (BOOL) canBecomeKeyWindow; // to stop the beeping
+
+- (void) sendEvent:(NSEvent *)theEvent;
+- (void) windowDidResize:(NSNotification*)notice;
+- (void) windowDidUpdate: (NSNotification*)notice;
+- (void) windowDidMove:(NSNotification *)notice;
+
+- (void) performClose: (id)sender;
+- (void) mouseDown:(NSEvent *)theEvent; 
+- (void) mouseDragged:(NSEvent *)theEvent;
+
+- (void)keyDown:(NSEvent *)theEvent;
+- (void)keyUp:(NSEvent *)theEvent;
+
+@end
+
+@interface NetSfPeopsOpenGLGPUPluginWindow (NSMenuValidation) 
+- (BOOL)validateMenuItem:(NSMenuItem*) item;
+@end

pcsxr-1.9.93.tar.bz2/macosx/plugins/PeopsXgl/macsrc/PluginWindow.m Added

@@ -0,0 +1,157 @@
+/***************************************************************************
+    PluginWindow.m
+    PeopsSoftGPU
+  
+    Created by Gil Pedersen on Wed April 21 2004.
+    Copyright (c) 2004 Gil Pedersen.
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+#import "PluginWindow.h"
+@implementation NetSfPeopsOpenGLGPUPluginWindow
+/*
+- (BOOL)windowShouldClose:(id)sender
+{
+	[[NSNotificationCenter defaultCenter] postNotificationName:@"emuWindowDidClose" object:self];
+	
+	return YES;
+}*/
+
+- (void)sendEvent:(NSEvent *)theEvent
+{
+	NSEventType type = [theEvent type];
+	if (type == NSKeyDown || type == NSKeyUp) {
+		if (type == NSKeyDown && [theEvent keyCode] == 53 /* escape */) {
+			// reroute to menu event
+			[[NSApp mainMenu] performKeyEquivalent:theEvent];
+		}
+		
+		// ignore all key Events
+		return;
+	}
+
+	[super sendEvent:theEvent];
+}
+
+- (id) initWithContentRect: (NSRect) contentRect
+                 styleMask: (NSUInteger) aStyle
+                   backing: (NSBackingStoreType) bufferingType
+                     defer: (BOOL) flag
+{
+    if (self = [super initWithContentRect: contentRect
+                                styleMask: NSBorderlessWindowMask
+                                  backing: bufferingType
+                                    defer: flag])
+    {
+    return self;
+    }
+
+    return nil;
+}
+
+- (void) windowDidResize:(NSNotification*)notice
+{
+}
+
+- (void) windowDidUpdate: (NSNotification*)notice
+{
+}
+
+- (void)windowDidMove:(NSNotification *)notification
+{
+
+}
+
+- (BOOL) canBecomeKeyWindow
+{
+    return YES;
+}
+
+- (void)keyDown:(NSEvent *)theEvent
+{
+}
+
+- (void)keyUp:(NSEvent *)theEvent
+{
+}
+
+- (BOOL)validateMenuItem:(NSMenuItem*) menuItem
+{
+//    SEL bleh = [menuItem action];
+//    NSLog(@"Validate: %@, action: %@", menuItem, NSStringFromSelector(bleh));
+    if ([menuItem action] == @selector(performClose:))
+        return YES;
+    
+    return NO;
+    
+}
+
+- (void) performClose: (id)sender
+{
+    if ([self delegate]){
+  //      NSLog(@"We have a delegate %@", [self delegate]);
+
+        if ([[self delegate] windowShouldClose:sender])
+            [super close];
+    }
+    else {
+        // hmm, just explode I guess
+        [super close];
+    }
+}
+
+- (void)mouseDown:(NSEvent *)theEvent {    
+
+    // Get the mouse location in window coordinates.
+    initialLocation = [theEvent locationInWindow];
+
+}
+
+ 
+
+/*
+
+ Once the user starts dragging the mouse, move the window with it. The window has no title bar for the user to drag (so we have to implement dragging ourselves)
+
+ */
+
+- (void)mouseDragged:(NSEvent *)theEvent {
+
+    if ([self level] == NSScreenSaverWindowLevel)
+    // we don't drag when in fullscreen
+    // note that it is only because a quirk in the ordering of events
+    // and the time that NSScreenSaverWindowLevel is set
+    // that we'll never be dragged while in the background
+        return; 
+        
+    NSRect screenVisibleFrame = [[NSScreen mainScreen] visibleFrame];
+    NSRect windowFrame = [self frame];
+    NSPoint newOrigin = windowFrame.origin;
+
+    // Get the mouse location in window coordinates.
+    NSPoint currentLocation = [theEvent locationInWindow];
+
+    // Update the origin with the difference between the new mouse location and the old mouse location.
+    newOrigin.x += (currentLocation.x - initialLocation.x);
+    newOrigin.y += (currentLocation.y - initialLocation.y);
+
+    // Don't let window get dragged up under the menu bar
+    if ((newOrigin.y + windowFrame.size.height) > (screenVisibleFrame.origin.y + screenVisibleFrame.size.height)) {
+        newOrigin.y = screenVisibleFrame.origin.y + (screenVisibleFrame.size.height - windowFrame.size.height);
+    }
+
+    // Move the window to the new location
+    [self setFrameOrigin:newOrigin];
+
+}
+
+@end

pcsxr-1.9.93.tar.bz2/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.h Added

@@ -0,0 +1,61 @@
+/***************************************************************************
+ PluginWindowController.h
+ The big bad boy that controls/creates the game window, the openGLView, and
+ communicates with PCSXR itself
+ PeopsOpenGPU
+ 
+ Created by Gil Pedersen on Mon April 11 2004.
+ Copyright (c) 2004 Gil Pedersen.
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+/*
+ In truth, this controller should be the ONLY place that glues between the 
+ running PCSXR gpu and the mac interface. 
+ ATM, some of the glue is here, some of it in drawgl.m, and a couple
+ of bits are in the config controller...
+*/
+
+#define PluginWindowController NetSfPeopsOpenGLGPUPluginWindowController
+
+#import <Cocoa/Cocoa.h>
+#import "PluginGLView.h"
+
+@class PluginWindowController;
+
+extern NSWindow *gameWindow;
+extern PluginWindowController *gameController;
+
+@interface PluginWindowController : NSWindowController
+{
+ IBOutlet NSOpenGLView *glView;
+	 
+	// NSWindow *fullWindow;
+ bool inFullscreen;
+}
+
++ (id)openGameView;
+- (PluginGLView *)openGLView;
+- (BOOL)fullscreen;
+- (void)setFullscreen:(BOOL)flag;
+- (void)performFullscreenSwap;
+- (void)cureAllIlls;
+- (void) adaptToFrame:(NSRect)aFrame;
+- (NSRect) screenFrame;
+- (void)subscribeToEvents;
+
+- (id)initWithCoder:(NSCoder *)aDecoder ;
+- (id)initWithWindow:(NSWindow*)theWindow;
+
+- (void)windowDidBecomeKey:(NSNotification*)aNotice;
+- (void)windowDidResignKey:(NSNotification*)aNotice;
+@end

pcsxr-1.9.93.tar.bz2/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.m Added

@@ -0,0 +1,427 @@
+/***************************************************************************
+ PluginWindowController.m
+ The big bad boy that controls/creates the game window, the openGLView, and
+ communicates with PCSXR itself
+ 
+ PeopsOpenGPU
+ 
+ Created by Gil Pedersen on Tue April 12 2004.
+ Copyright (c) 2004 Gil Pedersen.
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+#import "PluginWindowController.h"
+#import "PluginWindow.h"
+#import "Carbon/Carbon.h"
+#include <OpenGL/gl.h> // OpenGL needed for "externals.h"
+#include "externals.h"
+#include "draw.h" // for CreateScanLines()
+#undef BOOL
+#import "ARCBridge.h"
+
+// not sure why these aren't class or instance variables...
+NSWindow *gameWindow;
+PluginWindowController *gameController;
+NSRect windowFrame;
+NSRect windowDefaultRect; // default window size (needed to go back into window mode)
+
+NSRect FitRectInRect(NSRect source, NSRect destination)
+{
+ NSRect newRect;
+ 
+ if (NSContainsRect(destination,source))
+ return source;
+ 
+ if (source.size.width > destination.size.width || source.size.height > destination.size.height){
+ // have to rescale
+ float ratio = source.size.width/source.size.height;
+ if (ratio > destination.size.width/destination.size.height){
+ source.size.width = destination.size.width;
+ source.size.height = source.size.width / ratio ;
+ }
+ else{
+ source.size.height = destination.size.height;
+ source.size.width = source.size.height * ratio;
+ }
+ }
+ // center horizontally and take top vertical
+ newRect.origin.x = destination.origin.x + (destination.size.width - source.size.width)/2;
+ newRect.origin.y = destination.origin.y + destination.size.height - source.size.height;
+ newRect.size = source.size;
+ 
+ return newRect;
+}
+
+@implementation PluginWindowController
+
++ (id)openGameView
+{
+ // create a window for the GPU and return
+ // the controller that controls it
+
+	if (gameWindow == nil) {
+		if (gameController == nil) {
+			gameController = [[PluginWindowController alloc] initWithWindowNibName:@"NetSfPeopsOpenGLGPUInterface"];
+		}
+		gameWindow = [gameController window];
+	}
+ else {
+ NSLog(@"Well, we have a game window open already, which is kinda bad.");
+ abort(); 
+ return nil;
+ }
+ 
+ [gameWindow setBackgroundColor: [NSColor blackColor]];
+
+ windowFrame.size.width=iResX;
+ windowFrame.size.height=iResY;
+ 
+ 
+	if (windowFrame.size.width != 0)
+		[gameWindow setFrame:windowFrame display:NO];
+ 
+	[gameWindow center];
+ windowDefaultRect = [gameWindow frame];
+
+	[gameWindow makeKeyAndOrderFront:nil];
+	[gameController showWindow:nil];
+ NSOpenGLView* glInstance = [gameController openGLView];
+ [glInstance setFrameSize: windowDefaultRect.size];
+ [glInstance reshape];
+// [glView update];
+ 
+	CGDirectDisplayID display = (CGDirectDisplayID)[[[[gameWindow screen] deviceDescription] objectForKey:@"NSScreenNumber"] unsignedIntValue];
+	if (CGDisplayIsCaptured(display)) {
+		[gameController setFullscreen:YES];
+	}
+	
+	return gameController;
+}
+
+- (void)subscribeToEvents
+{
+ NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
+ [nc addObserver:self selector:@selector(applicationDidChangeScreenParameters:) 
+ name:NSApplicationDidChangeScreenParametersNotification object:NSApp];
+
+/* not used ATM: 
+ [nc addObserver:self selector:@selector(applicationWillResignActive:) name:NSApplicationWillResignActiveNotification object:NSApp];
+ [nc addObserver:self selector:@selector(applicationWillBecomeActive:) name:NSApplicationWillBecomeActiveNotification object:NSApp];
+ [nc addObserver:self selector:@selector(applicationWillTerminate:) name:NSApplicationWillTerminateNotification object:NSApp];
+*/
+}
+
+- (id)initWithCoder:(NSCoder *)aDecoder {
+
+ self = [super initWithCoder:aDecoder];
+
+
+ [self subscribeToEvents];
+ return self;
+}
+
+- (id)initWithWindow:(NSWindow*)theWindow {
+ self = [super initWithWindow:theWindow];
+
+ [self subscribeToEvents];
+ return self;
+}
+
+- (NSRect) screenFrame
+{
+ NSWindow* wind = [self window];
+	CGDirectDisplayID display = (CGDirectDisplayID)[[[[wind screen] deviceDescription] objectForKey:@"NSScreenNumber"] unsignedIntValue];
+
+ return NSMakeRect (0,0,CGDisplayPixelsWide(display), CGDisplayPixelsHigh(display));
+}
+
+- (void) applicationDidChangeScreenParameters:(NSNotification*)aNotice
+{
+ // TODO: There could be issues with more drastic things like 
+ // openGL pixel format, etc. when screen changes...
+
+ // if fullscreen, conform to new size.
+ if ([self fullscreen]){
+ if (NSEqualRects([[self window] frame], [self screenFrame])){
+ return;
+ }
+
+ [self adaptToFrame: [self screenFrame]];
+ 
+ }
+ else {
+ // if windowed, recenter.
+ // TODO: scale window if screen size is too small
+ [[self window] center];
+
+ }
+ 
+}
+
+- (PluginGLView *)openGLView
+{
+	return (PluginGLView *)glView;
+}
+
+- (void) cureAllIlls
+{
+ // try to reset the GPU without discarding textures, etc.
+ // when a resize takes place, all hell breaks loose, so
+ // this is necessarily ugly.
+
+ // all this should be in draw.c, actually
+
+// needed, but I don't know what it's for...
+ rRatioRect.left = rRatioRect.top=0;
+ rRatioRect.right = iResX;
+ rRatioRect.bottom = iResY;
+
+ [[glView openGLContext] makeCurrentContext];
+
+ glFlush();
+ glFinish();
+ 
+ glViewport(rRatioRect.left, // init viewport by ratio rect
+ iResY-(rRatioRect.top+rRatioRect.bottom),
+ rRatioRect.right, 
+ rRatioRect.bottom); 
+ 
+ 
+ glScissor(0, 0, iResX, iResY); // init clipping (fullscreen)
+ glEnable(GL_SCISSOR_TEST); 
+ glMatrixMode(GL_PROJECTION); // init projection with psx resolution
+ glLoadIdentity();
+ glOrtho(0,PSXDisplay.DisplayMode.x,
+ PSXDisplay.DisplayMode.y, 0, -1, 1);
+
+ CreateScanLines();
+// if(bKeepRatio) SetAspectRatio(); // set ratio
+ glFlush();
+ glFinish();
+
+ [NSOpenGLContext clearCurrentContext];
+
+ [glView reshape]; // to get rid of fuglies on screen
+// GLinitialize(); // blunt instrument method of setting a proper state.
+
+}
+
+- (void)dealloc
+{
+	NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
+	
+	[nc removeObserver:self];
+	windowFrame = [[self window] frame]; // huh?
+
+	SUPERDEALLOC;
+}
+
+// forget keyDownEvents
+- (void)keyDown:(NSEvent *)theEvent
+{
+	// Not required any more
+}
+
+- (void)mouseDown:(NSEvent *)theEvent
+{
+	if ([self fullscreen]) {
+		[self setFullscreen:NO];
+	}
+}
+
+- (BOOL)fullscreen
+{
+	return inFullscreen;
+}
+
+- (void)setFullscreen:(BOOL)flag
+{
+// this is called by cocoa, not the main PSX thread.
+// Messing with the opengl context is a Bad Thing.
+// Therefore, just set a global flag, and
+// wait around for a frame until
+// gpu.c calls fullscreenswap() from
+// the right thread
+
+ if ([self fullscreen] == flag)
+ return;
+ 
+ if (flag)
+ bChangeWinMode = 2;
+ else
+ bChangeWinMode = 1;
+
+}
+
+- (void)performFullscreenSwap
+{
+ // ah, that's better. We are called from the main PSX thread
+ // after a screen update, so we're clean.
+ // bChangeWinMode is a global set from PSX
+ 
+ int flag = bChangeWinMode - 1; // 1 = go to window, 2 = go to fullscreen
+ bChangeWinMode = 0; // this is our flag that launched us, so 0 now
+ 
+	NSWindow *window = [self window];
+	NSScreen *screen = [window screen];
+
+ CGDirectDisplayID display = (CGDirectDisplayID)[[[screen deviceDescription] objectForKey:@"NSScreenNumber"] unsignedIntValue];
+
+ NSRect newPlace;
+ 
+ if (flag){
+ [window setLevel: NSScreenSaverWindowLevel];
+ newPlace = [self screenFrame] ; 
+		CGDisplayHideCursor(display);
+		CGAssociateMouseAndMouseCursorPosition(NO); // this could be bad since it disables mouse somewhat
+ }
+ else{
+ [window setLevel: NSNormalWindowLevel];
+ newPlace = windowDefaultRect;
+		CGDisplayShowCursor(display);
+		CGAssociateMouseAndMouseCursorPosition(YES);
+ }
+
+ if (flag) inFullscreen = TRUE;
+ else inFullscreen = FALSE;
+ 
+ if (!inFullscreen)
+ newPlace = FitRectInRect(newPlace, NSMakeRect(0,0,CGDisplayPixelsWide(display),CGDisplayPixelsHigh(display)-24)); // with menu bar room
+ 
+ [self adaptToFrame: newPlace];
+
+}
+
+- (BOOL)windowShouldZoom:(NSWindow *)sender toFrame:(NSRect)newFrame
+{
+	[self setFullscreen:YES];
+	
+	return NO;
+}
+
+- (NSSize)windowWillResize:(NSWindow *)sender toSize:(NSSize)proposedFrameSize
+{
+ // we don't bother
+
+ return proposedFrameSize;
+ 
+	if (!(([sender resizeFlags] & NSShiftKeyMask) == NSShiftKeyMask)) {
+		NSRect oldSize = [sender frame];
+		NSRect viewSize = [glView frame];
+		
+		float xDiff = NSWidth(oldSize) - NSWidth(viewSize);
+		float yDiff = NSHeight(oldSize) - NSHeight(viewSize);
+		
+		//if ((proposedFrameSize.height / proposedFrameSize.width) < (3.0/4.0))
+		//	proposedFrameSize.height = ((proposedFrameSize.width - xDiff) * 3.0) / 4.0 + yDiff;
+		//else
+			proposedFrameSize.width = ((proposedFrameSize.height - yDiff) * 4.0) / 3.0 + xDiff;
+	}
+	
+	return proposedFrameSize;
+}
+
+- (void)windowWillMiniaturize:(NSNotification *)aNotification
+{
+	[[NSNotificationCenter defaultCenter] postNotificationName:@"emuWindowWantPause" object:self];
+}
+
+- (void)windowDidDeminiaturize:(NSNotification *)aNotification
+{
+	[[NSNotificationCenter defaultCenter] postNotificationName:@"emuWindowWantResume" object:self];
+}
+
+- (BOOL)windowShouldClose:(id)sender
+{
+	[[NSNotificationCenter defaultCenter] postNotificationName:@"emuWindowDidClose" object:self];
+	AUTORELEASEOBJNORETURN(gameController);
+	gameController = nil;
+	gameWindow = nil;
+ CGReleaseAllDisplays();
+	return YES;
+}
+
+// these two funcs should be handled by the window class but
+// since we do fullscreen tweaking (hiding mouse, etc), 
+// the controller must do it ATM...
+- (void)windowDidBecomeKey:(NSNotification*)aNotice
+{
+ // if in fullscreen, we must restore level and mouse hiding.
+ // it might be cooler if window goes to "window" size or hides
+ // instead of taking up full screen in background.
+ 
+	NSWindow *window = [self window];
+ 	NSScreen *screen = [window screen];
+
+ CGDirectDisplayID display = (CGDirectDisplayID)[[[screen deviceDescription] objectForKey:@"NSScreenNumber"] unsignedIntValue];
+
+ if ([self fullscreen]){
+ [window setLevel: NSScreenSaverWindowLevel];
+		CGDisplayHideCursor(display);
+ }
+}
+
+- (void)windowDidResignKey:(NSNotification*)aNotice
+{
+ // if in fullscreen, we must abdicate mouse hiding and level.
+	NSWindow *window = [self window];
+	NSScreen *screen = [window screen];
+ CGDirectDisplayID display = (CGDirectDisplayID)[[[screen deviceDescription] objectForKey:@"NSScreenNumber"] unsignedIntValue];
+
+ if ([self fullscreen]){
+ [window setLevel: NSNormalWindowLevel];
+		CGDisplayShowCursor(display);
+ }
+}
+
+- (void) adaptToFrame:(NSRect)aFrame
+{
+ // do magic so everything goes as planned
+ // when the window area changes
+
+ int proportionalWidth, proportionalHeight;
+ 
+ NSWindow* window = [self window];
+ 
+ [window setFrame:aFrame display:NO];
+ 
+ // assume square pixel ratio on the monitor
+ if ((aFrame.size.width*3)/4 <= aFrame.size.height) { // is window skinnier than it needs to be?
+ proportionalHeight = (aFrame.size.width*3)/4; // then shrink the content height (letterbox)
+ proportionalWidth = aFrame.size.width; // and conform to width
+ } else {
+ proportionalWidth = (aFrame.size.height*4)/3;
+ proportionalHeight = aFrame.size.height;
+ }
+ 
+ NSRect fitToWindow = NSMakeRect(
+ roundf((aFrame.size.width - proportionalWidth)/2.0), 
+ roundf((aFrame.size.height - proportionalHeight)/2.0), 
+ roundf(proportionalWidth), roundf(proportionalHeight));
+ 
+ [glView setFrame:fitToWindow];
+ [glView reshape];
+ iResX = roundf(proportionalWidth);
+ iResY = roundf(proportionalHeight);
+ 
+ [self cureAllIlls]; // do some fixin'
+ return;
+ 
+}
+
+@end
+
+void ChangeWindowMode(void)
+{
+ // glue from PSX thread. Globals are already set
+ [ gameController performFullscreenSwap];
+}

pcsxr-1.9.93.tar.bz2/macosx/plugins/PeopsXgl/macsrc/drawgl.h Added

pcsxr-1.9.93.tar.bz2/macosx/plugins/PeopsXgl/macsrc/drawgl.m Added

@@ -0,0 +1,262 @@
+/***************************************************************************
+ drawgl.m
+ an odd set of functions that seem misplaced ATM.
+ presumably this is the glue to the C GPU plugin stuff
+ but a much better place might be "PluginWindowController.m" as
+ gluing is what a controller is made for.
+ 
+ PeopsOpenGPU
+ 
+ Created by Gil Pedersen on Sun April 18 2004.
+ Copyright (c) 2004 Gil Pedersen.
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+#import "PluginWindowController.h"
+#import "PluginGLView.h"
+#include "ExtendedKeys.h"
+#include "externals.h"
+#include "draw.h"
+#include "gpu.h"
+#include "menu.h"
+#include "drawgl.h"
+#import "ARCBridge.h"
+
+////////////////////////////////////////////////////////////////////////////////////
+// misc globals
+////////////////////////////////////////////////////////////////////////////////////
+#if 0 // globals for OpenGL (vs. SoftGPU) are owned by others... weird
+int iResX;
+int iResY;
+long lLowerpart;
+BOOL bIsFirstFrame = TRUE;
+BOOL bCheckMask=FALSE;
+unsigned short sSetMask=0;
+/* unsigned long lSetMask=0; */
+uint32_t sSetMassk=0;
+int iDesktopCol=16;
+int iShowFPS=0;
+int iWinSize; 
+int iUseScanLines=0;
+int iUseNoStretchBlt=0;
+int iFastFwd=0;
+int iDebugMode=0;
+int iFVDisplay=0;
+PSXPoint_t ptCursorPoint[8];
+unsigned short usCursorActive=0;
+char *			Xpixels;
+char * pCaptionText;
+#endif
+
+
+extern BOOL bCheckMask;
+extern BOOL bIsFirstFrame;
+extern int iShowFPS;
+extern unsigned short sSetMask;
+extern int iUseScanLines;
+extern unsigned short usCursorActive;
+
+
+int iResX;
+int iResY;
+long lLowerpart;
+
+uint32_t sSetMassk=0;
+int iDesktopCol=16;
+int iWinSize; 
+int iUseNoStretchBlt=0;
+int iFastFwd=0;
+int iDebugMode=0;
+int iFVDisplay=0;
+PSXPoint_t ptCursorPoint[8];
+char *			Xpixels;
+char * pCaptionText;
+
+//static PluginWindowController *windowController;
+// static is BAD NEWS if user uses other plug ins
+PluginGLView *glView;
+
+////////////////////////////////////////////////////////////////////////
+
+void DoBufferSwap(void) // SWAP BUFFERS
+{
+#if 1
+	[glView swapBuffer];
+#else
+	static long long lastTickCount = -1;
+	static int skipCount = 0;
+	long long microTickCount;
+	long deltaTime;
+	
+	Microseconds((struct UnsignedWide *)&microTickCount);
+	deltaTime = (long)(microTickCount - lastTickCount);
+	if (deltaTime <= (PSXDisplay.PAL ? 1000000/50 : 100000000 / 5994) ||
+		 skipCount >= 3) {
+		skipCount = 0;
+		[glView swapBuffer];
+	} else {
+		skipCount++;
+	}
+	NSLog(@"count: %i", deltaTime); 
+	lastTickCount = microTickCount;
+#endif
+}
+
+
+////////////////////////////////////////////////////////////////////////
+
+void DoClearScreenBuffer(void) // CLEAR DX BUFFER
+{
+	// clear the screen, and DON'T flush it
+	[glView clearBuffer:NO];
+}
+
+
+////////////////////////////////////////////////////////////////////////
+
+void DoClearFrontBuffer(void) // CLEAR DX BUFFER
+{
+	// clear the screen, and flush it
+	[glView clearBuffer:YES];
+}
+
+////////////////////////////////////////////////////////////////////////
+
+unsigned long ulInitDisplay(void)	// OPEN GAME WINDOW
+{
+	bUsingTWin = FALSE;
+	
+	//InitMenu(); // This function does nothing
+	
+	bIsFirstFrame = FALSE;
+	
+	if(iShowFPS)
+	{
+		//iShowFPS=0;
+		ulKeybits |= KEY_SHOWFPS;
+		szDispBuf[0] = 0;
+		BuildDispMenu(0);
+	}
+	
+	__block PluginWindowController *windowController;
+	
+	// this causes a runtime error if it's done on a thread other than the main thread
+	RunOnMainThreadSync(^{
+		windowController = [PluginWindowController openGameView];
+		glView = [windowController openGLView];
+		
+		[[windowController window] setTitle:@(pCaptionText)];
+	});
+	
+	return (unsigned long)[windowController window];
+}
+
+
+////////////////////////////////////////////////////////////////////////
+
+void CloseDisplay(void)
+{
+	if (gameController) {
+		[gameController close];
+		RELEASEOBJ(gameController);
+		gameController = nil;
+		gameWindow = nil;
+	}
+}
+
+void BringContextForward(void)
+{
+ [[glView openGLContext] makeCurrentContext];
+}
+
+void SendContextBack(void)
+{
+ [NSOpenGLContext clearCurrentContext];
+}
+
+void SetVSync(GLint myValue)
+{
+ GLint DoItMyFriend = myValue;
+ [[glView openGLContext] setValues: &DoItMyFriend forParameter: NSOpenGLCPSwapInterval];
+
+}
+////////////////////////////////////////////////////////////////////////
+
+/* taken care of in menu.c
+void CreatePic(unsigned char * pMem)
+{
+}
+*/
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+/* taken care of in menu.c
+void DestroyPic(void)
+{
+}
+*/
+
+///////////////////////////////////////////////////////////////////////////////////////
+/* taken care of in menu.c
+void DisplayPic(void)
+{
+}
+*/
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+void ShowGpuPic(void)
+{
+	// this is the default implementation...
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+void ShowTextGpuPic(void)
+{
+	// this is the default implementation...
+}
+
+void HandleKey(int keycode)
+{
+	switch (keycode) {
+ case GPU_FRAME_LIMIT:
+ if(bUseFrameLimit) {
+ bUseFrameLimit = false;
+ iFrameLimit = 1;
+ }
+ else {
+ bUseFrameLimit = true;
+ iFrameLimit = 2;
+ }
+ SetAutoFrameCap();
+ break;
+ case GPU_FAST_FORWARD:
+ if(bUseFrameLimit) {
+ bUseFrameLimit = false;
+ iFrameLimit = 1;
+ bUseFrameSkip = true;
+ iFastFwd = 0;
+ }
+ else {
+ bUseFrameLimit = true;
+ iFrameLimit = 2;
+ bUseFrameSkip = false;
+ iFastFwd = 0;
+ }
+ bSkipNextFrame = FALSE;
+ break;
+		case GPU_FULLSCREEN_KEY:
+			[gameController setFullscreen:![gameController fullscreen]];
+			break;
+	}
+}

pcsxr-1.9.93.tar.bz2/pcsxr.anjuta Changed

pcsxr-1.9.92.tar.bz2/pixmaps/Makefile.am -> pcsxr-1.9.93.tar.bz2/pixmaps/Makefile.am Changed

pcsxr-1.9.93.tar.bz2/pixmaps/cd.png Added

pcsxr-1.9.93.tar.bz2/pixmaps/cdr.png Added

pcsxr-1.9.93.tar.bz2/pixmaps/gpu.png Added

pcsxr-1.9.93.tar.bz2/pixmaps/iso-open.png Added

pcsxr-1.9.93.tar.bz2/pixmaps/iso-reopen.png Added

pcsxr-1.9.93.tar.bz2/pixmaps/memcard.png Added

pcsxr-1.9.93.tar.bz2/pixmaps/pad.png Added

pcsxr-1.9.93.tar.bz2/pixmaps/pcsxr-icon.png Added

pcsxr-1.9.93.tar.bz2/pixmaps/pcsxr.png Added

pcsxr-1.9.93.tar.bz2/pixmaps/play.png Added

pcsxr-1.9.93.tar.bz2/pixmaps/sio1.png Added

pcsxr-1.9.93.tar.bz2/pixmaps/spu.png Added

pcsxr-1.9.93.tar.bz2/plugins/bladesio1 Added

pcsxr-1.9.93.tar.bz2/plugins/bladesio1/Makefile.am Added

pcsxr-1.9.93.tar.bz2/plugins/bladesio1/cfg.c Added

@@ -0,0 +1,63 @@
+/***************************************************************************
+ * Copyright (C) 2013 by Blade_Arma <edgbla@yandex.ru> *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
+ ***************************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+
+#include "psxcommon.h"
+#include "psemu_plugin_defs.h"
+
+#include "sio1.h"
+
+/***************************************************************************/
+
+static const char configName[] = "bladesio1.cfg";
+
+Settings settings;
+
+/***************************************************************************/
+
+void settingsRead() {
+	FILE *file;
+
+	file = fopen(configName, "rb");
+	if(file) {
+		fread(&settings, 1, sizeof(settings), file);
+		fclose(file);
+	}
+	else {
+		settings.player = PLAYER_DISABLED;
+		strcpy(settings.ip, "127.0.0.1");
+		settings.port = 33307;
+	}
+}
+
+void settingsWrite() {
+	FILE *file;
+
+	file = fopen(configName, "wb");
+	if(file) {
+		fwrite(&settings, 1, sizeof(settings), file);
+		fclose(file);
+	}
+}
+
+/***************************************************************************/

pcsxr-1.9.93.tar.bz2/plugins/bladesio1/connection.c Added

@@ -0,0 +1,147 @@
+/***************************************************************************
+ * Copyright (C) 2013 by Blade_Arma <edgbla@yandex.ru> *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
+ ***************************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+
+#if defined _WINDOWS
+#include <winsock2.h>
+#else
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <netdb.h>
+#include <unistd.h>
+#endif
+
+#include "typedefs.h"
+#include "psemu_plugin_defs.h"
+
+#include "sio1.h"
+#include "connection.h"
+
+/***************************************************************************/
+
+static int serversock = -1;
+static int clientsock = -1;
+static struct sockaddr_in address;
+static struct hostent *hostinfo;
+
+/***************************************************************************/
+
+s32 connectionOpen() {
+	switch(settings.player) {
+		case PLAYER_MASTER: {
+			int reuse_addr = 1;
+			int one = 1;
+
+			serversock = socket(AF_INET, SOCK_STREAM, 0);
+			if(serversock == -1) {
+				fprintf(stderr, "[SIO1] ERROR: server socket()\n");
+				return -1;
+			}
+			
+			setsockopt(serversock, SOL_SOCKET, SO_REUSEADDR, (const char*)&reuse_addr, sizeof(reuse_addr));
+			setsockopt(serversock, IPPROTO_TCP, TCP_NODELAY, (const char*)&one, sizeof(one));
+
+			memset(&address, 0, sizeof(address));
+			address.sin_family		= AF_INET;
+			address.sin_addr.s_addr = INADDR_ANY;
+			address.sin_port		= settings.port;
+
+			if(bind(serversock,(struct sockaddr*)&address,sizeof(address)) == -1) {
+				fprintf(stderr, "[SIO1] ERROR: server bind()\n");
+				return -1;
+			}
+
+			if(listen(serversock, 1) != 0) {
+				fprintf(stderr, "[SIO1] ERROR: server listen()\n");
+				return -1;
+			}
+
+			clientsock = -1;
+			while(clientsock < 0)
+				clientsock = accept(serversock, NULL, NULL);
+		}
+		break;
+		case PLAYER_SLAVE: {
+			int one = 1;
+
+			memset(&address, 0, sizeof(address));
+			hostinfo = gethostbyname(settings.ip);
+			address.sin_family = AF_INET;
+			address.sin_addr = *((struct in_addr*)hostinfo->h_addr);
+			address.sin_port = settings.port;
+
+			clientsock = socket(AF_INET, SOCK_STREAM, 0);
+			if(clientsock == -1) {
+				fprintf(stderr, "[SIO1] ERROR: client socket()\n");
+				return -1;
+			}
+
+			setsockopt(clientsock, IPPROTO_TCP, TCP_NODELAY, (const char*)&one, sizeof(one));
+
+			if(connect(clientsock,(struct sockaddr*)&address,sizeof(address)) != 0) {
+				fprintf(stderr, "[SIO1] ERROR: client connect(%s)\n", settings.ip);
+				return -1;
+			}
+		}
+		break;
+	}
+
+	return 0;
+}
+
+void connectionClose() {
+	if(clientsock >= 0) {
+		//close(clientsock);
+		clientsock = -1;
+	}
+
+	if(serversock >= 0) {
+		//close(serversock);
+		serversock = -1;
+	}
+}
+
+/***************************************************************************/
+
+size_t connectionSend(u8 *pdata, s32 size) {
+	size_t bytes = 0;
+
+	if(clientsock >= 0)
+		if((bytes = send(clientsock, (const char*)pdata, size, 0)) < 0)
+			return 0;
+
+	return bytes;
+}
+
+size_t connectionRecv(u8 *pdata, s32 size) {
+	size_t bytes = 0;
+
+	if(clientsock >= 0)
+		if((bytes = recv(clientsock, (char*)pdata, size, 0)) < 0)
+			return 0;
+
+	return bytes;
+}
+
+/***************************************************************************/

pcsxr-1.9.93.tar.bz2/plugins/bladesio1/connection.h Added

@@ -0,0 +1,35 @@
+/***************************************************************************
+ * Copyright (C) 2013 by Blade_Arma <edgbla@yandex.ru> *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
+ ***************************************************************************/
+
+#ifndef _CONNECTION_H_
+#define _CONNECTION_H_
+
+/***************************************************************************/
+
+extern s32 connectionOpen();
+extern void connectionClose();
+
+/***************************************************************************/
+
+extern size_t connectionSend(u8 *pdata, s32 size);
+extern size_t connectionRecv(u8 *pdata, s32 size);
+
+/***************************************************************************/
+
+#endif // _CONNECTION_H_

pcsxr-1.9.93.tar.bz2/plugins/bladesio1/fifo.c Added

@@ -0,0 +1,124 @@
+/***************************************************************************
+ * Copyright (C) 2013 by Blade_Arma <edgbla@yandex.ru> *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
+ ***************************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+
+#include "typedefs.h"
+#include "psemu_plugin_defs.h"
+
+#include "sio1.h"
+#include "fifo.h"
+#include "connection.h"
+
+/***************************************************************************/
+
+static u8 _buf[8];
+static s32 _indexw;
+static s32 _indexr;
+static s32 _employment;
+static s32 _overrun;
+
+/***************************************************************************/
+
+void fifoOpen() {
+	fifoReset();
+	fifoResetErr();
+}
+
+void fifoClose() {
+}
+
+/***************************************************************************/
+
+void fifoReset() {
+	_indexw		= 0;
+	_indexr		= 0;
+	_employment = 0;
+}
+
+void fifoResetErr() {
+	_overrun = 0;
+}
+
+/***************************************************************************/
+
+s32 fifoEmployment() {
+	return _employment;
+}
+
+s32 fifoEmpty() {
+	return (_employment == 0);
+}
+
+s32 fifoFull() {
+	return (_employment == 8);
+}
+
+s32 fifoOverrun() {
+	return _overrun;
+}
+
+/***************************************************************************/
+
+void fifoPush(u8 data) {
+	if(_employment > 8) {
+		_overrun = 1;
+
+		--_indexw;
+		if(_indexw < 0)
+			_indexw += 8;
+
+		--_employment;
+	}
+
+	_buf[_indexw] = data;
+
+	++_indexw;
+	if(_indexw >= 8)
+		_indexw -= 8;
+
+	++_employment;
+}
+
+void fifoPeek(u8 *data) {
+	if(_employment <= 0)
+		*data = 0;
+	else
+		*data = _buf[_indexr];
+}
+
+void fifoPop(u8 *data) {
+	if(_employment <= 0) {
+		*data = 0;
+	}
+	else {
+		*data = _buf[_indexr];
+
+		++_indexr;
+		if(_indexr >= 8)
+			_indexr -= 8;
+
+		--_employment;
+	}
+}
+
+/***************************************************************************/

pcsxr-1.9.93.tar.bz2/plugins/bladesio1/fifo.h Added

@@ -0,0 +1,47 @@
+/***************************************************************************
+ * Copyright (C) 2013 by Blade_Arma <edgbla@yandex.ru> *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
+ ***************************************************************************/
+
+#ifndef _FIFO_H_
+#define _FIFO_H_
+
+/***************************************************************************/
+
+extern void fifoOpen();
+extern void fifoClose();
+
+extern void fifoReset();
+extern void fifoResetErr();
+
+/***************************************************************************/
+
+extern s32 fifoEmployment();
+extern s32 fifoEmpty();
+extern s32 fifoFull();
+
+extern s32 fifoOverrun();
+
+/***************************************************************************/
+
+extern void fifoPush(u8 data);
+extern void fifoPeek(u8 *data);
+extern void fifoPop(u8 *data);
+
+/***************************************************************************/
+
+#endif // _FIFO_H_

pcsxr-1.9.93.tar.bz2/plugins/bladesio1/gui.c Added

@@ -0,0 +1,209 @@
+/***************************************************************************
+ * Copyright (C) 2013 by Blade_Arma <edgbla@yandex.ru> *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
+ ***************************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <linux/if.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+
+#include "psxcommon.h"
+#include "psemu_plugin_defs.h"
+
+#include "cfg.c"
+#include "sio1.h"
+
+/***************************************************************************/
+
+#define MAXINTERFACES 16
+
+void sockGetIP(char *IPAddress) {
+	int fd, intrface;
+	struct ifreq buf[MAXINTERFACES];
+	struct ifconf ifc;
+	struct sockaddr_in addr;
+
+	strcpy(IPAddress, "127.0.0.1");
+
+	if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) >= 0) {
+		ifc.ifc_len = sizeof(buf);
+		ifc.ifc_buf = (caddr_t)buf;
+		if (!ioctl(fd, SIOCGIFCONF, (char *)&ifc)) {
+			intrface = ifc.ifc_len / sizeof(struct ifreq);
+			while (intrface-- > 0) {
+				if (!(ioctl(fd, SIOCGIFADDR, (char *)&buf[intrface]))) {
+					memcpy(&addr, &(buf[intrface].ifr_addr), sizeof(addr));
+					strcpy(IPAddress, inet_ntoa(addr.sin_addr));
+					break;
+				}
+			}
+		}
+		close(fd);
+	}
+}
+
+void cfgSysMessage(const char *fmt, ...) {
+	GtkWidget *MsgDlg;
+	va_list list;
+	char msg[512];
+
+	va_start(list, fmt);
+	vsprintf(msg, fmt, list);
+	va_end(list);
+
+	if (msg[strlen(msg) - 1] == '\n') msg[strlen(msg) - 1] = 0;
+
+	MsgDlg = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL,
+		GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _("NetPlay"));
+	gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(MsgDlg), "%s", msg);
+
+	gtk_dialog_run(GTK_DIALOG(MsgDlg));
+	gtk_widget_destroy(MsgDlg);
+}
+
+void OnCopyIP(GtkWidget *widget, gpointer user_data) {
+	char str[256];
+
+	sockGetIP(str);
+	gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_CLIPBOARD), str, strlen(str));
+	cfgSysMessage(_("IP %s"), str);
+}
+
+/***************************************************************************/
+
+static
+void configure() {
+	GtkBuilder *builder;
+	GtkWidget *widget, *MainWindow;
+
+	builder = gtk_builder_new();
+
+	if(!gtk_builder_add_from_file(builder, DATADIR "sio1.ui", NULL))
+		g_warning("We could not load the interface!");
+
+	settingsRead();
+
+	MainWindow = gtk_builder_get_object(builder, "dlgStart");
+	gtk_window_set_title(GTK_WINDOW(MainWindow), _("Link Cable Configuration"));
+
+	widget = gtk_builder_get_object(builder, "btnCopyIP");
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+		G_CALLBACK(OnCopyIP), NULL, NULL, G_CONNECT_AFTER);
+
+	switch(settings.player) {
+		case PLAYER_DISABLED:
+			widget = gtk_builder_get_object(builder, "rbDisabled");
+			break;
+		case PLAYER_MASTER:
+			widget = gtk_builder_get_object(builder, "rbServer");
+			break;
+		case PLAYER_SLAVE:
+			widget = gtk_builder_get_object(builder, "rbClient");
+			break;
+	}
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE);
+
+	widget = gtk_builder_get_object(builder, "tbServerIP");
+	gtk_entry_set_text(GTK_ENTRY(widget), settings.ip);
+
+	widget = gtk_builder_get_object(builder, "tbPort");
+	gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), settings.port);
+
+	if(gtk_dialog_run(GTK_DIALOG(MainWindow)) == GTK_RESPONSE_OK) {
+		widget = gtk_builder_get_object(builder, "tbServerIP");
+		strncpy(settings.ip, gtk_entry_get_text(GTK_ENTRY(widget)), sizeof(settings.ip) - 1);
+
+		widget = gtk_builder_get_object(builder, "tbPort");
+		settings.port = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget));
+
+		widget = gtk_builder_get_object(builder, "rbDisabled");
+		if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
+			settings.player = PLAYER_DISABLED;
+		else {
+			widget = gtk_builder_get_object(builder, "rbServer");
+			if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
+				settings.player = PLAYER_MASTER;
+			else
+				settings.player = PLAYER_SLAVE;
+		}
+
+		settingsWrite();
+
+		gtk_widget_destroy(MainWindow);
+	}
+
+	gtk_widget_destroy(MainWindow);
+}
+
+static
+void about() {
+	const char *authors[]= {"edgbla <edgbla@yandex.ru>", NULL};
+	GtkWidget *widget;
+
+	widget = gtk_about_dialog_new();
+	gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(widget), "Link Cable");
+	gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(widget), "1.0");
+	gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(widget), authors);
+	gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(widget), "http://www.codeplex.com/pcsxr/");
+
+	gtk_dialog_run(GTK_DIALOG(widget));
+	gtk_widget_destroy(widget);
+}
+
+/***************************************************************************/
+
+int main(int argc, char *argv[]) {
+#ifdef ENABLE_NLS
+	setlocale(LC_ALL, "");
+	bindtextdomain(GETTEXT_PACKAGE, LOCALE_DIR);
+	bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+	textdomain(GETTEXT_PACKAGE);
+#endif
+
+	gtk_init(&argc, &argv);
+
+	if (argc < 2) {
+ 	printf ("Usage: cfgBladeSio1 {about | configure}\n");
+		return 0;
+	}
+
+ if (strcmp(argv[1], "configure") != 0 && 
+		strcmp(argv[1], "about") != 0) {
+		printf ("Usage: cfgBladeSio1 {about | configure}\n");
+		return 0;
+ }
+
+	if(!strcmp(argv[1], "configure"))
+		configure();
+	else if(!strcmp(argv[1], "about"))
+		about();
+
+	return 0;
+}
+
+/***************************************************************************/

pcsxr-1.9.93.tar.bz2/plugins/bladesio1/sio1.c Added

@@ -0,0 +1,605 @@
+/***************************************************************************
+ * Copyright (C) 2013 by Blade_Arma <edgbla@yandex.ru> *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
+ ***************************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+
+#if defined _WINDOWS
+#include "stdafx.h"
+#include "cfg-winapi.h"
+#elif defined _MACOSX
+#include <sys/stat.h>
+void AboutDlgProc();
+void ConfDlgProc();
+#else
+#include <sys/stat.h>
+#endif
+
+#include "typedefs.h"
+#include "psemu_plugin_defs.h"
+
+#include "sio1.h"
+#include "fifo.h"
+#include "connection.h"
+
+/***************************************************************************/
+
+//#define SIO1_DEBUG 1
+
+static char *pluginName	 = N_("sio1Blade");
+
+static const unsigned char version	= 1;
+static const unsigned char revision = 1;
+static const unsigned char build	= 1;
+
+static void (CALLBACK *irqCallback)() = 0;
+
+Settings settings;
+
+/* sio status flags.
+ */
+enum {
+	SR_TXRDY	= 0x0001,
+	SR_RXRDY	= 0x0002,
+	SR_TXU		= 0x0004,
+	SR_PERROR	= 0x0008,
+	SR_OE		= 0x0010,
+	SR_FE		= 0x0020,
+	SR_0040		= 0x0040, // ?
+	SR_DSR		= 0x0080,
+	SR_CTS		= 0x0100,
+	SR_IRQ		= 0x0200
+};
+
+/* sio mode flags.
+ */
+enum {
+	MR_BR_1		= 0x0001,
+	MR_BR_16	= 0x0002,
+	MR_BR_64	= 0x0003,
+	MR_CHLEN_5	= 0x0000,
+	MR_CHLEN_6	= 0x0004,
+	MR_CHLEN_7	= 0x0008,
+	MR_CHLEN_8	= 0x000C,
+	MR_PEN		= 0x0010,
+	MR_P_EVEN	= 0x0020,
+	MR_SB_00	= 0x0000,
+	MR_SB_01	= 0x0040,
+	MR_SB_10	= 0x0080,
+	MR_SB_11	= 0x00C0
+};
+
+/* sio control flags.
+ */
+enum {
+	CR_TXEN		= 0x0001,
+	CR_DTR		= 0x0002,
+	CR_RXEN		= 0x0004,
+	CR_0008		= 0x0008, // ?
+	CR_ERRRST	= 0x0010,
+	CR_RTS		= 0x0020,
+	CR_RST		= 0x0040,
+	CR_0080		= 0x0080, // HM?
+	CR_BUFSZ_1	= 0x0000,
+	CR_BUFSZ_2	= 0x0100,
+	CR_BUFSZ_4	= 0x0200,
+	CR_BUFSZ_8	= 0x0300,
+	CR_TXIEN	= 0x0400,
+	CR_RXIEN	= 0x0800,
+	CR_DSRIEN	= 0x1000,
+	CR_2000		= 0x2000 // CTSIEN?
+};
+
+static u8 fifoIrqVals[] = {1, 2, 4, 8};
+static s32 slaveDelay = 1;
+
+static u16 statReg; // 0x1f801054: 0x185 SR_TXRDY | SR_TXU | SR_DSR | SR_CTS
+static u16 modeReg; // 0x1f801058: 0x0
+static u16 ctrlReg; // 0x1f80105A: 0x0
+static u16 baudReg; // 0x1f80105E: 0x0
+
+typedef struct EXC_DATA {
+	u16 reg;
+	u8 len;
+	u8 data;
+} EXC_DATA;
+
+/***************************************************************************/
+
+long CALLBACK SIO1init() {
+	return 0;
+}
+
+long CALLBACK SIO1shutdown() {
+	return 0;
+}
+
+/***************************************************************************/
+
+long CALLBACK SIO1open(unsigned long *gpuDisp) {
+	settingsRead();
+
+	statReg = SR_TXRDY | SR_TXU | SR_DSR | SR_CTS;
+	modeReg = 0x0000;
+	ctrlReg = 0x0000;
+	baudReg = 0x0000;
+
+	fifoOpen();
+
+	if(connectionOpen() < 0)
+		settings.player = PLAYER_DISABLED;
+
+	return 0;
+}
+
+long CALLBACK SIO1close() {
+	fifoClose();
+	connectionClose();
+
+	return 0;
+}
+
+/***************************************************************************/
+
+void CALLBACK SIO1pause() {
+}
+
+void CALLBACK SIO1resume() {
+}
+
+/***************************************************************************/
+
+long CALLBACK SIO1keypressed(int key) {
+	return 0;
+}
+
+/***************************************************************************/
+
+void Exchange(s32 data) {
+	EXC_DATA exc_data_send, exc_data_recv;
+
+	if(settings.player == PLAYER_DISABLED)
+		return;
+
+	if(slaveDelay && settings.player == PLAYER_SLAVE) {
+		EXC_DATA exc_data_empty;
+		s32 count;
+
+		memset(&exc_data_empty, 0x00, sizeof(exc_data_empty));
+		exc_data_empty.reg = CR_DTR | CR_RTS;
+
+		for(count = 0; count < 4; ++count) {
+			connectionRecv((u8*)&exc_data_recv, sizeof(exc_data_recv));
+			connectionSend((u8*)&exc_data_empty, sizeof(exc_data_empty));
+		}
+
+		slaveDelay = 0;
+		return;
+	}
+
+	memset(&exc_data_send, 0x00, sizeof(exc_data_send));
+	memset(&exc_data_recv, 0x00, sizeof(exc_data_recv));
+
+	exc_data_send.reg = ctrlReg;
+	exc_data_send.len = 0;
+
+	if(data >= 0) {
+		statReg |= SR_TXRDY | SR_TXU;
+
+		exc_data_send.len = 1;
+		exc_data_send.data = data;
+
+		if(ctrlReg & CR_TXIEN) {
+			if(!(statReg & SR_IRQ)) {
+#if defined SIO1_DEBUG
+			printf("irqCallback() : CR_TXIEN\n");
+#endif
+				irqCallback();
+				statReg |= SR_IRQ;
+			}
+		}
+	}
+
+	if(settings.player == PLAYER_MASTER) {
+		connectionSend((u8*)&exc_data_send, sizeof(exc_data_send));
+		connectionRecv((u8*)&exc_data_recv, sizeof(exc_data_recv));
+	}
+	else {
+		connectionRecv((u8*)&exc_data_recv, sizeof(exc_data_recv));
+		connectionSend((u8*)&exc_data_send, sizeof(exc_data_send));
+	}
+
+	if(exc_data_recv.reg & CR_DTR)
+		statReg |= SR_DSR;
+	else
+		statReg &= ~SR_DSR;
+
+	if(exc_data_recv.reg & CR_RTS)
+		statReg |= SR_CTS;
+	else
+		statReg &= ~SR_CTS;
+
+	if(exc_data_recv.len) {
+		fifoPush(exc_data_recv.data);
+
+#if defined SIO1_DEBUG
+		printf("data recieved : %.2x (%i)\n", exc_data_recv.data, fifoEmployment());
+#endif
+	}
+
+	if(ctrlReg & CR_RXIEN) {
+		if(fifoEmployment() == fifoIrqVals[(ctrlReg >> 8) & 0x03]) {
+			if(!(statReg & SR_IRQ)) {
+#if defined SIO1_DEBUG
+			printf("irqCallback() : CR_RXIEN\n");
+#endif
+				irqCallback();
+				statReg |= SR_IRQ;
+			}
+		}
+	}
+
+	if(fifoOverrun()) {
+#if defined SIO1_DEBUG
+		printf("Overrun\n");
+#endif
+		statReg |= SR_OE;
+	}
+
+	// FIXME:
+	if(fifoEmpty())
+		statReg &= ~SR_RXRDY;
+	else
+		statReg |= SR_RXRDY;
+
+	if(ctrlReg & CR_DSRIEN) {
+		if(statReg & SR_DSR) {
+			if(!(statReg & SR_IRQ)) {
+#if defined SIO1_DEBUG
+			printf("irqCallback() : CR_DSRIEN\n");
+#endif
+				irqCallback();
+				statReg |= SR_IRQ;
+			}
+		}
+	}
+}
+
+/***************************************************************************/
+
+/* Write.
+ */
+
+void CALLBACK SIO1writeData8(u8 data) {
+#if defined SIO1_DEBUG
+	printf("SIO1writeData8(%.2x)\n", data);
+#endif
+	Exchange(data);
+}
+
+void CALLBACK SIO1writeData16(u16 data) {
+#if defined SIO1_DEBUG
+	printf("SIO1writeData16(%.4x)\n", data);
+#endif
+	Exchange(data & 0xff);
+}
+
+void CALLBACK SIO1writeData32(u32 data) {
+#if defined SIO1_DEBUG
+	printf("SIO1writeData32(%.8x)\n", data);
+#endif
+	Exchange(data & 0xff);
+}
+
+void CALLBACK SIO1writeStat16(u16 stat) {
+#if defined SIO1_DEBUG
+	printf("SIO1writeStat16(%.4x)\n", stat);
+#endif
+	Exchange(-1);
+}
+
+void CALLBACK SIO1writeStat32(u32 stat) {
+#if defined SIO1_DEBUG
+	printf("SIO1writeStat32(%.8x)\n", stat);
+#endif
+	SIO1writeStat16(stat);
+}
+
+void CALLBACK SIO1writeMode16(u16 mode) {
+#if defined SIO1_DEBUG
+	printf("SIO1writeMode16(%.4x)\n", mode);
+#endif
+	modeReg = mode;
+	Exchange(-1);
+}
+
+void CALLBACK SIO1writeMode32(u32 mode) {
+#if defined SIO1_DEBUG
+	printf("SIO1writeMode32(%.8x)\n", mode);
+#endif
+	SIO1writeMode16(mode);
+}
+
+void CALLBACK SIO1writeCtrl16(u16 ctrl) {
+#if defined SIO1_DEBUG
+	printf("SIO1writeCtrl16(%.4x)\n", ctrl);
+#endif
+	u16 ctrlSaved = ctrlReg;
+
+	ctrlReg = ctrl;
+
+	if(ctrlReg & CR_ERRRST) {
+		ctrlReg &= ~CR_ERRRST;
+		statReg &= ~(SR_PERROR | SR_OE | SR_FE | SR_IRQ);
+		
+		fifoResetErr();
+	}
+
+	if(ctrlReg & CR_RST) {
+		statReg &= ~SR_IRQ;
+		statReg |= SR_TXRDY | SR_TXU;
+		modeReg = 0;
+		ctrlReg = 0;
+		baudReg = 0;
+	}
+	
+	// FIXME: buffer not cleared and overrun possible, but flag must be cleared.
+	//if(!(ctrlReg & CR_RXEN))
+	//	statReg &= ~SR_RXRDY;
+	
+	// FIXME: ugly hack for C&C: RA and C&C: RAR.
+	if(((ctrlReg >> 8) & 0x03) != ((ctrlSaved >> 8) & 0x03))
+		fifoReset();
+	
+	// FIXME: move to Exchange.
+	if(ctrlReg & CR_TXIEN) {
+		if(!(statReg & SR_IRQ)) {
+#if defined SIO1_DEBUG
+		printf("irqCallback() : ctrl CR_TXIEN\n");
+#endif
+			irqCallback();
+			statReg |= SR_IRQ;
+		}
+	}
+	
+	Exchange(-1);
+}
+
+void CALLBACK SIO1writeCtrl32(u32 ctrl) {
+#if defined SIO1_DEBUG
+	printf("SIO1writeCtrl32(%.8x)\n", ctrl);
+#endif
+	SIO1writeCtrl16(ctrl);
+}
+
+void CALLBACK SIO1writeBaud16(u16 baud) {
+#if defined SIO1_DEBUG
+	printf("SIO1writeBaud16(%.4x)\n", baud);
+#endif
+	baudReg = baud;
+	Exchange(-1);
+}
+
+void CALLBACK SIO1writeBaud32(u32 baud) {
+#if defined SIO1_DEBUG
+	printf("SIO1writeBaud32(%.8x)\n", baud);
+#endif
+	SIO1writeBaud16(baud);
+}
+
+/* Read.
+ */
+
+u8 CALLBACK SIO1readData8() {
+	u8 data[1];
+
+	fifoPop(&data[0]);
+	Exchange(-1);
+
+#if defined SIO1_DEBUG
+	printf("SIO1readData8() : %.2x\n", data[0]);
+#endif
+
+	return *(u8*)data;
+}
+
+u16 CALLBACK SIO1readData16() {
+	u8 data[2];
+
+	fifoPop(&data[0]);
+	fifoPeek(&data[1]);
+	Exchange(-1);
+
+#if defined SIO1_DEBUG
+	printf("SIO1readData16() : %.2x %.2x\n", data[0], data[1]);
+#endif
+
+	return *(u16*)data;
+}
+
+u32 CALLBACK SIO1readData32() {
+	u8 data[4];
+
+	fifoPop(&data[0]);
+	fifoPop(&data[1]);
+	fifoPop(&data[2]);
+	fifoPop(&data[3]);
+	Exchange(-1);
+
+#if defined SIO1_DEBUG
+	printf("SIO1readData32() : %.2x %.2x %.2x %.2x\n", data[0], data[1], data[2], data[3]);
+#endif
+
+	return *(u32*)data;
+}
+
+u16 CALLBACK SIO1readStat16() {
+	Exchange(-1);
+#if defined SIO1_DEBUG
+	printf("SIO1readStat16() : %.4x\n", statReg);
+#endif
+	return statReg;
+}
+
+u32 CALLBACK SIO1readStat32() {
+	Exchange(-1);
+#if defined SIO1_DEBUG
+	printf("SIO1readStat32() : %.4x\n", statReg);
+#endif
+	return statReg;
+}
+
+u16 CALLBACK SIO1readMode16() {
+	Exchange(-1);
+#if defined SIO1_DEBUG
+	printf("SIO1readMode16() : %.4x\n", modeReg);
+#endif
+	return modeReg;
+}
+
+u32 CALLBACK SIO1readMode32() {
+	Exchange(-1);
+#if defined SIO1_DEBUG
+	printf("SIO1readMode32() : %.4x\n", modeReg);
+#endif
+	return modeReg;
+}
+
+u16 CALLBACK SIO1readCtrl16() {
+	Exchange(-1);
+#if defined SIO1_DEBUG
+	printf("SIO1readCtrl16() : %.4x\n", ctrlReg);
+#endif
+	return ctrlReg;
+}
+
+u32 CALLBACK SIO1readCtrl32() {
+	Exchange(-1);
+#if defined SIO1_DEBU
+	printf("SIO1readCtrl32() : %.4x\n", ctrlReg);
+#endif
+	return ctrlReg;
+}
+
+u16 CALLBACK SIO1readBaud16() {
+	Exchange(-1);
+#if defined SIO1_DEBUG
+	printf("SIO1readBaud16() : %.4x\n", baudReg);
+#endif
+	return baudReg;
+}
+
+u32 CALLBACK SIO1readBaud32() {
+	Exchange(-1);
+#if defined SIO1_DEBUG
+	printf("SIO1readBaud32() : %.4x\n", baudReg);
+#endif
+	return baudReg;
+}
+
+/***************************************************************************/
+
+void CALLBACK SIO1update(uint32_t t) {
+	Exchange(-1);
+}
+
+void CALLBACK SIO1registerCallback(void (CALLBACK *callback)()) {
+	irqCallback = callback;
+}
+
+/***************************************************************************/
+
+unsigned long CALLBACK PSEgetLibType() {
+	return PSE_LT_SIO1;
+}
+
+char* CALLBACK PSEgetLibName() {
+	return _(pluginName);
+}
+
+unsigned long CALLBACK PSEgetLibVersion() {
+	return version << 16 | revision << 8 | build;
+}
+
+long CALLBACK SIO1test() {
+	return 0;
+}
+
+#if defined _WINDOWS
+#elif defined _MACOSX
+#else
+void ExecCfg(char *arg) {
+	char cfg[256];
+	struct stat buf;
+
+	strcpy(cfg, "./cfgBladeSio1");
+	if (stat(cfg, &buf) != -1) {
+		int pid = fork();
+		if (pid == 0) {
+			if (fork() == 0) {
+				execl(cfg, "cfgBladeSio1", arg, NULL);
+			}
+			exit(0);
+		} else if (pid > 0) {
+			waitpid(pid, NULL, 0);
+		}
+		return;
+	}
+
+	strcpy(cfg, "./cfg/cfgBladeSio1");
+	if (stat(cfg, &buf) != -1) {
+		int pid = fork();
+		if (pid == 0) {
+			if (fork() == 0) {
+				execl(cfg, "cfgBladeSio1", arg, NULL);
+			}
+			exit(0);
+		} else if (pid > 0) {
+			waitpid(pid, NULL, 0);
+		}
+		return;
+	}
+
+	fprintf(stderr, "cfgBladeSio1 file not found!\n");
+}
+#endif
+
+void CALLBACK SIO1about() {
+#if defined _WINDOWS
+	DialogBox(hInst,MAKEINTRESOURCE(IDD_ABOUT), GetActiveWindow(),(DLGPROC)AboutDlgProc);
+#elif defined _MACOSX
+	AboutDlgProc();
+#else
+	ExecCfg("about");
+#endif
+}
+
+void CALLBACK SIO1configure() {
+#if defined _WINDOWS
+	DialogBox(hInst,MAKEINTRESOURCE(IDD_CFGDLG), GetActiveWindow(),(DLGPROC)Sio1DlgProc);
+#elif defined _MACOSX
+	ConfDlgProc();
+#else
+	ExecCfg("configure");
+#endif
+}
+
+/***************************************************************************/

pcsxr-1.9.93.tar.bz2/plugins/bladesio1/sio1.h Added

@@ -0,0 +1,87 @@
+/***************************************************************************
+ * Copyright (C) 2013 by Blade_Arma <edgbla@yandex.ru> *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
+ ***************************************************************************/
+
+#ifndef _SIO1_H_
+#define _SIO1_H_
+
+/***************************************************************************/
+
+#ifdef ENABLE_NLS
+#include <libintl.h>
+#include <locale.h>
+#define _(x) gettext(x)
+#define N_(x) (x)
+#elif defined(_MACOSX)
+#ifdef __cplusplus
+extern "C" {
+#endif
+#ifdef PCSXRCORE
+__private_extern__ char* Pcsxr_locale_text(char* toloc);
+#define _(String) Pcsxr_locale_text(String)
+#define N_(String) String
+#else
+#ifndef PCSXRPLUG
+#warning please define the plug being built to use Mac OS X localization!
+#define _(msgid) msgid
+#define N_(msgid) msgid
+#else
+	//Kludge to get the preprocessor to accept PCSXRPLUG as a variable.
+#define PLUGLOC_x(x,y) x ## y
+#define PLUGLOC_y(x,y) PLUGLOC_x(x,y)
+#define PLUGLOC PLUGLOC_y(PCSXRPLUG,_locale_text)
+__private_extern__ char* PLUGLOC(char* toloc);
+#define _(String) PLUGLOC(String)
+#define N_(String) String
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif
+#else
+#define _(x) (x)
+#define N_(x) (x)
+#endif
+
+#ifndef CALLBACK
+#define CALLBACK
+#endif
+
+enum {
+	PLAYER_DISABLED = 0,
+	PLAYER_MASTER,
+	PLAYER_SLAVE
+};
+
+typedef struct Settings {
+	s32 enabled;
+	s32 player;
+	char ip[32];
+	u16 port;
+} Settings;
+
+/******************************************************************************/
+
+extern void settingsRead();
+extern void settingsWrite();
+
+extern Settings settings;
+
+/***************************************************************************/
+
+#endif // _SIO1_H_

pcsxr-1.9.93.tar.bz2/plugins/bladesio1/sio1.ui Added

@@ -0,0 +1,292 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ 
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="upper">65535</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkDialog" id="dlgStart">
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="resizable">False</property>
+ <property name="modal">True</property>
+ <property name="window_position">center</property>
+ <property name="type_hint">normal</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">5</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="btnOk">
+ <property name="label" translatable="yes">OK</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="btnCancel">
+ <property name="label" translatable="yes">CANCEL</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Select here if you'll be Server (Player1) or Client (Player2).
+If you select Server you must Copy your IP address to the Clipboard and paste if (Ctrl+V) wherever the Client can see it.
+If you selected Client please enter the IP address the Server gave to you in the IP Address Control.</property>
+ <property name="wrap">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkTable" id="table1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">3</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">8</property>
+ <property name="row_spacing">5</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <object class="GtkButton" id="btnCopyIP">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <child>
+ <object class="GtkHBox" id="hbox2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-copy</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Copy PC IP to Clipboard</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="tbServerIP">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="max_length">15</property>
+ <property name="invisible_char">●</property>
+ <signal name="activate" handler="on_tbServerIP_activate" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="rbServer">
+ <property name="label" translatable="yes">Server (Player1)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="rbClient">
+ <property name="label" translatable="yes">Client (Player2)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">rbServer</property>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="rbDisabled">
+ <property name="label" translatable="yes">Disabled</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">rbServer</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkFixed" id="fixed1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="padding">2</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Do not change if not necessary (remember it must be changed on both sides).</property>
+ <property name="wrap">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Port Number</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="tbPort">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">●</property>
+ <property name="adjustment">adjustment1</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-5">btnOk</action-widget>
+ <action-widget response="-6">btnCancel</action-widget>
+ </action-widgets>
+ </object>
+</interface>

pcsxr-1.9.93.tar.bz2/plugins/bladesio1/typedefs.h Added

@@ -0,0 +1,35 @@
+/***************************************************************************
+ * Copyright (C) 2013 by Blade_Arma <edgbla@yandex.ru> *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
+ ***************************************************************************/
+
+#ifndef _TYPEDEFS_H_
+#define _TYPEDEFS_H_
+
+typedef int8_t s8;
+typedef int16_t s16;
+typedef int32_t s32;
+typedef int64_t s64;
+typedef intptr_t sptr;
+
+typedef uint8_t u8;
+typedef uint16_t u16;
+typedef uint32_t u32;
+typedef uint64_t u64;
+typedef uintptr_t uptr;
+
+#endif // _TYPEDEFS_H_

pcsxr-1.9.92.tar.bz2/plugins/dfcdrom/Makefile.am -> pcsxr-1.9.93.tar.bz2/plugins/dfcdrom/Makefile.am Changed

pcsxr-1.9.92.tar.bz2/plugins/dfcdrom/cdr-libcdio.c -> pcsxr-1.9.93.tar.bz2/plugins/dfcdrom/cdr-libcdio.c Changed

pcsxr-1.9.92.tar.bz2/plugins/dfcdrom/cdr-linux.c -> pcsxr-1.9.93.tar.bz2/plugins/dfcdrom/cdr-linux.c Changed

pcsxr-1.9.92.tar.bz2/plugins/dfcdrom/cdr-null.c -> pcsxr-1.9.93.tar.bz2/plugins/dfcdrom/cdr-null.c Changed

pcsxr-1.9.92.tar.bz2/plugins/dfcdrom/cdr.c -> pcsxr-1.9.93.tar.bz2/plugins/dfcdrom/cdr.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Wei Mingzhi <whistler@openoffice.org>.
+ * Copyright (c) 2010, Wei Mingzhi <whistler_wmz@users.sf.net>.
 * All Rights Reserved.
 *
 * Based on: Cdrom for Psemu Pro like Emulators
@@ -32,9 +32,10 @@
 pthread_mutex_t mut = PTHREAD_MUTEX_INITIALIZER;
 pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
 
-CacheData *cdcache;
-unsigned char *cdbuffer;
-int cacheaddr;
+volatile CacheData *cdcache;
+volatile int cacheaddr;
+
+volatile unsigned char *cdbuffer;
 
 crdata cr;
 
@@ -85,7 +86,7 @@
 	if (ReadMode == THREADED) {
 		cdcache = (CacheData *)malloc(CacheSize * sizeof(CacheData));
 		if (cdcache == NULL) return -1;
-		memset(cdcache, 0, CacheSize * sizeof(CacheData));
+		memset((void *)cdcache, 0, CacheSize * sizeof(CacheData));
 
 		found = 0;
 	} else {
@@ -136,7 +137,7 @@
 	}
 
 	if (ReadMode == THREADED) {
-		free(cdcache);
+		free((void *)cdcache);
 	}
 
 	return 0;
@@ -190,8 +191,8 @@
 	return 0;
 }
 
-unsigned char* GetBNormal() {
-	return cdbuffer;
+unsigned char *GetBNormal() {
+	return (unsigned char *)cdbuffer;
 }
 
 // threaded reading (with cache)
@@ -203,16 +204,16 @@
 		i = addr - cacheaddr;
 		PRINTF("found %d\n", (addr - cacheaddr));
 		cdbuffer = cdcache[i].cr.buf + 12;
-		while (btoi(cdbuffer[0]) != cr.msf.cdmsf_min0 ||
-			 btoi(cdbuffer[1]) != cr.msf.cdmsf_sec0 ||
-			 btoi(cdbuffer[2]) != cr.msf.cdmsf_frame0) {
+		while (cdcache[i].msf[0] != cr.msf.cdmsf_min0 ||
+			 cdcache[i].msf[1] != cr.msf.cdmsf_sec0 ||
+			 cdcache[i].msf[2] != cr.msf.cdmsf_frame0) {
 			if (locked == 1) {
 				if (cdcache[i].ret == 0) break;
 				return -1;
 			}
 			usleep(5000);
 		}
-		PRINTF("%x:%x:%x, %p, %p\n", cdbuffer[0], cdbuffer[1], cdbuffer[2], cdbuffer, cdcache);
+		PRINTF("%d:%d:%d, %p, %p\n", cdcache[i].msf[0], cdcache[i].msf[1], cdcache[i].msf[2], cdbuffer, cdcache);
 		found = 1;
 
 		return 0;
@@ -226,6 +227,7 @@
 
 	// not found in cache
 	locked = 0;
+
 	pthread_mutex_lock(&mut);
 	pthread_cond_signal(&cond);
 	pthread_mutex_unlock(&mut);
@@ -233,20 +235,22 @@
 	return 0;
 }
 
-unsigned char* GetBThreaded() {
+unsigned char *GetBThreaded() {
 	PRINTF("threadc %d\n", found);
 
-	if (found == 1) return cdbuffer;
+	if (found == 1) return (unsigned char *)cdbuffer;
+
 	cdbuffer = cdcache[0].cr.buf + 12;
-	while (btoi(cdbuffer[0]) != cr.msf.cdmsf_min0 ||
-		 btoi(cdbuffer[1]) != cr.msf.cdmsf_sec0 ||
-		 btoi(cdbuffer[2]) != cr.msf.cdmsf_frame0) {
+
+	while (cdcache[0].msf[0] != cr.msf.cdmsf_min0 ||
+		 cdcache[0].msf[1] != cr.msf.cdmsf_sec0 ||
+		 cdcache[0].msf[2] != cr.msf.cdmsf_frame0) {
 		if (locked == 1) return NULL;
 		usleep(5000);
 	}
 	if (cdcache[0].ret == -1) return NULL;
 
-	return cdbuffer;
+	return (unsigned char *)cdbuffer;
 }
 
 void *CdrThread(void *arg) {
@@ -254,8 +258,9 @@
 	int i;
 
 	for (;;) {
-		locked = 1;
 		pthread_mutex_lock(&mut);
+		locked = 1;
+
 		pthread_cond_wait(&cond, &mut);
 
 		if (stopth == 2) pthread_exit(NULL);
@@ -267,13 +272,21 @@
 		PRINTF("start thc %d:%d:%d\n", curTime[0], curTime[1], curTime[2]);
 
 		for (i = 0; i < CacheSize; i++) {
-			memcpy(&cdcache[i].cr.msf, curTime, 3);
+			cdcache[i].cr.msf.cdmsf_min0 = curTime[0];
+			cdcache[i].cr.msf.cdmsf_sec0 = curTime[1];
+			cdcache[i].cr.msf.cdmsf_frame0 = curTime[2];
+
 			PRINTF("reading %d:%d:%d\n", curTime[0], curTime[1], curTime[2]);
-			cdcache[i].ret = ReadSector(&cdcache[i].cr);
 
-			PRINTF("readed %x:%x:%x\n", cdcache[i].cr.buf[12], cdcache[i].cr.buf[13], cdcache[i].cr.buf[14]);
+			cdcache[i].ret = ReadSector((crdata *)&cdcache[i].cr);
 			if (cdcache[i].ret == -1) break;
 
+			PRINTF("readed %x:%x:%x\n", cdcache[i].cr.buf[12], cdcache[i].cr.buf[13], cdcache[i].cr.buf[14]);
+
+			cdcache[i].msf[0] = curTime[0];
+			cdcache[i].msf[1] = curTime[1];
+			cdcache[i].msf[2] = curTime[2];
+
 			curTime[2]++;
 			if (curTime[2] == 75) {
 				curTime[2] = 0;
@@ -428,7 +441,7 @@
 
 // read CDDA sector into buffer
 long CDRreadCDDA(unsigned char m, unsigned char s, unsigned char f, unsigned char *buffer) {
-	unsigned char msf[3] = {m, s, f};
+	unsigned char msf[3] = {itob(m), itob(s), itob(f)};
 	unsigned char *p;
 
 	if (CDRreadTrack(msf) != 0) return -1;
@@ -461,18 +474,28 @@
 
 	strcpy(cfg, "./cfgDFCdrom");
 	if (stat(cfg, &buf) != -1) {
-		if (fork() == 0) {
-			execl(cfg, "cfgDFCdrom", arg, NULL);
+		int pid = fork();
+		if (pid == 0) {
+			if (fork() == 0) {
+				execl(cfg, "cfgDFCdrom", arg, NULL);
+			}
 			exit(0);
+		} else if (pid > 0) {
+			waitpid(pid, NULL, 0);
 		}
 		return;
 	}
 
-	strcpy(cfg, "./cfg/DFCdrom");
+	strcpy(cfg, "./cfg/cfgDFCdrom");
 	if (stat(cfg, &buf) != -1) {
-		if (fork() == 0) {
-			execl(cfg, "cfgDFCdrom", arg, NULL);
+		int pid = fork();
+		if (pid == 0) {
+			if (fork() == 0) {
+				execl(cfg, "cfgDFCdrom", arg, NULL);
+			}
 			exit(0);
+		} else if (pid > 0) {
+			waitpid(pid, NULL, 0);
 		}
 		return;
 	}

pcsxr-1.9.92.tar.bz2/plugins/dfcdrom/cdr.h -> pcsxr-1.9.93.tar.bz2/plugins/dfcdrom/cdr.h Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Wei Mingzhi <whistler@openoffice.org>.
+ * Copyright (c) 2010, Wei Mingzhi <whistler_wmz@users.sf.net>.
 * All Rights Reserved.
 *
 * Based on: Cdrom for Psemu Pro like Emulators
@@ -31,6 +31,32 @@
 #include <locale.h>
 #define _(x) gettext(x)
 #define N_(x) (x)
+#elif defined(_MACOSX)
+#ifdef __cplusplus
+extern "C" {
+#endif
+#ifdef PCSXRCORE
+__private_extern__ char* Pcsxr_locale_text(char* toloc);
+#define _(String) Pcsxr_locale_text(String)
+#define N_(String) String
+#else
+#ifndef PCSXRPLUG
+#warning please define the plug being built to use Mac OS X localization!
+#define _(msgid) msgid
+#define N_(msgid) msgid
+#else
+//Kludge to get the preprocessor to accept PCSXRPLUG as a variable.
+#define PLUGLOC_x(x,y) x ## y
+#define PLUGLOC_y(x,y) PLUGLOC_x(x,y)
+#define PLUGLOC PLUGLOC_y(PCSXRPLUG,_locale_text)
+__private_extern__ char* PLUGLOC(char* toloc);
+#define _(String) PLUGLOC(String)
+#define N_(String) String
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif
 #else
 #define _(x) (x)
 #define N_(x) (x)
@@ -175,6 +201,7 @@
 } crdata;
 
 typedef struct {
+	unsigned char msf[3];
 	crdata cr;
 	int ret;
 } CacheData;

pcsxr-1.9.93.tar.bz2/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui Added

@@ -0,0 +1,394 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ 
+ <object class="GtkAdjustment" id="adjustmentCacheSize">
+ <property name="lower">32</property>
+ <property name="upper">2048</property>
+ <property name="value">64</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">16</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustmentCdrSpeed">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">4</property>
+ </object>
+ <object class="GtkDialog" id="CfgWnd">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">CDR configuration</property>
+ <property name="resizable">False</property>
+ <property name="modal">True</property>
+ <property name="window_position">center</property>
+ <property name="type_hint">normal</property>
+ <signal name="show" handler="on_cfg_dialog_show" swapped="no"/>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="cfg_dialog-action_area">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="cfg_closebutton">
+ <property name="label">gtk-close</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ <signal name="clicked" handler="on_cfg_cancelbutton_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <child>
+ <object class="GtkHBox" id="hbox5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <child>
+ <object class="GtkComboBox" id="cddev_comboboxentry">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Choose your CD-ROM device or type its path if it's not listed</property>
+ <property name="has_entry">True</property>
+ <child internal-child="entry">
+ <object class="GtkEntry" id="combobox-entry2">
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <child>
+ <object class="GtkVBox" id="vbox2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkHBox" id="hbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="spacing">5</property>
+ <child>
+ <object class="GtkLabel" id="readmode_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Select read mode:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="readmode_combobox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="model">liststoreReadMode</property>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertextReadMode"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="spacing">5</property>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Cache Size (Def. 64):</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="spinCacheSize">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="adjustment">adjustmentCacheSize</property>
+ <property name="climb_rate">1</property>
+ <property name="numeric">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="spacing">5</property>
+ <child>
+ <object class="GtkLabel" id="label7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Spindown Time:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="comboSpinDown">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="model">liststoreSpindownTime</property>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertextSpindownTime"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="spacing">5</property>
+ <child>
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Cdrom Speed (Def. 0 = MAX):</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="spinCdrSpeed">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="adjustment">adjustmentCdrSpeed</property>
+ <property name="climb_rate">1</property>
+ <property name="numeric">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="subQ_button">
+ <property name="label" translatable="yes">Enable subchannel read</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="border_width">5</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">cfg_closebutton</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkListStore" id="liststoreReadMode">
+ <columns>
+ 
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Normal (No Cache)</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Threaded - Faster (With Cache)</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="liststoreSpindownTime">
+ <columns>
+ 
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Default</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">125ms</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">250ms</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">500ms</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">1s</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">2s</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">4s</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">8s</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">16s</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">32s</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">1min</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">2min</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">4min</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">8min</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">16min</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">32min</col>
+ </row>
+ </data>
+ </object>
+</interface>

pcsxr-1.9.92.tar.bz2/plugins/dfcdrom/cdrcfg-0.1df/main.c -> pcsxr-1.9.93.tar.bz2/plugins/dfcdrom/cdrcfg-0.1df/main.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Wei Mingzhi <whistler@openoffice.org>.
+ * Copyright (c) 2010, Wei Mingzhi <whistler_wmz@users.sf.net>.
 * All Rights Reserved.
 *
 * Based on: Cdrom for Psemu Pro like Emulators
@@ -22,9 +22,9 @@
 #include "../cfg.c"
 
 #include <gtk/gtk.h>
-#include <glade/glade.h>
 
-GtkWidget *MainWindow;
+GtkBuilder *builder;
+GtkWidget *widget, *MainWindow;
 
 // function to check if the device is a cdrom
 int is_cdrom(const char *device) {
@@ -94,6 +94,10 @@
 		"/dev/cdroms/cdrom1",
 		"/dev/cdroms/cdrom2",
 		"/dev/cdroms/cdrom3",
+		"/dev/sr0",
+		"/dev/sr1",
+		"/dev/sr2",
+		"/dev/sr3",
 		"/dev/hda",
 		"/dev/hdb",
 		"/dev/hdc",
@@ -170,79 +174,73 @@
 	}
 
 	gtk_combo_box_set_model(GTK_COMBO_BOX(widget), GTK_TREE_MODEL(store));
-	gtk_combo_box_entry_set_text_column(GTK_COMBO_BOX_ENTRY(widget), 0);
+	gtk_combo_box_set_entry_text_column(GTK_COMBO_BOX(widget), 0);
 }
 
 static void OnConfigExit(GtkWidget *widget, gpointer user_data) {
-	GladeXML *xml;
-
-	xml = glade_get_widget_tree(MainWindow);
-
-	widget = glade_xml_get_widget(xml, "cddev_comboboxentry");
-	strncpy(CdromDev, gtk_entry_get_text(GTK_ENTRY(GTK_BIN(widget)->child)), 255);
+	widget = gtk_builder_get_object(builder, "cddev_comboboxentry");
+	strncpy(CdromDev, gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(widget)))), 255);
 	CdromDev[255] = '\0';
 
-	widget = glade_xml_get_widget(xml, "readmode_combobox");
+	widget = gtk_builder_get_object(builder, "readmode_combobox");
 	ReadMode = gtk_combo_box_get_active(GTK_COMBO_BOX(widget));
 
-	widget = glade_xml_get_widget(xml, "subQ_button");
+	widget = gtk_builder_get_object(builder, "subQ_button");
 	UseSubQ = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
 
-	widget = glade_xml_get_widget(xml, "spinCacheSize");
+	widget = gtk_builder_get_object(builder, "spinCacheSize");
 	CacheSize = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget));
 
-	widget = glade_xml_get_widget(xml, "spinCdrSpeed");
+	widget = gtk_builder_get_object(builder, "spinCdrSpeed");
 	CdrSpeed = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget));
 
-	widget = glade_xml_get_widget(xml, "comboSpinDown");
+	widget = gtk_builder_get_object(builder, "comboSpinDown");
 	SpinDown = gtk_combo_box_get_active(GTK_COMBO_BOX(widget));
 
 	SaveConf();
 
 	gtk_widget_destroy(widget);
-	gtk_exit(0);
+	exit(0);
 }
 
 long CDRconfigure() {
-	GladeXML *xml;
-	GtkWidget *widget;
-
 	LoadConf();
 
-	xml = glade_xml_new(DATADIR "dfcdrom.glade2", "CfgWnd", NULL);
-	if (xml == NULL) {
+	builder = gtk_builder_new();
+		
+	if (!gtk_builder_add_from_file(builder, DATADIR "dfcdrom.ui", NULL)) {
 		g_warning("We could not load the interface!");
-		return -1;
+		return 0;
 	}
 
-	MainWindow = glade_xml_get_widget(xml, "CfgWnd");
+	MainWindow = gtk_builder_get_object(builder, "CfgWnd");
 	gtk_window_set_title(GTK_WINDOW(MainWindow), _("CDR configuration"));
 
-	widget = glade_xml_get_widget(xml, "CfgWnd");
-	g_signal_connect_data(GTK_OBJECT(widget), "delete_event",
-		GTK_SIGNAL_FUNC(OnConfigExit), NULL, NULL, G_CONNECT_AFTER);
+	widget = gtk_builder_get_object(builder, "CfgWnd");
+	g_signal_connect_data(G_OBJECT(widget), "delete_event",
+		G_CALLBACK(OnConfigExit), NULL, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "cfg_closebutton");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		GTK_SIGNAL_FUNC(OnConfigExit), NULL, NULL, G_CONNECT_AFTER);
+	widget = gtk_builder_get_object(builder, "cfg_closebutton");
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+		G_CALLBACK(OnConfigExit), NULL, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "cddev_comboboxentry");
+	widget = gtk_builder_get_object(builder, "cddev_comboboxentry");
 	fill_drives_list(widget);
-	gtk_entry_set_text(GTK_ENTRY(GTK_BIN(widget)->child), CdromDev);
+	gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(widget))), CdromDev);
 
-	widget = glade_xml_get_widget(xml, "readmode_combobox");
+	widget = gtk_builder_get_object(builder, "readmode_combobox");
 	gtk_combo_box_set_active(GTK_COMBO_BOX(widget), ReadMode);
 
-	widget = glade_xml_get_widget(xml, "subQ_button");
+	widget = gtk_builder_get_object(builder, "subQ_button");
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), UseSubQ);
 
-	widget = glade_xml_get_widget(xml, "spinCacheSize");
+	widget = gtk_builder_get_object(builder, "spinCacheSize");
 	gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), (float)CacheSize);
 
-	widget = glade_xml_get_widget(xml, "spinCdrSpeed");
+	widget = gtk_builder_get_object(builder, "spinCdrSpeed");
 	gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), (float)CdrSpeed);
 
-	widget = glade_xml_get_widget(xml, "comboSpinDown");
+	widget = gtk_builder_get_object(builder, "comboSpinDown");
 	gtk_combo_box_set_active(GTK_COMBO_BOX(widget), SpinDown);
 
 	gtk_widget_show(MainWindow);
@@ -258,7 +256,7 @@
 							"Wei Mingzhi <whistler_wmz@users.sf.net>", NULL};
 
 	widget = gtk_about_dialog_new();
-	gtk_about_dialog_set_name(GTK_ABOUT_DIALOG(widget), "CD-ROM Device Reader");
+	gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(widget), "CD-ROM Device Reader");
 	gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(widget), "1.0");
 	gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(widget), authors);
 	gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(widget), "http://pcsxr.codeplex.com/");
@@ -275,16 +273,23 @@
 	textdomain(GETTEXT_PACKAGE);
 #endif
 
-	gtk_set_locale();
 	gtk_init(&argc, &argv);
 
-	if (argc != 2) return 0;
+	if (argc < 2) {
+ 	printf ("Usage: cfgBladeSio1 {about | configure}\n");
+		return 0;
+	}
 
-	if (strcmp(argv[1], "configure") == 0) {
+ if (strcmp(argv[1], "configure") != 0 && 
+		strcmp(argv[1], "about") != 0) {
+		printf ("Usage: cfgBladeSio1 {about | configure}\n");
+		return 0;
+ }
+ 
+	if(!strcmp(argv[1], "configure"))
 		CDRconfigure();
-	} else {
+	else if(!strcmp(argv[1], "about"))
 		CDRabout();
-	}
-
+	
 	return 0;
 }

pcsxr-1.9.92.tar.bz2/plugins/dfcdrom/cfg.c -> pcsxr-1.9.93.tar.bz2/plugins/dfcdrom/cfg.c Changed

pcsxr-1.9.92.tar.bz2/plugins/dfcdrom/util.c -> pcsxr-1.9.93.tar.bz2/plugins/dfcdrom/util.c Changed

pcsxr-1.9.92.tar.bz2/plugins/dfinput/Makefile.am -> pcsxr-1.9.93.tar.bz2/plugins/dfinput/Makefile.am Changed

@@ -3,21 +3,19 @@
 
 lib_LTLIBRARIES = libDFInput.la
 
-libDFInput_la_SOURCES = cfg.c pad.c pad.h sdljoy.c xkb.c analog.c
-libDFInput_la_LDFLAGS = -module -avoid-version -lpthread -lX11 \
-	`$(SDL_CONFIG) --libs` -L/usr/X11R6/lib64 -L/usr/X11R6/lib
+libDFInput_la_SOURCES = cfg.c pad.c pad.h sdljoy.c xkb.c analog.c util.c util.h
+libDFInput_la_LDFLAGS = -module -avoid-version 
+libDFInput_la_LIBADD = -lpthread -lX11 $(SDL_LIBS)
 
-INCLUDES = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \
-	-DLOCALE_DIR=\"${datadir}/locale/\" \
+AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
 	-DDATADIR=\"${datadir}/psemu/\" \
-	$(GTK2_CFLAGS) $(GLADE2_CFLAGS) -I/usr/X11R6/include \
+	$(GTK3_CFLAGS) \
 	-I../../include -I../../libpcsxcore $(SDL_CFLAGS)
 
 bin_PROGRAMS = cfgDFInput
-cfgDFInput_SOURCES = cfg-gtk2.c pad.h
-cfgDFInput_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS)
-cfgDFInput_LDFLAGS = $(SDL_LIBS) -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
+cfgDFInput_SOURCES = cfg-gtk.c pad.h
+cfgDFInput_LDADD = $(GTK3_LIBS) $(SDL_LIBS) -lX11
 
-glade_DATA = dfinput.glade2
+glade_DATA = dfinput.ui
 gladedir = $(datadir)/psemu/
 EXTRA_DIST = $(glade_DATA)

pcsxr-1.9.92.tar.bz2/plugins/dfinput/analog.c -> pcsxr-1.9.93.tar.bz2/plugins/dfinput/analog.c Changed

pcsxr-1.9.93.tar.bz2/plugins/dfinput/cfg-gtk.c Added

@@ -0,0 +1,868 @@
+/*
+ * Copyright (c) 2009, Wei Mingzhi <whistler_wmz@users.sf.net>.
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses>.
+ */
+
+#include "cfg.c"
+
+#include <time.h>
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+
+GtkWidget *MainWindow;
+GtkBuilder *xml;
+
+
+const int NUM_KEYLIST = 3; // emukey + num controllers
+const char *widgetname_treeview[3] = {"treeview_e", "treeview1", "treeview2"};
+const char *widgetname_change[3] = {"btnchange_e", "btnchange1", "btnchange2"};
+const char *widgetname_reset[3] = {"btnreset_e", "btnreset1", "btnreset2"};
+const char *widgetname_combodev[3] = {"combodev_e", "combodev1", "combodev2"};
+
+// TODO: this could be removed if the underlying enum order is changed like this has, so then GUI's order will be the same
+const int DPad[DKEY_TOTAL] = {
+	DKEY_UP,
+	DKEY_DOWN,
+	DKEY_LEFT,
+	DKEY_RIGHT,
+	DKEY_CROSS,
+	DKEY_CIRCLE,
+	DKEY_SQUARE,
+	DKEY_TRIANGLE,
+	DKEY_L1,
+	DKEY_R1,
+	DKEY_L2,
+	DKEY_R2,
+	DKEY_SELECT,
+	DKEY_START,
+	DKEY_L3,
+	DKEY_R3,
+	DKEY_ANALOG
+};
+
+
+const char *EmuKeyText[EMU_TOTAL] = {
+	N_("Increment state slot"),
+	N_("Fast-forwards"),
+	N_("Load state"),
+	N_("Save state"),
+	N_("Screenshot"),
+	N_("Escape")
+};
+
+const char *DPadText[DKEY_TOTAL] = {
+	N_("D-Pad Up"),
+	N_("D-Pad Down"),
+	N_("D-Pad Left"),
+	N_("D-Pad Right"),
+	N_("Cross"),
+	N_("Circle"),
+	N_("Square"),
+	N_("Triangle"),
+	N_("L1"),
+	N_("R1"),
+	N_("L2"),
+	N_("R2"),
+	N_("Select"),
+	N_("Start"),
+	N_("L3"),
+	N_("R3"),
+	N_("Analog")
+};
+
+const char *AnalogText[] = {
+	N_("L-Stick Right"),
+	N_("L-Stick Left"),
+	N_("L-Stick Down"),
+	N_("L-Stick Up"),
+	N_("R-Stick Right"),
+	N_("R-Stick Left"),
+	N_("R-Stick Down"),
+	N_("R-Stick Up")
+};
+
+static int GetSelectedKeyIndex(int padnum) {
+	GtkTreeSelection	*selection;
+	GtkTreeIter			iter;
+	GtkTreeModel		*model;
+	GtkTreePath			*path;
+	gboolean			selected;
+	int					i;
+
+	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(gtk_builder_get_object(xml, widgetname_treeview[padnum+1])));
+	selected = gtk_tree_selection_get_selected(selection, &model, &iter);
+
+	if (!selected) {
+		return -1;
+	}
+
+	path = gtk_tree_model_get_path(model, &iter);
+	i = *gtk_tree_path_get_indices(path);
+	gtk_tree_path_free(path);
+
+	return i;
+}
+
+static void GetKeyDescription(char *buf, int joynum, int key) {
+	const char *hatname[16] = {_("Centered"), _("Up"), _("Right"), _("Rightup"),
+		_("Down"), "", _("Rightdown"), "", _("Left"), _("Leftup"), "", "",
+		_("Leftdown"), "", "", ""};
+
+	KEYDEF* keydef = joynum < 0 ? &g.cfg.E.EmuDef[key].Mapping : &g.cfg.PadDef[joynum].KeyDef[key];
+
+	switch (keydef->JoyEvType) {
+		case BUTTON:
+			sprintf(buf, _("Joystick: Button %d"), keydef->J.Button);
+			break;
+
+		case AXIS:
+			sprintf(buf, _("Joystick: Axis %d%c"), abs(keydef->J.Axis) - 1,
+				keydef->J.Axis > 0 ? '+' : '-');
+			break;
+
+		case HAT:
+			sprintf(buf, _("Joystick: Hat %d %s"), (keydef->J.Hat >> 8),
+				hatname[keydef->J.Hat & 0x0F]);
+			break;
+
+		case NONE:
+		default:
+			buf[0] = '\0';
+			break;
+	}
+
+	if (keydef->Key != 0) {
+		if (buf[0] != '\0') {
+			strcat(buf, " / ");
+		}
+
+		strcat(buf, _("Keyboard:"));
+		strcat(buf, " ");
+		strcat(buf, XKeysymToString(keydef->Key));
+	} else if (buf[0] == '\0') {
+		strcpy(buf, _("(Not Set)"));
+	}
+}
+
+static void GetAnalogDescription(char *buf, int joynum, int analognum, int dir) {
+	const char *hatname[16] = {_("Centered"), _("Up"), _("Right"), _("Rightup"),
+		_("Down"), "", _("Rightdown"), "", _("Left"), _("Leftup"), "", "",
+		_("Leftdown"), "", "", ""};
+
+	switch (g.cfg.PadDef[joynum].AnalogDef[analognum][dir].JoyEvType) {
+		case BUTTON:
+			sprintf(buf, _("Joystick: Button %d"), g.cfg.PadDef[joynum].AnalogDef[analognum][dir].J.Button);
+			break;
+
+		case AXIS:
+			sprintf(buf, _("Joystick: Axis %d%c"), abs(g.cfg.PadDef[joynum].AnalogDef[analognum][dir].J.Axis) - 1,
+				g.cfg.PadDef[joynum].AnalogDef[analognum][dir].J.Axis > 0 ? '+' : '-');
+			break;
+
+		case HAT:
+			sprintf(buf, _("Joystick: Hat %d %s"), (g.cfg.PadDef[joynum].AnalogDef[analognum][dir].J.Hat >> 8),
+				hatname[g.cfg.PadDef[joynum].AnalogDef[analognum][dir].J.Hat & 0x0F]);
+			break;
+
+		case NONE:
+		default:
+			buf[0] = '\0';
+			break;
+	}
+
+	if (g.cfg.PadDef[joynum].AnalogDef[analognum][dir].Key != 0) {
+		if (buf[0] != '\0') {
+			strcat(buf, " / ");
+		}
+
+		strcat(buf, _("Keyboard:"));
+		strcat(buf, " ");
+		strcat(buf, XKeysymToString(g.cfg.PadDef[joynum].AnalogDef[analognum][dir].Key));
+	} else if (buf[0] == '\0') {
+		strcpy(buf, _("(Not Set)"));
+	}
+}
+
+static void UpdateKeyList() {
+	GtkWidget *widget;
+	GtkListStore *store;
+	GtkTreeIter iter;
+	int i, j;
+	char buf[256];
+
+	for (i = 0; i < NUM_KEYLIST; i++) {
+		int total;
+
+		widget = GTK_WIDGET(gtk_builder_get_object(xml, widgetname_treeview[i]));
+		store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_STRING);
+
+		if ( i == 0 ) {
+			total = EMU_TOTAL;
+		}
+		else {
+		switch(g.cfg.PadDef[i-1].Type)
+		{
+			case PSE_PAD_TYPE_MOUSE:
+				total = 0;
+				break;
+			case PSE_PAD_TYPE_STANDARD:
+				total = DKEY_TOTAL - 3;
+				break;
+			case PSE_PAD_TYPE_ANALOGPAD:
+				total = DKEY_TOTAL;
+				break;
+		}
+		}
+
+		for (j = 0; j < total; j++) {
+			gtk_list_store_append(store, &iter);
+			GetKeyDescription(buf, i-1, i == 0 ? j : DPad[j]); // change order of orig. typedef to up, down, etc
+			gtk_list_store_set(store, &iter, 0, i == 0 ? _(EmuKeyText[j]) : _(DPadText[j]), 1, buf, -1);
+		}
+
+		if (i > 0 && g.cfg.PadDef[i-1].Type == PSE_PAD_TYPE_ANALOGPAD) {
+			for (j = 0; j < 8; j++) {
+				gtk_list_store_append(store, &iter);
+				GetAnalogDescription(buf, i-1, j / 4, j % 4);
+				gtk_list_store_set(store, &iter, 0, _(AnalogText[j]), 1, buf, -1);
+			}
+		}
+
+		gtk_tree_view_set_model(GTK_TREE_VIEW(widget), GTK_TREE_MODEL(store));
+		g_object_unref(G_OBJECT(store));
+		gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(widget), TRUE);
+		gtk_widget_show(widget);
+	}
+}
+
+static void UpdateKey() {
+	int i, index;
+	GtkWidget *widget;
+	GtkTreeModel *model;
+	GtkTreeIter iter;
+	char buf[256];
+
+	for (i = 0; i < NUM_KEYLIST; i++) {
+		GValue value = { 0, };
+		index = GetSelectedKeyIndex(i-1);
+		if (index == -1) continue;
+
+		widget = GTK_WIDGET(gtk_builder_get_object(xml, widgetname_treeview[i]));
+		gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)), &model, &iter);
+
+		// this can be removed if DPAD[index] is removed
+		if (i == 0) {
+			GetKeyDescription(buf, i-1, index);
+		}
+		else if (index < DKEY_TOTAL) {
+			GetKeyDescription(buf, i-1, DPad[index]);
+		} else {
+			GetAnalogDescription(buf, i-1, (index - DKEY_TOTAL) / 4, (index - DKEY_TOTAL) % 4);
+		}
+
+		g_value_init(&value, G_TYPE_STRING);
+		g_value_set_string(&value, buf);
+		gtk_list_store_set_value(GTK_LIST_STORE(model), &iter, 1, &value);
+	}
+}
+
+static void OnConfigExit(GtkWidget *widget, gpointer user_data) {
+	SavePADConfig();
+
+	gtk_widget_destroy(widget);
+	SDL_Quit();
+	XCloseDisplay(g.Disp);
+
+	exit(0);
+}
+
+static void TreeSelectionChanged(GtkTreeSelection *selection, gpointer user_data) {
+	GtkTreeIter iter;
+	GtkTreeModel *model;
+	GtkTreePath *path;
+
+	gboolean selected;
+	int i;
+
+	selected = gtk_tree_selection_get_selected(selection, &model, &iter);
+
+	if (selected) {
+		path = gtk_tree_model_get_path(model, &iter);
+		i = *gtk_tree_path_get_indices(path);
+		gtk_tree_path_free(path);
+
+		// If a row was selected, and the row is not blank, we can now enable
+		// some of the disabled widgets
+	}
+	gint padnum = GPOINTER_TO_INT(user_data);
+	gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(xml, widgetname_reset[padnum+1])), selected);
+	gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(xml, widgetname_change[padnum+1])), selected);
+}
+
+static void OnDeviceChanged(GtkWidget *widget, gpointer user_data) {
+	int n = GPOINTER_TO_INT(user_data);
+	int current = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)) - 1;
+	if (n >= 0) {
+		g.cfg.PadDef[n].DevNum = current;
+	} else {
+		g.cfg.E.DevNum = current;
+	}
+}
+
+static void OnTypeChanged(GtkWidget *widget, gpointer user_data) {
+	uint n = GPOINTER_TO_UINT(user_data), current = gtk_combo_box_get_active(GTK_COMBO_BOX(widget));
+
+	int padTypeList[] = {
+		PSE_PAD_TYPE_STANDARD,
+		PSE_PAD_TYPE_ANALOGPAD,
+		PSE_PAD_TYPE_MOUSE
+	};
+
+	g.cfg.PadDef[n].Type = padTypeList[current];
+
+	UpdateKeyList();
+}
+
+static void OnThreadedToggled(GtkWidget *widget, gpointer user_data) {
+	g.cfg.Threaded = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
+}
+
+static void OnVisualVibration1Toggled(GtkWidget *widget, gpointer user_data) {
+	g.cfg.PadDef[0].VisualVibration = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
+}
+
+static void OnVisualVibration2Toggled(GtkWidget *widget, gpointer user_data) {
+	g.cfg.PadDef[1].VisualVibration = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
+}
+
+static void OnHideCursorToggled(GtkWidget *widget, gpointer user_data) {
+	(void)user_data; // unused
+	g.cfg.HideCursor = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
+}
+
+static void OnPreventScrSaverToggled(GtkWidget *widget, gpointer user_data) {
+	(void)user_data; // unused
+	g.cfg.PreventScrSaver = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
+}
+
+static void ReadDKeyEvent(int padnum, int key) {
+	SDL_Joystick *js;
+	time_t t;
+	//GdkEvent *ge;
+	int i;
+	Sint16 axis, numAxes = 0, InitAxisPos[256], PrevAxisPos[256];
+	unsigned char buttons[32];
+	uint16_t Key;
+
+	KEYDEF* keydef = padnum < 0 ? &g.cfg.E.EmuDef[key].Mapping : &g.cfg.PadDef[padnum].KeyDef[key];
+	int8_t devnum = padnum < 0 ? g.cfg.E.DevNum : g.cfg.PadDef[padnum].DevNum;
+
+	if (devnum >= 0) {
+		js = SDL_JoystickOpen(devnum);
+		SDL_JoystickEventState(SDL_IGNORE);
+
+		SDL_JoystickUpdate();
+
+		numAxes = SDL_JoystickNumAxes(js);
+		if (numAxes > 256) numAxes = 256;
+
+		for (i = 0; i < numAxes; i++) {
+			InitAxisPos[i] = PrevAxisPos[i] = SDL_JoystickGetAxis(js, i);
+		}
+	} else {
+		js = NULL;
+	}
+
+	t = time(NULL);
+
+	while (time(NULL) < t + 10) {
+		// check joystick events
+		if (js != NULL) {
+			SDL_JoystickUpdate();
+
+			for (i = 0; i < SDL_JoystickNumButtons(js); i++) {
+				if (SDL_JoystickGetButton(js, i)) {
+					keydef->JoyEvType = BUTTON;
+					keydef->J.Button = i;
+					goto end;
+				}
+			}
+
+			for (i = 0; i < numAxes; i++) {
+				axis = SDL_JoystickGetAxis(js, i);
+				if (abs(axis) > 16383 && (abs(axis - InitAxisPos[i]) > 4096 || abs(axis - PrevAxisPos[i]) > 4096)) {
+					keydef->JoyEvType = AXIS;
+					keydef->J.Axis = (i + 1) * (axis > 0 ? 1 : -1);
+					goto end;
+				}
+				PrevAxisPos[i] = axis;
+			}
+
+			for (i = 0; i < SDL_JoystickNumHats(js); i++) {
+				axis = SDL_JoystickGetHat(js, i);
+				if (axis != SDL_HAT_CENTERED) {
+					keydef->JoyEvType = HAT;
+
+					if (axis & SDL_HAT_UP) {
+						keydef->J.Hat = ((i << 8) | SDL_HAT_UP);
+					} else if (axis & SDL_HAT_DOWN) {
+						keydef->J.Hat = ((i << 8) | SDL_HAT_DOWN);
+					} else if (axis & SDL_HAT_LEFT) {
+						keydef->J.Hat = ((i << 8) | SDL_HAT_LEFT);
+					} else if (axis & SDL_HAT_RIGHT) {
+						keydef->J.Hat = ((i << 8) | SDL_HAT_RIGHT);
+					}
+
+					goto end;
+				}
+			}
+		}
+
+		// check keyboard events
+		XQueryKeymap(g.Disp, buttons);
+		for (i = 0; i < 256; ++i) {
+			if(buttons[i >> 3] & (1 << (i & 7))) {
+				Key = XkbKeycodeToKeysym(g.Disp, i, 0, 0);
+				if(Key != XK_Escape) {
+					keydef->Key = Key;
+				}
+				goto end;
+			}
+		}
+
+		usleep(5000);
+	}
+
+end:
+	if (js != NULL) {
+		SDL_JoystickClose(js);
+	}
+}
+
+static void ReadAnalogEvent(int padnum, int analognum, int analogdir) {
+	SDL_Joystick *js;
+	time_t t;
+	GdkEvent *ge;
+	int i;
+	Sint16 axis, numAxes = 0, InitAxisPos[256], PrevAxisPos[256];
+	unsigned char buttons[32];
+	uint16_t Key;
+
+	if (g.cfg.PadDef[padnum].DevNum >= 0) {
+		js = SDL_JoystickOpen(g.cfg.PadDef[padnum].DevNum);
+		SDL_JoystickEventState(SDL_IGNORE);
+
+		SDL_JoystickUpdate();
+
+		numAxes = SDL_JoystickNumAxes(js);
+		if (numAxes > 256) numAxes = 256;
+
+		for (i = 0; i < SDL_JoystickNumAxes(js); i++) {
+			InitAxisPos[i] = PrevAxisPos[i] = SDL_JoystickGetAxis(js, i);
+		}
+	} else {
+		js = NULL;
+	}
+
+	t = time(NULL);
+
+	while (time(NULL) < t + 10) {
+		// check joystick events
+		if (js != NULL) {
+			SDL_JoystickUpdate();
+
+			for (i = 0; i < SDL_JoystickNumButtons(js); i++) {
+				if (SDL_JoystickGetButton(js, i)) {
+					g.cfg.PadDef[padnum].AnalogDef[analognum][analogdir].JoyEvType = BUTTON;
+					g.cfg.PadDef[padnum].AnalogDef[analognum][analogdir].J.Button = i;
+					goto end;
+				}
+			}
+
+			for (i = 0; i < numAxes; i++) {
+				axis = SDL_JoystickGetAxis(js, i);
+				if (abs(axis) > 16383 && (abs(axis - InitAxisPos[i]) > 4096 || abs(axis - PrevAxisPos[i]) > 4096)) {
+					g.cfg.PadDef[padnum].AnalogDef[analognum][analogdir].JoyEvType = AXIS;
+					g.cfg.PadDef[padnum].AnalogDef[analognum][analogdir].J.Axis = (i + 1) * (axis > 0 ? 1 : -1);
+					goto end;
+				}
+				PrevAxisPos[i] = axis;
+			}
+
+			for (i = 0; i < SDL_JoystickNumHats(js); i++) {
+				axis = SDL_JoystickGetHat(js, i);
+				if (axis != SDL_HAT_CENTERED) {
+					g.cfg.PadDef[padnum].AnalogDef[analognum][analogdir].JoyEvType = HAT;
+
+					if (axis & SDL_HAT_UP) {
+						g.cfg.PadDef[padnum].AnalogDef[analognum][analogdir].J.Hat = ((i << 8) | SDL_HAT_UP);
+					} else if (axis & SDL_HAT_DOWN) {
+						g.cfg.PadDef[padnum].AnalogDef[analognum][analogdir].J.Hat = ((i << 8) | SDL_HAT_DOWN);
+					} else if (axis & SDL_HAT_LEFT) {
+						g.cfg.PadDef[padnum].AnalogDef[analognum][analogdir].J.Hat = ((i << 8) | SDL_HAT_LEFT);
+					} else if (axis & SDL_HAT_RIGHT) {
+						g.cfg.PadDef[padnum].AnalogDef[analognum][analogdir].J.Hat = ((i << 8) | SDL_HAT_RIGHT);
+					}
+
+					goto end;
+				}
+			}
+		}
+
+		// check keyboard events
+		XQueryKeymap(g.Disp, buttons);
+		for (i = 0; i < 256; ++i) {
+			if(buttons[i >> 3] & (1 << (i & 7))) {
+				Key = XkbKeycodeToKeysym(g.Disp, i, 0, 0);
+				if(Key != XK_Escape) {
+					g.cfg.PadDef[padnum].AnalogDef[analognum][analogdir].Key = Key;
+				}
+				goto end;
+			}
+		}
+
+		usleep(5000);
+	}
+
+end:
+	if (js != NULL) {
+		SDL_JoystickClose(js);
+	}
+}
+
+static void OnChangeClicked(GtkWidget* widget, gpointer user_data) {
+	int pad = GPOINTER_TO_INT(user_data);
+	int index = GetSelectedKeyIndex(pad);
+
+	if (index == -1) {
+		return;
+	} else if (pad < 0) {
+		ReadDKeyEvent(pad, index); // order matches EMUKEY struct
+	} else if (index < DKEY_TOTAL) {
+		ReadDKeyEvent(pad, DPad[index]);
+	} else {
+		index -= DKEY_TOTAL;
+		ReadAnalogEvent(pad, index / 4, index % 4);
+	}
+
+	UpdateKey();
+}
+
+static void OnResetClicked(GtkWidget *widget, gpointer user_data) {
+	int pad = GPOINTER_TO_INT(user_data);
+	int index = GetSelectedKeyIndex(pad);
+
+	if (index == -1) {
+		return;
+	} else if (pad < 0) {
+		g.cfg.E.EmuDef[index].Mapping.Key = 0;
+		g.cfg.E.EmuDef[index].Mapping.JoyEvType = NONE;
+		g.cfg.E.EmuDef[index].Mapping.J.Button = 0;
+	} else if (index < DKEY_TOTAL) {
+		g.cfg.PadDef[pad].KeyDef[DPad[index]].Key = 0;
+		g.cfg.PadDef[pad].KeyDef[DPad[index]].JoyEvType = NONE;
+		g.cfg.PadDef[pad].KeyDef[DPad[index]].J.Button = 0;
+	} else {
+		index -= DKEY_TOTAL;
+		g.cfg.PadDef[pad].AnalogDef[index / 4][index % 4].Key = 0;
+		g.cfg.PadDef[pad].AnalogDef[index / 4][index % 4].JoyEvType = NONE;
+		g.cfg.PadDef[pad].AnalogDef[index / 4][index % 4].J.Button = 0;
+	}
+
+	UpdateKey();
+}
+
+static void PopulateDevList() {
+	int i, j, n;
+	GtkWidget *widget;
+	GtkTreeIter iter;
+	GtkListStore *store;
+	GtkCellRenderer *renderer;
+	char buf[256];
+
+	for (i = 0; i < NUM_KEYLIST; i++) {
+		widget = GTK_WIDGET(gtk_builder_get_object(xml, widgetname_combodev[i]));
+
+		renderer = gtk_cell_renderer_text_new();
+		gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(widget), renderer, FALSE);
+		gtk_cell_layout_add_attribute(GTK_CELL_LAYOUT(widget), renderer, "text", 0);
+
+		store = gtk_list_store_new(1, G_TYPE_STRING);
+
+		gtk_list_store_append(store, &iter);
+		gtk_list_store_set(store, &iter, 0, _("None"), -1);
+
+		n = SDL_NumJoysticks();
+		for (j = 0; j < n; j++) {
+			sprintf(buf, "%d: %s", j + 1, SDL_JoystickName(j));
+			gtk_list_store_append(store, &iter);
+			gtk_list_store_set(store, &iter, 0, buf, -1);
+		}
+
+		gtk_combo_box_set_model(GTK_COMBO_BOX(widget), GTK_TREE_MODEL(store));
+
+		if (i > 0) {
+			n = g.cfg.PadDef[i-1].DevNum + 1;
+			if (n > SDL_NumJoysticks()) {
+				n = 0;
+				g.cfg.PadDef[i-1].DevNum = -1;
+			}
+		}
+
+		gtk_combo_box_set_active(GTK_COMBO_BOX(widget), n);
+	}
+}
+
+long PADconfigure() {
+	GtkWidget *widget;
+	GtkTreeSelection *treesel;
+	GtkTreeViewColumn *column;
+	GtkCellRenderer *renderer;
+
+	if (SDL_Init(SDL_INIT_JOYSTICK) == -1) {
+		fprintf(stderr, "Failed to initialize SDL!\n");
+		return -1;
+	}
+
+	g.Disp = XOpenDisplay(NULL);
+	if (!g.Disp) {
+		fprintf(stderr, "XOpenDisplay failed!\n");
+		return -1;
+	}
+
+	LoadPADConfig();
+
+	xml = gtk_builder_new();
+
+	if (!gtk_builder_add_from_file(xml, DATADIR "dfinput.ui", NULL)) {
+		g_warning("We could not load the interface!");
+		return -1;
+	}
+
+	MainWindow = GTK_WIDGET(gtk_builder_get_object(xml, "CfgWnd"));
+	gtk_window_set_title(GTK_WINDOW(MainWindow), _("Gamepad/Keyboard Input Configuration"));
+
+	widget = GTK_WIDGET(gtk_builder_get_object(xml, widgetname_treeview[1])); // pad 1
+
+	// column for key
+	renderer = gtk_cell_renderer_text_new();
+	column = gtk_tree_view_column_new_with_attributes(_("Key"),
+		renderer, "text", 0, NULL);
+	gtk_tree_view_append_column(GTK_TREE_VIEW(widget), column);
+
+	// column for button
+	renderer = gtk_cell_renderer_text_new();
+	column = gtk_tree_view_column_new_with_attributes(_("Button"),
+		renderer, "text", 1, NULL);
+	gtk_tree_view_append_column(GTK_TREE_VIEW(widget), column);
+
+	treesel = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget));
+	gtk_tree_selection_set_mode(treesel, GTK_SELECTION_SINGLE);
+
+	g_signal_connect_data(G_OBJECT(treesel), "changed",
+		G_CALLBACK(TreeSelectionChanged), GINT_TO_POINTER(0), NULL, G_CONNECT_AFTER);
+
+	widget = GTK_WIDGET(gtk_builder_get_object(xml, widgetname_treeview[2])); // pad 2
+
+	// column for key
+	renderer = gtk_cell_renderer_text_new();
+	column = gtk_tree_view_column_new_with_attributes(_("Key"),
+		renderer, "text", 0, NULL);
+	gtk_tree_view_append_column(GTK_TREE_VIEW(widget), column);
+
+	// column for button
+	renderer = gtk_cell_renderer_text_new();
+	column = gtk_tree_view_column_new_with_attributes(_("Button"),
+		renderer, "text", 1, NULL);
+	gtk_tree_view_append_column(GTK_TREE_VIEW(widget), column);
+
+	treesel = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget));
+	gtk_tree_selection_set_mode(treesel, GTK_SELECTION_SINGLE);
+
+	g_signal_connect_data(G_OBJECT(treesel), "changed",
+		G_CALLBACK(TreeSelectionChanged), GINT_TO_POINTER(1), NULL, G_CONNECT_AFTER);
+
+	widget = GTK_WIDGET(gtk_builder_get_object(xml, "CfgWnd"));
+	g_signal_connect_data(G_OBJECT(widget), "delete_event",
+		G_CALLBACK(OnConfigExit), NULL, NULL, G_CONNECT_AFTER);
+
+	widget = GTK_WIDGET(gtk_builder_get_object(xml, "btnclose"));
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+		G_CALLBACK(OnConfigExit), NULL, NULL, G_CONNECT_AFTER);
+
+	widget = GTK_WIDGET(gtk_builder_get_object(xml, "checkmt"));
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), g.cfg.Threaded);
+	g_signal_connect_data(G_OBJECT(widget), "toggled",
+		G_CALLBACK(OnThreadedToggled), NULL, NULL, G_CONNECT_AFTER);
+
+	widget = GTK_WIDGET(gtk_builder_get_object(xml, "checkcg"));
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), g.cfg.HideCursor);
+	g_signal_connect_data(G_OBJECT(widget), "toggled",
+		G_CALLBACK(OnHideCursorToggled), NULL, NULL, G_CONNECT_AFTER);
+
+	widget = GTK_WIDGET(gtk_builder_get_object(xml, "checkps"));
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), g.cfg.PreventScrSaver);
+	g_signal_connect_data(G_OBJECT(widget), "toggled",
+		G_CALLBACK(OnPreventScrSaverToggled), NULL, NULL, G_CONNECT_AFTER);
+
+	widget = GTK_WIDGET(gtk_builder_get_object(xml, widgetname_combodev[1]));
+	g_signal_connect_data(G_OBJECT(widget), "changed",
+		G_CALLBACK(OnDeviceChanged), GINT_TO_POINTER(0), NULL, G_CONNECT_AFTER);
+
+	widget = GTK_WIDGET(gtk_builder_get_object(xml, widgetname_combodev[2]));
+	g_signal_connect_data(G_OBJECT(widget), "changed",
+		G_CALLBACK(OnDeviceChanged), GINT_TO_POINTER(1), NULL, G_CONNECT_AFTER);
+
+	int padTypeList[] = {
+		0,
+		2, // PSE_PAD_TYPE_MOUSE
+		0, // PSE_PAD_TYPE_NEGCON
+		0, // PSE_PAD_TYPE_GUN
+		0, // PSE_PAD_TYPE_STANDARD
+		1, // PSE_PAD_TYPE_ANALOGJOY
+		0, // PSE_PAD_TYPE_GUNCON
+		1, //PSE_PAD_TYPE_ANALOGPAD
+	};
+
+	widget = GTK_WIDGET(gtk_builder_get_object(xml, "combotype1"));
+	gtk_combo_box_set_active(GTK_COMBO_BOX(widget),
+		padTypeList[g.cfg.PadDef[0].Type]);
+	g_signal_connect_data(G_OBJECT(widget), "changed",
+		G_CALLBACK(OnTypeChanged), GUINT_TO_POINTER(0u), NULL, G_CONNECT_AFTER);
+
+	widget = GTK_WIDGET(gtk_builder_get_object(xml, "combotype2"));
+	gtk_combo_box_set_active(GTK_COMBO_BOX(widget),
+		padTypeList[g.cfg.PadDef[1].Type]);
+	g_signal_connect_data(G_OBJECT(widget), "changed",
+		G_CALLBACK(OnTypeChanged), GUINT_TO_POINTER(1u), NULL, G_CONNECT_AFTER);
+
+	widget = GTK_WIDGET(gtk_builder_get_object(xml, "checkvv1"));
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), g.cfg.PadDef[0].VisualVibration);
+	g_signal_connect_data(G_OBJECT(widget), "toggled",
+		G_CALLBACK(OnVisualVibration1Toggled), NULL, NULL, G_CONNECT_AFTER);
+
+	widget = GTK_WIDGET(gtk_builder_get_object(xml, "checkvv2"));
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), g.cfg.PadDef[1].VisualVibration);
+	g_signal_connect_data(G_OBJECT(widget), "toggled",
+		G_CALLBACK(OnVisualVibration2Toggled), NULL, NULL, G_CONNECT_AFTER);
+
+	widget = GTK_WIDGET(gtk_builder_get_object(xml, widgetname_change[1]));
+	gtk_widget_set_sensitive(widget, FALSE);
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+		G_CALLBACK(OnChangeClicked), GINT_TO_POINTER(0), NULL, G_CONNECT_AFTER);
+
+	widget = GTK_WIDGET(gtk_builder_get_object(xml, widgetname_reset[1]));
+	gtk_widget_set_sensitive(widget, FALSE);
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+		G_CALLBACK(OnResetClicked), GINT_TO_POINTER(0), NULL, G_CONNECT_AFTER);
+
+	widget = GTK_WIDGET(gtk_builder_get_object(xml, widgetname_change[2]));
+	gtk_widget_set_sensitive(widget, FALSE);
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+		G_CALLBACK(OnChangeClicked), GINT_TO_POINTER(1), NULL, G_CONNECT_AFTER);
+
+	widget = GTK_WIDGET(gtk_builder_get_object(xml, widgetname_reset[2]));
+	gtk_widget_set_sensitive(widget, FALSE);
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+		G_CALLBACK(OnResetClicked), GINT_TO_POINTER(1), NULL, G_CONNECT_AFTER);
+
+
+	// ************ Emulators keys	**********************
+	widget = GTK_WIDGET(gtk_builder_get_object(xml, widgetname_treeview[0])); // emu
+
+	// column for key
+	renderer = gtk_cell_renderer_text_new();
+	column = gtk_tree_view_column_new_with_attributes(_("Key"),
+		renderer, "text", 0, NULL);
+	gtk_tree_view_append_column(GTK_TREE_VIEW(widget), column);
+
+	// column for button
+	renderer = gtk_cell_renderer_text_new();
+	column = gtk_tree_view_column_new_with_attributes(_("Button"),
+		renderer, "text", 1, NULL);
+	gtk_tree_view_append_column(GTK_TREE_VIEW(widget), column);
+
+	treesel = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget));
+	gtk_tree_selection_set_mode(treesel, GTK_SELECTION_SINGLE);
+
+	g_signal_connect_data(G_OBJECT(treesel), "changed",
+		G_CALLBACK(TreeSelectionChanged), GINT_TO_POINTER(-1), NULL, G_CONNECT_AFTER);
+
+	widget = GTK_WIDGET(gtk_builder_get_object(xml, widgetname_change[0]));
+	gtk_widget_set_sensitive(widget, FALSE);
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+		G_CALLBACK(OnChangeClicked), GINT_TO_POINTER(-1), NULL, G_CONNECT_AFTER);
+
+	widget = GTK_WIDGET(gtk_builder_get_object(xml, widgetname_reset[0]));
+	gtk_widget_set_sensitive(widget, FALSE);
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+		G_CALLBACK(OnResetClicked), GINT_TO_POINTER(-1), NULL, G_CONNECT_AFTER);
+
+	widget = GTK_WIDGET(gtk_builder_get_object(xml, widgetname_combodev[0]));
+	g_signal_connect_data(G_OBJECT(widget), "changed",
+		G_CALLBACK(OnDeviceChanged), GINT_TO_POINTER(-1), NULL, G_CONNECT_AFTER);
+
+	PopulateDevList();
+	UpdateKeyList();
+
+	gtk_widget_show(MainWindow);
+	gtk_main();
+
+	return 0;
+}
+
+void PADabout() {
+	const char *authors[]= {"Wei Mingzhi <weimingzhi@gmail.com>", "ckain <ckain@iki.fi>", NULL};
+	GtkWidget *widget;
+
+	widget = gtk_about_dialog_new();
+	gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(widget), "Gamepad/Keyboard Input");
+	gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(widget), "1.2");
+	gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(widget), authors);
+	gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(widget), "http://www.codeplex.com/pcsxr/");
+
+	gtk_dialog_run(GTK_DIALOG(widget));
+	gtk_widget_destroy(widget);
+}
+
+int main(int argc, char *argv[]) {
+#ifdef ENABLE_NLS
+	setlocale(LC_ALL, "");
+	bindtextdomain(GETTEXT_PACKAGE, LOCALE_DIR);
+	bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+	textdomain(GETTEXT_PACKAGE);
+#endif
+
+	gtk_init(&argc, &argv);
+
+	if (argc < 2) {
+	printf ("Usage: cfgDFInput {about | configure}\n");
+		return 0;
+	}
+
+	if (strcmp(argv[1], "configure") != 0 &&
+		strcmp(argv[1], "about") != 0) {
+		printf ("Usage: cfgDFInput {about | configure}\n");
+		return 0;
+	}
+
+	if(!strcmp(argv[1], "configure"))
+		PADconfigure();
+	else if(!strcmp(argv[1], "about"))
+		PADabout();
+
+	return 0;
+}

pcsxr-1.9.92.tar.bz2/plugins/dfinput/cfg.c -> pcsxr-1.9.93.tar.bz2/plugins/dfinput/cfg.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Wei Mingzhi <whistler@openoffice.org>.
+ * Copyright (c) 2009, Wei Mingzhi <whistler_wmz@users.sf.net>.
 * All Rights Reserved.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -26,6 +26,8 @@
 	memset(&g.cfg, 0, sizeof(g.cfg));
 
 	g.cfg.Threaded = 1;
+	g.cfg.HideCursor = 0;
+	g.cfg.PreventScrSaver = 0u;
 
 	g.cfg.PadDef[0].DevNum = 0;
 	g.cfg.PadDef[1].DevNum = 1;
@@ -33,6 +35,9 @@
 	g.cfg.PadDef[0].Type = PSE_PAD_TYPE_STANDARD;
 	g.cfg.PadDef[1].Type = PSE_PAD_TYPE_STANDARD;
 
+	g.cfg.PadDef[0].VisualVibration = 0;
+	g.cfg.PadDef[1].VisualVibration = 0;
+
 	// Pad1 keyboard
 	g.cfg.PadDef[0].KeyDef[DKEY_SELECT].Key = XK_c;
 	g.cfg.PadDef[0].KeyDef[DKEY_START].Key = XK_v;
@@ -48,6 +53,7 @@
 	g.cfg.PadDef[0].KeyDef[DKEY_CIRCLE].Key = XK_x;
 	g.cfg.PadDef[0].KeyDef[DKEY_CROSS].Key = XK_z;
 	g.cfg.PadDef[0].KeyDef[DKEY_SQUARE].Key = XK_s;
+	g.cfg.PadDef[0].KeyDef[DKEY_ANALOG].Key = XK_b;
 
 	// Pad1 joystick
 	g.cfg.PadDef[0].KeyDef[DKEY_SELECT].JoyEvType = BUTTON;
@@ -108,6 +114,17 @@
 	g.cfg.PadDef[1].KeyDef[DKEY_CROSS].J.Button = 2;
 	g.cfg.PadDef[1].KeyDef[DKEY_SQUARE].JoyEvType = BUTTON;
 	g.cfg.PadDef[1].KeyDef[DKEY_SQUARE].J.Button = 3;
+
+	// Emu special
+	g.cfg.E.DevNum = -1;
+	g.cfg.E.EmuKeyDev = 0;
+
+	g.cfg.E.EmuDef[EMU_SAVESTATE].EmuKeyEvent = XK_F1;
+	g.cfg.E.EmuDef[EMU_FASTFORWARDS].EmuKeyEvent = XK_section;
+	g.cfg.E.EmuDef[EMU_LOADSTATE].EmuKeyEvent = XK_F3;
+	g.cfg.E.EmuDef[EMU_INCREMENTSTATE].EmuKeyEvent = XK_F2;
+	g.cfg.E.EmuDef[EMU_SCREENSHOT].EmuKeyEvent = XK_F8;
+	g.cfg.E.EmuDef[EMU_ESCAPE].EmuKeyEvent = XK_Escape;
 }
 
 void LoadPADConfig() {
@@ -127,6 +144,10 @@
 	while (fgets(buf, 256, fp) != NULL) {
 		if (strncmp(buf, "Threaded=", 9) == 0) {
 			g.cfg.Threaded = atoi(&buf[9]);
+		} else if (strncmp(buf, "HideCursor=", 11) == 0) {
+			g.cfg.HideCursor = atoi(&buf[11]);
+		} else if (strncmp(buf, "PreventScrSaver=", 16) == 0) {
+			g.cfg.PreventScrSaver = atoi(&buf[16]);
 		} else if (strncmp(buf, "[PAD", 4) == 0) {
 			current = atoi(&buf[4]) - 1;
 			if (current < 0) {
@@ -138,6 +159,40 @@
 			g.cfg.PadDef[current].DevNum = atoi(&buf[7]);
 		} else if (strncmp(buf, "Type=", 5) == 0) {
 			g.cfg.PadDef[current].Type = atoi(&buf[5]);
+		} else if (strncmp(buf, "VisualVibration=", 16) == 0) {
+			g.cfg.PadDef[current].VisualVibration = atoi(&buf[16]);
+		} else if (strncmp(buf, "EmuDev=", 7) == 0) {
+			g.cfg.E.DevNum = atoi(&buf[5]);
+		} else if (strncmp(buf, "EMU_FASTFORWARDS=", 17) == 0) {
+			sscanf(buf, "EMU_FASTFORWARDS=%d,%d,%d", &a, &b, &c);
+			g.cfg.E.EmuDef[EMU_FASTFORWARDS].Mapping.Key = a;
+			g.cfg.E.EmuDef[EMU_FASTFORWARDS].Mapping.JoyEvType = b;
+			g.cfg.E.EmuDef[EMU_FASTFORWARDS].Mapping.J.d = c;
+		} else if (strncmp(buf, "EMU_SAVESTATE=", 14) == 0) {
+			sscanf(buf, "EMU_SAVESTATE=%d,%d,%d", &a, &b, &c);
+			g.cfg.E.EmuDef[EMU_SAVESTATE].Mapping.Key = a;
+			g.cfg.E.EmuDef[EMU_SAVESTATE].Mapping.JoyEvType = b;
+			g.cfg.E.EmuDef[EMU_SAVESTATE].Mapping.J.d = c;
+		} else if (strncmp(buf, "EMU_LOADSTATE=", 14) == 0) {
+			sscanf(buf, "EMU_LOADSTATE=%d,%d,%d", &a, &b, &c);
+			g.cfg.E.EmuDef[EMU_LOADSTATE].Mapping.Key = a;
+			g.cfg.E.EmuDef[EMU_LOADSTATE].Mapping.JoyEvType = b;
+			g.cfg.E.EmuDef[EMU_LOADSTATE].Mapping.J.d = c;
+		} else if (strncmp(buf, "EMU_SCREENSHOT=", 15) == 0) {
+			sscanf(buf, "EMU_SCREENSHOT=%d,%d,%d", &a, &b, &c);
+			g.cfg.E.EmuDef[EMU_SCREENSHOT].Mapping.Key = a;
+			g.cfg.E.EmuDef[EMU_SCREENSHOT].Mapping.JoyEvType = b;
+			g.cfg.E.EmuDef[EMU_SCREENSHOT].Mapping.J.d = c;
+		} else if (strncmp(buf, "EMU_INCREMENTSTATE=", 19) == 0) {
+			sscanf(buf, "EMU_INCREMENTSTATE=%d,%d,%d", &a, &b, &c);
+			g.cfg.E.EmuDef[EMU_INCREMENTSTATE].Mapping.Key = a;
+			g.cfg.E.EmuDef[EMU_INCREMENTSTATE].Mapping.JoyEvType = b;
+			g.cfg.E.EmuDef[EMU_INCREMENTSTATE].Mapping.J.d = c;
+		} else if (strncmp(buf, "EMU_ESCAPE=", 11) == 0) {
+			sscanf(buf, "EMU_ESCAPE=%d,%d,%d", &a, &b, &c);
+			g.cfg.E.EmuDef[EMU_ESCAPE].Mapping.Key = a;
+			g.cfg.E.EmuDef[EMU_ESCAPE].Mapping.JoyEvType = b;
+			g.cfg.E.EmuDef[EMU_ESCAPE].Mapping.J.d = c;
 		} else if (strncmp(buf, "Select=", 7) == 0) {
 			sscanf(buf, "Select=%d,%d,%d", &a, &b, &c);
 			g.cfg.PadDef[current].KeyDef[DKEY_SELECT].Key = a;
@@ -153,6 +208,11 @@
 			g.cfg.PadDef[current].KeyDef[DKEY_R3].Key = a;
 			g.cfg.PadDef[current].KeyDef[DKEY_R3].JoyEvType = b;
 			g.cfg.PadDef[current].KeyDef[DKEY_R3].J.d = c;
+		} else if (strncmp(buf, "Analog=", 7) == 0) {
+			sscanf(buf, "Analog=%d,%d,%d", &a, &b, &c);
+			g.cfg.PadDef[current].KeyDef[DKEY_ANALOG].Key = a;
+			g.cfg.PadDef[current].KeyDef[DKEY_ANALOG].JoyEvType = b;
+			g.cfg.PadDef[current].KeyDef[DKEY_ANALOG].J.d = c;
 		} else if (strncmp(buf, "Start=", 6) == 0) {
 			sscanf(buf, "Start=%d,%d,%d", &a, &b, &c);
 			g.cfg.PadDef[current].KeyDef[DKEY_START].Key = a;
@@ -275,12 +335,15 @@
 
 	fprintf(fp, "[CONFIG]\n");
 	fprintf(fp, "Threaded=%d\n", g.cfg.Threaded);
+	fprintf(fp, "HideCursor=%d\n", g.cfg.HideCursor);
+	fprintf(fp, "PreventScrSaver=%d\n", g.cfg.PreventScrSaver);
 	fprintf(fp, "\n");
 
 	for (i = 0; i < 2; i++) {
 		fprintf(fp, "[PAD%d]\n", i + 1);
 		fprintf(fp, "DevNum=%d\n", g.cfg.PadDef[i].DevNum);
 		fprintf(fp, "Type=%d\n", g.cfg.PadDef[i].Type);
+		fprintf(fp, "VisualVibration=%d\n", g.cfg.PadDef[i].VisualVibration);
 
 		fprintf(fp, "Select=%d,%d,%d\n", g.cfg.PadDef[i].KeyDef[DKEY_SELECT].Key,
 			g.cfg.PadDef[i].KeyDef[DKEY_SELECT].JoyEvType, g.cfg.PadDef[i].KeyDef[DKEY_SELECT].J.d);
@@ -288,6 +351,8 @@
 			g.cfg.PadDef[i].KeyDef[DKEY_L3].JoyEvType, g.cfg.PadDef[i].KeyDef[DKEY_L3].J.d);
 		fprintf(fp, "R3=%d,%d,%d\n", g.cfg.PadDef[i].KeyDef[DKEY_R3].Key,
 			g.cfg.PadDef[i].KeyDef[DKEY_R3].JoyEvType, g.cfg.PadDef[i].KeyDef[DKEY_R3].J.d);
+		fprintf(fp, "Analog=%d,%d,%d\n", g.cfg.PadDef[i].KeyDef[DKEY_ANALOG].Key,
+			g.cfg.PadDef[i].KeyDef[DKEY_ANALOG].JoyEvType, g.cfg.PadDef[i].KeyDef[DKEY_ANALOG].J.d);
 		fprintf(fp, "Start=%d,%d,%d\n", g.cfg.PadDef[i].KeyDef[DKEY_START].Key,
 			g.cfg.PadDef[i].KeyDef[DKEY_START].JoyEvType, g.cfg.PadDef[i].KeyDef[DKEY_START].J.d);
 		fprintf(fp, "Up=%d,%d,%d\n", g.cfg.PadDef[i].KeyDef[DKEY_UP].Key,
@@ -342,5 +407,26 @@
 		fprintf(fp, "\n");
 	}
 
+	// Emulator keys
+	fprintf(fp, "[EMU]\n");
+	fprintf(fp, "EmuDev=%d\n", g.cfg.E.DevNum);
+	fprintf(fp, "EMU_SAVESTATE=%d,%d,%d\n", g.cfg.E.EmuDef[EMU_SAVESTATE].Mapping.Key,
+			g.cfg.E.EmuDef[EMU_SAVESTATE].Mapping.JoyEvType,
+			g.cfg.E.EmuDef[EMU_SAVESTATE].Mapping.J.d);
+	fprintf(fp, "EMU_LOADSTATE=%d,%d,%d\n", g.cfg.E.EmuDef[EMU_LOADSTATE].Mapping.Key,
+			g.cfg.E.EmuDef[EMU_LOADSTATE].Mapping.JoyEvType,
+			g.cfg.E.EmuDef[EMU_LOADSTATE].Mapping.J.d);
+	fprintf(fp, "EMU_INCREMENTSTATE=%d,%d,%d\n", g.cfg.E.EmuDef[EMU_INCREMENTSTATE].Mapping.Key,
+			g.cfg.E.EmuDef[EMU_INCREMENTSTATE].Mapping.JoyEvType,
+			g.cfg.E.EmuDef[EMU_INCREMENTSTATE].Mapping.J.d);
+	fprintf(fp, "EMU_FASTFORWARDS=%d,%d,%d\n", g.cfg.E.EmuDef[EMU_FASTFORWARDS].Mapping.Key,
+			g.cfg.E.EmuDef[EMU_FASTFORWARDS].Mapping.JoyEvType,
+			g.cfg.E.EmuDef[EMU_FASTFORWARDS].Mapping.J.d);
+	fprintf(fp, "EMU_SCREENSHOT=%d,%d,%d\n", g.cfg.E.EmuDef[EMU_SCREENSHOT].Mapping.Key,
+			g.cfg.E.EmuDef[EMU_SCREENSHOT].Mapping.JoyEvType,
+			g.cfg.E.EmuDef[EMU_SCREENSHOT].Mapping.J.d);
+	fprintf(fp, "EMU_ESCAPE=%d,%d,%d\n", g.cfg.E.EmuDef[EMU_ESCAPE].Mapping.Key,
+			g.cfg.E.EmuDef[EMU_ESCAPE].Mapping.JoyEvType,
+			g.cfg.E.EmuDef[EMU_ESCAPE].Mapping.J.d);
 	fclose(fp);
 }

pcsxr-1.9.93.tar.bz2/plugins/dfinput/dfinput.ui Added

@@ -0,0 +1,793 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ 
+ <object class="GtkWindow" id="CfgWnd">
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkTable" id="table1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="n_rows">2</property>
+ <child>
+ <object class="GtkNotebook" id="notebook1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <child>
+ <object class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkGrid" id="grid1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">5</property>
+ <property name="column_spacing">5</property>
+ <child>
+ <object class="GtkLabel" id="label10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Device:</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="combodev1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Type:</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="combotype1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="model">liststore2</property>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertext2"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkvv1">
+ <property name="label" translatable="yes">Visual vibration</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow1">
+ <property name="width_request">500</property>
+ <property name="height_request">275</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="border_width">5</property>
+ <property name="window_placement_set">True</property>
+ <property name="shadow_type">etched-in</property>
+ <child>
+ <object class="GtkTreeView" id="treeview1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection1"/>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHButtonBox" id="hbuttonbox2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">20</property>
+ <property name="layout_style">center</property>
+ <child>
+ <object class="GtkButton" id="btnchange1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <child>
+ <object class="GtkHBox" id="hbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-edit</property>
+ <property name="icon-size">1</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Change</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="btnreset1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <child>
+ <object class="GtkHBox" id="hbox2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkImage" id="image2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-undo</property>
+ <property name="icon-size">1</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Reset</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Controller 1</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkGrid" id="grid2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">5</property>
+ <property name="column_spacing">5</property>
+ <child>
+ <object class="GtkLabel" id="label11">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Device:</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="combodev2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Type:</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="combotype2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="model">liststore1</property>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertext1"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkvv2">
+ <property name="label" translatable="yes">Visual vibration</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow2">
+ <property name="width_request">500</property>
+ <property name="height_request">275</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="border_width">5</property>
+ <property name="window_placement_set">True</property>
+ <property name="shadow_type">etched-in</property>
+ <child>
+ <object class="GtkTreeView" id="treeview2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection2"/>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHButtonBox" id="hbuttonbox3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">20</property>
+ <property name="layout_style">center</property>
+ <child>
+ <object class="GtkButton" id="btnchange2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <child>
+ <object class="GtkHBox" id="hbox3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkImage" id="image3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-edit</property>
+ <property name="icon-size">1</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Change</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="btnreset2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <child>
+ <object class="GtkHBox" id="hbox4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkImage" id="image4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-undo</property>
+ <property name="icon-size">1</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Reset</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Controller 2</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox_e">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkGrid" id="grid_e">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">5</property>
+ <property name="column_spacing">5</property>
+ <child>
+ <object class="GtkLabel" id="label_e2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Device:</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="combodev_e">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow_e">
+ <property name="width_request">500</property>
+ <property name="height_request">275</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="border_width">5</property>
+ <property name="window_placement_set">True</property>
+ <property name="shadow_type">etched-in</property>
+ <child>
+ <object class="GtkTreeView" id="treeview_e">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection-e"/>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHButtonBox" id="hbuttonbox_e">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">20</property>
+ <property name="layout_style">center</property>
+ <child>
+ <object class="GtkButton" id="btnchange_e">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <child>
+ <object class="GtkHBox" id="hbox_e1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkImage" id="image_e1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-edit</property>
+ <property name="icon-size">1</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_e3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Change</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="btnreset_e">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <child>
+ <object class="GtkHBox" id="hbox_e2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkImage" id="image_e2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-undo</property>
+ <property name="icon-size">1</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_e4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Reset</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label_e5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Emulator keys</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="spacing">5</property>
+ <child>
+ <object class="GtkCheckButton" id="checkmt">
+ <property name="label" translatable="yes">Multi-Threaded (Recommended)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkcg">
+ <property name="label" translatable="yes">Hide mouse cursor</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkps">
+ <property name="label" translatable="yes">Prevent screensaver (xdg-screensaver)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Options</property>
+ </object>
+ <packing>
+ <property name="position">3</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkHButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="btnclose">
+ <property name="label">gtk-close</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <object class="GtkListStore" id="liststore1">
+ <columns>
+ 
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Digital Pad</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Analog Pad</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Mouse</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="liststore2">
+ <columns>
+ 
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Digital Pad</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Analog Pad</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Mouse</col>
+ </row>
+ </data>
+ </object>
+</interface>

pcsxr-1.9.92.tar.bz2/plugins/dfinput/pad.c -> pcsxr-1.9.93.tar.bz2/plugins/dfinput/pad.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Wei Mingzhi <whistler@openoffice.org>.
+ * Copyright (c) 2009, Wei Mingzhi <whistler_wmz@users.sf.net>.
 * All Rights Reserved.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -17,9 +17,20 @@
 */
 
 #include "pad.h"
+#if !SDL_VERSION_ATLEAST(1,3,0) && defined(__linux__)
+#include <linux/input.h>
+#include <sys/file.h>
+#include <time.h>
+#endif
+
+#if SDL_VERSION_ATLEAST(1,3,0)
+int has_haptic;
+#endif
+
+static void (*gpuVisualVibration)(uint32_t, uint32_t) = NULL;
 
 char *PSEgetLibName(void) {
-	return _("Gamepad/Keyboard Input");
+	return _("Gamepad/Keyboard/Mouse Input");
 }
 
 uint32_t PSEgetLibType(void) {
@@ -27,16 +38,34 @@
 }
 
 uint32_t PSEgetLibVersion(void) {
-	return (1 << 16) | (1 << 8);
+	return (1 << 16) | (2 << 8);
+}
+
+static int padDataLenght[] = {0, 2, 3, 1, 1, 3, 3, 3};
+void PADsetMode(const int pad, const int mode) {
+	g.PadState[pad].PadMode = mode;
+ 
+ if (g.cfg.PadDef[pad].Type == PSE_PAD_TYPE_ANALOGPAD) {
+ g.PadState[pad].PadID = mode ? 0x73 : 0x41;
+ }
+ else {
+ g.PadState[pad].PadID = (g.cfg.PadDef[pad].Type << 4) |
+ padDataLenght[g.cfg.PadDef[pad].Type];
+ }
+ 
+	g.PadState[pad].Vib0 = 0;
+	g.PadState[pad].Vib1 = 0;
+	g.PadState[pad].VibF[0] = 0;
+	g.PadState[pad].VibF[1] = 0;
 }
 
 long PADinit(long flags) {
 	LoadPADConfig();
 
-	g.PadState[0].PadMode = 0;
-	g.PadState[0].PadID = 0x41;
-	g.PadState[1].PadMode = 0;
-	g.PadState[1].PadID = 0x41;
+	PADsetMode(0, 0);
+	PADsetMode(1, 0);
+
+	gpuVisualVibration = NULL;
 
 	return PSE_PAD_ERR_SUCCESS;
 }
@@ -69,6 +98,12 @@
 		} else if (SDL_Init(SDL_INIT_JOYSTICK | SDL_INIT_NOPARACHUTE) == -1) {
 			return PSE_PAD_ERR_FAILURE;
 		}
+ 
+#if SDL_VERSION_ATLEAST(1,3,0)
+ has_haptic = 0;
+ if (SDL_InitSubSystem(SDL_INIT_HAPTIC) == 0)
+ has_haptic = 1;
+#endif
 
 		InitSDLJoy();
 		InitKeyboard();
@@ -99,14 +134,18 @@
 
 		DestroySDLJoy();
 		DestroyKeyboard();
-
+#if SDL_VERSION_ATLEAST(1,3,0)
+		if (SDL_WasInit(SDL_INIT_EVERYTHING & ~(SDL_INIT_HAPTIC | SDL_INIT_JOYSTICK))) {
+			SDL_QuitSubSystem(SDL_INIT_HAPTIC);
+			SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
+		} else
+#endif
 		if (SDL_WasInit(SDL_INIT_EVERYTHING & ~SDL_INIT_JOYSTICK)) {
 			SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
 		} else {
 			SDL_Quit();
 		}
 	}
-
 	g.Opened = 0;
 
 	return PSE_PAD_ERR_SUCCESS;
@@ -117,7 +156,14 @@
 }
 
 static void UpdateInput(void) {
+	int pad;
 	if (!g.cfg.Threaded) CheckJoy();
+	for(pad = 0; pad < 2; pad++) {
+		if(g.PadState[pad].PadModeSwitch) {
+			g.PadState[pad].PadModeSwitch = 0;
+			PADsetMode(pad, 1 - g.PadState[pad].PadMode);
+		}
+	}
 	CheckKeyboard();
 }
 
@@ -174,6 +220,152 @@
 	 0x01,
 	 0x00}
 };
+ 
+#if !SDL_VERSION_ATLEAST(1,3,0) && defined(__linux__)
+/* lifted from SDL; but it's GPL as well */
+/* added ffbit, though */
+#define test_bit(nr, addr) \
+	(((1UL << ((nr) % (sizeof(long) * 8))) & ((addr)[(nr) / (sizeof(long) * 8)])) != 0)
+#define NBITS(x) ((((x)-1)/(sizeof(long) * 8))+1)
+static int EV_IsJoystick(int fd)
+{
+	unsigned long evbit[NBITS(EV_MAX)] = { 0 };
+	unsigned long keybit[NBITS(KEY_MAX)] = { 0 };
+	unsigned long absbit[NBITS(ABS_MAX)] = { 0 };
+	unsigned long ffbit[NBITS(FF_MAX)] = { 0 };
+
+	if ( (ioctl(fd, EVIOCGBIT(0, sizeof(evbit)), evbit) < 0) ||
+	 (ioctl(fd, EVIOCGBIT(EV_KEY, sizeof(keybit)), keybit) < 0) ||
+	 (ioctl(fd, EVIOCGBIT(EV_ABS, sizeof(absbit)), absbit) < 0) ) {
+		return(0);
+	}
+	if (!(test_bit(EV_KEY, evbit) && test_bit(EV_ABS, evbit) &&
+	 test_bit(ABS_X, absbit) && test_bit(ABS_Y, absbit) &&
+	 (test_bit(BTN_TRIGGER, keybit) || test_bit(BTN_A, keybit) || test_bit(BTN_1, keybit)))) return 0;
+	if ( (ioctl(fd, EVIOCGBIT(EV_FF, sizeof(ffbit)), ffbit) < 0) ||
+	 !test_bit(FF_RUMBLE, ffbit) )
+		return(1);
+	return(2);
+}
+
+static void linux_set_vibrate(int pad)
+{
+	int jno = 0, devno, dev;
+	const char *sdlj;
+	int tjno = g.cfg.PadDef[pad].DevNum;
+
+	g.PadState[pad].VibrateDev = -2;
+	/* simulate SDL device opening; probably not very accurate */
+	/* works for me, though */
+	sdlj = getenv("SDL_JOYSTICK_DEVICE");
+	if(sdlj) {
+		dev = open(sdlj, O_RDONLY);
+		if(dev >= 0) {
+			if(!tjno) {
+				close(dev);
+				dev = open(sdlj, O_RDWR);
+				if(dev < 0) {
+					printf("%s has no permission to rumble\n", sdlj);
+					return;
+				}
+				if(EV_IsJoystick(dev) != 2) {
+					printf("%s has no rumble\n", sdlj);
+					close(dev);
+					return;
+				}
+				g.PadState[pad].VibrateDev = dev;
+				return;
+			}
+			close(dev);
+			jno++;
+		} else
+			perror(sdlj);
+	}
+	for(devno = 0; devno < 32; devno++) {
+		char buf[20];
+
+		sprintf(buf, "/dev/input/event%d", devno);
+		dev = open(buf, O_RDONLY);
+		if(dev >= 0) {
+			int isj = EV_IsJoystick(dev);
+			if(isj) {
+				if(tjno == jno) {
+					close(dev);
+					if(isj != 2) {
+						printf("%s has no rumble\n", buf);
+						return;
+					}
+					dev = open(buf, O_RDWR);
+					if(dev < 0) {
+						printf("%s has no permission to rumble\n", buf);
+						return;
+					}
+					g.PadState[pad].VibrateDev = dev;
+					return;
+				}
+				jno++;
+			}
+			close(dev);
+		}
+	}
+}
+
+static int linux_vibrate(PADSTATE *pad)
+{
+	struct ff_effect ffe = { 0 };
+	struct input_event ev = { { 0 } };
+	struct timespec t;
+	uint32_t stime;
+
+	if(pad->VibrateDev < 0)
+		return 0;
+	ev.type = EV_FF;
+	if(!pad->VibF[0] && !pad->VibF[1] && pad->VibrateEffect < 0) {
+		return 1;
+	}
+	clock_gettime(CLOCK_REALTIME, &t);
+	stime = (uint32_t)(t.tv_sec * 1000 + t.tv_nsec / 1000000);
+	if(pad->VibrateEffect >= 0 &&
+	 pad->VibrLow == pad->VibF[0] && pad->VibrHigh == pad->VibF[1]) {
+		if(stime - pad->VibrSetTime < 300)
+			return 1;
+	}
+	if(pad->VibrateEffect < 0 || pad->VibrLow != pad->VibF[0] ||
+	 pad->VibrHigh != pad->VibF[1]) {
+		if(pad->VibrateEffect >= 0) {
+			ev.code = pad->VibrateEffect;
+			ev.value = 0;
+			if(write(pad->VibrateDev, &ev, sizeof(ev)) < 0)
+				perror("ev write");
+		}
+		ffe.type = FF_RUMBLE;
+		ffe.id = pad->VibrateEffect;
+		/* DG says refresh 1/vsync = 166, but add for delays/etc. */
+		ffe.replay.length = 500;
+		ffe.replay.delay = 0;
+		ffe.u.rumble.strong_magnitude = pad->VibF[1] * 256;
+		ffe.u.rumble.weak_magnitude = pad->VibF[0] * 256;
+		pad->VibrLow = pad->VibF[0];
+		pad->VibrHigh = pad->VibF[1];
+		if(ioctl(pad->VibrateDev, EVIOCSFF,&ffe) < 0) {
+			perror("SFF ioctl");
+			close(pad->VibrateDev);
+			pad->VibrateDev = -2;
+			return 0;
+		}
+	}
+	pad->VibrSetTime = stime;
+	ev.code = pad->VibrateEffect = ffe.id;
+	ev.value = 1;
+	if(write(pad->VibrateDev, &ev, sizeof(ev)) != sizeof(ev)) {
+		close(pad->VibrateDev);
+		pad->VibrateDev = -2;
+		perror("ev write");
+		return 0;
+	}
+	return 1;
+}
+#endif
 
 static uint8_t CurPad = 0, CurByte = 0, CurCmd = 0, CmdLen = 0;
 
@@ -238,8 +430,6 @@
 
 			case CMD_READ_DATA_AND_VIBRATE:
 			default:
-				UpdateInput();
-
 				n = g.PadState[CurPad].KeyStatus;
 				n &= g.PadState[CurPad].JoyKeyStatus;
 
@@ -253,7 +443,15 @@
 					stdpar[CurPad][5] = g.PadState[CurPad].AnalogStatus[ANALOG_RIGHT][1];
 					stdpar[CurPad][6] = g.PadState[CurPad].AnalogStatus[ANALOG_LEFT][0];
 					stdpar[CurPad][7] = g.PadState[CurPad].AnalogStatus[ANALOG_LEFT][1];
-				} else {
+				}
+				else if(g.PadState[CurPad].PadID == 0x12)
+ {
+ CmdLen = 6;
+ 
+ stdpar[CurPad][4] = g.PadState[0].MouseAxis[0][0];
+ stdpar[CurPad][5] = g.PadState[0].MouseAxis[0][1];
+ }
+ else {
 					CmdLen = 4;
 				}
 
@@ -262,7 +460,63 @@
 		}
 	}
 
+	//makes it so that the following switch doesn't try to dereference a null pointer
+	//quiets a warning in the Clang static analyzer.
+	if (buf == NULL) {
+		return 0;
+	}
+	
 	switch (CurCmd) {
+		case CMD_READ_DATA_AND_VIBRATE:
+			if (g.cfg.PadDef[CurPad].Type == PSE_PAD_TYPE_ANALOGPAD) {
+				if (CurByte == g.PadState[CurPad].Vib0) {
+					g.PadState[CurPad].VibF[0] = value;
+
+					if (g.PadState[CurPad].VibF[0] != 0 || g.PadState[CurPad].VibF[1] != 0) {
+#if !SDL_VERSION_ATLEAST(1,3,0) && defined(__linux__)
+						if (g.PadState[CurPad].VibrateDev == -1 &&
+							g.PadState[CurPad].JoyDev != NULL) {
+							linux_set_vibrate(CurPad);
+						}
+						if (!linux_vibrate(&g.PadState[CurPad]))
+						/* only do visual if joy fails */
+#endif
+							if (!JoyHapticRumble(CurPad, g.PadState[CurPad].VibF[0], g.PadState[CurPad].VibF[1])) {
+								//gpuVisualVibration(g.PadState[CurPad].VibF[0], g.PadState[CurPad].VibF[1]);
+							}
+							
+						if(gpuVisualVibration != NULL &&
+						 g.cfg.PadDef[CurPad].VisualVibration) {
+							gpuVisualVibration(g.PadState[CurPad].VibF[0], g.PadState[CurPad].VibF[1]);
+						}
+					}
+				}
+
+				if (CurByte == g.PadState[CurPad].Vib1) {
+					g.PadState[CurPad].VibF[1] = value;
+
+					if (g.PadState[CurPad].VibF[0] != 0 || g.PadState[CurPad].VibF[1] != 0) {
+#if !SDL_VERSION_ATLEAST(1,3,0) && defined(__linux__)
+						if (g.PadState[CurPad].VibrateDev == -1 &&
+							g.PadState[CurPad].JoyDev != NULL) {
+							linux_set_vibrate(CurPad);
+						}
+						if (!linux_vibrate(&g.PadState[CurPad]))
+							/* only do visual if joy fails */
+#endif
+							if (!JoyHapticRumble(CurPad, g.PadState[CurPad].VibF[0], g.PadState[CurPad].VibF[1])) {
+								//gpuVisualVibration(g.PadState[CurPad].VibF[0], g.PadState[CurPad].VibF[1]);
+							}
+						
+						if(gpuVisualVibration != NULL &&
+						 g.cfg.PadDef[CurPad].VisualVibration) {
+							gpuVisualVibration(g.PadState[CurPad].VibF[0], g.PadState[CurPad].VibF[1]);
+						}
+					}
+				}
+			}
+			break;
+
 		case CMD_CONFIG_MODE:
 			if (CurByte == 2) {
 				switch (value) {
@@ -281,8 +535,7 @@
 
 		case CMD_SET_MODE_AND_LOCK:
 			if (CurByte == 2) {
-				g.PadState[CurPad].PadMode = value;
-				g.PadState[CurPad].PadID = value ? 0x73 : 0x41;
+				PADsetMode(CurPad, value);
 			}
 			break;
 
@@ -317,9 +570,33 @@
 				}
 			}
 			break;
+
+		case CMD_VIBRATION_TOGGLE:
+			if (CurByte >= 2 && CurByte < CmdLen) {
+				if (CurByte == g.PadState[CurPad].Vib0) {
+					buf[CurByte] = 0;
+				}
+				if (CurByte == g.PadState[CurPad].Vib1) {
+					buf[CurByte] = 1;
+				}
+
+				if (value == 0) {
+					g.PadState[CurPad].Vib0 = CurByte;
+					if ((g.PadState[CurPad].PadID & 0x0f) < (CurByte - 1) / 2) {
+						g.PadState[CurPad].PadID = (g.PadState[CurPad].PadID & 0xf0) + (CurByte - 1) / 2;
+					}
+				} else if (value == 1) {
+					g.PadState[CurPad].Vib1 = CurByte;
+					if ((g.PadState[CurPad].PadID & 0x0f) < (CurByte - 1) / 2) {
+						g.PadState[CurPad].PadID = (g.PadState[CurPad].PadID & 0xf0) + (CurByte - 1) / 2;
+					}
+				}
+			}
+			break;
 	}
 
 	if (CurByte >= CmdLen) return 0;
+	if (buf == NULL) return 0;
 	return buf[CurByte++];
 }
 
@@ -328,7 +605,7 @@
 
 	pad->buttonStatus = (g.PadState[num].KeyStatus & g.PadState[num].JoyKeyStatus);
 
-	// ePSXe different from pcsx, swap bytes
+	// ePSXe different from pcsxr, swap bytes
 	pad->buttonStatus = (pad->buttonStatus >> 8) | (pad->buttonStatus << 8);
 
 	switch (g.cfg.PadDef[num].Type) {
@@ -359,8 +636,11 @@
 
 long PADkeypressed(void) {
 	long s;
-
-	CheckKeyboard();
+ 
+ static int frame = 0;
+ if( !frame )
+ UpdateInput();
+ frame ^= 1;
 
 	s = g.KeyLeftOver;
 	g.KeyLeftOver = 0;
@@ -368,20 +648,37 @@
 	return s;
 }
 
+void PADregisterVibration(void (*callback)(uint32_t, uint32_t)) {
+	gpuVisualVibration = callback;
+}
+
 #ifndef _MACOSX
 
 long PADconfigure(void) {
-	if (fork() == 0) {
-		execl("cfg/cfgDFInput", "cfgDFInput", NULL);
+	int pid = fork();
+
+	if (pid == 0) {
+		if (fork() == 0) {
+			execl("cfg/cfgDFInput", "cfgDFInput", "configure", NULL);
+		}
 		exit(0);
+	} else if (pid > 0) {
+		waitpid(pid, NULL, 0);
 	}
+
 	return PSE_PAD_ERR_SUCCESS;
 }
 
 void PADabout(void) {
-	if (fork() == 0) {
-		execl("cfg/cfgDFInput", "cfgDFInput", "-about", NULL);
+	int pid = fork();
+
+	if (pid == 0) {
+		if (fork() == 0) {
+			execl("cfg/cfgDFInput", "cfgDFInput", "about", NULL);
+		}
 		exit(0);
+	} else if (pid > 0) {
+		waitpid(pid, NULL, 0);
 	}
 }

pcsxr-1.9.92.tar.bz2/plugins/dfinput/pad.h -> pcsxr-1.9.93.tar.bz2/plugins/dfinput/pad.h Changed

pcsxr-1.9.92.tar.bz2/plugins/dfinput/sdljoy.c -> pcsxr-1.9.93.tar.bz2/plugins/dfinput/sdljoy.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Wei Mingzhi <whistler@openoffice.org>.
+ * Copyright (c) 2009, Wei Mingzhi <whistler_wmz@users.sf.net>.
 * All Rights Reserved.
 *
 * This program is free software; you can redistribute it and/or modify
@@ -18,18 +18,102 @@
 
 #include "pad.h"
 
+#if SDL_VERSION_ATLEAST(1,3,0)
+static SDL_HapticEffect haptic_rumbleEffect;
+#endif
+
+void JoyInitHaptic()
+{
+#if SDL_VERSION_ATLEAST(1,3,0)
+ uint8_t i;
+ //unsigned int haptic_query = 0;
+ for (i = 0; i < 2; i++)
+ {
+ if (g.PadState[i].JoyDev && SDL_JoystickIsHaptic(g.PadState[i].JoyDev))
+ {
+ if (g.PadState[i].haptic != NULL)
+ {
+ SDL_HapticClose(g.PadState[i].haptic);
+ g.PadState[i].haptic = NULL;
+ }
+
+ g.PadState[i].haptic = SDL_HapticOpenFromJoystick(g.PadState[i].JoyDev);
+ if (g.PadState[i].haptic == NULL)
+ continue;
+
+ if (SDL_HapticRumbleSupported(g.PadState[i].haptic) == SDL_FALSE)
+ {
+ printf("\nRumble not supported\n");
+ g.PadState[i].haptic = NULL;
+ continue;
+ }
+
+ if (SDL_HapticRumbleInit(g.PadState[i].haptic) != 0)
+ {
+ printf("\nFailed to initialize rumble: %s\n", SDL_GetError());
+ g.PadState[i].haptic = NULL;
+ continue;
+ }
+ }
+ }
+#endif
+}
+
+int JoyHapticRumble(int pad, uint32_t low, uint32_t high)
+{
+#if SDL_VERSION_ATLEAST(1,3,0)
+ float mag;
+
+ if (g.PadState[pad].haptic) {
+
+ /* Stop the effect if it was playing. */
+ SDL_HapticRumbleStop(g.PadState[pad].haptic);
+
+ mag = ((high * 2 + low) / 6) / 127.5;
+ //printf("low: %d high: %d mag: %f\n", low, high, mag);
+
+ if(SDL_HapticRumblePlay(g.PadState[pad].haptic, mag, 500) != 0)
+ {
+ printf("\nFailed to play rumble: %s\n", SDL_GetError());
+ return 1;
+ }
+ }
+#endif
+ return 0;
+}
+
 void InitSDLJoy() {
 	uint8_t				i;
-
+	uint8_t				emukeydev;
 	g.PadState[0].JoyKeyStatus = 0xFFFF;
 	g.PadState[1].JoyKeyStatus = 0xFFFF;
 
 	for (i = 0; i < 2; i++) {
 		if (g.cfg.PadDef[i].DevNum >= 0) {
 			g.PadState[i].JoyDev = SDL_JoystickOpen(g.cfg.PadDef[i].DevNum);
+
+			// Saves an extra call to SDL joystick open
+			if (g.cfg.E.DevNum == g.cfg.PadDef[i].DevNum) {
+				g.cfg.E.EmuKeyDev = g.PadState[i].JoyDev;
+			}
 		} else {
 			g.PadState[i].JoyDev = NULL;
 		}
+#if !SDL_VERSION_ATLEAST(1,3,0) && defined(__linux__)
+		g.PadState[i].VibrateDev = -1;
+		g.PadState[i].VibrateEffect = -1;
+#endif
+	}
+
+#if SDL_VERSION_ATLEAST(1,3,0)
+ if (has_haptic)
+ {
+ JoyInitHaptic();
+ }
+#endif
+
+	if (g.cfg.E.EmuKeyDev == 0 && g.cfg.E.DevNum >= 0) {
+		g.cfg.E.EmuKeyDev = SDL_JoystickOpen(g.cfg.E.DevNum);
 	}
 
 	SDL_JoystickEventState(SDL_IGNORE);
@@ -43,6 +127,13 @@
 	if (SDL_WasInit(SDL_INIT_JOYSTICK)) {
 		for (i = 0; i < 2; i++) {
 			if (g.PadState[i].JoyDev != NULL) {
+#if SDL_VERSION_ATLEAST(1,3,0)
+ if (g.PadState[i].haptic != NULL)
+ {
+ SDL_HapticClose(g.PadState[i].haptic);
+ g.PadState[i].haptic = NULL;
+ }
+#endif
 				SDL_JoystickClose(g.PadState[i].JoyDev);
 			}
 		}
@@ -51,6 +142,27 @@
 	for (i = 0; i < 2; i++) {
 		g.PadState[i].JoyDev = NULL;
 	}
+	g.cfg.E.EmuKeyDev = NULL;
+}
+
+static void bdown(int pad, int bit)
+{
+	if(bit < 16)
+		g.PadState[pad].JoyKeyStatus &= ~(1 << bit);
+	else if(bit == DKEY_ANALOG) {
+		if(++g.PadState[pad].PadModeKey == 10)
+			g.PadState[pad].PadModeSwitch = 1;
+		else if(g.PadState[pad].PadModeKey > 10)
+			g.PadState[pad].PadModeKey = 11;
+	}
+}
+
+static void bup(int pad, int bit)
+{
+	if(bit < 16)
+		g.PadState[pad].JoyKeyStatus |= (1 << bit);
+	else if(bit == DKEY_ANALOG)
+		g.PadState[pad].PadModeKey = 0;
 }
 
 void CheckJoy() {
@@ -63,6 +175,7 @@
 			continue;
 		}
 
+		g.PadState[i].JoyKeyStatus = ~0;
 		for (j = 0; j < DKEY_TOTAL; j++) {
 			switch (g.cfg.PadDef[i].KeyDef[j].JoyEvType) {
 				case AXIS:
@@ -70,15 +183,15 @@
 
 					if (g.cfg.PadDef[i].KeyDef[j].J.Axis > 0) {
 						if (SDL_JoystickGetAxis(g.PadState[i].JoyDev, n) > 16383) {
-							g.PadState[i].JoyKeyStatus &= ~(1 << j);
+							bdown(i, j);
 						} else {
-							g.PadState[i].JoyKeyStatus |= (1 << j);
+							bup(i, j);
 						}
 					} else if (g.cfg.PadDef[i].KeyDef[j].J.Axis < 0) {
 						if (SDL_JoystickGetAxis(g.PadState[i].JoyDev, n) < -16383) {
-							g.PadState[i].JoyKeyStatus &= ~(1 << j);
+							bdown(i, j);
 						} else {
-							g.PadState[i].JoyKeyStatus |= (1 << j);
+							bup(i, j);
 						}
 					}
 					break;
@@ -87,17 +200,17 @@
 					n = (g.cfg.PadDef[i].KeyDef[j].J.Hat >> 8);
 
 					if (SDL_JoystickGetHat(g.PadState[i].JoyDev, n) & (g.cfg.PadDef[i].KeyDef[j].J.Hat & 0xFF)) {
-						g.PadState[i].JoyKeyStatus &= ~(1 << j);
+						bdown(i, j);
 					} else {
-						g.PadState[i].JoyKeyStatus |= (1 << j);
+						bup(i, j);
 					}
 					break;
 
 				case BUTTON:
 					if (SDL_JoystickGetButton(g.PadState[i].JoyDev, g.cfg.PadDef[i].KeyDef[j].J.Button)) {
-						g.PadState[i].JoyKeyStatus &= ~(1 << j);
+						bdown(i, j);
 					} else {
-						g.PadState[i].JoyKeyStatus |= (1 << j);
+						bup(i, j);
 					}
 					break;
 
@@ -107,5 +220,83 @@
 		}
 	}
 
+	// Check for emulator button states
+	for (i=(g.cfg.E.EmuKeyDev == NULL ? EMU_TOTAL : 0) ; i < EMU_TOTAL ; i++) {
+		switch (g.cfg.E.EmuDef[i].Mapping.JoyEvType) {
+			case BUTTON:
+				if (SDL_JoystickGetButton(g.cfg.E.EmuKeyDev, g.cfg.E.EmuDef[i].Mapping.J.Button)) {
+					if (g.cfg.E.EmuDef[i].Mapping.ReleaseEventPending == 0) {
+						//printf("%x %x %x %x\n", g.cfg.E.EmuKeyDev, i, g.cfg.E.EmuDef[i].Mapping.J.Button, g.cfg.E.EmuDef[i].EmuKeyEvent);
+						g.KeyLeftOver = g.cfg.E.EmuDef[i].EmuKeyEvent;
+						g.cfg.E.EmuDef[i].Mapping.ReleaseEventPending = 1;
+					}
+				} else if (g.cfg.E.EmuDef[i].Mapping.ReleaseEventPending) {
+					//printf("%x %x %x %x\n", g.cfg.E.EmuKeyDev, i, g.cfg.E.EmuDef[i].Mapping.J.Button, g.cfg.E.EmuDef[i].EmuKeyEvent);
+					g.KeyLeftOver = ( g.cfg.E.EmuDef[i].EmuKeyEvent | 0x40000000l );
+					g.cfg.E.EmuDef[i].Mapping.ReleaseEventPending = 0;
+				}
+				break;
+			case HAT:
+				n = (g.cfg.E.EmuDef[i].Mapping.J.Hat >> 8);
+				if (SDL_JoystickGetHat(g.cfg.E.EmuKeyDev, n) & (g.cfg.E.EmuDef[i].Mapping.J.Hat & 0xFF)) {
+					if (g.cfg.E.EmuDef[i].Mapping.ReleaseEventPending == 0) {
+						//printf("%x %x %x %x\n", g.cfg.E.EmuKeyDev, i, g.cfg.E.EmuDef[i].Mapping.J.Button, g.cfg.E.EmuDef[i].EmuKeyEvent);
+						g.KeyLeftOver = g.cfg.E.EmuDef[i].EmuKeyEvent;
+						g.cfg.E.EmuDef[i].Mapping.ReleaseEventPending = 1;
+					}
+				} else if (g.cfg.E.EmuDef[i].Mapping.ReleaseEventPending) {
+					//printf("%x %x %x %x\n", g.cfg.E.EmuKeyDev, i, g.cfg.E.EmuDef[i].Mapping.J.Button, g.cfg.E.EmuDef[i].EmuKeyEvent);
+					g.KeyLeftOver = ( g.cfg.E.EmuDef[i].EmuKeyEvent | 0x40000000l );
+					g.cfg.E.EmuDef[i].Mapping.ReleaseEventPending = 0;
+				}
+				break;
+			case AXIS:
+				n = abs(g.cfg.E.EmuDef[i].Mapping.J.Axis) - 1;
+
+				if (g.cfg.E.EmuDef[i].Mapping.J.Axis > 0) {
+					if (SDL_JoystickGetAxis(g.cfg.E.EmuKeyDev, n) > 16383) {
+						if (g.cfg.E.EmuDef[i].Mapping.ReleaseEventPending == 0) {
+							//printf("push1 %x %x %x %x\n", g.cfg.E.EmuKeyDev, i, g.cfg.E.EmuDef[i].Mapping.J.Axis, g.cfg.E.EmuDef[i].EmuKeyEvent);
+							g.KeyLeftOver = g.cfg.E.EmuDef[i].EmuKeyEvent;
+							g.cfg.E.EmuDef[i].Mapping.ReleaseEventPending = 1;
+						}
+					} else if (g.cfg.E.EmuDef[i].Mapping.ReleaseEventPending) {
+						//printf("rel1 %x %x %x %x\n", g.cfg.E.EmuKeyDev, i, g.cfg.E.EmuDef[i].Mapping.J.Button, g.cfg.E.EmuDef[i].EmuKeyEvent);
+						g.KeyLeftOver = ( g.cfg.E.EmuDef[i].EmuKeyEvent | 0x40000000l );
+						g.cfg.E.EmuDef[i].Mapping.ReleaseEventPending = 0;
+					}
+				} else if (g.cfg.E.EmuDef[i].Mapping.J.Axis < 0) {
+					if (SDL_JoystickGetAxis(g.cfg.E.EmuKeyDev, n) < -16383) {
+						if (g.cfg.E.EmuDef[i].Mapping.ReleaseEventPending == 0) {
+							//printf("push2 %x %x %x %x\n", g.cfg.E.EmuKeyDev, i, g.cfg.E.EmuDef[i].Mapping.J.Axis, g.cfg.E.EmuDef[i].EmuKeyEvent);
+							g.KeyLeftOver = g.cfg.E.EmuDef[i].EmuKeyEvent;
+							g.cfg.E.EmuDef[i].Mapping.ReleaseEventPending = 1;
+						}
+					} else if (g.cfg.E.EmuDef[i].Mapping.ReleaseEventPending) {
+						//printf("rel2 %x %x %x %x\n", g.cfg.E.EmuKeyDev, i, g.cfg.E.EmuDef[i].Mapping.J.Button, g.cfg.E.EmuDef[i].EmuKeyEvent);
+						g.KeyLeftOver = ( g.cfg.E.EmuDef[i].EmuKeyEvent | 0x40000000l );
+						g.cfg.E.EmuDef[i].Mapping.ReleaseEventPending = 0;
+					}
+				}
+				break;
+			default:
+				break;
+
+		}
+	}
+
 	CheckAnalog();
+
+	for (i = 0; i < 2; i++) {
+		if(!g.PadState[i].PadMode) {
+			if(g.PadState[i].AnalogStatus[ANALOG_LEFT][0] < 64)
+				bdown(i, DKEY_LEFT);
+			else if(g.PadState[i].AnalogStatus[ANALOG_LEFT][0] > 127 + 64)
+				bdown(i, DKEY_RIGHT);
+			if(g.PadState[i].AnalogStatus[ANALOG_LEFT][1] < 64)
+				bdown(i, DKEY_UP);
+			else if(g.PadState[i].AnalogStatus[ANALOG_LEFT][1] > 127 + 64)
+				bdown(i, DKEY_DOWN);
+		}
+	}
 }

pcsxr-1.9.93.tar.bz2/plugins/dfinput/util.c Added

@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2010, Wei Mingzhi <whistler_wmz@users.sf.net>.
+ * All Rights Reserved.
+ *
+ * Based on: Cdrom for Psemu Pro like Emulators
+ * By: linuzappz <linuzappz@hotmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses>.
+ */
+
+#include "pad.h"
+#include "util.h"
+
+void grabCursor(Display *dpy, Window win, int grab)
+{
+ if(!grab)
+ {
+ XUngrabPointer(dpy, CurrentTime);
+ }
+ else
+ {
+ XGrabPointer(dpy, win, True, ButtonPressMask, GrabModeAsync, GrabModeAsync, win, None, CurrentTime);
+ }
+}
+
+void showCursor(Display *dpy, Window win, int show)
+{
+ if(!show)
+ {
+ Pixmap bm_no;
+ Colormap cmap;
+ Cursor no_ptr;
+ XColor black, dummy;
+
+ char bm_no_data[] =
+ {
+ 0, 0, 0, 0, 0, 0, 0, 0
+ };
+
+ cmap = DefaultColormap(dpy, DefaultScreen(dpy));
+ XAllocNamedColor(dpy, cmap, "black", &black, &dummy);
+ bm_no = XCreateBitmapFromData(dpy, win, bm_no_data, 8, 8);
+ no_ptr = XCreatePixmapCursor(dpy, bm_no, bm_no, &black, &black, 0, 0);
+
+ XDefineCursor(dpy, win, no_ptr);
+
+ XFreeCursor(dpy, no_ptr);
+ XFreePixmap(dpy, bm_no);
+ XFreeColors(dpy, cmap, &black.pixel, 1, 0);
+ }
+ else
+ {
+ XDefineCursor(dpy, win, 0);
+ }
+}

pcsxr-1.9.93.tar.bz2/plugins/dfinput/util.h Added

@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2010, Wei Mingzhi <whistler_wmz@users.sf.net>.
+ * All Rights Reserved.
+ *
+ * Based on: Cdrom for Psemu Pro like Emulators
+ * By: linuzappz <linuzappz@hotmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses>.
+ */
+
+#ifndef __UTIL_H__
+#define __UTIL_H__
+
+extern void grabCursor(Display *dpy, Window win, int grab);
+extern void showCursor(Display *dpy, Window win, int show);
+
+#endif // __UTIL_H__

pcsxr-1.9.92.tar.bz2/plugins/dfinput/xkb.c -> pcsxr-1.9.93.tar.bz2/plugins/dfinput/xkb.c Changed

pcsxr-1.9.92.tar.bz2/plugins/dfnet/Makefile.am -> pcsxr-1.9.93.tar.bz2/plugins/dfnet/Makefile.am Changed

pcsxr-1.9.92.tar.bz2/plugins/dfnet/cfg.c -> pcsxr-1.9.93.tar.bz2/plugins/dfnet/cfg.c Changed

pcsxr-1.9.92.tar.bz2/plugins/dfnet/dfnet.c -> pcsxr-1.9.93.tar.bz2/plugins/dfnet/dfnet.c Changed

@@ -38,9 +38,9 @@
 	return sockInit();
 }
 
-int SEND(const void *buf, int Size, int Mode) {
-	int bytes;
-	int count = 0;
+size_t SEND(const void *buf, int Size, int Mode) {
+	long bytes;
+	long count = 0;
 	const char *pData = (const char *)buf;
 
 	if (Mode & PSE_NET_NONBLOCKING) { // NONBLOCKING
@@ -69,9 +69,9 @@
 	return count;
 }
 
-int RECV(void *buf, int Size, int Mode) {
-	int bytes;
-	int count = 0;
+size_t RECV(void *buf, int Size, int Mode) {
+	long bytes;
+	long count = 0;
 	char *pData = (char *)buf;
 
 	if (Mode & PSE_NET_NONBLOCKING) { // NONBLOCKING
@@ -100,7 +100,7 @@
 }
 
 long CALLBACK NETopen(unsigned long *gpuDisp) {
-	int ret = sockOpen();
+	long ret = sockOpen();
 
 	struct sockaddr_in address;
 
@@ -183,7 +183,7 @@
 
 	PadSendData = (char *)malloc(PadCountMax * 128);
 	if (PadSendData == NULL) {
-		SysMessage(_("Error allocating memory!\n")); return -1;
+		SysMessage("%s", _("Error allocating memory!\n")); return -1;
 	}
 	memset(PadSendData, 0xff, PadCountMax);

pcsxr-1.9.92.tar.bz2/plugins/dfnet/dfnet.h -> pcsxr-1.9.93.tar.bz2/plugins/dfnet/dfnet.h Changed

@@ -23,6 +23,32 @@
 #include <locale.h>
 #define _(x) gettext(x)
 #define N_(x) (x)
+#elif defined(_MACOSX)
+#ifdef __cplusplus
+extern "C" {
+#endif
+#ifdef PCSXRCORE
+__private_extern__ char* Pcsxr_locale_text(char* toloc);
+#define _(String) Pcsxr_locale_text(String)
+#define N_(String) String
+#else
+#ifndef PCSXRPLUG
+#warning please define the plug being built to use Mac OS X localization!
+#define _(msgid) msgid
+#define N_(msgid) msgid
+#else
+//Kludge to get the preprocessor to accept PCSXRPLUG as a variable.
+#define PLUGLOC_x(x,y) x ## y
+#define PLUGLOC_y(x,y) PLUGLOC_x(x,y)
+#define PLUGLOC PLUGLOC_y(PCSXRPLUG,_locale_text)
+__private_extern__ char* PLUGLOC(char* toloc);
+#define _(String) PLUGLOC(String)
+#define N_(String) String
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif
 #else
 #define _(x) (x)
 #define N_(x) (x)
@@ -49,7 +75,7 @@
 void LoadConf();
 void SaveConf();
 
-long sock;
+int sock;
 char *PadSendData;
 char *PadRecvData;
 char PadSendSize;
@@ -74,7 +100,7 @@
 int ShowPauseDlg();
 void SysMessage(const char *fmt, ...);
 
-int SEND(const void *pData, int Size, int Mode);
-int RECV(void *pData, int Size, int Mode);
+size_t SEND(const void *pData, int Size, int Mode);
+size_t RECV(void *pData, int Size, int Mode);
 
 #endif

pcsxr-1.9.93.tar.bz2/plugins/dfnet/dfnet.ui Added

@@ -0,0 +1,314 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ 
+ <object class="GtkDialog" id="dlgStart">
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="resizable">False</property>
+ <property name="modal">True</property>
+ <property name="window_position">center</property>
+ <property name="type_hint">normal</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">5</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="btnStart">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <child>
+ <object class="GtkHBox" id="hbox3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkImage" id="image2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-network</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Start Game</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="btnOffline">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <child>
+ <object class="GtkHBox" id="hbox4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkImage" id="image3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-no</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Play Offline</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Select here if you'll be Server (Player1) or Client (Player2).
+
+If you select Server you must Copy your IP address to the Clipboard and paste if (Ctrl+V) wherever the Client can see it.
+
+If you selected Client please enter the IP address the Server gave to you in the IP Address Control.</property>
+ <property name="wrap">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkTable" id="table1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">8</property>
+ <property name="row_spacing">12</property>
+ <child>
+ <object class="GtkButton" id="btnCopyIP">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <child>
+ <object class="GtkHBox" id="hbox2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-copy</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Copy PC IP to Clipboard</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="tbServerIP">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="max_length">15</property>
+ <property name="invisible_char">●</property>
+ <signal name="activate" handler="on_tbServerIP_activate" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="rbServer">
+ <property name="label" translatable="yes">Server (Player1)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="rbClient">
+ <property name="label" translatable="yes">Client (Player2)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">rbServer</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="padding">2</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Do not change if not necessary (remember it must be changed on both sides).</property>
+ <property name="wrap">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Port Number</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="tbPort">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="max_length">5</property>
+ <property name="invisible_char">●</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-5">btnStart</action-widget>
+ <action-widget response="-6">btnOffline</action-widget>
+ </action-widgets>
+ </object>
+</interface>

pcsxr-1.9.92.tar.bz2/plugins/dfnet/gui.c -> pcsxr-1.9.93.tar.bz2/plugins/dfnet/gui.c Changed

@@ -11,7 +11,6 @@
 
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
-#include <glade/glade.h>
 #include <signal.h>
 
 #include "cfg.c"
@@ -96,48 +95,49 @@
 }
 
 long CFGopen() {
-	GladeXML *xml;
+	GtkBuilder *builder;
 	GtkWidget *widget, *MainWindow;
 	char buf[256];
 
 	LoadConf();
 
-	xml = glade_xml_new(DATADIR "dfnet.glade2", "dlgStart", NULL);
-	if (xml == NULL) {
+	builder = gtk_builder_new();
+
+	if (!gtk_builder_add_from_file(builder, DATADIR "dfnet.ui", NULL)) {
 		g_warning("We could not load the interface!");
 		return 0;
 	}
 
-	MainWindow = glade_xml_get_widget(xml, "dlgStart");
+	MainWindow = gtk_builder_get_object(builder, "dlgStart");
 	gtk_window_set_title(GTK_WINDOW(MainWindow), _("NetPlay"));
 
-	widget = glade_xml_get_widget(xml, "btnCopyIP");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		GTK_SIGNAL_FUNC(OnCopyIP), NULL, NULL, G_CONNECT_AFTER);
+	widget = gtk_builder_get_object(builder, "btnCopyIP");
+	g_signal_connect_data(G_OBJECT(widget), "clicked",
+		G_CALLBACK(OnCopyIP), NULL, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "tbServerIP");
+	widget = gtk_builder_get_object(builder, "tbServerIP");
 	gtk_entry_set_text(GTK_ENTRY(widget), conf.ipAddress);
 
-	widget = glade_xml_get_widget(xml, "tbPort");
+	widget = gtk_builder_get_object(builder, "tbPort");
 	sprintf(buf, "%d", conf.PortNum);
 	gtk_entry_set_text(GTK_ENTRY(widget), buf);
 
 	if (conf.PlayerNum == 1) {
-		widget = glade_xml_get_widget(xml, "rbServer");
+		widget = gtk_builder_get_object(builder, "rbServer");
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE);
 	} else {
-		widget = glade_xml_get_widget(xml, "rbClient");
+		widget = gtk_builder_get_object(builder, "rbClient");
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE);
 	}
 
 	if (gtk_dialog_run(GTK_DIALOG(MainWindow)) == GTK_RESPONSE_OK) {
-		widget = glade_xml_get_widget(xml, "tbServerIP");
+		widget = gtk_builder_get_object(builder, "tbServerIP");
 		strcpy(conf.ipAddress, gtk_entry_get_text(GTK_ENTRY(widget)));
 
-		widget = glade_xml_get_widget(xml, "tbPort");
+		widget = gtk_builder_get_object(builder, "tbPort");
 		conf.PortNum = atoi(gtk_entry_get_text(GTK_ENTRY(widget)));
 
-		widget = glade_xml_get_widget(xml, "rbServer");
+		widget = gtk_builder_get_object(builder, "rbServer");
 		if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) {
 			conf.PlayerNum = 1;
 		} else {
@@ -182,7 +182,7 @@
 	GtkWidget *widget;
 
 	widget = gtk_about_dialog_new();
-	gtk_about_dialog_set_name(GTK_ABOUT_DIALOG(widget), "Socket NetPlay Driver");
+	gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(widget), "Socket NetPlay Driver");
 	gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(widget), "0.21");
 	gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(widget), authors);
 	gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(widget), "http://www.codeplex.com/pcsxr/");
@@ -212,21 +212,37 @@
 	textdomain(GETTEXT_PACKAGE);
 #endif
 
-	gtk_set_locale();
 	gtk_init(&argc, &argv);
 
-	if (!strcmp(argv[1], "configure")) {
-		CFGconfigure();
-	} else if (!strcmp(argv[1], "open")) {
-		return CFGopen();
-	} else if (!strcmp(argv[1], "wait")) {
-		CFGwait();
-	} else if (!strcmp(argv[1], "pause")) {
-		return CFGpause();
-	} else if (!strcmp(argv[1], "about")) {
-		CFGabout();
-	} else if (!strcmp(argv[1], "message")) {
-		CFGmessage(&argv[2], argc - 2);
+	if (argc < 2) {
+ 	printf ("Usage: cfgDFNet {about | configure | open | wait | pause | message}\n");
+		return 0;
+	}
+
+ if (strcmp(argv[1], "about") != 0 && 
+		strcmp(argv[1], "configure") != 0 && 
+		strcmp(argv[1], "open") != 0 && 
+		strcmp(argv[1], "wait") != 0 && 
+		strcmp(argv[1], "pause") != 0 && 
+		strcmp(argv[1], "message") != 0) {
+		printf ("Usage: cfgDFNet {about | configure | open | wait | pause | message}\n");
+		return 0;
+ }
+	
+	if(argc > 1) {
+		if (!strcmp(argv[1], "configure")) {
+			CFGconfigure();
+		} else if (!strcmp(argv[1], "about")) {
+			CFGabout();
+		} else if (!strcmp(argv[1], "open")) {
+			return CFGopen();
+		} else if (!strcmp(argv[1], "wait")) {
+			CFGwait();
+		} else if (!strcmp(argv[1], "pause")) {
+			return CFGpause();
+		} else if (!strcmp(argv[1], "message")) {
+			CFGmessage(&argv[2], argc - 2);
+		}
 	}
 
 	return 0;

pcsxr-1.9.92.tar.bz2/plugins/dfnet/unix.c -> pcsxr-1.9.93.tar.bz2/plugins/dfnet/unix.c Changed

@@ -34,19 +34,6 @@
 	return system(cfg);
 }
 
-void SysMessage(const char *fmt, ...) {
-	va_list list;
-	char msg[512];
-	char cmd[512];
-
-	va_start(list, fmt);
-	vsprintf(msg, fmt, list);
-	va_end(list);
-
-	sprintf(cmd, "message %s\n", msg);
-	ExecCfg(cmd, 1);
-}
-
 long sockInit() {
 	conf.PlayerNum = 0;
 	tm.tv_sec = 0;
@@ -59,14 +46,6 @@
 	return 0;
 }
 
-long sockOpen() {
-	if (ExecCfg("open", 0) == 0) return -1;
-
-	LoadConf();
-
-	return 0;
-}
-
 int sockPing() {
 	char data[32];
 	struct timeval tv, tvn;
@@ -82,6 +61,29 @@
 		   (tvn.tv_usec - tv.tv_usec) / 1000;
 }
 
+#ifndef _MACOSX
+void SysMessage(const char *fmt, ...) {
+	va_list list;
+	char msg[512];
+	char cmd[512];
+
+	va_start(list, fmt);
+	vsprintf(msg, fmt, list);
+	va_end(list);
+
+	sprintf(cmd, "message %s\n", msg);
+	ExecCfg(cmd, 1);
+}
+
+
+long sockOpen() {
+	if (ExecCfg("open", 0) == 0) return -1;
+
+	LoadConf();
+
+	return 0;
+}
+
 void CALLBACK NETconfigure() {
 	ExecCfg("configure", 1);
 }
@@ -116,6 +118,7 @@
 		cfgpid = 0;
 	}
 }
+#endif
 
 long timeGetTime() {
 	struct timeval tv;

pcsxr-1.9.92.tar.bz2/plugins/dfsound/Makefile.am -> pcsxr-1.9.93.tar.bz2/plugins/dfsound/Makefile.am Changed

@@ -1,51 +1,57 @@
-INCLUDES = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \
-	-DLOCALE_DIR=\"${datadir}/locale/\" \
-	-DDATADIR=\"${datadir}/psemu/\" \
-	$(GTK2_CFLAGS) $(GLADE2_CFLAGS) \
-	-I../../include
+AM_CPPFLAGS = -I../../include
 
 bindir = @libdir@/games/psemu/
 libdir = @libdir@/games/psemu/
 
 lib_LTLIBRARIES = libDFSound.la
 
-libDFSound_la_SOURCES = spu.c cfg.c dma.c freeze.c registers.c
+libDFSound_la_SOURCES = adsr.c adsr.h spu.c spu.h cfg.c cfg.h dma.c dma.h gauss_i.h freeze.c reverb.c reverb.h registers.c registers.h externals.c externals.h dsoundoss.h psemuxa.h regs.h xa.c xa.h stdafx.h
 
-libDFSound_la_CFLAGS =
-libDFSound_la_LDFLAGS = -module -avoid-version -lpthread -lm
+libDFSound_la_CPPFLAGS = $(AM_CPPFLAGS)
+libDFSound_la_LDFLAGS = -module -avoid-version 
+libDFSound_la_LIBADD = -lpthread -lm
 
 if SOUND_ALSA
 libDFSound_la_SOURCES += alsa.c
-libDFSound_la_CFLAGS += -DUSEALSA=1
-libDFSound_la_LDFLAGS += $(ALSA_LIBS)
+libDFSound_la_CPPFLAGS += -DUSEALSA=1
+libDFSound_la_LIBADD += $(ALSA_LIBS)
 endif
 
 if SOUND_OSS
 libDFSound_la_SOURCES += oss.c
-libDFSound_la_CFLAGS += -DUSEOSS=1
+libDFSound_la_CPPFLAGS += -DUSEOSS=1
 endif
 
 if SOUND_PULSEAUDIO
 libDFSound_la_SOURCES += pulseaudio.c
-libDFSound_la_CFLAGS += -DUSEPULSEAUDIO=1 $(PULSEAUDIO_CFLAGS)
-libDFSound_la_LDFLAGS += $(PULSEAUDIO_LIBS)
+libDFSound_la_CPPFLAGS += -DUSEPULSEAUDIO=1 $(PULSEAUDIO_CFLAGS)
+libDFSound_la_LIBADD += $(PULSEAUDIO_LIBS)
 endif
 
 if SOUND_SDL
 libDFSound_la_SOURCES += sdl.c
-libDFSound_la_CFLAGS += -DUSESDL=1 $(SDL_CFLAGS)
-libDFSound_la_LDFLAGS += $(SDL_LIBS)
+libDFSound_la_CPPFLAGS += -DUSESDL=1 $(SDL_CFLAGS)
+libDFSound_la_LIBADD += $(SDL_LIBS)
+endif
+
+if SOUND_OPENAL
+libDFSound_la_SOURCES += openal.c
+libDFSound_la_CPPFLAGS += -DUSEOPENAL=1
+libDFSound_la_LIBADD += $(OPENAL_LIBS)
 endif
 
 if SOUND_NULL
 libDFSound_la_SOURCES += nullsnd.c
-libDFSound_la_CFLAGS += -DUSENULL=1
+libDFSound_la_CPPFLAGS += -DUSENULL=1
 endif
 
 bin_PROGRAMS = cfgDFSound
+cfgDFSound_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
+	-DDATADIR=\"${datadir}/psemu/\" \
+	$(GTK3_CFLAGS) $(AM_CPPFLAGS)
 cfgDFSound_SOURCES = spucfg-0.1df/main.c
-cfgDFSound_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS)
+cfgDFSound_LDADD = $(GTK3_LIBS)
 
-glade_DATA = spucfg-0.1df/dfsound.glade2
+glade_DATA = spucfg-0.1df/dfsound.ui
 gladedir = $(datadir)/psemu/
 EXTRA_DIST = $(glade_DATA)

pcsxr-1.9.92.tar.bz2/plugins/dfsound/adsr.c -> pcsxr-1.9.93.tar.bz2/plugins/dfsound/adsr.c Changed

@@ -1,641 +1,763 @@
-/***************************************************************************
- adsr.c - description
- -------------------
- begin : Wed May 15 2002
- copyright : (C) 2002 by Pete Bernert
- email : BlackDove@addcom.de
- ***************************************************************************/
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. See also the license.txt file for *
- * additional informations. *
- * *
- ***************************************************************************/
-
-#include "stdafx.h"
-
-#define _IN_ADSR
-
-// will be included from spu.c
-#ifdef _IN_SPU
-
-////////////////////////////////////////////////////////////////////////
-// ADSR func
-////////////////////////////////////////////////////////////////////////
-
-unsigned long RateTable[160];
-
-void InitADSR(void) // INIT ADSR
-{
- unsigned long r,rs,rd;int i;
-
- memset(RateTable,0,sizeof(unsigned long)*160); // build the rate table according to Neill's rules (see at bottom of file)
-
- r=3;rs=1;rd=0;
-
- for(i=32;i<160;i++) // we start at pos 32 with the real values... everything before is 0
- {
- if(r<0x3FFFFFFF)
- {
- r+=rs;
- rd++;if(rd==5) {rd=1;rs*=2;}
- }
- if(r>0x3FFFFFFF) r=0x3FFFFFFF;
-
- RateTable[i]=r;
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-
-INLINE void StartADSR(int ch) // MIX ADSR
-{
- s_chan[ch].ADSRX.lVolume=1; // and init some adsr vars
- s_chan[ch].ADSRX.State=0;
- s_chan[ch].ADSRX.EnvelopeVol=0;
-}
-
-////////////////////////////////////////////////////////////////////////
-
-INLINE int MixADSR(int ch) // MIX ADSR
-{ 
- if(s_chan[ch].bStop) // should be stopped:
- { // do release
- if(s_chan[ch].ADSRX.ReleaseModeExp)
- {
- switch((s_chan[ch].ADSRX.EnvelopeVol>>28)&0x7)
- {
- case 0: s_chan[ch].ADSRX.EnvelopeVol-=RateTable[(4*(s_chan[ch].ADSRX.ReleaseRate^0x1F))-0x18 +0 + 32]; break;
- case 1: s_chan[ch].ADSRX.EnvelopeVol-=RateTable[(4*(s_chan[ch].ADSRX.ReleaseRate^0x1F))-0x18 +4 + 32]; break;
- case 2: s_chan[ch].ADSRX.EnvelopeVol-=RateTable[(4*(s_chan[ch].ADSRX.ReleaseRate^0x1F))-0x18 +6 + 32]; break;
- case 3: s_chan[ch].ADSRX.EnvelopeVol-=RateTable[(4*(s_chan[ch].ADSRX.ReleaseRate^0x1F))-0x18 +8 + 32]; break;
- case 4: s_chan[ch].ADSRX.EnvelopeVol-=RateTable[(4*(s_chan[ch].ADSRX.ReleaseRate^0x1F))-0x18 +9 + 32]; break;
- case 5: s_chan[ch].ADSRX.EnvelopeVol-=RateTable[(4*(s_chan[ch].ADSRX.ReleaseRate^0x1F))-0x18 +10+ 32]; break;
- case 6: s_chan[ch].ADSRX.EnvelopeVol-=RateTable[(4*(s_chan[ch].ADSRX.ReleaseRate^0x1F))-0x18 +11+ 32]; break;
- case 7: s_chan[ch].ADSRX.EnvelopeVol-=RateTable[(4*(s_chan[ch].ADSRX.ReleaseRate^0x1F))-0x18 +12+ 32]; break;
- }
- }
- else
- {
- s_chan[ch].ADSRX.EnvelopeVol-=RateTable[(4*(s_chan[ch].ADSRX.ReleaseRate^0x1F))-0x0C + 32];
- }
-
- if(s_chan[ch].ADSRX.EnvelopeVol<0) 
- {
- s_chan[ch].ADSRX.EnvelopeVol=0;
- s_chan[ch].bOn=0;
- //s_chan[ch].bReverb=0;
- //s_chan[ch].bNoise=0;
- }
-
- s_chan[ch].ADSRX.lVolume=s_chan[ch].ADSRX.EnvelopeVol>>21;
- return s_chan[ch].ADSRX.lVolume;
- }
- else // not stopped yet?
- {
- if(s_chan[ch].ADSRX.State==0) // -> attack
- {
- if(s_chan[ch].ADSRX.AttackModeExp)
- {
- if(s_chan[ch].ADSRX.EnvelopeVol<0x60000000) 
- s_chan[ch].ADSRX.EnvelopeVol+=RateTable[(s_chan[ch].ADSRX.AttackRate^0x7F)-0x10 + 32];
- else
- s_chan[ch].ADSRX.EnvelopeVol+=RateTable[(s_chan[ch].ADSRX.AttackRate^0x7F)-0x18 + 32];
- }
- else
- {
- s_chan[ch].ADSRX.EnvelopeVol+=RateTable[(s_chan[ch].ADSRX.AttackRate^0x7F)-0x10 + 32];
- }
-
- if(s_chan[ch].ADSRX.EnvelopeVol<0) 
- {
- s_chan[ch].ADSRX.EnvelopeVol=0x7FFFFFFF;
- s_chan[ch].ADSRX.State=1;
- }
-
- s_chan[ch].ADSRX.lVolume=s_chan[ch].ADSRX.EnvelopeVol>>21;
- return s_chan[ch].ADSRX.lVolume;
- }
- //--------------------------------------------------//
- if(s_chan[ch].ADSRX.State==1) // -> decay
- {
- switch((s_chan[ch].ADSRX.EnvelopeVol>>28)&0x7)
- {
- case 0: s_chan[ch].ADSRX.EnvelopeVol-=RateTable[(4*(s_chan[ch].ADSRX.DecayRate^0x1F))-0x18+0 + 32]; break;
- case 1: s_chan[ch].ADSRX.EnvelopeVol-=RateTable[(4*(s_chan[ch].ADSRX.DecayRate^0x1F))-0x18+4 + 32]; break;
- case 2: s_chan[ch].ADSRX.EnvelopeVol-=RateTable[(4*(s_chan[ch].ADSRX.DecayRate^0x1F))-0x18+6 + 32]; break;
- case 3: s_chan[ch].ADSRX.EnvelopeVol-=RateTable[(4*(s_chan[ch].ADSRX.DecayRate^0x1F))-0x18+8 + 32]; break;
- case 4: s_chan[ch].ADSRX.EnvelopeVol-=RateTable[(4*(s_chan[ch].ADSRX.DecayRate^0x1F))-0x18+9 + 32]; break;
- case 5: s_chan[ch].ADSRX.EnvelopeVol-=RateTable[(4*(s_chan[ch].ADSRX.DecayRate^0x1F))-0x18+10+ 32]; break;
- case 6: s_chan[ch].ADSRX.EnvelopeVol-=RateTable[(4*(s_chan[ch].ADSRX.DecayRate^0x1F))-0x18+11+ 32]; break;
- case 7: s_chan[ch].ADSRX.EnvelopeVol-=RateTable[(4*(s_chan[ch].ADSRX.DecayRate^0x1F))-0x18+12+ 32]; break;
- }
-
- if(s_chan[ch].ADSRX.EnvelopeVol<0) s_chan[ch].ADSRX.EnvelopeVol=0;
- if(((s_chan[ch].ADSRX.EnvelopeVol>>27)&0xF) <= s_chan[ch].ADSRX.SustainLevel)
- {
- s_chan[ch].ADSRX.State=2;
- }
-
- s_chan[ch].ADSRX.lVolume=s_chan[ch].ADSRX.EnvelopeVol>>21;
- return s_chan[ch].ADSRX.lVolume;
- }
- //--------------------------------------------------//
- if(s_chan[ch].ADSRX.State==2) // -> sustain
- {
- if(s_chan[ch].ADSRX.SustainIncrease)
- {
- if(s_chan[ch].ADSRX.SustainModeExp)
- {
- if(s_chan[ch].ADSRX.EnvelopeVol<0x60000000) 
- s_chan[ch].ADSRX.EnvelopeVol+=RateTable[(s_chan[ch].ADSRX.SustainRate^0x7F)-0x10 + 32];
- else
- s_chan[ch].ADSRX.EnvelopeVol+=RateTable[(s_chan[ch].ADSRX.SustainRate^0x7F)-0x18 + 32];
- }
- else
- {
- s_chan[ch].ADSRX.EnvelopeVol+=RateTable[(s_chan[ch].ADSRX.SustainRate^0x7F)-0x10 + 32];
- }
-
- if(s_chan[ch].ADSRX.EnvelopeVol<0) 
- {
- s_chan[ch].ADSRX.EnvelopeVol=0x7FFFFFFF;
- }
- }
- else
- {
- if(s_chan[ch].ADSRX.SustainModeExp)
- {
- switch((s_chan[ch].ADSRX.EnvelopeVol>>28)&0x7)
- {
- case 0: s_chan[ch].ADSRX.EnvelopeVol-=RateTable[((s_chan[ch].ADSRX.SustainRate^0x7F))-0x1B +0 + 32];break;
- case 1: s_chan[ch].ADSRX.EnvelopeVol-=RateTable[((s_chan[ch].ADSRX.SustainRate^0x7F))-0x1B +4 + 32];break;
- case 2: s_chan[ch].ADSRX.EnvelopeVol-=RateTable[((s_chan[ch].ADSRX.SustainRate^0x7F))-0x1B +6 + 32];break;
- case 3: s_chan[ch].ADSRX.EnvelopeVol-=RateTable[((s_chan[ch].ADSRX.SustainRate^0x7F))-0x1B +8 + 32];break;
- case 4: s_chan[ch].ADSRX.EnvelopeVol-=RateTable[((s_chan[ch].ADSRX.SustainRate^0x7F))-0x1B +9 + 32];break;
- case 5: s_chan[ch].ADSRX.EnvelopeVol-=RateTable[((s_chan[ch].ADSRX.SustainRate^0x7F))-0x1B +10+ 32];break;
- case 6: s_chan[ch].ADSRX.EnvelopeVol-=RateTable[((s_chan[ch].ADSRX.SustainRate^0x7F))-0x1B +11+ 32];break;
- case 7: s_chan[ch].ADSRX.EnvelopeVol-=RateTable[((s_chan[ch].ADSRX.SustainRate^0x7F))-0x1B +12+ 32];break;
- }
- }
- else
- {
- s_chan[ch].ADSRX.EnvelopeVol-=RateTable[((s_chan[ch].ADSRX.SustainRate^0x7F))-0x0F + 32];
- }
-
- if(s_chan[ch].ADSRX.EnvelopeVol<0) 
- {
- s_chan[ch].ADSRX.EnvelopeVol=0;
- }
- }
- s_chan[ch].ADSRX.lVolume=s_chan[ch].ADSRX.EnvelopeVol>>21;
- return s_chan[ch].ADSRX.lVolume;
- }
- }
- return 0;
-}
-
-#endif
-
-/*
-James Higgs ADSR investigations:
-
-PSX SPU Envelope Timings
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-First, here is an extract from doomed's SPU doc, which explains the basics
-of the SPU "volume envelope": 
-
-*** doomed doc extract start ***
-
---------------------------------------------------------------------------
-Voices.
---------------------------------------------------------------------------
-The SPU has 24 hardware voices. These voices can be used to reproduce sample
-data, noise or can be used as frequency modulator on the next voice.
-Each voice has it's own programmable ADSR envelope filter. The main volume
-can be programmed independently for left and right output.
-
-The ADSR envelope filter works as follows:
-Ar = Attack rate, which specifies the speed at which the volume increases
- from zero to it's maximum value, as soon as the note on is given. The
- slope can be set to lineair or exponential.
-Dr = Decay rate specifies the speed at which the volume decreases to the
- sustain level. Decay is always decreasing exponentially.
-Sl = Sustain level, base level from which sustain starts.
-Sr = Sustain rate is the rate at which the volume of the sustained note
- increases or decreases. This can be either lineair or exponential.
-Rr = Release rate is the rate at which the volume of the note decreases
- as soon as the note off is given.
-
- lvl |
- ^ | /\Dr __
- Sl _| _ / _ \__--- \
- | / ---__ \ Rr
- | /Ar Sr \ \
- | / \\
- |/___________________\________
- ->time
-
-The overal volume can also be set to sweep up or down lineairly or
-exponentially from it's current value. This can be done seperately
-for left and right.
-
-Relevant SPU registers:
--------------------------------------------------------------
-$1f801xx8 Attack/Decay/Sustain level
-bit |0f|0e 0d 0c 0b 0a 09 08|07 06 05 04|03 02 01 00|
-desc.|Am| Ar |Dr |Sl |
-
-Am 0 Attack mode Linear
- 1 Exponential
-
-Ar 0-7f attack rate
-Dr 0-f decay rate
-Sl 0-f sustain level
--------------------------------------------------------------
-$1f801xxa Sustain rate, Release Rate.
-bit |0f|0e|0d|0c 0b 0a 09 08 07 06|05|04 03 02 01 00|
-desc.|Sm|Sd| 0| Sr |Rm|Rr |
-
-Sm 0 sustain rate mode linear
- 1 exponential
-Sd 0 sustain rate mode increase
- 1 decrease
-Sr 0-7f Sustain Rate
-Rm 0 Linear decrease
- 1 Exponential decrease
-Rr 0-1f Release Rate
-
-Note: decay mode is always Expontial decrease, and thus cannot
-be set.
--------------------------------------------------------------
-$1f801xxc Current ADSR volume
-bit |0f 0e 0d 0c 0b 0a 09 08 07 06 05 04 03 02 01 00|
-desc.|ADSRvol |
-
-ADSRvol Returns the current envelope volume when
- read.
--- James' Note: return range: 0 -> 32767
-
-*** doomed doc extract end *** 
-
-By using a small PSX proggie to visualise the envelope as it was played,
-the following results for envelope timing were obtained:
-
-1. Attack rate value (linear mode)
-
- Attack value range: 0 -> 127
-
- Value | 48 | 52 | 56 | 60 | 64 | 68 | 72 | | 80 |
- -----------------------------------------------------------------
- Frames | 11 | 21 | 42 | 84 | 169| 338| 676| |2890|
-
- Note: frames is no. of PAL frames to reach full volume (100%
- amplitude)
-
- Hmm, noticing that the time taken to reach full volume doubles
- every time we add 4 to our attack value, we know the equation is
- of form:
- frames = k * 2 ^ (value / 4)
-
- (You may ponder about envelope generator hardware at this point,
- or maybe not... :)
-
- By substituting some stuff and running some checks, we get:
-
- k = 0.00257 (close enuf)
-
- therefore,
- frames = 0.00257 * 2 ^ (value / 4)
- If you just happen to be writing an emulator, then you can probably
- use an equation like:
-
- %volume_increase_per_tick = 1 / frames
-
-
- ------------------------------------
- Pete:
- ms=((1<<(value>>2))*514)/10000
- ------------------------------------
-
-2. Decay rate value (only has log mode)
-
- Decay value range: 0 -> 15
-
- Value | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 |
- ------------------------------------------------
- frames | | | | | 6 | 12 | 24 | 47 |
-
- Note: frames here is no. of PAL frames to decay to 50% volume.
-
- formula: frames = k * 2 ^ (value)
-
- Substituting, we get: k = 0.00146
-
- Further info on logarithmic nature:
- frames to decay to sustain level 3 = 3 * frames to decay to 
- sustain level 9
-
- Also no. of frames to 25% volume = roughly 1.85 * no. of frames to
- 50% volume.
-
- Frag it - just use linear approx.
-
- ------------------------------------
- Pete:
- ms=((1<<value)*292)/10000
- ------------------------------------
-
-
-3. Sustain rate value (linear mode)
-
- Sustain rate range: 0 -> 127
-
- Value | 48 | 52 | 56 | 60 | 64 | 68 | 72 |
- -------------------------------------------
- frames | 9 | 19 | 37 | 74 | 147| 293| 587|
-
- Here, frames = no. of PAL frames for volume amplitude to go from 100%
- to 0% (or vice-versa).
-
- Same formula as for attack value, just a different value for k:
-
- k = 0.00225
-
- ie: frames = 0.00225 * 2 ^ (value / 4)
-
- For emulation purposes:
-
- %volume_increase_or_decrease_per_tick = 1 / frames
-
- ------------------------------------
- Pete:
- ms=((1<<(value>>2))*450)/10000
- ------------------------------------
-
-
-4. Release rate (linear mode)
-
- Release rate range: 0 -> 31
-
- Value | 13 | 14 | 15 | 16 | 17 |
- ---------------------------------------------------------------
- frames | 18 | 36 | 73 | 146| 292|
-
- Here, frames = no. of PAL frames to decay from 100% vol to 0% vol
- after "note-off" is triggered.
-
- Formula: frames = k * 2 ^ (value)
-
- And so: k = 0.00223
-
- ------------------------------------
- Pete:
- ms=((1<<value)*446)/10000
- ------------------------------------
-
-
-Other notes: 
-
-Log stuff not figured out. You may get some clues from the "Decay rate"
-stuff above. For emu purposes it may not be important - use linear
-approx.
-
-To get timings in millisecs, multiply frames by 20.
-
-
-
-- James Higgs 17/6/2000
-james7780@yahoo.com
-
-//---------------------------------------------------------------
-
-OLD adsr mixing according to james' rules... has to be called
-every one millisecond
-
-
- long v,v2,lT,l1,l2,l3;
-
- if(s_chan[ch].bStop) // psx wants to stop? -> release phase
- {
- if(s_chan[ch].ADSR.ReleaseVal!=0) // -> release not 0: do release (if 0: stop right now)
- {
- if(!s_chan[ch].ADSR.ReleaseVol) // --> release just started? set up the release stuff
- {
- s_chan[ch].ADSR.ReleaseStartTime=s_chan[ch].ADSR.lTime;
- s_chan[ch].ADSR.ReleaseVol=s_chan[ch].ADSR.lVolume;
- s_chan[ch].ADSR.ReleaseTime = // --> calc how long does it take to reach the wanted sus level
- (s_chan[ch].ADSR.ReleaseTime*
- s_chan[ch].ADSR.ReleaseVol)/1024;
- }
- // -> NO release exp mode used (yet)
- v=s_chan[ch].ADSR.ReleaseVol; // -> get last volume
- lT=s_chan[ch].ADSR.lTime- // -> how much time is past?
- s_chan[ch].ADSR.ReleaseStartTime;
- l1=s_chan[ch].ADSR.ReleaseTime;
- 
- if(lT<l1) // -> we still have to release
- {
- v=v-((v*lT)/l1); // --> calc new volume
- }
- else // -> release is over: now really stop that sample
- {v=0;s_chan[ch].bOn=0;s_chan[ch].ADSR.ReleaseVol=0;s_chan[ch].bNoise=0;}
- }
- else // -> release IS 0: release at once
- {
- v=0;s_chan[ch].bOn=0;s_chan[ch].ADSR.ReleaseVol=0;s_chan[ch].bNoise=0;
- }
- }
- else 
- {//--------------------------------------------------// not in release phase:
- v=1024;
- lT=s_chan[ch].ADSR.lTime;
- l1=s_chan[ch].ADSR.AttackTime;
- 
- if(lT<l1) // attack
- { // no exp mode used (yet)
-// if(s_chan[ch].ADSR.AttackModeExp)
-// {
-// v=(v*lT)/l1;
-// }
-// else
- {
- v=(v*lT)/l1;
- }
- if(v==0) v=1;
- }
- else // decay
- { // should be exp, but who cares? ;)
- l2=s_chan[ch].ADSR.DecayTime;
- v2=s_chan[ch].ADSR.SustainLevel;
-
- lT-=l1;
- if(lT<l2)
- {
- v-=(((v-v2)*lT)/l2);
- }
- else // sustain
- { // no exp mode used (yet)
- l3=s_chan[ch].ADSR.SustainTime;
- lT-=l2;
- if(s_chan[ch].ADSR.SustainModeDec>0)
- {
- if(l3!=0) v2+=((v-v2)*lT)/l3;
- else v2=v;
- }
- else
- {
- if(l3!=0) v2-=(v2*lT)/l3;
- else v2=v;
- }
-
- if(v2>v) v2=v;
- if(v2<=0) {v2=0;s_chan[ch].bOn=0;s_chan[ch].ADSR.ReleaseVol=0;s_chan[ch].bNoise=0;}
-
- v=v2;
- }
- }
- }
-
- //----------------------------------------------------// 
- // ok, done for this channel, so increase time
-
- s_chan[ch].ADSR.lTime+=1; // 1 = 1.020408f ms; 
-
- if(v>1024) v=1024; // adjust volume
- if(v<0) v=0; 
- s_chan[ch].ADSR.lVolume=v; // store act volume
-
- return v; // return the volume factor
-*/
-
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
-
-/*
------------------------------------------------------------------------------
-Neill Corlett
-Playstation SPU envelope timing notes
------------------------------------------------------------------------------
-
-This is preliminary. This may be wrong. But the model described herein fits
-all of my experimental data, and it's just simple enough to sound right.
-
-ADSR envelope level ranges from 0x00000000 to 0x7FFFFFFF internally.
-The value returned by channel reg 0xC is (envelope_level>>16).
-
-Each sample, an increment or decrement value will be added to or
-subtracted from this envelope level.
-
-Create the rate log table. The values double every 4 entries.
- entry #0 = 4
-
- 4, 5, 6, 7,
- 8,10,12,14,
- 16,20,24,28, ...
-
- entry #40 = 4096...
- entry #44 = 8192...
- entry #48 = 16384...
- entry #52 = 32768...
- entry #56 = 65536...
-
-increments and decrements are in terms of ratelogtable[n]
-n may exceed the table bounds (plan on n being between -32 and 127).
-table values are all clipped between 0x00000000 and 0x3FFFFFFF
-
-when you "voice on", the envelope is always fully reset.
-(yes, it may click. the real thing does this too.)
-
-envelope level begins at zero.
-
-each state happens for at least 1 cycle
-(transitions are not instantaneous)
-this may result in some oddness: if the decay rate is uberfast, it will cut
-the envelope from full down to half in one sample, potentially skipping over
-the sustain level
-
-ATTACK
-------
-- if the envelope level has overflowed past the max, clip to 0x7FFFFFFF and
- proceed to DECAY.
-
-Linear attack mode:
-- line extends upward to 0x7FFFFFFF
-- increment per sample is ratelogtable[(Ar^0x7F)-0x10]
-
-Logarithmic attack mode:
-if envelope_level < 0x60000000:
- - line extends upward to 0x60000000
- - increment per sample is ratelogtable[(Ar^0x7F)-0x10]
-else:
- - line extends upward to 0x7FFFFFFF
- - increment per sample is ratelogtable[(Ar^0x7F)-0x18]
-
-DECAY
------
-- if ((envelope_level>>27)&0xF) <= Sl, proceed to SUSTAIN.
- Do not clip to the sustain level.
-- current line ends at (envelope_level & 0x07FFFFFF)
-- decrement per sample depends on (envelope_level>>28)&0x7
- 0: ratelogtable[(4*(Dr^0x1F))-0x18+0]
- 1: ratelogtable[(4*(Dr^0x1F))-0x18+4]
- 2: ratelogtable[(4*(Dr^0x1F))-0x18+6]
- 3: ratelogtable[(4*(Dr^0x1F))-0x18+8]
- 4: ratelogtable[(4*(Dr^0x1F))-0x18+9]
- 5: ratelogtable[(4*(Dr^0x1F))-0x18+10]
- 6: ratelogtable[(4*(Dr^0x1F))-0x18+11]
- 7: ratelogtable[(4*(Dr^0x1F))-0x18+12]
- (note that this is the same as the release rate formula, except that
- decay rates 10-1F aren't possible... those would be slower in theory)
-
-SUSTAIN
--------
-- no terminating condition except for voice off
-- Sd=0 (increase) behavior is identical to ATTACK for both log and linear.
-- Sd=1 (decrease) behavior:
-Linear sustain decrease:
-- line extends to 0x00000000
-- decrement per sample is ratelogtable[(Sr^0x7F)-0x0F]
-Logarithmic sustain decrease:
-- current line ends at (envelope_level & 0x07FFFFFF)
-- decrement per sample depends on (envelope_level>>28)&0x7
- 0: ratelogtable[(Sr^0x7F)-0x1B+0]
- 1: ratelogtable[(Sr^0x7F)-0x1B+4]
- 2: ratelogtable[(Sr^0x7F)-0x1B+6]
- 3: ratelogtable[(Sr^0x7F)-0x1B+8]
- 4: ratelogtable[(Sr^0x7F)-0x1B+9]
- 5: ratelogtable[(Sr^0x7F)-0x1B+10]
- 6: ratelogtable[(Sr^0x7F)-0x1B+11]
- 7: ratelogtable[(Sr^0x7F)-0x1B+12]
-
-RELEASE
--------
-- if the envelope level has overflowed to negative, clip to 0 and QUIT.
-
-Linear release mode:
-- line extends to 0x00000000
-- decrement per sample is ratelogtable[(4*(Rr^0x1F))-0x0C]
-
-Logarithmic release mode:
-- line extends to (envelope_level & 0x0FFFFFFF)
-- decrement per sample depends on (envelope_level>>28)&0x7
- 0: ratelogtable[(4*(Rr^0x1F))-0x18+0]
- 1: ratelogtable[(4*(Rr^0x1F))-0x18+4]
- 2: ratelogtable[(4*(Rr^0x1F))-0x18+6]
- 3: ratelogtable[(4*(Rr^0x1F))-0x18+8]
- 4: ratelogtable[(4*(Rr^0x1F))-0x18+9]
- 5: ratelogtable[(4*(Rr^0x1F))-0x18+10]
- 6: ratelogtable[(4*(Rr^0x1F))-0x18+11]
- 7: ratelogtable[(4*(Rr^0x1F))-0x18+12]
-
------------------------------------------------------------------------------
-*/
-
+/***************************************************************************
+ adsr.c - description
+ -------------------
+ begin : Wed May 15 2002
+ copyright : (C) 2002 by Pete Bernert
+ email : BlackDove@addcom.de
+ ***************************************************************************/
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+#include "stdafx.h"
+
+#define _IN_ADSR
+
+// will be included from spu.c
+#ifdef _IN_SPU
+
+////////////////////////////////////////////////////////////////////////
+// ADSR func
+////////////////////////////////////////////////////////////////////////
+
+/*
+ADSR
+- Dr. Hell (Xebra PS1 emu)
+- Accurate (!)
+- http://drhell.web.fc2.com
+
+
+Envelope increase
+0-47: (7 - (RATE & 3)) <<(11 - (RATE>> 2))
+48+: 7 - (RATE & 3) / (1 <<((RATE>> 2) - 11))
+
+Envelope decrease
+0-47: (-8 + (RATE & 3)) <<(11 - (RATE>> 2))
+48+: -8 + (RATE & 3) / (1 <<((RATE>> 2) - 11))
+
+
+Exponential increase
+0000-5FFF = (rate + 0)
+6000+ = (rate + 8)
+
+Exponential decrease
+(molecules (decrease) * level)>> 15
+
+-----------------------------------
+
+Fraction (release rate)
+1<<((4*32>>2)-11) = 1<<21
+
+
+Increase
+40 = (7-0)<<(11-10) = 7<<1 = 14
+41 = (7-1)<<(11-10) = 6<<1 = 12
+42 = (7-2)<<(11-10) = 5<<1 = 10
+43 = (7-3)<<(11-10) = 4<<1 = 8
+
+44 = (7-0)<<(11-11) = 7<<0 = 7
+45 = (7-1)<<(11-11) = 6<<0 = 6
+46 = (7-2)<<(11-11) = 5<<0 = 5
+47 = (7-3)<<(11-11) = 4<<0 = 4
+--
+48 = (7-0) / 1<<(12-11) = 7 / 2
+49 = (7-1) / 1<<(12-11) = 6 / 2
+50 = (7-2) / 1<<(12-11) = 5 / 2
+51 = (7-3) / 1<<(12-11) = 4 / 2
+
+52 = (7-0) / 1<<(13-11) = 7 / 4
+56 = (7-0) / 1<<(14-11) = 7 / 8
+60 = (7-0) / 1<<(15-11) = 7 / 16
+
+
+Decrease
+40 = (-8+0)<<(11-10) = -8<<1 = -16
+41 = (-8+1)<<(11-10) = -7<<1 = -14
+42 = (-8+2)<<(11-10) = -6<<1 = -12
+43 = (-8+3)<<(11-10) = -5<<1 = -10
+
+44 = (-8+0)<<(11-11) = -8<<0 = -8
+45 = (-8+1)<<(11-11) = -7<<0 = -7
+46 = (-8+2)<<(11-11) = -6<<0 = -6
+47 = (-8+3)<<(11-11) = -5<<0 = -5
+--
+48 = (-8+0) / 1<<(12-11) = -8 / 2
+49 = (-8+1) / 1<<(12-11) = -7 / 2
+50 = (-8+2) / 1<<(12-11) = -6 / 2
+51 = (-8+3) / 1<<(12-11) = -5 / 2
+*/
+
+
+static int RateTableAdd[128];
+static int RateTableAdd_f[128];
+static int RateTableSub[128];
+static int RateTableSub_f[128];
+static const int RateTable_denom = 1 << (( (4*32)>>2) - 11);
+
+void InitADSR(void) // INIT ADSR
+{
+ int lcv;
+
+ memset(RateTableAdd,0,sizeof(int)*128);
+ memset(RateTableAdd_f,0,sizeof(int)*128);
+ memset(RateTableSub,0,sizeof(int)*128);
+ memset(RateTableSub_f,0,sizeof(int)*128);
+
+
+ // Optimize table - Dr. Hell ADSR math
+ for( lcv=0; lcv<48; lcv++ ) {
+	 RateTableAdd[lcv] = (7 - (lcv&3)) << (11 - (lcv >> 2));
+	 RateTableSub[lcv] = (-8 + (lcv&3)) << (11 - (lcv >> 2));
+
+	 RateTableAdd_f[lcv] = 0;
+	 RateTableSub_f[lcv] = 0;
+ }
+
+ for( lcv=48; lcv<128; lcv++ ) {
+	 int denom;
+
+	 denom = 1 << ((lcv>>2) - 11);
+
+	 // whole
+	 RateTableAdd[lcv] = (7 - (lcv&3)) / denom;
+	 RateTableSub[lcv] = (-8 + (lcv&3)) / denom;
+
+	 // fraction
+	 RateTableAdd_f[lcv] = (7 - (lcv&3)) % denom;
+	 RateTableSub_f[lcv] = (-8 + (lcv&3)) % denom;
+
+	 RateTableAdd_f[lcv] *= RateTable_denom / denom;
+	 RateTableSub_f[lcv] *= RateTable_denom / denom;
+
+	 // goofy compiler - mod
+	 if( RateTableSub_f[lcv] > 0 ) RateTableSub_f[lcv] = -RateTableSub_f[lcv];
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static INLINE void StartADSR(int ch) // MIX ADSR
+{
+ s_chan[ch].ADSRX.lVolume=1; // and init some adsr vars
+ s_chan[ch].ADSRX.State=0;
+ s_chan[ch].ADSRX.EnvelopeVol=0;
+ s_chan[ch].ADSRX.EnvelopeVol_f=0;
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static INLINE int MixADSR(int ch) // MIX ADSR
+{ 
+ int EnvelopeVol = s_chan[ch].ADSRX.EnvelopeVol;
+ int EnvelopeVol_f = s_chan[ch].ADSRX.EnvelopeVol_f;
+
+
+ // dead volume - voice on
+ if( s_chan[ch].iSilent == 2 ) {
+	 if( s_chan[ch].bStop ) s_chan[ch].bOn = 0;
+	 return 0;
+ }
+
+
+ if(s_chan[ch].bStop) // should be stopped:
+ { // do release
+	 if(s_chan[ch].ADSRX.ReleaseModeExp)
+ EnvelopeVol += ( RateTableSub[ s_chan[ch].ADSRX.ReleaseRate * 4 ] * EnvelopeVol ) >> 15;
+ else
+ EnvelopeVol += RateTableSub[ s_chan[ch].ADSRX.ReleaseRate * 4 ];
+
+	 EnvelopeVol_f += RateTableSub_f[ s_chan[ch].ADSRX.ReleaseRate * 4 ];
+	 if( EnvelopeVol_f < 0 ) {
+		 EnvelopeVol_f += RateTable_denom;
+		 EnvelopeVol--;
+	 }
+
+ if(EnvelopeVol<0) 
+ {
+ EnvelopeVol=0;
+		 EnvelopeVol_f=0;
+ // don't stop if this chan can still cause irqs
+ if(!(spuCtrl&0x40) || (s_chan[ch].pCurr > pSpuIrq && s_chan[ch].pLoop > pSpuIrq))
+ s_chan[ch].bOn=0;
+		}
+
+ 
+ s_chan[ch].ADSRX.EnvelopeVol=EnvelopeVol;
+	 s_chan[ch].ADSRX.EnvelopeVol_f=EnvelopeVol_f;
+ s_chan[ch].ADSRX.lVolume=EnvelopeVol>>5;
+ return EnvelopeVol>>5;
+ }
+ else // not stopped yet?
+ {
+ if(s_chan[ch].ADSRX.State==0) // -> attack
+ {
+ if(s_chan[ch].ADSRX.AttackModeExp)
+ {
+ if(EnvelopeVol>=0x6000) {
+				EnvelopeVol+=RateTableAdd[s_chan[ch].ADSRX.AttackRate + 8];
+				EnvelopeVol_f += RateTableAdd_f[ s_chan[ch].ADSRX.AttackRate + 8];
+			 }
+			 else {
+				EnvelopeVol+=RateTableAdd[ s_chan[ch].ADSRX.AttackRate + 0];
+				EnvelopeVol_f += RateTableAdd_f[ s_chan[ch].ADSRX.AttackRate + 0];
+			 }
+ }
+		 else {
+			EnvelopeVol+=RateTableAdd[ s_chan[ch].ADSRX.AttackRate + 0];
+			EnvelopeVol_f += RateTableAdd_f[ s_chan[ch].ADSRX.AttackRate + 0];
+		 }
+
+		 if( EnvelopeVol_f >= RateTable_denom ) {
+			 EnvelopeVol_f -= RateTable_denom;
+			 EnvelopeVol++;
+		 }
+
+ if(EnvelopeVol>=0x8000) 
+ {
+ EnvelopeVol=0x7FFF;
+			 EnvelopeVol_f=RateTable_denom;
+ s_chan[ch].ADSRX.State=1;
+		 }
+
+		 s_chan[ch].ADSRX.EnvelopeVol=EnvelopeVol;
+		 s_chan[ch].ADSRX.EnvelopeVol_f=EnvelopeVol_f;
+		 s_chan[ch].ADSRX.lVolume=EnvelopeVol>>5;
+ return EnvelopeVol>>5;
+ }
+ //--------------------------------------------------//
+ if(s_chan[ch].ADSRX.State==1) // -> decay
+ {
+		 EnvelopeVol += ( RateTableSub[ s_chan[ch].ADSRX.DecayRate * 4 ] * EnvelopeVol ) >> 15;
+		 
+		 EnvelopeVol_f += RateTableSub_f[ s_chan[ch].ADSRX.DecayRate * 4 ];
+		 if( EnvelopeVol_f < 0 ) {
+			 EnvelopeVol_f += RateTable_denom;
+			 EnvelopeVol--;
+		 }
+
+ if(EnvelopeVol<0) {
+			 EnvelopeVol=0;
+			 EnvelopeVol_f=0;
+		 }
+
+		 // FF7 cursor - use Neill's 4-bit accuracy
+		 if( ((EnvelopeVol>>11)&0xf) <= s_chan[ch].ADSRX.SustainLevel)
+ {
+ s_chan[ch].ADSRX.State=2;
+		 }
+
+
+		 s_chan[ch].ADSRX.EnvelopeVol=EnvelopeVol;
+		 s_chan[ch].ADSRX.EnvelopeVol_f=EnvelopeVol_f;
+		 s_chan[ch].ADSRX.lVolume=EnvelopeVol>>5;
+ return EnvelopeVol>>5;
+ }
+ //--------------------------------------------------//
+ if(s_chan[ch].ADSRX.State==2) // -> sustain
+ {
+ if(s_chan[ch].ADSRX.SustainIncrease)
+ {
+ if(s_chan[ch].ADSRX.SustainModeExp)
+ {
+				 if(EnvelopeVol>=0x6000) {
+					EnvelopeVol+=RateTableAdd[ s_chan[ch].ADSRX.SustainRate + 8];
+					EnvelopeVol_f += RateTableAdd_f[ s_chan[ch].ADSRX.SustainRate + 8];
+				 }
+				 else {
+					EnvelopeVol+=RateTableAdd[ s_chan[ch].ADSRX.SustainRate + 0];
+					EnvelopeVol_f += RateTableAdd_f[ s_chan[ch].ADSRX.SustainRate + 0];
+				 }
+				}
+			 else {
+				EnvelopeVol+=RateTableAdd[ s_chan[ch].ADSRX.SustainRate + 0];
+				EnvelopeVol_f += RateTableAdd_f[ s_chan[ch].ADSRX.SustainRate + 0];
+			 }
+
+			 if( EnvelopeVol_f >= RateTable_denom ) {
+				 EnvelopeVol_f -= RateTable_denom;
+				 EnvelopeVol++;
+			 }
+
+ if(EnvelopeVol >= 0x8000) 
+ {
+ EnvelopeVol=0x7FFF;
+				 EnvelopeVol_f=RateTable_denom;
+ }
+ }
+ else
+ {
+ if(s_chan[ch].ADSRX.SustainModeExp)
+				EnvelopeVol += ( RateTableSub[ s_chan[ch].ADSRX.SustainRate ] * EnvelopeVol ) >> 15;
+			 else
+				EnvelopeVol += RateTableSub[ s_chan[ch].ADSRX.SustainRate ];
+			 
+			 EnvelopeVol_f += RateTableSub_f[ s_chan[ch].ADSRX.SustainRate ];
+			 if( EnvelopeVol_f < 0 ) {
+				 EnvelopeVol_f += RateTable_denom;
+				 EnvelopeVol--;
+			 }
+
+
+ if(EnvelopeVol<0) {
+ EnvelopeVol=0;
+				 EnvelopeVol_f=0;
+ }
+ }
+
+
+		 s_chan[ch].ADSRX.EnvelopeVol=EnvelopeVol;
+		 s_chan[ch].ADSRX.EnvelopeVol_f=EnvelopeVol_f;
+		 s_chan[ch].ADSRX.lVolume=EnvelopeVol>>5;
+ return EnvelopeVol>>5;
+ }
+ }
+ return 0;
+}
+
+#endif
+
+/*
+James Higgs ADSR investigations:
+
+PSX SPU Envelope Timings
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+First, here is an extract from doomed's SPU doc, which explains the basics
+of the SPU "volume envelope": 
+
+*** doomed doc extract start ***
+
+--------------------------------------------------------------------------
+Voices.
+--------------------------------------------------------------------------
+The SPU has 24 hardware voices. These voices can be used to reproduce sample
+data, noise or can be used as frequency modulator on the next voice.
+Each voice has it's own programmable ADSR envelope filter. The main volume
+can be programmed independently for left and right output.
+
+The ADSR envelope filter works as follows:
+Ar = Attack rate, which specifies the speed at which the volume increases
+ from zero to it's maximum value, as soon as the note on is given. The
+ slope can be set to lineair or exponential.
+Dr = Decay rate specifies the speed at which the volume decreases to the
+ sustain level. Decay is always decreasing exponentially.
+Sl = Sustain level, base level from which sustain starts.
+Sr = Sustain rate is the rate at which the volume of the sustained note
+ increases or decreases. This can be either lineair or exponential.
+Rr = Release rate is the rate at which the volume of the note decreases
+ as soon as the note off is given.
+
+ lvl |
+ ^ | /\Dr __
+ Sl _| _ / _ \__--- \
+ | / ---__ \ Rr
+ | /Ar Sr \ \
+ | / \\
+ |/___________________\________
+ ->time
+
+The overal volume can also be set to sweep up or down lineairly or
+exponentially from it's current value. This can be done seperately
+for left and right.
+
+Relevant SPU registers:
+-------------------------------------------------------------
+$1f801xx8 Attack/Decay/Sustain level
+bit |0f|0e 0d 0c 0b 0a 09 08|07 06 05 04|03 02 01 00|
+desc.|Am| Ar |Dr |Sl |
+
+Am 0 Attack mode Linear
+ 1 Exponential
+
+Ar 0-7f attack rate
+Dr 0-f decay rate
+Sl 0-f sustain level
+-------------------------------------------------------------
+$1f801xxa Sustain rate, Release Rate.
+bit |0f|0e|0d|0c 0b 0a 09 08 07 06|05|04 03 02 01 00|
+desc.|Sm|Sd| 0| Sr |Rm|Rr |
+
+Sm 0 sustain rate mode linear
+ 1 exponential
+Sd 0 sustain rate mode increase
+ 1 decrease
+Sr 0-7f Sustain Rate
+Rm 0 Linear decrease
+ 1 Exponential decrease
+Rr 0-1f Release Rate
+
+Note: decay mode is always Expontial decrease, and thus cannot
+be set.
+-------------------------------------------------------------
+$1f801xxc Current ADSR volume
+bit |0f 0e 0d 0c 0b 0a 09 08 07 06 05 04 03 02 01 00|
+desc.|ADSRvol |
+
+ADSRvol Returns the current envelope volume when
+ read.
+-- James' Note: return range: 0 -> 32767
+
+*** doomed doc extract end *** 
+
+By using a small PSX proggie to visualise the envelope as it was played,
+the following results for envelope timing were obtained:
+
+1. Attack rate value (linear mode)
+
+ Attack value range: 0 -> 127
+
+ Value | 48 | 52 | 56 | 60 | 64 | 68 | 72 | | 80 |
+ -----------------------------------------------------------------
+ Frames | 11 | 21 | 42 | 84 | 169| 338| 676| |2890|
+
+ Note: frames is no. of PAL frames to reach full volume (100%
+ amplitude)
+
+ Hmm, noticing that the time taken to reach full volume doubles
+ every time we add 4 to our attack value, we know the equation is
+ of form:
+ frames = k * 2 ^ (value / 4)
+
+ (You may ponder about envelope generator hardware at this point,
+ or maybe not... :)
+
+ By substituting some stuff and running some checks, we get:
+
+ k = 0.00257 (close enuf)
+
+ therefore,
+ frames = 0.00257 * 2 ^ (value / 4)
+ If you just happen to be writing an emulator, then you can probably
+ use an equation like:
+
+ %volume_increase_per_tick = 1 / frames
+
+
+ ------------------------------------
+ Pete:
+ ms=((1<<(value>>2))*514)/10000
+ ------------------------------------
+
+2. Decay rate value (only has log mode)
+
+ Decay value range: 0 -> 15
+
+ Value | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 |
+ ------------------------------------------------
+ frames | | | | | 6 | 12 | 24 | 47 |
+
+ Note: frames here is no. of PAL frames to decay to 50% volume.
+
+ formula: frames = k * 2 ^ (value)
+
+ Substituting, we get: k = 0.00146
+
+ Further info on logarithmic nature:
+ frames to decay to sustain level 3 = 3 * frames to decay to 
+ sustain level 9
+
+ Also no. of frames to 25% volume = roughly 1.85 * no. of frames to
+ 50% volume.
+
+ Frag it - just use linear approx.
+
+ ------------------------------------
+ Pete:
+ ms=((1<<value)*292)/10000
+ ------------------------------------
+
+
+3. Sustain rate value (linear mode)
+
+ Sustain rate range: 0 -> 127
+
+ Value | 48 | 52 | 56 | 60 | 64 | 68 | 72 |
+ -------------------------------------------
+ frames | 9 | 19 | 37 | 74 | 147| 293| 587|
+
+ Here, frames = no. of PAL frames for volume amplitude to go from 100%
+ to 0% (or vice-versa).
+
+ Same formula as for attack value, just a different value for k:
+
+ k = 0.00225
+
+ ie: frames = 0.00225 * 2 ^ (value / 4)
+
+ For emulation purposes:
+
+ %volume_increase_or_decrease_per_tick = 1 / frames
+
+ ------------------------------------
+ Pete:
+ ms=((1<<(value>>2))*450)/10000
+ ------------------------------------
+
+
+4. Release rate (linear mode)
+
+ Release rate range: 0 -> 31
+
+ Value | 13 | 14 | 15 | 16 | 17 |
+ ---------------------------------------------------------------
+ frames | 18 | 36 | 73 | 146| 292|
+
+ Here, frames = no. of PAL frames to decay from 100% vol to 0% vol
+ after "note-off" is triggered.
+
+ Formula: frames = k * 2 ^ (value)
+
+ And so: k = 0.00223
+
+ ------------------------------------
+ Pete:
+ ms=((1<<value)*446)/10000
+ ------------------------------------
+
+
+Other notes: 
+
+Log stuff not figured out. You may get some clues from the "Decay rate"
+stuff above. For emu purposes it may not be important - use linear
+approx.
+
+To get timings in millisecs, multiply frames by 20.
+
+
+
+- James Higgs 17/6/2000
+james7780@yahoo.com
+
+//---------------------------------------------------------------
+
+OLD adsr mixing according to james' rules... has to be called
+every one millisecond
+
+
+ long v,v2,lT,l1,l2,l3;
+
+ if(s_chan[ch].bStop) // psx wants to stop? -> release phase
+ {
+ if(s_chan[ch].ADSR.ReleaseVal!=0) // -> release not 0: do release (if 0: stop right now)
+ {
+ if(!s_chan[ch].ADSR.ReleaseVol) // --> release just started? set up the release stuff
+ {
+ s_chan[ch].ADSR.ReleaseStartTime=s_chan[ch].ADSR.lTime;
+ s_chan[ch].ADSR.ReleaseVol=s_chan[ch].ADSR.lVolume;
+ s_chan[ch].ADSR.ReleaseTime = // --> calc how long does it take to reach the wanted sus level
+ (s_chan[ch].ADSR.ReleaseTime*
+ s_chan[ch].ADSR.ReleaseVol)/1024;
+ }
+ // -> NO release exp mode used (yet)
+ v=s_chan[ch].ADSR.ReleaseVol; // -> get last volume
+ lT=s_chan[ch].ADSR.lTime- // -> how much time is past?
+ s_chan[ch].ADSR.ReleaseStartTime;
+ l1=s_chan[ch].ADSR.ReleaseTime;
+ 
+ if(lT<l1) // -> we still have to release
+ {
+ v=v-((v*lT)/l1); // --> calc new volume
+ }
+ else // -> release is over: now really stop that sample
+ {v=0;s_chan[ch].bOn=0;s_chan[ch].ADSR.ReleaseVol=0;s_chan[ch].bNoise=0;}
+ }
+ else // -> release IS 0: release at once
+ {
+ v=0;s_chan[ch].bOn=0;s_chan[ch].ADSR.ReleaseVol=0;s_chan[ch].bNoise=0;
+ }
+ }
+ else 
+ {//--------------------------------------------------// not in release phase:
+ v=1024;
+ lT=s_chan[ch].ADSR.lTime;
+ l1=s_chan[ch].ADSR.AttackTime;
+ 
+ if(lT<l1) // attack
+ { // no exp mode used (yet)
+// if(s_chan[ch].ADSR.AttackModeExp)
+// {
+// v=(v*lT)/l1;
+// }
+// else
+ {
+ v=(v*lT)/l1;
+ }
+ if(v==0) v=1;
+ }
+ else // decay
+ { // should be exp, but who cares? ;)
+ l2=s_chan[ch].ADSR.DecayTime;
+ v2=s_chan[ch].ADSR.SustainLevel;
+
+ lT-=l1;
+ if(lT<l2)
+ {
+ v-=(((v-v2)*lT)/l2);
+ }
+ else // sustain
+ { // no exp mode used (yet)
+ l3=s_chan[ch].ADSR.SustainTime;
+ lT-=l2;
+ if(s_chan[ch].ADSR.SustainModeDec>0)
+ {
+ if(l3!=0) v2+=((v-v2)*lT)/l3;
+ else v2=v;
+ }
+ else
+ {
+ if(l3!=0) v2-=(v2*lT)/l3;
+ else v2=v;
+ }
+
+ if(v2>v) v2=v;
+ if(v2<=0) {v2=0;s_chan[ch].bOn=0;s_chan[ch].ADSR.ReleaseVol=0;s_chan[ch].bNoise=0;}
+
+ v=v2;
+ }
+ }
+ }
+
+ //----------------------------------------------------// 
+ // ok, done for this channel, so increase time
+
+ s_chan[ch].ADSR.lTime+=1; // 1 = 1.020408f ms; 
+
+ if(v>1024) v=1024; // adjust volume
+ if(v<0) v=0; 
+ s_chan[ch].ADSR.lVolume=v; // store act volume
+
+ return v; // return the volume factor
+*/
+
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+
+
+/*
+-----------------------------------------------------------------------------
+Neill Corlett
+Playstation SPU envelope timing notes
+-----------------------------------------------------------------------------
+
+This is preliminary. This may be wrong. But the model described herein fits
+all of my experimental data, and it's just simple enough to sound right.
+
+ADSR envelope level ranges from 0x00000000 to 0x7FFFFFFF internally.
+The value returned by channel reg 0xC is (envelope_level>>16).
+
+Each sample, an increment or decrement value will be added to or
+subtracted from this envelope level.
+
+Create the rate log table. The values double every 4 entries.
+ entry #0 = 4
+
+ 4, 5, 6, 7,
+ 8,10,12,14,
+ 16,20,24,28, ...
+
+ entry #40 = 4096...
+ entry #44 = 8192...
+ entry #48 = 16384...
+ entry #52 = 32768...
+ entry #56 = 65536...
+
+increments and decrements are in terms of ratelogtable[n]
+n may exceed the table bounds (plan on n being between -32 and 127).
+table values are all clipped between 0x00000000 and 0x3FFFFFFF
+
+when you "voice on", the envelope is always fully reset.
+(yes, it may click. the real thing does this too.)
+
+envelope level begins at zero.
+
+each state happens for at least 1 cycle
+(transitions are not instantaneous)
+this may result in some oddness: if the decay rate is uberfast, it will cut
+the envelope from full down to half in one sample, potentially skipping over
+the sustain level
+
+ATTACK
+------
+- if the envelope level has overflowed past the max, clip to 0x7FFFFFFF and
+ proceed to DECAY.
+
+Linear attack mode:
+- line extends upward to 0x7FFFFFFF
+- increment per sample is ratelogtable[(Ar^0x7F)-0x10]
+
+Logarithmic attack mode:
+if envelope_level < 0x60000000:
+ - line extends upward to 0x60000000
+ - increment per sample is ratelogtable[(Ar^0x7F)-0x10]
+else:
+ - line extends upward to 0x7FFFFFFF
+ - increment per sample is ratelogtable[(Ar^0x7F)-0x18]
+
+DECAY
+-----
+- if ((envelope_level>>27)&0xF) <= Sl, proceed to SUSTAIN.
+ Do not clip to the sustain level.
+- current line ends at (envelope_level & 0x07FFFFFF)
+- decrement per sample depends on (envelope_level>>28)&0x7
+ 0: ratelogtable[(4*(Dr^0x1F))-0x18+0]
+ 1: ratelogtable[(4*(Dr^0x1F))-0x18+4]
+ 2: ratelogtable[(4*(Dr^0x1F))-0x18+6]
+ 3: ratelogtable[(4*(Dr^0x1F))-0x18+8]
+ 4: ratelogtable[(4*(Dr^0x1F))-0x18+9]
+ 5: ratelogtable[(4*(Dr^0x1F))-0x18+10]
+ 6: ratelogtable[(4*(Dr^0x1F))-0x18+11]
+ 7: ratelogtable[(4*(Dr^0x1F))-0x18+12]
+ (note that this is the same as the release rate formula, except that
+ decay rates 10-1F aren't possible... those would be slower in theory)
+
+SUSTAIN
+-------
+- no terminating condition except for voice off
+- Sd=0 (increase) behavior is identical to ATTACK for both log and linear.
+- Sd=1 (decrease) behavior:
+Linear sustain decrease:
+- line extends to 0x00000000
+- decrement per sample is ratelogtable[(Sr^0x7F)-0x0F]
+Logarithmic sustain decrease:
+- current line ends at (envelope_level & 0x07FFFFFF)
+- decrement per sample depends on (envelope_level>>28)&0x7
+ 0: ratelogtable[(Sr^0x7F)-0x1B+0]
+ 1: ratelogtable[(Sr^0x7F)-0x1B+4]
+ 2: ratelogtable[(Sr^0x7F)-0x1B+6]
+ 3: ratelogtable[(Sr^0x7F)-0x1B+8]
+ 4: ratelogtable[(Sr^0x7F)-0x1B+9]
+ 5: ratelogtable[(Sr^0x7F)-0x1B+10]
+ 6: ratelogtable[(Sr^0x7F)-0x1B+11]
+ 7: ratelogtable[(Sr^0x7F)-0x1B+12]
+
+RELEASE
+-------
+- if the envelope level has overflowed to negative, clip to 0 and QUIT.
+
+Linear release mode:
+- line extends to 0x00000000
+- decrement per sample is ratelogtable[(4*(Rr^0x1F))-0x0C]
+
+Logarithmic release mode:
+- line extends to (envelope_level & 0x0FFFFFFF)
+- decrement per sample depends on (envelope_level>>28)&0x7
+ 0: ratelogtable[(4*(Rr^0x1F))-0x18+0]
+ 1: ratelogtable[(4*(Rr^0x1F))-0x18+4]
+ 2: ratelogtable[(4*(Rr^0x1F))-0x18+6]
+ 3: ratelogtable[(4*(Rr^0x1F))-0x18+8]
+ 4: ratelogtable[(4*(Rr^0x1F))-0x18+9]
+ 5: ratelogtable[(4*(Rr^0x1F))-0x18+10]
+ 6: ratelogtable[(4*(Rr^0x1F))-0x18+11]
+ 7: ratelogtable[(4*(Rr^0x1F))-0x18+12]
+
+-----------------------------------------------------------------------------
+*/
+

pcsxr-1.9.92.tar.bz2/plugins/dfsound/adsr.h -> pcsxr-1.9.93.tar.bz2/plugins/dfsound/adsr.h Changed

@@ -1,19 +1,19 @@
-/***************************************************************************
-                           adsr.h  -  description
-                             -------------------
-    begin                : Wed May 15 2002
-    copyright            : (C) 2002 by Pete Bernert
-    email                : BlackDove@addcom.de
- ***************************************************************************/
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version. See also the license.txt file for *
- *   additional informations.                                              *
- *                                                                         *
- ***************************************************************************/
-
-INLINE void StartADSR(int ch);
-INLINE int  MixADSR(int ch);
+/***************************************************************************
+                           adsr.h  -  description
+                             -------------------
+    begin                : Wed May 15 2002
+    copyright            : (C) 2002 by Pete Bernert
+    email                : BlackDove@addcom.de
+ ***************************************************************************/
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+static INLINE void StartADSR(int ch);
+static INLINE int  MixADSR(int ch);

pcsxr-1.9.92.tar.bz2/plugins/dfsound/cfg.c -> pcsxr-1.9.93.tar.bz2/plugins/dfsound/cfg.c Changed

@@ -1,167 +1,151 @@
-/***************************************************************************
- cfg.c - description
- -------------------
- begin : Wed May 15 2002
- copyright : (C) 2002 by Pete Bernert
- email : BlackDove@addcom.de
- ***************************************************************************/
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. See also the license.txt file for *
- * additional informations. *
- * *
- ***************************************************************************/
-
-#include "stdafx.h"
-
-#define _IN_CFG
-
-#include "externals.h"
-
-////////////////////////////////////////////////////////////////////////
-// LINUX CONFIG/ABOUT HANDLING
-////////////////////////////////////////////////////////////////////////
-
-#include <unistd.h>
-
-////////////////////////////////////////////////////////////////////////
-// START EXTERNAL CFG TOOL
-////////////////////////////////////////////////////////////////////////
-
-void StartCfgTool(char * pCmdLine)
-{
- FILE * cf;
- char filename[255];
-
- strcpy(filename,"cfgDFSound");
- cf=fopen(filename,"rb");
- if(cf!=NULL)
- {
- fclose(cf);
- if(fork()==0)
- {
- execl("./cfgDFSound","cfgDFSound",pCmdLine,NULL);
- exit(0);
- }
- }
- else
- {
- strcpy(filename,"cfg/cfgDFSound");
- cf=fopen(filename,"rb");
- if(cf!=NULL)
- {
- fclose(cf);
- if(fork()==0)
- {
- chdir("cfg");
- execl("./cfgDFSound","cfgDFSound",pCmdLine,NULL);
- exit(0);
- }
- }
- else
- {
- sprintf(filename,"%s/cfgDFSound",getenv("HOME"));
- cf=fopen(filename,"rb");
- if(cf!=NULL)
- {
- fclose(cf);
- if(fork()==0)
- {
- chdir(getenv("HOME"));
- execl("./cfgDFSound","cfgDFSound",pCmdLine,NULL);
- exit(0);
- }
- }
- else printf("Sound error: cfgDFSound not found!\n");
- }
- }
-}
-
-/////////////////////////////////////////////////////////
-// READ LINUX CONFIG FILE
-/////////////////////////////////////////////////////////
-
-void ReadConfigFile(void)
-{
- FILE *in;char t[256];int len;
- char * pB, * p;
-
- strcpy(t,"dfsound.cfg");
- in = fopen(t,"rb"); 
- if(!in) 
- {
- strcpy(t,"cfg/dfsound.cfg");
- in = fopen(t,"rb"); 
- if(!in) 
- {
- sprintf(t,"%s/dfsound.cfg",getenv("HOME")); 
- in = fopen(t,"rb"); 
- if(!in) return;
- }
- }
-
- pB = (char *)malloc(32767);
- memset(pB,0,32767);
-
- len = fread(pB, 1, 32767, in);
- fclose(in);
-
- strcpy(t,"\nVolume");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) iVolume=4-atoi(p+len);
- if(iVolume<1) iVolume=1;
- if(iVolume>4) iVolume=4;
-
- strcpy(t,"\nXAPitch");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) iXAPitch=atoi(p+len);
- if(iXAPitch<0) iXAPitch=0;
- if(iXAPitch>1) iXAPitch=1;
-
- strcpy(t,"\nHighCompMode");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;} 
- if(p) iUseTimer=atoi(p+len); 
- if(iUseTimer<0) iUseTimer=0; 
- // note: timer mode 1 (win time events) is not supported
- // in linux. But timer mode 2 (spuupdate) is safe to use.
- if(iUseTimer) iUseTimer=2; 
-
- strcpy(t,"\nSPUIRQWait");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;} 
- if(p) iSPUIRQWait=atoi(p+len); 
- if(iSPUIRQWait<0) iSPUIRQWait=0; 
- if(iSPUIRQWait>1) iSPUIRQWait=1; 
-
- strcpy(t,"\nUseReverb");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;} 
- if(p) iUseReverb=atoi(p+len); 
- if(iUseReverb<0) iUseReverb=0; 
- if(iUseReverb>2) iUseReverb=2; 
-
- strcpy(t,"\nUseInterpolation");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;} 
- if(p) iUseInterpolation=atoi(p+len); 
- if(iUseInterpolation<0) iUseInterpolation=0; 
- if(iUseInterpolation>3) iUseInterpolation=3; 
-
- strcpy(t,"\nDisStereo");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;} 
- if(p) iDisStereo=atoi(p+len); 
- if(iDisStereo<0) iDisStereo=0; 
- if(iDisStereo>1) iDisStereo=1; 
-
- free(pB);
-}
-
-/////////////////////////////////////////////////////////
-// READ CONFIG called by spu funcs
-/////////////////////////////////////////////////////////
-
-void ReadConfig(void)
-{
- iVolume=2;
- iXAPitch=0;
- iSPUIRQWait=1;
- iUseTimer=2;
- iUseReverb=2;
- iUseInterpolation=2;
- iDisStereo=0;
-
- ReadConfigFile();
-}
+/***************************************************************************
+ cfg.c - description
+ -------------------
+ begin : Wed May 15 2002
+ copyright : (C) 2002 by Pete Bernert
+ email : BlackDove@addcom.de
+ ***************************************************************************/
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+#include "stdafx.h"
+
+#define _IN_CFG
+
+#include "externals.h"
+
+////////////////////////////////////////////////////////////////////////
+// LINUX CONFIG/ABOUT HANDLING
+////////////////////////////////////////////////////////////////////////
+
+#include <unistd.h>
+
+////////////////////////////////////////////////////////////////////////
+// START EXTERNAL CFG TOOL
+////////////////////////////////////////////////////////////////////////
+
+void StartCfgTool(char * pCmdLine)
+{
+ FILE * cf;
+ char filename[255];
+
+ strcpy(filename,"cfgDFSound");
+ cf=fopen(filename,"rb");
+ if(cf!=NULL)
+ {
+ int pid;
+ fclose(cf);
+ pid=fork();
+ if(pid==0)
+ {
+ if(fork()==0)
+ {
+ execl("./cfgDFSound","cfgDFSound",pCmdLine,NULL);
+ }
+ exit(0);
+ }
+ else if(pid>0)
+ {
+ waitpid(pid,NULL,0);
+ }
+ }
+}
+
+/////////////////////////////////////////////////////////
+// READ LINUX CONFIG FILE
+/////////////////////////////////////////////////////////
+
+void ReadConfigFile(void)
+{
+ FILE *in;char t[256];int len;
+ char * pB, * p;
+
+ strcpy(t,"dfsound.cfg");
+ in = fopen(t,"rb"); 
+ if(!in) 
+ {
+ strcpy(t,"cfg/dfsound.cfg");
+ in = fopen(t,"rb"); 
+ if(!in) 
+ {
+ sprintf(t,"%s/dfsound.cfg",getenv("HOME")); 
+ in = fopen(t,"rb"); 
+ if(!in) return;
+ }
+ }
+
+ pB = (char *)malloc(32767);
+ memset(pB,0,32767);
+
+ len = fread(pB, 1, 32767, in);
+ fclose(in);
+
+ strcpy(t,"\nVolume");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+ if(p) iVolume=4-atoi(p+len);
+ if(iVolume<1) iVolume=1;
+ if(iVolume>5) iVolume=5;
+
+ strcpy(t,"\nXAPitch");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+ if(p) iXAPitch=atoi(p+len);
+ if(iXAPitch<0) iXAPitch=0;
+ if(iXAPitch>1) iXAPitch=1;
+
+ strcpy(t,"\nHighCompMode");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;} 
+ if(p) iUseTimer=atoi(p+len); 
+ if(iUseTimer<0) iUseTimer=0; 
+ // note: timer mode 1 (win time events) is not supported
+ // in linux. But timer mode 2 (spuupdate) is safe to use.
+ if(iUseTimer) iUseTimer=2; 
+
+ strcpy(t,"\nSPUIRQWait");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;} 
+ if(p) iSPUIRQWait=atoi(p+len); 
+ if(iSPUIRQWait<0) iSPUIRQWait=0; 
+ if(iSPUIRQWait>1) iSPUIRQWait=1; 
+
+ strcpy(t,"\nUseReverb");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;} 
+ if(p) iUseReverb=atoi(p+len); 
+ if(iUseReverb<0) iUseReverb=0; 
+ if(iUseReverb>2) iUseReverb=2; 
+
+ strcpy(t,"\nUseInterpolation");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;} 
+ if(p) iUseInterpolation=atoi(p+len); 
+ if(iUseInterpolation<0) iUseInterpolation=0; 
+ if(iUseInterpolation>3) iUseInterpolation=3; 
+
+ strcpy(t,"\nDisStereo");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;} 
+ if(p) iDisStereo=atoi(p+len); 
+ if(iDisStereo<0) iDisStereo=0; 
+ if(iDisStereo>1) iDisStereo=1; 
+
+ strcpy(t,"\nFreqResponse");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;} 
+ if(p) iFreqResponse=atoi(p+len); 
+ if(iFreqResponse<0) iFreqResponse=0; 
+ if(iFreqResponse>1) iFreqResponse=1; 
+
+ free(pB);
+}
+
+/////////////////////////////////////////////////////////
+// READ CONFIG called by spu funcs
+/////////////////////////////////////////////////////////
+
+void ReadConfig(void)
+{
+ iVolume=2;
+ iXAPitch=0;
+ iSPUIRQWait=1;
+ iUseTimer=2;
+ iUseReverb=2;
+ iUseInterpolation=2;
+ iDisStereo=0;
+ iFreqResponse=0;
+
+ ReadConfigFile();
+}

pcsxr-1.9.92.tar.bz2/plugins/dfsound/cfg.h -> pcsxr-1.9.93.tar.bz2/plugins/dfsound/cfg.h Changed

@@ -1,19 +1,25 @@
-/***************************************************************************
-                            cfg.h  -  description
-                             -------------------
-    begin                : Wed May 15 2002
-    copyright            : (C) 2002 by Pete Bernert
-    email                : BlackDove@addcom.de
- ***************************************************************************/
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version. See also the license.txt file for *
- *   additional informations.                                              *
- *                                                                         *
- ***************************************************************************/
-
-void ReadConfig(void);
-void StartCfgTool(char * pCmdLine);
+/***************************************************************************
+                            cfg.h  -  description
+                             -------------------
+    begin                : Wed May 15 2002
+    copyright            : (C) 2002 by Pete Bernert
+    email                : BlackDove@addcom.de
+ ***************************************************************************/
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+void ReadConfig(void);
+
+#ifdef _WINDOWS
+BOOL CALLBACK AboutDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam);
+BOOL CALLBACK DSoundDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam);
+#else
+void StartCfgTool(char * pCmdLine);
+#endif

pcsxr-1.9.92.tar.bz2/plugins/dfsound/dma.c -> pcsxr-1.9.93.tar.bz2/plugins/dfsound/dma.c Changed

@@ -1,97 +1,122 @@
-/***************************************************************************
- dma.c - description
- -------------------
- begin : Wed May 15 2002
- copyright : (C) 2002 by Pete Bernert
- email : BlackDove@addcom.de
- ***************************************************************************/
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. See also the license.txt file for *
- * additional informations. *
- * *
- ***************************************************************************/
-
-#include "stdafx.h"
-
-#define _IN_DMA
-
-#include "externals.h"
-
-////////////////////////////////////////////////////////////////////////
-// READ DMA (one value)
-////////////////////////////////////////////////////////////////////////
-
-unsigned short CALLBACK SPUreadDMA(void)
-{
- unsigned short s=spuMem[spuAddr>>1];
- spuAddr+=2;
- if(spuAddr>0x7ffff) spuAddr=0;
-
- iSpuAsyncWait=0;
-
- return s;
-}
-
-////////////////////////////////////////////////////////////////////////
-// READ DMA (many values)
-////////////////////////////////////////////////////////////////////////
-
-void CALLBACK SPUreadDMAMem(unsigned short * pusPSXMem,int iSize)
-{
- int i;
-
- for(i=0;i<iSize;i++)
- {
- *pusPSXMem++=spuMem[spuAddr>>1]; // spu addr got by writeregister
- spuAddr+=2; // inc spu addr
- if(spuAddr>0x7ffff) spuAddr=0; // wrap
- }
-
- iSpuAsyncWait=0;
-}
-
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-
-// to investigate: do sound data updates by writedma affect spu
-// irqs? Will an irq be triggered, if new data is written to
-// the memory irq address?
-
-////////////////////////////////////////////////////////////////////////
-// WRITE DMA (one value)
-////////////////////////////////////////////////////////////////////////
- 
-void CALLBACK SPUwriteDMA(unsigned short val)
-{
- spuMem[spuAddr>>1] = val; // spu addr got by writeregister
-
- spuAddr+=2; // inc spu addr
- if(spuAddr>0x7ffff) spuAddr=0; // wrap
-
- iSpuAsyncWait=0;
-}
-
-////////////////////////////////////////////////////////////////////////
-// WRITE DMA (many values)
-////////////////////////////////////////////////////////////////////////
-
-void CALLBACK SPUwriteDMAMem(unsigned short * pusPSXMem,int iSize)
-{
- int i;
-
- for(i=0;i<iSize;i++)
- {
- spuMem[spuAddr>>1] = *pusPSXMem++; // spu addr got by writeregister
- spuAddr+=2; // inc spu addr
- if(spuAddr>0x7ffff) spuAddr=0; // wrap
- }
- 
- iSpuAsyncWait=0;
-}
-
-////////////////////////////////////////////////////////////////////////
+/***************************************************************************
+ dma.c - description
+ -------------------
+ begin : Wed May 15 2002
+ copyright : (C) 2002 by Pete Bernert
+ email : BlackDove@addcom.de
+ ***************************************************************************/
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+#include "stdafx.h"
+
+#define _IN_DMA
+
+#include "externals.h"
+#include "registers.h"
+
+////////////////////////////////////////////////////////////////////////
+// READ DMA (one value)
+////////////////////////////////////////////////////////////////////////
+
+unsigned short CALLBACK SPUreadDMA(void)
+{
+ unsigned short s=spuMem[spuAddr>>1];
+ spuAddr+=2;
+ if(spuAddr>0x7ffff) spuAddr=0;
+
+ iSpuAsyncWait=0;
+
+ return s;
+}
+
+////////////////////////////////////////////////////////////////////////
+// READ DMA (many values)
+////////////////////////////////////////////////////////////////////////
+
+void CALLBACK SPUreadDMAMem(unsigned short * pusPSXMem,int iSize)
+{
+ int i;
+
+ spuStat |= STAT_DATA_BUSY;
+
+ for(i=0;i<iSize;i++)
+ {
+	 Check_IRQ( spuAddr, 0 );
+
+		
+	 *pusPSXMem++=spuMem[spuAddr>>1]; // spu addr got by writeregister
+ spuAddr+=2; // inc spu addr
+
+	 // guess based on Vib Ribbon (below)
+ if(spuAddr>0x7ffff) break;
+ }
+
+ iSpuAsyncWait=0;
+
+ spuStat &= ~STAT_DATA_BUSY;
+ spuStat &= ~STAT_DMA_NON;
+ spuStat &= ~STAT_DMA_W;
+ spuStat |= STAT_DMA_R;
+}
+
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+
+// to investigate: do sound data updates by writedma affect spu
+// irqs? Will an irq be triggered, if new data is written to
+// the memory irq address?
+
+////////////////////////////////////////////////////////////////////////
+// WRITE DMA (one value)
+////////////////////////////////////////////////////////////////////////
+ 
+void CALLBACK SPUwriteDMA(unsigned short val)
+{
+ spuMem[spuAddr>>1] = val; // spu addr got by writeregister
+
+ spuAddr+=2; // inc spu addr
+ if(spuAddr>0x7ffff) spuAddr=0; // wrap
+
+ iSpuAsyncWait=0;
+}
+
+////////////////////////////////////////////////////////////////////////
+// WRITE DMA (many values)
+////////////////////////////////////////////////////////////////////////
+
+void CALLBACK SPUwriteDMAMem(unsigned short * pusPSXMem,int iSize)
+{
+ int i;
+
+ spuStat |= STAT_DATA_BUSY;
+
+ for(i=0;i<iSize;i++)
+ {
+	 Check_IRQ( spuAddr, 0 );
+
+	 spuMem[spuAddr>>1] = *pusPSXMem++; // spu addr got by writeregister
+ spuAddr+=2; // inc spu addr
+
+	 // Vib Ribbon - stop transfer (reverb playback)
+ if(spuAddr>0x7ffff) break;
+ }
+ 
+ iSpuAsyncWait=0;
+
+
+ spuStat &= ~STAT_DATA_BUSY;
+ spuStat &= ~STAT_DMA_NON;
+ spuStat &= ~STAT_DMA_R;
+ spuStat |= STAT_DMA_W;
+}
+
+////////////////////////////////////////////////////////////////////////

pcsxr-1.9.92.tar.bz2/plugins/dfsound/dma.h -> pcsxr-1.9.93.tar.bz2/plugins/dfsound/dma.h Changed

@@ -1,31 +1,31 @@
-/***************************************************************************
-                            dma.h  -  description
-                             -------------------
-    begin                : Wed May 15 2002
-    copyright            : (C) 2002 by Pete Bernert
-    email                : BlackDove@addcom.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version. See also the license.txt file for *
- *   additional informations.                                              *
- *                                                                         *
- ***************************************************************************/
-
-//*************************************************************************//
-// History of changes:
-//
-// 2002/05/15 - Pete
-// - generic cleanup for the Peops release
-//
-//*************************************************************************//
-
-
-unsigned short CALLBACK SPUreadDMA(void);
-void CALLBACK SPUreadDMAMem(unsigned short * pusPSXMem,int iSize);
-void CALLBACK SPUwriteDMA(unsigned short val);
-void CALLBACK SPUwriteDMAMem(unsigned short * pusPSXMem,int iSize);
+/***************************************************************************
+                            dma.h  -  description
+                             -------------------
+    begin                : Wed May 15 2002
+    copyright            : (C) 2002 by Pete Bernert
+    email                : BlackDove@addcom.de
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+//*************************************************************************//
+// History of changes:
+//
+// 2002/05/15 - Pete
+// - generic cleanup for the Peops release
+//
+//*************************************************************************//
+
+
+unsigned short CALLBACK SPUreadDMA(void);
+void CALLBACK SPUreadDMAMem(unsigned short * pusPSXMem,int iSize);
+void CALLBACK SPUwriteDMA(unsigned short val);
+void CALLBACK SPUwriteDMAMem(unsigned short * pusPSXMem,int iSize);

pcsxr-1.9.92.tar.bz2/plugins/dfsound/dsoundoss.h -> pcsxr-1.9.93.tar.bz2/plugins/dfsound/dsoundoss.h Changed

pcsxr-1.9.93.tar.bz2/plugins/dfsound/externals.c Added

@@ -0,0 +1,26 @@
+/***************************************************************************
+ externals.c - description
+ -------------------
+ begin : Wed May 15 2002
+ copyright : (C) 2002 by Pete Bernert
+ email : BlackDove@addcom.de
+ ***************************************************************************/
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+#include <stdint.h>
+
+// 15-bit value + 1-sign
+int CLAMP16(int x) {
+	if(x > 32767) x = 32767;
+	else if(x < -32768) x = -32768;
+
+	return x;
+}

pcsxr-1.9.92.tar.bz2/plugins/dfsound/externals.h -> pcsxr-1.9.93.tar.bz2/plugins/dfsound/externals.h Changed

@@ -1,286 +1,367 @@
-/***************************************************************************
- externals.h - description
- -------------------
- begin : Wed May 15 2002
- copyright : (C) 2002 by Pete Bernert
- email : BlackDove@addcom.de
- ***************************************************************************/
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. See also the license.txt file for *
- * additional informations. *
- * *
- ***************************************************************************/
-
-#include <stdint.h>
-
-/////////////////////////////////////////////////////////
-// generic defines
-/////////////////////////////////////////////////////////
-
-#define PSE_LT_SPU 4
-#define PSE_SPU_ERR_SUCCESS 0
-#define PSE_SPU_ERR -60
-#define PSE_SPU_ERR_NOTCONFIGURED PSE_SPU_ERR - 1
-#define PSE_SPU_ERR_INIT PSE_SPU_ERR - 2
-#ifndef max
-#define max(a,b) (((a) > (b)) ? (a) : (b))
-#define min(a,b) (((a) < (b)) ? (a) : (b))
-#endif
-
-////////////////////////////////////////////////////////////////////////
-// spu defines
-////////////////////////////////////////////////////////////////////////
-
-// sound buffer sizes
-// 400 ms complete sound buffer
-#define SOUNDSIZE 70560
-// 137 ms test buffer... if less than that is buffered, a new upload will happen
-#define TESTSIZE 24192
-
-// num of channels
-#define MAXCHAN 24
-
-// ~ 1 ms of data
-#define NSSIZE 45
-
-///////////////////////////////////////////////////////////
-// struct defines
-///////////////////////////////////////////////////////////
-
-// ADSR INFOS PER CHANNEL
-typedef struct
-{
- int AttackModeExp;
- long AttackTime;
- long DecayTime;
- long SustainLevel;
- int SustainModeExp;
- long SustainModeDec;
- long SustainTime;
- int ReleaseModeExp;
- unsigned long ReleaseVal;
- long ReleaseTime;
- long ReleaseStartTime; 
- long ReleaseVol; 
- long lTime;
- long lVolume;
-} ADSRInfo;
-
-typedef struct
-{
- int State;
- int AttackModeExp;
- int AttackRate;
- int DecayRate;
- int SustainLevel;
- int SustainModeExp;
- int SustainIncrease;
- int SustainRate;
- int ReleaseModeExp;
- int ReleaseRate;
- int EnvelopeVol;
- long lVolume;
- long lDummy1;
- long lDummy2;
-} ADSRInfoEx;
- 
-///////////////////////////////////////////////////////////
-
-// Tmp Flags
-
-// used for debug channel muting
-#define FLAG_MUTE 1
-
-// used for simple interpolation
-#define FLAG_IPOL0 2
-#define FLAG_IPOL1 4
-
-///////////////////////////////////////////////////////////
-
-// MAIN CHANNEL STRUCT
-typedef struct
-{
- // no mutexes used anymore... don't need them to sync access
- //HANDLE hMutex;
-
- int bNew; // start flag
-
- int iSBPos; // mixing stuff
- int spos;
- int sinc;
- int SB[32+32]; // Pete added another 32 dwords in 1.6 ... prevents overflow issues with gaussian/cubic interpolation (thanx xodnizel!), and can be used for even better interpolations, eh? :)
- int sval;
-
- unsigned char * pStart; // start ptr into sound mem
- unsigned char * pCurr; // current pos in sound mem
- unsigned char * pLoop; // loop ptr in sound mem
-
- int bOn; // is channel active (sample playing?)
- int bStop; // is channel stopped (sample _can_ still be playing, ADSR Release phase)
- int bReverb; // can we do reverb on this channel? must have ctrl register bit, to get active
- int iActFreq; // current psx pitch
- int iUsedFreq; // current pc pitch
- int iLeftVolume; // left volume
- int iLeftVolRaw; // left psx volume value
- int bIgnoreLoop; // ignore loop bit, if an external loop address is used
- int iMute; // mute mode
- int iRightVolume; // right volume
- int iRightVolRaw; // right psx volume value
- int iRawPitch; // raw pitch (0...3fff)
- int iIrqDone; // debug irq done flag
- int s_1; // last decoding infos
- int s_2;
- int bRVBActive; // reverb active flag
- int iRVBOffset; // reverb offset
- int iRVBRepeat; // reverb repeat
- int bNoise; // noise active flag
- int bFMod; // freq mod (0=off, 1=sound channel, 2=freq channel)
- int iRVBNum; // another reverb helper
- int iOldNoise; // old noise val for this channel 
- ADSRInfo ADSR; // active ADSR settings
- ADSRInfoEx ADSRX; // next ADSR settings (will be moved to active on sample start)
-} SPUCHAN;
-
-///////////////////////////////////////////////////////////
-
-typedef struct
-{
- int StartAddr; // reverb area start addr in samples
- int CurrAddr; // reverb area curr addr in samples
-
- int VolLeft;
- int VolRight;
- int iLastRVBLeft;
- int iLastRVBRight;
- int iRVBLeft;
- int iRVBRight;
-
- int FB_SRC_A; // (offset)
- int FB_SRC_B; // (offset)
- int IIR_ALPHA; // (coef.)
- int ACC_COEF_A; // (coef.)
- int ACC_COEF_B; // (coef.)
- int ACC_COEF_C; // (coef.)
- int ACC_COEF_D; // (coef.)
- int IIR_COEF; // (coef.)
- int FB_ALPHA; // (coef.)
- int FB_X; // (coef.)
- int IIR_DEST_A0; // (offset)
- int IIR_DEST_A1; // (offset)
- int ACC_SRC_A0; // (offset)
- int ACC_SRC_A1; // (offset)
- int ACC_SRC_B0; // (offset)
- int ACC_SRC_B1; // (offset)
- int IIR_SRC_A0; // (offset)
- int IIR_SRC_A1; // (offset)
- int IIR_DEST_B0; // (offset)
- int IIR_DEST_B1; // (offset)
- int ACC_SRC_C0; // (offset)
- int ACC_SRC_C1; // (offset)
- int ACC_SRC_D0; // (offset)
- int ACC_SRC_D1; // (offset)
- int IIR_SRC_B1; // (offset)
- int IIR_SRC_B0; // (offset)
- int MIX_DEST_A0; // (offset)
- int MIX_DEST_A1; // (offset)
- int MIX_DEST_B0; // (offset)
- int MIX_DEST_B1; // (offset)
- int IN_COEF_L; // (coef.)
- int IN_COEF_R; // (coef.)
-} REVERBInfo;
-
-///////////////////////////////////////////////////////////
-// SPU.C globals
-///////////////////////////////////////////////////////////
-
-#ifndef _IN_SPU
-
-// psx buffers / addresses
-
-extern unsigned short regArea[]; 
-extern unsigned short spuMem[];
-extern unsigned char * spuMemC;
-extern unsigned char * pSpuIrq;
-extern unsigned char * pSpuBuffer;
-
-// user settings
-
-extern int iVolume;
-extern int iXAPitch;
-extern int iUseTimer;
-extern int iSPUIRQWait;
-extern int iDebugMode;
-extern int iRecordMode;
-extern int iUseReverb;
-extern int iUseInterpolation;
-extern int iDisStereo;
-// MISC
-
-extern int iSpuAsyncWait;
-
-extern SPUCHAN s_chan[];
-extern REVERBInfo rvb;
-
-extern unsigned long dwNoiseVal;
-extern unsigned short spuCtrl;
-extern unsigned short spuStat;
-extern unsigned short spuIrq;
-extern unsigned long spuAddr;
-extern int bEndThread; 
-extern int bThreadEnded;
-extern int bSpuInit;
-extern unsigned long dwNewChannel;
-
-extern int SSumR[];
-extern int SSumL[];
-extern int iCycle;
-extern short * pS;
-
-extern void (CALLBACK *cddavCallback)(unsigned short,unsigned short);
-
-#endif
-
-///////////////////////////////////////////////////////////
-// XA.C globals
-///////////////////////////////////////////////////////////
-
-#ifndef _IN_XA
-
-extern xa_decode_t * xapGlobal;
-
-extern uint32_t * XAFeed;
-extern uint32_t * XAPlay;
-extern uint32_t * XAStart;
-extern uint32_t * XAEnd;
-
-extern uint32_t XARepeat;
-extern uint32_t XALastVal;
-
-extern uint32_t * CDDAFeed;
-extern uint32_t * CDDAPlay;
-extern uint32_t * CDDAStart;
-extern uint32_t * CDDAEnd;
-
-extern int iLeftXAVol;
-extern int iRightXAVol;
-
-#endif
-
-///////////////////////////////////////////////////////////
-// REVERB.C globals
-///////////////////////////////////////////////////////////
-
-#ifndef _IN_REVERB
-
-extern int * sRVBPlay;
-extern int * sRVBEnd;
-extern int * sRVBStart;
-extern int iReverbOff;
-extern int iReverbRepeat;
-extern int iReverbNum; 
-
-#endif
+/***************************************************************************
+ externals.h - description
+ -------------------
+ begin : Wed May 15 2002
+ copyright : (C) 2002 by Pete Bernert
+ email : BlackDove@addcom.de
+ ***************************************************************************/
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+#include <stdint.h>
+
+/////////////////////////////////////////////////////////
+// generic defines
+/////////////////////////////////////////////////////////
+
+#define PSE_LT_SPU 4
+#define PSE_SPU_ERR_SUCCESS 0
+#define PSE_SPU_ERR -60
+#define PSE_SPU_ERR_NOTCONFIGURED PSE_SPU_ERR - 1
+#define PSE_SPU_ERR_INIT PSE_SPU_ERR - 2
+#ifndef max
+#define max(a,b) (((a) > (b)) ? (a) : (b))
+#define min(a,b) (((a) < (b)) ? (a) : (b))
+#endif
+
+
+
+// 15-bit value + 1-sign
+extern int CLAMP16(int x);
+
+
+////////////////////////////////////////////////////////////////////////
+// spu defines
+////////////////////////////////////////////////////////////////////////
+
+// sound buffer sizes
+// 400 ms complete sound buffer
+#define SOUNDSIZE 70560
+// 137 ms test buffer... if less than that is buffered, a new upload will happen
+#define TESTSIZE 24192
+
+// num of channels
+#define MAXCHAN 24
+
+
+// ~ 1 ms of data - somewhat slower than Eternal
+//#define NSSIZE 45
+//#define INTERVAL_TIME 1000
+
+// ~ 0.5 ms of data - roughly Eternal maybe
+//#define NSSIZE 23
+//#define INTERVAL_TIME 2000
+
+// ~ 0.25 ms of data - seems a little bad..?
+//#define NSSIZE 12
+//#define INTERVAL_TIME 4000
+
+#define NSSIZE 10
+#define APU_CYCLES_UPDATE NSSIZE
+
+
+// update times
+#if 0
+// PEOPS DSound 1.09a - good sound cards
+#define LATENCY 10
+#elif defined (_WINDOWS)
+// work on most cards
+#define LATENCY 25
+#else
+// work on most cards
+#define LATENCY 25
+#endif
+
+
+// make sure this is bigger than cpu action - no glitchy
+#define INTERVAL_TIME 4500
+
+
+#define CPU_CLOCK 33868800
+
+///////////////////////////////////////////////////////////
+// struct defines
+///////////////////////////////////////////////////////////
+
+// ADSR INFOS PER CHANNEL
+typedef struct
+{
+ int AttackModeExp;
+ long AttackTime;
+ long DecayTime;
+ long SustainLevel;
+ int SustainModeExp;
+ long SustainModeDec;
+ long SustainTime;
+ int ReleaseModeExp;
+ unsigned long ReleaseVal;
+ long ReleaseTime;
+ long ReleaseStartTime;
+ long ReleaseVol;
+ long lTime;
+ long lVolume;
+} ADSRInfo;
+
+typedef struct
+{
+ int State;
+ int AttackModeExp;
+ int AttackRate;
+ int DecayRate;
+ int SustainLevel;
+ int SustainModeExp;
+ int SustainIncrease;
+ int SustainRate;
+ int ReleaseModeExp;
+ int ReleaseRate;
+ int EnvelopeVol;
+ int EnvelopeVol_f;			// fraction
+ long lVolume;
+ long lDummy1;
+ long lDummy2;
+} ADSRInfoEx;
+
+///////////////////////////////////////////////////////////
+
+// Tmp Flags
+
+// used for debug channel muting
+#define FLAG_MUTE 1
+
+// used for simple interpolation
+#define FLAG_IPOL0 2
+#define FLAG_IPOL1 4
+
+///////////////////////////////////////////////////////////
+
+// MAIN CHANNEL STRUCT
+typedef struct
+{
+ // no mutexes used anymore... don't need them to sync access
+ //HANDLE hMutex;
+
+ int bNew; // start flag
+
+ int iSBPos; // mixing stuff
+ int spos;
+ int sinc;
+ int SB[32+32]; // Pete added another 32 dwords in 1.6 ... prevents overflow issues with gaussian/cubic interpolation (thanx xodnizel!), and can be used for even better interpolations, eh? :)
+ int sval;
+
+ unsigned char * pStart; // start ptr into sound mem
+ unsigned char * pCurr; // current pos in sound mem
+ unsigned char * pLoop; // loop ptr in sound mem
+
+ int bOn; // is channel active (sample playing?)
+ int bStop; // is channel stopped (sample _can_ still be playing, ADSR Release phase)
+ int bReverb; // can we do reverb on this channel? must have ctrl register bit, to get active
+ int iActFreq; // current psx pitch
+ int iUsedFreq; // current pc pitch
+ int iLeftVolume; // left volume
+ int iLeftVolRaw; // left psx volume value
+ int bLoopJump;													 // ignore loop bit, if an external loop address is used
+ int iMute; // mute mode (debug)
+ int iSilent; // voice on - sound on/off
+ int iRightVolume; // right volume
+ int iRightVolRaw; // right psx volume value
+ int iRawPitch; // raw pitch (0...3fff)
+ int iIrqDone; // debug irq done flag
+ int s_1; // last decoding infos
+ int s_2;
+ int bRVBActive; // reverb active flag
+ int iRVBOffset; // reverb offset
+ int iRVBRepeat; // reverb repeat
+ int bNoise; // noise active flag
+ int bFMod; // freq mod (0=off, 1=sound channel, 2=freq channel)
+ int iRVBNum; // another reverb helper
+ int iOldNoise; // old noise val for this channel
+ ADSRInfo ADSR; // active ADSR settings
+ ADSRInfoEx ADSRX; // next ADSR settings (will be moved to active on sample start)
+} SPUCHAN;
+
+///////////////////////////////////////////////////////////
+
+typedef struct
+{
+ int StartAddr; // reverb area start addr in samples
+ int CurrAddr; // reverb area curr addr in samples
+
+ int VolLeft;
+ int VolRight;
+ int iLastRVBLeft;
+ int iLastRVBRight;
+ int iRVBLeft;
+ int iRVBRight;
+
+ int FB_SRC_A; // (offset)
+ int FB_SRC_B; // (offset)
+ int IIR_ALPHA; // (coef.)
+ int ACC_COEF_A; // (coef.)
+ int ACC_COEF_B; // (coef.)
+ int ACC_COEF_C; // (coef.)
+ int ACC_COEF_D; // (coef.)
+ int IIR_COEF; // (coef.)
+ int FB_ALPHA; // (coef.)
+ int FB_X; // (coef.)
+ int IIR_DEST_A0; // (offset)
+ int IIR_DEST_A1; // (offset)
+ int ACC_SRC_A0; // (offset)
+ int ACC_SRC_A1; // (offset)
+ int ACC_SRC_B0; // (offset)
+ int ACC_SRC_B1; // (offset)
+ int IIR_SRC_A0; // (offset)
+ int IIR_SRC_A1; // (offset)
+ int IIR_DEST_B0; // (offset)
+ int IIR_DEST_B1; // (offset)
+ int ACC_SRC_C0; // (offset)
+ int ACC_SRC_C1; // (offset)
+ int ACC_SRC_D0; // (offset)
+ int ACC_SRC_D1; // (offset)
+ int IIR_SRC_B1; // (offset)
+ int IIR_SRC_B0; // (offset)
+ int MIX_DEST_A0; // (offset)
+ int MIX_DEST_A1; // (offset)
+ int MIX_DEST_B0; // (offset)
+ int MIX_DEST_B1; // (offset)
+ int IN_COEF_L; // (coef.)
+ int IN_COEF_R; // (coef.)
+} REVERBInfo;
+
+#ifdef _WINDOWS
+extern HINSTANCE hInst;
+#define WM_MUTE (WM_USER+543)
+#endif
+
+///////////////////////////////////////////////////////////
+// SPU.C globals
+///////////////////////////////////////////////////////////
+
+#ifndef _IN_SPU
+
+// psx buffers / addresses
+
+extern unsigned short regArea[];
+extern unsigned short spuMem[];
+extern unsigned char * spuMemC;
+extern unsigned char * pSpuIrq;
+extern unsigned char * pSpuBuffer;
+
+// user settings
+
+extern int iVolume;
+extern int iXAPitch;
+extern int iUseTimer;
+extern int iSPUIRQWait;
+extern int iDebugMode;
+extern int iRecordMode;
+extern int iUseReverb;
+extern int iUseInterpolation;
+extern int iDisStereo;
+extern int				iFreqResponse;
+// MISC
+
+extern int iSpuAsyncWait;
+
+extern SPUCHAN s_chan[];
+extern REVERBInfo rvb;
+
+extern unsigned long dwNoiseVal;
+extern unsigned long dwNoiseClock;
+extern unsigned long dwNoiseCount;
+extern unsigned short spuCtrl;
+extern unsigned short spuStat;
+extern unsigned short spuIrq;
+extern unsigned long spuAddr;
+extern int bEndThread;
+extern int bThreadEnded;
+extern int bSpuInit;
+extern uint32_t dwNewChannel;
+extern unsigned int bIrqHit;
+
+extern int SSumR[];
+extern int SSumL[];
+extern int iCycle;
+extern short * pS;
+
+#ifdef _WINDOWS
+extern HWND hWMain; // window handle
+extern HWND hWDebug;
+#endif
+
+extern void (CALLBACK *cddavCallback)(unsigned short,unsigned short);
+extern void (CALLBACK *irqCallback)(void); // func of main emu, called on spu irq
+
+#endif
+
+///////////////////////////////////////////////////////////
+// DSOUND.C globals
+///////////////////////////////////////////////////////////
+
+#ifndef _IN_DSOUND
+
+#ifdef _WINDOWS
+extern unsigned long LastWrite;
+extern unsigned long LastPlay;
+#endif
+
+#endif
+
+///////////////////////////////////////////////////////////
+// RECORD.C globals
+///////////////////////////////////////////////////////////
+
+#ifndef _IN_RECORD
+
+#ifdef _WINDOWS
+extern int iDoRecord;
+#endif
+
+#endif
+
+///////////////////////////////////////////////////////////
+// XA.C globals
+///////////////////////////////////////////////////////////
+
+#ifndef _IN_XA
+
+extern xa_decode_t * xapGlobal;
+
+extern uint32_t * XAFeed;
+extern uint32_t * XAPlay;
+extern uint32_t * XAStart;
+extern uint32_t * XAEnd;
+
+extern uint32_t XARepeat;
+extern uint32_t XALastVal;
+
+extern uint32_t * CDDAFeed;
+extern uint32_t * CDDAPlay;
+extern uint32_t * CDDAStart;
+extern uint32_t * CDDAEnd;
+
+extern int iLeftXAVol;
+extern int iRightXAVol;
+
+#endif
+
+///////////////////////////////////////////////////////////
+// REVERB.C globals
+///////////////////////////////////////////////////////////
+
+#ifndef _IN_REVERB
+
+extern int * sRVBPlay;
+extern int * sRVBEnd;
+extern int * sRVBStart;
+extern int iReverbOff;
+extern int iReverbRepeat;
+extern int iReverbNum;
+
+#endif

pcsxr-1.9.92.tar.bz2/plugins/dfsound/freeze.c -> pcsxr-1.9.93.tar.bz2/plugins/dfsound/freeze.c Changed

@@ -1,214 +1,235 @@
-/***************************************************************************
- freeze.c - description
- -------------------
- begin : Wed May 15 2002
- copyright : (C) 2002 by Pete Bernert
- email : BlackDove@addcom.de
- ***************************************************************************/
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. See also the license.txt file for *
- * additional informations. *
- * *
- ***************************************************************************/
-
-#include "stdafx.h"
-
-#define _IN_FREEZE
-
-#include "externals.h"
-#include "registers.h"
-#include "spu.h"
-#include "regs.h"
-
-////////////////////////////////////////////////////////////////////////
-// freeze structs
-////////////////////////////////////////////////////////////////////////
-
-typedef struct
-{
- char szSPUName[8];
- uint32_t ulFreezeVersion;
- uint32_t ulFreezeSize;
- unsigned char cSPUPort[0x200];
- unsigned char cSPURam[0x80000];
- xa_decode_t xaS; 
-} SPUFreeze_t;
-
-typedef struct
-{
- unsigned short spuIrq;
- uint32_t pSpuIrq;
- uint32_t spuAddr;
- uint32_t dummy1;
- uint32_t dummy2;
- uint32_t dummy3;
-
- SPUCHAN s_chan[MAXCHAN]; 
-
-} SPUOSSFreeze_t;
-
-////////////////////////////////////////////////////////////////////////
-
-void LoadStateV5(SPUFreeze_t * pF); // newest version
-void LoadStateUnknown(SPUFreeze_t * pF); // unknown format
-
-extern int lastch;
-
-////////////////////////////////////////////////////////////////////////
-// SPUFREEZE: called by main emu on savestate load/save
-////////////////////////////////////////////////////////////////////////
-
-long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF)
-{
- int i;SPUOSSFreeze_t * pFO;
-
- if(!pF) return 0; // first check
-
- if(ulFreezeMode) // info or save?
- {//--------------------------------------------------//
- if(ulFreezeMode==1) 
- memset(pF,0,sizeof(SPUFreeze_t)+sizeof(SPUOSSFreeze_t));
-
- strcpy(pF->szSPUName,"PBOSS");
- pF->ulFreezeVersion=5;
- pF->ulFreezeSize=sizeof(SPUFreeze_t)+sizeof(SPUOSSFreeze_t);
-
- if(ulFreezeMode==2) return 1; // info mode? ok, bye
- // save mode:
- RemoveTimer(); // stop timer
-
- memcpy(pF->cSPURam,spuMem,0x80000); // copy common infos
- memcpy(pF->cSPUPort,regArea,0x200);
-
- if(xapGlobal && XAPlay!=XAFeed) // some xa
- {
- pF->xaS=*xapGlobal; 
- }
- else 
- memset(&pF->xaS,0,sizeof(xa_decode_t)); // or clean xa
-
- pFO=(SPUOSSFreeze_t *)(pF+1); // store special stuff
-
- pFO->spuIrq=spuIrq;
- if(pSpuIrq) pFO->pSpuIrq = (unsigned long)pSpuIrq-(unsigned long)spuMemC;
-
- pFO->spuAddr=spuAddr;
- if(pFO->spuAddr==0) pFO->spuAddr=0xbaadf00d;
-
- for(i=0;i<MAXCHAN;i++)
- {
- memcpy((void *)&pFO->s_chan[i],(void *)&s_chan[i],sizeof(SPUCHAN));
- if(pFO->s_chan[i].pStart)
- pFO->s_chan[i].pStart-=(unsigned long)spuMemC;
- if(pFO->s_chan[i].pCurr)
- pFO->s_chan[i].pCurr-=(unsigned long)spuMemC;
- if(pFO->s_chan[i].pLoop)
- pFO->s_chan[i].pLoop-=(unsigned long)spuMemC;
- }
-
- SetupTimer(); // sound processing on again
-
- return 1;
- //--------------------------------------------------//
- }
- 
- if(ulFreezeMode!=0) return 0; // bad mode? bye
-
- RemoveTimer(); // we stop processing while doing the save!
-
- memcpy(spuMem,pF->cSPURam,0x80000); // get ram
- memcpy(regArea,pF->cSPUPort,0x200);
-
- if(pF->xaS.nsamples<=4032) // start xa again
- SPUplayADPCMchannel(&pF->xaS);
-
- xapGlobal=0;
-
- if(!strcmp(pF->szSPUName,"PBOSS") && pF->ulFreezeVersion==5)
- LoadStateV5(pF);
- else LoadStateUnknown(pF);
-
- lastch = -1;
-
- // repair some globals
- for(i=0;i<=62;i+=2)
- SPUwriteRegister(H_Reverb+i,regArea[(H_Reverb+i-0xc00)>>1]);
- SPUwriteRegister(H_SPUReverbAddr,regArea[(H_SPUReverbAddr-0xc00)>>1]);
- SPUwriteRegister(H_SPUrvolL,regArea[(H_SPUrvolL-0xc00)>>1]);
- SPUwriteRegister(H_SPUrvolR,regArea[(H_SPUrvolR-0xc00)>>1]);
-
- SPUwriteRegister(H_SPUctrl,(unsigned short)(regArea[(H_SPUctrl-0xc00)>>1]|0x4000));
- SPUwriteRegister(H_SPUstat,regArea[(H_SPUstat-0xc00)>>1]);
- SPUwriteRegister(H_CDLeft,regArea[(H_CDLeft-0xc00)>>1]);
- SPUwriteRegister(H_CDRight,regArea[(H_CDRight-0xc00)>>1]);
-
- // fix to prevent new interpolations from crashing
- for(i=0;i<MAXCHAN;i++) s_chan[i].SB[28]=0;
-
- SetupTimer(); // start sound processing again
-
- return 1;
-}
-
-////////////////////////////////////////////////////////////////////////
-
-void LoadStateV5(SPUFreeze_t * pF)
-{
- int i;SPUOSSFreeze_t * pFO;
-
- pFO=(SPUOSSFreeze_t *)(pF+1);
-
- spuIrq = pFO->spuIrq;
- if(pFO->pSpuIrq) pSpuIrq = pFO->pSpuIrq+spuMemC; else pSpuIrq=NULL;
-
- if(pFO->spuAddr)
- {
- spuAddr = pFO->spuAddr;
- if (spuAddr == 0xbaadf00d) spuAddr = 0;
- }
-
- for(i=0;i<MAXCHAN;i++)
- {
- memcpy((void *)&s_chan[i],(void *)&pFO->s_chan[i],sizeof(SPUCHAN));
-
- s_chan[i].pStart+=(unsigned long)spuMemC;
- s_chan[i].pCurr+=(unsigned long)spuMemC;
- s_chan[i].pLoop+=(unsigned long)spuMemC;
- s_chan[i].iMute=0;
- s_chan[i].iIrqDone=0;
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-
-void LoadStateUnknown(SPUFreeze_t * pF)
-{
- int i;
-
- for(i=0;i<MAXCHAN;i++)
- {
- s_chan[i].bOn=0;
- s_chan[i].bNew=0;
- s_chan[i].bStop=0;
- s_chan[i].ADSR.lVolume=0;
- s_chan[i].pLoop=spuMemC;
- s_chan[i].pStart=spuMemC;
- s_chan[i].pLoop=spuMemC;
- s_chan[i].iMute=0;
- s_chan[i].iIrqDone=0;
- }
-
- dwNewChannel=0;
- pSpuIrq=0;
-
- for(i=0;i<0xc0;i++)
- {
- SPUwriteRegister(0x1f801c00+i*2,regArea[i]);
- }
-}
-
-////////////////////////////////////////////////////////////////////////
+/***************************************************************************
+ freeze.c - description
+ -------------------
+ begin : Wed May 15 2002
+ copyright : (C) 2002 by Pete Bernert
+ email : BlackDove@addcom.de
+ ***************************************************************************/
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+#include "stdafx.h"
+
+#define _IN_FREEZE
+
+#include "externals.h"
+#include "registers.h"
+#include "spu.h"
+#include "regs.h"
+
+////////////////////////////////////////////////////////////////////////
+// freeze structs
+////////////////////////////////////////////////////////////////////////
+
+typedef struct
+{
+ char szSPUName[8];
+ uint32_t ulFreezeVersion;
+ uint32_t ulFreezeSize;
+ unsigned char cSPUPort[0x200];
+ unsigned char cSPURam[0x80000];
+ xa_decode_t xaS; 
+} SPUFreeze_t;
+
+typedef struct
+{
+ unsigned short spuIrq;
+ uint32_t pSpuIrq;
+ uint32_t spuAddr;
+ uint32_t bIrqHit;
+ uint32_t decoded_ptr;
+ uint32_t dummy3;
+
+ SPUCHAN s_chan[MAXCHAN]; 
+
+} SPUOSSFreeze_t;
+
+////////////////////////////////////////////////////////////////////////
+
+void LoadStateV5(SPUFreeze_t * pF); // newest version
+void LoadStateUnknown(SPUFreeze_t * pF); // unknown format
+
+extern int lastns;
+
+////////////////////////////////////////////////////////////////////////
+// SPUFREEZE: called by main emu on savestate load/save
+////////////////////////////////////////////////////////////////////////
+
+long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF)
+{
+ int i;SPUOSSFreeze_t * pFO;
+
+ if(!pF) return 0; // first check
+
+ if(!bSpuInit) return 0;
+
+ if(ulFreezeMode) // info or save?
+ {//--------------------------------------------------//
+ if(ulFreezeMode==1) 
+ memset(pF,0,sizeof(SPUFreeze_t)+sizeof(SPUOSSFreeze_t));
+
+ strcpy(pF->szSPUName,"PBOSS");
+ pF->ulFreezeVersion=5;
+ pF->ulFreezeSize=sizeof(SPUFreeze_t)+sizeof(SPUOSSFreeze_t);
+
+ if(ulFreezeMode==2) return 1; // info mode? ok, bye
+ // save mode:
+ RemoveTimer(); // stop timer
+
+ memcpy(pF->cSPURam,spuMem,0x80000); // copy common infos
+ memcpy(pF->cSPUPort,regArea,0x200);
+
+ if(xapGlobal && XAPlay!=XAFeed) // some xa
+ {
+ pF->xaS=*xapGlobal; 
+ }
+ else 
+ memset(&pF->xaS,0,sizeof(xa_decode_t)); // or clean xa
+
+ pFO=(SPUOSSFreeze_t *)(pF+1); // store special stuff
+
+ pFO->spuIrq=spuIrq;
+ if(pSpuIrq) pFO->pSpuIrq = (unsigned long)pSpuIrq-(unsigned long)spuMemC;
+
+ pFO->spuAddr=spuAddr;
+ if(pFO->spuAddr==0) pFO->spuAddr=0xbaadf00d;
+
+ for(i=0;i<MAXCHAN;i++)
+ {
+ memcpy((void *)&pFO->s_chan[i],(void *)&s_chan[i],sizeof(SPUCHAN));
+ if(pFO->s_chan[i].pStart)
+ pFO->s_chan[i].pStart-=(unsigned long)spuMemC;
+ if(pFO->s_chan[i].pCurr)
+ pFO->s_chan[i].pCurr-=(unsigned long)spuMemC;
+ if(pFO->s_chan[i].pLoop)
+ pFO->s_chan[i].pLoop-=(unsigned long)spuMemC;
+ }
+
+ SetupTimer(); // sound processing on again
+
+ return 1;
+ //--------------------------------------------------//
+ }
+ 
+ if(ulFreezeMode!=0) return 0; // bad mode? bye
+
+#ifdef _WINDOWS
+ if(iDebugMode && IsWindow(hWDebug)) // clean debug mute infos
+ SendMessage(hWDebug,WM_MUTE,0,0);
+ if(IsBadReadPtr(pF,sizeof(SPUFreeze_t))) // check bad emu stuff
+ return 0;
+#endif
+
+ RemoveTimer(); // we stop processing while doing the save!
+
+ memcpy(spuMem,pF->cSPURam,0x80000); // get ram
+ memcpy(regArea,pF->cSPUPort,0x200);
+
+ if(pF->xaS.nsamples<=4032) // start xa again
+ SPUplayADPCMchannel(&pF->xaS);
+
+ xapGlobal=0;
+
+ if(!strcmp(pF->szSPUName,"PBOSS") && pF->ulFreezeVersion==5)
+ LoadStateV5(pF);
+ else LoadStateUnknown(pF);
+
+ lastns = 0;
+
+ // repair some globals
+ for(i=0;i<=62;i+=2)
+ SPUwriteRegister(H_Reverb+i,regArea[(H_Reverb+i-0xc00)>>1]);
+ SPUwriteRegister(H_SPUReverbAddr,regArea[(H_SPUReverbAddr-0xc00)>>1]);
+ SPUwriteRegister(H_SPUrvolL,regArea[(H_SPUrvolL-0xc00)>>1]);
+ SPUwriteRegister(H_SPUrvolR,regArea[(H_SPUrvolR-0xc00)>>1]);
+
+ SPUwriteRegister(H_SPUctrl,(unsigned short)(regArea[(H_SPUctrl-0xc00)>>1]|0x4000));
+ SPUwriteRegister(H_SPUstat,regArea[(H_SPUstat-0xc00)>>1]);
+ SPUwriteRegister(H_CDLeft,regArea[(H_CDLeft-0xc00)>>1]);
+ SPUwriteRegister(H_CDRight,regArea[(H_CDRight-0xc00)>>1]);
+
+ // fix to prevent new interpolations from crashing
+ for(i=0;i<MAXCHAN;i++) s_chan[i].SB[28]=0;
+
+ SetupTimer(); // start sound processing again
+
+ // stop load crackling
+ //cpu_cycles = 0;
+ //iCycle = 0;
+
+ // fix movie lag
+ CDDAEnd = CDDAStart + 44100;
+ CDDAPlay = CDDAStart;
+ CDDAFeed = CDDAStart;
+
+ XAPlay = XAStart;
+ XAFeed = XAStart;
+ XAEnd = XAStart + 44100;
+
+ return 1;
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void LoadStateV5(SPUFreeze_t * pF)
+{
+ int i;SPUOSSFreeze_t * pFO;
+
+ pFO=(SPUOSSFreeze_t *)(pF+1);
+
+ spuIrq = pFO->spuIrq;
+ if(pFO->pSpuIrq) pSpuIrq = pFO->pSpuIrq+spuMemC; else pSpuIrq=NULL;
+
+ if(pFO->spuAddr)
+ {
+ spuAddr = pFO->spuAddr;
+ if (spuAddr == 0xbaadf00d) spuAddr = 0;
+ }
+
+ for(i=0;i<MAXCHAN;i++)
+ {
+ memcpy((void *)&s_chan[i],(void *)&pFO->s_chan[i],sizeof(SPUCHAN));
+
+ s_chan[i].pStart+=(unsigned long)spuMemC;
+ s_chan[i].pCurr+=(unsigned long)spuMemC;
+ s_chan[i].pLoop+=(unsigned long)spuMemC;
+ s_chan[i].iMute=0;
+ s_chan[i].iIrqDone=0;
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void LoadStateUnknown(SPUFreeze_t * pF)
+{
+ int i;
+
+ for(i=0;i<MAXCHAN;i++)
+ {
+ s_chan[i].bOn=0;
+ s_chan[i].bNew=0;
+ s_chan[i].bStop=0;
+ s_chan[i].ADSR.lVolume=0;
+ s_chan[i].pLoop=(unsigned char *)((int)spuMemC+4096);
+ s_chan[i].pStart=(unsigned char *)((int)spuMemC+4096);
+ s_chan[i].iMute=0;
+ s_chan[i].iIrqDone=0;
+ }
+
+ dwNewChannel=0;
+ pSpuIrq=0;
+
+ for(i=0;i<0xc0;i++)
+ {
+ SPUwriteRegister(0x1f801c00+i*2,regArea[i]);
+ }
+}
+
+////////////////////////////////////////////////////////////////////////

pcsxr-1.9.92.tar.bz2/plugins/dfsound/gauss_i.h -> pcsxr-1.9.93.tar.bz2/plugins/dfsound/gauss_i.h Changed

@@ -1,150 +1,150 @@
-/***************************************************************************
-                          gauss_i.h  -  description
-                           -----------------------
-    begin                : Sun Feb 08 2003
-    copyright            : (C) 2003 by Chris Moeller, eh, whatever
-    email                : chris@kode54.tk
- ***************************************************************************/
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version. See also the license.txt file for *
- *   additional informations.                                              *
- *                                                                         *
- ***************************************************************************/
-                           
-#ifndef GAUSS_H
-#define GAUSS_H
-
-const int gauss[]={
-	0x172, 0x519, 0x176, 0x000, 0x16E, 0x519, 0x17A, 0x000, 
-	0x16A, 0x518, 0x17D, 0x000, 0x166, 0x518, 0x181, 0x000, 
-	0x162, 0x518, 0x185, 0x000, 0x15F, 0x518, 0x189, 0x000, 
-	0x15B, 0x518, 0x18D, 0x000, 0x157, 0x517, 0x191, 0x000, 
-	0x153, 0x517, 0x195, 0x000, 0x150, 0x517, 0x19A, 0x000, 
-	0x14C, 0x516, 0x19E, 0x000, 0x148, 0x516, 0x1A2, 0x000, 
-	0x145, 0x515, 0x1A6, 0x000, 0x141, 0x514, 0x1AA, 0x000, 
-	0x13E, 0x514, 0x1AE, 0x000, 0x13A, 0x513, 0x1B2, 0x000, 
-	0x137, 0x512, 0x1B7, 0x001, 0x133, 0x511, 0x1BB, 0x001, 
-	0x130, 0x511, 0x1BF, 0x001, 0x12C, 0x510, 0x1C3, 0x001, 
-	0x129, 0x50F, 0x1C8, 0x001, 0x125, 0x50E, 0x1CC, 0x001, 
-	0x122, 0x50D, 0x1D0, 0x001, 0x11E, 0x50C, 0x1D5, 0x001, 
-	0x11B, 0x50B, 0x1D9, 0x001, 0x118, 0x50A, 0x1DD, 0x001, 
-	0x114, 0x508, 0x1E2, 0x001, 0x111, 0x507, 0x1E6, 0x002, 
-	0x10E, 0x506, 0x1EB, 0x002, 0x10B, 0x504, 0x1EF, 0x002, 
-	0x107, 0x503, 0x1F3, 0x002, 0x104, 0x502, 0x1F8, 0x002, 
-	0x101, 0x500, 0x1FC, 0x002, 0x0FE, 0x4FF, 0x201, 0x002, 
-	0x0FB, 0x4FD, 0x205, 0x003, 0x0F8, 0x4FB, 0x20A, 0x003, 
-	0x0F5, 0x4FA, 0x20F, 0x003, 0x0F2, 0x4F8, 0x213, 0x003, 
-	0x0EF, 0x4F6, 0x218, 0x003, 0x0EC, 0x4F5, 0x21C, 0x004, 
-	0x0E9, 0x4F3, 0x221, 0x004, 0x0E6, 0x4F1, 0x226, 0x004, 
-	0x0E3, 0x4EF, 0x22A, 0x004, 0x0E0, 0x4ED, 0x22F, 0x004, 
-	0x0DD, 0x4EB, 0x233, 0x005, 0x0DA, 0x4E9, 0x238, 0x005, 
-	0x0D7, 0x4E7, 0x23D, 0x005, 0x0D4, 0x4E5, 0x241, 0x005, 
-	0x0D2, 0x4E3, 0x246, 0x006, 0x0CF, 0x4E0, 0x24B, 0x006, 
-	0x0CC, 0x4DE, 0x250, 0x006, 0x0C9, 0x4DC, 0x254, 0x006, 
-	0x0C7, 0x4D9, 0x259, 0x007, 0x0C4, 0x4D7, 0x25E, 0x007, 
-	0x0C1, 0x4D5, 0x263, 0x007, 0x0BF, 0x4D2, 0x267, 0x008, 
-	0x0BC, 0x4D0, 0x26C, 0x008, 0x0BA, 0x4CD, 0x271, 0x008, 
-	0x0B7, 0x4CB, 0x276, 0x009, 0x0B4, 0x4C8, 0x27B, 0x009, 
-	0x0B2, 0x4C5, 0x280, 0x009, 0x0AF, 0x4C3, 0x284, 0x00A, 
-	0x0AD, 0x4C0, 0x289, 0x00A, 0x0AB, 0x4BD, 0x28E, 0x00A, 
-	0x0A8, 0x4BA, 0x293, 0x00B, 0x0A6, 0x4B7, 0x298, 0x00B, 
-	0x0A3, 0x4B5, 0x29D, 0x00B, 0x0A1, 0x4B2, 0x2A2, 0x00C, 
-	0x09F, 0x4AF, 0x2A6, 0x00C, 0x09C, 0x4AC, 0x2AB, 0x00D, 
-	0x09A, 0x4A9, 0x2B0, 0x00D, 0x098, 0x4A6, 0x2B5, 0x00E, 
-	0x096, 0x4A2, 0x2BA, 0x00E, 0x093, 0x49F, 0x2BF, 0x00F, 
-	0x091, 0x49C, 0x2C4, 0x00F, 0x08F, 0x499, 0x2C9, 0x00F, 
-	0x08D, 0x496, 0x2CE, 0x010, 0x08B, 0x492, 0x2D3, 0x010, 
-	0x089, 0x48F, 0x2D8, 0x011, 0x086, 0x48C, 0x2DC, 0x011, 
-	0x084, 0x488, 0x2E1, 0x012, 0x082, 0x485, 0x2E6, 0x013, 
-	0x080, 0x481, 0x2EB, 0x013, 0x07E, 0x47E, 0x2F0, 0x014, 
-	0x07C, 0x47A, 0x2F5, 0x014, 0x07A, 0x477, 0x2FA, 0x015, 
-	0x078, 0x473, 0x2FF, 0x015, 0x076, 0x470, 0x304, 0x016, 
-	0x075, 0x46C, 0x309, 0x017, 0x073, 0x468, 0x30E, 0x017, 
-	0x071, 0x465, 0x313, 0x018, 0x06F, 0x461, 0x318, 0x018, 
-	0x06D, 0x45D, 0x31D, 0x019, 0x06B, 0x459, 0x322, 0x01A, 
-	0x06A, 0x455, 0x326, 0x01B, 0x068, 0x452, 0x32B, 0x01B, 
-	0x066, 0x44E, 0x330, 0x01C, 0x064, 0x44A, 0x335, 0x01D, 
-	0x063, 0x446, 0x33A, 0x01D, 0x061, 0x442, 0x33F, 0x01E, 
-	0x05F, 0x43E, 0x344, 0x01F, 0x05E, 0x43A, 0x349, 0x020, 
-	0x05C, 0x436, 0x34E, 0x020, 0x05A, 0x432, 0x353, 0x021, 
-	0x059, 0x42E, 0x357, 0x022, 0x057, 0x42A, 0x35C, 0x023, 
-	0x056, 0x425, 0x361, 0x024, 0x054, 0x421, 0x366, 0x024, 
-	0x053, 0x41D, 0x36B, 0x025, 0x051, 0x419, 0x370, 0x026, 
-	0x050, 0x415, 0x374, 0x027, 0x04E, 0x410, 0x379, 0x028, 
-	0x04D, 0x40C, 0x37E, 0x029, 0x04C, 0x408, 0x383, 0x02A, 
-	0x04A, 0x403, 0x388, 0x02B, 0x049, 0x3FF, 0x38C, 0x02C, 
-	0x047, 0x3FB, 0x391, 0x02D, 0x046, 0x3F6, 0x396, 0x02E, 
-	0x045, 0x3F2, 0x39B, 0x02F, 0x043, 0x3ED, 0x39F, 0x030, 
-	0x042, 0x3E9, 0x3A4, 0x031, 0x041, 0x3E5, 0x3A9, 0x032, 
-	0x040, 0x3E0, 0x3AD, 0x033, 0x03E, 0x3DC, 0x3B2, 0x034, 
-	0x03D, 0x3D7, 0x3B7, 0x035, 0x03C, 0x3D2, 0x3BB, 0x036, 
-	0x03B, 0x3CE, 0x3C0, 0x037, 0x03A, 0x3C9, 0x3C5, 0x038, 
-	0x038, 0x3C5, 0x3C9, 0x03A, 0x037, 0x3C0, 0x3CE, 0x03B, 
-	0x036, 0x3BB, 0x3D2, 0x03C, 0x035, 0x3B7, 0x3D7, 0x03D, 
-	0x034, 0x3B2, 0x3DC, 0x03E, 0x033, 0x3AD, 0x3E0, 0x040, 
-	0x032, 0x3A9, 0x3E5, 0x041, 0x031, 0x3A4, 0x3E9, 0x042, 
-	0x030, 0x39F, 0x3ED, 0x043, 0x02F, 0x39B, 0x3F2, 0x045, 
-	0x02E, 0x396, 0x3F6, 0x046, 0x02D, 0x391, 0x3FB, 0x047, 
-	0x02C, 0x38C, 0x3FF, 0x049, 0x02B, 0x388, 0x403, 0x04A, 
-	0x02A, 0x383, 0x408, 0x04C, 0x029, 0x37E, 0x40C, 0x04D, 
-	0x028, 0x379, 0x410, 0x04E, 0x027, 0x374, 0x415, 0x050, 
-	0x026, 0x370, 0x419, 0x051, 0x025, 0x36B, 0x41D, 0x053, 
-	0x024, 0x366, 0x421, 0x054, 0x024, 0x361, 0x425, 0x056, 
-	0x023, 0x35C, 0x42A, 0x057, 0x022, 0x357, 0x42E, 0x059, 
-	0x021, 0x353, 0x432, 0x05A, 0x020, 0x34E, 0x436, 0x05C, 
-	0x020, 0x349, 0x43A, 0x05E, 0x01F, 0x344, 0x43E, 0x05F, 
-	0x01E, 0x33F, 0x442, 0x061, 0x01D, 0x33A, 0x446, 0x063, 
-	0x01D, 0x335, 0x44A, 0x064, 0x01C, 0x330, 0x44E, 0x066, 
-	0x01B, 0x32B, 0x452, 0x068, 0x01B, 0x326, 0x455, 0x06A, 
-	0x01A, 0x322, 0x459, 0x06B, 0x019, 0x31D, 0x45D, 0x06D, 
-	0x018, 0x318, 0x461, 0x06F, 0x018, 0x313, 0x465, 0x071, 
-	0x017, 0x30E, 0x468, 0x073, 0x017, 0x309, 0x46C, 0x075, 
-	0x016, 0x304, 0x470, 0x076, 0x015, 0x2FF, 0x473, 0x078, 
-	0x015, 0x2FA, 0x477, 0x07A, 0x014, 0x2F5, 0x47A, 0x07C, 
-	0x014, 0x2F0, 0x47E, 0x07E, 0x013, 0x2EB, 0x481, 0x080, 
-	0x013, 0x2E6, 0x485, 0x082, 0x012, 0x2E1, 0x488, 0x084, 
-	0x011, 0x2DC, 0x48C, 0x086, 0x011, 0x2D8, 0x48F, 0x089, 
-	0x010, 0x2D3, 0x492, 0x08B, 0x010, 0x2CE, 0x496, 0x08D, 
-	0x00F, 0x2C9, 0x499, 0x08F, 0x00F, 0x2C4, 0x49C, 0x091, 
-	0x00F, 0x2BF, 0x49F, 0x093, 0x00E, 0x2BA, 0x4A2, 0x096, 
-	0x00E, 0x2B5, 0x4A6, 0x098, 0x00D, 0x2B0, 0x4A9, 0x09A, 
-	0x00D, 0x2AB, 0x4AC, 0x09C, 0x00C, 0x2A6, 0x4AF, 0x09F, 
-	0x00C, 0x2A2, 0x4B2, 0x0A1, 0x00B, 0x29D, 0x4B5, 0x0A3, 
-	0x00B, 0x298, 0x4B7, 0x0A6, 0x00B, 0x293, 0x4BA, 0x0A8, 
-	0x00A, 0x28E, 0x4BD, 0x0AB, 0x00A, 0x289, 0x4C0, 0x0AD, 
-	0x00A, 0x284, 0x4C3, 0x0AF, 0x009, 0x280, 0x4C5, 0x0B2, 
-	0x009, 0x27B, 0x4C8, 0x0B4, 0x009, 0x276, 0x4CB, 0x0B7, 
-	0x008, 0x271, 0x4CD, 0x0BA, 0x008, 0x26C, 0x4D0, 0x0BC, 
-	0x008, 0x267, 0x4D2, 0x0BF, 0x007, 0x263, 0x4D5, 0x0C1, 
-	0x007, 0x25E, 0x4D7, 0x0C4, 0x007, 0x259, 0x4D9, 0x0C7, 
-	0x006, 0x254, 0x4DC, 0x0C9, 0x006, 0x250, 0x4DE, 0x0CC, 
-	0x006, 0x24B, 0x4E0, 0x0CF, 0x006, 0x246, 0x4E3, 0x0D2, 
-	0x005, 0x241, 0x4E5, 0x0D4, 0x005, 0x23D, 0x4E7, 0x0D7, 
-	0x005, 0x238, 0x4E9, 0x0DA, 0x005, 0x233, 0x4EB, 0x0DD, 
-	0x004, 0x22F, 0x4ED, 0x0E0, 0x004, 0x22A, 0x4EF, 0x0E3, 
-	0x004, 0x226, 0x4F1, 0x0E6, 0x004, 0x221, 0x4F3, 0x0E9, 
-	0x004, 0x21C, 0x4F5, 0x0EC, 0x003, 0x218, 0x4F6, 0x0EF, 
-	0x003, 0x213, 0x4F8, 0x0F2, 0x003, 0x20F, 0x4FA, 0x0F5, 
-	0x003, 0x20A, 0x4FB, 0x0F8, 0x003, 0x205, 0x4FD, 0x0FB, 
-	0x002, 0x201, 0x4FF, 0x0FE, 0x002, 0x1FC, 0x500, 0x101, 
-	0x002, 0x1F8, 0x502, 0x104, 0x002, 0x1F3, 0x503, 0x107, 
-	0x002, 0x1EF, 0x504, 0x10B, 0x002, 0x1EB, 0x506, 0x10E, 
-	0x002, 0x1E6, 0x507, 0x111, 0x001, 0x1E2, 0x508, 0x114, 
-	0x001, 0x1DD, 0x50A, 0x118, 0x001, 0x1D9, 0x50B, 0x11B, 
-	0x001, 0x1D5, 0x50C, 0x11E, 0x001, 0x1D0, 0x50D, 0x122, 
-	0x001, 0x1CC, 0x50E, 0x125, 0x001, 0x1C8, 0x50F, 0x129, 
-	0x001, 0x1C3, 0x510, 0x12C, 0x001, 0x1BF, 0x511, 0x130, 
-	0x001, 0x1BB, 0x511, 0x133, 0x001, 0x1B7, 0x512, 0x137, 
-	0x000, 0x1B2, 0x513, 0x13A, 0x000, 0x1AE, 0x514, 0x13E, 
-	0x000, 0x1AA, 0x514, 0x141, 0x000, 0x1A6, 0x515, 0x145, 
-	0x000, 0x1A2, 0x516, 0x148, 0x000, 0x19E, 0x516, 0x14C, 
-	0x000, 0x19A, 0x517, 0x150, 0x000, 0x195, 0x517, 0x153, 
-	0x000, 0x191, 0x517, 0x157, 0x000, 0x18D, 0x518, 0x15B, 
-	0x000, 0x189, 0x518, 0x15F, 0x000, 0x185, 0x518, 0x162, 
-	0x000, 0x181, 0x518, 0x166, 0x000, 0x17D, 0x518, 0x16A, 
-	0x000, 0x17A, 0x519, 0x16E, 0x000, 0x176, 0x519, 0x172};
-#endif
+/***************************************************************************
+                          gauss_i.h  -  description
+                           -----------------------
+    begin                : Sun Feb 08 2003
+    copyright            : (C) 2003 by Chris Moeller, eh, whatever
+    email                : chris@kode54.tk
+ ***************************************************************************/
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+                           
+#ifndef GAUSS_H
+#define GAUSS_H
+
+const int gauss[]={
+	0x172, 0x519, 0x176, 0x000, 0x16E, 0x519, 0x17A, 0x000, 
+	0x16A, 0x518, 0x17D, 0x000, 0x166, 0x518, 0x181, 0x000, 
+	0x162, 0x518, 0x185, 0x000, 0x15F, 0x518, 0x189, 0x000, 
+	0x15B, 0x518, 0x18D, 0x000, 0x157, 0x517, 0x191, 0x000, 
+	0x153, 0x517, 0x195, 0x000, 0x150, 0x517, 0x19A, 0x000, 
+	0x14C, 0x516, 0x19E, 0x000, 0x148, 0x516, 0x1A2, 0x000, 
+	0x145, 0x515, 0x1A6, 0x000, 0x141, 0x514, 0x1AA, 0x000, 
+	0x13E, 0x514, 0x1AE, 0x000, 0x13A, 0x513, 0x1B2, 0x000, 
+	0x137, 0x512, 0x1B7, 0x001, 0x133, 0x511, 0x1BB, 0x001, 
+	0x130, 0x511, 0x1BF, 0x001, 0x12C, 0x510, 0x1C3, 0x001, 
+	0x129, 0x50F, 0x1C8, 0x001, 0x125, 0x50E, 0x1CC, 0x001, 
+	0x122, 0x50D, 0x1D0, 0x001, 0x11E, 0x50C, 0x1D5, 0x001, 
+	0x11B, 0x50B, 0x1D9, 0x001, 0x118, 0x50A, 0x1DD, 0x001, 
+	0x114, 0x508, 0x1E2, 0x001, 0x111, 0x507, 0x1E6, 0x002, 
+	0x10E, 0x506, 0x1EB, 0x002, 0x10B, 0x504, 0x1EF, 0x002, 
+	0x107, 0x503, 0x1F3, 0x002, 0x104, 0x502, 0x1F8, 0x002, 
+	0x101, 0x500, 0x1FC, 0x002, 0x0FE, 0x4FF, 0x201, 0x002, 
+	0x0FB, 0x4FD, 0x205, 0x003, 0x0F8, 0x4FB, 0x20A, 0x003, 
+	0x0F5, 0x4FA, 0x20F, 0x003, 0x0F2, 0x4F8, 0x213, 0x003, 
+	0x0EF, 0x4F6, 0x218, 0x003, 0x0EC, 0x4F5, 0x21C, 0x004, 
+	0x0E9, 0x4F3, 0x221, 0x004, 0x0E6, 0x4F1, 0x226, 0x004, 
+	0x0E3, 0x4EF, 0x22A, 0x004, 0x0E0, 0x4ED, 0x22F, 0x004, 
+	0x0DD, 0x4EB, 0x233, 0x005, 0x0DA, 0x4E9, 0x238, 0x005, 
+	0x0D7, 0x4E7, 0x23D, 0x005, 0x0D4, 0x4E5, 0x241, 0x005, 
+	0x0D2, 0x4E3, 0x246, 0x006, 0x0CF, 0x4E0, 0x24B, 0x006, 
+	0x0CC, 0x4DE, 0x250, 0x006, 0x0C9, 0x4DC, 0x254, 0x006, 
+	0x0C7, 0x4D9, 0x259, 0x007, 0x0C4, 0x4D7, 0x25E, 0x007, 
+	0x0C1, 0x4D5, 0x263, 0x007, 0x0BF, 0x4D2, 0x267, 0x008, 
+	0x0BC, 0x4D0, 0x26C, 0x008, 0x0BA, 0x4CD, 0x271, 0x008, 
+	0x0B7, 0x4CB, 0x276, 0x009, 0x0B4, 0x4C8, 0x27B, 0x009, 
+	0x0B2, 0x4C5, 0x280, 0x009, 0x0AF, 0x4C3, 0x284, 0x00A, 
+	0x0AD, 0x4C0, 0x289, 0x00A, 0x0AB, 0x4BD, 0x28E, 0x00A, 
+	0x0A8, 0x4BA, 0x293, 0x00B, 0x0A6, 0x4B7, 0x298, 0x00B, 
+	0x0A3, 0x4B5, 0x29D, 0x00B, 0x0A1, 0x4B2, 0x2A2, 0x00C, 
+	0x09F, 0x4AF, 0x2A6, 0x00C, 0x09C, 0x4AC, 0x2AB, 0x00D, 
+	0x09A, 0x4A9, 0x2B0, 0x00D, 0x098, 0x4A6, 0x2B5, 0x00E, 
+	0x096, 0x4A2, 0x2BA, 0x00E, 0x093, 0x49F, 0x2BF, 0x00F, 
+	0x091, 0x49C, 0x2C4, 0x00F, 0x08F, 0x499, 0x2C9, 0x00F, 
+	0x08D, 0x496, 0x2CE, 0x010, 0x08B, 0x492, 0x2D3, 0x010, 
+	0x089, 0x48F, 0x2D8, 0x011, 0x086, 0x48C, 0x2DC, 0x011, 
+	0x084, 0x488, 0x2E1, 0x012, 0x082, 0x485, 0x2E6, 0x013, 
+	0x080, 0x481, 0x2EB, 0x013, 0x07E, 0x47E, 0x2F0, 0x014, 
+	0x07C, 0x47A, 0x2F5, 0x014, 0x07A, 0x477, 0x2FA, 0x015, 
+	0x078, 0x473, 0x2FF, 0x015, 0x076, 0x470, 0x304, 0x016, 
+	0x075, 0x46C, 0x309, 0x017, 0x073, 0x468, 0x30E, 0x017, 
+	0x071, 0x465, 0x313, 0x018, 0x06F, 0x461, 0x318, 0x018, 
+	0x06D, 0x45D, 0x31D, 0x019, 0x06B, 0x459, 0x322, 0x01A, 
+	0x06A, 0x455, 0x326, 0x01B, 0x068, 0x452, 0x32B, 0x01B, 
+	0x066, 0x44E, 0x330, 0x01C, 0x064, 0x44A, 0x335, 0x01D, 
+	0x063, 0x446, 0x33A, 0x01D, 0x061, 0x442, 0x33F, 0x01E, 
+	0x05F, 0x43E, 0x344, 0x01F, 0x05E, 0x43A, 0x349, 0x020, 
+	0x05C, 0x436, 0x34E, 0x020, 0x05A, 0x432, 0x353, 0x021, 
+	0x059, 0x42E, 0x357, 0x022, 0x057, 0x42A, 0x35C, 0x023, 
+	0x056, 0x425, 0x361, 0x024, 0x054, 0x421, 0x366, 0x024, 
+	0x053, 0x41D, 0x36B, 0x025, 0x051, 0x419, 0x370, 0x026, 
+	0x050, 0x415, 0x374, 0x027, 0x04E, 0x410, 0x379, 0x028, 
+	0x04D, 0x40C, 0x37E, 0x029, 0x04C, 0x408, 0x383, 0x02A, 
+	0x04A, 0x403, 0x388, 0x02B, 0x049, 0x3FF, 0x38C, 0x02C, 
+	0x047, 0x3FB, 0x391, 0x02D, 0x046, 0x3F6, 0x396, 0x02E, 
+	0x045, 0x3F2, 0x39B, 0x02F, 0x043, 0x3ED, 0x39F, 0x030, 
+	0x042, 0x3E9, 0x3A4, 0x031, 0x041, 0x3E5, 0x3A9, 0x032, 
+	0x040, 0x3E0, 0x3AD, 0x033, 0x03E, 0x3DC, 0x3B2, 0x034, 
+	0x03D, 0x3D7, 0x3B7, 0x035, 0x03C, 0x3D2, 0x3BB, 0x036, 
+	0x03B, 0x3CE, 0x3C0, 0x037, 0x03A, 0x3C9, 0x3C5, 0x038, 
+	0x038, 0x3C5, 0x3C9, 0x03A, 0x037, 0x3C0, 0x3CE, 0x03B, 
+	0x036, 0x3BB, 0x3D2, 0x03C, 0x035, 0x3B7, 0x3D7, 0x03D, 
+	0x034, 0x3B2, 0x3DC, 0x03E, 0x033, 0x3AD, 0x3E0, 0x040, 
+	0x032, 0x3A9, 0x3E5, 0x041, 0x031, 0x3A4, 0x3E9, 0x042, 
+	0x030, 0x39F, 0x3ED, 0x043, 0x02F, 0x39B, 0x3F2, 0x045, 
+	0x02E, 0x396, 0x3F6, 0x046, 0x02D, 0x391, 0x3FB, 0x047, 
+	0x02C, 0x38C, 0x3FF, 0x049, 0x02B, 0x388, 0x403, 0x04A, 
+	0x02A, 0x383, 0x408, 0x04C, 0x029, 0x37E, 0x40C, 0x04D, 
+	0x028, 0x379, 0x410, 0x04E, 0x027, 0x374, 0x415, 0x050, 
+	0x026, 0x370, 0x419, 0x051, 0x025, 0x36B, 0x41D, 0x053, 
+	0x024, 0x366, 0x421, 0x054, 0x024, 0x361, 0x425, 0x056, 
+	0x023, 0x35C, 0x42A, 0x057, 0x022, 0x357, 0x42E, 0x059, 
+	0x021, 0x353, 0x432, 0x05A, 0x020, 0x34E, 0x436, 0x05C, 
+	0x020, 0x349, 0x43A, 0x05E, 0x01F, 0x344, 0x43E, 0x05F, 
+	0x01E, 0x33F, 0x442, 0x061, 0x01D, 0x33A, 0x446, 0x063, 
+	0x01D, 0x335, 0x44A, 0x064, 0x01C, 0x330, 0x44E, 0x066, 
+	0x01B, 0x32B, 0x452, 0x068, 0x01B, 0x326, 0x455, 0x06A, 
+	0x01A, 0x322, 0x459, 0x06B, 0x019, 0x31D, 0x45D, 0x06D, 
+	0x018, 0x318, 0x461, 0x06F, 0x018, 0x313, 0x465, 0x071, 
+	0x017, 0x30E, 0x468, 0x073, 0x017, 0x309, 0x46C, 0x075, 
+	0x016, 0x304, 0x470, 0x076, 0x015, 0x2FF, 0x473, 0x078, 
+	0x015, 0x2FA, 0x477, 0x07A, 0x014, 0x2F5, 0x47A, 0x07C, 
+	0x014, 0x2F0, 0x47E, 0x07E, 0x013, 0x2EB, 0x481, 0x080, 
+	0x013, 0x2E6, 0x485, 0x082, 0x012, 0x2E1, 0x488, 0x084, 
+	0x011, 0x2DC, 0x48C, 0x086, 0x011, 0x2D8, 0x48F, 0x089, 
+	0x010, 0x2D3, 0x492, 0x08B, 0x010, 0x2CE, 0x496, 0x08D, 
+	0x00F, 0x2C9, 0x499, 0x08F, 0x00F, 0x2C4, 0x49C, 0x091, 
+	0x00F, 0x2BF, 0x49F, 0x093, 0x00E, 0x2BA, 0x4A2, 0x096, 
+	0x00E, 0x2B5, 0x4A6, 0x098, 0x00D, 0x2B0, 0x4A9, 0x09A, 
+	0x00D, 0x2AB, 0x4AC, 0x09C, 0x00C, 0x2A6, 0x4AF, 0x09F, 
+	0x00C, 0x2A2, 0x4B2, 0x0A1, 0x00B, 0x29D, 0x4B5, 0x0A3, 
+	0x00B, 0x298, 0x4B7, 0x0A6, 0x00B, 0x293, 0x4BA, 0x0A8, 
+	0x00A, 0x28E, 0x4BD, 0x0AB, 0x00A, 0x289, 0x4C0, 0x0AD, 
+	0x00A, 0x284, 0x4C3, 0x0AF, 0x009, 0x280, 0x4C5, 0x0B2, 
+	0x009, 0x27B, 0x4C8, 0x0B4, 0x009, 0x276, 0x4CB, 0x0B7, 
+	0x008, 0x271, 0x4CD, 0x0BA, 0x008, 0x26C, 0x4D0, 0x0BC, 
+	0x008, 0x267, 0x4D2, 0x0BF, 0x007, 0x263, 0x4D5, 0x0C1, 
+	0x007, 0x25E, 0x4D7, 0x0C4, 0x007, 0x259, 0x4D9, 0x0C7, 
+	0x006, 0x254, 0x4DC, 0x0C9, 0x006, 0x250, 0x4DE, 0x0CC, 
+	0x006, 0x24B, 0x4E0, 0x0CF, 0x006, 0x246, 0x4E3, 0x0D2, 
+	0x005, 0x241, 0x4E5, 0x0D4, 0x005, 0x23D, 0x4E7, 0x0D7, 
+	0x005, 0x238, 0x4E9, 0x0DA, 0x005, 0x233, 0x4EB, 0x0DD, 
+	0x004, 0x22F, 0x4ED, 0x0E0, 0x004, 0x22A, 0x4EF, 0x0E3, 
+	0x004, 0x226, 0x4F1, 0x0E6, 0x004, 0x221, 0x4F3, 0x0E9, 
+	0x004, 0x21C, 0x4F5, 0x0EC, 0x003, 0x218, 0x4F6, 0x0EF, 
+	0x003, 0x213, 0x4F8, 0x0F2, 0x003, 0x20F, 0x4FA, 0x0F5, 
+	0x003, 0x20A, 0x4FB, 0x0F8, 0x003, 0x205, 0x4FD, 0x0FB, 
+	0x002, 0x201, 0x4FF, 0x0FE, 0x002, 0x1FC, 0x500, 0x101, 
+	0x002, 0x1F8, 0x502, 0x104, 0x002, 0x1F3, 0x503, 0x107, 
+	0x002, 0x1EF, 0x504, 0x10B, 0x002, 0x1EB, 0x506, 0x10E, 
+	0x002, 0x1E6, 0x507, 0x111, 0x001, 0x1E2, 0x508, 0x114, 
+	0x001, 0x1DD, 0x50A, 0x118, 0x001, 0x1D9, 0x50B, 0x11B, 
+	0x001, 0x1D5, 0x50C, 0x11E, 0x001, 0x1D0, 0x50D, 0x122, 
+	0x001, 0x1CC, 0x50E, 0x125, 0x001, 0x1C8, 0x50F, 0x129, 
+	0x001, 0x1C3, 0x510, 0x12C, 0x001, 0x1BF, 0x511, 0x130, 
+	0x001, 0x1BB, 0x511, 0x133, 0x001, 0x1B7, 0x512, 0x137, 
+	0x000, 0x1B2, 0x513, 0x13A, 0x000, 0x1AE, 0x514, 0x13E, 
+	0x000, 0x1AA, 0x514, 0x141, 0x000, 0x1A6, 0x515, 0x145, 
+	0x000, 0x1A2, 0x516, 0x148, 0x000, 0x19E, 0x516, 0x14C, 
+	0x000, 0x19A, 0x517, 0x150, 0x000, 0x195, 0x517, 0x153, 
+	0x000, 0x191, 0x517, 0x157, 0x000, 0x18D, 0x518, 0x15B, 
+	0x000, 0x189, 0x518, 0x15F, 0x000, 0x185, 0x518, 0x162, 
+	0x000, 0x181, 0x518, 0x166, 0x000, 0x17D, 0x518, 0x16A, 
+	0x000, 0x17A, 0x519, 0x16E, 0x000, 0x176, 0x519, 0x172};
+#endif

pcsxr-1.9.93.tar.bz2/plugins/dfsound/openal.c Added

@@ -0,0 +1,313 @@
+/***************************************************************************
+ * Copyright (C) 2011 by Blade_Arma *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
+ ***************************************************************************/
+
+#include "stdafx.h"
+
+#define _IN_OSS
+
+#include "externals.h"
+
+#ifdef __APPLE__
+#include <OpenAL/al.h>
+#include <OpenAL/alc.h>
+#else
+#include <AL/al.h>
+#include <AL/alc.h>
+#endif
+
+/******************************************************************************/
+/* Defines.
+ */
+
+#define BUFFER_SIZE_TOTAL (32768)
+#define BUFFER_SIZE (1024)
+#define BUFFER_QUANTITY (BUFFER_SIZE_TOTAL / BUFFER_SIZE)
+
+/******************************************************************************/
+/* Variables.
+ */
+
+static ALCdevice *pDevice;
+static ALCcontext *pContext;
+
+// Buffers hold sound data.
+static ALuint buffers[BUFFER_QUANTITY];
+
+// Sources are points emitting sound.
+static ALuint source;
+
+// Position of the source sound.
+static ALfloat SourcePos[] = {0.0, 0.0, 0.0};
+
+// Velocity of the source sound.
+static ALfloat SourceVel[] = {0.0, 0.0, 0.0};
+
+// Direction of the source sound.
+static ALfloat SourceDir[] = {0.0, 0.0, 0.0};
+
+// Position of the listener.
+static ALfloat ListenerPos[] = {0.0, 0.0, 0.0};
+
+// Velocity of the listener.
+static ALfloat ListenerVel[] = {0.0, 0.0, 0.0};
+
+// Orientation of the listener. (first 3 elements are "at", second 3 are "up")
+static ALfloat ListenerOri[] = {0.0, 0.0, -1.0, 0.0, 1.0, 0.0};
+
+static ALenum format = AL_FORMAT_STEREO16;
+static ALuint sampleRate = 44100;
+ 
+static ALuint UNUSED_VARIABLE sampleQuality = 16;
+static ALuint UNUSED_VARIABLE channels = 2;
+
+/******************************************************************************/
+/* Error handling.
+ */
+
+char* GetALErrorString(ALenum error)
+{
+ switch(error)
+ {
+ case AL_NO_ERROR:
+ return 0;
+ case AL_INVALID_NAME:
+ return "AL_INVALID_NAME";
+ case AL_INVALID_ENUM:
+ return "AL_INVALID_ENUM";
+ case AL_INVALID_VALUE:
+ return "AL_INVALID_VALUE";
+ case AL_INVALID_OPERATION:
+ return "AL_INVALID_OPERATION";
+ case AL_OUT_OF_MEMORY:
+ return "AL_OUT_OF_MEMORY";
+ };
+ 
+ return "AL_UNKNOWN_ERROR";
+}
+
+char* GetALCErrorString(ALenum error)
+{
+ switch(error)
+ {
+ case ALC_NO_ERROR:
+ return 0;
+ case ALC_INVALID_DEVICE:
+ return "ALC_INVALID_DEVICE";
+ case ALC_INVALID_CONTEXT:
+ return "ALC_INVALID_CONTEXT";
+ case ALC_INVALID_ENUM:
+ return "ALC_INVALID_ENUM";
+ case ALC_INVALID_VALUE:
+ return "ALC_INVALID_VALUE";
+ case ALC_OUT_OF_MEMORY:
+ return "ALC_OUT_OF_MEMORY";
+ };
+
+ return "ALC_UNKNOWN_ERROR";
+}
+
+int checkALError()
+{
+ char *pErrorString = GetALErrorString(alGetError());
+ if(pErrorString)
+ {
+ fprintf(stderr, "[SPU] AL: %s.\n", pErrorString);
+ return -1;
+ }
+ 
+ return 0;
+}
+
+int checkALCError()
+{
+ char *pErrorString = GetALCErrorString(alcGetError(pDevice));
+ if(pErrorString)
+ {
+ fprintf(stderr, "[SPU] ALC: %s.\n", pErrorString);
+ return -1;
+ }
+ 
+ return 0;
+}
+
+/******************************************************************************/
+
+void SetupSound()
+{
+ unsigned char buf[BUFFER_SIZE];
+ int i;
+ 
+ // Get handle to device.
+ pDevice = alcOpenDevice(NULL);
+ if(checkALCError())
+ {
+ fprintf(stderr, "[SPU] alcOpenDevice failed.\n");
+ return;
+ }
+ 
+ // ALC info.
+ const ALCubyte* UNUSED_VARIABLE deviceName = (ALCubyte*)alcGetString(pDevice, ALC_DEVICE_SPECIFIER);
+ //printf("[SPU] ALC_DEVICE_SPECIFIER = %s.\n", deviceName);
+ 
+ const ALCubyte* UNUSED_VARIABLE extensionList = (ALCubyte*)alcGetString(pDevice, ALC_EXTENSIONS);
+ //printf("[SPU] ALC_EXTENSIONS = %s.\n", extensionList);
+ 
+ // Create audio context.
+ pContext = alcCreateContext(pDevice, NULL);
+ if(checkALCError())
+ {
+ fprintf(stderr, "[SPU] alcCreateContext failed.\n");
+ return;
+ }
+ 
+ // Set active context.
+ alcMakeContextCurrent( pContext );
+ if( checkALCError() )
+ {
+ fprintf(stderr, "[SPU] alcMakeContextCurrent failed.\n");
+ return;
+ }
+ 
+ // AL info.
+ const ALubyte* UNUSED_VARIABLE version = (ALubyte*)alGetString(AL_VERSION);
+ //printf("[SPU] AL_VERSION = %s.\n", version);
+ 
+ const ALubyte* UNUSED_VARIABLE renderer = (ALubyte*)alGetString(AL_RENDERER);
+ //printf("[SPU] AL_RENDERER = %s.\n", renderer);
+
+ const ALubyte* UNUSED_VARIABLE vendor = (ALubyte*)alGetString(AL_VENDOR);
+ //printf("[SPU] AL_VENDOR = %s.\n", vendor);
+ 
+ // Create buffers.
+ alGenBuffers(BUFFER_QUANTITY, buffers);
+ checkALError();
+ 
+ // Load sound data into a buffer.
+ memset(buf, 0x00, BUFFER_SIZE);
+ for(i = 0; i < BUFFER_QUANTITY; ++i)
+ {
+ alBufferData(buffers[i], format, buf, BUFFER_SIZE, sampleRate);
+ }
+ checkALError();
+ 
+ // Create source.
+ alGenSources(1, &source);
+ checkALError();
+ 
+ // Bind buffer with a source.
+ alSourcef (source, AL_PITCH, 1.0f );
+ alSourcef (source, AL_GAIN, 1.0f );
+ alSourcefv(source, AL_POSITION, SourcePos);
+ alSourcefv(source, AL_VELOCITY, SourceVel);
+ alSourcefv(source, AL_DIRECTION, SourceDir);
+ alSourcei (source, AL_SOURCE_RELATIVE, AL_TRUE );
+ alSourcei (source, AL_LOOPING, AL_FALSE );
+ 
+ // Listener properties.
+ alListenerfv(AL_POSITION, ListenerPos);
+ alListenerfv(AL_VELOCITY, ListenerVel);
+ alListenerfv(AL_ORIENTATION, ListenerOri);
+ 
+ // Add buffers to queue.
+ alSourceQueueBuffers(source, BUFFER_QUANTITY, buffers);
+ checkALError();
+ 
+ // Enable playing.
+ alSourcePlay(source);
+ checkALError();
+}
+
+void RemoveSound()
+{
+ alSourceStop(source);
+ checkALError();
+ alDeleteSources(1, &source);
+ checkALError();
+ alDeleteBuffers(BUFFER_QUANTITY, buffers);
+ checkALError();
+ 
+ // Reset the current context to NULL.
+ alcMakeContextCurrent(NULL);
+ checkALCError();
+ 
+ // RELEASE the context and the device.
+ alcDestroyContext(pContext);
+ checkALCError();
+ alcCloseDevice(pDevice);
+}
+
+/******************************************************************************/
+
+unsigned long SoundGetBytesBuffered()
+{
+ ALint processed;
+	int buffered;
+	
+ alGetSourcei(source, AL_BUFFERS_PROCESSED, &processed);
+ checkALError();
+	
+	buffered = BUFFER_SIZE_TOTAL - processed * BUFFER_SIZE;
+ //printf("[SPU] SoundGetBytesBuffered: %i\n", buffered);
+ 
+ return buffered;
+}
+
+/******************************************************************************/
+
+void SoundFeedStreamData(unsigned char *pData, long lBytes)
+{
+ ALint processed;
+ ALint state;
+ ALuint buffer;
+ int needed;
+ int i;
+
+ //printf("[SPU] SoundFeedStreamData: %i\n", lBytes);
+ 
+ needed = (lBytes + (BUFFER_SIZE - 1)) / BUFFER_SIZE;
+ 
+ // Expect free buffer.
+	alGetSourcei(source, AL_BUFFERS_PROCESSED, &processed);
+ while(processed < needed)
+ {
+ usleep(1);
+ alGetSourcei(source, AL_BUFFERS_PROCESSED, &processed);
+ }
+	
+ // Add buffers to queue.
+ for(i = 0; i < needed; ++i)
+ {
+ alSourceUnqueueBuffers(source, 1, &buffer); 
+ alBufferData(buffer, format, pData, lBytes > BUFFER_SIZE ? BUFFER_SIZE : lBytes, sampleRate); 
+ alSourceQueueBuffers(source, 1, &buffer);
+ lBytes -= BUFFER_SIZE;
+ pData += BUFFER_SIZE;
+ }
+ 
+ // Restart playing.
+ alGetSourcei(source, AL_SOURCE_STATE, &state);
+ if(state != AL_PLAYING)
+ {
+ //fprintf(stderr, "[SPU] AL_SOURCE_STATE != AL_PLAYING: %x\n", state);
+ alSourcePlay(source);
+ checkALError();
+ }
+}
+
+/******************************************************************************/

pcsxr-1.9.92.tar.bz2/plugins/dfsound/psemuxa.h -> pcsxr-1.9.93.tar.bz2/plugins/dfsound/psemuxa.h Changed

@@ -1,28 +1,28 @@
-//============================================
-//=== Audio XA decoding
-//=== Kazzuya
-//============================================
-
-#ifndef DECODEXA_H
-#define DECODEXA_H
-
-typedef struct
-{
-	long	y0, y1;
-} ADPCM_Decode_t;
-
-typedef struct
-{                                                                   
-	int				freq;
-	int				nbits;
-	int				stereo;
-	int				nsamples;
-	ADPCM_Decode_t	left, right;
-	short			pcm[16384];
-} xa_decode_t;
-
-long xa_decode_sector( xa_decode_t *xdp,
-					   unsigned char *sectorp,
-					   int is_first_sector );
-
-#endif
+//============================================
+//=== Audio XA decoding
+//=== Kazzuya
+//============================================
+
+#ifndef DECODEXA_H
+#define DECODEXA_H
+
+typedef struct
+{
+	int	y0, y1;
+} ADPCM_Decode_t;
+
+typedef struct
+{                                                                   
+	int				freq;
+	int				nbits;
+	int				stereo;
+	int				nsamples;
+	ADPCM_Decode_t	left, right;
+	short			pcm[16384];
+} xa_decode_t;
+
+long xa_decode_sector( xa_decode_t *xdp,
+					   unsigned char *sectorp,
+					   int is_first_sector );
+
+#endif

pcsxr-1.9.92.tar.bz2/plugins/dfsound/pulseaudio.c -> pcsxr-1.9.93.tar.bz2/plugins/dfsound/pulseaudio.c Changed

@@ -150,7 +150,7 @@
 
      // Acquire context ////////////////////////////////////////////////////////
      device.api = pa_threaded_mainloop_get_api (device.mainloop);
-     device.context = pa_context_new (device.api, "PCSX");
+     device.context = pa_context_new (device.api, "PCSXR");
      pa_context_set_state_callback (device.context, context_state_cb, &device);
 
      if (device.context == NULL)
@@ -188,8 +188,8 @@
 	  }
 	  else if (context_state == PA_CONTEXT_READY)
 	       break;
-	  else
-	       fprintf (stderr, "PulseAudio context state is %d\n", context_state);
+	  //else
+	  //     fprintf (stderr, "PulseAudio context state is %d\n", context_state);
 	  pa_threaded_mainloop_wait (device.mainloop);
      }
 
@@ -214,7 +214,7 @@
      //fprintf (stderr, "Target buffer size: %lu\n", buffer_attributes.tlength);
 
      // Acquire new stream using spec //////////////////////////////////////////
-     device.stream = pa_stream_new (device.context, "PCSX", &device.spec, NULL);
+     device.stream = pa_stream_new (device.context, "PCSXR", &device.spec, NULL);
      if (device.stream == NULL)
      {
 	  error_number = pa_context_errno (device.context);
@@ -253,14 +253,14 @@
 	       fprintf (stderr, "Stream state is not good: %s\n", pa_strerror (error_number));
 	       return;
 	  }
-	  else
-	       fprintf (stderr, "PulseAudio stream state is %d\n", stream_state);
+	  //else
+	  //     fprintf (stderr, "PulseAudio stream state is %d\n", stream_state);
 	  pa_threaded_mainloop_wait (device.mainloop);
      }
 
      pa_threaded_mainloop_unlock (device.mainloop);
 
-     fprintf  (stderr, "PulseAudio should be connected\n");
+     //fprintf  (stderr, "PulseAudio should be connected\n");
      return;
 }

pcsxr-1.9.92.tar.bz2/plugins/dfsound/registers.c -> pcsxr-1.9.93.tar.bz2/plugins/dfsound/registers.c Changed

@@ -1,589 +1,683 @@
-/***************************************************************************
- registers.c - description
- -------------------
- begin : Wed May 15 2002
- copyright : (C) 2002 by Pete Bernert
- email : BlackDove@addcom.de
- ***************************************************************************/
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. See also the license.txt file for *
- * additional informations. *
- * *
- ***************************************************************************/
-
-#include "stdafx.h"
-
-#define _IN_REGISTERS
-
-#include "externals.h"
-#include "registers.h"
-#include "regs.h"
-#include "reverb.h"
-
-/*
-// adsr time values (in ms) by James Higgs ... see the end of
-// the adsr.c source for details
-
-#define ATTACK_MS 514L
-#define DECAYHALF_MS 292L
-#define DECAY_MS 584L
-#define SUSTAIN_MS 450L
-#define RELEASE_MS 446L
-*/
-
-// we have a timebase of 1.020408f ms, not 1 ms... so adjust adsr defines
-#define ATTACK_MS 494L
-#define DECAYHALF_MS 286L
-#define DECAY_MS 572L
-#define SUSTAIN_MS 441L
-#define RELEASE_MS 437L
-
-////////////////////////////////////////////////////////////////////////
-// WRITE REGISTERS: called by main emu
-////////////////////////////////////////////////////////////////////////
-
-void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val)
-{
- const unsigned long r=reg&0xfff;
- regArea[(r-0xc00)>>1] = val;
-
- if(r>=0x0c00 && r<0x0d80) // some channel info?
- {
- int ch=(r>>4)-0xc0; // calc channel
- switch(r&0x0f)
- {
- //------------------------------------------------// r volume
- case 0: 
- SetVolumeL((unsigned char)ch,val);
- break;
- //------------------------------------------------// l volume
- case 2: 
- SetVolumeR((unsigned char)ch,val);
- break;
- //------------------------------------------------// pitch
- case 4: 
- SetPitch(ch,val);
- break;
- //------------------------------------------------// start
- case 6: 
- s_chan[ch].pStart=spuMemC+((unsigned long) val<<3);
- break;
- //------------------------------------------------// level with pre-calcs
- case 8:
- {
- const unsigned long lval=val;unsigned long lx;
- //---------------------------------------------//
- s_chan[ch].ADSRX.AttackModeExp=(lval&0x8000)?1:0; 
- s_chan[ch].ADSRX.AttackRate=(lval>>8) & 0x007f;
- s_chan[ch].ADSRX.DecayRate=(lval>>4) & 0x000f;
- s_chan[ch].ADSRX.SustainLevel=lval & 0x000f;
- //---------------------------------------------//
- if(!iDebugMode) break;
- //---------------------------------------------// stuff below is only for debug mode
-
- s_chan[ch].ADSR.AttackModeExp=(lval&0x8000)?1:0; //0x007f
-
- lx=(((lval>>8) & 0x007f)>>2); // attack time to run from 0 to 100% volume
- lx=min(31,lx); // no overflow on shift!
- if(lx) 
- { 
- lx = (1<<lx);
- if(lx<2147483) lx=(lx*ATTACK_MS)/10000L; // another overflow check
- else lx=(lx/10000L)*ATTACK_MS;
- if(!lx) lx=1;
- }
- s_chan[ch].ADSR.AttackTime=lx; 
-
- s_chan[ch].ADSR.SustainLevel= // our adsr vol runs from 0 to 1024, so scale the sustain level
- (1024*((lval) & 0x000f))/15;
-
- lx=(lval>>4) & 0x000f; // decay:
- if(lx) // our const decay value is time it takes from 100% to 0% of volume
- {
- lx = ((1<<(lx))*DECAY_MS)/10000L;
- if(!lx) lx=1;
- }
- s_chan[ch].ADSR.DecayTime = // so calc how long does it take to run from 100% to the wanted sus level
- (lx*(1024-s_chan[ch].ADSR.SustainLevel))/1024;
- }
- break;
- //------------------------------------------------// adsr times with pre-calcs
- case 10:
- {
- const unsigned long lval=val;unsigned long lx;
-
- //----------------------------------------------//
- s_chan[ch].ADSRX.SustainModeExp = (lval&0x8000)?1:0;
- s_chan[ch].ADSRX.SustainIncrease= (lval&0x4000)?0:1;
- s_chan[ch].ADSRX.SustainRate = (lval>>6) & 0x007f;
- s_chan[ch].ADSRX.ReleaseModeExp = (lval&0x0020)?1:0;
- s_chan[ch].ADSRX.ReleaseRate = lval & 0x001f;
- //----------------------------------------------//
- if(!iDebugMode) break;
- //----------------------------------------------// stuff below is only for debug mode
-
- s_chan[ch].ADSR.SustainModeExp = (lval&0x8000)?1:0;
- s_chan[ch].ADSR.ReleaseModeExp = (lval&0x0020)?1:0;
- 
- lx=((((lval>>6) & 0x007f)>>2)); // sustain time... often very high
- lx=min(31,lx); // values are used to hold the volume
- if(lx) // until a sound stop occurs
- { // the highest value we reach (due to 
- lx = (1<<lx); // overflow checking) is: 
- if(lx<2147483) lx=(lx*SUSTAIN_MS)/10000L; // 94704 seconds = 1578 minutes = 26 hours... 
- else lx=(lx/10000L)*SUSTAIN_MS; // should be enuff... if the stop doesn't 
- if(!lx) lx=1; // come in this time span, I don't care :)
- }
- s_chan[ch].ADSR.SustainTime = lx;
-
- lx=(lval & 0x001f);
- s_chan[ch].ADSR.ReleaseVal =lx;
- if(lx) // release time from 100% to 0%
- { // note: the release time will be
- lx = (1<<lx); // adjusted when a stop is coming,
- if(lx<2147483) lx=(lx*RELEASE_MS)/10000L; // so at this time the adsr vol will 
- else lx=(lx/10000L)*RELEASE_MS; // run from (current volume) to 0%
- if(!lx) lx=1;
- }
- s_chan[ch].ADSR.ReleaseTime=lx;
-
- if(lval & 0x4000) // add/dec flag
- s_chan[ch].ADSR.SustainModeDec=-1;
- else s_chan[ch].ADSR.SustainModeDec=1;
- }
- break;
- //------------------------------------------------// adsr volume... mmm have to investigate this
- case 12:
- break;
- //------------------------------------------------//
- case 14: // loop?
- //WaitForSingleObject(s_chan[ch].hMutex,2000); // -> no multithread fuckups
- s_chan[ch].pLoop=spuMemC+((unsigned long) val<<3);
- s_chan[ch].bIgnoreLoop=1;
- //ReleaseMutex(s_chan[ch].hMutex); // -> oki, on with the thread
- break;
- //------------------------------------------------//
- }
- iSpuAsyncWait=0;
- return;
- }
-
- switch(r)
- {
- //-------------------------------------------------//
- case H_SPUaddr:
- spuAddr = (unsigned long) val<<3;
- break;
- //-------------------------------------------------//
- case H_SPUdata:
- spuMem[spuAddr>>1] = val;
- spuAddr+=2;
- if(spuAddr>0x7ffff) spuAddr=0;
- break;
- //-------------------------------------------------//
- case H_SPUctrl:
- spuCtrl=val;
- break;
- //-------------------------------------------------//
- case H_SPUstat:
- spuStat=val & 0xf800;
- break;
- //-------------------------------------------------//
- case H_SPUReverbAddr:
- if(val==0xFFFF || val<=0x200)
- {rvb.StartAddr=rvb.CurrAddr=0;}
- else
- {
- const long iv=(unsigned long)val<<2;
- if(rvb.StartAddr!=iv)
- {
- rvb.StartAddr=(unsigned long)val<<2;
- rvb.CurrAddr=rvb.StartAddr;
- }
- }
- break;
- //-------------------------------------------------//
- case H_SPUirqAddr:
- spuIrq = val;
- pSpuIrq=spuMemC+((unsigned long) val<<3);
- break;
- //-------------------------------------------------//
- case H_SPUrvolL:
- rvb.VolLeft=val;
- break;
- //-------------------------------------------------//
- case H_SPUrvolR:
- rvb.VolRight=val;
- break;
- //-------------------------------------------------//
-
-/*
- case H_ExtLeft:
- //auxprintf("EL %d\n",val);
- break;
- //-------------------------------------------------//
- case H_ExtRight:
- //auxprintf("ER %d\n",val);
- break;
- //-------------------------------------------------//
- case H_SPUmvolL:
- //auxprintf("ML %d\n",val);
- break;
- //-------------------------------------------------//
- case H_SPUmvolR:
- //auxprintf("MR %d\n",val);
- break;
- //-------------------------------------------------//
- case H_SPUMute1:
- //auxprintf("M0 %04x\n",val);
- break;
- //-------------------------------------------------//
- case H_SPUMute2:
- //auxprintf("M1 %04x\n",val);
- break;
-*/
- //-------------------------------------------------//
- case H_SPUon1:
- SoundOn(0,16,val);
- break;
- //-------------------------------------------------//
- case H_SPUon2:
- SoundOn(16,24,val);
- break;
- //-------------------------------------------------//
- case H_SPUoff1:
- SoundOff(0,16,val);
- break;
- //-------------------------------------------------//
- case H_SPUoff2:
- SoundOff(16,24,val);
- break;
- //-------------------------------------------------//
- case H_CDLeft:
- iLeftXAVol=val & 0x7fff;
- if(cddavCallback) cddavCallback(0,val);
- break;
- case H_CDRight:
- iRightXAVol=val & 0x7fff;
- if(cddavCallback) cddavCallback(1,val);
- break;
- //-------------------------------------------------//
- case H_FMod1:
- FModOn(0,16,val);
- break;
- //-------------------------------------------------//
- case H_FMod2:
- FModOn(16,24,val);
- break;
- //-------------------------------------------------//
- case H_Noise1:
- NoiseOn(0,16,val);
- break;
- //-------------------------------------------------//
- case H_Noise2:
- NoiseOn(16,24,val);
- break;
- //-------------------------------------------------//
- case H_RVBon1:
- ReverbOn(0,16,val);
- break;
- //-------------------------------------------------//
- case H_RVBon2:
- ReverbOn(16,24,val);
- break;
- //-------------------------------------------------//
- case H_Reverb+0:
-
- rvb.FB_SRC_A=val;
-
- // OK, here's the fake REVERB stuff...
- // depending on effect we do more or less delay and repeats... bah
- // still... better than nothing :)
-
- SetREVERB(val);
- break;
-
-
- case H_Reverb+2 : rvb.FB_SRC_B=(short)val; break;
- case H_Reverb+4 : rvb.IIR_ALPHA=(short)val; break;
- case H_Reverb+6 : rvb.ACC_COEF_A=(short)val; break;
- case H_Reverb+8 : rvb.ACC_COEF_B=(short)val; break;
- case H_Reverb+10 : rvb.ACC_COEF_C=(short)val; break;
- case H_Reverb+12 : rvb.ACC_COEF_D=(short)val; break;
- case H_Reverb+14 : rvb.IIR_COEF=(short)val; break;
- case H_Reverb+16 : rvb.FB_ALPHA=(short)val; break;
- case H_Reverb+18 : rvb.FB_X=(short)val; break;
- case H_Reverb+20 : rvb.IIR_DEST_A0=(short)val; break;
- case H_Reverb+22 : rvb.IIR_DEST_A1=(short)val; break;
- case H_Reverb+24 : rvb.ACC_SRC_A0=(short)val; break;
- case H_Reverb+26 : rvb.ACC_SRC_A1=(short)val; break;
- case H_Reverb+28 : rvb.ACC_SRC_B0=(short)val; break;
- case H_Reverb+30 : rvb.ACC_SRC_B1=(short)val; break;
- case H_Reverb+32 : rvb.IIR_SRC_A0=(short)val; break;
- case H_Reverb+34 : rvb.IIR_SRC_A1=(short)val; break;
- case H_Reverb+36 : rvb.IIR_DEST_B0=(short)val; break;
- case H_Reverb+38 : rvb.IIR_DEST_B1=(short)val; break;
- case H_Reverb+40 : rvb.ACC_SRC_C0=(short)val; break;
- case H_Reverb+42 : rvb.ACC_SRC_C1=(short)val; break;
- case H_Reverb+44 : rvb.ACC_SRC_D0=(short)val; break;
- case H_Reverb+46 : rvb.ACC_SRC_D1=(short)val; break;
- case H_Reverb+48 : rvb.IIR_SRC_B1=(short)val; break;
- case H_Reverb+50 : rvb.IIR_SRC_B0=(short)val; break;
- case H_Reverb+52 : rvb.MIX_DEST_A0=(short)val; break;
- case H_Reverb+54 : rvb.MIX_DEST_A1=(short)val; break;
- case H_Reverb+56 : rvb.MIX_DEST_B0=(short)val; break;
- case H_Reverb+58 : rvb.MIX_DEST_B1=(short)val; break;
- case H_Reverb+60 : rvb.IN_COEF_L=(short)val; break;
- case H_Reverb+62 : rvb.IN_COEF_R=(short)val; break;
- }
-
- iSpuAsyncWait=0;
-}
-
-////////////////////////////////////////////////////////////////////////
-// READ REGISTER: called by main emu
-////////////////////////////////////////////////////////////////////////
-
-unsigned short CALLBACK SPUreadRegister(unsigned long reg)
-{
- const unsigned long r=reg&0xfff;
- 
- iSpuAsyncWait=0;
-
- if(r>=0x0c00 && r<0x0d80)
- {
- switch(r&0x0f)
- {
- case 12: // get adsr vol
- {
- const int ch=(r>>4)-0xc0;
- if(s_chan[ch].bNew) return 1; // we are started, but not processed? return 1
- if(s_chan[ch].ADSRX.lVolume && // same here... we haven't decoded one sample yet, so no envelope yet. return 1 as well
- !s_chan[ch].ADSRX.EnvelopeVol) 
- return 1;
- return (unsigned short)(s_chan[ch].ADSRX.EnvelopeVol>>16);
- }
-
- case 14: // get loop address
- {
- const int ch=(r>>4)-0xc0;
- if(s_chan[ch].pLoop==NULL) return 0;
- return (unsigned short)((s_chan[ch].pLoop-spuMemC)>>3);
- }
- }
- }
-
- switch(r)
- {
- case H_SPUctrl:
- return spuCtrl;
-
- case H_SPUstat:
- return spuStat;
- 
- case H_SPUaddr:
- return (unsigned short)(spuAddr>>3);
-
- case H_SPUdata:
- {
- unsigned short s=spuMem[spuAddr>>1];
- spuAddr+=2;
- if(spuAddr>0x7ffff) spuAddr=0;
- return s;
- }
-
- case H_SPUirqAddr:
- return spuIrq;
-
- //case H_SPUIsOn1:
- // return IsSoundOn(0,16);
-
- //case H_SPUIsOn2:
- // return IsSoundOn(16,24);
- 
- }
-
- return regArea[(r-0xc00)>>1];
-}
- 
-////////////////////////////////////////////////////////////////////////
-// SOUND ON register write
-////////////////////////////////////////////////////////////////////////
-
-void SoundOn(int start,int end,unsigned short val) // SOUND ON PSX COMAND
-{
- int ch;
-
- for(ch=start;ch<end;ch++,val>>=1) // loop channels
- {
- if((val&1) && s_chan[ch].pStart) // mmm... start has to be set before key on !?!
- {
- s_chan[ch].bIgnoreLoop=0;
- s_chan[ch].bNew=1;
- dwNewChannel|=(1<<ch); // bitfield for faster testing
- }
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-// SOUND OFF register write
-////////////////////////////////////////////////////////////////////////
-
-void SoundOff(int start,int end,unsigned short val) // SOUND OFF PSX COMMAND
-{
- int ch;
- for(ch=start;ch<end;ch++,val>>=1) // loop channels
- {
- if(val&1) // && s_chan[i].bOn) mmm...
- {
- s_chan[ch].bStop=1;
- } 
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-// FMOD register write
-////////////////////////////////////////////////////////////////////////
-
-void FModOn(int start,int end,unsigned short val) // FMOD ON PSX COMMAND
-{
- int ch;
-
- for(ch=start;ch<end;ch++,val>>=1) // loop channels
- {
- if(val&1) // -> fmod on/off
- {
- if(ch>0) 
- {
- s_chan[ch].bFMod=1; // --> sound channel
- s_chan[ch-1].bFMod=2; // --> freq channel
- }
- }
- else
- {
- s_chan[ch].bFMod=0; // --> turn off fmod
- }
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-// NOISE register write
-////////////////////////////////////////////////////////////////////////
-
-void NoiseOn(int start,int end,unsigned short val) // NOISE ON PSX COMMAND
-{
- int ch;
-
- for(ch=start;ch<end;ch++,val>>=1) // loop channels
- {
- if(val&1) // -> noise on/off
- {
- s_chan[ch].bNoise=1;
- }
- else 
- {
- s_chan[ch].bNoise=0;
- }
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-// LEFT VOLUME register write
-////////////////////////////////////////////////////////////////////////
-
-// please note: sweep and phase invert are wrong... but I've never seen
-// them used
-
-void SetVolumeL(unsigned char ch,short vol) // LEFT VOLUME
-{
- s_chan[ch].iLeftVolRaw=vol;
-
- if(vol&0x8000) // sweep?
- {
- short sInc=1; // -> sweep up?
- if(vol&0x2000) sInc=-1; // -> or down?
- if(vol&0x1000) vol^=0xffff; // -> mmm... phase inverted? have to investigate this
- vol=((vol&0x7f)+1)/2; // -> sweep: 0..127 -> 0..64
- vol+=vol/(2*sInc); // -> HACK: we don't sweep right now, so we just raise/lower the volume by the half!
- vol*=128;
- }
- else // no sweep:
- {
- if(vol&0x4000) // -> mmm... phase inverted? have to investigate this
- //vol^=0xffff;
- vol=0x3fff-(vol&0x3fff);
- }
-
- vol&=0x3fff;
- s_chan[ch].iLeftVolume=vol; // store volume
-}
-
-////////////////////////////////////////////////////////////////////////
-// RIGHT VOLUME register write
-////////////////////////////////////////////////////////////////////////
-
-void SetVolumeR(unsigned char ch,short vol) // RIGHT VOLUME
-{
- s_chan[ch].iRightVolRaw=vol;
-
- if(vol&0x8000) // comments... see above :)
- {
- short sInc=1;
- if(vol&0x2000) sInc=-1;
- if(vol&0x1000) vol^=0xffff;
- vol=((vol&0x7f)+1)/2; 
- vol+=vol/(2*sInc);
- vol*=128;
- }
- else 
- {
- if(vol&0x4000) //vol=vol^=0xffff;
- vol=0x3fff-(vol&0x3fff);
- }
-
- vol&=0x3fff;
-
- s_chan[ch].iRightVolume=vol;
-}
-
-////////////////////////////////////////////////////////////////////////
-// PITCH register write
-////////////////////////////////////////////////////////////////////////
-
-void SetPitch(int ch,unsigned short val) // SET PITCH
-{
- int NP;
- if(val>0x3fff) NP=0x3fff; // get pitch val
- else NP=val;
-
- s_chan[ch].iRawPitch=NP;
-
- NP=(44100L*NP)/4096L; // calc frequency
- if(NP<1) NP=1; // some security
- s_chan[ch].iActFreq=NP; // store frequency
-}
-
-////////////////////////////////////////////////////////////////////////
-// REVERB register write
-////////////////////////////////////////////////////////////////////////
-
-void ReverbOn(int start,int end,unsigned short val) // REVERB ON PSX COMMAND
-{
- int ch;
-
- for(ch=start;ch<end;ch++,val>>=1) // loop channels
- {
- if(val&1) // -> reverb on/off
- {
- s_chan[ch].bReverb=1;
- }
- else 
- {
- s_chan[ch].bReverb=0;
- }
- }
-}
+/***************************************************************************
+ registers.c - description
+ -------------------
+ begin : Wed May 15 2002
+ copyright : (C) 2002 by Pete Bernert
+ email : BlackDove@addcom.de
+ ***************************************************************************/
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+#include "stdafx.h"
+
+#define _IN_REGISTERS
+
+#include "externals.h"
+#include "registers.h"
+#include "regs.h"
+#include "reverb.h"
+
+/*
+// adsr time values (in ms) by James Higgs ... see the end of
+// the adsr.c source for details
+
+#define ATTACK_MS 514L
+#define DECAYHALF_MS 292L
+#define DECAY_MS 584L
+#define SUSTAIN_MS 450L
+#define RELEASE_MS 446L
+*/
+
+// we have a timebase of 1.020408f ms, not 1 ms... so adjust adsr defines
+#define ATTACK_MS 494L
+#define DECAYHALF_MS 286L
+#define DECAY_MS 572L
+#define SUSTAIN_MS 441L
+#define RELEASE_MS 437L
+
+
+
+
+
+
+int Check_IRQ( int addr, int force ) {
+	if(spuCtrl & CTRL_IRQ) // some callback and irq active?
+	{
+		if( ( bIrqHit == 0 ) &&
+				( force == 1 || pSpuIrq == spuMemC+addr ) )
+		{
+			if(irqCallback)
+				irqCallback(); // -> call main emu
+
+			// one-time
+			bIrqHit = 1;
+			spuStat |= STAT_IRQ;
+
+#if 0
+			MessageBox( NULL, "IRQ", "SPU", MB_OK );
+#endif
+
+			return 1;
+		}
+	}
+
+
+	return 0;
+}
+
+
+
+////////////////////////////////////////////////////////////////////////
+// WRITE REGISTERS: called by main emu
+////////////////////////////////////////////////////////////////////////
+
+void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val)
+{
+ const unsigned long r=reg&0xfff;
+ regArea[(r-0xc00)>>1] = val;
+
+ if(r>=0x0c00 && r<0x0d80) // some channel info?
+ {
+ int ch=(r>>4)-0xc0; // calc channel
+ switch(r&0x0f)
+ {
+ //------------------------------------------------// r volume
+ case 0: 
+ SetVolumeL((unsigned char)ch,val);
+ break;
+ //------------------------------------------------// l volume
+ case 2: 
+ SetVolumeR((unsigned char)ch,val);
+ break;
+ //------------------------------------------------// pitch
+ case 4: 
+ SetPitch(ch,val);
+ break;
+ //------------------------------------------------// start
+ case 6: 
+			 // Brain Dead 13 - align to 16 boundary
+ s_chan[ch].pStart= spuMemC+(unsigned long)((val<<3)&~0xf);
+ break;
+ //------------------------------------------------// level with pre-calcs
+ case 8:
+ {
+ const unsigned long lval=val;unsigned long lx;
+ //---------------------------------------------//
+ s_chan[ch].ADSRX.AttackModeExp=(lval&0x8000)?1:0; 
+ s_chan[ch].ADSRX.AttackRate=(lval>>8) & 0x007f;
+ s_chan[ch].ADSRX.DecayRate=(lval>>4) & 0x000f;
+ s_chan[ch].ADSRX.SustainLevel=lval & 0x000f;
+ //---------------------------------------------//
+ if(!iDebugMode) break;
+ //---------------------------------------------// stuff below is only for debug mode
+
+ s_chan[ch].ADSR.AttackModeExp=(lval&0x8000)?1:0; //0x007f
+
+ lx=(((lval>>8) & 0x007f)>>2); // attack time to run from 0 to 100% volume
+ lx=min(31,lx); // no overflow on shift!
+ if(lx) 
+ { 
+ lx = (1<<lx);
+ if(lx<2147483) lx=(lx*ATTACK_MS)/10000L; // another overflow check
+ else lx=(lx/10000L)*ATTACK_MS;
+ if(!lx) lx=1;
+ }
+ s_chan[ch].ADSR.AttackTime=lx; 
+
+ s_chan[ch].ADSR.SustainLevel= // our adsr vol runs from 0 to 1024, so scale the sustain level
+ (1024*((lval) & 0x000f))/15;
+
+ lx=(lval>>4) & 0x000f; // decay:
+ if(lx) // our const decay value is time it takes from 100% to 0% of volume
+ {
+ lx = ((1<<(lx))*DECAY_MS)/10000L;
+ if(!lx) lx=1;
+ }
+ s_chan[ch].ADSR.DecayTime = // so calc how long does it take to run from 100% to the wanted sus level
+ (lx*(1024-s_chan[ch].ADSR.SustainLevel))/1024;
+ }
+ break;
+ //------------------------------------------------// adsr times with pre-calcs
+ case 10:
+ {
+ const unsigned long lval=val;unsigned long lx;
+
+ //----------------------------------------------//
+ s_chan[ch].ADSRX.SustainModeExp = (lval&0x8000)?1:0;
+ s_chan[ch].ADSRX.SustainIncrease= (lval&0x4000)?0:1;
+ s_chan[ch].ADSRX.SustainRate = (lval>>6) & 0x007f;
+ s_chan[ch].ADSRX.ReleaseModeExp = (lval&0x0020)?1:0;
+ s_chan[ch].ADSRX.ReleaseRate = lval & 0x001f;
+ //----------------------------------------------//
+ if(!iDebugMode) break;
+ //----------------------------------------------// stuff below is only for debug mode
+
+ s_chan[ch].ADSR.SustainModeExp = (lval&0x8000)?1:0;
+ s_chan[ch].ADSR.ReleaseModeExp = (lval&0x0020)?1:0;
+ 
+ lx=((((lval>>6) & 0x007f)>>2)); // sustain time... often very high
+ lx=min(31,lx); // values are used to hold the volume
+ if(lx) // until a sound stop occurs
+ { // the highest value we reach (due to 
+ lx = (1<<lx); // overflow checking) is: 
+ if(lx<2147483) lx=(lx*SUSTAIN_MS)/10000L; // 94704 seconds = 1578 minutes = 26 hours... 
+ else lx=(lx/10000L)*SUSTAIN_MS; // should be enuff... if the stop doesn't 
+ if(!lx) lx=1; // come in this time span, I don't care :)
+ }
+ s_chan[ch].ADSR.SustainTime = lx;
+
+ lx=(lval & 0x001f);
+ s_chan[ch].ADSR.ReleaseVal =lx;
+ if(lx) // release time from 100% to 0%
+ { // note: the release time will be
+ lx = (1<<lx); // adjusted when a stop is coming,
+ if(lx<2147483) lx=(lx*RELEASE_MS)/10000L; // so at this time the adsr vol will 
+ else lx=(lx/10000L)*RELEASE_MS; // run from (current volume) to 0%
+ if(!lx) lx=1;
+ }
+ s_chan[ch].ADSR.ReleaseTime=lx;
+
+ if(lval & 0x4000) // add/dec flag
+ s_chan[ch].ADSR.SustainModeDec=-1;
+ else s_chan[ch].ADSR.SustainModeDec=1;
+ }
+ break;
+ //------------------------------------------------// adsr volume... mmm have to investigate this
+ case 12:
+ break;
+ //------------------------------------------------//
+ case 14: // loop?
+ //WaitForSingleObject(s_chan[ch].hMutex,2000); // -> no multithread fuckups
+ 
+			 s_chan[ch].pLoop=spuMemC+((unsigned long)((val<<3)&~0xf));
+ 
+			 //s_chan[ch].bIgnoreLoop=1;
+ //ReleaseMutex(s_chan[ch].hMutex); // -> oki, on with the thread
+ break;
+ //------------------------------------------------//
+ }
+ iSpuAsyncWait=0;
+ return;
+ }
+
+ switch(r)
+ {
+ //-------------------------------------------------//
+ case H_SPUaddr:
+ spuAddr = (unsigned long) val<<3;
+ break;
+ //-------------------------------------------------//
+ case H_SPUdata:
+ // BIOS - allow dma 00
+ Check_IRQ( spuAddr, 0 );
+
+ spuMem[spuAddr>>1] = val;
+ spuAddr+=2;
+ if(spuAddr>0x7ffff) spuAddr=0;
+ break;
+ //-------------------------------------------------//
+ case H_SPUctrl:
+ spuCtrl=val;
+
+
+			// flags
+			if( spuCtrl & CTRL_CD_PLAY )
+				spuStat |= CTRL_CD_PLAY;
+			else
+				spuStat &= ~CTRL_CD_PLAY;
+
+			if( spuCtrl & CTRL_CD_REVERB )
+				spuStat |= STAT_CD_REVERB;
+			else
+				spuStat &= ~STAT_CD_REVERB;
+
+
+			if( spuCtrl & CTRL_EXT_PLAY )
+				spuStat |= STAT_EXT_PLAY;
+			else
+				spuStat &= ~STAT_EXT_PLAY;
+
+			if( spuCtrl & CTRL_EXT_REVERB )
+				spuStat |= STAT_EXT_REVERB;
+			else
+				spuStat &= ~STAT_EXT_REVERB;
+
+
+			
+			spuStat &= ~(STAT_DMA_NON | STAT_DMA_R | STAT_DMA_W);
+
+			if( spuCtrl & CTRL_DMA_F )
+				spuStat |= STAT_DMA_F;
+
+			if( (spuCtrl & CTRL_DMA_F) == CTRL_DMA_R )
+				spuStat |= STAT_DMA_R;
+
+
+
+			// reset IRQ flag
+			if( (spuCtrl & CTRL_IRQ) == 0 ) {
+				bIrqHit = 0;
+				spuStat &= ~STAT_IRQ;
+			}
+
+
+			dwNoiseClock = (spuCtrl & CTRL_NOISE)>>8;
+ break;
+ //-------------------------------------------------//
+ case H_SPUstat:
+ spuStat=val & 0xf800;
+ break;
+ //-------------------------------------------------//
+ case H_SPUReverbAddr:
+ if(val==0xFFFF || val<=0x200)
+ {rvb.StartAddr=rvb.CurrAddr=0;}
+ else
+ {
+ const long iv=(unsigned long)val<<2;
+ if(rvb.StartAddr!=iv)
+ {
+ rvb.StartAddr=(unsigned long)val<<2;
+ rvb.CurrAddr=rvb.StartAddr;
+ }
+ }
+ break;
+ //-------------------------------------------------//
+ case H_SPUirqAddr:
+ spuIrq = val;
+ pSpuIrq=spuMemC+((unsigned long) val<<3);
+ break;
+ //-------------------------------------------------//
+ case H_SPUrvolL:
+ rvb.VolLeft=val;
+ break;
+ //-------------------------------------------------//
+ case H_SPUrvolR:
+ rvb.VolRight=val;
+ break;
+ //-------------------------------------------------//
+
+/*
+ case H_ExtLeft:
+ //auxprintf("EL %d\n",val);
+ break;
+ //-------------------------------------------------//
+ case H_ExtRight:
+ //auxprintf("ER %d\n",val);
+ break;
+ //-------------------------------------------------//
+ case H_SPUmvolL:
+ //auxprintf("ML %d\n",val);
+ break;
+ //-------------------------------------------------//
+ case H_SPUmvolR:
+ //auxprintf("MR %d\n",val);
+ break;
+ //-------------------------------------------------//
+ case H_SPUMute1:
+ //auxprintf("M0 %04x\n",val);
+ break;
+ //-------------------------------------------------//
+ case H_SPUMute2:
+ //auxprintf("M1 %04x\n",val);
+ break;
+*/
+ //-------------------------------------------------//
+ case H_SPUon1:
+ SoundOn(0,16,val);
+ break;
+ //-------------------------------------------------//
+ case H_SPUon2:
+ SoundOn(16,24,val);
+ break;
+ //-------------------------------------------------//
+ case H_SPUoff1:
+ SoundOff(0,16,val);
+ break;
+ //-------------------------------------------------//
+ case H_SPUoff2:
+ SoundOff(16,24,val);
+ break;
+ //-------------------------------------------------//
+ case H_CDLeft:
+			iLeftXAVol = val;
+			if(cddavCallback) cddavCallback(0,val);
+			break;
+ case H_CDRight:
+			iRightXAVol = val;
+			if(cddavCallback) cddavCallback(1,val);
+			break;
+ //-------------------------------------------------//
+ case H_FMod1:
+ FModOn(0,16,val);
+ break;
+ //-------------------------------------------------//
+ case H_FMod2:
+ FModOn(16,24,val);
+ break;
+ //-------------------------------------------------//
+ case H_Noise1:
+ NoiseOn(0,16,val);
+ break;
+ //-------------------------------------------------//
+ case H_Noise2:
+ NoiseOn(16,24,val);
+ break;
+ //-------------------------------------------------//
+ case H_RVBon1:
+ ReverbOn(0,16,val);
+ break;
+ //-------------------------------------------------//
+ case H_RVBon2:
+ ReverbOn(16,24,val);
+ break;
+ //-------------------------------------------------//
+ case H_Reverb+0:
+
+ rvb.FB_SRC_A=val;
+
+ // OK, here's the fake REVERB stuff...
+ // depending on effect we do more or less delay and repeats... bah
+ // still... better than nothing :)
+
+ SetREVERB(val);
+ break;
+
+
+ case H_Reverb+2 : rvb.FB_SRC_B=(short)val; break;
+ case H_Reverb+4 : rvb.IIR_ALPHA=(short)val; break;
+ case H_Reverb+6 : rvb.ACC_COEF_A=(short)val; break;
+ case H_Reverb+8 : rvb.ACC_COEF_B=(short)val; break;
+ case H_Reverb+10 : rvb.ACC_COEF_C=(short)val; break;
+ case H_Reverb+12 : rvb.ACC_COEF_D=(short)val; break;
+ case H_Reverb+14 : rvb.IIR_COEF=(short)val; break;
+ case H_Reverb+16 : rvb.FB_ALPHA=(short)val; break;
+ case H_Reverb+18 : rvb.FB_X=(short)val; break;
+ case H_Reverb+20 : rvb.IIR_DEST_A0=(short)val; break;
+ case H_Reverb+22 : rvb.IIR_DEST_A1=(short)val; break;
+ case H_Reverb+24 : rvb.ACC_SRC_A0=(short)val; break;
+ case H_Reverb+26 : rvb.ACC_SRC_A1=(short)val; break;
+ case H_Reverb+28 : rvb.ACC_SRC_B0=(short)val; break;
+ case H_Reverb+30 : rvb.ACC_SRC_B1=(short)val; break;
+ case H_Reverb+32 : rvb.IIR_SRC_A0=(short)val; break;
+ case H_Reverb+34 : rvb.IIR_SRC_A1=(short)val; break;
+ case H_Reverb+36 : rvb.IIR_DEST_B0=(short)val; break;
+ case H_Reverb+38 : rvb.IIR_DEST_B1=(short)val; break;
+ case H_Reverb+40 : rvb.ACC_SRC_C0=(short)val; break;
+ case H_Reverb+42 : rvb.ACC_SRC_C1=(short)val; break;
+ case H_Reverb+44 : rvb.ACC_SRC_D0=(short)val; break;
+ case H_Reverb+46 : rvb.ACC_SRC_D1=(short)val; break;
+ case H_Reverb+48 : rvb.IIR_SRC_B1=(short)val; break;
+ case H_Reverb+50 : rvb.IIR_SRC_B0=(short)val; break;
+ case H_Reverb+52 : rvb.MIX_DEST_A0=(short)val; break;
+ case H_Reverb+54 : rvb.MIX_DEST_A1=(short)val; break;
+ case H_Reverb+56 : rvb.MIX_DEST_B0=(short)val; break;
+ case H_Reverb+58 : rvb.MIX_DEST_B1=(short)val; break;
+ case H_Reverb+60 : rvb.IN_COEF_L=(short)val; break;
+ case H_Reverb+62 : rvb.IN_COEF_R=(short)val; break;
+ }
+
+ iSpuAsyncWait=0;
+}
+
+////////////////////////////////////////////////////////////////////////
+// READ REGISTER: called by main emu
+////////////////////////////////////////////////////////////////////////
+
+unsigned short CALLBACK SPUreadRegister(unsigned long reg)
+{
+ const unsigned long r=reg&0xfff;
+ 
+ iSpuAsyncWait=0;
+
+ if(r>=0x0c00 && r<0x0d80)
+ {
+ switch(r&0x0f)
+ {
+ case 12: // get adsr vol
+ {
+ const int ch=(r>>4)-0xc0;
+ if(s_chan[ch].bNew) return 1; // we are started, but not processed? return 1
+ if(s_chan[ch].ADSRX.lVolume && // same here... we haven't decoded one sample yet, so no envelope yet. return 1 as well
+ !s_chan[ch].ADSRX.EnvelopeVol) 
+ return 1;
+ return (unsigned short)(s_chan[ch].ADSRX.EnvelopeVol);
+ }
+ }
+ }
+
+ switch(r)
+ {
+	case H_SPUaddr:
+ return spuAddr>>3;
+
+ case H_SPUctrl:
+ return spuCtrl;
+
+ case H_SPUstat:
+ return spuStat;
+
+ case H_SPUdata:
+ {
+ unsigned short s=spuMem[spuAddr>>1];
+ spuAddr+=2;
+ if(spuAddr>0x7ffff) spuAddr=0;
+ return s;
+ }
+
+ //case H_SPUIsOn1:
+ // return IsSoundOn(0,16);
+
+ //case H_SPUIsOn2:
+ // return IsSoundOn(16,24);
+ 
+ }
+
+ return regArea[(r-0xc00)>>1];
+}
+ 
+////////////////////////////////////////////////////////////////////////
+// SOUND ON register write
+////////////////////////////////////////////////////////////////////////
+
+void SoundOn(int start,int end,unsigned short val) // SOUND ON PSX COMAND
+{
+ int ch;
+
+ for(ch=start;ch<end;ch++,val>>=1) // loop channels
+ {
+ if((val&1) && s_chan[ch].pStart) // mmm... start has to be set before key on !?!
+ {
+		 s_chan[ch].bLoopJump = 0;
+ s_chan[ch].bNew=1;
+
+		 // do this here, not in StartSound
+		 // - fixes fussy timing issues
+		 s_chan[ch].iSilent=0;
+		 s_chan[ch].bStop=0;
+		 s_chan[ch].bOn=1;
+		 s_chan[ch].pCurr=s_chan[ch].pStart;
+
+#if 0
+		 // ADSR init time (guess to # apu cycles)
+		 s_chan[ch].ADSRX.StartDelay = 0;
+#endif
+
+		 // Final Fantasy 7 - don't do any of these
+		 // - sets loop address before VoiceOn
+		 //s_chan[ch].pLoop = s_chan[ch].pStart;
+
+ dwNewChannel|=(1<<ch); // bitfield for faster testing
+ }
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+// SOUND OFF register write
+////////////////////////////////////////////////////////////////////////
+
+void SoundOff(int start,int end,unsigned short val) // SOUND OFF PSX COMMAND
+{
+ int ch;
+ for(ch=start;ch<end;ch++,val>>=1) // loop channels
+ {
+ if(val&1) // && s_chan[i].bOn) mmm...
+ {
+ s_chan[ch].bStop=1;
+
+		 // Jungle Book - Rhythm 'n Groove
+		 // - turns off buzzing sound (loop hangs)
+		 s_chan[ch].bNew=0;
+		 dwNewChannel &= ~(1<<ch);
+		} 
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+// FMOD register write
+////////////////////////////////////////////////////////////////////////
+
+void FModOn(int start,int end,unsigned short val) // FMOD ON PSX COMMAND
+{
+ int ch;
+
+ for(ch=start;ch<end;ch++,val>>=1) // loop channels
+ {
+ if(val&1) // -> fmod on/off
+ {
+ if(ch>0) 
+ {
+ s_chan[ch].bFMod=1; // --> sound channel
+ s_chan[ch-1].bFMod=2; // --> freq channel
+ }
+ }
+ else
+ {
+ s_chan[ch].bFMod=0; // --> turn off fmod
+ }
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+// NOISE register write
+////////////////////////////////////////////////////////////////////////
+
+void NoiseOn(int start,int end,unsigned short val) // NOISE ON PSX COMMAND
+{
+ int ch;
+
+ for(ch=start;ch<end;ch++,val>>=1) // loop channels
+ {
+ if(val&1) // -> noise on/off
+ {
+ s_chan[ch].bNoise=1;
+ }
+ else 
+ {
+ s_chan[ch].bNoise=0;
+ }
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+// LEFT VOLUME register write
+////////////////////////////////////////////////////////////////////////
+
+// please note: sweep and phase invert are wrong... but I've never seen
+// them used
+
+void SetVolumeL(unsigned char ch,short vol) // LEFT VOLUME
+{
+ s_chan[ch].iLeftVolRaw=vol;
+
+ if(vol&0x8000) // sweep?
+ {
+ short sInc=1; // -> sweep up?
+ if(vol&0x2000) sInc=-1; // -> or down?
+ if(vol&0x1000) vol^=0xffff; // -> mmm... phase inverted? have to investigate this
+ vol=((vol&0x7f)+1)/2; // -> sweep: 0..127 -> 0..64
+ vol+=vol/(2*sInc); // -> HACK: we don't sweep right now, so we just raise/lower the volume by the half!
+ vol*=128;
+ }
+ else // no sweep:
+ {
+ if(vol&0x4000) // -> mmm... phase inverted? have to investigate this
+ //vol^=0xffff;
+ vol=0x3fff-(vol&0x3fff);
+ }
+
+ vol&=0x3fff;
+ s_chan[ch].iLeftVolume=vol; // store volume
+}
+
+////////////////////////////////////////////////////////////////////////
+// RIGHT VOLUME register write
+////////////////////////////////////////////////////////////////////////
+
+void SetVolumeR(unsigned char ch,short vol) // RIGHT VOLUME
+{
+ s_chan[ch].iRightVolRaw=vol;
+
+ if(vol&0x8000) // comments... see above :)
+ {
+ short sInc=1;
+ if(vol&0x2000) sInc=-1;
+ if(vol&0x1000) vol^=0xffff;
+ vol=((vol&0x7f)+1)/2; 
+ vol+=vol/(2*sInc);
+ vol*=128;
+ }
+ else 
+ {
+ if(vol&0x4000) //vol=vol^=0xffff;
+ vol=0x3fff-(vol&0x3fff);
+ }
+
+ vol&=0x3fff;
+
+ s_chan[ch].iRightVolume=vol;
+}
+
+////////////////////////////////////////////////////////////////////////
+// PITCH register write
+////////////////////////////////////////////////////////////////////////
+
+void SetPitch(int ch,unsigned short val) // SET PITCH
+{
+ int NP;
+ if(val>0x3fff) NP=0x3fff; // get pitch val
+ else NP=val;
+
+ s_chan[ch].iRawPitch=NP;
+
+ NP=(44100L*NP)/4096L; // calc frequency
+ if(NP<1) NP=1; // some security
+ s_chan[ch].iActFreq=NP; // store frequency
+}
+
+////////////////////////////////////////////////////////////////////////
+// REVERB register write
+////////////////////////////////////////////////////////////////////////
+
+void ReverbOn(int start,int end,unsigned short val) // REVERB ON PSX COMMAND
+{
+ int ch;
+
+ for(ch=start;ch<end;ch++,val>>=1) // loop channels
+ {
+ if(val&1) // -> reverb on/off
+ {
+ s_chan[ch].bReverb=1;
+ }
+ else 
+ {
+ s_chan[ch].bReverb=0;
+ }
+ }
+}

pcsxr-1.9.92.tar.bz2/plugins/dfsound/registers.h -> pcsxr-1.9.93.tar.bz2/plugins/dfsound/registers.h Changed

@@ -1,144 +1,185 @@
-/***************************************************************************
-                         registers.h  -  description
-                             -------------------
-    begin                : Wed May 15 2002
-    copyright            : (C) 2002 by Pete Bernert
-    email                : BlackDove@addcom.de
- ***************************************************************************/
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version. See also the license.txt file for *
- *   additional informations.                                              *
- *                                                                         *
- ***************************************************************************/
-
-#define H_SPUReverbAddr  0x0da2
-#define H_SPUirqAddr     0x0da4
-#define H_SPUaddr        0x0da6
-#define H_SPUdata        0x0da8
-#define H_SPUctrl        0x0daa
-#define H_SPUstat        0x0dae
-#define H_SPUmvolL       0x0d80
-#define H_SPUmvolR       0x0d82
-#define H_SPUrvolL       0x0d84
-#define H_SPUrvolR       0x0d86
-#define H_SPUon1         0x0d88
-#define H_SPUon2         0x0d8a
-#define H_SPUoff1        0x0d8c
-#define H_SPUoff2        0x0d8e
-#define H_FMod1          0x0d90
-#define H_FMod2          0x0d92
-#define H_Noise1         0x0d94
-#define H_Noise2         0x0d96
-#define H_RVBon1         0x0d98
-#define H_RVBon2         0x0d9a
-#define H_SPUMute1       0x0d9c
-#define H_SPUMute2       0x0d9e
-#define H_CDLeft         0x0db0
-#define H_CDRight        0x0db2
-#define H_ExtLeft        0x0db4
-#define H_ExtRight       0x0db6
-#define H_Reverb         0x0dc0
-#define H_SPUPitch0      0x0c04
-#define H_SPUPitch1      0x0c14
-#define H_SPUPitch2      0x0c24
-#define H_SPUPitch3      0x0c34
-#define H_SPUPitch4      0x0c44
-#define H_SPUPitch5      0x0c54
-#define H_SPUPitch6      0x0c64
-#define H_SPUPitch7      0x0c74
-#define H_SPUPitch8      0x0c84
-#define H_SPUPitch9      0x0c94
-#define H_SPUPitch10     0x0ca4
-#define H_SPUPitch11     0x0cb4
-#define H_SPUPitch12     0x0cc4
-#define H_SPUPitch13     0x0cd4
-#define H_SPUPitch14     0x0ce4
-#define H_SPUPitch15     0x0cf4
-#define H_SPUPitch16     0x0d04
-#define H_SPUPitch17     0x0d14
-#define H_SPUPitch18     0x0d24
-#define H_SPUPitch19     0x0d34
-#define H_SPUPitch20     0x0d44
-#define H_SPUPitch21     0x0d54
-#define H_SPUPitch22     0x0d64
-#define H_SPUPitch23     0x0d74
-
-#define H_SPUStartAdr0   0x0c06
-#define H_SPUStartAdr1   0x0c16
-#define H_SPUStartAdr2   0x0c26
-#define H_SPUStartAdr3   0x0c36
-#define H_SPUStartAdr4   0x0c46
-#define H_SPUStartAdr5   0x0c56
-#define H_SPUStartAdr6   0x0c66
-#define H_SPUStartAdr7   0x0c76
-#define H_SPUStartAdr8   0x0c86
-#define H_SPUStartAdr9   0x0c96
-#define H_SPUStartAdr10  0x0ca6
-#define H_SPUStartAdr11  0x0cb6
-#define H_SPUStartAdr12  0x0cc6
-#define H_SPUStartAdr13  0x0cd6
-#define H_SPUStartAdr14  0x0ce6
-#define H_SPUStartAdr15  0x0cf6
-#define H_SPUStartAdr16  0x0d06
-#define H_SPUStartAdr17  0x0d16
-#define H_SPUStartAdr18  0x0d26
-#define H_SPUStartAdr19  0x0d36
-#define H_SPUStartAdr20  0x0d46
-#define H_SPUStartAdr21  0x0d56
-#define H_SPUStartAdr22  0x0d66
-#define H_SPUStartAdr23  0x0d76
-
-#define H_SPULoopAdr0   0x0c0e
-#define H_SPULoopAdr1   0x0c1e
-#define H_SPULoopAdr2   0x0c2e
-#define H_SPULoopAdr3   0x0c3e
-#define H_SPULoopAdr4   0x0c4e
-#define H_SPULoopAdr5   0x0c5e
-#define H_SPULoopAdr6   0x0c6e
-#define H_SPULoopAdr7   0x0c7e
-#define H_SPULoopAdr8   0x0c8e
-#define H_SPULoopAdr9   0x0c9e
-#define H_SPULoopAdr10  0x0cae
-#define H_SPULoopAdr11  0x0cbe
-#define H_SPULoopAdr12  0x0cce
-#define H_SPULoopAdr13  0x0cde
-#define H_SPULoopAdr14  0x0cee
-#define H_SPULoopAdr15  0x0cfe
-#define H_SPULoopAdr16  0x0d0e
-#define H_SPULoopAdr17  0x0d1e
-#define H_SPULoopAdr18  0x0d2e
-#define H_SPULoopAdr19  0x0d3e
-#define H_SPULoopAdr20  0x0d4e
-#define H_SPULoopAdr21  0x0d5e
-#define H_SPULoopAdr22  0x0d6e
-#define H_SPULoopAdr23  0x0d7e
-
-#define H_SPU_ADSRLevel0   0x0c08
-#define H_SPU_ADSRLevel1   0x0c18
-#define H_SPU_ADSRLevel2   0x0c28
-#define H_SPU_ADSRLevel3   0x0c38
-#define H_SPU_ADSRLevel4   0x0c48
-#define H_SPU_ADSRLevel5   0x0c58
-#define H_SPU_ADSRLevel6   0x0c68
-#define H_SPU_ADSRLevel7   0x0c78
-#define H_SPU_ADSRLevel8   0x0c88
-#define H_SPU_ADSRLevel9   0x0c98
-#define H_SPU_ADSRLevel10  0x0ca8
-#define H_SPU_ADSRLevel11  0x0cb8
-#define H_SPU_ADSRLevel12  0x0cc8
-#define H_SPU_ADSRLevel13  0x0cd8
-#define H_SPU_ADSRLevel14  0x0ce8
-#define H_SPU_ADSRLevel15  0x0cf8
-#define H_SPU_ADSRLevel16  0x0d08
-#define H_SPU_ADSRLevel17  0x0d18
-#define H_SPU_ADSRLevel18  0x0d28
-#define H_SPU_ADSRLevel19  0x0d38
-#define H_SPU_ADSRLevel20  0x0d48
-#define H_SPU_ADSRLevel21  0x0d58
-#define H_SPU_ADSRLevel22  0x0d68
-#define H_SPU_ADSRLevel23  0x0d78
-
+/***************************************************************************
+                         registers.h  -  description
+                             -------------------
+    begin                : Wed May 15 2002
+    copyright            : (C) 2002 by Pete Bernert
+    email                : BlackDove@addcom.de
+ ***************************************************************************/
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+#define H_SPUReverbAddr  0x0da2
+#define H_SPUirqAddr     0x0da4
+#define H_SPUaddr        0x0da6
+#define H_SPUdata        0x0da8
+#define H_SPUctrl        0x0daa
+#define H_SPUstat        0x0dae
+#define H_SPUmvolL       0x0d80
+#define H_SPUmvolR       0x0d82
+#define H_SPUrvolL       0x0d84
+#define H_SPUrvolR       0x0d86
+#define H_SPUon1         0x0d88
+#define H_SPUon2         0x0d8a
+#define H_SPUoff1        0x0d8c
+#define H_SPUoff2        0x0d8e
+#define H_FMod1          0x0d90
+#define H_FMod2          0x0d92
+#define H_Noise1         0x0d94
+#define H_Noise2         0x0d96
+#define H_RVBon1         0x0d98
+#define H_RVBon2         0x0d9a
+#define H_SPUMute1       0x0d9c
+#define H_SPUMute2       0x0d9e
+#define H_CDLeft         0x0db0
+#define H_CDRight        0x0db2
+#define H_ExtLeft        0x0db4
+#define H_ExtRight       0x0db6
+#define H_Reverb         0x0dc0
+#define H_SPUPitch0      0x0c04
+#define H_SPUPitch1      0x0c14
+#define H_SPUPitch2      0x0c24
+#define H_SPUPitch3      0x0c34
+#define H_SPUPitch4      0x0c44
+#define H_SPUPitch5      0x0c54
+#define H_SPUPitch6      0x0c64
+#define H_SPUPitch7      0x0c74
+#define H_SPUPitch8      0x0c84
+#define H_SPUPitch9      0x0c94
+#define H_SPUPitch10     0x0ca4
+#define H_SPUPitch11     0x0cb4
+#define H_SPUPitch12     0x0cc4
+#define H_SPUPitch13     0x0cd4
+#define H_SPUPitch14     0x0ce4
+#define H_SPUPitch15     0x0cf4
+#define H_SPUPitch16     0x0d04
+#define H_SPUPitch17     0x0d14
+#define H_SPUPitch18     0x0d24
+#define H_SPUPitch19     0x0d34
+#define H_SPUPitch20     0x0d44
+#define H_SPUPitch21     0x0d54
+#define H_SPUPitch22     0x0d64
+#define H_SPUPitch23     0x0d74
+
+#define H_SPUStartAdr0   0x0c06
+#define H_SPUStartAdr1   0x0c16
+#define H_SPUStartAdr2   0x0c26
+#define H_SPUStartAdr3   0x0c36
+#define H_SPUStartAdr4   0x0c46
+#define H_SPUStartAdr5   0x0c56
+#define H_SPUStartAdr6   0x0c66
+#define H_SPUStartAdr7   0x0c76
+#define H_SPUStartAdr8   0x0c86
+#define H_SPUStartAdr9   0x0c96
+#define H_SPUStartAdr10  0x0ca6
+#define H_SPUStartAdr11  0x0cb6
+#define H_SPUStartAdr12  0x0cc6
+#define H_SPUStartAdr13  0x0cd6
+#define H_SPUStartAdr14  0x0ce6
+#define H_SPUStartAdr15  0x0cf6
+#define H_SPUStartAdr16  0x0d06
+#define H_SPUStartAdr17  0x0d16
+#define H_SPUStartAdr18  0x0d26
+#define H_SPUStartAdr19  0x0d36
+#define H_SPUStartAdr20  0x0d46
+#define H_SPUStartAdr21  0x0d56
+#define H_SPUStartAdr22  0x0d66
+#define H_SPUStartAdr23  0x0d76
+
+#define H_SPULoopAdr0   0x0c0e
+#define H_SPULoopAdr1   0x0c1e
+#define H_SPULoopAdr2   0x0c2e
+#define H_SPULoopAdr3   0x0c3e
+#define H_SPULoopAdr4   0x0c4e
+#define H_SPULoopAdr5   0x0c5e
+#define H_SPULoopAdr6   0x0c6e
+#define H_SPULoopAdr7   0x0c7e
+#define H_SPULoopAdr8   0x0c8e
+#define H_SPULoopAdr9   0x0c9e
+#define H_SPULoopAdr10  0x0cae
+#define H_SPULoopAdr11  0x0cbe
+#define H_SPULoopAdr12  0x0cce
+#define H_SPULoopAdr13  0x0cde
+#define H_SPULoopAdr14  0x0cee
+#define H_SPULoopAdr15  0x0cfe
+#define H_SPULoopAdr16  0x0d0e
+#define H_SPULoopAdr17  0x0d1e
+#define H_SPULoopAdr18  0x0d2e
+#define H_SPULoopAdr19  0x0d3e
+#define H_SPULoopAdr20  0x0d4e
+#define H_SPULoopAdr21  0x0d5e
+#define H_SPULoopAdr22  0x0d6e
+#define H_SPULoopAdr23  0x0d7e
+
+#define H_SPU_ADSRLevel0   0x0c08
+#define H_SPU_ADSRLevel1   0x0c18
+#define H_SPU_ADSRLevel2   0x0c28
+#define H_SPU_ADSRLevel3   0x0c38
+#define H_SPU_ADSRLevel4   0x0c48
+#define H_SPU_ADSRLevel5   0x0c58
+#define H_SPU_ADSRLevel6   0x0c68
+#define H_SPU_ADSRLevel7   0x0c78
+#define H_SPU_ADSRLevel8   0x0c88
+#define H_SPU_ADSRLevel9   0x0c98
+#define H_SPU_ADSRLevel10  0x0ca8
+#define H_SPU_ADSRLevel11  0x0cb8
+#define H_SPU_ADSRLevel12  0x0cc8
+#define H_SPU_ADSRLevel13  0x0cd8
+#define H_SPU_ADSRLevel14  0x0ce8
+#define H_SPU_ADSRLevel15  0x0cf8
+#define H_SPU_ADSRLevel16  0x0d08
+#define H_SPU_ADSRLevel17  0x0d18
+#define H_SPU_ADSRLevel18  0x0d28
+#define H_SPU_ADSRLevel19  0x0d38
+#define H_SPU_ADSRLevel20  0x0d48
+#define H_SPU_ADSRLevel21  0x0d58
+#define H_SPU_ADSRLevel22  0x0d68
+#define H_SPU_ADSRLevel23  0x0d78
+
+
+
+
+#define CTRL_CD_PLAY						0x01
+#define CTRL_CD_REVERB					0x02
+#define CTRL_EXT_PLAY						0x04
+#define CTRL_EXT_REVERB					0x08
+
+#define CTRL_DMA_F							0x30
+#define CTRL_DMA_R							0x30
+#define CTRL_DMA_W							0x20
+#define CTRL_DMA_NON						0x10
+#define CTRL_DMA_OFF						0x00
+
+#define CTRL_IRQ								0x40
+#define CTRL_REVERB							0x80
+#define CTRL_NOISE							0x3f00
+#define CTRL_MUTE								0x4000
+#define CTRL_ON									0x8000
+
+
+
+
+#define STAT_CD_PLAY						0x01
+#define STAT_CD_REVERB					0x02
+#define STAT_EXT_PLAY						0x04
+#define STAT_EXT_REVERB					0x08
+
+#define STAT_DMA_F							0x10
+#define STAT_DMA_OFF						0x00
+#define STAT_DMA_NON						0x10
+#define STAT_DMA_W							(0x200 | 0x80 | 0x20)
+#define STAT_DMA_R							(0x100 | 0x80 | 0x20 | 0x10)
+
+#define STAT_IRQ								0x40
+#define STAT_DATA_BUSY					0x80
+#define STAT_DECODED						0x800
+
+
+
+extern int Check_IRQ( int addr, int force );

pcsxr-1.9.92.tar.bz2/plugins/dfsound/regs.h -> pcsxr-1.9.93.tar.bz2/plugins/dfsound/regs.h Changed

@@ -1,27 +1,27 @@
-/***************************************************************************
-                           regs.h  -  description
-                             -------------------
-    begin                : Wed May 15 2002
-    copyright            : (C) 2002 by Pete Bernert
-    email                : BlackDove@addcom.de
- ***************************************************************************/
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version. See also the license.txt file for *
- *   additional informations.                                              *
- *                                                                         *
- ***************************************************************************/
-
-void SoundOn(int start,int end,unsigned short val);
-void SoundOff(int start,int end,unsigned short val);
-void FModOn(int start,int end,unsigned short val);
-void NoiseOn(int start,int end,unsigned short val);
-void SetVolumeL(unsigned char ch,short vol);
-void SetVolumeR(unsigned char ch,short vol);
-void SetPitch(int ch,unsigned short val);
-void ReverbOn(int start,int end,unsigned short val);
-void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val);
-
+/***************************************************************************
+                           regs.h  -  description
+                             -------------------
+    begin                : Wed May 15 2002
+    copyright            : (C) 2002 by Pete Bernert
+    email                : BlackDove@addcom.de
+ ***************************************************************************/
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+void SoundOn(int start,int end,unsigned short val);
+void SoundOff(int start,int end,unsigned short val);
+void FModOn(int start,int end,unsigned short val);
+void NoiseOn(int start,int end,unsigned short val);
+void SetVolumeL(unsigned char ch,short vol);
+void SetVolumeR(unsigned char ch,short vol);
+void SetPitch(int ch,unsigned short val);
+void ReverbOn(int start,int end,unsigned short val);
+void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val);
+

pcsxr-1.9.92.tar.bz2/plugins/dfsound/reverb.c -> pcsxr-1.9.93.tar.bz2/plugins/dfsound/reverb.c Changed

@@ -1,462 +1,499 @@
-/***************************************************************************
- reverb.c - description
- -------------------
- begin : Wed May 15 2002
- copyright : (C) 2002 by Pete Bernert
- email : BlackDove@addcom.de
- ***************************************************************************/
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. See also the license.txt file for *
- * additional informations. *
- * *
- ***************************************************************************/
-
-#include "stdafx.h"
-
-#define _IN_REVERB
-
-// will be included from spu.c
-#ifdef _IN_SPU
-
-////////////////////////////////////////////////////////////////////////
-// globals
-////////////////////////////////////////////////////////////////////////
-
-// REVERB info and timing vars...
-
-int * sRVBPlay = 0;
-int * sRVBEnd = 0;
-int * sRVBStart = 0;
-int iReverbOff = -1; // some delay factor for reverb
-int iReverbRepeat = 0;
-int iReverbNum = 1; 
-
-////////////////////////////////////////////////////////////////////////
-// SET REVERB
-////////////////////////////////////////////////////////////////////////
-
-void SetREVERB(unsigned short val)
-{
- switch(val)
- {
- case 0x0000: iReverbOff=-1; break; // off
- case 0x007D: iReverbOff=32; iReverbNum=2; iReverbRepeat=128; break; // ok room
-
- case 0x0033: iReverbOff=32; iReverbNum=2; iReverbRepeat=64; break; // studio small
- case 0x00B1: iReverbOff=48; iReverbNum=2; iReverbRepeat=96; break; // ok studio medium
- case 0x00E3: iReverbOff=64; iReverbNum=2; iReverbRepeat=128; break; // ok studio large ok
-
- case 0x01A5: iReverbOff=128; iReverbNum=4; iReverbRepeat=32; break; // ok hall
- case 0x033D: iReverbOff=256; iReverbNum=4; iReverbRepeat=64; break; // space echo
- case 0x0001: iReverbOff=184; iReverbNum=3; iReverbRepeat=128; break; // echo/delay
- case 0x0017: iReverbOff=128; iReverbNum=2; iReverbRepeat=128; break; // half echo
- default: iReverbOff=32; iReverbNum=1; iReverbRepeat=0; break;
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-// START REVERB
-////////////////////////////////////////////////////////////////////////
-
-INLINE void StartREVERB(int ch)
-{
- if(s_chan[ch].bReverb && (spuCtrl&0x80)) // reverb possible?
- {
- if(iUseReverb==2) s_chan[ch].bRVBActive=1;
- else
- if(iUseReverb==1 && iReverbOff>0) // -> fake reverb used?
- {
- s_chan[ch].bRVBActive=1; // -> activate it
- s_chan[ch].iRVBOffset=iReverbOff*45;
- s_chan[ch].iRVBRepeat=iReverbRepeat*45;
- s_chan[ch].iRVBNum =iReverbNum;
- }
- }
- else s_chan[ch].bRVBActive=0; // else -> no reverb
-}
-
-////////////////////////////////////////////////////////////////////////
-// HELPER FOR NEILL'S REVERB: re-inits our reverb mixing buf
-////////////////////////////////////////////////////////////////////////
-
-INLINE void InitREVERB(void)
-{
- if(iUseReverb==2)
- {memset(sRVBStart,0,NSSIZE*2*4);}
-}
-
-////////////////////////////////////////////////////////////////////////
-// STORE REVERB
-////////////////////////////////////////////////////////////////////////
-
-INLINE void StoreREVERB(int ch,int ns)
-{
- if(iUseReverb==0) return;
- else
- if(iUseReverb==2) // -------------------------------- // Neil's reverb
- {
- const int iRxl=(s_chan[ch].sval*s_chan[ch].iLeftVolume)/0x4000;
- const int iRxr=(s_chan[ch].sval*s_chan[ch].iRightVolume)/0x4000;
-
- ns<<=1;
-
- *(sRVBStart+ns) +=iRxl; // -> we mix all active reverb channels into an extra buffer
- *(sRVBStart+ns+1)+=iRxr;
- }
- else // --------------------------------------------- // Pete's easy fake reverb
- {
- int * pN;int iRn,iRr=0;
-
- // we use the half channel volume (/0x8000) for the first reverb effects, quarter for next and so on
-
- int iRxl=(s_chan[ch].sval*s_chan[ch].iLeftVolume)/0x8000;
- int iRxr=(s_chan[ch].sval*s_chan[ch].iRightVolume)/0x8000;
- 
- for(iRn=1;iRn<=s_chan[ch].iRVBNum;iRn++,iRr+=s_chan[ch].iRVBRepeat,iRxl/=2,iRxr/=2)
- {
- pN=sRVBPlay+((s_chan[ch].iRVBOffset+iRr+ns)<<1);
- if(pN>=sRVBEnd) pN=sRVBStart+(pN-sRVBEnd);
-
- (*pN)+=iRxl;
- pN++;
- (*pN)+=iRxr;
- }
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-
-INLINE int g_buffer(int iOff) // get_buffer content helper: takes care about wraps
-{
- short * p=(short *)spuMem;
- iOff=(iOff*4)+rvb.CurrAddr;
- while(iOff>0x3FFFF) iOff=rvb.StartAddr+(iOff-0x40000);
- while(iOff<rvb.StartAddr) iOff=0x3ffff-(rvb.StartAddr-iOff);
- return (int)*(p+iOff);
-}
-
-////////////////////////////////////////////////////////////////////////
-
-INLINE void s_buffer(int iOff,int iVal) // set_buffer content helper: takes care about wraps and clipping
-{
- short * p=(short *)spuMem;
- iOff=(iOff*4)+rvb.CurrAddr;
- while(iOff>0x3FFFF) iOff=rvb.StartAddr+(iOff-0x40000);
- while(iOff<rvb.StartAddr) iOff=0x3ffff-(rvb.StartAddr-iOff);
- if(iVal<-32768L) iVal=-32768L;if(iVal>32767L) iVal=32767L;
- *(p+iOff)=(short)iVal;
-}
-
-////////////////////////////////////////////////////////////////////////
-
-INLINE void s_buffer1(int iOff,int iVal) // set_buffer (+1 sample) content helper: takes care about wraps and clipping
-{
- short * p=(short *)spuMem;
- iOff=(iOff*4)+rvb.CurrAddr+1;
- while(iOff>0x3FFFF) iOff=rvb.StartAddr+(iOff-0x40000);
- while(iOff<rvb.StartAddr) iOff=0x3ffff-(rvb.StartAddr-iOff);
- if(iVal<-32768L) iVal=-32768L;if(iVal>32767L) iVal=32767L;
- *(p+iOff)=(short)iVal;
-}
-
-////////////////////////////////////////////////////////////////////////
-
-INLINE int MixREVERBLeft(int ns)
-{
- if(iUseReverb==0) return 0;
- else
- if(iUseReverb==2)
- {
- static int iCnt=0; // this func will be called with 44.1 khz
-
- if(!rvb.StartAddr) // reverb is off
- {
- rvb.iLastRVBLeft=rvb.iLastRVBRight=rvb.iRVBLeft=rvb.iRVBRight=0;
- return 0;
- }
-
- iCnt++; 
-
- if(iCnt&1) // we work on every second left value: downsample to 22 khz
- {
- if(spuCtrl&0x80) // -> reverb on? oki
- {
- int ACC0,ACC1,FB_A0,FB_A1,FB_B0,FB_B1;
-
- const int INPUT_SAMPLE_L=*(sRVBStart+(ns<<1)); 
- const int INPUT_SAMPLE_R=*(sRVBStart+(ns<<1)+1); 
-
- const int IIR_INPUT_A0 = (g_buffer(rvb.IIR_SRC_A0) * rvb.IIR_COEF)/32768L + (INPUT_SAMPLE_L * rvb.IN_COEF_L)/32768L;
- const int IIR_INPUT_A1 = (g_buffer(rvb.IIR_SRC_A1) * rvb.IIR_COEF)/32768L + (INPUT_SAMPLE_R * rvb.IN_COEF_R)/32768L;
- const int IIR_INPUT_B0 = (g_buffer(rvb.IIR_SRC_B0) * rvb.IIR_COEF)/32768L + (INPUT_SAMPLE_L * rvb.IN_COEF_L)/32768L;
- const int IIR_INPUT_B1 = (g_buffer(rvb.IIR_SRC_B1) * rvb.IIR_COEF)/32768L + (INPUT_SAMPLE_R * rvb.IN_COEF_R)/32768L;
-
- const int IIR_A0 = (IIR_INPUT_A0 * rvb.IIR_ALPHA)/32768L + (g_buffer(rvb.IIR_DEST_A0) * (32768L - rvb.IIR_ALPHA))/32768L;
- const int IIR_A1 = (IIR_INPUT_A1 * rvb.IIR_ALPHA)/32768L + (g_buffer(rvb.IIR_DEST_A1) * (32768L - rvb.IIR_ALPHA))/32768L;
- const int IIR_B0 = (IIR_INPUT_B0 * rvb.IIR_ALPHA)/32768L + (g_buffer(rvb.IIR_DEST_B0) * (32768L - rvb.IIR_ALPHA))/32768L;
- const int IIR_B1 = (IIR_INPUT_B1 * rvb.IIR_ALPHA)/32768L + (g_buffer(rvb.IIR_DEST_B1) * (32768L - rvb.IIR_ALPHA))/32768L;
-
- s_buffer1(rvb.IIR_DEST_A0, IIR_A0);
- s_buffer1(rvb.IIR_DEST_A1, IIR_A1);
- s_buffer1(rvb.IIR_DEST_B0, IIR_B0);
- s_buffer1(rvb.IIR_DEST_B1, IIR_B1);
- 
- ACC0 = (g_buffer(rvb.ACC_SRC_A0) * rvb.ACC_COEF_A)/32768L +
- (g_buffer(rvb.ACC_SRC_B0) * rvb.ACC_COEF_B)/32768L +
- (g_buffer(rvb.ACC_SRC_C0) * rvb.ACC_COEF_C)/32768L +
- (g_buffer(rvb.ACC_SRC_D0) * rvb.ACC_COEF_D)/32768L;
- ACC1 = (g_buffer(rvb.ACC_SRC_A1) * rvb.ACC_COEF_A)/32768L +
- (g_buffer(rvb.ACC_SRC_B1) * rvb.ACC_COEF_B)/32768L +
- (g_buffer(rvb.ACC_SRC_C1) * rvb.ACC_COEF_C)/32768L +
- (g_buffer(rvb.ACC_SRC_D1) * rvb.ACC_COEF_D)/32768L;
-
- FB_A0 = g_buffer(rvb.MIX_DEST_A0 - rvb.FB_SRC_A);
- FB_A1 = g_buffer(rvb.MIX_DEST_A1 - rvb.FB_SRC_A);
- FB_B0 = g_buffer(rvb.MIX_DEST_B0 - rvb.FB_SRC_B);
- FB_B1 = g_buffer(rvb.MIX_DEST_B1 - rvb.FB_SRC_B);
-
- s_buffer(rvb.MIX_DEST_A0, ACC0 - (FB_A0 * rvb.FB_ALPHA)/32768L);
- s_buffer(rvb.MIX_DEST_A1, ACC1 - (FB_A1 * rvb.FB_ALPHA)/32768L);
- 
- s_buffer(rvb.MIX_DEST_B0, (rvb.FB_ALPHA * ACC0)/32768L - (FB_A0 * (int)(rvb.FB_ALPHA^0xFFFF8000))/32768L - (FB_B0 * rvb.FB_X)/32768L);
- s_buffer(rvb.MIX_DEST_B1, (rvb.FB_ALPHA * ACC1)/32768L - (FB_A1 * (int)(rvb.FB_ALPHA^0xFFFF8000))/32768L - (FB_B1 * rvb.FB_X)/32768L);
- 
- rvb.iLastRVBLeft = rvb.iRVBLeft;
- rvb.iLastRVBRight = rvb.iRVBRight;
-
- rvb.iRVBLeft = (g_buffer(rvb.MIX_DEST_A0)+g_buffer(rvb.MIX_DEST_B0))/3;
- rvb.iRVBRight = (g_buffer(rvb.MIX_DEST_A1)+g_buffer(rvb.MIX_DEST_B1))/3;
-
- rvb.iRVBLeft = (rvb.iRVBLeft * rvb.VolLeft) / 0x4000;
- rvb.iRVBRight = (rvb.iRVBRight * rvb.VolRight) / 0x4000;
-
- rvb.CurrAddr++;
- if(rvb.CurrAddr>0x3ffff) rvb.CurrAddr=rvb.StartAddr;
-
- return rvb.iLastRVBLeft+(rvb.iRVBLeft-rvb.iLastRVBLeft)/2;
- }
- else // -> reverb off
- {
- rvb.iLastRVBLeft=rvb.iLastRVBRight=rvb.iRVBLeft=rvb.iRVBRight=0;
- }
-
- rvb.CurrAddr++;
- if(rvb.CurrAddr>0x3ffff) rvb.CurrAddr=rvb.StartAddr;
- }
-
- return rvb.iLastRVBLeft;
- }
- else // easy fake reverb:
- {
- const int iRV=*sRVBPlay; // -> simply take the reverb mix buf value
- *sRVBPlay++=0; // -> init it after
- if(sRVBPlay>=sRVBEnd) sRVBPlay=sRVBStart; // -> and take care about wrap arounds
- return iRV; // -> return reverb mix buf val
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-
-INLINE int MixREVERBRight(void)
-{
- if(iUseReverb==0) return 0;
- else
- if(iUseReverb==2) // Neill's reverb:
- {
- int i=rvb.iLastRVBRight+(rvb.iRVBRight-rvb.iLastRVBRight)/2;
- rvb.iLastRVBRight=rvb.iRVBRight;
- return i; // -> just return the last right reverb val (little bit scaled by the previous right val)
- }
- else // easy fake reverb:
- {
- const int iRV=*sRVBPlay; // -> simply take the reverb mix buf value
- *sRVBPlay++=0; // -> init it after
- if(sRVBPlay>=sRVBEnd) sRVBPlay=sRVBStart; // -> and take care about wrap arounds
- return iRV; // -> return reverb mix buf val
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-
-#endif
-
-/*
------------------------------------------------------------------------------
-PSX reverb hardware notes
-by Neill Corlett
------------------------------------------------------------------------------
-
-Yadda yadda disclaimer yadda probably not perfect yadda well it's okay anyway
-yadda yadda.
-
------------------------------------------------------------------------------
-
-Basics
-------
-
-- The reverb buffer is 22khz 16-bit mono PCM.
-- It starts at the reverb address given by 1DA2, extends to
- the end of sound RAM, and wraps back to the 1DA2 address.
-
-Setting the address at 1DA2 resets the current reverb work address.
-
-This work address ALWAYS increments every 1/22050 sec., regardless of
-whether reverb is enabled (bit 7 of 1DAA set).
-
-And the contents of the reverb buffer ALWAYS play, scaled by the
-"reverberation depth left/right" volumes (1D84/1D86).
-(which, by the way, appear to be scaled so 3FFF=approx. 1.0, 4000=-1.0)
-
------------------------------------------------------------------------------
-
-Register names
---------------
-
-These are probably not their real names.
-These are probably not even correct names.
-We will use them anyway, because we can.
-
-1DC0: FB_SRC_A (offset)
-1DC2: FB_SRC_B (offset)
-1DC4: IIR_ALPHA (coef.)
-1DC6: ACC_COEF_A (coef.)
-1DC8: ACC_COEF_B (coef.)
-1DCA: ACC_COEF_C (coef.)
-1DCC: ACC_COEF_D (coef.)
-1DCE: IIR_COEF (coef.)
-1DD0: FB_ALPHA (coef.)
-1DD2: FB_X (coef.)
-1DD4: IIR_DEST_A0 (offset)
-1DD6: IIR_DEST_A1 (offset)
-1DD8: ACC_SRC_A0 (offset)
-1DDA: ACC_SRC_A1 (offset)
-1DDC: ACC_SRC_B0 (offset)
-1DDE: ACC_SRC_B1 (offset)
-1DE0: IIR_SRC_A0 (offset)
-1DE2: IIR_SRC_A1 (offset)
-1DE4: IIR_DEST_B0 (offset)
-1DE6: IIR_DEST_B1 (offset)
-1DE8: ACC_SRC_C0 (offset)
-1DEA: ACC_SRC_C1 (offset)
-1DEC: ACC_SRC_D0 (offset)
-1DEE: ACC_SRC_D1 (offset)
-1DF0: IIR_SRC_B1 (offset)
-1DF2: IIR_SRC_B0 (offset)
-1DF4: MIX_DEST_A0 (offset)
-1DF6: MIX_DEST_A1 (offset)
-1DF8: MIX_DEST_B0 (offset)
-1DFA: MIX_DEST_B1 (offset)
-1DFC: IN_COEF_L (coef.)
-1DFE: IN_COEF_R (coef.)
-
-The coefficients are signed fractional values.
--32768 would be -1.0
- 32768 would be 1.0 (if it were possible... the highest is of course 32767)
-
-The offsets are (byte/8) offsets into the reverb buffer.
-i.e. you multiply them by 8, you get byte offsets.
-You can also think of them as (samples/4) offsets.
-They appear to be signed. They can be negative.
-None of the documented presets make them negative, though.
-
-Yes, 1DF0 and 1DF2 appear to be backwards. Not a typo.
-
------------------------------------------------------------------------------
-
-What it does
-------------
-
-We take all reverb sources:
-- regular channels that have the reverb bit on
-- cd and external sources, if their reverb bits are on
-and mix them into one stereo 44100hz signal.
-
-Lowpass/downsample that to 22050hz. The PSX uses a proper bandlimiting
-algorithm here, but I haven't figured out the hysterically exact specifics.
-I use an 8-tap filter with these coefficients, which are nice but probably
-not the real ones:
-
-0.037828187894
-0.157538631280
-0.321159685278
-0.449322115345
-0.449322115345
-0.321159685278
-0.157538631280
-0.037828187894
-
-So we have two input samples (INPUT_SAMPLE_L, INPUT_SAMPLE_R) every 22050hz.
-
-* IN MY EMULATION, I divide these by 2 to make it clip less.
- (and of course the L/R output coefficients are adjusted to compensate)
- The real thing appears to not do this.
-
-At every 22050hz tick:
-- If the reverb bit is enabled (bit 7 of 1DAA), execute the reverb
- steady-state algorithm described below
-- AFTERWARDS, retrieve the "wet out" L and R samples from the reverb buffer
- (This part may not be exactly right and I guessed at the coefs. TODO: check later.)
- L is: 0.333 * (buffer[MIX_DEST_A0] + buffer[MIX_DEST_B0])
- R is: 0.333 * (buffer[MIX_DEST_A1] + buffer[MIX_DEST_B1])
-- Advance the current buffer position by 1 sample
-
-The wet out L and R are then upsampled to 44100hz and played at the
-"reverberation depth left/right" (1D84/1D86) volume, independent of the main
-volume.
-
------------------------------------------------------------------------------
-
-Reverb steady-state
--------------------
-
-The reverb steady-state algorithm is fairly clever, and of course by
-"clever" I mean "batshit insane".
-
-buffer[x] is relative to the current buffer position, not the beginning of
-the buffer. Note that all buffer offsets must wrap around so they're
-contained within the reverb work area.
-
-Clipping is performed at the end... maybe also sooner, but definitely at
-the end.
-
-IIR_INPUT_A0 = buffer[IIR_SRC_A0] * IIR_COEF + INPUT_SAMPLE_L * IN_COEF_L;
-IIR_INPUT_A1 = buffer[IIR_SRC_A1] * IIR_COEF + INPUT_SAMPLE_R * IN_COEF_R;
-IIR_INPUT_B0 = buffer[IIR_SRC_B0] * IIR_COEF + INPUT_SAMPLE_L * IN_COEF_L;
-IIR_INPUT_B1 = buffer[IIR_SRC_B1] * IIR_COEF + INPUT_SAMPLE_R * IN_COEF_R;
-
-IIR_A0 = IIR_INPUT_A0 * IIR_ALPHA + buffer[IIR_DEST_A0] * (1.0 - IIR_ALPHA);
-IIR_A1 = IIR_INPUT_A1 * IIR_ALPHA + buffer[IIR_DEST_A1] * (1.0 - IIR_ALPHA);
-IIR_B0 = IIR_INPUT_B0 * IIR_ALPHA + buffer[IIR_DEST_B0] * (1.0 - IIR_ALPHA);
-IIR_B1 = IIR_INPUT_B1 * IIR_ALPHA + buffer[IIR_DEST_B1] * (1.0 - IIR_ALPHA);
-
-buffer[IIR_DEST_A0 + 1sample] = IIR_A0;
-buffer[IIR_DEST_A1 + 1sample] = IIR_A1;
-buffer[IIR_DEST_B0 + 1sample] = IIR_B0;
-buffer[IIR_DEST_B1 + 1sample] = IIR_B1;
-
-ACC0 = buffer[ACC_SRC_A0] * ACC_COEF_A +
- buffer[ACC_SRC_B0] * ACC_COEF_B +
- buffer[ACC_SRC_C0] * ACC_COEF_C +
- buffer[ACC_SRC_D0] * ACC_COEF_D;
-ACC1 = buffer[ACC_SRC_A1] * ACC_COEF_A +
- buffer[ACC_SRC_B1] * ACC_COEF_B +
- buffer[ACC_SRC_C1] * ACC_COEF_C +
- buffer[ACC_SRC_D1] * ACC_COEF_D;
-
-FB_A0 = buffer[MIX_DEST_A0 - FB_SRC_A];
-FB_A1 = buffer[MIX_DEST_A1 - FB_SRC_A];
-FB_B0 = buffer[MIX_DEST_B0 - FB_SRC_B];
-FB_B1 = buffer[MIX_DEST_B1 - FB_SRC_B];
-
-buffer[MIX_DEST_A0] = ACC0 - FB_A0 * FB_ALPHA;
-buffer[MIX_DEST_A1] = ACC1 - FB_A1 * FB_ALPHA;
-buffer[MIX_DEST_B0] = (FB_ALPHA * ACC0) - FB_A0 * (FB_ALPHA^0x8000) - FB_B0 * FB_X;
-buffer[MIX_DEST_B1] = (FB_ALPHA * ACC1) - FB_A1 * (FB_ALPHA^0x8000) - FB_B1 * FB_X;
-
------------------------------------------------------------------------------
-*/
-
+/***************************************************************************
+ reverb.c - description
+ -------------------
+ begin : Wed May 15 2002
+ copyright : (C) 2002 by Pete Bernert
+ email : BlackDove@addcom.de
+ ***************************************************************************/
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+#include "stdafx.h"
+#include "registers.h"
+
+#define _IN_REVERB
+
+// will be included from spu.c
+#ifdef _IN_SPU
+
+////////////////////////////////////////////////////////////////////////
+// globals
+////////////////////////////////////////////////////////////////////////
+
+// REVERB info and timing vars...
+
+int * sRVBPlay = 0;
+int * sRVBEnd = 0;
+int * sRVBStart = 0;
+int iReverbOff = -1; // some delay factor for reverb
+int iReverbRepeat = 0;
+int iReverbNum = 1; 
+
+////////////////////////////////////////////////////////////////////////
+// SET REVERB
+////////////////////////////////////////////////////////////////////////
+
+void SetREVERB(unsigned short val)
+{
+ switch(val)
+ {
+ case 0x0000: iReverbOff=-1; break; // off
+ case 0x007D: iReverbOff=32; iReverbNum=2; iReverbRepeat=128; break; // ok room
+
+ case 0x0033: iReverbOff=32; iReverbNum=2; iReverbRepeat=64; break; // studio small
+ case 0x00B1: iReverbOff=48; iReverbNum=2; iReverbRepeat=96; break; // ok studio medium
+ case 0x00E3: iReverbOff=64; iReverbNum=2; iReverbRepeat=128; break; // ok studio large ok
+
+ case 0x01A5: iReverbOff=128; iReverbNum=4; iReverbRepeat=32; break; // ok hall
+ case 0x033D: iReverbOff=256; iReverbNum=4; iReverbRepeat=64; break; // space echo
+ case 0x0001: iReverbOff=184; iReverbNum=3; iReverbRepeat=128; break; // echo/delay
+ case 0x0017: iReverbOff=128; iReverbNum=2; iReverbRepeat=128; break; // half echo
+ default: iReverbOff=32; iReverbNum=1; iReverbRepeat=0; break;
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+// START REVERB
+////////////////////////////////////////////////////////////////////////
+
+static INLINE void StartREVERB(int ch)
+{
+ if(s_chan[ch].bReverb && (spuCtrl&0x80)) // reverb possible?
+ {
+ if(iUseReverb==2) s_chan[ch].bRVBActive=1;
+ else
+ if(iUseReverb==1 && iReverbOff>0) // -> fake reverb used?
+ {
+ s_chan[ch].bRVBActive=1; // -> activate it
+ s_chan[ch].iRVBOffset=iReverbOff*45;
+ s_chan[ch].iRVBRepeat=iReverbRepeat*45;
+ s_chan[ch].iRVBNum =iReverbNum;
+ }
+ }
+ else s_chan[ch].bRVBActive=0; // else -> no reverb
+}
+
+////////////////////////////////////////////////////////////////////////
+// HELPER FOR NEILL'S REVERB: re-inits our reverb mixing buf
+////////////////////////////////////////////////////////////////////////
+
+static INLINE void InitREVERB(void)
+{
+ if(iUseReverb==2)
+ {memset(sRVBStart,0,NSSIZE*2*4);}
+}
+
+////////////////////////////////////////////////////////////////////////
+// STORE REVERB
+////////////////////////////////////////////////////////////////////////
+
+static INLINE void StoreREVERB_CD(int left, int right,int ns)
+{
+ if(iUseReverb==0) return;
+ else
+ if(iUseReverb==2) // -------------------------------- // Neil's reverb
+ {
+ const int iRxl=left;
+ const int iRxr=right;
+
+ ns<<=1;
+
+ // -> we mix all active reverb channels into an extra buffer
+	 *(sRVBStart+ns) += CLAMP16( *(sRVBStart+ns+0) + ( iRxl ) );
+ *(sRVBStart+ns+1) += CLAMP16( *(sRVBStart+ns+1) + ( iRxr ) );
+ }
+}
+ 
+
+static INLINE void StoreREVERB(int ch,int ns)
+{
+ if(iUseReverb==0) return;
+ else
+ if(iUseReverb==2) // -------------------------------- // Neil's reverb
+ {
+ const int iRxl=(s_chan[ch].sval*s_chan[ch].iLeftVolume)/0x4000;
+ const int iRxr=(s_chan[ch].sval*s_chan[ch].iRightVolume)/0x4000;
+
+ ns<<=1;
+
+ *(sRVBStart+ns) +=iRxl; // -> we mix all active reverb channels into an extra buffer
+ *(sRVBStart+ns+1)+=iRxr;
+ }
+ else // --------------------------------------------- // Pete's easy fake reverb
+ {
+ int * pN;int iRn,iRr=0;
+
+ // we use the half channel volume (/0x8000) for the first reverb effects, quarter for next and so on
+
+ int iRxl=(s_chan[ch].sval*s_chan[ch].iLeftVolume)/0x8000;
+ int iRxr=(s_chan[ch].sval*s_chan[ch].iRightVolume)/0x8000;
+ 
+ for(iRn=1;iRn<=s_chan[ch].iRVBNum;iRn++,iRr+=s_chan[ch].iRVBRepeat,iRxl/=2,iRxr/=2)
+ {
+ pN=sRVBPlay+((s_chan[ch].iRVBOffset+iRr+ns)<<1);
+ if(pN>=sRVBEnd) pN=sRVBStart+(pN-sRVBEnd);
+
+ (*pN)+=iRxl;
+ pN++;
+ (*pN)+=iRxr;
+ }
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static INLINE int g_buffer(int iOff) // get_buffer content helper: takes care about wraps
+{
+ short * p=(short *)spuMem;
+ iOff=(iOff*4)+rvb.CurrAddr;
+ while(iOff>0x3FFFF) iOff=rvb.StartAddr+(iOff-0x40000);
+ while(iOff<rvb.StartAddr) iOff=0x3ffff-(rvb.StartAddr-iOff);
+ return (int)*(p+iOff);
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static INLINE void s_buffer(int iOff,int iVal) // set_buffer content helper: takes care about wraps and clipping
+{
+ short * p=(short *)spuMem;
+ iOff=(iOff*4)+rvb.CurrAddr;
+ while(iOff>0x3FFFF) iOff=rvb.StartAddr+(iOff-0x40000);
+ while(iOff<rvb.StartAddr) iOff=0x3ffff-(rvb.StartAddr-iOff);
+ if(iVal<-32768L) iVal=-32768L;if(iVal>32767L) iVal=32767L;
+ *(p+iOff)=(short)iVal;
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static INLINE void s_buffer1(int iOff,int iVal) // set_buffer (+1 sample) content helper: takes care about wraps and clipping
+{
+ short * p=(short *)spuMem;
+ iOff=(iOff*4)+rvb.CurrAddr+1;
+ while(iOff>0x3FFFF) iOff=rvb.StartAddr+(iOff-0x40000);
+ while(iOff<rvb.StartAddr) iOff=0x3ffff-(rvb.StartAddr-iOff);
+ if(iVal<-32768L) iVal=-32768L;if(iVal>32767L) iVal=32767L;
+ *(p+iOff)=(short)iVal;
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static INLINE int MixREVERBLeft(int ns)
+{
+ if(iUseReverb==0) return 0;
+ else
+ if(iUseReverb==2)
+ {
+ static int iCnt=0; // this func will be called with 44.1 khz
+
+ if(!rvb.StartAddr) // reverb is off
+ {
+ rvb.iLastRVBLeft=rvb.iLastRVBRight=rvb.iRVBLeft=rvb.iRVBRight=0;
+ return 0;
+ }
+
+ iCnt++; 
+
+ if(iCnt&1) // we work on every second left value: downsample to 22 khz
+ {
+ if(spuCtrl&0x80) // -> reverb on? oki
+ {
+ int ACC0,ACC1,FB_A0,FB_A1,FB_B0,FB_B1;
+
+ const int INPUT_SAMPLE_L=*(sRVBStart+(ns<<1)); 
+ const int INPUT_SAMPLE_R=*(sRVBStart+(ns<<1)+1); 
+
+ const int IIR_INPUT_A0 = (g_buffer(rvb.IIR_SRC_A0) * rvb.IIR_COEF)/32768L + (INPUT_SAMPLE_L * rvb.IN_COEF_L)/32768L;
+ const int IIR_INPUT_A1 = (g_buffer(rvb.IIR_SRC_A1) * rvb.IIR_COEF)/32768L + (INPUT_SAMPLE_R * rvb.IN_COEF_R)/32768L;
+ const int IIR_INPUT_B0 = (g_buffer(rvb.IIR_SRC_B0) * rvb.IIR_COEF)/32768L + (INPUT_SAMPLE_L * rvb.IN_COEF_L)/32768L;
+ const int IIR_INPUT_B1 = (g_buffer(rvb.IIR_SRC_B1) * rvb.IIR_COEF)/32768L + (INPUT_SAMPLE_R * rvb.IN_COEF_R)/32768L;
+
+ const int IIR_A0 = (IIR_INPUT_A0 * rvb.IIR_ALPHA)/32768L + (g_buffer(rvb.IIR_DEST_A0) * (32768L - rvb.IIR_ALPHA))/32768L;
+ const int IIR_A1 = (IIR_INPUT_A1 * rvb.IIR_ALPHA)/32768L + (g_buffer(rvb.IIR_DEST_A1) * (32768L - rvb.IIR_ALPHA))/32768L;
+ const int IIR_B0 = (IIR_INPUT_B0 * rvb.IIR_ALPHA)/32768L + (g_buffer(rvb.IIR_DEST_B0) * (32768L - rvb.IIR_ALPHA))/32768L;
+ const int IIR_B1 = (IIR_INPUT_B1 * rvb.IIR_ALPHA)/32768L + (g_buffer(rvb.IIR_DEST_B1) * (32768L - rvb.IIR_ALPHA))/32768L;
+
+ s_buffer1(rvb.IIR_DEST_A0, IIR_A0);
+ s_buffer1(rvb.IIR_DEST_A1, IIR_A1);
+ s_buffer1(rvb.IIR_DEST_B0, IIR_B0);
+ s_buffer1(rvb.IIR_DEST_B1, IIR_B1);
+ 
+ ACC0 = (g_buffer(rvb.ACC_SRC_A0) * rvb.ACC_COEF_A)/32768L +
+ (g_buffer(rvb.ACC_SRC_B0) * rvb.ACC_COEF_B)/32768L +
+ (g_buffer(rvb.ACC_SRC_C0) * rvb.ACC_COEF_C)/32768L +
+ (g_buffer(rvb.ACC_SRC_D0) * rvb.ACC_COEF_D)/32768L;
+ ACC1 = (g_buffer(rvb.ACC_SRC_A1) * rvb.ACC_COEF_A)/32768L +
+ (g_buffer(rvb.ACC_SRC_B1) * rvb.ACC_COEF_B)/32768L +
+ (g_buffer(rvb.ACC_SRC_C1) * rvb.ACC_COEF_C)/32768L +
+ (g_buffer(rvb.ACC_SRC_D1) * rvb.ACC_COEF_D)/32768L;
+
+ FB_A0 = g_buffer(rvb.MIX_DEST_A0 - rvb.FB_SRC_A);
+ FB_A1 = g_buffer(rvb.MIX_DEST_A1 - rvb.FB_SRC_A);
+ FB_B0 = g_buffer(rvb.MIX_DEST_B0 - rvb.FB_SRC_B);
+ FB_B1 = g_buffer(rvb.MIX_DEST_B1 - rvb.FB_SRC_B);
+
+ s_buffer(rvb.MIX_DEST_A0, ACC0 - (FB_A0 * rvb.FB_ALPHA)/32768L);
+ s_buffer(rvb.MIX_DEST_A1, ACC1 - (FB_A1 * rvb.FB_ALPHA)/32768L);
+ 
+ s_buffer(rvb.MIX_DEST_B0, (rvb.FB_ALPHA * ACC0)/32768L - (FB_A0 * (int)(rvb.FB_ALPHA^0xFFFF8000))/32768L - (FB_B0 * rvb.FB_X)/32768L);
+ s_buffer(rvb.MIX_DEST_B1, (rvb.FB_ALPHA * ACC1)/32768L - (FB_A1 * (int)(rvb.FB_ALPHA^0xFFFF8000))/32768L - (FB_B1 * rvb.FB_X)/32768L);
+ 
+ rvb.iLastRVBLeft = rvb.iRVBLeft;
+ rvb.iLastRVBRight = rvb.iRVBRight;
+
+ rvb.iRVBLeft = (g_buffer(rvb.MIX_DEST_A0)+g_buffer(rvb.MIX_DEST_B0))/3;
+ rvb.iRVBRight = (g_buffer(rvb.MIX_DEST_A1)+g_buffer(rvb.MIX_DEST_B1))/3;
+
+ rvb.iRVBLeft = (rvb.iRVBLeft * rvb.VolLeft) / 0x4000;
+ rvb.iRVBRight = (rvb.iRVBRight * rvb.VolRight) / 0x4000;
+
+ rvb.CurrAddr++;
+ if(rvb.CurrAddr>0x3ffff) rvb.CurrAddr=rvb.StartAddr;
+
+ return rvb.iLastRVBLeft+(rvb.iRVBLeft-rvb.iLastRVBLeft)/2;
+ }
+ else // -> reverb off
+ {
+			 // Vib Ribbon - grab current reverb sample (cdda data)
+			 // - mono data
+
+			 rvb.iRVBLeft = (short) spuMem[ rvb.CurrAddr ];
+			 rvb.iRVBRight = rvb.iRVBLeft;
+			 rvb.iLastRVBLeft = (rvb.iRVBLeft * rvb.VolLeft) / 0x4000;
+			 rvb.iLastRVBRight = (rvb.iRVBRight * rvb.VolRight) / 0x4000;
+
+			 //rvb.iLastRVBLeft=rvb.iLastRVBRight=rvb.iRVBLeft=rvb.iRVBRight=0;
+ }
+
+
+		 Check_IRQ( rvb.CurrAddr*2, 0 );
+
+ rvb.CurrAddr++;
+ if(rvb.CurrAddr>0x3ffff) rvb.CurrAddr=rvb.StartAddr;
+ }
+
+ return rvb.iLastRVBLeft;
+ }
+ else // easy fake reverb:
+ {
+ const int iRV=*sRVBPlay; // -> simply take the reverb mix buf value
+ *sRVBPlay++=0; // -> init it after
+ if(sRVBPlay>=sRVBEnd) sRVBPlay=sRVBStart; // -> and take care about wrap arounds
+ return iRV; // -> return reverb mix buf val
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static INLINE int MixREVERBRight(void)
+{
+ if(iUseReverb==0) return 0;
+ else
+ if(iUseReverb==2) // Neill's reverb:
+ {
+	 // Vib Ribbon - reverb always on (!), reverb write flag
+ if(spuCtrl & CTRL_REVERB) // -> reverb on? oki
+	 {
+		 int i=rvb.iLastRVBRight+(rvb.iRVBRight-rvb.iLastRVBRight)/2;
+		 rvb.iLastRVBRight=rvb.iRVBRight;
+		 return i; // -> just return the last right reverb val (little bit scaled by the previous right val)
+	 } else {
+		 // Vib Ribbon - return reverb buffer (cdda data)
+		 return CLAMP16(rvb.iLastRVBRight);
+	 }
+ }
+ else // easy fake reverb:
+ {
+ const int iRV=*sRVBPlay; // -> simply take the reverb mix buf value
+ *sRVBPlay++=0; // -> init it after
+ if(sRVBPlay>=sRVBEnd) sRVBPlay=sRVBStart; // -> and take care about wrap arounds
+ return iRV; // -> return reverb mix buf val
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+#endif
+
+/*
+-----------------------------------------------------------------------------
+PSX reverb hardware notes
+by Neill Corlett
+-----------------------------------------------------------------------------
+
+Yadda yadda disclaimer yadda probably not perfect yadda well it's okay anyway
+yadda yadda.
+
+-----------------------------------------------------------------------------
+
+Basics
+------
+
+- The reverb buffer is 22khz 16-bit mono PCM.
+- It starts at the reverb address given by 1DA2, extends to
+ the end of sound RAM, and wraps back to the 1DA2 address.
+
+Setting the address at 1DA2 resets the current reverb work address.
+
+This work address ALWAYS increments every 1/22050 sec., regardless of
+whether reverb is enabled (bit 7 of 1DAA set).
+
+And the contents of the reverb buffer ALWAYS play, scaled by the
+"reverberation depth left/right" volumes (1D84/1D86).
+(which, by the way, appear to be scaled so 3FFF=approx. 1.0, 4000=-1.0)
+
+-----------------------------------------------------------------------------
+
+Register names
+--------------
+
+These are probably not their real names.
+These are probably not even correct names.
+We will use them anyway, because we can.
+
+1DC0: FB_SRC_A (offset)
+1DC2: FB_SRC_B (offset)
+1DC4: IIR_ALPHA (coef.)
+1DC6: ACC_COEF_A (coef.)
+1DC8: ACC_COEF_B (coef.)
+1DCA: ACC_COEF_C (coef.)
+1DCC: ACC_COEF_D (coef.)
+1DCE: IIR_COEF (coef.)
+1DD0: FB_ALPHA (coef.)
+1DD2: FB_X (coef.)
+1DD4: IIR_DEST_A0 (offset)
+1DD6: IIR_DEST_A1 (offset)
+1DD8: ACC_SRC_A0 (offset)
+1DDA: ACC_SRC_A1 (offset)
+1DDC: ACC_SRC_B0 (offset)
+1DDE: ACC_SRC_B1 (offset)
+1DE0: IIR_SRC_A0 (offset)
+1DE2: IIR_SRC_A1 (offset)
+1DE4: IIR_DEST_B0 (offset)
+1DE6: IIR_DEST_B1 (offset)
+1DE8: ACC_SRC_C0 (offset)
+1DEA: ACC_SRC_C1 (offset)
+1DEC: ACC_SRC_D0 (offset)
+1DEE: ACC_SRC_D1 (offset)
+1DF0: IIR_SRC_B1 (offset)
+1DF2: IIR_SRC_B0 (offset)
+1DF4: MIX_DEST_A0 (offset)
+1DF6: MIX_DEST_A1 (offset)
+1DF8: MIX_DEST_B0 (offset)
+1DFA: MIX_DEST_B1 (offset)
+1DFC: IN_COEF_L (coef.)
+1DFE: IN_COEF_R (coef.)
+
+The coefficients are signed fractional values.
+-32768 would be -1.0
+ 32768 would be 1.0 (if it were possible... the highest is of course 32767)
+
+The offsets are (byte/8) offsets into the reverb buffer.
+i.e. you multiply them by 8, you get byte offsets.
+You can also think of them as (samples/4) offsets.
+They appear to be signed. They can be negative.
+None of the documented presets make them negative, though.
+
+Yes, 1DF0 and 1DF2 appear to be backwards. Not a typo.
+
+-----------------------------------------------------------------------------
+
+What it does
+------------
+
+We take all reverb sources:
+- regular channels that have the reverb bit on
+- cd and external sources, if their reverb bits are on
+and mix them into one stereo 44100hz signal.
+
+Lowpass/downsample that to 22050hz. The PSX uses a proper bandlimiting
+algorithm here, but I haven't figured out the hysterically exact specifics.
+I use an 8-tap filter with these coefficients, which are nice but probably
+not the real ones:
+
+0.037828187894
+0.157538631280
+0.321159685278
+0.449322115345
+0.449322115345
+0.321159685278
+0.157538631280
+0.037828187894
+
+So we have two input samples (INPUT_SAMPLE_L, INPUT_SAMPLE_R) every 22050hz.
+
+* IN MY EMULATION, I divide these by 2 to make it clip less.
+ (and of course the L/R output coefficients are adjusted to compensate)
+ The real thing appears to not do this.
+
+At every 22050hz tick:
+- If the reverb bit is enabled (bit 7 of 1DAA), execute the reverb
+ steady-state algorithm described below
+- AFTERWARDS, retrieve the "wet out" L and R samples from the reverb buffer
+ (This part may not be exactly right and I guessed at the coefs. TODO: check later.)
+ L is: 0.333 * (buffer[MIX_DEST_A0] + buffer[MIX_DEST_B0])
+ R is: 0.333 * (buffer[MIX_DEST_A1] + buffer[MIX_DEST_B1])
+- Advance the current buffer position by 1 sample
+
+The wet out L and R are then upsampled to 44100hz and played at the
+"reverberation depth left/right" (1D84/1D86) volume, independent of the main
+volume.
+
+-----------------------------------------------------------------------------
+
+Reverb steady-state
+-------------------
+
+The reverb steady-state algorithm is fairly clever, and of course by
+"clever" I mean "batshit insane".
+
+buffer[x] is relative to the current buffer position, not the beginning of
+the buffer. Note that all buffer offsets must wrap around so they're
+contained within the reverb work area.
+
+Clipping is performed at the end... maybe also sooner, but definitely at
+the end.
+
+IIR_INPUT_A0 = buffer[IIR_SRC_A0] * IIR_COEF + INPUT_SAMPLE_L * IN_COEF_L;
+IIR_INPUT_A1 = buffer[IIR_SRC_A1] * IIR_COEF + INPUT_SAMPLE_R * IN_COEF_R;
+IIR_INPUT_B0 = buffer[IIR_SRC_B0] * IIR_COEF + INPUT_SAMPLE_L * IN_COEF_L;
+IIR_INPUT_B1 = buffer[IIR_SRC_B1] * IIR_COEF + INPUT_SAMPLE_R * IN_COEF_R;
+
+IIR_A0 = IIR_INPUT_A0 * IIR_ALPHA + buffer[IIR_DEST_A0] * (1.0 - IIR_ALPHA);
+IIR_A1 = IIR_INPUT_A1 * IIR_ALPHA + buffer[IIR_DEST_A1] * (1.0 - IIR_ALPHA);
+IIR_B0 = IIR_INPUT_B0 * IIR_ALPHA + buffer[IIR_DEST_B0] * (1.0 - IIR_ALPHA);
+IIR_B1 = IIR_INPUT_B1 * IIR_ALPHA + buffer[IIR_DEST_B1] * (1.0 - IIR_ALPHA);
+
+buffer[IIR_DEST_A0 + 1sample] = IIR_A0;
+buffer[IIR_DEST_A1 + 1sample] = IIR_A1;
+buffer[IIR_DEST_B0 + 1sample] = IIR_B0;
+buffer[IIR_DEST_B1 + 1sample] = IIR_B1;
+
+ACC0 = buffer[ACC_SRC_A0] * ACC_COEF_A +
+ buffer[ACC_SRC_B0] * ACC_COEF_B +
+ buffer[ACC_SRC_C0] * ACC_COEF_C +
+ buffer[ACC_SRC_D0] * ACC_COEF_D;
+ACC1 = buffer[ACC_SRC_A1] * ACC_COEF_A +
+ buffer[ACC_SRC_B1] * ACC_COEF_B +
+ buffer[ACC_SRC_C1] * ACC_COEF_C +
+ buffer[ACC_SRC_D1] * ACC_COEF_D;
+
+FB_A0 = buffer[MIX_DEST_A0 - FB_SRC_A];
+FB_A1 = buffer[MIX_DEST_A1 - FB_SRC_A];
+FB_B0 = buffer[MIX_DEST_B0 - FB_SRC_B];
+FB_B1 = buffer[MIX_DEST_B1 - FB_SRC_B];
+
+buffer[MIX_DEST_A0] = ACC0 - FB_A0 * FB_ALPHA;
+buffer[MIX_DEST_A1] = ACC1 - FB_A1 * FB_ALPHA;
+buffer[MIX_DEST_B0] = (FB_ALPHA * ACC0) - FB_A0 * (FB_ALPHA^0x8000) - FB_B0 * FB_X;
+buffer[MIX_DEST_B1] = (FB_ALPHA * ACC1) - FB_A1 * (FB_ALPHA^0x8000) - FB_B1 * FB_X;
+
+-----------------------------------------------------------------------------
+*/
+

pcsxr-1.9.92.tar.bz2/plugins/dfsound/reverb.h -> pcsxr-1.9.93.tar.bz2/plugins/dfsound/reverb.h Changed

@@ -1,21 +1,21 @@
-/***************************************************************************
-                          reverb.h  -  description
-                             -------------------
-    begin                : Wed May 15 2002
-    copyright            : (C) 2002 by Pete Bernert
-    email                : BlackDove@addcom.de
- ***************************************************************************/
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version. See also the license.txt file for *
- *   additional informations.                                              *
- *                                                                         *
- ***************************************************************************/
-
-void SetREVERB(unsigned short val);
-INLINE void StartREVERB(int ch);
-INLINE void StoreREVERB(int ch,int ns);
-
+/***************************************************************************
+                          reverb.h  -  description
+                             -------------------
+    begin                : Wed May 15 2002
+    copyright            : (C) 2002 by Pete Bernert
+    email                : BlackDove@addcom.de
+ ***************************************************************************/
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+void SetREVERB(unsigned short val);
+static INLINE void StartREVERB(int ch);
+static INLINE void StoreREVERB(int ch,int ns);
+

pcsxr-1.9.92.tar.bz2/plugins/dfsound/sdl.c -> pcsxr-1.9.93.tar.bz2/plugins/dfsound/sdl.c Changed

pcsxr-1.9.92.tar.bz2/plugins/dfsound/spu.c -> pcsxr-1.9.93.tar.bz2/plugins/dfsound/spu.c Changed

@@ -24,17 +24,47 @@
 #include "dsoundoss.h"
 #include "regs.h"
 
+#ifdef _WINDOWS
+#include "debug.h"
+#include "record.h"
+#elif defined(_MACOSX)
+#include "maccfg.h"
+#endif
+
 #ifdef ENABLE_NLS
 #include <libintl.h>
 #include <locale.h>
 #define _(x) gettext(x)
 #define N_(x) (x)
+//If running under Mac OS X, use the Localizable.strings file instead.
+#elif defined(_MACOSX)
+#ifdef PCSXRCORE
+__private_extern__ char* Pcsxr_locale_text(char* toloc);
+#define _(String) Pcsxr_locale_text(String)
+#define N_(String) String
+#else
+#ifndef PCSXRPLUG
+#warning please define the plug being built to use Mac OS X localization!
+#define _(msgid) msgid
+#define N_(msgid) msgid
+#else
+//Kludge to get the preprocessor to accept PCSXRPLUG as a variable.
+#define PLUGLOC_x(x,y) x ## y
+#define PLUGLOC_y(x,y) PLUGLOC_x(x,y)
+#define PLUGLOC PLUGLOC_y(PCSXRPLUG,_locale_text)
+__private_extern__ char* PLUGLOC(char* toloc);
+#define _(String) PLUGLOC(String)
+#define N_(String) String
+#endif
+#endif
 #else
 #define _(x) (x)
 #define N_(x) (x)
 #endif
 
-#if defined (USEMACOSX)
+#if defined (_WINDOWS)
+static char * libraryName = N_("DirectSound Driver");
+#elif defined (USEMACOSX)
 static char * libraryName = N_("Mac OS X Sound");
 #elif defined (USEALSA)
 static char * libraryName = N_("ALSA Sound");
@@ -42,6 +72,8 @@
 static char * libraryName = N_("OSS Sound");
 #elif defined (USESDL)
 static char * libraryName = N_("SDL Sound");
+#elif defined (USEOPENAL)
+static char * libraryName = N_("OpenAL Sound");
 #elif defined (USEPULSEAUDIO)
 static char * libraryName = N_("PulseAudio Sound");
 #else
@@ -72,6 +104,7 @@
 int iUseReverb=2;
 int iUseInterpolation=2;
 int iDisStereo=0;
+int							iFreqResponse=0;
 
 // MAIN infos struct for each channel
 
@@ -79,20 +112,32 @@
 REVERBInfo rvb;
 
 unsigned long dwNoiseVal=1; // global noise generator
+unsigned long dwNoiseCount; // global noise generator
+unsigned long dwNoiseClock; // global noise generator
 int iSpuAsyncWait=0;
 
+unsigned int decoded_ptr = 0;
+unsigned int	bIrqHit = 0;
+
 unsigned short spuCtrl=0; // some vars to store psx reg infos
 unsigned short spuStat=0;
 unsigned short spuIrq=0;
-unsigned long spuAddr=0xffffffff; // address into spu mem
+unsigned long spuAddr=0x200; // address into spu mem
 int bEndThread=0; // thread handlers
 int bThreadEnded=0;
 int bSpuInit=0;
 int bSPUIsOpen=0;
 
+#ifdef _WINDOWS
+HWND hWMain=0; // window handle
+HWND hWDebug=0;
+HWND hWRecord=0;
+static HANDLE hMainThread;
+#else
 static pthread_t thread = (pthread_t)-1; // thread id (linux)
+#endif
 
-unsigned long dwNewChannel=0; // flags for faster testing, if new channel starts
+uint32_t dwNewChannel=0; // flags for faster testing, if new channel starts
 
 void (CALLBACK *irqCallback)(void)=0; // func of main emu, called on spu irq
 void (CALLBACK *cddavCallback)(unsigned short,unsigned short)=0;
@@ -110,8 +155,7 @@
 int iCycle = 0;
 short * pS;
 
-int lastch=-1; // last channel processed on spu irq in timer mode
-static int lastns=0; // last ns pos
+int lastns=0; // last ns pos
 static int iSecureStart=0; // secure start counter
 
 ////////////////////////////////////////////////////////////////////////
@@ -158,7 +202,7 @@
 //
 // - and next delta significant (at least twice) bigger:
 // /
-// __- 
+// __-
 //
 // - and next delta is nearly same:
 // /
@@ -166,7 +210,7 @@
 //
 
 
-INLINE void InterpolateUp(int ch)
+static INLINE void InterpolateUp(int ch)
 {
 if(s_chan[ch].SB[32]==1) // flag == 1? calc step and set flag... and don't change the value in this pass
 {
@@ -183,7 +227,7 @@
 if(id2<(id1<<1))
 s_chan[ch].SB[28]=(id1*s_chan[ch].sinc)/0x10000L;
 else
- s_chan[ch].SB[28]=(id1*s_chan[ch].sinc)/0x20000L; 
+ s_chan[ch].SB[28]=(id1*s_chan[ch].sinc)/0x20000L;
 }
 else // curr delta negative
 {
@@ -193,7 +237,7 @@
 if(id2>(id1<<1))
 s_chan[ch].SB[28]=(id1*s_chan[ch].sinc)/0x10000L;
 else
- s_chan[ch].SB[28]=(id1*s_chan[ch].sinc)/0x20000L; 
+ s_chan[ch].SB[28]=(id1*s_chan[ch].sinc)/0x20000L;
 }
 }
 else
@@ -214,7 +258,7 @@
 // even easier interpolation on downsampling, also no special filter, again just "Pete's common sense" tm
 //
 
-INLINE void InterpolateDown(int ch)
+static INLINE void InterpolateDown(int ch)
 {
 if(s_chan[ch].sinc>=0x20000L) // we would skip at least one val?
 {
@@ -240,20 +284,21 @@
 // START SOUND... called by main thread to setup a new sound on a channel
 ////////////////////////////////////////////////////////////////////////
 
-INLINE void StartSound(int ch)
+static INLINE void StartSound(int ch)
 {
 StartADSR(ch);
 StartREVERB(ch);
 
- s_chan[ch].pCurr=s_chan[ch].pStart; // set sample start
+ // fussy timing issues - do in VoiceOn
+ //s_chan[ch].pCurr=s_chan[ch].pStart; // set sample start
+ //s_chan[ch].bStop=0;
+ //s_chan[ch].bOn=1;
 
 s_chan[ch].s_1=0; // init mixing vars
 s_chan[ch].s_2=0;
 s_chan[ch].iSBPos=28;
 
 s_chan[ch].bNew=0; // init channel flags
- s_chan[ch].bStop=0;
- s_chan[ch].bOn=1;
 
 s_chan[ch].SB[29]=0; // init our interpolation helpers
 s_chan[ch].SB[30]=0;
@@ -269,7 +314,7 @@
 // ALL KIND OF HELPERS
 ////////////////////////////////////////////////////////////////////////
 
-INLINE void VoiceChangeFrequency(int ch)
+static INLINE void VoiceChangeFrequency(int ch)
 {
 s_chan[ch].iUsedFreq=s_chan[ch].iActFreq; // -> take it and calc steps
 s_chan[ch].sinc=s_chan[ch].iRawPitch<<4;
@@ -279,7 +324,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-INLINE void FModChangeFrequency(int ch,int ns)
+static INLINE void FModChangeFrequency(int ch,int ns)
 {
 int NP=s_chan[ch].iRawPitch;
 
@@ -297,63 +342,126 @@
 if(iUseInterpolation==1) // freq change in simple interpolation mode
 s_chan[ch].SB[32]=1;
 iFMod[ns]=0;
-} 
+}
 
 ////////////////////////////////////////////////////////////////////////
 
-// noise handler... just produces some noise data
-// surely wrong... and no noise frequency (spuCtrl&0x3f00) will be used...
-// and sometimes the noise will be used as fmod modulation... pfff
+/*
+Noise Algorithm
+- Dr.Hell (Xebra PS1 emu)
+- 100% accurate (waveform + frequency)
+- http://drhell.web.fc2.com
+
+
+Level change cycle
+Freq = 0x8000 >> (NoiseClock >> 2);
+
+Frequency of half cycle
+Half = ((NoiseClock & 3) * 2) / (4 + (NoiseClock & 3));
+- 0 = (0*2)/(4+0) = 0/4
+- 1 = (1*2)/(4+1) = 2/5
+- 2 = (2*2)/(4+2) = 4/6
+- 3 = (3*2)/(4+3) = 6/7
+
+-------------------------------
+
+5*6*7 = 210
+4 - 0*0 = 0
+5 - 42*2 = 84
+6 - 35*4 = 140
+7 - 30*6 = 180
+*/
+
+// Noise Waveform - Dr. Hell (Xebra)
+char NoiseWaveAdd [64] = {
+	1, 0, 0, 1, 0, 1, 1, 0,
+	1, 0, 0, 1, 0, 1, 1, 0,
+	1, 0, 0, 1, 0, 1, 1, 0,
+	1, 0, 0, 1, 0, 1, 1, 0,
+	0, 1, 1, 0, 1, 0, 0, 1,
+	0, 1, 1, 0, 1, 0, 0, 1,
+	0, 1, 1, 0, 1, 0, 0, 1,
+	0, 1, 1, 0, 1, 0, 0, 1
+};
+
+unsigned short NoiseFreqAdd[5] = {
+	0, 84, 140, 180, 210
+};
+
+static INLINE void NoiseClock()
+{
+	unsigned int level;
+
+	level = 0x8000 >> (dwNoiseClock >> 2);
+	level <<= 16;
 
-INLINE int iGetNoiseVal(int ch)
+	dwNoiseCount += 0x10000;
+
+	// Dr. Hell - fraction
+	dwNoiseCount += NoiseFreqAdd[ dwNoiseClock & 3 ];
+	if( (dwNoiseCount&0xffff) >= NoiseFreqAdd[4] ) {
+		dwNoiseCount += 0x10000;
+		dwNoiseCount -= NoiseFreqAdd[ dwNoiseClock & 3 ];
+	}
+
+	if( dwNoiseCount >= level )
+	{
+		while( dwNoiseCount >= level )
+			dwNoiseCount -= level;
+
+		// Dr. Hell - form
+		dwNoiseVal = (dwNoiseVal<<1) | NoiseWaveAdd[ (dwNoiseVal>>10) & 63 ];
+	}
+}
+
+static INLINE int iGetNoiseVal(int ch)
 {
 int fa;
 
- if((dwNoiseVal<<=1)&0x80000000L)
- {
- dwNoiseVal^=0x0040001L;
- fa=((dwNoiseVal>>2)&0x7fff);
- fa=-fa;
- }
- else fa=(dwNoiseVal>>2)&0x7fff;
+ fa = (short) dwNoiseVal;
+
+ // no clip need
+ //if(fa>32767L) fa=32767L;
+ //if(fa<-32767L) fa=-32767L;
 
- // mmm... depending on the noise freq we allow bigger/smaller changes to the previous val
- fa=s_chan[ch].iOldNoise+((fa-s_chan[ch].iOldNoise)/((0x001f-((spuCtrl&0x3f00)>>9))+1));
- if(fa>32767L) fa=32767L;
- if(fa<-32767L) fa=-32767L; 
- s_chan[ch].iOldNoise=fa;
+ // don't upset VAG decoder
+ //if(iUseInterpolation<2) // no gauss/cubic interpolation?
+ //pChannel->SB[29] = fa; // -> store noise val in "current sample" slot
 
- if(iUseInterpolation<2) // no gauss/cubic interpolation?
- s_chan[ch].SB[29] = fa; // -> store noise val in "current sample" slot
+ // boost volume - no more!
+ //return fa * 3 / 2;
 return fa;
-} 
+}
 
 ////////////////////////////////////////////////////////////////////////
 
-INLINE void StoreInterpolationVal(int ch,int fa)
+static INLINE void StoreInterpolationVal(int ch,int fa)
 {
+	/*
+	// fmod channel = sound output
 if(s_chan[ch].bFMod==2) // fmod freq channel
 s_chan[ch].SB[29]=fa;
 else
+ */
 {
 if((spuCtrl&0x4000)==0) fa=0; // muted?
 else // else adjust
 {
 if(fa>32767L) fa=32767L;
- if(fa<-32767L) fa=-32767L; 
+ if(fa<-32767L) fa=-32767L;
 }
 
 if(iUseInterpolation>=2) // gauss/cubic interpolation
- { 
+ {
 int gpos = s_chan[ch].SB[28];
- gval0 = fa; 
+ gval0 = fa;
 gpos = (gpos+1) & 3;
 s_chan[ch].SB[28] = gpos;
 }
 else
 if(iUseInterpolation==1) // simple interpolation
 {
- s_chan[ch].SB[28] = 0; 
+ s_chan[ch].SB[28] = 0;
 s_chan[ch].SB[29] = s_chan[ch].SB[30]; // -> helpers for simple linear interpolation: delay real val for two slots, and calc the two deltas, for a 'look at the future behaviour'
 s_chan[ch].SB[30] = s_chan[ch].SB[31];
 s_chan[ch].SB[31] = fa;
@@ -365,14 +473,15 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-INLINE int iGetInterpolationVal(int ch)
+static INLINE int iGetInterpolationVal(int ch)
 {
 int fa;
 
- if(s_chan[ch].bFMod==2) return s_chan[ch].SB[29];
+ // fmod channel = sound output
+ //if(s_chan[ch].bFMod==2) return s_chan[ch].SB[29];
 
 switch(iUseInterpolation)
- { 
+ {
 //--------------------------------------------------//
 case 3: // cubic interpolation
 {
@@ -415,7 +524,7 @@
 //--------------------------------------------------//
 default: // no interpolation
 {
- fa=s_chan[ch].SB[29]; 
+ fa=s_chan[ch].SB[29];
 } break;
 //--------------------------------------------------//
 }
@@ -433,22 +542,27 @@
 // .. can be made smaller (smallest val: 1 ms), but bigger waits give
 // better performance
 
-#define PAUSE_W 5
-#define PAUSE_L 5000
+#define PAUSE_W 1
+#define PAUSE_L 1000
 
 ////////////////////////////////////////////////////////////////////////
 
+#ifdef _WINDOWS
+static VOID CALLBACK MAINProc(UINT nTimerId, UINT msg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2)
+#else
 static void *MAINThread(void *arg)
+#endif
 {
 int s_1,s_2,fa,ns;
-#ifndef _MACOSX
 int voldiv = iVolume;
-#else
- const int voldiv = 2;
-#endif
+
 unsigned char * start;unsigned int nSample;
 int ch,predict_nr,shift_factor,flags,d,s;
 int bIRQReturn=0;
+ unsigned int decoded_voice=0;
+
+ // mute output
+ if( voldiv == 5 ) voldiv = 0x7fffffff;
 
 while(!bEndThread) // until we are shutting down
 {
@@ -462,7 +576,7 @@
 if(dwNewChannel) // new channel should start immedately?
 { // (at least one bit 0 ... MAXCHANNEL is set?)
 iSecureStart++; // -> set iSecure
- if(iSecureStart>5) iSecureStart=0; // (if it is set 5 times - that means on 5 tries a new samples has been started - in a row, we will reset it, to give the sound update a chance)
+ if(iSecureStart>1) iSecureStart=0; // (if it is set 5 times - that means on 5 tries a new samples has been started - in a row, we will reset it, to give the sound update a chance)
 }
 else iSecureStart=0; // 0: no new channel should start
 
@@ -471,50 +585,101 @@
 {
 iSecureStart=0; // reset secure
 
+#ifdef _WINDOWS
+ if(iUseTimer) // no-thread mode?
+ {
+ if(iUseTimer==1) // -> ok, timer mode 1: setup a oneshot timer of x ms to wait
+ timeSetEvent(PAUSE_W,1,MAINProc,0,TIME_ONESHOT);
+ return; // -> and done this time (timer mode 1 or 2)
+ }
+ // win thread mode:
+ Sleep(PAUSE_W); // sleep for x ms (win)
+#else
 if(iUseTimer) return 0; // linux no-thread mode? bye
 usleep(PAUSE_L); // else sleep for x ms (linux)
+#endif
 
 if(dwNewChannel) iSecureStart=1; // if a new channel kicks in (or, of course, sound buffer runs low), we will leave the loop
 }
 
- //--------------------------------------------------// continue from irq handling in timer mode? 
+ ns=0;
+
+ //--------------------------------------------------// continue from irq handling in timer mode?
 
- if(lastch>=0) // will be -1 if no continue is pending
+ if(lastns>0) // will be 0 if no continue is pending
 {
- ch=lastch; ns=lastns; lastch=-1; // -> setup all kind of vars to continue
- goto GOON; // -> directly jump to the continue point
+ ns=lastns; // -> setup all kind of vars to continue
+ lastns=0;
 }
 
 //--------------------------------------------------//
- //- main channel loop -// 
+ //- main channel loop -//
 //--------------------------------------------------//
 {
- for(ch=0;ch<MAXCHAN;ch++) // loop em all... we will collect 1 ms of sound of each playing channel
+		 decoded_voice = decoded_ptr;
+
+		 while(ns<NSSIZE) // loop until 1 ms of data is reached
 {
- if(s_chan[ch].bNew) StartSound(ch); // start new sound
- if(!s_chan[ch].bOn) continue; // channel not playing? next
+				SSumL[ns]=0;
+				SSumR[ns]=0;
 
- if(s_chan[ch].iActFreq!=s_chan[ch].iUsedFreq) // new psx frequency?
- VoiceChangeFrequency(ch);
 
- ns=0;
- while(ns<NSSIZE) // loop until 1 ms of data is reached
+				// decoded buffer values - dummy
+				spuMem[ (0x000 + decoded_voice) / 2 ] = (short) 0;
+				spuMem[ (0x400 + decoded_voice) / 2 ] = (short) 0;
+				spuMem[ (0x800 + decoded_voice) / 2 ] = (short) 0;
+				spuMem[ (0xc00 + decoded_voice) / 2 ] = (short) 0;
+
+
+				NoiseClock();
+
+				for(ch=0;ch<MAXCHAN;ch++) // loop em all... we will collect 1 ms of sound of each playing channel
 {
- if(s_chan[ch].bFMod==1 && iFMod[ns]) // fmod freq channel
+					if(s_chan[ch].bNew) {
+#if 1
+						StartSound(ch);																 // start new sound
+						dwNewChannel&=~(1<<ch); // clear new channel bit
+#else
+						if( s_chan[ch].ADSRX.StartDelay == 0 ) {
+							StartSound(ch);															// start new sound
+							dwNewChannel&=~(1<<ch); // clear new channel bit
+						} else {
+							s_chan[ch].ADSRX.StartDelay--;
+						}
+#endif
+					}
+				 if(!s_chan[ch].bOn) continue; // channel not playing? next
+
+				 if(s_chan[ch].iActFreq!=s_chan[ch].iUsedFreq) // new psx frequency?
+					VoiceChangeFrequency(ch);
+
+				 if(s_chan[ch].bFMod==1 && iFMod[ns]) // fmod freq channel
 FModChangeFrequency(ch,ns);
 
 while(s_chan[ch].spos>=0x10000L)
 {
 if(s_chan[ch].iSBPos==28) // 28 reached?
 {
- start=s_chan[ch].pCurr; // set up the current pos
+						 // Xenogears - Anima Relic dungeon (exp gain)
+						 if( s_chan[ch].bLoopJump == 1 )
+							 s_chan[ch].pCurr = s_chan[ch].pLoop;
+
+						 s_chan[ch].bLoopJump = 0;
+
+
+						 start=s_chan[ch].pCurr; // set up the current pos
+
+ if (start == spuMemC)
+ s_chan[ch].bOn = 0;
 
- if (start == (unsigned char*)-1) // special "stop" sign
+ if (s_chan[ch].iSilent==1 )
 {
- s_chan[ch].bOn=0; // -> turn everything off
+ // silence = let channel keep running (IRQs)
+							 //s_chan[ch].bOn=0; // -> turn everything off
+							 s_chan[ch].iSilent=2;
+
 s_chan[ch].ADSRX.lVolume=0;
 s_chan[ch].ADSRX.EnvelopeVol=0;
- goto ENDX; // -> and done for this channel
 }
 
 s_chan[ch].iSBPos=0;
@@ -529,9 +694,12 @@
 predict_nr >>= 4;
 flags=(int)*start;start++;
 
- // -------------------------------------- // 
+						 // Silhouette Mirage - Serah fight
+						 if( predict_nr > 4 ) predict_nr = 0;
+
+ // -------------------------------------- //
 
- for (nSample=0;nSample<28;start++) 
+ for (nSample=0;nSample<28;start++)
 {
 d=(int)*start;
 s=((d&0xf)<<12);
@@ -539,14 +707,23 @@
 
 fa=(s >> shift_factor);
 fa=fa + ((s_1 * f[predict_nr][0])>>6) + ((s_2 * f[predict_nr][1])>>6);
+
+							 // snes brr clamps
+							 fa = CLAMP16(fa);
+
 s_2=s_1;s_1=fa;
 s=((d & 0xf0) << 8);
 
 s_chan[ch].SB[nSample++]=fa;
 
+
 if(s&0x8000) s|=0xffff0000;
 fa=(s>>shift_factor);
 fa=fa + ((s_1 * f[predict_nr][0])>>6) + ((s_2 * f[predict_nr][1])>>6);
+
+							 // snes brr clamps
+							 fa = CLAMP16(fa);
+
 s_2=s_1;s_1=fa;
 
 s_chan[ch].SB[nSample++]=fa;
@@ -554,16 +731,24 @@
 
 //////////////////////////////////////////// irq check
 
+#if 1
+						// Check channel/loop IRQs (e.g. Castlevania Chronicles) and at pos-8 for unknown reason
+						if( Check_IRQ( (s_chan[ch].pCurr)-spuMemC, 0 ) ||
+								Check_IRQ( (start-spuMemC)-0, 0 ) ||
+								Check_IRQ( (start-spuMemC)-8, 0 ) )
+						{
+#else
 if(irqCallback && (spuCtrl&0x40)) // some callback and irq active?
 {
 if((pSpuIrq > start-16 && // irq address reached?
 pSpuIrq <= start) ||
- ((flags&1) && // special: irq on looping addr, when stop/loop flag is set 
+ ((flags&1) && // special: irq on looping addr, when stop/loop flag is set
 (pSpuIrq > s_chan[ch].pLoop-16 &&
 pSpuIrq <= s_chan[ch].pLoop)))
+#endif
 {
 s_chan[ch].iIrqDone=1; // -> debug flag
- irqCallback(); // -> call main emu
+ //irqCallback(); // -> call main emu (checked & called on Check_IRQ)
 
 if(iSPUIRQWait) // -> option: wait after irq for main emu
 {
@@ -575,48 +760,68 @@
 
 //////////////////////////////////////////// flag handler
 
- if((flags&4) && (!s_chan[ch].bIgnoreLoop))
- s_chan[ch].pLoop=start-16; // loop adress
+						/*
+						SPU2-X:
+						$4 = set loop to current block
+						$2 = keep envelope on (no mute)
+						$1 = jump to loop address
 
- if(flags&1) // 1: stop/loop
- {
- // We play this block out first...
- //if(!(flags&2)) // 1+2: do loop... otherwise: stop
- if(flags!=3 || s_chan[ch].pLoop==NULL) // PETE: if we don't check exactly for 3, loop hang ups will happen (DQ4, for example)
- { // and checking if pLoop is set avoids crashes, yeah
- start = (unsigned char*)-1;
- }
- else
- {
- start = s_chan[ch].pLoop;
- }
- }
+						silence means no volume (ADSR keeps playing!!)
+						*/
 
- s_chan[ch].pCurr=start; // store values for next cycle
- s_chan[ch].s_1=s_1;
- s_chan[ch].s_2=s_2;
+						if(flags&4)
+							s_chan[ch].pLoop=start-16;
 
- if(bIRQReturn) // special return for "spu irq - wait for cpu action"
- {
- bIRQReturn=0;
- if(iUseTimer!=2)
- { 
- DWORD dwWatchTime=timeGetTime_spu()+2500;
-
- while(iSpuAsyncWait && !bEndThread && 
- timeGetTime_spu()<dwWatchTime)
- usleep(1000L);
- }
- else
- {
- lastch=ch; 
- lastns=ns;
 
- return 0;
- }
- }
+						// Jungle Book - Rhythm 'n Groove - don't reset ignore status
+						// - fixes gameplay speed (IRQ hits)
+						//s_chan[ch].bIgnoreLoop = 0;
+
+
+						if(flags&1)
+						{
+							// ...?
+							//s_chan[ch].bIgnoreLoop = 0;
+
+							// Xenogears - 7 = play missing sounds
+							// set jump flag
+							s_chan[ch].bLoopJump = 1;
+
 
-GOON: ;
+							// silence = keep playing..?
+							if( (flags&2) == 0 ) {
+								s_chan[ch].iSilent = 1;
+
+								// silence = don't start release phase
+								//s_chan[ch].bStop = 1;
+
+								//start = (unsigned char *) -1;
+							}
+						}
+
+#if 0
+						// crash check
+						if( start == 0 )
+							start = (unsigned char *) -1;
+						if( start >= spuMemC + 0x80000 )
+							start = spuMemC - 0x80000;
+#endif
+
+
+						// Silhouette Mirage - ending mini-game
+
+						// ??
+						if( start - spuMemC >= 0x80000 ) {
+							start -= 16;
+
+							s_chan[ch].iSilent = 1;
+							s_chan[ch].bStop = 1;
+						}
+
+
+ s_chan[ch].pCurr=start; // store values for next cycle
+ s_chan[ch].s_1=s_1;
+ s_chan[ch].s_2=s_2;
 }
 
 fa=s_chan[ch].SB[s_chan[ch].iSBPos++]; // get sample data
@@ -630,16 +835,27 @@
 fa=iGetNoiseVal(ch); // get noise val
 else fa=iGetInterpolationVal(ch); // get sample val
 
+
+				 // Voice 1/3 decoded buffer
+				 if( ch == 0 ) {
+					 spuMem[ (0x800 + decoded_voice) / 2 ] = (short) fa;
+				 } else if( ch == 2 ) {
+					 spuMem[ (0xc00 + decoded_voice) / 2 ] = (short) fa;
+				 }
+
+
 s_chan[ch].sval = (MixADSR(ch) * fa) / 1023; // mix adsr
 
 if(s_chan[ch].bFMod==2) // fmod freq channel
 iFMod[ns]=s_chan[ch].sval; // -> store 1T sample data, use that to do fmod on next channel
- else // no fmod freq channel
- {
+
+				 // mix fmod channel into output
+				 // - Xenogears save icon (high pitch)
+				 {
 //////////////////////////////////////////////
 // ok, left/right sound volume (psx volume goes from 0 ... 0x3fff)
 
- if(s_chan[ch].iMute) 
+ if(s_chan[ch].iMute)
 s_chan[ch].sval=0; // debug mute
 else
 {
@@ -648,29 +864,99 @@
 }
 
 //////////////////////////////////////////////
- // now let us store sound data for reverb 
+ // now let us store sound data for reverb
 
 if(s_chan[ch].bRVBActive) StoreREVERB(ch,ns);
 }
 
- ////////////////////////////////////////////////
- // ok, go on until 1 ms data of this channel is collected
+				 s_chan[ch].spos += s_chan[ch].sinc;
+ }
 
- ns++;
- s_chan[ch].spos += s_chan[ch].sinc;
+ ////////////////////////////////////////////////
+ // ok, go on until 1 ms data of this channel is collected
 
- }
-ENDX: ;
- }
+				// decoded buffer - voice
+				decoded_voice += 2;
+				decoded_voice &= 0x3ff;
+
+
+				// status flag
+				if( decoded_voice >= 0x200 ) {
+					spuStat |= STAT_DECODED;
+				} else {
+					spuStat &= ~STAT_DECODED;
+				}
+
+
+				// IRQ work
+				{
+					unsigned char *old_irq;
+					unsigned int old_ptr;
+
+					old_irq = pSpuIrq;
+					old_ptr = decoded_voice;
+
+#if 0
+					// align to boundaries ($0, $200, $400, $600)
+					pSpuIrq = ((pSpuIrq - spuMemC) & (~0x1ff)) + spuMemC;
+					decoded_voice = decoded_voice & (~0x1ff);
+#endif
+
+					// check all decoded buffer IRQs - timing issue
+					Check_IRQ( decoded_voice + 0x000, 0 );
+					Check_IRQ( decoded_voice + 0x400, 0 );
+					Check_IRQ( decoded_voice + 0x800, 0 );
+					Check_IRQ( decoded_voice + 0xc00, 0 );
+
+					pSpuIrq = old_irq;
+					decoded_voice = old_ptr;
+				}
+
+ if(bIRQReturn) // special return for "spu irq - wait for cpu action"
+ {
+ bIRQReturn=0;
+ if(iUseTimer!=2)
+ {
+ DWORD dwWatchTime=timeGetTime_spu()+2500;
+
+ while(iSpuAsyncWait && !bEndThread &&
+ timeGetTime_spu()<dwWatchTime)
+#ifdef _WINDOWS
+ Sleep(1);
+#else
+ usleep(1000L);
+#endif
+ }
+ else
+ {
+ lastns=ns+1;
+
+#ifdef _WINDOWS
+ return;
+#else
+ return 0;
+#endif
+ }
+ }
+
+ ns++;
+ } // end ns
 }
 
+
 //---------------------------------------------------//
 //- here we have another 1 ms of sound data
 //---------------------------------------------------//
 // mix XA infos (if any)
 
 MixXA();
- 
+
+
+	// now safe to update decoded buffer ptr
+	decoded_ptr += ns * 2;
+	decoded_ptr &= 0x3ff;
+
+
 ///////////////////////////////////////////////////////
 // mix all channels (including reverb) into one buffer
 
@@ -694,42 +980,86 @@
 else // stereo:
 for (ns = 0; ns < NSSIZE; ns++)
 {
- SSumL[ns] += MixREVERBLeft(ns);
+		static double _interpolation_coefficient = 3.759285613;
+
+		if(iFreqResponse) {
+			int sl,sr;
+			double ldiff, rdiff, avg, tmp;
+
+			SSumL[ns]+=MixREVERBLeft(ns);
+			SSumR[ns]+=MixREVERBRight();
+
+			sl = SSumL[ns]; SSumL[ns]=0;
+			sr = SSumR[ns]; SSumR[ns]=0;
+
+
+			/*
+			Frequency Response
+			- William Pitcock (nenolod) (UPSE PSF player)
+			- accurate (!)
+			- http://nenolod.net
+			*/
+
+			avg = ((sl + sr) / 2);
+			ldiff = sl - avg;
+			rdiff = sr - avg;
+
+			tmp = avg + ldiff * _interpolation_coefficient;
+			if (tmp < -32768)
+				tmp = -32768;
+			if (tmp > 32767)
+				tmp = 32767;
+			sl = (int)tmp;
+
+			tmp = avg + rdiff * _interpolation_coefficient;
+			if (tmp < -32768)
+				tmp = -32768;
+			if (tmp > 32767)
+				tmp = 32767;
+			sr = (int)tmp;
+
+
+			*pS++=sl/voldiv;
+			*pS++=sr/voldiv;
+		} else {
+			SSumL[ns]+=MixREVERBLeft(ns);
 
- d = SSumL[ns] / voldiv; SSumL[ns] = 0;
- if (d < -32767) d = -32767; if (d > 32767) d = 32767;
- *pS++ = d;
+			d=SSumL[ns]/voldiv;SSumL[ns]=0;
+			if(d<-32767) d=-32767;if(d>32767) d=32767;
+			*pS++=d;
 
- SSumR[ns] += MixREVERBRight();
+			SSumR[ns]+=MixREVERBRight();
 
- d = SSumR[ns] / voldiv; SSumR[ns] = 0;
- if(d < -32767) d = -32767; if(d > 32767) d = 32767;
- *pS++ = d;
+			d=SSumR[ns]/voldiv;SSumR[ns]=0;
+			if(d<-32767) d=-32767;if(d>32767) d=32767;
+			*pS++=d;
+		}
 }
 
- ////////////////////////////////////////////////////// 
+ //////////////////////////////////////////////////////
 // special irq handling in the decode buffers (0x0000-0x1000)
- // we know: 
+ // we know:
 // the decode buffers are located in spu memory in the following way:
 // 0x0000-0x03ff CD audio left
 // 0x0400-0x07ff CD audio right
 // 0x0800-0x0bff Voice 1
 // 0x0c00-0x0fff Voice 3
 // and decoded data is 16 bit for one sample
- // we assume: 
+ // we assume:
 // even if voices 1/3 are off or no cd audio is playing, the internal
 // play positions will move on and wrap after 0x400 bytes.
- // Therefore: we just need a pointer from spumem+0 to spumem+3ff, and 
+ // Therefore: we just need a pointer from spumem+0 to spumem+3ff, and
 // increase this pointer on each sample by 2 bytes. If this pointer
 // (or 0x400 offsets of this pointer) hits the spuirq address, we generate
 // an IRQ. Only problem: the "wait for cpu" option is kinda hard to do here
 // in some of Peops timer modes. So: we ignore this option here (for now).
 
+#if 0
 if(pMixIrq && irqCallback)
 {
 for(ns=0;ns<NSSIZE;ns++)
 {
- if((spuCtrl&0x40) && pSpuIrq && pSpuIrq<spuMemC+0x1000) 
+ if((spuCtrl&0x40) && pSpuIrq && pSpuIrq<spuMemC+0x1000)
 {
 for(ch=0;ch<4;ch++)
 {
@@ -740,32 +1070,60 @@
 pMixIrq+=2;if(pMixIrq>spuMemC+0x3ff) pMixIrq=spuMemC;
 }
 }
+#endif
 
 InitREVERB();
 
+ //////////////////////////////////////////////////////
 // feed the sound
- // wanna have around 1/60 sec (16.666 ms) updates
- if (iCycle++ > 16)
+ // latency = 25 ms (less pops, crackles, smoother)
+
+	//if(iCycle++>=20)
+	iCycle += APU_CYCLES_UPDATE;
+	if(iCycle > 44000/1000*LATENCY + 100*LATENCY/1000)
 {
 SoundFeedStreamData((unsigned char *)pSpuBuffer,
 ((unsigned char *)pS) - ((unsigned char *)pSpuBuffer));
 pS = (short *)pSpuBuffer;
 iCycle = 0;
 }
+
+
+	if( iUseTimer == 2 )
+		break;
 }
 
 // end of big main loop...
 
 bThreadEnded = 1;
 
+#ifndef _WINDOWS
 return 0;
+#endif
 }
 
+////////////////////////////////////////////////////////////////////////
+// WINDOWS THREAD... simply calls the timer func and stays forever :)
+////////////////////////////////////////////////////////////////////////
+
+#ifdef _WINDOWS
+
+DWORD WINAPI MAINThreadEx(LPVOID lpParameter)
+{
+ MAINProc(0,0,0,0,0);
+ return 0;
+}
+
+#endif
+
 // SPU ASYNC... even newer epsxe func
 // 1 time every 'cycle' cycles... harhar
 
+long cpu_cycles;
 void CALLBACK SPUasync(unsigned long cycle)
 {
+	cpu_cycles += cycle;
+
 if(iSpuAsyncWait)
 {
 iSpuAsyncWait++;
@@ -773,11 +1131,36 @@
 iSpuAsyncWait=0;
 }
 
+#ifdef _WINDOWS
+ if(iDebugMode==2)
+ {
+ if(IsWindow(hWDebug)) DestroyWindow(hWDebug);
+ hWDebug=0;iDebugMode=0;
+ }
+ if(iRecordMode==2)
+ {
+ if(IsWindow(hWRecord)) DestroyWindow(hWRecord);
+ hWRecord=0;iRecordMode=0;
+ }
+#endif
+
 if(iUseTimer==2) // special mode, only used in Linux by this spu (or if you enable the experimental Windows mode)
 {
 if(!bSpuInit) return; // -> no init, no call
 
- MAINThread(0); // -> linux high-compat mode
+	 // note: usable precision difference (not using interval_time)
+	 while( cpu_cycles >= CPU_CLOCK / 44100 * NSSIZE )
+	 {
+	#ifdef _WINDOWS
+		 MAINProc(0,0,0,0,0); // -> experimental win mode... not really tested... don't like the drawbacks
+	#else
+		 MAINThread(0); // -> linux high-compat mode
+	#endif
+
+	 if (iSpuAsyncWait)
+	 break;
+	 cpu_cycles -= CPU_CLOCK / 44100 * NSSIZE;
+	 }
 }
 }
 
@@ -823,13 +1206,35 @@
 pS=(short *)pSpuBuffer; // setup soundbuffer pointer
 
 bEndThread=0; // init thread vars
- bThreadEnded=0; 
+ bThreadEnded=0;
 bSpuInit=1; // flag: we are inited
 
+#ifdef _WINDOWS
+
+ if(iUseTimer==1) // windows: use timer
+ {
+ timeBeginPeriod(1);
+ timeSetEvent(1,1,MAINProc,0,TIME_ONESHOT);
+ }
+ else
+ if(iUseTimer==0) // windows: use thread
+ {
+ //_beginthread(MAINThread,0,NULL);
+ DWORD dw;
+ hMainThread=CreateThread(NULL,0,MAINThreadEx,0,0,&dw);
+ SetThreadPriority(hMainThread,
+ //THREAD_PRIORITY_TIME_CRITICAL);
+ THREAD_PRIORITY_HIGHEST);
+ }
+
+#else
+
 if(!iUseTimer) // linux: use thread
 {
 pthread_create(&thread, NULL, MAINThread, NULL);
 }
+
+#endif
 }
 
 // REMOVETIMER: kill threads/timers
@@ -837,6 +1242,16 @@
 {
 bEndThread=1; // raise flag to end thread
 
+#ifdef _WINDOWS
+
+ if(iUseTimer!=2) // windows thread?
+ {
+ while(!bThreadEnded) {Sleep(5L);} // -> wait till thread has ended
+ Sleep(5L);
+ }
+ if(iUseTimer==1) timeEndPeriod(1); // windows timer? stop it
+
+#else
 if(!iUseTimer) // linux tread?
 {
 int i=0;
@@ -844,13 +1259,15 @@
 if(thread!=(pthread_t)-1) {pthread_cancel(thread);thread=(pthread_t)-1;} // -> cancel thread anyway
 }
 
+#endif
+
 bThreadEnded=0; // no more spu is running
 bSpuInit=0;
 }
 
 // SETUPSTREAMS: init most of the spu buffers
 void SetupStreams(void)
-{ 
+{
 int i;
 
 pSpuBuffer=(unsigned char *)malloc(32768); // alloc mixing buffer
@@ -870,14 +1287,14 @@
 XAFeed = XAStart;
 
 CDDAStart = // alloc cdda buffer
- (uint32_t *)malloc(16384 * sizeof(uint32_t));
- CDDAEnd = CDDAStart + 16384;
+ (uint32_t *)malloc(44100 * sizeof(uint32_t));
+ CDDAEnd = CDDAStart + 44100;
 CDDAPlay = CDDAStart;
- CDDAFeed = CDDAStart + 1;
+ CDDAFeed = CDDAStart;
 
 for(i=0;i<MAXCHAN;i++) // loop sound channels
 {
-// we don't use mutex sync... not needed, would only 
+// we don't use mutex sync... not needed, would only
 // slow us down:
 // s_chan[i].hMutex=CreateMutex(NULL,FALSE,NULL);
 s_chan[i].ADSRX.SustainLevel = 1024; // -> init sustain
@@ -893,7 +1310,7 @@
 
 // REMOVESTREAMS: free most buffer
 void RemoveStreams(void)
-{ 
+{
 free(pSpuBuffer); // free mixing buffer
 pSpuBuffer = NULL;
 free(sRVBStart); // free reverb buffer
@@ -916,7 +1333,7 @@
 iVolume = 3;
 iReverbOff = -1;
 spuIrq = 0;
- spuAddr = 0xffffffff;
+ spuAddr = 0x200;
 bEndThread = 0;
 bThreadEnded = 0;
 spuMemC = (unsigned char *)spuMem;
@@ -924,7 +1341,7 @@
 memset((void *)s_chan, 0, (MAXCHAN + 1) * sizeof(SPUCHAN));
 pSpuIrq = 0;
 iSPUIRQWait = 1;
- lastch = -1;
+ lastns = 0;
 
 ReadConfig(); // read user stuff
 SetupStreams(); // prepare streaming
@@ -933,15 +1350,45 @@
 }
 
 // SPUOPEN: called by main emu after init
-long CALLBACK SPUopen(void)
+#ifdef _WINDOWS
+long CALLBACK SPUopen(HWND hW)
+#else
+long SPUopen(void)
+#endif
 {
 if (bSPUIsOpen) return 0; // security for some stupid main emus
 
+#ifdef _WINDOWS
+ LastWrite=0xffffffff;LastPlay=0; // init some play vars
+ if(!IsWindow(hW)) hW=GetActiveWindow();
+ hWMain = hW; // store hwnd
+#endif
+
 SetupSound(); // setup sound (before init!)
 SetupTimer(); // timer for feeding data
 
 bSPUIsOpen = 1;
 
+#ifdef _WINDOWS
+ if(iDebugMode) // windows debug dialog
+ {
+ hWDebug=CreateDialog(hInst,MAKEINTRESOURCE(IDD_DEBUG),
+ NULL,(DLGPROC)DebugDlgProc);
+ SetWindowPos(hWDebug,HWND_TOPMOST,0,0,0,0,SWP_NOMOVE|SWP_NOSIZE|SWP_SHOWWINDOW|SWP_NOACTIVATE);
+ UpdateWindow(hWDebug);
+ SetFocus(hWMain);
+ }
+
+ if(iRecordMode) // windows recording dialog
+ {
+ hWRecord=CreateDialog(hInst,MAKEINTRESOURCE(IDD_RECORD),
+ NULL,(DLGPROC)RecordDlgProc);
+ SetWindowPos(hWRecord,HWND_TOPMOST,0,0,0,0,SWP_NOMOVE|SWP_NOSIZE|SWP_SHOWWINDOW|SWP_NOACTIVATE);
+ UpdateWindow(hWRecord);
+ SetFocus(hWMain);
+ }
+#endif
+
 return PSE_SPU_ERR_SUCCESS;
 }
 
@@ -952,6 +1399,13 @@
 
 bSPUIsOpen = 0; // no more open
 
+#ifdef _WINDOWS
+ if(IsWindow(hWDebug)) DestroyWindow(hWDebug);
+ hWDebug=0;
+ if(IsWindow(hWRecord)) DestroyWindow(hWRecord);
+ hWRecord=0;
+#endif
+
 RemoveTimer(); // no more feeding
 RemoveSound(); // no more sound handling
 
@@ -976,26 +1430,33 @@
 // SPUCONFIGURE: call config dialog
 long CALLBACK SPUconfigure(void)
 {
-#ifdef _MACOSX
- DoConfiguration();
+#if defined (_WINDOWS)
+ DialogBox(hInst,MAKEINTRESOURCE(IDD_CFGDLG),
+ GetActiveWindow(),(DLGPROC)DSoundDlgProc);
+#elif defined (_MACOSX)
+ return DoConfiguration();
 #else
- StartCfgTool("CFG");
+ StartCfgTool("configure");
 #endif
+
 return 0;
 }
 
 // SPUABOUT: show about window
 void CALLBACK SPUabout(void)
 {
-#ifdef _MACOSX
+#if defined (_WINDOWS)
+ DialogBox(hInst,MAKEINTRESOURCE(IDD_ABOUT),
+ GetActiveWindow(),(DLGPROC)AboutDlgProc);
+#elif defined (_MACOSX)
 DoAbout();
 #else
- StartCfgTool("ABOUT");
+ StartCfgTool("about");
 #endif
 }
 
 // SETUP CALLBACKS
-// this functions will be called once, 
+// this functions will be called once,
 // passes a callback that should be called on SPU-IRQ/cdda volume change
 void CALLBACK SPUregisterCallback(void (CALLBACK *callback)(void))
 {
@@ -1020,7 +1481,7 @@
 
 unsigned long CALLBACK PSEgetLibVersion(void)
 {
- return (1 << 16) | (6 << 8);
+ return (1 << 16) | (1 << 8);
 }
 
 char * SPUgetLibInfos(void)

pcsxr-1.9.92.tar.bz2/plugins/dfsound/spu.h -> pcsxr-1.9.93.tar.bz2/plugins/dfsound/spu.h Changed

@@ -1,21 +1,21 @@
-/***************************************************************************
-                            spu.h  -  description
-                             -------------------
-    begin                : Wed May 15 2002
-    copyright            : (C) 2002 by Pete Bernert
-    email                : BlackDove@addcom.de
- ***************************************************************************/
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version. See also the license.txt file for *
- *   additional informations.                                              *
- *                                                                         *
- ***************************************************************************/
-
-void SetupTimer(void);
-void RemoveTimer(void);
-void CALLBACK SPUplayADPCMchannel(xa_decode_t *xap);
-void CALLBACK SPUplayCDDAchannel(short *pcm, int bytes);
\ No newline at end of file
+/***************************************************************************
+                            spu.h  -  description
+                             -------------------
+    begin                : Wed May 15 2002
+    copyright            : (C) 2002 by Pete Bernert
+    email                : BlackDove@addcom.de
+ ***************************************************************************/
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+void SetupTimer(void);
+void RemoveTimer(void);
+void CALLBACK SPUplayADPCMchannel(xa_decode_t *xap);
+void CALLBACK SPUplayCDDAchannel(short *pcm, int bytes);

pcsxr-1.9.93.tar.bz2/plugins/dfsound/spucfg-0.1df/dfsound.ui Added

@@ -0,0 +1,397 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ 
+ <object class="GtkDialog" id="CfgWnd">
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Configure Sound</property>
+ <property name="resizable">False</property>
+ <property name="modal">True</property>
+ <property name="window_position">center</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox1">
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="btn_close">
+ <property name="label">gtk-close</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <child>
+ <object class="GtkAlignment" id="alignment4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <child>
+ <object class="GtkTable" id="table1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">3</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">5</property>
+ <property name="row_spacing">5</property>
+ <child>
+ <object class="GtkLabel" id="label1v">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Volume:</property>
+ <property name="justify">right</property>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Interpolation:</property>
+ <property name="justify">right</property>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Reverb:</property>
+ <property name="justify">right</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="cbVolume2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="model">liststoreVolume</property>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertextVolume"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="cbReverb2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="model">liststoreReverb</property>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertextReverb"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="cbInterpolation2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="model">liststoreInterpolation</property>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertextInterpolation"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <child>
+ <object class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <child>
+ <object class="GtkVBox" id="vbox3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkCheckButton" id="chkXASpeed">
+ <property name="label" translatable="yes">Adjust XA speed</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Choose this if XA music is played too quickly.</property>
+ <property name="tooltip_text" translatable="yes">Choose this if XA music is played too quickly.</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <child>
+ <object class="GtkAlignment" id="alignment3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <child>
+ <object class="GtkVBox" id="vbox4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkCheckButton" id="chkHiCompat">
+ <property name="label" translatable="yes">High compatibility mode</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Use the asynchronous SPU interface.</property>
+ <property name="tooltip_text" translatable="yes">Use the asynchronous SPU interface.</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="chkIRQWait">
+ <property name="label" translatable="yes">SPU IRQ Wait</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Wait for CPU; only useful for some games.</property>
+ <property name="tooltip_text" translatable="yes">Wait for CPU; only useful for some games.</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="chkDisStereo">
+ <property name="label" translatable="yes">Single channel sound</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Play only one channel for a performance boost.</property>
+ <property name="tooltip_text" translatable="yes">Play only one channel for a performance boost.</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="chkFreqResponse">
+ <property name="label" translatable="yes">Frequency Response - Output Filter</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">btn_close</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkListStore" id="liststoreInterpolation">
+ <columns>
+ 
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">None</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Simple</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Gaussian</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Cubic</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="liststoreReverb">
+ <columns>
+ 
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Off</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Simple</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Playstation</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="liststoreVolume">
+ <columns>
+ 
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">None</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Low</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Medium</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Loud</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Loudest</col>
+ </row>
+ </data>
+ </object>
+</interface>

pcsxr-1.9.92.tar.bz2/plugins/dfsound/spucfg-0.1df/main.c -> pcsxr-1.9.93.tar.bz2/plugins/dfsound/spucfg-0.1df/main.c Changed

@@ -6,7 +6,6 @@
 #include <string.h>
 #include <sys/stat.h>
 
-#include <glade/glade.h>
 #include <gtk/gtk.h>
 
 #ifdef ENABLE_NLS
@@ -18,6 +17,9 @@
 #define WRITEBINARY "wb"
 #define CONFIG_FILENAME "dfsound.cfg"
 
+GtkBuilder *builder;
+GtkWidget *widget, *MainWindow;
+
 void SaveConfig(GtkWidget *widget, gpointer user_datal);
 
 /*	This function checks for the value being outside the accepted range,
@@ -45,16 +47,12 @@
 
 void OnConfigClose(GtkWidget *widget, gpointer user_data)
 {
-	GladeXML *xml = (GladeXML *)user_data;
-
-	gtk_widget_destroy(glade_xml_get_widget(xml, "CfgWnd"));
-	gtk_exit(0);
+	gtk_widget_destroy(gtk_builder_get_object(builder, "CfgWnd"));
+	exit(0);
 }
 
 int main(int argc, char *argv[])
 {
- GtkWidget *widget;
- GladeXML *xml;
 FILE *in;
 char t[256];
 int len, val = 0;
@@ -68,191 +66,212 @@
 textdomain (GETTEXT_PACKAGE);
 #endif
 
- if (argc != 2) {
- 	printf ("Usage: cfgDFSound {ABOUT | CFG}\n");
+ if (argc < 2) {
+ 	printf ("Usage: cfgDFSound {about | configure}\n");
 		return 0;
 	}
 
- if (strcmp(argv[1], "CFG") != 0 && strcmp(argv[1], "ABOUT") != 0) {
-		printf ("Usage: cfgDFSound {ABOUT | CFG}\n");
+ if (strcmp(argv[1], "configure") != 0 && 
+		strcmp(argv[1], "about") != 0) {
+		printf ("Usage: cfgDFSound {about | configure}\n");
 		return 0;
 }
 
- gtk_set_locale();
 gtk_init(&argc, &argv);
 
- if (strcmp(argv[1], "ABOUT") == 0) {
+ if (strcmp(argv[1], "about") == 0) {
 		const char *authors[]= {"Pete Bernert and the P.E.Op.S. team", "Ryan Schultz", "Andrew Burton", NULL};
 		widget = gtk_about_dialog_new ();
-		gtk_about_dialog_set_name (GTK_ABOUT_DIALOG (widget), "dfsound PCSX Sound Plugin");
+		gtk_about_dialog_set_program_name (GTK_ABOUT_DIALOG (widget), "dfsound PCSXR Sound Plugin");
 		gtk_about_dialog_set_version (GTK_ABOUT_DIALOG (widget), "1.6");
 		gtk_about_dialog_set_authors (GTK_ABOUT_DIALOG (widget), authors);
 		gtk_about_dialog_set_website (GTK_ABOUT_DIALOG (widget), "http://pcsx-df.sourceforge.net/");
 
-		g_signal_connect_data(GTK_OBJECT(widget), "response",
-			GTK_SIGNAL_FUNC(on_about_clicked), NULL, NULL, G_CONNECT_AFTER);
+		g_signal_connect_data(G_OBJECT(widget), "response",
+			G_CALLBACK(on_about_clicked), NULL, NULL, G_CONNECT_AFTER);
 
 		gtk_widget_show (widget);
 		gtk_main();
 
 		return 0;
 }
+	else if (strcmp(argv[1], "configure") == 0) {
+		builder = gtk_builder_new();
 
- xml = glade_xml_new(DATADIR "dfsound.glade2", "CfgWnd", NULL);
- if (!xml) {
-		g_warning("We could not load the interface!");
-		return 255;
- }
-
- strcpy(cfg, CONFIG_FILENAME);
-
- in = fopen(cfg, READBINARY);
- if (in) {
-		pB = (char *)malloc(32767);
-		memset(pB, 0, 32767);
-		len = fread(pB, 1, 32767, in);
-		fclose(in);
- } else {
-		pB = 0;
-		printf ("Error - no configuration file\n");
-		/* TODO Raise error - no configuration file */
- }
-
-	/* ADB TODO Replace a lot of the following with common functions */
- if (pB) {
-		strcpy(t, "\nVolume");
-		p = strstr(pB, t);
-		if (p) {
-		 p = strstr(p, "=");
-	 	len = 1;
+		if (!gtk_builder_add_from_file(builder, DATADIR "dfsound.ui", NULL)) {
+			g_warning("We could not load the interface!");
+			return 0;
 		}
-	 val = set_limit (p, len, 0, 4);
- } else val = 2;
-
- gtk_combo_box_set_active(GTK_COMBO_BOX (glade_xml_get_widget(xml, "cbVolume2")), val);
-
- if (pB) {
-	strcpy(t, "\nUseInterpolation");
-	p = strstr(pB, t);
-	if (p) {
-	 p = strstr(p, "=");
-	 len = 1;
-	}
-	 val = set_limit (p, len, 0, 3);
- } else val = 2;
-
- gtk_combo_box_set_active(GTK_COMBO_BOX (glade_xml_get_widget(xml, "cbInterpolation2")), val);
-
- if (pB) {
-		strcpy(t, "\nXAPitch");
-		p = strstr(pB, t);
-		if (p) {
-		 p = strstr(p, "=");
-	 	len = 1;
-		}
-		val = set_limit (p, len, 0, 1);
- } else val = 0;
-
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "chkXASpeed")), val);
-
- if (pB) {
-		strcpy(t, "\nHighCompMode");
-		p = strstr(pB, t);
-		if (p) {
-		 p = strstr(p, "=");
-	 	len = 1;
+		
+		MainWindow = gtk_builder_get_object(builder, "CfgWnd");
+
+		strcpy(cfg, CONFIG_FILENAME);
+
+		in = fopen(cfg, READBINARY);
+		if (in) {
+			pB = (char *)malloc(32767);
+			memset(pB, 0, 32767);
+			len = fread(pB, 1, 32767, in);
+			fclose(in);
+		} else {
+			pB = 0;
+			printf ("Error - no configuration file\n");
+			/* TODO Raise error - no configuration file */
 		}
-		val = set_limit (p, len, 0, 1);
- } else val = 0;
-
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "chkHiCompat")), val);
 
- if (pB) {
-		strcpy(t, "\nSPUIRQWait");
+		/* ADB TODO Replace a lot of the following with common functions */
+		if (pB) {
+			strcpy(t, "\nVolume");
+			p = strstr(pB, t);
+			if (p) {
+				p = strstr(p, "=");
+				len = 1;
+			}
+			val = set_limit (p, len, -1, 4) + 1;
+		} else val = 2;
+
+		gtk_combo_box_set_active(GTK_COMBO_BOX (gtk_builder_get_object(builder, "cbVolume2")), val);
+
+		if (pB) {
+		strcpy(t, "\nUseInterpolation");
 		p = strstr(pB, t);
 		if (p) {
-		 p = strstr(p, "=");
-		 len = 1;
+			p = strstr(p, "=");
+			len = 1;
 		}
-
-		val = set_limit (p, len, 0, 1);
- } else val = 1;
-
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "chkIRQWait")), val);
-
- if (pB) {
-		strcpy(t, "\nDisStereo");
-		p = strstr(pB, t);
-		if (p) {
-		 p = strstr(p, "=");
-		 len = 1;
-		}
-
-		val = set_limit (p, len, 0, 1);
- } else val = 0;
-
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "chkDisStereo")), val);
-
- if (pB) {
-		strcpy(t, "\nUseReverb");
-		p = strstr(pB, t);
-		if (p) {
-		 p = strstr(p, "=");
-		 len = 1;
-		}
-		val = set_limit (p, len, 0, 2);
- } else val = 2;
-
- gtk_combo_box_set_active(GTK_COMBO_BOX(glade_xml_get_widget(xml, "cbReverb2")), val);
-
- if (pB)
-		free(pB);
-
-	widget = glade_xml_get_widget(xml, "CfgWnd");
-	g_signal_connect_data(GTK_OBJECT(widget), "destroy",
-		GTK_SIGNAL_FUNC(SaveConfig), xml, NULL, 0);
-
-	widget = glade_xml_get_widget(xml, "btn_close");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		GTK_SIGNAL_FUNC(OnConfigClose), xml, NULL, G_CONNECT_AFTER);
-
- gtk_main();
+			val = set_limit (p, len, 0, 3);
+		} else val = 2;
+
+		gtk_combo_box_set_active(GTK_COMBO_BOX (gtk_builder_get_object(builder, "cbInterpolation2")), val);
+
+		if (pB) {
+			strcpy(t, "\nXAPitch");
+			p = strstr(pB, t);
+			if (p) {
+				p = strstr(p, "=");
+				len = 1;
+			}
+			val = set_limit (p, len, 0, 1);
+		} else val = 0;
+
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "chkXASpeed")), val);
+
+		if (pB) {
+			strcpy(t, "\nHighCompMode");
+			p = strstr(pB, t);
+			if (p) {
+				p = strstr(p, "=");
+				len = 1;
+			}
+			val = set_limit (p, len, 0, 1);
+		} else val = 1;
+
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "chkHiCompat")), val);
+
+		if (pB) {
+			strcpy(t, "\nSPUIRQWait");
+			p = strstr(pB, t);
+			if (p) {
+				p = strstr(p, "=");
+				len = 1;
+			}
+
+			val = set_limit (p, len, 0, 1);
+		} else val = 1;
+
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "chkIRQWait")), val);
+
+		if (pB) {
+			strcpy(t, "\nDisStereo");
+			p = strstr(pB, t);
+			if (p) {
+				p = strstr(p, "=");
+				len = 1;
+			}
+
+			val = set_limit (p, len, 0, 1);
+		} else val = 0;
+
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "chkDisStereo")), val);
+
+		if (pB) {
+			strcpy(t, "\nFreqResponse");
+			p = strstr(pB, t);
+			if (p) {
+				p = strstr(p, "=");
+				len = 1;
+			}
+
+			val = set_limit (p, len, 0, 1);
+		} else val = 0;
+
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "chkFreqResponse")), val);
+
+		if (pB) {
+			strcpy(t, "\nUseReverb");
+			p = strstr(pB, t);
+			if (p) {
+				p = strstr(p, "=");
+				len = 1;
+			}
+			val = set_limit (p, len, 0, 2);
+		} else val = 2;
+
+		gtk_combo_box_set_active(GTK_COMBO_BOX(gtk_builder_get_object(builder, "cbReverb2")), val);
+
+		if (pB)
+			free(pB);
+
+		widget = gtk_builder_get_object(builder, "CfgWnd");
+		g_signal_connect_data(G_OBJECT(widget), "destroy",
+			G_CALLBACK(SaveConfig), builder, NULL, 0);
+
+		widget = gtk_builder_get_object(builder, "btn_close");
+		g_signal_connect_data(G_OBJECT(widget), "clicked",
+			G_CALLBACK(OnConfigClose), builder, NULL, G_CONNECT_AFTER);
+
+		gtk_widget_show(MainWindow);
+		gtk_main();
+	}
+	
 return 0;
 }
 
 void SaveConfig(GtkWidget *widget, gpointer user_data)
 {
-	GladeXML *xml = (GladeXML *)user_data;
 	FILE *fp;
 	int val;
 
 	fp = fopen(CONFIG_FILENAME, WRITEBINARY);
 	if (fp == NULL) {
 		fprintf(stderr, "Unable to write to configuration file %s!\n", CONFIG_FILENAME);
-		gtk_exit(0);
+		exit(0);
 	}
 
-	val = gtk_combo_box_get_active(GTK_COMBO_BOX(glade_xml_get_widget(xml, "cbVolume2")));
-	fprintf(fp, "\nVolume = %d\n", val);
+	val = gtk_combo_box_get_active(GTK_COMBO_BOX(gtk_builder_get_object(builder, "cbVolume2")));
+	fprintf(fp, "\nVolume = %d\n", val - 1);
 
-	val = gtk_combo_box_get_active(GTK_COMBO_BOX(glade_xml_get_widget(xml, "cbInterpolation2")));
+	val = gtk_combo_box_get_active(GTK_COMBO_BOX(gtk_builder_get_object(builder, "cbInterpolation2")));
 	fprintf(fp, "\nUseInterpolation = %d\n", val);
 
-	val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "chkXASpeed")));
+	val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "chkXASpeed")));
 	fprintf(fp, "\nXAPitch = %d\n", val);
 
-	val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "chkHiCompat")));
+	val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "chkHiCompat")));
 	fprintf(fp, "\nHighCompMode = %d\n", val);
 
-	val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "chkIRQWait")));
+	val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "chkIRQWait")));
 	fprintf(fp, "\nSPUIRQWait = %d\n", val);
 
-	val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "chkDisStereo")));
+	val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "chkDisStereo")));
 	fprintf(fp, "\nDisStereo = %d\n", val);
 
-	val = gtk_combo_box_get_active(GTK_COMBO_BOX(glade_xml_get_widget(xml, "cbReverb2")));
+	val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "chkFreqResponse")));
+	fprintf(fp, "\nFreqResponse = %d\n", val);
+
+	val = gtk_combo_box_get_active(GTK_COMBO_BOX(gtk_builder_get_object(builder, "cbReverb2")));
 	fprintf(fp, "\nUseReverb = %d\n", val);
 
 	fclose(fp);
-	gtk_exit(0);
+	exit(0);
 }

pcsxr-1.9.92.tar.bz2/plugins/dfsound/stdafx.h -> pcsxr-1.9.93.tar.bz2/plugins/dfsound/stdafx.h Changed

@@ -15,6 +15,26 @@
 * *
 ***************************************************************************/
 
+#ifdef _WINDOWS
+
+#define WIN32_LEAN_AND_MEAN
+#define STRICT
+#include <windows.h>
+#include <windowsx.h>
+#include "mmsystem.h"
+#include <process.h>
+#include <stdlib.h>
+
+#ifndef INLINE
+#define INLINE __inline
+#endif
+
+#include "resource.h"
+
+#pragma warning (disable:4996)
+
+#else
+
 #ifndef _MACOSX
 #include "config.h"
 #endif
@@ -35,12 +55,20 @@
 
 #undef CALLBACK
 #define CALLBACK
-#define DWORD unsigned long
+#define DWORD unsigned int
 #define LOWORD(l) ((unsigned short)(l)) 
-#define HIWORD(l) ((unsigned short)(((unsigned long)(l) >> 16) & 0xFFFF)) 
+#define HIWORD(l) ((unsigned short)(((unsigned int)(l) >> 16) & 0xFFFF)) 
 
 #ifndef INLINE
 #define INLINE inline
 #endif
 
+#endif
+
+#if defined (__GNUC__) || defined (__clang__)
+#define UNUSED_VARIABLE __attribute__((unused))
+#else
+#define UNUSED_VARIABLE
+#endif
+
 #include "psemuxa.h"

pcsxr-1.9.92.tar.bz2/plugins/dfsound/xa.c -> pcsxr-1.9.93.tar.bz2/plugins/dfsound/xa.c Changed

@@ -16,6 +16,7 @@
 ***************************************************************************/
 
 #include "stdafx.h"
+
 #define _IN_XA
 #include <stdint.h>
 
@@ -41,60 +42,202 @@
 uint32_t * CDDAStart = NULL;
 uint32_t * CDDAEnd = NULL;
 
-int iLeftXAVol = 32767;
-int iRightXAVol = 32767;
+int iLeftXAVol = 0x8000;
+int iRightXAVol = 0x8000;
 
-static int gauss_ptr = 0;
-static int gauss_window[8] = {0, 0, 0, 0, 0, 0, 0, 0};
+static int UNUSED_VARIABLE gauss_ptr = 0;
+static int UNUSED_VARIABLE gauss_window[8] = {0, 0, 0, 0, 0, 0, 0, 0};
 
 #define gvall0 gauss_window[gauss_ptr]
 #define gvall(x) gauss_window[(gauss_ptr+x)&3]
 #define gvalr0 gauss_window[4+gauss_ptr]
 #define gvalr(x) gauss_window[4+((gauss_ptr+x)&3)]
 
+long cdxa_dbuf_ptr;
+
 ////////////////////////////////////////////////////////////////////////
 // MIX XA & CDDA
 ////////////////////////////////////////////////////////////////////////
 
-INLINE void MixXA(void)
+static int lastxa_lc, lastxa_rc;
+static int lastcd_lc, lastcd_rc;
+
+static INLINE void MixXA(void)
 {
 int ns;
- uint32_t l;
+ int lc,rc;
+ unsigned long cdda_l;
+ int decoded_xa;
+ int decoded_cdda;
+
+ decoded_xa = decoded_ptr;
+
+ lc = 0;
+ rc = 0;
 
 for(ns=0;ns<NSSIZE && XAPlay!=XAFeed;ns++)
 {
- XALastVal=*XAPlay++;
+	 XALastVal=*XAPlay++;
 if(XAPlay==XAEnd) XAPlay=XAStart;
-#ifdef XA_HACK
- SSumL[ns]+=(((short)(XALastVal&0xffff)) * iLeftXAVol)/32768;
- SSumR[ns]+=(((short)((XALastVal>>16)&0xffff)) * iRightXAVol)/32768;
-#else
- SSumL[ns]+=(((short)(XALastVal&0xffff)) * iLeftXAVol)/32767;
- SSumR[ns]+=(((short)((XALastVal>>16)&0xffff)) * iRightXAVol)/32767;
-#endif
- }
+
+	 lc = (short)(XALastVal&0xffff);
+	 rc = (short)((XALastVal>>16) & 0xffff);
+
+
+	 // improve crackle - buffer under
+	 // - not update fast enough
+	 lastxa_lc = lc;
+	 lastxa_rc = rc;
+
+
+	 // Tales of Phantasia - voice meter
+	 spuMem[ (decoded_xa + 0x000)/2 ] = (short) lc;
+	 spuMem[ (decoded_xa + 0x400)/2 ] = (short) rc;
+
+	 decoded_xa += 2;
+	 if( decoded_xa >= 0x400 )
+		 decoded_xa = 0;
+
+ 
+	 lc = CLAMP16( (lc * iLeftXAVol) / 0x8000 );
+	 rc = CLAMP16( (rc * iRightXAVol) / 0x8000 );
+
+
+	 // reverb write flag
+	 if( spuCtrl & CTRL_CD_REVERB ) {
+		StoreREVERB_CD( lc, rc, ns );
+	 }
+
+
+	 // play flag
+	 if( spuCtrl & CTRL_CD_PLAY ) {
+		 SSumL[ns]+=lc;
+		 SSumR[ns]+=rc;
+	 }
+ }
 
 if(XAPlay==XAFeed && XARepeat)
 {
- XARepeat--;
+ //XARepeat--;
 for(;ns<NSSIZE;ns++)
 {
-#ifdef XA_HACK
- SSumL[ns]+=(((short)(XALastVal&0xffff)) * iLeftXAVol)/32768;
- SSumR[ns]+=(((short)((XALastVal>>16)&0xffff)) * iRightXAVol)/32768;
-#else
- SSumL[ns]+=(((short)(XALastVal&0xffff)) * iLeftXAVol)/32767;
- SSumR[ns]+=(((short)((XALastVal>>16)&0xffff)) * iRightXAVol)/32767;
-#endif
+		 // improve crackle - buffer under
+		 // - not update fast enough
+		 lc = lastxa_lc;
+		 rc = lastxa_rc;
+
+
+		 // Tales of Phantasia - voice meter
+		 spuMem[ (decoded_xa + 0x000)/2 ] = (short) lc;
+		 spuMem[ (decoded_xa + 0x400)/2 ] = (short) rc;
+
+		 decoded_xa += 2;
+		 if( decoded_xa >= 0x400 )
+			 decoded_xa = 0;
+
+
+		 lc = CLAMP16( (lc * iLeftXAVol) / 0x8000 );
+		 rc = CLAMP16( (rc * iRightXAVol) / 0x8000 );
+
+
+		 // reverb write flags
+		 if( spuCtrl & CTRL_CD_REVERB ) {
+			StoreREVERB_CD( lc, rc, ns );
+		 }
+
+
+		 // play flag
+		 if( spuCtrl & CTRL_CD_PLAY ) {
+			 SSumL[ns]+=lc;
+			 SSumR[ns]+=rc;
+		 }
 }
 }
 
+
+
+ decoded_cdda = decoded_ptr;
+
 for(ns=0;ns<NSSIZE && CDDAPlay!=CDDAFeed && (CDDAPlay!=CDDAEnd-1||CDDAFeed!=CDDAStart);ns++)
 {
- l=*CDDAPlay++;
+ cdda_l=*CDDAPlay++;
 if(CDDAPlay==CDDAEnd) CDDAPlay=CDDAStart;
- SSumL[ns]+=(((short)(l&0xffff)) * iLeftXAVol)/32767;
- SSumR[ns]+=(((short)((l>>16)&0xffff)) * iRightXAVol)/32767;
+
+	 lc = (short)(cdda_l&0xffff);
+	 rc = (short)((cdda_l>>16) & 0xffff);
+
+
+	 // improve crackle - buffer under
+	 // - not update fast enough
+	 lastcd_lc = lc;
+	 lastcd_rc = rc;
+
+
+	 // Vib Ribbon - playback
+	 spuMem[ (decoded_cdda + 0x000)/2 ] = (short) lc;
+	 spuMem[ (decoded_cdda + 0x400)/2 ] = (short) rc;
+
+	 decoded_cdda += 2;
+	 if( decoded_cdda >= 0x400 )
+		 decoded_cdda = 0;
+
+
+	 // Rayman - stage end fadeout
+	 lc = CLAMP16( (lc * iLeftXAVol) / 0x8000 );
+	 rc = CLAMP16( (rc * iRightXAVol) / 0x8000 );
+
+
+	 // reverb write flag
+	 if( spuCtrl & CTRL_CD_REVERB ) {
+		StoreREVERB_CD( lc, rc, ns );
+	 }
+
+
+	 // play flag
+	 if( spuCtrl & CTRL_CD_PLAY ) {
+		 SSumL[ns]+=lc;
+		 SSumR[ns]+=rc;
+	 }
+	}
+
+
+ if(CDDAPlay==CDDAFeed && XARepeat)
+ {
+ //XARepeat--;
+ for(;ns<NSSIZE;ns++)
+ {
+		 // improve crackle - buffer under
+		 // - not update fast enough
+		 lc = lastcd_lc;
+		 rc = lastcd_rc;
+
+
+		 // Vib Ribbon - playback
+		 spuMem[ (decoded_cdda + 0x000)/2 ] = (short) lc;
+		 spuMem[ (decoded_cdda + 0x400)/2 ] = (short) rc;
+
+		 decoded_cdda += 2;
+		 if( decoded_cdda >= 0x400 )
+			 decoded_cdda = 0;
+
+
+		 // Rayman - stage end fadeout
+		 lc = CLAMP16( (lc * iLeftXAVol) / 0x8000 );
+		 rc = CLAMP16( (rc * iRightXAVol) / 0x8000 );
+
+
+		 // reverb write flag
+		 if( spuCtrl & CTRL_CD_REVERB ) {
+			StoreREVERB_CD( lc, rc, ns );
+		 }
+
+
+		 // play flag
+		 if( spuCtrl & CTRL_CD_PLAY ) {
+			 SSumL[ns]+=lc;
+			 SSumR[ns]+=rc;
+		 }
+	 }
 }
 }
 
@@ -102,6 +245,8 @@
 // small linux time helper... only used for watchdog
 ////////////////////////////////////////////////////////////////////////
 
+#ifndef _WINDOWS
+
 unsigned long timeGetTime_spu()
 {
 struct timeval tv;
@@ -109,13 +254,15 @@
 return tv.tv_sec * 1000 + tv.tv_usec/1000; // to do that, but at least it works
 }
 
+#endif
+
 ////////////////////////////////////////////////////////////////////////
 // FEED XA 
 ////////////////////////////////////////////////////////////////////////
 
-INLINE void FeedXA(xa_decode_t *xap)
+static INLINE void FeedXA(xa_decode_t *xap)
 {
- int sinc,spos,i,iSize,iPlace,vl,vr;
+ int sinc,spos,i,iSize,iPlace;
 
 if(!bSPUIsOpen) return;
 
@@ -186,35 +333,10 @@
 int32_t l1,l2;short s;
 for(i=0;i<iSize;i++)
 {
- if(iUseInterpolation==2) 
+ while(spos>=0x10000L)
 {
- while(spos>=0x10000L)
- {
- l = *pS++;
- gauss_window[gauss_ptr] = (short)LOWORD(l);
- gauss_window[4+gauss_ptr] = (short)HIWORD(l);
- gauss_ptr = (gauss_ptr+1) & 3;
- spos -= 0x10000L;
- }
- vl = (spos >> 6) & ~3;
- vr=(gauss[vl]*gvall0)&~2047;
- vr+=(gauss[vl+1]*gvall(1))&~2047;
- vr+=(gauss[vl+2]*gvall(2))&~2047;
- vr+=(gauss[vl+3]*gvall(3))&~2047;
- l= (vr >> 11) & 0xffff;
- vr=(gauss[vl]*gvalr0)&~2047;
- vr+=(gauss[vl+1]*gvalr(1))&~2047;
- vr+=(gauss[vl+2]*gvalr(2))&~2047;
- vr+=(gauss[vl+3]*gvalr(3))&~2047;
- l |= vr << 5;
- }
- else
- {
- while(spos>=0x10000L)
- {
- l = *pS++;
- spos -= 0x10000L;
- }
+ l = *pS++;
+ spos -= 0x10000L;
 }
 
 s=(short)LOWORD(l);
@@ -245,35 +367,10 @@
 {
 for(i=0;i<iSize;i++)
 {
- if(iUseInterpolation==2) 
+ while(spos>=0x10000L)
 {
- while(spos>=0x10000L)
- {
- l = *pS++;
- gauss_window[gauss_ptr] = (short)LOWORD(l);
- gauss_window[4+gauss_ptr] = (short)HIWORD(l);
- gauss_ptr = (gauss_ptr+1) & 3;
- spos -= 0x10000L;
- }
- vl = (spos >> 6) & ~3;
- vr=(gauss[vl]*gvall0)&~2047;
- vr+=(gauss[vl+1]*gvall(1))&~2047;
- vr+=(gauss[vl+2]*gvall(2))&~2047;
- vr+=(gauss[vl+3]*gvall(3))&~2047;
- l= (vr >> 11) & 0xffff;
- vr=(gauss[vl]*gvalr0)&~2047;
- vr+=(gauss[vl+1]*gvalr(1))&~2047;
- vr+=(gauss[vl+2]*gvalr(2))&~2047;
- vr+=(gauss[vl+3]*gvalr(3))&~2047;
- l |= vr << 5;
- }
- else
- {
- while(spos>=0x10000L)
- {
- l = *pS++;
- spos -= 0x10000L;
- }
+ l = *pS++;
+ spos -= 0x10000L;
 }
 
 *XAFeed++=l;
@@ -299,31 +396,12 @@
 int32_t l1;
 for(i=0;i<iSize;i++)
 {
- if(iUseInterpolation==2) 
+ while(spos>=0x10000L)
 {
- while(spos>=0x10000L)
- {
- gauss_window[gauss_ptr] = (short)*pS++;
- gauss_ptr = (gauss_ptr+1) & 3;
- spos -= 0x10000L;
- }
- vl = (spos >> 6) & ~3;
- vr=(gauss[vl]*gvall0)&~2047;
- vr+=(gauss[vl+1]*gvall(1))&~2047;
- vr+=(gauss[vl+2]*gvall(2))&~2047;
- vr+=(gauss[vl+3]*gvall(3))&~2047;
- l1=s= vr >> 11;
- l1 &= 0xffff;
- }
- else
- {
- while(spos>=0x10000L)
- {
- s = *pS++;
- spos -= 0x10000L;
- }
- l1=s;
+ s = *pS++;
+ spos -= 0x10000L;
 }
+ l1=s;
 
 l1=(l1*iPlace)/iSize;
 if(l1<-32767) l1=-32767;
@@ -345,33 +423,14 @@
 {
 for(i=0;i<iSize;i++)
 {
- if(iUseInterpolation==2) 
+ while(spos>=0x10000L)
 {
- while(spos>=0x10000L)
- {
- gauss_window[gauss_ptr] = (short)*pS++;
- gauss_ptr = (gauss_ptr+1) & 3;
- spos -= 0x10000L;
- }
- vl = (spos >> 6) & ~3;
- vr=(gauss[vl]*gvall0)&~2047;
- vr+=(gauss[vl+1]*gvall(1))&~2047;
- vr+=(gauss[vl+2]*gvall(2))&~2047;
- vr+=(gauss[vl+3]*gvall(3))&~2047;
- l=s= vr >> 11;
- l &= 0xffff;
- }
- else
- {
- while(spos>=0x10000L)
- {
- s = *pS++;
- spos -= 0x10000L;
- }
- l=s;
+ s = *pS++;
+ spos -= 0x10000L;
 }
+ l=s;
 
- *XAFeed++=(l|(l<<16));
+ *XAFeed++=((l&0xffff)|(l<<16));
 
 if(XAFeed==XAEnd) XAFeed=XAStart;
 if(XAFeed==XAPlay) 
@@ -390,7 +449,9 @@
 // FEED CDDA
 ////////////////////////////////////////////////////////////////////////
 
-INLINE void FeedCDDA(unsigned char *pcm, int nBytes)
+unsigned int cdda_ptr;
+
+static INLINE void FeedCDDA(unsigned char *pcm, int nBytes)
 {
 while(nBytes>0)
 {
@@ -398,13 +459,18 @@
 while(CDDAFeed==CDDAPlay-1||
 (CDDAFeed==CDDAEnd-1&&CDDAPlay==CDDAStart))
 {
+#ifdef _WINDOWS
+ if (!iUseTimer) Sleep(1);
+ else return;
+#else
 if (!iUseTimer) usleep(1000);
 else return;
+#endif
 }
 *CDDAFeed++=(*pcm | (*(pcm+1)<<8) | (*(pcm+2)<<16) | (*(pcm+3)<<24));
 nBytes-=4;
 pcm+=4;
- }
+ }
 }
 
 #endif

pcsxr-1.9.92.tar.bz2/plugins/dfsound/xa.h -> pcsxr-1.9.93.tar.bz2/plugins/dfsound/xa.h Changed

@@ -1,20 +1,20 @@
-/***************************************************************************
-                            xa.h  -  description
-                             -------------------
-    begin                : Wed May 15 2002
-    copyright            : (C) 2002 by Pete Bernert
-    email                : BlackDove@addcom.de
- ***************************************************************************/
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version. See also the license.txt file for *
- *   additional informations.                                              *
- *                                                                         *
- ***************************************************************************/
-
-INLINE void MixXA(void);
-INLINE void FeedXA(xa_decode_t *xap);
-INLINE void FeedCDDA(unsigned char *pcm, int nBytes);
+/***************************************************************************
+                            xa.h  -  description
+                             -------------------
+    begin                : Wed May 15 2002
+    copyright            : (C) 2002 by Pete Bernert
+    email                : BlackDove@addcom.de
+ ***************************************************************************/
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+static INLINE void MixXA(void);
+static INLINE void FeedXA(xa_decode_t *xap);
+static INLINE void FeedCDDA(unsigned char *pcm, int nBytes);

pcsxr-1.9.92.tar.bz2/plugins/dfxvideo/Makefile.am -> pcsxr-1.9.93.tar.bz2/plugins/dfxvideo/Makefile.am Changed

@@ -6,10 +6,9 @@
 	$(LIBTOOL) --tag=CC --mode=compile \
 	$(STRIP_FPIC) $(NASM) -f elf -d ELF -I${srcdir}/ $<
 
-INCLUDES = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \
-	-DLOCALE_DIR=\"${datadir}/locale/\" \
+AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
 	-DDATADIR=\"${datadir}/psemu/\" \
-	$(GTK2_CFLAGS) $(GLADE2_CFLAGS) -I/usr/X11R6/include \
+	$(GTK3_CFLAGS)\
 	-I../../libpcsxcore \
 	-I../../include
 
@@ -18,19 +17,18 @@
 
 lib_LTLIBRARIES = libDFXVideo.la
 
-libDFXVideo_la_SOURCES = gpu.c cfg.c draw.c fps.c key.c menu.c prim.c soft.c zn.c
+libDFXVideo_la_SOURCES = gpu.c gpu.h cfg.c cfg.h draw.c draw.h fps.c fps.h key.c key.h menu.c menu.h prim.c prim.h soft.c soft.h zn.c swap.h externals.h hq2x.h hq3x.h interp.h
 if X86_NASM
-libDFXVideo_la_SOURCES += i386.asm
-INCLUDES += -DUSE_NASM=1
+libDFXVideo_la_SOURCES += i386.asm macros.inc
+AM_CPPFLAGS += -DUSE_NASM=1
 endif
 libDFXVideo_la_LDFLAGS = -module -avoid-version
-libDFXVideo_la_LDFLAGS += -L/usr/X11R6/lib64 -L/usr/X11R6/lib \
-	-lX11 -lXv -lXext -lm
+libDFXVideo_la_LIBADD = -lX11 -lXv -lXext -lm
 
 bin_PROGRAMS = cfgDFXVideo
 cfgDFXVideo_SOURCES = gpucfg-0.1df/main.c
-cfgDFXVideo_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS) -L/usr/X11R6/lib -lXext
+cfgDFXVideo_LDADD = $(GTK3_LIBS) -lXext
 
-glade_DATA = gpucfg-0.1df/dfxvideo.glade2
+glade_DATA = gpucfg-0.1df/dfxvideo.ui
 gladedir = $(datadir)/psemu/
 EXTRA_DIST = $(glade_DATA)

pcsxr-1.9.92.tar.bz2/plugins/dfxvideo/cfg.c -> pcsxr-1.9.93.tar.bz2/plugins/dfxvideo/cfg.c Changed

@@ -96,7 +96,7 @@
     {
      strcpy(t,"cfg/dfxvideo.cfg");
      in = fopen(t,"rb");
-     if(!in) sprintf(t,"%s/.pcsx/plugins/dfxvideo.cfg",getenv("HOME"));
+     if(!in) sprintf(t,"%s/.pcsxr/plugins/dfxvideo.cfg",getenv("HOME"));
      else    fclose(in);
     }
    else     fclose(in);
@@ -172,27 +172,42 @@
 
 	strcpy(cfg, "./cfgDFXVideo");
 	if (stat(cfg, &buf) != -1) {
-		if (fork() == 0) {
-			execl(cfg, "cfgDFXVideo", arg, NULL);
+		int pid = fork();
+		if (pid == 0) {
+			if (fork() == 0) {
+				execl(cfg, "cfgDFXVideo", arg, NULL);
+			}
 			exit(0);
+		} else if (pid > 0) {
+			waitpid(pid, NULL, 0);
 		}
 		return;
 	}
 
 	strcpy(cfg, "./cfg/cfgDFXVideo");
 	if (stat(cfg, &buf) != -1) {
-		if (fork() == 0) {
-			execl(cfg, "cfgDFXVideo", arg, NULL);
+		int pid = fork();
+		if (pid == 0) {
+			if (fork() == 0) {
+				execl(cfg, "cfgDFXVideo", arg, NULL);
+			}
 			exit(0);
+		} else if (pid > 0) {
+			waitpid(pid, NULL, 0);
 		}
 		return;
 	}
 
-	sprintf(cfg, "%s/.pcsx/plugins/cfg/cfgDFXVideo", getenv("HOME"));
+	sprintf(cfg, "%s/.pcsxr/plugins/cfg/cfgDFXVideo", getenv("HOME"));
 	if (stat(cfg, &buf) != -1) {
-		if (fork() == 0) {
-			execl(cfg, "cfgDFXVideo", arg, NULL);
+		int pid = fork();
+		if (pid == 0) {
+			if (fork() == 0) {
+				execl(cfg, "cfgDFXVideo", arg, NULL);
+			}
 			exit(0);
+		} else if (pid > 0) {
+			waitpid(pid, NULL, 0);
 		}
 		return;
 	}
@@ -202,15 +217,12 @@
 
 void SoftDlgProc(void)
 {
-	ExecCfg("CFG");
+	ExecCfg("configure");
 }
 
 void AboutDlgProc(void)
 {
-	char args[256];
-
-	sprintf(args, "ABOUT");
-	ExecCfg(args);
+	ExecCfg("about");
 }
 
 void ReadConfig(void)
@@ -256,7 +268,7 @@
     {
      strcpy(t,"cfg/dfxvideo.cfg");
      out = fopen(t,"rb");
-     if(!out) sprintf(t,"%s/.pcsx/plugins/dfxvideo.cfg",getenv("HOME"));
+     if(!out) sprintf(t,"%s/.pcsxr/plugins/dfxvideo.cfg",getenv("HOME"));
      else     fclose(out);
     }
    else     fclose(out);

pcsxr-1.9.92.tar.bz2/plugins/dfxvideo/cfg.h -> pcsxr-1.9.93.tar.bz2/plugins/dfxvideo/cfg.h Changed

pcsxr-1.9.92.tar.bz2/plugins/dfxvideo/draw.c -> pcsxr-1.9.93.tar.bz2/plugins/dfxvideo/draw.c Changed

@@ -35,7 +35,7 @@
 unsigned long lSetMask = 0;
 int iDesktopCol = 16;
 int iShowFPS = 0;
-int iWinSize; 
+int iWinSize;
 int iMaintainAspect = 0;
 int iUseNoStretchBlt = 0;
 int iFastFwd = 0;
@@ -49,7 +49,6 @@
 
 #include <sys/ipc.h>
 #include <sys/shm.h>
-#include <X11/extensions/Xv.h>
 #include <X11/extensions/Xvlib.h>
 #include <X11/extensions/XShm.h>
 int xv_port = -1;
@@ -87,23 +86,36 @@
 int r = 0;
 if (A == C) x+=1; else if (B == C) y+=1;
 if (A == D) x+=1; else if (B == D) y+=1;
- if (x <= 1) r+=1; 
+ if (x <= 1) r+=1;
 if (y <= 1) r-=1;
 return r;
 }
 
-static __inline int GetResult2(DWORD A, DWORD B, DWORD C, DWORD D, DWORD E) 
+static __inline int GetResult2(DWORD A, DWORD B, DWORD C, DWORD D, DWORD E)
 {
- int x = 0; 
+ int x = 0;
 int y = 0;
 int r = 0;
 if (A == C) x+=1; else if (B == C) y+=1;
 if (A == D) x+=1; else if (B == D) y+=1;
- if (x <= 1) r-=1; 
+ if (x <= 1) r-=1;
 if (y <= 1) r+=1;
 return r;
 }
 
+/* Convert RGB to YUV */
+__inline uint32_t rgb_to_yuv(uint8_t R, uint8_t G, uint8_t B) {
+ uint8_t Y = min(abs(R * 2104 + G * 4130 + B * 802 + 4096 + 131072) >> 13, 235);
+ uint8_t U = min(abs(R * -1214 + G * -2384 + B * 3598 + 4096 + 1048576) >> 13, 240);
+ uint8_t V = min(abs(R * 3598 + G * -3013 + B * -585 + 4096 + 1048576) >> 13, 240);
+
+#ifdef __BIG_ENDIAN__
+ return Y << 24 | U << 16 | Y << 8 | V;
+#else
+ return Y << 24 | V << 16 | Y << 8 | U;
+#endif
+}
+
 #define colorMask8 0x00FEFEFE
 #define lowPixelMask8 0x00010101
 #define qcolorMask8 0x00FCFCFC
@@ -334,7 +346,7 @@
 if((colorA == colorD) && (colorB != colorC))
 {
 if(((colorA == colorE) && (colorB == colorL)) ||
- ((colorA == colorC) && (colorA == colorF) && 
+ ((colorA == colorC) && (colorA == colorF) &&
 (colorB != colorE) && (colorB == colorJ)))
 {
 product = colorA;
@@ -345,7 +357,7 @@
 }
 
 if(((colorA == colorG) && (colorC == colorO)) ||
- ((colorA == colorB) && (colorA == colorH) && 
+ ((colorA == colorB) && (colorA == colorH) &&
 (colorG != colorC) && (colorC == colorM)))
 {
 product1 = colorA;
@@ -360,7 +372,7 @@
 if((colorB == colorC) && (colorA != colorD))
 {
 if(((colorB == colorF) && (colorA == colorH)) ||
- ((colorB == colorE) && (colorB == colorD) && 
+ ((colorB == colorE) && (colorB == colorD) &&
 (colorA != colorF) && (colorA == colorI)))
 {
 product = colorB;
@@ -371,7 +383,7 @@
 }
 
 if(((colorC == colorH) && (colorA == colorF)) ||
- ((colorC == colorG) && (colorC == colorD) && 
+ ((colorC == colorG) && (colorC == colorD) &&
 (colorA != colorH) && (colorA == colorI)))
 {
 product1 = colorC;
@@ -417,7 +429,7 @@
 {
 product2 = Q_INTERPOLATE8(colorA, colorB, colorC, colorD);
 
- if ((colorA == colorC) && (colorA == colorF) && 
+ if ((colorA == colorC) && (colorA == colorF) &&
 (colorB != colorE) && (colorB == colorJ))
 {
 product = colorA;
@@ -432,13 +444,13 @@
 product = INTERPOLATE8(colorA, colorB);
 }
 
- if ((colorA == colorB) && (colorA == colorH) && 
+ if ((colorA == colorB) && (colorA == colorH) &&
 (colorG != colorC) && (colorC == colorM))
 {
 product1 = colorA;
 }
 else
- if ((colorC == colorG) && (colorC == colorD) && 
+ if ((colorC == colorG) && (colorC == colorD) &&
 (colorA != colorH) && (colorA == colorI))
 {
 product1 = colorC;
@@ -480,7 +492,7 @@
 int iXA,iXB,iXC,iYA,iYB,iYC,finish;
 DWORD color4, color5, color6;
 DWORD color1, color2, color3;
- DWORD colorA1, colorA2, 
+ DWORD colorA1, colorA2,
 colorB1, colorB2,
 colorS1, colorS2;
 DWORD product1a, product1b,
@@ -540,7 +552,7 @@
 {
 product1a = INTERPOLATE8(color5, color6);
 }
- 
+
 if((color6 == colorS2) ||
 (color2 == colorA1))
 {
@@ -833,7 +845,7 @@
 	int count = height;
 
 	int dstPitch = srcPitch*3;
-	int dstRowPixels = dstPitch>>2;	
+	int dstRowPixels = dstPitch>>2;
 
 	finalw=width*3;
 	finalh=height*3;
@@ -889,9 +901,8 @@
 Window window;
 static GC hGC;
 static XImage * Ximage;
-static XvImage * XCimage; 
-static XImage * XFimage; 
-static XImage * XPimage=0 ; 
+static XvImage * XCimage;
+static XImage * XPimage=0;
 char * Xpixels;
 char * pCaptionText;
 
@@ -930,7 +941,7 @@
 if(display)
 {
 XFreeColormap(display, colormap);
- if(hGC) 
+ if(hGC)
 {
 XFreeGC(display,hGC);
 hGC = 0;
@@ -940,16 +951,11 @@
 XDestroyImage(Ximage);
 Ximage=0;
 }
- if(XCimage) 
- { 
- XFree(XCimage); 
- XCimage=0; 
- } 
- if(XFimage) 
- { 
- XDestroyImage(XFimage);
- XFimage=0; 
- } 
+ if(XCimage)
+ {
+ XFree(XCimage);
+ XCimage=0;
+ }
 
 	XShmDetach(display,&shminfo);
 	shmdt(shminfo.shmaddr);
@@ -995,6 +1001,8 @@
 XvAdaptorInfo		*ai;
 XvImageFormatValues	*fo;
 
+ XClassHint* classHint;
+
 // Open display
 display = XOpenDisplay(NULL);
 
@@ -1135,7 +1143,7 @@
 }
 
 // pffff... much work for a simple blank cursor... oh, well...
- if(iWindowMode) cursor=XCreateFontCursor(display,XC_trek);
+ if(iWindowMode) cursor=XCreateFontCursor(display,XC_left_ptr);
 else
 {
 Pixmap p1,p2;
@@ -1177,7 +1185,7 @@
 colormap=XCreateColormap(display,root_window_id,
 myvisual->visual,AllocNone);
 
- winattr.background_pixel=0;
+ winattr.background_pixel=BlackPixelOfScreen(screen);
 winattr.border_pixel=WhitePixelOfScreen(screen);
 winattr.bit_gravity=ForgetGravity;
 winattr.win_gravity=NorthWestGravity;
@@ -1185,7 +1193,12 @@
 
 winattr.override_redirect=False;
 winattr.save_under=False;
- winattr.event_mask=0;
+ winattr.event_mask=ExposureMask |
+ VisibilityChangeMask |
+ FocusChangeMask |
+ KeyPressMask | KeyReleaseMask |
+ ButtonPressMask | ButtonReleaseMask |
+ PointerMotionMask;
 winattr.do_not_propagate_mask=0;
 winattr.colormap=colormap;
 winattr.cursor=None;
@@ -1196,7 +1209,7 @@
 InputOutput,myvisual->visual,
 CWBorderPixel | CWBackPixel |
 CWEventMask | CWDontPropagate |
- CWColormap | CWCursor,
+ CWColormap | CWCursor | CWEventMask,
 &winattr);
 
 if(!window)
@@ -1218,13 +1231,29 @@
 
 XSetWMHints(display,window,&wm_hints);
 XSetWMNormalHints(display,window,&hints);
- if(pCaptionText)
- XStoreName(display,window,pCaptionText);
- else XStoreName(display,window,"P.E.Op.S SoftX PSX Gpu");
+
+ if(!pCaptionText)
+ pCaptionText = "P.E.Op.S SoftX PSX Gpu";
+
+ // set the WM_NAME and WM_CLASS of the window
+
+ // set the titlebar name
+ XStoreName(display, window, pCaptionText);
+
+ // set the name and class hints for the window manager to use
+ classHint = XAllocClassHint();
+ if(classHint)
+ {
+ classHint->res_name = pCaptionText;
+ classHint->res_class = pCaptionText;
+ }
+
+ XSetClassHint(display, window, classHint);
+ XFree(classHint);
 
 XDefineCursor(display,window,cursor);
 
- // hack to get rid of window title bar 
+ // hack to get rid of window title bar
 if (fx)
 {
 mwmhints.flags=MWM_HINTS_DECORATIONS;
@@ -1234,13 +1263,6 @@
 PropModeReplace,(unsigned char *)&mwmhints,4);
 }
 
- // key stuff
- XSelectInput(display,
- window,
- FocusChangeMask | ExposureMask |
- KeyPressMask | KeyReleaseMask
- );
-
 XMapRaised(display,window);
 XClearWindow(display,window);
 XWindowEvent(display,window,ExposureMask,&event);
@@ -1276,28 +1298,29 @@
 }
 }
 
+ gcv.foreground = 0x0000FF00; // green letters for the FPS bar; do we need to take care of endianess?
+ gcv.background = 0x00000000;
 gcv.graphics_exposures = False;
 hGC = XCreateGC(display,window,
- GCGraphicsExposures, &gcv);
- if(!hGC) 
+ GCGraphicsExposures | GCForeground | GCBackground, &gcv);
+ if(!hGC)
 {
 fprintf(stderr,"No gfx context!!!\n");
 DestroyDisplay();
 }
 
+ uint32_t color;
 
-
- Xpixels = (char *)malloc(220*15*4);
- memset(Xpixels,255,220*15*4);
- XFimage = XCreateImage(display,myvisual->visual, 
- depth, ZPixmap, 0, 
- (char *)Xpixels, 
- 220, 15, 
- depth>16 ? 32 : 16,
- 0); 
+ /* fix the green back ground in YUV mode */
+ if(use_yuv)
+	 color = rgb_to_yuv(0x00, 0x00, 0x00);
+ else
+	 color = 0;
 
 Xpixels = (char *)malloc(8*8*4);
- memset(Xpixels,0,8*8*4);
+ for(i = 0; i < 8*8; ++i)
+	 ((uint32_t *)Xpixels)[i] = color;
+
 XCimage = XvCreateImage(display,xv_port,xv_id,
 (char *)Xpixels, 8, 8);
 
@@ -1312,11 +1335,17 @@
 shminfo.shmid = shmget(IPC_PRIVATE, 640*512*4*3*3, IPC_CREAT | 0777);
 shminfo.shmaddr = shmat(shminfo.shmid, 0, 0);
 shminfo.readOnly = 0;
- 
+
 if (!XShmAttach(display, &shminfo)) {
 printf("XShmAttach failed !\n");
 exit (-1);
 }
+
+ {
+ uint32_t *pShmaddr = (uint32_t *)shminfo.shmaddr;
+ for(i = 0; i < 640*512*3*3; ++i)
+	 pShmaddr[i] = color;
+ }
 }
 
 void (*p2XSaIFunc) (unsigned char *, DWORD, unsigned char *, int, int);
@@ -1367,7 +1396,7 @@
 for (row = 0; row < dx; row++)
 {
 lu = *((uint32_t *)pD);
- destpix[row] = 
+ destpix[row] =
 0xff000000 | (RED(lu) << 16) | (GREEN(lu) << 8) | (BLUE(lu));
 pD += 3;
 }
@@ -1382,13 +1411,15 @@
 for (row = 0; row < dx; row++)
 {
 s = GETLE16(&psxVuw[startxy++]);
- destpix[row] = 
+ destpix[row] =
 (((s << 19) & 0xf80000) | ((s << 6) & 0xf800) | ((s >> 7) & 0xf8)) | 0xff000000;
 }
 }
 }
 }
 
+
+
 void BlitToYUV(unsigned char * surf,int32_t x,int32_t y)
 {
 unsigned char * pD;
@@ -1397,7 +1428,7 @@
 unsigned short row,column;
 unsigned short dx = PreviousPSXDisplay.Range.x1;
 unsigned short dy = PreviousPSXDisplay.DisplayMode.y;
- int Y,U,V, R,G,B;
+ int R,G,B;
 
 int32_t lPitch = PSXDisplay.DisplayMode.x << 2;
 uint32_t *destpix;
@@ -1454,15 +1485,8 @@
 G = GREEN(lu);
 B = BLUE(lu);
 
- Y = min(abs(R * 2104 + G * 4130 + B * 802 + 4096 + 131072) >> 13, 235);
- U = min(abs(R * -1214 + G * -2384 + B * 3598 + 4096 + 1048576) >> 13, 240);
- V = min(abs(R * 3598 + G * -3013 + B * -585 + 4096 + 1048576) >> 13, 240);
+ destpix[row] = rgb_to_yuv(R, G, B);
 
-#ifdef __BIG_ENDIAN__
- destpix[row] = Y << 24 | U << 16 | Y << 8 | V;
-#else
- destpix[row] = Y << 24 | V << 16 | Y << 8 | U;
-#endif
 pD += 3;
 }
 }
@@ -1481,15 +1505,8 @@
 G = (s >> 2) &0xf8;
 B = (s >> 7) &0xf8;
 
- Y = min(abs(R * 2104 + G * 4130 + B * 802 + 4096 + 131072) >> 13, 235);
- U = min(abs(R * -1214 + G * -2384 + B * 3598 + 4096 + 1048576) >> 13, 240);
- V = min(abs(R * 3598 + G * -3013 + B * -585 + 4096 + 1048576) >> 13, 240);
+ destpix[row] = rgb_to_yuv(R, G, B);
 
-#ifdef __BIG_ENDIAN__
- destpix[row] = Y << 24 | U << 16 | Y << 8 | V;
-#else
- destpix[row] = Y << 24 | V << 16 | Y << 8 | U;
-#endif
 }
 }
 }
@@ -1531,21 +1548,30 @@
 
 extern time_t tStart;
 
-//Note: dest x,y,w,h are both input and output variables
-inline void MaintainAspect(unsigned int *dx,unsigned int *dy,unsigned int *dw,unsigned int *dh)
+/* compute the position and the size of output screen
+ * The aspect of the psx output mode is preserved.
+ * Note: dest dx,dy,dw,dh are both input and output variables
+ */
+__inline void MaintainAspect(uint32_t * dx, uint32_t * dy, uint32_t * dw, uint32_t * dh)
 {
-	//Currently just 4/3 aspect ratio
-	int t;
 
-	if (*dw * 3 > *dh * 4) {
-		t = *dh * 4.0f / 3;	//new width aspect
-		*dx = (*dw - t) / 2;	//centering
-		*dw = t;
+	double ratio_x = ((double)*dw) / ((double)PSXDisplay.DisplayMode.x) ;
+	double ratio_y = ((double)*dh) / ((double)PSXDisplay.DisplayMode.y);
+
+	double ratio;
+	if (ratio_x < ratio_y) {
+		ratio = ratio_x;
 	} else {
-		t = *dw * 3.0f / 4;
-		*dy = (*dh - t) / 2;
-		*dh = t;
+		ratio = ratio_y;
 	}
+
+	uint32_t tw = (uint32_t) floor(PSXDisplay.DisplayMode.x * ratio);
+	uint32_t th = (uint32_t) floor(PSXDisplay.DisplayMode.y * ratio);
+
+	*dx = (uint32_t) floor((*dw - tw) / 2.0);
+	*dy = (uint32_t) floor((*dh - th) / 2.0);
+	*dw = tw;
+	*dh = th;
 }
 
 void DoBufferSwap(void)
@@ -1553,7 +1579,7 @@
 	Screen *screen;
 	Window _dw;
 	XvImage *xvi;
-	unsigned int dstx, dsty, srcy = 0;
+	unsigned int dstx, dsty;
 	unsigned int _d, _w, _h;	//don't care about _d
 
 	finalw = PSXDisplay.DisplayMode.x;
@@ -1588,7 +1614,7 @@
 
 	xvi->data = shminfo.shmaddr;
 
-	screen=DefaultScreenOfDisplay(display);	
+	screen=DefaultScreenOfDisplay(display);
 	//screennum = DefaultScreen(display);
 
 	if (!iWindowMode) {
@@ -1602,48 +1628,43 @@
 	if (iMaintainAspect)
 		MaintainAspect(&dstx, &dsty, &_w, &_h);
 
-	if (ulKeybits&KEY_SHOWFPS)	//to avoid flicker, don't paint overtop FPS bar
-	{
-		srcy = 15 * finalh / _h;
-		dsty += 15;
-	}
-
-	XvShmPutImage(display, xv_port, window, hGC, xvi, 
-		0,srcy,		//src x,y
+/*Whistler: too slow/laggy so commented out for now
+ if(iRumbleTime)
+ {
+ dstx += (rand() % iRumbleVal) - iRumbleVal / 2;
+ _w -= (rand() % iRumbleVal) - iRumbleVal / 2;
+ dsty += (rand() % iRumbleVal) - iRumbleVal / 2;
+ _h -= (rand() % iRumbleVal) - iRumbleVal / 2;
+ iRumbleTime--;
+ }
+*/
+	XvShmPutImage(display, xv_port, window, hGC, xvi,
+		0,0,		//src x,y
 		finalw,finalh,	//src w,h
 		dstx,dsty,	//dst x,y
-		_w,_h,		//dst w,h
+		_w, _h,		//dst w,h
 		1
 		);
 
-	if(ulKeybits&KEY_SHOWFPS) //DisplayText(); // paint menu text 
+	if(ulKeybits&KEY_SHOWFPS) //DisplayText(); c // paint menu text
 	{
 		if(szDebugText[0] && ((time(NULL) - tStart) < 2))
 		{
 			strcpy(szDispBuf,szDebugText);
 		}
-		else 
+		else
 		{
 			szDebugText[0]=0;
 			strcat(szDispBuf,szMenuBuf);
 		}
 
-		//XPutImage(display,window,hGC, XFimage, 
+		//XPutImage(display,window,hGC, XFimage,
 		// 0, 0, 0, 0, 220,15);
-		XFree(xvi);
-		xvi = XvCreateImage(display, xv_port, xv_id, XFimage->data, 220, 15);
-		XvPutImage(display, xv_port, window, hGC, xvi, 
-			0,0,		//src x,y
-			220,15,		//src w,h
-			0,0,		//dst x,y
-			220,15		//dst w,h
-			);
-
-		XDrawString(display,window,hGC,2,13,szDispBuf,strlen(szDispBuf));
+
+		XDrawImageString(display,window,hGC,2,13,szDispBuf,strlen(szDispBuf));
 	}
-	
+
 	//if(XPimage) DisplayPic();
-	
 
 	XFree(xvi);
 }
@@ -1737,7 +1758,7 @@
 {
 CloseMenu();
 
- if(iUseNoStretchBlt>0) 
+ if(iUseNoStretchBlt>0)
 {
 if(pBackBuffer) free(pBackBuffer);
 pBackBuffer=0;
@@ -1816,7 +1837,7 @@
 
 XPimage = XCreateImage(display,myvisual->visual,
 depth, ZPixmap, 0,
- (char *)p, 
+ (char *)p,
 128, 96,
 depth>16 ? 32 : 16,
 0);
@@ -1824,13 +1845,13 @@
 
 void DestroyPic(void)
 {
- if(XPimage) 
+ if(XPimage)
 { /*
 XPutImage(display,window,hGC, XCimage,
 	 0, 0, 0, 0, iResX, iResY);*/
 XDestroyImage(XPimage);
- XPimage=0; 
- } 
+ XPimage=0;
+ }
 }
 
 void DisplayPic(void)
@@ -1851,14 +1872,14 @@
 {
 	static unsigned char cache_vert_mask[640];
 	unsigned char cache_horiz_mask = 0;
-	
+
 	unsigned i;
 	unsigned char mask;
 	uint32_t c[9];
 
 	if (src0 == src1)	//processing first row
-		memset(cache_vert_mask, 0, count);	
-	
+		memset(cache_vert_mask, 0, count);
+
 	for(i=0;i<count;++i) {
 		c[1] = src0[0];
 		c[4] = src1[0];
@@ -1897,11 +1918,55 @@
 		mask |= cache_vert_mask[i] << 5; // << 1 << 5 == << 6
 		mask |= interp_32_diff(c[8], c[4]) << 7;
 
+#define P0 dst0[0]
+#define P1 dst0[1]
+#define P2 dst1[0]
+#define P3 dst1[1]
+#define MUR interp_32_diff(c[1], c[5])
+#define MDR interp_32_diff(c[5], c[7])
+#define MDL interp_32_diff(c[7], c[3])
+#define MUL interp_32_diff(c[3], c[1])
+#define IC(p0) c[p0]
+#define I11(p0,p1) interp_32_11(c[p0], c[p1])
+#define I211(p0,p1,p2) interp_32_211(c[p0], c[p1], c[p2])
+#define I31(p0,p1) interp_32_31(c[p0], c[p1])
+#define I332(p0,p1,p2) interp_32_332(c[p0], c[p1], c[p2])
+#define I431(p0,p1,p2) interp_32_431(c[p0], c[p1], c[p2])
+#define I521(p0,p1,p2) interp_32_521(c[p0], c[p1], c[p2])
+#define I53(p0,p1) interp_32_53(c[p0], c[p1])
+#define I611(p0,p1,p2) interp_32_611(c[p0], c[p1], c[p2])
+#define I71(p0,p1) interp_32_71(c[p0], c[p1])
+#define I772(p0,p1,p2) interp_32_772(c[p0], c[p1], c[p2])
+#define I97(p0,p1) interp_32_97(c[p0], c[p1])
+#define I1411(p0,p1,p2) interp_32_1411(c[p0], c[p1], c[p2])
+#define I151(p0,p1) interp_32_151(c[p0], c[p1])
 
 		switch (mask) {
 #include "hq2x.h"
 		}
 
+#undef P0
+#undef P1
+#undef P2
+#undef P3
+#undef MUR
+#undef MDR
+#undef MDL
+#undef MUL
+#undef IC
+#undef I11
+#undef I211
+#undef I31
+#undef I332
+#undef I431
+#undef I521
+#undef I53
+#undef I611
+#undef I71
+#undef I772
+#undef I97
+#undef I1411
+#undef I151
 
 		src0 += 1;
 		src1 += 1;
@@ -1954,7 +2019,7 @@
 	uint32_t c[9];
 
 	if (src0 == src1)	//processing first row
-		memset(cache_vert_mask, 0, count);	
+		memset(cache_vert_mask, 0, count);
 
 	for(i=0;i<count;++i) {
 		c[1] = src0[0];
@@ -1982,7 +2047,7 @@
 		}
 
 		mask = 0;
-		
+
 		mask |= interp_32_diff(c[0], c[4]) << 0;
 		mask |= cache_vert_mask[i];
 		mask |= interp_32_diff(c[2], c[4]) << 2;
@@ -1994,10 +2059,66 @@
 		mask |= cache_vert_mask[i] << 5; // << 1 << 5 == << 6
 		mask |= interp_32_diff(c[8], c[4]) << 7;
 
+#define P0 dst0[0]
+#define P1 dst0[1]
+#define P2 dst0[2]
+#define P3 dst1[0]
+#define P4 dst1[1]
+#define P5 dst1[2]
+#define P6 dst2[0]
+#define P7 dst2[1]
+#define P8 dst2[2]
+#define MUR interp_32_diff(c[1], c[5])
+#define MDR interp_32_diff(c[5], c[7])
+#define MDL interp_32_diff(c[7], c[3])
+#define MUL interp_32_diff(c[3], c[1])
+#define IC(p0) c[p0]
+#define I11(p0,p1) interp_32_11(c[p0], c[p1])
+#define I211(p0,p1,p2) interp_32_211(c[p0], c[p1], c[p2])
+#define I31(p0,p1) interp_32_31(c[p0], c[p1])
+#define I332(p0,p1,p2) interp_32_332(c[p0], c[p1], c[p2])
+#define I431(p0,p1,p2) interp_32_431(c[p0], c[p1], c[p2])
+#define I521(p0,p1,p2) interp_32_521(c[p0], c[p1], c[p2])
+#define I53(p0,p1) interp_32_53(c[p0], c[p1])
+#define I611(p0,p1,p2) interp_32_611(c[p0], c[p1], c[p2])
+#define I71(p0,p1) interp_32_71(c[p0], c[p1])
+#define I772(p0,p1,p2) interp_32_772(c[p0], c[p1], c[p2])
+#define I97(p0,p1) interp_32_97(c[p0], c[p1])
+#define I1411(p0,p1,p2) interp_32_1411(c[p0], c[p1], c[p2])
+#define I151(p0,p1) interp_32_151(c[p0], c[p1])
+
 		switch (mask) {
 #include "hq3x.h"
 		}
 
+#undef P0
+#undef P1
+#undef P2
+#undef P3
+#undef P4
+#undef P5
+#undef P6
+#undef P7
+#undef P8
+#undef MUR
+#undef MDR
+#undef MDL
+#undef MUL
+#undef IC
+#undef I11
+#undef I211
+#undef I31
+#undef I332
+#undef I431
+#undef I521
+#undef I53
+#undef I611
+#undef I71
+#undef I772
+#undef I97
+#undef I1411
+#undef I151
+
 		src0 += 1;
 		src1 += 1;
 		src2 += 1;

pcsxr-1.9.92.tar.bz2/plugins/dfxvideo/externals.h -> pcsxr-1.9.93.tar.bz2/plugins/dfxvideo/externals.h Changed

@@ -52,6 +52,40 @@
 #define GPUIsNotReadyForCommands (lGPUstatusRet &= ~GPUSTATUS_READYFORCOMMANDS)
 #define GPUIsReadyForCommands (lGPUstatusRet |= GPUSTATUS_READYFORCOMMANDS)
 
+#ifdef _WINDOWS
+
+#ifndef STRICT
+#define STRICT
+#endif
+#define D3D_OVERLOADS
+#define DIRECT3D_VERSION 0x600
+#define CINTERFACE
+#ifndef WINVER
+#define WINVER 0x0500
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include <stdint.h>
+#include <windows.h>
+#include <windowsx.h>
+#include <tchar.h>
+#include "resource.h"
+
+#include "ddraw.h"
+#include "d3dtypes.h"
+#include "d3d.h"
+
+#ifdef _MSC_VER
+#pragma warning (disable:864)
+#pragma warning (disable:4244)
+#pragma warning (disable:4996)
+#endif
+
+#else
+
 #define __X11_C_
 //X11 render
 #define __inline inline
@@ -64,11 +98,13 @@
 #ifndef _MACGL
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
+#include <X11/cursorfont.h>
 #endif
 #include <math.h>
-#include <X11/cursorfont.h>
 #include <stdint.h>
 
+#endif
+
 /////////////////////////////////////////////////////////////////////////////
 
 typedef struct VRAMLOADTTAG
@@ -104,6 +140,21 @@
 short y1;
 } PSXRect_t;
 
+#ifdef _WINDOWS
+
+typedef struct SDXTAG
+{
+ LPDIRECTDRAW DD;
+
+ LPDIRECTDRAWSURFACE DDSPrimary;
+ LPDIRECTDRAWSURFACE DDSRender;
+ LPDIRECTDRAWSURFACE DDSHelper;
+ LPDIRECTDRAWSURFACE DDSScreenPic;
+ HWND hWnd;
+} sDX;
+
+#else
+
 // linux defines for some windows stuff
 
 #define FALSE 0
@@ -114,7 +165,7 @@
 #define max(a,b) (((a) > (b)) ? (a) : (b))
 #define min(a,b) (((a) < (b)) ? (a) : (b))
 #define DWORD uint32_t
-#define __int64 long long int 
+#define __int64 long long int
 
 typedef struct RECTTAG
 {
@@ -122,9 +173,9 @@
 int top;
 int right;
 int bottom;
-}RECT;
-
+} RECT;
 
+#endif
 
 /////////////////////////////////////////////////////////////////////////////
 
@@ -141,7 +192,7 @@
 PSXPoint_t DisplayMode;
 PSXPoint_t DisplayPosition;
 PSXPoint_t DisplayEnd;
- 
+
 int32_t Double;
 int32_t Height;
 int32_t PAL;
@@ -155,13 +206,27 @@
 
 } PSXDisplay_t;
 
+#ifdef _WINDOWS
+extern HINSTANCE hInst;
+extern HMODULE hDDrawDLL;
+#endif
+
 /////////////////////////////////////////////////////////////////////////////
 
 // draw.c
 
 #ifndef _IN_DRAW
 
+#ifdef _WINDOWS
+extern sDX DX;
+extern HWND hWGPU;
+extern GUID guiDev;
+extern int iRefreshRate;
+extern BOOL bVsync;
+extern BOOL bVsync_Key;
+#else
 extern char * pCaptionText;
+#endif
 
 extern int iResX;
 extern int iResY;
@@ -180,6 +245,9 @@
 extern short g_m3;
 extern short DrawSemiTrans;
 extern int iUseGammaVal;
+#ifdef _WINDOWS
+extern int iUseScanLines;
+#endif
 extern int iMaintainAspect;
 extern int iDesktopCol;
 extern int iUseNoStretchBlt;
@@ -190,6 +258,9 @@
 extern PSXPoint_t ptCursorPoint[];
 extern unsigned short usCursorActive;
 
+#ifdef _WINDOWS
+extern int iSysMemory;
+#endif
 
 #endif
 
@@ -253,6 +324,9 @@
 extern DWORD dwLaceCnt;
 extern uint32_t lGPUInfoVals[];
 extern uint32_t ulStatusControl[];
+extern uint32_t vBlank;
+extern int iRumbleVal;
+extern int iRumbleTime;
 
 #endif
 
@@ -262,6 +336,12 @@
 
 extern uint32_t dwCoreFlags;
 
+#ifdef _WINDOWS
+extern HFONT hGFont;
+extern int iMPos;
+extern BOOL bTransparent;
+#endif
+
 #endif
 
 // key.c
@@ -270,6 +350,10 @@
 
 extern unsigned long ulKeybits;
 
+#ifdef _WINDOWS
+extern char szGPUKeys[];
+#endif
+
 #endif
 
 // fps.c
@@ -283,6 +367,10 @@
 extern float fFrameRateHz;
 extern float fps_skip;
 extern float fps_cur;
+#ifdef _WINDOWS
+extern BOOL IsPerformanceCounter;
+extern int			 iStopSaver;
+#endif
 
 #endif
 
@@ -311,5 +399,3 @@
 extern int iTileCheat;
 
 #endif
-
-

pcsxr-1.9.92.tar.bz2/plugins/dfxvideo/fps.h -> pcsxr-1.9.93.tar.bz2/plugins/dfxvideo/fps.h Changed

@@ -1,31 +1,31 @@
-/***************************************************************************
-                          fps.h -  description
-                             -------------------
-    begin                : Sun Oct 28 2001
-    copyright            : (C) 2001 by Pete Bernert
-    email                : BlackDove@addcom.de
- ***************************************************************************/
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version. See also the license.txt file for *
- *   additional informations.                                              *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef _FPS_INTERNALS_H
-#define _FPS_INTERNALS_H
-
-void FrameCap(void); 
-void FrameSkip(void); 
-void calcfps(void);
-void PCFrameCap (void);
-void PCcalcfps(void);
-void SetAutoFrameCap(void);
-void SetFPSHandler(void);
-void InitFPS(void);
-void CheckFrameRate(void);
-
-#endif // _FPS_INTERNALS_H
+/***************************************************************************
+                          fps.h -  description
+                             -------------------
+    begin                : Sun Oct 28 2001
+    copyright            : (C) 2001 by Pete Bernert
+    email                : BlackDove@addcom.de
+ ***************************************************************************/
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef _FPS_INTERNALS_H
+#define _FPS_INTERNALS_H
+
+void FrameCap(void); 
+void FrameSkip(void); 
+void calcfps(void);
+void PCFrameCap (void);
+void PCcalcfps(void);
+void SetAutoFrameCap(void);
+void SetFPSHandler(void);
+void InitFPS(void);
+void CheckFrameRate(void);
+
+#endif // _FPS_INTERNALS_H

pcsxr-1.9.92.tar.bz2/plugins/dfxvideo/gpu.c -> pcsxr-1.9.93.tar.bz2/plugins/dfxvideo/gpu.c Changed

@@ -15,7 +15,7 @@
 * *
 ***************************************************************************/
 
-#ifndef _MACGL
+#if !defined(_MACGL) && !defined(_WINDOWS)
 #include "config.h"
 #endif
 
@@ -38,11 +38,38 @@
 #include <locale.h>
 #define _(x) gettext(x)
 #define N_(x) (x)
+
+//If running under Mac OS X, use the Localizable.strings file instead.
+#elif defined(_MACOSX)
+#ifdef PCSXRCORE
+__private_extern__ char* Pcsxr_locale_text(char* toloc);
+#define _(String) Pcsxr_locale_text(String)
+#define N_(String) String
+#else
+#ifndef PCSXRPLUG
+#warning please define the plug being built to use Mac OS X localization!
+#define _(msgid) msgid
+#define N_(msgid) msgid
+#else
+//Kludge to get the preprocessor to accept PCSXRPLUG as a variable.
+#define PLUGLOC_x(x,y) x ## y
+#define PLUGLOC_y(x,y) PLUGLOC_x(x,y)
+#define PLUGLOC PLUGLOC_y(PCSXRPLUG,_locale_text)
+__private_extern__ char* PLUGLOC(char* toloc);
+#define _(String) PLUGLOC(String)
+#define N_(String) String
+#endif
+#endif
 #else
 #define _(x) (x)
 #define N_(x) (x)
 #endif
 
+#ifdef _WINDOWS
+#include "resource.h"
+#include "record.h"
+#endif
+
 ////////////////////////////////////////////////////////////////////////
 // PPDK developer must change libraryName field and can change revision and build
 ////////////////////////////////////////////////////////////////////////
@@ -51,7 +78,10 @@
 const unsigned char revision = 1;
 const unsigned char build = 17; // increase that with each version
 
-#ifdef _MACGL
+#if defined (_WINDOWS)
+static char *libraryName = N_("Soft Driver");
+static char *libraryInfo = N_("P.E.Op.S. Soft Driver V1.17\nCoded by Pete Bernert and the P.E.Op.S. team\n");
+#elif defined (_MACGL)
 static char *libraryName = N_("SoftGL Driver");
 static char *libraryInfo = N_("P.E.Op.S. SoftGL Driver V1.17\nCoded by Pete Bernert and the P.E.Op.S. team\n");
 #else
@@ -62,7 +92,7 @@
 static char *PluginAuthor = N_("Pete Bernert and the P.E.Op.S. team");
 
 ////////////////////////////////////////////////////////////////////////
-// memory image of the PSX vram 
+// memory image of the PSX vram
 ////////////////////////////////////////////////////////////////////////
 
 unsigned char *psxVSecure;
@@ -107,6 +137,68 @@
 BOOL bDoLazyUpdate=FALSE;
 uint32_t lGPUInfoVals[16];
 static int iFakePrimBusy=0;
+uint32_t vBlank=0;
+int iRumbleVal=0;
+int iRumbleTime=0;
+
+#ifdef _WINDOWS
+
+////////////////////////////////////////////////////////////////////////
+// screensaver stuff: dynamically load kernel32.dll to avoid export dependeny
+////////////////////////////////////////////////////////////////////////
+
+int				 iStopSaver=0;
+HINSTANCE kernel32LibHandle = NULL;
+
+// A stub function, that does nothing .... but it does "nothing" well :)
+EXECUTION_STATE WINAPI STUB_SetThreadExecutionState(EXECUTION_STATE esFlags)
+{
+	return esFlags;
+}
+
+// The dynamic version of the system call is prepended with a "D_"
+EXECUTION_STATE (WINAPI *D_SetThreadExecutionState)(EXECUTION_STATE esFlags) = STUB_SetThreadExecutionState;
+
+BOOL LoadKernel32(void)
+{
+	// Get a handle to the kernel32.dll (which is actually already loaded)
+	kernel32LibHandle = LoadLibrary("kernel32.dll");
+
+	// If we've got a handle, then locate the entry point for the SetThreadExecutionState function
+	if (kernel32LibHandle != NULL)
+	{
+		if ((D_SetThreadExecutionState = (EXECUTION_STATE (WINAPI *)(EXECUTION_STATE))GetProcAddress (kernel32LibHandle, "SetThreadExecutionState")) == NULL)
+			D_SetThreadExecutionState = STUB_SetThreadExecutionState;
+	}
+
+	return TRUE;
+}
+
+BOOL FreeKernel32(void)
+{
+	// Release the handle to kernel32.dll
+	if (kernel32LibHandle != NULL)
+		FreeLibrary(kernel32LibHandle);
+
+	// Set to stub function, to avoid nasty suprises if called :)
+	D_SetThreadExecutionState = STUB_SetThreadExecutionState;
+
+	return TRUE;
+}
+#else
+
+// Linux: Stub the functions
+BOOL LoadKernel32(void)
+{
+	return TRUE;
+}
+
+BOOL FreeKernel32(void)
+{
+	return TRUE;
+}
+
+#endif
 
 ////////////////////////////////////////////////////////////////////////
 // some misc external display funcs
@@ -159,7 +251,7 @@
 // Snapshot func
 ////////////////////////////////////////////////////////////////////////
 
-static char * pGetConfigInfos(int iCfg)
+char * pGetConfigInfos(int iCfg)
 {
 char szO[2][4]={"off","on "};
 char szTxt[256];
@@ -178,10 +270,10 @@
 else
 sprintf(szTxt,"Resolution/Color:\r\n- %dx%d ",iResX,iResY);
 strcat(pB,szTxt);
- if(iWindowMode && iCfg) 
+ if(iWindowMode && iCfg)
 strcpy(szTxt,"Window mode\r\n");
 else
- if(iWindowMode) 
+ if(iWindowMode)
 sprintf(szTxt,"Window mode - [%d Bit]\r\n",iDesktopCol);
 else
 sprintf(szTxt,"Fullscreen - [%d Bit]\r\n",iColDepth);
@@ -203,7 +295,7 @@
 else sprintf(szTxt,"- FPS limit: %.1f\r\n\r\n",fFrameRate);
 strcat(pB,szTxt);
 //----------------------------------------------------//
-#ifndef _MACGL
+#if !defined (_MACGL) && !defined (_WINDOWS)
 strcpy(szTxt,"Misc:\r\n- MaintainAspect: ");
 if(iMaintainAspect == 0) strcat(szTxt,"disabled");
 else
@@ -223,7 +315,11 @@
 char szTxt[256];
 char *pB;
 
- sprintf(szTxt,"%s/pcsx%04d.txt",getenv("HOME"),iNum);
+#ifdef _WINDOWS
+ sprintf(szTxt,"snap\\pcsxr%04d.txt",iNum);
+#else
+ sprintf(szTxt,"%s/pcsxr%04d.txt",getenv("HOME"),iNum);
+#endif
 
 if ((txtfile = fopen(szTxt, "wb")) == NULL)
 return;
@@ -281,7 +377,11 @@
 do
 {
 snapshotnr++;
- sprintf(filename, "%s/pcsx%04ld.bmp", getenv("HOME"), snapshotnr);
+#ifdef _WINDOWS
+ sprintf(filename,"snap\\pcsxr%04ld.bmp",snapshotnr);
+#else
+ sprintf(filename, "%s/pcsxr%04ld.bmp", getenv("HOME"), snapshotnr);
+#endif
 
 bmpfile = fopen(filename,"rb");
 if (bmpfile == NULL)
@@ -304,9 +404,9 @@
 if (PSXDisplay.RGB24)
 {
 uint32_t lu = *(uint32_t *)pD;
- line[j * 3 + 2] = RED(lu);
- line[j * 3 + 1] = GREEN(lu);
- line[j * 3 + 0] = BLUE(lu);
+ line[j * 3 + 2] = (unsigned char)RED(lu);
+ line[j * 3 + 1] = (unsigned char)GREEN(lu);
+ line[j * 3 + 0] = (unsigned char)BLUE(lu);
 pD += 3;
 }
 else
@@ -378,12 +478,16 @@
 // Reset transfer values, to prevent mis-transfer of data
 memset(&VRAMWrite, 0, sizeof(VRAMLoad_t));
 memset(&VRAMRead, 0, sizeof(VRAMLoad_t));
- 
+
 // device initialised already !
 lGPUstatusRet = 0x14802000;
 GPUIsIdle;
 GPUIsReadyForCommands;
 bDoVSyncUpdate = TRUE;
+ vBlank = 0;
+
+ // Get a handle for kernel32.dll, and access the required export function
+ LoadKernel32();
 
 return 0;
 }
@@ -392,6 +496,33 @@
 // Here starts all...
 ////////////////////////////////////////////////////////////////////////
 
+#ifdef _WINDOWS
+long CALLBACK GPUopen(HWND hwndGPU) // GPU OPEN
+{
+ hWGPU = hwndGPU; // store hwnd
+
+ SetKeyHandler(); // sub-class window
+
+ if(bChangeWinMode) ReadWinSizeConfig(); // alt+enter toggle?
+ else // or first time startup?
+ {
+ ReadConfig(); // read registry
+ InitFPS();
+ }
+
+ bIsFirstFrame = TRUE; // we have to init later
+ bDoVSyncUpdate = TRUE;
+
+ ulInitDisplay(); // setup direct draw
+
+ if(iStopSaver)
+ D_SetThreadExecutionState(ES_SYSTEM_REQUIRED|ES_DISPLAY_REQUIRED|ES_CONTINUOUS);
+
+
+ return 0;
+}
+
+#else
 
 long GPUopen(unsigned long * disp,char * CapText,char * CfgFile)
 {
@@ -416,6 +547,7 @@
 return -1;
 }
 
+#endif
 
 ////////////////////////////////////////////////////////////////////////
 // time to leave...
@@ -423,11 +555,19 @@
 
 long CALLBACK GPUclose() // GPU CLOSE
 {
+#ifdef _WINDOWS
+ if(RECORD_RECORDING==TRUE) {RECORD_Stop();RECORD_RECORDING=FALSE;BuildDispMenu(0);}
+#endif
 
 ReleaseKeyHandler(); // de-subclass window
 
 CloseDisplay(); // shutdown direct draw
 
+#ifdef _WINDOWS
+ if(iStopSaver)
+ D_SetThreadExecutionState(ES_SYSTEM_REQUIRED|ES_DISPLAY_REQUIRED);
+#endif
+
 return 0;
 }
 
@@ -437,6 +577,9 @@
 
 long CALLBACK GPUshutdown() // GPU SHUTDOWN
 {
+ // screensaver: release the handle for kernel32.dll
+ FreeKernel32();
+
 free(psxVSecure);
 
 return 0; // nothinh to do
@@ -457,8 +600,8 @@
 if(dwActFixes&32) // pc fps calculation fix
 {
 if(UseFrameLimit) PCFrameCap(); // -> brake
- if(UseFrameSkip || ulKeybits&KEY_SHOWFPS) 
- PCcalcfps(); 
+ if(UseFrameSkip || ulKeybits&KEY_SHOWFPS)
+ PCcalcfps();
 }
 
 if(ulKeybits&KEY_SHOWFPS) // make fps display buf
@@ -539,17 +682,18 @@
 
 PreviousPSXDisplay.Range.x1+=(short)(lx-l);
 
+#ifndef _WINDOWS
 PreviousPSXDisplay.Range.x1-=2; // makes linux stretching easier
-
+#endif
 }
 
-
+#ifndef _WINDOWS
 // some linux alignment security
 PreviousPSXDisplay.Range.x0=PreviousPSXDisplay.Range.x0>>1;
 PreviousPSXDisplay.Range.x0=PreviousPSXDisplay.Range.x0<<1;
 PreviousPSXDisplay.Range.x1=PreviousPSXDisplay.Range.x1>>1;
 PreviousPSXDisplay.Range.x1=PreviousPSXDisplay.Range.x1<<1;
-
+#endif
 
 DoClearScreenBuffer();
 }
@@ -587,7 +731,7 @@
 
 if(PreviousPSXDisplay.DisplayModeNew.y!=iOldYOffset) // if old offset!=new offset: recalc height
 {
- PSXDisplay.Height = PSXDisplay.Range.y1 - 
+ PSXDisplay.Height = PSXDisplay.Range.y1 -
 PSXDisplay.Range.y0 +
 PreviousPSXDisplay.DisplayModeNew.y;
 PSXDisplay.DisplayModeNew.y=PSXDisplay.Height*PSXDisplay.Double;
@@ -606,7 +750,7 @@
 PSXDisplay.DisplayModeNew.y+=
 PreviousPSXDisplay.Range.y0;
 }
- else 
+ else
 PreviousPSXDisplay.Range.y0=0;
 
 if(iO!=PreviousPSXDisplay.Range.y0)
@@ -621,10 +765,10 @@
 
 void updateDisplayIfChanged(void) // UPDATE DISPLAY IF CHANGED
 {
- if ((PSXDisplay.DisplayMode.y == PSXDisplay.DisplayModeNew.y) && 
+ if ((PSXDisplay.DisplayMode.y == PSXDisplay.DisplayModeNew.y) &&
 (PSXDisplay.DisplayMode.x == PSXDisplay.DisplayModeNew.x))
 {
- if((PSXDisplay.RGB24 == PSXDisplay.RGB24New) && 
+ if((PSXDisplay.RGB24 == PSXDisplay.RGB24New) &&
 (PSXDisplay.Interlaced == PSXDisplay.InterlacedNew)) return;
 }
 
@@ -634,10 +778,10 @@
 PSXDisplay.DisplayMode.x = PSXDisplay.DisplayModeNew.x;
 PreviousPSXDisplay.DisplayMode.x= // previous will hold
 min(640,PSXDisplay.DisplayMode.x); // max 640x512... that's
- PreviousPSXDisplay.DisplayMode.y= // the size of my 
+ PreviousPSXDisplay.DisplayMode.y= // the size of my
 min(512,PSXDisplay.DisplayMode.y); // back buffer surface
 PSXDisplay.Interlaced = PSXDisplay.InterlacedNew;
- 
+
 PSXDisplay.DisplayEnd.x= // calc end of display
 PSXDisplay.DisplayPosition.x+ PSXDisplay.DisplayMode.x;
 PSXDisplay.DisplayEnd.y=
@@ -656,7 +800,18 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-#ifndef _MACGL
+#if defined(_WINDOWS)
+
+void ChangeWindowMode(void) // TOGGLE FULLSCREEN - WINDOW
+{
+ GPUclose();
+ iWindowMode=!iWindowMode;
+ GPUopen(hWGPU);
+ bChangeWinMode=FALSE;
+ bDoVSyncUpdate=TRUE;
+}
+
+#elif !defined (_MACGL)
 
 #include "draw.h"
 
@@ -783,14 +938,15 @@
 
 void CALLBACK GPUupdateLace(void) // VSYNC
 {
- if(!(dwActFixes&1))
- lGPUstatusRet^=0x80000000; // odd/even bit
+ //if(!(dwActFixes&1))
+ //lGPUstatusRet^=0x80000000; // odd/even bit
 
 if(!(dwActFixes&32)) // std fps limitation?
 CheckFrameRate();
 
 if(PSXDisplay.Interlaced) // interlaced mode?
 {
+ lGPUstatusRet^=0x80000000;
 if(bDoVSyncUpdate && PSXDisplay.DisplayMode.x>0 && PSXDisplay.DisplayMode.y>0)
 {
 updateDisplay();
@@ -800,8 +956,8 @@
 {
 if(dwActFixes&64) // lazy screen update fix
 {
- if(bDoLazyUpdate && !UseFrameSkip) 
- updateDisplay(); 
+ if(bDoLazyUpdate && !UseFrameSkip)
+ updateDisplay();
 bDoLazyUpdate=FALSE;
 }
 else
@@ -810,9 +966,17 @@
 updateDisplay(); // -> update display
 }
 }
+
+#ifdef _WINDOWS
+ if(RECORD_RECORDING)
+ if(RECORD_WriteFrame()==FALSE)
+ {RECORD_RECORDING=FALSE;RECORD_Stop();}
+#endif
+
 #ifndef _MACGL
 if(bChangeWinMode) ChangeWindowMode(); // toggle full - window mode
 #endif
+
 bDoVSyncUpdate=FALSE; // vsync done
 }
 
@@ -848,7 +1012,7 @@
 GPUIsReadyForCommands;
 }
 }
- return lGPUstatusRet;
+ return lGPUstatusRet | (vBlank ? 0x80000000 : 0 );
 }
 
 ////////////////////////////////////////////////////////////////////////
@@ -882,13 +1046,13 @@
 bUsingTWin = FALSE;
 return;
 //--------------------------------------------------//
- // dis/enable display 
- case 0x03: 
+ // dis/enable display
+ case 0x03:
 
 PreviousPSXDisplay.Disabled = PSXDisplay.Disabled;
 PSXDisplay.Disabled = (gdata & 1);
 
- if(PSXDisplay.Disabled) 
+ if(PSXDisplay.Disabled)
 lGPUstatusRet|=GPUSTATUS_DISPLAYDISABLED;
 else lGPUstatusRet&=~GPUSTATUS_DISPLAYDISABLED;
 return;
@@ -907,7 +1071,7 @@
 return;
 //--------------------------------------------------//
 // setting display position
- case 0x05: 
+ case 0x05:
 {
 PreviousPSXDisplay.DisplayPosition.x = PSXDisplay.DisplayPosition.x;
 PreviousPSXDisplay.DisplayPosition.y = PSXDisplay.DisplayPosition.y;
@@ -915,9 +1079,9 @@
 ////////
 /*
 PSXDisplay.DisplayPosition.y = (short)((gdata>>10)&0x3ff);
- if (PSXDisplay.DisplayPosition.y & 0x200) 
+ if (PSXDisplay.DisplayPosition.y & 0x200)
 PSXDisplay.DisplayPosition.y |= 0xfffffc00;
- if(PSXDisplay.DisplayPosition.y<0) 
+ if(PSXDisplay.DisplayPosition.y<0)
 {
 PreviousPSXDisplay.DisplayModeNew.y=PSXDisplay.DisplayPosition.y/PSXDisplay.Double;
 PSXDisplay.DisplayPosition.y=0;
@@ -928,7 +1092,7 @@
 // new
 if(iGPUHeight==1024)
 {
- if(dwGPUVersion==2) 
+ if(dwGPUVersion==2)
 PSXDisplay.DisplayPosition.y = (short)((gdata>>12)&0x3ff);
 else PSXDisplay.DisplayPosition.y = (short)((gdata>>10)&0x3ff);
 }
@@ -964,7 +1128,7 @@
 PreviousPSXDisplay.DisplayPosition.x+ PSXDisplay.DisplayMode.x;
 PreviousPSXDisplay.DisplayEnd.y=
 PreviousPSXDisplay.DisplayPosition.y+ PSXDisplay.DisplayMode.y + PreviousPSXDisplay.DisplayModeNew.y;
- 
+
 bDoVSyncUpdate=TRUE;
 
 if (!(PSXDisplay.Interlaced)) // stupid frame skipping option
@@ -992,10 +1156,10 @@
 
 PSXDisplay.Range.y0=(short)(gdata & 0x3ff);
 PSXDisplay.Range.y1=(short)((gdata>>10) & 0x3ff);
- 
+
 PreviousPSXDisplay.Height = PSXDisplay.Height;
 
- PSXDisplay.Height = PSXDisplay.Range.y1 - 
+ PSXDisplay.Height = PSXDisplay.Range.y1 -
 PSXDisplay.Range.y0 +
 PreviousPSXDisplay.DisplayModeNew.y;
 
@@ -1029,7 +1193,7 @@
 
 lGPUstatusRet&=~GPUSTATUS_WIDTHBITS; // Clear the width bits
 lGPUstatusRet|=
- (((gdata & 0x03) << 17) | 
+ (((gdata & 0x03) << 17) |
 ((gdata & 0x40) << 10)); // Set the width bits
 
 if(PSXDisplay.InterlacedNew)
@@ -1060,11 +1224,11 @@
 return;
 //--------------------------------------------------//
 // ask about GPU version and other stuff
- case 0x10: 
+ case 0x10:
 
 gdata&=0xff;
 
- switch(gdata) 
+ switch(gdata)
 {
 case 0x02:
 lGPUdataRet=lGPUInfoVals[INFO_TW]; // tw infos
@@ -1091,14 +1255,14 @@
 }
 return;
 //--------------------------------------------------//
- } 
+ }
 }
 
 ////////////////////////////////////////////////////////////////////////
 // vram read/write helpers, needed by LEWPY's optimized vram read/write :)
 ////////////////////////////////////////////////////////////////////////
 
-__inline void FinishedVRAMWrite(void)
+static __inline void FinishedVRAMWrite(void)
 {
 /*
 // NEWX
@@ -1125,7 +1289,7 @@
 VRAMWrite.RowsRemaining = 0;
 }
 
-__inline void FinishedVRAMRead(void)
+static __inline void FinishedVRAMRead(void)
 {
 // Set register to NORMAL operation
 DataReadMode = DR_NORMAL;
@@ -1250,7 +1414,7 @@
 // 7,7,7,7,9,9,9,9, // GLINE
 255,255,255,255,255,255,255,255,
 // 60
- 3,3,3,3,4,4,4,4, 
+ 3,3,3,3,4,4,4,4,
 // 68
 2,2,2,2,3,3,3,3, // 3=SPRITE1???
 // 70
@@ -1367,11 +1531,11 @@
 if(DataWriteMode==DR_VRAMTRANSFER) goto STARTVRAM;
 
 gdata=GETLE32(pMem); pMem++; i++;
- 
+
 if(gpuDataC == 0)
 {
 command = (unsigned char)((gdata>>24) & 0xff);
- 
+
 //if(command>=0xb0 && command<0xc0) auxprintf("b0 %x!!!!!!!!!\n",command);
 
 if(primTableCX[command])
@@ -1397,20 +1561,21 @@
 }
 gpuDataP++;
 }
- 
+
 if(gpuDataP == gpuDataC)
 {
 gpuDataC=gpuDataP=0;
 primFunc[gpuCommand]((unsigned char *)gpuDataM);
 if(dwEmuFixes&0x0001 || dwActFixes&0x0400) // hack for emulating "gpu busy" in some games
- iFakePrimBusy=4;
 }
- } 
+ iFakePrimBusy=4;
+ }
+ }
 }
 
 lGPUdataRet=gdata;
 
 GPUIsReadyForCommands;
- GPUIsIdle; 
+ GPUIsIdle;
 }
 
 ////////////////////////////////////////////////////////////////////////
@@ -1447,7 +1612,14 @@
 
 long CALLBACK GPUconfigure(void)
 {
+#ifdef _WINDOWS
+ HWND hWP=GetActiveWindow();
+
+ DialogBox(hInst,MAKEINTRESOURCE(IDD_CFGSOFT),
+ hWP,(DLGPROC)SoftDlgProc);
+#else
 SoftDlgProc();
+#endif
 
 return 0;
 }
@@ -1458,6 +1630,17 @@
 
 void SetFixes(void)
 {
+#ifdef _WINDOWS
+ BOOL bOldPerformanceCounter=IsPerformanceCounter; // store curr timer mode
+
+ if(dwActFixes&0x10) // check fix 0x10
+ IsPerformanceCounter=FALSE;
+ else SetFPSHandler();
+
+ if(bOldPerformanceCounter!=IsPerformanceCounter) // we have change it?
+ InitFPS(); // -> init fps again
+#endif
+
 if(dwActFixes&0x02) sDispWidths[4]=384;
 else sDispWidths[4]=368;
 }
@@ -1468,7 +1651,7 @@
 
 unsigned long lUsedAddr[3];
 
-__inline BOOL CheckForEndlessLoop(unsigned long laddr)
+static __inline BOOL CheckForEndlessLoop(unsigned long laddr)
 {
 if(laddr==lUsedAddr[1]) return TRUE;
 if(laddr==lUsedAddr[2]) return TRUE;
@@ -1516,10 +1699,31 @@
 // show about dlg
 ////////////////////////////////////////////////////////////////////////
 
+#ifdef _WINDOWS
+BOOL CALLBACK AboutDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+ switch(uMsg)
+ {
+ case WM_COMMAND:
+ {
+ switch(LOWORD(wParam))
+ {case IDOK: EndDialog(hW,TRUE);return TRUE;}
+ }
+ }
+ return FALSE;
+}
+#endif
 
 void CALLBACK GPUabout(void) // ABOUT
 {
+#ifdef _WINDOWS
+ HWND hWP=GetActiveWindow(); // to be sure
+ DialogBox(hInst,MAKEINTRESOURCE(IDD_ABOUT),
+ hWP,(DLGPROC)AboutDlgProc);
+#else
 AboutDlgProc();
+#endif
+
 return;
 }
 
@@ -1849,12 +2053,153 @@
 ////////////////////////////////////////////////////////////////////////
 // the main emu allocs 128x96x3 bytes, and passes a ptr
 // to it in pMem... the plugin has to fill it with
-// 8-8-8 bit BGR screen data (Win 24 bit BMP format 
-// without header). 
+// 8-8-8 bit BGR screen data (Win 24 bit BMP format
+// without header).
 // Beware: the func can be called at any time,
 // so you have to use the frontbuffer to get a fully
 // rendered picture
 
+#ifdef _WINDOWS
+
+void CALLBACK GPUgetScreenPic(unsigned char * pMem)
+{
+ HRESULT ddrval;DDSURFACEDESC xddsd;unsigned char * pf;
+ int x,y,c,v;RECT r;
+ float XS,YS;
+
+ memset(&xddsd, 0, sizeof(DDSURFACEDESC));
+ xddsd.dwSize = sizeof(DDSURFACEDESC);
+ xddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT;
+ xddsd.dwWidth = iResX;
+ xddsd.dwHeight = iResY;
+
+ r.left=0; r.right =iResX;
+ r.top=0; r.bottom=iResY;
+
+ if(iWindowMode)
+ {
+ POINT Point={0,0};
+ ClientToScreen(DX.hWnd,&Point);
+ r.left+=Point.x;r.right+=Point.x;
+ r.top+=Point.y;r.bottom+=Point.y;
+ }
+
+ XS=(float)iResX/128;
+ YS=(float)iResY/96;
+
+ ddrval=IDirectDrawSurface_Lock(DX.DDSPrimary,NULL, &xddsd, DDLOCK_WAIT|DDLOCK_READONLY, NULL);
+
+ if(ddrval==DDERR_SURFACELOST) IDirectDrawSurface_Restore(DX.DDSPrimary);
+
+ pf=pMem;
+
+ if(ddrval==DD_OK)
+ {
+ unsigned char * ps=(unsigned char *)xddsd.lpSurface;
+
+ if(iDesktopCol==16)
+ {
+ unsigned short sx;
+ for(y=0;y<96;y++)
+ {
+ for(x=0;x<128;x++)
+ {
+ sx=*((unsigned short *)((ps)+
+ r.top*xddsd.lPitch+
+ (((int)((float)y*YS))*xddsd.lPitch)+
+ r.left*2+
+ ((int)((float)x*XS))*2));
+ *(pf+0)=(sx&0x1f)<<3;
+ *(pf+1)=(sx&0x7e0)>>3;
+ *(pf+2)=(sx&0xf800)>>8;
+ pf+=3;
+ }
+ }
+ }
+ else
+ if(iDesktopCol==15)
+ {
+ unsigned short sx;
+ for(y=0;y<96;y++)
+ {
+ for(x=0;x<128;x++)
+ {
+ sx=*((unsigned short *)((ps)+
+ r.top*xddsd.lPitch+
+ (((int)((float)y*YS))*xddsd.lPitch)+
+ r.left*2+
+ ((int)((float)x*XS))*2));
+ *(pf+0)=(sx&0x1f)<<3;
+ *(pf+1)=(sx&0x3e0)>>2;
+ *(pf+2)=(sx&0x7c00)>>7;
+ pf+=3;
+ }
+ }
+ }
+ else
+ {
+ unsigned long sx;
+ for(y=0;y<96;y++)
+ {
+ for(x=0;x<128;x++)
+ {
+ sx=*((unsigned long *)((ps)+
+ r.top*xddsd.lPitch+
+ (((int)((float)y*YS))*xddsd.lPitch)+
+ r.left*4+
+ ((int)((float)x*XS))*4));
+ *(pf+0)=(unsigned char)((sx&0xff));
+ *(pf+1)=(unsigned char)((sx&0xff00)>>8);
+ *(pf+2)=(unsigned char)((sx&0xff0000)>>16);
+ pf+=3;
+ }
+ }
+ }
+ }
+
+ IDirectDrawSurface_Unlock(DX.DDSPrimary,&xddsd);
+
+ /////////////////////////////////////////////////////////////////////
+ // generic number/border painter
+
+ pf=pMem+(103*3); // offset to number rect
+
+ for(y=0;y<20;y++) // loop the number rect pixel
+ {
+ for(x=0;x<6;x++)
+ {
+ c=cFont[lSelectedSlot][x+y*6]; // get 4 char dot infos at once (number depends on selected slot)
+ v=(c&0xc0)>>6;
+ PaintPicDot(pf,(unsigned char)v);pf+=3; // paint the dots into the rect
+ v=(c&0x30)>>4;
+ PaintPicDot(pf,(unsigned char)v);pf+=3;
+ v=(c&0x0c)>>2;
+ PaintPicDot(pf,(unsigned char)v);pf+=3;
+ v=c&0x03;
+ PaintPicDot(pf,(unsigned char)v);pf+=3;
+ }
+ pf+=104*3; // next rect y line
+ }
+
+ pf=pMem; // ptr to first pos in 128x96 pic
+ for(x=0;x<128;x++) // loop top/bottom line
+ {
+ *(pf+(95*128*3))=0x00;*pf++=0x00;
+ *(pf+(95*128*3))=0x00;*pf++=0x00; // paint it red
+ *(pf+(95*128*3))=0xff;*pf++=0xff;
+ }
+ pf=pMem; // ptr to first pos
+ for(y=0;y<96;y++) // loop left/right line
+ {
+ *(pf+(127*3))=0x00;*pf++=0x00;
+ *(pf+(127*3))=0x00;*pf++=0x00; // paint it red
+ *(pf+(127*3))=0xff;*pf++=0xff;
+ pf+=127*3; // offset to next line
+ }
+}
+
+#else
+
 // LINUX version:
 
 extern char * Xpixels;
@@ -1930,6 +2275,7 @@
 */
 }
 
+#endif
 
 ////////////////////////////////////////////////////////////////////////
 // func will be called with 128x96x3 BGR data.
@@ -1950,3 +2296,22 @@
 {
 dwEmuFixes=dwFixBits;
 }
+
+void CALLBACK GPUvBlank( int val )
+{
+ vBlank = val;
+}
+
+void CALLBACK GPUvisualVibration(uint32_t iSmall, uint32_t iBig)
+{
+ int iVibVal;
+
+ if(PreviousPSXDisplay.DisplayMode.x) // calc min "shake pixel" from screen width
+ iVibVal=max(1,iResX/PreviousPSXDisplay.DisplayMode.x);
+ else iVibVal=1;
+ // big rumble: 4...15 sp ; small rumble 1...3 sp
+ if(iBig) iRumbleVal=max(4*iVibVal,min(15*iVibVal,((int)iBig *iVibVal)/10));
+ else iRumbleVal=max(1*iVibVal,min( 3*iVibVal,((int)iSmall*iVibVal)/10));
+
+ iRumbleTime=15; // let the rumble last 16 buffer swaps
+}

pcsxr-1.9.93.tar.bz2/plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui Added

@@ -0,0 +1,729 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ 
+ <object class="GtkWindow" id="CfgWnd">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Configure X11 Video</property>
+ <property name="resizable">False</property>
+ <property name="modal">True</property>
+ <property name="window_position">center</property>
+ <property name="type_hint">dialog</property>
+ <signal name="destroy" handler="on_CfgWnd_destroy" swapped="no"/>
+ <child>
+ <object class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <child>
+ <object class="GtkAlignment" id="alignment4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">5</property>
+ <property name="bottom_padding">5</property>
+ <property name="left_padding">5</property>
+ <property name="right_padding">5</property>
+ <child>
+ <object class="GtkVBox" id="vbox7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkTable" id="table1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">3</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">30</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label14">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Initial Window Size:</property>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label15">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Stretching:</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label16">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Dithering:</property>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="stretchCombo2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="model">liststoreStretching</property>
+ <property name="active">0</property>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertextStretching"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="ditherCombo2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="model">liststoreDither</property>
+ <property name="active">1</property>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertextDither"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">10</property>
+ <child>
+ <object class="GtkComboBox" id="resCombo2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="model">liststoreRes</property>
+ <property name="active">2</property>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertextRes"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkFullscreen">
+ <property name="label" translatable="yes">Fullscreen</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes">Toggle windowed/fullscreen mode.</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkCheckButton" id="maintain43">
+ <property name="label" translatable="yes">Maintain 4:3 Aspect Ratio</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <child>
+ <object class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">5</property>
+ <property name="bottom_padding">5</property>
+ <property name="left_padding">5</property>
+ <property name="right_padding">5</property>
+ <child>
+ <object class="GtkVBox" id="vbox3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkCheckButton" id="checkShowFPS">
+ <property name="label" translatable="yes">Show FPS</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">Toggle whether the FPS will be shown.</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkFrameSkip">
+ <property name="label" translatable="yes">Enable frame skipping</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">Skip frames when rendering.</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkTable" id="table2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_columns">3</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkCheckButton" id="checkSetFPS">
+ <property name="label" translatable="yes">Set FPS</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">Enable this if games display too quickly.</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="entryFPS">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="width_chars">4</property>
+ <property name="text" translatable="yes">200.0</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkAutoFPSLimit">
+ <property name="label" translatable="yes">Autodetect FPS limit</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <child>
+ <object class="GtkAlignment" id="alignment3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">5</property>
+ <property name="bottom_padding">5</property>
+ <property name="left_padding">5</property>
+ <property name="right_padding">5</property>
+ <child>
+ <object class="GtkVBox" id="vbox4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkCheckButton" id="checkUseFixes">
+ <property name="label" translatable="yes">Use game fixes</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">19</property>
+ <child>
+ <object class="GtkTable" id="table_fixes">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">6</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">16</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkFix5">
+ <property name="label" translatable="yes">Disable CPU Saving</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">For precise framerate</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkFix1">
+ <property name="label" translatable="yes">Odd/even bit hack</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">Chrono Cross</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkFix6">
+ <property name="label" translatable="yes">PC FPS calculation</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">Better FPS limit in some</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkFix2">
+ <property name="label" translatable="yes">Expand screen width</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">Capcom fighting games</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkFix3">
+ <property name="label" translatable="yes">Ignore brightness color</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">Black screens in Lunar</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkFix4">
+ <property name="label" translatable="yes">Disable coordinate check</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">Compatibility mode</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkFix7">
+ <property name="label" translatable="yes">Lazy screen update</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes">Pandemonium 2</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkFix8">
+ <property name="label" translatable="yes">Old frame skipping</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes">Skip every second frame</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkFix9">
+ <property name="label" translatable="yes">Repeated flat tex triangles</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes">Needed by Dark Forces</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkFix10">
+ <property name="label" translatable="yes">Draw quads with triangles</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes">better g-colors, worse textures</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkFix11">
+ <property name="label" translatable="yes">Fake 'gpu busy' states</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text" translatable="yes">Toggle busy flags after drawing</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHButtonBox" id="hbuttonbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="btn_close">
+ <property name="label">gtk-close</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <object class="GtkListStore" id="liststoreDither">
+ <columns>
+ 
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">0: Off (fastest)</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">1: Game dependant</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">2: Always</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="liststoreRes">
+ <columns>
+ 
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">320x240</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">640x480</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">800x600</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">1024x768</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">1152x864</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">1280x1024</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">1600x1200</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="liststoreStretching">
+ <columns>
+ 
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">0: None</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">1: 2xSai</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">2: 2xSuperSai</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">3: SuperEagle</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">4: Scale2x</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">5: Scale3x</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">6: HQ2X</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">7: HQ3X</col>
+ </row>
+ </data>
+ </object>
+</interface>

pcsxr-1.9.92.tar.bz2/plugins/dfxvideo/gpucfg-0.1df/main.c -> pcsxr-1.9.93.tar.bz2/plugins/dfxvideo/gpucfg-0.1df/main.c Changed

@@ -1,5 +1,4 @@
 #include <gtk/gtk.h>
-#include <glade/glade.h>
 
 #include "config.h"
 
@@ -14,6 +13,9 @@
 #include <string.h>
 #include <sys/stat.h>
 
+GtkBuilder *builder;
+GtkWidget *widget, *MainWindow;
+
 void SaveConfig(GtkWidget *widget, gpointer user_datal);
 
 #define READBINARY "rb"
@@ -55,65 +57,52 @@
 	exit (0);
 }
 
-void set_widget_sensitive(GtkWidget *widget, gpointer user_data)
-{
-	gtk_widget_set_sensitive (widget, (int)user_data);
-}
-
 void on_fullscreen_toggled(GtkWidget *widget, gpointer user_data)
 {
 	GtkWidget *check, *resCombo2;
-	GladeXML *xml;
-	xml = (GladeXML*) user_data;
 
-	check = glade_xml_get_widget(xml, "checkFullscreen");
-	resCombo2 = glade_xml_get_widget(xml, "resCombo2");
+	check = gtk_builder_get_object(builder, "checkFullscreen");
+	resCombo2 = gtk_builder_get_object(builder, "resCombo2");
 
-	set_widget_sensitive(resCombo2, !gtk_toggle_button_get_active(check));
+	gtk_widget_set_sensitive(resCombo2, !gtk_toggle_button_get_active(check));
 }
 
 void on_use_fixes_toggled(GtkWidget *widget, gpointer user_data)
 {
 	GtkWidget *check, *table_fixes;
-	GladeXML *xml;
-	xml = (GladeXML*) user_data;
-	check = glade_xml_get_widget (xml, "checkUseFixes");
+	check = gtk_builder_get_object(builder,"checkUseFixes");
 
-	table_fixes = glade_xml_get_widget (xml, "table_fixes");
+	table_fixes = gtk_builder_get_object(builder,"table_fixes");
 
 	/* Set the state of each of the fixes to the value of the use fixes toggle */
-	gtk_container_foreach (GTK_CONTAINER (table_fixes), (GtkCallback) set_widget_sensitive,
-		(void *)gtk_toggle_button_get_active (check));
+	gtk_container_foreach (GTK_CONTAINER (table_fixes), (GtkCallback) gtk_widget_set_sensitive,
+		(gpointer)gtk_toggle_button_get_active (check));
 }
 
 void on_fps_toggled(GtkWidget *widget, gpointer user_data)
 {
 	GtkWidget *checkSetFPS, *checkAutoFPSLimit, *entryFPS;
-	GladeXML *xml;
 
-	xml = (GladeXML*) user_data;
-	checkSetFPS = glade_xml_get_widget(xml, "checkSetFPS");
-	checkAutoFPSLimit = glade_xml_get_widget(xml, "checkAutoFPSLimit");
-	entryFPS = glade_xml_get_widget(xml, "entryFPS");
+	checkSetFPS = gtk_builder_get_object(builder, "checkSetFPS");
+	checkAutoFPSLimit = gtk_builder_get_object(builder, "checkAutoFPSLimit");
+	entryFPS = gtk_builder_get_object(builder, "entryFPS");
 
-	set_widget_sensitive(entryFPS,
-		gtk_toggle_button_get_active(checkSetFPS) && !gtk_toggle_button_get_active(checkAutoFPSLimit));
-	set_widget_sensitive(checkAutoFPSLimit, gtk_toggle_button_get_active(checkSetFPS));
+	gtk_widget_set_sensitive(entryFPS, 
+							 gtk_toggle_button_get_active(checkSetFPS) && 
+							 !gtk_toggle_button_get_active(checkAutoFPSLimit));
+	gtk_widget_set_sensitive(checkAutoFPSLimit, gtk_toggle_button_get_active(checkSetFPS));
 }
 
 void OnConfigClose(GtkWidget *widget, gpointer user_data)
 {
-	GladeXML *xml = (GladeXML *)user_data;
-
-	gtk_widget_destroy(glade_xml_get_widget(xml, "CfgWnd"));
-	gtk_exit(0);
+	gtk_widget_destroy(gtk_builder_get_object(builder, "CfgWnd"));
+	exit(0);
 }
 
 int
 main (int argc, char *argv[])
 {
 GtkWidget *CfgWnd, *widget;
- GladeXML *xml;
 FILE *in;char t[256];int len,val; 
 float valf;
 char * pB, * p;
@@ -128,217 +117,220 @@
 textdomain (GETTEXT_PACKAGE);
 #endif
 
- if (argc!=2) {
- printf("Usage: cfgDFXVideo {ABOUT | CFG}\n");
- return 0;
- }
- if(strcmp(argv[1],"CFG")!=0 && strcmp(argv[1],"ABOUT")!=0) {
- printf("Usage: cfgDFXVideo {ABOUT | CFG}\n");
- return 0;
- }
+	if (argc < 2) {
+		printf ("Usage: cfgDFXVideo {about | configure}\n");
+		return 0;
+	}
 
- gtk_set_locale ();
- gtk_init (&argc, &argv);
+	if (strcmp(argv[1], "configure") != 0 && 
+		strcmp(argv[1], "about") != 0) {
+		printf ("Usage: cfgDFXVideo {about | configure}\n");
+		return 0;
+	}
 
+	gtk_init (&argc, &argv);
 
- if (strcmp(argv[1], "ABOUT") == 0) {
+	if (strcmp(argv[1], "about") == 0) {
 		const char *authors[]= {"Pete Bernert and the P.E.Op.S. team", "Ryan Schultz", "Andrew Burton", NULL};
 		widget = gtk_about_dialog_new ();
-		gtk_about_dialog_set_name (GTK_ABOUT_DIALOG (widget), "P.E.Op.S PCSX Video Plugin");
+		gtk_about_dialog_set_program_name (GTK_ABOUT_DIALOG (widget), "P.E.Op.S PCSXR Video Plugin");
 		gtk_about_dialog_set_version (GTK_ABOUT_DIALOG (widget), "1.17");
 		gtk_about_dialog_set_authors (GTK_ABOUT_DIALOG (widget), authors);
 		gtk_about_dialog_set_website (GTK_ABOUT_DIALOG (widget), "http://pcsx-df.sourceforge.net/");
 
-	g_signal_connect_data(GTK_OBJECT(widget), "response",
-			GTK_SIGNAL_FUNC(on_about_clicked), NULL, NULL, G_CONNECT_AFTER);
+		g_signal_connect_data(G_OBJECT(widget), "response",
+			G_CALLBACK(on_about_clicked), NULL, NULL, G_CONNECT_AFTER);
 
 		gtk_widget_show (widget);
 		gtk_main();
 
 		return 0;
 }
+	else {
+		builder = gtk_builder_new();
+		
+		if (!gtk_builder_add_from_file(builder, DATADIR "dfxvideo.ui", NULL)) {
+			g_warning("We could not load the interface!");
+			return -1;
+		}
+
+		/*ADB wndMain = gtk_builder_get_object(builder, "CfgWnd");*/
+
+		strcpy(cfg, CONFIG_FILENAME);
+
+		in = fopen(cfg,READBINARY);
+		/* ADB TODO This is bad - asking for problems; need to read in line by line */
+		if(in)
+		{
+			pB=(char *)malloc(32767);
+			memset(pB,0,32767);
+			len = fread(pB, 1, 32767, in);
+			fclose(in);
+		}
+		else{ pB=0;printf("Couldn't find config file %s\n", cfg);}
+		/* ADB TODO Parse this like we parse the config file in PCSXR - use common functions! */
+		val=1;
+		if(pB)
+		{
+			strcpy(t,"\nResX");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+			val = set_limit (p, len, 0, 1600);
+		}
+
+		if (val == 1600) val = VIDMODE_1600x1200;
+		else if (val == 1280) val = VIDMODE_1280x1024;
+		else if (val == 1152) val = VIDMODE_1152x864;
+		else if (val == 1024) val = VIDMODE_1024x768;
+		else if (val == 800) val = VIDMODE_800x600;
+		else if (val == 640) val = VIDMODE_640x480;
+		else if (val == 320) val = VIDMODE_320x200;
+
+		gtk_combo_box_set_active(GTK_COMBO_BOX (gtk_builder_get_object(builder, "resCombo2")), val);
+
+		val=0;
+		if(pB)
+		{
+			strcpy(t,"\nNoStretch");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+
+			val = set_limit (p, len, 0, 9);
+		}
+
+		gtk_combo_box_set_active(GTK_COMBO_BOX (gtk_builder_get_object(builder, "stretchCombo2")), val);
+
+		val=0;
+		if(pB)
+		{
+			strcpy(t,"\nDithering");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+
+				val = set_limit (p, len, 0, 2);
+		}
+
+		gtk_combo_box_set_active(GTK_COMBO_BOX (gtk_builder_get_object(builder, "ditherCombo2")), val);
+
+		val=0;
+		if(pB)
+		{
+			strcpy(t,"\nMaintain43");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+
+			val = set_limit (p, len, 0, 1);
+		}
+
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "maintain43")), val);
+		
+		val=0; //ADB Leave - these are default values
+		if(pB)
+		{
+			strcpy(t,"\nFullScreen");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+
+				val = set_limit (p, len, 0, 1);
+		}
+
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "checkFullscreen")), val);
+
+		val=0;
+		if(pB)
+		{
+			strcpy(t,"\nShowFPS");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+
+				val = set_limit (p, len, 0, 1);
+		}
+
+			gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "checkShowFPS")), val);
+
+		val=1;
+		if(pB)
+		{
+			strcpy(t,"\nUseFrameLimit");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+
+				val = set_limit (p, len, 0, 1);
+		}
+			gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "checkSetFPS")), val);
+
+		val=0;
+		if(pB)
+		{
+			strcpy(t,"\nFPSDetection");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+
+				val = set_limit (p, len, 1, 2);
+		}
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "checkAutoFPSLimit")), (val-1));
+
+		val=0;
+		if(pB)
+		{
+			strcpy(t,"\nUseFrameSkip");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+				val = set_limit (p, len, 0, 1);
+		}
+
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "checkFrameSkip")), val);
+
+		valf=200;
+		if(pB)
+		{
+			strcpy(t,"\nFrameRate");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+			if(p) valf=(float)atoi(p+len) / 10;
+			if(valf<1) valf=1;
+			if(valf>500) valf=500;
+		}
+		sprintf(tempstr,"%.1f",valf);
+		gtk_entry_set_text(gtk_builder_get_object(builder, "entryFPS"),tempstr);
+
+		val=0;
+		if(pB)
+		{
+			strcpy(t,"\nUseFixes");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+
+				val = set_limit (p, len, 0, 1);
+		}
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "checkUseFixes")), val);
 
- xml = glade_xml_new(DATADIR "dfxvideo.glade2", "CfgWnd", NULL);
- if (!xml) {
-		g_warning("We could not load the interface!");
-		return -1;
- }
-
- /*ADB wndMain = glade_xml_get_widget(xml, "CfgWnd");*/
-
- strcpy(cfg, CONFIG_FILENAME);
+		
+			if(pB)
+			{
+				strcpy(t,"\nCfgFixes");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+				if (p)
+					val = atoi(p + len);
+			}
 
- in = fopen(cfg,READBINARY);
- /* ADB TODO This is bad - asking for problems; need to read in line by line */
- if(in)
- {
- pB=(char *)malloc(32767);
- memset(pB,0,32767);
- len = fread(pB, 1, 32767, in);
- fclose(in);
- }
- else{ pB=0;printf("Couldn't find config file %s\n", cfg);}
-/* ADB TODO Parse this like we parse the config file in PCSX - use common functions! */
- val=1;
- if(pB)
- {
- strcpy(t,"\nResX");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- val = set_limit (p, len, 0, 1600);
- }
-
- if (val == 1600) val = VIDMODE_1600x1200;
- else if (val == 1280) val = VIDMODE_1280x1024;
- else if (val == 1152) val = VIDMODE_1152x864;
- else if (val == 1024) val = VIDMODE_1024x768;
- else if (val == 800) val = VIDMODE_800x600;
- else if (val == 640) val = VIDMODE_640x480;
- else if (val == 320) val = VIDMODE_320x200;
-
- gtk_combo_box_set_active(GTK_COMBO_BOX (glade_xml_get_widget(xml, "resCombo2")), val);
-
- val=0;
- if(pB)
- {
- strcpy(t,"\nNoStretch");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
-
- val = set_limit (p, len, 0, 9);
- }
-
- gtk_combo_box_set_active(GTK_COMBO_BOX (glade_xml_get_widget(xml, "stretchCombo2")), val);
-
- val=0;
- if(pB)
- {
- strcpy(t,"\nDithering");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
-
- val = set_limit (p, len, 0, 2);
- }
-
- gtk_combo_box_set_active(GTK_COMBO_BOX (glade_xml_get_widget(xml, "ditherCombo2")), val);
-
- val=0;
- if(pB)
- {
- strcpy(t,"\nMaintain43");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
-
- val = set_limit (p, len, 0, 1);
- }
-
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "maintain43")), val);
- 
- val=0; //ADB Leave - these are default values
- if(pB)
- {
- strcpy(t,"\nFullScreen");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
-
- val = set_limit (p, len, 0, 1);
- }
-
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "checkFullscreen")), val);
-
- val=0;
- if(pB)
- {
- strcpy(t,"\nShowFPS");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
-
- val = set_limit (p, len, 0, 1);
- }
-
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "checkShowFPS")), val);
-
- val=1;
- if(pB)
- {
- strcpy(t,"\nUseFrameLimit");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
-
- val = set_limit (p, len, 0, 1);
- }
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "checkSetFPS")), val);
-
- val=0;
- if(pB)
- {
- strcpy(t,"\nFPSDetection");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
-
- val = set_limit (p, len, 1, 2);
- }
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "checkAutoFPSLimit")), (val-1));
-
- val=0;
- if(pB)
- {
- strcpy(t,"\nUseFrameSkip");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- val = set_limit (p, len, 0, 1);
- }
-
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "checkFrameSkip")), val);
-
- valf=200;
- if(pB)
- {
- strcpy(t,"\nFrameRate");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) valf=(float)atoi(p+len) / 10;
- if(valf<1) valf=1;
- if(valf>500) valf=500;
- }
- sprintf(tempstr,"%.1f",valf);
- gtk_entry_set_text(glade_xml_get_widget(xml, "entryFPS"),tempstr);
-
- val=0;
- if(pB)
- {
- strcpy(t,"\nUseFixes");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
-
- val = set_limit (p, len, 0, 1);
- }
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "checkUseFixes")), val);
-
- 
-	if(pB)
-	{
-		strcpy(t,"\nCfgFixes");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
-		if (p)
-			val = atoi(p + len);
-	}
-
-	for (i=0; i<11; i++)
-	{
-		sprintf(tempstr, "checkFix%d", i+1);
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (glade_xml_get_widget (xml, tempstr)), (val>>i)&1 );
+			for (i=0; i<11; i++)
+			{
+				sprintf(tempstr, "checkFix%d", i+1);
+				gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder,tempstr)), (val>>i)&1 );
+			}
+
+
+		if(pB) free(pB);
+
+			widget = gtk_builder_get_object(builder, "CfgWnd");
+			g_signal_connect_data(G_OBJECT(widget), "destroy",
+					G_CALLBACK(SaveConfig), NULL, NULL, 0);
+
+			widget = gtk_builder_get_object(builder, "btn_close");
+			g_signal_connect_data(G_OBJECT(widget), "clicked",
+					G_CALLBACK(OnConfigClose), NULL, NULL, G_CONNECT_AFTER);
+
+			widget = gtk_builder_get_object(builder, "checkFullscreen");
+			g_signal_connect_data(G_OBJECT(widget), "clicked",
+					G_CALLBACK(on_fullscreen_toggled), NULL, NULL, G_CONNECT_AFTER);
+
+			widget = gtk_builder_get_object(builder, "checkUseFixes");
+			g_signal_connect_data(G_OBJECT(widget), "clicked",
+					G_CALLBACK(on_use_fixes_toggled), NULL, NULL, G_CONNECT_AFTER);
+
+			widget = gtk_builder_get_object(builder, "checkSetFPS");
+			g_signal_connect_data(G_OBJECT(widget), "clicked",
+					G_CALLBACK(on_fps_toggled), NULL, NULL, G_CONNECT_AFTER);
+
+			widget = gtk_builder_get_object(builder, "checkAutoFPSLimit");
+			g_signal_connect_data(G_OBJECT(widget), "clicked",
+					G_CALLBACK(on_fps_toggled), NULL, NULL, G_CONNECT_AFTER);
+
+			on_fullscreen_toggled(widget, NULL);
+			on_fps_toggled(widget, NULL);
+			on_use_fixes_toggled(widget, NULL);
+
+		gtk_main ();
 	}
-
-
- if(pB) free(pB);
-
-	widget = glade_xml_get_widget(xml, "CfgWnd");
-	g_signal_connect_data(GTK_OBJECT(widget), "destroy",
-			GTK_SIGNAL_FUNC(SaveConfig), xml, NULL, 0);
-
-	widget = glade_xml_get_widget(xml, "btn_close");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnConfigClose), xml, NULL, G_CONNECT_AFTER);
-
-	widget = glade_xml_get_widget(xml, "checkFullscreen");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(on_fullscreen_toggled), xml, NULL, G_CONNECT_AFTER);
-
-	widget = glade_xml_get_widget(xml, "checkUseFixes");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(on_use_fixes_toggled), xml, NULL, G_CONNECT_AFTER);
-
-	widget = glade_xml_get_widget(xml, "checkSetFPS");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(on_fps_toggled), xml, NULL, G_CONNECT_AFTER);
-
-	widget = glade_xml_get_widget(xml, "checkAutoFPSLimit");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(on_fps_toggled), xml, NULL, G_CONNECT_AFTER);
-
-	on_fullscreen_toggled(widget, (gpointer) xml);
-	on_fps_toggled(widget, (gpointer) xml);
-	on_use_fixes_toggled(widget, (gpointer) xml);
-
- gtk_main ();
+	
 return 0;
 }
 
@@ -377,7 +369,6 @@
 void SaveConfig(GtkWidget *widget, gpointer user_data)
 {
 FILE *in;int len,val;char * pB;
-	GladeXML *xml;
 char cfg[255];
 char tempstr[50];
 int i;
@@ -395,9 +386,8 @@
 len = fread(pB, 1, 32767, in);
 fclose(in);
 }
- xml = (GladeXML*) user_data;
 
- val = gtk_combo_box_get_active (GTK_COMBO_BOX (glade_xml_get_widget (xml, "resCombo2")));
+ val = gtk_combo_box_get_active (GTK_COMBO_BOX (gtk_builder_get_object(builder,"resCombo2")));
 
 if (val == VIDMODE_320x200) { SetCfgVal(pB,"\nResX",320); SetCfgVal(pB,"\nResY",240); }
 else if (val == VIDMODE_640x480) { SetCfgVal(pB,"\nResX",640); SetCfgVal(pB,"\nResY",480); }
@@ -407,35 +397,35 @@
 else if (val == VIDMODE_1280x1024) { SetCfgVal(pB,"\nResX",1280); SetCfgVal(pB,"\nResY",1024); }
 else if (val == VIDMODE_1600x1200) { SetCfgVal(pB,"\nResX",1600); SetCfgVal(pB,"\nResY",1200); }
 
- val = gtk_combo_box_get_active (GTK_COMBO_BOX (glade_xml_get_widget (xml, "stretchCombo2")));
+ val = gtk_combo_box_get_active (GTK_COMBO_BOX (gtk_builder_get_object(builder,"stretchCombo2")));
 SetCfgVal(pB,"\nNoStretch",val);
 
- val = gtk_combo_box_get_active (GTK_COMBO_BOX (glade_xml_get_widget (xml, "ditherCombo2")));
+ val = gtk_combo_box_get_active (GTK_COMBO_BOX (gtk_builder_get_object(builder,"ditherCombo2")));
 SetCfgVal(pB,"\nDithering",val);
 
- val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (glade_xml_get_widget (xml, "maintain43")));
+ val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder,"maintain43")));
 SetCfgVal(pB,"\nMaintain43",val);
 
- val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (glade_xml_get_widget (xml, "checkFullscreen")));
+ val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder,"checkFullscreen")));
 SetCfgVal(pB,"\nFullScreen",val);
 
- val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (glade_xml_get_widget (xml, "checkShowFPS")));
+ val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder,"checkShowFPS")));
 SetCfgVal(pB,"\nShowFPS",val);
 
- val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (glade_xml_get_widget (xml, "checkSetFPS")));
+ val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder,"checkSetFPS")));
 SetCfgVal(pB,"\nUseFrameLimit",val);
 
- val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (glade_xml_get_widget (xml, "checkAutoFPSLimit")));
+ val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder,"checkAutoFPSLimit")));
 SetCfgVal(pB,"\nFPSDetection",val+1);
 
- val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (glade_xml_get_widget (xml, "checkFrameSkip")));
+ val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder,"checkFrameSkip")));
 SetCfgVal(pB,"\nUseFrameSkip",val);
 
 //Framerate stored *10
- val = atof(gtk_entry_get_text(glade_xml_get_widget(xml, "entryFPS"))) * 10;
+ val = atof(gtk_entry_get_text(gtk_builder_get_object(builder, "entryFPS"))) * 10;
 SetCfgVal(pB,"\nFrameRate",val);
 
- val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (glade_xml_get_widget (xml, "checkUseFixes")));
+ val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder,"checkUseFixes")));
 SetCfgVal(pB,"\nUseFixes",val);
 
 
@@ -443,7 +433,7 @@
 	for (i=0; i<11; i++)
 	{
 		sprintf(tempstr, "checkFix%d", i+1);
-		if( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (glade_xml_get_widget (xml, tempstr))) )
+		if( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder,tempstr))) )
 			val |= 1 << i;
 	}
 
@@ -460,5 +450,5 @@
 free(pB);
 
 	// Close the window and exit control from the plugin
-	gtk_exit (0); 
+	exit (0); 
 }

pcsxr-1.9.92.tar.bz2/plugins/dfxvideo/hq2x.h -> pcsxr-1.9.93.tar.bz2/plugins/dfxvideo/hq2x.h Changed

@@ -1,26 +1,3 @@
-#define P0 dst0[0]
-#define P1 dst0[1]
-#define P2 dst1[0]
-#define P3 dst1[1]
-#define MUR interp_32_diff(c[1], c[5])
-#define MDR interp_32_diff(c[5], c[7])
-#define MDL interp_32_diff(c[7], c[3])
-#define MUL interp_32_diff(c[3], c[1])
-#define IC(p0) c[p0]
-#define I11(p0,p1) interp_32_11(c[p0], c[p1])
-#define I211(p0,p1,p2) interp_32_211(c[p0], c[p1], c[p2])
-#define I31(p0,p1) interp_32_31(c[p0], c[p1])
-#define I332(p0,p1,p2) interp_32_332(c[p0], c[p1], c[p2])
-#define I431(p0,p1,p2) interp_32_431(c[p0], c[p1], c[p2])
-#define I521(p0,p1,p2) interp_32_521(c[p0], c[p1], c[p2])
-#define I53(p0,p1) interp_32_53(c[p0], c[p1])
-#define I611(p0,p1,p2) interp_32_611(c[p0], c[p1], c[p2])
-#define I71(p0,p1) interp_32_71(c[p0], c[p1])
-#define I772(p0,p1,p2) interp_32_772(c[p0], c[p1], c[p2])
-#define I97(p0,p1) interp_32_97(c[p0], c[p1])
-#define I1411(p0,p1,p2) interp_32_1411(c[p0], c[p1], c[p2])
-#define I151(p0,p1) interp_32_151(c[p0], c[p1])
-
 case 0 : 
 case 1 : 
 case 4 : 
@@ -1845,26 +1822,3 @@
     P1 = I1411(4, 1, 5);
   }
 } break;
-
-#undef P0
-#undef P1
-#undef P2
-#undef P3
-#undef MUR
-#undef MDR
-#undef MDL
-#undef MUL
-#undef IC
-#undef I11
-#undef I211
-#undef I31
-#undef I332
-#undef I431
-#undef I521
-#undef I53
-#undef I611
-#undef I71
-#undef I772
-#undef I97
-#undef I1411
-#undef I151

pcsxr-1.9.92.tar.bz2/plugins/dfxvideo/hq3x.h -> pcsxr-1.9.93.tar.bz2/plugins/dfxvideo/hq3x.h Changed

@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
  *
  * In addition, as a special exception, Andrea Mazzoleni
  * gives permission to link the code of this program with
@@ -32,34 +33,6 @@
  * This effect is a rewritten implementation of the hq effect made by Maxim Stepin
  */
 
-#define P0 dst0[0]
-#define P1 dst0[1]
-#define P2 dst0[2]
-#define P3 dst1[0]
-#define P4 dst1[1]
-#define P5 dst1[2]
-#define P6 dst2[0]
-#define P7 dst2[1]
-#define P8 dst2[2]
-#define MUR interp_32_diff(c[1], c[5])
-#define MDR interp_32_diff(c[5], c[7])
-#define MDL interp_32_diff(c[7], c[3])
-#define MUL interp_32_diff(c[3], c[1])
-#define IC(p0) c[p0]
-#define I11(p0,p1) interp_32_11(c[p0], c[p1])
-#define I211(p0,p1,p2) interp_32_211(c[p0], c[p1], c[p2])
-#define I31(p0,p1) interp_32_31(c[p0], c[p1])
-#define I332(p0,p1,p2) interp_32_332(c[p0], c[p1], c[p2])
-#define I431(p0,p1,p2) interp_32_431(c[p0], c[p1], c[p2])
-#define I521(p0,p1,p2) interp_32_521(c[p0], c[p1], c[p2])
-#define I53(p0,p1) interp_32_53(c[p0], c[p1])
-#define I611(p0,p1,p2) interp_32_611(c[p0], c[p1], c[p2])
-#define I71(p0,p1) interp_32_71(c[p0], c[p1])
-#define I772(p0,p1,p2) interp_32_772(c[p0], c[p1], c[p2])
-#define I97(p0,p1) interp_32_97(c[p0], c[p1])
-#define I1411(p0,p1,p2) interp_32_1411(c[p0], c[p1], c[p2])
-#define I151(p0,p1) interp_32_151(c[p0], c[p1])
-
 case 0 :
 case 1 :
 case 4 :
@@ -2941,30 +2914,3 @@
 }
 } break;
 
-#undef P0
-#undef P1
-#undef P2
-#undef P3
-#undef P4
-#undef P5
-#undef P6
-#undef P7
-#undef P8
-#undef MUR
-#undef MDR
-#undef MDL
-#undef MUL
-#undef IC
-#undef I11
-#undef I211
-#undef I31
-#undef I332
-#undef I431
-#undef I521
-#undef I53
-#undef I611
-#undef I71
-#undef I772
-#undef I97
-#undef I1411
-#undef I151

pcsxr-1.9.92.tar.bz2/plugins/dfxvideo/interp.h -> pcsxr-1.9.93.tar.bz2/plugins/dfxvideo/interp.h Changed

pcsxr-1.9.92.tar.bz2/plugins/dfxvideo/key.c -> pcsxr-1.9.93.tar.bz2/plugins/dfxvideo/key.c Changed

@@ -23,6 +23,18 @@
 #include "draw.h"
 #include "key.h"
 
+////////////////////////////////////////////////////////////////////////
+// keyboard handler (UNIX)
+////////////////////////////////////////////////////////////////////////
+#ifdef _MACGL
+#define VK_INSERT 114
+#define VK_HOME 115
+#define VK_PRIOR 116
+#define VK_NEXT 121
+#define VK_END 119
+#define VK_DEL 117
+#define VK_F5 96
+#else
 #define VK_INSERT 65379
 #define VK_HOME 65360
 #define VK_PRIOR 65365
@@ -30,6 +42,7 @@
 #define VK_END 65367
 #define VK_DEL 65535
 #define VK_F5 65474
+#endif
 
 void GPUmakeSnapshot(void);
 
@@ -41,11 +54,17 @@
 {
 case 0xFFC9:			//X11 key: F12
 case ((1<<29) | 0xFF0D):	//special keycode from pcsx-df: alt-enter
-	bChangeWinMode=TRUE;
-	break;
+ bChangeWinMode=TRUE;
+ break;
+#ifndef _MACGL
+ case XK_section:	//special - accelerate
+ iFastFwd = ( iFastFwd != 0 ? 0 : 1 );
+ UseFrameLimit = ( UseFrameLimit != 0 ? 0 : 1 );
+ break;
+#endif
 case VK_F5:
 GPUmakeSnapshot();
- break;
+ break;
 
 case VK_INSERT:
 if(iUseFixes) {iUseFixes=0;dwActFixes=0;}
@@ -56,11 +75,8 @@
 
 case VK_DEL:
 if(ulKeybits&KEY_SHOWFPS)
- {
 ulKeybits&=~KEY_SHOWFPS;
- DoClearScreenBuffer();
- }
- else 
+ else
 {
 ulKeybits|=KEY_SHOWFPS;
 szDispBuf[0]=0;
@@ -72,6 +88,7 @@
 case VK_NEXT: BuildDispMenu( 1); break;
 case VK_END: SwitchDispMenu(1); break;
 case VK_HOME: SwitchDispMenu(-1); break;
+#ifndef _MACGL // 0x60 is VK_F5 in OSX, so I put this here until I figure something better -npepinpe
 case 0x60:
 {
 iFastFwd = 1 - iFastFwd;
@@ -80,7 +97,7 @@
 BuildDispMenu(0);
 break;
 }
-#ifdef _MACGL
+#else
 default: { void HandleKey(int keycode); HandleKey(keycode); }
 #endif
 }

pcsxr-1.9.92.tar.bz2/plugins/dfxvideo/menu.c -> pcsxr-1.9.93.tar.bz2/plugins/dfxvideo/menu.c Changed

@@ -22,17 +22,41 @@
 #include "menu.h"
 #include "gpu.h"
 
+#ifdef _WINDOWS
+
+#include "record.h"
+
+HFONT hGFont=NULL;
+BOOL bTransparent=FALSE;
+
+#endif
+
 unsigned long dwCoreFlags = 0;
 
 // create lists/stuff for fonts (actually there are no more lists, but I am too lazy to change the func names ;)
 void InitMenu(void)
 {
+#ifdef _WINDOWS
+ hGFont=CreateFont(//-8,
+ 13,0,0,0,FW_NORMAL,FALSE,FALSE,FALSE,
+ ANSI_CHARSET,OUT_DEFAULT_PRECIS,
+ CLIP_DEFAULT_PRECIS,DEFAULT_QUALITY,
+ DEFAULT_PITCH,
+ //"Courier New");
+ //"MS Sans Serif");
+ "Arial");
+#endif
 }
 
 // kill existing lists/fonts
 void CloseMenu(void)
 {
+#ifdef _WINDOWS
+ if(hGFont) DeleteObject(hGFont);
+ hGFont=NULL;
+#else
 DestroyPic();
+#endif
 }
 
 // DISPLAY FPS/MENU TEXT
@@ -44,6 +68,32 @@
 
 void DisplayText(void) // DISPLAY TEXT
 {
+#ifdef _WINDOWS
+ HDC hdc;HFONT hFO;
+
+ IDirectDrawSurface_GetDC(DX.DDSRender,&hdc);
+ hFO=(HFONT)SelectObject(hdc,hGFont);
+
+ SetTextColor(hdc,RGB(0,255,0));
+ if(bTransparent) 
+ SetBkMode(hdc,TRANSPARENT);
+ else SetBkColor(hdc,RGB(0,0,0));
+
+ if(szDebugText[0] && ((time(NULL) - tStart) < 2)) // special debug text? show it
+ {
+ RECT r={0,0,1024,1024};
+ DrawText(hdc,szDebugText,lstrlen(szDebugText),&r,DT_LEFT|DT_NOCLIP);
+ }
+ else // else standard gpu menu
+ {
+ szDebugText[0]=0;
+ lstrcat(szDispBuf,szMenuBuf);
+ ExtTextOut(hdc,0,0,0,NULL,szDispBuf,lstrlen(szDispBuf),NULL);
+ }
+
+ SelectObject(hdc,hFO);
+ IDirectDrawSurface_ReleaseDC(DX.DDSRender,hdc);
+#endif
 }
 
 // Build Menu buffer (== Dispbuffer without FPS)...
@@ -94,11 +144,28 @@
 szMenuBuf[24]='0'+(char)((dwCoreFlags&0xf000)>>12); // number
 }
 
+#ifdef _WINDOWS
+ if(bVsync_Key) szMenuBuf[25] = 'V';
+#endif
 
 if(lSelectedSlot) szMenuBuf[26] = '0'+(char)lSelectedSlot; 
 
 szMenuBuf[(iMPos+1)*5]='<'; // set arrow
 
+#ifdef _WINDOWS
+ if(RECORD_RECORDING)
+ {
+ szMenuBuf[27] = ' ';
+ szMenuBuf[28] = ' ';
+ szMenuBuf[29] = ' ';
+ szMenuBuf[30] = 'R';
+ szMenuBuf[31] = 'e';
+ szMenuBuf[32] = 'c';
+ szMenuBuf[33] = 0;
+ }
+
+ if(DX.DDSScreenPic) ShowTextGpuPic();
+#endif
 }
 
 // Some menu action...
@@ -113,6 +180,17 @@
 int iType=0;
 bInitCap = TRUE;
 
+#ifdef _WINDOWS
+ if(iFrameLimit==1 && UseFrameLimit &&
+ GetAsyncKeyState(VK_SHIFT)&32768)
+ {
+ fFrameRate+=iStep;
+ if(fFrameRate<3.0f) fFrameRate=3.0f;
+ SetAutoFrameCap();
+ break;
+ }
+#endif
+
 if(UseFrameLimit) iType=iFrameLimit;
 iType+=iStep;
 if(iType<0) iType=2;

pcsxr-1.9.92.tar.bz2/plugins/dfxvideo/prim.c -> pcsxr-1.9.93.tar.bz2/plugins/dfxvideo/prim.c Changed

@@ -50,11 +50,11 @@
 #ifdef USE_NASM
 
 #define BGR24to16 i386_BGR24to16
-__inline unsigned short BGR24to16 (uint32_t BGR);
+extern __inline unsigned short BGR24to16 (uint32_t BGR);
 
 #else
 
-__inline unsigned short BGR24to16 (uint32_t BGR)
+static __inline unsigned short BGR24to16 (uint32_t BGR)
 {
 return (unsigned short)(((BGR>>3)&0x1f)|((BGR&0xf80000)>>9)|((BGR&0xf800)>>6));
 }
@@ -65,7 +65,7 @@
 // Update global TP infos
 ////////////////////////////////////////////////////////////////////////
 
-__inline void UpdateGlobalTP(unsigned short gdata)
+static __inline void UpdateGlobalTP(unsigned short gdata)
 {
 GlobalTextAddrX = (gdata << 6) & 0x3c0; // texture addr
 
@@ -119,7 +119,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline void SetRenderMode(uint32_t DrawAttributes)
+static __inline void SetRenderMode(uint32_t DrawAttributes)
 {
 DrawSemiTrans = (SEMITRANSBIT(DrawAttributes)) ? TRUE : FALSE;
 
@@ -155,7 +155,7 @@
 #define CHKMAX_X 1024
 #define CHKMAX_Y 512
 
-void AdjustCoord4()
+static void AdjustCoord4()
 {
 lx0=(short)(((int)lx0<<SIGNSHIFT)>>SIGNSHIFT);
 lx1=(short)(((int)lx1<<SIGNSHIFT)>>SIGNSHIFT);
@@ -167,7 +167,7 @@
 ly3=(short)(((int)ly3<<SIGNSHIFT)>>SIGNSHIFT);
 }
 
-void AdjustCoord3()
+static void AdjustCoord3()
 {
 lx0=(short)(((int)lx0<<SIGNSHIFT)>>SIGNSHIFT);
 lx1=(short)(((int)lx1<<SIGNSHIFT)>>SIGNSHIFT);
@@ -177,7 +177,7 @@
 ly2=(short)(((int)ly2<<SIGNSHIFT)>>SIGNSHIFT);
 }
 
-void AdjustCoord2()
+static void AdjustCoord2()
 {
 lx0=(short)(((int)lx0<<SIGNSHIFT)>>SIGNSHIFT);
 lx1=(short)(((int)lx1<<SIGNSHIFT)>>SIGNSHIFT);
@@ -185,7 +185,7 @@
 ly1=(short)(((int)ly1<<SIGNSHIFT)>>SIGNSHIFT);
 }
 
-void AdjustCoord1()
+static void AdjustCoord1()
 {
 lx0=(short)(((int)lx0<<SIGNSHIFT)>>SIGNSHIFT);
 ly0=(short)(((int)ly0<<SIGNSHIFT)>>SIGNSHIFT);
@@ -211,7 +211,7 @@
 // \ / \ 
 // 2___3
 
-__inline BOOL CheckCoord4()
+static __inline BOOL CheckCoord4()
 {
 if(lx0<0)
 {
@@ -277,7 +277,7 @@
 return FALSE;
 }
 
-__inline BOOL CheckCoord3()
+static __inline BOOL CheckCoord3()
 {
 if(lx0<0)
 {
@@ -314,7 +314,7 @@
 }
 
 
-__inline BOOL CheckCoord2()
+static __inline BOOL CheckCoord2()
 {
 if(lx0<0)
 {
@@ -336,7 +336,7 @@
 return FALSE;
 }
 
-__inline BOOL CheckCoordL(short slx0,short sly0,short slx1,short sly1)
+static __inline BOOL CheckCoordL(short slx0,short sly0,short slx1,short sly1)
 {
 if(slx0<0)
 {
@@ -387,9 +387,9 @@
 
 lGPUstatusRet&=~0x000007ff;
 lGPUstatusRet|=(gdata & 0x07ff);
- 
- usMirror=gdata&0x3000;
- 
+
+ usMirror=(unsigned short)(gdata&0x3000);
+
 UpdateGlobalTP((unsigned short)gdata);
 GlobalTextREST = (gdata&0x00ffffff)>>9;
 }
@@ -589,7 +589,7 @@
 short sX = GETLEs16(&sgpuData[2]);
 short sY = GETLEs16(&sgpuData[3]);
 short sW = GETLEs16(&sgpuData[4]) & 0x3ff;
- short sH = GETLEs16(&sgpuData[5]) & 0x3ff;
+ short sH = GETLEs16(&sgpuData[5]) & iGPUHeightMask;
 
 sW = (sW+15) & ~15;

pcsxr-1.9.92.tar.bz2/plugins/dfxvideo/soft.c -> pcsxr-1.9.93.tar.bz2/plugins/dfxvideo/soft.c Changed

@@ -26,6 +26,11 @@
 #include "menu.h"
 #include "swap.h"
 
+#ifdef _WINDOWS
+#pragma warning (disable:4244)
+#pragma warning (disable:4761)
+#endif
+
 ////////////////////////////////////////////////////////////////////////////////////
 // "NO EDGE BUFFER" POLY VERSION... FUNCS BASED ON FATMAP.TXT FROM MRI / Doomsday
 ////////////////////////////////////////////////////////////////////////////////////
@@ -206,7 +211,7 @@
 4, 3, 5, 2
 };
 
-void Dither16(unsigned short * pdest,uint32_t r,uint32_t g,uint32_t b,unsigned short sM)
+static void Dither16(unsigned short * pdest,uint32_t r,uint32_t g,uint32_t b,unsigned short sM)
 {
 unsigned char coeff;
 unsigned char rlow, glow, blow;
@@ -235,7 +240,7 @@
 /////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////
 
-__inline void GetShadeTransCol_Dither(unsigned short * pdest, int32_t m1, int32_t m2, int32_t m3)
+static __inline void GetShadeTransCol_Dither(unsigned short * pdest, int32_t m1, int32_t m2, int32_t m3)
 {
 int32_t r,g,b;
 
@@ -299,7 +304,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline void GetShadeTransCol(unsigned short * pdest,unsigned short color)
+static __inline void GetShadeTransCol(unsigned short * pdest,unsigned short color)
 {
 if(bCheckMask && (*pdest & HOST2LE16(0x8000))) return;
 
@@ -358,7 +363,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline void GetShadeTransCol32(uint32_t * pdest,uint32_t color)
+static __inline void GetShadeTransCol32(uint32_t * pdest,uint32_t color)
 {
 if(DrawSemiTrans)
 {
@@ -445,7 +450,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline void GetTextureTransColG(unsigned short * pdest,unsigned short color)
+static __inline void GetTextureTransColG(unsigned short * pdest,unsigned short color)
 {
 int32_t r,g,b;unsigned short l;
 
@@ -518,7 +523,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline void GetTextureTransColG_S(unsigned short * pdest,unsigned short color)
+static __inline void GetTextureTransColG_S(unsigned short * pdest,unsigned short color)
 {
 int32_t r,g,b;unsigned short l;
 
@@ -539,7 +544,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline void GetTextureTransColG_SPR(unsigned short * pdest,unsigned short color)
+static __inline void GetTextureTransColG_SPR(unsigned short * pdest,unsigned short color)
 {
 int32_t r,g,b;unsigned short l;
 
@@ -612,7 +617,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline void GetTextureTransColG32(uint32_t * pdest,uint32_t color)
+static __inline void GetTextureTransColG32(uint32_t * pdest,uint32_t color)
 {
 int32_t r,g,b,l;
 
@@ -716,7 +721,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline void GetTextureTransColG32_S(uint32_t * pdest,uint32_t color)
+static __inline void GetTextureTransColG32_S(uint32_t * pdest,uint32_t color)
 {
 int32_t r,g,b;
 
@@ -741,7 +746,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline void GetTextureTransColG32_SPR(uint32_t * pdest,uint32_t color)
+static __inline void GetTextureTransColG32_SPR(uint32_t * pdest,uint32_t color)
 {
 int32_t r,g,b;
 
@@ -843,7 +848,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline void GetTextureTransColGX_Dither(unsigned short * pdest,unsigned short color,int32_t m1,int32_t m2,int32_t m3)
+static __inline void GetTextureTransColGX_Dither(unsigned short * pdest,unsigned short color,int32_t m1,int32_t m2,int32_t m3)
 {
 int32_t r,g,b;
 
@@ -914,7 +919,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline void GetTextureTransColGX(unsigned short * pdest,unsigned short color,short m1,short m2,short m3)
+static __inline void GetTextureTransColGX(unsigned short * pdest,unsigned short color,short m1,short m2,short m3)
 {
 int32_t r,g,b;unsigned short l;
 
@@ -986,7 +991,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline void GetTextureTransColGX_S(unsigned short * pdest,unsigned short color,short m1,short m2,short m3)
+static __inline void GetTextureTransColGX_S(unsigned short * pdest,unsigned short color,short m1,short m2,short m3)
 {
 int32_t r,g,b;
 
@@ -1005,7 +1010,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline void GetTextureTransColGX32_S(uint32_t * pdest,uint32_t color,short m1,short m2,short m3)
+static __inline void GetTextureTransColGX32_S(uint32_t * pdest,uint32_t color,short m1,short m2,short m3)
 {
 int32_t r,g,b;
 
@@ -1200,15 +1205,15 @@
 // NASM version (external):
 #define shl10idiv i386_shl10idiv
 
-__inline int shl10idiv(int x, int y);
+extern __inline int shl10idiv(int x, int y);
 
 #else
 
-__inline int shl10idiv(int x, int y)
+static __inline int shl10idiv(int x, int y)
 {
 __int64 bi=x;
 bi<<=10;
- return bi/y;
+ return (int)(bi/y);
 }
 
 #endif
@@ -1217,7 +1222,7 @@
 
 // GNUC long long int version:
 
-__inline int shl10idiv(int x, int y) 
+static __inline int shl10idiv(int x, int y) 
 { 
 long long int bi=x; 
 bi<<=10; 
@@ -1230,7 +1235,7 @@
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
 
-__inline int RightSection_F(void)
+static __inline int RightSection_F(void)
 {
 soft_vertex * v1 = right_array[ right_section ];
 soft_vertex * v2 = right_array[ right_section-1 ];
@@ -1246,7 +1251,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline int LeftSection_F(void)
+static __inline int LeftSection_F(void)
 {
 soft_vertex * v1 = left_array[ left_section ];
 soft_vertex * v2 = left_array[ left_section-1 ];
@@ -1262,7 +1267,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline BOOL NextRow_F(void)
+static __inline BOOL NextRow_F(void)
 {
 if(--left_section_height<=0) 
 {
@@ -1288,7 +1293,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline BOOL SetupSections_F(short x1, short y1, short x2, short y2, short x3, short y3)
+static __inline BOOL SetupSections_F(short x1, short y1, short x2, short y2, short x3, short y3)
 {
 soft_vertex * v1, * v2, * v3;
 int height,longest;
@@ -1350,7 +1355,7 @@
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
 
-__inline int RightSection_G(void)
+static __inline int RightSection_G(void)
 {
 soft_vertex * v1 = right_array[ right_section ];
 soft_vertex * v2 = right_array[ right_section-1 ];
@@ -1366,7 +1371,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline int LeftSection_G(void)
+static __inline int LeftSection_G(void)
 {
 soft_vertex * v1 = left_array[ left_section ];
 soft_vertex * v2 = left_array[ left_section-1 ];
@@ -1389,7 +1394,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline BOOL NextRow_G(void)
+static __inline BOOL NextRow_G(void)
 {
 if(--left_section_height<=0) 
 {
@@ -1418,7 +1423,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline BOOL SetupSections_G(short x1,short y1,short x2,short y2,short x3,short y3,int32_t rgb1, int32_t rgb2, int32_t rgb3)
+static __inline BOOL SetupSections_G(short x1,short y1,short x2,short y2,short x3,short y3,int32_t rgb1, int32_t rgb2, int32_t rgb3)
 {
 soft_vertex * v1, * v2, * v3;
 int height,longest,temp;
@@ -1496,7 +1501,7 @@
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
 
-__inline int RightSection_FT(void)
+static __inline int RightSection_FT(void)
 {
 soft_vertex * v1 = right_array[ right_section ];
 soft_vertex * v2 = right_array[ right_section-1 ];
@@ -1512,7 +1517,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline int LeftSection_FT(void)
+static __inline int LeftSection_FT(void)
 {
 soft_vertex * v1 = left_array[ left_section ];
 soft_vertex * v2 = left_array[ left_section-1 ];
@@ -1533,7 +1538,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline BOOL NextRow_FT(void)
+static __inline BOOL NextRow_FT(void)
 {
 if(--left_section_height<=0) 
 {
@@ -1561,7 +1566,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline BOOL SetupSections_FT(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3)
+static __inline BOOL SetupSections_FT(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3)
 {
 soft_vertex * v1, * v2, * v3;
 int height,longest,temp;
@@ -1649,7 +1654,7 @@
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
 
-__inline int RightSection_GT(void)
+static __inline int RightSection_GT(void)
 {
 soft_vertex * v1 = right_array[ right_section ];
 soft_vertex * v2 = right_array[ right_section-1 ];
@@ -1665,7 +1670,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline int LeftSection_GT(void)
+static __inline int LeftSection_GT(void)
 {
 soft_vertex * v1 = left_array[ left_section ];
 soft_vertex * v2 = left_array[ left_section-1 ];
@@ -1693,7 +1698,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline BOOL NextRow_GT(void)
+static __inline BOOL NextRow_GT(void)
 {
 if(--left_section_height<=0) 
 {
@@ -1724,7 +1729,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline BOOL SetupSections_GT(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, int32_t rgb1, int32_t rgb2, int32_t rgb3)
+static __inline BOOL SetupSections_GT(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, int32_t rgb1, int32_t rgb2, int32_t rgb3)
 {
 soft_vertex * v1, * v2, * v3;
 int height,longest,temp;
@@ -1829,7 +1834,7 @@
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
 
-__inline int RightSection_F4(void)
+static __inline int RightSection_F4(void)
 {
 soft_vertex * v1 = right_array[ right_section ];
 soft_vertex * v2 = right_array[ right_section-1 ];
@@ -1848,7 +1853,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline int LeftSection_F4(void)
+static __inline int LeftSection_F4(void)
 {
 soft_vertex * v1 = left_array[ left_section ];
 soft_vertex * v2 = left_array[ left_section-1 ];
@@ -1867,7 +1872,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline BOOL NextRow_F4(void)
+static __inline BOOL NextRow_F4(void)
 {
 if(--left_section_height<=0) 
 {
@@ -1899,7 +1904,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline BOOL SetupSections_F4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4)
+static __inline BOOL SetupSections_F4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4)
 {
 soft_vertex * v1, * v2, * v3, * v4;
 int height,width,longest1,longest2;
@@ -2041,7 +2046,7 @@
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
 
-__inline int RightSection_FT4(void)
+static __inline int RightSection_FT4(void)
 {
 soft_vertex * v1 = right_array[ right_section ];
 soft_vertex * v2 = right_array[ right_section-1 ];
@@ -2064,7 +2069,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline int LeftSection_FT4(void)
+static __inline int LeftSection_FT4(void)
 {
 soft_vertex * v1 = left_array[ left_section ];
 soft_vertex * v2 = left_array[ left_section-1 ];
@@ -2087,7 +2092,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline BOOL NextRow_FT4(void)
+static __inline BOOL NextRow_FT4(void)
 {
 if(--left_section_height<=0) 
 {
@@ -2123,7 +2128,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline BOOL SetupSections_FT4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4)
+static __inline BOOL SetupSections_FT4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4)
 {
 soft_vertex * v1, * v2, * v3, * v4;
 int height,width,longest1,longest2;
@@ -2272,7 +2277,7 @@
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
 
-__inline int RightSection_GT4(void)
+static __inline int RightSection_GT4(void)
 {
 soft_vertex * v1 = right_array[ right_section ];
 soft_vertex * v2 = right_array[ right_section-1 ];
@@ -2302,7 +2307,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline int LeftSection_GT4(void)
+static __inline int LeftSection_GT4(void)
 {
 soft_vertex * v1 = left_array[ left_section ];
 soft_vertex * v2 = left_array[ left_section-1 ];
@@ -2332,7 +2337,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline BOOL NextRow_GT4(void)
+static __inline BOOL NextRow_GT4(void)
 {
 if(--left_section_height<=0) 
 {
@@ -2374,7 +2379,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline BOOL SetupSections_GT4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,int32_t rgb1,int32_t rgb2,int32_t rgb3,int32_t rgb4)
+static __inline BOOL SetupSections_GT4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,int32_t rgb1,int32_t rgb2,int32_t rgb3,int32_t rgb4)
 {
 soft_vertex * v1, * v2, * v3, * v4;
 int height,width,longest1,longest2;
@@ -2544,7 +2549,7 @@
 // POLY 3/4 FLAT SHADED
 ////////////////////////////////////////////////////////////////////////
 
-__inline void drawPoly3Fi(short x1,short y1,short x2,short y2,short x3,short y3,int32_t rgb)
+static __inline void drawPoly3Fi(short x1,short y1,short x2,short y2,short x3,short y3,int32_t rgb)
 {
 int i,j,xmin,xmax,ymin,ymax;
 unsigned short color;uint32_t lcolor;
@@ -5182,7 +5187,7 @@
 // POLY 3/4 G-SHADED
 ////////////////////////////////////////////////////////////////////////
 
-__inline void drawPoly3Gi(short x1,short y1,short x2,short y2,short x3,short y3,int32_t rgb1, int32_t rgb2, int32_t rgb3)
+static __inline void drawPoly3Gi(short x1,short y1,short x2,short y2,short x3,short y3,int32_t rgb1, int32_t rgb2, int32_t rgb3)
 {
 int i,j,xmin,xmax,ymin,ymax;
 int32_t cR1,cG1,cB1;
@@ -7081,7 +7086,7 @@
 
 /*
 // no real rect test, but it does its job the way I need it
-__inline BOOL IsNoRect(void)
+static __inline BOOL IsNoRect(void)
 {
 if(lx0==lx1 && lx2==lx3) return FALSE;
 if(lx0==lx2 && lx1==lx3) return FALSE;
@@ -7091,7 +7096,7 @@
 */
 
 // real rect test
-__inline BOOL IsNoRect(void)
+static __inline BOOL IsNoRect(void)
 {
 if(!(dwActFixes&0x200)) return FALSE;

pcsxr-1.9.92.tar.bz2/plugins/dfxvideo/soft.h -> pcsxr-1.9.93.tar.bz2/plugins/dfxvideo/soft.h Changed

@@ -1,42 +1,42 @@
-/***************************************************************************
-                         soft.h  -  description
-                             -------------------
-    begin                : Sun Oct 28 2001
-    copyright            : (C) 2001 by Pete Bernert
-    email                : BlackDove@addcom.de
- ***************************************************************************/
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version. See also the license.txt file for *
- *   additional informations.                                              *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef _GPU_SOFT_H_
-#define _GPU_SOFT_H_
-
-void offsetPSXLine(void);
-void offsetPSX2(void);
-void offsetPSX3(void);
-void offsetPSX4(void);
-
-void FillSoftwareAreaTrans(short x0,short y0,short x1,short y1,unsigned short col);
-void FillSoftwareArea(short x0,short y0,short x1,short y1,unsigned short col);
-void drawPoly3G(int32_t rgb1, int32_t rgb2, int32_t rgb3);
-void drawPoly4G(int32_t rgb1, int32_t rgb2, int32_t rgb3, int32_t rgb4);
-void drawPoly3F(int32_t rgb);
-void drawPoly4F(int32_t rgb);
-void drawPoly4FT(unsigned char * baseAddr);
-void drawPoly4GT(unsigned char * baseAddr);
-void drawPoly3FT(unsigned char * baseAddr);
-void drawPoly3GT(unsigned char * baseAddr);
-void DrawSoftwareSprite(unsigned char * baseAddr,short w,short h,int32_t tx,int32_t ty);
-void DrawSoftwareSpriteTWin(unsigned char * baseAddr,int32_t w,int32_t h);
-void DrawSoftwareSpriteMirror(unsigned char * baseAddr,int32_t w,int32_t h);
-void DrawSoftwareLineShade(int32_t rgb0, int32_t rgb1);
-void DrawSoftwareLineFlat(int32_t rgb);
-
-#endif // _GPU_SOFT_H_
+/***************************************************************************
+                         soft.h  -  description
+                             -------------------
+    begin                : Sun Oct 28 2001
+    copyright            : (C) 2001 by Pete Bernert
+    email                : BlackDove@addcom.de
+ ***************************************************************************/
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef _GPU_SOFT_H_
+#define _GPU_SOFT_H_
+
+void offsetPSXLine(void);
+void offsetPSX2(void);
+void offsetPSX3(void);
+void offsetPSX4(void);
+
+void FillSoftwareAreaTrans(short x0,short y0,short x1,short y1,unsigned short col);
+void FillSoftwareArea(short x0,short y0,short x1,short y1,unsigned short col);
+void drawPoly3G(int32_t rgb1, int32_t rgb2, int32_t rgb3);
+void drawPoly4G(int32_t rgb1, int32_t rgb2, int32_t rgb3, int32_t rgb4);
+void drawPoly3F(int32_t rgb);
+void drawPoly4F(int32_t rgb);
+void drawPoly4FT(unsigned char * baseAddr);
+void drawPoly4GT(unsigned char * baseAddr);
+void drawPoly3FT(unsigned char * baseAddr);
+void drawPoly3GT(unsigned char * baseAddr);
+void DrawSoftwareSprite(unsigned char * baseAddr,short w,short h,int32_t tx,int32_t ty);
+void DrawSoftwareSpriteTWin(unsigned char * baseAddr,int32_t w,int32_t h);
+void DrawSoftwareSpriteMirror(unsigned char * baseAddr,int32_t w,int32_t h);
+void DrawSoftwareLineShade(int32_t rgb0, int32_t rgb1);
+void DrawSoftwareLineFlat(int32_t rgb);
+
+#endif // _GPU_SOFT_H_

pcsxr-1.9.92.tar.bz2/plugins/dfxvideo/zn.c -> pcsxr-1.9.93.tar.bz2/plugins/dfxvideo/zn.c Changed

@@ -23,8 +23,11 @@
 // - psx gpu plugin interface prototypes-------------- //
 // --------------------------------------------------- //
 
-long GPUopen(unsigned long *disp, const char *CapText, const char *CfgFile);
-
+#ifdef _WINDOWS
+long CALLBACK GPUopen(HWND hwndGPU);
+#else
+long GPUopen(unsigned long * disp,const char * CapText,const char * CfgFile);
+#endif
 void CALLBACK GPUdisplayText(char * pText);
 void CALLBACK GPUdisplayFlags(uint32_t dwFlags);
 void CALLBACK GPUmakeSnapshot(void);
@@ -48,9 +51,9 @@
 long CALLBACK GPUfreeze(uint32_t ulGetFreezeData,void * pF);
 void CALLBACK GPUgetScreenPic(unsigned char * pMem);
 void CALLBACK GPUshowScreenPic(unsigned char * pMem);
-
+#ifndef _WINDOWS
 void CALLBACK GPUkeypressed(int keycode);
-
+#endif
 
 // --------------------------------------------------- // 
 // - zn gpu interface -------------------------------- // 
@@ -69,7 +72,7 @@
 typedef struct GPUOTAG
  {
   uint32_t  Version;        // Version of structure - currently 1
-  long           hWnd;           // Window handle
+  unsigned long hWnd;           // Window handle
   uint32_t  ScreenRotation; // 0 = 0CW, 1 = 90CW, 2 = 180CW, 3 = 270CW = 90CCW
   uint32_t  GPUVersion;     // 0 = a, 1 = b, 2 = c
   const char*    GameName;       // NULL terminated string
@@ -112,8 +115,11 @@
  if(!cfg)            return -1;
  if(cfg->Version!=1) return -1;
 
+#ifdef _WINDOWS
+ lret=GPUopen((HWND)cfg->hWnd);
+#else
  lret = GPUopen(&cfg->hWnd, cfg->GameName, cfg->CfgFile);
-
+#endif
 
 /*
  if(!lstrcmp(cfg->GameName,"kikaioh")     ||
@@ -248,8 +254,11 @@
 
 // --------------------------------------------------- // 
 
+#ifndef _WINDOWS
+
 void CALLBACK ZN_GPUkeypressed(int keycode)
 {
  GPUkeypressed(keycode);
 }
 
+#endif

pcsxr-1.9.92.tar.bz2/plugins/peopsxgl/Makefile.am -> pcsxr-1.9.93.tar.bz2/plugins/peopsxgl/Makefile.am Changed

@@ -1,8 +1,8 @@
-INCLUDES = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \
+AM_CPPFLAGS = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \
 	-DLOCALE_DIR=\"${datadir}/locale/\" \
 	-DDATADIR=\"${datadir}/psemu/\" \
-	$(GTK2_CFLAGS) $(GLADE2_CFLAGS) -I/usr/X11R6/include \
-	-I../../libpcsxcore -I../../include -fPIC
+	$(GTK3_CFLAGS) \
+	-I../../libpcsxcore -I../../include
 
 bindir = @libdir@/games/psemu/
 libdir = @libdir@/games/psemu/
@@ -10,15 +10,14 @@
 lib_LTLIBRARIES = libpeopsxgl.la
 
 libpeopsxgl_la_SOURCES = cfg.c draw.c fps.c gpu.c key.c menu.c \
-	prim.c soft.c texture.c
-libpeopsxgl_la_LDFLAGS = -module -avoid-version \
-	-L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11 -lXxf86vm -lGL -lm
+	prim.c soft.c texture.c gte_accuracy.c
+libpeopsxgl_la_LDFLAGS = -module -avoid-version
+libpeopsxgl_la_LIBADD = -lX11 -lXxf86vm -lGL -lm
 
 bin_PROGRAMS = cfgpeopsxgl
-cfgpeopsxgl_SOURCES = gpucfg/main.c gpucfg/callbacks.c gpucfg/interface.c \
-	gpucfg/support.c
-cfgpeopsxgl_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS)
+cfgpeopsxgl_SOURCES = gpucfg/main.c
+cfgpeopsxgl_LDADD = $(GTK3_LIBS)
 
-#glade_DATA = gpucfg-0.1df/peopsxgl.glade2
-#gladedir = $(datadir)/psemu/
-#EXTRA_DIST = $(glade_DATA)
+glade_DATA = gpucfg/peopsxgl.ui
+gladedir = $(datadir)/psemu/
+EXTRA_DIST = $(glade_DATA)

pcsxr-1.9.92.tar.bz2/plugins/peopsxgl/cfg.c -> pcsxr-1.9.93.tar.bz2/plugins/peopsxgl/cfg.c Changed

@@ -1,249 +1,260 @@
-/***************************************************************************
- cfg.c - description
- -------------------
- begin : Sun Mar 08 2009
- copyright : (C) 1999-2009 by Pete Bernert
- web : www.pbernert.com 
- ***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. See also the license.txt file for *
- * additional informations. *
- * *
- ***************************************************************************/
-
-//*************************************************************************// 
-// History of changes:
-//
-// 2009/03/08 - Pete 
-// - generic cleanup for the Peops release
-//
-//*************************************************************************// 
-
-#define _IN_CFG
-
-#include "stdafx.h"
-#include "externals.h"
-#include "cfg.h"
-
-char *pConfigFile = NULL;
-
-void ReadConfigFile()
-{
- FILE *in = NULL;
- int len;
- char *pB, *p, t[256];
-
- if (pConfigFile != NULL)
- in = fopen(pConfigFile, "rb");
- else
- in = fopen("gpuPeopsMesaGL.cfg", "rb"); 
-
- if (in == NULL) return;
-
- pB=(char *)malloc(32767); // buffer for reading config (32k)
- memset(pB, 0, 32767);
-
- len = fread(pB, 1, 32767, in); // read config in buffer
- fclose(in); // close config file
-
- strcpy(t,"\nResX");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) iResX=atoi(p+len);
- if(iResX<10) iResX=10;
-
- strcpy(t,"\nResY");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) iResY=atoi(p+len);
- if(iResY<10) iResY=10;
-
- strcpy(t,"\nKeepRatio");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) bKeepRatio=atoi(p+len);
- if(bKeepRatio<0) bKeepRatio=0;
- if(bKeepRatio>1) bKeepRatio=1;
-
- strcpy(t,"\nScreenSmoothing");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) iBlurBuffer=atoi(p+len);
- if(iBlurBuffer<0) iBlurBuffer=0;
- if(iBlurBuffer>1) iBlurBuffer=1;
-
- strcpy(t,"\nHiResTextures");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) iHiResTextures=atoi(p+len);
- if(iHiResTextures<0) iHiResTextures=0;
- if(iHiResTextures>2) iHiResTextures=2;
-
- iSortTexCnt =0;
- strcpy(t,"\nVRamSize");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) iVRamSize=atoi(p+len);
- if(iVRamSize<0) iVRamSize=0;
- if(iVRamSize>1024) iVRamSize=1024;
-
- strcpy(t,"\nFullScreen");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) bFullScreen=atoi(p+len);
- if(bFullScreen>1) bFullScreen=1;
-
- strcpy(t,"\nScanLines");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) iUseScanLines=atoi(p+len);
- if(iUseScanLines<0) iUseScanLines=0;
- if(iUseScanLines>1) iUseScanLines=1;
-
- strcpy(t,"\nScanLinesBlend");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) iScanBlend=atoi(p+len);
- if(iScanBlend<-1) iScanBlend=-1;
- if(iScanBlend>255) iScanBlend=255;
-
- strcpy(t,"\nFrameTextures");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) iFrameTexType=atoi(p+len);
- if(iFrameTexType<0) iFrameTexType=0;
- if(iFrameTexType>3) iFrameTexType=3;
-
- strcpy(t,"\nFrameAccess");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) iFrameReadType=atoi(p+len);
- if(iFrameReadType<0) iFrameReadType=0;
- if(iFrameReadType>4) iFrameReadType=4;
- if(iFrameReadType==4) bFullVRam=TRUE;
- else bFullVRam=FALSE;
-
- strcpy(t,"\nTexFilter");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) iFilterType=atoi(p+len);
- if(iFilterType<0) iFilterType=0;
- if(iFilterType>6) iFilterType=6;
-
- strcpy(t,"\nAdvancedBlend");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) bAdvancedBlend=atoi(p+len);
- if(bAdvancedBlend<0) bAdvancedBlend=0;
- if(bAdvancedBlend>1) bAdvancedBlend=1;
-
- strcpy(t,"\nDithering");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) bDrawDither=atoi(p+len);
- if(bDrawDither<0) bDrawDither=0;
- if(bDrawDither>1) bDrawDither=1;
-
- strcpy(t,"\nLineMode");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) bUseLines=atoi(p+len);
- if(bUseLines<0) bUseLines=0;
- if(bUseLines>1) bUseLines=1;
-
- strcpy(t,"\nShowFPS");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) iShowFPS=atoi(p+len);
- if(iShowFPS<0) iShowFPS=0;
- if(iShowFPS>1) iShowFPS=1;
-
- strcpy(t,"\nUseFrameLimit");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) bUseFrameLimit=atoi(p+len);
- if(bUseFrameLimit<0) bUseFrameLimit=0;
- if(bUseFrameLimit>1) bUseFrameLimit=1;
-
- strcpy(t,"\nUseFrameSkip");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) bUseFrameSkip=atoi(p+len);
- if(bUseFrameSkip<0) bUseFrameSkip=0;
- if(bUseFrameSkip>1) bUseFrameSkip=1;
-
- strcpy(t,"\nFPSDetection");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) iFrameLimit=atoi(p+len)+1;
- if(iFrameLimit<1) iFrameLimit=1;
- if(iFrameLimit>2) iFrameLimit=2;
-
- strcpy(t,"\nFrameRate");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) fFrameRate=(float)atof(p+len);
- if(fFrameRate<0.0f) fFrameRate=0.0f;
- if(fFrameRate>1000.0f) fFrameRate=1000.0f;
-
- strcpy(t,"\nOffscreenDrawing");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) iOffscreenDrawing=atoi(p+len);
- if(iOffscreenDrawing<0) iOffscreenDrawing=0;
- if(iOffscreenDrawing>4) iOffscreenDrawing=4;
-
- strcpy(t,"\nOpaquePass");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) bOpaquePass=atoi(p+len);
- if(bOpaquePass<0) bOpaquePass=0;
- if(bOpaquePass>1) bOpaquePass=1;
-
- strcpy(t,"\nAntiAlias");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) bUseAntiAlias=atoi(p+len);
- if(bUseAntiAlias<0) bUseAntiAlias=0;
- if(bUseAntiAlias>1) bUseAntiAlias=1;
-
- strcpy(t,"\nTexQuality");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) iTexQuality=atoi(p+len);
- if(iTexQuality<0) iTexQuality=0;
- if(iTexQuality>4) iTexQuality=4;
-
- strcpy(t,"\n15bitMdec");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) bUse15bitMdec=atoi(p+len);
- if(bUse15bitMdec<0) bUse15bitMdec=0;
- if(bUse15bitMdec>1) bUse15bitMdec=1;
-
- strcpy(t,"\nMaskDetect");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) iUseMask=atoi(p+len);
- if(iUseMask<0) iUseMask=0;
- if(iUseMask>1) iUseMask=1;
-
- strcpy(t,"\nFastMdec");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) bUseFastMdec=atoi(p+len);
- if(bUseFastMdec<0) bUseFastMdec=0;
- if(bUseFastMdec>1) bUseFastMdec=1;
-
- strcpy(t,"\nCfgFixes");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) dwCfgFixes=atoi(p+len);
-
- strcpy(t,"\nUseFixes");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) bUseFixes=atoi(p+len);
- if(bUseFixes<0) bUseFixes=0;
- if(bUseFixes>1) bUseFixes=1;
-
- strcpy(t,"\nOGLExtensions");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) iUseExts=atoi(p+len);
- if(iUseExts>1) iUseExts=1;
-
- free(pB);
-}
-
-void ReadConfig(void) // read config (linux file)
-{
- iResX=640;
- iResY=480;
- iColDepth=16;
- bChangeRes=FALSE;
- bWindowMode=TRUE;
- iUseScanLines=0;
- bFullScreen=FALSE;
- bFullVRam=FALSE;
- iFilterType=0;
- bAdvancedBlend=FALSE;
- bDrawDither=FALSE;
- bUseLines=FALSE;
- bUseFrameLimit=TRUE;
- bUseFrameSkip=FALSE;
- iFrameLimit=2;
- fFrameRate=200.0f;
- iOffscreenDrawing=2;
- bOpaquePass=TRUE;
- bUseAntiAlias=FALSE;
- iTexQuality=0;
- iUseMask=0;
- iZBufferDepth=0;
- bUseFastMdec=TRUE;
- dwCfgFixes=0;
- bUseFixes=FALSE;
- iFrameTexType=1;
- iFrameReadType=0;
- bUse15bitMdec=FALSE;
- iShowFPS=0;
- bKeepRatio=FALSE;
- iScanBlend=0;
- iVRamSize=0;
- iTexGarbageCollection=1;
- iBlurBuffer=0;
- iHiResTextures=0;
- iForceVSync=-1;
-
- ReadConfigFile(); // read file
-
- if(!iColDepth) iColDepth=32; // adjust color info
- if(iUseMask) iZBufferDepth=16; // set zbuffer depth 
- else iZBufferDepth=0;
- if(bUseFixes) dwActFixes=dwCfgFixes; // init game fix global
-}
+/***************************************************************************
+ cfg.c - description
+ -------------------
+ begin : Sun Mar 08 2009
+ copyright : (C) 1999-2009 by Pete Bernert
+ web : www.pbernert.com 
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+//*************************************************************************// 
+// History of changes:
+//
+// 2009/03/08 - Pete 
+// - generic cleanup for the Peops release
+//
+//*************************************************************************// 
+
+#define _IN_CFG
+
+#include "stdafx.h"
+#include "externals.h"
+#include "cfg.h"
+
+char *pConfigFile = NULL;
+
+void ReadConfigFile()
+{
+ FILE *in = NULL;
+ int len;
+ char *pB, *p, t[256];
+
+ if (pConfigFile != NULL)
+ in = fopen(pConfigFile, "rb");
+ else
+ in = fopen("gpuPeopsMesaGL.cfg", "rb"); 
+
+ if (in == NULL) return;
+
+ pB=(char *)malloc(32767); // buffer for reading config (32k)
+ memset(pB, 0, 32767);
+
+ len = fread(pB, 1, 32767, in); // read config in buffer
+ fclose(in); // close config file
+
+ strcpy(t,"\nResX");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+ if(p) iResX=atoi(p+len);
+ if(iResX<10) iResX=10;
+
+ strcpy(t,"\nResY");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+ if(p) iResY=atoi(p+len);
+ if(iResY<10) iResY=10;
+
+ strcpy(t,"\nKeepRatio");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+ if(p) bKeepRatio=atoi(p+len);
+ if(bKeepRatio<0) bKeepRatio=0;
+ if(bKeepRatio>1) bKeepRatio=1;
+
+ strcpy(t,"\nForceRatio43");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+ if(p) bForceRatio43=atoi(p+len);
+ if(bForceRatio43<0) bForceRatio43=0;
+ if(bForceRatio43>1) bForceRatio43=1;
+ 
+ strcpy(t,"\nScreenSmoothing");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+ if(p) iBlurBuffer=atoi(p+len);
+ if(iBlurBuffer<0) iBlurBuffer=0;
+ if(iBlurBuffer>1) iBlurBuffer=1;
+
+ strcpy(t,"\nHiResTextures");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+ if(p) iHiResTextures=atoi(p+len);
+ if(iHiResTextures<0) iHiResTextures=0;
+ if(iHiResTextures>2) iHiResTextures=2;
+
+ iSortTexCnt =0;
+ strcpy(t,"\nVRamSize");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+ if(p) iVRamSize=atoi(p+len);
+ if(iVRamSize<0) iVRamSize=0;
+ if(iVRamSize>1024) iVRamSize=1024;
+
+ strcpy(t,"\nFullScreen");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+ if(p) bFullScreen=atoi(p+len);
+ if(bFullScreen>1) bFullScreen=1;
+
+ strcpy(t,"\nScanLines");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+ if(p) iUseScanLines=atoi(p+len);
+ if(iUseScanLines<0) iUseScanLines=0;
+ if(iUseScanLines>1) iUseScanLines=1;
+
+ strcpy(t,"\nScanLinesBlend");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+ if(p) iScanBlend=atoi(p+len);
+ if(iScanBlend<-1) iScanBlend=-1;
+ if(iScanBlend>255) iScanBlend=255;
+
+ strcpy(t,"\nFrameTextures");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+ if(p) iFrameTexType=atoi(p+len);
+ if(iFrameTexType<0) iFrameTexType=0;
+ if(iFrameTexType>3) iFrameTexType=3;
+
+ strcpy(t,"\nFrameAccess");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+ if(p) iFrameReadType=atoi(p+len);
+ if(iFrameReadType<0) iFrameReadType=0;
+ if(iFrameReadType>4) iFrameReadType=4;
+ if(iFrameReadType==4) bFullVRam=TRUE;
+ else bFullVRam=FALSE;
+
+ strcpy(t,"\nTexFilter");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+ if(p) iFilterType=atoi(p+len);
+ if(iFilterType<0) iFilterType=0;
+ if(iFilterType>6) iFilterType=6;
+
+ strcpy(t,"\nAdvancedBlend");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+ if(p) bAdvancedBlend=atoi(p+len);
+ if(bAdvancedBlend<0) bAdvancedBlend=0;
+ if(bAdvancedBlend>1) bAdvancedBlend=1;
+
+ strcpy(t,"\nDithering");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+ if(p) bDrawDither=atoi(p+len);
+ if(bDrawDither<0) bDrawDither=0;
+ if(bDrawDither>1) bDrawDither=1;
+
+ strcpy(t,"\nLineMode");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+ if(p) bUseLines=atoi(p+len);
+ if(bUseLines<0) bUseLines=0;
+ if(bUseLines>1) bUseLines=1;
+
+ strcpy(t,"\nShowFPS");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+ if(p) iShowFPS=atoi(p+len);
+ if(iShowFPS<0) iShowFPS=0;
+ if(iShowFPS>1) iShowFPS=1;
+
+ strcpy(t,"\nUseFrameLimit");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+ if(p) bUseFrameLimit=atoi(p+len);
+ if(bUseFrameLimit<0) bUseFrameLimit=0;
+ if(bUseFrameLimit>1) bUseFrameLimit=1;
+
+ strcpy(t,"\nUseFrameSkip");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+ if(p) bUseFrameSkip=atoi(p+len);
+ if(bUseFrameSkip<0) bUseFrameSkip=0;
+ if(bUseFrameSkip>1) bUseFrameSkip=1;
+
+ strcpy(t,"\nFPSDetection");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+ if(p) iFrameLimit=atoi(p+len)+1;
+ if(iFrameLimit<1) iFrameLimit=1;
+ if(iFrameLimit>2) iFrameLimit=2;
+
+ strcpy(t,"\nFrameRate");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+ if(p) fFrameRate=(float)atof(p+len);
+ if(fFrameRate<0.0f) fFrameRate=0.0f;
+ if(fFrameRate>1000.0f) fFrameRate=1000.0f;
+
+ strcpy(t,"\nOffscreenDrawing");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+ if(p) iOffscreenDrawing=atoi(p+len);
+ if(iOffscreenDrawing<0) iOffscreenDrawing=0;
+ if(iOffscreenDrawing>4) iOffscreenDrawing=4;
+
+ strcpy(t,"\nOpaquePass");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+ if(p) bOpaquePass=atoi(p+len);
+ if(bOpaquePass<0) bOpaquePass=0;
+ if(bOpaquePass>1) bOpaquePass=1;
+
+ strcpy(t,"\nAntiAlias");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+ if(p) bUseAntiAlias=atoi(p+len);
+ if(bUseAntiAlias<0) bUseAntiAlias=0;
+ if(bUseAntiAlias>1) bUseAntiAlias=1;
+
+ strcpy(t,"\nTexQuality");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+ if(p) iTexQuality=atoi(p+len);
+ if(iTexQuality<0) iTexQuality=0;
+ if(iTexQuality>4) iTexQuality=4;
+
+ strcpy(t,"\n15bitMdec");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+ if(p) bUse15bitMdec=atoi(p+len);
+ if(bUse15bitMdec<0) bUse15bitMdec=0;
+ if(bUse15bitMdec>1) bUse15bitMdec=1;
+
+ strcpy(t,"\nMaskDetect");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+ if(p) iUseMask=atoi(p+len);
+ if(iUseMask<0) iUseMask=0;
+ if(iUseMask>1) iUseMask=1;
+
+ strcpy(t,"\nFastMdec");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+ if(p) bUseFastMdec=atoi(p+len);
+ if(bUseFastMdec<0) bUseFastMdec=0;
+ if(bUseFastMdec>1) bUseFastMdec=1;
+
+ strcpy(t,"\nCfgFixes");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+ if(p) dwCfgFixes=atoi(p+len);
+
+ strcpy(t,"\nUseFixes");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+ if(p) bUseFixes=atoi(p+len);
+ if(bUseFixes<0) bUseFixes=0;
+ if(bUseFixes>1) bUseFixes=1;
+
+ strcpy(t,"\nOGLExtensions");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+ if(p) iUseExts=atoi(p+len);
+ if(iUseExts>1) iUseExts=1;
+ 
+ strcpy(t,"\nGteAccuracy");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
+ if(p) bGteAccuracy=atoi(p+len);
+ if(bGteAccuracy>1) bGteAccuracy=1;
+
+ free(pB);
+}
+
+void ReadConfig(void) // read config (linux file)
+{
+ iResX=640;
+ iResY=480;
+ iColDepth=16;
+ bChangeRes=FALSE;
+ bWindowMode=TRUE;
+ iUseScanLines=0;
+ bFullScreen=FALSE;
+ bFullVRam=FALSE;
+ iFilterType=0;
+ bAdvancedBlend=FALSE;
+ bDrawDither=FALSE;
+ bUseLines=FALSE;
+ bUseFrameLimit=TRUE;
+ bUseFrameSkip=FALSE;
+ iFrameLimit=2;
+ fFrameRate=200.0f;
+ iOffscreenDrawing=2;
+ bOpaquePass=TRUE;
+ bUseAntiAlias=FALSE;
+ iTexQuality=0;
+ iUseMask=0;
+ iZBufferDepth=0;
+ bUseFastMdec=TRUE;
+ dwCfgFixes=0;
+ bUseFixes=FALSE;
+ iFrameTexType=1;
+ iFrameReadType=0;
+ bUse15bitMdec=FALSE;
+ iShowFPS=0;
+ bGteAccuracy=0;
+ bKeepRatio=FALSE;
+ bForceRatio43=FALSE;
+ iScanBlend=0;
+ iVRamSize=0;
+ iTexGarbageCollection=1;
+ iBlurBuffer=0;
+ iHiResTextures=0;
+ iForceVSync=-1;
+
+ ReadConfigFile(); // read file
+
+ if(!iColDepth) iColDepth=32; // adjust color info
+ if(iUseMask) iZBufferDepth=16; // set zbuffer depth 
+ else iZBufferDepth=0;
+ if(bUseFixes) dwActFixes=dwCfgFixes; // init game fix global
+}

pcsxr-1.9.92.tar.bz2/plugins/peopsxgl/cfg.h -> pcsxr-1.9.93.tar.bz2/plugins/peopsxgl/cfg.h Changed

@@ -1,20 +1,32 @@
-/***************************************************************************
-                            cfg.h  -  description
-                             -------------------
-    begin                : Sun Mar 08 2009
-    copyright            : (C) 1999-2009 by Pete Bernert
-    web                  : www.pbernert.com   
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version. See also the license.txt file for *
- *   additional informations.                                              *
- *                                                                         *
- ***************************************************************************/
-
-void ReadConfig(void);
+/***************************************************************************
+                            cfg.h  -  description
+                             -------------------
+    begin                : Sun Mar 08 2009
+    copyright            : (C) 1999-2009 by Pete Bernert
+    web                  : www.pbernert.com   
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifdef _WINDOWS
+
+void ReadConfig(void);
+void WriteConfig(void);
+void ReadWinSizeConfig(void);
+BOOL CALLBACK CfgDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+BOOL CALLBACK AboutDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam);
+
+#else
+
+void ReadConfig(void);
 void ReadConfigFile();
+
+#endif

pcsxr-1.9.92.tar.bz2/plugins/peopsxgl/draw.c -> pcsxr-1.9.93.tar.bz2/plugins/peopsxgl/draw.c Changed

@@ -1,1517 +1,1711 @@
-/***************************************************************************
- draw.c - description
- -------------------
- begin : Sun Mar 08 2009
- copyright : (C) 1999-2009 by Pete Bernert
- web : www.pbernert.com 
- ***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. See also the license.txt file for *
- * additional informations. *
- * *
- ***************************************************************************/
-
-#include "stdafx.h"
-
-#define _IN_DRAW
-
-#include "externals.h"
-#include "gpu.h"
-#include "draw.h"
-#include "prim.h"
-#include "texture.h"
-#include "menu.h"
-
-////////////////////////////////////////////////////////////////////////////////////
-// defines
-
-#define SIGNBIT 0x800
-#define S_MASK 0xf000
-#define L_MASK 0xfffff000
-
-// ownscale: some ogl drivers have buggy texture matrix funcs, so it
-// is safer to calc sow/tow ourselves
-
-#ifdef OWNSCALE
-
-#define ST_FACSPRITE 255.99f
-#define ST_BFFACSPRITE 0.5f/256.0f
-#define ST_BFFACSPRITESORT 0.333f/256.0f
-
-#define ST_OFFSET 0.5f/256.0f;
-
-#define ST_FAC 255.99f
-#define ST_BFFAC 0.5f/256.0f
-#define ST_BFFACSORT 0.333f/256.0f
-
-#define ST_FACTRI 255.99f
-#define ST_BFFACTRI 0.5f/256.0f
-#define ST_BFFACTRISORT 0.333f/256.0f
-
-#define ST_FACVRAMX 255.0f
-#define ST_FACVRAM 256.0f
-
-///////////////////////////////////////////////////////////////
-
-#else
-
-#define ST_BFFACSPRITE 0.5f
-#define ST_BFFACSPRITESORT 0.333f
-
-#define ST_BFFAC 0.5f
-#define ST_BFFACSORT 0.333f
-
-#define ST_BFFACTRI 0.5f
-#define ST_BFFACTRISORT 0.333f
-
-#define ST_OFFSET 0.5f;
- 
-#endif
-
-////////////////////////////////////////////////////////////////////////////////////
-// draw globals; most will be initialized again later (by config or checks) 
-
-BOOL bIsFirstFrame=TRUE;
-
-// resolution/ratio vars
-
-int iResX;
-int iResY;
-BOOL bKeepRatio=FALSE;
-RECT rRatioRect;
-
-// psx mask related vars
-
-BOOL bCheckMask=FALSE;
-int iUseMask=0;
-int iSetMask=0;
-unsigned short sSetMask=0;
-uint32_t lSetMask=0;
-
-// drawing/coord vars
-
-OGLVertex vertex[4];
-GLubyte gl_ux[8];
-GLubyte gl_vy[8];
-short sprtY,sprtX,sprtH,sprtW;
-
-// drawing options
-
-BOOL bOpaquePass;
-BOOL bAdvancedBlend;
-BOOL bUseLines;
-BOOL bUseAntiAlias;
-int iTexQuality;
-int iUsePalTextures=1;
-BOOL bSnapShot=FALSE;
-BOOL bSmallAlpha=FALSE;
-int iShowFPS=0;
-
-// OGL extension support
-
-int iForceVSync=-1;
-int iUseExts=0;
-BOOL bGLExt;
-BOOL bGLFastMovie=FALSE;
-BOOL bGLSoft;
-BOOL bGLBlend;
-PFNGLBLENDEQU glBlendEquationEXTEx=NULL;
-PFNGLCOLORTABLEEXT glColorTableEXTEx=NULL;
-
-// gfx card buffer infos
-
-int iDepthFunc=0;
-int iZBufferDepth=0;
-GLbitfield uiBufferBits=GL_COLOR_BUFFER_BIT;
-
-////////////////////////////////////////////////////////////////////////
-// Get extension infos (f.e. pal textures / packed pixels)
-////////////////////////////////////////////////////////////////////////
-
-void GetExtInfos(void) 
-{
- BOOL bPacked=FALSE; // default: no packed pixel support
-
- bGLExt=FALSE; // default: no extensions
- bGLFastMovie=FALSE;
-
- if(strstr((char *)glGetString(GL_EXTENSIONS), // packed pixels available?
- "GL_EXT_packed_pixels")) 
- bPacked=TRUE; // -> ok
-
- if(bPacked && bUse15bitMdec) // packed available and 15bit mdec wanted?
- bGLFastMovie=TRUE; // -> ok
-
- if(bPacked && (iTexQuality==1 || iTexQuality==2)) // packed available and 16 bit texture format?
- {
- bGLFastMovie=TRUE; // -> ok
- bGLExt=TRUE;
- }
-
- if(iUseExts && // extension support wanted?
- (strstr((char *)glGetString(GL_EXTENSIONS),
- "GL_EXT_texture_edge_clamp") ||
- strstr((char *)glGetString(GL_EXTENSIONS), // -> check clamp support, if yes: use it
- "GL_SGIS_texture_edge_clamp")))
- iClampType=GL_TO_EDGE_CLAMP;
- else iClampType=GL_CLAMP;
-
- glColorTableEXTEx=(PFNGLCOLORTABLEEXT)NULL; // init ogl palette func pointer
-
-#ifndef __sun
- if(iGPUHeight!=1024 && // no pal textures in ZN mode (height=1024)! 
- strstr((char *)glGetString(GL_EXTENSIONS), // otherwise: check ogl support
- "GL_EXT_paletted_texture"))
- {
- iUsePalTextures=1; // -> wow, supported, get func pointer
-
- glColorTableEXTEx=(PFNGLCOLORTABLEEXT)glXGetProcAddress("glColorTableEXT");
-
- if(glColorTableEXTEx==NULL) iUsePalTextures=0; // -> ha, cheater... no func, no support
- }
- else iUsePalTextures=0;
-#else
- iUsePalTextures=0;
-#endif
-}
-
-////////////////////////////////////////////////////////////////////////
-// Setup some stuff depending on user settings or in-game toggle
-////////////////////////////////////////////////////////////////////////
-
-void SetExtGLFuncs(void)
-{
- //----------------------------------------------------//
-
- SetFixes(); // update fix infos
-
- //----------------------------------------------------//
-
- if(iUseExts && !(dwActFixes&1024) && // extensions wanted? and not turned off by game fix?
- strstr((char *)glGetString(GL_EXTENSIONS), // and blend_subtract available?
- "GL_EXT_blend_subtract"))
- { // -> get ogl blend function pointer
- glBlendEquationEXTEx=(PFNGLBLENDEQU)glXGetProcAddress("glBlendEquationEXT"); 
- }
- else // no subtract blending?
- {
- if(glBlendEquationEXTEx) // -> change to additive blending (if subract was active)
- glBlendEquationEXTEx(FUNC_ADD_EXT);
- glBlendEquationEXTEx=(PFNGLBLENDEQU)NULL; // -> no more blend function pointer
- }
-
- //----------------------------------------------------//
-
- if(iUseExts && bAdvancedBlend && // advanced blending wanted ?
- strstr((char *)glGetString(GL_EXTENSIONS), // and extension avail?
- "GL_EXT_texture_env_combine"))
- {
- bUseMultiPass=FALSE;bGLBlend=TRUE; // -> no need for 2 passes, perfect
-
- glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, COMBINE_EXT); 
- glTexEnvf(GL_TEXTURE_ENV, COMBINE_RGB_EXT, GL_MODULATE); 
- glTexEnvf(GL_TEXTURE_ENV, COMBINE_ALPHA_EXT, GL_MODULATE); 
- glTexEnvf(GL_TEXTURE_ENV, RGB_SCALE_EXT, 2.0f); 
- }
- else // no advanced blending wanted/available:
- {
- if(bAdvancedBlend) bUseMultiPass=TRUE; // -> pseudo-advanced with 2 passes
- else bUseMultiPass=FALSE; // -> or simple 'bright color' mode
- bGLBlend=FALSE; // -> no ext blending!
-
- glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 
- }
-
- //----------------------------------------------------//
- // init standard tex quality 0-2, and big alpha mode 3
-
- if(!(dwActFixes&0x4000) && iFilterType && iTexQuality>=3) 
- bSmallAlpha=TRUE; 
- else bSmallAlpha=FALSE;
-
- if(bOpaquePass) // opaque mode?
- {
- if(dwActFixes&32) 
- {
- TCF[0]=CP8RGBA_0;
- PalTexturedColourFn=CP8RGBA; // -> init col func
- }
- else
- {
- TCF[0]=XP8RGBA_0;
- PalTexturedColourFn=XP8RGBA; // -> init col func
- }
-
- TCF[1]=XP8RGBA_1;
- glAlphaFunc(GL_GREATER,0.49f);
- }
- else // no opaque mode?
- {
- TCF[0]=TCF[1]=P8RGBA;
- PalTexturedColourFn=P8RGBA; // -> init col func
- glAlphaFunc(GL_NOTEQUAL,0); // --> set alpha func
- }
-
- //----------------------------------------------------//
-
- LoadSubTexFn=LoadSubTexturePageSort; // init load tex ptr
-
- giWantedFMT=GL_RGBA; // init ogl tex format
-
- switch(iTexQuality) // -> quality:
- {
- //--------------------------------------------------// 
- case 0: // -> don't care
- giWantedRGBA=4;
- giWantedTYPE=GL_UNSIGNED_BYTE;
- break;
- //--------------------------------------------------// 
- case 1: // -> R4G4B4A4
- if(bGLExt)
- {
- giWantedRGBA=GL_RGBA4;
- giWantedTYPE=GL_UNSIGNED_SHORT_4_4_4_4_EXT;
- LoadSubTexFn=LoadPackedSubTexturePageSort;
- if(bOpaquePass) 
- {
- if(dwActFixes&32) PTCF[0]=CP4RGBA_0;
- else PTCF[0]=XP4RGBA_0;
- PTCF[1]=XP4RGBA_1;
- }
- else 
- {
- PTCF[0]=PTCF[1]=P4RGBA;
- }
- }
- else
- {
- giWantedRGBA=GL_RGBA4;
- giWantedTYPE=GL_UNSIGNED_BYTE;
- }
- break;
- //--------------------------------------------------// 
- case 2: // -> R5B5G5A1
- if(bGLExt)
- {
- giWantedRGBA=GL_RGB5_A1;
- giWantedTYPE=GL_UNSIGNED_SHORT_5_5_5_1_EXT;
- LoadSubTexFn=LoadPackedSubTexturePageSort;
- if(bOpaquePass) 
- {
- if(dwActFixes&32) PTCF[0]=CP5RGBA_0;
- else PTCF[0]=XP5RGBA_0;
- PTCF[1]=XP5RGBA_1;
- }
- else 
- {
- PTCF[0]=PTCF[1]=P5RGBA;
- }
- }
- else
- {
- giWantedRGBA=GL_RGB5_A1;giWantedTYPE=GL_UNSIGNED_BYTE;
- }
- break;
- //--------------------------------------------------// 
- case 3: // -> R8G8B8A8
- giWantedRGBA=GL_RGBA8;
- giWantedTYPE=GL_UNSIGNED_BYTE;
-
- if(bSmallAlpha)
- {
- if(bOpaquePass) // opaque mode?
- {
- if(dwActFixes&32) {TCF[0]=CP8RGBAEx_0;PalTexturedColourFn=CP8RGBAEx;}
- else {TCF[0]=XP8RGBAEx_0;PalTexturedColourFn=XP8RGBAEx;}
- TCF[1]=XP8RGBAEx_1;
- }
- }
-
- break;
- //--------------------------------------------------// 
- case 4: // -> R8G8B8A8
- giWantedRGBA = GL_RGBA8;
- giWantedTYPE = GL_UNSIGNED_BYTE;
-
- if(strstr((char *)glGetString(GL_EXTENSIONS), // and extension avail?
- "GL_EXT_bgra"))
- {
- giWantedFMT = GL_BGRA_EXT;
-
- if(bOpaquePass) // opaque mode?
- {
- if(bSmallAlpha)
- {
- if(dwActFixes&32) {TCF[0]=CP8BGRAEx_0;PalTexturedColourFn=CP8RGBAEx;}
- else {TCF[0]=XP8BGRAEx_0;PalTexturedColourFn=XP8RGBAEx;}
- TCF[1]=XP8BGRAEx_1;
- }
- else
- {
- if(dwActFixes&32) {TCF[0]=CP8BGRA_0;PalTexturedColourFn=CP8RGBA;}
- else {TCF[0]=XP8BGRA_0;PalTexturedColourFn=XP8RGBA;}
- TCF[1]=XP8BGRA_1;
- }
- }
- else // no opaque mode?
- {
- TCF[0]=TCF[1]=P8BGRA; // -> init col func
- }
- }
- else
- {
- iTexQuality=3;
- if(bSmallAlpha)
- {
- if(bOpaquePass) // opaque mode?
- {
- if(dwActFixes&32) {TCF[0]=CP8RGBAEx_0;PalTexturedColourFn=CP8RGBAEx;}
- else {TCF[0]=XP8RGBAEx_0;PalTexturedColourFn=XP8RGBAEx;}
- TCF[1]=XP8RGBAEx_1;
- }
- }
- }
-
- break;
- //--------------------------------------------------// 
- }
-
- bBlendEnable=FALSE; // init blending: off
- glDisable(GL_BLEND);
-
- SetScanTrans(); // init scan lines (if wanted)
-}
-
-////////////////////////////////////////////////////////////////////////
-// setup scan lines
-////////////////////////////////////////////////////////////////////////
-
-#define R_TSP 0x00,0x45,0x00,0xff
-#define G_TSP 0x00,0x00,0x45,0xff
-#define B_TSP 0x45,0x00,0x00,0xff
-#define O_TSP 0x45,0x45,0x45,0xff
-#define N_TSP 0x00,0x00,0x00,0xff
-
-GLuint gTexScanName=0;
-
-GLubyte texscan[4][16]= 
-{
-{R_TSP, G_TSP, B_TSP, N_TSP},
-{O_TSP, N_TSP, O_TSP, N_TSP},
-{B_TSP, N_TSP, R_TSP, G_TSP},
-{O_TSP, N_TSP, O_TSP, N_TSP}
-};
-
-void CreateScanLines(void)
-{
- if(iUseScanLines)
- {
- int y;
- if(iScanBlend<0) // special scan mask mode
- {
- glGenTextures(1, &gTexScanName);
- glBindTexture(GL_TEXTURE_2D, gTexScanName);
-
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- glTexImage2D(GL_TEXTURE_2D, 0, 4, 4, 4, 0,GL_RGBA, GL_UNSIGNED_BYTE, texscan);
- }
- else // otherwise simple lines in a display list
- {
- uiScanLine=glGenLists(1);
- glNewList(uiScanLine,GL_COMPILE);
-
- for(y=0;y<iResY;y+=2)
- {
- glBegin(GL_QUADS);
- glVertex2f(0,y);
- glVertex2f(iResX,y);
- glVertex2f(iResX,y+1);
- glVertex2f(0,y+1);
- glEnd();
- }
- glEndList();
- }
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-// Initialize OGL
-////////////////////////////////////////////////////////////////////////
-
-int GLinitialize() 
-{
- glViewport(rRatioRect.left, // init viewport by ratio rect
- iResY-(rRatioRect.top+rRatioRect.bottom),
- rRatioRect.right, 
- rRatioRect.bottom); 
- 
- glScissor(0, 0, iResX, iResY); // init clipping (fullscreen)
- glEnable(GL_SCISSOR_TEST); 
-
-#ifndef OWNSCALE
- glMatrixMode(GL_TEXTURE); // init psx tex sow and tow if not "ownscale"
- glLoadIdentity();
- glScalef(1.0f/255.99f,1.0f/255.99f,1.0f); // geforce precision hack
-#endif 
-
- glMatrixMode(GL_PROJECTION); // init projection with psx resolution
- glLoadIdentity();
- glOrtho(0,PSXDisplay.DisplayMode.x,
- PSXDisplay.DisplayMode.y, 0, -1, 1);
-
- if(iZBufferDepth) // zbuffer?
- {
- uiBufferBits=GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT;
- glEnable(GL_DEPTH_TEST); 
- glDepthFunc(GL_ALWAYS);
- iDepthFunc=1;
- }
- else // no zbuffer?
- {
- uiBufferBits=GL_COLOR_BUFFER_BIT;
- glDisable(GL_DEPTH_TEST);
- }
-
- glClearColor(0.0f, 0.0f, 0.0f, 0.0f); // first buffer clear
- glClear(uiBufferBits);
-
- if(bUseLines) // funny lines 
- {
- glPolygonMode(GL_FRONT, GL_LINE); 
- glPolygonMode(GL_BACK, GL_LINE); 
- }
- else // or the real filled thing
- {
- glPolygonMode(GL_FRONT, GL_FILL);
- glPolygonMode(GL_BACK, GL_FILL);
- }
-
- MakeDisplayLists(); // lists for menu/opaque
- GetExtInfos(); // get ext infos
- SetExtGLFuncs(); // init all kind of stuff (tex function pointers)
- 
- glEnable(GL_ALPHA_TEST); // wanna alpha test
-
- if(!bUseAntiAlias) // no anti-alias (default)
- {
- glDisable(GL_LINE_SMOOTH);
- glDisable(GL_POLYGON_SMOOTH);
- glDisable(GL_POINT_SMOOTH);
- }
- else // wanna try it? glitches galore...
- { 
- glHint(GL_PERSPECTIVE_CORRECTION_HINT,GL_NICEST);
- glEnable(GL_LINE_SMOOTH);
- glEnable(GL_POLYGON_SMOOTH);
- glEnable(GL_POINT_SMOOTH);
- glHint(GL_LINE_SMOOTH_HINT,GL_NICEST);
- glHint(GL_POINT_SMOOTH_HINT,GL_NICEST);
- glHint(GL_POLYGON_SMOOTH_HINT,GL_NICEST);
- }
-
- ubGloAlpha=127; // init some drawing vars
- ubGloColAlpha=127;
- TWin.UScaleFactor = 1;
- TWin.VScaleFactor = 1;
- bDrawMultiPass=FALSE;
- bTexEnabled=FALSE;
- bUsingTWin=FALSE;
- 
- if(bDrawDither) glEnable(GL_DITHER); // dither mode
- else glDisable(GL_DITHER); 
-
- glDisable(GL_FOG); // turn all (currently) unused modes off
- glDisable(GL_LIGHTING); 
- glDisable(GL_LOGIC_OP);
- glDisable(GL_STENCIL_TEST); 
- glDisable(GL_TEXTURE_1D);
- glDisable(GL_TEXTURE_2D);
- glDisable(GL_CULL_FACE);
-
- glPixelTransferi(GL_RED_SCALE, 1); // to be sure:
- glPixelTransferi(GL_RED_BIAS, 0); // init more OGL vals
- glPixelTransferi(GL_GREEN_SCALE, 1);
- glPixelTransferi(GL_GREEN_BIAS, 0);
- glPixelTransferi(GL_BLUE_SCALE, 1);
- glPixelTransferi(GL_BLUE_BIAS, 0);
- glPixelTransferi(GL_ALPHA_SCALE, 1);
- glPixelTransferi(GL_ALPHA_BIAS, 0); 
-
- printf(glGetString(GL_VENDOR)); // linux: tell user what is getting used
- printf("\n");
- printf(glGetString(GL_RENDERER));
- printf("\n");
-
- glFlush(); // we are done...
- glFinish(); 
-
- CreateScanLines(); // setup scanline stuff (if wanted)
-
- CheckTextureMemory(); // check available tex memory
-
- if(bKeepRatio) SetAspectRatio(); // set ratio
-
- if(iShowFPS) // user wants FPS display on startup?
- {
- ulKeybits|=KEY_SHOWFPS; // -> ok, turn display on
- szDispBuf[0]=0;
- BuildDispMenu(0);
- }
- 
- bIsFirstFrame = FALSE; // we have survived the first frame :)
-
- return 0;
-}
-
-////////////////////////////////////////////////////////////////////////
-// clean up OGL stuff
-////////////////////////////////////////////////////////////////////////
-
-void GLcleanup() 
-{ 
- KillDisplayLists(); // bye display lists
-
- if(iUseScanLines) // scanlines used?
- {
- if(iScanBlend<0)
- {
- if(gTexScanName!=0) // some scanline tex?
- glDeleteTextures(1, &gTexScanName); // -> delete it
- gTexScanName=0;
- }
- else glDeleteLists(uiScanLine,1); // otherwise del scanline display list
- }
-
- CleanupTextureStore(); // bye textures
-}
-
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////////
-// Offset stuff
-////////////////////////////////////////////////////////////////////////
-
-// please note: it is hardly do-able in a hw/accel plugin to get the 
-// real psx polygon coord mapping right... the following
-// works not to bad with many games, though
-
-__inline BOOL CheckCoord4()
-{
- if(lx0<0)
- {
- if(((lx1-lx0)>CHKMAX_X) ||
- ((lx2-lx0)>CHKMAX_X)) 
- {
- if(lx3<0)
- {
- if((lx1-lx3)>CHKMAX_X) return TRUE;
- if((lx2-lx3)>CHKMAX_X) return TRUE;
- }
- }
- }
- if(lx1<0)
- {
- if((lx0-lx1)>CHKMAX_X) return TRUE;
- if((lx2-lx1)>CHKMAX_X) return TRUE;
- if((lx3-lx1)>CHKMAX_X) return TRUE;
- }
- if(lx2<0)
- {
- if((lx0-lx2)>CHKMAX_X) return TRUE;
- if((lx1-lx2)>CHKMAX_X) return TRUE;
- if((lx3-lx2)>CHKMAX_X) return TRUE;
- }
- if(lx3<0)
- {
- if(((lx1-lx3)>CHKMAX_X) ||
- ((lx2-lx3)>CHKMAX_X))
- {
- if(lx0<0)
- {
- if((lx1-lx0)>CHKMAX_X) return TRUE;
- if((lx2-lx0)>CHKMAX_X) return TRUE;
- }
- }
- }
- 
-
- if(ly0<0)
- {
- if((ly1-ly0)>CHKMAX_Y) return TRUE;
- if((ly2-ly0)>CHKMAX_Y) return TRUE;
- }
- if(ly1<0)
- {
- if((ly0-ly1)>CHKMAX_Y) return TRUE;
- if((ly2-ly1)>CHKMAX_Y) return TRUE;
- if((ly3-ly1)>CHKMAX_Y) return TRUE;
- }
- if(ly2<0)
- {
- if((ly0-ly2)>CHKMAX_Y) return TRUE;
- if((ly1-ly2)>CHKMAX_Y) return TRUE;
- if((ly3-ly2)>CHKMAX_Y) return TRUE;
- }
- if(ly3<0)
- {
- if((ly1-ly3)>CHKMAX_Y) return TRUE;
- if((ly2-ly3)>CHKMAX_Y) return TRUE;
- }
-
- return FALSE;
-}
-
-__inline BOOL CheckCoord3()
-{
- if(lx0<0)
- {
- if((lx1-lx0)>CHKMAX_X) return TRUE;
- if((lx2-lx0)>CHKMAX_X) return TRUE;
- }
- if(lx1<0)
- {
- if((lx0-lx1)>CHKMAX_X) return TRUE;
- if((lx2-lx1)>CHKMAX_X) return TRUE;
- }
- if(lx2<0)
- {
- if((lx0-lx2)>CHKMAX_X) return TRUE;
- if((lx1-lx2)>CHKMAX_X) return TRUE;
- }
- if(ly0<0)
- {
- if((ly1-ly0)>CHKMAX_Y) return TRUE;
- if((ly2-ly0)>CHKMAX_Y) return TRUE;
- }
- if(ly1<0)
- {
- if((ly0-ly1)>CHKMAX_Y) return TRUE;
- if((ly2-ly1)>CHKMAX_Y) return TRUE;
- }
- if(ly2<0)
- {
- if((ly0-ly2)>CHKMAX_Y) return TRUE;
- if((ly1-ly2)>CHKMAX_Y) return TRUE;
- }
-
- return FALSE;
-}
-
-
-__inline BOOL CheckCoord2()
-{
- if(lx0<0)
- {
- if((lx1-lx0)>CHKMAX_X) return TRUE;
- }
- if(lx1<0)
- {
- if((lx0-lx1)>CHKMAX_X) return TRUE;
- }
- if(ly0<0)
- {
- if((ly1-ly0)>CHKMAX_Y) return TRUE;
- }
- if(ly1<0)
- {
- if((ly0-ly1)>CHKMAX_Y) return TRUE;
- }
-
- return FALSE;
-}
-
-/*
-//Lewpys "offsetline" func:
-
-void offsetline(void)
-{
-	float x0, x1, y0, y1, oolength, xl, yl;
-
- if(bDisplayNotSet)
- SetOGLDisplaySettings(1);
-
- if(!(dwActFixes&16))
- {
- if((lx0 & SIGNBIT)) lx0|=S_MASK;
- else lx0&=~S_MASK;
- if((lx1 & SIGNBIT)) lx1|=S_MASK;
- else lx1&=~S_MASK;
- if((ly0 & SIGNBIT)) ly0|=S_MASK;
- else ly0&=~S_MASK;
- if((ly1 & SIGNBIT)) ly1|=S_MASK;
- else ly1&=~S_MASK;
- }
-
- x0 = (float)(lx0 + PSXDisplay.CumulOffset.x);
- x1 = (float)(lx1 + PSXDisplay.CumulOffset.x);
- y0 = (float)(ly0 + PSXDisplay.CumulOffset.y);
- y1 = (float)(ly1 + PSXDisplay.CumulOffset.y);
-
- oolength = (float)1/((float)sqrt((y1 - y0)*(y1 - y0) + (x1 - x0)*(x1 - x0)) * (float)2);
-//	oolength = (float)1/((float)sqrt(((y1 - y0)*(y1 - y0) + (x1 - x0)*(x1 - x0)) * (float)2));
-
-	xl = (x1 - x0) * oolength;
-	yl = (y1 - y0) * oolength;
-
-	x0 += 0.5f;
-	x1 += 0.5f;
-
-	x0 -= xl - yl;
-	x1 += xl + yl;
-	y0 -= yl + xl;
-	y1 += yl - xl;
-
-	vertex[0].x=x0;
-	vertex[1].x=x1;
-	vertex[0].y=y0;
-	vertex[1].y=y1;
-
-	x0 -= yl * 2;
-	x1 -= yl * 2;
-	y0 += xl * 2;
-	y1 += xl * 2;
-
-	vertex[2].x=x1;
-	vertex[3].x=x0;
-	vertex[2].y=y1;
-	vertex[3].y=y0;
-}
-*/
-
-
-// Pete's way: a very easy (and hopefully fast) approach for lines
-// without sqrt... using a small float -> short cast trick :)
-
-#define VERTEX_OFFX 0.2f
-#define VERTEX_OFFY 0.2f
-
-BOOL offsetline(void) 
-{
- short x0,x1,y0,y1,dx,dy;float px,py;
-
- if(bDisplayNotSet)
- SetOGLDisplaySettings(1);
-
- if(!(dwActFixes&16))
- {
- lx0=(short)(((int)lx0<<SIGNSHIFT)>>SIGNSHIFT);
- lx1=(short)(((int)lx1<<SIGNSHIFT)>>SIGNSHIFT);
- ly0=(short)(((int)ly0<<SIGNSHIFT)>>SIGNSHIFT);
- ly1=(short)(((int)ly1<<SIGNSHIFT)>>SIGNSHIFT);
-
- if(CheckCoord2()) return TRUE;
- }
-
- x0 = (lx0 + PSXDisplay.CumulOffset.x)+1;
- x1 = (lx1 + PSXDisplay.CumulOffset.x)+1;
- y0 = (ly0 + PSXDisplay.CumulOffset.y)+1;
- y1 = (ly1 + PSXDisplay.CumulOffset.y)+1;
- 
- dx=x1-x0;
- dy=y1-y0;
- 
- if(dx>=0)
- {
- if(dy>=0)
- {
- px=0.5f;
- if(dx>dy) py=-0.5f;
- else if(dx<dy) py= 0.5f;
- else py= 0.0f;
- }
- else
- {
- py=-0.5f;
- dy=-dy;
- if(dx>dy) px= 0.5f;
- else if(dx<dy) px=-0.5f;
- else px= 0.0f;
- }
- }
- else
- {
- if(dy>=0)
- {
- py=0.5f;
- dx=-dx;
- if(dx>dy) px=-0.5f;
- else if(dx<dy) px= 0.5f;
- else px= 0.0f;
- }
- else
- {
- px=-0.5f;
- if(dx>dy) py=-0.5f;
- else if(dx<dy) py= 0.5f;
- else py= 0.0f;
- }
- } 
- 
- vertex[0].x=(short)((float)x0-px);
- vertex[3].x=(short)((float)x0+py);
- 
- vertex[0].y=(short)((float)y0-py);
- vertex[3].y=(short)((float)y0-px);
- 
- vertex[1].x=(short)((float)x1-py);
- vertex[2].x=(short)((float)x1+px);
-
- vertex[1].y=(short)((float)y1+px);
- vertex[2].y=(short)((float)y1+py);
-
- if(vertex[0].x==vertex[3].x && // ortho rect? done
- vertex[1].x==vertex[2].x &&
- vertex[0].y==vertex[1].y &&
- vertex[2].y==vertex[3].y) return FALSE;
- if(vertex[0].x==vertex[1].x &&
- vertex[2].x==vertex[3].x &&
- vertex[0].y==vertex[3].y &&
- vertex[1].y==vertex[2].y) return FALSE;
-
- vertex[0].x-=VERTEX_OFFX; // otherwise a small offset
- vertex[0].y-=VERTEX_OFFY; // to get better accuracy
- vertex[1].x-=VERTEX_OFFX;
- vertex[1].y-=VERTEX_OFFY;
- vertex[2].x-=VERTEX_OFFX;
- vertex[2].y-=VERTEX_OFFY;
- vertex[3].x-=VERTEX_OFFX;
- vertex[3].y-=VERTEX_OFFY;
-
- return FALSE;
-}
-
-///////////////////////////////////////////////////////// 
-
-BOOL offset2(void)
-{
- if(bDisplayNotSet)
- SetOGLDisplaySettings(1);
-
- if(!(dwActFixes&16))
- {
- lx0=(short)(((int)lx0<<SIGNSHIFT)>>SIGNSHIFT);
- lx1=(short)(((int)lx1<<SIGNSHIFT)>>SIGNSHIFT);
- ly0=(short)(((int)ly0<<SIGNSHIFT)>>SIGNSHIFT);
- ly1=(short)(((int)ly1<<SIGNSHIFT)>>SIGNSHIFT);
-
- if(CheckCoord2()) return TRUE;
- }
-
- vertex[0].x=lx0+PSXDisplay.CumulOffset.x;
- vertex[1].x=lx1+PSXDisplay.CumulOffset.x;
- vertex[0].y=ly0+PSXDisplay.CumulOffset.y;
- vertex[1].y=ly1+PSXDisplay.CumulOffset.y;
-
- return FALSE;
-}
-
-///////////////////////////////////////////////////////// 
-
-BOOL offset3(void)
-{
- if(bDisplayNotSet)
- SetOGLDisplaySettings(1);
-
- if(!(dwActFixes&16))
- {
- lx0=(short)(((int)lx0<<SIGNSHIFT)>>SIGNSHIFT);
- lx1=(short)(((int)lx1<<SIGNSHIFT)>>SIGNSHIFT);
- lx2=(short)(((int)lx2<<SIGNSHIFT)>>SIGNSHIFT);
- ly0=(short)(((int)ly0<<SIGNSHIFT)>>SIGNSHIFT);
- ly1=(short)(((int)ly1<<SIGNSHIFT)>>SIGNSHIFT);
- ly2=(short)(((int)ly2<<SIGNSHIFT)>>SIGNSHIFT);
-
- if(CheckCoord3()) return TRUE;
- }
-
- vertex[0].x=lx0+PSXDisplay.CumulOffset.x;
- vertex[1].x=lx1+PSXDisplay.CumulOffset.x;
- vertex[2].x=lx2+PSXDisplay.CumulOffset.x;
- vertex[0].y=ly0+PSXDisplay.CumulOffset.y;
- vertex[1].y=ly1+PSXDisplay.CumulOffset.y;
- vertex[2].y=ly2+PSXDisplay.CumulOffset.y;
-
- return FALSE;
-}
-
-///////////////////////////////////////////////////////// 
-
-BOOL offset4(void)
-{
- if(bDisplayNotSet)
- SetOGLDisplaySettings(1);
-
- if(!(dwActFixes&16))
- {
- lx0=(short)(((int)lx0<<SIGNSHIFT)>>SIGNSHIFT);
- lx1=(short)(((int)lx1<<SIGNSHIFT)>>SIGNSHIFT);
- lx2=(short)(((int)lx2<<SIGNSHIFT)>>SIGNSHIFT);
- lx3=(short)(((int)lx3<<SIGNSHIFT)>>SIGNSHIFT);
- ly0=(short)(((int)ly0<<SIGNSHIFT)>>SIGNSHIFT);
- ly1=(short)(((int)ly1<<SIGNSHIFT)>>SIGNSHIFT);
- ly2=(short)(((int)ly2<<SIGNSHIFT)>>SIGNSHIFT);
- ly3=(short)(((int)ly3<<SIGNSHIFT)>>SIGNSHIFT);
-
- if(CheckCoord4()) return TRUE;
- }
-
- vertex[0].x=lx0+PSXDisplay.CumulOffset.x;
- vertex[1].x=lx1+PSXDisplay.CumulOffset.x;
- vertex[2].x=lx2+PSXDisplay.CumulOffset.x;
- vertex[3].x=lx3+PSXDisplay.CumulOffset.x;
- vertex[0].y=ly0+PSXDisplay.CumulOffset.y;
- vertex[1].y=ly1+PSXDisplay.CumulOffset.y;
- vertex[2].y=ly2+PSXDisplay.CumulOffset.y;
- vertex[3].y=ly3+PSXDisplay.CumulOffset.y;
-
- return FALSE;
-}
-
-///////////////////////////////////////////////////////// 
-
-void offsetST(void)
-{
- if(bDisplayNotSet)
- SetOGLDisplaySettings(1);
-
- if(!(dwActFixes&16))
- {
- lx0=(short)(((int)lx0<<SIGNSHIFT)>>SIGNSHIFT);
- ly0=(short)(((int)ly0<<SIGNSHIFT)>>SIGNSHIFT);
-
- if(lx0<-512 && PSXDisplay.DrawOffset.x<=-512)
- lx0+=2048;
-
- if(ly0<-512 && PSXDisplay.DrawOffset.y<=-512)
- ly0+=2048;
- }
-
- ly1 = ly0;
- ly2 = ly3 = ly0+sprtH;
- lx3 = lx0;
- lx1 = lx2 = lx0+sprtW;
-
- vertex[0].x=lx0+PSXDisplay.CumulOffset.x;
- vertex[1].x=lx1+PSXDisplay.CumulOffset.x;
- vertex[2].x=lx2+PSXDisplay.CumulOffset.x;
- vertex[3].x=lx3+PSXDisplay.CumulOffset.x;
- vertex[0].y=ly0+PSXDisplay.CumulOffset.y;
- vertex[1].y=ly1+PSXDisplay.CumulOffset.y;
- vertex[2].y=ly2+PSXDisplay.CumulOffset.y;
- vertex[3].y=ly3+PSXDisplay.CumulOffset.y;
-}
-
-///////////////////////////////////////////////////////// 
-
-void offsetScreenUpload(int Position)
-{
- if(bDisplayNotSet)
- SetOGLDisplaySettings(1);
-
- if(Position==-1)
- {
- int lmdx,lmdy;
-
- lmdx=xrUploadArea.x0;
- lmdy=xrUploadArea.y0;
-
- lx0-=lmdx;
- ly0-=lmdy;
- lx1-=lmdx;
- ly1-=lmdy;
- lx2-=lmdx;
- ly2-=lmdy;
- lx3-=lmdx;
- ly3-=lmdy;
- }
- else
- if(Position)
- {
- lx0-=PSXDisplay.DisplayPosition.x;
- ly0-=PSXDisplay.DisplayPosition.y;
- lx1-=PSXDisplay.DisplayPosition.x;
- ly1-=PSXDisplay.DisplayPosition.y;
- lx2-=PSXDisplay.DisplayPosition.x;
- ly2-=PSXDisplay.DisplayPosition.y;
- lx3-=PSXDisplay.DisplayPosition.x;
- ly3-=PSXDisplay.DisplayPosition.y;
- }
- else
- {
- lx0-=PreviousPSXDisplay.DisplayPosition.x;
- ly0-=PreviousPSXDisplay.DisplayPosition.y;
- lx1-=PreviousPSXDisplay.DisplayPosition.x;
- ly1-=PreviousPSXDisplay.DisplayPosition.y;
- lx2-=PreviousPSXDisplay.DisplayPosition.x;
- ly2-=PreviousPSXDisplay.DisplayPosition.y;
- lx3-=PreviousPSXDisplay.DisplayPosition.x;
- ly3-=PreviousPSXDisplay.DisplayPosition.y;
- }
-
- vertex[0].x=lx0 + PreviousPSXDisplay.Range.x0;
- vertex[1].x=lx1 + PreviousPSXDisplay.Range.x0;
- vertex[2].x=lx2 + PreviousPSXDisplay.Range.x0;
- vertex[3].x=lx3 + PreviousPSXDisplay.Range.x0;
- vertex[0].y=ly0 + PreviousPSXDisplay.Range.y0;
- vertex[1].y=ly1 + PreviousPSXDisplay.Range.y0;
- vertex[2].y=ly2 + PreviousPSXDisplay.Range.y0;
- vertex[3].y=ly3 + PreviousPSXDisplay.Range.y0;
-
- if(iUseMask)
- {
- vertex[0].z=vertex[1].z=vertex[2].z=vertex[3].z=gl_z;
- gl_z+=0.00004f;
- }
-}
- 
-///////////////////////////////////////////////////////// 
-
-void offsetBlk(void)
-{
- if(bDisplayNotSet)
- SetOGLDisplaySettings(1);
- 
- vertex[0].x=lx0-PSXDisplay.GDrawOffset.x + PreviousPSXDisplay.Range.x0;
- vertex[1].x=lx1-PSXDisplay.GDrawOffset.x + PreviousPSXDisplay.Range.x0;
- vertex[2].x=lx2-PSXDisplay.GDrawOffset.x + PreviousPSXDisplay.Range.x0;
- vertex[3].x=lx3-PSXDisplay.GDrawOffset.x + PreviousPSXDisplay.Range.x0;
- vertex[0].y=ly0-PSXDisplay.GDrawOffset.y + PreviousPSXDisplay.Range.y0;
- vertex[1].y=ly1-PSXDisplay.GDrawOffset.y + PreviousPSXDisplay.Range.y0;
- vertex[2].y=ly2-PSXDisplay.GDrawOffset.y + PreviousPSXDisplay.Range.y0;
- vertex[3].y=ly3-PSXDisplay.GDrawOffset.y + PreviousPSXDisplay.Range.y0;
-
- if(iUseMask)
- {
- vertex[0].z=vertex[1].z=vertex[2].z=vertex[3].z=gl_z;
- gl_z+=0.00004f;
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-// texture sow/tow calculations
-////////////////////////////////////////////////////////////////////////
-
-void assignTextureVRAMWrite(void)
-{
-#ifdef OWNSCALE
-
- vertex[0].sow=0.5f/ ST_FACVRAMX;
- vertex[0].tow=0.5f/ ST_FACVRAM;
-
- vertex[1].sow=(float)gl_ux[1]/ ST_FACVRAMX;
- vertex[1].tow=0.5f/ ST_FACVRAM;
-
- vertex[2].sow=(float)gl_ux[2]/ ST_FACVRAMX;
- vertex[2].tow=(float)gl_vy[2]/ ST_FACVRAM;
-
- vertex[3].sow=0.5f/ ST_FACVRAMX;
- vertex[3].tow=(float)gl_vy[3]/ ST_FACVRAM;
-
-#else
-
- if(gl_ux[1]==255)
- {
- vertex[0].sow=(gl_ux[0]*255.99f)/255.0f;
- vertex[1].sow=(gl_ux[1]*255.99f)/255.0f;
- vertex[2].sow=(gl_ux[2]*255.99f)/255.0f;
- vertex[3].sow=(gl_ux[3]*255.99f)/255.0f;
- }
- else
- {
- vertex[0].sow=gl_ux[0];
- vertex[1].sow=gl_ux[1];
- vertex[2].sow=gl_ux[2];
- vertex[3].sow=gl_ux[3];
- }
-
- vertex[0].tow=gl_vy[0];
- vertex[1].tow=gl_vy[1];
- vertex[2].tow=gl_vy[2];
- vertex[3].tow=gl_vy[3];
-
-#endif
-}
-
-GLuint gLastTex=0;
-GLuint gLastFMode=(GLuint)-1;
-
-///////////////////////////////////////////////////////// 
-
-void assignTextureSprite(void)
-{
- if(bUsingTWin)
- {
- vertex[0].sow=vertex[3].sow=(float)gl_ux[0]/TWin.UScaleFactor;
- vertex[1].sow=vertex[2].sow=(float)sSprite_ux2/TWin.UScaleFactor;
- vertex[0].tow=vertex[1].tow=(float)gl_vy[0]/TWin.VScaleFactor;
- vertex[2].tow=vertex[3].tow=(float)sSprite_vy2/TWin.VScaleFactor;
- gLastTex=gTexName;
-
- if(iFilterType>0 && iFilterType<3 && iHiResTextures!=2) 
- {
- float fxmin=65536.0f,fxmax=0.0f,fymin=65536.0f,fymax=0.0f;int i;
-
- for(i=0;i<4;i++)
- {
- if(vertex[i].sow<fxmin) fxmin=vertex[i].sow;
- if(vertex[i].tow<fymin) fymin=vertex[i].tow;
- if(vertex[i].sow>fxmax) fxmax=vertex[i].sow;
- if(vertex[i].tow>fymax) fymax=vertex[i].tow; 
- }
-
- for(i=0;i<4;i++)
- {
-#ifdef OWNSCALE
- if(vertex[i].sow==fxmin) vertex[i].sow+=0.375f/(float)TWin.Position.x1;
- if(vertex[i].sow==fxmax) vertex[i].sow-=0.375f/(float)TWin.Position.x1;
- if(vertex[i].tow==fymin) vertex[i].tow+=0.375f/(float)TWin.Position.y1;
- if(vertex[i].tow==fymax) vertex[i].tow-=0.375f/(float)TWin.Position.y1;
-#else
- if(vertex[i].sow==fxmin) vertex[i].sow+=96.0f/(float)TWin.Position.x1;
- if(vertex[i].sow==fxmax) vertex[i].sow-=96.0f/(float)TWin.Position.x1;
- if(vertex[i].tow==fymin) vertex[i].tow+=96.0f/(float)TWin.Position.y1;
- if(vertex[i].tow==fymax) vertex[i].tow-=96.0f/(float)TWin.Position.y1;
-#endif
- }
- }
-
- }
- else
- {
-#ifdef OWNSCALE
-
- vertex[0].sow=vertex[3].sow=(float)gl_ux[0] / ST_FACSPRITE;
- vertex[1].sow=vertex[2].sow=(float)sSprite_ux2 / ST_FACSPRITE;
- vertex[0].tow=vertex[1].tow=(float)gl_vy[0] / ST_FACSPRITE;
- vertex[2].tow=vertex[3].tow=(float)sSprite_vy2 / ST_FACSPRITE;
-
-#else
- 
- vertex[0].sow=vertex[3].sow=gl_ux[0];
- vertex[1].sow=vertex[2].sow=sSprite_ux2;
- vertex[0].tow=vertex[1].tow=gl_vy[0];
- vertex[2].tow=vertex[3].tow=sSprite_vy2;
-
-#endif
-
- if(iFilterType>2) 
- {
- if(gLastTex!=gTexName || gLastFMode!=0)
- {
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- gLastTex=gTexName;gLastFMode=0;
- }
- }
- }
-
- if(usMirror & 0x1000) 
- {
- vertex[0].sow=vertex[1].sow;
- vertex[1].sow=vertex[2].sow=vertex[3].sow;
- vertex[3].sow=vertex[0].sow;
- }
-
- if(usMirror & 0x2000) 
- {
- vertex[0].tow=vertex[3].tow;
- vertex[2].tow=vertex[3].tow=vertex[1].tow;
- vertex[1].tow=vertex[0].tow;
- }
-
-}
-
-///////////////////////////////////////////////////////// 
-
-void assignTexture3(void)
-{
- if(bUsingTWin)
- {
- vertex[0].sow=(float)gl_ux[0]/TWin.UScaleFactor;
- vertex[0].tow=(float)gl_vy[0]/TWin.VScaleFactor;
- vertex[1].sow=(float)gl_ux[1]/TWin.UScaleFactor;
- vertex[1].tow=(float)gl_vy[1]/TWin.VScaleFactor;
- vertex[2].sow=(float)gl_ux[2]/TWin.UScaleFactor;
- vertex[2].tow=(float)gl_vy[2]/TWin.VScaleFactor;
- gLastTex=gTexName;
- }
- else
- {
-#ifdef OWNSCALE
- vertex[0].sow=(float)gl_ux[0] / ST_FACTRI;
- vertex[0].tow=(float)gl_vy[0] / ST_FACTRI;
- vertex[1].sow=(float)gl_ux[1] / ST_FACTRI;
-
- vertex[1].tow=(float)gl_vy[1] / ST_FACTRI;
- vertex[2].sow=(float)gl_ux[2] / ST_FACTRI;
- vertex[2].tow=(float)gl_vy[2] / ST_FACTRI;
-#else
- vertex[0].sow=gl_ux[0];
- vertex[0].tow=gl_vy[0];
- vertex[1].sow=gl_ux[1];
- vertex[1].tow=gl_vy[1];
- vertex[2].sow=gl_ux[2];
- vertex[2].tow=gl_vy[2];
-#endif
-
- if(iFilterType>2) 
- {
- if(gLastTex!=gTexName || gLastFMode!=1)
- {
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
- gLastTex=gTexName;gLastFMode=1;
- }
- }
-
- if(iFilterType) 
- {
- float fxmin=256.0f,fxmax=0.0f,fymin=256.0f,fymax=0.0f;int i;
- for(i=0;i<3;i++)
- {
- if(vertex[i].sow<fxmin) fxmin=vertex[i].sow;
- if(vertex[i].tow<fymin) fymin=vertex[i].tow;
- if(vertex[i].sow>fxmax) fxmax=vertex[i].sow;
- if(vertex[i].tow>fymax) fymax=vertex[i].tow; 
- }
-
- for(i=0;i<3;i++)
- {
- if(vertex[i].sow==fxmin) vertex[i].sow+=ST_BFFACSORT;
- if(vertex[i].sow==fxmax) vertex[i].sow-=ST_BFFACSORT;
- if(vertex[i].tow==fymin) vertex[i].tow+=ST_BFFACSORT;
- if(vertex[i].tow==fymax) vertex[i].tow-=ST_BFFACSORT;
- }
- }
- }
-}
-
-///////////////////////////////////////////////////////// 
-
-void assignTexture4(void)
-{
- if(bUsingTWin)
- {
- vertex[0].sow=(float)gl_ux[0]/TWin.UScaleFactor;
- vertex[0].tow=(float)gl_vy[0]/TWin.VScaleFactor;
- vertex[1].sow=(float)gl_ux[1]/TWin.UScaleFactor;
- vertex[1].tow=(float)gl_vy[1]/TWin.VScaleFactor;
- vertex[2].sow=(float)gl_ux[2]/TWin.UScaleFactor;
- vertex[2].tow=(float)gl_vy[2]/TWin.VScaleFactor;
- vertex[3].sow=(float)gl_ux[3]/TWin.UScaleFactor;
- vertex[3].tow=(float)gl_vy[3]/TWin.VScaleFactor;
- gLastTex=gTexName;
- }
- else
- {
-#ifdef OWNSCALE
- vertex[0].sow=(float)gl_ux[0] / ST_FAC;
- vertex[0].tow=(float)gl_vy[0] / ST_FAC;
- vertex[1].sow=(float)gl_ux[1] / ST_FAC;
- vertex[1].tow=(float)gl_vy[1] / ST_FAC;
- vertex[2].sow=(float)gl_ux[2] / ST_FAC;
- vertex[2].tow=(float)gl_vy[2] / ST_FAC;
- vertex[3].sow=(float)gl_ux[3] / ST_FAC;
- vertex[3].tow=(float)gl_vy[3] / ST_FAC;
-#else
- vertex[0].sow=gl_ux[0];
- vertex[0].tow=gl_vy[0];
- vertex[1].sow=gl_ux[1];
- vertex[1].tow=gl_vy[1];
- vertex[2].sow=gl_ux[2];
- vertex[2].tow=gl_vy[2];
- vertex[3].sow=gl_ux[3];
- vertex[3].tow=gl_vy[3];
-#endif
-
- if(iFilterType>2) 
- {
- if(gLastTex!=gTexName || gLastFMode!=1)
- {
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
- gLastTex=gTexName;gLastFMode=1;
- }
- }
-
- if(iFilterType) 
- {
- float fxmin=256.0f,fxmax=0.0f,fymin=256.0f,fymax=0.0f;int i;
- for(i=0;i<4;i++)
- {
- if(vertex[i].sow<fxmin) fxmin=vertex[i].sow;
- if(vertex[i].tow<fymin) fymin=vertex[i].tow;
- if(vertex[i].sow>fxmax) fxmax=vertex[i].sow;
- if(vertex[i].tow>fymax) fymax=vertex[i].tow; 
- }
-
- for(i=0;i<4;i++)
- {
- if(vertex[i].sow==fxmin) vertex[i].sow+=ST_BFFACSORT;
- if(vertex[i].sow==fxmax) vertex[i].sow-=ST_BFFACSORT;
- if(vertex[i].tow==fymin) vertex[i].tow+=ST_BFFACSORT;
- if(vertex[i].tow==fymax) vertex[i].tow-=ST_BFFACSORT;
- }
- }
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////////
-// render pos / buffers
-////////////////////////////////////////////////////////////////////////
-
-#define EqualRect(pr1,pr2) ((pr1)->left==(pr2)->left && (pr1)->top==(pr2)->top && (pr1)->right==(pr2)->right && (pr1)->bottom==(pr2)->bottom)
-
-////////////////////////////////////////////////////////////////////////
-// SetDisplaySettings: "simply" calcs the new drawing area and updates
-// the ogl clipping (scissor) 
-
-BOOL bSetClip=FALSE;
-
-void SetOGLDisplaySettings(BOOL DisplaySet)
-{
- static RECT rprev={0,0,0,0};
- static RECT rC ={0,0,0,0};
- static int iOldX=0;
- static int iOldY=0;
- RECT r;float XS,YS;
-
- bDisplayNotSet = FALSE;
-
- //----------------------------------------------------// that's a whole screen upload
- if(!DisplaySet)
- {
- RECT rX;
- PSXDisplay.GDrawOffset.x=0;
- PSXDisplay.GDrawOffset.y=0;
-
- PSXDisplay.CumulOffset.x = PSXDisplay.DrawOffset.x+PreviousPSXDisplay.Range.x0;
- PSXDisplay.CumulOffset.y = PSXDisplay.DrawOffset.y+PreviousPSXDisplay.Range.y0;
-
- rprev.left=rprev.left+1;
-
- rX=rRatioRect;
- rX.top=iResY-(rRatioRect.top+rRatioRect.bottom);
-
- if(bSetClip || !EqualRect(&rC,&rX))
- {
- rC=rX;
- glScissor(rC.left,rC.top,rC.right,rC.bottom);
- bSetClip=FALSE; 
- }
- return;
- }
- //----------------------------------------------------// 
-
- PSXDisplay.GDrawOffset.y = PreviousPSXDisplay.DisplayPosition.y;
- PSXDisplay.GDrawOffset.x = PreviousPSXDisplay.DisplayPosition.x;
- PSXDisplay.CumulOffset.x = PSXDisplay.DrawOffset.x - PSXDisplay.GDrawOffset.x+PreviousPSXDisplay.Range.x0;
- PSXDisplay.CumulOffset.y = PSXDisplay.DrawOffset.y - PSXDisplay.GDrawOffset.y+PreviousPSXDisplay.Range.y0;
-
- r.top =PSXDisplay.DrawArea.y0 - PreviousPSXDisplay.DisplayPosition.y;
- r.bottom=PSXDisplay.DrawArea.y1 - PreviousPSXDisplay.DisplayPosition.y;
-
- if(r.bottom<0 || r.top>=PSXDisplay.DisplayMode.y)
- {
- r.top =PSXDisplay.DrawArea.y0 - PSXDisplay.DisplayPosition.y;
- r.bottom=PSXDisplay.DrawArea.y1 - PSXDisplay.DisplayPosition.y;
- }
-
- r.left =PSXDisplay.DrawArea.x0 - PreviousPSXDisplay.DisplayPosition.x;
- r.right =PSXDisplay.DrawArea.x1 - PreviousPSXDisplay.DisplayPosition.x;
-
- if(r.right<0 || r.left>=PSXDisplay.DisplayMode.x)
- {
- r.left =PSXDisplay.DrawArea.x0 - PSXDisplay.DisplayPosition.x;
- r.right =PSXDisplay.DrawArea.x1 - PSXDisplay.DisplayPosition.x;
- }
-
- if(!bSetClip && EqualRect(&r,&rprev) &&
- iOldX == PSXDisplay.DisplayMode.x &&
- iOldY == PSXDisplay.DisplayMode.y)
- return;
-
- rprev = r;
- iOldX = PSXDisplay.DisplayMode.x;
- iOldY = PSXDisplay.DisplayMode.y;
-
- XS=(float)rRatioRect.right/(float)PSXDisplay.DisplayMode.x;
- YS=(float)rRatioRect.bottom/(float)PSXDisplay.DisplayMode.y;
-
- if(PreviousPSXDisplay.Range.x0)
- {
- short s=PreviousPSXDisplay.Range.x0+PreviousPSXDisplay.Range.x1;
-
- r.left+=PreviousPSXDisplay.Range.x0+1;
-
- r.right+=PreviousPSXDisplay.Range.x0;
-
- if(r.left>s) r.left=s;
- if(r.right>s) r.right=s;
- }
-
- if(PreviousPSXDisplay.Range.y0)
- {
- short s=PreviousPSXDisplay.Range.y0+PreviousPSXDisplay.Range.y1;
-
- r.top+=PreviousPSXDisplay.Range.y0+1;
- r.bottom+=PreviousPSXDisplay.Range.y0;
-
- if(r.top>s) r.top=s;
- if(r.bottom>s) r.bottom=s;
- }
-
- // Set the ClipArea variables to reflect the new screen,
- // offset from zero (since it is a new display buffer)
- r.left = (int)(((float)(r.left)) *XS);
- r.top = (int)(((float)(r.top)) *YS);
- r.right = (int)(((float)(r.right + 1))*XS);
- r.bottom = (int)(((float)(r.bottom + 1))*YS);
-
- // Limit clip area to the screen size
- if (r.left > iResX) r.left = iResX;
- if (r.left < 0) r.left = 0;
- if (r.top > iResY) r.top = iResY;
- if (r.top < 0) r.top = 0;
- if (r.right > iResX) r.right = iResX;
- if (r.right < 0) r.right = 0;
- if (r.bottom > iResY) r.bottom = iResY;
- if (r.bottom < 0) r.bottom = 0;
-
- r.right -=r.left;
- r.bottom-=r.top;
- r.top=iResY-(r.top+r.bottom);
-
- r.left+=rRatioRect.left;
- r.top -=rRatioRect.top;
-
- if(bSetClip || !EqualRect(&r,&rC))
- {
- glScissor(r.left,r.top,r.right,r.bottom);
- rC=r;
- bSetClip=FALSE;
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-
+/***************************************************************************
+ draw.c - description
+ -------------------
+ begin : Sun Mar 08 2009
+ copyright : (C) 1999-2009 by Pete Bernert
+ web : www.pbernert.com 
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+#include "stdafx.h"
+
+#define _IN_DRAW
+
+#include "externals.h"
+#include "gpu.h"
+#include "draw.h"
+#include "prim.h"
+#include "texture.h"
+#include "menu.h"
+
+#include "gte_accuracy.h"
+
+#if defined(_MACGL)
+// if you use it, you must include it
+#include <OpenGL/gl.h>
+#include <OpenGL/glext.h>
+#include "drawgl.h"
+#endif
+////////////////////////////////////////////////////////////////////////////////////
+// defines
+
+#define SIGNBIT 0x800
+#define S_MASK 0xf000
+#define L_MASK 0xfffff000
+
+// ownscale: some ogl drivers have buggy texture matrix funcs, so it
+// is safer to calc sow/tow ourselves
+
+#ifdef OWNSCALE
+
+#define ST_FACSPRITE 255.99f
+#define ST_BFFACSPRITE 0.5f/256.0f
+#define ST_BFFACSPRITESORT 0.333f/256.0f
+
+#define ST_OFFSET 0.5f/256.0f;
+
+#define ST_FAC 255.99f
+#define ST_BFFAC 0.5f/256.0f
+#define ST_BFFACSORT 0.333f/256.0f
+
+#define ST_FACTRI 255.99f
+#define ST_BFFACTRI 0.5f/256.0f
+#define ST_BFFACTRISORT 0.333f/256.0f
+
+#define ST_FACVRAMX 255.0f
+#define ST_FACVRAM 256.0f
+
+///////////////////////////////////////////////////////////////
+
+#else
+
+#define ST_BFFACSPRITE 0.5f
+#define ST_BFFACSPRITESORT 0.333f
+
+#define ST_BFFAC 0.5f
+#define ST_BFFACSORT 0.333f
+
+#define ST_BFFACTRI 0.5f
+#define ST_BFFACTRISORT 0.333f
+
+#define ST_OFFSET 0.5f;
+ 
+#endif
+
+////////////////////////////////////////////////////////////////////////////////////
+// draw globals; most will be initialized again later (by config or checks) 
+
+#ifdef _WINDOWS
+HDC dcGlobal = NULL;
+HWND hWWindow;
+#endif
+
+BOOL bIsFirstFrame = TRUE;
+
+// resolution/ratio vars
+
+int iResX;
+int iResY;
+BOOL bKeepRatio = FALSE;
+BOOL bForceRatio43 = FALSE;
+RECT rRatioRect;
+
+// psx mask related vars
+
+BOOL bCheckMask = FALSE;
+int iUseMask = 0;
+int iSetMask = 0;
+unsigned short sSetMask = 0;
+uint32_t lSetMask = 0;
+
+// drawing/coord vars
+
+OGLVertex vertex[4];
+GLubyte gl_ux[8];
+GLubyte gl_vy[8];
+short sprtY,sprtX,sprtH,sprtW;
+
+// drawing options
+
+BOOL bOpaquePass;
+BOOL bAdvancedBlend;
+BOOL bUseLines;
+BOOL bUseAntiAlias;
+int iTexQuality;
+int iUsePalTextures=1;
+BOOL bSnapShot=FALSE;
+BOOL bSmallAlpha=FALSE;
+int iShowFPS=0;
+BOOL bGteAccuracy;
+
+// OGL extension support
+
+int iForceVSync=-1;
+int iUseExts=0;
+BOOL bGLExt;
+BOOL bGLFastMovie=FALSE;
+BOOL bGLSoft;
+BOOL bGLBlend;
+#if defined (_MACGL) // always supported on OSX > 10.4.3
+#define glBlendEquationEXTEx glBlendEquationEXT
+#define glColorTableEXTEx glColorTableEXT
+#else
+PFNGLBLENDEQU glBlendEquationEXTEx=NULL;
+PFNGLCOLORTABLEEXT glColorTableEXTEx=NULL;
+#endif
+// gfx card buffer infos
+
+int iDepthFunc=0;
+int iZBufferDepth=0;
+GLbitfield uiBufferBits=GL_COLOR_BUFFER_BIT;
+
+////////////////////////////////////////////////////////////////////////
+// Set OGL pixel format
+////////////////////////////////////////////////////////////////////////
+ 
+#ifdef _WINDOWS
+BOOL bSetupPixelFormat(HDC hDC)
+{
+ int pixelformat;
+ static PIXELFORMATDESCRIPTOR pfd = 
+ {
+ sizeof(PIXELFORMATDESCRIPTOR), // size of this pfd
+ 1, // version number
+ PFD_DRAW_TO_WINDOW | // support window
+ PFD_SUPPORT_OPENGL | // support OpenGL
+ PFD_DOUBLEBUFFER, // double buffered
+ PFD_TYPE_RGBA, // RGBA type
+ 16, // 16-bit color depth (adjusted later)
+ 0, 0, 0, 0, 0, 0, // color bits ignored
+ 0, // no alpha buffer
+ 0, // shift bit ignored
+ 0, // no accumulation buffer
+ 0, 0, 0, 0, // accum bits ignored
+ 0, // z-buffer 
+ 0,
+ 0, // no auxiliary buffer
+ PFD_MAIN_PLANE, // main layer
+ 0, // reserved
+ 0, 0, 0 // layer masks ignored
+ };
+ 
+ pfd.cColorBits=iColDepth; // set user color depth
+ pfd.cDepthBits=iZBufferDepth; // set user zbuffer (by psx mask)
+
+ if((pixelformat=ChoosePixelFormat(hDC,&pfd))==0) 
+ {
+ MessageBox(NULL,"ChoosePixelFormat failed","Error",MB_OK);
+ return FALSE;
+ }
+
+ if(SetPixelFormat(hDC,pixelformat, &pfd)==FALSE)
+ {
+ MessageBox(NULL,"SetPixelFormat failed","Error",MB_OK);
+ return FALSE;
+ }
+
+ return TRUE;
+}
+#endif
+
+////////////////////////////////////////////////////////////////////////
+// Get extension infos (f.e. pal textures / packed pixels)
+////////////////////////////////////////////////////////////////////////
+
+void GetExtInfos(void) 
+{
+ BOOL bPacked=FALSE; // default: no packed pixel support
+
+ bGLExt=FALSE; // default: no extensions
+ bGLFastMovie=FALSE;
+
+ if(strstr((char *)glGetString(GL_EXTENSIONS), // packed pixels available?
+ "GL_EXT_packed_pixels")) 
+ bPacked=TRUE; // -> ok
+
+ if(bPacked && bUse15bitMdec) // packed available and 15bit mdec wanted?
+ bGLFastMovie=TRUE; // -> ok
+
+ if(bPacked && (iTexQuality==1 || iTexQuality==2)) // packed available and 16 bit texture format?
+ {
+ bGLFastMovie=TRUE; // -> ok
+ bGLExt=TRUE;
+ }
+
+ if(iUseExts && // extension support wanted?
+ (strstr((char *)glGetString(GL_EXTENSIONS),
+ "GL_EXT_texture_edge_clamp") ||
+ strstr((char *)glGetString(GL_EXTENSIONS), // -> check clamp support, if yes: use it
+ "GL_SGIS_texture_edge_clamp")))
+ iClampType=GL_TO_EDGE_CLAMP;
+ else iClampType=GL_CLAMP;
+
+#if !defined (_MACGL) // OSX > 10.4.3 defines this
+ glColorTableEXTEx=(PFNGLCOLORTABLEEXT)NULL; // init ogl palette func pointer
+#endif
+
+#ifndef __sun
+ if(iGPUHeight!=1024 && // no pal textures in ZN mode (height=1024)! 
+ strstr((char *)glGetString(GL_EXTENSIONS), // otherwise: check ogl support
+ "GL_EXT_paletted_texture"))
+ {
+ iUsePalTextures=1; // -> wow, supported, get func pointer
+
+#ifdef _WINDOWS
+ glColorTableEXTEx=(PFNGLCOLORTABLEEXT)wglGetProcAddress("glColorTableEXT");
+#elif defined (_MACGL)
+ // no prob, done already in OSX > 10.4.3
+#else
+ glColorTableEXTEx=(PFNGLCOLORTABLEEXT)glXGetProcAddress("glColorTableEXT");
+#endif
+
+ if(glColorTableEXTEx==NULL) iUsePalTextures=0; // -> ha, cheater... no func, no support
+
+ }
+ else iUsePalTextures=0;
+#else
+ iUsePalTextures=0;
+#endif
+}
+
+////////////////////////////////////////////////////////////////////////
+// Setup some stuff depending on user settings or in-game toggle
+////////////////////////////////////////////////////////////////////////
+
+void SetExtGLFuncs(void)
+{
+ //----------------------------------------------------//
+
+ SetFixes(); // update fix infos
+
+ //----------------------------------------------------//
+
+#ifdef _WINDOWS
+ if((iForceVSync>=0) && // force vsync?
+ strstr((char *)glGetString(GL_EXTENSIONS), // and extension available?
+ "WGL_EXT_swap_control"))
+ {
+ PFNWGLSWAPINTERVALFARPROC wglSwapIntervalEXT= 
+ (PFNWGLSWAPINTERVALFARPROC)wglGetProcAddress("wglSwapIntervalEXT");
+
+ if(wglSwapIntervalEXT) wglSwapIntervalEXT(iForceVSync);
+ }
+#endif
+#ifdef _MACGL
+ SetVSync(iForceVSync);
+#endif
+ if(iUseExts && !(dwActFixes&1024) && // extensions wanted? and not turned off by game fix?
+ strstr((char *)glGetString(GL_EXTENSIONS), // and blend_subtract available?
+ "GL_EXT_blend_subtract"))
+ { // -> get ogl blend function pointer
+#ifdef _WINDOWS
+ glBlendEquationEXTEx=(PFNGLBLENDEQU)wglGetProcAddress("glBlendEquationEXT");
+#elif defined(_MACGL)
+ // no prob, OSX > 10.4.3 has this
+#else
+ glBlendEquationEXTEx=(PFNGLBLENDEQU)glXGetProcAddress("glBlendEquationEXT");
+#endif
+ }
+ else // no subtract blending?
+ {
+ if(glBlendEquationEXTEx) // -> change to additive blending (if subract was active)
+ glBlendEquationEXTEx(FUNC_ADD_EXT);
+#if !defined(_MACGL) // BTW, why set to null? strange...
+ glBlendEquationEXTEx=(PFNGLBLENDEQU)NULL; // -> no more blend function pointer
+#endif
+ }
+
+ //----------------------------------------------------//
+
+ if(iUseExts && bAdvancedBlend && // advanced blending wanted ?
+ strstr((char *)glGetString(GL_EXTENSIONS), // and extension avail?
+ "GL_EXT_texture_env_combine"))
+ {
+ bUseMultiPass=FALSE;bGLBlend=TRUE; // -> no need for 2 passes, perfect
+
+ glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, COMBINE_EXT); 
+ glTexEnvf(GL_TEXTURE_ENV, COMBINE_RGB_EXT, GL_MODULATE); 
+ glTexEnvf(GL_TEXTURE_ENV, COMBINE_ALPHA_EXT, GL_MODULATE); 
+ glTexEnvf(GL_TEXTURE_ENV, RGB_SCALE_EXT, 2.0f); 
+ }
+ else // no advanced blending wanted/available:
+ {
+ if(bAdvancedBlend) bUseMultiPass=TRUE; // -> pseudo-advanced with 2 passes
+ else bUseMultiPass=FALSE; // -> or simple 'bright color' mode
+ bGLBlend=FALSE; // -> no ext blending!
+
+ glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 
+ }
+
+ //----------------------------------------------------//
+ // init standard tex quality 0-2, and big alpha mode 3
+
+ if(!(dwActFixes&0x4000) && iFilterType && iTexQuality>=3) 
+ bSmallAlpha=TRUE; 
+ else bSmallAlpha=FALSE;
+
+ if(bOpaquePass) // opaque mode?
+ {
+ if(dwActFixes&32) 
+ {
+ TCF[0]=CP8RGBA_0;
+ PalTexturedColourFn=CP8RGBA; // -> init col func
+ }
+ else
+ {
+ TCF[0]=XP8RGBA_0;
+ PalTexturedColourFn=XP8RGBA; // -> init col func
+ }
+
+ TCF[1]=XP8RGBA_1;
+ glAlphaFunc(GL_GREATER,0.49f);
+ }
+ else // no opaque mode?
+ {
+ TCF[0]=TCF[1]=P8RGBA;
+ PalTexturedColourFn=P8RGBA; // -> init col func
+ glAlphaFunc(GL_NOTEQUAL,0); // --> set alpha func
+ }
+
+ //----------------------------------------------------//
+
+ LoadSubTexFn=LoadSubTexturePageSort; // init load tex ptr
+
+ giWantedFMT=GL_RGBA; // init ogl tex format
+
+ switch(iTexQuality) // -> quality:
+ {
+ //--------------------------------------------------// 
+ case 0: // -> don't care
+ giWantedRGBA=4;
+ giWantedTYPE=GL_UNSIGNED_BYTE;
+ break;
+ //--------------------------------------------------// 
+ case 1: // -> R4G4B4A4
+ if(bGLExt)
+ {
+ giWantedRGBA=GL_RGBA4;
+ giWantedTYPE=GL_UNSIGNED_SHORT_4_4_4_4_EXT;
+ LoadSubTexFn=LoadPackedSubTexturePageSort;
+ if(bOpaquePass) 
+ {
+ if(dwActFixes&32) PTCF[0]=CP4RGBA_0;
+ else PTCF[0]=XP4RGBA_0;
+ PTCF[1]=XP4RGBA_1;
+ }
+ else 
+ {
+ PTCF[0]=PTCF[1]=P4RGBA;
+ }
+ }
+ else
+ {
+ giWantedRGBA=GL_RGBA4;
+ giWantedTYPE=GL_UNSIGNED_BYTE;
+ }
+ break;
+ //--------------------------------------------------// 
+ case 2: // -> R5B5G5A1
+ if(bGLExt)
+ {
+ giWantedRGBA=GL_RGB5_A1;
+ giWantedTYPE=GL_UNSIGNED_SHORT_5_5_5_1_EXT;
+ LoadSubTexFn=LoadPackedSubTexturePageSort;
+ if(bOpaquePass) 
+ {
+ if(dwActFixes&32) PTCF[0]=CP5RGBA_0;
+ else PTCF[0]=XP5RGBA_0;
+ PTCF[1]=XP5RGBA_1;
+ }
+ else 
+ {
+ PTCF[0]=PTCF[1]=P5RGBA;
+ }
+ }
+ else
+ {
+ giWantedRGBA=GL_RGB5_A1;giWantedTYPE=GL_UNSIGNED_BYTE;
+ }
+ break;
+ //--------------------------------------------------// 
+ case 3: // -> R8G8B8A8
+ giWantedRGBA=GL_RGBA8;
+ giWantedTYPE=GL_UNSIGNED_BYTE;
+
+ if(bSmallAlpha)
+ {
+ if(bOpaquePass) // opaque mode?
+ {
+ if(dwActFixes&32) {TCF[0]=CP8RGBAEx_0;PalTexturedColourFn=CP8RGBAEx;}
+ else {TCF[0]=XP8RGBAEx_0;PalTexturedColourFn=XP8RGBAEx;}
+ TCF[1]=XP8RGBAEx_1;
+ }
+ }
+
+ break;
+ //--------------------------------------------------// 
+ case 4: // -> R8G8B8A8
+ giWantedRGBA = GL_RGBA8;
+ giWantedTYPE = GL_UNSIGNED_BYTE;
+
+ if(strstr((char *)glGetString(GL_EXTENSIONS), // and extension avail?
+ "GL_EXT_bgra"))
+ {
+ giWantedFMT = GL_BGRA_EXT;
+
+ if(bOpaquePass) // opaque mode?
+ {
+ if(bSmallAlpha)
+ {
+ if(dwActFixes&32) {TCF[0]=CP8BGRAEx_0;PalTexturedColourFn=CP8RGBAEx;}
+ else {TCF[0]=XP8BGRAEx_0;PalTexturedColourFn=XP8RGBAEx;}
+ TCF[1]=XP8BGRAEx_1;
+ }
+ else
+ {
+ if(dwActFixes&32) {TCF[0]=CP8BGRA_0;PalTexturedColourFn=CP8RGBA;}
+ else {TCF[0]=XP8BGRA_0;PalTexturedColourFn=XP8RGBA;}
+ TCF[1]=XP8BGRA_1;
+ }
+ }
+ else // no opaque mode?
+ {
+ TCF[0]=TCF[1]=P8BGRA; // -> init col func
+ }
+ }
+ else
+ {
+ iTexQuality=3;
+ if(bSmallAlpha)
+ {
+ if(bOpaquePass) // opaque mode?
+ {
+ if(dwActFixes&32) {TCF[0]=CP8RGBAEx_0;PalTexturedColourFn=CP8RGBAEx;}
+ else {TCF[0]=XP8RGBAEx_0;PalTexturedColourFn=XP8RGBAEx;}
+ TCF[1]=XP8RGBAEx_1;
+ }
+ }
+ }
+
+ break;
+ //--------------------------------------------------// 
+ }
+
+ bBlendEnable=FALSE; // init blending: off
+ glDisable(GL_BLEND);
+
+ SetScanTrans(); // init scan lines (if wanted)
+}
+
+////////////////////////////////////////////////////////////////////////
+// setup scan lines
+////////////////////////////////////////////////////////////////////////
+
+#define R_TSP 0x00,0x45,0x00,0xff
+#define G_TSP 0x00,0x00,0x45,0xff
+#define B_TSP 0x45,0x00,0x00,0xff
+#define O_TSP 0x45,0x45,0x45,0xff
+#define N_TSP 0x00,0x00,0x00,0xff
+
+GLuint gTexScanName=0;
+
+GLubyte texscan[4][16]= 
+{
+{R_TSP, G_TSP, B_TSP, N_TSP},
+{O_TSP, N_TSP, O_TSP, N_TSP},
+{B_TSP, N_TSP, R_TSP, G_TSP},
+{O_TSP, N_TSP, O_TSP, N_TSP}
+};
+
+void CreateScanLines(void)
+{
+ if(iUseScanLines)
+ {
+ int y;
+ if(iScanBlend<0) // special scan mask mode
+ {
+ glGenTextures(1, &gTexScanName);
+ glBindTexture(GL_TEXTURE_2D, gTexScanName);
+
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+ glTexImage2D(GL_TEXTURE_2D, 0, 4, 4, 4, 0,GL_RGBA, GL_UNSIGNED_BYTE, texscan);
+ }
+ else // otherwise simple lines in a display list
+ {
+ uiScanLine=glGenLists(1);
+ glNewList(uiScanLine,GL_COMPILE);
+ #ifdef _MACGL
+ // not mac specific, just commenting out to be friendly
+ // use it if you like
+ // this draws anti-aliased lines with user-chosen color
+ glPushAttrib(GL_ENABLE_BIT | GL_COLOR_BUFFER_BIT | GL_CURRENT_BIT);
+ glEnable(GL_BLEND | GL_LINE_SMOOTH);
+ glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
+ glColor4f(iScanlineColor[0],iScanlineColor[1],iScanlineColor[2],iScanlineColor[3]);
+ glBegin(GL_LINES);
+ for(y=0;y<iResY;y+=2)
+ {
+ glVertex2f(0,y);
+ glVertex2f(iResX,y);
+ }
+ glEnd();
+ glPopAttrib();
+	 #else
+	 for(y=0;y<iResY;y+=2)
+ {
+ glBegin(GL_QUADS);
+ glVertex2f(0,y);
+ glVertex2f(iResX,y);
+ glVertex2f(iResX,y+1);
+ glVertex2f(0,y+1);
+ glEnd();
+ }
+ 
+ #endif
+ glEndList();
+ }
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+// Initialize OGL
+////////////////////////////////////////////////////////////////////////
+
+#ifdef _WINDOWS 
+HGLRC GLCONTEXT=NULL;
+#endif
+
+int GLinitialize() 
+{
+#ifdef _WINDOWS
+ HGLRC objectRC;
+ // init
+ dcGlobal = GetDC(hWWindow); // FIRST: dc/rc stuff
+ objectRC = wglCreateContext(dcGlobal); 
+ GLCONTEXT=objectRC;
+ wglMakeCurrent(dcGlobal, objectRC);
+ // CheckWGLExtensions(dcGlobal);
+ if(bWindowMode) ReleaseDC(hWWindow,dcGlobal); // win mode: release dc again
+#endif
+#if defined (_MACGL)
+ BringContextForward();
+#endif
+ glViewport(rRatioRect.left, // init viewport by ratio rect
+ iResY-(rRatioRect.top+rRatioRect.bottom),
+ rRatioRect.right, 
+ rRatioRect.bottom); 
+ 
+ glScissor(0, 0, iResX, iResY); // init clipping (fullscreen)
+ glEnable(GL_SCISSOR_TEST); 
+
+#ifndef OWNSCALE
+ glMatrixMode(GL_TEXTURE); // init psx tex sow and tow if not "ownscale"
+ glLoadIdentity();
+ glScalef(1.0f/255.99f,1.0f/255.99f,1.0f); // geforce precision hack
+#endif 
+
+ glMatrixMode(GL_PROJECTION); // init projection with psx resolution
+ glLoadIdentity();
+ glOrtho(0,PSXDisplay.DisplayMode.x,
+ PSXDisplay.DisplayMode.y, 0, -1, 1);
+
+ if(iZBufferDepth) // zbuffer?
+ {
+ uiBufferBits=GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT;
+ glEnable(GL_DEPTH_TEST); 
+ glDepthFunc(GL_ALWAYS);
+ iDepthFunc=1;
+ }
+ else // no zbuffer?
+ {
+ uiBufferBits=GL_COLOR_BUFFER_BIT;
+ glDisable(GL_DEPTH_TEST);
+ }
+
+ glClearColor(0.0f, 0.0f, 0.0f, 0.0f); // first buffer clear
+ glClear(uiBufferBits);
+
+ if(bUseLines) // funny lines 
+ {
+ glPolygonMode(GL_FRONT, GL_LINE); 
+ glPolygonMode(GL_BACK, GL_LINE); 
+ }
+ else // or the real filled thing
+ {
+ glPolygonMode(GL_FRONT, GL_FILL);
+ glPolygonMode(GL_BACK, GL_FILL);
+ }
+
+ MakeDisplayLists(); // lists for menu/opaque
+ GetExtInfos(); // get ext infos
+ SetExtGLFuncs(); // init all kind of stuff (tex function pointers)
+ 
+ glEnable(GL_ALPHA_TEST); // wanna alpha test
+
+ if(!bUseAntiAlias) // no anti-alias (default)
+ {
+ glDisable(GL_LINE_SMOOTH);
+ glDisable(GL_POLYGON_SMOOTH);
+ glDisable(GL_POINT_SMOOTH);
+ }
+ else // wanna try it? glitches galore...
+ { 
+ glHint(GL_PERSPECTIVE_CORRECTION_HINT,GL_NICEST);
+ glEnable(GL_LINE_SMOOTH);
+ glEnable(GL_POLYGON_SMOOTH);
+ glEnable(GL_POINT_SMOOTH);
+ glHint(GL_LINE_SMOOTH_HINT,GL_NICEST);
+ glHint(GL_POINT_SMOOTH_HINT,GL_NICEST);
+ glHint(GL_POLYGON_SMOOTH_HINT,GL_NICEST);
+ }
+
+ ubGloAlpha=127; // init some drawing vars
+ ubGloColAlpha=127;
+ TWin.UScaleFactor = 1;
+ TWin.VScaleFactor = 1;
+ bDrawMultiPass=FALSE;
+ bTexEnabled=FALSE;
+ bUsingTWin=FALSE;
+ 
+ if(bDrawDither) glEnable(GL_DITHER); // dither mode
+ else glDisable(GL_DITHER); 
+
+ glDisable(GL_FOG); // turn all (currently) unused modes off
+ glDisable(GL_LIGHTING); 
+ glDisable(GL_LOGIC_OP);
+ glDisable(GL_STENCIL_TEST); 
+ glDisable(GL_TEXTURE_1D);
+ glDisable(GL_TEXTURE_2D);
+ glDisable(GL_CULL_FACE);
+
+ glPixelTransferi(GL_RED_SCALE, 1); // to be sure:
+ glPixelTransferi(GL_RED_BIAS, 0); // init more OGL vals
+ glPixelTransferi(GL_GREEN_SCALE, 1);
+ glPixelTransferi(GL_GREEN_BIAS, 0);
+ glPixelTransferi(GL_BLUE_SCALE, 1);
+ glPixelTransferi(GL_BLUE_BIAS, 0);
+ glPixelTransferi(GL_ALPHA_SCALE, 1);
+ glPixelTransferi(GL_ALPHA_BIAS, 0); 
+
+#ifdef _WINDOWS
+ // detect Windows hw/sw mode (just for info)
+ if(!strcmp("Microsoft Corporation",(LPTSTR)glGetString(GL_VENDOR)) &&
+ !strcmp("GDI Generic", (LPTSTR)glGetString(GL_RENDERER)))
+ bGLSoft=TRUE;
+ else bGLSoft=FALSE;
+#endif
+
+ glFlush(); // we are done...
+ glFinish(); 
+
+ CreateScanLines(); // setup scanline stuff (if wanted)
+
+ CheckTextureMemory(); // check available tex memory
+
+ if(bKeepRatio) SetAspectRatio(); // set ratio
+
+ if(iShowFPS) // user wants FPS display on startup?
+ {
+ ulKeybits|=KEY_SHOWFPS; // -> ok, turn display on
+ szDispBuf[0]=0;
+ BuildDispMenu(0);
+ }
+ 
+ bIsFirstFrame = FALSE; // we have survived the first frame :)
+
+ return 0;
+}
+
+////////////////////////////////////////////////////////////////////////
+// clean up OGL stuff
+////////////////////////////////////////////////////////////////////////
+
+void GLcleanup() 
+{ 
+ KillDisplayLists(); // bye display lists
+
+ if(iUseScanLines) // scanlines used?
+ {
+ if(iScanBlend<0)
+ {
+ if(gTexScanName!=0) // some scanline tex?
+ glDeleteTextures(1, &gTexScanName); // -> delete it
+ gTexScanName=0;
+ }
+ else glDeleteLists(uiScanLine,1); // otherwise del scanline display list
+ }
+
+ CleanupTextureStore(); // bye textures
+
+#ifdef _WINDOWS 
+ wglMakeCurrent(NULL, NULL); // bye context
+ if(GLCONTEXT) wglDeleteContext(GLCONTEXT);
+ if(!bWindowMode && dcGlobal) 
+ ReleaseDC(hWWindow,dcGlobal);
+#endif
+}
+
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////////////////
+// Offset stuff
+////////////////////////////////////////////////////////////////////////
+
+// please note: it is hardly do-able in a hw/accel plugin to get the 
+// real psx polygon coord mapping right... the following
+// works not to bad with many games, though
+
+static __inline BOOL CheckCoord4()
+{
+ if(lx0<0)
+ {
+ if(((lx1-lx0)>CHKMAX_X) ||
+ ((lx2-lx0)>CHKMAX_X)) 
+ {
+ if(lx3<0)
+ {
+ if((lx1-lx3)>CHKMAX_X) return TRUE;
+ if((lx2-lx3)>CHKMAX_X) return TRUE;
+ }
+ }
+ }
+ if(lx1<0)
+ {
+ if((lx0-lx1)>CHKMAX_X) return TRUE;
+ if((lx2-lx1)>CHKMAX_X) return TRUE;
+ if((lx3-lx1)>CHKMAX_X) return TRUE;
+ }
+ if(lx2<0)
+ {
+ if((lx0-lx2)>CHKMAX_X) return TRUE;
+ if((lx1-lx2)>CHKMAX_X) return TRUE;
+ if((lx3-lx2)>CHKMAX_X) return TRUE;
+ }
+ if(lx3<0)
+ {
+ if(((lx1-lx3)>CHKMAX_X) ||
+ ((lx2-lx3)>CHKMAX_X))
+ {
+ if(lx0<0)
+ {
+ if((lx1-lx0)>CHKMAX_X) return TRUE;
+ if((lx2-lx0)>CHKMAX_X) return TRUE;
+ }
+ }
+ }
+ 
+
+ if(ly0<0)
+ {
+ if((ly1-ly0)>CHKMAX_Y) return TRUE;
+ if((ly2-ly0)>CHKMAX_Y) return TRUE;
+ }
+ if(ly1<0)
+ {
+ if((ly0-ly1)>CHKMAX_Y) return TRUE;
+ if((ly2-ly1)>CHKMAX_Y) return TRUE;
+ if((ly3-ly1)>CHKMAX_Y) return TRUE;
+ }
+ if(ly2<0)
+ {
+ if((ly0-ly2)>CHKMAX_Y) return TRUE;
+ if((ly1-ly2)>CHKMAX_Y) return TRUE;
+ if((ly3-ly2)>CHKMAX_Y) return TRUE;
+ }
+ if(ly3<0)
+ {
+ if((ly1-ly3)>CHKMAX_Y) return TRUE;
+ if((ly2-ly3)>CHKMAX_Y) return TRUE;
+ }
+
+ return FALSE;
+}
+
+static __inline BOOL CheckCoord3()
+{
+ if(lx0<0)
+ {
+ if((lx1-lx0)>CHKMAX_X) return TRUE;
+ if((lx2-lx0)>CHKMAX_X) return TRUE;
+ }
+ if(lx1<0)
+ {
+ if((lx0-lx1)>CHKMAX_X) return TRUE;
+ if((lx2-lx1)>CHKMAX_X) return TRUE;
+ }
+ if(lx2<0)
+ {
+ if((lx0-lx2)>CHKMAX_X) return TRUE;
+ if((lx1-lx2)>CHKMAX_X) return TRUE;
+ }
+ if(ly0<0)
+ {
+ if((ly1-ly0)>CHKMAX_Y) return TRUE;
+ if((ly2-ly0)>CHKMAX_Y) return TRUE;
+ }
+ if(ly1<0)
+ {
+ if((ly0-ly1)>CHKMAX_Y) return TRUE;
+ if((ly2-ly1)>CHKMAX_Y) return TRUE;
+ }
+ if(ly2<0)
+ {
+ if((ly0-ly2)>CHKMAX_Y) return TRUE;
+ if((ly1-ly2)>CHKMAX_Y) return TRUE;
+ }
+
+ return FALSE;
+}
+
+
+static __inline BOOL CheckCoord2()
+{
+ if(lx0<0)
+ {
+ if((lx1-lx0)>CHKMAX_X) return TRUE;
+ }
+ if(lx1<0)
+ {
+ if((lx0-lx1)>CHKMAX_X) return TRUE;
+ }
+ if(ly0<0)
+ {
+ if((ly1-ly0)>CHKMAX_Y) return TRUE;
+ }
+ if(ly1<0)
+ {
+ if((ly0-ly1)>CHKMAX_Y) return TRUE;
+ }
+
+ return FALSE;
+}
+
+/*
+//Lewpys "offsetline" func:
+
+void offsetline(void)
+{
+	float x0, x1, y0, y1, oolength, xl, yl;
+
+ if(bDisplayNotSet)
+ SetOGLDisplaySettings(1);
+
+ if(!(dwActFixes&16))
+ {
+ if((lx0 & SIGNBIT)) lx0|=S_MASK;
+ else lx0&=~S_MASK;
+ if((lx1 & SIGNBIT)) lx1|=S_MASK;
+ else lx1&=~S_MASK;
+ if((ly0 & SIGNBIT)) ly0|=S_MASK;
+ else ly0&=~S_MASK;
+ if((ly1 & SIGNBIT)) ly1|=S_MASK;
+ else ly1&=~S_MASK;
+ }
+
+ x0 = (float)(lx0 + PSXDisplay.CumulOffset.x);
+ x1 = (float)(lx1 + PSXDisplay.CumulOffset.x);
+ y0 = (float)(ly0 + PSXDisplay.CumulOffset.y);
+ y1 = (float)(ly1 + PSXDisplay.CumulOffset.y);
+
+ oolength = (float)1/((float)sqrt((y1 - y0)*(y1 - y0) + (x1 - x0)*(x1 - x0)) * (float)2);
+//	oolength = (float)1/((float)sqrt(((y1 - y0)*(y1 - y0) + (x1 - x0)*(x1 - x0)) * (float)2));
+
+	xl = (x1 - x0) * oolength;
+	yl = (y1 - y0) * oolength;
+
+	x0 += 0.5f;
+	x1 += 0.5f;
+
+	x0 -= xl - yl;
+	x1 += xl + yl;
+	y0 -= yl + xl;
+	y1 += yl - xl;
+
+	vertex[0].x=x0;
+	vertex[1].x=x1;
+	vertex[0].y=y0;
+	vertex[1].y=y1;
+
+	x0 -= yl * 2;
+	x1 -= yl * 2;
+	y0 += xl * 2;
+	y1 += xl * 2;
+
+	vertex[2].x=x1;
+	vertex[3].x=x0;
+	vertex[2].y=y1;
+	vertex[3].y=y0;
+}
+*/
+
+
+// Pete's way: a very easy (and hopefully fast) approach for lines
+// without sqrt... using a small float -> short cast trick :)
+
+#define VERTEX_OFFX 0.2f
+#define VERTEX_OFFY 0.2f
+
+BOOL offsetline(void) 
+{
+ short x0,x1,y0,y1,dx,dy;float px,py;
+
+ if(bDisplayNotSet)
+ SetOGLDisplaySettings(1);
+
+ if(!(dwActFixes&16))
+ {
+ lx0=(short)(((int)lx0<<SIGNSHIFT)>>SIGNSHIFT);
+ lx1=(short)(((int)lx1<<SIGNSHIFT)>>SIGNSHIFT);
+ ly0=(short)(((int)ly0<<SIGNSHIFT)>>SIGNSHIFT);
+ ly1=(short)(((int)ly1<<SIGNSHIFT)>>SIGNSHIFT);
+
+ if(CheckCoord2()) return TRUE;
+ }
+
+ x0 = (lx0 + PSXDisplay.CumulOffset.x)+1;
+ x1 = (lx1 + PSXDisplay.CumulOffset.x)+1;
+ y0 = (ly0 + PSXDisplay.CumulOffset.y)+1;
+ y1 = (ly1 + PSXDisplay.CumulOffset.y)+1;
+ 
+ dx=x1-x0;
+ dy=y1-y0;
+ 
+ if(dx>=0)
+ {
+ if(dy>=0)
+ {
+ px=0.5f;
+ if(dx>dy) py=-0.5f;
+ else if(dx<dy) py= 0.5f;
+ else py= 0.0f;
+ }
+ else
+ {
+ py=-0.5f;
+ dy=-dy;
+ if(dx>dy) px= 0.5f;
+ else if(dx<dy) px=-0.5f;
+ else px= 0.0f;
+ }
+ }
+ else
+ {
+ if(dy>=0)
+ {
+ py=0.5f;
+ dx=-dx;
+ if(dx>dy) px=-0.5f;
+ else if(dx<dy) px= 0.5f;
+ else px= 0.0f;
+ }
+ else
+ {
+ px=-0.5f;
+ if(dx>dy) py=-0.5f;
+ else if(dx<dy) py= 0.5f;
+ else py= 0.0f;
+ }
+ } 
+ 
+ vertex[0].x=(short)((float)x0-px);
+ vertex[3].x=(short)((float)x0+py);
+ 
+ vertex[0].y=(short)((float)y0-py);
+ vertex[3].y=(short)((float)y0-px);
+ 
+ vertex[1].x=(short)((float)x1-py);
+ vertex[2].x=(short)((float)x1+px);
+
+ vertex[1].y=(short)((float)y1+px);
+ vertex[2].y=(short)((float)y1+py);
+
+ if(vertex[0].x==vertex[3].x && // ortho rect? done
+ vertex[1].x==vertex[2].x &&
+ vertex[0].y==vertex[1].y &&
+ vertex[2].y==vertex[3].y) return FALSE;
+ if(vertex[0].x==vertex[1].x &&
+ vertex[2].x==vertex[3].x &&
+ vertex[0].y==vertex[3].y &&
+ vertex[1].y==vertex[2].y) return FALSE;
+
+ vertex[0].x-=VERTEX_OFFX; // otherwise a small offset
+ vertex[0].y-=VERTEX_OFFY; // to get better accuracy
+ vertex[1].x-=VERTEX_OFFX;
+ vertex[1].y-=VERTEX_OFFY;
+ vertex[2].x-=VERTEX_OFFX;
+ vertex[2].y-=VERTEX_OFFY;
+ vertex[3].x-=VERTEX_OFFX;
+ vertex[3].y-=VERTEX_OFFY;
+
+ return FALSE;
+}
+
+///////////////////////////////////////////////////////// 
+
+BOOL offset2(void)
+{
+ if(bDisplayNotSet)
+ SetOGLDisplaySettings(1);
+
+ if(!(dwActFixes&16))
+ {
+ lx0=(short)(((int)lx0<<SIGNSHIFT)>>SIGNSHIFT);
+ lx1=(short)(((int)lx1<<SIGNSHIFT)>>SIGNSHIFT);
+ ly0=(short)(((int)ly0<<SIGNSHIFT)>>SIGNSHIFT);
+ ly1=(short)(((int)ly1<<SIGNSHIFT)>>SIGNSHIFT);
+
+ if(CheckCoord2()) return TRUE;
+ }
+
+ if(!getGteVertex(lx0, ly0, &vertex[0].x, &vertex[0].y))
+ {
+	vertex[0].x=lx0;
+	vertex[0].y=ly0;
+ }
+ if(!getGteVertex(lx1, ly1, &vertex[1].x, &vertex[1].y))
+ {
+	vertex[1].x=lx1;
+	vertex[1].y=ly1;
+ }
+
+ vertex[0].x+=PSXDisplay.CumulOffset.x;
+ vertex[1].x+=PSXDisplay.CumulOffset.x;
+ vertex[0].y+=PSXDisplay.CumulOffset.y;
+ vertex[1].y+=PSXDisplay.CumulOffset.y;
+
+ return FALSE;
+}
+
+///////////////////////////////////////////////////////// 
+
+BOOL offset3(void)
+{
+ if(bDisplayNotSet)
+ SetOGLDisplaySettings(1);
+
+ if(!(dwActFixes&16))
+ {
+ lx0=(short)(((int)lx0<<SIGNSHIFT)>>SIGNSHIFT);
+ lx1=(short)(((int)lx1<<SIGNSHIFT)>>SIGNSHIFT);
+ lx2=(short)(((int)lx2<<SIGNSHIFT)>>SIGNSHIFT);
+ ly0=(short)(((int)ly0<<SIGNSHIFT)>>SIGNSHIFT);
+ ly1=(short)(((int)ly1<<SIGNSHIFT)>>SIGNSHIFT);
+ ly2=(short)(((int)ly2<<SIGNSHIFT)>>SIGNSHIFT);
+
+ if(CheckCoord3()) return TRUE;
+ }
+ 
+ if(!getGteVertex(lx0, ly0, &vertex[0].x, &vertex[0].y))
+ {
+	vertex[0].x=lx0;
+	vertex[0].y=ly0;
+ }
+ if(!getGteVertex(lx1, ly1, &vertex[1].x, &vertex[1].y))
+ {
+	vertex[1].x=lx1;
+	vertex[1].y=ly1;
+ }
+ if(!getGteVertex(lx2, ly2, &vertex[2].x, &vertex[2].y))
+ {
+	vertex[2].x=lx2;
+	vertex[2].y=ly2;
+ }
+
+ vertex[0].x+=PSXDisplay.CumulOffset.x;
+ vertex[1].x+=PSXDisplay.CumulOffset.x;
+ vertex[2].x+=PSXDisplay.CumulOffset.x;
+ vertex[0].y+=PSXDisplay.CumulOffset.y;
+ vertex[1].y+=PSXDisplay.CumulOffset.y;
+ vertex[2].y+=PSXDisplay.CumulOffset.y;
+
+ return FALSE;
+}
+
+///////////////////////////////////////////////////////// 
+
+BOOL offset4(void)
+{
+ if(bDisplayNotSet)
+ SetOGLDisplaySettings(1);
+
+ if(!(dwActFixes&16))
+ {
+ lx0=(short)(((int)lx0<<SIGNSHIFT)>>SIGNSHIFT);
+ lx1=(short)(((int)lx1<<SIGNSHIFT)>>SIGNSHIFT);
+ lx2=(short)(((int)lx2<<SIGNSHIFT)>>SIGNSHIFT);
+ lx3=(short)(((int)lx3<<SIGNSHIFT)>>SIGNSHIFT);
+ ly0=(short)(((int)ly0<<SIGNSHIFT)>>SIGNSHIFT);
+ ly1=(short)(((int)ly1<<SIGNSHIFT)>>SIGNSHIFT);
+ ly2=(short)(((int)ly2<<SIGNSHIFT)>>SIGNSHIFT);
+ ly3=(short)(((int)ly3<<SIGNSHIFT)>>SIGNSHIFT);
+
+ if(CheckCoord4()) return TRUE;
+ }
+
+ if(!getGteVertex(lx0, ly0, &vertex[0].x, &vertex[0].y))
+ {
+	vertex[0].x=lx0;
+	vertex[0].y=ly0;
+ }
+ if(!getGteVertex(lx1, ly1, &vertex[1].x, &vertex[1].y))
+ {
+	vertex[1].x=lx1;
+	vertex[1].y=ly1;
+ }
+ if(!getGteVertex(lx2, ly2, &vertex[2].x, &vertex[2].y))
+ {
+	vertex[2].x=lx2;
+	vertex[2].y=ly2;
+ }
+ if(!getGteVertex(lx3, ly3, &vertex[3].x, &vertex[3].y))
+ {
+	vertex[3].x=lx3;
+	vertex[3].y=ly3;
+ }
+ 
+ vertex[0].x+=PSXDisplay.CumulOffset.x;
+ vertex[1].x+=PSXDisplay.CumulOffset.x;
+ vertex[2].x+=PSXDisplay.CumulOffset.x;
+ vertex[3].x+=PSXDisplay.CumulOffset.x;
+ vertex[0].y+=PSXDisplay.CumulOffset.y;
+ vertex[1].y+=PSXDisplay.CumulOffset.y;
+ vertex[2].y+=PSXDisplay.CumulOffset.y;
+ vertex[3].y+=PSXDisplay.CumulOffset.y;
+
+ return FALSE;
+}
+
+///////////////////////////////////////////////////////// 
+
+void offsetST(void)
+{
+ if(bDisplayNotSet)
+ SetOGLDisplaySettings(1);
+
+ if(!(dwActFixes&16))
+ {
+ lx0=(short)(((int)lx0<<SIGNSHIFT)>>SIGNSHIFT);
+ ly0=(short)(((int)ly0<<SIGNSHIFT)>>SIGNSHIFT);
+
+ if(lx0<-512 && PSXDisplay.DrawOffset.x<=-512)
+ lx0+=2048;
+
+ if(ly0<-512 && PSXDisplay.DrawOffset.y<=-512)
+ ly0+=2048;
+ }
+
+ ly1 = ly0;
+ ly2 = ly3 = ly0+sprtH;
+ lx3 = lx0;
+ lx1 = lx2 = lx0+sprtW;
+
+ vertex[0].x=lx0+PSXDisplay.CumulOffset.x;
+ vertex[1].x=lx1+PSXDisplay.CumulOffset.x;
+ vertex[2].x=lx2+PSXDisplay.CumulOffset.x;
+ vertex[3].x=lx3+PSXDisplay.CumulOffset.x;
+ vertex[0].y=ly0+PSXDisplay.CumulOffset.y;
+ vertex[1].y=ly1+PSXDisplay.CumulOffset.y;
+ vertex[2].y=ly2+PSXDisplay.CumulOffset.y;
+ vertex[3].y=ly3+PSXDisplay.CumulOffset.y;
+}
+
+///////////////////////////////////////////////////////// 
+
+void offsetScreenUpload(int Position)
+{
+ if(bDisplayNotSet)
+ SetOGLDisplaySettings(1);
+
+ if(Position==-1)
+ {
+ int lmdx,lmdy;
+
+ lmdx=xrUploadArea.x0;
+ lmdy=xrUploadArea.y0;
+
+ lx0-=lmdx;
+ ly0-=lmdy;
+ lx1-=lmdx;
+ ly1-=lmdy;
+ lx2-=lmdx;
+ ly2-=lmdy;
+ lx3-=lmdx;
+ ly3-=lmdy;
+ }
+ else
+ if(Position)
+ {
+ lx0-=PSXDisplay.DisplayPosition.x;
+ ly0-=PSXDisplay.DisplayPosition.y;
+ lx1-=PSXDisplay.DisplayPosition.x;
+ ly1-=PSXDisplay.DisplayPosition.y;
+ lx2-=PSXDisplay.DisplayPosition.x;
+ ly2-=PSXDisplay.DisplayPosition.y;
+ lx3-=PSXDisplay.DisplayPosition.x;
+ ly3-=PSXDisplay.DisplayPosition.y;
+ }
+ else
+ {
+ lx0-=PreviousPSXDisplay.DisplayPosition.x;
+ ly0-=PreviousPSXDisplay.DisplayPosition.y;
+ lx1-=PreviousPSXDisplay.DisplayPosition.x;
+ ly1-=PreviousPSXDisplay.DisplayPosition.y;
+ lx2-=PreviousPSXDisplay.DisplayPosition.x;
+ ly2-=PreviousPSXDisplay.DisplayPosition.y;
+ lx3-=PreviousPSXDisplay.DisplayPosition.x;
+ ly3-=PreviousPSXDisplay.DisplayPosition.y;
+ }
+
+ vertex[0].x=lx0 + PreviousPSXDisplay.Range.x0;
+ vertex[1].x=lx1 + PreviousPSXDisplay.Range.x0;
+ vertex[2].x=lx2 + PreviousPSXDisplay.Range.x0;
+ vertex[3].x=lx3 + PreviousPSXDisplay.Range.x0;
+ vertex[0].y=ly0 + PreviousPSXDisplay.Range.y0;
+ vertex[1].y=ly1 + PreviousPSXDisplay.Range.y0;
+ vertex[2].y=ly2 + PreviousPSXDisplay.Range.y0;
+ vertex[3].y=ly3 + PreviousPSXDisplay.Range.y0;
+
+ if(iUseMask)
+ {
+ vertex[0].z=vertex[1].z=vertex[2].z=vertex[3].z=gl_z;
+ gl_z+=0.00004f;
+ }
+}
+ 
+///////////////////////////////////////////////////////// 
+
+void offsetBlk(void)
+{
+ if(bDisplayNotSet)
+ SetOGLDisplaySettings(1);
+ 
+ vertex[0].x=lx0-PSXDisplay.GDrawOffset.x + PreviousPSXDisplay.Range.x0;
+ vertex[1].x=lx1-PSXDisplay.GDrawOffset.x + PreviousPSXDisplay.Range.x0;
+ vertex[2].x=lx2-PSXDisplay.GDrawOffset.x + PreviousPSXDisplay.Range.x0;
+ vertex[3].x=lx3-PSXDisplay.GDrawOffset.x + PreviousPSXDisplay.Range.x0;
+ vertex[0].y=ly0-PSXDisplay.GDrawOffset.y + PreviousPSXDisplay.Range.y0;
+ vertex[1].y=ly1-PSXDisplay.GDrawOffset.y + PreviousPSXDisplay.Range.y0;
+ vertex[2].y=ly2-PSXDisplay.GDrawOffset.y + PreviousPSXDisplay.Range.y0;
+ vertex[3].y=ly3-PSXDisplay.GDrawOffset.y + PreviousPSXDisplay.Range.y0;
+
+ if(iUseMask)
+ {
+ vertex[0].z=vertex[1].z=vertex[2].z=vertex[3].z=gl_z;
+ gl_z+=0.00004f;
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+// texture sow/tow calculations
+////////////////////////////////////////////////////////////////////////
+
+void assignTextureVRAMWrite(void)
+{
+#ifdef OWNSCALE
+
+ vertex[0].sow=0.5f/ ST_FACVRAMX;
+ vertex[0].tow=0.5f/ ST_FACVRAM;
+
+ vertex[1].sow=(float)gl_ux[1]/ ST_FACVRAMX;
+ vertex[1].tow=0.5f/ ST_FACVRAM;
+
+ vertex[2].sow=(float)gl_ux[2]/ ST_FACVRAMX;
+ vertex[2].tow=(float)gl_vy[2]/ ST_FACVRAM;
+
+ vertex[3].sow=0.5f/ ST_FACVRAMX;
+ vertex[3].tow=(float)gl_vy[3]/ ST_FACVRAM;
+
+#else
+
+ if(gl_ux[1]==255)
+ {
+ vertex[0].sow=(gl_ux[0]*255.99f)/255.0f;
+ vertex[1].sow=(gl_ux[1]*255.99f)/255.0f;
+ vertex[2].sow=(gl_ux[2]*255.99f)/255.0f;
+ vertex[3].sow=(gl_ux[3]*255.99f)/255.0f;
+ }
+ else
+ {
+ vertex[0].sow=gl_ux[0];
+ vertex[1].sow=gl_ux[1];
+ vertex[2].sow=gl_ux[2];
+ vertex[3].sow=gl_ux[3];
+ }
+
+ vertex[0].tow=gl_vy[0];
+ vertex[1].tow=gl_vy[1];
+ vertex[2].tow=gl_vy[2];
+ vertex[3].tow=gl_vy[3];
+
+#endif
+}
+
+GLuint gLastTex=0;
+GLuint gLastFMode=(GLuint)-1;
+
+///////////////////////////////////////////////////////// 
+
+void assignTextureSprite(void)
+{
+ if(bUsingTWin)
+ {
+ vertex[0].sow=vertex[3].sow=(float)gl_ux[0]/TWin.UScaleFactor;
+ vertex[1].sow=vertex[2].sow=(float)sSprite_ux2/TWin.UScaleFactor;
+ vertex[0].tow=vertex[1].tow=(float)gl_vy[0]/TWin.VScaleFactor;
+ vertex[2].tow=vertex[3].tow=(float)sSprite_vy2/TWin.VScaleFactor;
+ gLastTex=gTexName;
+
+ if(iFilterType>0 && iFilterType<3 && iHiResTextures!=2) 
+ {
+ float fxmin=65536.0f,fxmax=0.0f,fymin=65536.0f,fymax=0.0f;int i;
+
+ for(i=0;i<4;i++)
+ {
+ if(vertex[i].sow<fxmin) fxmin=vertex[i].sow;
+ if(vertex[i].tow<fymin) fymin=vertex[i].tow;
+ if(vertex[i].sow>fxmax) fxmax=vertex[i].sow;
+ if(vertex[i].tow>fymax) fymax=vertex[i].tow; 
+ }
+
+ for(i=0;i<4;i++)
+ {
+#ifdef OWNSCALE
+ if(vertex[i].sow==fxmin) vertex[i].sow+=0.375f/(float)TWin.Position.x1;
+ if(vertex[i].sow==fxmax) vertex[i].sow-=0.375f/(float)TWin.Position.x1;
+ if(vertex[i].tow==fymin) vertex[i].tow+=0.375f/(float)TWin.Position.y1;
+ if(vertex[i].tow==fymax) vertex[i].tow-=0.375f/(float)TWin.Position.y1;
+#else
+ if(vertex[i].sow==fxmin) vertex[i].sow+=96.0f/(float)TWin.Position.x1;
+ if(vertex[i].sow==fxmax) vertex[i].sow-=96.0f/(float)TWin.Position.x1;
+ if(vertex[i].tow==fymin) vertex[i].tow+=96.0f/(float)TWin.Position.y1;
+ if(vertex[i].tow==fymax) vertex[i].tow-=96.0f/(float)TWin.Position.y1;
+#endif
+ }
+ }
+
+ }
+ else
+ {
+#ifdef OWNSCALE
+
+ vertex[0].sow=vertex[3].sow=(float)gl_ux[0] / ST_FACSPRITE;
+ vertex[1].sow=vertex[2].sow=(float)sSprite_ux2 / ST_FACSPRITE;
+ vertex[0].tow=vertex[1].tow=(float)gl_vy[0] / ST_FACSPRITE;
+ vertex[2].tow=vertex[3].tow=(float)sSprite_vy2 / ST_FACSPRITE;
+
+#else
+ 
+ vertex[0].sow=vertex[3].sow=gl_ux[0];
+ vertex[1].sow=vertex[2].sow=sSprite_ux2;
+ vertex[0].tow=vertex[1].tow=gl_vy[0];
+ vertex[2].tow=vertex[3].tow=sSprite_vy2;
+
+#endif
+
+ if(iFilterType>2) 
+ {
+ if(gLastTex!=gTexName || gLastFMode!=0)
+ {
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+ gLastTex=gTexName;gLastFMode=0;
+ }
+ }
+ }
+
+ if(usMirror & 0x1000) 
+ {
+ vertex[0].sow=vertex[1].sow;
+ vertex[1].sow=vertex[2].sow=vertex[3].sow;
+ vertex[3].sow=vertex[0].sow;
+ }
+
+ if(usMirror & 0x2000) 
+ {
+ vertex[0].tow=vertex[3].tow;
+ vertex[2].tow=vertex[3].tow=vertex[1].tow;
+ vertex[1].tow=vertex[0].tow;
+ }
+
+}
+
+///////////////////////////////////////////////////////// 
+
+void assignTexture3(void)
+{
+ if(bUsingTWin)
+ {
+ vertex[0].sow=(float)gl_ux[0]/TWin.UScaleFactor;
+ vertex[0].tow=(float)gl_vy[0]/TWin.VScaleFactor;
+ vertex[1].sow=(float)gl_ux[1]/TWin.UScaleFactor;
+ vertex[1].tow=(float)gl_vy[1]/TWin.VScaleFactor;
+ vertex[2].sow=(float)gl_ux[2]/TWin.UScaleFactor;
+ vertex[2].tow=(float)gl_vy[2]/TWin.VScaleFactor;
+ gLastTex=gTexName;
+ }
+ else
+ {
+#ifdef OWNSCALE
+ vertex[0].sow=(float)gl_ux[0] / ST_FACTRI;
+ vertex[0].tow=(float)gl_vy[0] / ST_FACTRI;
+ vertex[1].sow=(float)gl_ux[1] / ST_FACTRI;
+
+ vertex[1].tow=(float)gl_vy[1] / ST_FACTRI;
+ vertex[2].sow=(float)gl_ux[2] / ST_FACTRI;
+ vertex[2].tow=(float)gl_vy[2] / ST_FACTRI;
+#else
+ vertex[0].sow=gl_ux[0];
+ vertex[0].tow=gl_vy[0];
+ vertex[1].sow=gl_ux[1];
+ vertex[1].tow=gl_vy[1];
+ vertex[2].sow=gl_ux[2];
+ vertex[2].tow=gl_vy[2];
+#endif
+
+ if(iFilterType>2) 
+ {
+ if(gLastTex!=gTexName || gLastFMode!=1)
+ {
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+ gLastTex=gTexName;gLastFMode=1;
+ }
+ }
+
+ if(iFilterType) 
+ {
+ float fxmin=256.0f,fxmax=0.0f,fymin=256.0f,fymax=0.0f;int i;
+ for(i=0;i<3;i++)
+ {
+ if(vertex[i].sow<fxmin) fxmin=vertex[i].sow;
+ if(vertex[i].tow<fymin) fymin=vertex[i].tow;
+ if(vertex[i].sow>fxmax) fxmax=vertex[i].sow;
+ if(vertex[i].tow>fymax) fymax=vertex[i].tow; 
+ }
+
+ for(i=0;i<3;i++)
+ {
+ if(vertex[i].sow==fxmin) vertex[i].sow+=ST_BFFACSORT;
+ if(vertex[i].sow==fxmax) vertex[i].sow-=ST_BFFACSORT;
+ if(vertex[i].tow==fymin) vertex[i].tow+=ST_BFFACSORT;
+ if(vertex[i].tow==fymax) vertex[i].tow-=ST_BFFACSORT;
+ }
+ }
+ }
+}
+
+///////////////////////////////////////////////////////// 
+
+void assignTexture4(void)
+{
+ if(bUsingTWin)
+ {
+ vertex[0].sow=(float)gl_ux[0]/TWin.UScaleFactor;
+ vertex[0].tow=(float)gl_vy[0]/TWin.VScaleFactor;
+ vertex[1].sow=(float)gl_ux[1]/TWin.UScaleFactor;
+ vertex[1].tow=(float)gl_vy[1]/TWin.VScaleFactor;
+ vertex[2].sow=(float)gl_ux[2]/TWin.UScaleFactor;
+ vertex[2].tow=(float)gl_vy[2]/TWin.VScaleFactor;
+ vertex[3].sow=(float)gl_ux[3]/TWin.UScaleFactor;
+ vertex[3].tow=(float)gl_vy[3]/TWin.VScaleFactor;
+ gLastTex=gTexName;
+ }
+ else
+ {
+#ifdef OWNSCALE
+ vertex[0].sow=(float)gl_ux[0] / ST_FAC;
+ vertex[0].tow=(float)gl_vy[0] / ST_FAC;
+ vertex[1].sow=(float)gl_ux[1] / ST_FAC;
+ vertex[1].tow=(float)gl_vy[1] / ST_FAC;
+ vertex[2].sow=(float)gl_ux[2] / ST_FAC;
+ vertex[2].tow=(float)gl_vy[2] / ST_FAC;
+ vertex[3].sow=(float)gl_ux[3] / ST_FAC;
+ vertex[3].tow=(float)gl_vy[3] / ST_FAC;
+#else
+ vertex[0].sow=gl_ux[0];
+ vertex[0].tow=gl_vy[0];
+ vertex[1].sow=gl_ux[1];
+ vertex[1].tow=gl_vy[1];
+ vertex[2].sow=gl_ux[2];
+ vertex[2].tow=gl_vy[2];
+ vertex[3].sow=gl_ux[3];
+ vertex[3].tow=gl_vy[3];
+#endif
+
+ if(iFilterType>2) 
+ {
+ if(gLastTex!=gTexName || gLastFMode!=1)
+ {
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+ gLastTex=gTexName;gLastFMode=1;
+ }
+ }
+
+ if(iFilterType) 
+ {
+ float fxmin=256.0f,fxmax=0.0f,fymin=256.0f,fymax=0.0f;int i;
+ for(i=0;i<4;i++)
+ {
+ if(vertex[i].sow<fxmin) fxmin=vertex[i].sow;
+ if(vertex[i].tow<fymin) fymin=vertex[i].tow;
+ if(vertex[i].sow>fxmax) fxmax=vertex[i].sow;
+ if(vertex[i].tow>fymax) fymax=vertex[i].tow; 
+ }
+
+ for(i=0;i<4;i++)
+ {
+ if(vertex[i].sow==fxmin) vertex[i].sow+=ST_BFFACSORT;
+ if(vertex[i].sow==fxmax) vertex[i].sow-=ST_BFFACSORT;
+ if(vertex[i].tow==fymin) vertex[i].tow+=ST_BFFACSORT;
+ if(vertex[i].tow==fymax) vertex[i].tow-=ST_BFFACSORT;
+ }
+ }
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////////////////
+// render pos / buffers
+////////////////////////////////////////////////////////////////////////
+
+#ifndef _WINDOWS
+#define EqualRect(pr1,pr2) ((pr1)->left==(pr2)->left && (pr1)->top==(pr2)->top && (pr1)->right==(pr2)->right && (pr1)->bottom==(pr2)->bottom)
+#endif
+
+////////////////////////////////////////////////////////////////////////
+// SetDisplaySettings: "simply" calcs the new drawing area and updates
+// the ogl clipping (scissor) 
+
+BOOL bSetClip=FALSE;
+
+void SetOGLDisplaySettings(BOOL DisplaySet)
+{
+ static RECT rprev={0,0,0,0};
+ static RECT rC ={0,0,0,0};
+ static int iOldX=0;
+ static int iOldY=0;
+ RECT r;float XS,YS;
+
+ bDisplayNotSet = FALSE;
+
+ //----------------------------------------------------// that's a whole screen upload
+ if(!DisplaySet)
+ {
+ RECT rX;
+ PSXDisplay.GDrawOffset.x=0;
+ PSXDisplay.GDrawOffset.y=0;
+
+ PSXDisplay.CumulOffset.x = PSXDisplay.DrawOffset.x+PreviousPSXDisplay.Range.x0;
+ PSXDisplay.CumulOffset.y = PSXDisplay.DrawOffset.y+PreviousPSXDisplay.Range.y0;
+
+ rprev.left=rprev.left+1;
+
+ rX=rRatioRect;
+ rX.top=iResY-(rRatioRect.top+rRatioRect.bottom);
+
+ if(bSetClip || !EqualRect(&rC,&rX))
+ {
+ rC=rX;
+ glScissor(rC.left,rC.top,rC.right,rC.bottom);
+ bSetClip=FALSE; 
+ }
+ return;
+ }
+ //----------------------------------------------------// 
+
+ PSXDisplay.GDrawOffset.y = PreviousPSXDisplay.DisplayPosition.y;
+ PSXDisplay.GDrawOffset.x = PreviousPSXDisplay.DisplayPosition.x;
+ PSXDisplay.CumulOffset.x = PSXDisplay.DrawOffset.x - PSXDisplay.GDrawOffset.x+PreviousPSXDisplay.Range.x0;
+ PSXDisplay.CumulOffset.y = PSXDisplay.DrawOffset.y - PSXDisplay.GDrawOffset.y+PreviousPSXDisplay.Range.y0;
+
+ r.top =PSXDisplay.DrawArea.y0 - PreviousPSXDisplay.DisplayPosition.y;
+ r.bottom=PSXDisplay.DrawArea.y1 - PreviousPSXDisplay.DisplayPosition.y;
+
+ if(r.bottom<0 || r.top>=PSXDisplay.DisplayMode.y)
+ {
+ r.top =PSXDisplay.DrawArea.y0 - PSXDisplay.DisplayPosition.y;
+ r.bottom=PSXDisplay.DrawArea.y1 - PSXDisplay.DisplayPosition.y;
+ }
+
+ r.left =PSXDisplay.DrawArea.x0 - PreviousPSXDisplay.DisplayPosition.x;
+ r.right =PSXDisplay.DrawArea.x1 - PreviousPSXDisplay.DisplayPosition.x;
+
+ if(r.right<0 || r.left>=PSXDisplay.DisplayMode.x)
+ {
+ r.left =PSXDisplay.DrawArea.x0 - PSXDisplay.DisplayPosition.x;
+ r.right =PSXDisplay.DrawArea.x1 - PSXDisplay.DisplayPosition.x;
+ }
+
+ if(!bSetClip && EqualRect(&r,&rprev) &&
+ iOldX == PSXDisplay.DisplayMode.x &&
+ iOldY == PSXDisplay.DisplayMode.y)
+ return;
+
+ rprev = r;
+ iOldX = PSXDisplay.DisplayMode.x;
+ iOldY = PSXDisplay.DisplayMode.y;
+
+ XS=(float)rRatioRect.right/(float)PSXDisplay.DisplayMode.x;
+ YS=(float)rRatioRect.bottom/(float)PSXDisplay.DisplayMode.y;
+
+ if(PreviousPSXDisplay.Range.x0)
+ {
+ short s=PreviousPSXDisplay.Range.x0+PreviousPSXDisplay.Range.x1;
+
+ r.left+=PreviousPSXDisplay.Range.x0+1;
+
+ r.right+=PreviousPSXDisplay.Range.x0;
+
+ if(r.left>s) r.left=s;
+ if(r.right>s) r.right=s;
+ }
+
+ if(PreviousPSXDisplay.Range.y0)
+ {
+ short s=PreviousPSXDisplay.Range.y0+PreviousPSXDisplay.Range.y1;
+
+ r.top+=PreviousPSXDisplay.Range.y0+1;
+ r.bottom+=PreviousPSXDisplay.Range.y0;
+
+ if(r.top>s) r.top=s;
+ if(r.bottom>s) r.bottom=s;
+ }
+
+ // Set the ClipArea variables to reflect the new screen,
+ // offset from zero (since it is a new display buffer)
+ r.left = (int)(((float)(r.left)) *XS);
+ r.top = (int)(((float)(r.top)) *YS);
+ r.right = (int)(((float)(r.right + 1))*XS);
+ r.bottom = (int)(((float)(r.bottom + 1))*YS);
+
+ // Limit clip area to the screen size
+ if (r.left > iResX) r.left = iResX;
+ if (r.left < 0) r.left = 0;
+ if (r.top > iResY) r.top = iResY;
+ if (r.top < 0) r.top = 0;
+ if (r.right > iResX) r.right = iResX;
+ if (r.right < 0) r.right = 0;
+ if (r.bottom > iResY) r.bottom = iResY;
+ if (r.bottom < 0) r.bottom = 0;
+
+ r.right -=r.left;
+ r.bottom-=r.top;
+ r.top=iResY-(r.top+r.bottom);
+
+ r.left+=rRatioRect.left;
+ r.top -=rRatioRect.top;
+
+ if(bSetClip || !EqualRect(&r,&rC))
+ {
+ glScissor(r.left,r.top,r.right,r.bottom);
+ rC=r;
+ bSetClip=FALSE;
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+

pcsxr-1.9.92.tar.bz2/plugins/peopsxgl/draw.h -> pcsxr-1.9.93.tar.bz2/plugins/peopsxgl/draw.h Changed

@@ -1,51 +1,57 @@
-/***************************************************************************
-                            draw.h  -  description
-                             -------------------
-    begin                : Sun Mar 08 2009
-    copyright            : (C) 1999-2009 by Pete Bernert
-    web                  : www.pbernert.com   
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version. See also the license.txt file for *
- *   additional informations.                                              *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef _GL_DRAW_H_
-#define _GL_DRAW_H_
-
-// internally used defines
-
-#define GPUCOMMAND(x) ((x>>24) & 0xff)
-#define RED(x) (x & 0xff)
-#define BLUE(x) ((x>>16) & 0xff)
-#define GREEN(x) ((x>>8) & 0xff)
-#define COLOR(x) (x & 0xffffff)
-
-// prototypes
-int  GLinitialize();
-void GLcleanup();
-BOOL offset2(void);
-BOOL offset3(void);
-BOOL offset4(void);
-BOOL offsetline(void);
-void offsetST(void);
-void offsetBlk(void);
-void offsetScreenUpload(int Position);
-void assignTexture3(void);
-void assignTexture4(void);
-void assignTextureSprite(void);
-void assignTextureVRAMWrite(void);
-void SetOGLDisplaySettings (BOOL DisplaySet);
-void ReadConfig(void);
-void WriteConfig(void);
-void SetExtGLFuncs(void);
-
-///////////////////////////////////////////////////////////////////////
-
-#endif // _GL_DRAW_H_
+/***************************************************************************
+                            draw.h  -  description
+                             -------------------
+    begin                : Sun Mar 08 2009
+    copyright            : (C) 1999-2009 by Pete Bernert
+    web                  : www.pbernert.com   
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef _GL_DRAW_H_
+#define _GL_DRAW_H_
+
+// internally used defines
+
+#define GPUCOMMAND(x) ((x>>24) & 0xff)
+#define RED(x) (x & 0xff)
+#define BLUE(x) ((x>>16) & 0xff)
+#define GREEN(x) ((x>>8) & 0xff)
+#define COLOR(x) (x & 0xffffff)
+
+// prototypes
+
+#ifdef _WINDOWS
+BOOL bSetupPixelFormat(HDC hDC);
+#endif
+
+int  GLinitialize();
+void GLcleanup();
+BOOL offset2(void);
+BOOL offset3(void);
+BOOL offset4(void);
+BOOL offsetline(void);
+void offsetST(void);
+void offsetBlk(void);
+void offsetScreenUpload(int Position);
+void assignTexture3(void);
+void assignTexture4(void);
+void assignTextureSprite(void);
+void assignTextureVRAMWrite(void);
+void SetOGLDisplaySettings (BOOL DisplaySet);
+void ReadConfig(void);
+void WriteConfig(void);
+void SetExtGLFuncs(void);
+void CreateScanLines(void);
+
+///////////////////////////////////////////////////////////////////////
+
+#endif // _GL_DRAW_H_

pcsxr-1.9.92.tar.bz2/plugins/peopsxgl/externals.h -> pcsxr-1.9.93.tar.bz2/plugins/peopsxgl/externals.h Changed

@@ -1,413 +1,450 @@
-/***************************************************************************
- external.h - description
- -------------------
- begin : Sun Mar 08 2009
- copyright : (C) 1999-2009 by Pete Bernert
- web : www.pbernert.com 
- ***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. See also the license.txt file for *
- * additional informations. *
- * *
- ***************************************************************************/
-
-#define MIRROR_TEST 1
-#define SCISSOR_TEST 1
-
-// for own sow/tow scaling
-#define OWNSCALE 1
-
-#define CLUTUSED 0x80000000
-
-#define SETCOL(x) if(x.c.lcol!=ulOLDCOL) {ulOLDCOL=x.c.lcol;glColor4ubv(x.c.col);} 
-#define SETPCOL(x) if(x->c.lcol!=ulOLDCOL) {ulOLDCOL=x->c.lcol;glColor4ubv(x->c.col);}
-
-#define GL_TO_EDGE_CLAMP 0x812F
-
-#define INFO_TW 0
-#define INFO_DRAWSTART 1
-#define INFO_DRAWEND 2
-#define INFO_DRAWOFF 3
-
-#define SIGNSHIFT 21
-#define CHKMAX_X 1024
-#define CHKMAX_Y 512
-
-// GPU STATUS REGISTER bit values (c) Lewpy
-
-#define DR_NORMAL 0
-#define DR_VRAMTRANSFER 1
-
-#define GPUSTATUS_ODDLINES 0x80000000
-#define GPUSTATUS_DMABITS 0x60000000 // Two bits
-#define GPUSTATUS_READYFORCOMMANDS 0x10000000
-#define GPUSTATUS_READYFORVRAM 0x08000000
-#define GPUSTATUS_IDLE 0x04000000
-#define GPUSTATUS_DISPLAYDISABLED 0x00800000
-#define GPUSTATUS_INTERLACED 0x00400000
-#define GPUSTATUS_RGB24 0x00200000
-#define GPUSTATUS_PAL 0x00100000
-#define GPUSTATUS_DOUBLEHEIGHT 0x00080000
-#define GPUSTATUS_WIDTHBITS 0x00070000 // Three bits
-#define GPUSTATUS_MASKENABLED 0x00001000
-#define GPUSTATUS_MASKDRAWN 0x00000800
-#define GPUSTATUS_DRAWINGALLOWED 0x00000400
-#define GPUSTATUS_DITHER 0x00000200
-
-#define STATUSREG lGPUstatusRet
-
-#define GPUIsBusy (STATUSREG &= ~GPUSTATUS_IDLE)
-#define GPUIsIdle (STATUSREG |= GPUSTATUS_IDLE)
-
-#define GPUIsNotReadyForCommands (STATUSREG &= ~GPUSTATUS_READYFORCOMMANDS)
-#define GPUIsReadyForCommands (STATUSREG |= GPUSTATUS_READYFORCOMMANDS)
-
-#define KEY_RESETTEXSTORE 1
-#define KEY_SHOWFPS 2
-#define KEY_RESETOPAQUE 4
-#define KEY_RESETDITHER 8
-#define KEY_RESETFILTER 16
-#define KEY_RESETADVBLEND 32
-#define KEY_BLACKWHITE 64
-#define KEY_TOGGLEFBTEXTURE 128
-#define KEY_STEPDOWN 256
-#define KEY_TOGGLEFBREAD 512
-
-#define FALSE 0
-#define TRUE 1
-#define BOOL unsigned short
-#define bool unsigned short
-#define LOWORD(l) ((unsigned short)(l))
-#define HIWORD(l) ((unsigned short)(((uint32_t)(l) >> 16) & 0xFFFF))
-#define max(a,b) (((a) > (b)) ? (a) : (b))
-#define min(a,b) (((a) < (b)) ? (a) : (b))
-#define DWORD uint32_t
-
-typedef struct RECTTAG
-{
- int left;
- int top;
- int right;
- int bottom;
-}RECT;
-
-typedef struct VRAMLOADTAG
-{
- short x;
- short y;
- short Width;
- short Height;
- short RowsRemaining;
- short ColsRemaining;
- unsigned short *ImagePtr;
-} VRAMLoad_t;
-
-typedef struct PSXPOINTTAG
-{
- int x;
- int y;
-} PSXPoint_t;
-
-typedef struct PSXSPOINTTAG
-{
- short x;
- short y;
-} PSXSPoint_t;
-
-typedef struct PSXRECTTAG
-{
- short x0;
- short x1;
- short y0;
- short y1;
-} PSXRect_t;
-
-typedef struct TWINTAG
-{
- PSXRect_t Position;
- PSXRect_t OPosition;
- PSXPoint_t TextureSize;
- float UScaleFactor;
- float VScaleFactor;
-} TWin_t;
-
-typedef struct PSXDISPLAYTAG
-{
- PSXPoint_t DisplayModeNew;
- PSXPoint_t DisplayMode;
- PSXPoint_t DisplayPosition;
- PSXPoint_t DisplayEnd;
- 
- int Double;
- int Height;
- int PAL;
- int InterlacedNew;
- int Interlaced;
- int InterlacedTest;
- int RGB24New;
- int RGB24;
- PSXSPoint_t DrawOffset;
- PSXRect_t DrawArea;
- PSXPoint_t GDrawOffset;
- PSXPoint_t CumulOffset;
- int Disabled;
- PSXRect_t Range;
-} PSXDisplay_t;
-
-typedef struct OGLVertexTag 
-{
- GLfloat x;
- GLfloat y;
- GLfloat z;
-
- GLfloat sow;
- GLfloat tow;
-
- union COLTAG
- {
- unsigned char col[4];
- unsigned int lcol;
- } c;
-} OGLVertex;
-
-typedef union EXShortTag
-{
- unsigned char c[2];
- unsigned short s;
-} EXShort;
-
-typedef union EXLongTag
-{
- unsigned char c[4];
- unsigned int l;
- EXShort s[2];
-} EXLong;
-
-#ifndef _IN_CFG
-
-extern char *pConfigFile;
-
-#endif
-
-#ifndef _IN_DRAW
-
-extern int iResX;
-extern int iResY;
-extern BOOL bKeepRatio;
-extern RECT rRatioRect;
-extern BOOL bSnapShot;
-extern BOOL bSmallAlpha;
-extern BOOL bOpaquePass;
-extern BOOL bAdvancedBlend;
-extern BOOL bUseLines;
-extern int iTexQuality;
-extern BOOL bUseAntiAlias;
-extern BOOL bGLExt;
-extern BOOL bGLFastMovie;
-extern BOOL bGLSoft;
-extern BOOL bGLBlend;
-
-extern PFNGLBLENDEQU glBlendEquationEXTEx;
-extern PFNGLCOLORTABLEEXT glColorTableEXTEx;
-
-extern unsigned char gl_ux[8];
-extern unsigned char gl_vy[8];
-extern OGLVertex vertex[4];
-extern short sprtY,sprtX,sprtH,sprtW;
-extern BOOL bIsFirstFrame;
-extern int iWinSize;
-extern int iZBufferDepth;
-extern GLbitfield uiBufferBits;
-extern int iUseMask;
-extern int iSetMask;
-extern int iDepthFunc;
-extern BOOL bCheckMask;
-extern unsigned short sSetMask;
-extern uint32_t lSetMask;
-extern int iShowFPS;
-extern BOOL bSetClip;
-extern int iForceVSync;
-extern int iUseExts;
-extern int iUsePalTextures;
-extern GLuint gTexScanName;
-
-#endif
-
-#ifndef _IN_SOFT
-
-extern int GlobalTextAddrX,GlobalTextAddrY,GlobalTextTP;
-extern int GlobalTextREST,GlobalTextABR,GlobalTextPAGE;
-extern short ly0,lx0,ly1,lx1,ly2,lx2,ly3,lx3;
-extern short g_m1;
-extern short g_m2;
-extern short g_m3;
-extern short DrawSemiTrans;
-
-#endif
-
-#ifndef _IN_PRIMDRAW
-
-extern BOOL bNeedUploadTest;
-extern BOOL bNeedUploadAfter;
-extern BOOL bTexEnabled;
-extern BOOL bBlendEnable;
-extern BOOL bDrawDither;
-extern int iFilterType; 
-extern BOOL bFullVRam;
-extern BOOL bUseMultiPass;
-extern int iOffscreenDrawing;
-extern BOOL bOldSmoothShaded;
-extern BOOL bUsingTWin;
-extern BOOL bUsingMovie;
-extern PSXRect_t xrMovieArea;
-extern PSXRect_t xrUploadArea;
-extern PSXRect_t xrUploadAreaIL;
-extern PSXRect_t xrUploadAreaRGB24;
-extern GLuint gTexName;
-extern BOOL bDrawNonShaded;
-extern BOOL bDrawMultiPass;
-extern GLubyte ubGloColAlpha;
-extern GLubyte ubGloAlpha;
-extern short sSprite_ux2;
-extern short sSprite_vy2;
-extern BOOL bRenderFrontBuffer;
-extern uint32_t ulOLDCOL;
-extern uint32_t ulClutID;
-extern void (*primTableJ[256])(unsigned char *);
-extern void (*primTableSkip[256])(unsigned char *);
-extern unsigned short usMirror;
-extern uint32_t dwCfgFixes;
-extern uint32_t dwActFixes;
-extern uint32_t dwEmuFixes;
-extern BOOL bUseFixes;
-extern int iSpriteTex;
-extern int iDrawnSomething;
-
-extern int drawX;
-extern int drawY;
-extern int drawW;
-extern int drawH;
-extern short sxmin;
-extern short sxmax;
-extern short symin;
-extern short symax;
-
-#endif
-
-#ifndef _IN_TEXTURE
-
-extern unsigned char ubOpaqueDraw;
-extern GLint giWantedRGBA;
-extern GLint giWantedFMT;
-extern GLint giWantedTYPE;
-extern void (*LoadSubTexFn) (int,int,short,short);
-extern int GlobalTexturePage;
-extern uint32_t (*TCF[]) (uint32_t);
-extern unsigned short (*PTCF[]) (unsigned short);
-extern uint32_t (*PalTexturedColourFn) (uint32_t);
-extern BOOL bUseFastMdec;
-extern BOOL bUse15bitMdec;
-extern int iFrameTexType;
-extern int iFrameReadType;
-extern int iClampType;
-extern int iSortTexCnt;
-extern BOOL bFakeFrontBuffer; 
-extern GLuint gTexFrameName;
-extern GLuint gTexBlurName;
-extern int iVRamSize;
-extern int iTexGarbageCollection;
-extern int iFTexA;
-extern int iFTexB;
-extern int iHiResTextures;
-extern BOOL bIgnoreNextTile;
-
-#endif
-
-#ifndef _IN_GPU
-
-extern VRAMLoad_t VRAMWrite;
-extern VRAMLoad_t VRAMRead;
-extern int iDataWriteMode;
-extern int iDataReadMode;
-extern int iColDepth;
-extern BOOL bChangeRes;
-extern BOOL bWindowMode;
-extern char szDispBuf[];
-extern char szGPUKeys[];
-extern PSXDisplay_t PSXDisplay;
-extern PSXDisplay_t PreviousPSXDisplay;
-extern uint32_t ulKeybits;
-extern TWin_t TWin;
-extern BOOL bDisplayNotSet;
-extern int lGPUstatusRet;
-extern short imageX0,imageX1;
-extern short imageY0,imageY1;
-extern int lClearOnSwap,lClearOnSwapColor;
-extern unsigned char *psxVub;
-extern signed char *psxVsb;
-extern unsigned short *psxVuw;
-extern signed short *psxVsw;
-extern uint32_t *psxVul;
-extern signed int *psxVsl;
-extern GLfloat gl_z;
-extern BOOL bNeedRGB24Update;
-extern BOOL bChangeWinMode;
-extern GLuint uiScanLine;
-extern int iUseScanLines;
-extern int lSelectedSlot;
-extern int iScanBlend;
-extern BOOL bInitCap;
-extern int iBlurBuffer;
-extern int iLastRGB24;
-extern int iRenderFVR;
-extern int iNoScreenSaver;
-extern uint32_t ulGPUInfoVals[];
-extern BOOL bNeedInterlaceUpdate;
-extern BOOL bNeedWriteUpload;
-extern BOOL bSkipNextFrame;
-
-extern int bFullScreen;
-
-#endif
-
-#ifndef _IN_MENU
-
-extern uint32_t dwCoreFlags;
-extern GLuint gTexPicName;
-extern PSXPoint_t ptCursorPoint[];
-extern unsigned short usCursorActive;
-
-#endif
-
-#ifndef _IN_FPS
-
-extern BOOL bUseFrameLimit;
-extern BOOL bUseFrameSkip;
-extern float fFrameRate;
-extern float fFrameRateHz;
-extern int iFrameLimit;
-extern float fps_skip;
-extern float fps_cur;
-
-#endif
-
-#ifndef _IN_KEY
-
-extern uint32_t ulKeybits;
-
-#endif
-
-#ifndef _IN_ZN
-
-extern uint32_t dwGPUVersion;
-extern int iGPUHeight;
-extern int iGPUHeightMask;
-extern int GlobalTextIL;
-extern int iTileCheat;
-
-#endif
+/***************************************************************************
+ external.h - description
+ -------------------
+ begin : Sun Mar 08 2009
+ copyright : (C) 1999-2009 by Pete Bernert
+ web : www.pbernert.com 
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+#if defined (_MACGL)
+// if you use it, you must include it.
+#include <OpenGL/gl.h>
+#include <OpenGL/glext.h>
+#ifndef GL_COLOR_INDEX8_EXT
+#define GL_COLOR_INDEX8_EXT 0x80E5
+#endif
+#ifndef glColorTableEXT
+#define glColorTableEXT glColorTable
+#endif
+#endif
+
+#define MIRROR_TEST 1
+#define SCISSOR_TEST 1
+
+// for own sow/tow scaling
+#define OWNSCALE 1
+
+#define CLUTUSED 0x80000000
+
+#define SETCOL(x) if(x.c.lcol!=ulOLDCOL) {ulOLDCOL=x.c.lcol;glColor4ubv(x.c.col);} 
+#define SETPCOL(x) if(x->c.lcol!=ulOLDCOL) {ulOLDCOL=x->c.lcol;glColor4ubv(x->c.col);}
+
+#define GL_TO_EDGE_CLAMP 0x812F
+
+#define INFO_TW 0
+#define INFO_DRAWSTART 1
+#define INFO_DRAWEND 2
+#define INFO_DRAWOFF 3
+
+#define SIGNSHIFT 21
+#define CHKMAX_X 1024
+#define CHKMAX_Y 512
+
+// GPU STATUS REGISTER bit values (c) Lewpy
+
+#define DR_NORMAL 0
+#define DR_VRAMTRANSFER 1
+
+#define GPUSTATUS_ODDLINES 0x80000000
+#define GPUSTATUS_DMABITS 0x60000000 // Two bits
+#define GPUSTATUS_READYFORCOMMANDS 0x10000000
+#define GPUSTATUS_READYFORVRAM 0x08000000
+#define GPUSTATUS_IDLE 0x04000000
+#define GPUSTATUS_DISPLAYDISABLED 0x00800000
+#define GPUSTATUS_INTERLACED 0x00400000
+#define GPUSTATUS_RGB24 0x00200000
+#define GPUSTATUS_PAL 0x00100000
+#define GPUSTATUS_DOUBLEHEIGHT 0x00080000
+#define GPUSTATUS_WIDTHBITS 0x00070000 // Three bits
+#define GPUSTATUS_MASKENABLED 0x00001000
+#define GPUSTATUS_MASKDRAWN 0x00000800
+#define GPUSTATUS_DRAWINGALLOWED 0x00000400
+#define GPUSTATUS_DITHER 0x00000200
+
+#define STATUSREG lGPUstatusRet
+
+#define GPUIsBusy (STATUSREG &= ~GPUSTATUS_IDLE)
+#define GPUIsIdle (STATUSREG |= GPUSTATUS_IDLE)
+
+#define GPUIsNotReadyForCommands (STATUSREG &= ~GPUSTATUS_READYFORCOMMANDS)
+#define GPUIsReadyForCommands (STATUSREG |= GPUSTATUS_READYFORCOMMANDS)
+
+#define KEY_RESETTEXSTORE 1
+#define KEY_SHOWFPS 2
+#define KEY_RESETOPAQUE 4
+#define KEY_RESETDITHER 8
+#define KEY_RESETFILTER 16
+#define KEY_RESETADVBLEND 32
+#define KEY_BLACKWHITE 64
+#define KEY_TOGGLEFBTEXTURE 128
+#define KEY_STEPDOWN 256
+#define KEY_TOGGLEFBREAD 512
+
+#ifndef _WINDOWS
+
+#define FALSE 0
+#define TRUE 1
+#define BOOL unsigned short
+#ifndef bool
+#define bool unsigned short
+#endif
+
+#define LOWORD(l) ((unsigned short)(l))
+#define HIWORD(l) ((unsigned short)(((uint32_t)(l) >> 16) & 0xFFFF))
+#define max(a,b) (((a) > (b)) ? (a) : (b))
+#define min(a,b) (((a) < (b)) ? (a) : (b))
+#define DWORD uint32_t
+
+typedef struct RECTTAG
+{
+ int left;
+ int top;
+ int right;
+ int bottom;
+}RECT;
+
+#endif
+
+typedef struct VRAMLOADTAG
+{
+ short x;
+ short y;
+ short Width;
+ short Height;
+ short RowsRemaining;
+ short ColsRemaining;
+ unsigned short *ImagePtr;
+} VRAMLoad_t;
+
+typedef struct PSXPOINTTAG
+{
+ int x;
+ int y;
+} PSXPoint_t;
+
+typedef struct PSXSPOINTTAG
+{
+ short x;
+ short y;
+} PSXSPoint_t;
+
+typedef struct PSXRECTTAG
+{
+ short x0;
+ short x1;
+ short y0;
+ short y1;
+} PSXRect_t;
+
+typedef struct TWINTAG
+{
+ PSXRect_t Position;
+ PSXRect_t OPosition;
+ PSXPoint_t TextureSize;
+ float UScaleFactor;
+ float VScaleFactor;
+} TWin_t;
+
+typedef struct PSXDISPLAYTAG
+{
+ PSXPoint_t DisplayModeNew;
+ PSXPoint_t DisplayMode;
+ PSXPoint_t DisplayPosition;
+ PSXPoint_t DisplayEnd;
+ 
+ int Double;
+ int Height;
+ int PAL;
+ int InterlacedNew;
+ int Interlaced;
+ int InterlacedTest;
+ int RGB24New;
+ int RGB24;
+ PSXSPoint_t DrawOffset;
+ PSXRect_t DrawArea;
+ PSXPoint_t GDrawOffset;
+ PSXPoint_t CumulOffset;
+ int Disabled;
+ PSXRect_t Range;
+} PSXDisplay_t;
+
+typedef struct OGLVertexTag 
+{
+ GLfloat x;
+ GLfloat y;
+ GLfloat z;
+
+ GLfloat sow;
+ GLfloat tow;
+
+ union COLTAG
+ {
+ unsigned char col[4];
+ unsigned int lcol;
+ } c;
+} OGLVertex;
+
+typedef union EXShortTag
+{
+ unsigned char c[2];
+ unsigned short s;
+} EXShort;
+
+typedef union EXLongTag
+{
+ unsigned char c[4];
+ unsigned int l;
+ EXShort s[2];
+} EXLong;
+
+#ifndef _IN_CFG
+
+extern char *pConfigFile;
+
+#endif
+
+#ifdef _WINDOWS
+
+extern HINSTANCE hInst;
+
+#endif
+
+#ifndef _IN_DRAW
+
+extern int iResX;
+extern int iResY;
+extern BOOL bKeepRatio;
+extern BOOL bForceRatio43;
+extern RECT rRatioRect;
+extern BOOL bSnapShot;
+extern BOOL bSmallAlpha;
+extern BOOL bOpaquePass;
+extern BOOL bAdvancedBlend;
+extern BOOL bUseLines;
+extern int iTexQuality;
+extern BOOL bUseAntiAlias;
+extern BOOL bGLExt;
+extern BOOL bGLFastMovie;
+extern BOOL bGLSoft;
+extern BOOL bGLBlend;
+
+#if !defined(_MACGL)
+extern PFNGLBLENDEQU glBlendEquationEXTEx;
+extern PFNGLCOLORTABLEEXT glColorTableEXTEx;
+#else // no pointers for mac (OSX >= 10.4.3)
+#define glBlendEquationEXTEx glBlendEquationEXT
+#define glColorTableEXTEx glColorTableEXT
+#endif
+
+extern unsigned char gl_ux[8];
+extern unsigned char gl_vy[8];
+extern OGLVertex vertex[4];
+extern short sprtY,sprtX,sprtH,sprtW;
+#ifdef _WINDOWS
+extern HWND hWWindow;
+#endif
+extern BOOL bIsFirstFrame;
+extern int iWinSize;
+extern int iZBufferDepth;
+extern GLbitfield uiBufferBits;
+extern int iUseMask;
+extern int iSetMask;
+extern int iDepthFunc;
+extern BOOL bCheckMask;
+extern unsigned short sSetMask;
+extern uint32_t lSetMask;
+extern int iShowFPS;
+extern BOOL bGteAccuracy;
+extern BOOL bSetClip;
+extern int iForceVSync;
+extern int iUseExts;
+extern int iUsePalTextures;
+extern GLuint gTexScanName;
+
+#endif
+
+#ifndef _IN_SOFT
+
+extern int GlobalTextAddrX,GlobalTextAddrY,GlobalTextTP;
+extern int GlobalTextREST,GlobalTextABR,GlobalTextPAGE;
+extern short ly0,lx0,ly1,lx1,ly2,lx2,ly3,lx3;
+extern short g_m1;
+extern short g_m2;
+extern short g_m3;
+extern short DrawSemiTrans;
+
+#endif
+
+#ifndef _IN_PRIMDRAW
+
+extern BOOL bNeedUploadTest;
+extern BOOL bNeedUploadAfter;
+extern BOOL bTexEnabled;
+extern BOOL bBlendEnable;
+extern BOOL bDrawDither;
+extern int iFilterType; 
+extern BOOL bFullVRam;
+extern BOOL bUseMultiPass;
+extern int iOffscreenDrawing;
+extern BOOL bOldSmoothShaded;
+extern BOOL bUsingTWin;
+extern BOOL bUsingMovie;
+extern PSXRect_t xrMovieArea;
+extern PSXRect_t xrUploadArea;
+extern PSXRect_t xrUploadAreaIL;
+extern PSXRect_t xrUploadAreaRGB24;
+extern GLuint gTexName;
+extern BOOL bDrawNonShaded;
+extern BOOL bDrawMultiPass;
+extern GLubyte ubGloColAlpha;
+extern GLubyte ubGloAlpha;
+extern short sSprite_ux2;
+extern short sSprite_vy2;
+extern BOOL bRenderFrontBuffer;
+extern uint32_t ulOLDCOL;
+extern uint32_t ulClutID;
+extern void (*primTableJ[256])(unsigned char *);
+extern void (*primTableSkip[256])(unsigned char *);
+extern unsigned short usMirror;
+extern uint32_t dwCfgFixes;
+extern uint32_t dwActFixes;
+extern uint32_t dwEmuFixes;
+extern BOOL bUseFixes;
+extern int iSpriteTex;
+extern int iDrawnSomething;
+
+extern int drawX;
+extern int drawY;
+extern int drawW;
+extern int drawH;
+extern short sxmin;
+extern short sxmax;
+extern short symin;
+extern short symax;
+
+#endif
+
+#ifndef _IN_TEXTURE
+
+extern unsigned char ubOpaqueDraw;
+extern GLint giWantedRGBA;
+extern GLint giWantedFMT;
+extern GLint giWantedTYPE;
+extern void (*LoadSubTexFn) (int,int,short,short);
+extern int GlobalTexturePage;
+extern uint32_t (*TCF[]) (uint32_t);
+extern unsigned short (*PTCF[]) (unsigned short);
+extern uint32_t (*PalTexturedColourFn) (uint32_t);
+extern BOOL bUseFastMdec;
+extern BOOL bUse15bitMdec;
+extern int iFrameTexType;
+extern int iFrameReadType;
+extern int iClampType;
+extern int iSortTexCnt;
+extern BOOL bFakeFrontBuffer; 
+extern GLuint gTexFrameName;
+extern GLuint gTexBlurName;
+extern int iVRamSize;
+extern int iTexGarbageCollection;
+extern int iFTexA;
+extern int iFTexB;
+extern int iHiResTextures;
+extern BOOL bIgnoreNextTile;
+
+#endif
+
+#ifndef _IN_GPU
+
+extern VRAMLoad_t VRAMWrite;
+extern VRAMLoad_t VRAMRead;
+extern int iDataWriteMode;
+extern int iDataReadMode;
+extern int iColDepth;
+extern BOOL bChangeRes;
+extern BOOL bWindowMode;
+extern char szDispBuf[];
+extern char szGPUKeys[];
+extern PSXDisplay_t PSXDisplay;
+extern PSXDisplay_t PreviousPSXDisplay;
+extern uint32_t ulKeybits;
+extern TWin_t TWin;
+extern BOOL bDisplayNotSet;
+extern int lGPUstatusRet;
+extern short imageX0,imageX1;
+extern short imageY0,imageY1;
+extern int lClearOnSwap,lClearOnSwapColor;
+extern unsigned char *psxVub;
+extern signed char *psxVsb;
+extern unsigned short *psxVuw;
+extern signed short *psxVsw;
+extern uint32_t *psxVul;
+extern signed int *psxVsl;
+extern GLfloat gl_z;
+extern BOOL bNeedRGB24Update;
+extern BOOL bChangeWinMode;
+extern GLuint uiScanLine;
+extern int iUseScanLines;
+extern float iScanlineColor[]; /* 4 element array of RGBA float */
+extern int lSelectedSlot;
+extern int iScanBlend;
+extern BOOL bInitCap;
+extern int iBlurBuffer;
+extern int iLastRGB24;
+extern int iRenderFVR;
+extern int iNoScreenSaver;
+extern uint32_t ulGPUInfoVals[];
+extern BOOL bNeedInterlaceUpdate;
+extern BOOL bNeedWriteUpload;
+extern BOOL bSkipNextFrame;
+extern uint32_t vBlank;
+
+extern int bFullScreen;
+
+#endif
+
+#ifndef _IN_MENU
+
+extern uint32_t dwCoreFlags;
+extern GLuint gTexPicName;
+extern PSXPoint_t ptCursorPoint[];
+extern unsigned short usCursorActive;
+
+#endif
+
+#ifndef _IN_FPS
+
+extern BOOL bUseFrameLimit;
+extern BOOL bUseFrameSkip;
+extern float fFrameRate;
+extern float fFrameRateHz;
+extern int iFrameLimit;
+extern float fps_skip;
+extern float fps_cur;
+
+#endif
+
+#ifndef _IN_KEY
+
+extern uint32_t ulKeybits;
+
+#endif
+
+#ifndef _IN_ZN
+
+extern uint32_t dwGPUVersion;
+extern int iGPUHeight;
+extern int iGPUHeightMask;
+extern int GlobalTextIL;
+extern int iTileCheat;
+
+#endif

pcsxr-1.9.92.tar.bz2/plugins/peopsxgl/fps.c -> pcsxr-1.9.93.tar.bz2/plugins/peopsxgl/fps.c Changed

@@ -1,396 +1,396 @@
-/***************************************************************************
- fps.c - description
- -------------------
- begin : Sun Mar 08 2009
- copyright : (C) 1999-2009 by Pete Bernert
- web : www.pbernert.com 
- ***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. See also the license.txt file for *
- * additional informations. *
- * *
- ***************************************************************************/
-
-//*************************************************************************// 
-// History of changes:
-//
-// 2009/03/08 - Pete 
-// - generic cleanup for the Peops release
-//
-//*************************************************************************// 
-
-#include "stdafx.h"
-
-#define _IN_FPS
-
-#include "externals.h"
-
-////////////////////////////////////////////////////////////////////////
-// FPS stuff
-////////////////////////////////////////////////////////////////////////
-
-BOOL bIsPerformanceCounter=FALSE;
-float fFrameRateHz=0;
-DWORD dwFrameRateTicks=16;
-float fFrameRate;
-int iFrameLimit;
-BOOL bUseFrameLimit=FALSE;
-BOOL bUseFrameSkip=0;
-DWORD dwLaceCnt=0;
-
-////////////////////////////////////////////////////////////////////////
-// FPS skipping / limit
-////////////////////////////////////////////////////////////////////////
-
-BOOL bInitCap = TRUE; 
-float fps_skip = 0;
-float fps_cur = 0;
-
-#define TIMEBASE 100000
-
-unsigned long timeGetTime()
-{
- struct timeval tv;
- gettimeofday(&tv, 0); // well, maybe there are better ways
- return tv.tv_sec * 100000 + tv.tv_usec/10; // to do that in linux, but at least it works
-}
-
-void FrameCap(void)
-{
- static unsigned long curticks, lastticks, _ticks_since_last_update;
- static unsigned long TicksToWait = 0;
- bool Waiting = TRUE;
-
- {
- curticks = timeGetTime();
- _ticks_since_last_update = curticks - lastticks;
-
- if((_ticks_since_last_update > TicksToWait) ||
- (curticks <lastticks))
- {
- lastticks = curticks;
-
- if((_ticks_since_last_update-TicksToWait) > dwFrameRateTicks)
- TicksToWait=0;
- else TicksToWait=dwFrameRateTicks-(_ticks_since_last_update-TicksToWait);
- }
- else
- {
- while (Waiting) 
- {
- curticks = timeGetTime(); 
- _ticks_since_last_update = curticks - lastticks; 
- if ((_ticks_since_last_update > TicksToWait) ||
- (curticks < lastticks)) 
- { 
- Waiting = FALSE;
- lastticks = curticks;
- TicksToWait = dwFrameRateTicks; 
- } 
- } 
- } 
- } 
-} 
-
-#define MAXSKIP 120
-#define MAXLACE 16
-
-void FrameSkip(void)
-{
- static int iNumSkips=0,iAdditionalSkip=0; // number of additional frames to skip
- static DWORD dwLastLace=0; // helper var for frame limitation
- static DWORD curticks, lastticks, _ticks_since_last_update;
-
- if(!dwLaceCnt) return; // important: if no updatelace happened, we ignore it completely
-
- if(iNumSkips) // we are in skipping mode?
- {
- dwLastLace+=dwLaceCnt; // -> calc frame limit helper (number of laces)
- bSkipNextFrame = TRUE; // -> we skip next frame
- iNumSkips--; // -> ok, one done
- }
- else // ok, no additional skipping has to be done... 
- { // we check now, if some limitation is needed, or a new skipping has to get started
- DWORD dwWaitTime;
-
- if(bInitCap || bSkipNextFrame) // first time or we skipped before?
- {
- if(bUseFrameLimit && !bInitCap) // frame limit wanted and not first time called?
- {
- DWORD dwT=_ticks_since_last_update; // -> that's the time of the last drawn frame
- dwLastLace+=dwLaceCnt; // -> and that's the number of updatelace since the start of the last drawn frame
-
- curticks = timeGetTime();
- _ticks_since_last_update= dwT+curticks - lastticks;
-
- dwWaitTime=dwLastLace*dwFrameRateTicks; // -> and now we calc the time the real psx would have needed
-
- if(_ticks_since_last_update<dwWaitTime) // -> we were too fast?
- { 
- if((dwWaitTime-_ticks_since_last_update)> // -> some more security, to prevent
- (60*dwFrameRateTicks)) // wrong waiting times
- _ticks_since_last_update=dwWaitTime;
-
- while(_ticks_since_last_update<dwWaitTime) // -> loop until we have reached the real psx time
- { // (that's the additional limitation, yup)
- curticks = timeGetTime();
- _ticks_since_last_update = dwT+curticks - lastticks;
- }
- }
- else // we were still too slow ?!!?
- {
- if(iAdditionalSkip<MAXSKIP) // -> well, somewhen we really have to stop skipping on very slow systems
- {
- iAdditionalSkip++; // -> inc our watchdog var
- dwLaceCnt=0; // -> reset lace count
- lastticks = timeGetTime();
- return; // -> done, we will skip next frame to get more speed
- }
- }
- }
-
- bInitCap=FALSE; // -> ok, we have inited the frameskip func
- iAdditionalSkip=0; // -> init additional skip
- bSkipNextFrame=FALSE; // -> we don't skip the next frame
- lastticks = timeGetTime();
- dwLaceCnt=0; // -> and we start to count the laces 
- dwLastLace=0; 
- _ticks_since_last_update=0;
- return; // -> done, the next frame will get drawn
- }
-
- bSkipNextFrame=FALSE; // init the frame skip signal to 'no skipping' first
-
- curticks = timeGetTime();
- _ticks_since_last_update = curticks - lastticks;
-
- dwLastLace=dwLaceCnt; // store curr count (frame limitation helper)
- dwWaitTime=dwLaceCnt*dwFrameRateTicks; // calc the 'real psx lace time'
-
- if(_ticks_since_last_update>dwWaitTime) // hey, we needed way too long for that frame...
- {
- if(bUseFrameLimit) // if limitation, we skip just next frame,
- { // and decide after, if we need to do more
- iNumSkips=0;
- }
- else
- {
- iNumSkips=_ticks_since_last_update/dwWaitTime; // -> calc number of frames to skip to catch up
- iNumSkips--; // -> since we already skip next frame, one down
- if(iNumSkips>MAXSKIP) iNumSkips=MAXSKIP; // -> well, somewhere we have to draw a line
- }
- bSkipNextFrame = TRUE; // -> signal for skipping the next frame
- }
- else // we were faster than real psx? fine :)
- if(bUseFrameLimit) // frame limit used? so we wait til the 'real psx time' has been reached
- {
- if(dwLaceCnt>MAXLACE) // -> security check
- _ticks_since_last_update=dwWaitTime;
-
- while(_ticks_since_last_update<dwWaitTime) // just do a waiting loop...
- {
- curticks = timeGetTime();
- _ticks_since_last_update = curticks - lastticks;
- }
- }
-
- lastticks = timeGetTime();
- }
-
- dwLaceCnt=0; // init lace counter
-}
-
-void calcfps(void) 
-{ 
- static unsigned long curticks,_ticks_since_last_update,lastticks; 
- static long fps_cnt = 0;
- static unsigned long fps_tck = 1; 
- static long fpsskip_cnt = 0;
- static unsigned long fpsskip_tck = 1;
- 
- { 
- curticks = timeGetTime(); 
- _ticks_since_last_update=curticks-lastticks; 
- 
- if(bUseFrameSkip && !bUseFrameLimit && _ticks_since_last_update) 
- fps_skip=min(fps_skip,((float)TIMEBASE/(float)_ticks_since_last_update+1.0f));
- 
- lastticks = curticks; 
- } 
- 
- if(bUseFrameSkip && bUseFrameLimit)
- {
- fpsskip_tck += _ticks_since_last_update;
-
- if(++fpsskip_cnt==2)
- {
- fps_skip = (float)2000/(float)fpsskip_tck;
-
- fps_skip +=6.0f;
-
- fpsskip_cnt = 0;
- fpsskip_tck = 1;
- }
- }
-
- fps_tck += _ticks_since_last_update; 
- 
- if(++fps_cnt==10) 
- { 
- fps_cur = (float)(TIMEBASE*10)/(float)fps_tck; 
-
- fps_cnt = 0; 
- fps_tck = 1; 
- 
- if(bUseFrameLimit && fps_cur>fFrameRateHz) // optical adjust ;) avoids flickering fps display 
- fps_cur=fFrameRateHz; 
- } 
-} 
-
-void PCFrameCap (void) 
-{
- static unsigned long curticks, lastticks, _ticks_since_last_update;
- static unsigned long TicksToWait = 0;
- bool Waiting = TRUE; 
- 
- while (Waiting) 
- {
- curticks = timeGetTime(); 
- _ticks_since_last_update = curticks - lastticks; 
- if ((_ticks_since_last_update > TicksToWait) || 
- (curticks < lastticks)) 
- { 
- Waiting = FALSE; 
- lastticks = curticks; 
- TicksToWait = (TIMEBASE / (unsigned long)fFrameRateHz); 
- } 
- } 
-} 
-
-void PCcalcfps(void) 
-{ 
- static unsigned long curticks,_ticks_since_last_update,lastticks; 
- static long fps_cnt = 0; 
- static float fps_acc = 0;
- float CurrentFPS=0; 
- 
- curticks = timeGetTime(); 
- _ticks_since_last_update=curticks-lastticks;
- if(_ticks_since_last_update) 
- CurrentFPS=(float)TIMEBASE/(float)_ticks_since_last_update;
- else CurrentFPS = 0;
- lastticks = curticks; 
- 
- fps_acc += CurrentFPS;
-
- if(++fps_cnt==10)
- {
- fps_cur = fps_acc / 10;
- fps_acc = 0;
- fps_cnt = 0;
- }
-
- fps_skip=CurrentFPS+1.0f;
-}
-
-void SetAutoFrameCap(void)
-{
- if(iFrameLimit==1)
- {
- fFrameRateHz = fFrameRate;
- dwFrameRateTicks=(TIMEBASE / (unsigned long)fFrameRateHz);
- return;
- }
-
- if(dwActFixes&128)
- {
- if (PSXDisplay.Interlaced)
- fFrameRateHz = PSXDisplay.PAL?50.0f:60.0f;
- else fFrameRateHz = PSXDisplay.PAL?25.0f:30.0f;
- }
- else
- {
- //fFrameRateHz = PSXDisplay.PAL?50.0f:59.94f;
-
- if(PSXDisplay.PAL)
- {
- if (STATUSREG&GPUSTATUS_INTERLACED)
- fFrameRateHz=33868800.0f/677343.75f; // 50.00238
- else fFrameRateHz=33868800.0f/680595.00f; // 49.76351
- } 
- else
- {
- if (STATUSREG&GPUSTATUS_INTERLACED)
- fFrameRateHz=33868800.0f/565031.25f; // 59.94146
- else fFrameRateHz=33868800.0f/566107.50f; // 59.82750
- }
-
- dwFrameRateTicks=(TIMEBASE / (unsigned long)fFrameRateHz);
- }
-}
-
-void SetFrameRateConfig(void)
-{
- if(!fFrameRate) fFrameRate=200.0f;
-
- if(fFrameRateHz==0) 
- { 
- if(iFrameLimit==2) fFrameRateHz=59.94f; // auto framerate? set some init val (no pal/ntsc known yet)
- else fFrameRateHz=fFrameRate; // else set user framerate
- }
-
- dwFrameRateTicks=(TIMEBASE / (unsigned long)fFrameRateHz);
-
- if(iFrameLimit==2) SetAutoFrameCap();
-}
-
-void InitFrameCap(void)
-{
-}
-
-void ReInitFrameCap(void)
-{
-}
-
-void CheckFrameRate(void) // called in updatelace (on every emulated psx vsync)
-{
- if(bUseFrameSkip) 
- {
- if(!(dwActFixes&0x100))
- {
- dwLaceCnt++; // -> and store cnt of vsync between frames
- if(dwLaceCnt>=MAXLACE && bUseFrameLimit) 
- {
- if(dwLaceCnt==MAXLACE) bInitCap=TRUE;
- FrameCap();
- }
- }
- else if(bUseFrameLimit) FrameCap();
- calcfps(); // -> calc fps display in skipping mode
- } 
- else // -> non-skipping mode:
- {
- if(bUseFrameLimit) FrameCap();
- if(ulKeybits&KEY_SHOWFPS) calcfps(); 
- }
-}
-
-void CALLBACK GPUsetframelimit(unsigned long option) // new EPSXE interface func: main emu can enable/disable fps limitation this way
-{
- bInitCap = TRUE;
-
- if(option==1) // emu says: limit
- {
- bUseFrameLimit=TRUE;bUseFrameSkip=FALSE;iFrameLimit=2;
- SetAutoFrameCap();
- }
- else // emu says: no limit
- {
- bUseFrameLimit=FALSE;
- }
-}
+/***************************************************************************
+ fps.c - description
+ -------------------
+ begin : Sun Mar 08 2009
+ copyright : (C) 1999-2009 by Pete Bernert
+ web : www.pbernert.com 
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+//*************************************************************************// 
+// History of changes:
+//
+// 2009/03/08 - Pete 
+// - generic cleanup for the Peops release
+//
+//*************************************************************************// 
+
+#include "stdafx.h"
+
+#define _IN_FPS
+
+#include "externals.h"
+
+////////////////////////////////////////////////////////////////////////
+// FPS stuff
+////////////////////////////////////////////////////////////////////////
+
+BOOL bIsPerformanceCounter=FALSE;
+float fFrameRateHz=0;
+DWORD dwFrameRateTicks=16;
+float fFrameRate;
+int iFrameLimit;
+BOOL bUseFrameLimit=FALSE;
+BOOL bUseFrameSkip=0;
+DWORD dwLaceCnt=0;
+
+////////////////////////////////////////////////////////////////////////
+// FPS skipping / limit
+////////////////////////////////////////////////////////////////////////
+
+BOOL bInitCap = TRUE; 
+float fps_skip = 0;
+float fps_cur = 0;
+
+#define TIMEBASE 100000
+
+unsigned long timeGetTime()
+{
+ struct timeval tv;
+ gettimeofday(&tv, 0); // well, maybe there are better ways
+ return tv.tv_sec * 100000 + tv.tv_usec/10; // to do that in linux, but at least it works
+}
+
+void FrameCap(void)
+{
+ static unsigned long curticks, lastticks, _ticks_since_last_update;
+ static unsigned long TicksToWait = 0;
+ bool Waiting = TRUE;
+
+ {
+ curticks = timeGetTime();
+ _ticks_since_last_update = curticks - lastticks;
+
+ if((_ticks_since_last_update > TicksToWait) ||
+ (curticks <lastticks))
+ {
+ lastticks = curticks;
+
+ if((_ticks_since_last_update-TicksToWait) > dwFrameRateTicks)
+ TicksToWait=0;
+ else TicksToWait=dwFrameRateTicks-(_ticks_since_last_update-TicksToWait);
+ }
+ else
+ {
+ while (Waiting) 
+ {
+ curticks = timeGetTime(); 
+ _ticks_since_last_update = curticks - lastticks; 
+ if ((_ticks_since_last_update > TicksToWait) ||
+ (curticks < lastticks)) 
+ { 
+ Waiting = FALSE;
+ lastticks = curticks;
+ TicksToWait = dwFrameRateTicks; 
+ } 
+ } 
+ } 
+ } 
+} 
+
+#define MAXSKIP 120
+#define MAXLACE 16
+
+void FrameSkip(void)
+{
+ static int iNumSkips=0,iAdditionalSkip=0; // number of additional frames to skip
+ static DWORD dwLastLace=0; // helper var for frame limitation
+ static DWORD curticks, lastticks, _ticks_since_last_update;
+
+ if(!dwLaceCnt) return; // important: if no updatelace happened, we ignore it completely
+
+ if(iNumSkips) // we are in skipping mode?
+ {
+ dwLastLace+=dwLaceCnt; // -> calc frame limit helper (number of laces)
+ bSkipNextFrame = TRUE; // -> we skip next frame
+ iNumSkips--; // -> ok, one done
+ }
+ else // ok, no additional skipping has to be done... 
+ { // we check now, if some limitation is needed, or a new skipping has to get started
+ DWORD dwWaitTime;
+
+ if(bInitCap || bSkipNextFrame) // first time or we skipped before?
+ {
+ if(bUseFrameLimit && !bInitCap) // frame limit wanted and not first time called?
+ {
+ DWORD dwT=_ticks_since_last_update; // -> that's the time of the last drawn frame
+ dwLastLace+=dwLaceCnt; // -> and that's the number of updatelace since the start of the last drawn frame
+
+ curticks = timeGetTime();
+ _ticks_since_last_update= dwT+curticks - lastticks;
+
+ dwWaitTime=dwLastLace*dwFrameRateTicks; // -> and now we calc the time the real psx would have needed
+
+ if(_ticks_since_last_update<dwWaitTime) // -> we were too fast?
+ { 
+ if((dwWaitTime-_ticks_since_last_update)> // -> some more security, to prevent
+ (60*dwFrameRateTicks)) // wrong waiting times
+ _ticks_since_last_update=dwWaitTime;
+
+ while(_ticks_since_last_update<dwWaitTime) // -> loop until we have reached the real psx time
+ { // (that's the additional limitation, yup)
+ curticks = timeGetTime();
+ _ticks_since_last_update = dwT+curticks - lastticks;
+ }
+ }
+ else // we were still too slow ?!!?
+ {
+ if(iAdditionalSkip<MAXSKIP) // -> well, somewhen we really have to stop skipping on very slow systems
+ {
+ iAdditionalSkip++; // -> inc our watchdog var
+ dwLaceCnt=0; // -> reset lace count
+ lastticks = timeGetTime();
+ return; // -> done, we will skip next frame to get more speed
+ }
+ }
+ }
+
+ bInitCap=FALSE; // -> ok, we have inited the frameskip func
+ iAdditionalSkip=0; // -> init additional skip
+ bSkipNextFrame=FALSE; // -> we don't skip the next frame
+ lastticks = timeGetTime();
+ dwLaceCnt=0; // -> and we start to count the laces 
+ dwLastLace=0; 
+ _ticks_since_last_update=0;
+ return; // -> done, the next frame will get drawn
+ }
+
+ bSkipNextFrame=FALSE; // init the frame skip signal to 'no skipping' first
+
+ curticks = timeGetTime();
+ _ticks_since_last_update = curticks - lastticks;
+
+ dwLastLace=dwLaceCnt; // store curr count (frame limitation helper)
+ dwWaitTime=dwLaceCnt*dwFrameRateTicks; // calc the 'real psx lace time'
+
+ if(_ticks_since_last_update>dwWaitTime) // hey, we needed way too long for that frame...
+ {
+ if(bUseFrameLimit) // if limitation, we skip just next frame,
+ { // and decide after, if we need to do more
+ iNumSkips=0;
+ }
+ else
+ {
+ iNumSkips=_ticks_since_last_update/dwWaitTime; // -> calc number of frames to skip to catch up
+ iNumSkips--; // -> since we already skip next frame, one down
+ if(iNumSkips>MAXSKIP) iNumSkips=MAXSKIP; // -> well, somewhere we have to draw a line
+ }
+ bSkipNextFrame = TRUE; // -> signal for skipping the next frame
+ }
+ else // we were faster than real psx? fine :)
+ if(bUseFrameLimit) // frame limit used? so we wait til the 'real psx time' has been reached
+ {
+ if(dwLaceCnt>MAXLACE) // -> security check
+ _ticks_since_last_update=dwWaitTime;
+
+ while(_ticks_since_last_update<dwWaitTime) // just do a waiting loop...
+ {
+ curticks = timeGetTime();
+ _ticks_since_last_update = curticks - lastticks;
+ }
+ }
+
+ lastticks = timeGetTime();
+ }
+
+ dwLaceCnt=0; // init lace counter
+}
+
+void calcfps(void) 
+{ 
+ static unsigned long curticks,_ticks_since_last_update,lastticks; 
+ static long fps_cnt = 0;
+ static unsigned long fps_tck = 1; 
+ static long fpsskip_cnt = 0;
+ static unsigned long fpsskip_tck = 1;
+ 
+ { 
+ curticks = timeGetTime(); 
+ _ticks_since_last_update=curticks-lastticks; 
+ 
+ if(bUseFrameSkip && !bUseFrameLimit && _ticks_since_last_update) 
+ fps_skip=min(fps_skip,((float)TIMEBASE/(float)_ticks_since_last_update+1.0f));
+ 
+ lastticks = curticks; 
+ } 
+ 
+ if(bUseFrameSkip && bUseFrameLimit)
+ {
+ fpsskip_tck += _ticks_since_last_update;
+
+ if(++fpsskip_cnt==2)
+ {
+ fps_skip = (float)2000/(float)fpsskip_tck;
+
+ fps_skip +=6.0f;
+
+ fpsskip_cnt = 0;
+ fpsskip_tck = 1;
+ }
+ }
+
+ fps_tck += _ticks_since_last_update; 
+ 
+ if(++fps_cnt==10) 
+ { 
+ fps_cur = (float)(TIMEBASE*10)/(float)fps_tck; 
+
+ fps_cnt = 0; 
+ fps_tck = 1; 
+ 
+ if(bUseFrameLimit && fps_cur>fFrameRateHz) // optical adjust ;) avoids flickering fps display 
+ fps_cur=fFrameRateHz; 
+ } 
+} 
+
+void PCFrameCap (void) 
+{
+ static unsigned long curticks, lastticks, _ticks_since_last_update;
+ static unsigned long TicksToWait = 0;
+ bool Waiting = TRUE; 
+ 
+ while (Waiting) 
+ {
+ curticks = timeGetTime(); 
+ _ticks_since_last_update = curticks - lastticks; 
+ if ((_ticks_since_last_update > TicksToWait) || 
+ (curticks < lastticks)) 
+ { 
+ Waiting = FALSE; 
+ lastticks = curticks; 
+ TicksToWait = (TIMEBASE / (unsigned long)fFrameRateHz); 
+ } 
+ } 
+} 
+
+void PCcalcfps(void) 
+{ 
+ static unsigned long curticks,_ticks_since_last_update,lastticks; 
+ static long fps_cnt = 0; 
+ static float fps_acc = 0;
+ float CurrentFPS=0; 
+ 
+ curticks = timeGetTime(); 
+ _ticks_since_last_update=curticks-lastticks;
+ if(_ticks_since_last_update) 
+ CurrentFPS=(float)TIMEBASE/(float)_ticks_since_last_update;
+ else CurrentFPS = 0;
+ lastticks = curticks; 
+ 
+ fps_acc += CurrentFPS;
+
+ if(++fps_cnt==10)
+ {
+ fps_cur = fps_acc / 10;
+ fps_acc = 0;
+ fps_cnt = 0;
+ }
+
+ fps_skip=CurrentFPS+1.0f;
+}
+
+void SetAutoFrameCap(void)
+{
+ if(iFrameLimit==1)
+ {
+ fFrameRateHz = fFrameRate;
+ dwFrameRateTicks=(TIMEBASE / (unsigned long)fFrameRateHz);
+ return;
+ }
+
+ if(dwActFixes&128)
+ {
+ if (PSXDisplay.Interlaced)
+ fFrameRateHz = PSXDisplay.PAL?50.0f:60.0f;
+ else fFrameRateHz = PSXDisplay.PAL?25.0f:30.0f;
+ }
+ else
+ {
+ //fFrameRateHz = PSXDisplay.PAL?50.0f:59.94f;
+
+ if(PSXDisplay.PAL)
+ {
+ if (STATUSREG&GPUSTATUS_INTERLACED)
+ fFrameRateHz=33868800.0f/677343.75f; // 50.00238
+ else fFrameRateHz=33868800.0f/680595.00f; // 49.76351
+ } 
+ else
+ {
+ if (STATUSREG&GPUSTATUS_INTERLACED)
+ fFrameRateHz=33868800.0f/565031.25f; // 59.94146
+ else fFrameRateHz=33868800.0f/566107.50f; // 59.82750
+ }
+
+ dwFrameRateTicks=(TIMEBASE / (unsigned long)fFrameRateHz);
+ }
+}
+
+void SetFrameRateConfig(void)
+{
+ if(!fFrameRate) fFrameRate=200.0f;
+
+ if(fFrameRateHz==0) 
+ { 
+ if(iFrameLimit==2) fFrameRateHz=59.94f; // auto framerate? set some init val (no pal/ntsc known yet)
+ else fFrameRateHz=fFrameRate; // else set user framerate
+ }
+
+ dwFrameRateTicks=(TIMEBASE / (unsigned long)fFrameRateHz);
+
+ if(iFrameLimit==2) SetAutoFrameCap();
+}
+
+void InitFrameCap(void)
+{
+}
+
+void ReInitFrameCap(void)
+{
+}
+
+void CheckFrameRate(void) // called in updatelace (on every emulated psx vsync)
+{
+ if(bUseFrameSkip) 
+ {
+ if(!(dwActFixes&0x100))
+ {
+ dwLaceCnt++; // -> and store cnt of vsync between frames
+ if(dwLaceCnt>=MAXLACE && bUseFrameLimit) 
+ {
+ if(dwLaceCnt==MAXLACE) bInitCap=TRUE;
+ FrameCap();
+ }
+ }
+ else if(bUseFrameLimit) FrameCap();
+ calcfps(); // -> calc fps display in skipping mode
+ } 
+ else // -> non-skipping mode:
+ {
+ if(bUseFrameLimit) FrameCap();
+ if(ulKeybits&KEY_SHOWFPS) calcfps(); 
+ }
+}
+
+void CALLBACK GPUsetframelimit(unsigned long option) // new EPSXE interface func: main emu can enable/disable fps limitation this way
+{
+ bInitCap = TRUE;
+
+ if(option==1) // emu says: limit
+ {
+ bUseFrameLimit=TRUE;bUseFrameSkip=FALSE;iFrameLimit=2;
+ SetAutoFrameCap();
+ }
+ else // emu says: no limit
+ {
+ bUseFrameLimit=FALSE;
+ }
+}

pcsxr-1.9.92.tar.bz2/plugins/peopsxgl/fps.h -> pcsxr-1.9.93.tar.bz2/plugins/peopsxgl/fps.h Changed

@@ -1,28 +1,30 @@
-/***************************************************************************
-                          fps.h  -  description
-                             -------------------
-    begin                : Sun Mar 08 2009
-    copyright            : (C) 1999-2009 by Pete Bernert
-    web                  : www.pbernert.com   
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version. See also the license.txt file for *
- *   additional informations.                                              *
- *                                                                         *
- ***************************************************************************/
-
-void InitFrameCap(void);
-void SetFrameRateConfig(void);
-void PCFrameCap(void);
-void PCcalcfps(void);
-void FrameSkip(void);
-void CheckFrameRate(void);
-void ReInitFrameCap(void);
-void SetAutoFrameCap(void);
-
-unsigned long timeGetTime();
+/***************************************************************************
+                          fps.h  -  description
+                             -------------------
+    begin                : Sun Mar 08 2009
+    copyright            : (C) 1999-2009 by Pete Bernert
+    web                  : www.pbernert.com   
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+void InitFrameCap(void);
+void SetFrameRateConfig(void);
+void PCFrameCap(void);
+void PCcalcfps(void);
+void FrameSkip(void);
+void CheckFrameRate(void);
+void ReInitFrameCap(void);
+void SetAutoFrameCap(void);
+
+#ifndef _WINDOWS
+unsigned long timeGetTime();
+#endif

pcsxr-1.9.92.tar.bz2/plugins/peopsxgl/gl_ext.h -> pcsxr-1.9.93.tar.bz2/plugins/peopsxgl/gl_ext.h Changed

@@ -1,32 +1,40 @@
 #define COMBINE_EXT          0x8570
-#define COMBINE_RGB_EXT      0x8571
-#define COMBINE_ALPHA_EXT    0x8572
-#define SOURCE0_RGB_EXT      0x8580
-#define SOURCE1_RGB_EXT      0x8581
-#define SOURCE2_RGB_EXT      0x8582
-#define SOURCE0_ALPHA_EXT    0x8588
-#define SOURCE1_ALPHA_EXT    0x8589
-#define SOURCE2_ALPHA_EXT    0x858A
-#define OPERAND0_RGB_EXT     0x8590
-#define OPERAND1_RGB_EXT     0x8591
-#define OPERAND2_RGB_EXT     0x8592
-#define OPERAND0_ALPHA_EXT   0x8598
-#define OPERAND1_ALPHA_EXT   0x8599
-#define OPERAND2_ALPHA_EXT   0x859A
-#define RGB_SCALE_EXT        0x8573
-#define ADD_SIGNED_EXT       0x8574
-#define INTERPOLATE_EXT      0x8575
-#define CONSTANT_EXT         0x8576
-#define PRIMARY_COLOR_EXT    0x8577
-#define PREVIOUS_EXT         0x8578
-
-#define FUNC_ADD_EXT             0x8006
-#define FUNC_REVERSESUBTRACT_EXT 0x800B
+#define COMBINE_RGB_EXT      0x8571
+#define COMBINE_ALPHA_EXT    0x8572
+#define SOURCE0_RGB_EXT      0x8580
+#define SOURCE1_RGB_EXT      0x8581
+#define SOURCE2_RGB_EXT      0x8582
+#define SOURCE0_ALPHA_EXT    0x8588
+#define SOURCE1_ALPHA_EXT    0x8589
+#define SOURCE2_ALPHA_EXT    0x858A
+#define OPERAND0_RGB_EXT     0x8590
+#define OPERAND1_RGB_EXT     0x8591
+#define OPERAND2_RGB_EXT     0x8592
+#define OPERAND0_ALPHA_EXT   0x8598
+#define OPERAND1_ALPHA_EXT   0x8599
+#define OPERAND2_ALPHA_EXT   0x859A
+#define RGB_SCALE_EXT        0x8573
+#define ADD_SIGNED_EXT       0x8574
+#define INTERPOLATE_EXT      0x8575
+#define CONSTANT_EXT         0x8576
+#define PRIMARY_COLOR_EXT    0x8577
+#define PREVIOUS_EXT         0x8578
 
+#define FUNC_ADD_EXT             0x8006
+#define FUNC_REVERSESUBTRACT_EXT 0x800B
+
+#ifdef _WINDOWS
+typedef void (APIENTRY * PFNGLBLENDEQU) (GLenum mode);
+typedef void (APIENTRY * PFNGLCOLORTABLEEXT)
+    (GLenum target, GLenum internalFormat, GLsizei width, GLenum format,
+     GLenum type, const GLvoid *data);
+typedef BOOL (APIENTRY *PFNWGLSWAPINTERVALFARPROC)(int iV);
+#else
 typedef void (* PFNGLBLENDEQU) (GLenum mode);
 typedef void (* PFNGLCOLORTABLEEXT)
     (GLenum target, GLenum internalFormat, GLsizei width, GLenum format,
      GLenum type, const GLvoid *data);
+#endif
 
 #define GL_UNSIGNED_SHORT_4_4_4_4_EXT       0x8033
 #define GL_UNSIGNED_SHORT_5_5_5_1_EXT       0x8034
@@ -34,4 +42,15 @@
 #define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF
 #define GL_TEXTURE_MAX_ANISOTROPY_EXT     0x84FE
 
+#ifndef GL_BGR_EXT
+#define GL_BGR_EXT                        0x80E0
+#endif
+#ifndef GL_BGRA_EXT
+#define GL_BGRA_EXT                       0x80E1
+#endif
+
+#ifndef GL_COLOR_INDEX8_EXT
+#define GL_COLOR_INDEX8_EXT               0x80E5
+#endif
+
 //GL_ALPHA_SCALE

pcsxr-1.9.92.tar.bz2/plugins/peopsxgl/gpu.c -> pcsxr-1.9.93.tar.bz2/plugins/peopsxgl/gpu.c Changed

@@ -1,792 +1,1029 @@
-/***************************************************************************
- gpu.c - description
- -------------------
- begin : Sun Mar 08 2009
- copyright : (C) 1999-2009 by Pete Bernert
- email : BlackDove@addcom.de
- ***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. See also the license.txt file for *
- * additional informations. *
- * *
- ***************************************************************************/
-
-// !!! enable this, if Linux XF86VidMode is not supported: 
-//#define NOVMODE
-
-#include "stdafx.h"
-#include "config.h"
-
-#ifndef NOVMODE
-#include <X11/extensions/xf86vmode.h>
-static XF86VidModeModeInfo **modes=0;
-static int iOldMode=0;
-#endif
-
-#define _IN_GPU
-
-#include "externals.h"
-#include "gpu.h"
-#include "draw.h"
-#include "cfg.h"
-#include "prim.h"
-#include "psemu_plugin_defs.h"
-#include "texture.h"
-#include "menu.h"
-#include "fps.h"
-#include "key.h"
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#include <locale.h>
-#define _(x) gettext(x)
-#define N_(x) (x)
-#else
-#define _(x) (x)
-#define N_(x) (x)
-#endif
- 
-////////////////////////////////////////////////////////////////////////
-// PPDK developer must change libraryName field and can change revision and build
-////////////////////////////////////////////////////////////////////////
-
-const unsigned char version = 1; // do not touch - library for PSEmu 1.x
-const unsigned char revision = 1;
-const unsigned char build = 78;
-
-static char *libraryName = N_("OpenGL Driver");
-
-static char *PluginAuthor = N_("Pete Bernert");
-static char *libraryInfo = N_("Based on P.E.Op.S. MesaGL Driver V1.78\nCoded by Pete Bernert\n");
-
-////////////////////////////////////////////////////////////////////////
-// memory image of the PSX vram
-////////////////////////////////////////////////////////////////////////
-
-unsigned char *psxVSecure;
-unsigned char *psxVub;
-signed char *psxVsb;
-unsigned short *psxVuw;
-unsigned short *psxVuw_eom;
-signed short *psxVsw;
-uint32_t *psxVul;
-signed int *psxVsl;
-
-// macro for easy access to packet information
-#define GPUCOMMAND(x) ((x>>24) & 0xff)
-
-GLfloat gl_z=0.0f;
-BOOL bNeedInterlaceUpdate=FALSE;
-BOOL bNeedRGB24Update=FALSE;
-BOOL bChangeWinMode=FALSE;
-
-uint32_t ulStatusControl[256];
-
-////////////////////////////////////////////////////////////////////////
-// global GPU vars
-////////////////////////////////////////////////////////////////////////
-
-static int GPUdataRet;
-int lGPUstatusRet;
-char szDispBuf[64];
-
-uint32_t dwGPUVersion = 0;
-int iGPUHeight = 512;
-int iGPUHeightMask = 511;
-int GlobalTextIL = 0;
-int iTileCheat = 0;
-
-static uint32_t gpuDataM[256];
-static unsigned char gpuCommand = 0;
-static int gpuDataC = 0;
-static int gpuDataP = 0;
-
-VRAMLoad_t VRAMWrite;
-VRAMLoad_t VRAMRead;
-int iDataWriteMode;
-int iDataReadMode;
-
-int lClearOnSwap;
-int lClearOnSwapColor;
-BOOL bSkipNextFrame = FALSE;
-int iColDepth;
-BOOL bChangeRes;
-BOOL bWindowMode;
-int iWinSize;
-
-// possible psx display widths
-short dispWidths[8] = {256,320,512,640,368,384,512,640};
-
-PSXDisplay_t PSXDisplay;
-PSXDisplay_t PreviousPSXDisplay;
-TWin_t TWin;
-short imageX0,imageX1;
-short imageY0,imageY1;
-BOOL bDisplayNotSet = TRUE;
-GLuint uiScanLine=0;
-int iUseScanLines=0;
-int lSelectedSlot=0;
-unsigned char * pGfxCardScreen=0;
-int iBlurBuffer=0;
-int iScanBlend=0;
-int iRenderFVR=0;
-int iNoScreenSaver=0;
-uint32_t ulGPUInfoVals[16];
-int iFakePrimBusy = 0;
-int iRumbleVal = 0;
-int iRumbleTime = 0;
-
-////////////////////////////////////////////////////////////////////////
-// stuff to make this a true PDK module
-////////////////////////////////////////////////////////////////////////
-
-char * CALLBACK PSEgetLibName(void)
-{
- return _(libraryName);
-}
-
-unsigned long CALLBACK PSEgetLibType(void)
-{
- return PSE_LT_GPU;
-}
-
-unsigned long CALLBACK PSEgetLibVersion(void)
-{
- return version<<16|revision<<8|build;
-}
-
-char * GPUgetLibInfos(void)
-{
- return _(libraryInfo);
-}
-
-////////////////////////////////////////////////////////////////////////
-// snapshot funcs (saves screen to bitmap / text infos into file)
-////////////////////////////////////////////////////////////////////////
-
-char * GetConfigInfos(int hW)
-{
- char szO[2][4]={"off","on "};
- char szTxt[256];
- char * pB=(char *)malloc(32767);
-
- if(!pB) return NULL;
- *pB=0;
- //----------------------------------------------------//
- sprintf(szTxt,"Plugin: %s %d.%d.%d\r\n",libraryName,version,revision,build);
- strcat(pB,szTxt);
- sprintf(szTxt,"Author: %s\r\n",PluginAuthor);
- strcat(pB,szTxt);
-
- sprintf(szTxt,"Card vendor: %s\r\n",(char *)glGetString(GL_VENDOR));
- strcat(pB,szTxt);
- sprintf(szTxt,"GFX card: %s\r\n",(char *)glGetString(GL_RENDERER));
- strcat(pB,szTxt);
- sprintf(szTxt,"OGL version: %s\r\n\r\n",(char *)glGetString(GL_VERSION));
- strcat(pB,szTxt);
- //strcat(pB,(char *)glGetString(GL_EXTENSIONS));
- //strcat(pB,"\r\n\r\n");
-
- if(hW && bWindowMode)
- sprintf(szTxt,"Resolution/Color:\r\n- %dx%d ",LOWORD(iWinSize),HIWORD(iWinSize));
- else
- sprintf(szTxt,"Resolution/Color:\r\n- %dx%d ",iResX,iResY);
- strcat(pB,szTxt);
- if(bWindowMode) sprintf(szTxt,"Window mode\r\n");
- else
- {
- sprintf(szTxt,"Fullscreen ");
- strcat(pB,szTxt);
- if(bChangeRes) sprintf(szTxt,"- Desktop changing [%d Bit]\r\n",iColDepth);
- else sprintf(szTxt,"- NO desktop changing\r\n");
- } 
- strcat(pB,szTxt);
-
- if(iForceVSync>=0) sprintf(szTxt,"- V-Sync: %s\r\n",szO[iForceVSync]);
- else strcpy(szTxt,"- V-Sync: Driver\r\n");
- strcat(pB,szTxt); 
- sprintf(szTxt,"- Keep psx aspect ratio: %s\r\n\r\n",szO[bKeepRatio]);
- strcat(pB,szTxt);
- //----------------------------------------------------//
- strcpy(szTxt,"Textures:\r\n- ");
- if(iTexQuality==0) strcat(szTxt,"Default");
- else if(iTexQuality==1) strcat(szTxt,"R4G4B4A4");
- else if(iTexQuality==2) strcat(szTxt,"R5G5B5A1");
- else if(iTexQuality==3) strcat(szTxt,"R8G8A8A8");
- else if(iTexQuality==4) strcat(szTxt,"B8G8R8A8");
- if(!hW && bGLExt) strcat(szTxt," (packed pixels)\r\n");
- else strcat(szTxt,"\r\n");
- strcat(pB,szTxt);
- if(!hW)
- {
- sprintf(szTxt,"- Filtering: %d - edge clamping ",iFilterType);
- if(iClampType==GL_TO_EDGE_CLAMP) strcat(szTxt,"supported\r\n");
- else strcat(szTxt,"NOT supported\r\n");
- }
- else sprintf(szTxt,"- iFiltering: %d\r\n",iFilterType);
- strcat(pB,szTxt);
- sprintf(szTxt,"- Hi-Res textures: %d\r\n",iHiResTextures);
- strcat(pB,szTxt); 
- if(!hW)
- {
- sprintf(szTxt,"- Palettized tex windows: %s\r\n",szO[iUsePalTextures]);
- strcat(pB,szTxt); 
- }
- sprintf(szTxt,"- VRam size: %d MBytes",iVRamSize);
- if(!hW)
- sprintf(szTxt+strlen(szTxt)," - %d textures usable\r\n\r\n",iSortTexCnt);
- else strcat(szTxt,"\r\n\r\n");
- strcat(pB,szTxt);
- //----------------------------------------------------//
- sprintf(szTxt,"Framerate:\r\n- FPS limitation: %s\r\n",szO[bUseFrameLimit]);
- strcat(pB,szTxt);
- sprintf(szTxt,"- Frame skipping: %s\r\n",szO[bUseFrameSkip]);
- strcat(pB,szTxt);
- if(iFrameLimit==2)
- strcpy(szTxt,"- FPS limit: Auto\r\n\r\n");
- else sprintf(szTxt,"- FPS limit: %.1f\r\n\r\n",fFrameRate);
- strcat(pB,szTxt);
- //----------------------------------------------------//
- sprintf(szTxt,"Compatibility:\r\n- Offscreen drawing: %d\r\n",iOffscreenDrawing);
- strcat(pB,szTxt);
- sprintf(szTxt,"- Framebuffer texture: %d",iFrameTexType);
- if(!hW && iFrameTexType==2)
- {
- if(gTexFrameName) strcat(szTxt," - texture created\r\n");
- else strcat(szTxt," - not used yet\r\n");
- }
- else strcat(szTxt,"\r\n");
- strcat(pB,szTxt);
- sprintf(szTxt,"- Framebuffer access: %d\r\n",iFrameReadType);
- strcat(pB,szTxt);
- sprintf(szTxt,"- Alpha multipass: %s\r\n",szO[bOpaquePass]);
- strcat(pB,szTxt);
- sprintf(szTxt,"- Mask bit: %s\r\n",szO[iUseMask]);
- strcat(pB,szTxt);
- sprintf(szTxt,"- Advanced blending: %s",szO[bAdvancedBlend]);
- if(!hW && bAdvancedBlend)
- {
- if(bGLBlend) strcat(szTxt," (hardware)\r\n");
- else strcat(szTxt," (software)\r\n");
- }
- else strcat(szTxt,"\r\n");
- strcat(pB,szTxt);
-
- if(!hW)
- {
- strcpy(szTxt,"- Subtractive blending: ");
- if(glBlendEquationEXTEx)
- {
- if(bUseMultiPass) strcat(szTxt,"supported, but not used!");
- else strcat(szTxt,"activated");
- }
- else strcat(szTxt," NOT supported!");
- strcat(szTxt,"\r\n\r\n");
- }
- else strcpy(szTxt,"\r\n");
- 
- strcat(pB,szTxt); 
- //----------------------------------------------------//
- sprintf(szTxt,"Misc:\r\n- Scanlines: %s",szO[iUseScanLines]);
- strcat(pB,szTxt);
- if(iUseScanLines) sprintf(szTxt," [%d]\r\n",iScanBlend);
- else strcpy(szTxt,"\r\n");
- strcat(pB,szTxt);
- sprintf(szTxt,"- Line mode: %s\r\n",szO[bUseLines]);
- strcat(pB,szTxt);
-// sprintf(szTxt,"- Line AA: %s\r\n",szO[bUseAntiAlias]);
-// fwrite(szTxt,lstrlen(szTxt),1,txtfile);
- sprintf(szTxt,"- Unfiltered FB: %s\r\n",szO[bUseFastMdec]);
- strcat(pB,szTxt);
- sprintf(szTxt,"- 15 bit FB: %s\r\n",szO[bUse15bitMdec]);
- strcat(pB,szTxt);
- sprintf(szTxt,"- Dithering: %s\r\n",szO[bDrawDither]);
- strcat(pB,szTxt);
- sprintf(szTxt,"- Screen smoothing: %s",szO[iBlurBuffer]);
- strcat(pB,szTxt);
- if(!hW && iBlurBuffer) 
- {
- if(gTexBlurName) strcat(pB," - supported\r\n");
- else strcat(pB," - not supported\r\n");
- }
- else strcat(pB,"\r\n");
- sprintf(szTxt,"- Game fixes: %s [%08x]\r\n",szO[bUseFixes],dwCfgFixes);
- strcat(pB,szTxt);
- //----------------------------------------------------//
- return pB;
-}
-
-////////////////////////////////////////////////////////////////////////
-// save text infos to file
-////////////////////////////////////////////////////////////////////////
-
-void DoTextSnapShot(int iNum)
-{
- FILE *txtfile;char szTxt[256];char * pB;
-
- sprintf(szTxt,"%s/pcsx%04d.txt",getenv("HOME"),iNum);
-
- if((txtfile=fopen(szTxt,"wb"))==NULL)
- return; 
-
- pB=GetConfigInfos(0);
- if(pB)
- {
- fwrite(pB,strlen(pB),1,txtfile);
- free(pB);
- }
- fclose(txtfile); 
-}
-
-////////////////////////////////////////////////////////////////////////
-// saves screen bitmap to file
-////////////////////////////////////////////////////////////////////////
-
-void DoSnapShot(void)
-{
- unsigned char * snapshotdumpmem=NULL,* p,c;
- FILE *bmpfile;char filename[256];
- unsigned char header[0x36];int size;
- unsigned char empty[2]={0,0};int i;
- unsigned int snapshotnr = 0;
- short SnapWidth;
- short SnapHeigth;
-
- bSnapShot=FALSE;
-
- SnapWidth = iResX;
- SnapHeigth = iResY;
-
- size=SnapWidth * SnapHeigth * 3 + 0x38;
-
- if((snapshotdumpmem=(unsigned char *)
- malloc(SnapWidth*SnapHeigth*3))==NULL)
- return;
- 
- // fill in proper values for BMP
- for(i=0;i<0x36;i++) header[i]=0;
- header[0]='B';
- header[1]='M';
- header[2]=(unsigned char)(size&0xff);
- header[3]=(unsigned char)((size>>8)&0xff);
- header[4]=(unsigned char)((size>>16)&0xff);
- header[5]=(unsigned char)((size>>24)&0xff);
- header[0x0a]=0x36;
- header[0x0e]=0x28;
- header[0x12]=(unsigned char)(SnapWidth%256);
- header[0x13]=(unsigned char)(SnapWidth/256);
- header[0x16]=(unsigned char)(SnapHeigth%256);
- header[0x17]=(unsigned char)(SnapHeigth/256);
- header[0x1a]=0x01;
- header[0x1c]=0x18;
- header[0x26]=0x12;
- header[0x27]=0x0B;
- header[0x2A]=0x12;
- header[0x2B]=0x0B;
-
- // increment snapshot value
- // get filename
- do
- {
- snapshotnr++;
- sprintf(filename,"%s/pcsx%04d.bmp",getenv("HOME"),snapshotnr);
- bmpfile=fopen(filename,"rb");
- if(bmpfile==NULL)break;
- fclose(bmpfile);
- if(snapshotnr==9999) break;
- }
- while(TRUE);
-
- // try opening new snapshot file
- if((bmpfile=fopen(filename,"wb"))==NULL)
- {free(snapshotdumpmem);return;}
-
- fwrite(header,0x36,1,bmpfile);
-
- glReadPixels(0,0,SnapWidth,SnapHeigth,GL_RGB,
- GL_UNSIGNED_BYTE,snapshotdumpmem);
- p=snapshotdumpmem;
- size=SnapWidth * SnapHeigth;
-
- for(i=0;i<size;i++,p+=3)
- {c=*p;*p=*(p+2);*(p+2)=c;}
-
- fwrite(snapshotdumpmem,size*3,1,bmpfile);
- fwrite(empty,0x2,1,bmpfile);
- fclose(bmpfile); 
- free(snapshotdumpmem);
-
- DoTextSnapShot(snapshotnr);
-} 
-
-void CALLBACK GPUmakeSnapshot(void)
-{
- bSnapShot = TRUE;
-} 
-
-////////////////////////////////////////////////////////////////////////
-// GPU INIT... here starts it all (first func called by emu)
-////////////////////////////////////////////////////////////////////////
-
-long CALLBACK GPUinit()
-{
- memset(ulStatusControl,0,256*sizeof(uint32_t));
-
- // different ways of accessing PSX VRAM
-
- psxVSecure=(unsigned char *)malloc((iGPUHeight*2)*1024 + (1024*1024)); // always alloc one extra MB for soft drawing funcs security
- if(!psxVSecure) return -1;
-
- psxVub=psxVSecure+512*1024; // security offset into double sized psx vram!
- psxVsb=(signed char *)psxVub;
- psxVsw=(signed short *)psxVub;
- psxVsl=(signed int *)psxVub;
- psxVuw=(unsigned short *)psxVub;
- psxVul=(uint32_t *)psxVub;
-
- psxVuw_eom=psxVuw+1024*iGPUHeight; // pre-calc of end of vram
-
- memset(psxVSecure,0x00,(iGPUHeight*2)*1024 + (1024*1024));
- memset(ulGPUInfoVals,0x00,16*sizeof(uint32_t));
-
- InitFrameCap(); // init frame rate stuff
-
- PSXDisplay.RGB24 = 0; // init vars
- PreviousPSXDisplay.RGB24= 0;
- PSXDisplay.Interlaced = 0;
- PSXDisplay.InterlacedTest=0;
- PSXDisplay.DrawOffset.x = 0;
- PSXDisplay.DrawOffset.y = 0;
- PSXDisplay.DrawArea.x0 = 0;
- PSXDisplay.DrawArea.y0 = 0;
- PSXDisplay.DrawArea.x1 = 320;
- PSXDisplay.DrawArea.y1 = 240;
- PSXDisplay.DisplayMode.x= 320;
- PSXDisplay.DisplayMode.y= 240;
- PSXDisplay.Disabled = FALSE;
- PreviousPSXDisplay.Range.x0 =0;
- PreviousPSXDisplay.Range.x1 =0;
- PreviousPSXDisplay.Range.y0 =0;
- PreviousPSXDisplay.Range.y1 =0;
- PSXDisplay.Range.x0=0;
- PSXDisplay.Range.x1=0;
- PSXDisplay.Range.y0=0;
- PSXDisplay.Range.y1=0;
- PreviousPSXDisplay.DisplayPosition.x = 1;
- PreviousPSXDisplay.DisplayPosition.y = 1;
- PSXDisplay.DisplayPosition.x = 1;
- PSXDisplay.DisplayPosition.y = 1;
- PreviousPSXDisplay.DisplayModeNew.y=0;
- PSXDisplay.Double=1;
- GPUdataRet=0x400;
-
- PSXDisplay.DisplayModeNew.x=0;
- PSXDisplay.DisplayModeNew.y=0;
-
- //PreviousPSXDisplay.Height = PSXDisplay.Height = 239;
- 
- iDataWriteMode = DR_NORMAL;
-
- // Reset transfer values, to prevent mis-transfer of data
- memset(&VRAMWrite,0,sizeof(VRAMLoad_t));
- memset(&VRAMRead,0,sizeof(VRAMLoad_t));
- 
- // device initialised already !
- //lGPUstatusRet = 0x74000000;
-
- STATUSREG = 0x14802000;
- GPUIsIdle;
- GPUIsReadyForCommands;
-
- return 0;
-} 
-
-////////////////////////////////////////////////////////////////////////
-// GPU OPEN: funcs to open up the gpu display (Windows)
-////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////////
-// LINUX GPU OPEN: func to open up the gpu display (X stuff)
-// please note: in linux we are creating our own display, and we return
-// the display ID to the main emu... that's cleaner
-////////////////////////////////////////////////////////////////////////
-
-char * pCaptionText=0;
-int bFullScreen=0;
-Display *display;
-
-static Cursor cursor;
-static XVisualInfo *myvisual;
-static Colormap colormap;
-static Window window;
-
-static int bModeChanged=0;
-
-typedef struct
-{
-#define MWM_HINTS_DECORATIONS 2
- long flags;
- long functions;
- long decorations;
- long input_mode;
-} MotifWmHints;
-
-static int dbdepat[]={GLX_RGBA,GLX_DOUBLEBUFFER,GLX_DEPTH_SIZE,16,None};
-static int dbnodepat[]={GLX_RGBA,GLX_DOUBLEBUFFER,None};
-static GLXContext cx;
-
-static int fx=0;
-
-////////////////////////////////////////////////////////////////////////
-
-void osd_close_display (void) // close display
-{
- if(display) // display exists?
- {
- glXDestroyContext(display,cx); // -> kill context
- XFreeColormap(display, colormap); // -> kill colormap
- XSync(display,False); // -> sync events
-
-#ifndef NOVMODE
- if(bModeChanged) // -> repair screen mode
- {
- int myscreen=DefaultScreen(display);
- XF86VidModeSwitchToMode(display,myscreen, // --> switch mode back
- modes[iOldMode]);
- XF86VidModeSetViewPort(display,myscreen,0,0); // --> set viewport upperleft
- free(modes); // --> finally kill mode infos
- bModeChanged=0; // --> done
- }
-#endif
-
- XCloseDisplay(display); // -> close display
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-
-void sysdep_create_display(void) // create display
-{
- XSetWindowAttributes winattr;float fxgamma=2;
- int myscreen;char gammastr[14];
- Screen * screen;XEvent event;
- XSizeHints hints;XWMHints wm_hints;
- MotifWmHints mwmhints;Atom mwmatom;Atom delwindow;
- char *glxfx;
-
- glxfx=getenv("MESA_GLX_FX"); // 3dfx mesa fullscreen flag
- if(glxfx)
- {
- if(glxfx[0]=='f') // -> yup, fullscreen needed
- {
- fx=1; // -> raise flag
- putenv("FX_GLIDE_NO_SPLASH=");
- sprintf(gammastr,"SST_GAMMA=%2.1f",fxgamma); // -> set gamma
- putenv(gammastr);
- }
- }
-
- display=XOpenDisplay(NULL); // open display
- if(!display) // no display?
- {
- fprintf (stderr,"Failed to open display!!!\n");
- osd_close_display();
- return; // -> bye
- }
-
- myscreen=DefaultScreen(display); // get screen id
-
-#ifdef NOVMODE
- if(bFullScreen) {fx=1;bModeChanged=0;}
-#else
- if(bFullScreen)
- {
- XF86VidModeModeLine mode;
- int nmodes,iC;
- fx=1; // raise flag
- XF86VidModeGetModeLine(display,myscreen,&iC,&mode); // get actual mode info
- if(mode.privsize) XFree(mode.private); // no need for private stuff
- bModeChanged=0; // init mode change flag
- if(iResX!=mode.hdisplay || iResY!=mode.vdisplay) // wanted mode is different?
- {
- XF86VidModeGetAllModeLines(display,myscreen, // -> enum all mode infos
- &nmodes,&modes);
- if(modes) // -> infos got?
- {
- for(iC=0;iC<nmodes;++iC) // -> loop modes
- {
- if(mode.hdisplay==modes[iC]->hdisplay && // -> act mode found?
- mode.vdisplay==modes[iC]->vdisplay) // if yes: store mode id
- iOldMode=iC;
-
- if(iResX==modes[iC]->hdisplay && // -> wanted mode found?
- iResY==modes[iC]->vdisplay)
- {
- XF86VidModeSwitchToMode(display,myscreen, // --> switch to mode
- modes[iC]);
- XF86VidModeSetViewPort(display,myscreen,0,0);
- bModeChanged=1; // --> raise flag for repairing mode on close
- }
- }
-
- if(bModeChanged==0) // -> no mode found?
- {
- free(modes); // --> free infos
- printf("No proper fullscreen mode found!\n"); // --> some info output
- }
- }
- }
- }
-#endif
-
- screen=DefaultScreenOfDisplay(display);
-
- if(iZBufferDepth) // visual (with or without zbuffer)
- myvisual=glXChooseVisual(display,myscreen,dbdepat);
- else myvisual=glXChooseVisual(display,myscreen,dbnodepat);
-
- if(!myvisual) // no visual?
- {
- fprintf(stderr,"Failed to obtain visual!!!\n"); // -> bye
- osd_close_display();
- return;
- }
-
- cx=glXCreateContext(display,myvisual,0,GL_TRUE); // create rendering context
-
- if(!cx) // no context?
- {
- fprintf(stderr,"Failed to create OpenGL context!!!\n");
- osd_close_display(); // -> bxe
- return;
- }
-
- // pffff... much work for a simple blank cursor... oh, well...
- if(!bFullScreen) cursor=XCreateFontCursor(display,XC_trek);
- else
- {
- Pixmap p1,p2;XImage * img;
- XColor b,w;unsigned char * idata;
- XGCValues GCv;
- GC GCc;
-
- memset(&b,0,sizeof(XColor));
- memset(&w,0,sizeof(XColor));
- idata=(unsigned char *)malloc(8);
- memset(idata,0,8);
-
- p1=XCreatePixmap(display,RootWindow(display,myvisual->screen),8,8,1);
- p2=XCreatePixmap(display,RootWindow(display,myvisual->screen),8,8,1);
-
- img = XCreateImage(display,myvisual->visual,
- 1,XYBitmap,0,idata,8,8,8,1);
-
- GCv.function = GXcopy;
- GCv.foreground = ~0;
- GCv.background = 0;
- GCv.plane_mask = AllPlanes;
- GCc = XCreateGC(display,p1,
- (GCFunction|GCForeground|GCBackground|GCPlaneMask),&GCv);
-
- XPutImage(display, p1,GCc,img,0,0,0,0,8,8);
- XPutImage(display, p2,GCc,img,0,0,0,0,8,8);
- XFreeGC(display, GCc);
-
- cursor = XCreatePixmapCursor(display,p1,p2,&b,&w,0,0);
-
- XFreePixmap(display,p1);
- XFreePixmap(display,p2);
- XDestroyImage(img); // will free idata as well
- }
-
- colormap=XCreateColormap(display, // create colormap
- RootWindow(display,myvisual->screen),
- myvisual->visual,AllocNone);
-
- winattr.background_pixel=0;
- winattr.border_pixel=WhitePixelOfScreen(screen);
- winattr.bit_gravity=ForgetGravity;
- winattr.win_gravity=NorthWestGravity;
- winattr.backing_store=NotUseful;
- winattr.override_redirect=False;
- winattr.save_under=False;
- winattr.event_mask=0;
- winattr.do_not_propagate_mask=0;
- winattr.colormap=colormap;
- winattr.cursor=None;
-
- window=XCreateWindow(display, // create own window
- RootWindow(display,DefaultScreen(display)),
- 0,0,iResX,iResY,
- 0,myvisual->depth,
- InputOutput,myvisual->visual,
- CWBorderPixel | CWBackPixel |
- CWEventMask | CWDontPropagate |
- CWColormap | CWCursor,
- &winattr);
-
- if(!window) // no window?
- {
- fprintf(stderr,"Failed in XCreateWindow()!!!\n");
- osd_close_display(); // -> bye
- return;
- }
-
- delwindow = XInternAtom(display,"WM_DELETE_WINDOW",0);
- XSetWMProtocols(display, window, &delwindow, 1);
-
- hints.flags=PMinSize|PMaxSize; // hints
- if(fx) hints.flags|=USPosition|USSize;
- else hints.flags|=PSize;
-
- hints.min_width = hints.max_width = hints.base_width = iResX;
- hints.min_height = hints.max_height = hints.base_height = iResY;
-
- wm_hints.input=1;
- wm_hints.flags=InputHint;
-
- XSetWMHints(display,window,&wm_hints);
- XSetWMNormalHints(display,window,&hints);
- if(pCaptionText) // caption
- XStoreName(display,window,pCaptionText);
- else XStoreName(display,window,"Pete MesaGL PSX Gpu");
-
- XDefineCursor(display,window,cursor); // cursor
-
- if(fx) // window title bar hack
- {
- mwmhints.flags=MWM_HINTS_DECORATIONS;
- mwmhints.decorations=0;
- mwmatom=XInternAtom(display,"_MOTIF_WM_HINTS",0);
- XChangeProperty(display,window,mwmatom,mwmatom,32,
- PropModeReplace,(unsigned char *)&mwmhints,4);
- }
-
- XSelectInput(display,window, // input setup
- FocusChangeMask | ExposureMask |
- KeyPressMask | KeyReleaseMask);
-
- XMapRaised(display,window);
- XClearWindow(display,window);
- XWindowEvent(display,window,ExposureMask,&event);
- glXMakeCurrent(display,window,cx);
-
-/* 
- printf(glGetString(GL_VENDOR));
- printf("\n");
- printf(glGetString(GL_RENDERER));
- printf("\n");
-*/
-
- if (fx) // after make current: fullscreen resize
- {
- XResizeWindow(display,window,screen->width,screen->height);
- hints.min_width = hints.max_width = hints.base_width = screen->width;
- hints.min_height= hints.max_height = hints.base_height = screen->height;
+/***************************************************************************
+ gpu.c - description
+ -------------------
+ begin : Sun Mar 08 2009
+ copyright : (C) 1999-2009 by Pete Bernert
+ email : BlackDove@addcom.de
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+// !!! enable this, if Linux XF86VidMode is not supported: 
+//#define NOVMODE
+
+#include "stdafx.h"
+
+#if defined (_MACGL)
+#include "drawgl.h"
+#elif !defined(_MACGL) && !defined(_WINDOWS)
+
+#include "config.h"
+
+#ifndef NOVMODE
+#include <X11/extensions/xf86vmode.h>
+static XF86VidModeModeInfo **modes=0;
+static int iOldMode=0;
+#endif
+
+#endif
+
+#define _IN_GPU
+
+#include "externals.h"
+#include "gpu.h"
+#include "draw.h"
+#include "cfg.h"
+#include "prim.h"
+#include "psemu_plugin_defs.h"
+#include "texture.h"
+#include "menu.h"
+#include "fps.h"
+#include "key.h"
+#include "gte_accuracy.h"
+#ifdef _WINDOWS
+#include "resource.h"
+#include "ssave.h"
+#endif
+#ifdef ENABLE_NLS
+#include <libintl.h>
+#include <locale.h>
+#define _(x) gettext(x)
+#define N_(x) (x)
+#elif defined(_MACOSX)
+#ifdef PCSXRCORE
+__private_extern__ char* Pcsxr_locale_text(char* toloc);
+#define _(String) Pcsxr_locale_text(String)
+#define N_(String) String
+#else
+#ifndef PCSXRPLUG
+#warning please define the plug being built to use Mac OS X localization!
+#define _(msgid) msgid
+#define N_(msgid) msgid
+#else
+//Kludge to get the preprocessor to accept PCSXRPLUG as a variable.
+#define PLUGLOC_x(x,y) x ## y
+#define PLUGLOC_y(x,y) PLUGLOC_x(x,y)
+#define PLUGLOC PLUGLOC_y(PCSXRPLUG,_locale_text)
+__private_extern__ char* PLUGLOC(char* toloc);
+#define _(String) PLUGLOC(String)
+#define N_(String) String
+#endif
+#endif
+#else
+#define _(x) (x)
+#define N_(x) (x)
+#endif
+
+#ifdef _MACGL
+#include "drawgl.h"
+#endif
+
+////////////////////////////////////////////////////////////////////////
+// PPDK developer must change libraryName field and can change revision and build
+////////////////////////////////////////////////////////////////////////
+
+const unsigned char version = 1; // do not touch - library for PSEmu 1.x
+const unsigned char revision = 1;
+const unsigned char build = 78;
+
+static char *libraryName = N_("OpenGL Driver");
+
+static char *PluginAuthor = N_("Pete Bernert");
+static char *libraryInfo = N_("Based on P.E.Op.S. MesaGL Driver V1.78\nCoded by Pete Bernert\n");
+
+////////////////////////////////////////////////////////////////////////
+// memory image of the PSX vram
+////////////////////////////////////////////////////////////////////////
+
+unsigned char *psxVSecure;
+unsigned char *psxVub;
+signed char *psxVsb;
+unsigned short *psxVuw;
+unsigned short *psxVuw_eom;
+signed short *psxVsw;
+uint32_t *psxVul;
+signed int *psxVsl;
+
+// macro for easy access to packet information
+#define GPUCOMMAND(x) ((x>>24) & 0xff)
+
+GLfloat gl_z=0.0f;
+BOOL bNeedInterlaceUpdate=FALSE;
+BOOL bNeedRGB24Update=FALSE;
+BOOL bChangeWinMode=FALSE;
+
+#ifdef _WINDOWS
+extern HGLRC GLCONTEXT;
+#endif
+
+uint32_t ulStatusControl[256];
+
+////////////////////////////////////////////////////////////////////////
+// global GPU vars
+////////////////////////////////////////////////////////////////////////
+
+static int GPUdataRet;
+int lGPUstatusRet;
+char szDispBuf[64];
+
+uint32_t dwGPUVersion = 0;
+int iGPUHeight = 512;
+int iGPUHeightMask = 511;
+int GlobalTextIL = 0;
+int iTileCheat = 0;
+
+static uint32_t gpuDataM[256];
+static unsigned char gpuCommand = 0;
+static int gpuDataC = 0;
+static int gpuDataP = 0;
+
+VRAMLoad_t VRAMWrite;
+VRAMLoad_t VRAMRead;
+int iDataWriteMode;
+int iDataReadMode;
+
+int lClearOnSwap;
+int lClearOnSwapColor;
+BOOL bSkipNextFrame = FALSE;
+int iColDepth;
+BOOL bChangeRes;
+BOOL bWindowMode;
+int iWinSize;
+
+// possible psx display widths
+short dispWidths[8] = {256,320,512,640,368,384,512,640};
+
+PSXDisplay_t PSXDisplay;
+PSXDisplay_t PreviousPSXDisplay;
+TWin_t TWin;
+short imageX0,imageX1;
+short imageY0,imageY1;
+BOOL bDisplayNotSet = TRUE;
+GLuint uiScanLine=0;
+int iUseScanLines=0;
+float iScanlineColor[] = {0,0,0, 0.3f}; // easy on the eyes.
+int lSelectedSlot=0;
+unsigned char * pGfxCardScreen=0;
+int iBlurBuffer=0;
+int iScanBlend=0;
+int iRenderFVR=0;
+int iNoScreenSaver=0;
+uint32_t ulGPUInfoVals[16];
+int iFakePrimBusy = 0;
+int iRumbleVal = 0;
+int iRumbleTime = 0;
+uint32_t vBlank=0;
+
+////////////////////////////////////////////////////////////////////////
+// stuff to make this a true PDK module
+////////////////////////////////////////////////////////////////////////
+
+char * CALLBACK PSEgetLibName(void)
+{
+ return _(libraryName);
+}
+
+unsigned long CALLBACK PSEgetLibType(void)
+{
+ return PSE_LT_GPU;
+}
+
+unsigned long CALLBACK PSEgetLibVersion(void)
+{
+ return version<<16|revision<<8|build;
+}
+
+char * GPUgetLibInfos(void)
+{
+ return _(libraryInfo);
+}
+
+////////////////////////////////////////////////////////////////////////
+// snapshot funcs (saves screen to bitmap / text infos into file)
+////////////////////////////////////////////////////////////////////////
+
+#ifdef _WINDOWS
+char * GetConfigInfos(HWND hW)
+#else
+char * GetConfigInfos(int hW)
+#endif
+{
+#ifdef _WINDOWS
+ HDC hdc;HGLRC hglrc;
+#endif
+ char szO[2][4]={"off","on "};
+ char szTxt[256];
+ char * pB=(char *)malloc(32767);
+
+ if(!pB) return NULL;
+ *pB=0;
+ //----------------------------------------------------//
+ sprintf(szTxt,"Plugin: %s %d.%d.%d (mod)\r\n",libraryName,version,revision,build);
+ strcat(pB,szTxt);
+ sprintf(szTxt,"Author: %s\r\n",PluginAuthor);
+ strcat(pB,szTxt);
+
+#ifdef _WINDOWS
+ if(hW)
+ {
+ hdc = GetDC(hW);
+ bSetupPixelFormat(hdc);
+ hglrc = wglCreateContext(hdc);
+ wglMakeCurrent(hdc, hglrc);
+ }
+#endif
+
+ sprintf(szTxt,"Card vendor: %s\r\n",(char *)glGetString(GL_VENDOR));
+ strcat(pB,szTxt);
+ sprintf(szTxt,"GFX card: %s\r\n",(char *)glGetString(GL_RENDERER));
+ strcat(pB,szTxt);
+ sprintf(szTxt,"OGL version: %s\r\n\r\n",(char *)glGetString(GL_VERSION));
+ strcat(pB,szTxt);
+ //strcat(pB,(char *)glGetString(GL_EXTENSIONS));
+ //strcat(pB,"\r\n\r\n");
+
+#ifdef _WINDOWS
+ if(hW)
+ {
+ wglMakeCurrent(NULL, NULL);
+ wglDeleteContext(hglrc);
+ ReleaseDC(hW,hdc);
+ }
+ //----------------------------------------------------//
+#endif
+
+ if(hW && bWindowMode)
+ sprintf(szTxt,"Resolution/Color:\r\n- %dx%d ",LOWORD(iWinSize),HIWORD(iWinSize));
+ else
+ sprintf(szTxt,"Resolution/Color:\r\n- %dx%d ",iResX,iResY);
+ strcat(pB,szTxt);
+ if(bWindowMode) sprintf(szTxt,"Window mode\r\n");
+ else
+ {
+ sprintf(szTxt,"Fullscreen ");
+ strcat(pB,szTxt);
+ if(bChangeRes) sprintf(szTxt,"- Desktop changing [%d Bit]\r\n",iColDepth);
+ else sprintf(szTxt,"- NO desktop changing\r\n");
+ } 
+ strcat(pB,szTxt);
+
+ if(iForceVSync>=0) sprintf(szTxt,"- V-Sync: %s\r\n",szO[iForceVSync]);
+ else strcpy(szTxt,"- V-Sync: Driver\r\n");
+ strcat(pB,szTxt); 
+ sprintf(szTxt,"- Keep psx aspect ratio: %s\r\n\r\n",szO[bKeepRatio]);
+ strcat(pB,szTxt);
+ //----------------------------------------------------//
+ strcpy(szTxt,"Textures:\r\n- ");
+ if(iTexQuality==0) strcat(szTxt,"Default");
+ else if(iTexQuality==1) strcat(szTxt,"R4G4B4A4");
+ else if(iTexQuality==2) strcat(szTxt,"R5G5B5A1");
+ else if(iTexQuality==3) strcat(szTxt,"R8G8A8A8");
+ else if(iTexQuality==4) strcat(szTxt,"B8G8R8A8");
+ if(!hW && bGLExt) strcat(szTxt," (packed pixels)\r\n");
+ else strcat(szTxt,"\r\n");
+ strcat(pB,szTxt);
+ if(!hW)
+ {
+ sprintf(szTxt,"- Filtering: %d - edge clamping ",iFilterType);
+ if(iClampType==GL_TO_EDGE_CLAMP) strcat(szTxt,"supported\r\n");
+ else strcat(szTxt,"NOT supported\r\n");
+ }
+ else sprintf(szTxt,"- iFiltering: %d\r\n",iFilterType);
+ strcat(pB,szTxt);
+ sprintf(szTxt,"- Hi-Res textures: %d\r\n",iHiResTextures);
+ strcat(pB,szTxt); 
+ if(!hW)
+ {
+ sprintf(szTxt,"- Palettized tex windows: %s\r\n",szO[iUsePalTextures]);
+ strcat(pB,szTxt); 
+ }
+ sprintf(szTxt,"- VRam size: %d MBytes",iVRamSize);
+ if(!hW)
+ sprintf(szTxt+strlen(szTxt)," - %d textures usable\r\n\r\n",iSortTexCnt);
+ else strcat(szTxt,"\r\n\r\n");
+ strcat(pB,szTxt);
+ //----------------------------------------------------//
+ sprintf(szTxt,"Framerate:\r\n- FPS limitation: %s\r\n",szO[bUseFrameLimit]);
+ strcat(pB,szTxt);
+ sprintf(szTxt,"- Frame skipping: %s\r\n",szO[bUseFrameSkip]);
+ strcat(pB,szTxt);
+ if(iFrameLimit==2)
+ strcpy(szTxt,"- FPS limit: Auto\r\n\r\n");
+ else sprintf(szTxt,"- FPS limit: %.1f\r\n\r\n",fFrameRate);
+ strcat(pB,szTxt);
+ //----------------------------------------------------//
+ sprintf(szTxt,"Compatibility:\r\n- Offscreen drawing: %d\r\n",iOffscreenDrawing);
+ strcat(pB,szTxt);
+ sprintf(szTxt,"- Framebuffer texture: %d",iFrameTexType);
+ if(!hW && iFrameTexType==2)
+ {
+ if(gTexFrameName) strcat(szTxt," - texture created\r\n");
+ else strcat(szTxt," - not used yet\r\n");
+ }
+ else strcat(szTxt,"\r\n");
+ strcat(pB,szTxt);
+ sprintf(szTxt,"- Framebuffer access: %d\r\n",iFrameReadType);
+ strcat(pB,szTxt);
+ sprintf(szTxt,"- Alpha multipass: %s\r\n",szO[bOpaquePass]);
+ strcat(pB,szTxt);
+ sprintf(szTxt,"- Mask bit: %s\r\n",szO[iUseMask]);
+ strcat(pB,szTxt);
+ sprintf(szTxt,"- Advanced blending: %s",szO[bAdvancedBlend]);
+ if(!hW && bAdvancedBlend)
+ {
+ if(bGLBlend) strcat(szTxt," (hardware)\r\n");
+ else strcat(szTxt," (software)\r\n");
+ }
+ else strcat(szTxt,"\r\n");
+ strcat(pB,szTxt);
+
+ if(!hW)
+ {
+ strcpy(szTxt,"- Subtractive blending: ");
+ if(glBlendEquationEXTEx)
+ {
+ if(bUseMultiPass) strcat(szTxt,"supported, but not used!");
+ else strcat(szTxt,"activated");
+ }
+ else strcat(szTxt," NOT supported!");
+ strcat(szTxt,"\r\n\r\n");
+ }
+ else strcpy(szTxt,"\r\n");
+ 
+ strcat(pB,szTxt); 
+ //----------------------------------------------------//
+ sprintf(szTxt,"Misc:\r\n- Scanlines: %s",szO[iUseScanLines]);
+ strcat(pB,szTxt);
+ if(iUseScanLines) sprintf(szTxt," [%d]\r\n",iScanBlend);
+ else strcpy(szTxt,"\r\n");
+ strcat(pB,szTxt);
+ sprintf(szTxt,"- Line mode: %s\r\n",szO[bUseLines]);
+ strcat(pB,szTxt);
+// sprintf(szTxt,"- Line AA: %s\r\n",szO[bUseAntiAlias]);
+// fwrite(szTxt,lstrlen(szTxt),1,txtfile);
+ sprintf(szTxt,"- Unfiltered FB: %s\r\n",szO[bUseFastMdec]);
+ strcat(pB,szTxt);
+ sprintf(szTxt,"- 15 bit FB: %s\r\n",szO[bUse15bitMdec]);
+ strcat(pB,szTxt);
+ sprintf(szTxt,"- Dithering: %s\r\n",szO[bDrawDither]);
+ strcat(pB,szTxt);
+ sprintf(szTxt,"- Screen smoothing: %s",szO[iBlurBuffer]);
+ strcat(pB,szTxt);
+ if(!hW && iBlurBuffer) 
+ {
+ if(gTexBlurName) strcat(pB," - supported\r\n");
+ else strcat(pB," - not supported\r\n");
+ }
+ else strcat(pB,"\r\n");
+ sprintf(szTxt,"- Game fixes: %s [%08x]\r\n",szO[bUseFixes],dwCfgFixes);
+ strcat(pB,szTxt);
+ //----------------------------------------------------//
+ return pB;
+}
+
+////////////////////////////////////////////////////////////////////////
+// save text infos to file
+////////////////////////////////////////////////////////////////////////
+
+void DoTextSnapShot(int iNum)
+{
+ FILE *txtfile;char szTxt[256];char * pB;
+
+#ifdef _WINDOWS
+ sprintf(szTxt,"snap\\pcsxr%04d.txt",iNum);
+#else
+ sprintf(szTxt,"%s/pcsxr%04d.txt",getenv("HOME"),iNum);
+#endif
+
+ if((txtfile=fopen(szTxt,"wb"))==NULL)
+ return; 
+
+ pB=GetConfigInfos(0);
+ if(pB)
+ {
+ fwrite(pB,strlen(pB),1,txtfile);
+ free(pB);
+ }
+ fclose(txtfile); 
+}
+
+////////////////////////////////////////////////////////////////////////
+// saves screen bitmap to file
+////////////////////////////////////////////////////////////////////////
+
+void DoSnapShot(void)
+{
+ unsigned char * snapshotdumpmem=NULL,* p,c;
+ FILE *bmpfile;char filename[256];
+ unsigned char header[0x36];int size;
+ unsigned char empty[2]={0,0};int i;
+ unsigned int snapshotnr = 0;
+ short SnapWidth;
+ short SnapHeigth;
+
+ bSnapShot=FALSE;
+
+ SnapWidth = iResX;
+ SnapHeigth = iResY;
+
+ size=SnapWidth * SnapHeigth * 3 + 0x38;
+
+ if((snapshotdumpmem=(unsigned char *)
+ malloc(SnapWidth*SnapHeigth*3))==NULL)
+ return;
+ 
+ // fill in proper values for BMP
+ for(i=0;i<0x36;i++) header[i]=0;
+ header[0]='B';
+ header[1]='M';
+ header[2]=(unsigned char)(size&0xff);
+ header[3]=(unsigned char)((size>>8)&0xff);
+ header[4]=(unsigned char)((size>>16)&0xff);
+ header[5]=(unsigned char)((size>>24)&0xff);
+ header[0x0a]=0x36;
+ header[0x0e]=0x28;
+ header[0x12]=(unsigned char)(SnapWidth%256);
+ header[0x13]=(unsigned char)(SnapWidth/256);
+ header[0x16]=(unsigned char)(SnapHeigth%256);
+ header[0x17]=(unsigned char)(SnapHeigth/256);
+ header[0x1a]=0x01;
+ header[0x1c]=0x18;
+ header[0x26]=0x12;
+ header[0x27]=0x0B;
+ header[0x2A]=0x12;
+ header[0x2B]=0x0B;
+
+ // increment snapshot value
+ // get filename
+ do
+ {
+ snapshotnr++;
+#ifdef _WINDOWS
+ sprintf(filename,"snap/pcsxr%04d.bmp",snapshotnr);
+#else
+ sprintf(filename,"%s/pcsxr%04d.bmp",getenv("HOME"),snapshotnr);
+#endif
+ bmpfile=fopen(filename,"rb");
+ if(bmpfile==NULL)break;
+ fclose(bmpfile);
+ if(snapshotnr==9999) break;
+ }
+ while(TRUE);
+
+ // try opening new snapshot file
+ if((bmpfile=fopen(filename,"wb"))==NULL)
+ {free(snapshotdumpmem);return;}
+
+ fwrite(header,0x36,1,bmpfile);
+
+ glReadPixels(0,0,SnapWidth,SnapHeigth,GL_RGB,
+ GL_UNSIGNED_BYTE,snapshotdumpmem);
+ p=snapshotdumpmem;
+ size=SnapWidth * SnapHeigth;
+
+ for(i=0;i<size;i++,p+=3)
+ {c=*p;*p=*(p+2);*(p+2)=c;}
+
+ fwrite(snapshotdumpmem,size*3,1,bmpfile);
+ fwrite(empty,0x2,1,bmpfile);
+ fclose(bmpfile); 
+ free(snapshotdumpmem);
+
+ DoTextSnapShot(snapshotnr);
+#ifdef _WINDOWS
+ MessageBeep((UINT)-1);
+#endif
+} 
+
+void CALLBACK GPUmakeSnapshot(void)
+{
+ bSnapShot = TRUE;
+} 
+
+////////////////////////////////////////////////////////////////////////
+// GPU INIT... here starts it all (first func called by emu)
+////////////////////////////////////////////////////////////////////////
+
+long CALLBACK GPUinit()
+{
+ memset(ulStatusControl,0,256*sizeof(uint32_t));
+
+ // different ways of accessing PSX VRAM
+
+ psxVSecure=(unsigned char *)malloc((iGPUHeight*2)*1024 + (1024*1024)); // always alloc one extra MB for soft drawing funcs security
+ if(!psxVSecure) return -1;
+
+ psxVub=psxVSecure+512*1024; // security offset into double sized psx vram!
+ psxVsb=(signed char *)psxVub;
+ psxVsw=(signed short *)psxVub;
+ psxVsl=(signed int *)psxVub;
+ psxVuw=(unsigned short *)psxVub;
+ psxVul=(uint32_t *)psxVub;
+
+ psxVuw_eom=psxVuw+1024*iGPUHeight; // pre-calc of end of vram
+
+ memset(psxVSecure,0x00,(iGPUHeight*2)*1024 + (1024*1024));
+ memset(ulGPUInfoVals,0x00,16*sizeof(uint32_t));
+
+ InitFrameCap(); // init frame rate stuff
+
+ PSXDisplay.RGB24 = 0; // init vars
+ PreviousPSXDisplay.RGB24= 0;
+ PSXDisplay.Interlaced = 0;
+ PSXDisplay.InterlacedTest=0;
+ PSXDisplay.DrawOffset.x = 0;
+ PSXDisplay.DrawOffset.y = 0;
+ PSXDisplay.DrawArea.x0 = 0;
+ PSXDisplay.DrawArea.y0 = 0;
+ PSXDisplay.DrawArea.x1 = 320;
+ PSXDisplay.DrawArea.y1 = 240;
+ PSXDisplay.DisplayMode.x= 320;
+ PSXDisplay.DisplayMode.y= 240;
+ PSXDisplay.Disabled = FALSE;
+ PreviousPSXDisplay.Range.x0 =0;
+ PreviousPSXDisplay.Range.x1 =0;
+ PreviousPSXDisplay.Range.y0 =0;
+ PreviousPSXDisplay.Range.y1 =0;
+ PSXDisplay.Range.x0=0;
+ PSXDisplay.Range.x1=0;
+ PSXDisplay.Range.y0=0;
+ PSXDisplay.Range.y1=0;
+ PreviousPSXDisplay.DisplayPosition.x = 1;
+ PreviousPSXDisplay.DisplayPosition.y = 1;
+ PSXDisplay.DisplayPosition.x = 1;
+ PSXDisplay.DisplayPosition.y = 1;
+ PreviousPSXDisplay.DisplayModeNew.y=0;
+ PSXDisplay.Double=1;
+ GPUdataRet=0x400;
+
+ PSXDisplay.DisplayModeNew.x=0;
+ PSXDisplay.DisplayModeNew.y=0;
+
+ //PreviousPSXDisplay.Height = PSXDisplay.Height = 239;
+ 
+ iDataWriteMode = DR_NORMAL;
+
+ // Reset transfer values, to prevent mis-transfer of data
+ memset(&VRAMWrite,0,sizeof(VRAMLoad_t));
+ memset(&VRAMRead,0,sizeof(VRAMLoad_t));
+ 
+ // device initialised already !
+ //lGPUstatusRet = 0x74000000;
+ vBlank = 0;
+
+ STATUSREG = 0x14802000;
+ GPUIsIdle;
+ GPUIsReadyForCommands;
+
+ return 0;
+} 
+
+////////////////////////////////////////////////////////////////////////
+// GPU OPEN: funcs to open up the gpu display (Windows)
+////////////////////////////////////////////////////////////////////////
+
+#ifdef _WINDOWS
+
+void ChangeDesktop() // change destop resolution
+{
+ DEVMODE dv;long lRes,iTry=0; 
+
+ while(iTry<10) // keep on hammering...
+ {
+ memset(&dv,0,sizeof(DEVMODE));
+ dv.dmSize=sizeof(DEVMODE);
+ dv.dmBitsPerPel=iColDepth;
+ dv.dmPelsWidth=iResX;
+ dv.dmPelsHeight=iResY;
+
+ dv.dmFields=DM_BITSPERPEL|DM_PELSWIDTH|DM_PELSHEIGHT;
+
+ lRes=ChangeDisplaySettings(&dv,0); // ...hammering the anvil
+
+ if(lRes==DISP_CHANGE_SUCCESSFUL) return;
+ iTry++;Sleep(10);
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+// OPEN interface func: attention! 
+// some emus are calling this func in their main Window thread,
+// but all other interface funcs (to draw stuff) in a different thread!
+// that's a problem, since OGL is thread safe! Therefore we cannot 
+// initialize the OGL stuff right here, we simply set a "bIsFirstFrame = TRUE"
+// flag, to initialize OGL on the first real draw call.
+// btw, we also call this open func ourselfes, each time when the user 
+// is changing between fullscreen/window mode (ENTER key)
+// btw part 2: in windows the plugin gets the window handle from the
+// main emu, and doesn't create it's own window (if it would do it,
+// some PAD or SPU plugins would not work anymore)
+////////////////////////////////////////////////////////////////////////
+
+HMENU hPSEMenu=NULL;
+
+long CALLBACK GPUopen(HWND hwndGPU) 
+{
+ HDC hdc;RECT r;DEVMODE dv;
+
+ hWWindow = hwndGPU; // store hwnd globally
+
+ InitKeyHandler(); // init key handler (subclass window)
+
+ if(bChangeWinMode) // user wants to change fullscreen/window mode?
+ {
+ ReadWinSizeConfig(); // -> get sizes again
+ }
+ else // first real startup
+ {
+ ReadConfig(); // -> read config from registry
+
+ SetFrameRateConfig(); // -> setup frame rate stuff
+ }
+
+ if(iNoScreenSaver) EnableScreenSaver(FALSE); // at least we can try 
+
+
+ memset(&dv,0,sizeof(DEVMODE));
+ dv.dmSize=sizeof(DEVMODE);
+ EnumDisplaySettings(NULL,ENUM_CURRENT_SETTINGS,&dv);
+
+ bIsFirstFrame = TRUE; // flag: we have to init OGL later in windows!
+
+ if(bWindowMode) // win mode?
+ {
+ DWORD dw=GetWindowLong(hWWindow, GWL_STYLE); // -> adjust wnd style (owndc needed by some stupid ogl drivers)
+ dw&=~WS_THICKFRAME;
+ dw|=WS_BORDER|WS_CAPTION|CS_OWNDC;
+ SetWindowLong(hWWindow, GWL_STYLE, dw);
+
+ hPSEMenu=GetMenu(hWWindow); // -> hide emu menu (if any)
+ if(hPSEMenu!=NULL) SetMenu(hWWindow,NULL);
+
+ iResX=LOWORD(iWinSize);iResY=HIWORD(iWinSize);
+ ShowWindow(hWWindow,SW_SHOWNORMAL);
+
+ MoveWindow(hWWindow, // -> center wnd
+ GetSystemMetrics(SM_CXFULLSCREEN)/2-iResX/2,
+ GetSystemMetrics(SM_CYFULLSCREEN)/2-iResY/2,
+ iResX+GetSystemMetrics(SM_CXFIXEDFRAME)+3,
+ iResY+GetSystemMetrics(SM_CYFIXEDFRAME)+GetSystemMetrics(SM_CYCAPTION)+3,
+ TRUE);
+ UpdateWindow(hWWindow); // -> let windows do some update
+
+ if(dv.dmBitsPerPel==16 || dv.dmBitsPerPel==32) // -> overwrite user color info with desktop color info
+ iColDepth=dv.dmBitsPerPel;
+ }
+ else // fullscreen mode:
+ {
+ if(dv.dmBitsPerPel!=(unsigned int)iColDepth || // -> check, if we have to change resolution
+ dv.dmPelsWidth !=(unsigned int)iResX ||
+ dv.dmPelsHeight!=(unsigned int)iResY)
+ bChangeRes=TRUE; else bChangeRes=FALSE;
+
+ if(bChangeRes) ChangeDesktop(); // -> change the res (had to do an own func because of some MS 'optimizations')
+
+ SetWindowLong(hWWindow, GWL_STYLE, CS_OWNDC); // -> adjust wnd style as well (to be sure)
+ 
+ hPSEMenu=GetMenu(hWWindow); // -> hide menu
+ if(hPSEMenu!=NULL) SetMenu(hWWindow,NULL);
+ ShowWindow(hWWindow,SW_SHOWMAXIMIZED); // -> max mode
+ }
+
+ rRatioRect.left = rRatioRect.top=0;
+ rRatioRect.right = iResX;
+ rRatioRect.bottom = iResY;
+
+ r.left=r.top=0;r.right=iResX;r.bottom=iResY; // hack for getting a clean black window until OGL gets initialized
+ hdc = GetDC(hWWindow);
+ FillRect(hdc,&r,(HBRUSH)GetStockObject(BLACK_BRUSH));
+ bSetupPixelFormat(hdc);
+ ReleaseDC(hWWindow,hdc);
+
+ bDisplayNotSet = TRUE; 
+ bSetClip=TRUE;
+
+ SetFixes(); // setup game fixes
+
+ InitializeTextureStore(); // init texture mem
+
+ resetGteVertices();
+ 
+// lGPUstatusRet = 0x74000000;
+
+// with some emus, we could do the OGL init right here... oh my
+// if(bIsFirstFrame) GLinitialize();
+
+ return 0;
+}
+
+#elif !defined (_MACGL)
+
+////////////////////////////////////////////////////////////////////////
+// LINUX GPU OPEN: func to open up the gpu display (X stuff)
+// please note: in linux we are creating our own display, and we return
+// the display ID to the main emu... that's cleaner
+////////////////////////////////////////////////////////////////////////
+
+char * pCaptionText=0;
+int bFullScreen=0;
+Display *display;
+
+static Cursor cursor;
+static XVisualInfo *myvisual;
+static Colormap colormap;
+static Window window;
+
+static int bModeChanged=0;
+
+typedef struct
+{
+#define MWM_HINTS_DECORATIONS 2
+ long flags;
+ long functions;
+ long decorations;
+ long input_mode;
+} MotifWmHints;
+
+static int dbdepat[]={GLX_RGBA,GLX_DOUBLEBUFFER,GLX_DEPTH_SIZE,16,None};
+static int dbnodepat[]={GLX_RGBA,GLX_DOUBLEBUFFER,None};
+static GLXContext cx;
+
+static int fx=0;
+
+////////////////////////////////////////////////////////////////////////
+
+void osd_close_display (void) // close display
+{
+ if(display) // display exists?
+ {
+ glXDestroyContext(display,cx); // -> kill context
+ XFreeColormap(display, colormap); // -> kill colormap
+ XSync(display,False); // -> sync events
+
+#ifndef NOVMODE
+ if(bModeChanged) // -> repair screen mode
+ {
+ int myscreen=DefaultScreen(display);
+ XF86VidModeSwitchToMode(display,myscreen, // --> switch mode back
+ modes[iOldMode]);
+ XF86VidModeSetViewPort(display,myscreen,0,0); // --> set viewport upperleft
+ free(modes); // --> finally kill mode infos
+ bModeChanged=0; // --> done
+ }
+#endif
+
+ XCloseDisplay(display); // -> close display
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void sysdep_create_display(void) // create display
+{
+ XSetWindowAttributes winattr;float fxgamma=2;
+ int myscreen;char gammastr[14];
+ Screen * screen;XEvent event;
+ XSizeHints hints;XWMHints wm_hints;
+ MotifWmHints mwmhints;
+ Atom mwmatom;
+ Atom delwindow;
+ XClassHint* classHint;
+ char *glxfx;
+
+ glxfx=getenv("MESA_GLX_FX"); // 3dfx mesa fullscreen flag
+ if(glxfx)
+ {
+ if(glxfx[0]=='f') // -> yup, fullscreen needed
+ {
+ fx=1; // -> raise flag
+ putenv("FX_GLIDE_NO_SPLASH=");
+ sprintf(gammastr,"SST_GAMMA=%2.1f",fxgamma); // -> set gamma
+ putenv(gammastr);
+ }
+ }
+
+ display=XOpenDisplay(NULL); // open display
+ if(!display) // no display?
+ {
+ fprintf (stderr,"Failed to open display!!!\n");
+ osd_close_display();
+ return; // -> bye
+ }
+
+ myscreen=DefaultScreen(display); // get screen id
+
+#ifdef NOVMODE
+ if(bFullScreen) {fx=1;bModeChanged=0;}
+#else
+ if(bFullScreen)
+ {
+ XF86VidModeModeLine mode;
+ int nmodes,iC;
+ fx=1; // raise flag
+ XF86VidModeGetModeLine(display,myscreen,&iC,&mode); // get actual mode info
+ if(mode.privsize) XFree(mode.private); // no need for private stuff
+ bModeChanged=0; // init mode change flag
+ if(iResX!=mode.hdisplay || iResY!=mode.vdisplay) // wanted mode is different?
+ {
+ XF86VidModeGetAllModeLines(display,myscreen, // -> enum all mode infos
+ &nmodes,&modes);
+ if(modes) // -> infos got?
+ {
+ for(iC=0;iC<nmodes;++iC) // -> loop modes
+ {
+ if(mode.hdisplay==modes[iC]->hdisplay && // -> act mode found?
+ mode.vdisplay==modes[iC]->vdisplay) // if yes: store mode id
+ iOldMode=iC;
+
+ if(iResX==modes[iC]->hdisplay && // -> wanted mode found?
+ iResY==modes[iC]->vdisplay)
+ {
+ XF86VidModeSwitchToMode(display,myscreen, // --> switch to mode
+ modes[iC]);
+ XF86VidModeSetViewPort(display,myscreen,0,0);
+ bModeChanged=1; // --> raise flag for repairing mode on close
+ }
+ }
+
+ if(bModeChanged==0) // -> no mode found?
+ {
+ free(modes); // --> free infos
+ printf("No proper fullscreen mode found!\n"); // --> some info output
+ }
+ }
+ }
+ }
+#endif
+
+ screen=DefaultScreenOfDisplay(display);
+
+ if(iZBufferDepth) // visual (with or without zbuffer)
+ myvisual=glXChooseVisual(display,myscreen,dbdepat);
+ else myvisual=glXChooseVisual(display,myscreen,dbnodepat);
+
+ if(!myvisual) // no visual?
+ {
+ fprintf(stderr,"Failed to obtain visual!!!\n"); // -> bye
+ osd_close_display();
+ return;
+ }
+
+ cx=glXCreateContext(display,myvisual,0,GL_TRUE); // create rendering context
+
+ if(!cx) // no context?
+ {
+ fprintf(stderr,"Failed to create OpenGL context!!!\n");
+ osd_close_display(); // -> bxe
+ return;
+ }
+
+ // pffff... much work for a simple blank cursor... oh, well...
+ if(!bFullScreen) cursor=XCreateFontCursor(display,XC_left_ptr);
+ else
+ {
+ Pixmap p1,p2;XImage * img;
+ XColor b,w;unsigned char * idata;
+ XGCValues GCv;
+ GC GCc;
+
+ memset(&b,0,sizeof(XColor));
+ memset(&w,0,sizeof(XColor));
+ idata=(unsigned char *)malloc(8);
+ memset(idata,0,8);
+
+ p1=XCreatePixmap(display,RootWindow(display,myvisual->screen),8,8,1);
+ p2=XCreatePixmap(display,RootWindow(display,myvisual->screen),8,8,1);
+
+ img = XCreateImage(display,myvisual->visual,
+ 1,XYBitmap,0,idata,8,8,8,1);
+
+ GCv.function = GXcopy;
+ GCv.foreground = ~0;
+ GCv.background = 0;
+ GCv.plane_mask = AllPlanes;
+ GCc = XCreateGC(display,p1,
+ (GCFunction|GCForeground|GCBackground|GCPlaneMask),&GCv);
+
+ XPutImage(display, p1,GCc,img,0,0,0,0,8,8);
+ XPutImage(display, p2,GCc,img,0,0,0,0,8,8);
+ XFreeGC(display, GCc);
+
+ cursor = XCreatePixmapCursor(display,p1,p2,&b,&w,0,0);
+
+ XFreePixmap(display,p1);
+ XFreePixmap(display,p2);
+ XDestroyImage(img); // will free idata as well
+ }
+
+ colormap=XCreateColormap(display, // create colormap
+ RootWindow(display,myvisual->screen),
+ myvisual->visual,AllocNone);
+
+ winattr.background_pixel=0;
+ winattr.border_pixel=WhitePixelOfScreen(screen);
+ winattr.bit_gravity=ForgetGravity;
+ winattr.win_gravity=NorthWestGravity;
+ winattr.backing_store=NotUseful;
+ winattr.override_redirect=False;
+ winattr.save_under=False;
+ winattr.event_mask=ExposureMask |
+ VisibilityChangeMask |
+ FocusChangeMask |
+ KeyPressMask | KeyReleaseMask |
+ ButtonPressMask | ButtonReleaseMask |
+ PointerMotionMask;
+ winattr.do_not_propagate_mask=0;
+ winattr.colormap=colormap;
+ winattr.cursor=None;
+
+ window=XCreateWindow(display, // create own window
+ RootWindow(display,DefaultScreen(display)),
+ 0,0,iResX,iResY,
+ 0,myvisual->depth,
+ InputOutput,myvisual->visual,
+ CWBorderPixel | CWBackPixel |
+ CWEventMask | CWDontPropagate |
+ CWColormap | CWCursor | CWEventMask,
+ &winattr);
+
+ if(!window) // no window?
+ {
+ fprintf(stderr,"Failed in XCreateWindow()!!!\n");
+ osd_close_display(); // -> bye
+ return;
+ }
+
+ delwindow = XInternAtom(display,"WM_DELETE_WINDOW",0);
+ XSetWMProtocols(display, window, &delwindow, 1);
+
+ hints.flags=PMinSize|PMaxSize; // hints
+ if(fx) hints.flags|=USPosition|USSize;
+ else hints.flags|=PSize;
+
+ hints.min_width = hints.max_width = hints.base_width = iResX;
+ hints.min_height = hints.max_height = hints.base_height = iResY;
+
+ wm_hints.input=1;
+ wm_hints.flags=InputHint;
+
+ XSetWMHints(display,window,&wm_hints);
+ XSetWMNormalHints(display,window,&hints);
+
+ if(!pCaptionText)
+ pCaptionText = "Pete MesaGL PSX Gpu";
+
+ // set the WM_NAME and WM_CLASS of the window
+
+ // set the titlebar name
+ XStoreName(display, window, pCaptionText);
+
+ // set the name and class hints for the window manager to use
+ classHint = XAllocClassHint();
+ if(classHint)
+ {
+ classHint->res_name = pCaptionText;
+ classHint->res_class = pCaptionText;
+ }
+
+ XSetClassHint(display, window, classHint);
+ XFree(classHint);
+
+ XDefineCursor(display,window,cursor); // cursor
+
+ if(fx) // window title bar hack
+ {
+ mwmhints.flags=MWM_HINTS_DECORATIONS;
+ mwmhints.decorations=0;
+ mwmatom=XInternAtom(display,"_MOTIF_WM_HINTS",0);
+ XChangeProperty(display,window,mwmatom,mwmatom,32,
+ PropModeReplace,(unsigned char *)&mwmhints,4);
+ }
+
+ XMapRaised(display,window);
+ XClearWindow(display,window);
+ XWindowEvent(display,window,ExposureMask,&event);
+ glXMakeCurrent(display,window,cx);
+
+/* 
+ printf(glGetString(GL_VENDOR));
+ printf("\n");
+ printf(glGetString(GL_RENDERER));
+ printf("\n");
+*/
+
+ if (fx) // after make current: fullscreen resize
+ {
+ XResizeWindow(display,window,screen->width,screen->height);
+ hints.min_width = hints.max_width = hints.base_width = screen->width;
+ hints.min_height= hints.max_height = hints.base_height = screen->height;
 XSetWMNormalHints(display,window,&hints);
 
 // set the window layer for GNOME
@@ -809,2388 +1046,2549 @@
 XSendEvent(display, RootWindow(display, DefaultScreen(display)), 0,
 SubstructureRedirectMask | SubstructureNotifyMask, &xev);
 }
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-
-long GPUopen(unsigned long * disp,char * CapText,char * CfgFile)
-{
- pCaptionText=CapText;
- pConfigFile=CfgFile;
-
- ReadConfig(); // read text file for config
-
- SetFrameRateConfig(); // setup frame rate stuff
-
- bIsFirstFrame = TRUE; // we have to init later (well, no really... in Linux we do all in GPUopen)
-
- sysdep_create_display(); // create display
-
- InitializeTextureStore(); // init texture mem
-
- rRatioRect.left = rRatioRect.top=0;
- rRatioRect.right = iResX;
- rRatioRect.bottom = iResY;
-
- GLinitialize(); // init opengl
-
- if(disp)
- {
- *disp=(unsigned long *)display; // return display ID to main emu
- }
-
- if(display) return 0;
- return -1;
-}
-
-////////////////////////////////////////////////////////////////////////
-// close
-////////////////////////////////////////////////////////////////////////
-
-long GPUclose() // LINUX CLOSE
-{
- GLcleanup(); // close OGL
-
- if(pGfxCardScreen) free(pGfxCardScreen); // free helper memory
- pGfxCardScreen=0;
-
- osd_close_display(); // destroy display
-
- return 0;
-}
-
-////////////////////////////////////////////////////////////////////////
-// I shot the sheriff... last function called from emu 
-////////////////////////////////////////////////////////////////////////
-
-long CALLBACK GPUshutdown()
-{
- if(psxVSecure) free(psxVSecure); // kill emulated vram memory
- psxVSecure=0;
-
- return 0;
-}
-
-////////////////////////////////////////////////////////////////////////
-// paint it black: simple func to clean up optical border garbage
-////////////////////////////////////////////////////////////////////////
-
-void PaintBlackBorders(void)
-{
- short s;
-
- glDisable(GL_SCISSOR_TEST);
- if(bTexEnabled) {glDisable(GL_TEXTURE_2D);bTexEnabled=FALSE;}
- if(bOldSmoothShaded) {glShadeModel(GL_FLAT);bOldSmoothShaded=FALSE;}
- if(bBlendEnable) {glDisable(GL_BLEND);bBlendEnable=FALSE;}
- glDisable(GL_ALPHA_TEST);
-
- glBegin(GL_QUADS);
-
- vertex[0].c.lcol=0xff000000;
- SETCOL(vertex[0]); 
-
- if(PreviousPSXDisplay.Range.x0)
- {
- s=PreviousPSXDisplay.Range.x0+1;
- glVertex3f(0,0,0.99996f);
- glVertex3f(0,PSXDisplay.DisplayMode.y,0.99996f);
- glVertex3f(s,PSXDisplay.DisplayMode.y,0.99996f);
- glVertex3f(s,0,0.99996f);
-
- s+=PreviousPSXDisplay.Range.x1-2;
-
- glVertex3f(s,0,0.99996f);
- glVertex3f(s,PSXDisplay.DisplayMode.y,0.99996f);
- glVertex3f(PSXDisplay.DisplayMode.x,PSXDisplay.DisplayMode.y,0.99996f);
- glVertex3f(PSXDisplay.DisplayMode.x,0,0.99996f);
- }
-
- if(PreviousPSXDisplay.Range.y0)
- {
- s=PreviousPSXDisplay.Range.y0+1;
- glVertex3f(0,0,0.99996f);
- glVertex3f(0,s,0.99996f);
- glVertex3f(PSXDisplay.DisplayMode.x,s,0.99996f);
- glVertex3f(PSXDisplay.DisplayMode.x,0,0.99996f);
- }
-
- glEnd();
-
- glEnable(GL_ALPHA_TEST);
- glEnable(GL_SCISSOR_TEST);
-}
-
-////////////////////////////////////////////////////////////////////////
-// helper to draw scanlines
-////////////////////////////////////////////////////////////////////////
-
-__inline void XPRIMdrawTexturedQuad(OGLVertex* vertex1, OGLVertex* vertex2, 
- OGLVertex* vertex3, OGLVertex* vertex4) 
-{
-
- glBegin(GL_QUAD_STRIP);
- glTexCoord2fv(&vertex1->sow);
- glVertex3fv(&vertex1->x);
- 
- glTexCoord2fv(&vertex2->sow);
- glVertex3fv(&vertex2->x);
- 
- glTexCoord2fv(&vertex4->sow);
- glVertex3fv(&vertex4->x);
- 
- glTexCoord2fv(&vertex3->sow);
- glVertex3fv(&vertex3->x);
- glEnd();
-}
-
-////////////////////////////////////////////////////////////////////////
-// scanlines
-////////////////////////////////////////////////////////////////////////
-
-void SetScanLines(void)
-{
- glLoadIdentity();
- glOrtho(0,iResX,iResY, 0, -1, 1);
-
- if(bKeepRatio)
- glViewport(0,0,iResX,iResY);
-
- glDisable(GL_SCISSOR_TEST); 
- glDisable(GL_ALPHA_TEST);
- if(bOldSmoothShaded) {glShadeModel(GL_FLAT);bOldSmoothShaded=FALSE;}
-
- if(iScanBlend<0) // special texture mask scanline mode
- {
- if(!bTexEnabled) {glEnable(GL_TEXTURE_2D);bTexEnabled=TRUE;}
- gTexName=gTexScanName;
- glBindTexture(GL_TEXTURE_2D, gTexName);
- if(bGLBlend) glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 
- if(!bBlendEnable) {glEnable(GL_BLEND);bBlendEnable=TRUE;}
- SetScanTexTrans();
-
- vertex[0].x=0;
- vertex[0].y=iResY;
- vertex[0].z=0.99996f;
-
- vertex[1].x=iResX;
- vertex[1].y=iResY;
- vertex[1].z=0.99996f;
-
- vertex[2].x=iResX;
- vertex[2].y=0;
- vertex[2].z=0.99996f;
-
- vertex[3].x=0;
- vertex[3].y=0;
- vertex[3].z=0.99996f;
-
- vertex[0].sow=0;
- vertex[0].tow=0;
- vertex[1].sow=(float)iResX/4.0f;
- vertex[1].tow=0;
- vertex[2].sow=vertex[1].sow;
- vertex[2].tow=(float)iResY/4.0f;
- vertex[3].sow=0;
- vertex[3].tow=vertex[2].tow;
-
- vertex[0].c.lcol=0xffffffff;
- SETCOL(vertex[0]); 
-
- XPRIMdrawTexturedQuad(&vertex[0], &vertex[1], &vertex[2], &vertex[3]);
-
- if(bGLBlend) glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, COMBINE_EXT); 
- }
- else // typical line mode
- {
- if(bTexEnabled) {glDisable(GL_TEXTURE_2D);bTexEnabled=FALSE;}
-
- if(iScanBlend==0)
- {
- if(bBlendEnable) {glDisable(GL_BLEND);bBlendEnable=FALSE;}
- vertex[0].c.lcol=0xff000000;
- }
- else
- {
- if(!bBlendEnable) {glEnable(GL_BLEND);bBlendEnable=TRUE;}
- SetScanTrans();
- vertex[0].c.lcol=iScanBlend<<24;
- }
-
- SETCOL(vertex[0]); 
-
- glCallList(uiScanLine);
- }
-
- glLoadIdentity();
- glOrtho(0,PSXDisplay.DisplayMode.x,
- PSXDisplay.DisplayMode.y, 0, -1, 1);
-
- if(bKeepRatio)
- glViewport(rRatioRect.left,
- iResY-(rRatioRect.top+rRatioRect.bottom),
- rRatioRect.right, 
- rRatioRect.bottom); // init viewport
-
- glEnable(GL_ALPHA_TEST);
- glEnable(GL_SCISSOR_TEST); 
-}
-
-////////////////////////////////////////////////////////////////////////
-// blur, babe, blur (heavy performance hit for a so-so fullscreen effect)
-////////////////////////////////////////////////////////////////////////
-
-void BlurBackBuffer(void)
-{
- if(!gTexBlurName) return;
-
- if(bKeepRatio) glViewport(0,0,iResX,iResY);
-
- glDisable(GL_SCISSOR_TEST);
- glDisable(GL_ALPHA_TEST);
- if(bOldSmoothShaded) {glShadeModel(GL_FLAT);bOldSmoothShaded=FALSE;}
- if(bBlendEnable) {glDisable(GL_BLEND);bBlendEnable=FALSE;}
- if(!bTexEnabled) {glEnable(GL_TEXTURE_2D);bTexEnabled=TRUE;}
- if(iZBufferDepth) glDisable(GL_DEPTH_TEST); 
- if(bDrawDither) glDisable(GL_DITHER); 
-
- gTexName=gTexBlurName;
- glBindTexture(GL_TEXTURE_2D, gTexName);
-
- glCopyTexSubImage2D( GL_TEXTURE_2D, 0, // get back buffer in texture
- 0,
- 0,
- 0,
- 0,
- iResX,iResY);
-
- vertex[0].x=0;
- vertex[0].y=PSXDisplay.DisplayMode.y;
- vertex[1].x=PSXDisplay.DisplayMode.x;
- vertex[1].y=PSXDisplay.DisplayMode.y;
- vertex[2].x=PSXDisplay.DisplayMode.x;
- vertex[2].y=0;
- vertex[3].x=0;
- vertex[3].y=0;
- vertex[0].sow=0;
- vertex[0].tow=0;
-
-#ifdef OWNSCALE
- vertex[1].sow=((GLfloat)iFTexA)/256.0f;
- vertex[2].tow=((GLfloat)iFTexB)/256.0f;
-#else
- vertex[1].sow=iFTexA;
- vertex[2].tow=iFTexB;
-#endif
- vertex[1].tow=0;
- vertex[2].sow=vertex[1].sow;
- vertex[3].sow=0;
- vertex[3].tow=vertex[2].tow;
- 
- if(bGLBlend) glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 
- vertex[0].c.lcol=0x7fffffff;
- SETCOL(vertex[0]); 
-
- DrawMultiBlur(); // draw the backbuffer texture to create blur effect
-
- glEnable(GL_ALPHA_TEST);
- glEnable(GL_SCISSOR_TEST);
- if(iZBufferDepth) glEnable(GL_DEPTH_TEST); 
- if(bDrawDither) glEnable(GL_DITHER); 
- if(bGLBlend) glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, COMBINE_EXT); 
-
- if(bKeepRatio)
- glViewport(rRatioRect.left, // re-init viewport
- iResY-(rRatioRect.top+rRatioRect.bottom),
- rRatioRect.right, 
- rRatioRect.bottom); 
-}
-
-////////////////////////////////////////////////////////////////////////
-// "unblur" repairs the backbuffer after a blur
-
-void UnBlurBackBuffer(void)
-{
- if(!gTexBlurName) return;
-
- if(bKeepRatio) glViewport(0,0,iResX,iResY);
-
- glDisable(GL_SCISSOR_TEST);
- glDisable(GL_ALPHA_TEST);
- if(bBlendEnable) {glDisable(GL_BLEND);bBlendEnable=FALSE;}
- if(!bTexEnabled) {glEnable(GL_TEXTURE_2D);bTexEnabled=TRUE;}
- if(iZBufferDepth) glDisable(GL_DEPTH_TEST); 
- if(bDrawDither) glDisable(GL_DITHER); 
-
- gTexName=gTexBlurName;
- glBindTexture(GL_TEXTURE_2D, gTexName);
-
- vertex[0].x=0;
- vertex[0].y=PSXDisplay.DisplayMode.y;
- vertex[1].x=PSXDisplay.DisplayMode.x;
- vertex[1].y=PSXDisplay.DisplayMode.y;
- vertex[2].x=PSXDisplay.DisplayMode.x;
- vertex[2].y=0;
- vertex[3].x=0;
- vertex[3].y=0;
- vertex[0].sow=0;
- vertex[0].tow=0;
-#ifdef OWNSCALE
- vertex[1].sow=((GLfloat)iFTexA)/256.0f;
- vertex[2].tow=((GLfloat)iFTexB)/256.0f;
-#else
- vertex[1].sow=iFTexA;
- vertex[2].tow=iFTexB;
-#endif
- vertex[1].tow=0;
- vertex[2].sow=vertex[1].sow;
- vertex[3].sow=0;
- vertex[3].tow=vertex[2].tow;
- if(bGLBlend) glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 
- vertex[0].c.lcol=0xffffffff;
- SETCOL(vertex[0]); 
-
- // simply draw the backbuffer texture (without blur)
- XPRIMdrawTexturedQuad(&vertex[0], &vertex[1], &vertex[2], &vertex[3]);
-
- glEnable(GL_ALPHA_TEST);
- glEnable(GL_SCISSOR_TEST);
- if(iZBufferDepth) glEnable(GL_DEPTH_TEST); 
- if(bDrawDither) glEnable(GL_DITHER); // dither mode
- if(bGLBlend) glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, COMBINE_EXT); 
-
- if(bKeepRatio)
- glViewport(rRatioRect.left,
- iResY-(rRatioRect.top+rRatioRect.bottom),
- rRatioRect.right, 
- rRatioRect.bottom); // init viewport
-}
-
-////////////////////////////////////////////////////////////////////////
-// Update display (swap buffers)... called in interlaced mode on 
-// every emulated vsync, otherwise whenever the displayed screen region
-// has been changed
-////////////////////////////////////////////////////////////////////////
-
-int iLastRGB24=0; // special vars for checking when to skip two display updates
-int iSkipTwo=0;
-
-void updateDisplay(void) // UPDATE DISPLAY
-{
- BOOL bBlur=FALSE;
-
- bFakeFrontBuffer=FALSE;
- bRenderFrontBuffer=FALSE;
-
- if(iRenderFVR) // frame buffer read fix mode still active?
- {
- iRenderFVR--; // -> if some frames in a row without read access: turn off mode
- if(!iRenderFVR) bFullVRam=FALSE;
- }
-
- if(iLastRGB24 && iLastRGB24!=PSXDisplay.RGB24+1) // (mdec) garbage check
- {
- iSkipTwo=2; // -> skip two frames to avoid garbage if color mode changes
- }
- iLastRGB24=0;
-
- if(PSXDisplay.RGB24)// && !bNeedUploadAfter) // (mdec) upload wanted?
- {
- PrepareFullScreenUpload(-1);
- UploadScreen(PSXDisplay.Interlaced); // -> upload whole screen from psx vram
- bNeedUploadTest=FALSE;
- bNeedInterlaceUpdate=FALSE;
- bNeedUploadAfter=FALSE;
- bNeedRGB24Update=FALSE;
- }
- else
- if(bNeedInterlaceUpdate) // smaller upload?
- {
- bNeedInterlaceUpdate=FALSE;
- xrUploadArea=xrUploadAreaIL; // -> upload this rect
- UploadScreen(TRUE);
- }
-
- if(dwActFixes&512) bCheckFF9G4(NULL); // special game fix for FF9 
-
- if(PreviousPSXDisplay.Range.x0|| // paint black borders around display area, if needed
- PreviousPSXDisplay.Range.y0)
- PaintBlackBorders();
-
- if(PSXDisplay.Disabled) // display disabled?
- {
- // moved here
- glDisable(GL_SCISSOR_TEST); 
- glClearColor(0,0,0,128); // -> clear whole backbuffer
- glClear(uiBufferBits);
- glEnable(GL_SCISSOR_TEST); 
- gl_z=0.0f;
- bDisplayNotSet = TRUE;
- }
-
- if(iSkipTwo) // we are in skipping mood?
- {
- iSkipTwo--;
- iDrawnSomething=0; // -> simply lie about something drawn
- }
-
- if(iBlurBuffer && !bSkipNextFrame) // "blur display" activated?
- {BlurBackBuffer();bBlur=TRUE;} // -> blur it
-
- if(iUseScanLines) SetScanLines(); // "scan lines" activated? do it
-
- if(usCursorActive) ShowGunCursor(); // "gun cursor" wanted? show 'em
-
- if(dwActFixes&128) // special FPS limitation mode?
- {
- if(bUseFrameLimit) PCFrameCap(); // -> ok, do it
- if(bUseFrameSkip || ulKeybits&KEY_SHOWFPS) 
- PCcalcfps(); 
- }
-
- if(gTexPicName) DisplayPic(); // some gpu info picture active? display it
-
- if(bSnapShot) DoSnapShot(); // snapshot key pressed? cheeeese :)
-
- if(ulKeybits&KEY_SHOWFPS) // wanna see FPS?
- {
- sprintf(szDispBuf,"%06.1f",fps_cur);
- DisplayText(); // -> show it
- }
-
- //----------------------------------------------------//
- // main buffer swapping (well, or skip it)
-
- if(bUseFrameSkip) // frame skipping active ?
- {
- if(!bSkipNextFrame) 
- {
- if(iDrawnSomething)
- glXSwapBuffers(display,window);
- }
- if(dwActFixes&0x180) // -> special old frame skipping: skip max one in a row
- {
- if((fps_skip < fFrameRateHz) && !(bSkipNextFrame)) 
- {bSkipNextFrame = TRUE; fps_skip=fFrameRateHz;}
- else bSkipNextFrame = FALSE;
- }
- else FrameSkip();
- }
- else // no skip ?
- {
- if(iDrawnSomething)
- glXSwapBuffers(display,window);
- }
-
- iDrawnSomething=0;
-
- //----------------------------------------------------//
-
- if(lClearOnSwap) // clear buffer after swap?
- {
- GLclampf g,b,r;
-
- if(bDisplayNotSet) // -> set new vals
- SetOGLDisplaySettings(1);
-
- g=((GLclampf)GREEN(lClearOnSwapColor))/255.0f; // -> get col
- b=((GLclampf)BLUE(lClearOnSwapColor))/255.0f;
- r=((GLclampf)RED(lClearOnSwapColor))/255.0f;
- 
- glDisable(GL_SCISSOR_TEST); 
- glClearColor(r,g,b,128); // -> clear 
- glClear(uiBufferBits);
- glEnable(GL_SCISSOR_TEST); 
- lClearOnSwap=0; // -> done
- }
- else 
- {
- if(bBlur) UnBlurBackBuffer(); // unblur buff, if blurred before
-
- if(iZBufferDepth) // clear zbuffer as well (if activated)
- {
- glDisable(GL_SCISSOR_TEST); 
- glClear(GL_DEPTH_BUFFER_BIT);
- glEnable(GL_SCISSOR_TEST); 
- }
- }
- gl_z=0.0f;
-
- //----------------------------------------------------//
- // additional uploads immediatly after swapping
-
- if(bNeedUploadAfter) // upload wanted?
- {
- bNeedUploadAfter=FALSE; 
- bNeedUploadTest=FALSE;
- UploadScreen(-1); // -> upload
- }
- 
- if(bNeedUploadTest)
- {
- bNeedUploadTest=FALSE;
- if(PSXDisplay.InterlacedTest &&
- //iOffscreenDrawing>2 &&
- PreviousPSXDisplay.DisplayPosition.x==PSXDisplay.DisplayPosition.x &&
- PreviousPSXDisplay.DisplayEnd.x==PSXDisplay.DisplayEnd.x &&
- PreviousPSXDisplay.DisplayPosition.y==PSXDisplay.DisplayPosition.y &&
- PreviousPSXDisplay.DisplayEnd.y==PSXDisplay.DisplayEnd.y)
- {
- PrepareFullScreenUpload(TRUE);
- UploadScreen(TRUE);
- }
- }
-
- //----------------------------------------------------//
- // rumbling (main emu pad effect)
-
- if(iRumbleTime) // shake screen by modifying view port
- {
- int i1=0,i2=0,i3=0,i4=0;
-
- iRumbleTime--;
- if(iRumbleTime) 
- {
- i1=((rand()*iRumbleVal)/RAND_MAX)-(iRumbleVal/2); 
- i2=((rand()*iRumbleVal)/RAND_MAX)-(iRumbleVal/2); 
- i3=((rand()*iRumbleVal)/RAND_MAX)-(iRumbleVal/2); 
- i4=((rand()*iRumbleVal)/RAND_MAX)-(iRumbleVal/2); 
- }
-
- glViewport(rRatioRect.left+i1, 
- iResY-(rRatioRect.top+rRatioRect.bottom)+i2,
- rRatioRect.right+i3, 
- rRatioRect.bottom+i4); 
- }
-
- if(ulKeybits&KEY_RESETTEXSTORE) ResetStuff(); // reset on gpu mode changes? do it before next frame is filled
-}
-
-////////////////////////////////////////////////////////////////////////
-// update front display: smaller update func, if something has changed 
-// in the frontbuffer... dirty, but hey... real men know no pain
-////////////////////////////////////////////////////////////////////////
-
-void updateFrontDisplay(void)
-{
- if(PreviousPSXDisplay.Range.x0||
- PreviousPSXDisplay.Range.y0)
- PaintBlackBorders();
-
- if(iBlurBuffer) BlurBackBuffer();
-
- if(iUseScanLines) SetScanLines();
-
- if(usCursorActive) ShowGunCursor();
-
- bFakeFrontBuffer=FALSE;
- bRenderFrontBuffer=FALSE;
-
- if(gTexPicName) DisplayPic();
- if(ulKeybits&KEY_SHOWFPS) DisplayText();
-
- if(iDrawnSomething) // linux:
- glXSwapBuffers(display,window);
-
- if(iBlurBuffer) UnBlurBackBuffer();
-}
- 
-////////////////////////////////////////////////////////////////////////
-// check if update needed
-////////////////////////////////////////////////////////////////////////
-
-void ChangeDispOffsetsX(void) // CENTER X
-{
- int lx,l;short sO;
-
- if(!PSXDisplay.Range.x1) return; // some range given?
-
- l=PSXDisplay.DisplayMode.x;
-
- l*=(int)PSXDisplay.Range.x1; // some funky calculation
- l/=2560;lx=l;l&=0xfffffff8;
- 
- if(l==PreviousPSXDisplay.Range.x1) return; // some change?
-
- sO=PreviousPSXDisplay.Range.x0; // store old
-
- if(lx>=PSXDisplay.DisplayMode.x) // range bigger?
- {
- PreviousPSXDisplay.Range.x1= // -> take display width
- PSXDisplay.DisplayMode.x;
- PreviousPSXDisplay.Range.x0=0; // -> start pos is 0
- }
- else // range smaller? center it
- {
- PreviousPSXDisplay.Range.x1=l; // -> store width (8 pixel aligned)
- PreviousPSXDisplay.Range.x0= // -> calc start pos
- (PSXDisplay.Range.x0-500)/8;
- if(PreviousPSXDisplay.Range.x0<0) // -> we don't support neg. values yet
- PreviousPSXDisplay.Range.x0=0;
-
- if((PreviousPSXDisplay.Range.x0+lx)> // -> uhuu... that's too much
- PSXDisplay.DisplayMode.x)
- {
- PreviousPSXDisplay.Range.x0= // -> adjust start
- PSXDisplay.DisplayMode.x-lx;
- PreviousPSXDisplay.Range.x1+=lx-l; // -> adjust width
- } 
- }
-
- if(sO!=PreviousPSXDisplay.Range.x0) // something changed?
- {
- bDisplayNotSet=TRUE; // -> recalc display stuff
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-
-void ChangeDispOffsetsY(void) // CENTER Y
-{
- int iT;short sO; // store previous y size
-
- if(PSXDisplay.PAL) iT=48; else iT=28; // different offsets on PAL/NTSC
-
- if(PSXDisplay.Range.y0>=iT) // crossed the security line? :)
- {
- PreviousPSXDisplay.Range.y1= // -> store width
- PSXDisplay.DisplayModeNew.y;
- 
- sO=(PSXDisplay.Range.y0-iT-4)*PSXDisplay.Double; // -> calc offset
- if(sO<0) sO=0;
-
- PSXDisplay.DisplayModeNew.y+=sO; // -> add offset to y size, too
- }
- else sO=0; // else no offset
-
- if(sO!=PreviousPSXDisplay.Range.y0) // something changed?
- {
- PreviousPSXDisplay.Range.y0=sO;
- bDisplayNotSet=TRUE; // -> recalc display stuff
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-// Aspect ratio of ogl screen: simply adjusting ogl view port
-////////////////////////////////////////////////////////////////////////
-
-void SetAspectRatio(void)
-{
- float xs,ys,s;RECT r;
-
- if(!PSXDisplay.DisplayModeNew.x) return;
- if(!PSXDisplay.DisplayModeNew.y) return;
-
- xs=(float)iResX/(float)PSXDisplay.DisplayModeNew.x;
- ys=(float)iResY/(float)PSXDisplay.DisplayModeNew.y;
-
- s=min(xs,ys);
- r.right =(int)((float)PSXDisplay.DisplayModeNew.x*s);
- r.bottom=(int)((float)PSXDisplay.DisplayModeNew.y*s);
- if(r.right > iResX) r.right = iResX;
- if(r.bottom > iResY) r.bottom = iResY;
- if(r.right < 1) r.right = 1;
- if(r.bottom < 1) r.bottom = 1;
-
- r.left = (iResX-r.right)/2;
- r.top = (iResY-r.bottom)/2;
-
- if(r.bottom<rRatioRect.bottom ||
- r.right <rRatioRect.right)
- {
- RECT rC;
- glClearColor(0,0,0,128); 
-
- if(r.right <rRatioRect.right)
- {
- rC.left=0;
- rC.top=0;
- rC.right=r.left;
- rC.bottom=iResY;
- glScissor(rC.left,rC.top,rC.right,rC.bottom);
- glClear(uiBufferBits);
- rC.left=iResX-rC.right;
- glScissor(rC.left,rC.top,rC.right,rC.bottom);
- glClear(uiBufferBits);
- }
-
- if(r.bottom <rRatioRect.bottom)
- {
- rC.left=0;
- rC.top=0;
- rC.right=iResX;
- rC.bottom=r.top;
- glScissor(rC.left,rC.top,rC.right,rC.bottom);
- glClear(uiBufferBits);
- rC.top=iResY-rC.bottom;
- glScissor(rC.left,rC.top,rC.right,rC.bottom);
- glClear(uiBufferBits);
- }
- 
- bSetClip=TRUE;
- bDisplayNotSet=TRUE;
- }
-
- rRatioRect=r;
-
-
- glViewport(rRatioRect.left,
- iResY-(rRatioRect.top+rRatioRect.bottom),
- rRatioRect.right,
- rRatioRect.bottom); // init viewport
-}
-
-////////////////////////////////////////////////////////////////////////
-// big ass check, if an ogl swap buffer is needed
-////////////////////////////////////////////////////////////////////////
-
-void updateDisplayIfChanged(void)
-{
- BOOL bUp;
-
- if ((PSXDisplay.DisplayMode.y == PSXDisplay.DisplayModeNew.y) && 
- (PSXDisplay.DisplayMode.x == PSXDisplay.DisplayModeNew.x))
- {
- if((PSXDisplay.RGB24 == PSXDisplay.RGB24New) && 
- (PSXDisplay.Interlaced == PSXDisplay.InterlacedNew)) 
- return; // nothing has changed? fine, no swap buffer needed
- }
- else // some res change?
- {
- glLoadIdentity();
- glOrtho(0,PSXDisplay.DisplayModeNew.x, // -> new psx resolution
- PSXDisplay.DisplayModeNew.y, 0, -1, 1);
- if(bKeepRatio) SetAspectRatio();
- }
-
- bDisplayNotSet = TRUE; // re-calc offsets/display area
- 
- bUp=FALSE;
- if(PSXDisplay.RGB24!=PSXDisplay.RGB24New) // clean up textures, if rgb mode change (usually mdec on/off)
- {
- PreviousPSXDisplay.RGB24=0; // no full 24 frame uploaded yet
- ResetTextureArea(FALSE);
- bUp=TRUE;
- }
-
- PSXDisplay.RGB24 = PSXDisplay.RGB24New; // get new infos
- PSXDisplay.DisplayMode.y = PSXDisplay.DisplayModeNew.y;
- PSXDisplay.DisplayMode.x = PSXDisplay.DisplayModeNew.x;
- PSXDisplay.Interlaced = PSXDisplay.InterlacedNew;
- 
- PSXDisplay.DisplayEnd.x= // calc new ends
- PSXDisplay.DisplayPosition.x+ PSXDisplay.DisplayMode.x;
- PSXDisplay.DisplayEnd.y=
- PSXDisplay.DisplayPosition.y+ PSXDisplay.DisplayMode.y+PreviousPSXDisplay.DisplayModeNew.y;
- PreviousPSXDisplay.DisplayEnd.x=
- PreviousPSXDisplay.DisplayPosition.x+ PSXDisplay.DisplayMode.x;
- PreviousPSXDisplay.DisplayEnd.y=
- PreviousPSXDisplay.DisplayPosition.y+ PSXDisplay.DisplayMode.y+PreviousPSXDisplay.DisplayModeNew.y;
-
- ChangeDispOffsetsX();
-
- if(iFrameLimit==2) SetAutoFrameCap(); // set new fps limit vals (depends on interlace)
-
- if(bUp) updateDisplay(); // yeah, real update (swap buffer)
-}
-
-////////////////////////////////////////////////////////////////////////
-// swap update check (called by psx vsync function)
-////////////////////////////////////////////////////////////////////////
-
-BOOL bSwapCheck(void)
-{
- static int iPosCheck=0;
- static PSXPoint_t pO;
- static PSXPoint_t pD;
- static int iDoAgain=0;
-
- if(PSXDisplay.DisplayPosition.x==pO.x &&
- PSXDisplay.DisplayPosition.y==pO.y &&
- PSXDisplay.DisplayEnd.x==pD.x &&
- PSXDisplay.DisplayEnd.y==pD.y)
- iPosCheck++;
- else iPosCheck=0;
-
- pO=PSXDisplay.DisplayPosition;
- pD=PSXDisplay.DisplayEnd;
-
- if(iPosCheck<=4) return FALSE;
-
- iPosCheck=4;
-
- if(PSXDisplay.Interlaced) return FALSE;
-
- if (bNeedInterlaceUpdate||
- bNeedRGB24Update ||
- bNeedUploadAfter|| 
- bNeedUploadTest || 
- iDoAgain
- )
- {
- iDoAgain=0;
- if(bNeedUploadAfter) 
- iDoAgain=1;
- if(bNeedUploadTest && PSXDisplay.InterlacedTest)
- iDoAgain=1;
-
- bDisplayNotSet = TRUE;
- updateDisplay();
-
- PreviousPSXDisplay.DisplayPosition.x=PSXDisplay.DisplayPosition.x;
- PreviousPSXDisplay.DisplayPosition.y=PSXDisplay.DisplayPosition.y;
- PreviousPSXDisplay.DisplayEnd.x=PSXDisplay.DisplayEnd.x;
- PreviousPSXDisplay.DisplayEnd.y=PSXDisplay.DisplayEnd.y;
- pO=PSXDisplay.DisplayPosition;
- pD=PSXDisplay.DisplayEnd;
-
- return TRUE;
- }
-
- return FALSE;
-} 
-
-////////////////////////////////////////////////////////////////////////
-// gun cursor func: player=0-7, x=0-511, y=0-255
-////////////////////////////////////////////////////////////////////////
-
-void CALLBACK GPUcursor(int iPlayer,int x,int y)
-{
- if(iPlayer<0) return;
- if(iPlayer>7) return;
-
- usCursorActive|=(1<<iPlayer);
-
- if(x<0) x=0;
- if(x>iGPUHeightMask) x=iGPUHeightMask;
- if(y<0) y=0;
- if(y>255) y=255;
-
- ptCursorPoint[iPlayer].x=x;
- ptCursorPoint[iPlayer].y=y;
-}
-
-////////////////////////////////////////////////////////////////////////
-// update lace is called every VSync. Basically we limit frame rate 
-// here, and in interlaced mode we swap ogl display buffers.
-////////////////////////////////////////////////////////////////////////
-
-static unsigned short usFirstPos=2;
-
-void CALLBACK GPUupdateLace(void)
-{
- if(!(dwActFixes&0x1000)) 
- STATUSREG^=0x80000000; // interlaced bit toggle, if the CC game fix is not active (see gpuReadStatus)
-
- if(!(dwActFixes&128)) // normal frame limit func
- CheckFrameRate();
-
- if(iOffscreenDrawing==4) // special check if high offscreen drawing is on
- {
- if(bSwapCheck()) return;
- }
-
- if(PSXDisplay.Interlaced) // interlaced mode?
- {
- if(PSXDisplay.DisplayMode.x>0 && PSXDisplay.DisplayMode.y>0)
- {
- updateDisplay(); // -> swap buffers (new frame)
- }
- }
- else if(bRenderFrontBuffer) // no interlace mode? and some stuff in front has changed?
- {
- updateFrontDisplay(); // -> update front buffer
- }
- else if(usFirstPos==1) // initial updates (after startup)
- {
- updateDisplay();
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-// process read request from GPU status register
-////////////////////////////////////////////////////////////////////////
-
-uint32_t CALLBACK GPUreadStatus(void)
-{
- if(dwActFixes&0x1000) // CC game fix
- {
- static int iNumRead=0;
- if((iNumRead++)==2)
- {
- iNumRead=0;
- STATUSREG^=0x80000000; // interlaced bit toggle... we do it on every second read status... needed by some games (like ChronoCross)
- }
- }
-
- if(iFakePrimBusy) // 27.10.2007 - emulating some 'busy' while drawing... pfff... not perfect, but since our emulated dma is not done in an extra thread...
- {
- iFakePrimBusy--;
-
- if(iFakePrimBusy&1) // we do a busy-idle-busy-idle sequence after/while drawing prims
- {
- GPUIsBusy;
- GPUIsNotReadyForCommands;
- }
- else
- {
- GPUIsIdle;
- GPUIsReadyForCommands;
- }
- }
-
- return STATUSREG;
-}
-
-////////////////////////////////////////////////////////////////////////
-// processes data send to GPU status register
-// these are always single packet commands.
-////////////////////////////////////////////////////////////////////////
-
-void CALLBACK GPUwriteStatus(uint32_t gdata)
-{
- uint32_t lCommand=(gdata>>24)&0xff;
- 
- ulStatusControl[lCommand]=gdata;
-
- switch(lCommand)
- {
- //--------------------------------------------------//
- // reset gpu
- case 0x00:
- memset(ulGPUInfoVals, 0x00, 16 * sizeof(uint32_t));
- lGPUstatusRet = 0x14802000;
- PSXDisplay.Disabled=1;
- iDataWriteMode=iDataReadMode=DR_NORMAL;
- PSXDisplay.DrawOffset.x=PSXDisplay.DrawOffset.y=0;
- drawX=drawY=0;drawW=drawH=0;
- sSetMask=0;lSetMask=0;bCheckMask=FALSE;iSetMask=0;
- usMirror=0;
- GlobalTextAddrX=0;GlobalTextAddrY=0;
- GlobalTextTP=0;GlobalTextABR=0;
- PSXDisplay.RGB24=FALSE;
- PSXDisplay.Interlaced=FALSE;
- bUsingTWin = FALSE;
- return;
-
- // dis/enable display
- case 0x03: 
- PreviousPSXDisplay.Disabled = PSXDisplay.Disabled;
- PSXDisplay.Disabled = (gdata & 1);
-
- if(PSXDisplay.Disabled) 
- STATUSREG|=GPUSTATUS_DISPLAYDISABLED;
- else STATUSREG&=~GPUSTATUS_DISPLAYDISABLED;
-
- if (iOffscreenDrawing==4 &&
- PreviousPSXDisplay.Disabled && 
- !(PSXDisplay.Disabled))
- {
-
- if(!PSXDisplay.RGB24)
- {
- PrepareFullScreenUpload(TRUE);
- UploadScreen(TRUE); 
- updateDisplay();
- }
- }
-
- return;
-
- // setting transfer mode
- case 0x04:
- gdata &= 0x03; // only want the lower two bits
-
- iDataWriteMode=iDataReadMode=DR_NORMAL;
- if(gdata==0x02) iDataWriteMode=DR_VRAMTRANSFER;
- if(gdata==0x03) iDataReadMode =DR_VRAMTRANSFER;
-
- STATUSREG&=~GPUSTATUS_DMABITS; // clear the current settings of the DMA bits
- STATUSREG|=(gdata << 29); // set the DMA bits according to the received data
-
- return;
-
- // setting display position
- case 0x05: 
- {
- short sx=(short)(gdata & 0x3ff);
- short sy;
-
- if(iGPUHeight==1024)
- {
- if(dwGPUVersion==2) 
- sy = (short)((gdata>>12)&0x3ff);
- else sy = (short)((gdata>>10)&0x3ff);
- }
- else sy = (short)((gdata>>10)&0x3ff); // really: 0x1ff, but we adjust it later
-
- if (sy & 0x200) 
- {
- sy|=0xfc00;
- PreviousPSXDisplay.DisplayModeNew.y=sy/PSXDisplay.Double;
- sy=0;
- }
- else PreviousPSXDisplay.DisplayModeNew.y=0;
-
- if(sx>1000) sx=0;
-
- if(usFirstPos)
- {
- usFirstPos--;
- if(usFirstPos)
- {
- PreviousPSXDisplay.DisplayPosition.x = sx;
- PreviousPSXDisplay.DisplayPosition.y = sy;
- PSXDisplay.DisplayPosition.x = sx;
- PSXDisplay.DisplayPosition.y = sy;
- }
- }
-
- if(dwActFixes&8) 
- {
- if((!PSXDisplay.Interlaced) &&
- PreviousPSXDisplay.DisplayPosition.x == sx &&
- PreviousPSXDisplay.DisplayPosition.y == sy)
- return;
-
- PSXDisplay.DisplayPosition.x = PreviousPSXDisplay.DisplayPosition.x;
- PSXDisplay.DisplayPosition.y = PreviousPSXDisplay.DisplayPosition.y;
- PreviousPSXDisplay.DisplayPosition.x = sx;
- PreviousPSXDisplay.DisplayPosition.y = sy;
- }
- else
- {
- if((!PSXDisplay.Interlaced) &&
- PSXDisplay.DisplayPosition.x == sx &&
- PSXDisplay.DisplayPosition.y == sy)
- return;
- PreviousPSXDisplay.DisplayPosition.x = PSXDisplay.DisplayPosition.x;
- PreviousPSXDisplay.DisplayPosition.y = PSXDisplay.DisplayPosition.y;
- PSXDisplay.DisplayPosition.x = sx;
- PSXDisplay.DisplayPosition.y = sy;
- }
-
- PSXDisplay.DisplayEnd.x=
- PSXDisplay.DisplayPosition.x+ PSXDisplay.DisplayMode.x;
- PSXDisplay.DisplayEnd.y=
- PSXDisplay.DisplayPosition.y+ PSXDisplay.DisplayMode.y+PreviousPSXDisplay.DisplayModeNew.y;
-
- PreviousPSXDisplay.DisplayEnd.x=
- PreviousPSXDisplay.DisplayPosition.x+ PSXDisplay.DisplayMode.x;
- PreviousPSXDisplay.DisplayEnd.y=
- PreviousPSXDisplay.DisplayPosition.y+ PSXDisplay.DisplayMode.y+PreviousPSXDisplay.DisplayModeNew.y;
-
- bDisplayNotSet = TRUE;
-
- if (!(PSXDisplay.Interlaced))
- {
- updateDisplay();
- }
- else
- if(PSXDisplay.InterlacedTest && 
- ((PreviousPSXDisplay.DisplayPosition.x != PSXDisplay.DisplayPosition.x)||
- (PreviousPSXDisplay.DisplayPosition.y != PSXDisplay.DisplayPosition.y)))
- PSXDisplay.InterlacedTest--;
- 
- return;
- }
-
- // setting width
- case 0x06:
-
- PSXDisplay.Range.x0=gdata & 0x7ff; //0x3ff;
- PSXDisplay.Range.x1=(gdata>>12) & 0xfff;//0x7ff;
-
- PSXDisplay.Range.x1-=PSXDisplay.Range.x0;
-
- ChangeDispOffsetsX();
-
- return;
-
- // setting height
- case 0x07:
-
- PreviousPSXDisplay.Height = PSXDisplay.Height;
-
- PSXDisplay.Range.y0=gdata & 0x3ff;
- PSXDisplay.Range.y1=(gdata>>10) & 0x3ff;
-
- PSXDisplay.Height = PSXDisplay.Range.y1 - 
- PSXDisplay.Range.y0 +
- PreviousPSXDisplay.DisplayModeNew.y;
-
- if (PreviousPSXDisplay.Height != PSXDisplay.Height)
- {
- PSXDisplay.DisplayModeNew.y=PSXDisplay.Height*PSXDisplay.Double;
- ChangeDispOffsetsY();
- updateDisplayIfChanged();
- }
- return;
- 
- // setting display infos
- case 0x08:
-
- PSXDisplay.DisplayModeNew.x = dispWidths[(gdata & 0x03) | ((gdata & 0x40) >> 4)];
-
- if (gdata&0x04) PSXDisplay.Double=2;
- else PSXDisplay.Double=1;
- PSXDisplay.DisplayModeNew.y = PSXDisplay.Height*PSXDisplay.Double;
-
- ChangeDispOffsetsY();
- 
- PSXDisplay.PAL = (gdata & 0x08)?TRUE:FALSE; // if 1 - PAL mode, else NTSC
- PSXDisplay.RGB24New = (gdata & 0x10)?TRUE:FALSE; // if 1 - TrueColor
- PSXDisplay.InterlacedNew = (gdata & 0x20)?TRUE:FALSE; // if 1 - Interlace
-
- STATUSREG&=~GPUSTATUS_WIDTHBITS; // clear the width bits
-
- STATUSREG|=
- (((gdata & 0x03) << 17) | 
- ((gdata & 0x40) << 10)); // set the width bits
-
- PreviousPSXDisplay.InterlacedNew=FALSE;
- if (PSXDisplay.InterlacedNew)
- {
- if(!PSXDisplay.Interlaced)
- {
- PSXDisplay.InterlacedTest=2;
- PreviousPSXDisplay.DisplayPosition.x = PSXDisplay.DisplayPosition.x;
- PreviousPSXDisplay.DisplayPosition.y = PSXDisplay.DisplayPosition.y;
- PreviousPSXDisplay.InterlacedNew=TRUE;
- }
-
- STATUSREG|=GPUSTATUS_INTERLACED;
- }
- else 
- {
- PSXDisplay.InterlacedTest=0;
- STATUSREG&=~GPUSTATUS_INTERLACED;
- }
-
- if (PSXDisplay.PAL)
- STATUSREG|=GPUSTATUS_PAL;
- else STATUSREG&=~GPUSTATUS_PAL;
-
- if (PSXDisplay.Double==2)
- STATUSREG|=GPUSTATUS_DOUBLEHEIGHT;
- else STATUSREG&=~GPUSTATUS_DOUBLEHEIGHT;
-
- if (PSXDisplay.RGB24New)
- STATUSREG|=GPUSTATUS_RGB24;
- else STATUSREG&=~GPUSTATUS_RGB24;
-
- updateDisplayIfChanged();
-
- return;
-
- //--------------------------------------------------//
- // ask about GPU version and other stuff
- case 0x10: 
-
- gdata&=0xff;
-
- switch(gdata) 
- {
- case 0x02:
- GPUdataRet=ulGPUInfoVals[INFO_TW]; // tw infos
- return;
- case 0x03:
- GPUdataRet=ulGPUInfoVals[INFO_DRAWSTART]; // draw start
- return;
- case 0x04:
- GPUdataRet=ulGPUInfoVals[INFO_DRAWEND]; // draw end
- return;
- case 0x05:
- case 0x06:
- GPUdataRet=ulGPUInfoVals[INFO_DRAWOFF]; // draw offset
- return;
- case 0x07:
- if(dwGPUVersion==2)
- GPUdataRet=0x01;
- else GPUdataRet=0x02; // gpu type
- return;
- case 0x08:
- case 0x0F: // some bios addr?
- GPUdataRet=0xBFC03720;
- return;
- }
- return;
- //--------------------------------------------------//
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-// vram read/write helpers
-////////////////////////////////////////////////////////////////////////
-
-BOOL bNeedWriteUpload=FALSE;
-
-__inline void FinishedVRAMWrite(void)
-{
- if(bNeedWriteUpload)
- {
- bNeedWriteUpload=FALSE;
- CheckWriteUpdate();
- }
-
- // set register to NORMAL operation
- iDataWriteMode = DR_NORMAL;
-
- // reset transfer values, to prevent mis-transfer of data
- VRAMWrite.ColsRemaining = 0;
- VRAMWrite.RowsRemaining = 0;
-}
-
-__inline void FinishedVRAMRead(void)
-{
- // set register to NORMAL operation
- iDataReadMode = DR_NORMAL;
- // reset transfer values, to prevent mis-transfer of data
- VRAMRead.x = 0;
- VRAMRead.y = 0;
- VRAMRead.Width = 0;
- VRAMRead.Height = 0;
- VRAMRead.ColsRemaining = 0;
- VRAMRead.RowsRemaining = 0;
-
- // indicate GPU is no longer ready for VRAM data in the STATUS REGISTER
- STATUSREG&=~GPUSTATUS_READYFORVRAM;
-}
-
-////////////////////////////////////////////////////////////////////////
-// vram read check ex (reading from card's back/frontbuffer if needed...
-// slow!)
-////////////////////////////////////////////////////////////////////////
-
-void CheckVRamReadEx(int x, int y, int dx, int dy)
-{
- unsigned short sArea;
- int ux,uy,udx,udy,wx,wy;
- unsigned short * p1, *p2;
- float XS,YS;
- unsigned char * ps;
- unsigned char * px;
- unsigned short s,sx;
-
- if(STATUSREG&GPUSTATUS_RGB24) return;
-
- if(((dx > PSXDisplay.DisplayPosition.x) &&
- (x < PSXDisplay.DisplayEnd.x) &&
- (dy > PSXDisplay.DisplayPosition.y) &&
- (y < PSXDisplay.DisplayEnd.y)))
- sArea=0;
- else
- if((!(PSXDisplay.InterlacedTest) &&
- (dx > PreviousPSXDisplay.DisplayPosition.x) &&
- (x < PreviousPSXDisplay.DisplayEnd.x) &&
- (dy > PreviousPSXDisplay.DisplayPosition.y) &&
- (y < PreviousPSXDisplay.DisplayEnd.y)))
- sArea=1;
- else 
- {
- return;
- }
-
- //////////////
-
- if(iRenderFVR)
- {
- bFullVRam=TRUE;iRenderFVR=2;return;
- }
- bFullVRam=TRUE;iRenderFVR=2;
-
- //////////////
-
- p2=0;
-
- if(sArea==0)
- {
- ux=PSXDisplay.DisplayPosition.x;
- uy=PSXDisplay.DisplayPosition.y;
- udx=PSXDisplay.DisplayEnd.x-ux;
- udy=PSXDisplay.DisplayEnd.y-uy;
- if((PreviousPSXDisplay.DisplayEnd.x-
- PreviousPSXDisplay.DisplayPosition.x)==udx &&
- (PreviousPSXDisplay.DisplayEnd.y-
- PreviousPSXDisplay.DisplayPosition.y)==udy)
- p2=(psxVuw + (1024*PreviousPSXDisplay.DisplayPosition.y) + 
- PreviousPSXDisplay.DisplayPosition.x);
- }
- else
- {
- ux=PreviousPSXDisplay.DisplayPosition.x;
- uy=PreviousPSXDisplay.DisplayPosition.y;
- udx=PreviousPSXDisplay.DisplayEnd.x-ux;
- udy=PreviousPSXDisplay.DisplayEnd.y-uy;
- if((PSXDisplay.DisplayEnd.x-
- PSXDisplay.DisplayPosition.x)==udx &&
- (PSXDisplay.DisplayEnd.y-
- PSXDisplay.DisplayPosition.y)==udy)
- p2=(psxVuw + (1024*PSXDisplay.DisplayPosition.y) + 
- PSXDisplay.DisplayPosition.x);
- }
-
- p1=(psxVuw + (1024*uy) + ux);
- if(p1==p2) p2=0;
-
- x=0;y=0;
- wx=dx=udx;wy=dy=udy;
-
- if(udx<=0) return;
- if(udy<=0) return;
- if(dx<=0) return;
- if(dy<=0) return;
- if(wx<=0) return;
- if(wy<=0) return;
-
- XS=(float)rRatioRect.right/(float)wx;
- YS=(float)rRatioRect.bottom/(float)wy;
-
- dx=(int)((float)(dx)*XS);
- dy=(int)((float)(dy)*YS);
-
- if(dx>iResX) dx=iResX;
- if(dy>iResY) dy=iResY;
-
- if(dx<=0) return;
- if(dy<=0) return;
-
- // ogl y adjust
- y=iResY-y-dy;
-
- x+=rRatioRect.left;
- y-=rRatioRect.top;
-
- if(y<0) y=0; if((y+dy)>iResY) dy=iResY-y;
-
- if(!pGfxCardScreen)
- {
- glPixelStorei(GL_PACK_ALIGNMENT,1);
- pGfxCardScreen=(unsigned char *)malloc(iResX*iResY*4);
- }
-
- ps=pGfxCardScreen;
- 
- if(!sArea) glReadBuffer(GL_FRONT);
-
- glReadPixels(x,y,dx,dy,GL_RGB,GL_UNSIGNED_BYTE,ps);
- 
- if(!sArea) glReadBuffer(GL_BACK);
-
- s=0;
-
- XS=(float)dx/(float)(udx);
- YS=(float)dy/(float)(udy+1);
- 
- for(y=udy;y>0;y--)
- {
- for(x=0;x<udx;x++)
- {
- if(p1>=psxVuw && p1<psxVuw_eom)
- {
- px=ps+(3*((int)((float)x * XS))+
- (3*dx)*((int)((float)y*YS)));
- sx=(*px)>>3;px++;
- s=sx;
- sx=(*px)>>3;px++;
- s|=sx<<5;
- sx=(*px)>>3;
- s|=sx<<10;
- s&=~0x8000;
- *p1=s;
- }
- if(p2>=psxVuw && p2<psxVuw_eom) *p2=s;
-
- p1++;
- if(p2) p2++;
- }
-
- p1 += 1024 - udx;
- if(p2) p2 += 1024 - udx;
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-// vram read check (reading from card's back/frontbuffer if needed... 
-// slow!)
-////////////////////////////////////////////////////////////////////////
-
-void CheckVRamRead(int x, int y, int dx, int dy,BOOL bFront)
-{
- unsigned short sArea;unsigned short * p;
- int ux,uy,udx,udy,wx,wy;float XS,YS;
- unsigned char * ps, * px;
- unsigned short s=0,sx;
-
- if(STATUSREG&GPUSTATUS_RGB24) return;
-
- if(((dx > PSXDisplay.DisplayPosition.x) &&
- (x < PSXDisplay.DisplayEnd.x) &&
- (dy > PSXDisplay.DisplayPosition.y) &&
- (y < PSXDisplay.DisplayEnd.y)))
- sArea=0;
- else
- if((!(PSXDisplay.InterlacedTest) &&
- (dx > PreviousPSXDisplay.DisplayPosition.x) &&
- (x < PreviousPSXDisplay.DisplayEnd.x) &&
- (dy > PreviousPSXDisplay.DisplayPosition.y) &&
- (y < PreviousPSXDisplay.DisplayEnd.y)))
- sArea=1;
- else 
- {
- return;
- }
-
- if(dwActFixes&0x40)
- {
- if(iRenderFVR)
- {
- bFullVRam=TRUE;iRenderFVR=2;return;
- }
- bFullVRam=TRUE;iRenderFVR=2;
- }
-
- ux=x;uy=y;udx=dx;udy=dy;
-
- if(sArea==0)
- {
- x -=PSXDisplay.DisplayPosition.x;
- dx-=PSXDisplay.DisplayPosition.x;
- y -=PSXDisplay.DisplayPosition.y;
- dy-=PSXDisplay.DisplayPosition.y;
- wx=PSXDisplay.DisplayEnd.x-PSXDisplay.DisplayPosition.x;
- wy=PSXDisplay.DisplayEnd.y-PSXDisplay.DisplayPosition.y;
- }
- else
- {
- x -=PreviousPSXDisplay.DisplayPosition.x;
- dx-=PreviousPSXDisplay.DisplayPosition.x;
- y -=PreviousPSXDisplay.DisplayPosition.y;
- dy-=PreviousPSXDisplay.DisplayPosition.y;
- wx=PreviousPSXDisplay.DisplayEnd.x-PreviousPSXDisplay.DisplayPosition.x;
- wy=PreviousPSXDisplay.DisplayEnd.y-PreviousPSXDisplay.DisplayPosition.y;
- }
- if(x<0) {ux-=x;x=0;}
- if(y<0) {uy-=y;y=0;}
- if(dx>wx) {udx-=(dx-wx);dx=wx;}
- if(dy>wy) {udy-=(dy-wy);dy=wy;}
- udx-=ux;
- udy-=uy;
- 
- p=(psxVuw + (1024*uy) + ux);
-
- if(udx<=0) return;
- if(udy<=0) return;
- if(dx<=0) return;
- if(dy<=0) return;
- if(wx<=0) return;
- if(wy<=0) return;
-
- XS=(float)rRatioRect.right/(float)wx;
- YS=(float)rRatioRect.bottom/(float)wy;
-
- dx=(int)((float)(dx)*XS);
- dy=(int)((float)(dy)*YS);
- x=(int)((float)x*XS);
- y=(int)((float)y*YS);
-
- dx-=x;
- dy-=y;
-
- if(dx>iResX) dx=iResX;
- if(dy>iResY) dy=iResY;
-
- if(dx<=0) return;
- if(dy<=0) return;
-
- // ogl y adjust
- y=iResY-y-dy;
-
- x+=rRatioRect.left;
- y-=rRatioRect.top;
-
- if(y<0) y=0; if((y+dy)>iResY) dy=iResY-y;
-
- if(!pGfxCardScreen)
- {
- glPixelStorei(GL_PACK_ALIGNMENT,1);
- pGfxCardScreen=(unsigned char *)malloc(iResX*iResY*4);
- }
-
- ps=pGfxCardScreen;
- 
- if(bFront) glReadBuffer(GL_FRONT);
-
- glReadPixels(x,y,dx,dy,GL_RGB,GL_UNSIGNED_BYTE,ps);
- 
- if(bFront) glReadBuffer(GL_BACK);
-
- XS=(float)dx/(float)(udx);
- YS=(float)dy/(float)(udy+1);
- 
- for(y=udy;y>0;y--)
- {
- for(x=0;x<udx;x++)
- {
- if(p>=psxVuw && p<psxVuw_eom)
- {
- px=ps+(3*((int)((float)x * XS))+
- (3*dx)*((int)((float)y*YS)));
- sx=(*px)>>3;px++;
- s=sx;
- sx=(*px)>>3;px++;
- s|=sx<<5;
- sx=(*px)>>3;
- s|=sx<<10;
- s&=~0x8000;
- *p=s;
- }
- p++;
- }
- p += 1024 - udx;
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-// core read from vram
-////////////////////////////////////////////////////////////////////////
-
-void CALLBACK GPUreadDataMem(uint32_t *pMem, int iSize)
-{
- int i;
-
- if(iDataReadMode!=DR_VRAMTRANSFER) return;
-
- GPUIsBusy;
-
- // adjust read ptr, if necessary
- while(VRAMRead.ImagePtr>=psxVuw_eom)
- VRAMRead.ImagePtr-=iGPUHeight*1024;
- while(VRAMRead.ImagePtr<psxVuw)
- VRAMRead.ImagePtr+=iGPUHeight*1024;
-
- if((iFrameReadType&1 && iSize>1) &&
- !(iDrawnSomething==2 &&
- VRAMRead.x == VRAMWrite.x &&
- VRAMRead.y == VRAMWrite.y &&
- VRAMRead.Width == VRAMWrite.Width &&
- VRAMRead.Height == VRAMWrite.Height))
- CheckVRamRead(VRAMRead.x,VRAMRead.y,
- VRAMRead.x+VRAMRead.RowsRemaining,
- VRAMRead.y+VRAMRead.ColsRemaining,
- TRUE);
-
- for(i=0;i<iSize;i++)
- {
- // do 2 seperate 16bit reads for compatibility (wrap issues)
- if ((VRAMRead.ColsRemaining > 0) && (VRAMRead.RowsRemaining > 0))
- {
- // lower 16 bit
- GPUdataRet=(uint32_t)*VRAMRead.ImagePtr;
-
- VRAMRead.ImagePtr++;
- if(VRAMRead.ImagePtr>=psxVuw_eom) VRAMRead.ImagePtr-=iGPUHeight*1024;
- VRAMRead.RowsRemaining --;
-
- if(VRAMRead.RowsRemaining<=0)
- {
- VRAMRead.RowsRemaining = VRAMRead.Width;
- VRAMRead.ColsRemaining--;
- VRAMRead.ImagePtr += 1024 - VRAMRead.Width;
- if(VRAMRead.ImagePtr>=psxVuw_eom) VRAMRead.ImagePtr-=iGPUHeight*1024;
- }
-
- // higher 16 bit (always, even if it's an odd width)
- GPUdataRet|=(uint32_t)(*VRAMRead.ImagePtr)<<16;
- *pMem++=GPUdataRet;
-
- if(VRAMRead.ColsRemaining <= 0)
- {FinishedVRAMRead();goto ENDREAD;}
-
- VRAMRead.ImagePtr++;
- if(VRAMRead.ImagePtr>=psxVuw_eom) VRAMRead.ImagePtr-=iGPUHeight*1024;
- VRAMRead.RowsRemaining--;
- if(VRAMRead.RowsRemaining<=0)
- {
- VRAMRead.RowsRemaining = VRAMRead.Width;
- VRAMRead.ColsRemaining--;
- VRAMRead.ImagePtr += 1024 - VRAMRead.Width;
- if(VRAMRead.ImagePtr>=psxVuw_eom) VRAMRead.ImagePtr-=iGPUHeight*1024;
- }
- if(VRAMRead.ColsRemaining <= 0)
- {FinishedVRAMRead();goto ENDREAD;}
- }
- else {FinishedVRAMRead();goto ENDREAD;}
- }
-
-ENDREAD:
- GPUIsIdle;
-}
-
-uint32_t CALLBACK GPUreadData(void)
-{
- uint32_t l;
- GPUreadDataMem(&l,1);
- return GPUdataRet;
-}
-
-////////////////////////////////////////////////////////////////////////
-// helper table to know how much data is used by drawing commands
-////////////////////////////////////////////////////////////////////////
-
-const unsigned char primTableCX[256] =
-{
- // 00
- 0,0,3,0,0,0,0,0,
- // 08
- 0,0,0,0,0,0,0,0,
- // 10
- 0,0,0,0,0,0,0,0,
- // 18
- 0,0,0,0,0,0,0,0,
- // 20
- 4,4,4,4,7,7,7,7,
- // 28
- 5,5,5,5,9,9,9,9,
- // 30
- 6,6,6,6,9,9,9,9,
- // 38
- 8,8,8,8,12,12,12,12,
- // 40
- 3,3,3,3,0,0,0,0,
- // 48
-// 5,5,5,5,6,6,6,6, //FLINE
- 254,254,254,254,254,254,254,254,
- // 50
- 4,4,4,4,0,0,0,0,
- // 58
-// 7,7,7,7,9,9,9,9, // LINEG3 LINEG4
- 255,255,255,255,255,255,255,255,
- // 60
- 3,3,3,3,4,4,4,4, // TILE SPRT
- // 68
- 2,2,2,2,3,3,3,3, // TILE1
- // 70
- 2,2,2,2,3,3,3,3,
- // 78
- 2,2,2,2,3,3,3,3,
- // 80
- 4,0,0,0,0,0,0,0,
- // 88
- 0,0,0,0,0,0,0,0,
- // 90
- 0,0,0,0,0,0,0,0,
- // 98
- 0,0,0,0,0,0,0,0,
- // a0
- 3,0,0,0,0,0,0,0,
- // a8
- 0,0,0,0,0,0,0,0,
- // b0
- 0,0,0,0,0,0,0,0,
- // b8
- 0,0,0,0,0,0,0,0,
- // c0
- 3,0,0,0,0,0,0,0,
- // c8
- 0,0,0,0,0,0,0,0,
- // d0
- 0,0,0,0,0,0,0,0,
- // d8
- 0,0,0,0,0,0,0,0,
- // e0
- 0,1,1,1,1,1,1,0,
- // e8
- 0,0,0,0,0,0,0,0,
- // f0
- 0,0,0,0,0,0,0,0,
- // f8
- 0,0,0,0,0,0,0,0
-};
-
-////////////////////////////////////////////////////////////////////////
-// processes data send to GPU data register
-////////////////////////////////////////////////////////////////////////
-
-void CALLBACK GPUwriteDataMem(uint32_t *pMem, int iSize)
-{
- unsigned char command;
- uint32_t gdata=0;
- int i=0;
- GPUIsBusy;
- GPUIsNotReadyForCommands;
-
-STARTVRAM:
-
- if(iDataWriteMode==DR_VRAMTRANSFER)
- {
- // make sure we are in vram
- while(VRAMWrite.ImagePtr>=psxVuw_eom)
- VRAMWrite.ImagePtr-=iGPUHeight*1024;
- while(VRAMWrite.ImagePtr<psxVuw)
- VRAMWrite.ImagePtr+=iGPUHeight*1024;
-
- // now do the loop
- while(VRAMWrite.ColsRemaining>0)
- {
- while(VRAMWrite.RowsRemaining>0)
- {
- if(i>=iSize) {goto ENDVRAM;}
- i++;
-
- gdata=*pMem++;
-
- *VRAMWrite.ImagePtr++ = (unsigned short)gdata;
- if(VRAMWrite.ImagePtr>=psxVuw_eom) VRAMWrite.ImagePtr-=iGPUHeight*1024;
- VRAMWrite.RowsRemaining --;
-
- if(VRAMWrite.RowsRemaining <= 0)
- {
- VRAMWrite.ColsRemaining--;
- if (VRAMWrite.ColsRemaining <= 0) // last pixel is odd width
- {
- gdata=(gdata&0xFFFF)|(((uint32_t)(*VRAMWrite.ImagePtr))<<16);
- FinishedVRAMWrite();
- goto ENDVRAM;
- }
- VRAMWrite.RowsRemaining = VRAMWrite.Width;
- VRAMWrite.ImagePtr += 1024 - VRAMWrite.Width;
- }
-
- *VRAMWrite.ImagePtr++ = (unsigned short)(gdata>>16);
- if(VRAMWrite.ImagePtr>=psxVuw_eom) VRAMWrite.ImagePtr-=iGPUHeight*1024;
- VRAMWrite.RowsRemaining --;
- }
-
- VRAMWrite.RowsRemaining = VRAMWrite.Width;
- VRAMWrite.ColsRemaining--;
- VRAMWrite.ImagePtr += 1024 - VRAMWrite.Width;
- }
-
- FinishedVRAMWrite();
- }
-
-ENDVRAM:
-
- if(iDataWriteMode==DR_NORMAL)
- {
- void (* *primFunc)(unsigned char *);
- if(bSkipNextFrame) primFunc=primTableSkip;
- else primFunc=primTableJ;
-
- for(;i<iSize;)
- {
- if(iDataWriteMode==DR_VRAMTRANSFER) goto STARTVRAM;
-
- gdata=*pMem++;i++;
- 
- if(gpuDataC == 0)
- {
- command = (unsigned char)((gdata>>24) & 0xff);
- 
- if(primTableCX[command])
- {
- gpuDataC = primTableCX[command];
- gpuCommand = command;
- gpuDataM[0] = gdata;
- gpuDataP = 1;
- }
- else continue;
- }
- else
- {
- gpuDataM[gpuDataP] = gdata;
- if(gpuDataC>128)
- {
- if((gpuDataC==254 && gpuDataP>=3) ||
- (gpuDataC==255 && gpuDataP>=4 && !(gpuDataP&1)))
- {
- if((gpuDataM[gpuDataP] & 0xF000F000) == 0x50005000)
- gpuDataP=gpuDataC-1;
- }
- }
- gpuDataP++;
- }
- 
- if(gpuDataP == gpuDataC)
- {
- gpuDataC=gpuDataP=0;
- primFunc[gpuCommand]((unsigned char *)gpuDataM);
-
- if(dwEmuFixes&0x0001 || dwActFixes&0x20000) // hack for emulating "gpu busy" in some games
- iFakePrimBusy=4;
- }
- } 
- }
-
- GPUdataRet=gdata;
-
- GPUIsReadyForCommands;
- GPUIsIdle; 
-}
-
-////////////////////////////////////////////////////////////////////////
-
-void CALLBACK GPUwriteData(uint32_t gdata)
-{
- GPUwriteDataMem(&gdata,1);
-}
-
-////////////////////////////////////////////////////////////////////////
-// call config dlg
-////////////////////////////////////////////////////////////////////////
-
-void StartCfgTool(char *arg) // linux: start external cfg tool
-{
-	char cfg[256];
-	struct stat buf;
-
-	strcpy(cfg, "./cfgpeopsxgl");
-	if (stat(cfg, &buf) != -1) {
-		if (fork() == 0) {
-			execl(cfg, "cfgpeopsxgl", arg, NULL);
-			exit(0);
-		}
-		return;
-	}
-
-	strcpy(cfg, "./cfg/cfgpeopsxgl");
-	if (stat(cfg, &buf) != -1) {
-		if (fork() == 0) {
-			execl(cfg, "cfgpeopsxgl", arg, NULL);
-			exit(0);
-		}
-		return;
-	}
-
-	sprintf(cfg, "%s/.pcsx/plugins/cfg/cfgpeopsxgl", getenv("HOME"));
-	if (stat(cfg, &buf) != -1) {
-		if (fork() == 0) {
-			execl(cfg, "cfgpeopsxgl", arg, NULL);
-			exit(0);
-		}
-		return;
-	}
-
-	printf("ERROR: cfgpeopsxgl file not found!\n");
-}
-
-long CALLBACK GPUconfigure(void)
-{
- StartCfgTool("CFG");
- return 0;
-}
-
-////////////////////////////////////////////////////////////////////////
-// sets all kind of act fixes
-////////////////////////////////////////////////////////////////////////
-
-void SetFixes(void)
-{
- ReInitFrameCap();
-
- if(dwActFixes & 0x2000) 
- dispWidths[4]=384;
- else dispWidths[4]=368;
-}
-
-////////////////////////////////////////////////////////////////////////
-// Pete Special: make an 'intelligent' dma chain check (<-Tekken3)
-////////////////////////////////////////////////////////////////////////
-
-uint32_t lUsedAddr[3];
-
-__inline BOOL CheckForEndlessLoop(uint32_t laddr)
-{
- if(laddr==lUsedAddr[1]) return TRUE;
- if(laddr==lUsedAddr[2]) return TRUE;
-
- if(laddr<lUsedAddr[0]) lUsedAddr[1]=laddr;
- else lUsedAddr[2]=laddr;
- lUsedAddr[0]=laddr;
- return FALSE;
-}
-
-////////////////////////////////////////////////////////////////////////
-// core gives a dma chain to gpu: same as the gpuwrite interface funcs
-////////////////////////////////////////////////////////////////////////
-
-long CALLBACK GPUdmaChain(uint32_t *baseAddrL, uint32_t addr)
-{
- uint32_t dmaMem;
- unsigned char * baseAddrB;
- short count;unsigned int DMACommandCounter = 0;
-
- if(bIsFirstFrame) GLinitialize();
-
- GPUIsBusy;
-
- lUsedAddr[0]=lUsedAddr[1]=lUsedAddr[2]=0xffffff;
-
- baseAddrB = (unsigned char*) baseAddrL;
-
- do
- {
- if(iGPUHeight==512) addr&=0x1FFFFC;
-
- if(DMACommandCounter++ > 2000000) break;
- if(CheckForEndlessLoop(addr)) break;
-
- count = baseAddrB[addr+3];
-
- dmaMem=addr+4;
-
- if(count>0) GPUwriteDataMem(&baseAddrL[dmaMem>>2],count);
-
- addr = baseAddrL[addr>>2]&0xffffff;
- }
- while (addr != 0xffffff);
-
- GPUIsIdle;
-
- return 0;
-}
- 
-////////////////////////////////////////////////////////////////////////
-// show about dlg
-////////////////////////////////////////////////////////////////////////
-
-void CALLBACK GPUabout(void)
-{
- StartCfgTool("ABOUT");
-}
-
-////////////////////////////////////////////////////////////////////////
-// We are ever fine ;)
-////////////////////////////////////////////////////////////////////////
-
-long CALLBACK GPUtest(void)
-{
- // if test fails this function should return negative value for error (unable to continue)
- // and positive value for warning (can continue but output might be crappy)
-
- return 0;
-}
-
-////////////////////////////////////////////////////////////////////////
-// save state funcs
-////////////////////////////////////////////////////////////////////////
-
-typedef struct GPUFREEZETAG
-{
- uint32_t ulFreezeVersion; // should be always 1 for now (set by main emu)
- uint32_t ulStatus; // current gpu status
- uint32_t ulControl[256]; // latest control register values
- unsigned char psxVRam[1024*1024*2]; // current VRam image (full 2 MB for ZN)
-} GPUFreeze_t;
-
-////////////////////////////////////////////////////////////////////////
-
-long CALLBACK GPUfreeze(uint32_t ulGetFreezeData,GPUFreeze_t * pF)
-{
- if(ulGetFreezeData==2) 
- {
- int lSlotNum=*((int *)pF);
- if(lSlotNum<0) return 0;
- if(lSlotNum>8) return 0;
- lSelectedSlot=lSlotNum+1;
- return 1;
- }
-
- if(!pF) return 0; 
- if(pF->ulFreezeVersion!=1) return 0;
-
- if(ulGetFreezeData==1)
- {
- pF->ulStatus=STATUSREG;
- memcpy(pF->ulControl,ulStatusControl,256*sizeof(uint32_t));
- memcpy(pF->psxVRam, psxVub, 1024*iGPUHeight*2);
-
- return 1;
- }
-
- if(ulGetFreezeData!=0) return 0;
-
- STATUSREG=pF->ulStatus;
- memcpy(ulStatusControl,pF->ulControl,256*sizeof(uint32_t));
- memcpy(psxVub, pF->psxVRam, 1024*iGPUHeight*2);
-
- ResetTextureArea(TRUE);
-
- GPUwriteStatus(ulStatusControl[0]);
- GPUwriteStatus(ulStatusControl[1]);
- GPUwriteStatus(ulStatusControl[2]);
- GPUwriteStatus(ulStatusControl[3]);
- GPUwriteStatus(ulStatusControl[8]);
- GPUwriteStatus(ulStatusControl[6]);
- GPUwriteStatus(ulStatusControl[7]);
- GPUwriteStatus(ulStatusControl[5]);
- GPUwriteStatus(ulStatusControl[4]);
-
- return 1;
-}
-
-////////////////////////////////////////////////////////////////////////
-// special "emu infos" / "emu effects" functions
-////////////////////////////////////////////////////////////////////////
-
-//00 = black
-//01 = white
-//10 = red
-//11 = transparent
-
-unsigned char cFont[10][120]=
-{
-// 0
-{0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x05,0x54,0x00,0x00,
- 0x80,0x00,0x14,0x05,0x00,0x00,
- 0x80,0x00,0x14,0x05,0x00,0x00,
- 0x80,0x00,0x14,0x05,0x00,0x00,
- 0x80,0x00,0x14,0x05,0x00,0x00,
- 0x80,0x00,0x14,0x05,0x00,0x00,
- 0x80,0x00,0x14,0x05,0x00,0x00,
- 0x80,0x00,0x14,0x05,0x00,0x00,
- 0x80,0x00,0x14,0x05,0x00,0x00,
- 0x80,0x00,0x05,0x54,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0xaa,0xaa,0xaa,0xaa,0xaa,0xaa
-},
-// 1
-{0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x50,0x00,0x00,
- 0x80,0x00,0x05,0x50,0x00,0x00,
- 0x80,0x00,0x00,0x50,0x00,0x00,
- 0x80,0x00,0x00,0x50,0x00,0x00,
- 0x80,0x00,0x00,0x50,0x00,0x00,
- 0x80,0x00,0x00,0x50,0x00,0x00,
- 0x80,0x00,0x00,0x50,0x00,0x00,
- 0x80,0x00,0x00,0x50,0x00,0x00,
- 0x80,0x00,0x00,0x50,0x00,0x00,
- 0x80,0x00,0x05,0x55,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0xaa,0xaa,0xaa,0xaa,0xaa,0xaa
-},
-// 2
-{0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x05,0x54,0x00,0x00,
- 0x80,0x00,0x14,0x05,0x00,0x00,
- 0x80,0x00,0x00,0x05,0x00,0x00,
- 0x80,0x00,0x00,0x05,0x00,0x00,
- 0x80,0x00,0x00,0x14,0x00,0x00,
- 0x80,0x00,0x00,0x50,0x00,0x00,
- 0x80,0x00,0x01,0x40,0x00,0x00,
- 0x80,0x00,0x05,0x00,0x00,0x00,
- 0x80,0x00,0x14,0x00,0x00,0x00,
- 0x80,0x00,0x15,0x55,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0xaa,0xaa,0xaa,0xaa,0xaa,0xaa
-},
-// 3
-{0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x05,0x54,0x00,0x00,
- 0x80,0x00,0x14,0x05,0x00,0x00,
- 0x80,0x00,0x00,0x05,0x00,0x00,
- 0x80,0x00,0x00,0x05,0x00,0x00,
- 0x80,0x00,0x01,0x54,0x00,0x00,
- 0x80,0x00,0x00,0x05,0x00,0x00,
- 0x80,0x00,0x00,0x05,0x00,0x00,
- 0x80,0x00,0x00,0x05,0x00,0x00,
- 0x80,0x00,0x14,0x05,0x00,0x00,
- 0x80,0x00,0x05,0x54,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0xaa,0xaa,0xaa,0xaa,0xaa,0xaa
-},
-// 4
-{0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x14,0x00,0x00,
- 0x80,0x00,0x00,0x54,0x00,0x00,
- 0x80,0x00,0x01,0x54,0x00,0x00,
- 0x80,0x00,0x01,0x54,0x00,0x00,
- 0x80,0x00,0x05,0x14,0x00,0x00,
- 0x80,0x00,0x14,0x14,0x00,0x00,
- 0x80,0x00,0x15,0x55,0x00,0x00,
- 0x80,0x00,0x00,0x14,0x00,0x00,
- 0x80,0x00,0x00,0x14,0x00,0x00,
- 0x80,0x00,0x00,0x55,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0xaa,0xaa,0xaa,0xaa,0xaa,0xaa
-},
-// 5
-{0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x15,0x55,0x00,0x00,
- 0x80,0x00,0x14,0x00,0x00,0x00,
- 0x80,0x00,0x14,0x00,0x00,0x00,
- 0x80,0x00,0x14,0x00,0x00,0x00,
- 0x80,0x00,0x15,0x54,0x00,0x00,
- 0x80,0x00,0x00,0x05,0x00,0x00,
- 0x80,0x00,0x00,0x05,0x00,0x00,
- 0x80,0x00,0x00,0x05,0x00,0x00,
- 0x80,0x00,0x14,0x05,0x00,0x00,
- 0x80,0x00,0x05,0x54,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0xaa,0xaa,0xaa,0xaa,0xaa,0xaa
-},
-// 6
-{0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x01,0x54,0x00,0x00,
- 0x80,0x00,0x05,0x00,0x00,0x00,
- 0x80,0x00,0x14,0x00,0x00,0x00,
- 0x80,0x00,0x14,0x00,0x00,0x00,
- 0x80,0x00,0x15,0x54,0x00,0x00,
- 0x80,0x00,0x15,0x05,0x00,0x00,
- 0x80,0x00,0x14,0x05,0x00,0x00,
- 0x80,0x00,0x14,0x05,0x00,0x00,
- 0x80,0x00,0x14,0x05,0x00,0x00,
- 0x80,0x00,0x05,0x54,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0xaa,0xaa,0xaa,0xaa,0xaa,0xaa
-},
-// 7
-{0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x15,0x55,0x00,0x00,
- 0x80,0x00,0x14,0x05,0x00,0x00,
- 0x80,0x00,0x00,0x14,0x00,0x00,
- 0x80,0x00,0x00,0x14,0x00,0x00,
- 0x80,0x00,0x00,0x50,0x00,0x00,
- 0x80,0x00,0x00,0x50,0x00,0x00,
- 0x80,0x00,0x01,0x40,0x00,0x00,
- 0x80,0x00,0x01,0x40,0x00,0x00,
- 0x80,0x00,0x05,0x00,0x00,0x00,
- 0x80,0x00,0x05,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0xaa,0xaa,0xaa,0xaa,0xaa,0xaa
-},
-// 8
-{0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x05,0x54,0x00,0x00,
- 0x80,0x00,0x14,0x05,0x00,0x00,
- 0x80,0x00,0x14,0x05,0x00,0x00,
- 0x80,0x00,0x14,0x05,0x00,0x00,
- 0x80,0x00,0x05,0x54,0x00,0x00,
- 0x80,0x00,0x14,0x05,0x00,0x00,
- 0x80,0x00,0x14,0x05,0x00,0x00,
- 0x80,0x00,0x14,0x05,0x00,0x00,
- 0x80,0x00,0x14,0x05,0x00,0x00,
- 0x80,0x00,0x05,0x54,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0xaa,0xaa,0xaa,0xaa,0xaa,0xaa
-},
-// 9
-{0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x05,0x54,0x00,0x00,
- 0x80,0x00,0x14,0x05,0x00,0x00,
- 0x80,0x00,0x14,0x05,0x00,0x00,
- 0x80,0x00,0x14,0x05,0x00,0x00,
- 0x80,0x00,0x14,0x15,0x00,0x00,
- 0x80,0x00,0x05,0x55,0x00,0x00,
- 0x80,0x00,0x00,0x05,0x00,0x00,
- 0x80,0x00,0x00,0x05,0x00,0x00,
- 0x80,0x00,0x00,0x14,0x00,0x00,
- 0x80,0x00,0x05,0x50,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0x80,0x00,0x00,0x00,0x00,0x00,
- 0xaa,0xaa,0xaa,0xaa,0xaa,0xaa
-}
-};
-
-////////////////////////////////////////////////////////////////////////
-
-void PaintPicDot(unsigned char * p,unsigned char c)
-{
- if(c==0) {*p++=0x00;*p++=0x00;*p=0x00;return;}
- if(c==1) {*p++=0xff;*p++=0xff;*p=0xff;return;}
- if(c==2) {*p++=0x00;*p++=0x00;*p=0xff;return;}
-}
-
-////////////////////////////////////////////////////////////////////////
-
-void CALLBACK GPUgetScreenPic(unsigned char * pMem)
-{
- float XS,YS;int x,y,v;
- unsigned char * ps, * px, * pf;
- unsigned char c;
-
- if(!pGfxCardScreen)
- {
- glPixelStorei(GL_PACK_ALIGNMENT,1);
- pGfxCardScreen=(unsigned char *)malloc(iResX*iResY*4);
- }
-
- ps=pGfxCardScreen;
-
- glReadBuffer(GL_FRONT);
-
- glReadPixels(0,0,iResX,iResY,GL_RGB,GL_UNSIGNED_BYTE,ps);
- 
- glReadBuffer(GL_BACK);
-
- XS=(float)iResX/128;
- YS=(float)iResY/96;
- pf=pMem;
-
- for(y=96;y>0;y--)
- {
- for(x=0;x<128;x++)
- {
- px=ps+(3*((int)((float)x * XS))+
- (3*iResX)*((int)((float)y*YS)));
- *(pf+0)=*(px+2);
- *(pf+1)=*(px+1);
- *(pf+2)=*(px+0);
- pf+=3;
- }
- }
-
- /////////////////////////////////////////////////////////////////////
- // generic number/border painter
-
- pf=pMem+(103*3);
-
- for(y=0;y<20;y++)
- {
- for(x=0;x<6;x++)
- {
- c=cFont[lSelectedSlot][x+y*6];
- v=(c&0xc0)>>6;
- PaintPicDot(pf,(unsigned char)v);pf+=3; // paint the dots into the rect
- v=(c&0x30)>>4;
- PaintPicDot(pf,(unsigned char)v);pf+=3;
- v=(c&0x0c)>>2;
- PaintPicDot(pf,(unsigned char)v);pf+=3;
- v=c&0x03;
- PaintPicDot(pf,(unsigned char)v);pf+=3;
- }
- pf+=104*3;
- }
-
- pf=pMem;
- for(x=0;x<128;x++)
- {
- *(pf+(95*128*3))=0x00;*pf++=0x00;
- *(pf+(95*128*3))=0x00;*pf++=0x00;
- *(pf+(95*128*3))=0xff;*pf++=0xff;
- }
- pf=pMem;
- for(y=0;y<96;y++)
- {
- *(pf+(127*3))=0x00;*pf++=0x00;
- *(pf+(127*3))=0x00;*pf++=0x00;
- *(pf+(127*3))=0xff;*pf++=0xff;
- pf+=127*3;
- }
-
-}
-
-////////////////////////////////////////////////////////////////////////
-
-void CALLBACK GPUshowScreenPic(unsigned char * pMem)
-{
- DestroyPic();
- if(pMem==0) return;
- CreatePic(pMem);
-}
-
-////////////////////////////////////////////////////////////////////////
-
-void CALLBACK GPUsetfix(uint32_t dwFixBits)
-{
- dwEmuFixes=dwFixBits;
-}
-
-////////////////////////////////////////////////////////////////////////
- 
-void CALLBACK GPUvisualVibration(uint32_t iSmall, uint32_t iBig)
-{
- int iVibVal;
-
- if(PSXDisplay.DisplayModeNew.x) // calc min "shake pixel" from screen width
- iVibVal=max(1,iResX/PSXDisplay.DisplayModeNew.x);
- else iVibVal=1;
- // big rumble: 4...15 sp ; small rumble 1...3 sp
- if(iBig) iRumbleVal=max(4*iVibVal,min(15*iVibVal,((int)iBig *iVibVal)/10));
- else iRumbleVal=max(1*iVibVal,min( 3*iVibVal,((int)iSmall*iVibVal)/10));
-
- srand(timeGetTime()); // init rand (will be used in BufferSwap)
-
- iRumbleTime=15; // let the rumble last 16 buffer swaps
-}
- 
-////////////////////////////////////////////////////////////////////////
-// main emu can set display infos (A/M/G/D) 
-////////////////////////////////////////////////////////////////////////
-
-void CALLBACK GPUdisplayFlags(uint32_t dwFlags)
-{
- dwCoreFlags=dwFlags;
-}
+ }
+}
+
+#endif // !defined(_MACGL)
+
+#ifndef _WINDOWS
+
+#if defined(_MACGL)
+extern char * pCaptionText;
+#endif
+
+////////////////////////////////////////////////////////////////////////
+
+long GPUopen(unsigned long * disp,char * CapText,char * CfgFile)
+{
+ pCaptionText=CapText;
+#if !defined (_MACGL)
+ pConfigFile=CfgFile;
+#endif
+
+ ReadConfig(); // read text file for config
+
+ SetFrameRateConfig(); // setup frame rate stuff
+
+ bIsFirstFrame = TRUE; // we have to init later (well, no really... in Linux we do all in GPUopen)
+
+#if defined (_MACGL)
+ unsigned long display = ulInitDisplay();
+#else
+ sysdep_create_display(); // create display
+#endif
+ 
+ InitializeTextureStore(); // init texture mem
+
+ rRatioRect.left = rRatioRect.top=0;
+ rRatioRect.right = iResX;
+ rRatioRect.bottom = iResY;
+
+ GLinitialize(); // init opengl
+
+ if(disp)
+ {
+#if defined (_MACGL)
+ *disp = display;
+#else
+ *disp=(unsigned long *)display; // return display ID to main emu
+#endif
+ }
+
+ if(display) return 0;
+ return -1;
+}
+
+#endif // ndef _WINDOWS
+
+
+
+////////////////////////////////////////////////////////////////////////
+// close
+////////////////////////////////////////////////////////////////////////
+
+#ifdef _WINDOWS
+
+long CALLBACK GPUclose() // WINDOWS CLOSE
+{
+ ExitKeyHandler();
+
+ GLcleanup(); // close OGL
+
+ if(bChangeRes) // change res back
+ ChangeDisplaySettings(NULL,0);
+
+ if(hPSEMenu) // set menu again
+ SetMenu(hWWindow,hPSEMenu);
+
+ if(pGfxCardScreen) free(pGfxCardScreen); // free helper memory
+ pGfxCardScreen=0;
+
+ if(iNoScreenSaver) EnableScreenSaver(TRUE); // enable screen saver again
+
+ return 0;
+}
+
+#else
+
+long GPUclose() // LINUX CLOSE
+{
+ GLcleanup(); // close OGL
+
+ if(pGfxCardScreen) free(pGfxCardScreen); // free helper memory
+ pGfxCardScreen=0;
+#if defined (_MACGL)
+ CloseDisplay();
+#else
+ osd_close_display(); // destroy display
+#endif
+ return 0;
+}
+
+#endif
+
+////////////////////////////////////////////////////////////////////////
+// I shot the sheriff... last function called from emu 
+////////////////////////////////////////////////////////////////////////
+
+long CALLBACK GPUshutdown()
+{
+ if(psxVSecure) free(psxVSecure); // kill emulated vram memory
+ psxVSecure=0;
+
+ return 0;
+}
+
+////////////////////////////////////////////////////////////////////////
+// paint it black: simple func to clean up optical border garbage
+////////////////////////////////////////////////////////////////////////
+
+void PaintBlackBorders(void)
+{
+ short s;
+
+ glDisable(GL_SCISSOR_TEST);
+ if(bTexEnabled) {glDisable(GL_TEXTURE_2D);bTexEnabled=FALSE;}
+ if(bOldSmoothShaded) {glShadeModel(GL_FLAT);bOldSmoothShaded=FALSE;}
+ if(bBlendEnable) {glDisable(GL_BLEND);bBlendEnable=FALSE;}
+ glDisable(GL_ALPHA_TEST);
+
+ glBegin(GL_QUADS);
+
+ vertex[0].c.lcol=0xff000000;
+ SETCOL(vertex[0]); 
+
+ if(PreviousPSXDisplay.Range.x0)
+ {
+ s=PreviousPSXDisplay.Range.x0+1;
+ glVertex3f(0,0,0.99996f);
+ glVertex3f(0,PSXDisplay.DisplayMode.y,0.99996f);
+ glVertex3f(s,PSXDisplay.DisplayMode.y,0.99996f);
+ glVertex3f(s,0,0.99996f);
+
+ s+=PreviousPSXDisplay.Range.x1-2;
+
+ glVertex3f(s,0,0.99996f);
+ glVertex3f(s,PSXDisplay.DisplayMode.y,0.99996f);
+ glVertex3f(PSXDisplay.DisplayMode.x,PSXDisplay.DisplayMode.y,0.99996f);
+ glVertex3f(PSXDisplay.DisplayMode.x,0,0.99996f);
+ }
+
+ if(PreviousPSXDisplay.Range.y0)
+ {
+ s=PreviousPSXDisplay.Range.y0+1;
+ glVertex3f(0,0,0.99996f);
+ glVertex3f(0,s,0.99996f);
+ glVertex3f(PSXDisplay.DisplayMode.x,s,0.99996f);
+ glVertex3f(PSXDisplay.DisplayMode.x,0,0.99996f);
+ }
+
+ glEnd();
+
+ glEnable(GL_ALPHA_TEST);
+ glEnable(GL_SCISSOR_TEST);
+}
+
+////////////////////////////////////////////////////////////////////////
+// helper to draw scanlines
+////////////////////////////////////////////////////////////////////////
+
+static __inline void XPRIMdrawTexturedQuad(OGLVertex* vertex1, OGLVertex* vertex2, 
+ OGLVertex* vertex3, OGLVertex* vertex4) 
+{
+
+ glBegin(GL_QUAD_STRIP);
+ glTexCoord2fv(&vertex1->sow);
+ glVertex3fv(&vertex1->x);
+ 
+ glTexCoord2fv(&vertex2->sow);
+ glVertex3fv(&vertex2->x);
+ 
+ glTexCoord2fv(&vertex4->sow);
+ glVertex3fv(&vertex4->x);
+ 
+ glTexCoord2fv(&vertex3->sow);
+ glVertex3fv(&vertex3->x);
+ glEnd();
+}
+
+////////////////////////////////////////////////////////////////////////
+// scanlines
+////////////////////////////////////////////////////////////////////////
+
+void SetScanLines(void)
+{
+ glLoadIdentity();
+ glOrtho(0,iResX,iResY, 0, -1, 1);
+
+ if(bKeepRatio)
+ glViewport(0,0,iResX,iResY);
+
+ glDisable(GL_SCISSOR_TEST); 
+ glDisable(GL_ALPHA_TEST);
+ if(bOldSmoothShaded) {glShadeModel(GL_FLAT);bOldSmoothShaded=FALSE;}
+
+ if(iScanBlend<0) // special texture mask scanline mode
+ {
+ if(!bTexEnabled) {glEnable(GL_TEXTURE_2D);bTexEnabled=TRUE;}
+ gTexName=gTexScanName;
+ glBindTexture(GL_TEXTURE_2D, gTexName);
+ if(bGLBlend) glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 
+ if(!bBlendEnable) {glEnable(GL_BLEND);bBlendEnable=TRUE;}
+ SetScanTexTrans();
+
+ vertex[0].x=0;
+ vertex[0].y=iResY;
+ vertex[0].z=0.99996f;
+
+ vertex[1].x=iResX;
+ vertex[1].y=iResY;
+ vertex[1].z=0.99996f;
+
+ vertex[2].x=iResX;
+ vertex[2].y=0;
+ vertex[2].z=0.99996f;
+
+ vertex[3].x=0;
+ vertex[3].y=0;
+ vertex[3].z=0.99996f;
+
+ vertex[0].sow=0;
+ vertex[0].tow=0;
+ vertex[1].sow=(float)iResX/4.0f;
+ vertex[1].tow=0;
+ vertex[2].sow=vertex[1].sow;
+ vertex[2].tow=(float)iResY/4.0f;
+ vertex[3].sow=0;
+ vertex[3].tow=vertex[2].tow;
+
+ vertex[0].c.lcol=0xffffffff;
+ SETCOL(vertex[0]); 
+
+ XPRIMdrawTexturedQuad(&vertex[0], &vertex[1], &vertex[2], &vertex[3]);
+
+ if(bGLBlend) glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, COMBINE_EXT); 
+ }
+ else // typical line mode
+ {
+ if(bTexEnabled) {glDisable(GL_TEXTURE_2D);bTexEnabled=FALSE;}
+
+ if(iScanBlend==0)
+ {
+ if(bBlendEnable) {glDisable(GL_BLEND);bBlendEnable=FALSE;}
+ vertex[0].c.lcol=0xff000000;
+ }
+ else
+ {
+ if(!bBlendEnable) {glEnable(GL_BLEND);bBlendEnable=TRUE;}
+ SetScanTrans();
+ vertex[0].c.lcol=iScanBlend<<24;
+ }
+
+ SETCOL(vertex[0]); 
+
+ glCallList(uiScanLine);
+ }
+
+ glLoadIdentity();
+ glOrtho(0,PSXDisplay.DisplayMode.x,
+ PSXDisplay.DisplayMode.y, 0, -1, 1);
+
+ if(bKeepRatio)
+ glViewport(rRatioRect.left,
+ iResY-(rRatioRect.top+rRatioRect.bottom),
+ rRatioRect.right, 
+ rRatioRect.bottom); // init viewport
+
+ glEnable(GL_ALPHA_TEST);
+ glEnable(GL_SCISSOR_TEST); 
+}
+
+////////////////////////////////////////////////////////////////////////
+// blur, babe, blur (heavy performance hit for a so-so fullscreen effect)
+////////////////////////////////////////////////////////////////////////
+
+void BlurBackBuffer(void)
+{
+ if(!gTexBlurName) return;
+
+ if(bKeepRatio) glViewport(0,0,iResX,iResY);
+
+ glDisable(GL_SCISSOR_TEST);
+ glDisable(GL_ALPHA_TEST);
+ if(bOldSmoothShaded) {glShadeModel(GL_FLAT);bOldSmoothShaded=FALSE;}
+ if(bBlendEnable) {glDisable(GL_BLEND);bBlendEnable=FALSE;}
+ if(!bTexEnabled) {glEnable(GL_TEXTURE_2D);bTexEnabled=TRUE;}
+ if(iZBufferDepth) glDisable(GL_DEPTH_TEST); 
+ if(bDrawDither) glDisable(GL_DITHER); 
+
+ gTexName=gTexBlurName;
+ glBindTexture(GL_TEXTURE_2D, gTexName);
+
+ glCopyTexSubImage2D( GL_TEXTURE_2D, 0, // get back buffer in texture
+ 0,
+ 0,
+ 0,
+ 0,
+ iResX,iResY);
+
+ vertex[0].x=0;
+ vertex[0].y=PSXDisplay.DisplayMode.y;
+ vertex[1].x=PSXDisplay.DisplayMode.x;
+ vertex[1].y=PSXDisplay.DisplayMode.y;
+ vertex[2].x=PSXDisplay.DisplayMode.x;
+ vertex[2].y=0;
+ vertex[3].x=0;
+ vertex[3].y=0;
+ vertex[0].sow=0;
+ vertex[0].tow=0;
+
+#ifdef OWNSCALE
+ vertex[1].sow=((GLfloat)iFTexA)/256.0f;
+ vertex[2].tow=((GLfloat)iFTexB)/256.0f;
+#else
+ vertex[1].sow=iFTexA;
+ vertex[2].tow=iFTexB;
+#endif
+ vertex[1].tow=0;
+ vertex[2].sow=vertex[1].sow;
+ vertex[3].sow=0;
+ vertex[3].tow=vertex[2].tow;
+ 
+ if(bGLBlend) glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 
+ vertex[0].c.lcol=0x7fffffff;
+ SETCOL(vertex[0]); 
+
+ DrawMultiBlur(); // draw the backbuffer texture to create blur effect
+
+ glEnable(GL_ALPHA_TEST);
+ glEnable(GL_SCISSOR_TEST);
+ if(iZBufferDepth) glEnable(GL_DEPTH_TEST); 
+ if(bDrawDither) glEnable(GL_DITHER); 
+ if(bGLBlend) glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, COMBINE_EXT); 
+
+ if(bKeepRatio)
+ glViewport(rRatioRect.left, // re-init viewport
+ iResY-(rRatioRect.top+rRatioRect.bottom),
+ rRatioRect.right, 
+ rRatioRect.bottom); 
+}
+
+////////////////////////////////////////////////////////////////////////
+// "unblur" repairs the backbuffer after a blur
+
+void UnBlurBackBuffer(void)
+{
+ if(!gTexBlurName) return;
+
+ if(bKeepRatio) glViewport(0,0,iResX,iResY);
+
+ glDisable(GL_SCISSOR_TEST);
+ glDisable(GL_ALPHA_TEST);
+ if(bBlendEnable) {glDisable(GL_BLEND);bBlendEnable=FALSE;}
+ if(!bTexEnabled) {glEnable(GL_TEXTURE_2D);bTexEnabled=TRUE;}
+ if(iZBufferDepth) glDisable(GL_DEPTH_TEST); 
+ if(bDrawDither) glDisable(GL_DITHER); 
+
+ gTexName=gTexBlurName;
+ glBindTexture(GL_TEXTURE_2D, gTexName);
+
+ vertex[0].x=0;
+ vertex[0].y=PSXDisplay.DisplayMode.y;
+ vertex[1].x=PSXDisplay.DisplayMode.x;
+ vertex[1].y=PSXDisplay.DisplayMode.y;
+ vertex[2].x=PSXDisplay.DisplayMode.x;
+ vertex[2].y=0;
+ vertex[3].x=0;
+ vertex[3].y=0;
+ vertex[0].sow=0;
+ vertex[0].tow=0;
+#ifdef OWNSCALE
+ vertex[1].sow=((GLfloat)iFTexA)/256.0f;
+ vertex[2].tow=((GLfloat)iFTexB)/256.0f;
+#else
+ vertex[1].sow=iFTexA;
+ vertex[2].tow=iFTexB;
+#endif
+ vertex[1].tow=0;
+ vertex[2].sow=vertex[1].sow;
+ vertex[3].sow=0;
+ vertex[3].tow=vertex[2].tow;
+ if(bGLBlend) glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 
+ vertex[0].c.lcol=0xffffffff;
+ SETCOL(vertex[0]); 
+
+ // simply draw the backbuffer texture (without blur)
+ XPRIMdrawTexturedQuad(&vertex[0], &vertex[1], &vertex[2], &vertex[3]);
+
+ glEnable(GL_ALPHA_TEST);
+ glEnable(GL_SCISSOR_TEST);
+ if(iZBufferDepth) glEnable(GL_DEPTH_TEST); 
+ if(bDrawDither) glEnable(GL_DITHER); // dither mode
+ if(bGLBlend) glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, COMBINE_EXT); 
+
+ if(bKeepRatio)
+ glViewport(rRatioRect.left,
+ iResY-(rRatioRect.top+rRatioRect.bottom),
+ rRatioRect.right, 
+ rRatioRect.bottom); // init viewport
+}
+
+////////////////////////////////////////////////////////////////////////
+// Update display (swap buffers)... called in interlaced mode on 
+// every emulated vsync, otherwise whenever the displayed screen region
+// has been changed
+////////////////////////////////////////////////////////////////////////
+
+int iLastRGB24=0; // special vars for checking when to skip two display updates
+int iSkipTwo=0;
+
+void updateDisplay(void) // UPDATE DISPLAY
+{
+ BOOL bBlur=FALSE;
+
+#ifdef _WINDOWS
+ HDC hdc=GetDC(hWWindow); // windows:
+ wglMakeCurrent(hdc,GLCONTEXT); // -> make context current again
+#endif
+#if defined (_MACGL)
+ BringContextForward();
+#endif
+ bFakeFrontBuffer=FALSE;
+ bRenderFrontBuffer=FALSE;
+
+ if(iRenderFVR) // frame buffer read fix mode still active?
+ {
+ iRenderFVR--; // -> if some frames in a row without read access: turn off mode
+ if(!iRenderFVR) bFullVRam=FALSE;
+ }
+
+ if(iLastRGB24 && iLastRGB24!=PSXDisplay.RGB24+1) // (mdec) garbage check
+ {
+ iSkipTwo=2; // -> skip two frames to avoid garbage if color mode changes
+ }
+ iLastRGB24=0;
+
+ if(PSXDisplay.RGB24)// && !bNeedUploadAfter) // (mdec) upload wanted?
+ {
+ PrepareFullScreenUpload(-1);
+ UploadScreen(PSXDisplay.Interlaced); // -> upload whole screen from psx vram
+ bNeedUploadTest=FALSE;
+ bNeedInterlaceUpdate=FALSE;
+ bNeedUploadAfter=FALSE;
+ bNeedRGB24Update=FALSE;
+ }
+ else
+ if(bNeedInterlaceUpdate) // smaller upload?
+ {
+ bNeedInterlaceUpdate=FALSE;
+ xrUploadArea=xrUploadAreaIL; // -> upload this rect
+ UploadScreen(TRUE);
+ }
+
+ if(dwActFixes&512) bCheckFF9G4(NULL); // special game fix for FF9 
+
+ if(PreviousPSXDisplay.Range.x0|| // paint black borders around display area, if needed
+ PreviousPSXDisplay.Range.y0)
+ PaintBlackBorders();
+
+ if(PSXDisplay.Disabled) // display disabled?
+ {
+ // moved here
+ glDisable(GL_SCISSOR_TEST); 
+ glClearColor(0,0,0,128); // -> clear whole backbuffer
+ glClear(uiBufferBits);
+ glEnable(GL_SCISSOR_TEST); 
+ gl_z=0.0f;
+ bDisplayNotSet = TRUE;
+ }
+
+ if(iSkipTwo) // we are in skipping mood?
+ {
+ iSkipTwo--;
+ iDrawnSomething=0; // -> simply lie about something drawn
+ }
+
+ if(iBlurBuffer && !bSkipNextFrame) // "blur display" activated?
+ {BlurBackBuffer();bBlur=TRUE;} // -> blur it
+
+ if(iUseScanLines) SetScanLines(); // "scan lines" activated? do it
+
+ if(usCursorActive) ShowGunCursor(); // "gun cursor" wanted? show 'em
+
+ if(dwActFixes&128) // special FPS limitation mode?
+ {
+ if(bUseFrameLimit) PCFrameCap(); // -> ok, do it
+ if(bUseFrameSkip || ulKeybits&KEY_SHOWFPS) 
+ PCcalcfps(); 
+ }
+
+ if(gTexPicName) DisplayPic(); // some gpu info picture active? display it
+
+ if(bSnapShot) DoSnapShot(); // snapshot key pressed? cheeeese :)
+
+ if(ulKeybits&KEY_SHOWFPS) // wanna see FPS?
+ {
+ sprintf(szDispBuf,"%06.1f",fps_cur);
+ DisplayText(); // -> show it
+ }
+
+ //----------------------------------------------------//
+ // main buffer swapping (well, or skip it)
+
+ if(bUseFrameSkip) // frame skipping active ?
+ {
+ if(!bSkipNextFrame) 
+ {
+ if(iDrawnSomething)
+#ifdef _WINDOWS
+ SwapBuffers(wglGetCurrentDC()); // -> to skip or not to skip
+#elif defined(_MACGL)
+ DoBufferSwap();
+#else
+ glXSwapBuffers(display,window);
+#endif
+ }
+ if(dwActFixes&0x180) // -> special old frame skipping: skip max one in a row
+ {
+ if((fps_skip < fFrameRateHz) && !(bSkipNextFrame)) 
+ {bSkipNextFrame = TRUE; fps_skip=fFrameRateHz;}
+ else bSkipNextFrame = FALSE;
+ }
+ else FrameSkip();
+ }
+ else // no skip ?
+ {
+ if(iDrawnSomething)
+#ifdef _WINDOWS
+ SwapBuffers(wglGetCurrentDC()); // -> swap
+#elif defined(_MACGL)
+ DoBufferSwap();
+#else
+ glXSwapBuffers(display,window);
+#endif
+ }
+
+ iDrawnSomething=0;
+
+ //----------------------------------------------------//
+
+ if(lClearOnSwap) // clear buffer after swap?
+ {
+ GLclampf g,b,r;
+
+ if(bDisplayNotSet) // -> set new vals
+ SetOGLDisplaySettings(1);
+
+ g=((GLclampf)GREEN(lClearOnSwapColor))/255.0f; // -> get col
+ b=((GLclampf)BLUE(lClearOnSwapColor))/255.0f;
+ r=((GLclampf)RED(lClearOnSwapColor))/255.0f;
+ 
+ glDisable(GL_SCISSOR_TEST); 
+ glClearColor(r,g,b,128); // -> clear 
+ glClear(uiBufferBits);
+ glEnable(GL_SCISSOR_TEST); 
+ lClearOnSwap=0; // -> done
+ }
+ else 
+ {
+ if(bBlur) UnBlurBackBuffer(); // unblur buff, if blurred before
+
+ if(iZBufferDepth) // clear zbuffer as well (if activated)
+ {
+ glDisable(GL_SCISSOR_TEST); 
+ glClear(GL_DEPTH_BUFFER_BIT);
+ glEnable(GL_SCISSOR_TEST); 
+ }
+ }
+ gl_z=0.0f;
+
+ //----------------------------------------------------//
+ // additional uploads immediatly after swapping
+
+ if(bNeedUploadAfter) // upload wanted?
+ {
+ bNeedUploadAfter=FALSE; 
+ bNeedUploadTest=FALSE;
+ UploadScreen(-1); // -> upload
+ }
+ 
+ if(bNeedUploadTest)
+ {
+ bNeedUploadTest=FALSE;
+ if(PSXDisplay.InterlacedTest &&
+ //iOffscreenDrawing>2 &&
+ PreviousPSXDisplay.DisplayPosition.x==PSXDisplay.DisplayPosition.x &&
+ PreviousPSXDisplay.DisplayEnd.x==PSXDisplay.DisplayEnd.x &&
+ PreviousPSXDisplay.DisplayPosition.y==PSXDisplay.DisplayPosition.y &&
+ PreviousPSXDisplay.DisplayEnd.y==PSXDisplay.DisplayEnd.y)
+ {
+ PrepareFullScreenUpload(TRUE);
+ UploadScreen(TRUE);
+ }
+ }
+
+ //----------------------------------------------------//
+ // rumbling (main emu pad effect)
+
+ if(iRumbleTime) // shake screen by modifying view port
+ {
+ int i1=0,i2=0,i3=0,i4=0;
+
+ iRumbleTime--;
+ if(iRumbleTime) 
+ {
+ i1=((rand()*iRumbleVal)/RAND_MAX)-(iRumbleVal/2); 
+ i2=((rand()*iRumbleVal)/RAND_MAX)-(iRumbleVal/2); 
+ i3=((rand()*iRumbleVal)/RAND_MAX)-(iRumbleVal/2); 
+ i4=((rand()*iRumbleVal)/RAND_MAX)-(iRumbleVal/2); 
+ }
+
+ glViewport(rRatioRect.left+i1, 
+ iResY-(rRatioRect.top+rRatioRect.bottom)+i2,
+ rRatioRect.right+i3, 
+ rRatioRect.bottom+i4); 
+ }
+
+#ifdef _WINDOWS
+ ReleaseDC(hWWindow,hdc); // ! important !
+#endif
+
+ if(ulKeybits&KEY_RESETTEXSTORE) ResetStuff(); // reset on gpu mode changes? do it before next frame is filled
+}
+
+////////////////////////////////////////////////////////////////////////
+// update front display: smaller update func, if something has changed 
+// in the frontbuffer... dirty, but hey... real men know no pain
+////////////////////////////////////////////////////////////////////////
+
+void updateFrontDisplay(void)
+{
+ if(PreviousPSXDisplay.Range.x0||
+ PreviousPSXDisplay.Range.y0)
+ PaintBlackBorders();
+
+ if(iBlurBuffer) BlurBackBuffer();
+
+ if(iUseScanLines) SetScanLines();
+
+ if(usCursorActive) ShowGunCursor();
+
+ bFakeFrontBuffer=FALSE;
+ bRenderFrontBuffer=FALSE;
+
+ if(gTexPicName) DisplayPic();
+ if(ulKeybits&KEY_SHOWFPS) DisplayText();
+
+#ifdef _WINDOWS
+ { // windows: 
+ HDC hdc=GetDC(hWWindow);
+ wglMakeCurrent(hdc,GLCONTEXT); // -> make current again
+ if(iDrawnSomething)
+ SwapBuffers(wglGetCurrentDC()); // -> swap
+ ReleaseDC(hWWindow,hdc); // -> ! important !
+ }
+#elif defined (_MACGL)
+ if (iDrawnSomething){
+ DoBufferSwap();
+ }
+#else
+ if(iDrawnSomething) // linux:
+ glXSwapBuffers(display,window);
+#endif
+
+ if(iBlurBuffer) UnBlurBackBuffer();
+}
+ 
+////////////////////////////////////////////////////////////////////////
+// check if update needed
+////////////////////////////////////////////////////////////////////////
+
+void ChangeDispOffsetsX(void) // CENTER X
+{
+ int lx,l;short sO;
+
+ if(!PSXDisplay.Range.x1) return; // some range given?
+
+ l=PSXDisplay.DisplayMode.x;
+
+ l*=(int)PSXDisplay.Range.x1; // some funky calculation
+ l/=2560;lx=l;l&=0xfffffff8;
+ 
+ if(l==PreviousPSXDisplay.Range.x1) return; // some change?
+
+ sO=PreviousPSXDisplay.Range.x0; // store old
+
+ if(lx>=PSXDisplay.DisplayMode.x) // range bigger?
+ {
+ PreviousPSXDisplay.Range.x1= // -> take display width
+ PSXDisplay.DisplayMode.x;
+ PreviousPSXDisplay.Range.x0=0; // -> start pos is 0
+ }
+ else // range smaller? center it
+ {
+ PreviousPSXDisplay.Range.x1=l; // -> store width (8 pixel aligned)
+ PreviousPSXDisplay.Range.x0= // -> calc start pos
+ (PSXDisplay.Range.x0-500)/8;
+ if(PreviousPSXDisplay.Range.x0<0) // -> we don't support neg. values yet
+ PreviousPSXDisplay.Range.x0=0;
+
+ if((PreviousPSXDisplay.Range.x0+lx)> // -> uhuu... that's too much
+ PSXDisplay.DisplayMode.x)
+ {
+ PreviousPSXDisplay.Range.x0= // -> adjust start
+ PSXDisplay.DisplayMode.x-lx;
+ PreviousPSXDisplay.Range.x1+=lx-l; // -> adjust width
+ } 
+ }
+
+ if(sO!=PreviousPSXDisplay.Range.x0) // something changed?
+ {
+ bDisplayNotSet=TRUE; // -> recalc display stuff
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void ChangeDispOffsetsY(void) // CENTER Y
+{
+ int iT;short sO; // store previous y size
+
+ if(PSXDisplay.PAL) iT=48; else iT=28; // different offsets on PAL/NTSC
+
+ if(PSXDisplay.Range.y0>=iT) // crossed the security line? :)
+ {
+ PreviousPSXDisplay.Range.y1= // -> store width
+ PSXDisplay.DisplayModeNew.y;
+ 
+ sO=(PSXDisplay.Range.y0-iT-4)*PSXDisplay.Double; // -> calc offset
+ if(sO<0) sO=0;
+
+ PSXDisplay.DisplayModeNew.y+=sO; // -> add offset to y size, too
+ }
+ else sO=0; // else no offset
+
+ if(sO!=PreviousPSXDisplay.Range.y0) // something changed?
+ {
+ PreviousPSXDisplay.Range.y0=sO;
+ bDisplayNotSet=TRUE; // -> recalc display stuff
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+// Aspect ratio of ogl screen: simply adjusting ogl view port
+////////////////////////////////////////////////////////////////////////
+
+void SetAspectRatio(void)
+{
+ float xs,ys,s,resx,resy;RECT r;
+
+ if(!PSXDisplay.DisplayModeNew.x) return;
+ if(!PSXDisplay.DisplayModeNew.y) return;
+
+ resx = bForceRatio43 ? 640.0f : (float)PSXDisplay.DisplayModeNew.x;
+ resy = bForceRatio43 ? 480.0f : (float)PSXDisplay.DisplayModeNew.y;
+
+ xs=(float)iResX/resx;
+ ys=(float)iResY/resy;
+
+ s=min(xs,ys);
+ r.right =(int)(resx*s);
+ r.bottom=(int)(resy*s);
+ if(r.right > iResX) r.right = iResX;
+ if(r.bottom > iResY) r.bottom = iResY;
+ if(r.right < 1) r.right = 1;
+ if(r.bottom < 1) r.bottom = 1;
+
+ r.left = (iResX-r.right)/2;
+ r.top = (iResY-r.bottom)/2;
+
+ if(r.bottom<rRatioRect.bottom ||
+ r.right <rRatioRect.right)
+ {
+ RECT rC;
+ glClearColor(0,0,0,128); 
+
+ if(r.right <rRatioRect.right)
+ {
+ rC.left=0;
+ rC.top=0;
+ rC.right=r.left;
+ rC.bottom=iResY;
+ glScissor(rC.left,rC.top,rC.right,rC.bottom);
+ glClear(uiBufferBits);
+ rC.left=iResX-rC.right;
+ glScissor(rC.left,rC.top,rC.right,rC.bottom);
+ glClear(uiBufferBits);
+ }
+
+ if(r.bottom <rRatioRect.bottom)
+ {
+ rC.left=0;
+ rC.top=0;
+ rC.right=iResX;
+ rC.bottom=r.top;
+ glScissor(rC.left,rC.top,rC.right,rC.bottom);
+ glClear(uiBufferBits);
+ rC.top=iResY-rC.bottom;
+ glScissor(rC.left,rC.top,rC.right,rC.bottom);
+ glClear(uiBufferBits);
+ }
+ 
+ bSetClip=TRUE;
+ bDisplayNotSet=TRUE;
+ }
+
+ rRatioRect=r;
+
+
+ glViewport(rRatioRect.left,
+ iResY-(rRatioRect.top+rRatioRect.bottom),
+ rRatioRect.right,
+ rRatioRect.bottom); // init viewport
+}
+
+////////////////////////////////////////////////////////////////////////
+// big ass check, if an ogl swap buffer is needed
+////////////////////////////////////////////////////////////////////////
+
+void updateDisplayIfChanged(void)
+{
+ BOOL bUp;
+
+ if ((PSXDisplay.DisplayMode.y == PSXDisplay.DisplayModeNew.y) && 
+ (PSXDisplay.DisplayMode.x == PSXDisplay.DisplayModeNew.x))
+ {
+ if((PSXDisplay.RGB24 == PSXDisplay.RGB24New) && 
+ (PSXDisplay.Interlaced == PSXDisplay.InterlacedNew)) 
+ return; // nothing has changed? fine, no swap buffer needed
+ }
+ else // some res change?
+ {
+ glLoadIdentity();
+ glOrtho(0,PSXDisplay.DisplayModeNew.x, // -> new psx resolution
+ PSXDisplay.DisplayModeNew.y, 0, -1, 1);
+ if(bKeepRatio) SetAspectRatio();
+ }
+
+ bDisplayNotSet = TRUE; // re-calc offsets/display area
+ 
+ bUp=FALSE;
+ if(PSXDisplay.RGB24!=PSXDisplay.RGB24New) // clean up textures, if rgb mode change (usually mdec on/off)
+ {
+ PreviousPSXDisplay.RGB24=0; // no full 24 frame uploaded yet
+ ResetTextureArea(FALSE);
+ bUp=TRUE;
+ }
+
+ PSXDisplay.RGB24 = PSXDisplay.RGB24New; // get new infos
+ PSXDisplay.DisplayMode.y = PSXDisplay.DisplayModeNew.y;
+ PSXDisplay.DisplayMode.x = PSXDisplay.DisplayModeNew.x;
+ PSXDisplay.Interlaced = PSXDisplay.InterlacedNew;
+ 
+ PSXDisplay.DisplayEnd.x= // calc new ends
+ PSXDisplay.DisplayPosition.x+ PSXDisplay.DisplayMode.x;
+ PSXDisplay.DisplayEnd.y=
+ PSXDisplay.DisplayPosition.y+ PSXDisplay.DisplayMode.y+PreviousPSXDisplay.DisplayModeNew.y;
+ PreviousPSXDisplay.DisplayEnd.x=
+ PreviousPSXDisplay.DisplayPosition.x+ PSXDisplay.DisplayMode.x;
+ PreviousPSXDisplay.DisplayEnd.y=
+ PreviousPSXDisplay.DisplayPosition.y+ PSXDisplay.DisplayMode.y+PreviousPSXDisplay.DisplayModeNew.y;
+
+ ChangeDispOffsetsX();
+
+ if(iFrameLimit==2) SetAutoFrameCap(); // set new fps limit vals (depends on interlace)
+
+ if(bUp) updateDisplay(); // yeah, real update (swap buffer)
+}
+
+////////////////////////////////////////////////////////////////////////
+// window mode <-> fullscreen mode (windows)
+////////////////////////////////////////////////////////////////////////
+
+#ifdef _WINDOWS
+void ChangeWindowMode(void)
+ {
+ GPUclose();
+ bWindowMode=!bWindowMode;
+ GPUopen(hWWindow);
+ bChangeWinMode=FALSE;
+ }
+#endif
+
+////////////////////////////////////////////////////////////////////////
+// swap update check (called by psx vsync function)
+////////////////////////////////////////////////////////////////////////
+
+BOOL bSwapCheck(void)
+{
+ static int iPosCheck=0;
+ static PSXPoint_t pO;
+ static PSXPoint_t pD;
+ static int iDoAgain=0;
+
+ if(PSXDisplay.DisplayPosition.x==pO.x &&
+ PSXDisplay.DisplayPosition.y==pO.y &&
+ PSXDisplay.DisplayEnd.x==pD.x &&
+ PSXDisplay.DisplayEnd.y==pD.y)
+ iPosCheck++;
+ else iPosCheck=0;
+
+ pO=PSXDisplay.DisplayPosition;
+ pD=PSXDisplay.DisplayEnd;
+
+ if(iPosCheck<=4) return FALSE;
+
+ iPosCheck=4;
+
+ if(PSXDisplay.Interlaced) return FALSE;
+
+ if (bNeedInterlaceUpdate||
+ bNeedRGB24Update ||
+ bNeedUploadAfter|| 
+ bNeedUploadTest || 
+ iDoAgain
+ )
+ {
+ iDoAgain=0;
+ if(bNeedUploadAfter) 
+ iDoAgain=1;
+ if(bNeedUploadTest && PSXDisplay.InterlacedTest)
+ iDoAgain=1;
+
+ bDisplayNotSet = TRUE;
+ updateDisplay();
+
+ PreviousPSXDisplay.DisplayPosition.x=PSXDisplay.DisplayPosition.x;
+ PreviousPSXDisplay.DisplayPosition.y=PSXDisplay.DisplayPosition.y;
+ PreviousPSXDisplay.DisplayEnd.x=PSXDisplay.DisplayEnd.x;
+ PreviousPSXDisplay.DisplayEnd.y=PSXDisplay.DisplayEnd.y;
+ pO=PSXDisplay.DisplayPosition;
+ pD=PSXDisplay.DisplayEnd;
+
+ return TRUE;
+ }
+
+ return FALSE;
+} 
+
+////////////////////////////////////////////////////////////////////////
+// gun cursor func: player=0-7, x=0-511, y=0-255
+////////////////////////////////////////////////////////////////////////
+
+void CALLBACK GPUcursor(int iPlayer,int x,int y)
+{
+ if(iPlayer<0) return;
+ if(iPlayer>7) return;
+
+ usCursorActive|=(1<<iPlayer);
+
+ if(x<0) x=0;
+ if(x>iGPUHeightMask) x=iGPUHeightMask;
+ if(y<0) y=0;
+ if(y>255) y=255;
+
+ ptCursorPoint[iPlayer].x=x;
+ ptCursorPoint[iPlayer].y=y;
+}
+
+////////////////////////////////////////////////////////////////////////
+// update lace is called every VSync. Basically we limit frame rate 
+// here, and in interlaced mode we swap ogl display buffers.
+////////////////////////////////////////////////////////////////////////
+
+static unsigned short usFirstPos=2;
+
+void CALLBACK GPUupdateLace(void)
+{
+ //if(!(dwActFixes&0x1000)) 
+ // STATUSREG^=0x80000000; // interlaced bit toggle, if the CC game fix is not active (see gpuReadStatus)
+
+ if(!(dwActFixes&128)) // normal frame limit func
+ CheckFrameRate();
+
+ if(iOffscreenDrawing==4) // special check if high offscreen drawing is on
+ {
+ if(bSwapCheck()) return;
+ }
+
+ if(PSXDisplay.Interlaced) // interlaced mode?
+ {
+ STATUSREG^=0x80000000;
+ if(PSXDisplay.DisplayMode.x>0 && PSXDisplay.DisplayMode.y>0)
+ {
+ updateDisplay(); // -> swap buffers (new frame)
+ }
+ }
+ else if(bRenderFrontBuffer) // no interlace mode? and some stuff in front has changed?
+ {
+ updateFrontDisplay(); // -> update front buffer
+ }
+ else if(usFirstPos==1) // initial updates (after startup)
+ {
+ updateDisplay();
+ }
+
+#if defined(_WINDOWS) || defined(_MACGL)
+ if(bChangeWinMode) ChangeWindowMode();
+#endif
+}
+
+////////////////////////////////////////////////////////////////////////
+// process read request from GPU status register
+////////////////////////////////////////////////////////////////////////
+
+uint32_t CALLBACK GPUreadStatus(void)
+{
+ if(dwActFixes&0x1000) // CC game fix
+ {
+ static int iNumRead=0;
+ if((iNumRead++)==2)
+ {
+ iNumRead=0;
+ STATUSREG^=0x80000000; // interlaced bit toggle... we do it on every second read status... needed by some games (like ChronoCross)
+ }
+ }
+
+ if(iFakePrimBusy) // 27.10.2007 - emulating some 'busy' while drawing... pfff... not perfect, but since our emulated dma is not done in an extra thread...
+ {
+ iFakePrimBusy--;
+
+ if(iFakePrimBusy&1) // we do a busy-idle-busy-idle sequence after/while drawing prims
+ {
+ GPUIsBusy;
+ GPUIsNotReadyForCommands;
+ }
+ else
+ {
+ GPUIsIdle;
+ GPUIsReadyForCommands;
+ }
+ }
+
+ return STATUSREG | (vBlank ? 0x80000000 : 0 );;
+}
+
+////////////////////////////////////////////////////////////////////////
+// processes data send to GPU status register
+// these are always single packet commands.
+////////////////////////////////////////////////////////////////////////
+
+void CALLBACK GPUwriteStatus(uint32_t gdata)
+{
+ uint32_t lCommand=(gdata>>24)&0xff;
+
+#ifdef _WINDOWS
+ if(bIsFirstFrame) GLinitialize(); // real ogl startup (needed by some emus)
+#endif
+
+ ulStatusControl[lCommand]=gdata;
+
+ switch(lCommand)
+ {
+ //--------------------------------------------------//
+ // reset gpu
+ case 0x00:
+ memset(ulGPUInfoVals, 0x00, 16 * sizeof(uint32_t));
+ lGPUstatusRet = 0x14802000;
+ PSXDisplay.Disabled=1;
+ iDataWriteMode=iDataReadMode=DR_NORMAL;
+ PSXDisplay.DrawOffset.x=PSXDisplay.DrawOffset.y=0;
+ drawX=drawY=0;drawW=drawH=0;
+ sSetMask=0;lSetMask=0;bCheckMask=FALSE;iSetMask=0;
+ usMirror=0;
+ GlobalTextAddrX=0;GlobalTextAddrY=0;
+ GlobalTextTP=0;GlobalTextABR=0;
+ PSXDisplay.RGB24=FALSE;
+ PSXDisplay.Interlaced=FALSE;
+ bUsingTWin = FALSE;
+ return;
+
+ // dis/enable display
+ case 0x03: 
+ PreviousPSXDisplay.Disabled = PSXDisplay.Disabled;
+ PSXDisplay.Disabled = (gdata & 1);
+
+ if(PSXDisplay.Disabled) 
+ STATUSREG|=GPUSTATUS_DISPLAYDISABLED;
+ else STATUSREG&=~GPUSTATUS_DISPLAYDISABLED;
+
+ if (iOffscreenDrawing==4 &&
+ PreviousPSXDisplay.Disabled && 
+ !(PSXDisplay.Disabled))
+ {
+
+ if(!PSXDisplay.RGB24)
+ {
+ PrepareFullScreenUpload(TRUE);
+ UploadScreen(TRUE); 
+ updateDisplay();
+ }
+ }
+
+ return;
+
+ // setting transfer mode
+ case 0x04:
+ gdata &= 0x03; // only want the lower two bits
+
+ iDataWriteMode=iDataReadMode=DR_NORMAL;
+ if(gdata==0x02) iDataWriteMode=DR_VRAMTRANSFER;
+ if(gdata==0x03) iDataReadMode =DR_VRAMTRANSFER;
+
+ STATUSREG&=~GPUSTATUS_DMABITS; // clear the current settings of the DMA bits
+ STATUSREG|=(gdata << 29); // set the DMA bits according to the received data
+
+ return;
+
+ // setting display position
+ case 0x05: 
+ {
+ short sx=(short)(gdata & 0x3ff);
+ short sy;
+
+ if(iGPUHeight==1024)
+ {
+ if(dwGPUVersion==2) 
+ sy = (short)((gdata>>12)&0x3ff);
+ else sy = (short)((gdata>>10)&0x3ff);
+ }
+ else sy = (short)((gdata>>10)&0x3ff); // really: 0x1ff, but we adjust it later
+
+ if (sy & 0x200) 
+ {
+ sy|=0xfc00;
+ PreviousPSXDisplay.DisplayModeNew.y=sy/PSXDisplay.Double;
+ sy=0;
+ }
+ else PreviousPSXDisplay.DisplayModeNew.y=0;
+
+ if(sx>1000) sx=0;
+
+ if(usFirstPos)
+ {
+ usFirstPos--;
+ if(usFirstPos)
+ {
+ PreviousPSXDisplay.DisplayPosition.x = sx;
+ PreviousPSXDisplay.DisplayPosition.y = sy;
+ PSXDisplay.DisplayPosition.x = sx;
+ PSXDisplay.DisplayPosition.y = sy;
+ }
+ }
+
+ if(dwActFixes&8) 
+ {
+ if((!PSXDisplay.Interlaced) &&
+ PreviousPSXDisplay.DisplayPosition.x == sx &&
+ PreviousPSXDisplay.DisplayPosition.y == sy)
+ return;
+
+ PSXDisplay.DisplayPosition.x = PreviousPSXDisplay.DisplayPosition.x;
+ PSXDisplay.DisplayPosition.y = PreviousPSXDisplay.DisplayPosition.y;
+ PreviousPSXDisplay.DisplayPosition.x = sx;
+ PreviousPSXDisplay.DisplayPosition.y = sy;
+ }
+ else
+ {
+ if((!PSXDisplay.Interlaced) &&
+ PSXDisplay.DisplayPosition.x == sx &&
+ PSXDisplay.DisplayPosition.y == sy)
+ return;
+ PreviousPSXDisplay.DisplayPosition.x = PSXDisplay.DisplayPosition.x;
+ PreviousPSXDisplay.DisplayPosition.y = PSXDisplay.DisplayPosition.y;
+ PSXDisplay.DisplayPosition.x = sx;
+ PSXDisplay.DisplayPosition.y = sy;
+ }
+
+ PSXDisplay.DisplayEnd.x=
+ PSXDisplay.DisplayPosition.x+ PSXDisplay.DisplayMode.x;
+ PSXDisplay.DisplayEnd.y=
+ PSXDisplay.DisplayPosition.y+ PSXDisplay.DisplayMode.y+PreviousPSXDisplay.DisplayModeNew.y;
+
+ PreviousPSXDisplay.DisplayEnd.x=
+ PreviousPSXDisplay.DisplayPosition.x+ PSXDisplay.DisplayMode.x;
+ PreviousPSXDisplay.DisplayEnd.y=
+ PreviousPSXDisplay.DisplayPosition.y+ PSXDisplay.DisplayMode.y+PreviousPSXDisplay.DisplayModeNew.y;
+
+ bDisplayNotSet = TRUE;
+
+ if (!(PSXDisplay.Interlaced))
+ {
+ updateDisplay();
+ }
+ else
+ if(PSXDisplay.InterlacedTest && 
+ ((PreviousPSXDisplay.DisplayPosition.x != PSXDisplay.DisplayPosition.x)||
+ (PreviousPSXDisplay.DisplayPosition.y != PSXDisplay.DisplayPosition.y)))
+ PSXDisplay.InterlacedTest--;
+ 
+ return;
+ }
+
+ // setting width
+ case 0x06:
+
+ PSXDisplay.Range.x0=gdata & 0x7ff; //0x3ff;
+ PSXDisplay.Range.x1=(gdata>>12) & 0xfff;//0x7ff;
+
+ PSXDisplay.Range.x1-=PSXDisplay.Range.x0;
+
+ ChangeDispOffsetsX();
+
+ return;
+
+ // setting height
+ case 0x07:
+
+ PreviousPSXDisplay.Height = PSXDisplay.Height;
+
+ PSXDisplay.Range.y0=gdata & 0x3ff;
+ PSXDisplay.Range.y1=(gdata>>10) & 0x3ff;
+
+ PSXDisplay.Height = PSXDisplay.Range.y1 - 
+ PSXDisplay.Range.y0 +
+ PreviousPSXDisplay.DisplayModeNew.y;
+
+ if (PreviousPSXDisplay.Height != PSXDisplay.Height)
+ {
+ PSXDisplay.DisplayModeNew.y=PSXDisplay.Height*PSXDisplay.Double;
+ ChangeDispOffsetsY();
+ updateDisplayIfChanged();
+ }
+ return;
+ 
+ // setting display infos
+ case 0x08:
+
+ PSXDisplay.DisplayModeNew.x = dispWidths[(gdata & 0x03) | ((gdata & 0x40) >> 4)];
+
+ if (gdata&0x04) PSXDisplay.Double=2;
+ else PSXDisplay.Double=1;
+ PSXDisplay.DisplayModeNew.y = PSXDisplay.Height*PSXDisplay.Double;
+
+ ChangeDispOffsetsY();
+ 
+ PSXDisplay.PAL = (gdata & 0x08)?TRUE:FALSE; // if 1 - PAL mode, else NTSC
+ PSXDisplay.RGB24New = (gdata & 0x10)?TRUE:FALSE; // if 1 - TrueColor
+ PSXDisplay.InterlacedNew = (gdata & 0x20)?TRUE:FALSE; // if 1 - Interlace
+
+ STATUSREG&=~GPUSTATUS_WIDTHBITS; // clear the width bits
+
+ STATUSREG|=
+ (((gdata & 0x03) << 17) | 
+ ((gdata & 0x40) << 10)); // set the width bits
+
+ PreviousPSXDisplay.InterlacedNew=FALSE;
+ if (PSXDisplay.InterlacedNew)
+ {
+ if(!PSXDisplay.Interlaced)
+ {
+ PSXDisplay.InterlacedTest=2;
+ PreviousPSXDisplay.DisplayPosition.x = PSXDisplay.DisplayPosition.x;
+ PreviousPSXDisplay.DisplayPosition.y = PSXDisplay.DisplayPosition.y;
+ PreviousPSXDisplay.InterlacedNew=TRUE;
+ }
+
+ STATUSREG|=GPUSTATUS_INTERLACED;
+ }
+ else 
+ {
+ PSXDisplay.InterlacedTest=0;
+ STATUSREG&=~GPUSTATUS_INTERLACED;
+ }
+
+ if (PSXDisplay.PAL)
+ STATUSREG|=GPUSTATUS_PAL;
+ else STATUSREG&=~GPUSTATUS_PAL;
+
+ if (PSXDisplay.Double==2)
+ STATUSREG|=GPUSTATUS_DOUBLEHEIGHT;
+ else STATUSREG&=~GPUSTATUS_DOUBLEHEIGHT;
+
+ if (PSXDisplay.RGB24New)
+ STATUSREG|=GPUSTATUS_RGB24;
+ else STATUSREG&=~GPUSTATUS_RGB24;
+
+ updateDisplayIfChanged();
+
+ return;
+
+ //--------------------------------------------------//
+ // ask about GPU version and other stuff
+ case 0x10: 
+
+ gdata&=0xff;
+
+ switch(gdata) 
+ {
+ case 0x02:
+ GPUdataRet=ulGPUInfoVals[INFO_TW]; // tw infos
+ return;
+ case 0x03:
+ GPUdataRet=ulGPUInfoVals[INFO_DRAWSTART]; // draw start
+ return;
+ case 0x04:
+ GPUdataRet=ulGPUInfoVals[INFO_DRAWEND]; // draw end
+ return;
+ case 0x05:
+ case 0x06:
+ GPUdataRet=ulGPUInfoVals[INFO_DRAWOFF]; // draw offset
+ return;
+ case 0x07:
+ if(dwGPUVersion==2)
+ GPUdataRet=0x01;
+ else GPUdataRet=0x02; // gpu type
+ return;
+ case 0x08:
+ case 0x0F: // some bios addr?
+ GPUdataRet=0xBFC03720;
+ return;
+ }
+ return;
+ //--------------------------------------------------//
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+// vram read/write helpers
+////////////////////////////////////////////////////////////////////////
+
+BOOL bNeedWriteUpload=FALSE;
+
+static __inline void FinishedVRAMWrite(void)
+{
+ if(bNeedWriteUpload)
+ {
+ bNeedWriteUpload=FALSE;
+ CheckWriteUpdate();
+ }
+
+ // set register to NORMAL operation
+ iDataWriteMode = DR_NORMAL;
+
+ // reset transfer values, to prevent mis-transfer of data
+ VRAMWrite.ColsRemaining = 0;
+ VRAMWrite.RowsRemaining = 0;
+}
+
+static __inline void FinishedVRAMRead(void)
+{
+ // set register to NORMAL operation
+ iDataReadMode = DR_NORMAL;
+ // reset transfer values, to prevent mis-transfer of data
+ VRAMRead.x = 0;
+ VRAMRead.y = 0;
+ VRAMRead.Width = 0;
+ VRAMRead.Height = 0;
+ VRAMRead.ColsRemaining = 0;
+ VRAMRead.RowsRemaining = 0;
+
+ // indicate GPU is no longer ready for VRAM data in the STATUS REGISTER
+ STATUSREG&=~GPUSTATUS_READYFORVRAM;
+}
+
+////////////////////////////////////////////////////////////////////////
+// vram read check ex (reading from card's back/frontbuffer if needed...
+// slow!)
+////////////////////////////////////////////////////////////////////////
+
+void CheckVRamReadEx(int x, int y, int dx, int dy)
+{
+ unsigned short sArea;
+ int ux,uy,udx,udy,wx,wy;
+ unsigned short * p1, *p2;
+ float XS,YS;
+ unsigned char * ps;
+ unsigned char * px;
+ unsigned short s,sx;
+
+ if(STATUSREG&GPUSTATUS_RGB24) return;
+
+ if(((dx > PSXDisplay.DisplayPosition.x) &&
+ (x < PSXDisplay.DisplayEnd.x) &&
+ (dy > PSXDisplay.DisplayPosition.y) &&
+ (y < PSXDisplay.DisplayEnd.y)))
+ sArea=0;
+ else
+ if((!(PSXDisplay.InterlacedTest) &&
+ (dx > PreviousPSXDisplay.DisplayPosition.x) &&
+ (x < PreviousPSXDisplay.DisplayEnd.x) &&
+ (dy > PreviousPSXDisplay.DisplayPosition.y) &&
+ (y < PreviousPSXDisplay.DisplayEnd.y)))
+ sArea=1;
+ else 
+ {
+ return;
+ }
+
+ //////////////
+
+ if(iRenderFVR)
+ {
+ bFullVRam=TRUE;iRenderFVR=2;return;
+ }
+ bFullVRam=TRUE;iRenderFVR=2;
+
+ //////////////
+
+ p2=0;
+
+ if(sArea==0)
+ {
+ ux=PSXDisplay.DisplayPosition.x;
+ uy=PSXDisplay.DisplayPosition.y;
+ udx=PSXDisplay.DisplayEnd.x-ux;
+ udy=PSXDisplay.DisplayEnd.y-uy;
+ if((PreviousPSXDisplay.DisplayEnd.x-
+ PreviousPSXDisplay.DisplayPosition.x)==udx &&
+ (PreviousPSXDisplay.DisplayEnd.y-
+ PreviousPSXDisplay.DisplayPosition.y)==udy)
+ p2=(psxVuw + (1024*PreviousPSXDisplay.DisplayPosition.y) + 
+ PreviousPSXDisplay.DisplayPosition.x);
+ }
+ else
+ {
+ ux=PreviousPSXDisplay.DisplayPosition.x;
+ uy=PreviousPSXDisplay.DisplayPosition.y;
+ udx=PreviousPSXDisplay.DisplayEnd.x-ux;
+ udy=PreviousPSXDisplay.DisplayEnd.y-uy;
+ if((PSXDisplay.DisplayEnd.x-
+ PSXDisplay.DisplayPosition.x)==udx &&
+ (PSXDisplay.DisplayEnd.y-
+ PSXDisplay.DisplayPosition.y)==udy)
+ p2=(psxVuw + (1024*PSXDisplay.DisplayPosition.y) + 
+ PSXDisplay.DisplayPosition.x);
+ }
+
+ p1=(psxVuw + (1024*uy) + ux);
+ if(p1==p2) p2=0;
+
+ x=0;y=0;
+ wx=dx=udx;wy=dy=udy;
+
+ if(udx<=0) return;
+ if(udy<=0) return;
+ if(dx<=0) return;
+ if(dy<=0) return;
+ if(wx<=0) return;
+ if(wy<=0) return;
+
+ XS=(float)rRatioRect.right/(float)wx;
+ YS=(float)rRatioRect.bottom/(float)wy;
+
+ dx=(int)((float)(dx)*XS);
+ dy=(int)((float)(dy)*YS);
+
+ if(dx>iResX) dx=iResX;
+ if(dy>iResY) dy=iResY;
+
+ if(dx<=0) return;
+ if(dy<=0) return;
+
+ // ogl y adjust
+ y=iResY-y-dy;
+
+ x+=rRatioRect.left;
+ y-=rRatioRect.top;
+
+ if(y<0) y=0; if((y+dy)>iResY) dy=iResY-y;
+
+ if(!pGfxCardScreen)
+ {
+ glPixelStorei(GL_PACK_ALIGNMENT,1);
+ pGfxCardScreen=(unsigned char *)malloc(iResX*iResY*4);
+ }
+
+ ps=pGfxCardScreen;
+ 
+ if(!sArea) glReadBuffer(GL_FRONT);
+
+ glReadPixels(x,y,dx,dy,GL_RGB,GL_UNSIGNED_BYTE,ps);
+ 
+ if(!sArea) glReadBuffer(GL_BACK);
+
+ s=0;
+
+ XS=(float)dx/(float)(udx);
+ YS=(float)dy/(float)(udy+1);
+ 
+ for(y=udy;y>0;y--)
+ {
+ for(x=0;x<udx;x++)
+ {
+ if(p1>=psxVuw && p1<psxVuw_eom)
+ {
+ px=ps+(3*((int)((float)x * XS))+
+ (3*dx)*((int)((float)y*YS)));
+ sx=(*px)>>3;px++;
+ s=sx;
+ sx=(*px)>>3;px++;
+ s|=sx<<5;
+ sx=(*px)>>3;
+ s|=sx<<10;
+ s&=~0x8000;
+ *p1=s;
+ }
+ if(p2>=psxVuw && p2<psxVuw_eom) *p2=s;
+
+ p1++;
+ if(p2) p2++;
+ }
+
+ p1 += 1024 - udx;
+ if(p2) p2 += 1024 - udx;
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+// vram read check (reading from card's back/frontbuffer if needed... 
+// slow!)
+////////////////////////////////////////////////////////////////////////
+
+void CheckVRamRead(int x, int y, int dx, int dy,BOOL bFront)
+{
+ unsigned short sArea;unsigned short * p;
+ int ux,uy,udx,udy,wx,wy;float XS,YS;
+ unsigned char * ps, * px;
+ unsigned short s=0,sx;
+
+ if(STATUSREG&GPUSTATUS_RGB24) return;
+
+ if(((dx > PSXDisplay.DisplayPosition.x) &&
+ (x < PSXDisplay.DisplayEnd.x) &&
+ (dy > PSXDisplay.DisplayPosition.y) &&
+ (y < PSXDisplay.DisplayEnd.y)))
+ sArea=0;
+ else
+ if((!(PSXDisplay.InterlacedTest) &&
+ (dx > PreviousPSXDisplay.DisplayPosition.x) &&
+ (x < PreviousPSXDisplay.DisplayEnd.x) &&
+ (dy > PreviousPSXDisplay.DisplayPosition.y) &&
+ (y < PreviousPSXDisplay.DisplayEnd.y)))
+ sArea=1;
+ else 
+ {
+ return;
+ }
+
+ if(dwActFixes&0x40)
+ {
+ if(iRenderFVR)
+ {
+ bFullVRam=TRUE;iRenderFVR=2;return;
+ }
+ bFullVRam=TRUE;iRenderFVR=2;
+ }
+
+ ux=x;uy=y;udx=dx;udy=dy;
+
+ if(sArea==0)
+ {
+ x -=PSXDisplay.DisplayPosition.x;
+ dx-=PSXDisplay.DisplayPosition.x;
+ y -=PSXDisplay.DisplayPosition.y;
+ dy-=PSXDisplay.DisplayPosition.y;
+ wx=PSXDisplay.DisplayEnd.x-PSXDisplay.DisplayPosition.x;
+ wy=PSXDisplay.DisplayEnd.y-PSXDisplay.DisplayPosition.y;
+ }
+ else
+ {
+ x -=PreviousPSXDisplay.DisplayPosition.x;
+ dx-=PreviousPSXDisplay.DisplayPosition.x;
+ y -=PreviousPSXDisplay.DisplayPosition.y;
+ dy-=PreviousPSXDisplay.DisplayPosition.y;
+ wx=PreviousPSXDisplay.DisplayEnd.x-PreviousPSXDisplay.DisplayPosition.x;
+ wy=PreviousPSXDisplay.DisplayEnd.y-PreviousPSXDisplay.DisplayPosition.y;
+ }
+ if(x<0) {ux-=x;x=0;}
+ if(y<0) {uy-=y;y=0;}
+ if(dx>wx) {udx-=(dx-wx);dx=wx;}
+ if(dy>wy) {udy-=(dy-wy);dy=wy;}
+ udx-=ux;
+ udy-=uy;
+ 
+ p=(psxVuw + (1024*uy) + ux);
+
+ if(udx<=0) return;
+ if(udy<=0) return;
+ if(dx<=0) return;
+ if(dy<=0) return;
+ if(wx<=0) return;
+ if(wy<=0) return;
+
+ XS=(float)rRatioRect.right/(float)wx;
+ YS=(float)rRatioRect.bottom/(float)wy;
+
+ dx=(int)((float)(dx)*XS);
+ dy=(int)((float)(dy)*YS);
+ x=(int)((float)x*XS);
+ y=(int)((float)y*YS);
+
+ dx-=x;
+ dy-=y;
+
+ if(dx>iResX) dx=iResX;
+ if(dy>iResY) dy=iResY;
+
+ if(dx<=0) return;
+ if(dy<=0) return;
+
+ // ogl y adjust
+ y=iResY-y-dy;
+
+ x+=rRatioRect.left;
+ y-=rRatioRect.top;
+
+ if(y<0) y=0; if((y+dy)>iResY) dy=iResY-y;
+
+ if(!pGfxCardScreen)
+ {
+ glPixelStorei(GL_PACK_ALIGNMENT,1);
+ pGfxCardScreen=(unsigned char *)malloc(iResX*iResY*4);
+ }
+
+ ps=pGfxCardScreen;
+ 
+ if(bFront) glReadBuffer(GL_FRONT);
+
+ glReadPixels(x,y,dx,dy,GL_RGB,GL_UNSIGNED_BYTE,ps);
+ 
+ if(bFront) glReadBuffer(GL_BACK);
+
+ XS=(float)dx/(float)(udx);
+ YS=(float)dy/(float)(udy+1);
+ 
+ for(y=udy;y>0;y--)
+ {
+ for(x=0;x<udx;x++)
+ {
+ if(p>=psxVuw && p<psxVuw_eom)
+ {
+ px=ps+(3*((int)((float)x * XS))+
+ (3*dx)*((int)((float)y*YS)));
+ sx=(*px)>>3;px++;
+ s=sx;
+ sx=(*px)>>3;px++;
+ s|=sx<<5;
+ sx=(*px)>>3;
+ s|=sx<<10;
+ s&=~0x8000;
+ *p=s;
+ }
+ p++;
+ }
+ p += 1024 - udx;
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+// core read from vram
+////////////////////////////////////////////////////////////////////////
+
+void CALLBACK GPUreadDataMem(uint32_t *pMem, int iSize)
+{
+ int i;
+
+ if(iDataReadMode!=DR_VRAMTRANSFER) return;
+
+ GPUIsBusy;
+
+ // adjust read ptr, if necessary
+ while(VRAMRead.ImagePtr>=psxVuw_eom)
+ VRAMRead.ImagePtr-=iGPUHeight*1024;
+ while(VRAMRead.ImagePtr<psxVuw)
+ VRAMRead.ImagePtr+=iGPUHeight*1024;
+
+ if((iFrameReadType&1 && iSize>1) &&
+ !(iDrawnSomething==2 &&
+ VRAMRead.x == VRAMWrite.x &&
+ VRAMRead.y == VRAMWrite.y &&
+ VRAMRead.Width == VRAMWrite.Width &&
+ VRAMRead.Height == VRAMWrite.Height))
+ CheckVRamRead(VRAMRead.x,VRAMRead.y,
+ VRAMRead.x+VRAMRead.RowsRemaining,
+ VRAMRead.y+VRAMRead.ColsRemaining,
+ TRUE);
+
+ for(i=0;i<iSize;i++)
+ {
+ // do 2 seperate 16bit reads for compatibility (wrap issues)
+ if ((VRAMRead.ColsRemaining > 0) && (VRAMRead.RowsRemaining > 0))
+ {
+ // lower 16 bit
+ GPUdataRet=(uint32_t)*VRAMRead.ImagePtr;
+
+ VRAMRead.ImagePtr++;
+ if(VRAMRead.ImagePtr>=psxVuw_eom) VRAMRead.ImagePtr-=iGPUHeight*1024;
+ VRAMRead.RowsRemaining --;
+
+ if(VRAMRead.RowsRemaining<=0)
+ {
+ VRAMRead.RowsRemaining = VRAMRead.Width;
+ VRAMRead.ColsRemaining--;
+ VRAMRead.ImagePtr += 1024 - VRAMRead.Width;
+ if(VRAMRead.ImagePtr>=psxVuw_eom) VRAMRead.ImagePtr-=iGPUHeight*1024;
+ }
+
+ // higher 16 bit (always, even if it's an odd width)
+ GPUdataRet|=(uint32_t)(*VRAMRead.ImagePtr)<<16;
+ *pMem++=GPUdataRet;
+
+ if(VRAMRead.ColsRemaining <= 0)
+ {FinishedVRAMRead();goto ENDREAD;}
+
+ VRAMRead.ImagePtr++;
+ if(VRAMRead.ImagePtr>=psxVuw_eom) VRAMRead.ImagePtr-=iGPUHeight*1024;
+ VRAMRead.RowsRemaining--;
+ if(VRAMRead.RowsRemaining<=0)
+ {
+ VRAMRead.RowsRemaining = VRAMRead.Width;
+ VRAMRead.ColsRemaining--;
+ VRAMRead.ImagePtr += 1024 - VRAMRead.Width;
+ if(VRAMRead.ImagePtr>=psxVuw_eom) VRAMRead.ImagePtr-=iGPUHeight*1024;
+ }
+ if(VRAMRead.ColsRemaining <= 0)
+ {FinishedVRAMRead();goto ENDREAD;}
+ }
+ else {FinishedVRAMRead();goto ENDREAD;}
+ }
+
+ENDREAD:
+ GPUIsIdle;
+}
+
+uint32_t CALLBACK GPUreadData(void)
+{
+ uint32_t l;
+ GPUreadDataMem(&l,1);
+ return GPUdataRet;
+}
+
+////////////////////////////////////////////////////////////////////////
+// helper table to know how much data is used by drawing commands
+////////////////////////////////////////////////////////////////////////
+
+const unsigned char primTableCX[256] =
+{
+ // 00
+ 0,0,3,0,0,0,0,0,
+ // 08
+ 0,0,0,0,0,0,0,0,
+ // 10
+ 0,0,0,0,0,0,0,0,
+ // 18
+ 0,0,0,0,0,0,0,0,
+ // 20
+ 4,4,4,4,7,7,7,7,
+ // 28
+ 5,5,5,5,9,9,9,9,
+ // 30
+ 6,6,6,6,9,9,9,9,
+ // 38
+ 8,8,8,8,12,12,12,12,
+ // 40
+ 3,3,3,3,0,0,0,0,
+ // 48
+// 5,5,5,5,6,6,6,6, //FLINE
+ 254,254,254,254,254,254,254,254,
+ // 50
+ 4,4,4,4,0,0,0,0,
+ // 58
+// 7,7,7,7,9,9,9,9, // LINEG3 LINEG4
+ 255,255,255,255,255,255,255,255,
+ // 60
+ 3,3,3,3,4,4,4,4, // TILE SPRT
+ // 68
+ 2,2,2,2,3,3,3,3, // TILE1
+ // 70
+ 2,2,2,2,3,3,3,3,
+ // 78
+ 2,2,2,2,3,3,3,3,
+ // 80
+ 4,0,0,0,0,0,0,0,
+ // 88
+ 0,0,0,0,0,0,0,0,
+ // 90
+ 0,0,0,0,0,0,0,0,
+ // 98
+ 0,0,0,0,0,0,0,0,
+ // a0
+ 3,0,0,0,0,0,0,0,
+ // a8
+ 0,0,0,0,0,0,0,0,
+ // b0
+ 0,0,0,0,0,0,0,0,
+ // b8
+ 0,0,0,0,0,0,0,0,
+ // c0
+ 3,0,0,0,0,0,0,0,
+ // c8
+ 0,0,0,0,0,0,0,0,
+ // d0
+ 0,0,0,0,0,0,0,0,
+ // d8
+ 0,0,0,0,0,0,0,0,
+ // e0
+ 0,1,1,1,1,1,1,0,
+ // e8
+ 0,0,0,0,0,0,0,0,
+ // f0
+ 0,0,0,0,0,0,0,0,
+ // f8
+ 0,0,0,0,0,0,0,0
+};
+
+////////////////////////////////////////////////////////////////////////
+// processes data send to GPU data register
+////////////////////////////////////////////////////////////////////////
+
+void CALLBACK GPUwriteDataMem(uint32_t *pMem, int iSize)
+{
+ unsigned char command;
+ uint32_t gdata=0;
+ int i=0;
+ GPUIsBusy;
+ GPUIsNotReadyForCommands;
+
+STARTVRAM:
+
+ if(iDataWriteMode==DR_VRAMTRANSFER)
+ {
+ // make sure we are in vram
+ while(VRAMWrite.ImagePtr>=psxVuw_eom)
+ VRAMWrite.ImagePtr-=iGPUHeight*1024;
+ while(VRAMWrite.ImagePtr<psxVuw)
+ VRAMWrite.ImagePtr+=iGPUHeight*1024;
+
+ // now do the loop
+ while(VRAMWrite.ColsRemaining>0)
+ {
+ while(VRAMWrite.RowsRemaining>0)
+ {
+ if(i>=iSize) {goto ENDVRAM;}
+ i++;
+
+ gdata=*pMem++;
+
+ *VRAMWrite.ImagePtr++ = (unsigned short)gdata;
+ if(VRAMWrite.ImagePtr>=psxVuw_eom) VRAMWrite.ImagePtr-=iGPUHeight*1024;
+ VRAMWrite.RowsRemaining --;
+
+ if(VRAMWrite.RowsRemaining <= 0)
+ {
+ VRAMWrite.ColsRemaining--;
+ if (VRAMWrite.ColsRemaining <= 0) // last pixel is odd width
+ {
+ gdata=(gdata&0xFFFF)|(((uint32_t)(*VRAMWrite.ImagePtr))<<16);
+ FinishedVRAMWrite();
+ goto ENDVRAM;
+ }
+ VRAMWrite.RowsRemaining = VRAMWrite.Width;
+ VRAMWrite.ImagePtr += 1024 - VRAMWrite.Width;
+ }
+
+ *VRAMWrite.ImagePtr++ = (unsigned short)(gdata>>16);
+ if(VRAMWrite.ImagePtr>=psxVuw_eom) VRAMWrite.ImagePtr-=iGPUHeight*1024;
+ VRAMWrite.RowsRemaining --;
+ }
+
+ VRAMWrite.RowsRemaining = VRAMWrite.Width;
+ VRAMWrite.ColsRemaining--;
+ VRAMWrite.ImagePtr += 1024 - VRAMWrite.Width;
+ }
+
+ FinishedVRAMWrite();
+ }
+
+ENDVRAM:
+
+ if(iDataWriteMode==DR_NORMAL)
+ {
+ void (* *primFunc)(unsigned char *);
+ if(bSkipNextFrame) primFunc=primTableSkip;
+ else primFunc=primTableJ;
+
+ for(;i<iSize;)
+ {
+ if(iDataWriteMode==DR_VRAMTRANSFER) goto STARTVRAM;
+
+ gdata=*pMem++;i++;
+ 
+ if(gpuDataC == 0)
+ {
+ command = (unsigned char)((gdata>>24) & 0xff);
+ 
+ if(primTableCX[command])
+ {
+ gpuDataC = primTableCX[command];
+ gpuCommand = command;
+ gpuDataM[0] = gdata;
+ gpuDataP = 1;
+ }
+ else continue;
+ }
+ else
+ {
+ gpuDataM[gpuDataP] = gdata;
+ if(gpuDataC>128)
+ {
+ if((gpuDataC==254 && gpuDataP>=3) ||
+ (gpuDataC==255 && gpuDataP>=4 && !(gpuDataP&1)))
+ {
+ if((gpuDataM[gpuDataP] & 0xF000F000) == 0x50005000)
+ gpuDataP=gpuDataC-1;
+ }
+ }
+ gpuDataP++;
+ }
+ 
+ if(gpuDataP == gpuDataC)
+ {
+ gpuDataC=gpuDataP=0;
+ primFunc[gpuCommand]((unsigned char *)gpuDataM);
+
+ if(dwEmuFixes&0x0001 || dwActFixes&0x20000) // hack for emulating "gpu busy" in some games
+ iFakePrimBusy=4;
+ }
+ } 
+ }
+
+ GPUdataRet=gdata;
+
+ GPUIsReadyForCommands;
+ GPUIsIdle; 
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void CALLBACK GPUwriteData(uint32_t gdata)
+{
+ GPUwriteDataMem(&gdata,1);
+}
+
+////////////////////////////////////////////////////////////////////////
+// call config dlg
+////////////////////////////////////////////////////////////////////////
+
+#ifdef _WINDOWS
+
+long CALLBACK GPUconfigure(void)
+{
+ HWND hWP=GetActiveWindow();
+ DialogBox(hInst,MAKEINTRESOURCE(IDD_CFGDLG),
+ hWP,(DLGPROC)CfgDlgProc);
+
+ return 0;
+}
+
+#elif defined(_MACGL)
+long CALLBACK GPUconfigure(void)
+{
+	DlgProc();
+	return 0;
+}
+#else
+
+void StartCfgTool(char *arg) // linux: start external cfg tool
+{
+	char cfg[256];
+	struct stat buf;
+
+	strcpy(cfg, "./cfgpeopsxgl");
+	if (stat(cfg, &buf) != -1) {
+		int pid = fork();
+		if (pid == 0) {
+			if (fork() == 0) {
+				execl(cfg, "cfgpeopsxgl", arg, NULL);
+			}
+			exit(0);
+		} else {
+			waitpid(pid, NULL, 0);
+		}
+		return;
+	}
+
+	strcpy(cfg, "./cfg/cfgpeopsxgl");
+	if (stat(cfg, &buf) != -1) {
+		int pid = fork();
+		if (pid == 0) {
+			if (fork() == 0) {
+				execl(cfg, "cfgpeopsxgl", arg, NULL);
+			}
+			exit(0);
+		} else {
+			waitpid(pid, NULL, 0);
+		}
+		return;
+	}
+
+	sprintf(cfg, "%s/.pcsxr/plugins/cfg/cfgpeopsxgl", getenv("HOME"));
+	if (stat(cfg, &buf) != -1) {
+		int pid = fork();
+		if (pid == 0) {
+			if (fork() == 0) {
+				execl(cfg, "cfgpeopsxgl", arg, NULL);
+			}
+			exit(0);
+		} else {
+			waitpid(pid, NULL, 0);
+		}
+		return;
+	}
+
+	printf("ERROR: cfgpeopsxgl file not found!\n");
+}
+
+long CALLBACK GPUconfigure(void)
+{
+ StartCfgTool("configure");
+ return 0;
+}
+
+#endif // def _WINDOWS / _MACGL
+
+////////////////////////////////////////////////////////////////////////
+// sets all kind of act fixes
+////////////////////////////////////////////////////////////////////////
+
+void SetFixes(void)
+{
+ ReInitFrameCap();
+
+ if(dwActFixes & 0x2000) 
+ dispWidths[4]=384;
+ else dispWidths[4]=368;
+}
+
+////////////////////////////////////////////////////////////////////////
+// Pete Special: make an 'intelligent' dma chain check (<-Tekken3)
+////////////////////////////////////////////////////////////////////////
+
+uint32_t lUsedAddr[3];
+
+static __inline BOOL CheckForEndlessLoop(uint32_t laddr)
+{
+ if(laddr==lUsedAddr[1]) return TRUE;
+ if(laddr==lUsedAddr[2]) return TRUE;
+
+ if(laddr<lUsedAddr[0]) lUsedAddr[1]=laddr;
+ else lUsedAddr[2]=laddr;
+ lUsedAddr[0]=laddr;
+ return FALSE;
+}
+
+////////////////////////////////////////////////////////////////////////
+// core gives a dma chain to gpu: same as the gpuwrite interface funcs
+////////////////////////////////////////////////////////////////////////
+
+long CALLBACK GPUdmaChain(uint32_t *baseAddrL, uint32_t addr)
+{
+ uint32_t dmaMem;
+ unsigned char * baseAddrB;
+ short count;unsigned int DMACommandCounter = 0;
+
+ if(bIsFirstFrame) GLinitialize();
+
+ GPUIsBusy;
+
+ lUsedAddr[0]=lUsedAddr[1]=lUsedAddr[2]=0xffffff;
+
+ baseAddrB = (unsigned char*) baseAddrL;
+
+ do
+ {
+ if(iGPUHeight==512) addr&=0x1FFFFC;
+
+ if(DMACommandCounter++ > 2000000) break;
+ if(CheckForEndlessLoop(addr)) break;
+
+ count = baseAddrB[addr+3];
+
+ dmaMem=addr+4;
+
+ if(count>0) GPUwriteDataMem(&baseAddrL[dmaMem>>2],count);
+
+ addr = baseAddrL[addr>>2]&0xffffff;
+ }
+ while (addr != 0xffffff);
+
+ GPUIsIdle;
+
+ return 0;
+}
+ 
+////////////////////////////////////////////////////////////////////////
+// show about dlg
+////////////////////////////////////////////////////////////////////////
+
+void CALLBACK GPUabout(void)
+{
+#ifdef _WINDOWS
+	HWND hWP=GetActiveWindow(); // to be sure
+	DialogBox(hInst,MAKEINTRESOURCE(IDD_DIALOG_ABOUT), hWP,(DLGPROC)AboutDlgProc);
+#elif defined(_MACGL)
+ AboutDlgProc();
+#else
+	StartCfgTool("about");
+#endif
+}
+
+////////////////////////////////////////////////////////////////////////
+// We are ever fine ;)
+////////////////////////////////////////////////////////////////////////
+
+long CALLBACK GPUtest(void)
+{
+ // if test fails this function should return negative value for error (unable to continue)
+ // and positive value for warning (can continue but output might be crappy)
+
+ return 0;
+}
+
+////////////////////////////////////////////////////////////////////////
+// save state funcs
+////////////////////////////////////////////////////////////////////////
+
+typedef struct GPUFREEZETAG
+{
+ uint32_t ulFreezeVersion; // should be always 1 for now (set by main emu)
+ uint32_t ulStatus; // current gpu status
+ uint32_t ulControl[256]; // latest control register values
+ unsigned char psxVRam[1024*1024*2]; // current VRam image (full 2 MB for ZN)
+} GPUFreeze_t;
+
+////////////////////////////////////////////////////////////////////////
+
+long CALLBACK GPUfreeze(uint32_t ulGetFreezeData,GPUFreeze_t * pF)
+{
+ if(ulGetFreezeData==2) 
+ {
+ int lSlotNum=*((int *)pF);
+ if(lSlotNum<0) return 0;
+ if(lSlotNum>8) return 0;
+ lSelectedSlot=lSlotNum+1;
+ return 1;
+ }
+
+ if(!pF) return 0; 
+ if(pF->ulFreezeVersion!=1) return 0;
+
+ if(ulGetFreezeData==1)
+ {
+ pF->ulStatus=STATUSREG;
+ memcpy(pF->ulControl,ulStatusControl,256*sizeof(uint32_t));
+ memcpy(pF->psxVRam, psxVub, 1024*iGPUHeight*2);
+
+ return 1;
+ }
+
+ if(ulGetFreezeData!=0) return 0;
+
+ STATUSREG=pF->ulStatus;
+ memcpy(ulStatusControl,pF->ulControl,256*sizeof(uint32_t));
+ memcpy(psxVub, pF->psxVRam, 1024*iGPUHeight*2);
+
+ ResetTextureArea(TRUE);
+
+ GPUwriteStatus(ulStatusControl[0]);
+ GPUwriteStatus(ulStatusControl[1]);
+ GPUwriteStatus(ulStatusControl[2]);
+ GPUwriteStatus(ulStatusControl[3]);
+ GPUwriteStatus(ulStatusControl[8]);
+ GPUwriteStatus(ulStatusControl[6]);
+ GPUwriteStatus(ulStatusControl[7]);
+ GPUwriteStatus(ulStatusControl[5]);
+ GPUwriteStatus(ulStatusControl[4]);
+
+ return 1;
+}
+
+////////////////////////////////////////////////////////////////////////
+// special "emu infos" / "emu effects" functions
+////////////////////////////////////////////////////////////////////////
+
+//00 = black
+//01 = white
+//10 = red
+//11 = transparent
+
+unsigned char cFont[10][120]=
+{
+// 0
+{0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x05,0x54,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x05,0x54,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0xaa,0xaa,0xaa,0xaa,0xaa,0xaa
+},
+// 1
+{0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x50,0x00,0x00,
+ 0x80,0x00,0x05,0x50,0x00,0x00,
+ 0x80,0x00,0x00,0x50,0x00,0x00,
+ 0x80,0x00,0x00,0x50,0x00,0x00,
+ 0x80,0x00,0x00,0x50,0x00,0x00,
+ 0x80,0x00,0x00,0x50,0x00,0x00,
+ 0x80,0x00,0x00,0x50,0x00,0x00,
+ 0x80,0x00,0x00,0x50,0x00,0x00,
+ 0x80,0x00,0x00,0x50,0x00,0x00,
+ 0x80,0x00,0x05,0x55,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0xaa,0xaa,0xaa,0xaa,0xaa,0xaa
+},
+// 2
+{0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x05,0x54,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x00,0x05,0x00,0x00,
+ 0x80,0x00,0x00,0x05,0x00,0x00,
+ 0x80,0x00,0x00,0x14,0x00,0x00,
+ 0x80,0x00,0x00,0x50,0x00,0x00,
+ 0x80,0x00,0x01,0x40,0x00,0x00,
+ 0x80,0x00,0x05,0x00,0x00,0x00,
+ 0x80,0x00,0x14,0x00,0x00,0x00,
+ 0x80,0x00,0x15,0x55,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0xaa,0xaa,0xaa,0xaa,0xaa,0xaa
+},
+// 3
+{0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x05,0x54,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x00,0x05,0x00,0x00,
+ 0x80,0x00,0x00,0x05,0x00,0x00,
+ 0x80,0x00,0x01,0x54,0x00,0x00,
+ 0x80,0x00,0x00,0x05,0x00,0x00,
+ 0x80,0x00,0x00,0x05,0x00,0x00,
+ 0x80,0x00,0x00,0x05,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x05,0x54,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0xaa,0xaa,0xaa,0xaa,0xaa,0xaa
+},
+// 4
+{0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x14,0x00,0x00,
+ 0x80,0x00,0x00,0x54,0x00,0x00,
+ 0x80,0x00,0x01,0x54,0x00,0x00,
+ 0x80,0x00,0x01,0x54,0x00,0x00,
+ 0x80,0x00,0x05,0x14,0x00,0x00,
+ 0x80,0x00,0x14,0x14,0x00,0x00,
+ 0x80,0x00,0x15,0x55,0x00,0x00,
+ 0x80,0x00,0x00,0x14,0x00,0x00,
+ 0x80,0x00,0x00,0x14,0x00,0x00,
+ 0x80,0x00,0x00,0x55,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0xaa,0xaa,0xaa,0xaa,0xaa,0xaa
+},
+// 5
+{0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x15,0x55,0x00,0x00,
+ 0x80,0x00,0x14,0x00,0x00,0x00,
+ 0x80,0x00,0x14,0x00,0x00,0x00,
+ 0x80,0x00,0x14,0x00,0x00,0x00,
+ 0x80,0x00,0x15,0x54,0x00,0x00,
+ 0x80,0x00,0x00,0x05,0x00,0x00,
+ 0x80,0x00,0x00,0x05,0x00,0x00,
+ 0x80,0x00,0x00,0x05,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x05,0x54,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0xaa,0xaa,0xaa,0xaa,0xaa,0xaa
+},
+// 6
+{0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x01,0x54,0x00,0x00,
+ 0x80,0x00,0x05,0x00,0x00,0x00,
+ 0x80,0x00,0x14,0x00,0x00,0x00,
+ 0x80,0x00,0x14,0x00,0x00,0x00,
+ 0x80,0x00,0x15,0x54,0x00,0x00,
+ 0x80,0x00,0x15,0x05,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x05,0x54,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0xaa,0xaa,0xaa,0xaa,0xaa,0xaa
+},
+// 7
+{0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x15,0x55,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x00,0x14,0x00,0x00,
+ 0x80,0x00,0x00,0x14,0x00,0x00,
+ 0x80,0x00,0x00,0x50,0x00,0x00,
+ 0x80,0x00,0x00,0x50,0x00,0x00,
+ 0x80,0x00,0x01,0x40,0x00,0x00,
+ 0x80,0x00,0x01,0x40,0x00,0x00,
+ 0x80,0x00,0x05,0x00,0x00,0x00,
+ 0x80,0x00,0x05,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0xaa,0xaa,0xaa,0xaa,0xaa,0xaa
+},
+// 8
+{0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x05,0x54,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x05,0x54,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x05,0x54,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0xaa,0xaa,0xaa,0xaa,0xaa,0xaa
+},
+// 9
+{0xaa,0xaa,0xaa,0xaa,0xaa,0xaa,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x05,0x54,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x14,0x05,0x00,0x00,
+ 0x80,0x00,0x14,0x15,0x00,0x00,
+ 0x80,0x00,0x05,0x55,0x00,0x00,
+ 0x80,0x00,0x00,0x05,0x00,0x00,
+ 0x80,0x00,0x00,0x05,0x00,0x00,
+ 0x80,0x00,0x00,0x14,0x00,0x00,
+ 0x80,0x00,0x05,0x50,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x80,0x00,0x00,0x00,0x00,0x00,
+ 0xaa,0xaa,0xaa,0xaa,0xaa,0xaa
+}
+};
+
+////////////////////////////////////////////////////////////////////////
+
+void PaintPicDot(unsigned char * p,unsigned char c)
+{
+ if(c==0) {*p++=0x00;*p++=0x00;*p=0x00;return;}
+ if(c==1) {*p++=0xff;*p++=0xff;*p=0xff;return;}
+ if(c==2) {*p++=0x00;*p++=0x00;*p=0xff;return;}
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void CALLBACK GPUgetScreenPic(unsigned char * pMem)
+{
+ float XS,YS;int x,y,v;
+ unsigned char * ps, * px, * pf;
+ unsigned char c;
+
+ if(!pGfxCardScreen)
+ {
+ glPixelStorei(GL_PACK_ALIGNMENT,1);
+ pGfxCardScreen=(unsigned char *)malloc(iResX*iResY*4);
+ }
+
+ ps=pGfxCardScreen;
+
+ glReadBuffer(GL_FRONT);
+
+ glReadPixels(0,0,iResX,iResY,GL_RGB,GL_UNSIGNED_BYTE,ps);
+ 
+ glReadBuffer(GL_BACK);
+
+ XS=(float)iResX/128;
+ YS=(float)iResY/96;
+ pf=pMem;
+
+ for(y=96;y>0;y--)
+ {
+ for(x=0;x<128;x++)
+ {
+ px=ps+(3*((int)((float)x * XS))+
+ (3*iResX)*((int)((float)y*YS)));
+ *(pf+0)=*(px+2);
+ *(pf+1)=*(px+1);
+ *(pf+2)=*(px+0);
+ pf+=3;
+ }
+ }
+
+ /////////////////////////////////////////////////////////////////////
+ // generic number/border painter
+
+ pf=pMem+(103*3);
+
+ for(y=0;y<20;y++)
+ {
+ for(x=0;x<6;x++)
+ {
+ c=cFont[lSelectedSlot][x+y*6];
+ v=(c&0xc0)>>6;
+ PaintPicDot(pf,(unsigned char)v);pf+=3; // paint the dots into the rect
+ v=(c&0x30)>>4;
+ PaintPicDot(pf,(unsigned char)v);pf+=3;
+ v=(c&0x0c)>>2;
+ PaintPicDot(pf,(unsigned char)v);pf+=3;
+ v=c&0x03;
+ PaintPicDot(pf,(unsigned char)v);pf+=3;
+ }
+ pf+=104*3;
+ }
+
+ pf=pMem;
+ for(x=0;x<128;x++)
+ {
+ *(pf+(95*128*3))=0x00;*pf++=0x00;
+ *(pf+(95*128*3))=0x00;*pf++=0x00;
+ *(pf+(95*128*3))=0xff;*pf++=0xff;
+ }
+ pf=pMem;
+ for(y=0;y<96;y++)
+ {
+ *(pf+(127*3))=0x00;*pf++=0x00;
+ *(pf+(127*3))=0x00;*pf++=0x00;
+ *(pf+(127*3))=0xff;*pf++=0xff;
+ pf+=127*3;
+ }
+
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void CALLBACK GPUshowScreenPic(unsigned char * pMem)
+{
+ DestroyPic();
+ if(pMem==0) return;
+ CreatePic(pMem);
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void CALLBACK GPUsetfix(uint32_t dwFixBits)
+{
+ dwEmuFixes=dwFixBits;
+}
+
+////////////////////////////////////////////////////////////////////////
+ 
+void CALLBACK GPUvisualVibration(uint32_t iSmall, uint32_t iBig)
+{
+ int iVibVal;
+
+ if(PSXDisplay.DisplayModeNew.x) // calc min "shake pixel" from screen width
+ iVibVal=max(1,iResX/PSXDisplay.DisplayModeNew.x);
+ else iVibVal=1;
+ // big rumble: 4...15 sp ; small rumble 1...3 sp
+ if(iBig) iRumbleVal=max(4*iVibVal,min(15*iVibVal,((int)iBig *iVibVal)/10));
+ else iRumbleVal=max(1*iVibVal,min( 3*iVibVal,((int)iSmall*iVibVal)/10));
+
+ srand(timeGetTime()); // init rand (will be used in BufferSwap)
+
+ iRumbleTime=15; // let the rumble last 16 buffer swaps
+}
+ 
+////////////////////////////////////////////////////////////////////////
+// main emu can set display infos (A/M/G/D) 
+////////////////////////////////////////////////////////////////////////
+
+void CALLBACK GPUdisplayFlags(uint32_t dwFlags)
+{
+ dwCoreFlags=dwFlags;
+}
+
+void CALLBACK GPUvBlank( int val )
+{
+ vBlank = val;
+}

pcsxr-1.9.92.tar.bz2/plugins/peopsxgl/gpu.h -> pcsxr-1.9.93.tar.bz2/plugins/peopsxgl/gpu.h Changed

@@ -1,40 +1,40 @@
-/***************************************************************************
- gpu.h - description
- -------------------
- begin : Sun Mar 08 2009
- copyright : (C) 1999-2009 by Pete Bernert
- web : www.pbernert.com 
- ***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. See also the license.txt file for *
- * additional informations. *
- * *
- ***************************************************************************/
-
-#ifndef _GPU_INTERNALS_H
-#define _GPU_INTERNALS_H
-
-#define PRED(x) ((x << 3) & 0xF8)
-#define PBLUE(x) ((x >> 2) & 0xF8)
-#define PGREEN(x) ((x >> 7) & 0xF8)
-
-#define RED(x) (x & 0xff)
-#define BLUE(x) ((x>>16) & 0xff)
-#define GREEN(x) ((x>>8) & 0xff)
-#define COLOR(x) (x & 0xffffff)
-
-void DoSnapShot(void);
-void updateDisplay(void);
-void updateFrontDisplay(void);
-void SetAutoFrameCap(void);
-void SetAspectRatio(void);
-void CheckVRamRead(int x, int y, int dx, int dy,BOOL bFront);
-void CheckVRamReadEx(int x, int y, int dx, int dy);
-void SetFixes(void);
-
-#endif // _GPU_INTERNALS_H
+/***************************************************************************
+ gpu.h - description
+ -------------------
+ begin : Sun Mar 08 2009
+ copyright : (C) 1999-2009 by Pete Bernert
+ web : www.pbernert.com 
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+#ifndef _GPU_INTERNALS_H
+#define _GPU_INTERNALS_H
+
+#define PRED(x) ((x << 3) & 0xF8)
+#define PBLUE(x) ((x >> 2) & 0xF8)
+#define PGREEN(x) ((x >> 7) & 0xF8)
+
+#define RED(x) (x & 0xff)
+#define BLUE(x) ((x>>16) & 0xff)
+#define GREEN(x) ((x>>8) & 0xff)
+#define COLOR(x) (x & 0xffffff)
+
+void DoSnapShot(void);
+void updateDisplay(void);
+void updateFrontDisplay(void);
+void SetAutoFrameCap(void);
+void SetAspectRatio(void);
+void CheckVRamRead(int x, int y, int dx, int dy,BOOL bFront);
+void CheckVRamReadEx(int x, int y, int dx, int dy);
+void SetFixes(void);
+
+#endif // _GPU_INTERNALS_H

pcsxr-1.9.92.tar.bz2/plugins/peopsxgl/gpucfg/main.c -> pcsxr-1.9.93.tar.bz2/plugins/peopsxgl/gpucfg/main.c Changed

@@ -1,548 +1,780 @@
-#include "config.h"
-
 #include <gtk/gtk.h>
-
-#include "interface.h"
-#include "support.h"
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h> 
+#include <stdlib.h>
 #include <string.h>
 
+#include "config.h"
+
 #ifdef ENABLE_NLS
 #include <libintl.h>
 #include <locale.h>
-#endif 
-
-#define SETCHECK(winame) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON ((GtkWidget*) gtk_object_get_data (GTK_OBJECT (CfgWnd),winame)), TRUE)
-#define SETEDIT(winame,sz) gtk_entry_set_text(GTK_ENTRY((GtkWidget*) gtk_object_get_data (GTK_OBJECT (CfgWnd),winame)), sz)
-#define SETEDITVAL(winame,v) sprintf(t,"%d",v);gtk_entry_set_text(GTK_ENTRY((GtkWidget*) gtk_object_get_data (GTK_OBJECT (CfgWnd),winame)), t)
-#define SETLIST(winame,v) gtk_list_select_item(GTK_LIST(GTK_COMBO((GtkWidget*) gtk_object_get_data (GTK_OBJECT (CfgWnd),winame))->list),v)
-
-static GtkWidget * wndMain=0;
-
-int main (int argc, char *argv[])
-{
- GtkWidget *CfgWnd;
- FILE *in;char t[256];int len,val; 
- char * pB, * p; 
-
- if(argc!=2) return 0;
- if(strcmp(argv[1],"CFG")!=0 && strcmp(argv[1],"ABOUT")!=0)
- return 0;
-
-#ifdef ENABLE_NLS
- setlocale (LC_ALL, "");
- bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR);
- bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
- textdomain (GETTEXT_PACKAGE);
 #endif
 
- gtk_set_locale ();
- gtk_init (&argc, &argv);
-
- if (strcmp(argv[1],"ABOUT") == 0)
- {
- CfgWnd = create_AboutWnd ();
- gtk_widget_show (CfgWnd);
- gtk_main ();
- return 0;
- }
-
- CfgWnd = create_CfgWnd ();
- wndMain = CfgWnd;
-
- in = fopen("gpuPeopsMesaGL.cfg","rb");
- if(in)
- {
- pB=(char *)malloc(32767);
- memset(pB,0,32767);
- len = fread(pB, 1, 32767, in);
- fclose(in);
- }
- else pB=0;
-
- val=640;
- if(pB)
- {
- strcpy(t,"\nResX");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) val=atoi(p+len);
- if(val<10) val=10;
- }
- SETEDITVAL("edtXSize",val);
-
- val=480;
- if(pB)
- {
- strcpy(t,"\nResY");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) val=atoi(p+len);
- if(val<10) val=10;
- }
- SETEDITVAL("edtYSize",val);
-
- val=0;
- if(pB)
- {
- strcpy(t,"\nKeepRatio");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) val=atoi(p+len);
- if(val<0) val=0;
- if(val>1) val=1;
- }
- if(val) SETCHECK("chkKeepRatio");
-
- val=0;
- if(pB)
- {
- strcpy(t,"\nVRamSize");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) val=atoi(p+len);
- if(val<0) val=0;
- if(val>1024) val=1024;
- }
- SETEDITVAL("edtMaxTex",val);
-
- val=0;
- if(pB)
- {
- strcpy(t,"\n15bitMdec");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) val=atoi(p+len);
- if(val<0) val=0;
- if(val>1) val=1;
- }
- if(val) SETCHECK("chk15bitMdec");
-
- val=0;
- if(pB)
- {
- strcpy(t,"\nHiResTextures");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) val=atoi(p+len);
- if(val<0) val=0;
- if(val>2) val=2;
- }
- SETLIST("cmbHiresTex",val);
-
- val=0;
- if(pB)
- {
- strcpy(t,"\nFullScreen");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) val=atoi(p+len);
- if(val<0) val=0;
- if(val>1) val=1;
- }
- if(val) SETCHECK("chkFullScreen");
-
- val=0;
- if(pB)
- {
- strcpy(t,"\nScanLines");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) val=atoi(p+len);
- if(val<0) val=0;
- if(val>1) val=1;
- }
- if(val) SETCHECK("chkScanlines");
-
- val=0;
- if(pB)
- {
- strcpy(t,"\nScanLinesBlend");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) val=atoi(p+len);
- if(val<-1) val=-1;
- if(val>255) val=255;
- }
- SETEDITVAL("edtScanBlend",val);
-
- val=1;
- if(pB)
- {
- strcpy(t,"\nFrameTextures");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) val=atoi(p+len);
- if(val<0) val=0;
- if(val>3) val=3;
- }
- SETLIST("cmbFrameTex",val);
-
- val=0;
- if(pB)
- {
- strcpy(t,"\nFrameAccess");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) val=atoi(p+len);
- if(val<0) val=0;
- if(val>4) val=4;
- }
- SETLIST("cmbFrameAcc",val);
-
- val=0;
- if(pB)
- {
- strcpy(t,"\nTexFilter");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) val=atoi(p+len);
- if(val<0) val=0;
- if(val>6) val=6;
- }
- SETLIST("cmbFilter",val);
-
- val=0;
- if(pB)
- {
- strcpy(t,"\nAdvancedBlend");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) val=atoi(p+len);
- if(val<0) val=0;
- if(val>1) val=1;
- }
- if(val) SETCHECK("chkABlend");
-
- val=0;
- if(pB)
- {
- strcpy(t,"\nDithering");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) val=atoi(p+len);
- if(val<0) val=0;
- if(val>1) val=1;
- }
- if(val) SETCHECK("chkDither");
-
- val=0;
- if(pB)
- {
- strcpy(t,"\nLineMode");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) val=atoi(p+len);
- if(val<0) val=0;
- if(val>1) val=1;
- }
- if(val) SETCHECK("chkLinemode");
-
- val=0;
- if(pB)
- {
- strcpy(t,"\nShowFPS");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) val=atoi(p+len);
- if(val<0) val=0;
- if(val>1) val=1;
- }
- if(val) SETCHECK("chkShowFPS");
-
- val=1;
- if(pB)
- {
- strcpy(t,"\nUseFrameLimit");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) val=atoi(p+len);
- if(val<0) val=0;
- if(val>1) val=1;
- }
- if(val) SETCHECK("chkFPSLimit");
-
- val=0;
- if(pB)
- {
- strcpy(t,"\nUseFrameSkip");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) val=atoi(p+len);
- if(val<0) val=0;
- if(val>1) val=1;
- }
- if(val) SETCHECK("chkFPSSkip");
-
- val=2;
- if(pB)
- {
- strcpy(t,"\nFPSDetection");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) val=atoi(p+len)+1;
- if(val<1) val=1;
- if(val>2) val=2;
- }
- if(val==2) SETCHECK("rdbLimAuto");
- if(val==1) SETCHECK("rdbLimMan");
-
- val=200;
- if(pB)
- {
- strcpy(t,"\nFrameRate");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) val=atoi(p+len);
- if(val<0) val=0;
- if(val>1000) val=1000;
- }
- SETEDITVAL("edtFPSlim",val);
-
- val=2;
- if(pB)
- {
- strcpy(t,"\nOffscreenDrawing");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) val=atoi(p+len);
- if(val<0) val=0;
- if(val>4) val=4;
- }
- SETLIST("cmbOffscreen",val);
-
- val=1;
- if(pB)
- {
- strcpy(t,"\nOpaquePass");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) val=atoi(p+len);
- if(val<0) val=0;
- if(val>1) val=1;
- }
- if(val) SETCHECK("chkOpaque");
-
- val=0;
- if(pB)
- {
- strcpy(t,"\nAntiAlias");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) val=atoi(p+len);
- if(val<0) val=0;
- if(val>1) val=1;
- }
- if(val) SETCHECK("chkAntiA");
-
- val=0;
- if(pB)
- {
- strcpy(t,"\nTexQuality");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) val=atoi(p+len);
- if(val<0) val=0;
- if(val>4) val=4;
- }
- SETLIST("cmbQuality",val);
-
- val=0;
- if(pB)
- {
- strcpy(t,"\nMaskDetect");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) val=atoi(p+len);
- if(val<0) val=0;
- if(val>1) val=1;
- }
- if(val) SETCHECK("chkMaskBit");
-
- val=1;
- if(pB)
- {
- strcpy(t,"\nFastMdec");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) val=atoi(p+len);
- if(val<0) val=0;
- if(val>1) val=1;
- }
- if(val) SETCHECK("chkFastMdec");
-
- val=0;
- if(pB)
- {
- strcpy(t,"\nOGLExtensions");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) val=atoi(p+len);
- if(val<0) val=0;
- if(val>1) val=1;
- }
- if(val) SETCHECK("chkExtensions");
-
- val=0;
- if(pB)
- {
- strcpy(t,"\nScreenSmoothing");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) val=atoi(p+len);
- if(val<0) val=0;
- if(val>1) val=1;
- }
- if(val) SETCHECK("chkBlur");
-
- val=0;
- if(pB)
- {
- strcpy(t,"\nUseFixes");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) val=atoi(p+len);
- if(val<0) val=0;
- if(val>1) val=1;
- }
- if(val) SETCHECK("chkGameFixes");
-
- val=0;
- if(pB)
- {
- strcpy(t,"\nCfgFixes");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
- if(p) val=atoi(p+len);
- }
-
- for(len=0;len<18;len++)
- {
- if(val & (1<<len))
- {
- sprintf(t,"chkFix%d",len);
- SETCHECK(t);
- }
- }
-
- if(pB) free(pB);
-
- gtk_widget_show (CfgWnd);
- gtk_main ();
- return 0;
+// Widgets
+GtkWidget *window,
+ *btnCancel,
+ *btnSave,
+ *spinXSize,
+ *spinYSize,
+ *chkKeepRatio,
+		 *chkForceRatio43,
+ *chkDithering,
+ *chkFullScreen,
+ *cbxTexQuality,
+ *cbxTexFiltering,
+ *cbxHiResTex,
+ *spinVRam,
+ *chkShowFPS,
+ *chkUseFPSLimit,
+ *vboxFPSLimit,
+ *radFPSLimitAuto,
+ *radFPSLimitManual,
+ *spinFPSLimit,
+ *chkUseFrameSkipping,
+ *cbxOffscreen,
+ *cbxFBTex,
+ *cbxFBAccess,
+ *chkMaskDetect,
+ *chkOpaquePass,
+ *chkAdvancedBlend,
+ *chkScanLines,
+ *spinScanLinesBlend,
+ *chkFastMdec,
+ *chk15bitMdec,
+ *chkLineMode,
+ *chkAntiAlias,
+ *chkOGLExtensions,
+ *chkScreenSmoothing,
+		 *chkGteAccuracy,
+ *chkUseGameFixes,
+ *tblGameFixes,
+ *chkCfgFix1,
+ *chkCfgFix2,
+ *chkCfgFix4,
+ *chkCfgFix8,
+ *chkCfgFix16,
+ *chkCfgFix32,
+ *chkCfgFix64,
+ *chkCfgFix128,
+ *chkCfgFix256,
+ *chkCfgFix512,
+ *chkCfgFix1024,
+ *chkCfgFix2048,
+ *chkCfgFix4096,
+ *chkCfgFix8192,
+ *chkCfgFix16384,
+ *chkCfgFix32768,
+ *chkCfgFix65536,
+ *chkCfgFix131072,
+ *btnFast,
+ *btnBeautiful;
+
+// Save values to the config file
+void on_btnSave_clicked( GObject *object, gpointer user_data ) {
+ FILE *out;
+ out = fopen( "gpuPeopsMesaGL.cfg", "w+" );
+
+ if ( out != NULL ) {
+
+ // Computes the 'fixes' bitfield
+ int cfgFixes = 0;
+ if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkCfgFix1 ) ) ) { cfgFixes |= (1 << 0); }
+ if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkCfgFix2 ) ) ) { cfgFixes |= (1 << 1); }
+ if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkCfgFix4 ) ) ) { cfgFixes |= (1 << 2); }
+ if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkCfgFix8 ) ) ) { cfgFixes |= (1 << 3); }
+ if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkCfgFix16 ) ) ) { cfgFixes |= (1 << 4); }
+ if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkCfgFix32 ) ) ) { cfgFixes |= (1 << 5); }
+ if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkCfgFix64 ) ) ) { cfgFixes |= (1 << 6); }
+ if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkCfgFix128 ) ) ) { cfgFixes |= (1 << 7); }
+ if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkCfgFix256 ) ) ) { cfgFixes |= (1 << 8); }
+ if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkCfgFix512 ) ) ) { cfgFixes |= (1 << 9); }
+ if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkCfgFix1024 ) ) ) { cfgFixes |= (1 << 10); }
+ if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkCfgFix2048 ) ) ) { cfgFixes |= (1 << 11); }
+ if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkCfgFix4096 ) ) ) { cfgFixes |= (1 << 12); }
+ if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkCfgFix8192 ) ) ) { cfgFixes |= (1 << 13); }
+ if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkCfgFix16384 ) ) ) { cfgFixes |= (1 << 14); }
+ if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkCfgFix32768 ) ) ) { cfgFixes |= (1 << 15); }
+ if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkCfgFix65536 ) ) ) { cfgFixes |= (1 << 16); }
+ if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkCfgFix131072 ) ) ) { cfgFixes |= (1 << 17); }
+
+ // Print data to the config file
+ fprintf( out, "\nResX = %i", gtk_spin_button_get_value_as_int( GTK_SPIN_BUTTON( spinXSize ) ) );
+ fprintf( out, "\nResY = %i", gtk_spin_button_get_value_as_int( GTK_SPIN_BUTTON( spinYSize ) ) ); 
+ fprintf( out, "\nKeepRatio = %i", gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkKeepRatio ) ) );
+		fprintf( out, "\nForceRatio43 = %i", gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkForceRatio43 ) ) );
+ fprintf( out, "\nDithering = %i", gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkDithering ) ) );
+ fprintf( out, "\nFullScreen = %i", gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkFullScreen ) ) );
+ fprintf( out, "\nTexQuality = %i", gtk_combo_box_get_active( GTK_COMBO_BOX( cbxTexQuality ) ) );
+ fprintf( out, "\nTexFilter = %i", gtk_combo_box_get_active( GTK_COMBO_BOX( cbxTexFiltering ) ) );
+ fprintf( out, "\nHiResTextures = %i", gtk_combo_box_get_active( GTK_COMBO_BOX( cbxHiResTex ) ) );
+ fprintf( out, "\nVRamSize = %i", gtk_spin_button_get_value_as_int( GTK_SPIN_BUTTON( spinVRam ) ) ); 
+ fprintf( out, "\nShowFPS = %i", gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkShowFPS ) ) );
+ fprintf( out, "\nUseFrameLimit = %i", gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkUseFPSLimit ) ) );
+ fprintf( out, "\nFPSDetection = %i", gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( radFPSLimitAuto ) ) );
+ fprintf( out, "\nFrameRate = %i", gtk_spin_button_get_value_as_int( GTK_SPIN_BUTTON( spinFPSLimit ) ) );
+ fprintf( out, "\nUseFrameSkip = %i", gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkUseFrameSkipping ) ) );
+ fprintf( out, "\nOffscreenDrawing = %i", gtk_combo_box_get_active( GTK_COMBO_BOX( cbxOffscreen ) ) );
+ fprintf( out, "\nFrameTextures = %i", gtk_combo_box_get_active( GTK_COMBO_BOX( cbxFBTex ) ) );
+ fprintf( out, "\nFrameAccess = %i", gtk_combo_box_get_active( GTK_COMBO_BOX( cbxFBAccess ) ) );
+ fprintf( out, "\nMaskDetect = %i", gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkMaskDetect ) ) );
+ fprintf( out, "\nOpaquePass = %i", gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkOpaquePass ) ) );
+ fprintf( out, "\nAdvancedBlend = %i", gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkAdvancedBlend ) ) );
+ fprintf( out, "\nScanLines = %i", gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkScanLines ) ) );
+ fprintf( out, "\nScanLinesBlend = %i", gtk_spin_button_get_value_as_int( GTK_SPIN_BUTTON( spinScanLinesBlend ) ) );
+ fprintf( out, "\nFastMdec = %i", gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkFastMdec ) ) );
+ fprintf( out, "\n15bitMdec = %i", gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chk15bitMdec ) ) );
+ fprintf( out, "\nLineMode = %i", gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkLineMode ) ) );
+ fprintf( out, "\nAntiAlias = %i", gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkAntiAlias ) ) );
+ fprintf( out, "\nOGLExtensions = %i", gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkOGLExtensions ) ) );
+ fprintf( out, "\nScreenSmoothing = %i", gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkScreenSmoothing ) ) );
+ fprintf( out, "\nUseFixes = %i", gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkUseGameFixes ) ) );
+ fprintf( out, "\nCfgFixes = %i", cfgFixes );
+		fprintf( out, "\nGteAccuracy = %i", gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkGteAccuracy ) ) );
+
+ fclose( out );
+ }
+
+ gtk_main_quit();
 }
 
-////////////////////////////////////////////////////////////////////////////////////////////////
-
-void SetCfgVal(char * pB,char * pE,int val)
-{
- char * p, *ps, *pC;char t[32];
-
- sprintf(t,"%d",val);
-
- p=strstr(pB,pE);
- if(p)
- {
- p=strstr(p,"=");
- if(!p) return;
- p++;
- while(*p && *p!='\n' && *p!='-' && (*p<'0' || *p>'9')) p++;
- if(*p==0 || *p=='\n') return;
- ps=p;
- while((*p>='0' && *p<='9') || *p=='-') p++;
- pC=(char *)malloc(32767);
- strcpy(pC,p);
- strcpy(ps,t);
- strcat(pB,pC);
- free(pC);
- }
- else
- {
- strcat(pB,pE);
- strcat(pB," = ");
- strcat(pB,t);
- strcat(pB,"\n");
- }
+// Autoconfiguration callbacks
+
+void on_btnFast_clicked( GObject *object, gpointer user_data ) {
+ gtk_spin_button_set_value( GTK_SPIN_BUTTON( spinXSize ), 640 );
+ gtk_spin_button_set_value( GTK_SPIN_BUTTON( spinYSize ), 480 );
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkKeepRatio ), 0 );
+	gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkForceRatio43 ), 0 );
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkDithering ), 0 );
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkFullScreen ), 0 );
+ gtk_combo_box_set_active( GTK_COMBO_BOX( cbxTexQuality ), 0 );
+ gtk_combo_box_set_active( GTK_COMBO_BOX( cbxTexFiltering ), 0 );
+ gtk_combo_box_set_active( GTK_COMBO_BOX( cbxHiResTex ), 0 );
+ gtk_spin_button_set_value( GTK_SPIN_BUTTON( spinVRam ), 0 );
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkShowFPS ), 0 );
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkUseFPSLimit ), 1 );
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( radFPSLimitAuto ), 1 );
+ gtk_spin_button_set_value( GTK_SPIN_BUTTON( spinFPSLimit ), 200 );
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkUseFrameSkipping ), 0 );
+ gtk_combo_box_set_active( GTK_COMBO_BOX( cbxOffscreen ), 1 );
+ gtk_combo_box_set_active( GTK_COMBO_BOX( cbxFBTex ), 1 );
+ gtk_combo_box_set_active( GTK_COMBO_BOX( cbxFBAccess ), 0 );
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkMaskDetect ), 0 );
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkOpaquePass ), 1 );
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkAdvancedBlend ), 0 );
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkScanLines ), 0 );
+ gtk_spin_button_set_value( GTK_SPIN_BUTTON( spinScanLinesBlend ), 0 );
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkFastMdec ), 1 );
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chk15bitMdec ), 1 );
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkLineMode ), 0 );
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkAntiAlias ), 0 );
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkOGLExtensions ), 1 );
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkScreenSmoothing ), 0 );
+	gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkGteAccuracy ), 0 );
 }
 
-////////////////////////////////////////////////////////////////////////////////////////////////
-
-#define GETEDITVAL(winame) atoi(gtk_entry_get_text(GTK_ENTRY((GtkWidget*) gtk_object_get_data (GTK_OBJECT (wndMain),winame))))
-#define GETCHECK(winame) gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON ((GtkWidget*) gtk_object_get_data (GTK_OBJECT (wndMain),winame)))?1:0
-#define GETLIST(winame) atoi(gtk_entry_get_text(GTK_ENTRY(GTK_COMBO((GtkWidget*) gtk_object_get_data (GTK_OBJECT (wndMain),winame))->entry)))
-
-void SaveConfig(void)
-{
- FILE *in;int len,val;char * pB;char t[16];
-
- pB=(char *)malloc(32767);
- memset(pB,0,32767);
-
- in = fopen("gpuPeopsMesaGL.cfg","rb");
- if(in)
- {
- len = fread(pB, 1, 32767, in);
- fclose(in); 
- }
-
- ///////////////////////////////////////////////////////////////////////////////
-
- val=GETEDITVAL("edtXSize");
- if(val<10) val=10;
- SetCfgVal(pB,"\nResX",val);
-
- val=GETEDITVAL("edtYSize");
- if(val<10) val=10;
- SetCfgVal(pB,"\nResY",val);
-
- val=GETCHECK("chkKeepRatio");
- SetCfgVal(pB,"\nKeepRatio",val);
-
- val=GETEDITVAL("edtMaxTex");
- if(val<0) val=0;
- if(val>1024) val=1024;
- SetCfgVal(pB,"\nVRamSize",val);
-
- val=GETCHECK("chk15bitMdec");
- SetCfgVal(pB,"\n15bitMdec",val);
-
- val=GETLIST("cmbHiresTex");
- SetCfgVal(pB,"\nHiResTextures",val);
-
- val=GETCHECK("chkFullScreen");
- SetCfgVal(pB,"\nFullScreen",val);
-
- val=GETCHECK("chkScanlines");
- SetCfgVal(pB,"\nScanLines",val);
-
- val=GETEDITVAL("edtScanBlend");
- if(val<-1) val=-1;
- if(val>255) val=255;
- SetCfgVal(pB,"\nScanLinesBlend",val);
-
- val=GETLIST("cmbFrameTex");
- SetCfgVal(pB,"\nFrameTextures",val);
-
- val=GETLIST("cmbFrameAcc");
- SetCfgVal(pB,"\nFrameAccess",val);
-
- val=GETLIST("cmbFilter");
- SetCfgVal(pB,"\nTexFilter",val);
-
- val=GETCHECK("chkABlend");
- SetCfgVal(pB,"\nAdvancedBlend",val);
-
- val=GETCHECK("chkDither");
- SetCfgVal(pB,"\nDithering",val);
-
- val=GETCHECK("chkLinemode");
- SetCfgVal(pB,"\nLineMode",val);
-
- val=GETCHECK("chkShowFPS");
- SetCfgVal(pB,"\nShowFPS",val);
-
- val=GETCHECK("chkFPSLimit");
- SetCfgVal(pB,"\nUseFrameLimit",val);
-
- val=GETCHECK("chkFPSSkip");
- SetCfgVal(pB,"\nUseFrameSkip",val);
-
- val=GETCHECK("rdbLimAuto");
- if(val) val=1; else val=0;
- SetCfgVal(pB,"\nFPSDetection",val);
-
- val=GETEDITVAL("edtFPSlim");
- if(val<0) val=0;
- if(val>1000) val=1000;
- SetCfgVal(pB,"\nFrameRate",val);
-
- val=GETLIST("cmbOffscreen");
- SetCfgVal(pB,"\nOffscreenDrawing",val);
-
- val=GETCHECK("chkOpaque");
- SetCfgVal(pB,"\nOpaquePass",val);
-
- val=GETCHECK("chkAntiA");
- SetCfgVal(pB,"\nAntiAlias",val);
-
- val=GETLIST("cmbQuality");
- SetCfgVal(pB,"\nTexQuality",val);
-
- val=GETCHECK("chkMaskBit");
- SetCfgVal(pB,"\nMaskDetect",val);
-
- val=GETCHECK("chkFastMdec");
- SetCfgVal(pB,"\nFastMdec",val);
-
- val=GETCHECK("chkExtensions");
- SetCfgVal(pB,"\nOGLExtensions",val);
-
- val=GETCHECK("chkBlur");
- SetCfgVal(pB,"\nScreenSmoothing",val);
+void on_btnBeautiful_clicked( GObject *object, gpointer user_data ) {
+ gtk_spin_button_set_value( GTK_SPIN_BUTTON( spinXSize ), 640 );
+ gtk_spin_button_set_value( GTK_SPIN_BUTTON( spinYSize ), 480 );
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkKeepRatio ), 0 );
+	gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkForceRatio43 ), 0 );
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkDithering ), 0 );
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkFullScreen ), 0 );
+ gtk_combo_box_set_active( GTK_COMBO_BOX( cbxTexQuality ), 3 );
+ gtk_combo_box_set_active( GTK_COMBO_BOX( cbxTexFiltering ), 0 );
+ gtk_combo_box_set_active( GTK_COMBO_BOX( cbxHiResTex ), 0 );
+ gtk_spin_button_set_value( GTK_SPIN_BUTTON( spinVRam ), 0 );
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkShowFPS ), 0 );
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkUseFPSLimit ), 1 );
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( radFPSLimitAuto ), 1 );
+ gtk_spin_button_set_value( GTK_SPIN_BUTTON( spinFPSLimit ), 200 );
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkUseFrameSkipping ), 0 );
+ gtk_combo_box_set_active( GTK_COMBO_BOX( cbxOffscreen ), 3 );
+ gtk_combo_box_set_active( GTK_COMBO_BOX( cbxFBTex ), 2 );
+ gtk_combo_box_set_active( GTK_COMBO_BOX( cbxFBAccess ), 0 );
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkMaskDetect ), 1 );
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkOpaquePass ), 1 );
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkAdvancedBlend ), 1 );
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkScanLines ), 0 );
+ gtk_spin_button_set_value( GTK_SPIN_BUTTON( spinScanLinesBlend ), 0 );
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkFastMdec ), 0 );
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chk15bitMdec ), 0 );
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkLineMode ), 0 );
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkAntiAlias ), 0 );
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkOGLExtensions ), 1 );
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkScreenSmoothing ), 0 ); 
+	gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkGteAccuracy ), 0 ); 
+}
 
- val=GETCHECK("chkGameFixes");
- SetCfgVal(pB,"\nUseFixes",val);
+// Callbacks used to toggle the sensitivity of some parts of the GUI
 
- val=0;
- for(len=0;len<18;len++)
- {
- sprintf(t,"chkFix%d",len);
- if(GETCHECK(t)) val|=(1<<len);
- }
- SetCfgVal(pB,"\nCfgFixes",val);
+void on_chkUseGameFixes_toggled( GObject *object, gpointer user_data ) {
+ gtk_widget_set_sensitive( tblGameFixes, gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkUseGameFixes ) ) );
+}
 
- ///////////////////////////////////////////////////////////////////////////////
+void on_chkUseFPSLimit_toggled( GObject *object, gpointer user_data ) {
+ gtk_widget_set_sensitive( vboxFPSLimit, gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkUseFPSLimit ) ) );
+}
 
- if((in=fopen("gpuPeopsMesaGL.cfg","wb"))!=NULL)
- {
- fwrite(pB,strlen(pB),1,in);
- fclose(in);
- }
+void on_radFPSLimitManual_toggled( GObject *object, gpointer user_data ) {
+ gtk_widget_set_sensitive( spinFPSLimit, gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( radFPSLimitManual ) ) );
+}
 
- free(pB);
+void on_chkScanLines_toggled( GObject *object, gpointer user_data ) {
+ gtk_widget_set_sensitive( spinScanLinesBlend, gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkScanLines ) ) );
 }
 
+/* Instanciates the GUI
+ Reads the config file
+ Sets widget states according to the config file
+ Connect callbacks to signals */
+int main( int argc, char **argv ) {
+ GtkBuilder *builder;
+ GError *error = NULL;
+ FILE *in;
+ char *pB, *p;
+ int len, val;
+ char t[256];
 
+#ifdef ENABLE_NLS
+ setlocale (LC_ALL, "");
+ bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR);
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ textdomain (GETTEXT_PACKAGE);
+#endif
 
+ gtk_init( &argc, &argv );
+
+	if (argc < 2) {
+		printf ("Usage: cfgpeopsxgl {about | configure}\n");
+		return 0;
+	}
+
+	if (strcmp(argv[1], "configure") != 0 && 
+		strcmp(argv[1], "about") != 0) {
+		printf ("Usage: cfgpeopsxgl {about | configure}\n");
+		return 0;
+	}
+	
+ builder = gtk_builder_new();
+
+ // Load the glade file
+ if ( !gtk_builder_add_from_file( builder, DATADIR "peopsxgl.ui", &error ) ) {
+ g_warning( "%s", error->message );
+ g_free( error );
+ return( 1 );
+ }
+
+ // Display the About dialog when the emulator ask for it
+ if ( argv[1] && strcmp( argv[1], "about" ) == 0 ) {
+ GtkWidget *widget;
+ const char *authors[]= {"Adapted from P.E.Op.S OpenGL GPU by Pete Bernert", NULL};
+
+ widget = gtk_about_dialog_new();
+ gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(widget), "OpenGL GPU Driver");
+ gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(widget), "1.18");
+ gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(widget), authors);
+ gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(widget), "http://pcsxr.codeplex.com/");
+
+ gtk_dialog_run(GTK_DIALOG(widget));
+ gtk_widget_destroy(widget);
+
+ return 0;
+ }
+	else {
+		// Get widgets from the glade file
+		window = GTK_WIDGET( gtk_builder_get_object( builder, "MainDialog" ) );
+		btnCancel = GTK_WIDGET( gtk_builder_get_object( builder, "btnCancel" ) );
+		btnSave = GTK_WIDGET( gtk_builder_get_object( builder, "btnSave" ) );
+		spinXSize = GTK_WIDGET( gtk_builder_get_object( builder, "spinXSize" ) );
+		spinYSize = GTK_WIDGET( gtk_builder_get_object( builder, "spinYSize" ) );
+		chkKeepRatio = GTK_WIDGET( gtk_builder_get_object( builder, "chkKeepRatio" ) );
+		chkForceRatio43 = GTK_WIDGET( gtk_builder_get_object( builder, "chkForceRatio43" ) );
+		chkDithering = GTK_WIDGET( gtk_builder_get_object( builder, "chkDithering" ) );
+		chkFullScreen = GTK_WIDGET( gtk_builder_get_object( builder, "chkFullScreen" ) );
+		cbxTexQuality = GTK_WIDGET( gtk_builder_get_object( builder, "cbxTexQuality" ) );
+		cbxTexFiltering = GTK_WIDGET( gtk_builder_get_object( builder, "cbxTexFiltering" ) );
+		cbxHiResTex = GTK_WIDGET( gtk_builder_get_object( builder, "cbxHiResTex" ) );
+		spinVRam = GTK_WIDGET( gtk_builder_get_object( builder, "spinVRam" ) );
+		chkShowFPS = GTK_WIDGET( gtk_builder_get_object( builder, "chkShowFPS" ) );
+		chkUseFPSLimit = GTK_WIDGET( gtk_builder_get_object( builder, "chkUseFPSLimit" ) );
+		vboxFPSLimit = GTK_WIDGET( gtk_builder_get_object( builder, "vboxFPSLimit" ) );
+		radFPSLimitAuto = GTK_WIDGET( gtk_builder_get_object( builder, "radFPSLimitAuto" ) );
+		radFPSLimitManual = GTK_WIDGET( gtk_builder_get_object( builder, "radFPSLimitManual" ) );
+		spinFPSLimit = GTK_WIDGET( gtk_builder_get_object( builder, "spinFPSLimit" ) );
+		chkUseFrameSkipping = GTK_WIDGET( gtk_builder_get_object( builder, "chkUseFrameSkipping" ) );
+		cbxOffscreen = GTK_WIDGET( gtk_builder_get_object( builder, "cbxOffscreen" ) );
+		cbxFBTex = GTK_WIDGET( gtk_builder_get_object( builder, "cbxFBTex" ) );
+		cbxFBAccess = GTK_WIDGET( gtk_builder_get_object( builder, "cbxFBAccess" ) );
+		chkMaskDetect = GTK_WIDGET( gtk_builder_get_object( builder, "chkMaskDetect" ) );
+		chkOpaquePass = GTK_WIDGET( gtk_builder_get_object( builder, "chkOpaquePass" ) );
+		chkAdvancedBlend = GTK_WIDGET( gtk_builder_get_object( builder, "chkAdvancedBlend" ) );
+		chkScanLines = GTK_WIDGET( gtk_builder_get_object( builder, "chkScanLines" ) );
+		spinScanLinesBlend = GTK_WIDGET( gtk_builder_get_object( builder, "spinScanLinesBlend" ) );
+		chkFastMdec = GTK_WIDGET( gtk_builder_get_object( builder, "chkFastMdec" ) );
+		chk15bitMdec = GTK_WIDGET( gtk_builder_get_object( builder, "chk15bitMdec" ) );
+		chkLineMode = GTK_WIDGET( gtk_builder_get_object( builder, "chkLineMode" ) );
+		chkAntiAlias = GTK_WIDGET( gtk_builder_get_object( builder, "chkAntiAlias" ) );
+		chkOGLExtensions = GTK_WIDGET( gtk_builder_get_object( builder, "chkOGLExtensions" ) );
+		chkScreenSmoothing = GTK_WIDGET( gtk_builder_get_object( builder, "chkScreenSmoothing" ) );
+		chkGteAccuracy = GTK_WIDGET( gtk_builder_get_object( builder, "chkGteAccuracy" ) );
+		chkUseGameFixes = GTK_WIDGET( gtk_builder_get_object( builder, "chkUseGameFixes" ) );
+		tblGameFixes = GTK_WIDGET( gtk_builder_get_object( builder, "tblGameFixes" ) );
+		chkCfgFix1 = GTK_WIDGET( gtk_builder_get_object( builder, "chkCfgFix1" ) );
+		chkCfgFix2 = GTK_WIDGET( gtk_builder_get_object( builder, "chkCfgFix2" ) );
+		chkCfgFix4 = GTK_WIDGET( gtk_builder_get_object( builder, "chkCfgFix4" ) );
+		chkCfgFix8 = GTK_WIDGET( gtk_builder_get_object( builder, "chkCfgFix8" ) );
+		chkCfgFix16 = GTK_WIDGET( gtk_builder_get_object( builder, "chkCfgFix16" ) );
+		chkCfgFix32 = GTK_WIDGET( gtk_builder_get_object( builder, "chkCfgFix32" ) );
+		chkCfgFix64 = GTK_WIDGET( gtk_builder_get_object( builder, "chkCfgFix64" ) );
+		chkCfgFix128 = GTK_WIDGET( gtk_builder_get_object( builder, "chkCfgFix128" ) );
+		chkCfgFix256 = GTK_WIDGET( gtk_builder_get_object( builder, "chkCfgFix256" ) );
+		chkCfgFix512 = GTK_WIDGET( gtk_builder_get_object( builder, "chkCfgFix512" ) );
+		chkCfgFix1024 = GTK_WIDGET( gtk_builder_get_object( builder, "chkCfgFix1024" ) );
+		chkCfgFix2048 = GTK_WIDGET( gtk_builder_get_object( builder, "chkCfgFix2048" ) );
+		chkCfgFix4096 = GTK_WIDGET( gtk_builder_get_object( builder, "chkCfgFix4096" ) );
+		chkCfgFix8192 = GTK_WIDGET( gtk_builder_get_object( builder, "chkCfgFix8192" ) );
+		chkCfgFix16384 = GTK_WIDGET( gtk_builder_get_object( builder, "chkCfgFix16384" ) );
+		chkCfgFix32768 = GTK_WIDGET( gtk_builder_get_object( builder, "chkCfgFix32768" ) );
+		chkCfgFix65536 = GTK_WIDGET( gtk_builder_get_object( builder, "chkCfgFix65536" ) );
+		chkCfgFix131072 = GTK_WIDGET( gtk_builder_get_object( builder, "chkCfgFix131072" ) );
+		btnFast = GTK_WIDGET( gtk_builder_get_object( builder, "btnFast" ) );
+		btnBeautiful = GTK_WIDGET( gtk_builder_get_object( builder, "btnBeautiful" ) );
+
+		// Read the config file
+		in = fopen( "gpuPeopsMesaGL.cfg", "rb" );
+		if ( in ) {
+			pB = (char *) malloc( 32767 );
+			memset( pB, 0, 32767 );
+			len = fread( pB, 1, 32767, in );
+			fclose(in);
+		}
+		else pB = 0;
+
+		val = 640;
+		if ( pB ) {
+			strcpy( t, "\nResX" );
+			p = strstr( pB, t );
+			if ( p ) {
+				p = strstr( p, "=" );
+				len = 1;
+				val = atoi( p + len );
+			}
+		}
+		gtk_spin_button_set_value( GTK_SPIN_BUTTON( spinXSize ), val );
+
+		val = 480;
+		if ( pB ) {
+			strcpy( t, "\nResY" );
+			p = strstr( pB, t );
+			if ( p ) {
+				p = strstr( p, "=" );
+				len = 1;
+				val = atoi( p + len );
+			}
+		}
+		gtk_spin_button_set_value( GTK_SPIN_BUTTON( spinYSize ), val );
+
+		val = 0;
+		if ( pB ) {
+			strcpy( t, "\nKeepRatio" );
+			p = strstr( pB, t );
+			if ( p ) {
+				p = strstr( p, "=" );
+				len = 1;
+				val = atoi( p + len );
+			}
+		}
+		gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkKeepRatio ), val );
+
+		val = 0;
+		if ( pB ) {
+			strcpy( t, "\nForceRatio43" );
+			p = strstr( pB, t );
+			if ( p ) {
+				p = strstr( p, "=" );
+				len = 1;
+				val = atoi( p + len );
+			}
+		}
+		gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkForceRatio43 ), val );
+
+		val = 0;
+		if ( pB ) {
+			strcpy( t, "\nDithering" );
+			p = strstr( pB, t );
+			if ( p ) {
+				p = strstr( p, "=" );
+				len = 1;
+				val = atoi( p + len );
+			}
+		}
+		gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkDithering ), val );
+
+		val = 0;
+		if ( pB ) {
+			strcpy( t, "\nFullScreen" );
+			p = strstr( pB, t );
+			if ( p ) {
+				p = strstr( p, "=" );
+				len = 1;
+				val = atoi( p + len );
+			}
+		}
+		gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkFullScreen ), val );
+		
+		val = 0;
+		if ( pB ) {
+			strcpy( t, "\nTexQuality" );
+			p = strstr( pB, t );
+			if ( p ) {
+				p = strstr( p, "=" );
+				len = 1;
+				val = atoi( p + len );
+			}
+		}
+		gtk_combo_box_set_active( GTK_COMBO_BOX( cbxTexQuality ), val );
+
+		val = 0;
+		if ( pB ) {
+			strcpy( t, "\nTexFilter" );
+			p = strstr( pB, t );
+			if ( p ) {
+				p = strstr( p, "=" );
+				len = 1;
+				val = atoi( p + len );
+			}
+		}
+		gtk_combo_box_set_active( GTK_COMBO_BOX( cbxTexFiltering ), val );
+
+		val = 0;
+		if ( pB ) {
+			strcpy( t, "\nHiResTextures" );
+			p = strstr( pB, t );
+			if ( p ) {
+				p = strstr( p, "=" );
+				len = 1;
+				val = atoi( p + len );
+			}
+		}
+		gtk_combo_box_set_active( GTK_COMBO_BOX( cbxHiResTex ), val );
+
+		val = 0;
+		if ( pB ) {
+			strcpy(t,"\nVRamSize");
+			p = strstr( pB, t );
+			if ( p ) {
+				p = strstr( p, "=" );
+				len = 1;
+				val = atoi( p + len );
+			}
+		}
+		gtk_spin_button_set_value( GTK_SPIN_BUTTON( spinVRam ), val );
+
+		val = 0;
+		if ( pB ) {
+			strcpy( t, "\nShowFPS" );
+			p = strstr( pB, t );
+			if ( p ) {
+				p = strstr( p, "=" );
+				len = 1;
+				val = atoi( p + len );
+			}
+		}
+		gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkShowFPS ), val );
+
+		val = 1;
+		if ( pB ) {
+			strcpy( t, "\nUseFrameLimit" );
+			p = strstr( pB, t );
+			if ( p ) {
+				p = strstr( p, "=" );
+				len = 1;
+				val = atoi( p + len );
+			}
+		}
+		gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkUseFPSLimit ), val );
+
+		val = 1;
+		if ( pB ) {
+			strcpy( t, "\nFPSDetection" );
+			p = strstr( pB, t );
+			if ( p ) {
+				p = strstr( p, "=" );
+				len = 1;
+				val = atoi( p + len );
+			}
+		}
+		gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( radFPSLimitAuto ), val );
+
+		val = 200;
+		if ( pB ) {
+			strcpy(t,"\nFrameRate");
+			p = strstr( pB, t );
+			if ( p ) {
+				p = strstr( p, "=" );
+				len = 1;
+				val = atoi( p + len );
+			}
+		}
+		gtk_spin_button_set_value( GTK_SPIN_BUTTON( spinFPSLimit ), val );
+
+		val = 0;
+		if ( pB ) {
+			strcpy( t, "\nUseFrameSkip" );
+			p = strstr( pB, t );
+			if ( p ) {
+				p = strstr( p, "=" );
+				len = 1;
+				val = atoi( p + len );
+			}
+		}
+		gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkUseFrameSkipping ), val );
+
+		val = 2;
+		if ( pB ) {
+			strcpy( t, "\nOffscreenDrawing" );
+			p = strstr( pB, t );
+			if ( p ) {
+				p = strstr( p, "=" );
+				len = 1;
+				val = atoi( p + len );
+			}
+		}
+		gtk_combo_box_set_active( GTK_COMBO_BOX( cbxOffscreen ), val );
+		
+		val = 1;
+		if ( pB ) {
+			strcpy( t, "\nFrameTextures" );
+			p = strstr( pB, t );
+			if ( p ) {
+				p = strstr( p, "=" );
+				len = 1;
+				val = atoi( p + len );
+			}
+		}
+		gtk_combo_box_set_active( GTK_COMBO_BOX( cbxFBTex ), val );
+		
+		val = 0;
+		if ( pB ) {
+			strcpy( t, "\nFrameAccess" );
+			p = strstr( pB, t );
+			if ( p ) {
+				p = strstr( p, "=" );
+				len = 1;
+				val = atoi( p + len );
+			}
+		}
+		gtk_combo_box_set_active( GTK_COMBO_BOX( cbxFBAccess ), val );
+
+		val = 0;
+		if ( pB ) {
+			strcpy( t, "\nMaskDetect" );
+			p = strstr( pB, t );
+			if ( p ) {
+				p = strstr( p, "=" );
+				len = 1;
+				val = atoi( p + len );
+			}
+		}
+		gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkMaskDetect ), val );
+
+		val = 1;
+		if ( pB ) {
+			strcpy( t, "\nOpaquePass" );
+			p = strstr( pB, t );
+			if ( p ) {
+				p = strstr( p, "=" );
+				len = 1;
+				val = atoi( p + len );
+			}
+		}
+		gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkOpaquePass ), val );
+
+		val = 0;
+		if ( pB ) {
+			strcpy( t, "\nAdvancedBlend" );
+			p = strstr( pB, t );
+			if ( p ) {
+				p = strstr( p, "=" );
+				len = 1;
+				val = atoi( p + len );
+			}
+		}
+		gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkAdvancedBlend ), val );
+
+		val = 0;
+		if ( pB ) {
+			strcpy( t, "\nScanLines" );
+			p = strstr( pB, t );
+			if ( p ) {
+				p = strstr( p, "=" );
+				len = 1;
+				val = atoi( p + len );
+			}
+		}
+		gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkScanLines ), val );
+
+		val = 0;
+		if ( pB ) {
+			strcpy(t,"\nScanLinesBlend");
+			p = strstr( pB, t );
+			if ( p ) {
+				p = strstr( p, "=" );
+				len = 1;
+				val = atoi( p + len );
+			}
+		}
+		gtk_spin_button_set_value( GTK_SPIN_BUTTON( spinScanLinesBlend ), val );
+
+		val = 1;
+		if ( pB ) {
+			strcpy( t, "\nFastMdec" );
+			p = strstr( pB, t );
+			if ( p ) {
+				p = strstr( p, "=" );
+				len = 1;
+				val = atoi( p + len );
+			}
+		}
+		gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkFastMdec ), val );
+
+		val = 0;
+		if ( pB ) {
+			strcpy( t, "\n15bitMdec" );
+			p = strstr( pB, t );
+			if ( p ) {
+				p = strstr( p, "=" );
+				len = 1;
+				val = atoi( p + len );
+			}
+		}
+		gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chk15bitMdec ), val );
+
+		val = 0;
+		if ( pB ) {
+			strcpy( t, "\nLineMode" );
+			p = strstr( pB, t );
+			if ( p ) {
+				p = strstr( p, "=" );
+				len = 1;
+				val = atoi( p + len );
+			}
+		}
+		gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkLineMode ), val );
+
+		val = 0;
+		if ( pB ) {
+			strcpy( t, "\nAntiAlias" );
+			p = strstr( pB, t );
+			if ( p ) {
+				p = strstr( p, "=" );
+				len = 1;
+				val = atoi( p + len );
+			}
+		}
+		gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkAntiAlias ), val );
+
+		val = 0;
+		if ( pB ) {
+			strcpy( t, "\nOGLExtensions" );
+			p = strstr( pB, t );
+			if ( p ) {
+				p = strstr( p, "=" );
+				len = 1;
+				val = atoi( p + len );
+			}
+		}
+		gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkOGLExtensions ), val );
+
+		val = 0;
+		if ( pB ) {
+			strcpy( t, "\nScreenSmoothing" );
+			p = strstr( pB, t );
+			if ( p ) {
+				p = strstr( p, "=" );
+				len = 1;
+				val = atoi( p + len );
+			}
+		}
+		gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkScreenSmoothing ), val );
+
+		val = 0;
+		if ( pB ) {
+			strcpy( t, "\nGteAccuracy" );
+			p = strstr( pB, t );
+			if ( p ) {
+				p = strstr( p, "=" );
+				len = 1;
+				val = atoi( p + len );
+			}
+		}
+		gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkGteAccuracy ), val );
+		
+		val = 0;
+		if ( pB ) {
+			strcpy( t, "\nUseFixes" );
+			p = strstr( pB, t );
+			if ( p ) {
+				p = strstr( p, "=" );
+				len = 1;
+				val = atoi( p + len );
+			}
+		}
+		gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkUseGameFixes ), val );
+
+		val = 0;
+		if ( pB ) {
+			strcpy( t, "\nCfgFixes" );
+			p = strstr( pB, t );
+			if ( p ) {
+				p = strstr( p, "=" );
+				len = 1;
+				val = atoi( p + len );
+			}
+		}
+		if ( val & (1 << 17) ) { gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkCfgFix131072 ), TRUE ); }
+		if ( val & (1 << 16) ) { gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkCfgFix65536 ), TRUE ); }
+		if ( val & (1 << 15) ) { gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkCfgFix32768 ), TRUE ); }
+		if ( val & (1 << 14) ) { gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkCfgFix16384 ), TRUE ); }
+		if ( val & (1 << 13) ) { gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkCfgFix8192 ), TRUE ); }
+		if ( val & (1 << 12) ) { gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkCfgFix4096 ), TRUE ); }
+		if ( val & (1 << 11) ) { gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkCfgFix2048 ), TRUE ); }
+		if ( val & (1 << 10) ) { gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkCfgFix1024 ), TRUE ); }
+		if ( val & (1 << 9) ) { gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkCfgFix512 ), TRUE ); }
+		if ( val & (1 << 8) ) { gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkCfgFix256 ), TRUE ); }
+		if ( val & (1 << 7) ) { gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkCfgFix128 ), TRUE ); }
+		if ( val & (1 << 6) ) { gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkCfgFix64 ), TRUE ); }
+		if ( val & (1 << 5) ) { gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkCfgFix32 ), TRUE ); }
+		if ( val & (1 << 4) ) { gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkCfgFix16 ), TRUE ); }
+		if ( val & (1 << 3) ) { gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkCfgFix8 ), TRUE ); }
+		if ( val & (1 << 2) ) { gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkCfgFix4 ), TRUE ); }
+		if ( val & (1 << 1) ) { gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkCfgFix2 ), TRUE ); }
+		if ( val & (1 << 0) ) { gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkCfgFix1 ), TRUE ); }
+
+		gtk_builder_connect_signals( builder, NULL );
+		
+		g_object_unref( G_OBJECT( builder ) );
+
+		// Connect callbacks to signals
+		g_signal_connect(G_OBJECT( window ), "destroy", G_CALLBACK( gtk_main_quit ), NULL );
+		g_signal_connect(G_OBJECT( btnCancel ), "clicked", G_CALLBACK( gtk_main_quit ), NULL );
+		g_signal_connect(G_OBJECT( btnSave ), "clicked", G_CALLBACK( on_btnSave_clicked ), NULL );
+		g_signal_connect(G_OBJECT( chkUseGameFixes ), "toggled", G_CALLBACK( on_chkUseGameFixes_toggled ), NULL );
+		g_signal_connect(G_OBJECT( chkUseFPSLimit ), "toggled", G_CALLBACK( on_chkUseFPSLimit_toggled ), NULL );
+		g_signal_connect(G_OBJECT( radFPSLimitManual ), "toggled", G_CALLBACK( on_radFPSLimitManual_toggled ), NULL );
+		g_signal_connect(G_OBJECT( chkScanLines ), "toggled", G_CALLBACK( on_chkScanLines_toggled ), NULL );
+		g_signal_connect(G_OBJECT( btnFast ), "clicked", G_CALLBACK( on_btnFast_clicked ), NULL );
+		g_signal_connect(G_OBJECT( btnBeautiful ), "clicked", G_CALLBACK( on_btnBeautiful_clicked ), NULL );
+
+		// Call some callbacks to ensure widget state consistency
+		on_chkUseGameFixes_toggled( G_OBJECT( chkUseGameFixes ), NULL );
+		on_chkUseFPSLimit_toggled( G_OBJECT( chkUseFPSLimit ), NULL );
+		on_radFPSLimitManual_toggled( G_OBJECT( radFPSLimitManual ), NULL );
+		on_chkScanLines_toggled( G_OBJECT( chkScanLines ), NULL );
+
+		gtk_widget_show( window );
+
+		gtk_main();
+	}
+	
+ return 0;
+}

pcsxr-1.9.93.tar.bz2/plugins/peopsxgl/gpucfg/peopsxgl.ui Added

@@ -0,0 +1,1422 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ 
+ <object class="GtkDialog" id="MainDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">OpenGL Driver configuration</property>
+ <property name="resizable">False</property>
+ <property name="window_position">center</property>
+ <property name="type_hint">normal</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkNotebook" id="notebook1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <child>
+ <object class="GtkVBox" id="vbox2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">10</property>
+ <property name="spacing">5</property>
+ <child>
+ <object class="GtkTable" id="table2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">5</property>
+ <property name="row_spacing">5</property>
+ <child>
+ <object class="GtkSpinButton" id="spinXSize">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="adjustment">x</property>
+ <property name="numeric">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="spinYSize">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="adjustment">y</property>
+ <property name="numeric">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Width:</property>
+ </object>
+ <packing>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Height:</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="chkFullScreen">
+ <property name="label" translatable="yes">Fullscreen</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="chkDithering">
+ <property name="label" translatable="yes">Dithering</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="chkKeepRatio">
+ <property name="label" translatable="yes">Keep psx aspect ratio</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="chkForceRatio43">
+ <property name="label" translatable="yes">Force 4:3 aspect ratio</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Window options</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">10</property>
+ <property name="spacing">5</property>
+ <child>
+ <object class="GtkTable" id="table3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">3</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">5</property>
+ <property name="row_spacing">5</property>
+ <child>
+ <object class="GtkLabel" id="label9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Quality:</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Filtering:</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label11">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">HiRes Tex:</property>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="cbxTexQuality">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="model">liststore6</property>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertext6"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="cbxTexFiltering">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="model">liststore5</property>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertext5"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="cbxHiResTex">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="model">liststore4</property>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertext4"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">5</property>
+ <child>
+ <object class="GtkLabel" id="label12">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">VRam size in MBytes (0..1024, 0=auto):</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="spinVRam">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="adjustment">v</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Textures</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">10</property>
+ <property name="spacing">5</property>
+ <child>
+ <object class="GtkCheckButton" id="chkShowFPS">
+ <property name="label" translatable="yes">Show FPS display on startup</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="chkUseFPSLimit">
+ <property name="label" translatable="yes">Use FPS limit</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">20</property>
+ <child>
+ <object class="GtkVBox" id="vboxFPSLimit">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">5</property>
+ <child>
+ <object class="GtkRadioButton" id="radFPSLimitAuto">
+ <property name="label" translatable="yes">FPS limit auto-detector</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">radFPSLimitManual</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">5</property>
+ <child>
+ <object class="GtkRadioButton" id="radFPSLimitManual">
+ <property name="label" translatable="yes">FPS limit manual</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="spinFPSLimit">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="adjustment">f</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label13">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">FPS</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="chkUseFrameSkipping">
+ <property name="label" translatable="yes">Use Frame skipping</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Framerate</property>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">10</property>
+ <property name="spacing">5</property>
+ <child>
+ <object class="GtkTable" id="table4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">3</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">5</property>
+ <property name="row_spacing">5</property>
+ <child>
+ <object class="GtkLabel" id="label14">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Offscreen drawing:</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label15">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Framebuffer textures:</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label16">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Framebuffer access:</property>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="cbxOffscreen">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="model">liststore3</property>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertext3"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="cbxFBTex">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="model">liststore2</property>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertext2"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="cbxFBAccess">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="model">liststore1</property>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertext1"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="chkMaskDetect">
+ <property name="label" translatable="yes">Mask bit detection (Needed by a few games, zbuffer)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="chkOpaquePass">
+ <property name="label" translatable="yes">Alpha multipass (Correct opaque texture areas)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="chkAdvancedBlend">
+ <property name="label" translatable="yes">Advanced blending (Accurate psx color emulation)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Compatibility</property>
+ </object>
+ <packing>
+ <property name="position">3</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">10</property>
+ <property name="spacing">5</property>
+ <child>
+ <object class="GtkHBox" id="hbox3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">5</property>
+ <child>
+ <object class="GtkCheckButton" id="chkScanLines">
+ <property name="label" translatable="yes">Scanlines Blending (0..255, -1=dot):</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="spinScanLinesBlend">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="adjustment">s</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="chkFastMdec">
+ <property name="label" translatable="yes">Unfiltered MDECs (Small movie speedup)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="chk15bitMdec">
+ <property name="label" translatable="yes">Force 15 bit framebuffer updates (Faster movies)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="chkLineMode">
+ <property name="label" translatable="yes">Line mode (Polygons will not get filled)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="chkAntiAlias">
+ <property name="label" translatable="yes">Polygon anti-aliasing (Slow with most cards)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="chkOGLExtensions">
+ <property name="label" translatable="yes">Use OpenGL extensions (Recommended)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="chkScreenSmoothing">
+ <property name="label" translatable="yes">Screen smoothing (Can be slow or unsupported)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">6</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="chkGteAccuracy">
+ <property name="label" translatable="yes">Gte accuracy</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">7</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Misc</property>
+ </object>
+ <packing>
+ <property name="position">4</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">10</property>
+ <property name="spacing">5</property>
+ <child>
+ <object class="GtkCheckButton" id="chkUseGameFixes">
+ <property name="label" translatable="yes">Use game fixes</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">20</property>
+ <child>
+ <object class="GtkTable" id="tblGameFixes">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">9</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">5</property>
+ <property name="row_spacing">5</property>
+ <child>
+ <object class="GtkCheckButton" id="chkCfgFix1">
+ <property name="label" translatable="yes">Battle cursor (FF7)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="chkCfgFix512">
+ <property name="label" translatable="yes">Yellow rect (FF9)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="chkCfgFix2">
+ <property name="label" translatable="yes">Direct FB updates</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="chkCfgFix4">
+ <property name="label" translatable="yes">Black brightness (Lunar)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="chkCfgFix8">
+ <property name="label" translatable="yes">Swap front detection</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="chkCfgFix16">
+ <property name="label" translatable="yes">Disable coord check</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="chkCfgFix32">
+ <property name="label" translatable="yes">No blue glitches (LoD)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="chkCfgFix64">
+ <property name="label" translatable="yes">Soft FB access</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="chkCfgFix128">
+ <property name="label" translatable="yes">PC FPS calculation</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">7</property>
+ <property name="bottom_attach">8</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="chkCfgFix256">
+ <property name="label" translatable="yes">Old frame skipping</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">8</property>
+ <property name="bottom_attach">9</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="chkCfgFix1024">
+ <property name="label" translatable="yes">No subtr. blending</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="chkCfgFix2048">
+ <property name="label" translatable="yes">Lazy upload (DW7)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="chkCfgFix4096">
+ <property name="label" translatable="yes">Odd/even hack</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="chkCfgFix8192">
+ <property name="label" translatable="yes">Adjust screen width</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="chkCfgFix16384">
+ <property name="label" translatable="yes">Old texture filtering</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="chkCfgFix32768">
+ <property name="label" translatable="yes">Additional uploads</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="chkCfgFix65536">
+ <property name="label" translatable="yes">Unused</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">7</property>
+ <property name="bottom_attach">8</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="chkCfgFix131072">
+ <property name="label" translatable="yes">Fake 'GPU busy'</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">8</property>
+ <property name="bottom_attach">9</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Special game fixes</property>
+ </object>
+ <packing>
+ <property name="position">5</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="btnFast">
+ <property name="label" translatable="yes">Fast</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip_text" translatable="yes">Autoconfigure for fast display</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ <property name="secondary">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="btnBeautiful">
+ <property name="label" translatable="yes">Beautiful</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip_text" translatable="yes">Auto configure for beautiful display</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ <property name="secondary">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="btnSave">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="btnCancel">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">btnFast</action-widget>
+ <action-widget response="0">btnBeautiful</action-widget>
+ <action-widget response="0">btnSave</action-widget>
+ <action-widget response="0">btnCancel</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkAdjustment" id="f">
+ <property name="lower">20</property>
+ <property name="upper">200</property>
+ <property name="value">60</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkListStore" id="liststore1">
+ <columns>
+ 
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Emulated VRam - Ok most times</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Gfx card buffer reads</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Gfx card buffer moves</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Gfx card buffer reads and moves</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Full Software (FVP)</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="liststore2">
+ <columns>
+ 
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Emulated VRam - Needs FVP</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Black - Fast, no effects</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Gfx card buffer - Can be slow</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Gfx card and soft - Slow</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="liststore3">
+ <columns>
+ 
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">None - Fastest, most glitches</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Minimum - Missing screens</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Standard - OK for most games</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Enhanced - Shows more stuff</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Extended - Causing garbage</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="liststore4">
+ <columns>
+ 
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">None (Standard)</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">2xSaI (Much vram needed)</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Scaled (Needs tex filtering)</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="liststore5">
+ <columns>
+ 
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">None</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Standard - Glitches will happen</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Extended - No black borders</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Standard without sprites - Unfiltered 2D</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Extended without sprites - Unfiltered 2D</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Standard + smoothed sprites</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Extended + smoothed sprites</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="liststore6">
+ <columns>
+ 
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Don't care - Use driver's default textures</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">4444 - Fast, but less colorful</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">5551 - Nice colors, bad transparency</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">8888 - Best colors, more ram needed</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">BGR8888 - Faster on some cards</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkAdjustment" id="s">
+ <property name="lower">-1</property>
+ <property name="upper">255</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="v">
+ <property name="upper">1024</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="x">
+ <property name="upper">9999</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="y">
+ <property name="upper">9999</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+</interface>

pcsxr-1.9.93.tar.bz2/plugins/peopsxgl/gte_accuracy.c Added

@@ -0,0 +1,68 @@
+/***************************************************************************
+ * Copyright (C) 2011 by Blade_Arma *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
+ ***************************************************************************/
+
+#include "stdafx.h"
+#include "externals.h"
+
+#include <math.h>
+
+// TODO: use malloc and pointer to the array's center.
+float gteCoords[0x800 * 2][0x800 * 2][2];
+
+void CALLBACK GPUaddVertex(short sx, short sy, long long fx, long long fy, long long fz)
+{
+	if(bGteAccuracy)
+	{
+		if(sx >= -0x800 && sx <= 0x7ff &&
+		 sy >= -0x800 && sy <= 0x7ff)
+		{
+			gteCoords[sy + 0x800][sx + 0x800][0] = fx / 65536.0f;
+			gteCoords[sy + 0x800][sx + 0x800][1] = fy / 65536.0f;
+		}
+	}
+}
+
+void resetGteVertices()
+{
+	if(bGteAccuracy)
+	{
+		memset(gteCoords, 0x00, sizeof(gteCoords));
+	}
+}
+
+int getGteVertex(short sx, short sy, float *fx, float *fy)
+{
+	if(bGteAccuracy)
+	{
+		if(sx >= -0x800 && sx <= 0x7ff &&
+		 sy >= -0x800 && sy <= 0x7ff)
+		{
+			if((fabsf(gteCoords[sy + 0x800][sx + 0x800][0] - sx) < 1.0) &&
+			 (fabsf(gteCoords[sy + 0x800][sx + 0x800][1] - sy) < 1.0))
+			{
+				*fx = gteCoords[sy + 0x800][sx + 0x800][0];
+				*fy = gteCoords[sy + 0x800][sx + 0x800][1];
+				
+				return 1;
+			}
+		}
+	}
+	
+	return 0;
+}

pcsxr-1.9.93.tar.bz2/plugins/peopsxgl/gte_accuracy.h Added

@@ -0,0 +1,26 @@
+/***************************************************************************
+ *   Copyright (C) 2011 by Blade_Arma                                      *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
+ ***************************************************************************/
+
+#ifndef _GTE_ACCURACY_H_
+#define _GTE_ACCURACY_H_
+
+extern void resetGteVertices();
+extern int getGteVertex(short sx, short sy, float *fx, float *fy);
+
+#endif // _GTE_ACCURACY_H_

pcsxr-1.9.92.tar.bz2/plugins/peopsxgl/key.c -> pcsxr-1.9.93.tar.bz2/plugins/peopsxgl/key.c Changed

@@ -1,173 +1,201 @@
-/***************************************************************************
- key.c - description
- -------------------
- begin : Sun Mar 08 2009
- copyright : (C) 1999-2009 by Pete Bernert
- web : www.pbernert.com 
- ***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. See also the license.txt file for *
- * additional informations. *
- * *
- ***************************************************************************/
-
-#include "stdafx.h"
-
-#define _IN_KEY
-
-#include "externals.h"
-#include "menu.h"
-#include "texture.h"
-#include "draw.h"
-#include "fps.h"
-
-////////////////////////////////////////////////////////////////////////
-// KeyBoard handler stuff
-////////////////////////////////////////////////////////////////////////
-
-uint32_t ulKeybits = 0; 
-
-////////////////////////////////////////////////////////////////////////
-// keyboard handler (LINUX)
-////////////////////////////////////////////////////////////////////////
-
-#define VK_INSERT 65379
-#define VK_HOME 65360
-#define VK_PRIOR 65365
-#define VK_NEXT 65366
-#define VK_END 65367
-#define VK_DEL 65535
-#define VK_F5 65474
-
-void GPUkeypressed(int keycode)
-{
- switch(keycode)
- {
- case VK_F5:
- bSnapShot=1;
- break;
-
- case VK_INSERT:
- ulKeybits|=KEY_RESETTEXSTORE;
- if(iBlurBuffer) iBlurBuffer=0;
- else iBlurBuffer=1;
- break;
-
- case VK_DEL: 
- if(ulKeybits&KEY_SHOWFPS)
- {
- ulKeybits&=~KEY_SHOWFPS;
- HideText();
- DestroyPic();
- }
- else 
- {
- ulKeybits|=KEY_SHOWFPS;
- szDispBuf[0]=0;
- BuildDispMenu(0);
-
- }
- break;
-
- case VK_PRIOR: BuildDispMenu(-1); break;
- case VK_NEXT: BuildDispMenu( 1); break;
- case VK_END: SwitchDispMenu( 1); break;
- case VK_HOME: SwitchDispMenu(-1); break;
- }
-
-}
-
-void InitKeyHandler(void)
-{
-}
-
-void ExitKeyHandler(void)
-{
-}
-
-////////////////////////////////////////////////////////////////////////
-// reset stuff on special keyboard commands
-////////////////////////////////////////////////////////////////////////
-
-void ResetStuff(void)
-{
- ResetTextureArea(TRUE);
- ulKeybits&=~KEY_RESETTEXSTORE;
-
- if(ulKeybits&KEY_BLACKWHITE)
- {
- if(bUseFixes) {bUseFixes=FALSE;dwActFixes=0;}
- else {bUseFixes=TRUE; dwActFixes=dwCfgFixes;}
- SetExtGLFuncs();
- if(iFrameLimit==2) SetAutoFrameCap();
- ulKeybits&=~KEY_BLACKWHITE;
- }
-
- if(ulKeybits&KEY_RESETFILTER)
- {
- if(ulKeybits&KEY_STEPDOWN)
- iFilterType--;
- else iFilterType++;
- if(iFilterType>6) iFilterType=0;
- if(iFilterType<0) iFilterType=6;
- SetExtGLFuncs();
- ulKeybits&=~(KEY_RESETFILTER|KEY_STEPDOWN);
- BuildDispMenu(0);
- }
-
- if(ulKeybits&KEY_RESETOPAQUE)
- {
- bOpaquePass=!bOpaquePass;
- SetExtGLFuncs();
- ulKeybits&=~KEY_RESETOPAQUE;
- BuildDispMenu(0);
- }
-
- if(ulKeybits&KEY_RESETADVBLEND)
- {
- bAdvancedBlend=!bAdvancedBlend;
- SetExtGLFuncs();
- ulKeybits&=~KEY_RESETADVBLEND;
- BuildDispMenu(0);
- }
-
- if(ulKeybits&KEY_RESETDITHER)
- {
- bDrawDither=!bDrawDither;
- if(bDrawDither) glEnable(GL_DITHER); 
- else glDisable(GL_DITHER); 
- ulKeybits&=~KEY_RESETDITHER;
- BuildDispMenu(0);
- }
-
- if(ulKeybits & KEY_TOGGLEFBTEXTURE)
- {
- if(ulKeybits&KEY_STEPDOWN)
- iFrameTexType--;
- else iFrameTexType++;
- if(iFrameTexType>3) iFrameTexType=0;
- if(iFrameTexType<0) iFrameTexType=3;
- if(gTexFrameName!=0) 
- glDeleteTextures(1, &gTexFrameName); 
- gTexFrameName=0; 
- ulKeybits&=~(KEY_TOGGLEFBTEXTURE|KEY_STEPDOWN);
- }
-
- if(ulKeybits & KEY_TOGGLEFBREAD)
- {
- if(ulKeybits&KEY_STEPDOWN)
- iFrameReadType--;
- else iFrameReadType++;
- if(iFrameReadType>4) iFrameReadType=0;
- if(iFrameReadType<0) iFrameReadType=4;
- if(iFrameReadType==4) bFullVRam=TRUE;
- else bFullVRam=FALSE;
- iRenderFVR=0;
- ulKeybits&=~(KEY_TOGGLEFBREAD|KEY_STEPDOWN);
- }
-}
+/***************************************************************************
+ key.c - description
+ -------------------
+ begin : Sun Mar 08 2009
+ copyright : (C) 1999-2009 by Pete Bernert
+ web : www.pbernert.com
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+#include "stdafx.h"
+
+#define _IN_KEY
+
+#include "externals.h"
+#include "menu.h"
+#include "texture.h"
+#include "draw.h"
+#include "fps.h"
+
+////////////////////////////////////////////////////////////////////////
+// KeyBoard handler stuff
+////////////////////////////////////////////////////////////////////////
+
+uint32_t ulKeybits = 0;
+
+////////////////////////////////////////////////////////////////////////
+// keyboard handler (UNIX)
+////////////////////////////////////////////////////////////////////////
+#ifdef _MACGL
+#define VK_INSERT 114
+#define VK_HOME 115
+#define VK_PRIOR 116
+#define VK_NEXT 121
+#define VK_END 119
+#define VK_DEL 117
+#define VK_F5 96
+#else
+#define VK_INSERT 65379
+#define VK_HOME 65360
+#define VK_PRIOR 65365
+#define VK_NEXT 65366
+#define VK_END 65367
+#define VK_DEL 65535
+#define VK_F5 65474
+#endif
+
+void GPUkeypressed(int keycode)
+{
+/* arrives via the input plugin, so who knows what thread you're in */
+ switch(keycode)
+ {
+ case VK_F5:
+ bSnapShot=1;
+ break;
+
+ // maybe could somehow handle alt+enter
+ /*case XK_k:
+ //GPUclose();
+ bFullScreen = ( bFullScreen != 0 ? 0 : 1 );
+ GPUopen(disp, "2");
+ break;*/
+			 
+#ifndef _MACGL
+ case XK_section:
+ bUseFrameSkip=!bUseFrameSkip;
+ bUseFrameLimit=!bUseFrameLimit;
+ iFrameLimit = ( iFrameLimit != 0 ? 0 : 2 );
+ break;
+#endif
+
+ case VK_INSERT:
+ ulKeybits|=KEY_RESETTEXSTORE;
+ if(iBlurBuffer) iBlurBuffer=0;
+ else iBlurBuffer=1;
+ break;
+
+ case VK_DEL:
+ if(ulKeybits&KEY_SHOWFPS)
+ {
+ ulKeybits&=~KEY_SHOWFPS;
+ HideText();
+ DestroyPic();
+ }
+ else
+ {
+ ulKeybits|=KEY_SHOWFPS;
+ szDispBuf[0]=0;
+ BuildDispMenu(0);
+
+ }
+ break;
+
+ case VK_PRIOR: BuildDispMenu(-1); break;
+ case VK_NEXT: BuildDispMenu( 1); break;
+ case VK_END: SwitchDispMenu( 1); break;
+ case VK_HOME: SwitchDispMenu(-1); break;
+#if defined (_MACGL)
+ default: { void HandleKey(int keycode); HandleKey(keycode); };
+#endif
+ }
+
+}
+
+void InitKeyHandler(void)
+{
+}
+
+void ExitKeyHandler(void)
+{
+}
+
+////////////////////////////////////////////////////////////////////////
+// reset stuff on special keyboard commands
+////////////////////////////////////////////////////////////////////////
+
+void ResetStuff(void)
+{
+ ResetTextureArea(TRUE);
+ ulKeybits&=~KEY_RESETTEXSTORE;
+
+ if(ulKeybits&KEY_BLACKWHITE)
+ {
+ if(bUseFixes) {bUseFixes=FALSE;dwActFixes=0;}
+ else {bUseFixes=TRUE; dwActFixes=dwCfgFixes;}
+ SetExtGLFuncs();
+ if(iFrameLimit==2) SetAutoFrameCap();
+ ulKeybits&=~KEY_BLACKWHITE;
+ }
+
+ if(ulKeybits&KEY_RESETFILTER)
+ {
+ if(ulKeybits&KEY_STEPDOWN)
+ iFilterType--;
+ else iFilterType++;
+ if(iFilterType>6) iFilterType=0;
+ if(iFilterType<0) iFilterType=6;
+ SetExtGLFuncs();
+ ulKeybits&=~(KEY_RESETFILTER|KEY_STEPDOWN);
+ BuildDispMenu(0);
+ }
+
+ if(ulKeybits&KEY_RESETOPAQUE)
+ {
+ bOpaquePass=!bOpaquePass;
+ SetExtGLFuncs();
+ ulKeybits&=~KEY_RESETOPAQUE;
+ BuildDispMenu(0);
+ }
+
+ if(ulKeybits&KEY_RESETADVBLEND)
+ {
+ bAdvancedBlend=!bAdvancedBlend;
+ SetExtGLFuncs();
+ ulKeybits&=~KEY_RESETADVBLEND;
+ BuildDispMenu(0);
+ }
+
+ if(ulKeybits&KEY_RESETDITHER)
+ {
+ bDrawDither=!bDrawDither;
+ if(bDrawDither) glEnable(GL_DITHER);
+ else glDisable(GL_DITHER);
+ ulKeybits&=~KEY_RESETDITHER;
+ BuildDispMenu(0);
+ }
+
+ if(ulKeybits & KEY_TOGGLEFBTEXTURE)
+ {
+ if(ulKeybits&KEY_STEPDOWN)
+ iFrameTexType--;
+ else iFrameTexType++;
+ if(iFrameTexType>3) iFrameTexType=0;
+ if(iFrameTexType<0) iFrameTexType=3;
+ if(gTexFrameName!=0)
+ glDeleteTextures(1, &gTexFrameName);
+ gTexFrameName=0;
+ ulKeybits&=~(KEY_TOGGLEFBTEXTURE|KEY_STEPDOWN);
+ }
+
+ if(ulKeybits & KEY_TOGGLEFBREAD)
+ {
+ if(ulKeybits&KEY_STEPDOWN)
+ iFrameReadType--;
+ else iFrameReadType++;
+ if(iFrameReadType>4) iFrameReadType=0;
+ if(iFrameReadType<0) iFrameReadType=4;
+ if(iFrameReadType==4) bFullVRam=TRUE;
+ else bFullVRam=FALSE;
+ iRenderFVR=0;
+ ulKeybits&=~(KEY_TOGGLEFBREAD|KEY_STEPDOWN);
+ }
+}

pcsxr-1.9.92.tar.bz2/plugins/peopsxgl/key.h -> pcsxr-1.9.93.tar.bz2/plugins/peopsxgl/key.h Changed

@@ -1,21 +1,21 @@
-/***************************************************************************
-                          key.h  -  description
-                             -------------------
-    begin                : Sun Mar 08 2009
-    copyright            : (C) 1999-2009 by Pete Bernert
-    web                  : www.pbernert.com   
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version. See also the license.txt file for *
- *   additional informations.                                              *
- *                                                                         *
- ***************************************************************************/
-
-void InitKeyHandler(void);
-void ExitKeyHandler(void);
-void ResetStuff(void);
\ No newline at end of file
+/***************************************************************************
+                          key.h  -  description
+                             -------------------
+    begin                : Sun Mar 08 2009
+    copyright            : (C) 1999-2009 by Pete Bernert
+    web                  : www.pbernert.com
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+void InitKeyHandler(void);
+void ExitKeyHandler(void);
+void ResetStuff(void);

pcsxr-1.9.92.tar.bz2/plugins/peopsxgl/menu.c -> pcsxr-1.9.93.tar.bz2/plugins/peopsxgl/menu.c Changed

@@ -1,1443 +1,1581 @@
-/***************************************************************************
- menu.c - description
- -------------------
- begin : Sun Mar 08 2009
- copyright : (C) 1999-2009 by Pete Bernert
- web : www.pbernert.com 
- ***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. See also the license.txt file for *
- * additional informations. *
- * *
- ***************************************************************************/
-
-#include "stdafx.h"
-
-#define _IN_MENU
-
-#include "externals.h"
-#include "draw.h"
-#include "menu.h"
-#include "gpu.h"
-
-uint32_t dwCoreFlags=0;
-PSXPoint_t ptCursorPoint[8];
-unsigned short usCursorActive=0;
-
-////////////////////////////////////////////////////////////////////////
-// field with menu chars... like good old C64 time :)
-////////////////////////////////////////////////////////////////////////
-
-GLubyte texrasters[40][12]= {
-
-// 0,0 FPS
-{0x00,0x60,0x60,0x60,0x60,0x60,0x7e,0x60,0x60,0x60,0x60,0x7f},
-{0x00,0x18,0x18,0x18,0x18,0x18,0x1f,0x18,0x18,0x18,0x18,0x1f},
-{0x00,0x03,0x06,0x00,0x00,0x00,0xc3,0x66,0x66,0x66,0x66,0xc3},
-{0x00,0xf0,0x18,0x18,0x18,0x18,0xf0,0x00,0x00,0x00,0x18,0xf0},
-// 4,0 0
-{0x00,0x3c,0x66,0xc3,0xe3,0xf3,0xdb,0xcf,0xc7,0xc3,0x66,0x3c},
-// 5,0 1
-{0x00,0x7e,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x78,0x38,0x18},
-// 6,0 2
-{0x00,0xff,0xc0,0xc0,0x60,0x30,0x18,0x0c,0x06,0x03,0xe7,0x7e},
-// 7,0 3
-
-{0x00,0x7e,0xe7,0x03,0x03,0x07,0x7e,0x07,0x03,0x03,0xe7,0x7e},
-// 0,1 4
-{0x00,0x0c,0x0c,0x0c,0x0c,0x0c,0xff,0xcc,0x6c,0x3c,0x1c,0x0c},
-// 1,1 5
-{0x00,0x7e,0xe7,0x03,0x03,0x07,0xfe,0xc0,0xc0,0xc0,0xc0,0xff},
-// 2,1 6
-{0x00,0x7e,0xe7,0xc3,0xc3,0xc7,0xfe,0xc0,0xc0,0xc0,0xe7,0x7e},
-// 3,1 7
-{0x00,0x30,0x30,0x30,0x30,0x18,0x0c,0x06,0x03,0x03,0x03,0xff},
-// 4,1 8
-{0x00,0x7e,0xe7,0xc3,0xc3,0xe7,0x7e,0xe7,0xc3,0xc3,0xe7,0x7e},
-// 5,1 9
-{0x00,0x7e,0xe7,0x03,0x03,0x03,0x7f,0xe7,0xc3,0xc3,0xe7,0x7e},
-// 6,1 smiley
-{0x00,0x3c,0x42,0x99,0xa5,0x81,0xa5,0x81,0x42,0x3c,0x00,0x00},
-// 7,1 sun
-{0x00,0x08,0x49,0x2a,0x1c,0x7f,0x1c,0x2a,0x49,0x08,0x00,0x00},
-
-// 0,2 fl + empty box
-{0xff,0x81,0x81,0x81,0xff,0x00,0x87,0x84,0x84,0xf4,0x84,0xf8},
-// 1,2 fs + grey box
-{0xff,0xab,0xd5,0xab,0xff,0x00,0x87,0x81,0x87,0xf4,0x87,0xf8},
-// 2,2 od + filled box
-{0xff,0xff,0xff,0xff,0xff,0x00,0x66,0x95,0x95,0x95,0x96,0x60},
-// 3,2 fi + half grey box
-{0xff,0xa1,0xd1,0xa1,0xff,0x00,0x82,0x82,0x82,0xe2,0x82,0xf8},
-// 4,2 di + half filled box
-{0xff,0xf1,0xf1,0xf1,0xff,0x00,0xe2,0x92,0x92,0x92,0x92,0xe0},
-// 5,2 am + grey box
-{0xff,0xab,0xd5,0xab,0xff,0x00,0x95,0x95,0x95,0xf7,0x95,0x60},
-// 6,2 ab + filled box
-{0xff,0xff,0xff,0xff,0xff,0x00,0x97,0x95,0x96,0xf5,0x96,0x60},
-// 7,2 fa
-{0x00,0x00,0x00,0x00,0x00,0x00,0x85,0x85,0x87,0xf5,0x82,0xf8},
-
-// 0,3 fb
-{0xff,0x8b,0x85,0x8b,0xff,0x00,0x82,0x82,0x82,0xe2,0x87,0xf8},
-// 1,3 gf
-{0xff,0x8f,0x8f,0x8f,0xff,0x00,0x74,0x94,0x96,0xb4,0x87,0x70},
-// 2,3 D
-{0xff,0x00,0xfc,0xc6,0xc3,0xc3,0xc3,0xc3,0xc6,0xfc,0x00,0xff}, 
-// 3,3 G
-{0xff,0x00,0x3e,0x63,0xc3,0xc7,0xc0,0xc0,0x63,0x3e,0x00,0xff},
-// 4,3
-{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-// 5,3
-{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-// 6,3 tex pal smiley
-{0x00,0x3c,0x7e,0xe7,0xdb,0xff,0xdb,0xff,0x7e,0x3c,0x00,0x00},
-// 7,3
-{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-
-// 0,4 subtract blending (moon)
-{0x00,0x06,0x1c,0x38,0x78,0x78,0x78,0x38,0x1c,0x06,0x00,0x00},
-// 1,4 blurring
-{0x00,0x7e,0x93,0xa5,0x93,0xc9,0x93,0xa5,0x93,0x7e,0x00,0x00},
-// 2,4 (M)
-{0xff,0x00,0xc3,0xc3,0xc3,0xdb,0xff,0xe7,0xc3,0x81,0x00,0xff},
-// 3,4 (A)
-{0xff,0x00,0xc3,0xc3,0xff,0xc3,0xc3,0x66,0x3c,0x18,0x00,0xff},
-// 4,4 blank
-{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-// 5,4
-{0x00,0xfe,0xc5,0x62,0x35,0x18,0x0c,0xc6,0xc6,0x7c,0x00,0x00},
-// 6,4 <-
-{0x00,0x00,0x00,0x00,0x00,0x10,0x30,0x7f,0xff,0x7f,0x30,0x10},
-// 7,4 .
-{0x00,0x38,0x38,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}
-};
-
-////////////////////////////////////////////////////////////////////////
-// create lists/stuff for fonts 
-// (as a matter of fact: no more display list used, just a texture)
-////////////////////////////////////////////////////////////////////////
-
-GLuint gTexFontName=0;
-GLuint gTexPicName=0;
-GLuint gTexCursorName=0;
-
-void MakeDisplayLists(void) // MAKE FONT 
-{
- GLubyte TexBytes[64][64][3]; // we use a 64x64 texture
- int x,y,i,j,n=0; GLubyte col,IB;
-
- glPixelStorei(GL_UNPACK_ALIGNMENT,1);
- 
- memset(TexBytes,0,64*64*3);
-
- for(y=0;y<5;y++) // create texture out of raster infos
- {
- for(x=0;x<8;x++,n++)
- {
- for(i=0;i<12;i++)
- {
- IB=texrasters[n][i];
- for(j=0;j<8;j++)
- {
- if(IB&(1<<(7-j))) col=255; else col=0;
- TexBytes[y*12+i][x*8+j][0]=col;
- TexBytes[y*12+i][x*8+j][1]=col;
- TexBytes[y*12+i][x*8+j][2]=col;
- }
- }
- }
- }
-
- glGenTextures(1, &gTexFontName); // set tex params for font texture
- glBindTexture(GL_TEXTURE_2D, gTexFontName);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- glTexImage2D(GL_TEXTURE_2D, 0, 3, 64, 64, 0, GL_RGB,
- GL_UNSIGNED_BYTE,TexBytes);
-}
-
-////////////////////////////////////////////////////////////////////////
-// kill existing font stuff
-////////////////////////////////////////////////////////////////////////
-
-void KillDisplayLists(void)
-{
- if(gTexFontName) // del font/info textures
- {glDeleteTextures(1,&gTexFontName);gTexFontName=0;}
- if(gTexPicName) 
- {glDeleteTextures(1,&gTexPicName);gTexPicName=0;}
- if(gTexCursorName) 
- {glDeleteTextures(1,&gTexCursorName);gTexCursorName=0;}
-}
-
-////////////////////////////////////////////////////////////////////////
-// display text/infos in gpu menu
-////////////////////////////////////////////////////////////////////////
-
-#ifdef OWNSCALE
-#define DRAWTEXCHAR glTexCoord2f(fX1/256.0f,fY2/256.0f);glVertex3f(fXS1,fYS2,1.0f);glTexCoord2f(fX1/256.0f,fY1/256.0f);glVertex3f(fXS1,fYS1,1.0f);glTexCoord2f(fX2/256.0f,fY1/256.0f);glVertex3f(fXS2,fYS1,1.0f);glTexCoord2f(fX2/256.0f,fY2/256.0f);glVertex3f(fXS2,fYS2,1.0f);
-#else
-#define DRAWTEXCHAR glTexCoord2f(fX1,fY2);glVertex3f(fXS1,fYS2,1.0f);glTexCoord2f(fX1,fY1);glVertex3f(fXS1,fYS1,1.0f);glTexCoord2f(fX2,fY1);glVertex3f(fXS2,fYS1,1.0f);glTexCoord2f(fX2,fY2);glVertex3f(fXS2,fYS2,1.0f);
-#endif
-
-int iMPos=0;
-
-void DisplayText(void)
-{
- int iX,iY,i;
- GLfloat fX1,fY1,fX2,fY2,fYS1,fYS2,fXS1,fXS2,fXS,fXSC,fYSC,fYD;
-
- glDisable(GL_SCISSOR_TEST); // disable unwanted ogl states
- glDisable(GL_ALPHA_TEST);
- if(bOldSmoothShaded) {glShadeModel(GL_FLAT);bOldSmoothShaded=FALSE;}
- if(bBlendEnable) {glDisable(GL_BLEND);bBlendEnable=FALSE;}
- if(!bTexEnabled) {glEnable(GL_TEXTURE_2D);bTexEnabled=TRUE;}
-
- gTexName=gTexFontName;
- glBindTexture(GL_TEXTURE_2D,gTexFontName); // now set font texture
-
- fYD=fYSC=(GLfloat)PSXDisplay.DisplayMode.y/(GLfloat)iResY; // some pre-calculations
- fYS1=12.0f*fYSC;fYSC*=13.0f;
- fYS2=0.0f;
- fXS= (GLfloat)PSXDisplay.DisplayMode.x/(GLfloat)iResX;
- fXSC= 8.0f*fXS;fXS*=10.0f;
- fXS1=0.0f;
- fXS2=50.0f*fXS; // 3 is one option
-
-#ifdef OWNSCALE
- vertex[0].c.lcol=0xff00ff00; // set menu text color
-#else
- vertex[0].c.lcol=0xff00ffff; // set menu text color
-#endif
-
- SETCOL(vertex[0]); 
-
- glBegin(GL_QUADS);
-
-#ifdef OWNSCALE
- glTexCoord2f(128.0f/256.0f,240.0f/256.0f); // make blank (ownscale)
- glVertex3f(fXS1,fYS2,0.99996f);
- glTexCoord2f(128.0f/256.0f,192.0f/256.0f);
- glVertex3f(fXS1,fYSC,0.99996f);
- glTexCoord2f(160.0f/256.0f,192.0f/256.0f);
- glVertex3f(fXS2,fYSC,0.99996f);
- glTexCoord2f(160.0f/256.0f,240.0f/256.0f);
- glVertex3f(fXS2,fYS2,0.99996f);
-#else
- glTexCoord2f(128.0f,240.0f); // make blank
- glVertex3f(fXS1,fYS2,0.99996f);
- glTexCoord2f(128.0f,192.0f);
- glVertex3f(fXS1,fYSC,0.99996f);
- glTexCoord2f(160.0f,192.0f);
- glVertex3f(fXS2,fYSC,0.99996f);
- glTexCoord2f(160.0f,240.0f);
- glVertex3f(fXS2,fYS2,0.99996f);
-#endif
-
- fXS1=0.0f;fXS2=4.0f*fXSC; // draw fps
- fX1=0.0f; fX2=128.0f;
- fY1=0.0f; fY2=48.0f;
- DRAWTEXCHAR;
-
- fYSC=fXS1=3.0f*fXS; // start pos of numbers
-
- i=0;do // paint fps numbers
- {
- iX=4;iY=4;
- if(szDispBuf[i]>='0' && szDispBuf[i]<='3')
- {iX=4+szDispBuf[i]-'0';iY=0;}
- else
- if(szDispBuf[i]>='4' && szDispBuf[i]<='9')
- {iX=szDispBuf[i]-'4';iY=1;}
- else
- if(szDispBuf[i]=='.')
- {iX=7;iY=4;}
- else
- if(szDispBuf[i]==0) break;
-
- fX1=(GLfloat)iX*32.0f; fX2=fX1+32.0f;
- fY1=(GLfloat)iY*48.0f; fY2=fY1+48.0f;
- fXS1+=fXS;
- fXS2=fXS1+fXSC;
-
- DRAWTEXCHAR;
-
- i++;
- }
- while(i);
-
- //----------------------------------------------------//
- // draw small chars
- //----------------------------------------------------//
-
- fXS1=12.0f*fXS;fYS1=6.0f*fYD;
- fY1=120.0f;fY2=144.0f;
- fX1=0.0f;fX2=32.0f;
-
- for(i=0;i<8;i++)
- {
- fXS2=fXS1+fXSC;
- DRAWTEXCHAR;
- fX1+=32.0f;fX2+=32.0f;fXS1+=fYSC;
- }
-
- fY1=168.0f;fY2=192.0f;
- fX1=0.0f;fX2=32.0f;
-
- for(i=0;i<2;i++)
- {
- fXS2=fXS1+fXSC;
- DRAWTEXCHAR;
- fX1+=32.0f;fX2+=32.0f;fXS1+=fYSC;
- }
-
- //----------------------------------------------------//
-
- fYSC=fXS+fXS;
-
- fYS1=12.0f*fYD;
-
- if(iBlurBuffer && gTexBlurName) // blur
- {
- fXS1-=fXS;fY1=192.0f;fY2=240.0f;
- fXS2=fXS1+fXSC;fX1=32.0f;fX2=64.0f;
- DRAWTEXCHAR;
- fXS1+=fXS;
- }
-
- fY1=48.0f;fY2=96.0f;
- 
- if(bGLExt) // packed pixel
- {
- fXS2=fXS1+fXSC;fX1=192.0f;fX2=224.0f;
- DRAWTEXCHAR;
- }
-
- if(glColorTableEXTEx) // tex wnd pal
- { 
- fY1=144.0f;fY2=192.0f;
- fXS2=fXS1+fXSC;fX1=192.0f;
- if(bGLExt) {fX2=208.0f;fXS2-=fXSC/2.0f;}
- else fX2=224.0f;
- DRAWTEXCHAR;
- fY1=48.0f;fY2=96.0f;
- }
-
- if(!bUseMultiPass && glBlendEquationEXTEx) // multipass blend
- {
- fY1=192.0f;fY2=240.0f;
- fXS1+=fYSC-fXSC;fXS2=fXS1+fXSC;fX1=0.0f;fX2=32.0f;
- DRAWTEXCHAR;
- fXS1+=fXSC;
- fY1=48.0f;fY2=96.0f;
- }
- else fXS1+=fYSC;
-
- if(bGLBlend) // modulate2x
- {
- fXS2=fXS1+fXSC;fX1=224.0f;fX2=256.0f;
- DRAWTEXCHAR;
- }
-
- fY1=192.0f;fY2=240.0f;
-
- if(iHiResTextures) // 2x textures
- {
- fXS1+=fYSC-fXS;fXS2=fXS1+fXSC;
- fX1=160.0f;fX2=192.0f;
- DRAWTEXCHAR;
- fXS1+=fXS;
- }
- else fXS1+=fYSC;
-
- if(dwCoreFlags&1) //A 
- {
- fXS2=fXS1+fXSC;fX1=96.0f;fX2=128.0f;
- DRAWTEXCHAR;
- }
-
- if(dwCoreFlags&2) //M
- {
- fXS2=fXS1+fXSC;fX1=64.0f;fX2=96.0f;
- DRAWTEXCHAR;
- }
-
- // 00 -> digital, 01 -> analog, 02 -> mouse, 03 -> gun
- if(dwCoreFlags&0xff00) //A/M/G/D 
- {
- int k;
-
- fXS2=fXS1+fXSC;
-
- if((dwCoreFlags&0x0f00)==0x0000) // D
- {
- fY1=144.0f;fY2=192.0f;
- fX1=64.0f;fX2=96.0f;
- }
- else
- if((dwCoreFlags&0x0f00)==0x0100) // A
- {
- fX1=96.0f;fX2=128.0f;
- }
- else
- if((dwCoreFlags&0x0f00)==0x0200) // M
- {
- fX1=64.0f;fX2=96.0f;
- }
- else
- if((dwCoreFlags&0x0f00)==0x0300) // G
- {
- fY1=144.0f;fY2=192.0f;
- fX1=96.0f;fX2=128.0f;
- }
- DRAWTEXCHAR;
-
- k=(dwCoreFlags&0xf000)>>12; // number
- fXS1+=fXS;
- fXS2=fXS1+fXSC;
- iX=4;iY=4;
- if(k>=0 && k<=3)
- {iX=4+k;iY=0;}
- else
- if(k>=4 && k<=9)
- {iX=k-4;iY=1;}
- fX1=(GLfloat)iX*32.0f; fX2=fX1+32.0f;
- fY1=(GLfloat)iY*48.0f; fY2=fY1+48.0f;
- DRAWTEXCHAR;
- }
-
- fXS1+=fYSC;
-
- if(lSelectedSlot) // save state num
- {
- fXS2=fXS1+fXSC;
- iX=4;iY=4;
- if(lSelectedSlot>=0 && lSelectedSlot<=3)
- {iX=4+lSelectedSlot;iY=0;}
- else
- if(lSelectedSlot>=4 && lSelectedSlot<=9)
- {iX=lSelectedSlot-4;iY=1;}
- fX1=(GLfloat)iX*32.0f; fX2=fX1+32.0f;
- fY1=(GLfloat)iY*48.0f; fY2=fY1+48.0f;
- DRAWTEXCHAR;
- }
-
- fXS1=(GLfloat)(13+iMPos*3)*fXS;fXS2=fXS1+fXSC; // arrow
- fX1=192.0f; fX2=224.0f;
- fY1=192.0f; fY2=240.0f;
- DRAWTEXCHAR;
-
- /////////////////
-
- fXS1=12.0f*fXS;fXS2=fXS1+fXSC;
- fYS2=6.0f*fYD;fYSC=3.0f*fXS;
- fY1=96.0f;fY2=120.0f;
-
- if(bUseFrameLimit) // frame limit
- {
- if(iFrameLimit==2) {fX1=64.0f;fX2=96.0f;}
- else {fX1=32.0f;fX2=64.0f;}
- }
- else {fX1=0.0f ;fX2=32.0f;}
- DRAWTEXCHAR; 
- fXS1+=fYSC;fXS2=fXS1+fXSC;
-
- if(bUseFrameSkip) {fX1=64.0f;fX2=96.0f;} // frame skip
- else {fX1=0.0f ;fX2=32.0f;}
- DRAWTEXCHAR; 
- fXS1+=fYSC;fXS2=fXS1+fXSC;
-
- if(iOffscreenDrawing) fX1=(iOffscreenDrawing+2)*32.0f;// offscreen drawing
- else fX1=0.0f;
- fX2=fX1+32.0f;
- DRAWTEXCHAR; 
- fXS1+=fYSC;fXS2=fXS1+fXSC;
-
- if(iFilterType<5) fX1=iFilterType*32.0f; // texture filter
- else {fX1=(iFilterType-5)*32.0f;fY1=144.0f;fY2=168.0f;}
- fX2=fX1+32.0f; 
- DRAWTEXCHAR; 
- if(iFilterType>=5) {fY1=96.0f;fY2=120.0f;}
- fXS1+=fYSC;fXS2=fXS1+fXSC;
-
- if(bDrawDither) {fX1=64.0f;fX2=96.0f;} // dithering
- else {fX1=0.0f ;fX2=32.0f;}
- DRAWTEXCHAR; 
- fXS1+=fYSC;fXS2=fXS1+fXSC;
-
- if(bOpaquePass) {fX1=64.0f;fX2=96.0f;} // opaque pass
- else {fX1=0.0f ;fX2=32.0f;}
- DRAWTEXCHAR; 
- fXS1+=fYSC;fXS2=fXS1+fXSC;
-
- if(bAdvancedBlend) {fX1=64.0f;fX2=96.0f;} // advanced blend
- else {fX1=0.0f ;fX2=32.0f;}
- DRAWTEXCHAR; 
- fXS1+=fYSC;fXS2=fXS1+fXSC;
-
- if(!iFrameReadType) fX1=0.0f; // framebuffer reading
- else if(iFrameReadType==2) {fX1=0.0f;fY1=144.0f;fY2=168.0f;}
- else fX1=(iFrameReadType+2)*32.0f;
- fX2=fX1+32.0f;
- DRAWTEXCHAR; 
- if(iFrameReadType==2) {fY1=96.0f;fY2=120.0f;}
- fXS1+=fYSC;fXS2=fXS1+fXSC;
-
- if(iFrameTexType<2) fX1=iFrameTexType*32.0f; // frame texture
- else fX1=iFrameTexType*64.0f;
- fX2=fX1+32.0f;
- DRAWTEXCHAR; 
- fXS1+=fYSC;fXS2=fXS1+fXSC;
-
- if(dwActFixes) {fX1=64.0f;fX2=96.0f;} // game fixes
- else {fX1=0.0f ;fX2=32.0f;}
- DRAWTEXCHAR; 
- fXS1+=fYSC;fXS2=fXS1+fXSC;
-
- /////////////////
-
- glEnd();
-
- glEnable(GL_ALPHA_TEST); // repair needed states
- glEnable(GL_SCISSOR_TEST); 
-}
- 
-////////////////////////////////////////////////////////////////////////
-
-void HideText(void)
-{
- GLfloat fYS1,fYS2,fXS1,fXS2,fXS,fXSC,fYSC;
-
- glDisable(GL_SCISSOR_TEST); // turn off unneeded ogl states
- glDisable(GL_ALPHA_TEST);
- if(bOldSmoothShaded) {glShadeModel(GL_FLAT);bOldSmoothShaded=FALSE;}
- if(bBlendEnable) {glDisable(GL_BLEND);bBlendEnable=FALSE;}
- if(bTexEnabled) {glDisable(GL_TEXTURE_2D);bTexEnabled=FALSE;}
-
- fYSC=(GLfloat)PSXDisplay.DisplayMode.y/(GLfloat)iResY;
- fYS1=12.0f*fYSC;fYSC*=13.0f;
- fYS2=0.0f;
- fXS= (GLfloat)PSXDisplay.DisplayMode.x/(GLfloat)iResX;
- fXSC= 8.0f*fXS;fXS*=10.0f;
- fXS1=0.0f;
- fXS2=50.0f*fXS; 
-
- vertex[0].c.lcol=0xff000000; // black color
- SETCOL(vertex[0]); 
-
- glBegin(GL_QUADS); // make one quad
-
- glVertex3f(fXS1,fYS2,0.99996f);
- glVertex3f(fXS1,fYSC,0.99996f);
- glVertex3f(fXS2,fYSC,0.99996f);
- glVertex3f(fXS2,fYS2,0.99996f);
-
- glEnd();
- glEnable(GL_ALPHA_TEST); // enable needed ogl states
- glEnable(GL_SCISSOR_TEST); 
-}
-
-////////////////////////////////////////////////////////////////////////
-// Build Menu buffer (== Dispbuffer without FPS)
-////////////////////////////////////////////////////////////////////////
-
-void BuildDispMenu(int iInc)
-{
- if(!(ulKeybits&KEY_SHOWFPS)) return; // mmm, cheater ;)
-
- iMPos+=iInc; // up or down
- if(iMPos<0) iMPos=9; // wrap around
- if(iMPos>9) iMPos=0; 
-}
-
-////////////////////////////////////////////////////////////////////////
-// gpu menu actions...
-////////////////////////////////////////////////////////////////////////
-
-void SwitchDispMenu(int iStep)
-{
- if(!(ulKeybits&KEY_SHOWFPS)) return; // tststs
-
- switch(iMPos)
- {//////////////////////////////////////////////////////
- case 0: // frame limit
- {
- int iType=0;
- bInitCap = TRUE;
-
- if(bUseFrameLimit) iType=iFrameLimit;
- iType+=iStep;
- if(iType<0) iType=2;
- if(iType>2) iType=0;
- if(iType==0) bUseFrameLimit=FALSE;
- else
- {
- bUseFrameLimit=TRUE;
- iFrameLimit=iType;
- SetAutoFrameCap();
- }
- }
- break;
- //////////////////////////////////////////////////////
- case 1: // frame skip
- bInitCap = TRUE;
- bUseFrameSkip=!bUseFrameSkip;
- bSkipNextFrame=FALSE;
- break;
- //////////////////////////////////////////////////////
- case 2: // offscreen drawing
- iOffscreenDrawing+=iStep; 
- if(iOffscreenDrawing>4) iOffscreenDrawing=0;
- if(iOffscreenDrawing<0) iOffscreenDrawing=4;
- break;
- //////////////////////////////////////////////////////
- case 3: // filtering
- ulKeybits|=KEY_RESETTEXSTORE;
- ulKeybits|=KEY_RESETFILTER;
- if(iStep==-1) ulKeybits|=KEY_STEPDOWN;
- break;
- //////////////////////////////////////////////////////
- case 4: // dithering
- ulKeybits|=KEY_RESETTEXSTORE;
- ulKeybits|=KEY_RESETDITHER;
- break;
- //////////////////////////////////////////////////////
- case 5: // alpha multipass
- ulKeybits|=KEY_RESETTEXSTORE;
- ulKeybits|=KEY_RESETOPAQUE;
- break;
- //////////////////////////////////////////////////////
- case 6: // advanced blending
- ulKeybits|=KEY_RESETTEXSTORE;
- ulKeybits|=KEY_RESETADVBLEND;
- break;
- //////////////////////////////////////////////////////
- case 7: // full vram
- ulKeybits|=KEY_RESETTEXSTORE;
- ulKeybits|=KEY_TOGGLEFBREAD;
- if(iStep==-1) ulKeybits|=KEY_STEPDOWN;
- break;
- //////////////////////////////////////////////////////
- case 8: // frame buffer texture
- ulKeybits|=KEY_RESETTEXSTORE;
- ulKeybits|=KEY_TOGGLEFBTEXTURE;
- if(iStep==-1) ulKeybits|=KEY_STEPDOWN;
- break;
- //////////////////////////////////////////////////////
- case 9: // game fixes
- ulKeybits|=KEY_RESETTEXSTORE;
- ulKeybits|=KEY_BLACKWHITE;
- break;
- //////////////////////////////////////////////////////
- }
-
- BuildDispMenu(0); // update info
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////////
-// Here comes my painting zone... just to paint stuff... like 3DStudio ;)
-////////////////////////////////////////////////////////////////////////
-
-
-/*
- 12345678
-1
-2
-3
-4
-5
-6
-7
-8
-9
-0
-1
-2
-3
-
-
-{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}
-
-
- 12345678
-3
-2
-1
-0
-9
-8
-7
-6
-5 111
-4 111
-3
-2
-1
-
-{0x00,0x00,0x00,0x38,0x38,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}
-
-
- 12345678
-3 1111
-2 11 11
-111 11
-011 111
-911 1111
-811 11 11
-71111 11
-6111 11
-511 11
-4 11 11
-3 1111
-2
-1
-
-// 0
-{0x00,0x00,0x3c,0x66,0xc3,0xe3,0xf3,0xdb,0xcf,0xc7,0xc3,0x66,0x3c}
-// 1
-{0x00,0x00,0x7e,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x78,0x38,0x18}
-// 2
-{0x00,0x00,0xff,0xc0,0xc0,0x60,0x30,0x18,0x0c,0x06,0x03,0xe7,0x7e}
-// 3
-{0x00,0x00,0x7e,0xe7,0x03,0x03,0x07,0x7e,0x07,0x03,0x03,0xe7,0x7e}
-// 4
-{0x00,0x00,0x0c,0x0c,0x0c,0x0c,0x0c,0xff,0xcc,0x6c,0x3c,0x1c,0x0c}
-// 5
-{0x00,0x00,0x7e,0xe7,0x03,0x03,0x07,0xfe,0xc0,0xc0,0xc0,0xc0,0xff}
-// 6
-{0x00,0x00,0x7e,0xe7,0xc3,0xc3,0xc7,0xfe,0xc0,0xc0,0xc0,0xe7,0x7e}
-// 7
-{0x00,0x00,0x30,0x30,0x30,0x30,0x18,0x0c,0x06,0x03,0x03,0x03,0xff}
-// 8
-{0x00,0x00,0x7e,0xe7,0xc3,0xc3,0xe7,0x7e,0xe7,0xc3,0xc3,0xe7,0x7e}
-// 9
-{0x00,0x00,0x7e,0xe7,0x03,0x03,0x03,0x7f,0xe7,0xc3,0xc3,0xe7,0x7e}
-
- 12345678123456781234567812345678
-3 11111111 1111111 111111
-2 11 11 11 11 11
-1 11 11 11 11
-0 11 11 11 11
-9 11 11 11 11
-8 111111 1111111 111111
-7 11 11 11
-6 11 11 11
-5 11 11 11
-4 11 11 11 11
-3 11 11 111111
-2 
- 
-{0x00,0x60,0x60,0x60,0x60,0x60,0x7e,0x60,0x60,0x60,0x60,0x7f},
-{0x00,0x18,0x18,0x18,0x18,0x18,0x1f,0x18,0x18,0x18,0x18,0x1f},
-{0x00,0x03,0x06,0x00,0x00,0x00,0xc3,0x66,0x66,0x66,0x66,0xc3},
-{0x00,0xf0,0x18,0x18,0x18,0x18,0xf0,0x00,0x00,0x00,0x18,0xf0},
-
- 12345678
-311111111 0xff
-211 0xc0
-111 0xc0
-011 0xc0
-911 0xc0
-8111111 0xfc
-711 0xc0
-611 0xc0
-511 0xc0
-411 0xc0
-311 0xc0
-2 0x00
-1 0x00
-
-{0x00,0x00,0xc0,0xc0,0xc0,0xc0,0xc0,0x3f,0xc0,0xc0,0xc0,0xc0,0xff}
-
-
- 12345678
-31111111 0xfe
-211 11 0xc3
-111 11 0xc3
-011 11 0xc3
-911 11 0xc3
-81111111 0xfe
-711 0xc0
-611 0xc0
-511 0xc0
-411 0xc0
-311 0xc0
-2 0x00
-1 0x00
-
-
-{0x00,0x00,0xc0,0xc0,0xc0,0xc0,0xc0,0x7f,0xc3,0xc3,0xc3,0xc3,0x7f}
-
- 12345678
-3 111111 0x7e
-211 11 0xc3
-111 0xc0
-011 0xc0
-911 0xc0
-8 111111 0x7e
-7 11 0x03
-6 11 0x03
-5 11 0x03
-411 11 0xc3
-3 111111 0x7e
-2 0x00
-1 0x00
-
-{0x00,0x00,0x7e,0xc3,0x03,0x03,0x03,0x7e,0xc0,0xc0,0xc0,0xc3,0x7e}
-
- 12345678
-3 0x00
-2 1111111 0x7f
-1 11 0x60
-0 11 0x60
-9 11111 0x7c
-8 11 0x60
-7 11 0x60
-6 11 0x60
-5 0x00
-4 0x00
-3 0x00
-2 0x00
-1 0x00
-
-{0x00,0x00,0x00,0x00,0x00,0x60,0x60,0x60,0x7c,0x60,0x60,0x7f,0x00}
-
- 12345678
-3 0x00
-2 1111111 0x7f
-1 11 0x60
-0 11 0x60
-9 11111 0x7c
-8 11 0x60
-7 11 0x60
-6 11 0x60
-5 0x00
-4 1 0x08
-3 111 0x1c
-2 11111 0x3e
-1 1111111 0x7f
-
-{0x7f,0x3e,0x1c,0x08,0x00,0x60,0x60,0x60,0x7c,0x60,0x60,0x7f,0x00}
-
- 12345678
-3 0x00
-2 11 11 0x63
-1 11 11 0x63
-0 11 11 0x63
-9 11 11 0x63
-8 11 1 11 0x6b
-7 1111111 0x7f
-6 11 11 0x36
-5 0x00
-4 0x00
-3 0x00
-2 0x00
-1 0x00
-
-{0x00,0x00,0x00,0x00,0x00,0x36,0x7f,0x6b,0x63,0x63,0x63,0x63,0x00}
-
- 12345678
-3 0x00
-2 11 11 0x63
-1 11 11 0x63
-0 11 11 0x63
-9 11 11 0x63
-8 11 1 11 0x6b
-7 1111111 0x7f
-6 11 11 0x36
-5 0x00
-4 1 0x08
-3 111 0x1c
-2 11111 0x3e
-1 1111111 0x7f
-
-{0x7f,0x3e,0x1c,0x08,0x00,0x36,0x7f,0x6b,0x63,0x63,0x63,0x63,0x00}
-
-
- 12345678
-3 0x00
-2 1 0x08
-1 111 0x1c
-0 11 11 0x36
-9 11 11 0x63
-8 1111111 0x7f
-7 11 11 0x63
-6 11 11 0x63
-5 0x00
-4 0x00
-3 0x00
-2 0x00
-1 0x00
-
-{0x00,0x00,0x00,0x00,0x00,0x63,0x63,0x7f,0x63,0x36,0x1c,0x08,0x00}
-
- 12345678
-3 0x00
-2 1 0x08
-1 111 0x1c
-0 11 11 0x36
-9 11 11 0x63
-8 1111111 0x7f
-7 11 11 0x63
-6 11 11 0x63
-5 0x00
-4 1 0x08
-3 111 0x1c
-2 11111 0x3e
-1 1111111 0x7f
-
-{0x7f,0x3e,0x1c,0x08,0x00,0x63,0x63,0x7f,0x63,0x36,0x1c,0x08,0x00}
-
- 12345678
-3 0x00
-2 11111 0x3e
-1 11 11 0x63
-0 11 11 0x63
-9 11 11 0x63
-8 11 11 0x63
-7 11 11 0x63
-6 11111 0x3e
-5 0x00
-4 0x00
-3 0x00
-2 0x00
-1 0x00
-
-{0x00,0x00,0x00,0x00,0x00,0x3e,0x63,0x63,0x63,0x63,0x63,0x3e,0x00}
-
- 12345678
-3 0x00
-2 11111 0x3e
-1 11 11 0x63
-0 11 11 0x63
-9 11 11 0x63
-8 11 11 0x63
-7 11 11 0x63
-6 11111 0x3e
-5 0x00
-4 1 0x08
-3 111 0x1c
-2 11111 0x3e
-1 1111111 0x7f
-
-{0x7f,0x3e,0x1c,0x08,0x00,0x3e,0x63,0x63,0x63,0x63,0x63,0x3e,0x00}
-
- 12345678
-3 1 0x10
-2 11 0x30
-1 111 0x70
-011111111 0xff
-9 111 0x70
-8 11 0x30
-7 1 0x10
-6 0x00
-5 0x00
-4 0x00
-3 0x00
-2 0x00
-1 0x00
-
-{0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x30,0x70,0xff,0x70,0x30,0x10}
-
- 12345678
-3 1 0x10
-2 11 0x30
-1 1111111 0x7f
-011111111 0xff
-9 1111111 0x7f
-8 11 0x30
-7 1 0x10
-6 0x00
-5 0x00
-4 0x00
-3 0x00
-2 0x00
-1 0x00
-
-{0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x30,0x7f,0xff,0x7f,0x30,0x10}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
- 12345678
-3 0x00
-211111 0xf8
-11 1 1 0x85
-01111 1 1 0xf5
-91 1 1 0x85
-81 1 1 0x85
-71 1 0x82
-6 0x00
-5 0x00
-4 0x00
-3 0x00
-2 0x00
-1 0x00
-
-{0x00,0x00,0x00,0x00,0x00,0x00,0x82,0x85,0x85,0xf5,0x85,0xf8,0x00},
-
-///////////////////////////////////////////////////////////////////////////////////////
-
- 12345678
-3 0x00
-211111 0xf8
-11 111 0x87
-01111 1 0xf4
-91 111 0x87
-81 1 0x81
-71 111 0x87
-6 0x00
-5 0x00
-4 0x00
-3 0x00
-2 0x00
-1 0x00
-
-{0x00,0x00,0x00,0x00,0x00,0x00,0x87,0x81,0x87,0xf4,0x87,0xf8,0x00},
-
- 12345678
-3 0x00
-211111 0xf8
-11 1 0x84
-01111 1 0xf4
-91 1 0x84
-81 1 0x84
-71 111 0x87
-6 0x00
-5 0x00
-4 0x00
-3 0x00
-2 0x00
-1 0x00
-
-{0x00,0x00,0x00,0x00,0x00,0x00,0x87,0x84,0x84,0xf4,0x84,0xf8,0x00},
-
- 12345678
-3 0x00
-2 11 0x60
-11 1 11 0x96
-01 1 1 1 0x95
-91 1 1 1 0x95
-81 1 1 1 0x95
-7 11 11 0x66
-6 0x00
-5 0x00
-4 0x00
-3 0x00
-2 0x00
-1 0x00
-
-{0x00,0x00,0x00,0x00,0x00,0x00,0xf6,0x95,0x95,0x95,0x96,0xf0,0x00},
-
- 12345678
-3 0x00
-211111 0xf8
-1 1 1 0x22
-0 1 1 1 0x25
-9 1 111 0x27
-8 1 1 1 0x25
-7 1 1 1 0x25
-6 0x00
-5 0x00
-4 0x00
-3 0x00
-2 0x00
-1 0x00
-
-{0x00,0x00,0x00,0x00,0x00,0x00,0x25,0x25,0x27,0x25,0x22,0xf8,0x00},
-
- 12345678
-3 0x00
-211111 0xf8
-11 1 0x82
-0111 1 0xe2
-91 1 0x82
-81 1 0x82
-71 1 0x82
-6 0x00
-5 0x00
-4 0x00
-3 0x00
-2 0x00
-1 0x00
-
-{0x00,0x00,0x00,0x00,0x00,0x00,0x82,0x82,0x82,0xe2,0x82,0xf8,0x00},
-
- 12345678
-3 0x00
-2111 0xe0
-11 1 1 0x92
-01 1 1 0x92
-91 1 1 0x92
-81 1 1 0x92
-7111 1 0xe2
-6 0x00
-5 0x00
-4 0x00
-3 0x00
-2 0x00
-1 0x00
-
-{0x00,0x00,0x00,0x00,0x00,0x00,0xe2,0x92,0x92,0x92,0x92,0xe0,0x00},
-
- 12345678
-3 0x00
-211111 0xf8
-1 1 1 0x41
-0 1 1 1 0x51
-9 1 1 1 1 0x55
-8 1 11 11 0x5b
-7 1 1 1 0x51
-6 0x00
-5 0x00
-4 0x00
-3 0x00
-2 0x00
-1 0x00
-
-{0x00,0x00,0x00,0x00,0x00,0x00,0x51,0x5b,0x55,0x51,0x41,0xf8,0x00},
-
- 12345678
-6 0x00
-511111111 0xff
-4111 111 0xe7
-31 11 1 0x99
-2111 111 0xe7
-111111111 0xff
-
-0xff,0xe7,0x99,0xe7,0xff
-
- 12345678
-6 0x00
-511111111 0xff
-41 1 0x81
-31 1 0x81
-21 1 0x81
-111111111 0xff
-
-0xff,0x81,0x81,0x81,0xff
-
-
- 12345678
-3 0x00
-2 11 0x60
-11 1 1 1 0x95
-01111 111 0xf7
-91 1 1 1 0x95
-81 1 1 1 0x95
-71 1 1 1 0x95
-6 0x00
-5 0x00
-4 0x00
-3 0x00
-2 0x00
-1 0x00
-
-0x95,0x95,0x95,0xf7,0x95,0x60,0x00
-
- 12345678
-3 0x00
-2 0x00
-1 1111 0x3c
-0 1 1 0x42
-91 1 0x81
-81 1 1 1 0xa5
-71 1 0x81
-61 1 1 1 0xa5
-51 11 1 0x99
-4 1 1 0x42
-3 1111 0x3c
-2 0x00
-1 0x00
-
-0x00,0x00,0x3c,0x42,0x99,0xa5,0x81,0xa5,0x81,0x42,0x3c,0x00,0x00 
-
- 12345678
-3 0x00
-2 0x00
-1 1 0x08
-0 1 1 1 0x49
-9 1 1 1 0x2a
-8 111 0x1c
-7 1111111 0x7f
-6 111 0x1c
-5 1 1 1 0x2a
-4 1 1 1 0x49
-3 1 0x08
-2 0x00
-1 0x00
-
-0x00,0x00,0x08,0x49,0x2a,0x1c,0x7f,0x1c,0x2a,0x49,0x08,0x00,0x00
-
-
- 12345678
-3 0x00
-2 0x00
-1 11111 0x3e
-0 1 1 1 0x2a
-9 11 11 0x36
-8 1 1 1 0x2a
-7 11 11 0x36
-6 1 1 1 0x2a
-5 11 11 0x36
-4 1 1 1 0x2a
-3 11111 0x3e
-2 0x00
-1 0x00
-
-{0x00,0x00,0x3e,0x2a,0x36,0x2a,0x36,0x2a,0x36,0x2a,0x3e,0x00,0x00},
-
- 12345678
-3 0x00
-2 0x00
-1 11 0x06
-0 111 0x1c
-9 111 0x38
-8 1111 0x78
-7 1111 0x78 
-6 1111 0x78
-5 111 0x38
-4 111 0x1c
-3 11 0x06
-2 0x00
-1 0x00
-
-{0x00,0x00,0x06,0x1c,0x38,0x78,0x78,0x78,0x38,0x1c,0x06,0x00,0x00},
-
-
- 12345678
-3 0x00
-2 11 0x60
-11 1 11 0x96
-01111 1 1 0xf5
-91 1 11 0x96
-81 1 1 1 0x95
-71 1 111 0x97
-6 0x00
-5 0x00
-4 0x00
-3 0x00
-2 0x00
-1 0x00
-
-0x00,0x00,0x00,0x00,0x00,0x00,0x97,x95,0x96,0xf5,0x96,0x60,0x00
-
-*/
-
-////////////////////////////////////////////////////////////////////////
-// texture for gpu picture
-////////////////////////////////////////////////////////////////////////
-
-void CreatePic(unsigned char * pMem)
-{
- int x,y;
- GLubyte TexBytes[128][128][3];
- memset(TexBytes,0,128*128*3);
- 
- for(y=0;y<96;y++)
- {
- for(x=0;x<128;x++)
- {
- TexBytes[y][x][0]=*(pMem+2);
- TexBytes[y][x][1]=*(pMem+1);
- TexBytes[y][x][2]=*(pMem+0);
- pMem+=3;
- }
- }
-
- glGenTextures(1, &gTexPicName);
- glBindTexture(GL_TEXTURE_2D, gTexPicName);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- glTexImage2D(GL_TEXTURE_2D, 0, 3, 128, 128, 0, GL_RGB,
- GL_UNSIGNED_BYTE,TexBytes);
-}
-
-////////////////////////////////////////////////////////////////////////
-// destroy gpu picture texture
-////////////////////////////////////////////////////////////////////////
-
-void DestroyPic(void)
-{
- if(gTexPicName) 
- {
- GLfloat fYS1,fYS2,fXS1,fXS2,fXS,fYS;
-
- glDisable(GL_SCISSOR_TEST); 
- glDisable(GL_ALPHA_TEST);
- if(bOldSmoothShaded) {glShadeModel(GL_FLAT);bOldSmoothShaded=FALSE;}
- if(bBlendEnable) {glDisable(GL_BLEND);bBlendEnable=FALSE;}
- if(!bTexEnabled) {glEnable(GL_TEXTURE_2D);bTexEnabled=TRUE;}
- gTexName=0;
- glBindTexture(GL_TEXTURE_2D,0); 
- vertex[0].c.lcol=0xff000000; 
-
- fYS=(GLfloat)PSXDisplay.DisplayMode.y/(GLfloat)iResY;
- fXS=(GLfloat)PSXDisplay.DisplayMode.x/(GLfloat)iResX;
- fYS2=96.0f*fYS;
- fYS1=0.0f;
- fXS2=(GLfloat)PSXDisplay.DisplayMode.x;
- fXS1=fXS2-128.0f*fXS;
-
- SETCOL(vertex[0]); 
- glBegin(GL_QUADS); // paint a black rect to hide texture
-
- glVertex3f(fXS1,fYS1,0.99996f);
- glVertex3f(fXS1,fYS2,0.99996f);
- glVertex3f(fXS2,fYS2,0.99996f);
- glVertex3f(fXS2,fYS1,0.99996f);
-
- glEnd();
- glEnable(GL_ALPHA_TEST);
- glEnable(GL_SCISSOR_TEST); 
- 
- glDeleteTextures(1,&gTexPicName);gTexPicName=0;
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-// display info picture
-////////////////////////////////////////////////////////////////////////
-
-void DisplayPic(void)
-{
- GLfloat fYS1,fYS2,fXS1,fXS2,fXS,fYS;
-
- glDisable(GL_SCISSOR_TEST); 
- glDisable(GL_ALPHA_TEST);
- if(bOldSmoothShaded) {glShadeModel(GL_FLAT);bOldSmoothShaded=FALSE;}
- if(bBlendEnable) {glDisable(GL_BLEND);bBlendEnable=FALSE;}
- if(!bTexEnabled) {glEnable(GL_TEXTURE_2D);bTexEnabled=TRUE;}
- gTexName=gTexPicName;
- glBindTexture(GL_TEXTURE_2D,gTexPicName); // now set font texture
-
- if(bGLBlend) vertex[0].c.lcol=0xff7f7f7f; 
- else vertex[0].c.lcol=0xffffffff; 
-
- fYS=(GLfloat)PSXDisplay.DisplayMode.y/(GLfloat)iResY;
- fXS=(GLfloat)PSXDisplay.DisplayMode.x/(GLfloat)iResX;
- fYS2=96.0f*fYS;
- fYS1=0.0f;
- fXS2=(GLfloat)PSXDisplay.DisplayMode.x;
- fXS1=fXS2-128.0f*fXS;
-
- SETCOL(vertex[0]); 
- glBegin(GL_QUADS);
-
-#ifdef OWNSCALE
- glTexCoord2f(0.0f,0.0f);
- glVertex3f(fXS1,fYS1,0.99996f);
- glTexCoord2f(0.0f,192.0f/256.0f);
- glVertex3f(fXS1,fYS2,0.99996f);
- glTexCoord2f(256.0f/256.0f,192.0f/256.0f);
- glVertex3f(fXS2,fYS2,0.99996f);
- glTexCoord2f(256.0f/256.0f,0.0f);
- glVertex3f(fXS2,fYS1,0.99996f);
-#else
- glTexCoord2f(0.0f,0.0f);
- glVertex3f(fXS1,fYS1,0.99996f);
- glTexCoord2f(0.0f,192.0f);
- glVertex3f(fXS1,fYS2,0.99996f);
- glTexCoord2f(256.0f,192.0f);
- glVertex3f(fXS2,fYS2,0.99996f);
- glTexCoord2f(256.0f,0.0f);
- glVertex3f(fXS2,fYS1,0.99996f);
-#endif
-
- glEnd();
- glEnable(GL_ALPHA_TEST);
- glEnable(GL_SCISSOR_TEST); 
-}
-
-////////////////////////////////////////////////////////////////////////
-// show gun cursor
-////////////////////////////////////////////////////////////////////////
-
-#define TRA 0x00,0x00,0x00,0x00
-#define PNT 0xff,0xff,0xff,0xff
-
-GLubyte texcursor[8][32]= 
-{
-{TRA,TRA,PNT,PNT,PNT,TRA,TRA,TRA},
-{TRA,PNT,TRA,TRA,TRA,PNT,TRA,TRA},
-{PNT,TRA,TRA,PNT,TRA,TRA,PNT,TRA},
-{PNT,TRA,PNT,TRA,PNT,TRA,PNT,TRA},
-{PNT,TRA,TRA,PNT,TRA,TRA,PNT,TRA},
-{TRA,PNT,TRA,TRA,TRA,PNT,TRA,TRA},
-{TRA,TRA,PNT,PNT,PNT,TRA,TRA,TRA},
-{TRA,TRA,TRA,TRA,TRA,TRA,TRA,TRA}
-};
-
-void ShowGunCursor(void)
-{
- int iPlayer;
- GLfloat fX,fY,fDX,fDY,fYS,fXS;
- const uint32_t crCursorColor32[8]={0xff00ff00,0xffff0000,0xff0000ff,0xffff00ff,0xffffff00,0xff00ffff,0xffffffff,0xff7f7f7f};
-
- if(!gTexCursorName) // create gun cursor texture the first time
- {
- glGenTextures(1, &gTexCursorName);
- glBindTexture(GL_TEXTURE_2D, gTexCursorName);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- glTexImage2D(GL_TEXTURE_2D, 0, 4, 8, 8, 0, GL_RGBA,
- GL_UNSIGNED_BYTE,texcursor);
- }
-
- fYS=(GLfloat)PSXDisplay.DisplayMode.y/(GLfloat)iResY; // some pre-calculations
- fXS=(GLfloat)PSXDisplay.DisplayMode.x/(GLfloat)iResX;
-
- fDX=fXS*7;
- fDY=fYS*7;
-
- glDisable(GL_SCISSOR_TEST); 
- if(bOldSmoothShaded) {glShadeModel(GL_FLAT);bOldSmoothShaded=FALSE;}
- if(bBlendEnable) {glDisable(GL_BLEND);bBlendEnable=FALSE;}
- if(!bTexEnabled) {glEnable(GL_TEXTURE_2D);bTexEnabled=TRUE;}
-
- gTexName=gTexCursorName;
- glBindTexture(GL_TEXTURE_2D,gTexCursorName); // now set font texture
-
- for(iPlayer=0;iPlayer<8;iPlayer++) // loop all possible players
- {
- if(usCursorActive&(1<<iPlayer)) // player is active?
- {
- fY=((GLfloat)ptCursorPoint[iPlayer].y*(GLfloat)PSXDisplay.DisplayMode.y)/256.0f;
- fX=((GLfloat)ptCursorPoint[iPlayer].x*(GLfloat)PSXDisplay.DisplayMode.x)/512.0f;
-
- vertex[0].c.lcol=crCursorColor32[iPlayer]; // -> set player color
-
- SETCOL(vertex[0]); 
-
- glBegin(GL_QUADS);
-
- glTexCoord2f(000.0f,224.0f/255.99f); // -> paint gun cursor
- glVertex3f(fX-fDX,fY+fDY,0.99996f);
- glTexCoord2f(000.0f,000.0f);
- glVertex3f(fX-fDX,fY-fDY,0.99996f);
- glTexCoord2f(224.0f/255.99f,000.0f);
- glVertex3f(fX+fDX,fY-fDY,0.99996f);
- glTexCoord2f(224.0f/255.99f,224.0f/255.99f);
- glVertex3f(fX+fDX,fY+fDY,0.99996f);
-
- glEnd();
- }
- }
-
- glEnable(GL_SCISSOR_TEST); 
-}
+/***************************************************************************
+ menu.c - description
+ -------------------
+ begin : Sun Mar 08 2009
+ copyright : (C) 1999-2009 by Pete Bernert
+ web : www.pbernert.com 
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+#include "stdafx.h"
+
+#define _IN_MENU
+
+#include "externals.h"
+#include "draw.h"
+#include "menu.h"
+#include "gpu.h"
+
+uint32_t dwCoreFlags=0;
+PSXPoint_t ptCursorPoint[8];
+unsigned short usCursorActive=0;
+
+////////////////////////////////////////////////////////////////////////
+// field with menu chars... like good old C64 time :)
+////////////////////////////////////////////////////////////////////////
+
+GLubyte texrasters[40][12]= {
+
+// 0,0 FPS
+{0x00,0x60,0x60,0x60,0x60,0x60,0x7e,0x60,0x60,0x60,0x60,0x7f},
+{0x00,0x18,0x18,0x18,0x18,0x18,0x1f,0x18,0x18,0x18,0x18,0x1f},
+{0x00,0x03,0x06,0x00,0x00,0x00,0xc3,0x66,0x66,0x66,0x66,0xc3},
+{0x00,0xf0,0x18,0x18,0x18,0x18,0xf0,0x00,0x00,0x00,0x18,0xf0},
+// 4,0 0
+{0x00,0x3c,0x66,0xc3,0xe3,0xf3,0xdb,0xcf,0xc7,0xc3,0x66,0x3c},
+// 5,0 1
+{0x00,0x7e,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x78,0x38,0x18},
+// 6,0 2
+{0x00,0xff,0xc0,0xc0,0x60,0x30,0x18,0x0c,0x06,0x03,0xe7,0x7e},
+// 7,0 3
+
+{0x00,0x7e,0xe7,0x03,0x03,0x07,0x7e,0x07,0x03,0x03,0xe7,0x7e},
+// 0,1 4
+{0x00,0x0c,0x0c,0x0c,0x0c,0x0c,0xff,0xcc,0x6c,0x3c,0x1c,0x0c},
+// 1,1 5
+{0x00,0x7e,0xe7,0x03,0x03,0x07,0xfe,0xc0,0xc0,0xc0,0xc0,0xff},
+// 2,1 6
+{0x00,0x7e,0xe7,0xc3,0xc3,0xc7,0xfe,0xc0,0xc0,0xc0,0xe7,0x7e},
+// 3,1 7
+{0x00,0x30,0x30,0x30,0x30,0x18,0x0c,0x06,0x03,0x03,0x03,0xff},
+// 4,1 8
+{0x00,0x7e,0xe7,0xc3,0xc3,0xe7,0x7e,0xe7,0xc3,0xc3,0xe7,0x7e},
+// 5,1 9
+{0x00,0x7e,0xe7,0x03,0x03,0x03,0x7f,0xe7,0xc3,0xc3,0xe7,0x7e},
+// 6,1 smiley
+{0x00,0x3c,0x42,0x99,0xa5,0x81,0xa5,0x81,0x42,0x3c,0x00,0x00},
+// 7,1 sun
+{0x00,0x08,0x49,0x2a,0x1c,0x7f,0x1c,0x2a,0x49,0x08,0x00,0x00},
+
+// 0,2 fl + empty box
+{0xff,0x81,0x81,0x81,0xff,0x00,0x87,0x84,0x84,0xf4,0x84,0xf8},
+// 1,2 fs + grey box
+{0xff,0xab,0xd5,0xab,0xff,0x00,0x87,0x81,0x87,0xf4,0x87,0xf8},
+// 2,2 od + filled box
+{0xff,0xff,0xff,0xff,0xff,0x00,0x66,0x95,0x95,0x95,0x96,0x60},
+// 3,2 fi + half grey box
+{0xff,0xa1,0xd1,0xa1,0xff,0x00,0x82,0x82,0x82,0xe2,0x82,0xf8},
+// 4,2 di + half filled box
+{0xff,0xf1,0xf1,0xf1,0xff,0x00,0xe2,0x92,0x92,0x92,0x92,0xe0},
+// 5,2 am + grey box
+{0xff,0xab,0xd5,0xab,0xff,0x00,0x95,0x95,0x95,0xf7,0x95,0x60},
+// 6,2 ab + filled box
+{0xff,0xff,0xff,0xff,0xff,0x00,0x97,0x95,0x96,0xf5,0x96,0x60},
+// 7,2 fa
+{0x00,0x00,0x00,0x00,0x00,0x00,0x85,0x85,0x87,0xf5,0x82,0xf8},
+
+// 0,3 fb
+{0xff,0x8b,0x85,0x8b,0xff,0x00,0x82,0x82,0x82,0xe2,0x87,0xf8},
+// 1,3 gf
+{0xff,0x8f,0x8f,0x8f,0xff,0x00,0x74,0x94,0x96,0xb4,0x87,0x70},
+// 2,3 D
+{0xff,0x00,0xfc,0xc6,0xc3,0xc3,0xc3,0xc3,0xc6,0xfc,0x00,0xff}, 
+// 3,3 G
+{0xff,0x00,0x3e,0x63,0xc3,0xc7,0xc0,0xc0,0x63,0x3e,0x00,0xff},
+// 4,3
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+// 5,3
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+// 6,3 tex pal smiley
+{0x00,0x3c,0x7e,0xe7,0xdb,0xff,0xdb,0xff,0x7e,0x3c,0x00,0x00},
+// 7,3
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+
+// 0,4 subtract blending (moon)
+{0x00,0x06,0x1c,0x38,0x78,0x78,0x78,0x38,0x1c,0x06,0x00,0x00},
+// 1,4 blurring
+{0x00,0x7e,0x93,0xa5,0x93,0xc9,0x93,0xa5,0x93,0x7e,0x00,0x00},
+// 2,4 (M)
+{0xff,0x00,0xc3,0xc3,0xc3,0xdb,0xff,0xe7,0xc3,0x81,0x00,0xff},
+// 3,4 (A)
+{0xff,0x00,0xc3,0xc3,0xff,0xc3,0xc3,0x66,0x3c,0x18,0x00,0xff},
+// 4,4 blank
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+// 5,4
+{0x00,0xfe,0xc5,0x62,0x35,0x18,0x0c,0xc6,0xc6,0x7c,0x00,0x00},
+// 6,4 <-
+{0x00,0x00,0x00,0x00,0x00,0x10,0x30,0x7f,0xff,0x7f,0x30,0x10},
+// 7,4 .
+{0x00,0x38,0x38,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}
+};
+
+////////////////////////////////////////////////////////////////////////
+// create lists/stuff for fonts 
+// (as a matter of fact: no more display list used, just a texture)
+////////////////////////////////////////////////////////////////////////
+
+GLuint gTexFontName=0;
+GLuint gTexPicName=0;
+GLuint gTexCursorName=0;
+#ifdef _WINDOWS
+HFONT hGFont=NULL;
+#endif
+
+void MakeDisplayLists(void) // MAKE FONT 
+{
+ GLubyte TexBytes[64][64][3]; // we use a 64x64 texture
+ int x,y,i,j,n=0; GLubyte col,IB;
+
+ glPixelStorei(GL_UNPACK_ALIGNMENT,1);
+ 
+ memset(TexBytes,0,64*64*3);
+
+ for(y=0;y<5;y++) // create texture out of raster infos
+ {
+ for(x=0;x<8;x++,n++)
+ {
+ for(i=0;i<12;i++)
+ {
+ IB=texrasters[n][i];
+ for(j=0;j<8;j++)
+ {
+ if(IB&(1<<(7-j))) col=255; else col=0;
+ TexBytes[y*12+i][x*8+j][0]=col;
+ TexBytes[y*12+i][x*8+j][1]=col;
+ TexBytes[y*12+i][x*8+j][2]=col;
+ }
+ }
+ }
+ }
+
+ glGenTextures(1, &gTexFontName); // set tex params for font texture
+ glBindTexture(GL_TEXTURE_2D, gTexFontName);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+ glTexImage2D(GL_TEXTURE_2D, 0, 3, 64, 64, 0, GL_RGB,
+ GL_UNSIGNED_BYTE,TexBytes);
+
+#ifdef _WINDOWS
+ hGFont=CreateFont(13,0,0,0,FW_NORMAL,FALSE, // windows: create font for hint texts
+ FALSE,FALSE,DEFAULT_CHARSET,
+ OUT_DEFAULT_PRECIS,CLIP_DEFAULT_PRECIS,
+ DEFAULT_QUALITY,DEFAULT_PITCH,
+ "Arial");
+#endif
+}
+
+////////////////////////////////////////////////////////////////////////
+// kill existing font stuff
+////////////////////////////////////////////////////////////////////////
+
+void KillDisplayLists(void)
+{
+#ifdef _WINDOWS
+ if(hGFont) DeleteObject(hGFont); // windows: kill info font
+ hGFont=NULL;
+#endif
+
+ if(gTexFontName) // del font/info textures
+ {glDeleteTextures(1,&gTexFontName);gTexFontName=0;}
+ if(gTexPicName) 
+ {glDeleteTextures(1,&gTexPicName);gTexPicName=0;}
+ if(gTexCursorName) 
+ {glDeleteTextures(1,&gTexCursorName);gTexCursorName=0;}
+}
+
+////////////////////////////////////////////////////////////////////////
+// display text/infos in gpu menu
+////////////////////////////////////////////////////////////////////////
+
+#ifdef OWNSCALE
+#define DRAWTEXCHAR glTexCoord2f(fX1/256.0f,fY2/256.0f);glVertex3f(fXS1,fYS2,1.0f);glTexCoord2f(fX1/256.0f,fY1/256.0f);glVertex3f(fXS1,fYS1,1.0f);glTexCoord2f(fX2/256.0f,fY1/256.0f);glVertex3f(fXS2,fYS1,1.0f);glTexCoord2f(fX2/256.0f,fY2/256.0f);glVertex3f(fXS2,fYS2,1.0f);
+#else
+#define DRAWTEXCHAR glTexCoord2f(fX1,fY2);glVertex3f(fXS1,fYS2,1.0f);glTexCoord2f(fX1,fY1);glVertex3f(fXS1,fYS1,1.0f);glTexCoord2f(fX2,fY1);glVertex3f(fXS2,fYS1,1.0f);glTexCoord2f(fX2,fY2);glVertex3f(fXS2,fYS2,1.0f);
+#endif
+
+int iMPos=0;
+
+void DisplayText(void)
+{
+ int iX,iY,i;
+ GLfloat fX1,fY1,fX2,fY2,fYS1,fYS2,fXS1,fXS2,fXS,fXSC,fYSC,fYD;
+
+ glDisable(GL_SCISSOR_TEST); // disable unwanted ogl states
+ glDisable(GL_ALPHA_TEST);
+ if(bOldSmoothShaded) {glShadeModel(GL_FLAT);bOldSmoothShaded=FALSE;}
+ if(bBlendEnable) {glDisable(GL_BLEND);bBlendEnable=FALSE;}
+ if(!bTexEnabled) {glEnable(GL_TEXTURE_2D);bTexEnabled=TRUE;}
+
+ gTexName=gTexFontName;
+ glBindTexture(GL_TEXTURE_2D,gTexFontName); // now set font texture
+
+ fYD=fYSC=(GLfloat)PSXDisplay.DisplayMode.y/(GLfloat)iResY; // some pre-calculations
+ fYS1=12.0f*fYSC;fYSC*=13.0f;
+ fYS2=0.0f;
+ fXS= (GLfloat)PSXDisplay.DisplayMode.x/(GLfloat)iResX;
+ fXSC= 8.0f*fXS;fXS*=10.0f;
+ fXS1=0.0f;
+ fXS2=50.0f*fXS; // 3 is one option
+
+#ifdef OWNSCALE
+ vertex[0].c.lcol=0xff00ff00; // set menu text color
+#else
+ vertex[0].c.lcol=0xff00ffff; // set menu text color
+#endif
+
+ SETCOL(vertex[0]); 
+
+ glBegin(GL_QUADS);
+
+#ifdef OWNSCALE
+ glTexCoord2f(128.0f/256.0f,240.0f/256.0f); // make blank (ownscale)
+ glVertex3f(fXS1,fYS2,0.99996f);
+ glTexCoord2f(128.0f/256.0f,192.0f/256.0f);
+ glVertex3f(fXS1,fYSC,0.99996f);
+ glTexCoord2f(160.0f/256.0f,192.0f/256.0f);
+ glVertex3f(fXS2,fYSC,0.99996f);
+ glTexCoord2f(160.0f/256.0f,240.0f/256.0f);
+ glVertex3f(fXS2,fYS2,0.99996f);
+#else
+ glTexCoord2f(128.0f,240.0f); // make blank
+ glVertex3f(fXS1,fYS2,0.99996f);
+ glTexCoord2f(128.0f,192.0f);
+ glVertex3f(fXS1,fYSC,0.99996f);
+ glTexCoord2f(160.0f,192.0f);
+ glVertex3f(fXS2,fYSC,0.99996f);
+ glTexCoord2f(160.0f,240.0f);
+ glVertex3f(fXS2,fYS2,0.99996f);
+#endif
+
+ fXS1=0.0f;fXS2=4.0f*fXSC; // draw fps
+ fX1=0.0f; fX2=128.0f;
+ fY1=0.0f; fY2=48.0f;
+ DRAWTEXCHAR;
+
+ fYSC=fXS1=3.0f*fXS; // start pos of numbers
+
+ i=0;do // paint fps numbers
+ {
+ iX=4;iY=4;
+ if(szDispBuf[i]>='0' && szDispBuf[i]<='3')
+ {iX=4+szDispBuf[i]-'0';iY=0;}
+ else
+ if(szDispBuf[i]>='4' && szDispBuf[i]<='9')
+ {iX=szDispBuf[i]-'4';iY=1;}
+ else
+ if(szDispBuf[i]=='.')
+ {iX=7;iY=4;}
+ else
+ if(szDispBuf[i]==0) break;
+
+ fX1=(GLfloat)iX*32.0f; fX2=fX1+32.0f;
+ fY1=(GLfloat)iY*48.0f; fY2=fY1+48.0f;
+ fXS1+=fXS;
+ fXS2=fXS1+fXSC;
+
+ DRAWTEXCHAR;
+
+ i++;
+ }
+ while(i);
+
+ //----------------------------------------------------//
+ // draw small chars
+ //----------------------------------------------------//
+
+ fXS1=12.0f*fXS;fYS1=6.0f*fYD;
+ fY1=120.0f;fY2=144.0f;
+ fX1=0.0f;fX2=32.0f;
+
+ for(i=0;i<8;i++)
+ {
+ fXS2=fXS1+fXSC;
+ DRAWTEXCHAR;
+ fX1+=32.0f;fX2+=32.0f;fXS1+=fYSC;
+ }
+
+ fY1=168.0f;fY2=192.0f;
+ fX1=0.0f;fX2=32.0f;
+
+ for(i=0;i<2;i++)
+ {
+ fXS2=fXS1+fXSC;
+ DRAWTEXCHAR;
+ fX1+=32.0f;fX2+=32.0f;fXS1+=fYSC;
+ }
+
+ //----------------------------------------------------//
+
+ fYSC=fXS+fXS;
+
+ fYS1=12.0f*fYD;
+
+ if(iBlurBuffer && gTexBlurName) // blur
+ {
+ fXS1-=fXS;fY1=192.0f;fY2=240.0f;
+ fXS2=fXS1+fXSC;fX1=32.0f;fX2=64.0f;
+ DRAWTEXCHAR;
+ fXS1+=fXS;
+ }
+
+ fY1=48.0f;fY2=96.0f;
+ 
+ if(bGLExt) // packed pixel
+ {
+ fXS2=fXS1+fXSC;fX1=192.0f;fX2=224.0f;
+ DRAWTEXCHAR;
+ }
+
+ if(glColorTableEXTEx) // tex wnd pal
+ { 
+ fY1=144.0f;fY2=192.0f;
+ fXS2=fXS1+fXSC;fX1=192.0f;
+ if(bGLExt) {fX2=208.0f;fXS2-=fXSC/2.0f;}
+ else fX2=224.0f;
+ DRAWTEXCHAR;
+ fY1=48.0f;fY2=96.0f;
+ }
+
+ if(!bUseMultiPass && glBlendEquationEXTEx) // multipass blend
+ {
+ fY1=192.0f;fY2=240.0f;
+ fXS1+=fYSC-fXSC;fXS2=fXS1+fXSC;fX1=0.0f;fX2=32.0f;
+ DRAWTEXCHAR;
+ fXS1+=fXSC;
+ fY1=48.0f;fY2=96.0f;
+ }
+ else fXS1+=fYSC;
+
+ if(bGLBlend) // modulate2x
+ {
+ fXS2=fXS1+fXSC;fX1=224.0f;fX2=256.0f;
+ DRAWTEXCHAR;
+ }
+
+ fY1=192.0f;fY2=240.0f;
+
+ if(iHiResTextures) // 2x textures
+ {
+ fXS1+=fYSC-fXS;fXS2=fXS1+fXSC;
+ fX1=160.0f;fX2=192.0f;
+ DRAWTEXCHAR;
+ fXS1+=fXS;
+ }
+ else fXS1+=fYSC;
+
+ if(dwCoreFlags&1) //A 
+ {
+ fXS2=fXS1+fXSC;fX1=96.0f;fX2=128.0f;
+ DRAWTEXCHAR;
+ }
+
+ if(dwCoreFlags&2) //M
+ {
+ fXS2=fXS1+fXSC;fX1=64.0f;fX2=96.0f;
+ DRAWTEXCHAR;
+ }
+
+ // 00 -> digital, 01 -> analog, 02 -> mouse, 03 -> gun
+ if(dwCoreFlags&0xff00) //A/M/G/D 
+ {
+ int k;
+
+ fXS2=fXS1+fXSC;
+
+ if((dwCoreFlags&0x0f00)==0x0000) // D
+ {
+ fY1=144.0f;fY2=192.0f;
+ fX1=64.0f;fX2=96.0f;
+ }
+ else
+ if((dwCoreFlags&0x0f00)==0x0100) // A
+ {
+ fX1=96.0f;fX2=128.0f;
+ }
+ else
+ if((dwCoreFlags&0x0f00)==0x0200) // M
+ {
+ fX1=64.0f;fX2=96.0f;
+ }
+ else
+ if((dwCoreFlags&0x0f00)==0x0300) // G
+ {
+ fY1=144.0f;fY2=192.0f;
+ fX1=96.0f;fX2=128.0f;
+ }
+ DRAWTEXCHAR;
+
+ k=(dwCoreFlags&0xf000)>>12; // number
+ fXS1+=fXS;
+ fXS2=fXS1+fXSC;
+ iX=4;iY=4;
+ if(k>=0 && k<=3)
+ {iX=4+k;iY=0;}
+ else
+ if(k>=4 && k<=9)
+ {iX=k-4;iY=1;}
+ fX1=(GLfloat)iX*32.0f; fX2=fX1+32.0f;
+ fY1=(GLfloat)iY*48.0f; fY2=fY1+48.0f;
+ DRAWTEXCHAR;
+ }
+
+ fXS1+=fYSC;
+
+ if(lSelectedSlot) // save state num
+ {
+ fXS2=fXS1+fXSC;
+ iX=4;iY=4;
+ if(lSelectedSlot>=0 && lSelectedSlot<=3)
+ {iX=4+lSelectedSlot;iY=0;}
+ else
+ if(lSelectedSlot>=4 && lSelectedSlot<=9)
+ {iX=lSelectedSlot-4;iY=1;}
+ fX1=(GLfloat)iX*32.0f; fX2=fX1+32.0f;
+ fY1=(GLfloat)iY*48.0f; fY2=fY1+48.0f;
+ DRAWTEXCHAR;
+ }
+
+ fXS1=(GLfloat)(13+iMPos*3)*fXS;fXS2=fXS1+fXSC; // arrow
+ fX1=192.0f; fX2=224.0f;
+ fY1=192.0f; fY2=240.0f;
+ DRAWTEXCHAR;
+
+ /////////////////
+
+ fXS1=12.0f*fXS;fXS2=fXS1+fXSC;
+ fYS2=6.0f*fYD;fYSC=3.0f*fXS;
+ fY1=96.0f;fY2=120.0f;
+
+ if(bUseFrameLimit) // frame limit
+ {
+ if(iFrameLimit==2) {fX1=64.0f;fX2=96.0f;}
+ else {fX1=32.0f;fX2=64.0f;}
+ }
+ else {fX1=0.0f ;fX2=32.0f;}
+ DRAWTEXCHAR; 
+ fXS1+=fYSC;fXS2=fXS1+fXSC;
+
+ if(bUseFrameSkip) {fX1=64.0f;fX2=96.0f;} // frame skip
+ else {fX1=0.0f ;fX2=32.0f;}
+ DRAWTEXCHAR; 
+ fXS1+=fYSC;fXS2=fXS1+fXSC;
+
+ if(iOffscreenDrawing) fX1=(iOffscreenDrawing+2)*32.0f;// offscreen drawing
+ else fX1=0.0f;
+ fX2=fX1+32.0f;
+ DRAWTEXCHAR; 
+ fXS1+=fYSC;fXS2=fXS1+fXSC;
+
+ if(iFilterType<5) fX1=iFilterType*32.0f; // texture filter
+ else {fX1=(iFilterType-5)*32.0f;fY1=144.0f;fY2=168.0f;}
+ fX2=fX1+32.0f; 
+ DRAWTEXCHAR; 
+ if(iFilterType>=5) {fY1=96.0f;fY2=120.0f;}
+ fXS1+=fYSC;fXS2=fXS1+fXSC;
+
+ if(bDrawDither) {fX1=64.0f;fX2=96.0f;} // dithering
+ else {fX1=0.0f ;fX2=32.0f;}
+ DRAWTEXCHAR; 
+ fXS1+=fYSC;fXS2=fXS1+fXSC;
+
+ if(bOpaquePass) {fX1=64.0f;fX2=96.0f;} // opaque pass
+ else {fX1=0.0f ;fX2=32.0f;}
+ DRAWTEXCHAR; 
+ fXS1+=fYSC;fXS2=fXS1+fXSC;
+
+ if(bAdvancedBlend) {fX1=64.0f;fX2=96.0f;} // advanced blend
+ else {fX1=0.0f ;fX2=32.0f;}
+ DRAWTEXCHAR; 
+ fXS1+=fYSC;fXS2=fXS1+fXSC;
+
+ if(!iFrameReadType) fX1=0.0f; // framebuffer reading
+ else if(iFrameReadType==2) {fX1=0.0f;fY1=144.0f;fY2=168.0f;}
+ else fX1=(iFrameReadType+2)*32.0f;
+ fX2=fX1+32.0f;
+ DRAWTEXCHAR; 
+ if(iFrameReadType==2) {fY1=96.0f;fY2=120.0f;}
+ fXS1+=fYSC;fXS2=fXS1+fXSC;
+
+ if(iFrameTexType<2) fX1=iFrameTexType*32.0f; // frame texture
+ else fX1=iFrameTexType*64.0f;
+ fX2=fX1+32.0f;
+ DRAWTEXCHAR; 
+ fXS1+=fYSC;fXS2=fXS1+fXSC;
+
+ if(dwActFixes) {fX1=64.0f;fX2=96.0f;} // game fixes
+ else {fX1=0.0f ;fX2=32.0f;}
+ DRAWTEXCHAR; 
+ fXS1+=fYSC;fXS2=fXS1+fXSC;
+
+ /////////////////
+
+ glEnd();
+
+ glEnable(GL_ALPHA_TEST); // repair needed states
+ glEnable(GL_SCISSOR_TEST); 
+}
+ 
+////////////////////////////////////////////////////////////////////////
+
+void HideText(void)
+{
+ GLfloat fYS1,fYS2,fXS1,fXS2,fXS,fXSC,fYSC;
+
+ glDisable(GL_SCISSOR_TEST); // turn off unneeded ogl states
+ glDisable(GL_ALPHA_TEST);
+ if(bOldSmoothShaded) {glShadeModel(GL_FLAT);bOldSmoothShaded=FALSE;}
+ if(bBlendEnable) {glDisable(GL_BLEND);bBlendEnable=FALSE;}
+ if(bTexEnabled) {glDisable(GL_TEXTURE_2D);bTexEnabled=FALSE;}
+
+ fYSC=(GLfloat)PSXDisplay.DisplayMode.y/(GLfloat)iResY;
+ fYS1=12.0f*fYSC;fYSC*=13.0f;
+ fYS2=0.0f;
+ fXS= (GLfloat)PSXDisplay.DisplayMode.x/(GLfloat)iResX;
+ fXSC= 8.0f*fXS;fXS*=10.0f;
+ fXS1=0.0f;
+ fXS2=50.0f*fXS; 
+
+ vertex[0].c.lcol=0xff000000; // black color
+ SETCOL(vertex[0]); 
+
+ glBegin(GL_QUADS); // make one quad
+
+ glVertex3f(fXS1,fYS2,0.99996f);
+ glVertex3f(fXS1,fYSC,0.99996f);
+ glVertex3f(fXS2,fYSC,0.99996f);
+ glVertex3f(fXS2,fYS2,0.99996f);
+
+ glEnd();
+ glEnable(GL_ALPHA_TEST); // enable needed ogl states
+ glEnable(GL_SCISSOR_TEST); 
+}
+
+////////////////////////////////////////////////////////////////////////
+// Build Menu buffer (== Dispbuffer without FPS)
+////////////////////////////////////////////////////////////////////////
+
+void BuildDispMenu(int iInc)
+{
+ if(!(ulKeybits&KEY_SHOWFPS)) return; // mmm, cheater ;)
+
+ iMPos+=iInc; // up or down
+ if(iMPos<0) iMPos=9; // wrap around
+ if(iMPos>9) iMPos=0;
+
+#ifdef _WINDOWS
+ if(gTexPicName) ShowTextGpuPic(); // windows: show the gpu info as well
+#endif
+}
+
+////////////////////////////////////////////////////////////////////////
+// gpu menu actions...
+////////////////////////////////////////////////////////////////////////
+
+void SwitchDispMenu(int iStep)
+{
+ if(!(ulKeybits&KEY_SHOWFPS)) return; // tststs
+
+ switch(iMPos)
+ {//////////////////////////////////////////////////////
+ case 0: // frame limit
+ {
+ int iType=0;
+ bInitCap = TRUE;
+
+#ifdef _WINDOWS
+ if(iFrameLimit==1 && bUseFrameLimit &&
+ GetAsyncKeyState(VK_SHIFT)&32768)
+ {
+ fFrameRate+=iStep;
+ if(fFrameRate<3.0f) fFrameRate=3.0f;
+ SetAutoFrameCap();
+ break;
+ }
+#endif
+
+ if(bUseFrameLimit) iType=iFrameLimit;
+ iType+=iStep;
+ if(iType<0) iType=2;
+ if(iType>2) iType=0;
+ if(iType==0) bUseFrameLimit=FALSE;
+ else
+ {
+ bUseFrameLimit=TRUE;
+ iFrameLimit=iType;
+ SetAutoFrameCap();
+ }
+ }
+ break;
+ //////////////////////////////////////////////////////
+ case 1: // frame skip
+ bInitCap = TRUE;
+ bUseFrameSkip=!bUseFrameSkip;
+ bSkipNextFrame=FALSE;
+ break;
+ //////////////////////////////////////////////////////
+ case 2: // offscreen drawing
+ iOffscreenDrawing+=iStep; 
+ if(iOffscreenDrawing>4) iOffscreenDrawing=0;
+ if(iOffscreenDrawing<0) iOffscreenDrawing=4;
+ break;
+ //////////////////////////////////////////////////////
+ case 3: // filtering
+ ulKeybits|=KEY_RESETTEXSTORE;
+ ulKeybits|=KEY_RESETFILTER;
+ if(iStep==-1) ulKeybits|=KEY_STEPDOWN;
+ break;
+ //////////////////////////////////////////////////////
+ case 4: // dithering
+ ulKeybits|=KEY_RESETTEXSTORE;
+ ulKeybits|=KEY_RESETDITHER;
+ break;
+ //////////////////////////////////////////////////////
+ case 5: // alpha multipass
+ ulKeybits|=KEY_RESETTEXSTORE;
+ ulKeybits|=KEY_RESETOPAQUE;
+ break;
+ //////////////////////////////////////////////////////
+ case 6: // advanced blending
+ ulKeybits|=KEY_RESETTEXSTORE;
+ ulKeybits|=KEY_RESETADVBLEND;
+ break;
+ //////////////////////////////////////////////////////
+ case 7: // full vram
+ ulKeybits|=KEY_RESETTEXSTORE;
+ ulKeybits|=KEY_TOGGLEFBREAD;
+ if(iStep==-1) ulKeybits|=KEY_STEPDOWN;
+ break;
+ //////////////////////////////////////////////////////
+ case 8: // frame buffer texture
+ ulKeybits|=KEY_RESETTEXSTORE;
+ ulKeybits|=KEY_TOGGLEFBTEXTURE;
+ if(iStep==-1) ulKeybits|=KEY_STEPDOWN;
+ break;
+ //////////////////////////////////////////////////////
+ case 9: // game fixes
+ ulKeybits|=KEY_RESETTEXSTORE;
+ ulKeybits|=KEY_BLACKWHITE;
+ break;
+ //////////////////////////////////////////////////////
+ }
+
+ BuildDispMenu(0); // update info
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////////////////
+// Here comes my painting zone... just to paint stuff... like 3DStudio ;)
+////////////////////////////////////////////////////////////////////////
+
+
+/*
+ 12345678
+1
+2
+3
+4
+5
+6
+7
+8
+9
+0
+1
+2
+3
+
+
+{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}
+
+
+ 12345678
+3
+2
+1
+0
+9
+8
+7
+6
+5 111
+4 111
+3
+2
+1
+
+{0x00,0x00,0x00,0x38,0x38,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}
+
+
+ 12345678
+3 1111
+2 11 11
+111 11
+011 111
+911 1111
+811 11 11
+71111 11
+6111 11
+511 11
+4 11 11
+3 1111
+2
+1
+
+// 0
+{0x00,0x00,0x3c,0x66,0xc3,0xe3,0xf3,0xdb,0xcf,0xc7,0xc3,0x66,0x3c}
+// 1
+{0x00,0x00,0x7e,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x78,0x38,0x18}
+// 2
+{0x00,0x00,0xff,0xc0,0xc0,0x60,0x30,0x18,0x0c,0x06,0x03,0xe7,0x7e}
+// 3
+{0x00,0x00,0x7e,0xe7,0x03,0x03,0x07,0x7e,0x07,0x03,0x03,0xe7,0x7e}
+// 4
+{0x00,0x00,0x0c,0x0c,0x0c,0x0c,0x0c,0xff,0xcc,0x6c,0x3c,0x1c,0x0c}
+// 5
+{0x00,0x00,0x7e,0xe7,0x03,0x03,0x07,0xfe,0xc0,0xc0,0xc0,0xc0,0xff}
+// 6
+{0x00,0x00,0x7e,0xe7,0xc3,0xc3,0xc7,0xfe,0xc0,0xc0,0xc0,0xe7,0x7e}
+// 7
+{0x00,0x00,0x30,0x30,0x30,0x30,0x18,0x0c,0x06,0x03,0x03,0x03,0xff}
+// 8
+{0x00,0x00,0x7e,0xe7,0xc3,0xc3,0xe7,0x7e,0xe7,0xc3,0xc3,0xe7,0x7e}
+// 9
+{0x00,0x00,0x7e,0xe7,0x03,0x03,0x03,0x7f,0xe7,0xc3,0xc3,0xe7,0x7e}
+
+ 12345678123456781234567812345678
+3 11111111 1111111 111111
+2 11 11 11 11 11
+1 11 11 11 11
+0 11 11 11 11
+9 11 11 11 11
+8 111111 1111111 111111
+7 11 11 11
+6 11 11 11
+5 11 11 11
+4 11 11 11 11
+3 11 11 111111
+2 
+ 
+{0x00,0x60,0x60,0x60,0x60,0x60,0x7e,0x60,0x60,0x60,0x60,0x7f},
+{0x00,0x18,0x18,0x18,0x18,0x18,0x1f,0x18,0x18,0x18,0x18,0x1f},
+{0x00,0x03,0x06,0x00,0x00,0x00,0xc3,0x66,0x66,0x66,0x66,0xc3},
+{0x00,0xf0,0x18,0x18,0x18,0x18,0xf0,0x00,0x00,0x00,0x18,0xf0},
+
+ 12345678
+311111111 0xff
+211 0xc0
+111 0xc0
+011 0xc0
+911 0xc0
+8111111 0xfc
+711 0xc0
+611 0xc0
+511 0xc0
+411 0xc0
+311 0xc0
+2 0x00
+1 0x00
+
+{0x00,0x00,0xc0,0xc0,0xc0,0xc0,0xc0,0x3f,0xc0,0xc0,0xc0,0xc0,0xff}
+
+
+ 12345678
+31111111 0xfe
+211 11 0xc3
+111 11 0xc3
+011 11 0xc3
+911 11 0xc3
+81111111 0xfe
+711 0xc0
+611 0xc0
+511 0xc0
+411 0xc0
+311 0xc0
+2 0x00
+1 0x00
+
+
+{0x00,0x00,0xc0,0xc0,0xc0,0xc0,0xc0,0x7f,0xc3,0xc3,0xc3,0xc3,0x7f}
+
+ 12345678
+3 111111 0x7e
+211 11 0xc3
+111 0xc0
+011 0xc0
+911 0xc0
+8 111111 0x7e
+7 11 0x03
+6 11 0x03
+5 11 0x03
+411 11 0xc3
+3 111111 0x7e
+2 0x00
+1 0x00
+
+{0x00,0x00,0x7e,0xc3,0x03,0x03,0x03,0x7e,0xc0,0xc0,0xc0,0xc3,0x7e}
+
+ 12345678
+3 0x00
+2 1111111 0x7f
+1 11 0x60
+0 11 0x60
+9 11111 0x7c
+8 11 0x60
+7 11 0x60
+6 11 0x60
+5 0x00
+4 0x00
+3 0x00
+2 0x00
+1 0x00
+
+{0x00,0x00,0x00,0x00,0x00,0x60,0x60,0x60,0x7c,0x60,0x60,0x7f,0x00}
+
+ 12345678
+3 0x00
+2 1111111 0x7f
+1 11 0x60
+0 11 0x60
+9 11111 0x7c
+8 11 0x60
+7 11 0x60
+6 11 0x60
+5 0x00
+4 1 0x08
+3 111 0x1c
+2 11111 0x3e
+1 1111111 0x7f
+
+{0x7f,0x3e,0x1c,0x08,0x00,0x60,0x60,0x60,0x7c,0x60,0x60,0x7f,0x00}
+
+ 12345678
+3 0x00
+2 11 11 0x63
+1 11 11 0x63
+0 11 11 0x63
+9 11 11 0x63
+8 11 1 11 0x6b
+7 1111111 0x7f
+6 11 11 0x36
+5 0x00
+4 0x00
+3 0x00
+2 0x00
+1 0x00
+
+{0x00,0x00,0x00,0x00,0x00,0x36,0x7f,0x6b,0x63,0x63,0x63,0x63,0x00}
+
+ 12345678
+3 0x00
+2 11 11 0x63
+1 11 11 0x63
+0 11 11 0x63
+9 11 11 0x63
+8 11 1 11 0x6b
+7 1111111 0x7f
+6 11 11 0x36
+5 0x00
+4 1 0x08
+3 111 0x1c
+2 11111 0x3e
+1 1111111 0x7f
+
+{0x7f,0x3e,0x1c,0x08,0x00,0x36,0x7f,0x6b,0x63,0x63,0x63,0x63,0x00}
+
+
+ 12345678
+3 0x00
+2 1 0x08
+1 111 0x1c
+0 11 11 0x36
+9 11 11 0x63
+8 1111111 0x7f
+7 11 11 0x63
+6 11 11 0x63
+5 0x00
+4 0x00
+3 0x00
+2 0x00
+1 0x00
+
+{0x00,0x00,0x00,0x00,0x00,0x63,0x63,0x7f,0x63,0x36,0x1c,0x08,0x00}
+
+ 12345678
+3 0x00
+2 1 0x08
+1 111 0x1c
+0 11 11 0x36
+9 11 11 0x63
+8 1111111 0x7f
+7 11 11 0x63
+6 11 11 0x63
+5 0x00
+4 1 0x08
+3 111 0x1c
+2 11111 0x3e
+1 1111111 0x7f
+
+{0x7f,0x3e,0x1c,0x08,0x00,0x63,0x63,0x7f,0x63,0x36,0x1c,0x08,0x00}
+
+ 12345678
+3 0x00
+2 11111 0x3e
+1 11 11 0x63
+0 11 11 0x63
+9 11 11 0x63
+8 11 11 0x63
+7 11 11 0x63
+6 11111 0x3e
+5 0x00
+4 0x00
+3 0x00
+2 0x00
+1 0x00
+
+{0x00,0x00,0x00,0x00,0x00,0x3e,0x63,0x63,0x63,0x63,0x63,0x3e,0x00}
+
+ 12345678
+3 0x00
+2 11111 0x3e
+1 11 11 0x63
+0 11 11 0x63
+9 11 11 0x63
+8 11 11 0x63
+7 11 11 0x63
+6 11111 0x3e
+5 0x00
+4 1 0x08
+3 111 0x1c
+2 11111 0x3e
+1 1111111 0x7f
+
+{0x7f,0x3e,0x1c,0x08,0x00,0x3e,0x63,0x63,0x63,0x63,0x63,0x3e,0x00}
+
+ 12345678
+3 1 0x10
+2 11 0x30
+1 111 0x70
+011111111 0xff
+9 111 0x70
+8 11 0x30
+7 1 0x10
+6 0x00
+5 0x00
+4 0x00
+3 0x00
+2 0x00
+1 0x00
+
+{0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x30,0x70,0xff,0x70,0x30,0x10}
+
+ 12345678
+3 1 0x10
+2 11 0x30
+1 1111111 0x7f
+011111111 0xff
+9 1111111 0x7f
+8 11 0x30
+7 1 0x10
+6 0x00
+5 0x00
+4 0x00
+3 0x00
+2 0x00
+1 0x00
+
+{0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x30,0x7f,0xff,0x7f,0x30,0x10}
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+ 12345678
+3 0x00
+211111 0xf8
+11 1 1 0x85
+01111 1 1 0xf5
+91 1 1 0x85
+81 1 1 0x85
+71 1 0x82
+6 0x00
+5 0x00
+4 0x00
+3 0x00
+2 0x00
+1 0x00
+
+{0x00,0x00,0x00,0x00,0x00,0x00,0x82,0x85,0x85,0xf5,0x85,0xf8,0x00},
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+ 12345678
+3 0x00
+211111 0xf8
+11 111 0x87
+01111 1 0xf4
+91 111 0x87
+81 1 0x81
+71 111 0x87
+6 0x00
+5 0x00
+4 0x00
+3 0x00
+2 0x00
+1 0x00
+
+{0x00,0x00,0x00,0x00,0x00,0x00,0x87,0x81,0x87,0xf4,0x87,0xf8,0x00},
+
+ 12345678
+3 0x00
+211111 0xf8
+11 1 0x84
+01111 1 0xf4
+91 1 0x84
+81 1 0x84
+71 111 0x87
+6 0x00
+5 0x00
+4 0x00
+3 0x00
+2 0x00
+1 0x00
+
+{0x00,0x00,0x00,0x00,0x00,0x00,0x87,0x84,0x84,0xf4,0x84,0xf8,0x00},
+
+ 12345678
+3 0x00
+2 11 0x60
+11 1 11 0x96
+01 1 1 1 0x95
+91 1 1 1 0x95
+81 1 1 1 0x95
+7 11 11 0x66
+6 0x00
+5 0x00
+4 0x00
+3 0x00
+2 0x00
+1 0x00
+
+{0x00,0x00,0x00,0x00,0x00,0x00,0xf6,0x95,0x95,0x95,0x96,0xf0,0x00},
+
+ 12345678
+3 0x00
+211111 0xf8
+1 1 1 0x22
+0 1 1 1 0x25
+9 1 111 0x27
+8 1 1 1 0x25
+7 1 1 1 0x25
+6 0x00
+5 0x00
+4 0x00
+3 0x00
+2 0x00
+1 0x00
+
+{0x00,0x00,0x00,0x00,0x00,0x00,0x25,0x25,0x27,0x25,0x22,0xf8,0x00},
+
+ 12345678
+3 0x00
+211111 0xf8
+11 1 0x82
+0111 1 0xe2
+91 1 0x82
+81 1 0x82
+71 1 0x82
+6 0x00
+5 0x00
+4 0x00
+3 0x00
+2 0x00
+1 0x00
+
+{0x00,0x00,0x00,0x00,0x00,0x00,0x82,0x82,0x82,0xe2,0x82,0xf8,0x00},
+
+ 12345678
+3 0x00
+2111 0xe0
+11 1 1 0x92
+01 1 1 0x92
+91 1 1 0x92
+81 1 1 0x92
+7111 1 0xe2
+6 0x00
+5 0x00
+4 0x00
+3 0x00
+2 0x00
+1 0x00
+
+{0x00,0x00,0x00,0x00,0x00,0x00,0xe2,0x92,0x92,0x92,0x92,0xe0,0x00},
+
+ 12345678
+3 0x00
+211111 0xf8
+1 1 1 0x41
+0 1 1 1 0x51
+9 1 1 1 1 0x55
+8 1 11 11 0x5b
+7 1 1 1 0x51
+6 0x00
+5 0x00
+4 0x00
+3 0x00
+2 0x00
+1 0x00
+
+{0x00,0x00,0x00,0x00,0x00,0x00,0x51,0x5b,0x55,0x51,0x41,0xf8,0x00},
+
+ 12345678
+6 0x00
+511111111 0xff
+4111 111 0xe7
+31 11 1 0x99
+2111 111 0xe7
+111111111 0xff
+
+0xff,0xe7,0x99,0xe7,0xff
+
+ 12345678
+6 0x00
+511111111 0xff
+41 1 0x81
+31 1 0x81
+21 1 0x81
+111111111 0xff
+
+0xff,0x81,0x81,0x81,0xff
+
+
+ 12345678
+3 0x00
+2 11 0x60
+11 1 1 1 0x95
+01111 111 0xf7
+91 1 1 1 0x95
+81 1 1 1 0x95
+71 1 1 1 0x95
+6 0x00
+5 0x00
+4 0x00
+3 0x00
+2 0x00
+1 0x00
+
+0x95,0x95,0x95,0xf7,0x95,0x60,0x00
+
+ 12345678
+3 0x00
+2 0x00
+1 1111 0x3c
+0 1 1 0x42
+91 1 0x81
+81 1 1 1 0xa5
+71 1 0x81
+61 1 1 1 0xa5
+51 11 1 0x99
+4 1 1 0x42
+3 1111 0x3c
+2 0x00
+1 0x00
+
+0x00,0x00,0x3c,0x42,0x99,0xa5,0x81,0xa5,0x81,0x42,0x3c,0x00,0x00 
+
+ 12345678
+3 0x00
+2 0x00
+1 1 0x08
+0 1 1 1 0x49
+9 1 1 1 0x2a
+8 111 0x1c
+7 1111111 0x7f
+6 111 0x1c
+5 1 1 1 0x2a
+4 1 1 1 0x49
+3 1 0x08
+2 0x00
+1 0x00
+
+0x00,0x00,0x08,0x49,0x2a,0x1c,0x7f,0x1c,0x2a,0x49,0x08,0x00,0x00
+
+
+ 12345678
+3 0x00
+2 0x00
+1 11111 0x3e
+0 1 1 1 0x2a
+9 11 11 0x36
+8 1 1 1 0x2a
+7 11 11 0x36
+6 1 1 1 0x2a
+5 11 11 0x36
+4 1 1 1 0x2a
+3 11111 0x3e
+2 0x00
+1 0x00
+
+{0x00,0x00,0x3e,0x2a,0x36,0x2a,0x36,0x2a,0x36,0x2a,0x3e,0x00,0x00},
+
+ 12345678
+3 0x00
+2 0x00
+1 11 0x06
+0 111 0x1c
+9 111 0x38
+8 1111 0x78
+7 1111 0x78 
+6 1111 0x78
+5 111 0x38
+4 111 0x1c
+3 11 0x06
+2 0x00
+1 0x00
+
+{0x00,0x00,0x06,0x1c,0x38,0x78,0x78,0x78,0x38,0x1c,0x06,0x00,0x00},
+
+
+ 12345678
+3 0x00
+2 11 0x60
+11 1 11 0x96
+01111 1 1 0xf5
+91 1 11 0x96
+81 1 1 1 0x95
+71 1 111 0x97
+6 0x00
+5 0x00
+4 0x00
+3 0x00
+2 0x00
+1 0x00
+
+0x00,0x00,0x00,0x00,0x00,0x00,0x97,x95,0x96,0xf5,0x96,0x60,0x00
+
+*/
+
+////////////////////////////////////////////////////////////////////////
+// texture for gpu picture
+////////////////////////////////////////////////////////////////////////
+
+void CreatePic(unsigned char * pMem)
+{
+ int x,y;
+ GLubyte TexBytes[128][128][3];
+ memset(TexBytes,0,128*128*3);
+ 
+ for(y=0;y<96;y++)
+ {
+ for(x=0;x<128;x++)
+ {
+ TexBytes[y][x][0]=*(pMem+2);
+ TexBytes[y][x][1]=*(pMem+1);
+ TexBytes[y][x][2]=*(pMem+0);
+ pMem+=3;
+ }
+ }
+
+ glGenTextures(1, &gTexPicName);
+ glBindTexture(GL_TEXTURE_2D, gTexPicName);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+ glTexImage2D(GL_TEXTURE_2D, 0, 3, 128, 128, 0, GL_RGB,
+ GL_UNSIGNED_BYTE,TexBytes);
+}
+
+////////////////////////////////////////////////////////////////////////
+// destroy gpu picture texture
+////////////////////////////////////////////////////////////////////////
+
+void DestroyPic(void)
+{
+ if(gTexPicName) 
+ {
+ GLfloat fYS1,fYS2,fXS1,fXS2,fXS,fYS;
+
+ glDisable(GL_SCISSOR_TEST); 
+ glDisable(GL_ALPHA_TEST);
+ if(bOldSmoothShaded) {glShadeModel(GL_FLAT);bOldSmoothShaded=FALSE;}
+ if(bBlendEnable) {glDisable(GL_BLEND);bBlendEnable=FALSE;}
+ if(!bTexEnabled) {glEnable(GL_TEXTURE_2D);bTexEnabled=TRUE;}
+ gTexName=0;
+ glBindTexture(GL_TEXTURE_2D,0); 
+ vertex[0].c.lcol=0xff000000; 
+
+ fYS=(GLfloat)PSXDisplay.DisplayMode.y/(GLfloat)iResY;
+ fXS=(GLfloat)PSXDisplay.DisplayMode.x/(GLfloat)iResX;
+ fYS2=96.0f*fYS;
+ fYS1=0.0f;
+ fXS2=(GLfloat)PSXDisplay.DisplayMode.x;
+ fXS1=fXS2-128.0f*fXS;
+
+ SETCOL(vertex[0]); 
+ glBegin(GL_QUADS); // paint a black rect to hide texture
+
+ glVertex3f(fXS1,fYS1,0.99996f);
+ glVertex3f(fXS1,fYS2,0.99996f);
+ glVertex3f(fXS2,fYS2,0.99996f);
+ glVertex3f(fXS2,fYS1,0.99996f);
+
+ glEnd();
+ glEnable(GL_ALPHA_TEST);
+ glEnable(GL_SCISSOR_TEST); 
+ 
+ glDeleteTextures(1,&gTexPicName);gTexPicName=0;
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+// display info picture
+////////////////////////////////////////////////////////////////////////
+
+void DisplayPic(void)
+{
+ GLfloat fYS1,fYS2,fXS1,fXS2,fXS,fYS;
+
+ glDisable(GL_SCISSOR_TEST); 
+ glDisable(GL_ALPHA_TEST);
+ if(bOldSmoothShaded) {glShadeModel(GL_FLAT);bOldSmoothShaded=FALSE;}
+ if(bBlendEnable) {glDisable(GL_BLEND);bBlendEnable=FALSE;}
+ if(!bTexEnabled) {glEnable(GL_TEXTURE_2D);bTexEnabled=TRUE;}
+ gTexName=gTexPicName;
+ glBindTexture(GL_TEXTURE_2D,gTexPicName); // now set font texture
+
+ if(bGLBlend) vertex[0].c.lcol=0xff7f7f7f; 
+ else vertex[0].c.lcol=0xffffffff; 
+
+ fYS=(GLfloat)PSXDisplay.DisplayMode.y/(GLfloat)iResY;
+ fXS=(GLfloat)PSXDisplay.DisplayMode.x/(GLfloat)iResX;
+ fYS2=96.0f*fYS;
+ fYS1=0.0f;
+ fXS2=(GLfloat)PSXDisplay.DisplayMode.x;
+ fXS1=fXS2-128.0f*fXS;
+
+ SETCOL(vertex[0]); 
+ glBegin(GL_QUADS);
+
+#ifdef OWNSCALE
+ glTexCoord2f(0.0f,0.0f);
+ glVertex3f(fXS1,fYS1,0.99996f);
+ glTexCoord2f(0.0f,192.0f/256.0f);
+ glVertex3f(fXS1,fYS2,0.99996f);
+ glTexCoord2f(256.0f/256.0f,192.0f/256.0f);
+ glVertex3f(fXS2,fYS2,0.99996f);
+ glTexCoord2f(256.0f/256.0f,0.0f);
+ glVertex3f(fXS2,fYS1,0.99996f);
+#else
+ glTexCoord2f(0.0f,0.0f);
+ glVertex3f(fXS1,fYS1,0.99996f);
+ glTexCoord2f(0.0f,192.0f);
+ glVertex3f(fXS1,fYS2,0.99996f);
+ glTexCoord2f(256.0f,192.0f);
+ glVertex3f(fXS2,fYS2,0.99996f);
+ glTexCoord2f(256.0f,0.0f);
+ glVertex3f(fXS2,fYS1,0.99996f);
+#endif
+
+ glEnd();
+ glEnable(GL_ALPHA_TEST);
+ glEnable(GL_SCISSOR_TEST); 
+}
+
+////////////////////////////////////////////////////////////////////////
+// windows only: texture with pi-tec sign and version info
+////////////////////////////////////////////////////////////////////////
+
+#ifdef _WINDOWS
+void ShowGpuPic(void)
+{
+ HRSRC hR;HGLOBAL hG;
+ unsigned long * pRMem;
+ unsigned char * pMem;
+ int x,y;unsigned long * pDMem;
+
+ if(gTexPicName) {DestroyPic();return;} // turn off any screen pic, if it does already exist
+
+ if(ulKeybits&KEY_SHOWFPS) {ShowTextGpuPic();return;}
+
+ hR=FindResource(hInst,MAKEINTRESOURCE(IDB_GPU),RT_BITMAP); // load bitmap from resource
+ hG=LoadResource(hInst,hR);
+ 
+ pRMem=((unsigned long *)LockResource(hG))+10; // get long ptr to bmp data
+
+ pMem=(unsigned char *)malloc(128*96*3); // change the data upside-down
+
+ for(y=0;y<96;y++)
+ {
+ pDMem=(unsigned long *)(pMem+(95-y)*128*3);
+ for(x=0;x<96;x++) *pDMem++=*pRMem++;
+ }
+
+ CreatePic(pMem); // show the pic
+ 
+ free(pMem); // clean up
+ DeleteObject(hG);
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void ShowTextGpuPic(void) // CREATE TEXT SCREEN PIC
+{ // gets an Text and paints
+ unsigned char * pMem;BITMAPINFO bmi; // it into a rgb24 bitmap
+ HDC hdc,hdcMem;HBITMAP hBmp,hBmpMem;HFONT hFontMem; // to display it in the gpu
+ HBRUSH hBrush,hBrushMem;HPEN hPen,hPenMem;
+ char szB[256];
+ RECT r={0,0,128,96}; // size of bmp... don't change that
+ COLORREF crFrame = RGB(255,255,128); // some example color inits
+ COLORREF crBkg = RGB(0,0,0);
+ COLORREF crText = RGB(255,255,0);
+
+ if(gTexPicName) DestroyPic();
+
+ //----------------------------------------------------// creation of the dc & bitmap
+
+ hdc =GetDC(NULL); // create a dc
+ hdcMem=CreateCompatibleDC(hdc);
+ ReleaseDC(NULL,hdc);
+ 
+ memset(&bmi,0,sizeof(BITMAPINFO)); // create a 24bit dib
+ bmi.bmiHeader.biSize=sizeof(BITMAPINFOHEADER);
+ bmi.bmiHeader.biWidth=128;
+ bmi.bmiHeader.biHeight=-96;
+ bmi.bmiHeader.biPlanes=1;
+ bmi.bmiHeader.biBitCount=24;
+ bmi.bmiHeader.biCompression=BI_RGB;
+ hBmp=CreateDIBSection(hdcMem,&bmi,DIB_RGB_COLORS,
+ (void **)&pMem,NULL,0); // pMem will point to 128x96x3 bitmap data
+
+ hBmpMem = (HBITMAP)SelectObject(hdcMem,hBmp); // sel the bmp into the dc
+
+ //----------------------------------------------------// ok, the following is just a drawing example... change it...
+ // create & select an additional font... whatever you want to paint, paint it in the dc :)
+ hBrush=CreateSolidBrush(crBkg);
+ hPen=CreatePen(PS_SOLID,0,crFrame);
+
+ hBrushMem = (HBRUSH)SelectObject(hdcMem,hBrush);
+ hPenMem = (HPEN)SelectObject(hdcMem,hPen);
+ hFontMem = (HFONT)SelectObject(hdcMem,hGFont);
+
+ SetTextColor(hdcMem,crText);
+ SetBkColor(hdcMem,crBkg);
+
+ Rectangle(hdcMem,r.left,r.top,r.right,r.bottom); // our example: fill rect and paint border
+ InflateRect(&r,-3,-2); // reduce the text area
+
+ LoadString(hInst,IDS_INFO0+iMPos,szB,255);
+ DrawText(hdcMem,szB,strlen(szB),&r, // paint the text (including clipping and word break)
+ DT_LEFT|DT_WORDBREAK);
+ 
+ //----------------------------------------------------// ok, now store the pMem data, or just call the gpu func
+
+ CreatePic(pMem);
+
+ //----------------------------------------------------// finished, now we clean up... needed, or you will get resource leaks :)
+
+ SelectObject(hdcMem,hBmpMem); // sel old mem dc objects
+ SelectObject(hdcMem,hBrushMem);
+ SelectObject(hdcMem,hPenMem);
+ SelectObject(hdcMem,hFontMem);
+ DeleteDC(hdcMem); // delete mem dcs
+ DeleteObject(hBmp);
+ DeleteObject(hBrush); // delete created objects
+ DeleteObject(hPen);
+}
+
+////////////////////////////////////////////////////////////////////////
+
+#endif
+
+////////////////////////////////////////////////////////////////////////
+// show gun cursor
+////////////////////////////////////////////////////////////////////////
+
+#define TRA 0x00,0x00,0x00,0x00
+#define PNT 0xff,0xff,0xff,0xff
+
+GLubyte texcursor[8][32]= 
+{
+{TRA,TRA,PNT,PNT,PNT,TRA,TRA,TRA},
+{TRA,PNT,TRA,TRA,TRA,PNT,TRA,TRA},
+{PNT,TRA,TRA,PNT,TRA,TRA,PNT,TRA},
+{PNT,TRA,PNT,TRA,PNT,TRA,PNT,TRA},
+{PNT,TRA,TRA,PNT,TRA,TRA,PNT,TRA},
+{TRA,PNT,TRA,TRA,TRA,PNT,TRA,TRA},
+{TRA,TRA,PNT,PNT,PNT,TRA,TRA,TRA},
+{TRA,TRA,TRA,TRA,TRA,TRA,TRA,TRA}
+};
+
+void ShowGunCursor(void)
+{
+ int iPlayer;
+ GLfloat fX,fY,fDX,fDY,fYS,fXS;
+ const uint32_t crCursorColor32[8]={0xff00ff00,0xffff0000,0xff0000ff,0xffff00ff,0xffffff00,0xff00ffff,0xffffffff,0xff7f7f7f};
+
+ if(!gTexCursorName) // create gun cursor texture the first time
+ {
+ glGenTextures(1, &gTexCursorName);
+ glBindTexture(GL_TEXTURE_2D, gTexCursorName);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+ glTexImage2D(GL_TEXTURE_2D, 0, 4, 8, 8, 0, GL_RGBA,
+ GL_UNSIGNED_BYTE,texcursor);
+ }
+
+ fYS=(GLfloat)PSXDisplay.DisplayMode.y/(GLfloat)iResY; // some pre-calculations
+ fXS=(GLfloat)PSXDisplay.DisplayMode.x/(GLfloat)iResX;
+
+ fDX=fXS*7;
+ fDY=fYS*7;
+
+ glDisable(GL_SCISSOR_TEST); 
+ if(bOldSmoothShaded) {glShadeModel(GL_FLAT);bOldSmoothShaded=FALSE;}
+ if(bBlendEnable) {glDisable(GL_BLEND);bBlendEnable=FALSE;}
+ if(!bTexEnabled) {glEnable(GL_TEXTURE_2D);bTexEnabled=TRUE;}
+
+ gTexName=gTexCursorName;
+ glBindTexture(GL_TEXTURE_2D,gTexCursorName); // now set font texture
+
+ for(iPlayer=0;iPlayer<8;iPlayer++) // loop all possible players
+ {
+ if(usCursorActive&(1<<iPlayer)) // player is active?
+ {
+ fY=((GLfloat)ptCursorPoint[iPlayer].y*(GLfloat)PSXDisplay.DisplayMode.y)/256.0f;
+ fX=((GLfloat)ptCursorPoint[iPlayer].x*(GLfloat)PSXDisplay.DisplayMode.x)/512.0f;
+
+ vertex[0].c.lcol=crCursorColor32[iPlayer]; // -> set player color
+
+ SETCOL(vertex[0]); 
+
+ glBegin(GL_QUADS);
+
+ glTexCoord2f(000.0f,224.0f/255.99f); // -> paint gun cursor
+ glVertex3f(fX-fDX,fY+fDY,0.99996f);
+ glTexCoord2f(000.0f,000.0f);
+ glVertex3f(fX-fDX,fY-fDY,0.99996f);
+ glTexCoord2f(224.0f/255.99f,000.0f);
+ glVertex3f(fX+fDX,fY-fDY,0.99996f);
+ glTexCoord2f(224.0f/255.99f,224.0f/255.99f);
+ glVertex3f(fX+fDX,fY+fDY,0.99996f);
+
+ glEnd();
+ }
+ }
+
+ glEnable(GL_SCISSOR_TEST); 
+}

pcsxr-1.9.92.tar.bz2/plugins/peopsxgl/menu.h -> pcsxr-1.9.93.tar.bz2/plugins/peopsxgl/menu.h Changed

@@ -1,41 +1,45 @@
-/***************************************************************************
-                           menu.h  -  description
-                             -------------------
-    begin                : Sun Mar 08 2009
-    copyright            : (C) 1999-2009 by Pete Bernert
-    web                  : www.pbernert.com   
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version. See also the license.txt file for *
- *   additional informations.                                              *
- *                                                                         *
- ***************************************************************************/
-
-//*************************************************************************// 
-// History of changes:
-//
-// 2009/03/08 - Pete  
-// - generic cleanup for the Peops release
-//
-//*************************************************************************// 
-
-#ifndef _GL_MENU_H_
-#define _GL_MENU_H_
-
-void DisplayText(void);
-void HideText(void);
-void KillDisplayLists(void);
-void MakeDisplayLists(void);
-void BuildDispMenu(int iInc);
-void SwitchDispMenu(int iStep);
-void CreatePic(unsigned char * pMem);
-void DisplayPic(void);
-void DestroyPic(void);
-void ShowGunCursor(void);
-
-#endif // _GL_MENU_H_
+/***************************************************************************
+                           menu.h  -  description
+                             -------------------
+    begin                : Sun Mar 08 2009
+    copyright            : (C) 1999-2009 by Pete Bernert
+    web                  : www.pbernert.com   
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+//*************************************************************************// 
+// History of changes:
+//
+// 2009/03/08 - Pete  
+// - generic cleanup for the Peops release
+//
+//*************************************************************************// 
+
+#ifndef _GL_MENU_H_
+#define _GL_MENU_H_
+
+void DisplayText(void);
+void HideText(void);
+void KillDisplayLists(void);
+void MakeDisplayLists(void);
+void BuildDispMenu(int iInc);
+void SwitchDispMenu(int iStep);
+void CreatePic(unsigned char * pMem);
+void DisplayPic(void);
+void DestroyPic(void);
+#ifdef _WINDOWS
+void ShowGpuPic(void);
+void ShowTextGpuPic(void);
+#endif
+void ShowGunCursor(void);
+
+#endif // _GL_MENU_H_

pcsxr-1.9.92.tar.bz2/plugins/peopsxgl/prim.c -> pcsxr-1.9.93.tar.bz2/plugins/peopsxgl/prim.c Changed

@@ -1,21 +1,21 @@
-/***************************************************************************
- prim.c - description
- -------------------
- begin : Sun Mar 08 2009
- copyright : (C) 1999-2009 by Pete Bernert
- web : www.pbernert.com 
- ***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. See also the license.txt file for *
- * additional informations. *
- * *
- ***************************************************************************/
-
+/***************************************************************************
+ prim.c - description
+ -------------------
+ begin : Sun Mar 08 2009
+ copyright : (C) 1999-2009 by Pete Bernert
+ web : www.pbernert.com 
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
 #include "stdafx.h"
 
 #define _IN_PRIMDRAW
@@ -37,47 +37,47 @@
 // globals
 ////////////////////////////////////////////////////////////////////////
 
-BOOL bDrawTextured; // current active drawing states
+BOOL bDrawTextured; // current active drawing states
 BOOL bDrawSmoothShaded;
 BOOL bOldSmoothShaded;
 BOOL bDrawNonShaded;
 BOOL bDrawMultiPass;
 int iOffscreenDrawing;
 int iDrawnSomething=0;
-
-BOOL bRenderFrontBuffer=FALSE; // flag for front buffer rendering
 
-GLubyte ubGloAlpha; // texture alpha
-GLubyte ubGloColAlpha; // color alpha
-int iFilterType; // type of filter
-BOOL bFullVRam=FALSE; // sign for tex win
-BOOL bDrawDither; // sign for dither
-BOOL bUseMultiPass; // sign for multi pass
-GLuint gTexName; // binded texture
-BOOL bTexEnabled; // texture enable flag
-BOOL bBlendEnable; // blend enable flag
-PSXRect_t xrUploadArea; // rect to upload
-PSXRect_t xrUploadAreaIL; // rect to upload
-PSXRect_t xrUploadAreaRGB24; // rect to upload rgb24
-int iSpriteTex=0; // flag for "hey, it's a sprite"
-unsigned short usMirror; // mirror, mirror on the wall
-
-BOOL bNeedUploadAfter=FALSE; // sign for uploading in next frame
-BOOL bNeedUploadTest=FALSE; // sign for upload test
-BOOL bUsingTWin=FALSE; // tex win active flag
-BOOL bUsingMovie=FALSE; // movie active flag
-PSXRect_t xrMovieArea; // rect for movie upload
-short sSprite_ux2; // needed for sprire adjust
-short sSprite_vy2; // 
-uint32_t ulOLDCOL=0; // active color
-uint32_t ulClutID; // clut
+BOOL bRenderFrontBuffer=FALSE; // flag for front buffer rendering
+
+GLubyte ubGloAlpha; // texture alpha
+GLubyte ubGloColAlpha; // color alpha
+int iFilterType; // type of filter
+BOOL bFullVRam=FALSE; // sign for tex win
+BOOL bDrawDither; // sign for dither
+BOOL bUseMultiPass; // sign for multi pass
+GLuint gTexName; // binded texture
+BOOL bTexEnabled; // texture enable flag
+BOOL bBlendEnable; // blend enable flag
+PSXRect_t xrUploadArea; // rect to upload
+PSXRect_t xrUploadAreaIL; // rect to upload
+PSXRect_t xrUploadAreaRGB24; // rect to upload rgb24
+int iSpriteTex=0; // flag for "hey, it's a sprite"
+unsigned short usMirror; // mirror, mirror on the wall
+
+BOOL bNeedUploadAfter=FALSE; // sign for uploading in next frame
+BOOL bNeedUploadTest=FALSE; // sign for upload test
+BOOL bUsingTWin=FALSE; // tex win active flag
+BOOL bUsingMovie=FALSE; // movie active flag
+PSXRect_t xrMovieArea; // rect for movie upload
+short sSprite_ux2; // needed for sprire adjust
+short sSprite_vy2; // 
+uint32_t ulOLDCOL=0; // active color
+uint32_t ulClutID; // clut
 
-uint32_t dwCfgFixes; // game fixes
-uint32_t dwActFixes=0;
+uint32_t dwCfgFixes; // game fixes
+uint32_t dwActFixes=0;
 uint32_t dwEmuFixes=0;
-BOOL bUseFixes;
+BOOL bUseFixes;
 
-int drawX,drawY,drawW,drawH; // offscreen drawing checkers
+int drawX,drawY,drawW,drawH; // offscreen drawing checkers
 short sxmin,sxmax,symin,symax;
 
 //////////////////////////////////////////////////////////////////////// 
@@ -88,26 +88,26 @@
 {
 GlobalTextAddrX = (gdata << 6) & 0x3c0;
 
- if(iGPUHeight==1024) // ZN mode
- {
- if(dwGPUVersion==2) // very special zn gpu
- {
- GlobalTextAddrY =((gdata & 0x60 ) << 3);
- GlobalTextIL =(gdata & 0x2000) >> 13;
- GlobalTextABR = (unsigned short)((gdata >> 7) & 0x3);
- GlobalTextTP = (gdata >> 9) & 0x3;
- if(GlobalTextTP==3) GlobalTextTP=2; 
- GlobalTexturePage = (GlobalTextAddrX>>6)+(GlobalTextAddrY>>4);
- usMirror =0;
- STATUSREG = (STATUSREG & 0xffffe000 ) | (gdata & 0x1fff );
- return;
- }
- else // "enhanced" psx gpu
- {
- GlobalTextAddrY = (unsigned short)(((gdata << 4) & 0x100) | ((gdata >> 2) & 0x200));
- }
- }
- else GlobalTextAddrY = (gdata << 4) & 0x100; // "normal" psx gpu
+ if(iGPUHeight==1024) // ZN mode
+ {
+ if(dwGPUVersion==2) // very special zn gpu
+ {
+ GlobalTextAddrY =((gdata & 0x60 ) << 3);
+ GlobalTextIL =(gdata & 0x2000) >> 13;
+ GlobalTextABR = (unsigned short)((gdata >> 7) & 0x3);
+ GlobalTextTP = (gdata >> 9) & 0x3;
+ if(GlobalTextTP==3) GlobalTextTP=2; 
+ GlobalTexturePage = (GlobalTextAddrX>>6)+(GlobalTextAddrY>>4);
+ usMirror =0;
+ STATUSREG = (STATUSREG & 0xffffe000 ) | (gdata & 0x1fff );
+ return;
+ }
+ else // "enhanced" psx gpu
+ {
+ GlobalTextAddrY = (unsigned short)(((gdata << 4) & 0x100) | ((gdata >> 2) & 0x200));
+ }
+ }
+ else GlobalTextAddrY = (gdata << 4) & 0x100; // "normal" psx gpu
 
 usMirror=gdata&0x3000;
 
@@ -146,7 +146,7 @@
 // OpenGL primitive drawing commands
 ////////////////////////////////////////////////////////////////////////
 
-__inline void PRIMdrawTexturedQuad(OGLVertex* vertex1, OGLVertex* vertex2, 
+static __inline void PRIMdrawTexturedQuad(OGLVertex* vertex1, OGLVertex* vertex2, 
 OGLVertex* vertex3, OGLVertex* vertex4) 
 {
 glBegin(GL_TRIANGLE_STRIP);
@@ -166,7 +166,7 @@
 
 ///////////////////////////////////////////////////////// 
 
-__inline void PRIMdrawTexturedTri(OGLVertex* vertex1, OGLVertex* vertex2, 
+static __inline void PRIMdrawTexturedTri(OGLVertex* vertex1, OGLVertex* vertex2, 
 OGLVertex* vertex3) 
 {
 glBegin(GL_TRIANGLES);
@@ -183,7 +183,7 @@
 
 ///////////////////////////////////////////////////////// 
 
-__inline void PRIMdrawTexGouraudTriColor(OGLVertex* vertex1, OGLVertex* vertex2, 
+static __inline void PRIMdrawTexGouraudTriColor(OGLVertex* vertex1, OGLVertex* vertex2, 
 OGLVertex* vertex3) 
 {
 glBegin(GL_TRIANGLES);
@@ -204,7 +204,7 @@
 
 ///////////////////////////////////////////////////////// 
 
-__inline void PRIMdrawTexGouraudTriColorQuad(OGLVertex* vertex1, OGLVertex* vertex2, 
+static __inline void PRIMdrawTexGouraudTriColorQuad(OGLVertex* vertex1, OGLVertex* vertex2, 
 OGLVertex* vertex3, OGLVertex* vertex4) 
 {
 glBegin(GL_TRIANGLE_STRIP);
@@ -228,7 +228,7 @@
 
 ///////////////////////////////////////////////////////// 
 
-__inline void PRIMdrawTri(OGLVertex* vertex1, OGLVertex* vertex2, OGLVertex* vertex3) 
+static __inline void PRIMdrawTri(OGLVertex* vertex1, OGLVertex* vertex2, OGLVertex* vertex3) 
 {
 glBegin(GL_TRIANGLES);
 glVertex3fv(&vertex1->x);
@@ -239,7 +239,7 @@
 
 ///////////////////////////////////////////////////////// 
 
-__inline void PRIMdrawTri2(OGLVertex* vertex1, OGLVertex* vertex2, 
+static __inline void PRIMdrawTri2(OGLVertex* vertex1, OGLVertex* vertex2, 
 OGLVertex* vertex3, OGLVertex* vertex4) 
 {
 glBegin(GL_TRIANGLE_STRIP); 
@@ -252,7 +252,7 @@
 
 ///////////////////////////////////////////////////////// 
 
-__inline void PRIMdrawGouraudTriColor(OGLVertex* vertex1, OGLVertex* vertex2, 
+static __inline void PRIMdrawGouraudTriColor(OGLVertex* vertex1, OGLVertex* vertex2, 
 OGLVertex* vertex3) 
 {
 glBegin(GL_TRIANGLES); 
@@ -269,7 +269,7 @@
 
 ///////////////////////////////////////////////////////// 
 
-__inline void PRIMdrawGouraudTri2Color(OGLVertex* vertex1, OGLVertex* vertex2, 
+static __inline void PRIMdrawGouraudTri2Color(OGLVertex* vertex1, OGLVertex* vertex2, 
 OGLVertex* vertex3, OGLVertex* vertex4) 
 {
 glBegin(GL_TRIANGLE_STRIP); 
@@ -289,7 +289,7 @@
 
 ///////////////////////////////////////////////////////// 
 
-__inline void PRIMdrawFlatLine(OGLVertex* vertex1, OGLVertex* vertex2,OGLVertex* vertex3, OGLVertex* vertex4)
+static __inline void PRIMdrawFlatLine(OGLVertex* vertex1, OGLVertex* vertex2,OGLVertex* vertex3, OGLVertex* vertex4)
 {
 glBegin(GL_QUADS);
 
@@ -304,7 +304,7 @@
 
 ///////////////////////////////////////////////////////// 
 
-__inline void PRIMdrawGouraudLine(OGLVertex* vertex1, OGLVertex* vertex2,OGLVertex* vertex3, OGLVertex* vertex4)
+static __inline void PRIMdrawGouraudLine(OGLVertex* vertex1, OGLVertex* vertex2,OGLVertex* vertex3, OGLVertex* vertex4)
 {
 glBegin(GL_QUADS);
 
@@ -324,7 +324,7 @@
 
 ///////////////////////////////////////////////////////// 
 
-__inline void PRIMdrawQuad(OGLVertex* vertex1, OGLVertex* vertex2, 
+static __inline void PRIMdrawQuad(OGLVertex* vertex1, OGLVertex* vertex2, 
 OGLVertex* vertex3, OGLVertex* vertex4) 
 {
 glBegin(GL_QUADS);
@@ -354,7 +354,7 @@
 {GL_SRC_ALPHA,GL_SRC_ALPHA, 127},
 {GL_ONE, GL_ONE, 255},
 {GL_ZERO, GL_ONE_MINUS_SRC_COLOR,255},
- {GL_ONE_MINUS_SRC_ALPHA,GL_ONE, 192}
+ {GL_ONE_MINUS_SRC_ALPHA,GL_ONE, 192}
 }; 
 
 ////////////////////////////////////////////////////////////////////////
@@ -372,7 +372,7 @@
 {
 if(bBlendEnable)
 {glDisable(GL_BLEND);bBlendEnable=FALSE;} // -> don't wanna blend
- ubGloAlpha=ubGloColAlpha=255; // -> full alpha
+ ubGloAlpha=ubGloColAlpha=255; // -> full alpha
 return; // -> and bye
 }
 
@@ -388,7 +388,7 @@
 {
 obm1=TransSets[GlobalTextABR].srcFac;
 obm2=TransSets[GlobalTextABR].dstFac;
- glBlendFunc(obm1,obm2); // set blend func
+ glBlendFunc(obm1,obm2); // set blend func
 }
 else
 if(TransSets[GlobalTextABR].dstFac !=GL_ONE_MINUS_SRC_COLOR)
@@ -397,19 +397,19 @@
 glBlendEquationEXTEx(FUNC_ADD_EXT);
 obm1=TransSets[GlobalTextABR].srcFac;
 obm2=TransSets[GlobalTextABR].dstFac;
- glBlendFunc(obm1,obm2); // set blend func
+ glBlendFunc(obm1,obm2); // set blend func
 }
 else
 {
 glBlendEquationEXTEx(FUNC_REVERSESUBTRACT_EXT);
 obm1=TransSets[GlobalTextABR].srcFac;
 obm2=TransSets[GlobalTextABR].dstFac;
- glBlendFunc(GL_ONE,GL_ONE); // set blend func
+ glBlendFunc(GL_ONE,GL_ONE); // set blend func
 }
 }
 }
 
-void SetScanTrans(void) // blending for scan lines
+void SetScanTrans(void) // blending for scan lines
 {
 if(glBlendEquationEXTEx!=NULL)
 {
@@ -419,10 +419,10 @@
 
 obm1=TransSets[0].srcFac;
 obm2=TransSets[0].dstFac;
- glBlendFunc(obm1,obm2); // set blend func
+ glBlendFunc(obm1,obm2); // set blend func
 }
 
-void SetScanTexTrans(void) // blending for scan mask texture
+void SetScanTexTrans(void) // blending for scan mask texture
 {
 if(glBlendEquationEXTEx!=NULL)
 {
@@ -432,7 +432,7 @@
 
 obm1=TransSets[2].srcFac;
 obm2=TransSets[2].dstFac;
- glBlendFunc(obm1,obm2); // set blend func
+ glBlendFunc(obm1,obm2); // set blend func
 }
 
 //////////////////////////////////////////////////////////////////////// 
@@ -512,11 +512,11 @@
 }
 
 if(!bBlendEnable)
- {glEnable(GL_BLEND);bBlendEnable=TRUE;} // wanna blend
+ {glEnable(GL_BLEND);bBlendEnable=TRUE;} // wanna blend
 
 if(bm1!=obm1 || bm2!=obm2)
 {
- glBlendFunc(bm1,bm2); // set blend func
+ glBlendFunc(bm1,bm2); // set blend func
 obm1=bm1;obm2=bm2;
 }
 }
@@ -525,7 +525,7 @@
 // Set several rendering stuff including blending 
 ////////////////////////////////////////////////////////////////////////
 
-__inline void SetZMask3O(void)
+static __inline void SetZMask3O(void)
 {
 if(iUseMask && DrawSemiTrans && !iSetMask)
 {
@@ -534,7 +534,7 @@
 }
 }
 
-__inline void SetZMask3(void)
+static __inline void SetZMask3(void)
 {
 if(iUseMask)
 {
@@ -548,7 +548,7 @@
 }
 }
 
-__inline void SetZMask3NT(void)
+static __inline void SetZMask3NT(void)
 {
 if(iUseMask)
 {
@@ -564,7 +564,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-__inline void SetZMask4O(void)
+static __inline void SetZMask4O(void)
 {
 if(iUseMask && DrawSemiTrans && !iSetMask)
 {
@@ -573,7 +573,7 @@
 }
 }
 
-__inline void SetZMask4(void)
+static __inline void SetZMask4(void)
 {
 if(iUseMask)
 {
@@ -587,7 +587,7 @@
 }
 }
 
-__inline void SetZMask4NT(void)
+static __inline void SetZMask4NT(void)
 {
 if(iUseMask)
 {
@@ -600,29 +600,29 @@
 }
 }
 }
-
-__inline void SetZMask4SP(void)
-{
- if(iUseMask)
- {
- if(iSetMask==1)
- {vertex[0].z=vertex[1].z=vertex[2].z=vertex[3].z=0.95f;}
- else
- {
- if(bCheckMask)
- {
- vertex[0].z=vertex[1].z=vertex[2].z=vertex[3].z=gl_z;
- gl_z+=0.00004f;
- }
- else
- {vertex[0].z=vertex[1].z=vertex[2].z=vertex[3].z=0.95f;}
- }
- }
-}
-
+
+static __inline void SetZMask4SP(void)
+{
+ if(iUseMask)
+ {
+ if(iSetMask==1)
+ {vertex[0].z=vertex[1].z=vertex[2].z=vertex[3].z=0.95f;}
+ else
+ {
+ if(bCheckMask)
+ {
+ vertex[0].z=vertex[1].z=vertex[2].z=vertex[3].z=gl_z;
+ gl_z+=0.00004f;
+ }
+ else
+ {vertex[0].z=vertex[1].z=vertex[2].z=vertex[3].z=0.95f;}
+ }
+ }
+}
+
 ////////////////////////////////////////////////////////////////////////
 
-__inline void SetRenderState(uint32_t DrawAttributes)
+static __inline void SetRenderState(uint32_t DrawAttributes)
 {
 bDrawNonShaded = (SHADETEXBIT(DrawAttributes)) ? TRUE : FALSE;
 DrawSemiTrans = (SEMITRANSBIT(DrawAttributes)) ? TRUE : FALSE;
@@ -630,7 +630,7 @@
 
 //////////////////////////////////////////////////////////////////////// 
 
-__inline void SetRenderColor(uint32_t DrawAttributes)
+static __inline void SetRenderColor(uint32_t DrawAttributes)
 {
 if(bDrawNonShaded) {g_m1=g_m2=g_m3=128;}
 else
@@ -671,24 +671,24 @@
 if((dwActFixes&4) && ((DrawAttributes&0x00ffffff)==0))
 DrawAttributes|=0x007f7f7f;
 
- if(bDrawNonShaded) // -> non shaded?
+ if(bDrawNonShaded) // -> non shaded?
 {
- if(bGLBlend) vertex[0].c.lcol=0x7f7f7f; // --> solid color...
+ if(bGLBlend) vertex[0].c.lcol=0x7f7f7f; // --> solid color...
 else vertex[0].c.lcol=0xffffff;
 }
 else // -> shaded?
 {
- if(!bUseMultiPass && !bGLBlend) // --> given color...
+ if(!bUseMultiPass && !bGLBlend) // --> given color...
 vertex[0].c.lcol=DoubleBGR2RGB(DrawAttributes);
 else vertex[0].c.lcol=DrawAttributes;
 }
- vertex[0].c.col[3]=ubGloAlpha; // -> set color with
+ vertex[0].c.col[3]=ubGloAlpha; // -> set color with
 SETCOL(vertex[0]); // texture alpha
 }
 
- if(bDrawSmoothShaded!=bOldSmoothShaded) // shading changed?
+ if(bDrawSmoothShaded!=bOldSmoothShaded) // shading changed?
 {
- if(bDrawSmoothShaded) glShadeModel(GL_SMOOTH); // -> set actual shading
+ if(bDrawSmoothShaded) glShadeModel(GL_SMOOTH); // -> set actual shading
 else glShadeModel(GL_FLAT);
 bOldSmoothShaded=bDrawSmoothShaded;
 }
@@ -700,7 +700,7 @@
 
 void SetOpaqueColor(uint32_t DrawAttributes)
 {
- if(bDrawNonShaded) return; // no shading? bye
+ if(bDrawNonShaded) return; // no shading? bye
 
 DrawAttributes=DoubleBGR2RGB(DrawAttributes); // multipass is just half color, so double it on opaque pass
 vertex[0].c.lcol=DrawAttributes|0xff000000;
@@ -832,12 +832,12 @@
 vertex[2].y=ly2 - PSXDisplay.DisplayPosition.y+PreviousPSXDisplay.Range.y0;
 vertex[3].y=ly3 - PSXDisplay.DisplayPosition.y+PreviousPSXDisplay.Range.y0;
 
- if(iOffscreenDrawing==4 && !(dwActFixes&1)) // -> frontbuffer wanted
+ if(iOffscreenDrawing==4 && !(dwActFixes&1)) // -> frontbuffer wanted
 {
 bRenderFrontBuffer=TRUE;
 //return TRUE;
 }
- return bFullVRam; // -> but no od
+ return bFullVRam; // -> but no od
 }
 
 return TRUE;
@@ -858,7 +858,7 @@
 symin=min(ly0,min(ly1,ly2));
 if(symin>drawH) return FALSE;
 
- if(PSXDisplay.Disabled) return TRUE; // disabled? ever
+ if(PSXDisplay.Disabled) return TRUE; // disabled? ever
 
 if(iOffscreenDrawing==1) return bFullVRam;
 
@@ -876,7 +876,7 @@
 
 if(bFront)
 {
- if(PSXDisplay.InterlacedTest) return bFullVRam; // -> ok, no need for adjust
+ if(PSXDisplay.InterlacedTest) return bFullVRam; // -> ok, no need for adjust
 
 vertex[0].x=lx0 - PSXDisplay.DisplayPosition.x+PreviousPSXDisplay.Range.x0;
 vertex[1].x=lx1 - PSXDisplay.DisplayPosition.x+PreviousPSXDisplay.Range.x0;
@@ -885,13 +885,13 @@
 vertex[1].y=ly1 - PSXDisplay.DisplayPosition.y+PreviousPSXDisplay.Range.y0;
 vertex[2].y=ly2 - PSXDisplay.DisplayPosition.y+PreviousPSXDisplay.Range.y0;
 
- if(iOffscreenDrawing==4) // -> frontbuffer wanted
+ if(iOffscreenDrawing==4) // -> frontbuffer wanted
 {
 bRenderFrontBuffer=TRUE;
 // return TRUE;
 }
 
- return bFullVRam; // -> but no od
+ return bFullVRam; // -> but no od
 }
 
 return TRUE;
@@ -947,7 +947,7 @@
 {
 imageX1 += imageX0;
 imageY1 += imageY0;
-
+
 if (imageX0 < PreviousPSXDisplay.DisplayPosition.x)
 xrUploadArea.x0 = PreviousPSXDisplay.DisplayPosition.x;
 else
@@ -1099,7 +1099,7 @@
 // lClearOnSwap=0;
 }
 else 
- if(PSXDisplay.Interlaced && PreviousPSXDisplay.RGB24<2) // in interlaced mode we upload at least two full frames (GT1 menu)
+ if(PSXDisplay.Interlaced && PreviousPSXDisplay.RGB24<2) // in interlaced mode we upload at least two full frames (GT1 menu)
 {
 PreviousPSXDisplay.RGB24++;
 }
@@ -1152,92 +1152,92 @@
 // Upload screen (MDEC and such)
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
-
-unsigned char * LoadDirectMovieFast(void);
-
-void UploadScreenEx(int Position)
-{
- short ya,yb,xa,xb,x, y, YStep, XStep, U, UStep,ux[4],vy[4];
-
- if(!PSXDisplay.DisplayMode.x) return;
- if(!PSXDisplay.DisplayMode.y) return;
-
- glDisable(GL_SCISSOR_TEST);
- glShadeModel(GL_FLAT);
- bOldSmoothShaded=FALSE;
- glDisable(GL_BLEND);
- bBlendEnable=FALSE;
- glDisable(GL_TEXTURE_2D);
- bTexEnabled=FALSE;
- glDisable(GL_ALPHA_TEST);
-
- glPixelZoom(((float)rRatioRect.right)/((float)PSXDisplay.DisplayMode.x),
- -1.0f*(((float)rRatioRect.bottom)/((float)PSXDisplay.DisplayMode.y)));
- 
- //----------------------------------------------------//
-
- YStep = 256; // max texture size
- XStep = 256;
- UStep = (PSXDisplay.RGB24 ? 128 : 0);
- ya = xrUploadArea.y0;
- yb = xrUploadArea.y1;
- xa = xrUploadArea.x0;
- xb = xrUploadArea.x1;
- 
- for(y=ya;y<=yb;y+=YStep) // loop y
- {
- U = 0;
- for(x=xa;x<=xb;x+=XStep) // loop x
- {
- ly0 = ly1 = y; // -> get y coords
- ly2 = y + YStep;
- if (ly2 > yb) ly2 = yb;
- ly3 = ly2;
-
- lx0 = lx3 = x; // -> get x coords
- lx1 = x + XStep;
- if (lx1 > xb) lx1 = xb;
-
- lx2 = lx1;
-
- ux[0]=ux[3]=(xa - x); // -> set tex x coords
- if (ux[0] < 0) ux[0]=ux[3]=0;
- ux[2]=ux[1]=(xb - x);
- if (ux[2] > 256) ux[2]=ux[1]=256;
-
- vy[0]=vy[1]=(ya - y); // -> set tex y coords
- if (vy[0] < 0) vy[0]=vy[1]=0;
- vy[2]=vy[3]=(yb - y);
- if (vy[2] > 256) vy[2]=vy[3]=256;
-
- if ((ux[0] >= ux[2]) || // -> cheaters never win...
- (vy[0] >= vy[2])) continue; // (but winners always cheat...)
- 
- xrMovieArea.x0=lx0+U; xrMovieArea.y0=ly0;
- xrMovieArea.x1=lx2+U; xrMovieArea.y1=ly2;
- 
- offsetScreenUpload(Position);
-
- glRasterPos2f(vertex[0].x,vertex[0].y);
-
- glDrawPixels(xrMovieArea.x1-xrMovieArea.x0,
- xrMovieArea.y1-xrMovieArea.y0,
- GL_RGBA,GL_UNSIGNED_BYTE,
- LoadDirectMovieFast());
-
- U+=UStep;
- }
- }
-
- //----------------------------------------------------//
-
- glPixelZoom(1.0F,1.0F);
-
- glEnable(GL_ALPHA_TEST);
- glEnable(GL_SCISSOR_TEST);
-}
-
-////////////////////////////////////////////////////////////////////////
+
+unsigned char * LoadDirectMovieFast(void);
+
+void UploadScreenEx(int Position)
+{
+ short ya,yb,xa,xb,x, y, YStep, XStep, U, UStep,ux[4],vy[4];
+
+ if(!PSXDisplay.DisplayMode.x) return;
+ if(!PSXDisplay.DisplayMode.y) return;
+
+ glDisable(GL_SCISSOR_TEST);
+ glShadeModel(GL_FLAT);
+ bOldSmoothShaded=FALSE;
+ glDisable(GL_BLEND);
+ bBlendEnable=FALSE;
+ glDisable(GL_TEXTURE_2D);
+ bTexEnabled=FALSE;
+ glDisable(GL_ALPHA_TEST);
+
+ glPixelZoom(((float)rRatioRect.right)/((float)PSXDisplay.DisplayMode.x),
+ -1.0f*(((float)rRatioRect.bottom)/((float)PSXDisplay.DisplayMode.y)));
+ 
+ //----------------------------------------------------//
+
+ YStep = 256; // max texture size
+ XStep = 256;
+ UStep = (PSXDisplay.RGB24 ? 128 : 0);
+ ya = xrUploadArea.y0;
+ yb = xrUploadArea.y1;
+ xa = xrUploadArea.x0;
+ xb = xrUploadArea.x1;
+ 
+ for(y=ya;y<=yb;y+=YStep) // loop y
+ {
+ U = 0;
+ for(x=xa;x<=xb;x+=XStep) // loop x
+ {
+ ly0 = ly1 = y; // -> get y coords
+ ly2 = y + YStep;
+ if (ly2 > yb) ly2 = yb;
+ ly3 = ly2;
+
+ lx0 = lx3 = x; // -> get x coords
+ lx1 = x + XStep;
+ if (lx1 > xb) lx1 = xb;
+
+ lx2 = lx1;
+
+ ux[0]=ux[3]=(xa - x); // -> set tex x coords
+ if (ux[0] < 0) ux[0]=ux[3]=0;
+ ux[2]=ux[1]=(xb - x);
+ if (ux[2] > 256) ux[2]=ux[1]=256;
+
+ vy[0]=vy[1]=(ya - y); // -> set tex y coords
+ if (vy[0] < 0) vy[0]=vy[1]=0;
+ vy[2]=vy[3]=(yb - y);
+ if (vy[2] > 256) vy[2]=vy[3]=256;
+
+ if ((ux[0] >= ux[2]) || // -> cheaters never win...
+ (vy[0] >= vy[2])) continue; // (but winners always cheat...)
+ 
+ xrMovieArea.x0=lx0+U; xrMovieArea.y0=ly0;
+ xrMovieArea.x1=lx2+U; xrMovieArea.y1=ly2;
+ 
+ offsetScreenUpload(Position);
+
+ glRasterPos2f(vertex[0].x,vertex[0].y);
+
+ glDrawPixels(xrMovieArea.x1-xrMovieArea.x0,
+ xrMovieArea.y1-xrMovieArea.y0,
+ GL_RGBA,GL_UNSIGNED_BYTE,
+ LoadDirectMovieFast());
+
+ U+=UStep;
+ }
+ }
+
+ //----------------------------------------------------//
+
+ glPixelZoom(1.0F,1.0F);
+
+ glEnable(GL_ALPHA_TEST);
+ glEnable(GL_SCISSOR_TEST);
+}
+
+////////////////////////////////////////////////////////////////////////
 
 void UploadScreen(int Position)
 {
@@ -1246,26 +1246,26 @@
 
 if(xrUploadArea.x0>1023) xrUploadArea.x0=1023;
 if(xrUploadArea.x1>1024) xrUploadArea.x1=1024;
- if(xrUploadArea.y0>iGPUHeightMask) xrUploadArea.y0=iGPUHeightMask;
- if(xrUploadArea.y1>iGPUHeight) xrUploadArea.y1=iGPUHeight;
+ if(xrUploadArea.y0>iGPUHeightMask) xrUploadArea.y0=iGPUHeightMask;
+ if(xrUploadArea.y1>iGPUHeight) xrUploadArea.y1=iGPUHeight;
 
 if(xrUploadArea.x0==xrUploadArea.x1) return;
 if(xrUploadArea.y0==xrUploadArea.y1) return;
 
 if(PSXDisplay.Disabled && iOffscreenDrawing<4) return;
-
- iDrawnSomething = 2;
- iLastRGB24=PSXDisplay.RGB24+1;
-
- if(bSkipNextFrame) return;
-
- if(dwActFixes & 2) {UploadScreenEx(Position);return;}
+
+ iDrawnSomething = 2;
+ iLastRGB24=PSXDisplay.RGB24+1;
+
+ if(bSkipNextFrame) return;
+
+ if(dwActFixes & 2) {UploadScreenEx(Position);return;}
 
 bUsingMovie = TRUE;
- bDrawTextured = TRUE; // just doing textures
+ bDrawTextured = TRUE; // just doing textures
 bDrawSmoothShaded = FALSE;
 
- if(bGLBlend) vertex[0].c.lcol=0xff7f7f7f; // set solid col
+ if(bGLBlend) vertex[0].c.lcol=0xff7f7f7f; // set solid col
 else vertex[0].c.lcol=0xffffffff;
 SETCOL(vertex[0]); 
 
@@ -1281,10 +1281,10 @@
 xa=xrUploadArea.x0;
 xb=xrUploadArea.x1;
 
- for(y=ya;y<=yb;y+=YStep) // loop y
+ for(y=ya;y<=yb;y+=YStep) // loop y
 {
 U = 0;
- for(x=xa;x<=xb;x+=XStep) // loop x
+ for(x=xa;x<=xb;x+=XStep) // loop x
 {
 ly0 = ly1 = y; // -> get y coords
 ly2 = y + YStep;
@@ -1297,17 +1297,17 @@
 
 lx2 = lx1;
 
- ux[0]=ux[3]=(xa - x); // -> set tex x coords
+ ux[0]=ux[3]=(xa - x); // -> set tex x coords
 if (ux[0] < 0) ux[0]=ux[3]=0;
 ux[2]=ux[1]=(xb - x);
 if (ux[2] > 256) ux[2]=ux[1]=256;
 
- vy[0]=vy[1]=(ya - y); // -> set tex y coords
+ vy[0]=vy[1]=(ya - y); // -> set tex y coords
 if (vy[0] < 0) vy[0]=vy[1]=0;
 vy[2]=vy[3]=(yb - y);
 if (vy[2] > 256) vy[2]=vy[3]=256;
 
- if ((ux[0] >= ux[2]) || // -> cheaters never win...
+ if ((ux[0] >= ux[2]) || // -> cheaters never win...
 (vy[0] >= vy[2])) continue; // (but winners always cheat...)
 
 xrMovieArea.x0=lx0+U; xrMovieArea.y0=ly0;
@@ -1331,7 +1331,7 @@
 }
 }
 
- bUsingMovie=FALSE; // done...
+ bUsingMovie=FALSE; // done...
 bDisplayNotSet = TRUE;
 }
 
@@ -1392,25 +1392,25 @@
 STATUSREG|=((gdata & 0x03) << 11); // set the current bits
 
 if(!iUseMask) return;
-
- if(gdata&1) {sSetMask=0x8000;lSetMask=0x80008000;iSetMask=1;}
- else {sSetMask=0; lSetMask=0; iSetMask=0;}
-
- if(gdata&2) 
- {
- if(!(gdata&1)) iSetMask=2;
- bCheckMask=TRUE;
- if(iDepthFunc==0) return;
- iDepthFunc=0;
- glDepthFunc(GL_LESS);
- }
- else
- {
- bCheckMask=FALSE;
- if(iDepthFunc==1) return;
- glDepthFunc(GL_ALWAYS);
- iDepthFunc=1;
- }
+
+ if(gdata&1) {sSetMask=0x8000;lSetMask=0x80008000;iSetMask=1;}
+ else {sSetMask=0; lSetMask=0; iSetMask=0;}
+
+ if(gdata&2) 
+ {
+ if(!(gdata&1)) iSetMask=2;
+ bCheckMask=TRUE;
+ if(iDepthFunc==0) return;
+ iDepthFunc=0;
+ glDepthFunc(GL_LESS);
+ }
+ else
+ {
+ bCheckMask=FALSE;
+ if(iDepthFunc==1) return;
+ glDepthFunc(GL_ALWAYS);
+ iDepthFunc=1;
+ }
 }
 
 ////////////////////////////////////////////////////////////////////////
@@ -1430,57 +1430,57 @@
 
 void cmdTextureWindow(unsigned char *baseAddr)
 {
- uint32_t gdata = ((uint32_t *)baseAddr)[0];
- uint32_t YAlign,XAlign;
-
- ulGPUInfoVals[INFO_TW]=gdata&0xFFFFF;
-
- if(gdata & 0x020)
- TWin.Position.y1 = 8; // xxxx1
- else if (gdata & 0x040)
- TWin.Position.y1 = 16; // xxx10
- else if (gdata & 0x080)
- TWin.Position.y1 = 32; // xx100
- else if (gdata & 0x100)
- TWin.Position.y1 = 64; // x1000
- else if (gdata & 0x200)
- TWin.Position.y1 = 128; // 10000
- else
- TWin.Position.y1 = 256; // 00000
-
- // Texture window size is determined by the least bit set of the relevant 5 bits
-
- if (gdata & 0x001)
- TWin.Position.x1 = 8; // xxxx1
- else if (gdata & 0x002)
- TWin.Position.x1 = 16; // xxx10
- else if (gdata & 0x004)
- TWin.Position.x1 = 32; // xx100
- else if (gdata & 0x008)
- TWin.Position.x1 = 64; // x1000
- else if (gdata & 0x010)
- TWin.Position.x1 = 128; // 10000
- else
- TWin.Position.x1 = 256; // 00000
-
- // Re-calculate the bit field, because we can't trust what is passed in the data
-
- YAlign = (uint32_t)(32 - (TWin.Position.y1 >> 3));
- XAlign = (uint32_t)(32 - (TWin.Position.x1 >> 3));
-
- // Absolute position of the start of the texture window
-
- TWin.Position.y0 = (short)(((gdata >> 15) & YAlign) << 3);
- TWin.Position.x0 = (short)(((gdata >> 10) & XAlign) << 3);
+ uint32_t gdata = ((uint32_t *)baseAddr)[0];
+ uint32_t YAlign,XAlign;
+
+ ulGPUInfoVals[INFO_TW]=gdata&0xFFFFF;
+
+ if(gdata & 0x020)
+ TWin.Position.y1 = 8; // xxxx1
+ else if (gdata & 0x040)
+ TWin.Position.y1 = 16; // xxx10
+ else if (gdata & 0x080)
+ TWin.Position.y1 = 32; // xx100
+ else if (gdata & 0x100)
+ TWin.Position.y1 = 64; // x1000
+ else if (gdata & 0x200)
+ TWin.Position.y1 = 128; // 10000
+ else
+ TWin.Position.y1 = 256; // 00000
+
+ // Texture window size is determined by the least bit set of the relevant 5 bits
+
+ if (gdata & 0x001)
+ TWin.Position.x1 = 8; // xxxx1
+ else if (gdata & 0x002)
+ TWin.Position.x1 = 16; // xxx10
+ else if (gdata & 0x004)
+ TWin.Position.x1 = 32; // xx100
+ else if (gdata & 0x008)
+ TWin.Position.x1 = 64; // x1000
+ else if (gdata & 0x010)
+ TWin.Position.x1 = 128; // 10000
+ else
+ TWin.Position.x1 = 256; // 00000
+
+ // Re-calculate the bit field, because we can't trust what is passed in the data
 
- if((TWin.Position.x0 == 0 && // tw turned off
+ YAlign = (uint32_t)(32 - (TWin.Position.y1 >> 3));
+ XAlign = (uint32_t)(32 - (TWin.Position.x1 >> 3));
+
+ // Absolute position of the start of the texture window
+
+ TWin.Position.y0 = (short)(((gdata >> 15) & YAlign) << 3);
+ TWin.Position.x0 = (short)(((gdata >> 10) & XAlign) << 3);
+
+ if((TWin.Position.x0 == 0 && // tw turned off
 TWin.Position.y0 == 0 &&
 TWin.Position.x1 == 0 &&
 TWin.Position.y1 == 0) ||
 (TWin.Position.x1 == 256 &&
 TWin.Position.y1 == 256))
 {
- bUsingTWin = FALSE; // -> just do it
+ bUsingTWin = FALSE; // -> just do it
 
 #ifdef OWNSCALE
 TWin.UScaleFactor = 1.0f;
@@ -1533,7 +1533,7 @@
 TWin.UScaleFactor = (float)TWin.Position.x1;
 TWin.VScaleFactor = (float)TWin.Position.y1;
 #else
- TWin.UScaleFactor = ((float)TWin.Position.x1)/256.0f; // -> set scale factor
+ TWin.UScaleFactor = ((float)TWin.Position.x1)/256.0f; // -> set scale factor
 TWin.VScaleFactor = ((float)TWin.Position.y1)/256.0f;
 #endif
 }
@@ -1542,7 +1542,7 @@
 ////////////////////////////////////////////////////////////////////////
 // mmm, Lewpy uses that in TileS ... I don't ;)
 ////////////////////////////////////////////////////////////////////////
-
+
 /*
 void ClampToPSXDrawAreaOffset(short *x0, short *y0, short *x1, short *y1)
 {
@@ -1580,7 +1580,7 @@
 if ((*y1 + *y0) > PSXDisplay.DrawArea.y1)
 *y1 = (PSXDisplay.DrawArea.y1 - *y0 + 1);
 }
-*/
+*/
 
 ////////////////////////////////////////////////////////////////////////
 // Check draw area dimensions
@@ -1598,11 +1598,11 @@
 
 if (*y0 < 0) *y0 = 0;
 else
- if (*y0 > iGPUHeightMask) *y0 = iGPUHeightMask;
+ if (*y0 > iGPUHeightMask) *y0 = iGPUHeightMask;
 
 if (*y1 < 0) *y1 = 0;
 else
- if (*y1 > iGPUHeightMask) *y1 = iGPUHeightMask;
+ if (*y1 > iGPUHeightMask) *y1 = iGPUHeightMask;
 }
 
 ////////////////////////////////////////////////////////////////////////
@@ -1620,8 +1620,8 @@
 if (*y0 < 0)
 { *y1 += *y0; *y0 = 0; }
 else
- if (*y0 > iGPUHeightMask)
- { *y0 = iGPUHeightMask; *y1 = 0; }
+ if (*y0 > iGPUHeightMask)
+ { *y0 = iGPUHeightMask; *y1 = 0; }
 
 if (*x1 < 0) *x1 = 0;
 
@@ -1629,7 +1629,7 @@
 
 if (*y1 < 0) *y1 = 0;
 
- if ((*y1 + *y0) > iGPUHeight) *y1 = (iGPUHeight - *y0);
+ if ((*y1 + *y0) > iGPUHeight) *y1 = (iGPUHeight - *y0);
 }
 
 ////////////////////////////////////////////////////////////////////////
@@ -1639,27 +1639,27 @@
 void cmdDrawAreaStart(unsigned char * baseAddr)
 {
 uint32_t gdata = ((uint32_t *)baseAddr)[0];
-
- drawX = gdata & 0x3ff; // for soft drawing
- if(drawX>=1024) drawX=1023;
-
- if(dwGPUVersion==2)
- {
- ulGPUInfoVals[INFO_DRAWSTART]=gdata&0x3FFFFF;
- drawY = (gdata>>12)&0x3ff;
- }
- else
- {
- ulGPUInfoVals[INFO_DRAWSTART]=gdata&0xFFFFF;
- drawY = (gdata>>10)&0x3ff;
- }
-
- if(drawY>=iGPUHeight) drawY=iGPUHeightMask;
+
+ drawX = gdata & 0x3ff; // for soft drawing
+ if(drawX>=1024) drawX=1023;
+
+ if(dwGPUVersion==2)
+ {
+ ulGPUInfoVals[INFO_DRAWSTART]=gdata&0x3FFFFF;
+ drawY = (gdata>>12)&0x3ff;
+ }
+ else
+ {
+ ulGPUInfoVals[INFO_DRAWSTART]=gdata&0xFFFFF;
+ drawY = (gdata>>10)&0x3ff;
+ }
+
+ if(drawY>=iGPUHeight) drawY=iGPUHeightMask;
 
 PreviousPSXDisplay.DrawArea.y0=PSXDisplay.DrawArea.y0;
 PreviousPSXDisplay.DrawArea.x0=PSXDisplay.DrawArea.x0;
 
- PSXDisplay.DrawArea.y0 = (short)drawY; // for OGL drawing
+ PSXDisplay.DrawArea.y0 = (short)drawY; // for OGL drawing
 PSXDisplay.DrawArea.x0 = (short)drawX;
 }
 
@@ -1670,24 +1670,24 @@
 void cmdDrawAreaEnd(unsigned char * baseAddr)
 {
 uint32_t gdata = ((uint32_t *)baseAddr)[0];
-
+
 drawW = gdata & 0x3ff; // for soft drawing
 if(drawW>=1024) drawW=1023;
-
- if(dwGPUVersion==2)
- {
- ulGPUInfoVals[INFO_DRAWEND]=gdata&0x3FFFFF;
- drawH = (gdata>>12)&0x3ff;
- }
- else
- {
- ulGPUInfoVals[INFO_DRAWEND]=gdata&0xFFFFF;
- drawH = (gdata>>10)&0x3ff;
- }
- 
- if(drawH>=iGPUHeight) drawH=iGPUHeightMask;
 
- PSXDisplay.DrawArea.y1 = (short)drawH; // for OGL drawing
+ if(dwGPUVersion==2)
+ {
+ ulGPUInfoVals[INFO_DRAWEND]=gdata&0x3FFFFF;
+ drawH = (gdata>>12)&0x3ff;
+ }
+ else
+ {
+ ulGPUInfoVals[INFO_DRAWEND]=gdata&0xFFFFF;
+ drawH = (gdata>>10)&0x3ff;
+ }
+ 
+ if(drawH>=iGPUHeight) drawH=iGPUHeightMask;
+
+ PSXDisplay.DrawArea.y1 = (short)drawH; // for OGL drawing
 PSXDisplay.DrawArea.x1 = (short)drawW;
 
 ClampToPSXScreen(&PSXDisplay.DrawArea.x0, // clamp
@@ -1705,25 +1705,25 @@
 void cmdDrawOffset(unsigned char * baseAddr)
 {
 uint32_t gdata = ((uint32_t *)baseAddr)[0];
-
+
 PreviousPSXDisplay.DrawOffset.x = 
- PSXDisplay.DrawOffset.x = (short)(gdata & 0x7ff);
-
- if (dwGPUVersion == 2)
- {
- ulGPUInfoVals[INFO_DRAWOFF] = gdata&0x7FFFFF;
- PSXDisplay.DrawOffset.y = (short)((gdata>>12) & 0x7ff);
- }
- else
- {
- ulGPUInfoVals[INFO_DRAWOFF]=gdata&0x3FFFFF;
- PSXDisplay.DrawOffset.y = (short)((gdata>>11) & 0x7ff);
- }
+ PSXDisplay.DrawOffset.x = (short)(gdata & 0x7ff);
+
+ if (dwGPUVersion == 2)
+ {
+ ulGPUInfoVals[INFO_DRAWOFF] = gdata&0x7FFFFF;
+ PSXDisplay.DrawOffset.y = (short)((gdata>>12) & 0x7ff);
+ }
+ else
+ {
+ ulGPUInfoVals[INFO_DRAWOFF]=gdata&0x3FFFFF;
+ PSXDisplay.DrawOffset.y = (short)((gdata>>11) & 0x7ff);
+ }
 
 PSXDisplay.DrawOffset.x=(short)(((int)PSXDisplay.DrawOffset.x<<21)>>21);
 PSXDisplay.DrawOffset.y=(short)(((int)PSXDisplay.DrawOffset.y<<21)>>21);
 
- PSXDisplay.CumulOffset.x = // new OGL prim offsets
+ PSXDisplay.CumulOffset.x = // new OGL prim offsets
 PSXDisplay.DrawOffset.x - PSXDisplay.GDrawOffset.x + PreviousPSXDisplay.Range.x0;
 PSXDisplay.CumulOffset.y = 
 PSXDisplay.DrawOffset.y - PSXDisplay.GDrawOffset.y + PreviousPSXDisplay.Range.y0;
@@ -1856,7 +1856,7 @@
 }
 return;
 }
-
+
 if(!bNeedUploadAfter)
 {
 bNeedUploadAfter = TRUE;
@@ -1872,16 +1872,16 @@
 xrUploadArea.y0=min(xrUploadArea.y0,VRAMWrite.y);
 xrUploadArea.y1=max(xrUploadArea.y1,VRAMWrite.y+VRAMWrite.Height);
 }
-
- if(dwActFixes&0x8000)
- {
- if((xrUploadArea.x1-xrUploadArea.x0)>=(PSXDisplay.DisplayMode.x-32) &&
- (xrUploadArea.y1-xrUploadArea.y0)>=(PSXDisplay.DisplayMode.y-32))
- {
- UploadScreen(-1);
- updateFrontDisplay();
- }
- }
+
+ if(dwActFixes&0x8000)
+ {
+ if((xrUploadArea.x1-xrUploadArea.x0)>=(PSXDisplay.DisplayMode.x-32) &&
+ (xrUploadArea.y1-xrUploadArea.y0)>=(PSXDisplay.DisplayMode.y-32))
+ {
+ UploadScreen(-1);
+ updateFrontDisplay();
+ }
+ }
 }
 }
 }
@@ -1902,7 +1902,7 @@
 VRAMRead.ImagePtr = psxVuw + (VRAMRead.y<<10) + VRAMRead.x;
 VRAMRead.RowsRemaining = VRAMRead.Width;
 VRAMRead.ColsRemaining = VRAMRead.Height;
-
+
 iDataReadMode = DR_VRAMTRANSFER;
 
 STATUSREG |= GPUSTATUS_READYFORVRAM;
@@ -1922,9 +1922,9 @@
 sprtX = sgpuData[2];
 sprtY = sgpuData[3];
 sprtW = sgpuData[4] & 0x3ff;
- sprtH = sgpuData[5] & iGPUHeightMask;
-
- sprtW = (sprtW + 15) & ~15;
+ sprtH = sgpuData[5] & iGPUHeightMask;
+
+ sprtW = (sprtW + 15) & ~15;
 
 // Increase H & W if they are one short of full values, because they never can be full values
 if (sprtH == iGPUHeightMask) sprtH=iGPUHeight;
@@ -1938,7 +1938,7 @@
 
 offsetBlk();
 
- if(ClipVertexListScreen()) 
+ if(ClipVertexListScreen()) 
 {
 PSXDisplay_t * pd;
 if(PSXDisplay.InterlacedTest) pd=&PSXDisplay;
@@ -1979,7 +1979,7 @@
 }
 if(ly2<pd->DisplayEnd.y)
 {
- vertex[0].x=0;vertex[0].y=(pd->DisplayEnd.y-pd->DisplayPosition.y)-(pd->DisplayEnd.y-ly2);
+ vertex[0].x=0;vertex[0].y=(pd->DisplayEnd.y-pd->DisplayPosition.y)-(pd->DisplayEnd.y-ly2);
 vertex[1].x=pd->DisplayEnd.x-pd->DisplayPosition.x;vertex[1].y=vertex[0].y;
 vertex[2].x=vertex[1].x;vertex[2].y=pd->DisplayEnd.y;
 vertex[3].x=0;vertex[3].y=vertex[2].y;
@@ -2124,8 +2124,8 @@
 if((imageX0 == imageX1) && (imageY0 == imageY1)) return; 
 if(imageSX<=0) return;
 if(imageSY<=0) return;
-
- if(iGPUHeight==1024 && sgpuData[7]>1024) return;
+
+ if(iGPUHeight==1024 && sgpuData[7]>1024) return;
 
 if((imageY0+imageSY)>iGPUHeight ||
 (imageX0+imageSX)>1024 ||
@@ -2285,8 +2285,8 @@
 
 offsetST();
 
- if((dwActFixes&1) && // FF7 special game gix (battle cursor)
- sprtX==0 && sprtY==0 && sprtW==24 && sprtH==16) 
+ if((dwActFixes&1) && // FF7 special game gix (battle cursor)
+ sprtX==0 && sprtY==0 && sprtW==24 && sprtH==16) 
 return;
 
 bDrawTextured = FALSE;
@@ -2297,7 +2297,7 @@
 if(iOffscreenDrawing)
 {
 if(IsPrimCompleteInsideNextScreen(lx0,ly0,lx2,ly2) ||
- (ly0==-6 && ly2==10)) // OH MY GOD... I DIDN'T WANT TO DO IT... BUT I'VE FOUND NO OTHER WAY... HACK FOR GRADIUS SHOOTER :(
+ (ly0==-6 && ly2==10)) // OH MY GOD... I DIDN'T WANT TO DO IT... BUT I'VE FOUND NO OTHER WAY... HACK FOR GRADIUS SHOOTER :(
 {
 lClearOnSwapColor = COLOR(gpuData[0]);
 lClearOnSwap = 1;
@@ -2305,12 +2305,12 @@
 
 offsetPSX4();
 if(bDrawOffscreen4())
- {
- if(!(iTileCheat && sprtH==32 && gpuData[0]==0x60ffffff)) // special cheat for certain ZiNc games
+ {
+ if(!(iTileCheat && sprtH==32 && gpuData[0]==0x60ffffff)) // special cheat for certain ZiNc games
 {
 InvalidateTextureAreaEx(); 
 FillSoftwareAreaTrans(lx0,ly0,lx2,ly2,
- BGR24to16(gpuData[0])); 
+ BGR24to16(gpuData[0])); 
 }
 }
 }
@@ -2520,8 +2520,8 @@
 
 lABR=GlobalTextABR;
 lDST=DrawSemiTrans;
- vertex[0].c.col[3]=ubGloAlpha/2; // -> set color with
- SETCOL(vertex[0]); // texture alpha
+ vertex[0].c.col[3]=ubGloAlpha/2; // -> set color with
+ SETCOL(vertex[0]); // texture alpha
 PRIMdrawTexturedQuad(&vertex[0], &vertex[1], &vertex[2], &vertex[3]);
 vertex[0].x+=POFF;vertex[1].x+=POFF;
 vertex[2].x+=POFF;vertex[3].x+=POFF;
@@ -2558,30 +2558,30 @@
 offsetST();
 
 // do texture stuff
- gl_ux[0]=gl_ux[3]=baseAddr[8];//gpuData[2]&0xff;
-
- if(usMirror & 0x1000) 
- {
- s=gl_ux[0];
- s-=sprtW-1;
- if(s<0) {s=0;}
- gl_ux[0]=gl_ux[3]=s;
- }
+ gl_ux[0]=gl_ux[3]=baseAddr[8];//gpuData[2]&0xff;
+
+ if(usMirror & 0x1000) 
+ {
+ s=gl_ux[0];
+ s-=sprtW-1;
+ if(s<0) {s=0;}
+ gl_ux[0]=gl_ux[3]=s;
+ }
 
 sSprite_ux2=s=gl_ux[0]+sprtW; 
 if(s) s--;
 if(s>255) s=255;
 gl_ux[1]=gl_ux[2]=s;
 // Y coords
- gl_vy[0]=gl_vy[1]=baseAddr[9];//(gpuData[2]>>8)&0xff;
-
- if(usMirror & 0x2000) 
- {
- s=gl_vy[0];
- s-=sprtH-1;
- if(s<0) {s=0;}
- gl_vy[0]=gl_vy[1]=s;
- }
+ gl_vy[0]=gl_vy[1]=baseAddr[9];//(gpuData[2]>>8)&0xff;
+
+ if(usMirror & 0x2000) 
+ {
+ s=gl_vy[0];
+ s-=sprtH-1;
+ if(s<0) {s=0;}
+ gl_vy[0]=gl_vy[1]=s;
+ }
 
 sSprite_vy2=s=gl_vy[0]+sprtH; 
 if(s) s--;
@@ -2604,12 +2604,12 @@
 SetRenderColor(gpuData[0]);
 lx0-=PSXDisplay.DrawOffset.x;
 ly0-=PSXDisplay.DrawOffset.y;
-
+
 if(bUsingTWin) DrawSoftwareSpriteTWin(baseAddr,8,8);
 else
 if(usMirror) DrawSoftwareSpriteMirror(baseAddr,8,8);
 else
- DrawSoftwareSprite(baseAddr,8,8,baseAddr[8],baseAddr[9]);
+ DrawSoftwareSprite(baseAddr,8,8,baseAddr[8],baseAddr[9]);
 }
 }
 
@@ -2636,17 +2636,17 @@
 {
 SetZMask4O();
 if(bUseMultiPass) SetOpaqueColor(gpuData[0]);
- DEFOPAQUEON
-
- if(bSmallAlpha && iFilterType<=2)
- {
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- PRIMdrawTexturedQuad(&vertex[0], &vertex[1], &vertex[2], &vertex[3]);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
- SetZMask4O();
- }
+ DEFOPAQUEON
+
+ if(bSmallAlpha && iFilterType<=2)
+ {
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+ PRIMdrawTexturedQuad(&vertex[0], &vertex[1], &vertex[2], &vertex[3]);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+ SetZMask4O();
+ }
 
 PRIMdrawTexturedQuad(&vertex[0], &vertex[1], &vertex[2], &vertex[3]);
 DEFOPAQUEOFF
@@ -2679,30 +2679,30 @@
 offsetST();
 
 // do texture stuff
- gl_ux[0]=gl_ux[3]=baseAddr[8];//gpuData[2]&0xff;
-
- if(usMirror & 0x1000) 
- {
- s=gl_ux[0];
- s-=sprtW-1;
- if(s<0) {s=0;}
- gl_ux[0]=gl_ux[3]=s;
- }
+ gl_ux[0]=gl_ux[3]=baseAddr[8];//gpuData[2]&0xff;
+
+ if(usMirror & 0x1000) 
+ {
+ s=gl_ux[0];
+ s-=sprtW-1;
+ if(s<0) {s=0;}
+ gl_ux[0]=gl_ux[3]=s;
+ }
 
 sSprite_ux2=s=gl_ux[0]+sprtW; 
 if(s) s--;
 if(s>255) s=255;
 gl_ux[1]=gl_ux[2]=s; 
 // Y coords
- gl_vy[0]=gl_vy[1]=baseAddr[9];//(gpuData[2]>>8)&0xff;
-
- if(usMirror & 0x2000) 
- {
- s=gl_vy[0];
- s-=sprtH-1;
- if(s<0) {s=0;}
- gl_vy[0]=gl_vy[1]=s;
- }
+ gl_vy[0]=gl_vy[1]=baseAddr[9];//(gpuData[2]>>8)&0xff;
+
+ if(usMirror & 0x2000) 
+ {
+ s=gl_vy[0];
+ s-=sprtH-1;
+ if(s<0) {s=0;}
+ gl_vy[0]=gl_vy[1]=s;
+ }
 
 sSprite_vy2=s=gl_vy[0]+sprtH; 
 if(s) s--;
@@ -2729,7 +2729,7 @@
 else
 if(usMirror) DrawSoftwareSpriteMirror(baseAddr,16,16);
 else
- DrawSoftwareSprite(baseAddr,16,16,baseAddr[8],baseAddr[9]);
+ DrawSoftwareSprite(baseAddr,16,16,baseAddr[8],baseAddr[9]);
 }
 }
 
@@ -2757,16 +2757,16 @@
 SetZMask4O();
 if(bUseMultiPass) SetOpaqueColor(gpuData[0]);
 DEFOPAQUEON
-
- if(bSmallAlpha && iFilterType<=2)
- {
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- PRIMdrawTexturedQuad(&vertex[0], &vertex[1], &vertex[2], &vertex[3]);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
- SetZMask4O();
- }
+
+ if(bSmallAlpha && iFilterType<=2)
+ {
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+ PRIMdrawTexturedQuad(&vertex[0], &vertex[1], &vertex[2], &vertex[3]);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+ SetZMask4O();
+ }
 
 PRIMdrawTexturedQuad(&vertex[0], &vertex[1], &vertex[2], &vertex[3]);
 DEFOPAQUEOFF
@@ -2853,12 +2853,12 @@
 s-=sprtW-1;if(s<0) s=0;
 gl_ux[0]=gl_ux[3]=s;
 }
- if(usMirror & 0x2000) 
- {
- s=gl_vy[0];
- s-=sprtH-1;if(s<0) {s=0;}
- gl_vy[0]=gl_vy[1]=s;
- }
+ if(usMirror & 0x2000) 
+ {
+ s=gl_vy[0];
+ s-=sprtH-1;if(s<0) {s=0;}
+ gl_vy[0]=gl_vy[1]=s;
+ }
 
 sSprite_ux2=s=gl_ux[0]+sprtW; 
 if(s>255) s=255;
@@ -2900,7 +2900,7 @@
 else
 if(usMirror) DrawSoftwareSpriteMirror(baseAddr,sprtW,sprtH);
 else
- DrawSoftwareSprite(baseAddr,sprtW,sprtH,baseAddr[8],baseAddr[9]);
+ DrawSoftwareSprite(baseAddr,sprtW,sprtH,baseAddr[8],baseAddr[9]);
 }
 }
 
@@ -2927,17 +2927,17 @@
 {
 SetZMask4O();
 if(bUseMultiPass) SetOpaqueColor(gpuData[0]);
- DEFOPAQUEON
-
- if(bSmallAlpha && iFilterType<=2)
- {
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- PRIMdrawTexturedQuad(&vertex[0], &vertex[1], &vertex[2], &vertex[3]);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
- SetZMask4O();
- }
+ DEFOPAQUEON
+
+ if(bSmallAlpha && iFilterType<=2)
+ {
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+ PRIMdrawTexturedQuad(&vertex[0], &vertex[1], &vertex[2], &vertex[3]);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+ SetZMask4O();
+ }
 
 PRIMdrawTexturedQuad(&vertex[0], &vertex[1], &vertex[2], &vertex[3]);
 DEFOPAQUEOFF
@@ -2980,13 +2980,13 @@
 if(s<0) {s=0;}
 gl_ux[0]=gl_ux[3]=s;
 }
- if(usMirror & 0x2000) 
- {
- s=gl_vy[0];
- s-=sprtH-1;
- if(s<0) {s=0;}
- gl_vy[0]=gl_vy[1]=s;
- }
+ if(usMirror & 0x2000) 
+ {
+ s=gl_vy[0];
+ s-=sprtH-1;
+ if(s<0) {s=0;}
+ gl_vy[0]=gl_vy[1]=s;
+ }
 
 sSprite_ux2=s=gl_ux[0]+sprtW; 
 if(s) s--;
@@ -3030,7 +3030,7 @@
 else
 if(usMirror) DrawSoftwareSpriteMirror(baseAddr,sprtW,sprtH);
 else
- DrawSoftwareSprite(baseAddr,sprtW,sprtH,baseAddr[8],baseAddr[9]);
+ DrawSoftwareSprite(baseAddr,sprtW,sprtH,baseAddr[8],baseAddr[9]);
 }
 }
 
@@ -3060,17 +3060,17 @@
 {
 SetZMask4O();
 if(bUseMultiPass) SetOpaqueColor(gpuData[0]);
- DEFOPAQUEON
-
- if(bSmallAlpha && iFilterType<=2)
- {
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- PRIMdrawTexturedQuad(&vertex[0], &vertex[1], &vertex[2], &vertex[3]);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
- SetZMask4O();
- }
+ DEFOPAQUEON
+
+ if(bSmallAlpha && iFilterType<=2)
+ {
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+ PRIMdrawTexturedQuad(&vertex[0], &vertex[1], &vertex[2], &vertex[3]);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+ SetZMask4O();
+ }
 
 PRIMdrawTexturedQuad(&vertex[0], &vertex[1], &vertex[2], &vertex[3]);
 DEFOPAQUEOFF
@@ -3169,16 +3169,16 @@
 if(iFF9Fix==0)
 {
 if(bDrawOffscreenFrontFF9G4())
- {
- short *sgpuData = ((short *) pFF9G4Cache);
- iFF9Fix=2;
- memcpy(pFF9G4Cache,baseAddr,32);
-
- if(sgpuData[2]==142)
- {
- sgpuData[2] +=65;
- sgpuData[10]+=65;
- }
+ {
+ short *sgpuData = ((short *) pFF9G4Cache);
+ iFF9Fix=2;
+ memcpy(pFF9G4Cache,baseAddr,32);
+
+ if(sgpuData[2]==142)
+ {
+ sgpuData[2] +=65;
+ sgpuData[10]+=65;
+ }
 return TRUE;
 }
 else iFF9Fix=1;
@@ -3491,368 +3491,368 @@
 ////////////////////////////////////////////////////////////////////////
 // cmd: flat shaded Texture4
 ////////////////////////////////////////////////////////////////////////
-
-#define ST_FAC 255.99f
-
-void RectTexAlign(void)
-{
- int UFlipped = FALSE;
- int VFlipped = FALSE;
-
- if(gTexName==gTexFrameName) return;
-
- if(ly0==ly1)
- {
- if(!((lx1==lx3 && ly3==ly2 && lx2==lx0) ||
- (lx1==lx2 && ly2==ly3 && lx3==lx0)))
- return;
-
- if(ly0<ly2) 
- {
- if (vertex[0].tow > vertex[2].tow)
- VFlipped = 1;
- }
- else
- {
- if (vertex[0].tow < vertex[2].tow)
- VFlipped = 2;
- }
- }
- else
- if(ly0==ly2)
- {
- if(!((lx2==lx3 && ly3==ly1 && lx1==lx0) ||
- (lx2==lx1 && ly1==ly3 && lx3==lx0)))
- return;
-
- if(ly0<ly1) 
- {
- if (vertex[0].tow > vertex[1].tow)
- VFlipped = 3;
- }
- else
- {
- if (vertex[0].tow < vertex[1].tow)
- VFlipped = 4;
- }
- }
- else
- if(ly0==ly3)
- {
- if(!((lx3==lx2 && ly2==ly1 && lx1==lx0) ||
- (lx3==lx1 && ly1==ly2 && lx2==lx0)))
- return;
-
- if(ly0<ly1) 
- {
- if (vertex[0].tow > vertex[1].tow)
- VFlipped = 5;
- }
- else
- {
- if (vertex[0].tow < vertex[1].tow)
- VFlipped = 6;
- }
- }
- else return;
-
- if(lx0==lx1)
- {
- if(lx0<lx2) 
- {
- if (vertex[0].sow > vertex[2].sow)
- UFlipped = 1;
- }
- else
- {
- if (vertex[0].sow < vertex[2].sow)
- UFlipped = 2;
- }
- }
- else
- if(lx0==lx2)
- {
- if(lx0<lx1) 
- {
- if (vertex[0].sow > vertex[1].sow)
- UFlipped = 3;
- }
- else
- {
- if (vertex[0].sow < vertex[1].sow)
- UFlipped = 4;
- }
- }
- else
- if(lx0==lx3)
- {
- if(lx0<lx1) 
- {
- if (vertex[0].sow > vertex[1].sow)
- UFlipped = 5;
- }
- else
- {
- if (vertex[0].sow < vertex[1].sow)
- UFlipped = 6;
- }
- }
-
- if (UFlipped)
- {
-#ifdef OWNSCALE
- if(bUsingTWin)
- {
- switch(UFlipped)
- {
- case 1:
- vertex[2].sow+=0.95f/TWin.UScaleFactor; 
- vertex[3].sow+=0.95f/TWin.UScaleFactor;
- break;
- case 2:
- vertex[0].sow+=0.95f/TWin.UScaleFactor; 
- vertex[1].sow+=0.95f/TWin.UScaleFactor;
- break;
- case 3:
- vertex[1].sow+=0.95f/TWin.UScaleFactor; 
- vertex[3].sow+=0.95f/TWin.UScaleFactor;
- break;
- case 4:
- vertex[0].sow+=0.95f/TWin.UScaleFactor; 
- vertex[2].sow+=0.95f/TWin.UScaleFactor;
- break;
- case 5:
- vertex[1].sow+=0.95f/TWin.UScaleFactor; 
- vertex[2].sow+=0.95f/TWin.UScaleFactor;
- break;
- case 6:
- vertex[0].sow+=0.95f/TWin.UScaleFactor; 
- vertex[3].sow+=0.95f/TWin.UScaleFactor;
- break;
- }
- }
- else
- {
- switch(UFlipped)
- {
- case 1:
- vertex[2].sow+=1.0f/ST_FAC; 
- vertex[3].sow+=1.0f/ST_FAC;
- break;
- case 2:
- vertex[0].sow+=1.0f/ST_FAC; 
- vertex[1].sow+=1.0f/ST_FAC;
- break;
- case 3:
- vertex[1].sow+=1.0f/ST_FAC; 
- vertex[3].sow+=1.0f/ST_FAC;
- break;
- case 4:
- vertex[0].sow+=1.0f/ST_FAC; 
- vertex[2].sow+=1.0f/ST_FAC;
- break;
- case 5:
- vertex[1].sow+=1.0f/ST_FAC; 
- vertex[2].sow+=1.0f/ST_FAC;
- break;
- case 6:
- vertex[0].sow+=1.0f/ST_FAC; 
- vertex[3].sow+=1.0f/ST_FAC;
- break;
- }
- }
-#else
- if(bUsingTWin)
- {
- switch(UFlipped)
- {
- case 1:
- vertex[2].sow+=1.0f/TWin.UScaleFactor; 
- vertex[3].sow+=1.0f/TWin.UScaleFactor;
- break;
- case 2:
- vertex[0].sow+=1.0f/TWin.UScaleFactor; 
- vertex[1].sow+=1.0f/TWin.UScaleFactor;
- break;
- case 3:
- vertex[1].sow+=1.0f/TWin.UScaleFactor; 
- vertex[3].sow+=1.0f/TWin.UScaleFactor;
- break;
- case 4:
- vertex[0].sow+=1.0f/TWin.UScaleFactor; 
- vertex[2].sow+=1.0f/TWin.UScaleFactor;
- break;
- case 5:
- vertex[1].sow+=1.0f/TWin.UScaleFactor; 
- vertex[2].sow+=1.0f/TWin.UScaleFactor;
- break;
- case 6:
- vertex[0].sow+=1.0f/TWin.UScaleFactor; 
- vertex[3].sow+=1.0f/TWin.UScaleFactor;
- break;
- }
- }
- else
- {
- switch(UFlipped)
- {
- case 1:
- vertex[2].sow+=1.0f; 
- vertex[3].sow+=1.0f;
- break;
- case 2:
- vertex[0].sow+=1.0f; 
- vertex[1].sow+=1.0f;
- break;
- case 3:
- vertex[1].sow+=1.0f; 
- vertex[3].sow+=1.0f;
- break;
- case 4:
- vertex[0].sow+=1.0f; 
- vertex[2].sow+=1.0f;
- break;
- case 5:
- vertex[1].sow+=1.0f; 
- vertex[2].sow+=1.0f;
- break;
- case 6:
- vertex[0].sow+=1.0f; 
- vertex[3].sow+=1.0f;
- break;
- }
- }
-#endif
- }
-
- if (VFlipped)
- {
-#ifdef OWNSCALE
- if(bUsingTWin)
- {
- switch(VFlipped)
- {
- case 1:
- vertex[2].tow+=0.95f/TWin.VScaleFactor; 
- vertex[3].tow+=0.95f/TWin.VScaleFactor;
- break;
- case 2:
- vertex[0].tow+=0.95f/TWin.VScaleFactor; 
- vertex[1].tow+=0.95f/TWin.VScaleFactor;
- break;
- case 3:
- vertex[1].tow+=0.95f/TWin.VScaleFactor; 
- vertex[3].tow+=0.95f/TWin.VScaleFactor;
- break;
- case 4:
- vertex[0].tow+=0.95f/TWin.VScaleFactor; 
- vertex[2].tow+=0.95f/TWin.VScaleFactor;
- break;
- case 5:
- vertex[1].tow+=0.95f/TWin.VScaleFactor; 
- vertex[2].tow+=0.95f/TWin.VScaleFactor;
- break;
- case 6:
- vertex[0].tow+=0.95f/TWin.VScaleFactor; 
- vertex[3].tow+=0.95f/TWin.VScaleFactor;
- break;
- }
- }
- else
- {
- switch(VFlipped)
- {
- case 1:
- vertex[2].tow+=1.0f/ST_FAC; 
- vertex[3].tow+=1.0f/ST_FAC;
- break;
- case 2:
- vertex[0].tow+=1.0f/ST_FAC; 
- vertex[1].tow+=1.0f/ST_FAC;
- break;
- case 3:
- vertex[1].tow+=1.0f/ST_FAC;
- vertex[3].tow+=1.0f/ST_FAC;
- break;
- case 4:
- vertex[0].tow+=1.0f/ST_FAC; 
- vertex[2].tow+=1.0f/ST_FAC;
- break;
- case 5:
- vertex[1].tow+=1.0f/ST_FAC;
- vertex[2].tow+=1.0f/ST_FAC;
- break;
- case 6:
- vertex[0].tow+=1.0f/ST_FAC;
- vertex[3].tow+=1.0f/ST_FAC;
- break;
- }
- }
-#else
- if(bUsingTWin)
- {
- switch(VFlipped)
- {
- case 1:
- vertex[2].tow+=1.0f/TWin.VScaleFactor; 
- vertex[3].tow+=1.0f/TWin.VScaleFactor;
- break;
- case 2:
- vertex[0].tow+=1.0f/TWin.VScaleFactor; 
- vertex[1].tow+=1.0f/TWin.VScaleFactor;
- break;
- case 3:
- vertex[1].tow+=1.0f/TWin.VScaleFactor; 
- vertex[3].tow+=1.0f/TWin.VScaleFactor;
- break;
- case 4:
- vertex[0].tow+=1.0f/TWin.VScaleFactor; 
- vertex[2].tow+=1.0f/TWin.VScaleFactor;
- break;
- case 5:
- vertex[1].tow+=1.0f/TWin.VScaleFactor; 
- vertex[2].tow+=1.0f/TWin.VScaleFactor;
- break;
- case 6:
- vertex[0].tow+=1.0f/TWin.VScaleFactor; 
- vertex[3].tow+=1.0f/TWin.VScaleFactor;
- break;
- }
- }
- else
- {
- switch(VFlipped)
- {
- case 1:
- vertex[2].tow+=1.0f; 
- vertex[3].tow+=1.0f;
- break;
- case 2:
- vertex[0].tow+=1.0f; 
- vertex[1].tow+=1.0f;
- break;
- case 3:
- vertex[1].tow+=1.0f; 
- vertex[3].tow+=1.0f;
- break;
- case 4:
- vertex[0].tow+=1.0f; 
- vertex[2].tow+=1.0f;
- break;
- case 5:
- vertex[1].tow+=1.0f; 
- vertex[2].tow+=1.0f;
- break;
- case 6:
- vertex[0].tow+=1.0f; 
- vertex[3].tow+=1.0f;
- break;
- }
- }
-#endif
- }
-
-}
+
+#define ST_FAC 255.99f
+
+void RectTexAlign(void)
+{
+ int UFlipped = FALSE;
+ int VFlipped = FALSE;
+
+ if(gTexName==gTexFrameName) return;
+
+ if(ly0==ly1)
+ {
+ if(!((lx1==lx3 && ly3==ly2 && lx2==lx0) ||
+ (lx1==lx2 && ly2==ly3 && lx3==lx0)))
+ return;
+
+ if(ly0<ly2) 
+ {
+ if (vertex[0].tow > vertex[2].tow)
+ VFlipped = 1;
+ }
+ else
+ {
+ if (vertex[0].tow < vertex[2].tow)
+ VFlipped = 2;
+ }
+ }
+ else
+ if(ly0==ly2)
+ {
+ if(!((lx2==lx3 && ly3==ly1 && lx1==lx0) ||
+ (lx2==lx1 && ly1==ly3 && lx3==lx0)))
+ return;
+
+ if(ly0<ly1) 
+ {
+ if (vertex[0].tow > vertex[1].tow)
+ VFlipped = 3;
+ }
+ else
+ {
+ if (vertex[0].tow < vertex[1].tow)
+ VFlipped = 4;
+ }
+ }
+ else
+ if(ly0==ly3)
+ {
+ if(!((lx3==lx2 && ly2==ly1 && lx1==lx0) ||
+ (lx3==lx1 && ly1==ly2 && lx2==lx0)))
+ return;
+
+ if(ly0<ly1) 
+ {
+ if (vertex[0].tow > vertex[1].tow)
+ VFlipped = 5;
+ }
+ else
+ {
+ if (vertex[0].tow < vertex[1].tow)
+ VFlipped = 6;
+ }
+ }
+ else return;
+
+ if(lx0==lx1)
+ {
+ if(lx0<lx2) 
+ {
+ if (vertex[0].sow > vertex[2].sow)
+ UFlipped = 1;
+ }
+ else
+ {
+ if (vertex[0].sow < vertex[2].sow)
+ UFlipped = 2;
+ }
+ }
+ else
+ if(lx0==lx2)
+ {
+ if(lx0<lx1) 
+ {
+ if (vertex[0].sow > vertex[1].sow)
+ UFlipped = 3;
+ }
+ else
+ {
+ if (vertex[0].sow < vertex[1].sow)
+ UFlipped = 4;
+ }
+ }
+ else
+ if(lx0==lx3)
+ {
+ if(lx0<lx1) 
+ {
+ if (vertex[0].sow > vertex[1].sow)
+ UFlipped = 5;
+ }
+ else
+ {
+ if (vertex[0].sow < vertex[1].sow)
+ UFlipped = 6;
+ }
+ }
+
+ if (UFlipped)
+ {
+#ifdef OWNSCALE
+ if(bUsingTWin)
+ {
+ switch(UFlipped)
+ {
+ case 1:
+ vertex[2].sow+=0.95f/TWin.UScaleFactor; 
+ vertex[3].sow+=0.95f/TWin.UScaleFactor;
+ break;
+ case 2:
+ vertex[0].sow+=0.95f/TWin.UScaleFactor; 
+ vertex[1].sow+=0.95f/TWin.UScaleFactor;
+ break;
+ case 3:
+ vertex[1].sow+=0.95f/TWin.UScaleFactor; 
+ vertex[3].sow+=0.95f/TWin.UScaleFactor;
+ break;
+ case 4:
+ vertex[0].sow+=0.95f/TWin.UScaleFactor; 
+ vertex[2].sow+=0.95f/TWin.UScaleFactor;
+ break;
+ case 5:
+ vertex[1].sow+=0.95f/TWin.UScaleFactor; 
+ vertex[2].sow+=0.95f/TWin.UScaleFactor;
+ break;
+ case 6:
+ vertex[0].sow+=0.95f/TWin.UScaleFactor; 
+ vertex[3].sow+=0.95f/TWin.UScaleFactor;
+ break;
+ }
+ }
+ else
+ {
+ switch(UFlipped)
+ {
+ case 1:
+ vertex[2].sow+=1.0f/ST_FAC; 
+ vertex[3].sow+=1.0f/ST_FAC;
+ break;
+ case 2:
+ vertex[0].sow+=1.0f/ST_FAC; 
+ vertex[1].sow+=1.0f/ST_FAC;
+ break;
+ case 3:
+ vertex[1].sow+=1.0f/ST_FAC; 
+ vertex[3].sow+=1.0f/ST_FAC;
+ break;
+ case 4:
+ vertex[0].sow+=1.0f/ST_FAC; 
+ vertex[2].sow+=1.0f/ST_FAC;
+ break;
+ case 5:
+ vertex[1].sow+=1.0f/ST_FAC; 
+ vertex[2].sow+=1.0f/ST_FAC;
+ break;
+ case 6:
+ vertex[0].sow+=1.0f/ST_FAC; 
+ vertex[3].sow+=1.0f/ST_FAC;
+ break;
+ }
+ }
+#else
+ if(bUsingTWin)
+ {
+ switch(UFlipped)
+ {
+ case 1:
+ vertex[2].sow+=1.0f/TWin.UScaleFactor; 
+ vertex[3].sow+=1.0f/TWin.UScaleFactor;
+ break;
+ case 2:
+ vertex[0].sow+=1.0f/TWin.UScaleFactor; 
+ vertex[1].sow+=1.0f/TWin.UScaleFactor;
+ break;
+ case 3:
+ vertex[1].sow+=1.0f/TWin.UScaleFactor; 
+ vertex[3].sow+=1.0f/TWin.UScaleFactor;
+ break;
+ case 4:
+ vertex[0].sow+=1.0f/TWin.UScaleFactor; 
+ vertex[2].sow+=1.0f/TWin.UScaleFactor;
+ break;
+ case 5:
+ vertex[1].sow+=1.0f/TWin.UScaleFactor; 
+ vertex[2].sow+=1.0f/TWin.UScaleFactor;
+ break;
+ case 6:
+ vertex[0].sow+=1.0f/TWin.UScaleFactor; 
+ vertex[3].sow+=1.0f/TWin.UScaleFactor;
+ break;
+ }
+ }
+ else
+ {
+ switch(UFlipped)
+ {
+ case 1:
+ vertex[2].sow+=1.0f; 
+ vertex[3].sow+=1.0f;
+ break;
+ case 2:
+ vertex[0].sow+=1.0f; 
+ vertex[1].sow+=1.0f;
+ break;
+ case 3:
+ vertex[1].sow+=1.0f; 
+ vertex[3].sow+=1.0f;
+ break;
+ case 4:
+ vertex[0].sow+=1.0f; 
+ vertex[2].sow+=1.0f;
+ break;
+ case 5:
+ vertex[1].sow+=1.0f; 
+ vertex[2].sow+=1.0f;
+ break;
+ case 6:
+ vertex[0].sow+=1.0f; 
+ vertex[3].sow+=1.0f;
+ break;
+ }
+ }
+#endif
+ }
+
+ if (VFlipped)
+ {
+#ifdef OWNSCALE
+ if(bUsingTWin)
+ {
+ switch(VFlipped)
+ {
+ case 1:
+ vertex[2].tow+=0.95f/TWin.VScaleFactor; 
+ vertex[3].tow+=0.95f/TWin.VScaleFactor;
+ break;
+ case 2:
+ vertex[0].tow+=0.95f/TWin.VScaleFactor; 
+ vertex[1].tow+=0.95f/TWin.VScaleFactor;
+ break;
+ case 3:
+ vertex[1].tow+=0.95f/TWin.VScaleFactor; 
+ vertex[3].tow+=0.95f/TWin.VScaleFactor;
+ break;
+ case 4:
+ vertex[0].tow+=0.95f/TWin.VScaleFactor; 
+ vertex[2].tow+=0.95f/TWin.VScaleFactor;
+ break;
+ case 5:
+ vertex[1].tow+=0.95f/TWin.VScaleFactor; 
+ vertex[2].tow+=0.95f/TWin.VScaleFactor;
+ break;
+ case 6:
+ vertex[0].tow+=0.95f/TWin.VScaleFactor; 
+ vertex[3].tow+=0.95f/TWin.VScaleFactor;
+ break;
+ }
+ }
+ else
+ {
+ switch(VFlipped)
+ {
+ case 1:
+ vertex[2].tow+=1.0f/ST_FAC; 
+ vertex[3].tow+=1.0f/ST_FAC;
+ break;
+ case 2:
+ vertex[0].tow+=1.0f/ST_FAC; 
+ vertex[1].tow+=1.0f/ST_FAC;
+ break;
+ case 3:
+ vertex[1].tow+=1.0f/ST_FAC;
+ vertex[3].tow+=1.0f/ST_FAC;
+ break;
+ case 4:
+ vertex[0].tow+=1.0f/ST_FAC; 
+ vertex[2].tow+=1.0f/ST_FAC;
+ break;
+ case 5:
+ vertex[1].tow+=1.0f/ST_FAC;
+ vertex[2].tow+=1.0f/ST_FAC;
+ break;
+ case 6:
+ vertex[0].tow+=1.0f/ST_FAC;
+ vertex[3].tow+=1.0f/ST_FAC;
+ break;
+ }
+ }
+#else
+ if(bUsingTWin)
+ {
+ switch(VFlipped)
+ {
+ case 1:
+ vertex[2].tow+=1.0f/TWin.VScaleFactor; 
+ vertex[3].tow+=1.0f/TWin.VScaleFactor;
+ break;
+ case 2:
+ vertex[0].tow+=1.0f/TWin.VScaleFactor; 
+ vertex[1].tow+=1.0f/TWin.VScaleFactor;
+ break;
+ case 3:
+ vertex[1].tow+=1.0f/TWin.VScaleFactor; 
+ vertex[3].tow+=1.0f/TWin.VScaleFactor;
+ break;
+ case 4:
+ vertex[0].tow+=1.0f/TWin.VScaleFactor; 
+ vertex[2].tow+=1.0f/TWin.VScaleFactor;
+ break;
+ case 5:
+ vertex[1].tow+=1.0f/TWin.VScaleFactor; 
+ vertex[2].tow+=1.0f/TWin.VScaleFactor;
+ break;
+ case 6:
+ vertex[0].tow+=1.0f/TWin.VScaleFactor; 
+ vertex[3].tow+=1.0f/TWin.VScaleFactor;
+ break;
+ }
+ }
+ else
+ {
+ switch(VFlipped)
+ {
+ case 1:
+ vertex[2].tow+=1.0f; 
+ vertex[3].tow+=1.0f;
+ break;
+ case 2:
+ vertex[0].tow+=1.0f; 
+ vertex[1].tow+=1.0f;
+ break;
+ case 3:
+ vertex[1].tow+=1.0f; 
+ vertex[3].tow+=1.0f;
+ break;
+ case 4:
+ vertex[0].tow+=1.0f; 
+ vertex[2].tow+=1.0f;
+ break;
+ case 5:
+ vertex[1].tow+=1.0f; 
+ vertex[2].tow+=1.0f;
+ break;
+ case 6:
+ vertex[0].tow+=1.0f; 
+ vertex[3].tow+=1.0f;
+ break;
+ }
+ }
+#endif
+ }
+
+}
 
 void primPolyFT4(unsigned char * baseAddr)
 {
@@ -3918,17 +3918,17 @@
 {
 SetZMask4O();
 if(bUseMultiPass) SetOpaqueColor(gpuData[0]);
- DEFOPAQUEON
-
- if(bSmallAlpha && iFilterType<=2)
- {
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- PRIMdrawTexturedQuad(&vertex[0], &vertex[1], &vertex[3], &vertex[2]);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
- SetZMask4O();
- }
+ DEFOPAQUEON
+
+ if(bSmallAlpha && iFilterType<=2)
+ {
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+ PRIMdrawTexturedQuad(&vertex[0], &vertex[1], &vertex[3], &vertex[2]);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+ SetZMask4O();
+ }
 
 PRIMdrawTexturedQuad(&vertex[0], &vertex[1], &vertex[3], &vertex[2]);
 DEFOPAQUEOFF
@@ -4268,8 +4268,8 @@
 
 lx1 = sgpuData[2];
 ly1 = sgpuData[3];
-
- while(!(((gpuData[i] & 0xF000F000) == 0x50005000) && i>=4))
+
+ while(!(((gpuData[i] & 0xF000F000) == 0x50005000) && i>=4))
 {
 i++;
 
@@ -4302,11 +4302,11 @@
 lx1 = (short)(gpuData[1] & 0xffff);
 
 i=2;
-
+
 //while((gpuData[i]>>24)!=0x55)
- //while((gpuData[i]&0x50000000)!=0x50000000) 
- // currently best way to check for poly line end:
- while(!(((gpuData[i] & 0xF000F000) == 0x50005000) && i>=4))
+ //while((gpuData[i]&0x50000000)!=0x50000000) 
+ // currently best way to check for poly line end:
+ while(!(((gpuData[i] & 0xF000F000) == 0x50005000) && i>=4))
 {
 ly0 = ly1;lx0=lx1;
 vertex[1].c.lcol=vertex[2].c.lcol=vertex[0].c.lcol;
@@ -4317,8 +4317,8 @@
 
 ly1 = (short)((gpuData[i]>>16) & 0xffff);
 lx1 = (short)(gpuData[i] & 0xffff);
-
- if(offsetline()) bDraw=FALSE; else bDraw=TRUE;
+
+ if(offsetline()) bDraw=FALSE; else bDraw=TRUE;
 
 if (bDraw && ((lx0 != lx1) || (ly0 != ly1)))
 {
@@ -4401,7 +4401,7 @@
 ly1 = (short)((gpuData[1]>>16) & 0xffff);
 lx1 = (short)(gpuData[1] & 0xffff);
 
- while(!(((gpuData[i] & 0xF000F000) == 0x50005000) && i>=3))
+ while(!(((gpuData[i] & 0xF000F000) == 0x50005000) && i>=3))
 {
 ly1 = (short)((gpuData[i]>>16) & 0xffff);
 lx1 = (short)(gpuData[i] & 0xffff);
@@ -4439,13 +4439,13 @@
 // while((gpuData[i]>>24)!=0x55)
 // while((gpuData[i]&0x50000000)!=0x50000000) 
 // currently best way to check for poly line end:
- while(!(((gpuData[i] & 0xF000F000) == 0x50005000) && i>=3))
+ while(!(((gpuData[i] & 0xF000F000) == 0x50005000) && i>=3))
 {
 ly0 = ly1;lx0=lx1;
 ly1 = (short)((gpuData[i]>>16) & 0xffff);
 lx1 = (short)(gpuData[i] & 0xffff);
-
- if(!offsetline())
+
+ if(!offsetline())
 {
 if(iOffscreenDrawing)
 {
@@ -4459,7 +4459,7 @@
 lx0=cx0;lx1=cx1;ly0=cy0;ly1=cy1;
 }
 PRIMdrawFlatLine(&vertex[0], &vertex[1], &vertex[2], &vertex[3]);
- }
+ }
 
 i++;if(i>iMax) break;
 }

pcsxr-1.9.92.tar.bz2/plugins/peopsxgl/prim.h -> pcsxr-1.9.93.tar.bz2/plugins/peopsxgl/prim.h Changed

@@ -1,34 +1,34 @@
-/***************************************************************************
-                          prim.h  -  description
-                             -------------------
-    begin                : Sun Mar 08 2009
-    copyright            : (C) 1999-2009 by Pete Bernert
-    web                  : www.pbernert.com   
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version. See also the license.txt file for *
- *   additional informations.                                              *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef _PRIMDRAW_H_
-#define _PRIMDRAW_H_
-
-void UploadScreen (int Position);
-void PrepareFullScreenUpload (int Position);
-BOOL CheckAgainstScreen(short imageX0,short imageY0,short imageX1,short imageY1);
-BOOL CheckAgainstFrontScreen(short imageX0,short imageY0,short imageX1,short imageY1);
-BOOL FastCheckAgainstScreen(short imageX0,short imageY0,short imageX1,short imageY1);
-BOOL FastCheckAgainstFrontScreen(short imageX0,short imageY0,short imageX1,short imageY1);
-BOOL bCheckFF9G4(unsigned char * baseAddr);
-void SetScanTrans(void);
-void SetScanTexTrans(void);
-void DrawMultiBlur(void);
-void CheckWriteUpdate();
-
-#endif // _PRIMDRAW_H_
+/***************************************************************************
+                          prim.h  -  description
+                             -------------------
+    begin                : Sun Mar 08 2009
+    copyright            : (C) 1999-2009 by Pete Bernert
+    web                  : www.pbernert.com   
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef _PRIMDRAW_H_
+#define _PRIMDRAW_H_
+
+void UploadScreen (int Position);
+void PrepareFullScreenUpload (int Position);
+BOOL CheckAgainstScreen(short imageX0,short imageY0,short imageX1,short imageY1);
+BOOL CheckAgainstFrontScreen(short imageX0,short imageY0,short imageX1,short imageY1);
+BOOL FastCheckAgainstScreen(short imageX0,short imageY0,short imageX1,short imageY1);
+BOOL FastCheckAgainstFrontScreen(short imageX0,short imageY0,short imageX1,short imageY1);
+BOOL bCheckFF9G4(unsigned char * baseAddr);
+void SetScanTrans(void);
+void SetScanTexTrans(void);
+void DrawMultiBlur(void);
+void CheckWriteUpdate();
+
+#endif // _PRIMDRAW_H_

pcsxr-1.9.92.tar.bz2/plugins/peopsxgl/soft.c -> pcsxr-1.9.93.tar.bz2/plugins/peopsxgl/soft.c Changed

@@ -1,8385 +1,8407 @@
-/***************************************************************************
- soft.c - description
- -------------------
- begin : Sun Oct 28 2001
- copyright : (C) 2001 by Pete Bernert
- web : www.pbernert.com 
- ***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. See also the license.txt file for *
- * additional informations. *
- * *
- ***************************************************************************/
-
-#include "stdafx.h"
-
-#define _IN_SOFT
-
-#include "externals.h"
-#include "soft.h"
-
-int iDither = 0;
-
-////////////////////////////////////////////////////////////////////////////////////
-// "NO EDGE BUFFER" POLY VERSION... FUNCS BASED ON FATMAP.TXT FROM MRI / Doomsday
-////////////////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////////////////////
-// defines
-////////////////////////////////////////////////////////////////////////////////////
-
-// switches for painting textured quads as 2 triangles (small glitches, but better shading!)
-// can be toggled by game fix 0x200 in version 1.17 anyway, so let the defines enabled!
-
-#define POLYQUAD3 
-#define POLYQUAD3GT 
-
-// fast solid loops... a bit more additional code, of course
-
-#define FASTSOLID
-
-// psx blending mode 3 with 25% incoming color (instead 50% without the define)
-
-#define HALFBRIGHTMODE3
-
-// color decode defines
-
-#define XCOL1(x) (x & 0x1f)
-#define XCOL2(x) (x & 0x3e0)
-#define XCOL3(x) (x & 0x7c00)
-
-#define XCOL1D(x) (x & 0x1f)
-#define XCOL2D(x) ((x>>5) & 0x1f)
-#define XCOL3D(x) ((x>>10) & 0x1f)
-
-#define X32TCOL1(x) ((x & 0x001f001f)<<7)
-#define X32TCOL2(x) ((x & 0x03e003e0)<<2)
-#define X32TCOL3(x) ((x & 0x7c007c00)>>3)
-
-#define X32COL1(x) (x & 0x001f001f)
-#define X32COL2(x) ((x>>5) & 0x001f001f)
-#define X32COL3(x) ((x>>10) & 0x001f001f)
-
-#define X32ACOL1(x) (x & 0x001e001e)
-#define X32ACOL2(x) ((x>>5) & 0x001e001e)
-#define X32ACOL3(x) ((x>>10) & 0x001e001e)
-
-#define X32BCOL1(x) (x & 0x001c001c)
-#define X32BCOL2(x) ((x>>5) & 0x001c001c)
-#define X32BCOL3(x) ((x>>10) & 0x001c001c)
-
-#define X32PSXCOL(r,g,b) ((g<<10)|(b<<5)|r)
-
-#define XPSXCOL(r,g,b) ((g&0x7c00)|(b&0x3e0)|(r&0x1f))
-
-////////////////////////////////////////////////////////////////////////////////////
-// soft globals
-////////////////////////////////////////////////////////////////////////////////////
-
-short g_m1 = 255, g_m2 = 255, g_m3 = 255;
-short DrawSemiTrans = FALSE;
-short Ymin;
-short Ymax;
-
-short ly0, lx0, ly1, lx1, ly2, lx2, ly3, lx3; // global psx vertex coords
-int GlobalTextAddrX, GlobalTextAddrY, GlobalTextTP;
-int GlobalTextREST, GlobalTextABR, GlobalTextPAGE;
-
-////////////////////////////////////////////////////////////////////////
-// POLYGON OFFSET FUNCS
-////////////////////////////////////////////////////////////////////////
-
-void offsetPSXLine(void)
-{
- short x0,x1,y0,y1,dx,dy;float px,py;
-
- x0 = lx0+1+PSXDisplay.DrawOffset.x;
- x1 = lx1+1+PSXDisplay.DrawOffset.x;
- y0 = ly0+1+PSXDisplay.DrawOffset.y;
- y1 = ly1+1+PSXDisplay.DrawOffset.y;
-
- dx=x1-x0;
- dy=y1-y0;
-
- // tricky line width without sqrt
-
- if(dx>=0)
- {
- if(dy>=0)
- {
- px=0.5f;
- if(dx>dy) py=-0.5f;
- else if(dx<dy) py= 0.5f;
- else py= 0.0f;
- }
- else
- {
- py=-0.5f;
- dy=-dy;
- if(dx>dy) px= 0.5f;
- else if(dx<dy) px=-0.5f;
- else px= 0.0f;
- }
- }
- else
- {
- if(dy>=0)
- {
- py=0.5f;
- dx=-dx;
- if(dx>dy) px=-0.5f;
- else if(dx<dy) px= 0.5f;
- else px= 0.0f;
- }
- else
- {
- px=-0.5f;
- if(dx>dy) py=-0.5f;
- else if(dx<dy) py= 0.5f;
- else py= 0.0f;
- }
- } 
- 
- lx0=(short)((float)x0-px);
- lx3=(short)((float)x0+py);
- 
- ly0=(short)((float)y0-py);
- ly3=(short)((float)y0-px);
- 
- lx1=(short)((float)x1-py);
- lx2=(short)((float)x1+px);
- 
- ly1=(short)((float)y1+px);
- ly2=(short)((float)y1+py);
-}
-
-void offsetPSX2(void)
-{
- lx0 += PSXDisplay.DrawOffset.x;
- ly0 += PSXDisplay.DrawOffset.y;
- lx1 += PSXDisplay.DrawOffset.x;
- ly1 += PSXDisplay.DrawOffset.y;
-}
-
-void offsetPSX3(void)
-{
- lx0 += PSXDisplay.DrawOffset.x;
- ly0 += PSXDisplay.DrawOffset.y;
- lx1 += PSXDisplay.DrawOffset.x;
- ly1 += PSXDisplay.DrawOffset.y;
- lx2 += PSXDisplay.DrawOffset.x;
- ly2 += PSXDisplay.DrawOffset.y;
-}
-
-void offsetPSX4(void)
-{
- lx0 += PSXDisplay.DrawOffset.x;
- ly0 += PSXDisplay.DrawOffset.y;
- lx1 += PSXDisplay.DrawOffset.x;
- ly1 += PSXDisplay.DrawOffset.y;
- lx2 += PSXDisplay.DrawOffset.x;
- ly2 += PSXDisplay.DrawOffset.y;
- lx3 += PSXDisplay.DrawOffset.x;
- ly3 += PSXDisplay.DrawOffset.y;
-}
-
-/////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////
-// PER PIXEL FUNCS
-////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////
-
-
-unsigned char dithertable[16] =
-{
- 7, 0, 6, 1,
- 2, 5, 3, 4,
- 1, 6, 0, 7,
- 4, 3, 5, 2
-};
-
-void Dither16(unsigned short *pdest, uint32_t r, uint32_t g, uint32_t b, unsigned short sM)
-{
- unsigned char coeff;
- unsigned char rlow, glow, blow;
- int x, y;
- 
- x = pdest - psxVuw;
- y = x >> 10;
- x -= (y << 10);
-
- coeff = dithertable[(y&3)*4+(x&3)];
-
- rlow = r&7; glow = g&7; blow = b&7;
-
- r>>=3; g>>=3; b>>=3;
-
- if ((r < 0x1F) && rlow > coeff) r++;
- if ((g < 0x1F) && glow > coeff) g++;
- if ((b < 0x1F) && blow > coeff) b++;
-
- *pdest=((unsigned short)b<<10) |
- ((unsigned short)g<<5) |
- (unsigned short)r | sM;
-}
-
-/////////////////////////////////////////////////////////////////
-
-__inline void GetShadeTransCol_Dither(unsigned short *pdest, int m1, int m2, int m3)
-{
- int r,g,b;
-
- if (bCheckMask && *pdest & 0x8000) return;
-
- if (DrawSemiTrans)
- {
- r=((XCOL1D(*pdest))<<3);
- b=((XCOL2D(*pdest))<<3);
- g=((XCOL3D(*pdest))<<3);
-
- if(GlobalTextABR==0)
- {
- r=(r>>1)+(m1>>1);
- b=(b>>1)+(m2>>1);
- g=(g>>1)+(m3>>1);
- }
- else
- if(GlobalTextABR==1)
- {
- r+=m1;
- b+=m2;
- g+=m3;
- }
- else
- if(GlobalTextABR==2)
- {
- r-=m1;
- b-=m2;
- g-=m3;
- if(r&0x80000000) r=0;
- if(b&0x80000000) b=0;
- if(g&0x80000000) g=0;
- }
- else
- {
-#ifdef HALFBRIGHTMODE3
- r+=(m1>>2);
- b+=(m2>>2);
- g+=(m3>>2);
-#else
- r+=(m1>>1);
- b+=(m2>>1);
- g+=(m3>>1);
-#endif
- }
- }
- else 
- {
- r=m1;
- b=m2;
- g=m3;
- }
-
- if(r&0x7FFFFF00) r=0xff;
- if(b&0x7FFFFF00) b=0xff;
- if(g&0x7FFFFF00) g=0xff;
-
- Dither16(pdest,r,b,g,sSetMask);
-}
-
-////////////////////////////////////////////////////////////////////////
-
-__inline void GetShadeTransCol(unsigned short * pdest,unsigned short color)
-{
- if(bCheckMask && *pdest&0x8000) return;
-
- if(DrawSemiTrans)
- {
- int r,g,b;
- 
- if(GlobalTextABR==0)
- {
- *pdest=((((*pdest)&0x7bde)>>1)+(((color)&0x7bde)>>1))|sSetMask;//0x8000;
- return;
-/*
- r=(XCOL1(*pdest)>>1)+((XCOL1(color))>>1);
- b=(XCOL2(*pdest)>>1)+((XCOL2(color))>>1);
- g=(XCOL3(*pdest)>>1)+((XCOL3(color))>>1);
-*/
- }
- else
- if(GlobalTextABR==1)
- {
- r=(XCOL1(*pdest))+((XCOL1(color)));
- b=(XCOL2(*pdest))+((XCOL2(color)));
- g=(XCOL3(*pdest))+((XCOL3(color)));
- }
- else
- if(GlobalTextABR==2)
- {
- r=(XCOL1(*pdest))-((XCOL1(color)));
- b=(XCOL2(*pdest))-((XCOL2(color)));
- g=(XCOL3(*pdest))-((XCOL3(color)));
- if(r&0x80000000) r=0;
- if(b&0x80000000) b=0;
- if(g&0x80000000) g=0;
- }
- else
- {
-#ifdef HALFBRIGHTMODE3
- r=(XCOL1(*pdest))+((XCOL1(color))>>2);
- b=(XCOL2(*pdest))+((XCOL2(color))>>2);
- g=(XCOL3(*pdest))+((XCOL3(color))>>2);
-#else
- r=(XCOL1(*pdest))+((XCOL1(color))>>1);
- b=(XCOL2(*pdest))+((XCOL2(color))>>1);
- g=(XCOL3(*pdest))+((XCOL3(color))>>1);
-#endif
- }
-
- if(r&0x7FFFFFE0) r=0x1f;
- if(b&0x7FFFFC00) b=0x3e0;
- if(g&0x7FFF8000) g=0x7c00;
-
- *pdest=(XPSXCOL(r,g,b))|sSetMask;//0x8000;
- }
- else *pdest=color|sSetMask;
-} 
-
-////////////////////////////////////////////////////////////////////////
-
-__inline void GetShadeTransCol32(uint32_t *pdest, uint32_t color)
-{
- if (DrawSemiTrans)
- {
- int r,g,b;
-
- if(GlobalTextABR==0)
- {
- if(!bCheckMask)
- {
- *pdest=((((*pdest)&0x7bde7bde)>>1)+(((color)&0x7bde7bde)>>1))|lSetMask;//0x80008000;
- return;
- }
- r=(X32ACOL1(*pdest)>>1)+((X32ACOL1(color))>>1);
- b=(X32ACOL2(*pdest)>>1)+((X32ACOL2(color))>>1);
- g=(X32ACOL3(*pdest)>>1)+((X32ACOL3(color))>>1);
- }
- else
- if(GlobalTextABR==1)
- {
- r=(X32COL1(*pdest))+((X32COL1(color)));
- b=(X32COL2(*pdest))+((X32COL2(color)));
- g=(X32COL3(*pdest))+((X32COL3(color)));
- }
- else
- if(GlobalTextABR==2)
- {
- int sr,sb,sg,src,sbc,sgc,c;
- src=XCOL1(color);sbc=XCOL2(color);sgc=XCOL3(color);
- c=(*pdest)>>16;
- sr=(XCOL1(c))-src; if(sr&0x8000) sr=0;
- sb=(XCOL2(c))-sbc; if(sb&0x8000) sb=0;
- sg=(XCOL3(c))-sgc; if(sg&0x8000) sg=0;
- r=((int)sr)<<16;b=((int)sb)<<11;g=((int)sg)<<6;
- c=LOWORD(*pdest);
- sr=(XCOL1(c))-src; if(sr&0x8000) sr=0;
- sb=(XCOL2(c))-sbc; if(sb&0x8000) sb=0;
- sg=(XCOL3(c))-sgc; if(sg&0x8000) sg=0;
- r|=sr;b|=sb>>5;g|=sg>>10;
- }
- else
- {
-#ifdef HALFBRIGHTMODE3
- r=(X32COL1(*pdest))+((X32BCOL1(color))>>2);
- b=(X32COL2(*pdest))+((X32BCOL2(color))>>2);
- g=(X32COL3(*pdest))+((X32BCOL3(color))>>2);
-#else
- r=(X32COL1(*pdest))+((X32ACOL1(color))>>1);
- b=(X32COL2(*pdest))+((X32ACOL2(color))>>1);
- g=(X32COL3(*pdest))+((X32ACOL3(color))>>1);
-#endif
- }
-
- if(r&0x7FE00000) r=0x1f0000|(r&0xFFFF);
- if(r&0x7FE0) r=0x1f |(r&0xFFFF0000);
- if(b&0x7FE00000) b=0x1f0000|(b&0xFFFF);
- if(b&0x7FE0) b=0x1f |(b&0xFFFF0000);
- if(g&0x7FE00000) g=0x1f0000|(g&0xFFFF);
- if(g&0x7FE0) g=0x1f |(g&0xFFFF0000);
-
- if(bCheckMask) 
- {
- uint32_t ma=*pdest;
- *pdest=(X32PSXCOL(r,g,b))|lSetMask;//0x80008000;
- if(ma&0x80000000) *pdest=(ma&0xFFFF0000)|(*pdest&0xFFFF);
- if(ma&0x00008000) *pdest=(ma&0xFFFF) |(*pdest&0xFFFF0000);
- return;
- }
- *pdest=(X32PSXCOL(r,g,b))|lSetMask;//0x80008000;
- }
- else
- {
- if(bCheckMask) 
- {
- uint32_t ma=*pdest;
- *pdest=color|lSetMask;//0x80008000;
- if(ma&0x80000000) *pdest=(ma&0xFFFF0000)|(*pdest&0xFFFF);
- if(ma&0x00008000) *pdest=(ma&0xFFFF) |(*pdest&0xFFFF0000);
- return;
- }
-
- *pdest=color|lSetMask;//0x80008000;
- }
-} 
-
-////////////////////////////////////////////////////////////////////////
-
-__inline void GetTextureTransColG(unsigned short * pdest,unsigned short color)
-{
- int r,g,b;unsigned short l;
-
- if(color==0) return;
-
- if(bCheckMask && *pdest&0x8000) return;
-
- l=sSetMask|(color&0x8000);
-
- if(DrawSemiTrans && (color&0x8000))
- {
- if(GlobalTextABR==0)
- {
- unsigned short d;
- d =((*pdest)&0x7bde)>>1;
- color =((color) &0x7bde)>>1;
- r=(XCOL1(d))+((((XCOL1(color)))* g_m1)>>7);
- b=(XCOL2(d))+((((XCOL2(color)))* g_m2)>>7);
- g=(XCOL3(d))+((((XCOL3(color)))* g_m3)>>7);
-
-/*
- r=(XCOL1(*pdest)>>1)+((((XCOL1(color))>>1)* g_m1)>>7);
- b=(XCOL2(*pdest)>>1)+((((XCOL2(color))>>1)* g_m2)>>7);
- g=(XCOL3(*pdest)>>1)+((((XCOL3(color))>>1)* g_m3)>>7);
-*/
- }
- else
- if(GlobalTextABR==1)
- {
- r=(XCOL1(*pdest))+((((XCOL1(color)))* g_m1)>>7);
- b=(XCOL2(*pdest))+((((XCOL2(color)))* g_m2)>>7);
- g=(XCOL3(*pdest))+((((XCOL3(color)))* g_m3)>>7);
- }
- else
- if(GlobalTextABR==2)
- {
- r=(XCOL1(*pdest))-((((XCOL1(color)))* g_m1)>>7);
- b=(XCOL2(*pdest))-((((XCOL2(color)))* g_m2)>>7);
- g=(XCOL3(*pdest))-((((XCOL3(color)))* g_m3)>>7);
- if(r&0x80000000) r=0;
- if(b&0x80000000) b=0;
- if(g&0x80000000) g=0;
- }
- else
- {
-#ifdef HALFBRIGHTMODE3
- r=(XCOL1(*pdest))+((((XCOL1(color))>>2)* g_m1)>>7);
- b=(XCOL2(*pdest))+((((XCOL2(color))>>2)* g_m2)>>7);
- g=(XCOL3(*pdest))+((((XCOL3(color))>>2)* g_m3)>>7);
-#else
- r=(XCOL1(*pdest))+((((XCOL1(color))>>1)* g_m1)>>7);
- b=(XCOL2(*pdest))+((((XCOL2(color))>>1)* g_m2)>>7);
- g=(XCOL3(*pdest))+((((XCOL3(color))>>1)* g_m3)>>7);
-#endif
- }
- }
- else 
- {
- r=((XCOL1(color))* g_m1)>>7;
- b=((XCOL2(color))* g_m2)>>7;
- g=((XCOL3(color))* g_m3)>>7;
- }
-
- if(r&0x7FFFFFE0) r=0x1f;
- if(b&0x7FFFFC00) b=0x3e0;
- if(g&0x7FFF8000) g=0x7c00;
-
- *pdest=(XPSXCOL(r,g,b))|l;
-}
-
-////////////////////////////////////////////////////////////////////////
-
-__inline void GetTextureTransColG_S(unsigned short * pdest,unsigned short color)
-{
- int r,g,b;unsigned short l;
-
- if(color==0) return;
-
- l=sSetMask|(color&0x8000);
-
- r=((XCOL1(color))* g_m1)>>7;
- b=((XCOL2(color))* g_m2)>>7;
- g=((XCOL3(color))* g_m3)>>7;
-
- if(r&0x7FFFFFE0) r=0x1f;
- if(b&0x7FFFFC00) b=0x3e0;
- if(g&0x7FFF8000) g=0x7c00;
-
- *pdest=(XPSXCOL(r,g,b))|l;
-}
-
-
-////////////////////////////////////////////////////////////////////////
-
-__inline void GetTextureTransColG_SPR(unsigned short * pdest,unsigned short color)
-{
- int r,g,b;unsigned short l;
-
- if(color==0) return;
-
- if(bCheckMask && *pdest&0x8000) return;
-
- l=sSetMask|(color&0x8000);
-
- if(DrawSemiTrans && (color&0x8000))
- {
- if(GlobalTextABR==0)
- {
- unsigned short d;
- d =((*pdest)&0x7bde)>>1;
- color =((color) &0x7bde)>>1;
- r=(XCOL1(d))+((((XCOL1(color)))* g_m1)>>7);
- b=(XCOL2(d))+((((XCOL2(color)))* g_m2)>>7);
- g=(XCOL3(d))+((((XCOL3(color)))* g_m3)>>7);
-
-/*
- r=(XCOL1(*pdest)>>1)+((((XCOL1(color))>>1)* g_m1)>>7);
- b=(XCOL2(*pdest)>>1)+((((XCOL2(color))>>1)* g_m2)>>7);
- g=(XCOL3(*pdest)>>1)+((((XCOL3(color))>>1)* g_m3)>>7);
-*/
- }
- else
- if(GlobalTextABR==1)
- {
- r=(XCOL1(*pdest))+((((XCOL1(color)))* g_m1)>>7);
- b=(XCOL2(*pdest))+((((XCOL2(color)))* g_m2)>>7);
- g=(XCOL3(*pdest))+((((XCOL3(color)))* g_m3)>>7);
- }
- else
- if(GlobalTextABR==2)
- {
- r=(XCOL1(*pdest))-((((XCOL1(color)))* g_m1)>>7);
- b=(XCOL2(*pdest))-((((XCOL2(color)))* g_m2)>>7);
- g=(XCOL3(*pdest))-((((XCOL3(color)))* g_m3)>>7);
- if(r&0x80000000) r=0;
- if(b&0x80000000) b=0;
- if(g&0x80000000) g=0;
- }
- else
- {
-#ifdef HALFBRIGHTMODE3
- r=(XCOL1(*pdest))+((((XCOL1(color))>>2)* g_m1)>>7);
- b=(XCOL2(*pdest))+((((XCOL2(color))>>2)* g_m2)>>7);
- g=(XCOL3(*pdest))+((((XCOL3(color))>>2)* g_m3)>>7);
-#else
- r=(XCOL1(*pdest))+((((XCOL1(color))>>1)* g_m1)>>7);
- b=(XCOL2(*pdest))+((((XCOL2(color))>>1)* g_m2)>>7);
- g=(XCOL3(*pdest))+((((XCOL3(color))>>1)* g_m3)>>7);
-#endif
- }
- }
- else 
- {
- r=((XCOL1(color))* g_m1)>>7;
- b=((XCOL2(color))* g_m2)>>7;
- g=((XCOL3(color))* g_m3)>>7;
- }
-
- if(r&0x7FFFFFE0) r=0x1f;
- if(b&0x7FFFFC00) b=0x3e0;
- if(g&0x7FFF8000) g=0x7c00;
-
- *pdest=(XPSXCOL(r,g,b))|l;
-}
-
-////////////////////////////////////////////////////////////////////////
-
-__inline void GetTextureTransColG32(uint32_t *pdest, uint32_t color)
-{
- int r,g,b,l;
-
- if(color==0) return;
-
- l=lSetMask|(color&0x80008000);
-
- if(DrawSemiTrans && (color&0x80008000))
- {
- if(GlobalTextABR==0)
- { 
- r=((((X32TCOL1(*pdest))+((X32COL1(color)) * g_m1))&0xFF00FF00)>>8);
- b=((((X32TCOL2(*pdest))+((X32COL2(color)) * g_m2))&0xFF00FF00)>>8);
- g=((((X32TCOL3(*pdest))+((X32COL3(color)) * g_m3))&0xFF00FF00)>>8);
- }
- else
- if(GlobalTextABR==1)
- {
- r=(X32COL1(*pdest))+(((((X32COL1(color)))* g_m1)&0xFF80FF80)>>7);
- b=(X32COL2(*pdest))+(((((X32COL2(color)))* g_m2)&0xFF80FF80)>>7);
- g=(X32COL3(*pdest))+(((((X32COL3(color)))* g_m3)&0xFF80FF80)>>7);
- }
- else
- if(GlobalTextABR==2)
- {
- int t;
- r=(((((X32COL1(color)))* g_m1)&0xFF80FF80)>>7);
- t=(*pdest&0x001f0000)-(r&0x003f0000); if(t&0x80000000) t=0;
- r=(*pdest&0x0000001f)-(r&0x0000003f); if(r&0x80000000) r=0;
- r|=t;
-
- b=(((((X32COL2(color)))* g_m2)&0xFF80FF80)>>7);
- t=((*pdest>>5)&0x001f0000)-(b&0x003f0000); if(t&0x80000000) t=0;
- b=((*pdest>>5)&0x0000001f)-(b&0x0000003f); if(b&0x80000000) b=0;
- b|=t;
-
- g=(((((X32COL3(color)))* g_m3)&0xFF80FF80)>>7);
- t=((*pdest>>10)&0x001f0000)-(g&0x003f0000); if(t&0x80000000) t=0;
- g=((*pdest>>10)&0x0000001f)-(g&0x0000003f); if(g&0x80000000) g=0;
- g|=t;
- }
- else
- {
-#ifdef HALFBRIGHTMODE3
- r=(X32COL1(*pdest))+(((((X32BCOL1(color))>>2)* g_m1)&0xFF80FF80)>>7);
- b=(X32COL2(*pdest))+(((((X32BCOL2(color))>>2)* g_m2)&0xFF80FF80)>>7);
- g=(X32COL3(*pdest))+(((((X32BCOL3(color))>>2)* g_m3)&0xFF80FF80)>>7);
-#else
- r=(X32COL1(*pdest))+(((((X32ACOL1(color))>>1)* g_m1)&0xFF80FF80)>>7);
- b=(X32COL2(*pdest))+(((((X32ACOL2(color))>>1)* g_m2)&0xFF80FF80)>>7);
- g=(X32COL3(*pdest))+(((((X32ACOL3(color))>>1)* g_m3)&0xFF80FF80)>>7);
-#endif
- }
-
- if(!(color&0x8000))
- {
- r=(r&0xffff0000)|((((X32COL1(color))* g_m1)&0x0000FF80)>>7);
- b=(b&0xffff0000)|((((X32COL2(color))* g_m2)&0x0000FF80)>>7);
- g=(g&0xffff0000)|((((X32COL3(color))* g_m3)&0x0000FF80)>>7);
- }
- if(!(color&0x80000000))
- {
- r=(r&0xffff)|((((X32COL1(color))* g_m1)&0xFF800000)>>7);
- b=(b&0xffff)|((((X32COL2(color))* g_m2)&0xFF800000)>>7);
- g=(g&0xffff)|((((X32COL3(color))* g_m3)&0xFF800000)>>7);
- }
-
- }
- else 
- {
- r=(((X32COL1(color))* g_m1)&0xFF80FF80)>>7;
- b=(((X32COL2(color))* g_m2)&0xFF80FF80)>>7;
- g=(((X32COL3(color))* g_m3)&0xFF80FF80)>>7;
- }
-
- if(r&0x7FE00000) r=0x1f0000|(r&0xFFFF);
- if(r&0x7FE0) r=0x1f |(r&0xFFFF0000);
- if(b&0x7FE00000) b=0x1f0000|(b&0xFFFF);
- if(b&0x7FE0) b=0x1f |(b&0xFFFF0000);
- if(g&0x7FE00000) g=0x1f0000|(g&0xFFFF);
- if(g&0x7FE0) g=0x1f |(g&0xFFFF0000);
- 
- if(bCheckMask) 
- {
- uint32_t ma=*pdest;
-
- *pdest=(X32PSXCOL(r,g,b))|l;
- 
- if((color&0xffff)==0 ) *pdest=(ma&0xffff)|(*pdest&0xffff0000);
- if((color&0xffff0000)==0) *pdest=(ma&0xffff0000)|(*pdest&0xffff);
- if(ma&0x80000000) *pdest=(ma&0xFFFF0000)|(*pdest&0xFFFF);
- if(ma&0x00008000) *pdest=(ma&0xFFFF) |(*pdest&0xFFFF0000);
-
- return; 
- }
- if((color&0xffff)==0 ) {*pdest=(*pdest&0xffff)|(((X32PSXCOL(r,g,b))|l)&0xffff0000);return;}
- if((color&0xffff0000)==0) {*pdest=(*pdest&0xffff0000)|(((X32PSXCOL(r,g,b))|l)&0xffff);return;}
-
- *pdest=(X32PSXCOL(r,g,b))|l;
-}
-
-////////////////////////////////////////////////////////////////////////
-
-__inline void GetTextureTransColG32_S(uint32_t *pdest, uint32_t color)
-{
- int r,g,b;
-
- if(color==0) return;
-
- r=(((X32COL1(color))* g_m1)&0xFF80FF80)>>7;
- b=(((X32COL2(color))* g_m2)&0xFF80FF80)>>7;
- g=(((X32COL3(color))* g_m3)&0xFF80FF80)>>7;
-
- if(r&0x7FE00000) r=0x1f0000|(r&0xFFFF);
- if(r&0x7FE0) r=0x1f |(r&0xFFFF0000);
- if(b&0x7FE00000) b=0x1f0000|(b&0xFFFF);
- if(b&0x7FE0) b=0x1f |(b&0xFFFF0000);
- if(g&0x7FE00000) g=0x1f0000|(g&0xFFFF);
- if(g&0x7FE0) g=0x1f |(g&0xFFFF0000);
- 
- if((color&0xffff)==0) {*pdest=(*pdest&0xffff)|(((X32PSXCOL(r,g,b))|lSetMask|(color&0x80008000))&0xffff0000);return;}
- if((color&0xffff0000)==0) {*pdest=(*pdest&0xffff0000)|(((X32PSXCOL(r,g,b))|lSetMask|(color&0x80008000))&0xffff);return;}
-
- *pdest=(X32PSXCOL(r,g,b))|lSetMask|(color&0x80008000);
-}
-
-////////////////////////////////////////////////////////////////////////
-
-__inline void GetTextureTransColG32_SPR(uint32_t *pdest, uint32_t color)
-{
- int r,g,b;
-
- if(color==0) return;
-
- if(DrawSemiTrans && (color&0x80008000))
- {
- if(GlobalTextABR==0)
- { 
- r=((((X32TCOL1(*pdest))+((X32COL1(color)) * g_m1))&0xFF00FF00)>>8);
- b=((((X32TCOL2(*pdest))+((X32COL2(color)) * g_m2))&0xFF00FF00)>>8);
- g=((((X32TCOL3(*pdest))+((X32COL3(color)) * g_m3))&0xFF00FF00)>>8);
- }
- else
- if(GlobalTextABR==1)
- {
- r=(X32COL1(*pdest))+(((((X32COL1(color)))* g_m1)&0xFF80FF80)>>7);
- b=(X32COL2(*pdest))+(((((X32COL2(color)))* g_m2)&0xFF80FF80)>>7);
- g=(X32COL3(*pdest))+(((((X32COL3(color)))* g_m3)&0xFF80FF80)>>7);
- }
- else
- if(GlobalTextABR==2)
- {
- int t;
- r=(((((X32COL1(color)))* g_m1)&0xFF80FF80)>>7);
- t=(*pdest&0x001f0000)-(r&0x003f0000); if(t&0x80000000) t=0;
- r=(*pdest&0x0000001f)-(r&0x0000003f); if(r&0x80000000) r=0;
- r|=t;
-
- b=(((((X32COL2(color)))* g_m2)&0xFF80FF80)>>7);
- t=((*pdest>>5)&0x001f0000)-(b&0x003f0000); if(t&0x80000000) t=0;
- b=((*pdest>>5)&0x0000001f)-(b&0x0000003f); if(b&0x80000000) b=0;
- b|=t;
-
- g=(((((X32COL3(color)))* g_m3)&0xFF80FF80)>>7);
- t=((*pdest>>10)&0x001f0000)-(g&0x003f0000); if(t&0x80000000) t=0;
- g=((*pdest>>10)&0x0000001f)-(g&0x0000003f); if(g&0x80000000) g=0;
- g|=t;
- }
- else
- {
-#ifdef HALFBRIGHTMODE3
- r=(X32COL1(*pdest))+(((((X32BCOL1(color))>>2)* g_m1)&0xFF80FF80)>>7);
- b=(X32COL2(*pdest))+(((((X32BCOL2(color))>>2)* g_m2)&0xFF80FF80)>>7);
- g=(X32COL3(*pdest))+(((((X32BCOL3(color))>>2)* g_m3)&0xFF80FF80)>>7);
-#else
- r=(X32COL1(*pdest))+(((((X32ACOL1(color))>>1)* g_m1)&0xFF80FF80)>>7);
- b=(X32COL2(*pdest))+(((((X32ACOL2(color))>>1)* g_m2)&0xFF80FF80)>>7);
- g=(X32COL3(*pdest))+(((((X32ACOL3(color))>>1)* g_m3)&0xFF80FF80)>>7);
-#endif
- }
-
- if(!(color&0x8000))
- {
- r=(r&0xffff0000)|((((X32COL1(color))* g_m1)&0x0000FF80)>>7);
- b=(b&0xffff0000)|((((X32COL2(color))* g_m2)&0x0000FF80)>>7);
- g=(g&0xffff0000)|((((X32COL3(color))* g_m3)&0x0000FF80)>>7);
- }
- if(!(color&0x80000000))
- {
- r=(r&0xffff)|((((X32COL1(color))* g_m1)&0xFF800000)>>7);
- b=(b&0xffff)|((((X32COL2(color))* g_m2)&0xFF800000)>>7);
- g=(g&0xffff)|((((X32COL3(color))* g_m3)&0xFF800000)>>7);
- }
-
- }
- else 
- {
- r=(((X32COL1(color))* g_m1)&0xFF80FF80)>>7;
- b=(((X32COL2(color))* g_m2)&0xFF80FF80)>>7;
- g=(((X32COL3(color))* g_m3)&0xFF80FF80)>>7;
- }
-
- if(r&0x7FE00000) r=0x1f0000|(r&0xFFFF);
- if(r&0x7FE0) r=0x1f |(r&0xFFFF0000);
- if(b&0x7FE00000) b=0x1f0000|(b&0xFFFF);
- if(b&0x7FE0) b=0x1f |(b&0xFFFF0000);
- if(g&0x7FE00000) g=0x1f0000|(g&0xFFFF);
- if(g&0x7FE0) g=0x1f |(g&0xFFFF0000);
- 
- if(bCheckMask) 
- {
- uint32_t ma=*pdest;
-
- *pdest=(X32PSXCOL(r,g,b))|lSetMask|(color&0x80008000);
- 
- if((color&0xffff)==0 ) *pdest=(ma&0xffff)|(*pdest&0xffff0000);
- if((color&0xffff0000)==0) *pdest=(ma&0xffff0000)|(*pdest&0xffff);
- if(ma&0x80000000) *pdest=(ma&0xFFFF0000)|(*pdest&0xFFFF);
- if(ma&0x00008000) *pdest=(ma&0xFFFF) |(*pdest&0xFFFF0000);
-
- return; 
- }
- if((color&0xffff)==0 ) {*pdest=(*pdest&0xffff)|(((X32PSXCOL(r,g,b))|lSetMask|(color&0x80008000))&0xffff0000);return;}
- if((color&0xffff0000)==0) {*pdest=(*pdest&0xffff0000)|(((X32PSXCOL(r,g,b))|lSetMask|(color&0x80008000))&0xffff);return;}
-
- *pdest=(X32PSXCOL(r,g,b))|lSetMask|(color&0x80008000);
-}
-
-////////////////////////////////////////////////////////////////////////
-
-__inline void GetTextureTransColGX_Dither(unsigned short * pdest, unsigned short color, int m1, int m2, int m3)
-{
- int r,g,b;
-
- if(color==0) return;
- 
- if(bCheckMask && *pdest&0x8000) return;
-
- m1=(((XCOL1D(color)))*m1)>>4;
- m2=(((XCOL2D(color)))*m2)>>4;
- m3=(((XCOL3D(color)))*m3)>>4;
-
- if(DrawSemiTrans && (color&0x8000))
- {
- r=((XCOL1D(*pdest))<<3);
- b=((XCOL2D(*pdest))<<3);
- g=((XCOL3D(*pdest))<<3);
-
- if(GlobalTextABR==0)
- {
- r=(r>>1)+(m1>>1);
- b=(b>>1)+(m2>>1);
- g=(g>>1)+(m3>>1);
- }
- else
- if(GlobalTextABR==1)
- {
- r+=m1;
- b+=m2;
- g+=m3;
- }
- else
- if(GlobalTextABR==2)
- {
- r-=m1;
- b-=m2;
- g-=m3;
- if(r&0x80000000) r=0;
- if(b&0x80000000) b=0;
- if(g&0x80000000) g=0;
- }
- else
- {
-#ifdef HALFBRIGHTMODE3
- r+=(m1>>2);
- b+=(m2>>2);
- g+=(m3>>2);
-#else
- r+=(m1>>1);
- b+=(m2>>1);
- g+=(m3>>1);
-#endif
- }
- }
- else 
- {
- r=m1;
- b=m2;
- g=m3;
- }
-
- if(r&0x7FFFFF00) r=0xff;
- if(b&0x7FFFFF00) b=0xff;
- if(g&0x7FFFFF00) g=0xff;
-
- Dither16(pdest,r,b,g,sSetMask|(color&0x8000));
-
-}
-
-////////////////////////////////////////////////////////////////////////
-
-__inline void GetTextureTransColGX(unsigned short * pdest,unsigned short color,short m1,short m2,short m3)
-{
- int r,g,b;unsigned short l;
-
- if(color==0) return;
- 
- if(bCheckMask && *pdest&0x8000) return;
-
- l=sSetMask|(color&0x8000);
-
- if(DrawSemiTrans && (color&0x8000))
- {
- if(GlobalTextABR==0)
- {
- unsigned short d;
- d =((*pdest)&0x7bde)>>1;
- color =((color) &0x7bde)>>1;
- r=(XCOL1(d))+((((XCOL1(color)))* m1)>>7);
- b=(XCOL2(d))+((((XCOL2(color)))* m2)>>7);
- g=(XCOL3(d))+((((XCOL3(color)))* m3)>>7);
-/*
- r=(XCOL1(*pdest)>>1)+((((XCOL1(color))>>1)* m1)>>7);
- b=(XCOL2(*pdest)>>1)+((((XCOL2(color))>>1)* m2)>>7);
- g=(XCOL3(*pdest)>>1)+((((XCOL3(color))>>1)* m3)>>7);
-*/
- }
- else
- if(GlobalTextABR==1)
- {
- r=(XCOL1(*pdest))+((((XCOL1(color)))* m1)>>7);
- b=(XCOL2(*pdest))+((((XCOL2(color)))* m2)>>7);
- g=(XCOL3(*pdest))+((((XCOL3(color)))* m3)>>7);
- }
- else
- if(GlobalTextABR==2)
- {
- r=(XCOL1(*pdest))-((((XCOL1(color)))* m1)>>7);
- b=(XCOL2(*pdest))-((((XCOL2(color)))* m2)>>7);
- g=(XCOL3(*pdest))-((((XCOL3(color)))* m3)>>7);
- if(r&0x80000000) r=0;
- if(b&0x80000000) b=0;
- if(g&0x80000000) g=0;
- }
- else
- {
-#ifdef HALFBRIGHTMODE3
- r=(XCOL1(*pdest))+((((XCOL1(color))>>2)* m1)>>7);
- b=(XCOL2(*pdest))+((((XCOL2(color))>>2)* m2)>>7);
- g=(XCOL3(*pdest))+((((XCOL3(color))>>2)* m3)>>7);
-#else
- r=(XCOL1(*pdest))+((((XCOL1(color))>>1)* m1)>>7);
- b=(XCOL2(*pdest))+((((XCOL2(color))>>1)* m2)>>7);
- g=(XCOL3(*pdest))+((((XCOL3(color))>>1)* m3)>>7);
-#endif
- }
- }
- else 
- {
- r=((XCOL1(color))* m1)>>7;
- b=((XCOL2(color))* m2)>>7;
- g=((XCOL3(color))* m3)>>7;
- }
-
- if(r&0x7FFFFFE0) r=0x1f;
- if(b&0x7FFFFC00) b=0x3e0;
- if(g&0x7FFF8000) g=0x7c00;
-
- *pdest=(XPSXCOL(r,g,b))|l;
-}
-
-////////////////////////////////////////////////////////////////////////
-
-__inline void GetTextureTransColGX_S(unsigned short * pdest,unsigned short color,short m1,short m2,short m3)
-{
- int r,g,b;
-
- if(color==0) return;
- 
- r=((XCOL1(color))* m1)>>7;
- b=((XCOL2(color))* m2)>>7;
- g=((XCOL3(color))* m3)>>7;
-
- if(r&0x7FFFFFE0) r=0x1f;
- if(b&0x7FFFFC00) b=0x3e0;
- if(g&0x7FFF8000) g=0x7c00;
-
- *pdest=(XPSXCOL(r,g,b))|sSetMask|(color&0x8000);
-}
-
-////////////////////////////////////////////////////////////////////////
-
-__inline void GetTextureTransColGX32_S(uint32_t *pdest, uint32_t color, short m1, short m2, short m3)
-{
- int r,g,b;
- 
- if(color==0) return;
-
- r=(((X32COL1(color))* m1)&0xFF80FF80)>>7;
- b=(((X32COL2(color))* m2)&0xFF80FF80)>>7;
- g=(((X32COL3(color))* m3)&0xFF80FF80)>>7;
- 
- if(r&0x7FE00000) r=0x1f0000|(r&0xFFFF);
- if(r&0x7FE0) r=0x1f |(r&0xFFFF0000);
- if(b&0x7FE00000) b=0x1f0000|(b&0xFFFF);
- if(b&0x7FE0) b=0x1f |(b&0xFFFF0000);
- if(g&0x7FE00000) g=0x1f0000|(g&0xFFFF);
- if(g&0x7FE0) g=0x1f |(g&0xFFFF0000);
-
- if((color&0xffff)==0) {*pdest=(*pdest&0xffff)|(((X32PSXCOL(r,g,b))|lSetMask|(color&0x80008000))&0xffff0000);return;}
- if((color&0xffff0000)==0) {*pdest=(*pdest&0xffff0000)|(((X32PSXCOL(r,g,b))|lSetMask|(color&0x80008000))&0xffff);return;}
-
- *pdest=(X32PSXCOL(r,g,b))|lSetMask|(color&0x80008000);
-}
-
-////////////////////////////////////////////////////////////////////////
-// FILL FUNCS
-////////////////////////////////////////////////////////////////////////
-
-void FillSoftwareAreaTrans(short x0,short y0,short x1, // FILL AREA TRANS
- short y1,unsigned short col)
-{
- short j,i,dx,dy;
-
- if(y0>y1) return;
- if(x0>x1) return;
-
- if(x1<drawX) return;
- if(y1<drawY) return;
- if(x0>drawW) return;
- if(y0>drawH) return;
-
- x1=min(x1,drawW+1);
- y1=min(y1,drawH+1);
- x0=max(x0,drawX);
- y0=max(y0,drawY);
- 
- if(y0>=iGPUHeight) return;
- if(x0>1023) return;
-
- if(y1>iGPUHeight) y1=iGPUHeight;
- if(x1>1024) x1=1024;
-
- dx=x1-x0;dy=y1-y0;
-
- if(dx==1 && dy==1 && x0==1020 && y0==511) // special fix for pinball game... emu protection???
- {
-/*
-m->v 1020 511 1 1
-writedatamem 0x00000000 1
-tile1 newcol 7fff (orgcol 0xffffff), oldvram 0
-v->m 1020 511 1 1
-readdatamem 0x00007fff 1
-m->v 1020 511 1 1
-writedatamem 0x00000000 1
-tile1 newcol 8000 (orgcol 0xffffff), oldvram 0
-v->m 1020 511 1 1
-readdatamem 0x00008000 1
-*/
-
- static int iCheat=0;
- col+=iCheat;
- if(iCheat==1) iCheat=0; else iCheat=1;
- }
-
- if(dx&1) // slow fill
- {
- unsigned short *DSTPtr;
- unsigned short LineOffset;
- DSTPtr = psxVuw + (1024*y0) + x0;
- LineOffset = 1024 - dx;
- for(i=0;i<dy;i++)
- {
- for(j=0;j<dx;j++)
- GetShadeTransCol(DSTPtr++,col);
- DSTPtr += LineOffset;
- } 
- }
- else // fast fill
- {
- uint32_t *DSTPtr;
- unsigned short LineOffset;
- uint32_t lcol=lSetMask|(((uint32_t)(col))<<16)|col;
- dx>>=1;
- DSTPtr = (uint32_t *)(psxVuw + (1024*y0) + x0);
- LineOffset = 512 - dx;
-
- if(!bCheckMask && !DrawSemiTrans)
- {
- for(i=0;i<dy;i++)
- {
- for(j=0;j<dx;j++) *DSTPtr++=lcol;
- DSTPtr += LineOffset;
- }
- }
- else
- {
- for(i=0;i<dy;i++)
- {
- for(j=0;j<dx;j++) 
- GetShadeTransCol32(DSTPtr++,lcol);
- DSTPtr += LineOffset;
- } 
- }
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-
-void FillSoftwareArea(short x0,short y0,short x1, // FILL AREA (BLK FILL)
- short y1,unsigned short col) // no draw area check here!
-{
- short j,i,dx,dy;
-
- if(y0>y1) return;
- if(x0>x1) return;
- 
- if(y0>=iGPUHeight) return;
- if(x0>1023) return;
-
- if(y1>iGPUHeight) y1=iGPUHeight;
- if(x1>1024) x1=1024;
-
- dx=x1-x0;dy=y1-y0;
- if(dx&1)
- {
- unsigned short *DSTPtr;
- unsigned short LineOffset;
-
- DSTPtr = psxVuw + (1024*y0) + x0;
- LineOffset = 1024 - dx;
-
- for(i=0;i<dy;i++)
- {
- for(j=0;j<dx;j++) *DSTPtr++=col;
- DSTPtr += LineOffset;
- } 
- }
- else
- {
- uint32_t *DSTPtr;
- unsigned short LineOffset;
- uint32_t lcol=(((int)col)<<16)|col;
- dx>>=1;
- DSTPtr = (uint32_t *)(psxVuw + (1024*y0) + x0);
- LineOffset = 512 - dx;
-
- for(i=0;i<dy;i++)
- {
- for(j=0;j<dx;j++) *DSTPtr++=lcol;
- DSTPtr += LineOffset;
- } 
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-// EDGE INTERPOLATION
-////////////////////////////////////////////////////////////////////////
-
-typedef struct SOFTVTAG
-{
- int x,y; 
- int u,v;
- int R,G,B;
-} soft_vertex;
-
-static soft_vertex vtx[4];
-static soft_vertex * left_array[4], * right_array[4];
-static int left_section, right_section;
-static int left_section_height, right_section_height;
-static int left_x, delta_left_x, right_x, delta_right_x;
-static int left_u, delta_left_u, left_v, delta_left_v;
-static int right_u, delta_right_u, right_v, delta_right_v;
-static int left_R, delta_left_R, right_R, delta_right_R;
-static int left_G, delta_left_G, right_G, delta_right_G;
-static int left_B, delta_left_B, right_B, delta_right_B;
-
-__inline int shl10idiv(int x, int y)
-{
- long long int bi=x;
- bi<<=10;
- return bi/y;
-}
-
-__inline int RightSection_F(void)
-{
- soft_vertex * v1 = right_array[ right_section ];
- soft_vertex * v2 = right_array[ right_section-1 ];
-
- int height = v2->y - v1->y;
- if(height == 0) return 0;
- delta_right_x = (v2->x - v1->x) / height;
- right_x = v1->x;
-
- right_section_height = height;
- return height;
-}
-
-__inline int LeftSection_F(void)
-{
- soft_vertex * v1 = left_array[ left_section ];
- soft_vertex * v2 = left_array[ left_section-1 ];
-
- int height = v2->y - v1->y;
- if(height == 0) return 0;
- delta_left_x = (v2->x - v1->x) / height;
- left_x = v1->x;
-
- left_section_height = height;
- return height; 
-}
-
-__inline BOOL NextRow_F(void)
-{
- if(--left_section_height<=0) 
- {
- if(--left_section <= 0) {return TRUE;}
- if(LeftSection_F() <= 0) {return TRUE;}
- }
- else
- {
- left_x += delta_left_x;
- }
-
- if(--right_section_height<=0) 
- {
- if(--right_section<=0) {return TRUE;}
- if(RightSection_F() <=0) {return TRUE;}
- }
- else
- {
- right_x += delta_right_x;
- }
- return FALSE;
-}
-
-__inline BOOL SetupSections_F(short x1, short y1, short x2, short y2, short x3, short y3)
-{
- soft_vertex * v1, * v2, * v3;
- int height,longest;
-
- v1 = vtx; v1->x=x1<<16;v1->y=y1;
- v2 = vtx+1; v2->x=x2<<16;v2->y=y2;
- v3 = vtx+2; v3->x=x3<<16;v3->y=y3;
-
- if(v1->y > v2->y) { soft_vertex * v = v1; v1 = v2; v2 = v; }
- if(v1->y > v3->y) { soft_vertex * v = v1; v1 = v3; v3 = v; }
- if(v2->y > v3->y) { soft_vertex * v = v2; v2 = v3; v3 = v; }
-
- height = v3->y - v1->y;
- if(height == 0) {return FALSE;}
- longest = (((v2->y - v1->y) << 16) / height) * ((v3->x - v1->x)>>16) + (v1->x - v2->x);
- if(longest == 0) {return FALSE;}
-
- if(longest < 0)
- {
- right_array[0] = v3;
- right_array[1] = v2;
- right_array[2] = v1;
- right_section = 2;
- left_array[0] = v3;
- left_array[1] = v1;
- left_section = 1;
-
- if(LeftSection_F() <= 0) return FALSE;
- if(RightSection_F() <= 0)
- {
- right_section--;
- if(RightSection_F() <= 0) return FALSE;
- }
- }
- else
- {
- left_array[0] = v3;
- left_array[1] = v2;
- left_array[2] = v1;
- left_section = 2;
- right_array[0] = v3;
- right_array[1] = v1;
- right_section = 1;
-
- if(RightSection_F() <= 0) return FALSE;
- if(LeftSection_F() <= 0)
- { 
- left_section--;
- if(LeftSection_F() <= 0) return FALSE;
- }
- }
-
- Ymin=v1->y;
- Ymax=min(v3->y-1,drawH);
-
- return TRUE;
-}
-
-__inline int RightSection_G(void)
-{
- soft_vertex * v1 = right_array[ right_section ];
- soft_vertex * v2 = right_array[ right_section-1 ];
-
- int height = v2->y - v1->y;
- if(height == 0) return 0;
- delta_right_x = (v2->x - v1->x) / height;
- right_x = v1->x;
-
- right_section_height = height;
- return height;
-}
-
-__inline int LeftSection_G(void)
-{
- soft_vertex * v1 = left_array[ left_section ];
- soft_vertex * v2 = left_array[ left_section-1 ];
-
- int height = v2->y - v1->y;
- if(height == 0) return 0;
- delta_left_x = (v2->x - v1->x) / height;
- left_x = v1->x;
-
- delta_left_R = ((v2->R - v1->R)) / height;
- left_R = v1->R;
- delta_left_G = ((v2->G - v1->G)) / height;
- left_G = v1->G;
- delta_left_B = ((v2->B - v1->B)) / height;
- left_B = v1->B;
-
- left_section_height = height;
- return height; 
-}
-
-__inline BOOL NextRow_G(void)
-{
- if(--left_section_height<=0) 
- {
- if(--left_section <= 0) {return TRUE;}
- if(LeftSection_G() <= 0) {return TRUE;}
- }
- else
- {
- left_x += delta_left_x;
- left_R += delta_left_R;
- left_G += delta_left_G;
- left_B += delta_left_B;
- }
-
- if(--right_section_height<=0) 
- {
- if(--right_section<=0) {return TRUE;}
- if(RightSection_G() <=0) {return TRUE;}
- }
- else
- {
- right_x += delta_right_x;
- }
- return FALSE;
-}
-
-__inline BOOL SetupSections_G(short x1,short y1,short x2,short y2,short x3,short y3, int rgb1, int rgb2, int rgb3){
- soft_vertex *v1, *v2, *v3;
- int height, longest, temp;
-
- v1 = vtx; v1->x=x1<<16;v1->y=y1;
- v1->R=(rgb1) & 0x00ff0000;
- v1->G=(rgb1<<8) & 0x00ff0000;
- v1->B=(rgb1<<16) & 0x00ff0000;
- v2 = vtx+1; v2->x=x2<<16;v2->y=y2;
- v2->R=(rgb2) & 0x00ff0000;
- v2->G=(rgb2<<8) & 0x00ff0000;
- v2->B=(rgb2<<16) & 0x00ff0000;
- v3 = vtx+2; v3->x=x3<<16;v3->y=y3;
- v3->R=(rgb3) & 0x00ff0000;
- v3->G=(rgb3<<8) & 0x00ff0000;
- v3->B=(rgb3<<16) & 0x00ff0000;
-
- if(v1->y > v2->y) { soft_vertex * v = v1; v1 = v2; v2 = v; }
- if(v1->y > v3->y) { soft_vertex * v = v1; v1 = v3; v3 = v; }
- if(v2->y > v3->y) { soft_vertex * v = v2; v2 = v3; v3 = v; }
-
- height = v3->y - v1->y;
- if(height == 0) {return FALSE;}
- temp=(((v2->y - v1->y) << 16) / height);
- longest = temp * ((v3->x - v1->x)>>16) + (v1->x - v2->x);
- if(longest == 0) {return FALSE;}
-
- if(longest < 0)
- {
- right_array[0] = v3;
- right_array[1] = v2;
- right_array[2] = v1;
- right_section = 2;
- left_array[0] = v3;
- left_array[1] = v1;
- left_section = 1;
-
- if(LeftSection_G() <= 0) return FALSE;
- if(RightSection_G() <= 0)
- {
- right_section--;
- if(RightSection_G() <= 0) return FALSE;
- }
- if(longest > -0x1000) longest = -0x1000; 
- }
- else
- {
- left_array[0] = v3;
- left_array[1] = v2;
- left_array[2] = v1;
- left_section = 2;
- right_array[0] = v3;
- right_array[1] = v1;
- right_section = 1;
-
- if(RightSection_G() <= 0) return FALSE;
- if(LeftSection_G() <= 0)
- { 
- left_section--;
- if(LeftSection_G() <= 0) return FALSE;
- }
- if(longest < 0x1000) longest = 0x1000; 
- }
-
- Ymin=v1->y;
- Ymax=min(v3->y-1,drawH); 
-
- delta_right_R=shl10idiv(temp*((v3->R - v1->R)>>10)+((v1->R - v2->R)<<6),longest);
- delta_right_G=shl10idiv(temp*((v3->G - v1->G)>>10)+((v1->G - v2->G)<<6),longest);
- delta_right_B=shl10idiv(temp*((v3->B - v1->B)>>10)+((v1->B - v2->B)<<6),longest);
-
- return TRUE;
-}
-
-__inline int RightSection_FT(void)
-{
- soft_vertex * v1 = right_array[ right_section ];
- soft_vertex * v2 = right_array[ right_section-1 ];
-
- int height = v2->y - v1->y;
- if(height == 0) return 0;
- delta_right_x = (v2->x - v1->x) / height;
- right_x = v1->x;
-
- right_section_height = height;
- return height;
-}
-
-__inline int LeftSection_FT(void)
-{
- soft_vertex * v1 = left_array[ left_section ];
- soft_vertex * v2 = left_array[ left_section-1 ];
-
- int height = v2->y - v1->y;
- if(height == 0) return 0;
- delta_left_x = (v2->x - v1->x) / height;
- left_x = v1->x;
- 
- delta_left_u = ((v2->u - v1->u)) / height;
- left_u = v1->u;
- delta_left_v = ((v2->v - v1->v)) / height;
- left_v = v1->v;
-
- left_section_height = height;
- return height; 
-}
-
-__inline BOOL NextRow_FT(void)
-{
- if(--left_section_height<=0) 
- {
- if(--left_section <= 0) {return TRUE;}
- if(LeftSection_FT() <= 0) {return TRUE;}
- }
- else
- {
- left_x += delta_left_x;
- left_u += delta_left_u;
- left_v += delta_left_v;
- }
-
- if(--right_section_height<=0) 
- {
- if(--right_section<=0) {return TRUE;}
- if(RightSection_FT() <=0) {return TRUE;}
- }
- else
- {
- right_x += delta_right_x;
- }
- return FALSE;
-}
-
-__inline BOOL SetupSections_FT(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3)
-{
- soft_vertex * v1, * v2, * v3;
- int height,longest,temp;
-
- v1 = vtx; v1->x=x1<<16;v1->y=y1;
- v1->u=tx1<<16;v1->v=ty1<<16;
- v2 = vtx+1; v2->x=x2<<16;v2->y=y2;
- v2->u=tx2<<16;v2->v=ty2<<16;
- v3 = vtx+2; v3->x=x3<<16;v3->y=y3;
- v3->u=tx3<<16;v3->v=ty3<<16;
-
- if(v1->y > v2->y) { soft_vertex * v = v1; v1 = v2; v2 = v; }
- if(v1->y > v3->y) { soft_vertex * v = v1; v1 = v3; v3 = v; }
- if(v2->y > v3->y) { soft_vertex * v = v2; v2 = v3; v3 = v; }
-
- height = v3->y - v1->y;
- if(height == 0) {return FALSE;}
-
- temp=(((v2->y - v1->y) << 16) / height);
- longest = temp * ((v3->x - v1->x)>>16) + (v1->x - v2->x);
-
- if(longest == 0) {return FALSE;}
-
- if(longest < 0)
- {
- right_array[0] = v3;
- right_array[1] = v2;
- right_array[2] = v1;
- right_section = 2;
- left_array[0] = v3;
- left_array[1] = v1;
- left_section = 1;
-
- if(LeftSection_FT() <= 0) return FALSE;
- if(RightSection_FT() <= 0)
- {
- right_section--;
- if(RightSection_FT() <= 0) return FALSE;
- }
- if(longest > -0x1000) longest = -0x1000; 
- }
- else
- {
- left_array[0] = v3;
- left_array[1] = v2;
- left_array[2] = v1;
- left_section = 2;
- right_array[0] = v3;
- right_array[1] = v1;
- right_section = 1;
-
- if(RightSection_FT() <= 0) return FALSE;
- if(LeftSection_FT() <= 0)
- { 
- left_section--; 
- if(LeftSection_FT() <= 0) return FALSE;
- }
- if(longest < 0x1000) longest = 0x1000; 
- }
-
- Ymin=v1->y;
- Ymax=min(v3->y-1,drawH);
-
- delta_right_u=shl10idiv(temp*((v3->u - v1->u)>>10)+((v1->u - v2->u)<<6),longest);
- delta_right_v=shl10idiv(temp*((v3->v - v1->v)>>10)+((v1->v - v2->v)<<6),longest);
-
-/*
-Mmm... adjust neg tex deltas... will sometimes cause slight
-texture distortions 
-
- longest>>=16;
- if(longest)
- {
- if(longest<0) longest=-longest;
- if(delta_right_u<0)
- delta_right_u-=delta_right_u/longest;
- if(delta_right_v<0)
- delta_right_v-=delta_right_v/longest;
- }
-*/
-
- return TRUE;
-}
-
-__inline int RightSection_GT(void)
-{
- soft_vertex * v1 = right_array[ right_section ];
- soft_vertex * v2 = right_array[ right_section-1 ];
-
- int height = v2->y - v1->y;
- if(height == 0) return 0;
- delta_right_x = (v2->x - v1->x) / height;
- right_x = v1->x;
-
- right_section_height = height;
- return height;
-}
-
-__inline int LeftSection_GT(void)
-{
- soft_vertex * v1 = left_array[ left_section ];
- soft_vertex * v2 = left_array[ left_section-1 ];
-
- int height = v2->y - v1->y;
- if(height == 0) return 0;
- delta_left_x = (v2->x - v1->x) / height;
- left_x = v1->x;
-
- delta_left_u = ((v2->u - v1->u)) / height;
- left_u = v1->u;
- delta_left_v = ((v2->v - v1->v)) / height;
- left_v = v1->v;
-
- delta_left_R = ((v2->R - v1->R)) / height;
- left_R = v1->R;
- delta_left_G = ((v2->G - v1->G)) / height;
- left_G = v1->G;
- delta_left_B = ((v2->B - v1->B)) / height;
- left_B = v1->B;
-
- left_section_height = height;
- return height; 
-}
-
-__inline BOOL NextRow_GT(void)
-{
- if(--left_section_height<=0) 
- {
- if(--left_section <= 0) {return TRUE;}
- if(LeftSection_GT() <= 0) {return TRUE;}
- }
- else
- {
- left_x += delta_left_x;
- left_u += delta_left_u;
- left_v += delta_left_v;
- left_R += delta_left_R;
- left_G += delta_left_G;
- left_B += delta_left_B;
- }
-
- if(--right_section_height<=0) 
- {
- if(--right_section<=0) {return TRUE;}
- if(RightSection_GT() <=0) {return TRUE;}
- }
- else
- {
- right_x += delta_right_x;
- }
- return FALSE;
-}
-
-__inline BOOL SetupSections_GT(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, int rgb1, int rgb2, int rgb3)
-{
- soft_vertex * v1, * v2, * v3;
- int height,longest,temp;
-
- v1 = vtx; v1->x=x1<<16;v1->y=y1;
- v1->u=tx1<<16;v1->v=ty1<<16;
- v1->R=(rgb1) & 0x00ff0000;
- v1->G=(rgb1<<8) & 0x00ff0000;
- v1->B=(rgb1<<16) & 0x00ff0000;
-
- v2 = vtx+1; v2->x=x2<<16;v2->y=y2;
- v2->u=tx2<<16;v2->v=ty2<<16;
- v2->R=(rgb2) & 0x00ff0000;
- v2->G=(rgb2<<8) & 0x00ff0000;
- v2->B=(rgb2<<16) & 0x00ff0000;
- 
- v3 = vtx+2; v3->x=x3<<16;v3->y=y3;
- v3->u=tx3<<16;v3->v=ty3<<16;
- v3->R=(rgb3) & 0x00ff0000;
- v3->G=(rgb3<<8) & 0x00ff0000;
- v3->B=(rgb3<<16) & 0x00ff0000;
-
- if(v1->y > v2->y) { soft_vertex * v = v1; v1 = v2; v2 = v; }
- if(v1->y > v3->y) { soft_vertex * v = v1; v1 = v3; v3 = v; }
- if(v2->y > v3->y) { soft_vertex * v = v2; v2 = v3; v3 = v; }
-
- height = v3->y - v1->y;
- if(height == 0) {return FALSE;}
-
- temp=(((v2->y - v1->y) << 16) / height);
- longest = temp * ((v3->x - v1->x)>>16) + (v1->x - v2->x);
-
- if(longest == 0) {return FALSE;}
-
- if(longest < 0)
- {
- right_array[0] = v3;
- right_array[1] = v2;
- right_array[2] = v1;
- right_section = 2;
- left_array[0] = v3;
- left_array[1] = v1;
- left_section = 1;
-
- if(LeftSection_GT() <= 0) return FALSE;
- if(RightSection_GT() <= 0)
- {
- right_section--;
- if(RightSection_GT() <= 0) return FALSE;
- }
-
- if(longest > -0x1000) longest = -0x1000; 
- }
- else
- {
- left_array[0] = v3;
- left_array[1] = v2;
- left_array[2] = v1;
- left_section = 2;
- right_array[0] = v3;
- right_array[1] = v1;
- right_section = 1;
-
- if(RightSection_GT() <= 0) return FALSE;
- if(LeftSection_GT() <= 0)
- { 
- left_section--;
- if(LeftSection_GT() <= 0) return FALSE;
- }
- if(longest < 0x1000) longest = 0x1000; 
- }
-
- Ymin=v1->y;
- Ymax=min(v3->y-1,drawH);
-
- delta_right_R=shl10idiv(temp*((v3->R - v1->R)>>10)+((v1->R - v2->R)<<6),longest);
- delta_right_G=shl10idiv(temp*((v3->G - v1->G)>>10)+((v1->G - v2->G)<<6),longest);
- delta_right_B=shl10idiv(temp*((v3->B - v1->B)>>10)+((v1->B - v2->B)<<6),longest);
-
- delta_right_u=shl10idiv(temp*((v3->u - v1->u)>>10)+((v1->u - v2->u)<<6),longest);
- delta_right_v=shl10idiv(temp*((v3->v - v1->v)>>10)+((v1->v - v2->v)<<6),longest);
-
-
-/*
-Mmm... adjust neg tex deltas... will sometimes cause slight
-texture distortions 
- longest>>=16;
- if(longest)
- {
- if(longest<0) longest=-longest;
- if(delta_right_u<0)
- delta_right_u-=delta_right_u/longest;
- if(delta_right_v<0)
- delta_right_v-=delta_right_v/longest;
- }
-*/
-
-
- return TRUE;
-}
-
-__inline int RightSection_F4(void)
-{
- soft_vertex * v1 = right_array[ right_section ];
- soft_vertex * v2 = right_array[ right_section-1 ];
-
- int height = v2->y - v1->y;
- right_section_height = height;
- right_x = v1->x;
- if(height == 0) 
- {
- return 0;
- }
- delta_right_x = (v2->x - v1->x) / height;
-
- return height;
-}
-
-__inline int LeftSection_F4(void)
-{
- soft_vertex * v1 = left_array[ left_section ];
- soft_vertex * v2 = left_array[ left_section-1 ];
-
- int height = v2->y - v1->y;
- left_section_height = height;
- left_x = v1->x;
- if(height == 0) 
- {
- return 0;
- }
- delta_left_x = (v2->x - v1->x) / height;
-
- return height; 
-}
-
-__inline BOOL NextRow_F4(void)
-{
- if(--left_section_height<=0) 
- {
- if(--left_section > 0) 
- while(LeftSection_F4()<=0) 
- {
- if(--left_section <= 0) break;
- }
- }
- else
- {
- left_x += delta_left_x;
- }
-
- if(--right_section_height<=0) 
- {
- if(--right_section > 0) 
- while(RightSection_F4()<=0) 
- {
- if(--right_section<=0) break;
- }
- }
- else
- {
- right_x += delta_right_x;
- }
- return FALSE;
-}
-
-__inline BOOL SetupSections_F4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4)
-{
- soft_vertex * v1, * v2, * v3, * v4;
- int height,width,longest1,longest2;
-
- v1 = vtx; v1->x=x1<<16;v1->y=y1;
- v2 = vtx+1; v2->x=x2<<16;v2->y=y2;
- v3 = vtx+2; v3->x=x3<<16;v3->y=y3;
- v4 = vtx+3; v4->x=x4<<16;v4->y=y4;
-
- if(v1->y > v2->y) { soft_vertex * v = v1; v1 = v2; v2 = v; }
- if(v1->y > v3->y) { soft_vertex * v = v1; v1 = v3; v3 = v; }
- if(v1->y > v4->y) { soft_vertex * v = v1; v1 = v4; v4 = v; }
- if(v2->y > v3->y) { soft_vertex * v = v2; v2 = v3; v3 = v; }
- if(v2->y > v4->y) { soft_vertex * v = v2; v2 = v4; v4 = v; }
- if(v3->y > v4->y) { soft_vertex * v = v3; v3 = v4; v4 = v; }
-
- height = v4->y - v1->y; if(height == 0) height =1;
- width = (v4->x - v1->x)>>16;
- longest1 = (((v2->y - v1->y) << 16) / height) * width + (v1->x - v2->x);
- longest2 = (((v3->y - v1->y) << 16) / height) * width + (v1->x - v3->x);
-
- if(longest1 < 0) // 2 is right
- {
- if(longest2 < 0) // 3 is right
- {
- left_array[0] = v4;
- left_array[1] = v1;
- left_section = 1;
-
- height = v3->y - v1->y; if(height == 0) height=1;
- longest1 = (((v2->y - v1->y) << 16) / height) * ((v3->x - v1->x)>>16) + (v1->x - v2->x);
- if(longest1 >= 0)
- {
- right_array[0] = v4; // 1
- right_array[1] = v3; // 3
- right_array[2] = v1; // 4
- right_section = 2; 
- }
- else
- {
- height = v4->y - v2->y; if(height == 0) height=1;
- longest1 = (((v3->y - v2->y) << 16) / height) * ((v4->x - v2->x)>>16) + (v2->x - v3->x);
- if(longest1 >= 0)
- {
- right_array[0] = v4; // 1
- right_array[1] = v2; // 2
- right_array[2] = v1; // 4
- right_section = 2; 
- }
- else
- {
- right_array[0] = v4; // 1
- right_array[1] = v3; // 2
- right_array[2] = v2; // 3
- right_array[3] = v1; // 4
- right_section = 3; 
- }
- }
- }
- else 
- {
- left_array[0] = v4;
- left_array[1] = v3; // 1
- left_array[2] = v1; // 2
- left_section = 2; // 3
- right_array[0] = v4; // 4
- right_array[1] = v2;
- right_array[2] = v1;
- right_section = 2;
- }
- }
- else
- {
- if(longest2 < 0) 
- {
- left_array[0] = v4; // 1
- left_array[1] = v2; // 2
- left_array[2] = v1; // 3
- left_section = 2; // 4
- right_array[0] = v4;
- right_array[1] = v3;
- right_array[2] = v1;
- right_section = 2;
- }
- else 
- {
- right_array[0] = v4;
- right_array[1] = v1;
- right_section = 1;
-
- height = v3->y - v1->y; if(height == 0) height=1;
- longest1 = (((v2->y - v1->y) << 16) / height) * ((v3->x - v1->x)>>16) + (v1->x - v2->x);
- if(longest1<0)
- {
- left_array[0] = v4; // 1
- left_array[1] = v3; // 3
- left_array[2] = v1; // 4
- left_section = 2; 
- }
- else
- {
- height = v4->y - v2->y; if(height == 0) height=1;
- longest1 = (((v3->y - v2->y) << 16) / height) * ((v4->x - v2->x)>>16) + (v2->x - v3->x);
- if(longest1<0)
- {
- left_array[0] = v4; // 1
- left_array[1] = v2; // 2
- left_array[2] = v1; // 4
- left_section = 2; 
- }
- else
- {
- left_array[0] = v4; // 1
- left_array[1] = v3; // 2
- left_array[2] = v2; // 3
- left_array[3] = v1; // 4
- left_section = 3; 
- }
- }
- }
- }
-
- while(LeftSection_F4()<=0) 
- {
- if(--left_section <= 0) break;
- }
-
- while(RightSection_F4()<=0) 
- {
- if(--right_section <= 0) break;
- }
-
- Ymin=v1->y;
- Ymax=min(v4->y-1,drawH);
-
- return TRUE;
-}
-
-__inline int RightSection_FT4(void)
-{
- soft_vertex * v1 = right_array[ right_section ];
- soft_vertex * v2 = right_array[ right_section-1 ];
-
- int height = v2->y - v1->y;
- right_section_height = height;
- right_x = v1->x;
- right_u = v1->u;
- right_v = v1->v;
- if(height == 0) 
- {
- return 0;
- }
- delta_right_x = (v2->x - v1->x) / height;
- delta_right_u = (v2->u - v1->u) / height;
- delta_right_v = (v2->v - v1->v) / height;
-
- return height;
-}
-
-__inline int LeftSection_FT4(void)
-{
- soft_vertex * v1 = left_array[ left_section ];
- soft_vertex * v2 = left_array[ left_section-1 ];
-
- int height = v2->y - v1->y;
- left_section_height = height;
- left_x = v1->x;
- left_u = v1->u;
- left_v = v1->v;
- if(height == 0) 
- {
- return 0;
- }
- delta_left_x = (v2->x - v1->x) / height;
- delta_left_u = (v2->u - v1->u) / height;
- delta_left_v = (v2->v - v1->v) / height;
-
- return height; 
-}
-
-__inline BOOL NextRow_FT4(void)
-{
- if(--left_section_height<=0) 
- {
- if(--left_section > 0) 
- while(LeftSection_FT4()<=0) 
- {
- if(--left_section <= 0) break;
- }
- }
- else
- {
- left_x += delta_left_x;
- left_u += delta_left_u;
- left_v += delta_left_v;
- }
-
- if(--right_section_height<=0) 
- {
- if(--right_section > 0) 
- while(RightSection_FT4()<=0) 
- {
- if(--right_section<=0) break;
- }
- }
- else
- {
- right_x += delta_right_x;
- right_u += delta_right_u;
- right_v += delta_right_v;
- }
- return FALSE;
-}
-
-__inline BOOL SetupSections_FT4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4)
-{
- soft_vertex * v1, * v2, * v3, * v4;
- int height,width,longest1,longest2;
-
- v1 = vtx; v1->x=x1<<16;v1->y=y1;
- v1->u=tx1<<16;v1->v=ty1<<16;
-
- v2 = vtx+1; v2->x=x2<<16;v2->y=y2;
- v2->u=tx2<<16;v2->v=ty2<<16;
- 
- v3 = vtx+2; v3->x=x3<<16;v3->y=y3;
- v3->u=tx3<<16;v3->v=ty3<<16;
-
- v4 = vtx+3; v4->x=x4<<16;v4->y=y4;
- v4->u=tx4<<16;v4->v=ty4<<16;
-
- if(v1->y > v2->y) { soft_vertex * v = v1; v1 = v2; v2 = v; }
- if(v1->y > v3->y) { soft_vertex * v = v1; v1 = v3; v3 = v; }
- if(v1->y > v4->y) { soft_vertex * v = v1; v1 = v4; v4 = v; }
- if(v2->y > v3->y) { soft_vertex * v = v2; v2 = v3; v3 = v; }
- if(v2->y > v4->y) { soft_vertex * v = v2; v2 = v4; v4 = v; }
- if(v3->y > v4->y) { soft_vertex * v = v3; v3 = v4; v4 = v; }
-
- height = v4->y - v1->y; if(height == 0) height =1;
- width = (v4->x - v1->x)>>16;
- longest1 = (((v2->y - v1->y) << 16) / height) * width + (v1->x - v2->x);
- longest2 = (((v3->y - v1->y) << 16) / height) * width + (v1->x - v3->x);
-
- if(longest1 < 0) // 2 is right
- {
- if(longest2 < 0) // 3 is right
- {
- left_array[0] = v4;
- left_array[1] = v1;
- left_section = 1;
-
- height = v3->y - v1->y; if(height == 0) height=1;
- longest1 = (((v2->y - v1->y) << 16) / height) * ((v3->x - v1->x)>>16) + (v1->x - v2->x);
- if(longest1 >= 0)
- {
- right_array[0] = v4; // 1
- right_array[1] = v3; // 3
- right_array[2] = v1; // 4
- right_section = 2; 
- }
- else
- {
- height = v4->y - v2->y; if(height == 0) height=1;
- longest1 = (((v3->y - v2->y) << 16) / height) * ((v4->x - v2->x)>>16) + (v2->x - v3->x);
- if(longest1 >= 0)
- {
- right_array[0] = v4; // 1
- right_array[1] = v2; // 2
- right_array[2] = v1; // 4
- right_section = 2; 
- }
- else
- {
- right_array[0] = v4; // 1
- right_array[1] = v3; // 2
- right_array[2] = v2; // 3
- right_array[3] = v1; // 4
- right_section = 3; 
- }
- }
- }
- else 
- {
- left_array[0] = v4;
- left_array[1] = v3; // 1
- left_array[2] = v1; // 2
- left_section = 2; // 3
- right_array[0] = v4; // 4
- right_array[1] = v2;
- right_array[2] = v1;
- right_section = 2;
- }
- }
- else
- {
- if(longest2 < 0) 
- {
- left_array[0] = v4; // 1
- left_array[1] = v2; // 2
- left_array[2] = v1; // 3
- left_section = 2; // 4
- right_array[0] = v4;
- right_array[1] = v3;
- right_array[2] = v1;
- right_section = 2;
- }
- else 
- {
- right_array[0] = v4;
- right_array[1] = v1;
- right_section = 1;
-
- height = v3->y - v1->y; if(height == 0) height=1;
- longest1 = (((v2->y - v1->y) << 16) / height) * ((v3->x - v1->x)>>16) + (v1->x - v2->x);
- if(longest1<0)
- {
- left_array[0] = v4; // 1
- left_array[1] = v3; // 3
- left_array[2] = v1; // 4
- left_section = 2; 
- }
- else
- {
- height = v4->y - v2->y; if(height == 0) height=1;
- longest1 = (((v3->y - v2->y) << 16) / height) * ((v4->x - v2->x)>>16) + (v2->x - v3->x);
- if(longest1<0)
- {
- left_array[0] = v4; // 1
- left_array[1] = v2; // 2
- left_array[2] = v1; // 4
- left_section = 2; 
- }
- else
- {
- left_array[0] = v4; // 1
- left_array[1] = v3; // 2
- left_array[2] = v2; // 3
- left_array[3] = v1; // 4
- left_section = 3; 
- }
- }
- }
- }
-
- while(LeftSection_FT4()<=0) 
- {
- if(--left_section <= 0) break;
- }
-
- while(RightSection_FT4()<=0) 
- {
- if(--right_section <= 0) break;
- }
-
- Ymin=v1->y;
- Ymax=min(v4->y-1,drawH);
-
- return TRUE;
-}
-
-__inline int RightSection_GT4(void)
-{
- soft_vertex * v1 = right_array[ right_section ];
- soft_vertex * v2 = right_array[ right_section-1 ];
-
- int height = v2->y - v1->y;
- right_section_height = height;
- right_x = v1->x;
- right_u = v1->u;
- right_v = v1->v;
- right_R = v1->R;
- right_G = v1->G;
- right_B = v1->B;
-
- if(height == 0) 
- {
- return 0;
- }
- delta_right_x = (v2->x - v1->x) / height;
- delta_right_u = (v2->u - v1->u) / height;
- delta_right_v = (v2->v - v1->v) / height;
- delta_right_R = (v2->R - v1->R) / height;
- delta_right_G = (v2->G - v1->G) / height;
- delta_right_B = (v2->B - v1->B) / height;
-
- return height;
-}
-
-__inline int LeftSection_GT4(void)
-{
- soft_vertex * v1 = left_array[ left_section ];
- soft_vertex * v2 = left_array[ left_section-1 ];
-
- int height = v2->y - v1->y;
- left_section_height = height;
- left_x = v1->x;
- left_u = v1->u;
- left_v = v1->v;
- left_R = v1->R;
- left_G = v1->G;
- left_B = v1->B;
-
- if(height == 0) 
- {
- return 0;
- }
- delta_left_x = (v2->x - v1->x) / height;
- delta_left_u = (v2->u - v1->u) / height;
- delta_left_v = (v2->v - v1->v) / height;
- delta_left_R = (v2->R - v1->R) / height;
- delta_left_G = (v2->G - v1->G) / height;
- delta_left_B = (v2->B - v1->B) / height;
-
- return height; 
-}
-
-__inline BOOL NextRow_GT4(void)
-{
- if(--left_section_height<=0) 
- {
- if(--left_section > 0) 
- while(LeftSection_GT4()<=0) 
- {
- if(--left_section <= 0) break;
- }
- }
- else
- {
- left_x += delta_left_x;
- left_u += delta_left_u;
- left_v += delta_left_v;
- left_R += delta_left_R;
- left_G += delta_left_G;
- left_B += delta_left_B;
- }
-
- if(--right_section_height<=0) 
- {
- if(--right_section > 0) 
- while(RightSection_GT4()<=0) 
- {
- if(--right_section<=0) break;
- }
- }
- else
- {
- right_x += delta_right_x;
- right_u += delta_right_u;
- right_v += delta_right_v;
- right_R += delta_right_R;
- right_G += delta_right_G;
- right_B += delta_right_B;
- }
- return FALSE;
-}
-
-__inline BOOL SetupSections_GT4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, int rgb1, int rgb2, int rgb3, int rgb4)
-{
- soft_vertex * v1, * v2, * v3, * v4;
- int height,width,longest1,longest2;
-
- v1 = vtx; v1->x=x1<<16;v1->y=y1;
- v1->u=tx1<<16;v1->v=ty1<<16;
- v1->R=(rgb1) & 0x00ff0000;
- v1->G=(rgb1<<8) & 0x00ff0000;
- v1->B=(rgb1<<16) & 0x00ff0000;
-
- v2 = vtx+1; v2->x=x2<<16;v2->y=y2;
- v2->u=tx2<<16;v2->v=ty2<<16;
- v2->R=(rgb2) & 0x00ff0000;
- v2->G=(rgb2<<8) & 0x00ff0000;
- v2->B=(rgb2<<16) & 0x00ff0000;
- 
- v3 = vtx+2; v3->x=x3<<16;v3->y=y3;
- v3->u=tx3<<16;v3->v=ty3<<16;
- v3->R=(rgb3) & 0x00ff0000;
- v3->G=(rgb3<<8) & 0x00ff0000;
- v3->B=(rgb3<<16) & 0x00ff0000;
-
- v4 = vtx+3; v4->x=x4<<16;v4->y=y4;
- v4->u=tx4<<16;v4->v=ty4<<16;
- v4->R=(rgb4) & 0x00ff0000;
- v4->G=(rgb4<<8) & 0x00ff0000;
- v4->B=(rgb4<<16) & 0x00ff0000;
-
- if(v1->y > v2->y) { soft_vertex * v = v1; v1 = v2; v2 = v; }
- if(v1->y > v3->y) { soft_vertex * v = v1; v1 = v3; v3 = v; }
- if(v1->y > v4->y) { soft_vertex * v = v1; v1 = v4; v4 = v; }
- if(v2->y > v3->y) { soft_vertex * v = v2; v2 = v3; v3 = v; }
- if(v2->y > v4->y) { soft_vertex * v = v2; v2 = v4; v4 = v; }
- if(v3->y > v4->y) { soft_vertex * v = v3; v3 = v4; v4 = v; }
-
- height = v4->y - v1->y; if(height == 0) height =1;
- width = (v4->x - v1->x)>>16;
- longest1 = (((v2->y - v1->y) << 16) / height) * width + (v1->x - v2->x);
- longest2 = (((v3->y - v1->y) << 16) / height) * width + (v1->x - v3->x);
-
- if(longest1 < 0) // 2 is right
- {
- if(longest2 < 0) // 3 is right
- {
- left_array[0] = v4;
- left_array[1] = v1;
- left_section = 1;
-
- height = v3->y - v1->y; if(height == 0) height=1;
- longest1 = (((v2->y - v1->y) << 16) / height) * ((v3->x - v1->x)>>16) + (v1->x - v2->x);
- if(longest1 >= 0)
- {
- right_array[0] = v4; // 1
- right_array[1] = v3; // 3
- right_array[2] = v1; // 4
- right_section = 2; 
- }
- else
- {
- height = v4->y - v2->y; if(height == 0) height=1;
- longest1 = (((v3->y - v2->y) << 16) / height) * ((v4->x - v2->x)>>16) + (v2->x - v3->x);
- if(longest1 >= 0)
- {
- right_array[0] = v4; // 1
- right_array[1] = v2; // 2
- right_array[2] = v1; // 4
- right_section = 2; 
- }
- else
- {
- right_array[0] = v4; // 1
- right_array[1] = v3; // 2
- right_array[2] = v2; // 3
- right_array[3] = v1; // 4
- right_section = 3; 
- }
- }
- }
- else 
- {
- left_array[0] = v4;
- left_array[1] = v3; // 1
- left_array[2] = v1; // 2
- left_section = 2; // 3
- right_array[0] = v4; // 4
- right_array[1] = v2;
- right_array[2] = v1;
- right_section = 2;
- }
- }
- else
- {
- if(longest2 < 0) 
- {
- left_array[0] = v4; // 1
- left_array[1] = v2; // 2
- left_array[2] = v1; // 3
- left_section = 2; // 4
- right_array[0] = v4;
- right_array[1] = v3;
- right_array[2] = v1;
- right_section = 2;
- }
- else 
- {
- right_array[0] = v4;
- right_array[1] = v1;
- right_section = 1;
-
- height = v3->y - v1->y; if(height == 0) height=1;
- longest1 = (((v2->y - v1->y) << 16) / height) * ((v3->x - v1->x)>>16) + (v1->x - v2->x);
- if(longest1<0)
- {
- left_array[0] = v4; // 1
- left_array[1] = v3; // 3
- left_array[2] = v1; // 4
- left_section = 2; 
- }
- else
- {
- height = v4->y - v2->y; if(height == 0) height=1;
- longest1 = (((v3->y - v2->y) << 16) / height) * ((v4->x - v2->x)>>16) + (v2->x - v3->x);
- if(longest1<0)
- {
- left_array[0] = v4; // 1
- left_array[1] = v2; // 2
- left_array[2] = v1; // 4
- left_section = 2; 
- }
- else
- {
- left_array[0] = v4; // 1
- left_array[1] = v3; // 2
- left_array[2] = v2; // 3
- left_array[3] = v1; // 4
- left_section = 3; 
- }
- }
- }
- }
-
- while(LeftSection_GT4()<=0) 
- {
- if(--left_section <= 0) break;
- }
-
- while(RightSection_GT4()<=0) 
- {
- if(--right_section <= 0) break;
- }
-
- Ymin=v1->y;
- Ymax=min(v4->y-1,drawH);
-
- return TRUE;
-}
-
-////////////////////////////////////////////////////////////////////////
-// POLY FUNCS
-////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////////
-// POLY 3/4 FLAT SHADED
-////////////////////////////////////////////////////////////////////////
-
-__inline void drawPoly3Fi(short x1, short y1, short x2, short y2, short x3, short y3, int rgb)
-{
- int i,j,xmin,xmax,ymin,ymax;
- unsigned short color;
- uint32_t lcolor;
-
- if(x1>drawW && x2>drawW && x3>drawW) return;
- if(y1>drawH && y2>drawH && y3>drawH) return;
- if(x1<drawX && x2<drawX && x3<drawX) return;
- if(y1<drawY && y2<drawY && y3<drawY) return;
- if(drawY>=drawH) return;
- if(drawX>=drawW) return; 
-
- if(!SetupSections_F(x1,y1,x2,y2,x3,y3)) return;
-
- ymax=Ymax;
-
- color = ((rgb & 0x00f80000)>>9) | ((rgb & 0x0000f800)>>6) | ((rgb & 0x000000f8)>>3);
- lcolor=lSetMask|(((uint32_t)(color))<<16)|color;
-
- for(ymin=Ymin;ymin<drawY;ymin++)
- if(NextRow_F()) return;
-
-#ifdef FASTSOLID
-
- if(!bCheckMask && !DrawSemiTrans)
- {
- color |=sSetMask;
- for (i=ymin;i<=ymax;i++)
- {
- xmin=left_x >> 16; if(drawX>xmin) xmin=drawX;
- xmax=(right_x >> 16)-1; if(drawW<xmax) xmax=drawW;
-
- for(j=xmin;j<xmax;j+=2) 
- {
- *((uint32_t *)&psxVuw[(i<<10)+j])=lcolor;
- }
- if(j==xmax) psxVuw[(i<<10)+j]=color;
-
- if(NextRow_F()) return;
- }
- return;
- }
-
-#endif
-
- for (i=ymin;i<=ymax;i++)
- {
- xmin=left_x >> 16; if(drawX>xmin) xmin=drawX;
- xmax=(right_x >> 16)-1; if(drawW<xmax) xmax=drawW;
-
- for(j=xmin;j<xmax;j+=2) 
- {
- GetShadeTransCol32((uint32_t *)&psxVuw[(i<<10)+j], lcolor);
- }
- if(j == xmax)
- GetShadeTransCol(&psxVuw[(i << 10) + j],color);
-
- if(NextRow_F()) return;
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-
-void drawPoly3F(int rgb)
-{
- drawPoly3Fi(lx0,ly0,lx1,ly1,lx2,ly2,rgb);
-}
-
-#ifdef POLYQUAD3FS
-
-void drawPoly4F_TRI(int rgb)
-{
- drawPoly3Fi(lx1,ly1,lx3,ly3,lx2,ly2,rgb);
- drawPoly3Fi(lx0,ly0,lx1,ly1,lx2,ly2,rgb);
-}
-
-#endif
-
-// more exact:
-
-void drawPoly4F(int rgb)
-{
- int i,j,xmin,xmax,ymin,ymax;
- unsigned short color;unsigned int lcolor;
- 
- if(lx0>drawW && lx1>drawW && lx2>drawW && lx3>drawW) return;
- if(ly0>drawH && ly1>drawH && ly2>drawH && ly3>drawH) return;
- if(lx0<drawX && lx1<drawX && lx2<drawX && lx3<drawX) return;
- if(ly0<drawY && ly1<drawY && ly2<drawY && ly3<drawY) return;
- if(drawY>=drawH) return;
- if(drawX>=drawW) return; 
-
- if(!SetupSections_F4(lx0,ly0,lx1,ly1,lx2,ly2,lx3,ly3)) return;
-
- ymax=Ymax;
-
- for(ymin=Ymin;ymin<drawY;ymin++)
- if(NextRow_F4()) return;
-
- color = ((rgb & 0x00f80000)>>9) | ((rgb & 0x0000f800)>>6) | ((rgb & 0x000000f8)>>3);
- lcolor= lSetMask|(((uint32_t)(color))<<16)|color;
-
-#ifdef FASTSOLID
-
- if(!bCheckMask && !DrawSemiTrans)
- {
- color |=sSetMask;
- for (i=ymin;i<=ymax;i++)
- {
- xmin=left_x >> 16; if(drawX>xmin) xmin=drawX;
- xmax=(right_x >> 16)-1; if(drawW<xmax) xmax=drawW;
-
- for(j=xmin;j<xmax;j+=2) 
- {
- *((uint32_t *)&psxVuw[(i<<10)+j])=lcolor;
- }
- if(j==xmax) psxVuw[(i<<10)+j]=color;
-
- if(NextRow_F4()) return;
- }
- return;
- } 
-
-#endif
-
- for (i = ymin; i <= ymax; i++)
- {
- xmin = left_x >> 16; if(drawX > xmin) xmin = drawX;
- xmax = (right_x >> 16) - 1; if(drawW < xmax) xmax = drawW;
-
- for(j = xmin; j < xmax; j += 2) 
- {
- GetShadeTransCol32((uint32_t *)&psxVuw[(i<<10) + j],lcolor);
- }
- if(j == xmax) GetShadeTransCol(&psxVuw[(i<<10) + j],color);
-
- if(NextRow_F4()) return;
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-// POLY 3/4 F-SHADED TEX PAL 4
-////////////////////////////////////////////////////////////////////////
-
-void drawPoly3TEx4(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3,short clX, short clY)
-{
- int i,j,xmin,xmax,ymin,ymax;
- int difX, difY,difX2, difY2;
- int posX,posY,YAdjust,XAdjust;
- int clutP;
- short tC1,tC2;
- 
- if (x1 > drawW && x2 > drawW && x3 > drawW) return;
- if (y1 > drawH && y2 > drawH && y3 > drawH) return;
- if (x1 < drawX && x2 < drawX && x3 < drawX) return;
- if (y1 < drawY && y2 < drawY && y3 < drawY) return;
- if (drawY >= drawH) return;
- if (drawX >= drawW) return; 
-
- if (!SetupSections_FT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3)) return;
-
- ymax = Ymax;
-
- for (ymin = Ymin; ymin < drawY; ymin++)
- if (NextRow_FT()) return;
-
- clutP = (clY << 10) + clX;
-
- YAdjust = ((GlobalTextAddrY) << 11) + (GlobalTextAddrX << 1);
-
- difX = delta_right_u; difX2 = difX << 1;
- difY = delta_right_v; difY2 = difY << 1;
-
-#ifdef FASTSOLID
-
- if(!bCheckMask && !DrawSemiTrans)
- {
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!
- if(drawW<xmax) xmax=drawW;
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
-
- for(j=xmin;j<xmax;j+=2)
- {
- XAdjust=(posX>>16);
- tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(XAdjust>>1)];
- tC1=(tC1>>((XAdjust&1)<<2))&0xf;
- XAdjust=((posX+difX)>>16);
- tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+
- (XAdjust>>1)];
- tC2=(tC2>>((XAdjust&1)<<2))&0xf;
-
- GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
- psxVuw[clutP+tC1]|
- ((int)psxVuw[clutP+tC2])<<16);
-
- posX+=difX2;
- posY+=difY2;
- }
- if(j==xmax)
- {
- XAdjust=(posX>>16);
- tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+
- (XAdjust>>1)];
- tC1=(tC1>>((XAdjust&1)<<2))&0xf;
- GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
- }
- }
- if(NextRow_FT()) 
- {
- return;
- }
- }
- return;
- }
-
-#endif
-
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!!
- if(drawW<xmax) xmax=drawW;
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
-
- for(j=xmin;j<xmax;j+=2)
- {
- XAdjust=(posX>>16);
- tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(XAdjust>>1)];
- tC1=(tC1>>((XAdjust&1)<<2))&0xf;
- XAdjust=((posX+difX)>>16);
- tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+
- (XAdjust>>1)];
- tC2=(tC2>>((XAdjust&1)<<2))&0xf;
-
- GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
- psxVuw[clutP+tC1]|
- ((int)psxVuw[clutP+tC2])<<16);
-
- posX+=difX2;
- posY+=difY2;
- }
- if(j==xmax)
- {
- XAdjust=(posX>>16);
- tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+
- (XAdjust>>1)];
- tC1=(tC1>>((XAdjust&1)<<2))&0xf;
- GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
- }
- }
- if(NextRow_FT()) 
- {
- return;
- }
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-
-void drawPoly3TEx4_IL(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3,short clX, short clY)
-{
- int i,j,xmin,xmax,ymin,ymax,n_xi,n_yi,TXV;
- int difX, difY,difX2, difY2;
- int posX,posY,YAdjust,XAdjust;
- int clutP;
- short tC1,tC2;
- 
- if(x1>drawW && x2>drawW && x3>drawW) return;
- if(y1>drawH && y2>drawH && y3>drawH) return;
- if(x1<drawX && x2<drawX && x3<drawX) return;
- if(y1<drawY && y2<drawY && y3<drawY) return;
- if(drawY>=drawH) return;
- if(drawX>=drawW) return; 
-
- if(!SetupSections_FT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3)) return;
-
- ymax=Ymax;
-
- for(ymin=Ymin;ymin<drawY;ymin++)
- if(NextRow_FT()) return;
-
- clutP=(clY<<10)+clX;
-
- YAdjust=(GlobalTextAddrY<<10)+GlobalTextAddrX;
-
- difX=delta_right_u;difX2=difX<<1;
- difY=delta_right_v;difY2=difY<<1;
-
-#ifdef FASTSOLID
-
- if(!bCheckMask && !DrawSemiTrans)
- {
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16)-1;
- if(drawW<xmax) xmax=drawW;
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
-
- for(j=xmin;j<xmax;j+=2)
- {
- XAdjust=(posX>>16);
-
- TXV=posY>>16;
- n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
- n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
-
- tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
-
- XAdjust=((posX+difX)>>16);
-
- TXV=(posY+difY)>>16;
- n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
- n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
-
- tC2= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
-
- GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
- psxVuw[clutP+tC1]|
- ((int)psxVuw[clutP+tC2])<<16);
-
- posX+=difX2;
- posY+=difY2;
- }
- if(j==xmax)
- {
- XAdjust=(posX>>16);
-
- TXV=posY>>16;
- n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
- n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
-
- tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
-
- GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
- }
- }
- if(NextRow_FT()) 
- {
- return;
- }
- }
- return;
- }
-
-#endif
-
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!!
- if(drawW<xmax) xmax=drawW;
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
-
- for(j=xmin;j<xmax;j+=2)
- {
- XAdjust=(posX>>16);
-
- TXV=posY>>16;
- n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
- n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
-
- tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
-
- XAdjust=((posX+difX)>>16);
-
- TXV=(posY+difY)>>16;
- n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
- n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
-
- tC2= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
-
- GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
- psxVuw[clutP+tC1]|
- ((int)psxVuw[clutP+tC2])<<16);
-
- posX+=difX2;
- posY+=difY2;
- }
- if(j==xmax)
- {
- XAdjust=(posX>>16);
-
- TXV=posY>>16;
- n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
- n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
-
- tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
-
- GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
- }
- }
- if(NextRow_FT()) 
- {
- return;
- }
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-
-void drawPoly3TEx4_TW(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3,short clX, short clY)
-{
- int i,j,xmin,xmax,ymin,ymax;
- int difX, difY,difX2, difY2;
- int posX,posY,YAdjust,XAdjust;
- int clutP;
- short tC1,tC2;
- 
- if(x1>drawW && x2>drawW && x3>drawW) return;
- if(y1>drawH && y2>drawH && y3>drawH) return;
- if(x1<drawX && x2<drawX && x3<drawX) return;
- if(y1<drawY && y2<drawY && y3<drawY) return;
- if(drawY>=drawH) return;
- if(drawX>=drawW) return; 
-
- if(!SetupSections_FT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3)) return;
-
- ymax=Ymax;
-
- for(ymin=Ymin;ymin<drawY;ymin++)
- if(NextRow_FT()) return;
-
- clutP=(clY<<10)+clX;
-
- YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);
- YAdjust+=(TWin.Position.y0<<11)+(TWin.Position.x0>>1);
-
- difX=delta_right_u;difX2=difX<<1;
- difY=delta_right_v;difY2=difY<<1;
-
-#ifdef FASTSOLID
-
- if(!bCheckMask && !DrawSemiTrans)
- {
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16);//-1; //!!!!!!!!!!!!!!!!
- if(xmax>xmin) xmax--;
-
- if(drawW<xmax) xmax=drawW;
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
-
- for(j=xmin;j<xmax;j+=2)
- {
- XAdjust=(posX>>16)%TWin.Position.x1;
- tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
- YAdjust+(XAdjust>>1)];
- tC1=(tC1>>((XAdjust&1)<<2))&0xf;
- XAdjust=((posX+difX)>>16)%TWin.Position.x1;
- tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
- YAdjust+(XAdjust>>1)];
- tC2=(tC2>>((XAdjust&1)<<2))&0xf;
-
- GetTextureTransColG32_S((uint32_t *)&psxVuw[(i << 10) + j],
- psxVuw[clutP+tC1]|
- ((int)psxVuw[clutP+tC2])<<16);
-
- posX+=difX2;
- posY+=difY2;
- }
- if(j==xmax)
- {
- XAdjust=(posX>>16)%TWin.Position.x1;
- tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
- YAdjust+(XAdjust>>1)];
- tC1=(tC1>>((XAdjust&1)<<2))&0xf;
- GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
- }
- }
- if(NextRow_FT()) 
- {
- return;
- }
- }
- return;
- }
-
-#endif
-
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!!
- if(drawW<xmax) xmax=drawW;
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
-
- for(j=xmin;j<xmax;j+=2)
- {
- XAdjust=(posX>>16)%TWin.Position.x1;
- tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
- YAdjust+(XAdjust>>1)];
- tC1=(tC1>>((XAdjust&1)<<2))&0xf;
- XAdjust=((posX+difX)>>16)%TWin.Position.x1;
- tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
- YAdjust+(XAdjust>>1)];
- tC2=(tC2>>((XAdjust&1)<<2))&0xf;
-
- GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
- psxVuw[clutP+tC1]|
- ((int)psxVuw[clutP+tC2])<<16);
-
- posX+=difX2;
- posY+=difY2;
- }
- if(j==xmax)
- {
- XAdjust=(posX>>16)%TWin.Position.x1;
- tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
- YAdjust+(XAdjust>>1)];
- tC1=(tC1>>((XAdjust&1)<<2))&0xf;
- GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
- }
- }
- if(NextRow_FT()) 
- {
- return;
- }
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-
-#ifdef POLYQUAD3
-
-void drawPoly4TEx4_TRI(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
-{
- drawPoly3TEx4(x2,y2,x3,y3,x4,y4,
- tx2,ty2,tx3,ty3,tx4,ty4,
- clX,clY);
- drawPoly3TEx4(x1,y1,x2,y2,x4,y4,
- tx1,ty1,tx2,ty2,tx4,ty4,
- clX,clY);
-}
-
-#endif
-
-// more exact:
-
-void drawPoly4TEx4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
-{
- int num; 
- int i,j,xmin,xmax,ymin,ymax;
- int difX, difY, difX2, difY2;
- int posX,posY,YAdjust,clutP,XAdjust;
- short tC1,tC2;
-
- if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;
- if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;
- if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;
- if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;
- if(drawY>=drawH) return;
- if(drawX>=drawW) return; 
-
- if(!SetupSections_FT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4)) return;
-
- ymax=Ymax;
-
- for(ymin=Ymin;ymin<drawY;ymin++)
- if(NextRow_FT4()) return;
-
- clutP=(clY<<10)+clX;
-
- YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);
-
-#ifdef FASTSOLID
-
- if(!bCheckMask && !DrawSemiTrans)
- {
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16);
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
-
- num=(xmax-xmin);
- if(num==0) num=1;
- difX=(right_u-posX)/num;
- difY=(right_v-posY)/num;
- difX2=difX<<1;
- difY2=difY<<1;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
- xmax--;if(drawW<xmax) xmax=drawW;
-
- for(j=xmin;j<xmax;j+=2)
- {
- XAdjust=(posX>>16);
- tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(XAdjust>>1)];
- tC1=(tC1>>((XAdjust&1)<<2))&0xf;
- XAdjust=((posX+difX)>>16);
- tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+
- (XAdjust>>1)];
- tC2=(tC2>>((XAdjust&1)<<2))&0xf;
-
- GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
- psxVuw[clutP+tC1]|
- ((int)psxVuw[clutP+tC2])<<16);
- posX+=difX2;
- posY+=difY2;
- }
- if(j==xmax)
- {
- XAdjust=(posX>>16);
- tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+
- (XAdjust>>1)];
- tC1=(tC1>>((XAdjust&1)<<2))&0xf;
- GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
- }
-
- }
- if(NextRow_FT4()) return;
- }
- return;
- }
-
-#endif
-
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16);
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
-
- num=(xmax-xmin);
- if(num==0) num=1;
- difX=(right_u-posX)/num;
- difY=(right_v-posY)/num;
- difX2=difX<<1;
- difY2=difY<<1;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
- xmax--;if(drawW<xmax) xmax=drawW;
-
- for(j=xmin;j<xmax;j+=2)
- {
- XAdjust=(posX>>16);
- tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(XAdjust>>1)];
- tC1=(tC1>>((XAdjust&1)<<2))&0xf;
- XAdjust=((posX+difX)>>16);
- tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+
- (XAdjust>>1)];
- tC2=(tC2>>((XAdjust&1)<<2))&0xf;
-
- GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
- psxVuw[clutP+tC1]|
- ((int)psxVuw[clutP+tC2])<<16);
- posX+=difX2;
- posY+=difY2;
- }
- if(j==xmax)
- {
- XAdjust=(posX>>16);
- tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+
- (XAdjust>>1)];
- tC1=(tC1>>((XAdjust&1)<<2))&0xf;
- GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
- }
- }
- if(NextRow_FT4()) return;
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-
-void drawPoly4TEx4_IL(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
-{
- int num; 
- int i,j,xmin,xmax,ymin,ymax,n_xi,n_yi,TXV;
- int difX, difY, difX2, difY2;
- int posX,posY,YAdjust,clutP,XAdjust;
- short tC1,tC2;
-
- if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;
- if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;
- if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;
- if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;
- if(drawY>=drawH) return;
- if(drawX>=drawW) return; 
-
- if(!SetupSections_FT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4)) return;
-
- ymax=Ymax;
-
- for(ymin=Ymin;ymin<drawY;ymin++)
- if(NextRow_FT4()) return;
-
- clutP=(clY<<10)+clX;
-
- YAdjust=((GlobalTextAddrY)<<10)+GlobalTextAddrX;
-
-#ifdef FASTSOLID
-
- if(!bCheckMask && !DrawSemiTrans)
- {
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16);
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
-
- num=(xmax-xmin);
- if(num==0) num=1;
- difX=(right_u-posX)/num;
- difY=(right_v-posY)/num;
- difX2=difX<<1;
- difY2=difY<<1;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
- xmax--;if(drawW<xmax) xmax=drawW;
-
- for(j=xmin;j<xmax;j+=2)
- {
- XAdjust=(posX>>16);
-
- TXV=posY>>16;
- n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
- n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
-
- tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
-
- XAdjust=((posX+difX)>>16);
-
- TXV=(posY+difY)>>16;
- n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
- n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
-
- tC2= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
-
- GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
- psxVuw[clutP+tC1]|
- ((int)psxVuw[clutP+tC2])<<16);
- posX+=difX2;
- posY+=difY2;
- }
-
- if(j==xmax)
- {
- XAdjust=(posX>>16);
- TXV=posY>>16;
- n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
- n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
-
- tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
-
- GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
- }
-
- }
- if(NextRow_FT4()) return;
- }
- return;
- }
-
-#endif
-
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16);
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
-
- num=(xmax-xmin);
- if(num==0) num=1;
- difX=(right_u-posX)/num;
- difY=(right_v-posY)/num;
- difX2=difX<<1;
- difY2=difY<<1;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
- xmax--;if(drawW<xmax) xmax=drawW;
-
- for(j=xmin;j<xmax;j+=2)
- {
- XAdjust=(posX>>16);
-
- TXV=posY>>16;
- n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
- n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
-
- tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
-
- XAdjust=((posX+difX)>>16);
-
- TXV=(posY+difY)>>16;
- n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
- n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
-
- tC2= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
-
- GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
- psxVuw[clutP+tC1]|
- ((int)psxVuw[clutP+tC2])<<16);
- posX+=difX2;
- posY+=difY2;
- }
- if(j==xmax)
- {
- XAdjust=(posX>>16);
- TXV=posY>>16;
- n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
- n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
-
- tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
-
- GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
- }
- }
- if(NextRow_FT4()) return;
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-
-void drawPoly4TEx4_TW(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
-{
- int num; 
- int i,j,xmin,xmax,ymin,ymax;
- int difX, difY, difX2, difY2;
- int posX,posY,YAdjust,clutP,XAdjust;
- short tC1,tC2;
-
- if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;
- if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;
- if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;
- if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;
- if(drawY>=drawH) return;
- if(drawX>=drawW) return; 
-
- if(!SetupSections_FT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4)) return;
-
- ymax=Ymax;
-
- for(ymin=Ymin;ymin<drawY;ymin++)
- if(NextRow_FT4()) return;
-
- clutP=(clY<<10)+clX;
-
- YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);
- YAdjust+=(TWin.Position.y0<<11)+(TWin.Position.x0>>1);
-
-#ifdef FASTSOLID
-
- if(!bCheckMask && !DrawSemiTrans)
- {
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16);
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
-
- num=(xmax-xmin);
- if(num==0) num=1;
- difX=(right_u-posX)/num;
- difY=(right_v-posY)/num;
- difX2=difX<<1;
- difY2=difY<<1;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
- xmax--;if(drawW<xmax) xmax=drawW;
-
- for(j=xmin;j<xmax;j+=2)
- {
- XAdjust=(posX>>16)%TWin.Position.x1;
- tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
- YAdjust+(XAdjust>>1)];
- tC1=(tC1>>((XAdjust&1)<<2))&0xf;
- XAdjust=((posX+difX)>>16)%TWin.Position.x1;
- tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
- YAdjust+(XAdjust>>1)];
- tC2=(tC2>>((XAdjust&1)<<2))&0xf;
-
- GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
- psxVuw[clutP+tC1]|
- ((int)psxVuw[clutP+tC2])<<16);
- posX+=difX2;
- posY+=difY2;
- }
- if(j==xmax)
- {
- XAdjust=(posX>>16)%TWin.Position.x1;
- tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
- YAdjust+(XAdjust>>1)];
- tC1=(tC1>>((XAdjust&1)<<2))&0xf;
- GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
- }
- }
- if(NextRow_FT4()) return;
- }
- return;
- }
-
-#endif
-
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16);
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
-
- num=(xmax-xmin);
- if(num==0) num=1;
- difX=(right_u-posX)/num;
- difY=(right_v-posY)/num;
- difX2=difX<<1;
- difY2=difY<<1;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
- xmax--;if(drawW<xmax) xmax=drawW;
-
- for(j=xmin;j<xmax;j+=2)
- {
- XAdjust=(posX>>16)%TWin.Position.x1;
- tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
- YAdjust+(XAdjust>>1)];
- tC1=(tC1>>((XAdjust&1)<<2))&0xf;
- XAdjust=((posX+difX)>>16)%TWin.Position.x1;
- tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
- YAdjust+(XAdjust>>1)];
- tC2=(tC2>>((XAdjust&1)<<2))&0xf;
-
- GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
- psxVuw[clutP+tC1]|
- ((int)psxVuw[clutP+tC2])<<16);
- posX+=difX2;
- posY+=difY2;
- }
- if(j==xmax)
- {
- XAdjust=(posX>>16)%TWin.Position.x1;
- tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
- YAdjust+(XAdjust>>1)];
- tC1=(tC1>>((XAdjust&1)<<2))&0xf;
- GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
- }
- }
- if(NextRow_FT4()) return;
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-
-void drawPoly4TEx4_TW_S(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
-{
- int num; 
- int i,j,xmin,xmax,ymin,ymax;
- int difX, difY, difX2, difY2;
- int posX,posY,YAdjust,clutP,XAdjust;
- short tC1,tC2;
-
- if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;
- if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;
- if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;
- if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;
- if(drawY>=drawH) return;
- if(drawX>=drawW) return; 
-
- if(!SetupSections_FT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4)) return;
-
- ymax=Ymax;
-
- for(ymin=Ymin;ymin<drawY;ymin++)
- if(NextRow_FT4()) return;
-
- clutP=(clY<<10)+clX;
-
- YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);
- YAdjust+=(TWin.Position.y0<<11)+(TWin.Position.x0>>1);
-
-#ifdef FASTSOLID
-
- if(!bCheckMask && !DrawSemiTrans)
- {
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16);
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
-
- num=(xmax-xmin);
- if(num==0) num=1;
- difX=(right_u-posX)/num;
- difY=(right_v-posY)/num;
- difX2=difX<<1;
- difY2=difY<<1;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
- xmax--;if(drawW<xmax) xmax=drawW;
-
- for(j=xmin;j<xmax;j+=2)
- {
- XAdjust=(posX>>16)%TWin.Position.x1;
- tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
- YAdjust+(XAdjust>>1)];
- tC1=(tC1>>((XAdjust&1)<<2))&0xf;
- XAdjust=((posX+difX)>>16)%TWin.Position.x1;
- tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
- YAdjust+(XAdjust>>1)];
- tC2=(tC2>>((XAdjust&1)<<2))&0xf;
-
- GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
- psxVuw[clutP+tC1]|
- ((int)psxVuw[clutP+tC2])<<16);
- posX+=difX2;
- posY+=difY2;
- }
- if(j==xmax)
- {
- XAdjust=(posX>>16)%TWin.Position.x1;
- tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
- YAdjust+(XAdjust>>1)];
- tC1=(tC1>>((XAdjust&1)<<2))&0xf;
- GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
- }
- }
- if(NextRow_FT4()) return;
- }
- return;
- }
-
-#endif
-
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16);
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
-
- num=(xmax-xmin);
- if(num==0) num=1;
- difX=(right_u-posX)/num;
- difY=(right_v-posY)/num;
- difX2=difX<<1;
- difY2=difY<<1;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
- xmax--;if(drawW<xmax) xmax=drawW;
-
- for(j=xmin;j<xmax;j+=2)
- {
- XAdjust=(posX>>16)%TWin.Position.x1;
- tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
- YAdjust+(XAdjust>>1)];
- tC1=(tC1>>((XAdjust&1)<<2))&0xf;
- XAdjust=((posX+difX)>>16)%TWin.Position.x1;
- tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
- YAdjust+(XAdjust>>1)];
- tC2=(tC2>>((XAdjust&1)<<2))&0xf;
-
- GetTextureTransColG32_SPR((uint32_t *)&psxVuw[(i<<10)+j],
- psxVuw[clutP+tC1]|
- ((int)psxVuw[clutP+tC2])<<16);
- posX+=difX2;
- posY+=difY2;
- }
- if(j==xmax)
- {
- XAdjust=(posX>>16)%TWin.Position.x1;
- tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
- YAdjust+(XAdjust>>1)];
- tC1=(tC1>>((XAdjust&1)<<2))&0xf;
- GetTextureTransColG_SPR(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
- }
- }
- if(NextRow_FT4()) return;
- }
-}
-////////////////////////////////////////////////////////////////////////
-// POLY 3 F-SHADED TEX PAL 8
-////////////////////////////////////////////////////////////////////////
-
-void drawPoly3TEx8(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3,short clX, short clY)
-{
- int i,j,xmin,xmax,ymin,ymax;
- int difX, difY,difX2, difY2;
- int posX,posY,YAdjust,clutP;
- short tC1,tC2;
-
- if(x1>drawW && x2>drawW && x3>drawW) return;
- if(y1>drawH && y2>drawH && y3>drawH) return;
- if(x1<drawX && x2<drawX && x3<drawX) return;
- if(y1<drawY && y2<drawY && y3<drawY) return;
- if(drawY>=drawH) return;
- if(drawX>=drawW) return; 
-
- if(!SetupSections_FT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3)) return;
-
- ymax=Ymax;
-
- for(ymin=Ymin;ymin<drawY;ymin++)
- if(NextRow_FT()) return;
-
- clutP=(clY<<10)+clX;
-
- YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);
-
- difX=delta_right_u;difX2=difX<<1;
- difY=delta_right_v;difY2=difY<<1;
-
-#ifdef FASTSOLID
-
- if(!bCheckMask && !DrawSemiTrans)
- {
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!
- if(drawW<xmax) xmax=drawW;
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
-
- for(j=xmin;j<xmax;j+=2)
- {
- tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(posX>>16)];
- tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+
- ((posX+difX)>>16)];
- GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
- psxVuw[clutP+tC1]|
- ((int)psxVuw[clutP+tC2])<<16);
- posX+=difX2;
- posY+=difY2;
- }
-
- if(j==xmax)
- {
- tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(posX>>16)];
- GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
- }
- }
- if(NextRow_FT()) 
- {
- return;
- }
- }
- return;
- }
-
-#endif
-
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!
- if(drawW<xmax) xmax=drawW;
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
-
- for(j=xmin;j<xmax;j+=2)
- {
- tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(posX>>16)];
- tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+
- ((posX+difX)>>16)];
- GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
- psxVuw[clutP+tC1]|
- ((int)psxVuw[clutP+tC2])<<16);
- posX+=difX2;
- posY+=difY2;
- }
-
- if(j==xmax)
- {
- tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(posX>>16)];
- GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
- }
-
- }
- if(NextRow_FT()) 
- {
- return;
- }
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-
-void drawPoly3TEx8_IL(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3,short clX, short clY)
-{
- int i,j,xmin,xmax,ymin,ymax,n_xi,n_yi,TXV,TXU;
- int difX, difY,difX2, difY2;
- int posX,posY,YAdjust,clutP;
- short tC1,tC2;
-
- if(x1>drawW && x2>drawW && x3>drawW) return;
- if(y1>drawH && y2>drawH && y3>drawH) return;
- if(x1<drawX && x2<drawX && x3<drawX) return;
- if(y1<drawY && y2<drawY && y3<drawY) return;
- if(drawY>=drawH) return;
- if(drawX>=drawW) return; 
-
- if(!SetupSections_FT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3)) return;
-
- ymax=Ymax;
-
- for(ymin=Ymin;ymin<drawY;ymin++)
- if(NextRow_FT()) return;
-
- clutP=(clY<<10)+clX;
-
- YAdjust=(GlobalTextAddrY<<10)+GlobalTextAddrX;
-
- difX=delta_right_u;difX2=difX<<1;
- difY=delta_right_v;difY2=difY<<1;
-
-#ifdef FASTSOLID
-
- if(!bCheckMask && !DrawSemiTrans)
- {
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!
- if(drawW<xmax) xmax=drawW;
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
-
- for(j=xmin;j<xmax;j+=2)
- {
- TXU=posX>>16;
- TXV=posY>>16;
- n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
- n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
-
- tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
-
- TXU=(posX+difX)>>16;
- TXV=(posY+difY)>>16;
- n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
- n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
-
- tC2= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
-
- GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
- psxVuw[clutP+tC1]|
- ((int)psxVuw[clutP+tC2])<<16);
- posX+=difX2;
- posY+=difY2;
- }
-
- if(j==xmax)
- {
- TXU=posX>>16;
- TXV=posY>>16;
- n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
- n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
-
- tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
-
- GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
- }
- }
- if(NextRow_FT()) 
- {
- return;
- }
- }
- return;
- }
-
-#endif
-
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!
- if(drawW<xmax) xmax=drawW;
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
-
- for(j=xmin;j<xmax;j+=2)
- {
- TXU=posX>>16;
- TXV=posY>>16;
- n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
- n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
-
- tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
-
- TXU=(posX+difX)>>16;
- TXV=(posY+difY)>>16;
- n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
- n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
-
- tC2= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
-
- GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
- psxVuw[clutP+tC1]|
- ((int)psxVuw[clutP+tC2])<<16);
- posX+=difX2;
- posY+=difY2;
- }
-
- if(j==xmax)
- {
- TXU=posX>>16;
- TXV=posY>>16;
- n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
- n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
-
- tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
-
- GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
- }
-
- }
- if(NextRow_FT()) 
- {
- return;
- }
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-
-void drawPoly3TEx8_TW(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3,short clX, short clY)
-{
- int i,j,xmin,xmax,ymin,ymax;
- int difX, difY,difX2, difY2;
- int posX,posY,YAdjust,clutP;
- short tC1,tC2;
-
- if(x1>drawW && x2>drawW && x3>drawW) return;
- if(y1>drawH && y2>drawH && y3>drawH) return;
- if(x1<drawX && x2<drawX && x3<drawX) return;
- if(y1<drawY && y2<drawY && y3<drawY) return;
- if(drawY>=drawH) return;
- if(drawX>=drawW) return; 
-
- if(!SetupSections_FT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3)) return;
-
- ymax=Ymax;
-
- for(ymin=Ymin;ymin<drawY;ymin++)
- if(NextRow_FT()) return;
-
- clutP=(clY<<10)+clX;
-
- YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);
- YAdjust+=(TWin.Position.y0<<11)+(TWin.Position.x0);
-
- difX=delta_right_u;difX2=difX<<1;
- difY=delta_right_v;difY2=difY<<1;
-
-#ifdef FASTSOLID
-
- if(!bCheckMask && !DrawSemiTrans)
- {
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16);//-1; //!!!!!!!!!!!!!!!!
- if(xmax>xmin) xmax--;
-
- if(drawW<xmax) xmax=drawW;
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
-
- for(j=xmin;j<xmax;j+=2)
- {
- tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
- YAdjust+((posX>>16)%TWin.Position.x1)];
- tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
- YAdjust+(((posX+difX)>>16)%TWin.Position.x1)];
- GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
- psxVuw[clutP+tC1]|
- ((int)psxVuw[clutP+tC2])<<16);
- posX+=difX2;
- posY+=difY2;
- }
-
- if(j==xmax)
- {
- tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
- YAdjust+((posX>>16)%TWin.Position.x1)];
- GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
- }
- }
- if(NextRow_FT()) 
- {
- return;
- }
- }
- return;
- }
-
-#endif
-
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!
- if(drawW<xmax) xmax=drawW;
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
-
- for(j=xmin;j<xmax;j+=2)
- {
- tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
- YAdjust+((posX>>16)%TWin.Position.x1)];
- tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
- YAdjust+(((posX+difX)>>16)%TWin.Position.x1)];
- GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
- psxVuw[clutP+tC1]|
- ((int)psxVuw[clutP+tC2])<<16);
- posX+=difX2;
- posY+=difY2;
- }
-
- if(j==xmax)
- {
- tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
- YAdjust+((posX>>16)%TWin.Position.x1)];
- GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
- }
-
- }
- if(NextRow_FT()) 
- {
- return;
- }
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-
-#ifdef POLYQUAD3
-
-void drawPoly4TEx8_TRI(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
-{
- drawPoly3TEx8(x2,y2,x3,y3,x4,y4,
- tx2,ty2,tx3,ty3,tx4,ty4,
- clX,clY);
-
- drawPoly3TEx8(x1,y1,x2,y2,x4,y4,
- tx1,ty1,tx2,ty2,tx4,ty4,
- clX,clY);
-}
-
-#endif
-
-// more exact:
-
-void drawPoly4TEx8(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
-{
- int num; 
- int i,j,xmin,xmax,ymin,ymax;
- int difX, difY, difX2, difY2;
- int posX,posY,YAdjust,clutP;
- short tC1,tC2;
-
- if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;
- if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;
- if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;
- if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;
- if(drawY>=drawH) return;
- if(drawX>=drawW) return; 
-
- if(!SetupSections_FT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4)) return;
-
- ymax=Ymax;
-
- for(ymin=Ymin;ymin<drawY;ymin++)
- if(NextRow_FT4()) return;
-
- clutP=(clY<<10)+clX;
-
- YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);
-
-#ifdef FASTSOLID
-
- if(!bCheckMask && !DrawSemiTrans)
- {
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16);
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
-
- num=(xmax-xmin);
- if(num==0) num=1;
- difX=(right_u-posX)/num;
- difY=(right_v-posY)/num;
- difX2=difX<<1;
- difY2=difY<<1;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
- xmax--;if(drawW<xmax) xmax=drawW;
-
- for(j=xmin;j<xmax;j+=2)
- {
- tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(posX>>16)];
- tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+
- ((posX+difX)>>16)];
- GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
- psxVuw[clutP+tC1]|
- ((int)psxVuw[clutP+tC2])<<16);
- posX+=difX2;
- posY+=difY2;
- }
- if(j==xmax)
- {
- tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(posX>>16)];
- GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
- }
- }
- if(NextRow_FT4()) return;
- }
- return;
- }
-
-#endif
-
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16);
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
-
- num=(xmax-xmin);
- if(num==0) num=1;
- difX=(right_u-posX)/num;
- difY=(right_v-posY)/num;
- difX2=difX<<1;
- difY2=difY<<1;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
- xmax--;if(drawW<xmax) xmax=drawW;
-
- for(j=xmin;j<xmax;j+=2)
- {
- tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(posX>>16)];
- tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+
- ((posX+difX)>>16)];
- GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
- psxVuw[clutP+tC1]|
- ((int)psxVuw[clutP+tC2])<<16);
- posX+=difX2;
- posY+=difY2;
- }
- if(j==xmax)
- {
- tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(posX>>16)];
- GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
- }
- }
- if(NextRow_FT4()) return;
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-
-void drawPoly4TEx8_IL(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
-{
- int num; 
- int i,j,xmin,xmax,ymin,ymax,n_xi,n_yi,TXV,TXU;
- int difX, difY, difX2, difY2;
- int posX,posY,YAdjust,clutP;
- short tC1,tC2;
-
- if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;
- if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;
- if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;
- if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;
- if(drawY>=drawH) return;
- if(drawX>=drawW) return; 
-
- if(!SetupSections_FT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4)) return;
-
- ymax=Ymax;
-
- for(ymin=Ymin;ymin<drawY;ymin++)
- if(NextRow_FT4()) return;
-
- clutP=(clY<<10)+clX;
-
- YAdjust=(GlobalTextAddrY<<10)+GlobalTextAddrX;
-
-#ifdef FASTSOLID
-
- if(!bCheckMask && !DrawSemiTrans)
- {
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16);
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
-
- num=(xmax-xmin);
- if(num==0) num=1;
- difX=(right_u-posX)/num;
- difY=(right_v-posY)/num;
- difX2=difX<<1;
- difY2=difY<<1;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
- xmax--;if(drawW<xmax) xmax=drawW;
-
- for(j=xmin;j<xmax;j+=2)
- {
- TXU=posX>>16;
- TXV=posY>>16;
- n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
- n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
-
- tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
-
- TXU=(posX+difX)>>16;
- TXV=(posY+difY)>>16;
- n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
- n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
-
- tC2= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
-
- GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
- psxVuw[clutP+tC1]|
- ((int)psxVuw[clutP+tC2])<<16);
- posX+=difX2;
- posY+=difY2;
- }
- if(j==xmax)
- {
- TXU=posX>>16;
- TXV=posY>>16;
- n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
- n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
-
- tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
-
- GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
- }
- }
- if(NextRow_FT4()) return;
- }
- return;
- }
-
-#endif
-
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16);
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
-
- num=(xmax-xmin);
- if(num==0) num=1;
- difX=(right_u-posX)/num;
- difY=(right_v-posY)/num;
- difX2=difX<<1;
- difY2=difY<<1;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
- xmax--;if(drawW<xmax) xmax=drawW;
-
- for(j=xmin;j<xmax;j+=2)
- {
- TXU=posX>>16;
- TXV=posY>>16;
- n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
- n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
-
- tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
-
- TXU=(posX+difX)>>16;
- TXV=(posY+difY)>>16;
- n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
- n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
- 
- tC2= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
-
- GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
- psxVuw[clutP+tC1]|
- ((int)psxVuw[clutP+tC2])<<16);
- posX+=difX2;
- posY+=difY2;
- }
- if(j==xmax)
- {
- TXU=posX>>16;
- TXV=posY>>16;
- n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
- n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
- tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
- GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
- }
- }
- if(NextRow_FT4()) return;
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-
-void drawPoly4TEx8_TW(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
-{
- int num; 
- int i, j, xmin, xmax, ymin, ymax;
- int difX, difY, difX2, difY2;
- int posX, posY, YAdjust, clutP;
- short tC1, tC2;
-
- if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;
- if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;
- if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;
- if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;
- if(drawY>=drawH) return;
- if(drawX>=drawW) return; 
-
- if(!SetupSections_FT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4)) return;
-
- ymax=Ymax;
-
- for(ymin=Ymin;ymin<drawY;ymin++)
- if(NextRow_FT4()) return;
-
- clutP=(clY<<10)+clX;
-
- YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);
- YAdjust+=(TWin.Position.y0<<11)+(TWin.Position.x0);
-
-#ifdef FASTSOLID
-
- if(!bCheckMask && !DrawSemiTrans)
- {
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16);
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
-
- num=(xmax-xmin);
- if(num==0) num=1;
- difX=(right_u-posX)/num;
- difY=(right_v-posY)/num;
- difX2=difX<<1;
- difY2=difY<<1;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
- xmax--;if(drawW<xmax) xmax=drawW;
-
- for(j=xmin;j<xmax;j+=2)
- {
- tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
- YAdjust+((posX>>16)%TWin.Position.x1)];
- tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
- YAdjust+(((posX+difX)>>16)%TWin.Position.x1)];
- GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
- psxVuw[clutP+tC1]|
- ((int)psxVuw[clutP+tC2])<<16);
- posX += difX2;
- posY += difY2;
- }
- if(j==xmax)
- {
- tC1 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
- YAdjust+((posX>>16)%TWin.Position.x1)];
- GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
- }
- }
- if(NextRow_FT4()) return;
- }
- return;
- }
-
-#endif
-
-
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16);
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
-
- num=(xmax-xmin);
- if(num==0) num=1;
- difX=(right_u-posX)/num;
- difY=(right_v-posY)/num;
- difX2=difX<<1;
- difY2=difY<<1;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
- xmax--;if(drawW<xmax) xmax=drawW;
-
- for(j=xmin;j<xmax;j+=2)
- {
- tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
- YAdjust+((posX>>16)%TWin.Position.x1)];
- tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
- YAdjust+(((posX+difX)>>16)%TWin.Position.x1)];
- GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
- psxVuw[clutP+tC1]|
- ((int)psxVuw[clutP+tC2])<<16);
- posX+=difX2;
- posY+=difY2;
- }
- if(j==xmax)
- {
- tC1 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
- YAdjust+((posX>>16)%TWin.Position.x1)];
- GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
- }
- }
- if(NextRow_FT4()) return;
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-
-void drawPoly4TEx8_TW_S(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
-{
- int num; 
- int i,j,xmin,xmax,ymin,ymax;
- int difX, difY, difX2, difY2;
- int posX,posY,YAdjust,clutP;
- short tC1,tC2;
-
- if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;
- if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;
- if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;
- if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;
- if(drawY>=drawH) return;
- if(drawX>=drawW) return; 
-
- if(!SetupSections_FT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4)) return;
-
- ymax=Ymax;
-
- for(ymin=Ymin;ymin<drawY;ymin++)
- if(NextRow_FT4()) return;
-
- clutP=(clY<<10)+clX;
-
- YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);
- YAdjust+=(TWin.Position.y0<<11)+(TWin.Position.x0);
-
-#ifdef FASTSOLID
-
- if(!bCheckMask && !DrawSemiTrans)
- {
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16);
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
-
- num=(xmax-xmin);
- if(num==0) num=1;
- difX=(right_u-posX)/num;
- difY=(right_v-posY)/num;
- difX2=difX<<1;
- difY2=difY<<1;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
- xmax--;if(drawW<xmax) xmax=drawW;
-
- for(j=xmin;j<xmax;j+=2)
- {
- tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
- YAdjust+((posX>>16)%TWin.Position.x1)];
- tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
- YAdjust+(((posX+difX)>>16)%TWin.Position.x1)];
- GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
- psxVuw[clutP+tC1]|
- ((int)psxVuw[clutP+tC2])<<16);
- posX+=difX2;
- posY+=difY2;
- }
- if(j==xmax)
- {
- tC1 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
- YAdjust+((posX>>16)%TWin.Position.x1)];
- GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
- }
- }
- if(NextRow_FT4()) return;
- }
- return;
- }
-
-#endif
-
-
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16);
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
-
- num=(xmax-xmin);
- if(num==0) num=1;
- difX=(right_u-posX)/num;
- difY=(right_v-posY)/num;
- difX2=difX<<1;
- difY2=difY<<1;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
- xmax--;if(drawW<xmax) xmax=drawW;
-
- for(j=xmin;j<xmax;j+=2)
- {
- tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
- YAdjust+((posX>>16)%TWin.Position.x1)];
- tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
- YAdjust+(((posX+difX)>>16)%TWin.Position.x1)];
- GetTextureTransColG32_SPR((uint32_t *)&psxVuw[(i<<10)+j],
- psxVuw[clutP+tC1]|
- ((int)psxVuw[clutP+tC2])<<16);
- posX+=difX2;
- posY+=difY2;
- }
- if(j==xmax)
- {
- tC1 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
- YAdjust+((posX>>16)%TWin.Position.x1)];
- GetTextureTransColG_SPR(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
- }
- }
- if(NextRow_FT4()) return;
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-// POLY 3 F-SHADED TEX 15 BIT
-////////////////////////////////////////////////////////////////////////
-
-void drawPoly3TD(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3)
-{
- int i,j,xmin,xmax,ymin,ymax;
- int difX, difY,difX2, difY2;
- int posX,posY;
-
- if(x1>drawW && x2>drawW && x3>drawW) return;
- if(y1>drawH && y2>drawH && y3>drawH) return;
- if(x1<drawX && x2<drawX && x3<drawX) return;
- if(y1<drawY && y2<drawY && y3<drawY) return;
- if(drawY>=drawH) return;
- if(drawX>=drawW) return; 
- 
- if(!SetupSections_FT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3)) return;
-
- ymax=Ymax;
-
- for(ymin=Ymin;ymin<drawY;ymin++)
- if(NextRow_FT()) return;
-
- difX=delta_right_u;difX2=difX<<1;
- difY=delta_right_v;difY2=difY<<1;
-
-#ifdef FASTSOLID
-
- if(!bCheckMask && !DrawSemiTrans)
- {
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!
- if(drawW<xmax) xmax=drawW;
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
-
- for(j=xmin;j<xmax;j+=2)
- {
- GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
- (((int)psxVuw[((((posY+difY)>>16)+GlobalTextAddrY)<<10)+((posX+difX)>>16)+GlobalTextAddrX])<<16)|
- psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+((posX)>>16)+GlobalTextAddrX]);
-
- posX+=difX2;
- posY+=difY2;
- }
- if(j==xmax)
- GetTextureTransColG_S(&psxVuw[(i<<10)+j],
- psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+(posX>>16)+GlobalTextAddrX]);
- }
- if(NextRow_FT()) 
- {
- return;
- }
- }
- return;
- }
-
-#endif
-
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!
- if(drawW<xmax) xmax=drawW;
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
-
- for(j=xmin;j<xmax;j+=2)
- {
- GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
- (((int)psxVuw[((((posY+difY)>>16)+GlobalTextAddrY)<<10)+((posX+difX)>>16)+GlobalTextAddrX])<<16)|
- psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+((posX)>>16)+GlobalTextAddrX]);
-
- posX+=difX2;
- posY+=difY2;
- }
- if(j==xmax)
- GetTextureTransColG(&psxVuw[(i<<10)+j],
- psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+(posX>>16)+GlobalTextAddrX]);
- }
- if(NextRow_FT()) 
- {
- return;
- }
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-
-void drawPoly3TD_TW(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3)
-{
- int i,j,xmin,xmax,ymin,ymax;
- int difX, difY,difX2, difY2;
- int posX,posY;
-
- if(x1>drawW && x2>drawW && x3>drawW) return;
- if(y1>drawH && y2>drawH && y3>drawH) return;
- if(x1<drawX && x2<drawX && x3<drawX) return;
- if(y1<drawY && y2<drawY && y3<drawY) return;
- if(drawY>=drawH) return;
- if(drawX>=drawW) return; 
- 
- if(!SetupSections_FT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3)) return;
-
- ymax=Ymax;
-
- for(ymin=Ymin;ymin<drawY;ymin++)
- if(NextRow_FT()) return;
-
- difX=delta_right_u;difX2=difX<<1;
- difY=delta_right_v;difY2=difY<<1;
-
-#ifdef FASTSOLID
-
- if(!bCheckMask && !DrawSemiTrans)
- {
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!
- if(drawW<xmax) xmax=drawW;
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
-
- for(j=xmin;j<xmax;j+=2)
- {
- GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
- (((int)psxVuw[(((((posY+difY)>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
- (((posX+difX)>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0])<<16)|
- psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
- (((posX)>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);
-
- posX+=difX2;
- posY+=difY2;
- }
- if(j==xmax)
- GetTextureTransColG_S(&psxVuw[(i<<10)+j],
- psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
- ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);
- }
- if(NextRow_FT()) 
- {
- return;
- }
- }
- return;
- }
-
-#endif
-
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!
- if(drawW<xmax) xmax=drawW;
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
-
- for(j=xmin;j<xmax;j+=2)
- {
- GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
- (((int)psxVuw[(((((posY+difY)>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
- (((posX+difX)>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0])<<16)|
- psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
- (((posX)>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);
-
- posX+=difX2;
- posY+=difY2;
- }
- if(j==xmax)
- GetTextureTransColG(&psxVuw[(i<<10)+j],
- psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
- ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);
- }
- if(NextRow_FT()) 
- {
- return;
- }
- }
-}
-
-
-////////////////////////////////////////////////////////////////////////
-
-#ifdef POLYQUAD3
-
-void drawPoly4TD_TRI(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4)
-{
- drawPoly3TD(x2,y2,x3,y3,x4,y4,
- tx2,ty2,tx3,ty3,tx4,ty4);
- drawPoly3TD(x1,y1,x2,y2,x4,y4,
- tx1,ty1,tx2,ty2,tx4,ty4);
-}
-
-#endif
-
-// more exact:
-
-void drawPoly4TD(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4)
-{
- int num; 
- int i,j,xmin,xmax,ymin,ymax;
- int difX, difY, difX2, difY2;
- int posX,posY;
-
- if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;
- if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;
- if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;
- if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;
- if(drawY>=drawH) return;
- if(drawX>=drawW) return; 
-
- if(!SetupSections_FT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4)) return;
-
- ymax=Ymax;
-
- for(ymin=Ymin;ymin<drawY;ymin++)
- if(NextRow_FT4()) return;
-
-#ifdef FASTSOLID
-
- if(!bCheckMask && !DrawSemiTrans)
- {
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16);
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
-
- num=(xmax-xmin);
- if(num==0) num=1;
- difX=(right_u-posX)/num;
- difY=(right_v-posY)/num;
- difX2=difX<<1;
- difY2=difY<<1;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
- xmax--;if(drawW<xmax) xmax=drawW;
-
- for(j=xmin;j<xmax;j+=2)
- {
- GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
- (((int)psxVuw[((((posY+difY)>>16)+GlobalTextAddrY)<<10)+((posX+difX)>>16)+GlobalTextAddrX])<<16)|
- psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+((posX)>>16)+GlobalTextAddrX]);
-
- posX+=difX2;
- posY+=difY2;
- }
- if(j==xmax)
- GetTextureTransColG_S(&psxVuw[(i<<10)+j],
- psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+(posX>>16)+GlobalTextAddrX]);
- }
- if(NextRow_FT4()) return;
- }
- return;
- }
-
-#endif
-
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16);
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
-
- num=(xmax-xmin);
- if(num==0) num=1;
- difX=(right_u-posX)/num;
- difY=(right_v-posY)/num;
- difX2=difX<<1;
- difY2=difY<<1;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
- xmax--;if(drawW<xmax) xmax=drawW;
-
- for(j=xmin;j<xmax;j+=2)
- {
- GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
- (((int)psxVuw[((((posY+difY)>>16)+GlobalTextAddrY)<<10)+((posX+difX)>>16)+GlobalTextAddrX])<<16)|
- psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+((posX)>>16)+GlobalTextAddrX]);
-
- posX+=difX2;
- posY+=difY2;
- }
- if(j==xmax)
- GetTextureTransColG(&psxVuw[(i<<10)+j],
- psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+(posX>>16)+GlobalTextAddrX]);
- }
- if(NextRow_FT4()) return;
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-
-void drawPoly4TD_TW(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4)
-{
- int num; 
- int i,j,xmin,xmax,ymin,ymax;
- int difX, difY, difX2, difY2;
- int posX,posY;
-
- if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;
- if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;
- if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;
- if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;
- if(drawY>=drawH) return;
- if(drawX>=drawW) return; 
-
- if(!SetupSections_FT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4)) return;
-
- ymax=Ymax;
-
- for(ymin=Ymin;ymin<drawY;ymin++)
- if(NextRow_FT4()) return;
-
-#ifdef FASTSOLID
-
- if(!bCheckMask && !DrawSemiTrans)
- {
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16);
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
-
- num=(xmax-xmin);
- if(num==0) num=1;
- difX=(right_u-posX)/num;
- difY=(right_v-posY)/num;
- difX2=difX<<1;
- difY2=difY<<1;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
- xmax--;if(drawW<xmax) xmax=drawW;
-
- for(j=xmin;j<xmax;j+=2)
- {
- GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
- (((int)psxVuw[(((((posY+difY)>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
- (((posX+difX)>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0])<<16)|
- psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY)<<10)+TWin.Position.y0+
- ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);
-
- posX+=difX2;
- posY+=difY2;
- }
- if(j==xmax)
- GetTextureTransColG_S(&psxVuw[(i<<10)+j],
- psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
- ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);
- }
- if(NextRow_FT4()) return;
- }
- return;
- }
-
-#endif
-
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16);
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
-
- num=(xmax-xmin);
- if(num==0) num=1;
- difX=(right_u-posX)/num;
- difY=(right_v-posY)/num;
- difX2=difX<<1;
- difY2=difY<<1;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
- xmax--;if(drawW<xmax) xmax=drawW;
-
- for(j=xmin;j<xmax;j+=2)
- {
- GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
- (((int)psxVuw[(((((posY+difY)>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
- (((posX+difX)>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0])<<16)|
- psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
- ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);
-
- posX+=difX2;
- posY+=difY2;
- }
- if(j==xmax)
- GetTextureTransColG(&psxVuw[(i<<10)+j],
- psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
- ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);
- }
- if(NextRow_FT4()) return;
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-
-void drawPoly4TD_TW_S(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4)
-{
- int num; 
- int i,j,xmin,xmax,ymin,ymax;
- int difX, difY, difX2, difY2;
- int posX, posY;
-
- if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;
- if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;
- if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;
- if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;
- if(drawY>=drawH) return;
- if(drawX>=drawW) return; 
-
- if(!SetupSections_FT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4)) return;
-
- ymax=Ymax;
-
- for(ymin=Ymin;ymin<drawY;ymin++)
- if(NextRow_FT4()) return;
-
-#ifdef FASTSOLID
-
- if(!bCheckMask && !DrawSemiTrans)
- {
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16);
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
-
- num=(xmax-xmin);
- if(num==0) num=1;
- difX=(right_u-posX)/num;
- difY=(right_v-posY)/num;
- difX2=difX<<1;
- difY2=difY<<1;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
- xmax--;if(drawW<xmax) xmax=drawW;
-
- for(j=xmin;j<xmax;j+=2)
- {
- GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
- (((int)psxVuw[(((((posY+difY)>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
- (((posX+difX)>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0])<<16)|
- psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY)<<10)+TWin.Position.y0+
- ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);
-
- posX+=difX2;
- posY+=difY2;
- }
- if(j==xmax)
- GetTextureTransColG_S(&psxVuw[(i<<10)+j],
- psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
- ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);
- }
- if(NextRow_FT4()) return;
- }
- return;
- }
-
-#endif
-
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16);
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
-
- num=(xmax-xmin);
- if(num==0) num=1;
- difX=(right_u-posX)/num;
- difY=(right_v-posY)/num;
- difX2=difX<<1;
- difY2=difY<<1;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
- xmax--;if(drawW<xmax) xmax=drawW;
-
- for(j=xmin;j<xmax;j+=2)
- {
- GetTextureTransColG32_SPR((uint32_t *)&psxVuw[(i<<10)+j],
- (((int)psxVuw[(((((posY+difY)>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
- (((posX+difX)>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0])<<16)|
- psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
- ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);
-
- posX+=difX2;
- posY+=difY2;
- }
- if(j==xmax)
- GetTextureTransColG_SPR(&psxVuw[(i<<10)+j],
- psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
- ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);
- }
- if(NextRow_FT4()) return;
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-// POLY 3/4 G-SHADED
-////////////////////////////////////////////////////////////////////////
- 
-__inline void drawPoly3Gi(short x1,short y1,short x2,short y2,short x3,short y3, int rgb1, int rgb2, int rgb3)
-{
- int i,j,xmin,xmax,ymin,ymax;
- int cR1,cG1,cB1;
- int difR,difB,difG,difR2,difB2,difG2;
-
- if(x1>drawW && x2>drawW && x3>drawW) return;
- if(y1>drawH && y2>drawH && y3>drawH) return;
- if(x1<drawX && x2<drawX && x3<drawX) return;
- if(y1<drawY && y2<drawY && y3<drawY) return;
- if(drawY>=drawH) return;
- if(drawX>=drawW) return; 
-
- if(!SetupSections_G(x1,y1,x2,y2,x3,y3,rgb1,rgb2,rgb3)) return;
-
- ymax=Ymax;
-
- for(ymin=Ymin;ymin<drawY;ymin++)
- if(NextRow_G()) return;
-
- difR=delta_right_R;
- difG=delta_right_G;
- difB=delta_right_B;
- difR2=difR<<1;
- difG2=difG<<1;
- difB2=difB<<1;
-
-#ifdef FASTSOLID
-
- if(!bCheckMask && !DrawSemiTrans && iDither!=2)
- {
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16)-1;if(drawW<xmax) xmax=drawW;
-
- if(xmax>=xmin)
- {
- cR1=left_R;
- cG1=left_G;
- cB1=left_B;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
-
- for(j=xmin;j<xmax;j+=2) 
- {
- *((uint32_t *)&psxVuw[(i<<10)+j])=
- ((((cR1+difR) <<7)&0x7c000000)|(((cG1+difG) << 2)&0x03e00000)|(((cB1+difB)>>3)&0x001f0000)|
- (((cR1) >> 9)&0x7c00)|(((cG1) >> 14)&0x03e0)|(((cB1) >> 19)&0x001f))|lSetMask;
- 
- cR1+=difR2;
- cG1+=difG2;
- cB1+=difB2;
- }
- if(j==xmax)
- psxVuw[(i<<10)+j]=(((cR1 >> 9)&0x7c00)|((cG1 >> 14)&0x03e0)|((cB1 >> 19)&0x001f))|sSetMask;
- }
- if(NextRow_G()) return;
- }
- return;
- }
-
-#endif
-
- if(iDither==2)
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16)-1;if(drawW<xmax) xmax=drawW;
-
- if(xmax>=xmin)
- {
- cR1=left_R;
- cG1=left_G;
- cB1=left_B;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
-
- for(j=xmin;j<=xmax;j++) 
- {
- GetShadeTransCol_Dither(&psxVuw[(i<<10)+j],(cB1>>16),(cG1>>16),(cR1>>16));
-
- cR1+=difR;
- cG1+=difG;
- cB1+=difB;
- }
- }
- if(NextRow_G()) return;
- }
- else
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16)-1;if(drawW<xmax) xmax=drawW;
-
- if(xmax>=xmin)
- {
- cR1=left_R;
- cG1=left_G;
- cB1=left_B;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
-
- for(j=xmin;j<=xmax;j++) 
- {
- GetShadeTransCol(&psxVuw[(i<<10)+j],((cR1 >> 9)&0x7c00)|((cG1 >> 14)&0x03e0)|((cB1 >> 19)&0x001f));
-
- cR1+=difR;
- cG1+=difG;
- cB1+=difB;
- }
- }
- if(NextRow_G()) return;
- }
-
-}
-
-////////////////////////////////////////////////////////////////////////
-
-void drawPoly3G(int rgb1, int rgb2, int rgb3)
-{
- drawPoly3Gi(lx0,ly0,lx1,ly1,lx2,ly2,rgb1,rgb2,rgb3);
-}
-
-// draw two g-shaded tris for right psx shading emulation
-
-void drawPoly4G(int rgb1, int rgb2, int rgb3, int rgb4)
-{
- drawPoly3Gi(lx1,ly1,lx3,ly3,lx2,ly2,
- rgb2,rgb4,rgb3);
- drawPoly3Gi(lx0,ly0,lx1,ly1,lx2,ly2,
- rgb1,rgb2,rgb3);
-}
-
-////////////////////////////////////////////////////////////////////////
-// POLY 3/4 G-SHADED TEX PAL4
-////////////////////////////////////////////////////////////////////////
-
-void drawPoly3TGEx4(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short clX, short clY,int col1, int col2, int col3)
-{
- int i,j,xmin,xmax,ymin,ymax;
- int cR1,cG1,cB1;
- int difR,difB,difG,difR2,difB2,difG2;
- int difX, difY,difX2, difY2;
- int posX,posY,YAdjust,clutP,XAdjust;
- short tC1,tC2;
-
- if(x1>drawW && x2>drawW && x3>drawW) return;
- if(y1>drawH && y2>drawH && y3>drawH) return;
- if(x1<drawX && x2<drawX && x3<drawX) return;
- if(y1<drawY && y2<drawY && y3<drawY) return;
- if(drawY>=drawH) return;
- if(drawX>=drawW) return; 
-
- if(!SetupSections_GT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3,col1,col2,col3)) return;
-
- ymax=Ymax;
-
- for(ymin=Ymin;ymin<drawY;ymin++)
- if(NextRow_GT()) return;
-
- clutP=(clY<<10)+clX;
-
- YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);
-
- difR=delta_right_R;
- difG=delta_right_G;
- difB=delta_right_B;
- difR2=difR<<1;
- difG2=difG<<1;
- difB2=difB<<1;
-
- difX=delta_right_u;difX2=difX<<1;
- difY=delta_right_v;difY2=difY<<1;
-
-#ifdef FASTSOLID
-
- if(!bCheckMask && !DrawSemiTrans && !iDither)
- {
- for (i=ymin;i<=ymax;i++)
- {
- xmin=((left_x) >> 16);
- xmax=((right_x) >> 16)-1; //!!!!!!!!!!!!!
- if(drawW<xmax) xmax=drawW;
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
- cR1=left_R;
- cG1=left_G;
- cB1=left_B;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
-
- for(j=xmin;j<xmax;j+=2) 
- {
- XAdjust=(posX>>16);
- tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(XAdjust>>1)];
- tC1=(tC1>>((XAdjust&1)<<2))&0xf;
- XAdjust=((posX+difX)>>16);
- tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+
- (XAdjust>>1)];
- tC2=(tC2>>((XAdjust&1)<<2))&0xf;
-
- GetTextureTransColGX32_S((uint32_t *)&psxVuw[(i<<10)+j],
- psxVuw[clutP+tC1]|
- ((int)psxVuw[clutP+tC2])<<16,
- (cB1>>16)|((cB1+difB)&0xff0000),
- (cG1>>16)|((cG1+difG)&0xff0000),
- (cR1>>16)|((cR1+difR)&0xff0000));
- posX+=difX2;
- posY+=difY2;
- cR1+=difR2;
- cG1+=difG2;
- cB1+=difB2;
- }
- if(j==xmax)
- {
- XAdjust=(posX>>16);
- tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(XAdjust>>1)];
- tC1=(tC1>>((XAdjust&1)<<2))&0xf;
- GetTextureTransColGX_S(&psxVuw[(i<<10)+j], 
- psxVuw[clutP+tC1],
- (cB1>>16),(cG1>>16),(cR1>>16));
- }
- }
- if(NextRow_GT()) 
- {
- return;
- }
- }
- return;
- }
-
-#endif
-
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!
- if(drawW<xmax) xmax=drawW;
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
- cR1=left_R;
- cG1=left_G;
- cB1=left_B;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
-
- for(j=xmin;j<=xmax;j++) 
- {
- XAdjust=(posX>>16);
- tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(XAdjust>>1)];
- tC1=(tC1>>((XAdjust&1)<<2))&0xf;
- if(iDither)
- GetTextureTransColGX_Dither(&psxVuw[(i<<10)+j], 
- psxVuw[clutP+tC1],
- (cB1>>16),(cG1>>16),(cR1>>16));
- else
- GetTextureTransColGX(&psxVuw[(i<<10)+j], 
- psxVuw[clutP+tC1],
- (cB1>>16),(cG1>>16),(cR1>>16));
- posX+=difX;
- posY+=difY;
- cR1+=difR;
- cG1+=difG;
- cB1+=difB;
- }
- }
- if(NextRow_GT()) 
- {
- return;
- }
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-
-void drawPoly3TGEx4_IL(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short clX, short clY,int col1, int col2, int col3)
-{
- int i,j,xmin,xmax,ymin,ymax,n_xi,n_yi,TXV;
- int cR1,cG1,cB1;
- int difR,difB,difG,difR2,difB2,difG2;
- int difX, difY,difX2, difY2;
- int posX,posY,YAdjust,clutP,XAdjust;
- short tC1,tC2;
-
- if(x1>drawW && x2>drawW && x3>drawW) return;
- if(y1>drawH && y2>drawH && y3>drawH) return;
- if(x1<drawX && x2<drawX && x3<drawX) return;
- if(y1<drawY && y2<drawY && y3<drawY) return;
- if(drawY>=drawH) return;
- if(drawX>=drawW) return; 
-
- if(!SetupSections_GT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3,col1,col2,col3)) return;
-
- ymax=Ymax;
-
- for(ymin=Ymin;ymin<drawY;ymin++)
- if(NextRow_GT()) return;
-
- clutP=(clY<<10)+clX;
-
- YAdjust=(GlobalTextAddrY<<10)+GlobalTextAddrX;
-
- difR=delta_right_R;
- difG=delta_right_G;
- difB=delta_right_B;
- difR2=difR<<1;
- difG2=difG<<1;
- difB2=difB<<1;
-
- difX=delta_right_u;difX2=difX<<1;
- difY=delta_right_v;difY2=difY<<1;
-
-#ifdef FASTSOLID
-
- if(!bCheckMask && !DrawSemiTrans && !iDither)
- {
- for (i=ymin;i<=ymax;i++)
- {
- xmin=((left_x) >> 16);
- xmax=((right_x) >> 16)-1; //!!!!!!!!!!!!!
- if(drawW<xmax) xmax=drawW;
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
- cR1=left_R;
- cG1=left_G;
- cB1=left_B;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
-
- for(j=xmin;j<xmax;j+=2) 
- {
- XAdjust=(posX>>16);
-
- TXV=posY>>16;
- n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
- n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
- 
- tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
-
- XAdjust=((posX+difX)>>16);
-
- TXV=(posY+difY)>>16;
- n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
- n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
-
- tC2= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
-
- GetTextureTransColGX32_S((uint32_t *)&psxVuw[(i<<10)+j],
- psxVuw[clutP+tC1]|
- ((int)psxVuw[clutP+tC2])<<16,
- (cB1>>16)|((cB1+difB)&0xff0000),
- (cG1>>16)|((cG1+difG)&0xff0000),
- (cR1>>16)|((cR1+difR)&0xff0000));
- posX+=difX2;
- posY+=difY2;
- cR1+=difR2;
- cG1+=difG2;
- cB1+=difB2;
- }
- if(j==xmax)
- {
- XAdjust=(posX>>16);
-
- TXV=posY>>16;
- n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
- n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
-
- tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
-
- GetTextureTransColGX_S(&psxVuw[(i<<10)+j], 
- psxVuw[clutP+tC1],
- (cB1>>16),(cG1>>16),(cR1>>16));
- }
- }
- if(NextRow_GT()) 
- {
- return;
- }
- }
- return;
- }
-
-#endif
-
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!
- if(drawW<xmax) xmax=drawW;
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
- cR1=left_R;
- cG1=left_G;
- cB1=left_B;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
-
- for(j=xmin;j<=xmax;j++) 
- {
- XAdjust=(posX>>16);
-
- TXV=posY>>16;
- n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
- n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
-
- tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
-
- if(iDither)
- GetTextureTransColGX_Dither(&psxVuw[(i<<10)+j], 
- psxVuw[clutP+tC1],
- (cB1>>16),(cG1>>16),(cR1>>16));
- else
- GetTextureTransColGX(&psxVuw[(i<<10)+j], 
- psxVuw[clutP+tC1],
- (cB1>>16),(cG1>>16),(cR1>>16));
- posX+=difX;
- posY+=difY;
- cR1+=difR;
- cG1+=difG;
- cB1+=difB;
- }
- }
- if(NextRow_GT()) 
- {
- return;
- }
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-
-void drawPoly3TGEx4_TW(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short clX, short clY, int col1, int col2, int col3)
-{
- int i, j, xmin, xmax, ymin, ymax;
- int cR1, cG1, cB1;
- int difR, difB, difG, difR2, difB2, difG2;
- int difX, difY,difX2, difY2;
- int posX, posY, YAdjust, clutP, XAdjust;
- short tC1,tC2;
-
- if(x1>drawW && x2>drawW && x3>drawW) return;
- if(y1>drawH && y2>drawH && y3>drawH) return;
- if(x1<drawX && x2<drawX && x3<drawX) return;
- if(y1<drawY && y2<drawY && y3<drawY) return;
- if(drawY>=drawH) return;
- if(drawX>=drawW) return; 
-
- if(!SetupSections_GT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3,col1,col2,col3)) return;
-
- ymax=Ymax;
-
- for(ymin=Ymin;ymin<drawY;ymin++)
- if(NextRow_GT()) return;
-
- clutP=(clY<<10)+clX;
-
- YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);
- YAdjust+=(TWin.Position.y0<<11)+(TWin.Position.x0>>1);
-
- difR=delta_right_R;
- difG=delta_right_G;
- difB=delta_right_B;
- difR2=difR<<1;
- difG2=difG<<1;
- difB2=difB<<1;
-
- difX=delta_right_u;difX2=difX<<1;
- difY=delta_right_v;difY2=difY<<1;
-
-#ifdef FASTSOLID
-
- if(!bCheckMask && !DrawSemiTrans && !iDither)
- {
- for (i=ymin;i<=ymax;i++)
- {
- xmin=((left_x) >> 16);
- xmax=((right_x) >> 16)-1; //!!!!!!!!!!!!!
- if(drawW<xmax) xmax=drawW;
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
- cR1=left_R;
- cG1=left_G;
- cB1=left_B;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
-
- for(j=xmin;j<xmax;j+=2) 
- {
- XAdjust=(posX>>16)%TWin.Position.x1;
- tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
- YAdjust+(XAdjust>>1)];
- tC1=(tC1>>((XAdjust&1)<<2))&0xf;
- XAdjust=((posX+difX)>>16)%TWin.Position.x1;
- tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
- YAdjust+(XAdjust>>1)];
- tC2=(tC2>>((XAdjust&1)<<2))&0xf;
- GetTextureTransColGX32_S((uint32_t *)&psxVuw[(i<<10)+j],
- psxVuw[clutP+tC1]|
- ((int)psxVuw[clutP+tC2])<<16,
- (cB1>>16)|((cB1+difB)&0xff0000),
- (cG1>>16)|((cG1+difG)&0xff0000),
- (cR1>>16)|((cR1+difR)&0xff0000));
- posX+=difX2;
- posY+=difY2;
- cR1+=difR2;
- cG1+=difG2;
- cB1+=difB2;
- }
- if(j==xmax)
- {
- XAdjust=(posX>>16)%TWin.Position.x1;
- tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
- YAdjust+(XAdjust>>1)];
- tC1=(tC1>>((XAdjust&1)<<2))&0xf;
- GetTextureTransColGX_S(&psxVuw[(i<<10)+j], 
- psxVuw[clutP+tC1],
- (cB1>>16),(cG1>>16),(cR1>>16));
- }
- }
- if(NextRow_GT()) 
- {
- return;
- }
- }
- return;
- }
-
-#endif
-
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!
- if(drawW<xmax) xmax=drawW;
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
- cR1=left_R;
- cG1=left_G;
- cB1=left_B;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
-
- for(j=xmin;j<=xmax;j++) 
- {
- XAdjust=(posX>>16)%TWin.Position.x1;
- tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
- YAdjust+(XAdjust>>1)];
- tC1=(tC1>>((XAdjust&1)<<2))&0xf;
- if(iDither)
- GetTextureTransColGX_Dither(&psxVuw[(i<<10)+j], 
- psxVuw[clutP+tC1],
- (cB1>>16),(cG1>>16),(cR1>>16));
- else
- GetTextureTransColGX(&psxVuw[(i<<10)+j], 
- psxVuw[clutP+tC1],
- (cB1>>16),(cG1>>16),(cR1>>16));
- posX+=difX;
- posY+=difY;
- cR1+=difR;
- cG1+=difG;
- cB1+=difB;
- }
- }
- if(NextRow_GT()) 
- {
- return;
- }
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-
-// note: the psx is doing g-shaded quads as two g-shaded tris,
-// like the following func... sadly texturing is not 100%
-// correct that way, so small texture distortions can 
-// happen... 
-
-void drawPoly4TGEx4_TRI_IL(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, 
- short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, 
- short clX, short clY,
- int col1, int col2, int col3, int col4)
-{
- drawPoly3TGEx4_IL(x2,y2,x3,y3,x4,y4,
- tx2,ty2,tx3,ty3,tx4,ty4,
- clX,clY,
- col2,col4,col3);
- drawPoly3TGEx4_IL(x1,y1,x2,y2,x4,y4,
- tx1,ty1,tx2,ty2,tx4,ty4,
- clX,clY,
- col1,col2,col3);
-}
-
-#ifdef POLYQUAD3GT
-
-void drawPoly4TGEx4_TRI(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, 
- short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, 
- short clX, short clY,
- int col1, int col2, int col3, int col4)
-{
- drawPoly3TGEx4(x2,y2,x3,y3,x4,y4,
- tx2,ty2,tx3,ty3,tx4,ty4,
- clX,clY,
- col2,col4,col3);
- drawPoly3TGEx4(x1,y1,x2,y2,x4,y4,
- tx1,ty1,tx2,ty2,tx4,ty4,
- clX,clY,
- col1,col2,col3);
-}
-
-#endif
- 
-////////////////////////////////////////////////////////////////////////
-
-void drawPoly4TGEx4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, 
- short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, 
- short clX, short clY,
- int col1, int col2, int col4, int col3)
-{
- int num; 
- int i,j,xmin,xmax,ymin,ymax;
- int cR1,cG1,cB1;
- int difR,difB,difG,difR2,difB2,difG2;
- int difX, difY, difX2, difY2;
- int posX,posY,YAdjust,clutP,XAdjust;
- short tC1,tC2;
-
- if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;
- if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;
- if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;
- if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;
- if(drawY>=drawH) return;
- if(drawX>=drawW) return; 
-
- if(!SetupSections_GT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4,col1,col2,col3,col4)) return;
-
- ymax=Ymax;
-
- for(ymin=Ymin;ymin<drawY;ymin++)
- if(NextRow_GT4()) return;
-
- clutP=(clY<<10)+clX;
-
- YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);
-
-
-#ifdef FASTSOLID
-
- if(!bCheckMask && !DrawSemiTrans && !iDither)
- {
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16);
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
-
- num=(xmax-xmin);
- if(num==0) num=1;
- difX=(right_u-posX)/num;
- difY=(right_v-posY)/num;
- difX2=difX<<1;
- difY2=difY<<1;
-
- cR1=left_R;
- cG1=left_G;
- cB1=left_B;
- difR=(right_R-cR1)/num;
- difG=(right_G-cG1)/num;
- difB=(right_B-cB1)/num;
- difR2=difR<<1;
- difG2=difG<<1;
- difB2=difB<<1;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
- xmax--;if(drawW<xmax) xmax=drawW;
-
- for(j=xmin;j<xmax;j+=2)
- {
- XAdjust=(posX>>16);
- tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(XAdjust>>1)];
- tC1=(tC1>>((XAdjust&1)<<2))&0xf;
- XAdjust=((posX+difX)>>16);
- tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+
- (XAdjust>>1)];
- tC2=(tC2>>((XAdjust&1)<<2))&0xf;
-
- GetTextureTransColGX32_S((uint32_t *)&psxVuw[(i<<10)+j],
- psxVuw[clutP+tC1]|
- ((int)psxVuw[clutP+tC2])<<16,
- (cB1>>16)|((cB1+difB)&0xff0000),
- (cG1>>16)|((cG1+difG)&0xff0000),
- (cR1>>16)|((cR1+difR)&0xff0000));
- posX+=difX2;
- posY+=difY2;
- cR1+=difR2;
- cG1+=difG2;
- cB1+=difB2;
- }
- if(j==xmax)
- {
- XAdjust=(posX>>16);
- tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+
- (XAdjust>>1)];
- tC1=(tC1>>((XAdjust&1)<<2))&0xf;
-
- GetTextureTransColGX_S(&psxVuw[(i<<10)+j], 
- psxVuw[clutP+tC1],
- (cB1>>16),(cG1>>16),(cR1>>16));
- }
- }
- if(NextRow_GT4()) return;
- }
- return;
- }
-
-#endif
-
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16);
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
-
- num=(xmax-xmin);
- if(num==0) num=1;
- difX=(right_u-posX)/num;
- difY=(right_v-posY)/num;
- difX2=difX<<1;
- difY2=difY<<1;
-
- cR1=left_R;
- cG1=left_G;
- cB1=left_B;
- difR=(right_R-cR1)/num;
- difG=(right_G-cG1)/num;
- difB=(right_B-cB1)/num;
- difR2=difR<<1;
- difG2=difG<<1;
- difB2=difB<<1;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
- xmax--;if(drawW<xmax) xmax=drawW;
-
- for(j=xmin;j<=xmax;j++)
- {
- XAdjust=(posX>>16);
- tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+
- (XAdjust>>1)];
- tC1=(tC1>>((XAdjust&1)<<2))&0xf;
- if(iDither)
- GetTextureTransColGX_Dither(&psxVuw[(i<<10)+j], 
- psxVuw[clutP+tC1],
- (cB1>>16),(cG1>>16),(cR1>>16));
- else
- GetTextureTransColGX(&psxVuw[(i<<10)+j], 
- psxVuw[clutP+tC1],
- (cB1>>16),(cG1>>16),(cR1>>16));
- posX+=difX;
- posY+=difY;
- cR1+=difR;
- cG1+=difG;
- cB1+=difB;
- }
- }
- if(NextRow_GT4()) return;
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-
-void drawPoly4TGEx4_TW(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, 
- short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, 
- short clX, short clY,
- int col1, int col2, int col3, int col4)
-{
- drawPoly3TGEx4_TW(x2,y2,x3,y3,x4,y4,
- tx2,ty2,tx3,ty3,tx4,ty4,
- clX,clY,
- col2,col4,col3);
-
- drawPoly3TGEx4_TW(x1,y1,x2,y2,x4,y4,
- tx1,ty1,tx2,ty2,tx4,ty4,
- clX,clY,
- col1,col2,col3);
-}
-
-////////////////////////////////////////////////////////////////////////
-// POLY 3/4 G-SHADED TEX PAL8
-////////////////////////////////////////////////////////////////////////
-
-void drawPoly3TGEx8(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short clX, short clY, int col1, int col2, int col3)
-{
- int i,j,xmin,xmax,ymin,ymax;
- int cR1,cG1,cB1;
- int difR,difB,difG,difR2,difB2,difG2;
- int difX, difY,difX2, difY2;
- int posX,posY,YAdjust,clutP;
- short tC1,tC2;
-
- if(x1>drawW && x2>drawW && x3>drawW) return;
- if(y1>drawH && y2>drawH && y3>drawH) return;
- if(x1<drawX && x2<drawX && x3<drawX) return;
- if(y1<drawY && y2<drawY && y3<drawY) return;
- if(drawY>=drawH) return;
- if(drawX>=drawW) return; 
-
- if(!SetupSections_GT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3,col1,col2,col3)) return;
-
- ymax=Ymax;
-
- for(ymin=Ymin;ymin<drawY;ymin++)
- if(NextRow_GT()) return;
-
- clutP=(clY<<10)+clX;
-
- YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);
-
- difR=delta_right_R;
- difG=delta_right_G;
- difB=delta_right_B;
- difR2=difR<<1;
- difG2=difG<<1;
- difB2=difB<<1;
- difX=delta_right_u;difX2=difX<<1;
- difY=delta_right_v;difY2=difY<<1;
-
-#ifdef FASTSOLID
-
- if(!bCheckMask && !DrawSemiTrans && !iDither)
- {
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16)-1; // !!!!!!!!!!!!!
- if(drawW<xmax) xmax=drawW;
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
- cR1=left_R;
- cG1=left_G;
- cB1=left_B;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
-
- for(j=xmin;j<xmax;j+=2)
- {
- tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+((posX>>16))];
- tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+
- (((posX+difX)>>16))];
- GetTextureTransColGX32_S((uint32_t *)&psxVuw[(i<<10)+j],
- psxVuw[clutP+tC1]|
- ((int)psxVuw[clutP+tC2])<<16,
- (cB1>>16)|((cB1+difB)&0xff0000),
- (cG1>>16)|((cG1+difG)&0xff0000),
- (cR1>>16)|((cR1+difR)&0xff0000));
- posX+=difX2;
- posY+=difY2;
- cR1+=difR2;
- cG1+=difG2;
- cB1+=difB2;
- }
- if(j==xmax)
- {
- tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+((posX>>16))];
- GetTextureTransColGX_S(&psxVuw[(i<<10)+j], 
- psxVuw[clutP+tC1],
- (cB1>>16),(cG1>>16),(cR1>>16));
- }
- }
- if(NextRow_GT()) 
- {
- return;
- }
- }
- return;
- }
-
-#endif
-
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!!!!!!!
- if(drawW<xmax) xmax=drawW;
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
- cR1=left_R;
- cG1=left_G;
- cB1=left_B;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
-
- for(j=xmin;j<=xmax;j++)
- {
- tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+((posX>>16))];
- if(iDither)
- GetTextureTransColGX_Dither(&psxVuw[(i<<10)+j], 
- psxVuw[clutP+tC1],
- (cB1>>16),(cG1>>16),(cR1>>16));
- else
- GetTextureTransColGX(&psxVuw[(i<<10)+j], 
- psxVuw[clutP+tC1],
- (cB1>>16),(cG1>>16),(cR1>>16));
- posX+=difX;
- posY+=difY;
- cR1+=difR;
- cG1+=difG;
- cB1+=difB;
- }
- }
- if(NextRow_GT()) 
- {
- return;
- }
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-
-void drawPoly3TGEx8_IL(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short clX, short clY, int col1, int col2, int col3)
-{
- int i,j,xmin,xmax,ymin,ymax,n_xi,n_yi,TXV,TXU;
- int cR1,cG1,cB1;
- int difR,difB,difG,difR2,difB2,difG2;
- int difX, difY,difX2, difY2;
- int posX,posY,YAdjust,clutP;
- short tC1,tC2;
-
- if(x1>drawW && x2>drawW && x3>drawW) return;
- if(y1>drawH && y2>drawH && y3>drawH) return;
- if(x1<drawX && x2<drawX && x3<drawX) return;
- if(y1<drawY && y2<drawY && y3<drawY) return;
- if(drawY>=drawH) return;
- if(drawX>=drawW) return; 
-
- if(!SetupSections_GT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3,col1,col2,col3)) return;
-
- ymax=Ymax;
-
- for(ymin=Ymin;ymin<drawY;ymin++)
- if(NextRow_GT()) return;
-
- clutP=(clY<<10)+clX;
-
- YAdjust=(GlobalTextAddrY<<10)+GlobalTextAddrX;
-
- difR=delta_right_R;
- difG=delta_right_G;
- difB=delta_right_B;
- difR2=difR<<1;
- difG2=difG<<1;
- difB2=difB<<1;
- difX=delta_right_u;difX2=difX<<1;
- difY=delta_right_v;difY2=difY<<1;
-
-#ifdef FASTSOLID
-
- if(!bCheckMask && !DrawSemiTrans && !iDither)
- {
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16)-1; // !!!!!!!!!!!!!
- if(drawW<xmax) xmax=drawW;
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
- cR1=left_R;
- cG1=left_G;
- cB1=left_B;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
-
- for(j=xmin;j<xmax;j+=2)
- {
- TXU=posX>>16;
- TXV=posY>>16;
- n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
- n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
-
- tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
-
- TXU=(posX+difX)>>16;
- TXV=(posY+difY)>>16;
- n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
- n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
-
- tC2= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
-
- GetTextureTransColGX32_S((uint32_t *)&psxVuw[(i<<10)+j],
- psxVuw[clutP+tC1]|
- ((int)psxVuw[clutP+tC2])<<16,
- (cB1>>16)|((cB1+difB)&0xff0000),
- (cG1>>16)|((cG1+difG)&0xff0000),
- (cR1>>16)|((cR1+difR)&0xff0000));
- posX+=difX2;
- posY+=difY2;
- cR1+=difR2;
- cG1+=difG2;
- cB1+=difB2;
- }
- if(j==xmax)
- {
- TXU=posX>>16;
- TXV=posY>>16;
- n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
- n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
-
- tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
-
- GetTextureTransColGX_S(&psxVuw[(i<<10)+j], 
- psxVuw[clutP+tC1],
- (cB1>>16),(cG1>>16),(cR1>>16));
- }
- }
- if(NextRow_GT()) 
- {
- return;
- }
- }
- return;
- }
-
-#endif
-
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!!!!!!!
- if(drawW<xmax) xmax=drawW;
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
- cR1=left_R;
- cG1=left_G;
- cB1=left_B;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
-
- for(j=xmin;j<=xmax;j++)
- {
- TXU=posX>>16;
- TXV=posY>>16;
- n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
- n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
-
- tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
-
- if(iDither)
- GetTextureTransColGX_Dither(&psxVuw[(i<<10)+j], 
- psxVuw[clutP+tC1],
- (cB1>>16),(cG1>>16),(cR1>>16));
- else
- GetTextureTransColGX(&psxVuw[(i<<10)+j], 
- psxVuw[clutP+tC1],
- (cB1>>16),(cG1>>16),(cR1>>16));
- posX+=difX;
- posY+=difY;
- cR1+=difR;
- cG1+=difG;
- cB1+=difB;
- }
- }
- if(NextRow_GT()) 
- {
- return;
- }
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-
-void drawPoly3TGEx8_TW(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short clX, short clY, int col1, int col2, int col3)
-{
- int i,j,xmin,xmax,ymin,ymax;
- int cR1,cG1,cB1;
- int difR,difB,difG,difR2,difB2,difG2;
- int difX, difY,difX2, difY2;
- int posX,posY,YAdjust,clutP;
- short tC1,tC2;
-
- if(x1>drawW && x2>drawW && x3>drawW) return;
- if(y1>drawH && y2>drawH && y3>drawH) return;
- if(x1<drawX && x2<drawX && x3<drawX) return;
- if(y1<drawY && y2<drawY && y3<drawY) return;
- if(drawY>=drawH) return;
- if(drawX>=drawW) return; 
-
- if(!SetupSections_GT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3,col1,col2,col3)) return;
-
- ymax=Ymax;
-
- for(ymin=Ymin;ymin<drawY;ymin++)
- if(NextRow_GT()) return;
-
- clutP=(clY<<10)+clX;
-
- YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);
- YAdjust+=(TWin.Position.y0<<11)+(TWin.Position.x0);
-
- difR=delta_right_R;
- difG=delta_right_G;
- difB=delta_right_B;
- difR2=difR<<1;
- difG2=difG<<1;
- difB2=difB<<1;
- difX=delta_right_u;difX2=difX<<1;
- difY=delta_right_v;difY2=difY<<1;
-
-#ifdef FASTSOLID
-
- if(!bCheckMask && !DrawSemiTrans && !iDither)
- {
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16)-1; // !!!!!!!!!!!!!
- if(drawW<xmax) xmax=drawW;
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
- cR1=left_R;
- cG1=left_G;
- cB1=left_B;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
-
- for(j=xmin;j<xmax;j+=2)
- {
- tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
- YAdjust+((posX>>16)%TWin.Position.x1)];
- tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
- YAdjust+(((posX+difX)>>16)%TWin.Position.x1)];
- 
- GetTextureTransColGX32_S((uint32_t *)&psxVuw[(i<<10)+j],
- psxVuw[clutP+tC1]|
- ((int)psxVuw[clutP+tC2])<<16,
- (cB1>>16)|((cB1+difB)&0xff0000),
- (cG1>>16)|((cG1+difG)&0xff0000),
- (cR1>>16)|((cR1+difR)&0xff0000));
- posX+=difX2;
- posY+=difY2;
- cR1+=difR2;
- cG1+=difG2;
- cB1+=difB2;
- }
- if(j==xmax)
- {
- tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
- YAdjust+((posX>>16)%TWin.Position.x1)];
- GetTextureTransColGX_S(&psxVuw[(i<<10)+j], 
- psxVuw[clutP+tC1],
- (cB1>>16),(cG1>>16),(cR1>>16));
- }
- }
- if(NextRow_GT()) 
- {
- return;
- }
- }
- return;
- }
-
-#endif
-
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!!!!!!!
- if(drawW<xmax) xmax=drawW;
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
- cR1=left_R;
- cG1=left_G;
- cB1=left_B;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
-
- for(j=xmin;j<=xmax;j++)
- {
- tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
- YAdjust+((posX>>16)%TWin.Position.x1)];
- if(iDither)
- GetTextureTransColGX_Dither(&psxVuw[(i<<10)+j], 
- psxVuw[clutP+tC1],
- (cB1>>16),(cG1>>16),(cR1>>16));
- else
- GetTextureTransColGX(&psxVuw[(i<<10)+j], 
- psxVuw[clutP+tC1],
- (cB1>>16),(cG1>>16),(cR1>>16));
- posX+=difX;
- posY+=difY;
- cR1+=difR;
- cG1+=difG;
- cB1+=difB;
- }
- }
- if(NextRow_GT()) 
- {
- return;
- }
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-
-// note: two g-shaded tris: small texture distortions can happen
-
-void drawPoly4TGEx8_TRI_IL(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, 
- short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, 
- short clX, short clY,
- int col1, int col2, int col3, int col4)
-{
- drawPoly3TGEx8_IL(x2,y2,x3,y3,x4,y4,
- tx2,ty2,tx3,ty3,tx4,ty4,
- clX,clY,
- col2,col4,col3);
- drawPoly3TGEx8_IL(x1,y1,x2,y2,x4,y4,
- tx1,ty1,tx2,ty2,tx4,ty4,
- clX,clY,
- col1,col2,col3);
-}
-
-#ifdef POLYQUAD3GT
- 
-void drawPoly4TGEx8_TRI(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, 
- short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, 
- short clX, short clY,
- int col1, int col2, int col3, int col4)
-{
- drawPoly3TGEx8(x2,y2,x3,y3,x4,y4,
- tx2,ty2,tx3,ty3,tx4,ty4,
- clX,clY,
- col2,col4,col3);
- drawPoly3TGEx8(x1,y1,x2,y2,x4,y4,
- tx1,ty1,tx2,ty2,tx4,ty4,
- clX,clY,
- col1,col2,col3);
-}
-
-#endif
-
-void drawPoly4TGEx8(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, 
- short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, 
- short clX, short clY,
- int col1, int col2, int col4, int col3)
-{
- int num; 
- int i,j,xmin,xmax,ymin,ymax;
- int cR1,cG1,cB1;
- int difR,difB,difG,difR2,difB2,difG2;
- int difX, difY, difX2, difY2;
- int posX,posY,YAdjust,clutP;
- short tC1,tC2;
-
- if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;
- if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;
- if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;
- if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;
- if(drawY>=drawH) return;
- if(drawX>=drawW) return; 
-
- if(!SetupSections_GT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4,col1,col2,col3,col4)) return;
-
- ymax=Ymax;
-
- for(ymin=Ymin;ymin<drawY;ymin++)
- if(NextRow_GT4()) return;
-
- clutP=(clY<<10)+clX;
-
- YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);
-
-#ifdef FASTSOLID
-
- if(!bCheckMask && !DrawSemiTrans && !iDither)
- {
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16);
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
-
- num=(xmax-xmin);
- if(num==0) num=1;
- difX=(right_u-posX)/num;
- difY=(right_v-posY)/num;
- difX2=difX<<1;
- difY2=difY<<1;
-
- cR1=left_R;
- cG1=left_G;
- cB1=left_B;
- difR=(right_R-cR1)/num;
- difG=(right_G-cG1)/num;
- difB=(right_B-cB1)/num;
- difR2=difR<<1;
- difG2=difG<<1;
- difB2=difB<<1;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
- xmax--;if(drawW<xmax) xmax=drawW;
-
- for(j=xmin;j<xmax;j+=2)
- {
- tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(posX>>16)];
- tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+
- ((posX+difX)>>16)];
-
- GetTextureTransColGX32_S((uint32_t *)&psxVuw[(i<<10)+j],
- psxVuw[clutP+tC1]|
- ((int)psxVuw[clutP+tC2])<<16,
- (cB1>>16)|((cB1+difB)&0xff0000),
- (cG1>>16)|((cG1+difG)&0xff0000),
- (cR1>>16)|((cR1+difR)&0xff0000));
- posX+=difX2;
- posY+=difY2;
- cR1+=difR2;
- cG1+=difG2;
- cB1+=difB2;
- }
- if(j==xmax)
- {
- tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(posX>>16)];
- GetTextureTransColGX_S(&psxVuw[(i<<10)+j], 
- psxVuw[clutP+tC1],
- (cB1>>16),(cG1>>16),(cR1>>16));
- }
- }
- if(NextRow_GT4()) return;
- }
- return;
- }
-
-#endif
-
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16);
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
-
- num=(xmax-xmin);
- if(num==0) num=1;
- difX=(right_u-posX)/num;
- difY=(right_v-posY)/num;
- difX2=difX<<1;
- difY2=difY<<1;
-
- cR1=left_R;
- cG1=left_G;
- cB1=left_B;
- difR=(right_R-cR1)/num;
- difG=(right_G-cG1)/num;
- difB=(right_B-cB1)/num;
- difR2=difR<<1;
- difG2=difG<<1;
- difB2=difB<<1;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
- xmax--;if(drawW<xmax) xmax=drawW;
-
- for(j=xmin;j<=xmax;j++)
- {
- tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(posX>>16)];
- if(iDither)
- GetTextureTransColGX_Dither(&psxVuw[(i<<10)+j], 
- psxVuw[clutP+tC1],
- (cB1>>16),(cG1>>16),(cR1>>16));
- else
- GetTextureTransColGX(&psxVuw[(i<<10)+j], 
- psxVuw[clutP+tC1],
- (cB1>>16),(cG1>>16),(cR1>>16));
- posX+=difX;
- posY+=difY;
- cR1+=difR;
- cG1+=difG;
- cB1+=difB;
- }
- }
- if(NextRow_GT4()) return;
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-
-void drawPoly4TGEx8_TW(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, 
- short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, 
- short clX, short clY,
- int col1, int col2, int col3, int col4)
-{
- drawPoly3TGEx8_TW(x2,y2,x3,y3,x4,y4,
- tx2,ty2,tx3,ty3,tx4,ty4,
- clX,clY,
- col2,col4,col3);
- drawPoly3TGEx8_TW(x1,y1,x2,y2,x4,y4,
- tx1,ty1,tx2,ty2,tx4,ty4,
- clX,clY,
- col1,col2,col3);
-}
-
-////////////////////////////////////////////////////////////////////////
-// POLY 3 G-SHADED TEX 15 BIT
-////////////////////////////////////////////////////////////////////////
-
-void drawPoly3TGD(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, int col1, int col2, int col3)
-{
- int i,j,xmin,xmax,ymin,ymax;
- int cR1,cG1,cB1;
- int difR,difB,difG,difR2,difB2,difG2;
- int difX, difY,difX2, difY2;
- int posX,posY;
-
- if(x1>drawW && x2>drawW && x3>drawW) return;
- if(y1>drawH && y2>drawH && y3>drawH) return;
- if(x1<drawX && x2<drawX && x3<drawX) return;
- if(y1<drawY && y2<drawY && y3<drawY) return;
- if(drawY>=drawH) return;
- if(drawX>=drawW) return; 
-
- if(!SetupSections_GT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3,col1,col2,col3)) return;
-
- ymax=Ymax;
-
- for(ymin=Ymin;ymin<drawY;ymin++)
- if(NextRow_GT()) return;
-
- difR=delta_right_R;
- difG=delta_right_G;
- difB=delta_right_B;
- difR2=difR<<1;
- difG2=difG<<1;
- difB2=difB<<1;
- difX=delta_right_u;difX2=difX<<1;
- difY=delta_right_v;difY2=difY<<1;
-
-#ifdef FASTSOLID
-
- if(!bCheckMask && !DrawSemiTrans && !iDither)
- { 
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!!!!
- if(drawW<xmax) xmax=drawW;
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
- cR1=left_R;
- cG1=left_G;
- cB1=left_B;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
-
- for(j=xmin;j<xmax;j+=2)
- {
- GetTextureTransColGX32_S((uint32_t *)&psxVuw[(i<<10)+j],
- (((int)psxVuw[((((posY+difY)>>16)+GlobalTextAddrY)<<10)+((posX+difX)>>16)+GlobalTextAddrX])<<16)|
- psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+((posX)>>16)+GlobalTextAddrX],
- (cB1>>16)|((cB1+difB)&0xff0000),
- (cG1>>16)|((cG1+difG)&0xff0000),
- (cR1>>16)|((cR1+difR)&0xff0000));
- posX+=difX2;
- posY+=difY2;
- cR1+=difR2;
- cG1+=difG2;
- cB1+=difB2;
- }
- if(j==xmax)
- GetTextureTransColGX_S(&psxVuw[(i<<10)+j],
- psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+(posX>>16)+GlobalTextAddrX],
- (cB1>>16),(cG1>>16),(cR1>>16));
- }
- if(NextRow_GT()) 
- {
- return;
- }
- }
- return;
- }
-
-#endif
-
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!!
- if(drawW<xmax) xmax=drawW;
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
- cR1=left_R;
- cG1=left_G;
- cB1=left_B;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
-
- for(j=xmin;j<=xmax;j++)
- {
- if(iDither)
- GetTextureTransColGX_Dither(&psxVuw[(i<<10)+j],
- psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+(posX>>16)+GlobalTextAddrX],
- (cB1>>16),(cG1>>16),(cR1>>16));
- else
- GetTextureTransColGX(&psxVuw[(i<<10)+j],
- psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+(posX>>16)+GlobalTextAddrX],
- (cB1>>16),(cG1>>16),(cR1>>16));
- posX+=difX;
- posY+=difY;
- cR1+=difR;
- cG1+=difG;
- cB1+=difB;
- }
- }
- if(NextRow_GT()) 
- {
- return;
- }
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-
-void drawPoly3TGD_TW(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, int col1, int col2, int col3)
-{
- int i,j,xmin,xmax,ymin,ymax;
- int cR1,cG1,cB1;
- int difR,difB,difG,difR2,difB2,difG2;
- int difX, difY,difX2, difY2;
- int posX,posY;
-
- if (x1>drawW && x2>drawW && x3>drawW) return;
- if (y1>drawH && y2>drawH && y3>drawH) return;
- if (x1<drawX && x2<drawX && x3<drawX) return;
- if (y1<drawY && y2<drawY && y3<drawY) return;
- if (drawY >= drawH) return;
- if (drawX >= drawW) return; 
-
- if (!SetupSections_GT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3,col1,col2,col3)) return;
-
- ymax = Ymax;
-
- for(ymin = Ymin; ymin < drawY; ymin++)
- if(NextRow_GT()) return;
-
- difR = delta_right_R;
- difG = delta_right_G;
- difB = delta_right_B;
- difR2 = difR<<1;
- difG2 = difG<<1;
- difB2 = difB<<1;
- difX = delta_right_u; difX2 = difX<<1;
- difY = delta_right_v; difY2 = difY<<1;
-
-#ifdef FASTSOLID
-
- if (!bCheckMask && !DrawSemiTrans && !iDither)
- { 
- for (i = ymin; i <= ymax; i++)
- {
- xmin = (left_x >> 16);
- xmax = (right_x >> 16) - 1; //!!!!!!!!!!!!!!!!!!!!
- if(drawW<xmax) xmax=drawW;
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
- cR1=left_R;
- cG1=left_G;
- cB1=left_B;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
-
- for(j=xmin;j<xmax;j+=2)
- {
- GetTextureTransColGX32_S((uint32_t *)&psxVuw[(i<<10)+j],
- (((int)psxVuw[(((((posY+difY)>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
- (((posX+difX)>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0])<<16)|
- psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
- (((posX)>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0],
- (cB1>>16)|((cB1+difB)&0xff0000),
- (cG1>>16)|((cG1+difG)&0xff0000),
- (cR1>>16)|((cR1+difR)&0xff0000));
- posX+=difX2;
- posY+=difY2;
- cR1+=difR2;
- cG1+=difG2;
- cB1+=difB2;
- }
- if(j==xmax)
- GetTextureTransColGX_S(&psxVuw[(i<<10)+j],
- psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
- ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0],
- (cB1>>16),(cG1>>16),(cR1>>16));
- }
- if(NextRow_GT()) 
- {
- return;
- }
- }
- return;
- }
-
-#endif
-
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!!
- if(drawW<xmax) xmax=drawW;
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
- cR1=left_R;
- cG1=left_G;
- cB1=left_B;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
-
- for(j=xmin;j<=xmax;j++)
- {
- if(iDither)
- GetTextureTransColGX_Dither(&psxVuw[(i<<10)+j],
- psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
- ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0],
- (cB1>>16),(cG1>>16),(cR1>>16));
- else
- GetTextureTransColGX(&psxVuw[(i<<10)+j],
- psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
- ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0],
- (cB1>>16),(cG1>>16),(cR1>>16));
- posX+=difX;
- posY+=difY;
- cR1+=difR;
- cG1+=difG;
- cB1+=difB;
- }
- }
- if(NextRow_GT()) 
- {
- return;
- }
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-
-// note: two g-shaded tris: small texture distortions can happen
-
-#ifdef POLYQUAD3GT
-
-void drawPoly4TGD_TRI(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, int col1, int col2, int col3, int col4)
-{
- drawPoly3TGD(x2,y2,x3,y3,x4,y4,
- tx2,ty2,tx3,ty3,tx4,ty4,
- col2,col4,col3);
- drawPoly3TGD(x1,y1,x2,y2,x4,y4,
- tx1,ty1,tx2,ty2,tx4,ty4,
- col1,col2,col3);
-}
-
-#endif
-
-void drawPoly4TGD(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, int col1, int col2, int col4, int col3)
-{
- int num; 
- int i,j,xmin,xmax,ymin,ymax;
- int cR1,cG1,cB1;
- int difR,difB,difG,difR2,difB2,difG2;
- int difX, difY, difX2, difY2;
- int posX,posY;
-
- if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;
- if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;
- if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;
- if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;
- if(drawY>=drawH) return;
- if(drawX>=drawW) return; 
-
- if(!SetupSections_GT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4,col1,col2,col3,col4)) return;
-
- ymax = Ymax;
-
- for (ymin = Ymin; ymin < drawY; ymin++)
- if (NextRow_GT4()) return;
-
-#ifdef FASTSOLID
-
- if(!bCheckMask && !DrawSemiTrans && !iDither)
- {
- for (i = ymin; i <= ymax; i++)
- {
- xmin = (left_x >> 16);
- xmax = (right_x >> 16);
-
- if(xmax >= xmin)
- {
- posX = left_u;
- posY = left_v;
-
- num = (xmax-xmin);
- if(num==0) num=1;
- difX=(right_u-posX)/num;
- difY=(right_v-posY)/num;
- difX2=difX<<1;
- difY2=difY<<1;
-
- cR1=left_R;
- cG1=left_G;
- cB1=left_B;
- difR=(right_R-cR1)/num;
- difG=(right_G-cG1)/num;
- difB=(right_B-cB1)/num;
- difR2=difR<<1;
- difG2=difG<<1;
- difB2=difB<<1;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
- xmax--;if(drawW<xmax) xmax=drawW;
-
- for(j=xmin;j<xmax;j+=2)
- {
- GetTextureTransColGX32_S((uint32_t *)&psxVuw[(i<<10)+j],
- (((int)psxVuw[((((posY+difY)>>16)+GlobalTextAddrY)<<10)+((posX+difX)>>16)+GlobalTextAddrX])<<16)|
- psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+((posX)>>16)+GlobalTextAddrX],
- (cB1>>16)|((cB1+difB)&0xff0000),
- (cG1>>16)|((cG1+difG)&0xff0000),
- (cR1>>16)|((cR1+difR)&0xff0000));
- posX+=difX2;
- posY+=difY2;
- cR1+=difR2;
- cG1+=difG2;
- cB1+=difB2;
- }
- if(j==xmax)
- GetTextureTransColGX_S(&psxVuw[(i<<10)+j],
- psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+(posX>>16)+GlobalTextAddrX],
- (cB1>>16),(cG1>>16),(cR1>>16));
- }
- if(NextRow_GT4()) return;
- }
- return;
- }
-
-#endif
-
- for (i=ymin;i<=ymax;i++)
- {
- xmin=(left_x >> 16);
- xmax=(right_x >> 16);
-
- if(xmax>=xmin)
- {
- posX=left_u;
- posY=left_v;
-
- num=(xmax-xmin);
- if(num==0) num=1;
- difX=(right_u-posX)/num;
- difY=(right_v-posY)/num;
- difX2=difX<<1;
- difY2=difY<<1;
-
- cR1=left_R;
- cG1=left_G;
- cB1=left_B;
- difR=(right_R-cR1)/num;
- difG=(right_G-cG1)/num;
- difB=(right_B-cB1)/num;
- difR2=difR<<1;
- difG2=difG<<1;
- difB2=difB<<1;
-
- if(xmin<drawX)
- {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
- xmax--;if(drawW<xmax) xmax=drawW;
-
- for(j=xmin;j<=xmax;j++)
- {
- if(iDither)
- GetTextureTransColGX(&psxVuw[(i<<10)+j],
- psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+(posX>>16)+GlobalTextAddrX],
- (cB1>>16),(cG1>>16),(cR1>>16));
- else
- GetTextureTransColGX(&psxVuw[(i<<10)+j],
- psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+(posX>>16)+GlobalTextAddrX],
- (cB1>>16),(cG1>>16),(cR1>>16));
- posX+=difX;
- posY+=difY;
- cR1+=difR;
- cG1+=difG;
- cB1+=difB;
- }
- }
- if(NextRow_GT4()) return;
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-
-void drawPoly4TGD_TW(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, int col1, int col2, int col3, int col4)
-{
- drawPoly3TGD_TW(x2,y2,x3,y3,x4,y4,
- tx2,ty2,tx3,ty3,tx4,ty4,
- col2,col4,col3);
- drawPoly3TGD_TW(x1,y1,x2,y2,x4,y4,
- tx1,ty1,tx2,ty2,tx4,ty4,
- col1,col2,col3);
-}
-
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-
-
-/*
-// no real rect test, but it does its job the way I need it
-__inline BOOL IsNoRect(void)
-{
- if(lx0==lx1 && lx2==lx3) return FALSE;
- if(lx0==lx2 && lx1==lx3) return FALSE;
- if(lx0==lx3 && lx1==lx2) return FALSE;
- return TRUE; 
-}
-*/
-
-// real rect test
-__inline BOOL IsNoRect(void)
-{
- //if(!(dwActFixes&0x200)) return FALSE;
-
- if(ly0==ly1)
- {
- if(lx1==lx3 && ly3==ly2 && lx2==lx0) return FALSE;
- if(lx1==lx2 && ly2==ly3 && lx3==lx0) return FALSE;
- return TRUE;
- }
- 
- if(ly0==ly2)
- {
- if(lx2==lx3 && ly3==ly1 && lx1==lx0) return FALSE;
- if(lx2==lx1 && ly1==ly3 && lx3==lx0) return FALSE;
- return TRUE;
- }
- 
- if(ly0==ly3)
- {
- if(lx3==lx2 && ly2==ly1 && lx1==lx0) return FALSE;
- if(lx3==lx1 && ly1==ly2 && lx2==lx0) return FALSE;
- return TRUE;
- }
- return TRUE;
-}
-
-////////////////////////////////////////////////////////////////////////
-
-void drawPoly3FT(unsigned char *baseAddr)
-{
- uint32_t *gpuData = ((uint32_t *) baseAddr);
-
- if(GlobalTextIL && GlobalTextTP<2)
- {
- if(GlobalTextTP==0)
- drawPoly3TEx4_IL(lx0,ly0,lx1,ly1,lx2,ly2,
- (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), 
- ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
- else
- drawPoly3TEx8_IL(lx0,ly0,lx1,ly1,lx2,ly2,
- (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), 
- ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
- return;
- }
-
- if(!bUsingTWin)// && !(dwActFixes&0x100))
- {
- switch(GlobalTextTP) // depending on texture mode
- {
- case 0:
- drawPoly3TEx4(lx0,ly0,lx1,ly1,lx2,ly2,
- (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), 
- ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
- return;
- case 1:
- drawPoly3TEx8(lx0,ly0,lx1,ly1,lx2,ly2,
- (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), 
- ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
- return;
- case 2:
- drawPoly3TD(lx0,ly0,lx1,ly1,lx2,ly2,(gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff));
- return;
- }
- return;
- }
-
- switch(GlobalTextTP) // depending on texture mode
- {
- case 0:
- drawPoly3TEx4_TW(lx0,ly0,lx1,ly1,lx2,ly2,
- (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), 
- ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
- return;
- case 1:
- drawPoly3TEx8_TW(lx0,ly0,lx1,ly1,lx2,ly2,
- (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), 
- ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
- return;
- case 2:
- drawPoly3TD_TW(lx0,ly0,lx1,ly1,lx2,ly2,(gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff));
- return;
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-
-void drawPoly4FT(unsigned char *baseAddr)
-{
- uint32_t *gpuData = ((uint32_t *) baseAddr);
-
- if(GlobalTextIL && GlobalTextTP<2)
- {
- if(GlobalTextTP==0)
- drawPoly4TEx4_IL(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
- (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
- else
- drawPoly4TEx8_IL(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
- (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
- return;
- }
-
- if(!bUsingTWin)
- {
-#ifdef POLYQUAD3GT
- if(IsNoRect())
- {
- switch (GlobalTextTP)
- {
- case 0:
- drawPoly4TEx4_TRI(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
- (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
- return;
- case 1:
- drawPoly4TEx8_TRI(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
- (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
- return;
- case 2:
- drawPoly4TD_TRI(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,(gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff));
- return;
- }
- return;
- }
-#endif
- 
- switch (GlobalTextTP)
- {
- case 0: // grandia investigations needed
- drawPoly4TEx4(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
- (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
- return;
- case 1:
- drawPoly4TEx8(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
- (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
- return;
- case 2:
- drawPoly4TD(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,(gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff));
- return;
- }
- return;
- }
-
- switch (GlobalTextTP)
- {
- case 0:
- drawPoly4TEx4_TW(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
- (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
- return;
- case 1:
- drawPoly4TEx8_TW(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
- (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
- return;
- case 2:
- drawPoly4TD_TW(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,(gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff));
- return;
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-
-void drawPoly3GT(unsigned char * baseAddr)
-{
- uint32_t *gpuData = ((uint32_t *) baseAddr);
-
- if(GlobalTextIL && GlobalTextTP<2)
- {
- if(GlobalTextTP==0)
- drawPoly3TGEx4_IL(lx0,ly0,lx1,ly1,lx2,ly2,
- (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff), 
- ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask),
- gpuData[0],gpuData[3],gpuData[6]);
- else
- drawPoly3TGEx8_IL(lx0,ly0,lx1,ly1,lx2,ly2,
- (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff), 
- ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask),
- gpuData[0],gpuData[3],gpuData[6]);
- return;
- }
-
- if(!bUsingTWin)
- {
- switch (GlobalTextTP)
- {
- case 0:
- drawPoly3TGEx4(lx0,ly0,lx1,ly1,lx2,ly2,
- (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff), 
- ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask),
- gpuData[0],gpuData[3],gpuData[6]);
- return;
- case 1:
- drawPoly3TGEx8(lx0,ly0,lx1,ly1,lx2,ly2,
- (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff), 
- ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask),
- gpuData[0],gpuData[3],gpuData[6]);
- return;
- case 2:
- drawPoly3TGD(lx0,ly0,lx1,ly1,lx2,ly2,(gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),gpuData[0],gpuData[3],gpuData[6]);
- return;
- }
- return;
- }
-
- switch(GlobalTextTP)
- {
- case 0:
- drawPoly3TGEx4_TW(lx0,ly0,lx1,ly1,lx2,ly2,
- (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff), 
- ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask),
- gpuData[0],gpuData[3],gpuData[6]);
- return;
- case 1:
- drawPoly3TGEx8_TW(lx0,ly0,lx1,ly1,lx2,ly2,
- (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff), 
- ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask),
- gpuData[0],gpuData[3],gpuData[6]);
- return;
- case 2:
- drawPoly3TGD_TW(lx0,ly0,lx1,ly1,lx2,ly2,(gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),gpuData[0],gpuData[3],gpuData[6]);
- return;
- }
-} 
-
-////////////////////////////////////////////////////////////////////////
-
-void drawPoly4GT(unsigned char *baseAddr)
-{
- uint32_t *gpuData = ((uint32_t *) baseAddr);
-
- if(GlobalTextIL && GlobalTextTP<2)
- {
- if(GlobalTextTP==0)
- drawPoly4TGEx4_TRI_IL(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
- (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[11] & 0x000000ff), ((gpuData[11]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),
- ((gpuData[2]>>12) & 0x3f0),((gpuData[2]>>22) & iGPUHeightMask),
- gpuData[0],gpuData[3],gpuData[6],gpuData[9]);
- else
- drawPoly4TGEx8_TRI_IL(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
- (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[11] & 0x000000ff), ((gpuData[11]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),
- ((gpuData[2]>>12) & 0x3f0),((gpuData[2]>>22) & iGPUHeightMask),
- gpuData[0],gpuData[3],gpuData[6],gpuData[9]);
- return;
- }
-
- if(!bUsingTWin)
- {
-#ifdef POLYQUAD3GT
- if(IsNoRect())
- {
- switch (GlobalTextTP)
- {
- case 0:
- drawPoly4TGEx4_TRI(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
- (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[11] & 0x000000ff), ((gpuData[11]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),
- ((gpuData[2]>>12) & 0x3f0),((gpuData[2]>>22) & iGPUHeightMask),
- gpuData[0],gpuData[3],gpuData[6],gpuData[9]);
-
- return;
- case 1:
- drawPoly4TGEx8_TRI(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
- (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[11] & 0x000000ff), ((gpuData[11]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),
- ((gpuData[2]>>12) & 0x3f0),((gpuData[2]>>22) & iGPUHeightMask),
- gpuData[0],gpuData[3],gpuData[6],gpuData[9]);
- return;
- case 2:
- drawPoly4TGD_TRI(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,(gpuData[2] & 0x000000ff),((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[11] & 0x000000ff), ((gpuData[11]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),gpuData[0],gpuData[3],gpuData[6],gpuData[9]);
- return;
- }
- return;
- }
-#endif
-
- switch (GlobalTextTP)
- {
- case 0:
- drawPoly4TGEx4(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
- (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[11] & 0x000000ff), ((gpuData[11]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),
- ((gpuData[2]>>12) & 0x3f0),((gpuData[2]>>22) & iGPUHeightMask),
- gpuData[0],gpuData[3],gpuData[6],gpuData[9]);
-
- return;
- case 1:
- drawPoly4TGEx8(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
- (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[11] & 0x000000ff), ((gpuData[11]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),
- ((gpuData[2]>>12) & 0x3f0),((gpuData[2]>>22) & iGPUHeightMask),
- gpuData[0],gpuData[3],gpuData[6],gpuData[9]);
- return;
- case 2:
- drawPoly4TGD(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,(gpuData[2] & 0x000000ff),((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[11] & 0x000000ff), ((gpuData[11]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),gpuData[0],gpuData[3],gpuData[6],gpuData[9]);
- return;
- }
- return;
- }
- 
- switch (GlobalTextTP)
- {
- case 0:
- drawPoly4TGEx4_TW(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
- (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[11] & 0x000000ff), ((gpuData[11]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),
- ((gpuData[2]>>12) & 0x3f0),((gpuData[2]>>22) & iGPUHeightMask),
- gpuData[0],gpuData[3],gpuData[6],gpuData[9]);
- return;
- case 1:
- drawPoly4TGEx8_TW(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
- (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[11] & 0x000000ff), ((gpuData[11]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),
- ((gpuData[2]>>12) & 0x3f0),((gpuData[2]>>22) & iGPUHeightMask),
- gpuData[0],gpuData[3],gpuData[6],gpuData[9]);
- return;
- case 2:
- drawPoly4TGD_TW(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,(gpuData[2] & 0x000000ff),((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[11] & 0x000000ff), ((gpuData[11]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),gpuData[0],gpuData[3],gpuData[6],gpuData[9]);
- return;
- }
-}
- 
-////////////////////////////////////////////////////////////////////////
-// SPRITE FUNCS
-////////////////////////////////////////////////////////////////////////
-
-void DrawSoftwareSpriteTWin(unsigned char * baseAddr, int w, int h)
-{ 
- uint32_t *gpuData = (uint32_t *)baseAddr;
- short sx0,sy0,sx1,sy1,sx2,sy2,sx3,sy3;
- short tx0,ty0,tx1,ty1,tx2,ty2,tx3,ty3;
-
- sx0=lx0;
- sy0=ly0;
-
- sx0=sx3=sx0+PSXDisplay.DrawOffset.x;
- sx1=sx2=sx0+w;
- sy0=sy1=sy0+PSXDisplay.DrawOffset.y;
- sy2=sy3=sy0+h;
- 
- tx0=tx3=gpuData[2]&0xff;
- tx1=tx2=tx0+w;
- ty0=ty1=(gpuData[2]>>8)&0xff;
- ty2=ty3=ty0+h;
-
- switch (GlobalTextTP)
- {
- case 0:
- drawPoly4TEx4_TW_S(sx0,sy0,sx1,sy1,sx2,sy2,sx3,sy3,
- tx0,ty0,tx1,ty1,tx2,ty2,tx3,ty3, 
- ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
- return;
- case 1:
- drawPoly4TEx8_TW_S(sx0,sy0,sx1,sy1,sx2,sy2,sx3,sy3,
- tx0,ty0,tx1,ty1,tx2,ty2,tx3,ty3, 
- ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
- return;
- case 2:
- drawPoly4TD_TW_S(sx0,sy0,sx1,sy1,sx2,sy2,sx3,sy3,
- tx0,ty0,tx1,ty1,tx2,ty2,tx3,ty3);
- return;
- }
-} 
-
-////////////////////////////////////////////////////////////////////////
-
-void DrawSoftwareSpriteMirror(unsigned char * baseAddr, int w, int h)
-{
- int sprtY,sprtX,sprtW,sprtH,lXDir,lYDir;
- int clutY0,clutX0,clutP,textX0,textY0,sprtYa,sprCY,sprCX,sprA;
- short tC;
- uint32_t *gpuData = (uint32_t *)baseAddr;
- sprtY = ly0;
- sprtX = lx0;
- sprtH = h;
- sprtW = w;
- clutY0 = (gpuData[2]>>22) & iGPUHeightMask;
- clutX0 = (gpuData[2]>>12) & 0x3f0;
- clutP = (clutY0<<11) + (clutX0<<1);
- textY0 = ((gpuData[2]>>8) & 0x000000ff) + GlobalTextAddrY;
- textX0 = (gpuData[2] & 0x000000ff);
-
- sprtX+=PSXDisplay.DrawOffset.x;
- sprtY+=PSXDisplay.DrawOffset.y;
-
-// while (sprtX>1023) sprtX-=1024;
-// while (sprtY>MAXYLINESMIN1) sprtY-=MAXYLINES;
-
- if(sprtX>drawW)
- {
-// if((sprtX+sprtW)>1023) sprtX-=1024;
-// else return;
- return;
- }
-
- if(sprtY>drawH)
- {
-// if ((sprtY+sprtH)>MAXYLINESMIN1) sprtY-=MAXYLINES;
-// else return;
- return;
- }
-
- if(sprtY<drawY)
- {
- if((sprtY+sprtH)<drawY) return;
- sprtH-=(drawY-sprtY);
- textY0+=(drawY-sprtY);
- sprtY=drawY;
- }
-
- if(sprtX<drawX)
- {
- if((sprtX+sprtW)<drawX) return;
- sprtW-=(drawX-sprtX);
- textX0+=(drawX-sprtX);
- sprtX=drawX;
- }
-
- if((sprtY+sprtH)>drawH) sprtH=drawH-sprtY+1;
- if((sprtX+sprtW)>drawW) sprtW=drawW-sprtX+1;
-
- if(usMirror&0x1000) lXDir=-1; else lXDir=1;
- if(usMirror&0x2000) lYDir=-1; else lYDir=1;
-
- switch (GlobalTextTP)
- {
- case 0: // texture is 4-bit
- 
- sprtW=sprtW/2;
- textX0=(GlobalTextAddrX<<1)+(textX0>>1);
- sprtYa=(sprtY<<10);
- clutP=(clutY0<<10)+clutX0;
- for (sprCY=0;sprCY<sprtH;sprCY++)
- for (sprCX=0;sprCX<sprtW;sprCX++)
- {
- tC= psxVub[((textY0+(sprCY*lYDir))<<11) + textX0 +(sprCX*lXDir)];
- sprA=sprtYa+(sprCY<<10)+sprtX + (sprCX<<1);
- GetTextureTransColG_SPR(&psxVuw[sprA],psxVuw[clutP+((tC>>4)&0xf)]);
- GetTextureTransColG_SPR(&psxVuw[sprA+1],psxVuw[clutP+(tC&0xf)]);
- }
- return;
-
- case 1: 
-
- clutP>>=1;
- for(sprCY=0;sprCY<sprtH;sprCY++)
- for(sprCX=0;sprCX<sprtW;sprCX++)
- { 
- tC = psxVub[((textY0+(sprCY*lYDir))<<11)+(GlobalTextAddrX<<1) + textX0 + (sprCX*lXDir)] & 0xff;
- GetTextureTransColG_SPR(&psxVuw[((sprtY+sprCY)<<10)+sprtX + sprCX],psxVuw[clutP+tC]);
- }
- return;
-
-
- case 2:
-
- for (sprCY=0;sprCY<sprtH;sprCY++)
- for (sprCX=0;sprCX<sprtW;sprCX++)
- { 
- GetTextureTransColG_SPR(&psxVuw[((sprtY+sprCY)<<10)+sprtX+sprCX],
- psxVuw[((textY0+(sprCY*lYDir))<<10)+GlobalTextAddrX + textX0 +(sprCX*lXDir)]);
- }
- return;
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-
-void DrawSoftwareSprite_IL(unsigned char * baseAddr,short w,short h,int tx,int ty)
-{
- int sprtY,sprtX,sprtW,sprtH,tdx,tdy;
- uint32_t *gpuData = (uint32_t *)baseAddr;
-
- sprtY = ly0;
- sprtX = lx0;
- sprtH = h;
- sprtW = w;
-
- sprtX+=PSXDisplay.DrawOffset.x;
- sprtY+=PSXDisplay.DrawOffset.y;
-
- if(sprtX>drawW) return;
- if(sprtY>drawH) return;
-
- tdx=tx+sprtW;
- tdy=ty+sprtH;
-
- sprtW+=sprtX;
- sprtH+=sprtY;
-
- // Pete is too lazy to make a faster version ;)
-
- if(GlobalTextTP==0)
- drawPoly4TEx4_IL(sprtX,sprtY,sprtX,sprtH,sprtW,sprtH,sprtW,sprtY,
- tx,ty, tx,tdy, tdx,tdy, tdx,ty, 
- (gpuData[2]>>12) & 0x3f0, ((gpuData[2]>>22) & iGPUHeightMask));
-
-
- else
- drawPoly4TEx8_IL(sprtX,sprtY,sprtX,sprtH,sprtW,sprtH,sprtW,sprtY,
- tx,ty, tx,tdy, tdx,tdy, tdx,ty, 
- (gpuData[2]>>12) & 0x3f0, ((gpuData[2]>>22) & iGPUHeightMask));
-}
-
-////////////////////////////////////////////////////////////////////////
-
-void DrawSoftwareSprite(unsigned char *baseAddr, short w, short h, int tx, int ty)
-{
- int sprtY, sprtX, sprtW, sprtH;
- int clutY0, clutX0, clutP, textX0, textY0, sprtYa, sprCY, sprCX, sprA;
- short tC, tC2;
- uint32_t *gpuData = (uint32_t *)baseAddr;
- unsigned char *pV;
- BOOL bWT,bWS;
-
- if(GlobalTextIL && GlobalTextTP<2)
- {DrawSoftwareSprite_IL(baseAddr,w,h,tx,ty);return;}
-
- sprtY = ly0;
- sprtX = lx0;
- sprtH = h;
- sprtW = w;
- clutY0 = (gpuData[2]>>22) & iGPUHeightMask;
- clutX0 = (gpuData[2]>>12) & 0x3f0;
-
- clutP = (clutY0<<11) + (clutX0<<1);
-
- textY0 =ty+ GlobalTextAddrY;
- textX0 =tx;
-
- sprtX+=PSXDisplay.DrawOffset.x;
- sprtY+=PSXDisplay.DrawOffset.y;
-
- //while (sprtX>1023) sprtX-=1024;
- //while (sprtY>MAXYLINESMIN1) sprtY-=MAXYLINES;
-
- if(sprtX>drawW)
- {
-// if((sprtX+sprtW)>1023) sprtX-=1024;
-// else return;
- return;
- }
-
- if(sprtY>drawH)
- {
-// if ((sprtY+sprtH)>MAXYLINESMIN1) sprtY-=MAXYLINES;
-// else return;
- return;
- }
-
- if(sprtY<drawY)
- {
- if((sprtY+sprtH)<drawY) return;
- sprtH-=(drawY-sprtY);
- textY0+=(drawY-sprtY);
- sprtY=drawY;
- }
-
- if(sprtX<drawX)
- {
- if((sprtX+sprtW)<drawX) return;
-
- sprtW-=(drawX-sprtX);
- textX0+=(drawX-sprtX);
- sprtX=drawX;
- }
-
- if((sprtY+sprtH)>drawH) sprtH=drawH-sprtY+1;
- if((sprtX+sprtW)>drawW) sprtW=drawW-sprtX+1;
-
-
- bWT=FALSE;
- bWS=FALSE;
-
- switch (GlobalTextTP)
- {
- case 0:
-
- if(textX0&1) {bWS=TRUE;sprtW--;}
- if(sprtW&1) bWT=TRUE;
- 
- sprtW=sprtW>>1;
- textX0=(GlobalTextAddrX<<1)+(textX0>>1)+(textY0<<11);
- sprtYa=(sprtY<<10)+sprtX;
- clutP=(clutY0<<10)+clutX0;
-
-#ifdef FASTSOLID
- 
- if(!bCheckMask && !DrawSemiTrans)
- {
- for (sprCY=0;sprCY<sprtH;sprCY++)
- {
- sprA=sprtYa+(sprCY<<10);
- pV=&psxVub[(sprCY<<11)+textX0];
-
- if(bWS)
- {
- tC=*pV++;
- GetTextureTransColG_S(&psxVuw[sprA++],psxVuw[clutP+((tC>>4)&0xf)]);
- }
-
- for (sprCX=0;sprCX<sprtW;sprCX++,sprA+=2)
- { 
- tC=*pV++;
-
- GetTextureTransColG32_S((uint32_t *)&psxVuw[sprA],
- (((int)psxVuw[clutP+((tC>>4)&0xf)])<<16)|
- psxVuw[clutP+(tC&0x0f)]);
- }
-
- if(bWT)
- {
- tC=*pV;
- GetTextureTransColG_S(&psxVuw[sprA],psxVuw[clutP+(tC&0x0f)]);
- }
- }
- return;
- }
-
-#endif
-
- for (sprCY=0;sprCY<sprtH;sprCY++)
- {
- sprA=sprtYa+(sprCY<<10);
- pV=&psxVub[(sprCY<<11)+textX0];
-
- if(bWS)
- {
- tC=*pV++;
- GetTextureTransColG_SPR(&psxVuw[sprA++],psxVuw[clutP+((tC>>4)&0xf)]);
- }
-
- for (sprCX=0;sprCX<sprtW;sprCX++,sprA+=2)
- { 
- tC=*pV++;
-
- GetTextureTransColG32_SPR((uint32_t *)&psxVuw[sprA],
- (((int)psxVuw[clutP+((tC>>4)&0xf)])<<16)|
- psxVuw[clutP+(tC&0x0f)]);
- }
-
- if(bWT)
- {
- tC=*pV;
- GetTextureTransColG_SPR(&psxVuw[sprA],psxVuw[clutP+(tC&0x0f)]);
- }
- }
- return;
-
- case 1:
- clutP>>=1;sprtW--;
- textX0+=(GlobalTextAddrX<<1) + (textY0<<11);
-
-#ifdef FASTSOLID
-
- if(!bCheckMask && !DrawSemiTrans)
- {
- for(sprCY=0;sprCY<sprtH;sprCY++)
- {
- sprA=((sprtY+sprCY)<<10)+sprtX;
- pV=&psxVub[(sprCY<<11)+textX0];
- for(sprCX=0;sprCX<sprtW;sprCX+=2,sprA+=2)
- { 
- tC = *pV++;tC2 = *pV++;
- GetTextureTransColG32_S((uint32_t *)&psxVuw[sprA],
- (((int)psxVuw[clutP+tC2])<<16)|
- psxVuw[clutP+tC]);
- }
- if(sprCX==sprtW)
- GetTextureTransColG_S(&psxVuw[sprA],psxVuw[clutP+(*pV)]);
- }
- return;
- }
-
-#endif
-
- for(sprCY=0;sprCY<sprtH;sprCY++)
- {
- sprA=((sprtY+sprCY)<<10)+sprtX;
- pV=&psxVub[(sprCY<<11)+textX0];
- for(sprCX=0;sprCX<sprtW;sprCX+=2,sprA+=2)
- { 
- tC = *pV++;tC2 = *pV++;
- GetTextureTransColG32_SPR((uint32_t *)&psxVuw[sprA],
- (((int)psxVuw[clutP+tC2])<<16)|
- psxVuw[clutP+tC]);
- }
- if(sprCX==sprtW)
- GetTextureTransColG_SPR(&psxVuw[sprA],psxVuw[clutP+(*pV)]);
- }
- return;
-
- case 2:
-
- textX0+=(GlobalTextAddrX) + (textY0<<10);
- sprtW--;
-
-#ifdef FASTSOLID
-
- if(!bCheckMask && !DrawSemiTrans)
- {
- for (sprCY=0;sprCY<sprtH;sprCY++)
- {
- sprA=((sprtY+sprCY)<<10)+sprtX;
-
- for (sprCX=0;sprCX<sprtW;sprCX+=2,sprA+=2)
- { 
- GetTextureTransColG32_S((uint32_t *)&psxVuw[sprA],
- (((int)psxVuw[(sprCY<<10) + textX0 + sprCX +1])<<16)|
- psxVuw[(sprCY<<10) + textX0 + sprCX]);
- }
- if(sprCX==sprtW)
- GetTextureTransColG_S(&psxVuw[sprA],
- psxVuw[(sprCY<<10) + textX0 + sprCX]);
-
- }
- return;
- }
-
-#endif
-
- for (sprCY=0;sprCY<sprtH;sprCY++)
- {
- sprA=((sprtY+sprCY)<<10)+sprtX;
-
- for (sprCX=0;sprCX<sprtW;sprCX+=2,sprA+=2)
- { 
- GetTextureTransColG32_SPR((uint32_t *)&psxVuw[sprA],
- (((int)psxVuw[(sprCY<<10) + textX0 + sprCX +1])<<16)|
- psxVuw[(sprCY<<10) + textX0 + sprCX]);
- }
- if(sprCX==sprtW)
- GetTextureTransColG_SPR(&psxVuw[sprA],
- psxVuw[(sprCY<<10) + textX0 + sprCX]);
-
- }
- return;
- } 
-}
- 
-///////////////////////////////////////////////////////////////////////
-
-/////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////
-// LINE FUNCS
-////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-
-void Line_E_SE_Shade(int x0, int y0, int x1, int y1, uint32_t rgb0, uint32_t rgb1)
-{
- int dx, dy, incrE, incrSE, d;
-		uint32_t r0, g0, b0, r1, g1, b1;
-		int dr, dg, db;
-
-		r0 = (rgb0 & 0x00ff0000);
-		g0 = (rgb0 & 0x0000ff00) << 8;
-		b0 = (rgb0 & 0x000000ff) << 16;
-		r1 = (rgb1 & 0x00ff0000);
-		g1 = (rgb1 & 0x0000ff00) << 8;
-		b1 = (rgb1 & 0x000000ff) << 16;
-
- dx = x1 - x0;
- dy = y1 - y0;
-
-		if (dx > 0)
-		{
-			dr = ((int)r1 - (int)r0) / dx;
-			dg = ((int)g1 - (int)g0) / dx;
-			db = ((int)b1 - (int)b0) / dx;
-		}
-		else
-		{
-			dr = ((int)r1 - (int)r0);
-			dg = ((int)g1 - (int)g0);
-			db = ((int)b1 - (int)b0);
-		}
-
- d = 2*dy - dx; /* Initial value of d */
- incrE = 2*dy; /* incr. used for move to E */
- incrSE = 2*(dy - dx); /* incr. used for move to SE */
-
-		if ((x0>=drawX)&&(x0<drawW)&&(y0>=drawY)&&(y0<drawH))
-			GetShadeTransCol(&psxVuw[(y0<<10)+x0],(unsigned short)(((r0 >> 9)&0x7c00)|((g0 >> 14)&0x03e0)|((b0 >> 19)&0x001f)));
- while(x0 < x1)
- {
- if (d <= 0)
- {
- d = d + incrE; /* Choose E */
- }
- else
- {
- d = d + incrSE; /* Choose SE */
- y0++;
- }
- x0++;
-
-				r0+=dr;
-				g0+=dg;
-				b0+=db;
-
-				if ((x0>=drawX)&&(x0<drawW)&&(y0>=drawY)&&(y0<drawH))
-					GetShadeTransCol(&psxVuw[(y0<<10)+x0],(unsigned short)(((r0 >> 9)&0x7c00)|((g0 >> 14)&0x03e0)|((b0 >> 19)&0x001f)));
- }
-}
-
-///////////////////////////////////////////////////////////////////////
-
-void Line_S_SE_Shade(int x0, int y0, int x1, int y1, uint32_t rgb0, uint32_t rgb1)
-{
- int dx, dy, incrS, incrSE, d;
-		uint32_t r0, g0, b0, r1, g1, b1;
-		int dr, dg, db;
-
-		r0 = (rgb0 & 0x00ff0000);
-		g0 = (rgb0 & 0x0000ff00) << 8;
-		b0 = (rgb0 & 0x000000ff) << 16;
-		r1 = (rgb1 & 0x00ff0000);
-		g1 = (rgb1 & 0x0000ff00) << 8;
-		b1 = (rgb1 & 0x000000ff) << 16;
-
- dx = x1 - x0;
- dy = y1 - y0;
-
-		if (dy > 0)
-		{
-			dr = ((int)r1 - (int)r0) / dy;
-			dg = ((int)g1 - (int)g0) / dy;
-			db = ((int)b1 - (int)b0) / dy;
-		}
-		else
-		{
-			dr = ((int)r1 - (int)r0);
-			dg = ((int)g1 - (int)g0);
-			db = ((int)b1 - (int)b0);
-		}
-
- d = 2*dx - dy; /* Initial value of d */
- incrS = 2*dx; /* incr. used for move to S */
- incrSE = 2*(dx - dy); /* incr. used for move to SE */
-
-		if ((x0>=drawX)&&(x0<drawW)&&(y0>=drawY)&&(y0<drawH))
-			GetShadeTransCol(&psxVuw[(y0<<10)+x0],(unsigned short)(((r0 >> 9)&0x7c00)|((g0 >> 14)&0x03e0)|((b0 >> 19)&0x001f)));
- while(y0 < y1)
- {
- if (d <= 0)
- {
- d = d + incrS; /* Choose S */
- }
- else
- {
- d = d + incrSE; /* Choose SE */
- x0++;
- }
- y0++;
-
-				r0+=dr;
-				g0+=dg;
-				b0+=db;
-
-				if ((x0>=drawX)&&(x0<drawW)&&(y0>=drawY)&&(y0<drawH))
-					GetShadeTransCol(&psxVuw[(y0<<10)+x0],(unsigned short)(((r0 >> 9)&0x7c00)|((g0 >> 14)&0x03e0)|((b0 >> 19)&0x001f)));
- }
-}
-
-///////////////////////////////////////////////////////////////////////
-
-void Line_N_NE_Shade(int x0, int y0, int x1, int y1, uint32_t rgb0, uint32_t rgb1)
-{
- int dx, dy, incrN, incrNE, d;
-		uint32_t r0, g0, b0, r1, g1, b1;
-		int dr, dg, db;
-
-		r0 = (rgb0 & 0x00ff0000);
-		g0 = (rgb0 & 0x0000ff00) << 8;
-		b0 = (rgb0 & 0x000000ff) << 16;
-		r1 = (rgb1 & 0x00ff0000);
-		g1 = (rgb1 & 0x0000ff00) << 8;
-		b1 = (rgb1 & 0x000000ff) << 16;
-
- dx = x1 - x0;
- dy = -(y1 - y0);
-
-		if (dy > 0)
-		{
-			dr = ((uint32_t)r1 - (uint32_t)r0) / dy;
-			dg = ((uint32_t)g1 - (uint32_t)g0) / dy;
-			db = ((uint32_t)b1 - (uint32_t)b0) / dy;
-		}
-		else
-		{
-			dr = ((uint32_t)r1 - (uint32_t)r0);
-			dg = ((uint32_t)g1 - (uint32_t)g0);
-			db = ((uint32_t)b1 - (uint32_t)b0);
-		}
-
- d = 2*dx - dy; /* Initial value of d */
- incrN = 2*dx; /* incr. used for move to N */
- incrNE = 2*(dx - dy); /* incr. used for move to NE */
-
-		if ((x0>=drawX)&&(x0<drawW)&&(y0>=drawY)&&(y0<drawH))
-			GetShadeTransCol(&psxVuw[(y0<<10)+x0],(unsigned short)(((r0 >> 9)&0x7c00)|((g0 >> 14)&0x03e0)|((b0 >> 19)&0x001f)));
- while(y0 > y1)
- {
- if (d <= 0)
- {
- d = d + incrN; /* Choose N */
- }
- else
- {
- d = d + incrNE; /* Choose NE */
- x0++;
- }
- y0--;
-
-				r0+=dr;
-				g0+=dg;
-				b0+=db;
-
-				if ((x0>=drawX)&&(x0<drawW)&&(y0>=drawY)&&(y0<drawH))
-					GetShadeTransCol(&psxVuw[(y0<<10)+x0],(unsigned short)(((r0 >> 9)&0x7c00)|((g0 >> 14)&0x03e0)|((b0 >> 19)&0x001f)));
- }
-}
-
-///////////////////////////////////////////////////////////////////////
-
-void Line_E_NE_Shade(int x0, int y0, int x1, int y1, uint32_t rgb0, uint32_t rgb1)
-{
- int dx, dy, incrE, incrNE, d;
-		uint32_t r0, g0, b0, r1, g1, b1;
-		int dr, dg, db;
-
-		r0 = (rgb0 & 0x00ff0000);
-		g0 = (rgb0 & 0x0000ff00) << 8;
-		b0 = (rgb0 & 0x000000ff) << 16;
-		r1 = (rgb1 & 0x00ff0000);
-		g1 = (rgb1 & 0x0000ff00) << 8;
-		b1 = (rgb1 & 0x000000ff) << 16;
-
- dx = x1 - x0;
- dy = -(y1 - y0);
-
-		if (dx > 0)
-		{
-			dr = ((int)r1 - (int)r0) / dx;
-			dg = ((int)g1 - (int)g0) / dx;
-			db = ((int)b1 - (int)b0) / dx;
-		}
-		else
-		{
-			dr = ((int)r1 - (int)r0);
-			dg = ((int)g1 - (int)g0);
-			db = ((int)b1 - (int)b0);
-		}
-
- d = 2*dy - dx; /* Initial value of d */
- incrE = 2*dy; /* incr. used for move to E */
- incrNE = 2*(dy - dx); /* incr. used for move to NE */
-
-		if ((x0>=drawX)&&(x0<drawW)&&(y0>=drawY)&&(y0<drawH))
-			GetShadeTransCol(&psxVuw[(y0<<10)+x0],(unsigned short)(((r0 >> 9)&0x7c00)|((g0 >> 14)&0x03e0)|((b0 >> 19)&0x001f)));
- while(x0 < x1)
- {
- if (d <= 0)
- {
- d = d + incrE; /* Choose E */
- }
- else
- {
- d = d + incrNE; /* Choose NE */
- y0--;
- }
- x0++;
-
-				r0+=dr;
-				g0+=dg;
-				b0+=db;
-
-				if ((x0>=drawX)&&(x0<drawW)&&(y0>=drawY)&&(y0<drawH))
-					GetShadeTransCol(&psxVuw[(y0<<10)+x0],(unsigned short)(((r0 >> 9)&0x7c00)|((g0 >> 14)&0x03e0)|((b0 >> 19)&0x001f)));
- }
-}
-
-///////////////////////////////////////////////////////////////////////
-
-void VertLineShade(int x, int y0, int y1, uint32_t rgb0, uint32_t rgb1)
-{
- int y, dy;
-	uint32_t r0, g0, b0, r1, g1, b1;
-	int dr, dg, db;
-
-	r0 = (rgb0 & 0x00ff0000);
-	g0 = (rgb0 & 0x0000ff00) << 8;
-	b0 = (rgb0 & 0x000000ff) << 16;
-	r1 = (rgb1 & 0x00ff0000);
-	g1 = (rgb1 & 0x0000ff00) << 8;
-	b1 = (rgb1 & 0x000000ff) << 16;
-
-	dy = (y1 - y0);
-
-	if (dy > 0)
-	{
-		dr = ((int)r1 - (int)r0) / dy;
-		dg = ((int)g1 - (int)g0) / dy;
-		db = ((int)b1 - (int)b0) / dy;
-	}
-	else
-	{
-		dr = ((int)r1 - (int)r0);
-		dg = ((int)g1 - (int)g0);
-		db = ((int)b1 - (int)b0);
-	}
-
-	if (y0 < drawY)
-	{
-		r0+=dr*(drawY - y0);
-		g0+=dg*(drawY - y0);
-		b0+=db*(drawY - y0);
-		y0 = drawY;
-	}
-
-	if (y1 > drawH)
-		y1 = drawH;
-
- for (y = y0; y <= y1; y++)
-	{
-		GetShadeTransCol(&psxVuw[(y<<10)+x],(unsigned short)(((r0 >> 9)&0x7c00)|((g0 >> 14)&0x03e0)|((b0 >> 19)&0x001f)));
-		r0+=dr;
-		g0+=dg;
-		b0+=db;
-	}
-}
-
-///////////////////////////////////////////////////////////////////////
-
-void HorzLineShade(int y, int x0, int x1, uint32_t rgb0, uint32_t rgb1)
-{
- int x, dx;
-	uint32_t r0, g0, b0, r1, g1, b1;
-	int dr, dg, db;
-
-	r0 = (rgb0 & 0x00ff0000);
-	g0 = (rgb0 & 0x0000ff00) << 8;
-	b0 = (rgb0 & 0x000000ff) << 16;
-	r1 = (rgb1 & 0x00ff0000);
-	g1 = (rgb1 & 0x0000ff00) << 8;
-	b1 = (rgb1 & 0x000000ff) << 16;
-
-	dx = (x1 - x0);
-
-	if (dx > 0)
-	{
-		dr = ((int)r1 - (int)r0) / dx;
-		dg = ((int)g1 - (int)g0) / dx;
-		db = ((int)b1 - (int)b0) / dx;
-	}
-	else
-	{
-		dr = ((int)r1 - (int)r0);
-		dg = ((int)g1 - (int)g0);
-		db = ((int)b1 - (int)b0);
-	}
-
-	if (x0 < drawX)
-	{
-		r0+=dr*(drawX - x0);
-		g0+=dg*(drawX - x0);
-		b0+=db*(drawX - x0);
-		x0 = drawX;
-	}
-
-	if (x1 > drawW)
-		x1 = drawW;
-
- for (x = x0; x <= x1; x++)
-	{
-		GetShadeTransCol(&psxVuw[(y<<10)+x],(unsigned short)(((r0 >> 9)&0x7c00)|((g0 >> 14)&0x03e0)|((b0 >> 19)&0x001f)));
-		r0+=dr;
-		g0+=dg;
-		b0+=db;
-	}
-}
-
-///////////////////////////////////////////////////////////////////////
-
-void Line_E_SE_Flat(int x0, int y0, int x1, int y1, unsigned short colour)
-{
- int dx, dy, incrE, incrSE, d, x, y;
-
- dx = x1 - x0;
- dy = y1 - y0;
- d = 2*dy - dx; /* Initial value of d */
- incrE = 2*dy; /* incr. used for move to E */
- incrSE = 2*(dy - dx); /* incr. used for move to SE */
- x = x0;
- y = y0;
-		if ((x>=drawX)&&(x<drawW)&&(y>=drawY)&&(y<drawH))
-			GetShadeTransCol(&psxVuw[(y<<10)+x], colour);
- while(x < x1)
- {
- if (d <= 0)
- {
- d = d + incrE; /* Choose E */
- x++;
- }
- else
- {
- d = d + incrSE; /* Choose SE */
- x++;
- y++;
- }
-				if ((x>=drawX)&&(x<drawW)&&(y>=drawY)&&(y<drawH))
-					GetShadeTransCol(&psxVuw[(y<<10)+x], colour);
- }
-}
-
-///////////////////////////////////////////////////////////////////////
-
-void Line_S_SE_Flat(int x0, int y0, int x1, int y1, unsigned short colour)
-{
- int dx, dy, incrS, incrSE, d, x, y;
-
- dx = x1 - x0;
- dy = y1 - y0;
- d = 2*dx - dy; /* Initial value of d */
- incrS = 2*dx; /* incr. used for move to S */
- incrSE = 2*(dx - dy); /* incr. used for move to SE */
- x = x0;
- y = y0;
-		if ((x>=drawX)&&(x<drawW)&&(y>=drawY)&&(y<drawH))
-			GetShadeTransCol(&psxVuw[(y<<10)+x], colour);
- while(y < y1)
- {
- if (d <= 0)
- {
- d = d + incrS; /* Choose S */
- y++;
- }
- else
- {
- d = d + incrSE; /* Choose SE */
- x++;
- y++;
- }
-				if ((x>=drawX)&&(x<drawW)&&(y>=drawY)&&(y<drawH))
-					GetShadeTransCol(&psxVuw[(y<<10)+x], colour);
- }
-}
-
-///////////////////////////////////////////////////////////////////////
-
-void Line_N_NE_Flat(int x0, int y0, int x1, int y1, unsigned short colour)
-{
- int dx, dy, incrN, incrNE, d, x, y;
-
- dx = x1 - x0;
- dy = -(y1 - y0);
- d = 2*dx - dy; /* Initial value of d */
- incrN = 2*dx; /* incr. used for move to N */
- incrNE = 2*(dx - dy); /* incr. used for move to NE */
- x = x0;
- y = y0;
-		if ((x>=drawX)&&(x<drawW)&&(y>=drawY)&&(y<drawH))
-			GetShadeTransCol(&psxVuw[(y<<10)+x], colour);
- while(y > y1)
- {
- if (d <= 0)
- {
- d = d + incrN; /* Choose N */
- y--;
- }
- else
- {
- d = d + incrNE; /* Choose NE */
- x++;
- y--;
- }
-				if ((x>=drawX)&&(x<drawW)&&(y>=drawY)&&(y<drawH))
-					GetShadeTransCol(&psxVuw[(y<<10)+x], colour);
- }
-}
-
-///////////////////////////////////////////////////////////////////////
-
-void Line_E_NE_Flat(int x0, int y0, int x1, int y1, unsigned short colour)
-{
- int dx, dy, incrE, incrNE, d, x, y;
-
- dx = x1 - x0;
- dy = -(y1 - y0);
- d = 2*dy - dx; /* Initial value of d */
- incrE = 2*dy; /* incr. used for move to E */
- incrNE = 2*(dy - dx); /* incr. used for move to NE */
- x = x0;
- y = y0;
-		if ((x>=drawX)&&(x<drawW)&&(y>=drawY)&&(y<drawH))
-			GetShadeTransCol(&psxVuw[(y<<10)+x], colour);
- while(x < x1)
- {
- if (d <= 0)
- {
- d = d + incrE; /* Choose E */
- x++;
- }
- else
- {
- d = d + incrNE; /* Choose NE */
- x++;
- y--;
- }
-				if ((x>=drawX)&&(x<drawW)&&(y>=drawY)&&(y<drawH))
-					GetShadeTransCol(&psxVuw[(y<<10)+x], colour);
- }
-}
-
-///////////////////////////////////////////////////////////////////////
-
-void VertLineFlat(int x, int y0, int y1, unsigned short colour)
-{
-	int y;
-
-	if (y0 < drawY)
-		y0 = drawY;
-
-	if (y1 > drawH)
-		y1 = drawH;
-
- for (y = y0; y <= y1; y++)
-		GetShadeTransCol(&psxVuw[(y<<10)+x], colour);
-}
-
-///////////////////////////////////////////////////////////////////////
-
-void HorzLineFlat(int y, int x0, int x1, unsigned short colour)
-{
-	int x;
-
-	if (x0 < drawX)
-		x0 = drawX;
-
-	if (x1 > drawW)
-		x1 = drawW;
-
-	for (x = x0; x <= x1; x++)
-		GetShadeTransCol(&psxVuw[(y<<10)+x], colour);
-}
-
-///////////////////////////////////////////////////////////////////////
-
-/* Bresenham Line drawing function */
-void DrawSoftwareLineShade(int rgb0, int rgb1)
-{
-	short x0, y0, x1, y1, xt, yt;
-	int rgbt;
-	double m, dy, dx;
-
-	if(lx0>drawW && lx1>drawW) return;
-	if(ly0>drawH && ly1>drawH) return;
-	if(lx0<drawX && lx1<drawX) return;
-	if(ly0<drawY && ly1<drawY) return;
-	if(drawY>=drawH) return;
-	if(drawX>=drawW) return; 
-
-	x0 = lx0;
-	y0 = ly0;
-	x1 = lx1;
-	y1 = ly1;
-
-	dx = x1 - x0;
-	dy = y1 - y0;
-
-	if (dx == 0)
-	{
-		if (dy > 0)
-			VertLineShade(x0, y0, y1, rgb0, rgb1);
-		else
-			VertLineShade(x0, y1, y0, rgb1, rgb0);
-	}
-	else
-		if (dy == 0)
-		{
-			if (dx > 0)
-				HorzLineShade(y0, x0, x1, rgb0, rgb1);
-			else
-				HorzLineShade(y0, x1, x0, rgb1, rgb0);
-		}
-		else
-		{
-			if (dx < 0)
-			{
-				xt = x0;
-				yt = y0;
-				rgbt = rgb0;
-				x0 = x1;
-				y0 = y1;
-				rgb0 = rgb1;
-				x1 = xt;
-				y1 = yt;
-				rgb1 = rgbt;
-
-				dx = x1 - x0;
-				dy = y1 - y0;
-			}
-
-			m = dy/dx;
-
-			if (m >= 0)
-			{
-				if (m > 1)
-					Line_S_SE_Shade(x0, y0, x1, y1, rgb0, rgb1);
-				else
-					Line_E_SE_Shade(x0, y0, x1, y1, rgb0, rgb1);
-			}
-			else
-				if (m < -1)
-					Line_N_NE_Shade(x0, y0, x1, y1, rgb0, rgb1);
-				else
-					Line_E_NE_Shade(x0, y0, x1, y1, rgb0, rgb1);
-		}
-}
-
-///////////////////////////////////////////////////////////////////////
-
-void DrawSoftwareLineFlat(int rgb)
-{
-	short x0, y0, x1, y1, xt, yt;
-	double m, dy, dx;
-	unsigned short colour = 0;
- 
-	if(lx0>drawW && lx1>drawW) return;
-	if(ly0>drawH && ly1>drawH) return;
-	if(lx0<drawX && lx1<drawX) return;
-	if(ly0<drawY && ly1<drawY) return;
-	if(drawY>=drawH) return;
-	if(drawX>=drawW) return; 
-
-	colour = ((rgb & 0x00f80000)>>9) | ((rgb & 0x0000f800)>>6) | ((rgb & 0x000000f8)>>3);
-
-	x0 = lx0;
-	y0 = ly0;
-	x1 = lx1;
-	y1 = ly1;
-
-	dx = x1 - x0;
-	dy = y1 - y0;
-
-	if (dx == 0)
-	{
-		if (dy == 0)
-			return; // Nothing to draw
-		else if (dy > 0)
-			VertLineFlat(x0, y0, y1, colour);
-		else
-			VertLineFlat(x0, y1, y0, colour);
-	}
-	else
-		if (dy == 0)
-		{
-			if (dx > 0)
-				HorzLineFlat(y0, x0, x1, colour);
-			else
-				HorzLineFlat(y0, x1, x0, colour);
-		}
-		else
-		{
-			if (dx < 0)
-			{
-				xt = x0;
-				yt = y0;
-				x0 = x1;
-				y0 = y1;
-				x1 = xt;
-				y1 = yt;
-
-				dx = x1 - x0;
-				dy = y1 - y0;
-			}
-
-			m = dy/dx;
-
-			if (m >= 0)
-			{
-				if (m > 1)
-					Line_S_SE_Flat(x0, y0, x1, y1, colour);
-				else
-					Line_E_SE_Flat(x0, y0, x1, y1, colour);
-			}
-			else
-				if (m < -1)
-					Line_N_NE_Flat(x0, y0, x1, y1, colour);
-				else
-					Line_E_NE_Flat(x0, y0, x1, y1, colour);
-		}
-}
-
-///////////////////////////////////////////////////////////////////////
+/***************************************************************************
+ soft.c - description
+ -------------------
+ begin : Sun Oct 28 2001
+ copyright : (C) 2001 by Pete Bernert
+ web : www.pbernert.com 
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+#include "stdafx.h"
+
+#define _IN_SOFT
+
+#include "externals.h"
+#include "soft.h"
+
+int iDither = 0;
+
+////////////////////////////////////////////////////////////////////////////////////
+// "NO EDGE BUFFER" POLY VERSION... FUNCS BASED ON FATMAP.TXT FROM MRI / Doomsday
+////////////////////////////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////////////////////////////
+// defines
+////////////////////////////////////////////////////////////////////////////////////
+
+// switches for painting textured quads as 2 triangles (small glitches, but better shading!)
+// can be toggled by game fix 0x200 in version 1.17 anyway, so let the defines enabled!
+
+#define POLYQUAD3 
+#define POLYQUAD3GT 
+
+// fast solid loops... a bit more additional code, of course
+
+#define FASTSOLID
+
+// psx blending mode 3 with 25% incoming color (instead 50% without the define)
+
+#define HALFBRIGHTMODE3
+
+// color decode defines
+
+#define XCOL1(x) (x & 0x1f)
+#define XCOL2(x) (x & 0x3e0)
+#define XCOL3(x) (x & 0x7c00)
+
+#define XCOL1D(x) (x & 0x1f)
+#define XCOL2D(x) ((x>>5) & 0x1f)
+#define XCOL3D(x) ((x>>10) & 0x1f)
+
+#define X32TCOL1(x) ((x & 0x001f001f)<<7)
+#define X32TCOL2(x) ((x & 0x03e003e0)<<2)
+#define X32TCOL3(x) ((x & 0x7c007c00)>>3)
+
+#define X32COL1(x) (x & 0x001f001f)
+#define X32COL2(x) ((x>>5) & 0x001f001f)
+#define X32COL3(x) ((x>>10) & 0x001f001f)
+
+#define X32ACOL1(x) (x & 0x001e001e)
+#define X32ACOL2(x) ((x>>5) & 0x001e001e)
+#define X32ACOL3(x) ((x>>10) & 0x001e001e)
+
+#define X32BCOL1(x) (x & 0x001c001c)
+#define X32BCOL2(x) ((x>>5) & 0x001c001c)
+#define X32BCOL3(x) ((x>>10) & 0x001c001c)
+
+#define X32PSXCOL(r,g,b) ((g<<10)|(b<<5)|r)
+
+#define XPSXCOL(r,g,b) ((g&0x7c00)|(b&0x3e0)|(r&0x1f))
+
+////////////////////////////////////////////////////////////////////////////////////
+// soft globals
+////////////////////////////////////////////////////////////////////////////////////
+
+short g_m1 = 255, g_m2 = 255, g_m3 = 255;
+short DrawSemiTrans = FALSE;
+short Ymin;
+short Ymax;
+
+short ly0, lx0, ly1, lx1, ly2, lx2, ly3, lx3; // global psx vertex coords
+int GlobalTextAddrX, GlobalTextAddrY, GlobalTextTP;
+int GlobalTextREST, GlobalTextABR, GlobalTextPAGE;
+
+////////////////////////////////////////////////////////////////////////
+// POLYGON OFFSET FUNCS
+////////////////////////////////////////////////////////////////////////
+
+void offsetPSXLine(void)
+{
+ short x0,x1,y0,y1,dx,dy;float px,py;
+
+ x0 = lx0+1+PSXDisplay.DrawOffset.x;
+ x1 = lx1+1+PSXDisplay.DrawOffset.x;
+ y0 = ly0+1+PSXDisplay.DrawOffset.y;
+ y1 = ly1+1+PSXDisplay.DrawOffset.y;
+
+ dx=x1-x0;
+ dy=y1-y0;
+
+ // tricky line width without sqrt
+
+ if(dx>=0)
+ {
+ if(dy>=0)
+ {
+ px=0.5f;
+ if(dx>dy) py=-0.5f;
+ else if(dx<dy) py= 0.5f;
+ else py= 0.0f;
+ }
+ else
+ {
+ py=-0.5f;
+ dy=-dy;
+ if(dx>dy) px= 0.5f;
+ else if(dx<dy) px=-0.5f;
+ else px= 0.0f;
+ }
+ }
+ else
+ {
+ if(dy>=0)
+ {
+ py=0.5f;
+ dx=-dx;
+ if(dx>dy) px=-0.5f;
+ else if(dx<dy) px= 0.5f;
+ else px= 0.0f;
+ }
+ else
+ {
+ px=-0.5f;
+ if(dx>dy) py=-0.5f;
+ else if(dx<dy) py= 0.5f;
+ else py= 0.0f;
+ }
+ } 
+ 
+ lx0=(short)((float)x0-px);
+ lx3=(short)((float)x0+py);
+ 
+ ly0=(short)((float)y0-py);
+ ly3=(short)((float)y0-px);
+ 
+ lx1=(short)((float)x1-py);
+ lx2=(short)((float)x1+px);
+ 
+ ly1=(short)((float)y1+px);
+ ly2=(short)((float)y1+py);
+}
+
+void offsetPSX2(void)
+{
+ lx0 += PSXDisplay.DrawOffset.x;
+ ly0 += PSXDisplay.DrawOffset.y;
+ lx1 += PSXDisplay.DrawOffset.x;
+ ly1 += PSXDisplay.DrawOffset.y;
+}
+
+void offsetPSX3(void)
+{
+ lx0 += PSXDisplay.DrawOffset.x;
+ ly0 += PSXDisplay.DrawOffset.y;
+ lx1 += PSXDisplay.DrawOffset.x;
+ ly1 += PSXDisplay.DrawOffset.y;
+ lx2 += PSXDisplay.DrawOffset.x;
+ ly2 += PSXDisplay.DrawOffset.y;
+}
+
+void offsetPSX4(void)
+{
+ lx0 += PSXDisplay.DrawOffset.x;
+ ly0 += PSXDisplay.DrawOffset.y;
+ lx1 += PSXDisplay.DrawOffset.x;
+ ly1 += PSXDisplay.DrawOffset.y;
+ lx2 += PSXDisplay.DrawOffset.x;
+ ly2 += PSXDisplay.DrawOffset.y;
+ lx3 += PSXDisplay.DrawOffset.x;
+ ly3 += PSXDisplay.DrawOffset.y;
+}
+
+/////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////
+// PER PIXEL FUNCS
+////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////
+
+
+unsigned char dithertable[16] =
+{
+ 7, 0, 6, 1,
+ 2, 5, 3, 4,
+ 1, 6, 0, 7,
+ 4, 3, 5, 2
+};
+
+void Dither16(unsigned short *pdest, uint32_t r, uint32_t g, uint32_t b, unsigned short sM)
+{
+ unsigned char coeff;
+ unsigned char rlow, glow, blow;
+ int x, y;
+ 
+ x = pdest - psxVuw;
+ y = x >> 10;
+ x -= (y << 10);
+
+ coeff = dithertable[(y&3)*4+(x&3)];
+
+ rlow = r&7; glow = g&7; blow = b&7;
+
+ r>>=3; g>>=3; b>>=3;
+
+ if ((r < 0x1F) && rlow > coeff) r++;
+ if ((g < 0x1F) && glow > coeff) g++;
+ if ((b < 0x1F) && blow > coeff) b++;
+
+ *pdest=((unsigned short)b<<10) |
+ ((unsigned short)g<<5) |
+ (unsigned short)r | sM;
+}
+
+/////////////////////////////////////////////////////////////////
+
+static __inline void GetShadeTransCol_Dither(unsigned short *pdest, int m1, int m2, int m3)
+{
+ int r,g,b;
+
+ if (bCheckMask && *pdest & 0x8000) return;
+
+ if (DrawSemiTrans)
+ {
+ r=((XCOL1D(*pdest))<<3);
+ b=((XCOL2D(*pdest))<<3);
+ g=((XCOL3D(*pdest))<<3);
+
+ if(GlobalTextABR==0)
+ {
+ r=(r>>1)+(m1>>1);
+ b=(b>>1)+(m2>>1);
+ g=(g>>1)+(m3>>1);
+ }
+ else
+ if(GlobalTextABR==1)
+ {
+ r+=m1;
+ b+=m2;
+ g+=m3;
+ }
+ else
+ if(GlobalTextABR==2)
+ {
+ r-=m1;
+ b-=m2;
+ g-=m3;
+ if(r&0x80000000) r=0;
+ if(b&0x80000000) b=0;
+ if(g&0x80000000) g=0;
+ }
+ else
+ {
+#ifdef HALFBRIGHTMODE3
+ r+=(m1>>2);
+ b+=(m2>>2);
+ g+=(m3>>2);
+#else
+ r+=(m1>>1);
+ b+=(m2>>1);
+ g+=(m3>>1);
+#endif
+ }
+ }
+ else 
+ {
+ r=m1;
+ b=m2;
+ g=m3;
+ }
+
+ if(r&0x7FFFFF00) r=0xff;
+ if(b&0x7FFFFF00) b=0xff;
+ if(g&0x7FFFFF00) g=0xff;
+
+ Dither16(pdest,r,b,g,sSetMask);
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static __inline void GetShadeTransCol(unsigned short * pdest,unsigned short color)
+{
+ if(bCheckMask && *pdest&0x8000) return;
+
+ if(DrawSemiTrans)
+ {
+ int r,g,b;
+ 
+ if(GlobalTextABR==0)
+ {
+ *pdest=((((*pdest)&0x7bde)>>1)+(((color)&0x7bde)>>1))|sSetMask;//0x8000;
+ return;
+/*
+ r=(XCOL1(*pdest)>>1)+((XCOL1(color))>>1);
+ b=(XCOL2(*pdest)>>1)+((XCOL2(color))>>1);
+ g=(XCOL3(*pdest)>>1)+((XCOL3(color))>>1);
+*/
+ }
+ else
+ if(GlobalTextABR==1)
+ {
+ r=(XCOL1(*pdest))+((XCOL1(color)));
+ b=(XCOL2(*pdest))+((XCOL2(color)));
+ g=(XCOL3(*pdest))+((XCOL3(color)));
+ }
+ else
+ if(GlobalTextABR==2)
+ {
+ r=(XCOL1(*pdest))-((XCOL1(color)));
+ b=(XCOL2(*pdest))-((XCOL2(color)));
+ g=(XCOL3(*pdest))-((XCOL3(color)));
+ if(r&0x80000000) r=0;
+ if(b&0x80000000) b=0;
+ if(g&0x80000000) g=0;
+ }
+ else
+ {
+#ifdef HALFBRIGHTMODE3
+ r=(XCOL1(*pdest))+((XCOL1(color))>>2);
+ b=(XCOL2(*pdest))+((XCOL2(color))>>2);
+ g=(XCOL3(*pdest))+((XCOL3(color))>>2);
+#else
+ r=(XCOL1(*pdest))+((XCOL1(color))>>1);
+ b=(XCOL2(*pdest))+((XCOL2(color))>>1);
+ g=(XCOL3(*pdest))+((XCOL3(color))>>1);
+#endif
+ }
+
+ if(r&0x7FFFFFE0) r=0x1f;
+ if(b&0x7FFFFC00) b=0x3e0;
+ if(g&0x7FFF8000) g=0x7c00;
+
+ *pdest=(XPSXCOL(r,g,b))|sSetMask;//0x8000;
+ }
+ else *pdest=color|sSetMask;
+} 
+
+////////////////////////////////////////////////////////////////////////
+
+static __inline void GetShadeTransCol32(uint32_t *pdest, uint32_t color)
+{
+ if (DrawSemiTrans)
+ {
+ int r,g,b;
+
+ if(GlobalTextABR==0)
+ {
+ if(!bCheckMask)
+ {
+ *pdest=((((*pdest)&0x7bde7bde)>>1)+(((color)&0x7bde7bde)>>1))|lSetMask;//0x80008000;
+ return;
+ }
+ r=(X32ACOL1(*pdest)>>1)+((X32ACOL1(color))>>1);
+ b=(X32ACOL2(*pdest)>>1)+((X32ACOL2(color))>>1);
+ g=(X32ACOL3(*pdest)>>1)+((X32ACOL3(color))>>1);
+ }
+ else
+ if(GlobalTextABR==1)
+ {
+ r=(X32COL1(*pdest))+((X32COL1(color)));
+ b=(X32COL2(*pdest))+((X32COL2(color)));
+ g=(X32COL3(*pdest))+((X32COL3(color)));
+ }
+ else
+ if(GlobalTextABR==2)
+ {
+ int sr,sb,sg,src,sbc,sgc,c;
+ src=XCOL1(color);sbc=XCOL2(color);sgc=XCOL3(color);
+ c=(*pdest)>>16;
+ sr=(XCOL1(c))-src; if(sr&0x8000) sr=0;
+ sb=(XCOL2(c))-sbc; if(sb&0x8000) sb=0;
+ sg=(XCOL3(c))-sgc; if(sg&0x8000) sg=0;
+ r=((int)sr)<<16;b=((int)sb)<<11;g=((int)sg)<<6;
+ c=LOWORD(*pdest);
+ sr=(XCOL1(c))-src; if(sr&0x8000) sr=0;
+ sb=(XCOL2(c))-sbc; if(sb&0x8000) sb=0;
+ sg=(XCOL3(c))-sgc; if(sg&0x8000) sg=0;
+ r|=sr;b|=sb>>5;g|=sg>>10;
+ }
+ else
+ {
+#ifdef HALFBRIGHTMODE3
+ r=(X32COL1(*pdest))+((X32BCOL1(color))>>2);
+ b=(X32COL2(*pdest))+((X32BCOL2(color))>>2);
+ g=(X32COL3(*pdest))+((X32BCOL3(color))>>2);
+#else
+ r=(X32COL1(*pdest))+((X32ACOL1(color))>>1);
+ b=(X32COL2(*pdest))+((X32ACOL2(color))>>1);
+ g=(X32COL3(*pdest))+((X32ACOL3(color))>>1);
+#endif
+ }
+
+ if(r&0x7FE00000) r=0x1f0000|(r&0xFFFF);
+ if(r&0x7FE0) r=0x1f |(r&0xFFFF0000);
+ if(b&0x7FE00000) b=0x1f0000|(b&0xFFFF);
+ if(b&0x7FE0) b=0x1f |(b&0xFFFF0000);
+ if(g&0x7FE00000) g=0x1f0000|(g&0xFFFF);
+ if(g&0x7FE0) g=0x1f |(g&0xFFFF0000);
+
+ if(bCheckMask) 
+ {
+ uint32_t ma=*pdest;
+ *pdest=(X32PSXCOL(r,g,b))|lSetMask;//0x80008000;
+ if(ma&0x80000000) *pdest=(ma&0xFFFF0000)|(*pdest&0xFFFF);
+ if(ma&0x00008000) *pdest=(ma&0xFFFF) |(*pdest&0xFFFF0000);
+ return;
+ }
+ *pdest=(X32PSXCOL(r,g,b))|lSetMask;//0x80008000;
+ }
+ else
+ {
+ if(bCheckMask) 
+ {
+ uint32_t ma=*pdest;
+ *pdest=color|lSetMask;//0x80008000;
+ if(ma&0x80000000) *pdest=(ma&0xFFFF0000)|(*pdest&0xFFFF);
+ if(ma&0x00008000) *pdest=(ma&0xFFFF) |(*pdest&0xFFFF0000);
+ return;
+ }
+
+ *pdest=color|lSetMask;//0x80008000;
+ }
+} 
+
+////////////////////////////////////////////////////////////////////////
+
+static __inline void GetTextureTransColG(unsigned short * pdest,unsigned short color)
+{
+ int r,g,b;unsigned short l;
+
+ if(color==0) return;
+
+ if(bCheckMask && *pdest&0x8000) return;
+
+ l=sSetMask|(color&0x8000);
+
+ if(DrawSemiTrans && (color&0x8000))
+ {
+ if(GlobalTextABR==0)
+ {
+ unsigned short d;
+ d =((*pdest)&0x7bde)>>1;
+ color =((color) &0x7bde)>>1;
+ r=(XCOL1(d))+((((XCOL1(color)))* g_m1)>>7);
+ b=(XCOL2(d))+((((XCOL2(color)))* g_m2)>>7);
+ g=(XCOL3(d))+((((XCOL3(color)))* g_m3)>>7);
+
+/*
+ r=(XCOL1(*pdest)>>1)+((((XCOL1(color))>>1)* g_m1)>>7);
+ b=(XCOL2(*pdest)>>1)+((((XCOL2(color))>>1)* g_m2)>>7);
+ g=(XCOL3(*pdest)>>1)+((((XCOL3(color))>>1)* g_m3)>>7);
+*/
+ }
+ else
+ if(GlobalTextABR==1)
+ {
+ r=(XCOL1(*pdest))+((((XCOL1(color)))* g_m1)>>7);
+ b=(XCOL2(*pdest))+((((XCOL2(color)))* g_m2)>>7);
+ g=(XCOL3(*pdest))+((((XCOL3(color)))* g_m3)>>7);
+ }
+ else
+ if(GlobalTextABR==2)
+ {
+ r=(XCOL1(*pdest))-((((XCOL1(color)))* g_m1)>>7);
+ b=(XCOL2(*pdest))-((((XCOL2(color)))* g_m2)>>7);
+ g=(XCOL3(*pdest))-((((XCOL3(color)))* g_m3)>>7);
+ if(r&0x80000000) r=0;
+ if(b&0x80000000) b=0;
+ if(g&0x80000000) g=0;
+ }
+ else
+ {
+#ifdef HALFBRIGHTMODE3
+ r=(XCOL1(*pdest))+((((XCOL1(color))>>2)* g_m1)>>7);
+ b=(XCOL2(*pdest))+((((XCOL2(color))>>2)* g_m2)>>7);
+ g=(XCOL3(*pdest))+((((XCOL3(color))>>2)* g_m3)>>7);
+#else
+ r=(XCOL1(*pdest))+((((XCOL1(color))>>1)* g_m1)>>7);
+ b=(XCOL2(*pdest))+((((XCOL2(color))>>1)* g_m2)>>7);
+ g=(XCOL3(*pdest))+((((XCOL3(color))>>1)* g_m3)>>7);
+#endif
+ }
+ }
+ else 
+ {
+ r=((XCOL1(color))* g_m1)>>7;
+ b=((XCOL2(color))* g_m2)>>7;
+ g=((XCOL3(color))* g_m3)>>7;
+ }
+
+ if(r&0x7FFFFFE0) r=0x1f;
+ if(b&0x7FFFFC00) b=0x3e0;
+ if(g&0x7FFF8000) g=0x7c00;
+
+ *pdest=(XPSXCOL(r,g,b))|l;
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static __inline void GetTextureTransColG_S(unsigned short * pdest,unsigned short color)
+{
+ int r,g,b;unsigned short l;
+
+ if(color==0) return;
+
+ l=sSetMask|(color&0x8000);
+
+ r=((XCOL1(color))* g_m1)>>7;
+ b=((XCOL2(color))* g_m2)>>7;
+ g=((XCOL3(color))* g_m3)>>7;
+
+ if(r&0x7FFFFFE0) r=0x1f;
+ if(b&0x7FFFFC00) b=0x3e0;
+ if(g&0x7FFF8000) g=0x7c00;
+
+ *pdest=(XPSXCOL(r,g,b))|l;
+}
+
+
+////////////////////////////////////////////////////////////////////////
+
+static __inline void GetTextureTransColG_SPR(unsigned short * pdest,unsigned short color)
+{
+ int r,g,b;unsigned short l;
+
+ if(color==0) return;
+
+ if(bCheckMask && *pdest&0x8000) return;
+
+ l=sSetMask|(color&0x8000);
+
+ if(DrawSemiTrans && (color&0x8000))
+ {
+ if(GlobalTextABR==0)
+ {
+ unsigned short d;
+ d =((*pdest)&0x7bde)>>1;
+ color =((color) &0x7bde)>>1;
+ r=(XCOL1(d))+((((XCOL1(color)))* g_m1)>>7);
+ b=(XCOL2(d))+((((XCOL2(color)))* g_m2)>>7);
+ g=(XCOL3(d))+((((XCOL3(color)))* g_m3)>>7);
+
+/*
+ r=(XCOL1(*pdest)>>1)+((((XCOL1(color))>>1)* g_m1)>>7);
+ b=(XCOL2(*pdest)>>1)+((((XCOL2(color))>>1)* g_m2)>>7);
+ g=(XCOL3(*pdest)>>1)+((((XCOL3(color))>>1)* g_m3)>>7);
+*/
+ }
+ else
+ if(GlobalTextABR==1)
+ {
+ r=(XCOL1(*pdest))+((((XCOL1(color)))* g_m1)>>7);
+ b=(XCOL2(*pdest))+((((XCOL2(color)))* g_m2)>>7);
+ g=(XCOL3(*pdest))+((((XCOL3(color)))* g_m3)>>7);
+ }
+ else
+ if(GlobalTextABR==2)
+ {
+ r=(XCOL1(*pdest))-((((XCOL1(color)))* g_m1)>>7);
+ b=(XCOL2(*pdest))-((((XCOL2(color)))* g_m2)>>7);
+ g=(XCOL3(*pdest))-((((XCOL3(color)))* g_m3)>>7);
+ if(r&0x80000000) r=0;
+ if(b&0x80000000) b=0;
+ if(g&0x80000000) g=0;
+ }
+ else
+ {
+#ifdef HALFBRIGHTMODE3
+ r=(XCOL1(*pdest))+((((XCOL1(color))>>2)* g_m1)>>7);
+ b=(XCOL2(*pdest))+((((XCOL2(color))>>2)* g_m2)>>7);
+ g=(XCOL3(*pdest))+((((XCOL3(color))>>2)* g_m3)>>7);
+#else
+ r=(XCOL1(*pdest))+((((XCOL1(color))>>1)* g_m1)>>7);
+ b=(XCOL2(*pdest))+((((XCOL2(color))>>1)* g_m2)>>7);
+ g=(XCOL3(*pdest))+((((XCOL3(color))>>1)* g_m3)>>7);
+#endif
+ }
+ }
+ else 
+ {
+ r=((XCOL1(color))* g_m1)>>7;
+ b=((XCOL2(color))* g_m2)>>7;
+ g=((XCOL3(color))* g_m3)>>7;
+ }
+
+ if(r&0x7FFFFFE0) r=0x1f;
+ if(b&0x7FFFFC00) b=0x3e0;
+ if(g&0x7FFF8000) g=0x7c00;
+
+ *pdest=(XPSXCOL(r,g,b))|l;
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static __inline void GetTextureTransColG32(uint32_t *pdest, uint32_t color)
+{
+ int r,g,b,l;
+
+ if(color==0) return;
+
+ l=lSetMask|(color&0x80008000);
+
+ if(DrawSemiTrans && (color&0x80008000))
+ {
+ if(GlobalTextABR==0)
+ { 
+ r=((((X32TCOL1(*pdest))+((X32COL1(color)) * g_m1))&0xFF00FF00)>>8);
+ b=((((X32TCOL2(*pdest))+((X32COL2(color)) * g_m2))&0xFF00FF00)>>8);
+ g=((((X32TCOL3(*pdest))+((X32COL3(color)) * g_m3))&0xFF00FF00)>>8);
+ }
+ else
+ if(GlobalTextABR==1)
+ {
+ r=(X32COL1(*pdest))+(((((X32COL1(color)))* g_m1)&0xFF80FF80)>>7);
+ b=(X32COL2(*pdest))+(((((X32COL2(color)))* g_m2)&0xFF80FF80)>>7);
+ g=(X32COL3(*pdest))+(((((X32COL3(color)))* g_m3)&0xFF80FF80)>>7);
+ }
+ else
+ if(GlobalTextABR==2)
+ {
+ int t;
+ r=(((((X32COL1(color)))* g_m1)&0xFF80FF80)>>7);
+ t=(*pdest&0x001f0000)-(r&0x003f0000); if(t&0x80000000) t=0;
+ r=(*pdest&0x0000001f)-(r&0x0000003f); if(r&0x80000000) r=0;
+ r|=t;
+
+ b=(((((X32COL2(color)))* g_m2)&0xFF80FF80)>>7);
+ t=((*pdest>>5)&0x001f0000)-(b&0x003f0000); if(t&0x80000000) t=0;
+ b=((*pdest>>5)&0x0000001f)-(b&0x0000003f); if(b&0x80000000) b=0;
+ b|=t;
+
+ g=(((((X32COL3(color)))* g_m3)&0xFF80FF80)>>7);
+ t=((*pdest>>10)&0x001f0000)-(g&0x003f0000); if(t&0x80000000) t=0;
+ g=((*pdest>>10)&0x0000001f)-(g&0x0000003f); if(g&0x80000000) g=0;
+ g|=t;
+ }
+ else
+ {
+#ifdef HALFBRIGHTMODE3
+ r=(X32COL1(*pdest))+(((((X32BCOL1(color))>>2)* g_m1)&0xFF80FF80)>>7);
+ b=(X32COL2(*pdest))+(((((X32BCOL2(color))>>2)* g_m2)&0xFF80FF80)>>7);
+ g=(X32COL3(*pdest))+(((((X32BCOL3(color))>>2)* g_m3)&0xFF80FF80)>>7);
+#else
+ r=(X32COL1(*pdest))+(((((X32ACOL1(color))>>1)* g_m1)&0xFF80FF80)>>7);
+ b=(X32COL2(*pdest))+(((((X32ACOL2(color))>>1)* g_m2)&0xFF80FF80)>>7);
+ g=(X32COL3(*pdest))+(((((X32ACOL3(color))>>1)* g_m3)&0xFF80FF80)>>7);
+#endif
+ }
+
+ if(!(color&0x8000))
+ {
+ r=(r&0xffff0000)|((((X32COL1(color))* g_m1)&0x0000FF80)>>7);
+ b=(b&0xffff0000)|((((X32COL2(color))* g_m2)&0x0000FF80)>>7);
+ g=(g&0xffff0000)|((((X32COL3(color))* g_m3)&0x0000FF80)>>7);
+ }
+ if(!(color&0x80000000))
+ {
+ r=(r&0xffff)|((((X32COL1(color))* g_m1)&0xFF800000)>>7);
+ b=(b&0xffff)|((((X32COL2(color))* g_m2)&0xFF800000)>>7);
+ g=(g&0xffff)|((((X32COL3(color))* g_m3)&0xFF800000)>>7);
+ }
+
+ }
+ else 
+ {
+ r=(((X32COL1(color))* g_m1)&0xFF80FF80)>>7;
+ b=(((X32COL2(color))* g_m2)&0xFF80FF80)>>7;
+ g=(((X32COL3(color))* g_m3)&0xFF80FF80)>>7;
+ }
+
+ if(r&0x7FE00000) r=0x1f0000|(r&0xFFFF);
+ if(r&0x7FE0) r=0x1f |(r&0xFFFF0000);
+ if(b&0x7FE00000) b=0x1f0000|(b&0xFFFF);
+ if(b&0x7FE0) b=0x1f |(b&0xFFFF0000);
+ if(g&0x7FE00000) g=0x1f0000|(g&0xFFFF);
+ if(g&0x7FE0) g=0x1f |(g&0xFFFF0000);
+ 
+ if(bCheckMask) 
+ {
+ uint32_t ma=*pdest;
+
+ *pdest=(X32PSXCOL(r,g,b))|l;
+ 
+ if((color&0xffff)==0 ) *pdest=(ma&0xffff)|(*pdest&0xffff0000);
+ if((color&0xffff0000)==0) *pdest=(ma&0xffff0000)|(*pdest&0xffff);
+ if(ma&0x80000000) *pdest=(ma&0xFFFF0000)|(*pdest&0xFFFF);
+ if(ma&0x00008000) *pdest=(ma&0xFFFF) |(*pdest&0xFFFF0000);
+
+ return; 
+ }
+ if((color&0xffff)==0 ) {*pdest=(*pdest&0xffff)|(((X32PSXCOL(r,g,b))|l)&0xffff0000);return;}
+ if((color&0xffff0000)==0) {*pdest=(*pdest&0xffff0000)|(((X32PSXCOL(r,g,b))|l)&0xffff);return;}
+
+ *pdest=(X32PSXCOL(r,g,b))|l;
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static __inline void GetTextureTransColG32_S(uint32_t *pdest, uint32_t color)
+{
+ int r,g,b;
+
+ if(color==0) return;
+
+ r=(((X32COL1(color))* g_m1)&0xFF80FF80)>>7;
+ b=(((X32COL2(color))* g_m2)&0xFF80FF80)>>7;
+ g=(((X32COL3(color))* g_m3)&0xFF80FF80)>>7;
+
+ if(r&0x7FE00000) r=0x1f0000|(r&0xFFFF);
+ if(r&0x7FE0) r=0x1f |(r&0xFFFF0000);
+ if(b&0x7FE00000) b=0x1f0000|(b&0xFFFF);
+ if(b&0x7FE0) b=0x1f |(b&0xFFFF0000);
+ if(g&0x7FE00000) g=0x1f0000|(g&0xFFFF);
+ if(g&0x7FE0) g=0x1f |(g&0xFFFF0000);
+ 
+ if((color&0xffff)==0) {*pdest=(*pdest&0xffff)|(((X32PSXCOL(r,g,b))|lSetMask|(color&0x80008000))&0xffff0000);return;}
+ if((color&0xffff0000)==0) {*pdest=(*pdest&0xffff0000)|(((X32PSXCOL(r,g,b))|lSetMask|(color&0x80008000))&0xffff);return;}
+
+ *pdest=(X32PSXCOL(r,g,b))|lSetMask|(color&0x80008000);
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static __inline void GetTextureTransColG32_SPR(uint32_t *pdest, uint32_t color)
+{
+ int r,g,b;
+
+ if(color==0) return;
+
+ if(DrawSemiTrans && (color&0x80008000))
+ {
+ if(GlobalTextABR==0)
+ { 
+ r=((((X32TCOL1(*pdest))+((X32COL1(color)) * g_m1))&0xFF00FF00)>>8);
+ b=((((X32TCOL2(*pdest))+((X32COL2(color)) * g_m2))&0xFF00FF00)>>8);
+ g=((((X32TCOL3(*pdest))+((X32COL3(color)) * g_m3))&0xFF00FF00)>>8);
+ }
+ else
+ if(GlobalTextABR==1)
+ {
+ r=(X32COL1(*pdest))+(((((X32COL1(color)))* g_m1)&0xFF80FF80)>>7);
+ b=(X32COL2(*pdest))+(((((X32COL2(color)))* g_m2)&0xFF80FF80)>>7);
+ g=(X32COL3(*pdest))+(((((X32COL3(color)))* g_m3)&0xFF80FF80)>>7);
+ }
+ else
+ if(GlobalTextABR==2)
+ {
+ int t;
+ r=(((((X32COL1(color)))* g_m1)&0xFF80FF80)>>7);
+ t=(*pdest&0x001f0000)-(r&0x003f0000); if(t&0x80000000) t=0;
+ r=(*pdest&0x0000001f)-(r&0x0000003f); if(r&0x80000000) r=0;
+ r|=t;
+
+ b=(((((X32COL2(color)))* g_m2)&0xFF80FF80)>>7);
+ t=((*pdest>>5)&0x001f0000)-(b&0x003f0000); if(t&0x80000000) t=0;
+ b=((*pdest>>5)&0x0000001f)-(b&0x0000003f); if(b&0x80000000) b=0;
+ b|=t;
+
+ g=(((((X32COL3(color)))* g_m3)&0xFF80FF80)>>7);
+ t=((*pdest>>10)&0x001f0000)-(g&0x003f0000); if(t&0x80000000) t=0;
+ g=((*pdest>>10)&0x0000001f)-(g&0x0000003f); if(g&0x80000000) g=0;
+ g|=t;
+ }
+ else
+ {
+#ifdef HALFBRIGHTMODE3
+ r=(X32COL1(*pdest))+(((((X32BCOL1(color))>>2)* g_m1)&0xFF80FF80)>>7);
+ b=(X32COL2(*pdest))+(((((X32BCOL2(color))>>2)* g_m2)&0xFF80FF80)>>7);
+ g=(X32COL3(*pdest))+(((((X32BCOL3(color))>>2)* g_m3)&0xFF80FF80)>>7);
+#else
+ r=(X32COL1(*pdest))+(((((X32ACOL1(color))>>1)* g_m1)&0xFF80FF80)>>7);
+ b=(X32COL2(*pdest))+(((((X32ACOL2(color))>>1)* g_m2)&0xFF80FF80)>>7);
+ g=(X32COL3(*pdest))+(((((X32ACOL3(color))>>1)* g_m3)&0xFF80FF80)>>7);
+#endif
+ }
+
+ if(!(color&0x8000))
+ {
+ r=(r&0xffff0000)|((((X32COL1(color))* g_m1)&0x0000FF80)>>7);
+ b=(b&0xffff0000)|((((X32COL2(color))* g_m2)&0x0000FF80)>>7);
+ g=(g&0xffff0000)|((((X32COL3(color))* g_m3)&0x0000FF80)>>7);
+ }
+ if(!(color&0x80000000))
+ {
+ r=(r&0xffff)|((((X32COL1(color))* g_m1)&0xFF800000)>>7);
+ b=(b&0xffff)|((((X32COL2(color))* g_m2)&0xFF800000)>>7);
+ g=(g&0xffff)|((((X32COL3(color))* g_m3)&0xFF800000)>>7);
+ }
+
+ }
+ else 
+ {
+ r=(((X32COL1(color))* g_m1)&0xFF80FF80)>>7;
+ b=(((X32COL2(color))* g_m2)&0xFF80FF80)>>7;
+ g=(((X32COL3(color))* g_m3)&0xFF80FF80)>>7;
+ }
+
+ if(r&0x7FE00000) r=0x1f0000|(r&0xFFFF);
+ if(r&0x7FE0) r=0x1f |(r&0xFFFF0000);
+ if(b&0x7FE00000) b=0x1f0000|(b&0xFFFF);
+ if(b&0x7FE0) b=0x1f |(b&0xFFFF0000);
+ if(g&0x7FE00000) g=0x1f0000|(g&0xFFFF);
+ if(g&0x7FE0) g=0x1f |(g&0xFFFF0000);
+ 
+ if(bCheckMask) 
+ {
+ uint32_t ma=*pdest;
+
+ *pdest=(X32PSXCOL(r,g,b))|lSetMask|(color&0x80008000);
+ 
+ if((color&0xffff)==0 ) *pdest=(ma&0xffff)|(*pdest&0xffff0000);
+ if((color&0xffff0000)==0) *pdest=(ma&0xffff0000)|(*pdest&0xffff);
+ if(ma&0x80000000) *pdest=(ma&0xFFFF0000)|(*pdest&0xFFFF);
+ if(ma&0x00008000) *pdest=(ma&0xFFFF) |(*pdest&0xFFFF0000);
+
+ return; 
+ }
+ if((color&0xffff)==0 ) {*pdest=(*pdest&0xffff)|(((X32PSXCOL(r,g,b))|lSetMask|(color&0x80008000))&0xffff0000);return;}
+ if((color&0xffff0000)==0) {*pdest=(*pdest&0xffff0000)|(((X32PSXCOL(r,g,b))|lSetMask|(color&0x80008000))&0xffff);return;}
+
+ *pdest=(X32PSXCOL(r,g,b))|lSetMask|(color&0x80008000);
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static __inline void GetTextureTransColGX_Dither(unsigned short * pdest, unsigned short color, int m1, int m2, int m3)
+{
+ int r,g,b;
+
+ if(color==0) return;
+ 
+ if(bCheckMask && *pdest&0x8000) return;
+
+ m1=(((XCOL1D(color)))*m1)>>4;
+ m2=(((XCOL2D(color)))*m2)>>4;
+ m3=(((XCOL3D(color)))*m3)>>4;
+
+ if(DrawSemiTrans && (color&0x8000))
+ {
+ r=((XCOL1D(*pdest))<<3);
+ b=((XCOL2D(*pdest))<<3);
+ g=((XCOL3D(*pdest))<<3);
+
+ if(GlobalTextABR==0)
+ {
+ r=(r>>1)+(m1>>1);
+ b=(b>>1)+(m2>>1);
+ g=(g>>1)+(m3>>1);
+ }
+ else
+ if(GlobalTextABR==1)
+ {
+ r+=m1;
+ b+=m2;
+ g+=m3;
+ }
+ else
+ if(GlobalTextABR==2)
+ {
+ r-=m1;
+ b-=m2;
+ g-=m3;
+ if(r&0x80000000) r=0;
+ if(b&0x80000000) b=0;
+ if(g&0x80000000) g=0;
+ }
+ else
+ {
+#ifdef HALFBRIGHTMODE3
+ r+=(m1>>2);
+ b+=(m2>>2);
+ g+=(m3>>2);
+#else
+ r+=(m1>>1);
+ b+=(m2>>1);
+ g+=(m3>>1);
+#endif
+ }
+ }
+ else 
+ {
+ r=m1;
+ b=m2;
+ g=m3;
+ }
+
+ if(r&0x7FFFFF00) r=0xff;
+ if(b&0x7FFFFF00) b=0xff;
+ if(g&0x7FFFFF00) g=0xff;
+
+ Dither16(pdest,r,b,g,sSetMask|(color&0x8000));
+
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static __inline void GetTextureTransColGX(unsigned short * pdest,unsigned short color,short m1,short m2,short m3)
+{
+ int r,g,b;unsigned short l;
+
+ if(color==0) return;
+ 
+ if(bCheckMask && *pdest&0x8000) return;
+
+ l=sSetMask|(color&0x8000);
+
+ if(DrawSemiTrans && (color&0x8000))
+ {
+ if(GlobalTextABR==0)
+ {
+ unsigned short d;
+ d =((*pdest)&0x7bde)>>1;
+ color =((color) &0x7bde)>>1;
+ r=(XCOL1(d))+((((XCOL1(color)))* m1)>>7);
+ b=(XCOL2(d))+((((XCOL2(color)))* m2)>>7);
+ g=(XCOL3(d))+((((XCOL3(color)))* m3)>>7);
+/*
+ r=(XCOL1(*pdest)>>1)+((((XCOL1(color))>>1)* m1)>>7);
+ b=(XCOL2(*pdest)>>1)+((((XCOL2(color))>>1)* m2)>>7);
+ g=(XCOL3(*pdest)>>1)+((((XCOL3(color))>>1)* m3)>>7);
+*/
+ }
+ else
+ if(GlobalTextABR==1)
+ {
+ r=(XCOL1(*pdest))+((((XCOL1(color)))* m1)>>7);
+ b=(XCOL2(*pdest))+((((XCOL2(color)))* m2)>>7);
+ g=(XCOL3(*pdest))+((((XCOL3(color)))* m3)>>7);
+ }
+ else
+ if(GlobalTextABR==2)
+ {
+ r=(XCOL1(*pdest))-((((XCOL1(color)))* m1)>>7);
+ b=(XCOL2(*pdest))-((((XCOL2(color)))* m2)>>7);
+ g=(XCOL3(*pdest))-((((XCOL3(color)))* m3)>>7);
+ if(r&0x80000000) r=0;
+ if(b&0x80000000) b=0;
+ if(g&0x80000000) g=0;
+ }
+ else
+ {
+#ifdef HALFBRIGHTMODE3
+ r=(XCOL1(*pdest))+((((XCOL1(color))>>2)* m1)>>7);
+ b=(XCOL2(*pdest))+((((XCOL2(color))>>2)* m2)>>7);
+ g=(XCOL3(*pdest))+((((XCOL3(color))>>2)* m3)>>7);
+#else
+ r=(XCOL1(*pdest))+((((XCOL1(color))>>1)* m1)>>7);
+ b=(XCOL2(*pdest))+((((XCOL2(color))>>1)* m2)>>7);
+ g=(XCOL3(*pdest))+((((XCOL3(color))>>1)* m3)>>7);
+#endif
+ }
+ }
+ else 
+ {
+ r=((XCOL1(color))* m1)>>7;
+ b=((XCOL2(color))* m2)>>7;
+ g=((XCOL3(color))* m3)>>7;
+ }
+
+ if(r&0x7FFFFFE0) r=0x1f;
+ if(b&0x7FFFFC00) b=0x3e0;
+ if(g&0x7FFF8000) g=0x7c00;
+
+ *pdest=(XPSXCOL(r,g,b))|l;
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static __inline void GetTextureTransColGX_S(unsigned short * pdest,unsigned short color,short m1,short m2,short m3)
+{
+ int r,g,b;
+
+ if(color==0) return;
+ 
+ r=((XCOL1(color))* m1)>>7;
+ b=((XCOL2(color))* m2)>>7;
+ g=((XCOL3(color))* m3)>>7;
+
+ if(r&0x7FFFFFE0) r=0x1f;
+ if(b&0x7FFFFC00) b=0x3e0;
+ if(g&0x7FFF8000) g=0x7c00;
+
+ *pdest=(XPSXCOL(r,g,b))|sSetMask|(color&0x8000);
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static __inline void GetTextureTransColGX32_S(uint32_t *pdest, uint32_t color, short m1, short m2, short m3)
+{
+ int r,g,b;
+ 
+ if(color==0) return;
+
+ r=(((X32COL1(color))* m1)&0xFF80FF80)>>7;
+ b=(((X32COL2(color))* m2)&0xFF80FF80)>>7;
+ g=(((X32COL3(color))* m3)&0xFF80FF80)>>7;
+ 
+ if(r&0x7FE00000) r=0x1f0000|(r&0xFFFF);
+ if(r&0x7FE0) r=0x1f |(r&0xFFFF0000);
+ if(b&0x7FE00000) b=0x1f0000|(b&0xFFFF);
+ if(b&0x7FE0) b=0x1f |(b&0xFFFF0000);
+ if(g&0x7FE00000) g=0x1f0000|(g&0xFFFF);
+ if(g&0x7FE0) g=0x1f |(g&0xFFFF0000);
+
+ if((color&0xffff)==0) {*pdest=(*pdest&0xffff)|(((X32PSXCOL(r,g,b))|lSetMask|(color&0x80008000))&0xffff0000);return;}
+ if((color&0xffff0000)==0) {*pdest=(*pdest&0xffff0000)|(((X32PSXCOL(r,g,b))|lSetMask|(color&0x80008000))&0xffff);return;}
+
+ *pdest=(X32PSXCOL(r,g,b))|lSetMask|(color&0x80008000);
+}
+
+////////////////////////////////////////////////////////////////////////
+// FILL FUNCS
+////////////////////////////////////////////////////////////////////////
+
+void FillSoftwareAreaTrans(short x0,short y0,short x1, // FILL AREA TRANS
+ short y1,unsigned short col)
+{
+ short j,i,dx,dy;
+
+ if(y0>y1) return;
+ if(x0>x1) return;
+
+ if(x1<drawX) return;
+ if(y1<drawY) return;
+ if(x0>drawW) return;
+ if(y0>drawH) return;
+
+ x1=min(x1,drawW+1);
+ y1=min(y1,drawH+1);
+ x0=max(x0,drawX);
+ y0=max(y0,drawY);
+ 
+ if(y0>=iGPUHeight) return;
+ if(x0>1023) return;
+
+ if(y1>iGPUHeight) y1=iGPUHeight;
+ if(x1>1024) x1=1024;
+
+ dx=x1-x0;dy=y1-y0;
+
+ if(dx==1 && dy==1 && x0==1020 && y0==511) // special fix for pinball game... emu protection???
+ {
+/*
+m->v 1020 511 1 1
+writedatamem 0x00000000 1
+tile1 newcol 7fff (orgcol 0xffffff), oldvram 0
+v->m 1020 511 1 1
+readdatamem 0x00007fff 1
+m->v 1020 511 1 1
+writedatamem 0x00000000 1
+tile1 newcol 8000 (orgcol 0xffffff), oldvram 0
+v->m 1020 511 1 1
+readdatamem 0x00008000 1
+*/
+
+ static int iCheat=0;
+ col+=iCheat;
+ if(iCheat==1) iCheat=0; else iCheat=1;
+ }
+
+ if(dx&1) // slow fill
+ {
+ unsigned short *DSTPtr;
+ unsigned short LineOffset;
+ DSTPtr = psxVuw + (1024*y0) + x0;
+ LineOffset = 1024 - dx;
+ for(i=0;i<dy;i++)
+ {
+ for(j=0;j<dx;j++)
+ GetShadeTransCol(DSTPtr++,col);
+ DSTPtr += LineOffset;
+ } 
+ }
+ else // fast fill
+ {
+ uint32_t *DSTPtr;
+ unsigned short LineOffset;
+ uint32_t lcol=lSetMask|(((uint32_t)(col))<<16)|col;
+ dx>>=1;
+ DSTPtr = (uint32_t *)(psxVuw + (1024*y0) + x0);
+ LineOffset = 512 - dx;
+
+ if(!bCheckMask && !DrawSemiTrans)
+ {
+ for(i=0;i<dy;i++)
+ {
+ for(j=0;j<dx;j++) *DSTPtr++=lcol;
+ DSTPtr += LineOffset;
+ }
+ }
+ else
+ {
+ for(i=0;i<dy;i++)
+ {
+ for(j=0;j<dx;j++) 
+ GetShadeTransCol32(DSTPtr++,lcol);
+ DSTPtr += LineOffset;
+ } 
+ }
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void FillSoftwareArea(short x0,short y0,short x1, // FILL AREA (BLK FILL)
+ short y1,unsigned short col) // no draw area check here!
+{
+ short j,i,dx,dy;
+
+ if(y0>y1) return;
+ if(x0>x1) return;
+ 
+ if(y0>=iGPUHeight) return;
+ if(x0>1023) return;
+
+ if(y1>iGPUHeight) y1=iGPUHeight;
+ if(x1>1024) x1=1024;
+
+ dx=x1-x0;dy=y1-y0;
+ if(dx&1)
+ {
+ unsigned short *DSTPtr;
+ unsigned short LineOffset;
+
+ DSTPtr = psxVuw + (1024*y0) + x0;
+ LineOffset = 1024 - dx;
+
+ for(i=0;i<dy;i++)
+ {
+ for(j=0;j<dx;j++) *DSTPtr++=col;
+ DSTPtr += LineOffset;
+ } 
+ }
+ else
+ {
+ uint32_t *DSTPtr;
+ unsigned short LineOffset;
+ uint32_t lcol=(((int)col)<<16)|col;
+ dx>>=1;
+ DSTPtr = (uint32_t *)(psxVuw + (1024*y0) + x0);
+ LineOffset = 512 - dx;
+
+ for(i=0;i<dy;i++)
+ {
+ for(j=0;j<dx;j++) *DSTPtr++=lcol;
+ DSTPtr += LineOffset;
+ } 
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+// EDGE INTERPOLATION
+////////////////////////////////////////////////////////////////////////
+
+typedef struct SOFTVTAG
+{
+ int x,y; 
+ int u,v;
+ int R,G,B;
+} soft_vertex;
+
+static soft_vertex vtx[4];
+static soft_vertex * left_array[4], * right_array[4];
+static int left_section, right_section;
+static int left_section_height, right_section_height;
+static int left_x, delta_left_x, right_x, delta_right_x;
+static int left_u, delta_left_u, left_v, delta_left_v;
+static int right_u, delta_right_u, right_v, delta_right_v;
+static int left_R, delta_left_R, right_R, delta_right_R;
+static int left_G, delta_left_G, right_G, delta_right_G;
+static int left_B, delta_left_B, right_B, delta_right_B;
+
+#ifdef _MSC_VER
+
+#pragma warning (disable : 4035)
+
+static __inline int shl10idiv(int x, int y)
+{
+ __asm
+ {
+ mov eax,x
+ mov ebx,y
+ mov edx, eax
+ shl eax, 10
+ sar edx, 22
+ idiv ebx
+ // return result in eax
+ }
+}
+
+#else
+
+static __inline int shl10idiv(int x, int y)
+{
+ long long int bi=x;
+ bi<<=10;
+ return (int)(bi/y);
+}
+
+#endif
+
+static __inline int RightSection_F(void)
+{
+ soft_vertex * v1 = right_array[ right_section ];
+ soft_vertex * v2 = right_array[ right_section-1 ];
+
+ int height = v2->y - v1->y;
+ if(height == 0) return 0;
+ delta_right_x = (v2->x - v1->x) / height;
+ right_x = v1->x;
+
+ right_section_height = height;
+ return height;
+}
+
+static __inline int LeftSection_F(void)
+{
+ soft_vertex * v1 = left_array[ left_section ];
+ soft_vertex * v2 = left_array[ left_section-1 ];
+
+ int height = v2->y - v1->y;
+ if(height == 0) return 0;
+ delta_left_x = (v2->x - v1->x) / height;
+ left_x = v1->x;
+
+ left_section_height = height;
+ return height; 
+}
+
+static __inline BOOL NextRow_F(void)
+{
+ if(--left_section_height<=0) 
+ {
+ if(--left_section <= 0) {return TRUE;}
+ if(LeftSection_F() <= 0) {return TRUE;}
+ }
+ else
+ {
+ left_x += delta_left_x;
+ }
+
+ if(--right_section_height<=0) 
+ {
+ if(--right_section<=0) {return TRUE;}
+ if(RightSection_F() <=0) {return TRUE;}
+ }
+ else
+ {
+ right_x += delta_right_x;
+ }
+ return FALSE;
+}
+
+static __inline BOOL SetupSections_F(short x1, short y1, short x2, short y2, short x3, short y3)
+{
+ soft_vertex * v1, * v2, * v3;
+ int height,longest;
+
+ v1 = vtx; v1->x=x1<<16;v1->y=y1;
+ v2 = vtx+1; v2->x=x2<<16;v2->y=y2;
+ v3 = vtx+2; v3->x=x3<<16;v3->y=y3;
+
+ if(v1->y > v2->y) { soft_vertex * v = v1; v1 = v2; v2 = v; }
+ if(v1->y > v3->y) { soft_vertex * v = v1; v1 = v3; v3 = v; }
+ if(v2->y > v3->y) { soft_vertex * v = v2; v2 = v3; v3 = v; }
+
+ height = v3->y - v1->y;
+ if(height == 0) {return FALSE;}
+ longest = (((v2->y - v1->y) << 16) / height) * ((v3->x - v1->x)>>16) + (v1->x - v2->x);
+ if(longest == 0) {return FALSE;}
+
+ if(longest < 0)
+ {
+ right_array[0] = v3;
+ right_array[1] = v2;
+ right_array[2] = v1;
+ right_section = 2;
+ left_array[0] = v3;
+ left_array[1] = v1;
+ left_section = 1;
+
+ if(LeftSection_F() <= 0) return FALSE;
+ if(RightSection_F() <= 0)
+ {
+ right_section--;
+ if(RightSection_F() <= 0) return FALSE;
+ }
+ }
+ else
+ {
+ left_array[0] = v3;
+ left_array[1] = v2;
+ left_array[2] = v1;
+ left_section = 2;
+ right_array[0] = v3;
+ right_array[1] = v1;
+ right_section = 1;
+
+ if(RightSection_F() <= 0) return FALSE;
+ if(LeftSection_F() <= 0)
+ { 
+ left_section--;
+ if(LeftSection_F() <= 0) return FALSE;
+ }
+ }
+
+ Ymin=v1->y;
+ Ymax=min(v3->y-1,drawH);
+
+ return TRUE;
+}
+
+static __inline int RightSection_G(void)
+{
+ soft_vertex * v1 = right_array[ right_section ];
+ soft_vertex * v2 = right_array[ right_section-1 ];
+
+ int height = v2->y - v1->y;
+ if(height == 0) return 0;
+ delta_right_x = (v2->x - v1->x) / height;
+ right_x = v1->x;
+
+ right_section_height = height;
+ return height;
+}
+
+static __inline int LeftSection_G(void)
+{
+ soft_vertex * v1 = left_array[ left_section ];
+ soft_vertex * v2 = left_array[ left_section-1 ];
+
+ int height = v2->y - v1->y;
+ if(height == 0) return 0;
+ delta_left_x = (v2->x - v1->x) / height;
+ left_x = v1->x;
+
+ delta_left_R = ((v2->R - v1->R)) / height;
+ left_R = v1->R;
+ delta_left_G = ((v2->G - v1->G)) / height;
+ left_G = v1->G;
+ delta_left_B = ((v2->B - v1->B)) / height;
+ left_B = v1->B;
+
+ left_section_height = height;
+ return height; 
+}
+
+static __inline BOOL NextRow_G(void)
+{
+ if(--left_section_height<=0) 
+ {
+ if(--left_section <= 0) {return TRUE;}
+ if(LeftSection_G() <= 0) {return TRUE;}
+ }
+ else
+ {
+ left_x += delta_left_x;
+ left_R += delta_left_R;
+ left_G += delta_left_G;
+ left_B += delta_left_B;
+ }
+
+ if(--right_section_height<=0) 
+ {
+ if(--right_section<=0) {return TRUE;}
+ if(RightSection_G() <=0) {return TRUE;}
+ }
+ else
+ {
+ right_x += delta_right_x;
+ }
+ return FALSE;
+}
+
+static __inline BOOL SetupSections_G(short x1,short y1,short x2,short y2,short x3,short y3, int rgb1, int rgb2, int rgb3){
+ soft_vertex *v1, *v2, *v3;
+ int height, longest, temp;
+
+ v1 = vtx; v1->x=x1<<16;v1->y=y1;
+ v1->R=(rgb1) & 0x00ff0000;
+ v1->G=(rgb1<<8) & 0x00ff0000;
+ v1->B=(rgb1<<16) & 0x00ff0000;
+ v2 = vtx+1; v2->x=x2<<16;v2->y=y2;
+ v2->R=(rgb2) & 0x00ff0000;
+ v2->G=(rgb2<<8) & 0x00ff0000;
+ v2->B=(rgb2<<16) & 0x00ff0000;
+ v3 = vtx+2; v3->x=x3<<16;v3->y=y3;
+ v3->R=(rgb3) & 0x00ff0000;
+ v3->G=(rgb3<<8) & 0x00ff0000;
+ v3->B=(rgb3<<16) & 0x00ff0000;
+
+ if(v1->y > v2->y) { soft_vertex * v = v1; v1 = v2; v2 = v; }
+ if(v1->y > v3->y) { soft_vertex * v = v1; v1 = v3; v3 = v; }
+ if(v2->y > v3->y) { soft_vertex * v = v2; v2 = v3; v3 = v; }
+
+ height = v3->y - v1->y;
+ if(height == 0) {return FALSE;}
+ temp=(((v2->y - v1->y) << 16) / height);
+ longest = temp * ((v3->x - v1->x)>>16) + (v1->x - v2->x);
+ if(longest == 0) {return FALSE;}
+
+ if(longest < 0)
+ {
+ right_array[0] = v3;
+ right_array[1] = v2;
+ right_array[2] = v1;
+ right_section = 2;
+ left_array[0] = v3;
+ left_array[1] = v1;
+ left_section = 1;
+
+ if(LeftSection_G() <= 0) return FALSE;
+ if(RightSection_G() <= 0)
+ {
+ right_section--;
+ if(RightSection_G() <= 0) return FALSE;
+ }
+ if(longest > -0x1000) longest = -0x1000; 
+ }
+ else
+ {
+ left_array[0] = v3;
+ left_array[1] = v2;
+ left_array[2] = v1;
+ left_section = 2;
+ right_array[0] = v3;
+ right_array[1] = v1;
+ right_section = 1;
+
+ if(RightSection_G() <= 0) return FALSE;
+ if(LeftSection_G() <= 0)
+ { 
+ left_section--;
+ if(LeftSection_G() <= 0) return FALSE;
+ }
+ if(longest < 0x1000) longest = 0x1000; 
+ }
+
+ Ymin=v1->y;
+ Ymax=min(v3->y-1,drawH); 
+
+ delta_right_R=shl10idiv(temp*((v3->R - v1->R)>>10)+((v1->R - v2->R)<<6),longest);
+ delta_right_G=shl10idiv(temp*((v3->G - v1->G)>>10)+((v1->G - v2->G)<<6),longest);
+ delta_right_B=shl10idiv(temp*((v3->B - v1->B)>>10)+((v1->B - v2->B)<<6),longest);
+
+ return TRUE;
+}
+
+static __inline int RightSection_FT(void)
+{
+ soft_vertex * v1 = right_array[ right_section ];
+ soft_vertex * v2 = right_array[ right_section-1 ];
+
+ int height = v2->y - v1->y;
+ if(height == 0) return 0;
+ delta_right_x = (v2->x - v1->x) / height;
+ right_x = v1->x;
+
+ right_section_height = height;
+ return height;
+}
+
+static __inline int LeftSection_FT(void)
+{
+ soft_vertex * v1 = left_array[ left_section ];
+ soft_vertex * v2 = left_array[ left_section-1 ];
+
+ int height = v2->y - v1->y;
+ if(height == 0) return 0;
+ delta_left_x = (v2->x - v1->x) / height;
+ left_x = v1->x;
+ 
+ delta_left_u = ((v2->u - v1->u)) / height;
+ left_u = v1->u;
+ delta_left_v = ((v2->v - v1->v)) / height;
+ left_v = v1->v;
+
+ left_section_height = height;
+ return height; 
+}
+
+static __inline BOOL NextRow_FT(void)
+{
+ if(--left_section_height<=0) 
+ {
+ if(--left_section <= 0) {return TRUE;}
+ if(LeftSection_FT() <= 0) {return TRUE;}
+ }
+ else
+ {
+ left_x += delta_left_x;
+ left_u += delta_left_u;
+ left_v += delta_left_v;
+ }
+
+ if(--right_section_height<=0) 
+ {
+ if(--right_section<=0) {return TRUE;}
+ if(RightSection_FT() <=0) {return TRUE;}
+ }
+ else
+ {
+ right_x += delta_right_x;
+ }
+ return FALSE;
+}
+
+static __inline BOOL SetupSections_FT(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3)
+{
+ soft_vertex * v1, * v2, * v3;
+ int height,longest,temp;
+
+ v1 = vtx; v1->x=x1<<16;v1->y=y1;
+ v1->u=tx1<<16;v1->v=ty1<<16;
+ v2 = vtx+1; v2->x=x2<<16;v2->y=y2;
+ v2->u=tx2<<16;v2->v=ty2<<16;
+ v3 = vtx+2; v3->x=x3<<16;v3->y=y3;
+ v3->u=tx3<<16;v3->v=ty3<<16;
+
+ if(v1->y > v2->y) { soft_vertex * v = v1; v1 = v2; v2 = v; }
+ if(v1->y > v3->y) { soft_vertex * v = v1; v1 = v3; v3 = v; }
+ if(v2->y > v3->y) { soft_vertex * v = v2; v2 = v3; v3 = v; }
+
+ height = v3->y - v1->y;
+ if(height == 0) {return FALSE;}
+
+ temp=(((v2->y - v1->y) << 16) / height);
+ longest = temp * ((v3->x - v1->x)>>16) + (v1->x - v2->x);
+
+ if(longest == 0) {return FALSE;}
+
+ if(longest < 0)
+ {
+ right_array[0] = v3;
+ right_array[1] = v2;
+ right_array[2] = v1;
+ right_section = 2;
+ left_array[0] = v3;
+ left_array[1] = v1;
+ left_section = 1;
+
+ if(LeftSection_FT() <= 0) return FALSE;
+ if(RightSection_FT() <= 0)
+ {
+ right_section--;
+ if(RightSection_FT() <= 0) return FALSE;
+ }
+ if(longest > -0x1000) longest = -0x1000; 
+ }
+ else
+ {
+ left_array[0] = v3;
+ left_array[1] = v2;
+ left_array[2] = v1;
+ left_section = 2;
+ right_array[0] = v3;
+ right_array[1] = v1;
+ right_section = 1;
+
+ if(RightSection_FT() <= 0) return FALSE;
+ if(LeftSection_FT() <= 0)
+ { 
+ left_section--; 
+ if(LeftSection_FT() <= 0) return FALSE;
+ }
+ if(longest < 0x1000) longest = 0x1000; 
+ }
+
+ Ymin=v1->y;
+ Ymax=min(v3->y-1,drawH);
+
+ delta_right_u=shl10idiv(temp*((v3->u - v1->u)>>10)+((v1->u - v2->u)<<6),longest);
+ delta_right_v=shl10idiv(temp*((v3->v - v1->v)>>10)+((v1->v - v2->v)<<6),longest);
+
+/*
+Mmm... adjust neg tex deltas... will sometimes cause slight
+texture distortions 
+
+ longest>>=16;
+ if(longest)
+ {
+ if(longest<0) longest=-longest;
+ if(delta_right_u<0)
+ delta_right_u-=delta_right_u/longest;
+ if(delta_right_v<0)
+ delta_right_v-=delta_right_v/longest;
+ }
+*/
+
+ return TRUE;
+}
+
+static __inline int RightSection_GT(void)
+{
+ soft_vertex * v1 = right_array[ right_section ];
+ soft_vertex * v2 = right_array[ right_section-1 ];
+
+ int height = v2->y - v1->y;
+ if(height == 0) return 0;
+ delta_right_x = (v2->x - v1->x) / height;
+ right_x = v1->x;
+
+ right_section_height = height;
+ return height;
+}
+
+static __inline int LeftSection_GT(void)
+{
+ soft_vertex * v1 = left_array[ left_section ];
+ soft_vertex * v2 = left_array[ left_section-1 ];
+
+ int height = v2->y - v1->y;
+ if(height == 0) return 0;
+ delta_left_x = (v2->x - v1->x) / height;
+ left_x = v1->x;
+
+ delta_left_u = ((v2->u - v1->u)) / height;
+ left_u = v1->u;
+ delta_left_v = ((v2->v - v1->v)) / height;
+ left_v = v1->v;
+
+ delta_left_R = ((v2->R - v1->R)) / height;
+ left_R = v1->R;
+ delta_left_G = ((v2->G - v1->G)) / height;
+ left_G = v1->G;
+ delta_left_B = ((v2->B - v1->B)) / height;
+ left_B = v1->B;
+
+ left_section_height = height;
+ return height; 
+}
+
+static __inline BOOL NextRow_GT(void)
+{
+ if(--left_section_height<=0) 
+ {
+ if(--left_section <= 0) {return TRUE;}
+ if(LeftSection_GT() <= 0) {return TRUE;}
+ }
+ else
+ {
+ left_x += delta_left_x;
+ left_u += delta_left_u;
+ left_v += delta_left_v;
+ left_R += delta_left_R;
+ left_G += delta_left_G;
+ left_B += delta_left_B;
+ }
+
+ if(--right_section_height<=0) 
+ {
+ if(--right_section<=0) {return TRUE;}
+ if(RightSection_GT() <=0) {return TRUE;}
+ }
+ else
+ {
+ right_x += delta_right_x;
+ }
+ return FALSE;
+}
+
+static __inline BOOL SetupSections_GT(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, int rgb1, int rgb2, int rgb3)
+{
+ soft_vertex * v1, * v2, * v3;
+ int height,longest,temp;
+
+ v1 = vtx; v1->x=x1<<16;v1->y=y1;
+ v1->u=tx1<<16;v1->v=ty1<<16;
+ v1->R=(rgb1) & 0x00ff0000;
+ v1->G=(rgb1<<8) & 0x00ff0000;
+ v1->B=(rgb1<<16) & 0x00ff0000;
+
+ v2 = vtx+1; v2->x=x2<<16;v2->y=y2;
+ v2->u=tx2<<16;v2->v=ty2<<16;
+ v2->R=(rgb2) & 0x00ff0000;
+ v2->G=(rgb2<<8) & 0x00ff0000;
+ v2->B=(rgb2<<16) & 0x00ff0000;
+ 
+ v3 = vtx+2; v3->x=x3<<16;v3->y=y3;
+ v3->u=tx3<<16;v3->v=ty3<<16;
+ v3->R=(rgb3) & 0x00ff0000;
+ v3->G=(rgb3<<8) & 0x00ff0000;
+ v3->B=(rgb3<<16) & 0x00ff0000;
+
+ if(v1->y > v2->y) { soft_vertex * v = v1; v1 = v2; v2 = v; }
+ if(v1->y > v3->y) { soft_vertex * v = v1; v1 = v3; v3 = v; }
+ if(v2->y > v3->y) { soft_vertex * v = v2; v2 = v3; v3 = v; }
+
+ height = v3->y - v1->y;
+ if(height == 0) {return FALSE;}
+
+ temp=(((v2->y - v1->y) << 16) / height);
+ longest = temp * ((v3->x - v1->x)>>16) + (v1->x - v2->x);
+
+ if(longest == 0) {return FALSE;}
+
+ if(longest < 0)
+ {
+ right_array[0] = v3;
+ right_array[1] = v2;
+ right_array[2] = v1;
+ right_section = 2;
+ left_array[0] = v3;
+ left_array[1] = v1;
+ left_section = 1;
+
+ if(LeftSection_GT() <= 0) return FALSE;
+ if(RightSection_GT() <= 0)
+ {
+ right_section--;
+ if(RightSection_GT() <= 0) return FALSE;
+ }
+
+ if(longest > -0x1000) longest = -0x1000; 
+ }
+ else
+ {
+ left_array[0] = v3;
+ left_array[1] = v2;
+ left_array[2] = v1;
+ left_section = 2;
+ right_array[0] = v3;
+ right_array[1] = v1;
+ right_section = 1;
+
+ if(RightSection_GT() <= 0) return FALSE;
+ if(LeftSection_GT() <= 0)
+ { 
+ left_section--;
+ if(LeftSection_GT() <= 0) return FALSE;
+ }
+ if(longest < 0x1000) longest = 0x1000; 
+ }
+
+ Ymin=v1->y;
+ Ymax=min(v3->y-1,drawH);
+
+ delta_right_R=shl10idiv(temp*((v3->R - v1->R)>>10)+((v1->R - v2->R)<<6),longest);
+ delta_right_G=shl10idiv(temp*((v3->G - v1->G)>>10)+((v1->G - v2->G)<<6),longest);
+ delta_right_B=shl10idiv(temp*((v3->B - v1->B)>>10)+((v1->B - v2->B)<<6),longest);
+
+ delta_right_u=shl10idiv(temp*((v3->u - v1->u)>>10)+((v1->u - v2->u)<<6),longest);
+ delta_right_v=shl10idiv(temp*((v3->v - v1->v)>>10)+((v1->v - v2->v)<<6),longest);
+
+
+/*
+Mmm... adjust neg tex deltas... will sometimes cause slight
+texture distortions 
+ longest>>=16;
+ if(longest)
+ {
+ if(longest<0) longest=-longest;
+ if(delta_right_u<0)
+ delta_right_u-=delta_right_u/longest;
+ if(delta_right_v<0)
+ delta_right_v-=delta_right_v/longest;
+ }
+*/
+
+
+ return TRUE;
+}
+
+static __inline int RightSection_F4(void)
+{
+ soft_vertex * v1 = right_array[ right_section ];
+ soft_vertex * v2 = right_array[ right_section-1 ];
+
+ int height = v2->y - v1->y;
+ right_section_height = height;
+ right_x = v1->x;
+ if(height == 0) 
+ {
+ return 0;
+ }
+ delta_right_x = (v2->x - v1->x) / height;
+
+ return height;
+}
+
+static __inline int LeftSection_F4(void)
+{
+ soft_vertex * v1 = left_array[ left_section ];
+ soft_vertex * v2 = left_array[ left_section-1 ];
+
+ int height = v2->y - v1->y;
+ left_section_height = height;
+ left_x = v1->x;
+ if(height == 0) 
+ {
+ return 0;
+ }
+ delta_left_x = (v2->x - v1->x) / height;
+
+ return height; 
+}
+
+static __inline BOOL NextRow_F4(void)
+{
+ if(--left_section_height<=0) 
+ {
+ if(--left_section > 0) 
+ while(LeftSection_F4()<=0) 
+ {
+ if(--left_section <= 0) break;
+ }
+ }
+ else
+ {
+ left_x += delta_left_x;
+ }
+
+ if(--right_section_height<=0) 
+ {
+ if(--right_section > 0) 
+ while(RightSection_F4()<=0) 
+ {
+ if(--right_section<=0) break;
+ }
+ }
+ else
+ {
+ right_x += delta_right_x;
+ }
+ return FALSE;
+}
+
+static __inline BOOL SetupSections_F4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4)
+{
+ soft_vertex * v1, * v2, * v3, * v4;
+ int height,width,longest1,longest2;
+
+ v1 = vtx; v1->x=x1<<16;v1->y=y1;
+ v2 = vtx+1; v2->x=x2<<16;v2->y=y2;
+ v3 = vtx+2; v3->x=x3<<16;v3->y=y3;
+ v4 = vtx+3; v4->x=x4<<16;v4->y=y4;
+
+ if(v1->y > v2->y) { soft_vertex * v = v1; v1 = v2; v2 = v; }
+ if(v1->y > v3->y) { soft_vertex * v = v1; v1 = v3; v3 = v; }
+ if(v1->y > v4->y) { soft_vertex * v = v1; v1 = v4; v4 = v; }
+ if(v2->y > v3->y) { soft_vertex * v = v2; v2 = v3; v3 = v; }
+ if(v2->y > v4->y) { soft_vertex * v = v2; v2 = v4; v4 = v; }
+ if(v3->y > v4->y) { soft_vertex * v = v3; v3 = v4; v4 = v; }
+
+ height = v4->y - v1->y; if(height == 0) height =1;
+ width = (v4->x - v1->x)>>16;
+ longest1 = (((v2->y - v1->y) << 16) / height) * width + (v1->x - v2->x);
+ longest2 = (((v3->y - v1->y) << 16) / height) * width + (v1->x - v3->x);
+
+ if(longest1 < 0) // 2 is right
+ {
+ if(longest2 < 0) // 3 is right
+ {
+ left_array[0] = v4;
+ left_array[1] = v1;
+ left_section = 1;
+
+ height = v3->y - v1->y; if(height == 0) height=1;
+ longest1 = (((v2->y - v1->y) << 16) / height) * ((v3->x - v1->x)>>16) + (v1->x - v2->x);
+ if(longest1 >= 0)
+ {
+ right_array[0] = v4; // 1
+ right_array[1] = v3; // 3
+ right_array[2] = v1; // 4
+ right_section = 2; 
+ }
+ else
+ {
+ height = v4->y - v2->y; if(height == 0) height=1;
+ longest1 = (((v3->y - v2->y) << 16) / height) * ((v4->x - v2->x)>>16) + (v2->x - v3->x);
+ if(longest1 >= 0)
+ {
+ right_array[0] = v4; // 1
+ right_array[1] = v2; // 2
+ right_array[2] = v1; // 4
+ right_section = 2; 
+ }
+ else
+ {
+ right_array[0] = v4; // 1
+ right_array[1] = v3; // 2
+ right_array[2] = v2; // 3
+ right_array[3] = v1; // 4
+ right_section = 3; 
+ }
+ }
+ }
+ else 
+ {
+ left_array[0] = v4;
+ left_array[1] = v3; // 1
+ left_array[2] = v1; // 2
+ left_section = 2; // 3
+ right_array[0] = v4; // 4
+ right_array[1] = v2;
+ right_array[2] = v1;
+ right_section = 2;
+ }
+ }
+ else
+ {
+ if(longest2 < 0) 
+ {
+ left_array[0] = v4; // 1
+ left_array[1] = v2; // 2
+ left_array[2] = v1; // 3
+ left_section = 2; // 4
+ right_array[0] = v4;
+ right_array[1] = v3;
+ right_array[2] = v1;
+ right_section = 2;
+ }
+ else 
+ {
+ right_array[0] = v4;
+ right_array[1] = v1;
+ right_section = 1;
+
+ height = v3->y - v1->y; if(height == 0) height=1;
+ longest1 = (((v2->y - v1->y) << 16) / height) * ((v3->x - v1->x)>>16) + (v1->x - v2->x);
+ if(longest1<0)
+ {
+ left_array[0] = v4; // 1
+ left_array[1] = v3; // 3
+ left_array[2] = v1; // 4
+ left_section = 2; 
+ }
+ else
+ {
+ height = v4->y - v2->y; if(height == 0) height=1;
+ longest1 = (((v3->y - v2->y) << 16) / height) * ((v4->x - v2->x)>>16) + (v2->x - v3->x);
+ if(longest1<0)
+ {
+ left_array[0] = v4; // 1
+ left_array[1] = v2; // 2
+ left_array[2] = v1; // 4
+ left_section = 2; 
+ }
+ else
+ {
+ left_array[0] = v4; // 1
+ left_array[1] = v3; // 2
+ left_array[2] = v2; // 3
+ left_array[3] = v1; // 4
+ left_section = 3; 
+ }
+ }
+ }
+ }
+
+ while(LeftSection_F4()<=0) 
+ {
+ if(--left_section <= 0) break;
+ }
+
+ while(RightSection_F4()<=0) 
+ {
+ if(--right_section <= 0) break;
+ }
+
+ Ymin=v1->y;
+ Ymax=min(v4->y-1,drawH);
+
+ return TRUE;
+}
+
+static __inline int RightSection_FT4(void)
+{
+ soft_vertex * v1 = right_array[ right_section ];
+ soft_vertex * v2 = right_array[ right_section-1 ];
+
+ int height = v2->y - v1->y;
+ right_section_height = height;
+ right_x = v1->x;
+ right_u = v1->u;
+ right_v = v1->v;
+ if(height == 0) 
+ {
+ return 0;
+ }
+ delta_right_x = (v2->x - v1->x) / height;
+ delta_right_u = (v2->u - v1->u) / height;
+ delta_right_v = (v2->v - v1->v) / height;
+
+ return height;
+}
+
+static __inline int LeftSection_FT4(void)
+{
+ soft_vertex * v1 = left_array[ left_section ];
+ soft_vertex * v2 = left_array[ left_section-1 ];
+
+ int height = v2->y - v1->y;
+ left_section_height = height;
+ left_x = v1->x;
+ left_u = v1->u;
+ left_v = v1->v;
+ if(height == 0) 
+ {
+ return 0;
+ }
+ delta_left_x = (v2->x - v1->x) / height;
+ delta_left_u = (v2->u - v1->u) / height;
+ delta_left_v = (v2->v - v1->v) / height;
+
+ return height; 
+}
+
+static __inline BOOL NextRow_FT4(void)
+{
+ if(--left_section_height<=0) 
+ {
+ if(--left_section > 0) 
+ while(LeftSection_FT4()<=0) 
+ {
+ if(--left_section <= 0) break;
+ }
+ }
+ else
+ {
+ left_x += delta_left_x;
+ left_u += delta_left_u;
+ left_v += delta_left_v;
+ }
+
+ if(--right_section_height<=0) 
+ {
+ if(--right_section > 0) 
+ while(RightSection_FT4()<=0) 
+ {
+ if(--right_section<=0) break;
+ }
+ }
+ else
+ {
+ right_x += delta_right_x;
+ right_u += delta_right_u;
+ right_v += delta_right_v;
+ }
+ return FALSE;
+}
+
+static __inline BOOL SetupSections_FT4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4)
+{
+ soft_vertex * v1, * v2, * v3, * v4;
+ int height,width,longest1,longest2;
+
+ v1 = vtx; v1->x=x1<<16;v1->y=y1;
+ v1->u=tx1<<16;v1->v=ty1<<16;
+
+ v2 = vtx+1; v2->x=x2<<16;v2->y=y2;
+ v2->u=tx2<<16;v2->v=ty2<<16;
+ 
+ v3 = vtx+2; v3->x=x3<<16;v3->y=y3;
+ v3->u=tx3<<16;v3->v=ty3<<16;
+
+ v4 = vtx+3; v4->x=x4<<16;v4->y=y4;
+ v4->u=tx4<<16;v4->v=ty4<<16;
+
+ if(v1->y > v2->y) { soft_vertex * v = v1; v1 = v2; v2 = v; }
+ if(v1->y > v3->y) { soft_vertex * v = v1; v1 = v3; v3 = v; }
+ if(v1->y > v4->y) { soft_vertex * v = v1; v1 = v4; v4 = v; }
+ if(v2->y > v3->y) { soft_vertex * v = v2; v2 = v3; v3 = v; }
+ if(v2->y > v4->y) { soft_vertex * v = v2; v2 = v4; v4 = v; }
+ if(v3->y > v4->y) { soft_vertex * v = v3; v3 = v4; v4 = v; }
+
+ height = v4->y - v1->y; if(height == 0) height =1;
+ width = (v4->x - v1->x)>>16;
+ longest1 = (((v2->y - v1->y) << 16) / height) * width + (v1->x - v2->x);
+ longest2 = (((v3->y - v1->y) << 16) / height) * width + (v1->x - v3->x);
+
+ if(longest1 < 0) // 2 is right
+ {
+ if(longest2 < 0) // 3 is right
+ {
+ left_array[0] = v4;
+ left_array[1] = v1;
+ left_section = 1;
+
+ height = v3->y - v1->y; if(height == 0) height=1;
+ longest1 = (((v2->y - v1->y) << 16) / height) * ((v3->x - v1->x)>>16) + (v1->x - v2->x);
+ if(longest1 >= 0)
+ {
+ right_array[0] = v4; // 1
+ right_array[1] = v3; // 3
+ right_array[2] = v1; // 4
+ right_section = 2; 
+ }
+ else
+ {
+ height = v4->y - v2->y; if(height == 0) height=1;
+ longest1 = (((v3->y - v2->y) << 16) / height) * ((v4->x - v2->x)>>16) + (v2->x - v3->x);
+ if(longest1 >= 0)
+ {
+ right_array[0] = v4; // 1
+ right_array[1] = v2; // 2
+ right_array[2] = v1; // 4
+ right_section = 2; 
+ }
+ else
+ {
+ right_array[0] = v4; // 1
+ right_array[1] = v3; // 2
+ right_array[2] = v2; // 3
+ right_array[3] = v1; // 4
+ right_section = 3; 
+ }
+ }
+ }
+ else 
+ {
+ left_array[0] = v4;
+ left_array[1] = v3; // 1
+ left_array[2] = v1; // 2
+ left_section = 2; // 3
+ right_array[0] = v4; // 4
+ right_array[1] = v2;
+ right_array[2] = v1;
+ right_section = 2;
+ }
+ }
+ else
+ {
+ if(longest2 < 0) 
+ {
+ left_array[0] = v4; // 1
+ left_array[1] = v2; // 2
+ left_array[2] = v1; // 3
+ left_section = 2; // 4
+ right_array[0] = v4;
+ right_array[1] = v3;
+ right_array[2] = v1;
+ right_section = 2;
+ }
+ else 
+ {
+ right_array[0] = v4;
+ right_array[1] = v1;
+ right_section = 1;
+
+ height = v3->y - v1->y; if(height == 0) height=1;
+ longest1 = (((v2->y - v1->y) << 16) / height) * ((v3->x - v1->x)>>16) + (v1->x - v2->x);
+ if(longest1<0)
+ {
+ left_array[0] = v4; // 1
+ left_array[1] = v3; // 3
+ left_array[2] = v1; // 4
+ left_section = 2; 
+ }
+ else
+ {
+ height = v4->y - v2->y; if(height == 0) height=1;
+ longest1 = (((v3->y - v2->y) << 16) / height) * ((v4->x - v2->x)>>16) + (v2->x - v3->x);
+ if(longest1<0)
+ {
+ left_array[0] = v4; // 1
+ left_array[1] = v2; // 2
+ left_array[2] = v1; // 4
+ left_section = 2; 
+ }
+ else
+ {
+ left_array[0] = v4; // 1
+ left_array[1] = v3; // 2
+ left_array[2] = v2; // 3
+ left_array[3] = v1; // 4
+ left_section = 3; 
+ }
+ }
+ }
+ }
+
+ while(LeftSection_FT4()<=0) 
+ {
+ if(--left_section <= 0) break;
+ }
+
+ while(RightSection_FT4()<=0) 
+ {
+ if(--right_section <= 0) break;
+ }
+
+ Ymin=v1->y;
+ Ymax=min(v4->y-1,drawH);
+
+ return TRUE;
+}
+
+static __inline int RightSection_GT4(void)
+{
+ soft_vertex * v1 = right_array[ right_section ];
+ soft_vertex * v2 = right_array[ right_section-1 ];
+
+ int height = v2->y - v1->y;
+ right_section_height = height;
+ right_x = v1->x;
+ right_u = v1->u;
+ right_v = v1->v;
+ right_R = v1->R;
+ right_G = v1->G;
+ right_B = v1->B;
+
+ if(height == 0) 
+ {
+ return 0;
+ }
+ delta_right_x = (v2->x - v1->x) / height;
+ delta_right_u = (v2->u - v1->u) / height;
+ delta_right_v = (v2->v - v1->v) / height;
+ delta_right_R = (v2->R - v1->R) / height;
+ delta_right_G = (v2->G - v1->G) / height;
+ delta_right_B = (v2->B - v1->B) / height;
+
+ return height;
+}
+
+static __inline int LeftSection_GT4(void)
+{
+ soft_vertex * v1 = left_array[ left_section ];
+ soft_vertex * v2 = left_array[ left_section-1 ];
+
+ int height = v2->y - v1->y;
+ left_section_height = height;
+ left_x = v1->x;
+ left_u = v1->u;
+ left_v = v1->v;
+ left_R = v1->R;
+ left_G = v1->G;
+ left_B = v1->B;
+
+ if(height == 0) 
+ {
+ return 0;
+ }
+ delta_left_x = (v2->x - v1->x) / height;
+ delta_left_u = (v2->u - v1->u) / height;
+ delta_left_v = (v2->v - v1->v) / height;
+ delta_left_R = (v2->R - v1->R) / height;
+ delta_left_G = (v2->G - v1->G) / height;
+ delta_left_B = (v2->B - v1->B) / height;
+
+ return height; 
+}
+
+static __inline BOOL NextRow_GT4(void)
+{
+ if(--left_section_height<=0) 
+ {
+ if(--left_section > 0) 
+ while(LeftSection_GT4()<=0) 
+ {
+ if(--left_section <= 0) break;
+ }
+ }
+ else
+ {
+ left_x += delta_left_x;
+ left_u += delta_left_u;
+ left_v += delta_left_v;
+ left_R += delta_left_R;
+ left_G += delta_left_G;
+ left_B += delta_left_B;
+ }
+
+ if(--right_section_height<=0) 
+ {
+ if(--right_section > 0) 
+ while(RightSection_GT4()<=0) 
+ {
+ if(--right_section<=0) break;
+ }
+ }
+ else
+ {
+ right_x += delta_right_x;
+ right_u += delta_right_u;
+ right_v += delta_right_v;
+ right_R += delta_right_R;
+ right_G += delta_right_G;
+ right_B += delta_right_B;
+ }
+ return FALSE;
+}
+
+static __inline BOOL SetupSections_GT4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, int rgb1, int rgb2, int rgb3, int rgb4)
+{
+ soft_vertex * v1, * v2, * v3, * v4;
+ int height,width,longest1,longest2;
+
+ v1 = vtx; v1->x=x1<<16;v1->y=y1;
+ v1->u=tx1<<16;v1->v=ty1<<16;
+ v1->R=(rgb1) & 0x00ff0000;
+ v1->G=(rgb1<<8) & 0x00ff0000;
+ v1->B=(rgb1<<16) & 0x00ff0000;
+
+ v2 = vtx+1; v2->x=x2<<16;v2->y=y2;
+ v2->u=tx2<<16;v2->v=ty2<<16;
+ v2->R=(rgb2) & 0x00ff0000;
+ v2->G=(rgb2<<8) & 0x00ff0000;
+ v2->B=(rgb2<<16) & 0x00ff0000;
+ 
+ v3 = vtx+2; v3->x=x3<<16;v3->y=y3;
+ v3->u=tx3<<16;v3->v=ty3<<16;
+ v3->R=(rgb3) & 0x00ff0000;
+ v3->G=(rgb3<<8) & 0x00ff0000;
+ v3->B=(rgb3<<16) & 0x00ff0000;
+
+ v4 = vtx+3; v4->x=x4<<16;v4->y=y4;
+ v4->u=tx4<<16;v4->v=ty4<<16;
+ v4->R=(rgb4) & 0x00ff0000;
+ v4->G=(rgb4<<8) & 0x00ff0000;
+ v4->B=(rgb4<<16) & 0x00ff0000;
+
+ if(v1->y > v2->y) { soft_vertex * v = v1; v1 = v2; v2 = v; }
+ if(v1->y > v3->y) { soft_vertex * v = v1; v1 = v3; v3 = v; }
+ if(v1->y > v4->y) { soft_vertex * v = v1; v1 = v4; v4 = v; }
+ if(v2->y > v3->y) { soft_vertex * v = v2; v2 = v3; v3 = v; }
+ if(v2->y > v4->y) { soft_vertex * v = v2; v2 = v4; v4 = v; }
+ if(v3->y > v4->y) { soft_vertex * v = v3; v3 = v4; v4 = v; }
+
+ height = v4->y - v1->y; if(height == 0) height =1;
+ width = (v4->x - v1->x)>>16;
+ longest1 = (((v2->y - v1->y) << 16) / height) * width + (v1->x - v2->x);
+ longest2 = (((v3->y - v1->y) << 16) / height) * width + (v1->x - v3->x);
+
+ if(longest1 < 0) // 2 is right
+ {
+ if(longest2 < 0) // 3 is right
+ {
+ left_array[0] = v4;
+ left_array[1] = v1;
+ left_section = 1;
+
+ height = v3->y - v1->y; if(height == 0) height=1;
+ longest1 = (((v2->y - v1->y) << 16) / height) * ((v3->x - v1->x)>>16) + (v1->x - v2->x);
+ if(longest1 >= 0)
+ {
+ right_array[0] = v4; // 1
+ right_array[1] = v3; // 3
+ right_array[2] = v1; // 4
+ right_section = 2; 
+ }
+ else
+ {
+ height = v4->y - v2->y; if(height == 0) height=1;
+ longest1 = (((v3->y - v2->y) << 16) / height) * ((v4->x - v2->x)>>16) + (v2->x - v3->x);
+ if(longest1 >= 0)
+ {
+ right_array[0] = v4; // 1
+ right_array[1] = v2; // 2
+ right_array[2] = v1; // 4
+ right_section = 2; 
+ }
+ else
+ {
+ right_array[0] = v4; // 1
+ right_array[1] = v3; // 2
+ right_array[2] = v2; // 3
+ right_array[3] = v1; // 4
+ right_section = 3; 
+ }
+ }
+ }
+ else 
+ {
+ left_array[0] = v4;
+ left_array[1] = v3; // 1
+ left_array[2] = v1; // 2
+ left_section = 2; // 3
+ right_array[0] = v4; // 4
+ right_array[1] = v2;
+ right_array[2] = v1;
+ right_section = 2;
+ }
+ }
+ else
+ {
+ if(longest2 < 0) 
+ {
+ left_array[0] = v4; // 1
+ left_array[1] = v2; // 2
+ left_array[2] = v1; // 3
+ left_section = 2; // 4
+ right_array[0] = v4;
+ right_array[1] = v3;
+ right_array[2] = v1;
+ right_section = 2;
+ }
+ else 
+ {
+ right_array[0] = v4;
+ right_array[1] = v1;
+ right_section = 1;
+
+ height = v3->y - v1->y; if(height == 0) height=1;
+ longest1 = (((v2->y - v1->y) << 16) / height) * ((v3->x - v1->x)>>16) + (v1->x - v2->x);
+ if(longest1<0)
+ {
+ left_array[0] = v4; // 1
+ left_array[1] = v3; // 3
+ left_array[2] = v1; // 4
+ left_section = 2; 
+ }
+ else
+ {
+ height = v4->y - v2->y; if(height == 0) height=1;
+ longest1 = (((v3->y - v2->y) << 16) / height) * ((v4->x - v2->x)>>16) + (v2->x - v3->x);
+ if(longest1<0)
+ {
+ left_array[0] = v4; // 1
+ left_array[1] = v2; // 2
+ left_array[2] = v1; // 4
+ left_section = 2; 
+ }
+ else
+ {
+ left_array[0] = v4; // 1
+ left_array[1] = v3; // 2
+ left_array[2] = v2; // 3
+ left_array[3] = v1; // 4
+ left_section = 3; 
+ }
+ }
+ }
+ }
+
+ while(LeftSection_GT4()<=0) 
+ {
+ if(--left_section <= 0) break;
+ }
+
+ while(RightSection_GT4()<=0) 
+ {
+ if(--right_section <= 0) break;
+ }
+
+ Ymin=v1->y;
+ Ymax=min(v4->y-1,drawH);
+
+ return TRUE;
+}
+
+////////////////////////////////////////////////////////////////////////
+// POLY FUNCS
+////////////////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////////////////
+// POLY 3/4 FLAT SHADED
+////////////////////////////////////////////////////////////////////////
+
+static __inline void drawPoly3Fi(short x1, short y1, short x2, short y2, short x3, short y3, int rgb)
+{
+ int i,j,xmin,xmax,ymin,ymax;
+ unsigned short color;
+ uint32_t lcolor;
+
+ if(x1>drawW && x2>drawW && x3>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_F(x1,y1,x2,y2,x3,y3)) return;
+
+ ymax=Ymax;
+
+ color = ((rgb & 0x00f80000)>>9) | ((rgb & 0x0000f800)>>6) | ((rgb & 0x000000f8)>>3);
+ lcolor=lSetMask|(((uint32_t)(color))<<16)|color;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+ if(NextRow_F()) return;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans)
+ {
+ color |=sSetMask;
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=left_x >> 16; if(drawX>xmin) xmin=drawX;
+ xmax=(right_x >> 16)-1; if(drawW<xmax) xmax=drawW;
+
+ for(j=xmin;j<xmax;j+=2) 
+ {
+ *((uint32_t *)&psxVuw[(i<<10)+j])=lcolor;
+ }
+ if(j==xmax) psxVuw[(i<<10)+j]=color;
+
+ if(NextRow_F()) return;
+ }
+ return;
+ }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=left_x >> 16; if(drawX>xmin) xmin=drawX;
+ xmax=(right_x >> 16)-1; if(drawW<xmax) xmax=drawW;
+
+ for(j=xmin;j<xmax;j+=2) 
+ {
+ GetShadeTransCol32((uint32_t *)&psxVuw[(i<<10)+j], lcolor);
+ }
+ if(j == xmax)
+ GetShadeTransCol(&psxVuw[(i << 10) + j],color);
+
+ if(NextRow_F()) return;
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void drawPoly3F(int rgb)
+{
+ drawPoly3Fi(lx0,ly0,lx1,ly1,lx2,ly2,rgb);
+}
+
+#ifdef POLYQUAD3FS
+
+void drawPoly4F_TRI(int rgb)
+{
+ drawPoly3Fi(lx1,ly1,lx3,ly3,lx2,ly2,rgb);
+ drawPoly3Fi(lx0,ly0,lx1,ly1,lx2,ly2,rgb);
+}
+
+#endif
+
+// more exact:
+
+void drawPoly4F(int rgb)
+{
+ int i,j,xmin,xmax,ymin,ymax;
+ unsigned short color;unsigned int lcolor;
+ 
+ if(lx0>drawW && lx1>drawW && lx2>drawW && lx3>drawW) return;
+ if(ly0>drawH && ly1>drawH && ly2>drawH && ly3>drawH) return;
+ if(lx0<drawX && lx1<drawX && lx2<drawX && lx3<drawX) return;
+ if(ly0<drawY && ly1<drawY && ly2<drawY && ly3<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_F4(lx0,ly0,lx1,ly1,lx2,ly2,lx3,ly3)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+ if(NextRow_F4()) return;
+
+ color = ((rgb & 0x00f80000)>>9) | ((rgb & 0x0000f800)>>6) | ((rgb & 0x000000f8)>>3);
+ lcolor= lSetMask|(((uint32_t)(color))<<16)|color;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans)
+ {
+ color |=sSetMask;
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=left_x >> 16; if(drawX>xmin) xmin=drawX;
+ xmax=(right_x >> 16)-1; if(drawW<xmax) xmax=drawW;
+
+ for(j=xmin;j<xmax;j+=2) 
+ {
+ *((uint32_t *)&psxVuw[(i<<10)+j])=lcolor;
+ }
+ if(j==xmax) psxVuw[(i<<10)+j]=color;
+
+ if(NextRow_F4()) return;
+ }
+ return;
+ } 
+
+#endif
+
+ for (i = ymin; i <= ymax; i++)
+ {
+ xmin = left_x >> 16; if(drawX > xmin) xmin = drawX;
+ xmax = (right_x >> 16) - 1; if(drawW < xmax) xmax = drawW;
+
+ for(j = xmin; j < xmax; j += 2) 
+ {
+ GetShadeTransCol32((uint32_t *)&psxVuw[(i<<10) + j],lcolor);
+ }
+ if(j == xmax) GetShadeTransCol(&psxVuw[(i<<10) + j],color);
+
+ if(NextRow_F4()) return;
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+// POLY 3/4 F-SHADED TEX PAL 4
+////////////////////////////////////////////////////////////////////////
+
+void drawPoly3TEx4(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3,short clX, short clY)
+{
+ int i,j,xmin,xmax,ymin,ymax;
+ int difX, difY,difX2, difY2;
+ int posX,posY,YAdjust,XAdjust;
+ int clutP;
+ short tC1,tC2;
+ 
+ if (x1 > drawW && x2 > drawW && x3 > drawW) return;
+ if (y1 > drawH && y2 > drawH && y3 > drawH) return;
+ if (x1 < drawX && x2 < drawX && x3 < drawX) return;
+ if (y1 < drawY && y2 < drawY && y3 < drawY) return;
+ if (drawY >= drawH) return;
+ if (drawX >= drawW) return; 
+
+ if (!SetupSections_FT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3)) return;
+
+ ymax = Ymax;
+
+ for (ymin = Ymin; ymin < drawY; ymin++)
+ if (NextRow_FT()) return;
+
+ clutP = (clY << 10) + clX;
+
+ YAdjust = ((GlobalTextAddrY) << 11) + (GlobalTextAddrX << 1);
+
+ difX = delta_right_u; difX2 = difX << 1;
+ difY = delta_right_v; difY2 = difY << 1;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans)
+ {
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!
+ if(drawW<xmax) xmax=drawW;
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+
+ for(j=xmin;j<xmax;j+=2)
+ {
+ XAdjust=(posX>>16);
+ tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(XAdjust>>1)];
+ tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+ XAdjust=((posX+difX)>>16);
+ tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+
+ (XAdjust>>1)];
+ tC2=(tC2>>((XAdjust&1)<<2))&0xf;
+
+ GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
+ psxVuw[clutP+tC1]|
+ ((int)psxVuw[clutP+tC2])<<16);
+
+ posX+=difX2;
+ posY+=difY2;
+ }
+ if(j==xmax)
+ {
+ XAdjust=(posX>>16);
+ tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+
+ (XAdjust>>1)];
+ tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+ GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+ }
+ }
+ if(NextRow_FT()) 
+ {
+ return;
+ }
+ }
+ return;
+ }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!!
+ if(drawW<xmax) xmax=drawW;
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+
+ for(j=xmin;j<xmax;j+=2)
+ {
+ XAdjust=(posX>>16);
+ tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(XAdjust>>1)];
+ tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+ XAdjust=((posX+difX)>>16);
+ tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+
+ (XAdjust>>1)];
+ tC2=(tC2>>((XAdjust&1)<<2))&0xf;
+
+ GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
+ psxVuw[clutP+tC1]|
+ ((int)psxVuw[clutP+tC2])<<16);
+
+ posX+=difX2;
+ posY+=difY2;
+ }
+ if(j==xmax)
+ {
+ XAdjust=(posX>>16);
+ tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+
+ (XAdjust>>1)];
+ tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+ GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+ }
+ }
+ if(NextRow_FT()) 
+ {
+ return;
+ }
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void drawPoly3TEx4_IL(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3,short clX, short clY)
+{
+ int i,j,xmin,xmax,ymin,ymax,n_xi,n_yi,TXV;
+ int difX, difY,difX2, difY2;
+ int posX,posY,YAdjust,XAdjust;
+ int clutP;
+ short tC1,tC2;
+ 
+ if(x1>drawW && x2>drawW && x3>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_FT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+ if(NextRow_FT()) return;
+
+ clutP=(clY<<10)+clX;
+
+ YAdjust=(GlobalTextAddrY<<10)+GlobalTextAddrX;
+
+ difX=delta_right_u;difX2=difX<<1;
+ difY=delta_right_v;difY2=difY<<1;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans)
+ {
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16)-1;
+ if(drawW<xmax) xmax=drawW;
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+
+ for(j=xmin;j<xmax;j+=2)
+ {
+ XAdjust=(posX>>16);
+
+ TXV=posY>>16;
+ n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
+ n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
+
+ tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
+
+ XAdjust=((posX+difX)>>16);
+
+ TXV=(posY+difY)>>16;
+ n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
+ n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
+
+ tC2= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
+
+ GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
+ psxVuw[clutP+tC1]|
+ ((int)psxVuw[clutP+tC2])<<16);
+
+ posX+=difX2;
+ posY+=difY2;
+ }
+ if(j==xmax)
+ {
+ XAdjust=(posX>>16);
+
+ TXV=posY>>16;
+ n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
+ n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
+
+ tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
+
+ GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+ }
+ }
+ if(NextRow_FT()) 
+ {
+ return;
+ }
+ }
+ return;
+ }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!!
+ if(drawW<xmax) xmax=drawW;
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+
+ for(j=xmin;j<xmax;j+=2)
+ {
+ XAdjust=(posX>>16);
+
+ TXV=posY>>16;
+ n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
+ n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
+
+ tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
+
+ XAdjust=((posX+difX)>>16);
+
+ TXV=(posY+difY)>>16;
+ n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
+ n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
+
+ tC2= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
+
+ GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
+ psxVuw[clutP+tC1]|
+ ((int)psxVuw[clutP+tC2])<<16);
+
+ posX+=difX2;
+ posY+=difY2;
+ }
+ if(j==xmax)
+ {
+ XAdjust=(posX>>16);
+
+ TXV=posY>>16;
+ n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
+ n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
+
+ tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
+
+ GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+ }
+ }
+ if(NextRow_FT()) 
+ {
+ return;
+ }
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void drawPoly3TEx4_TW(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3,short clX, short clY)
+{
+ int i,j,xmin,xmax,ymin,ymax;
+ int difX, difY,difX2, difY2;
+ int posX,posY,YAdjust,XAdjust;
+ int clutP;
+ short tC1,tC2;
+ 
+ if(x1>drawW && x2>drawW && x3>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_FT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+ if(NextRow_FT()) return;
+
+ clutP=(clY<<10)+clX;
+
+ YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);
+ YAdjust+=(TWin.Position.y0<<11)+(TWin.Position.x0>>1);
+
+ difX=delta_right_u;difX2=difX<<1;
+ difY=delta_right_v;difY2=difY<<1;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans)
+ {
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16);//-1; //!!!!!!!!!!!!!!!!
+ if(xmax>xmin) xmax--;
+
+ if(drawW<xmax) xmax=drawW;
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+
+ for(j=xmin;j<xmax;j+=2)
+ {
+ XAdjust=(posX>>16)%TWin.Position.x1;
+ tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+ YAdjust+(XAdjust>>1)];
+ tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+ XAdjust=((posX+difX)>>16)%TWin.Position.x1;
+ tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
+ YAdjust+(XAdjust>>1)];
+ tC2=(tC2>>((XAdjust&1)<<2))&0xf;
+
+ GetTextureTransColG32_S((uint32_t *)&psxVuw[(i << 10) + j],
+ psxVuw[clutP+tC1]|
+ ((int)psxVuw[clutP+tC2])<<16);
+
+ posX+=difX2;
+ posY+=difY2;
+ }
+ if(j==xmax)
+ {
+ XAdjust=(posX>>16)%TWin.Position.x1;
+ tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+ YAdjust+(XAdjust>>1)];
+ tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+ GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+ }
+ }
+ if(NextRow_FT()) 
+ {
+ return;
+ }
+ }
+ return;
+ }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!!
+ if(drawW<xmax) xmax=drawW;
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+
+ for(j=xmin;j<xmax;j+=2)
+ {
+ XAdjust=(posX>>16)%TWin.Position.x1;
+ tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+ YAdjust+(XAdjust>>1)];
+ tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+ XAdjust=((posX+difX)>>16)%TWin.Position.x1;
+ tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
+ YAdjust+(XAdjust>>1)];
+ tC2=(tC2>>((XAdjust&1)<<2))&0xf;
+
+ GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
+ psxVuw[clutP+tC1]|
+ ((int)psxVuw[clutP+tC2])<<16);
+
+ posX+=difX2;
+ posY+=difY2;
+ }
+ if(j==xmax)
+ {
+ XAdjust=(posX>>16)%TWin.Position.x1;
+ tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+ YAdjust+(XAdjust>>1)];
+ tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+ GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+ }
+ }
+ if(NextRow_FT()) 
+ {
+ return;
+ }
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+#ifdef POLYQUAD3
+
+void drawPoly4TEx4_TRI(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
+{
+ drawPoly3TEx4(x2,y2,x3,y3,x4,y4,
+ tx2,ty2,tx3,ty3,tx4,ty4,
+ clX,clY);
+ drawPoly3TEx4(x1,y1,x2,y2,x4,y4,
+ tx1,ty1,tx2,ty2,tx4,ty4,
+ clX,clY);
+}
+
+#endif
+
+// more exact:
+
+void drawPoly4TEx4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
+{
+ int num; 
+ int i,j,xmin,xmax,ymin,ymax;
+ int difX, difY, difX2, difY2;
+ int posX,posY,YAdjust,clutP,XAdjust;
+ short tC1,tC2;
+
+ if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_FT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+ if(NextRow_FT4()) return;
+
+ clutP=(clY<<10)+clX;
+
+ YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans)
+ {
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16);
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+
+ num=(xmax-xmin);
+ if(num==0) num=1;
+ difX=(right_u-posX)/num;
+ difY=(right_v-posY)/num;
+ difX2=difX<<1;
+ difY2=difY<<1;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+ xmax--;if(drawW<xmax) xmax=drawW;
+
+ for(j=xmin;j<xmax;j+=2)
+ {
+ XAdjust=(posX>>16);
+ tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(XAdjust>>1)];
+ tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+ XAdjust=((posX+difX)>>16);
+ tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+
+ (XAdjust>>1)];
+ tC2=(tC2>>((XAdjust&1)<<2))&0xf;
+
+ GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
+ psxVuw[clutP+tC1]|
+ ((int)psxVuw[clutP+tC2])<<16);
+ posX+=difX2;
+ posY+=difY2;
+ }
+ if(j==xmax)
+ {
+ XAdjust=(posX>>16);
+ tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+
+ (XAdjust>>1)];
+ tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+ GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+ }
+
+ }
+ if(NextRow_FT4()) return;
+ }
+ return;
+ }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16);
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+
+ num=(xmax-xmin);
+ if(num==0) num=1;
+ difX=(right_u-posX)/num;
+ difY=(right_v-posY)/num;
+ difX2=difX<<1;
+ difY2=difY<<1;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+ xmax--;if(drawW<xmax) xmax=drawW;
+
+ for(j=xmin;j<xmax;j+=2)
+ {
+ XAdjust=(posX>>16);
+ tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(XAdjust>>1)];
+ tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+ XAdjust=((posX+difX)>>16);
+ tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+
+ (XAdjust>>1)];
+ tC2=(tC2>>((XAdjust&1)<<2))&0xf;
+
+ GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
+ psxVuw[clutP+tC1]|
+ ((int)psxVuw[clutP+tC2])<<16);
+ posX+=difX2;
+ posY+=difY2;
+ }
+ if(j==xmax)
+ {
+ XAdjust=(posX>>16);
+ tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+
+ (XAdjust>>1)];
+ tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+ GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+ }
+ }
+ if(NextRow_FT4()) return;
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void drawPoly4TEx4_IL(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
+{
+ int num; 
+ int i,j,xmin,xmax,ymin,ymax,n_xi,n_yi,TXV;
+ int difX, difY, difX2, difY2;
+ int posX,posY,YAdjust,clutP,XAdjust;
+ short tC1,tC2;
+
+ if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_FT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+ if(NextRow_FT4()) return;
+
+ clutP=(clY<<10)+clX;
+
+ YAdjust=((GlobalTextAddrY)<<10)+GlobalTextAddrX;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans)
+ {
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16);
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+
+ num=(xmax-xmin);
+ if(num==0) num=1;
+ difX=(right_u-posX)/num;
+ difY=(right_v-posY)/num;
+ difX2=difX<<1;
+ difY2=difY<<1;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+ xmax--;if(drawW<xmax) xmax=drawW;
+
+ for(j=xmin;j<xmax;j+=2)
+ {
+ XAdjust=(posX>>16);
+
+ TXV=posY>>16;
+ n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
+ n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
+
+ tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
+
+ XAdjust=((posX+difX)>>16);
+
+ TXV=(posY+difY)>>16;
+ n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
+ n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
+
+ tC2= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
+
+ GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
+ psxVuw[clutP+tC1]|
+ ((int)psxVuw[clutP+tC2])<<16);
+ posX+=difX2;
+ posY+=difY2;
+ }
+
+ if(j==xmax)
+ {
+ XAdjust=(posX>>16);
+ TXV=posY>>16;
+ n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
+ n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
+
+ tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
+
+ GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+ }
+
+ }
+ if(NextRow_FT4()) return;
+ }
+ return;
+ }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16);
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+
+ num=(xmax-xmin);
+ if(num==0) num=1;
+ difX=(right_u-posX)/num;
+ difY=(right_v-posY)/num;
+ difX2=difX<<1;
+ difY2=difY<<1;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+ xmax--;if(drawW<xmax) xmax=drawW;
+
+ for(j=xmin;j<xmax;j+=2)
+ {
+ XAdjust=(posX>>16);
+
+ TXV=posY>>16;
+ n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
+ n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
+
+ tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
+
+ XAdjust=((posX+difX)>>16);
+
+ TXV=(posY+difY)>>16;
+ n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
+ n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
+
+ tC2= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
+
+ GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
+ psxVuw[clutP+tC1]|
+ ((int)psxVuw[clutP+tC2])<<16);
+ posX+=difX2;
+ posY+=difY2;
+ }
+ if(j==xmax)
+ {
+ XAdjust=(posX>>16);
+ TXV=posY>>16;
+ n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
+ n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
+
+ tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
+
+ GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+ }
+ }
+ if(NextRow_FT4()) return;
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void drawPoly4TEx4_TW(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
+{
+ int num; 
+ int i,j,xmin,xmax,ymin,ymax;
+ int difX, difY, difX2, difY2;
+ int posX,posY,YAdjust,clutP,XAdjust;
+ short tC1,tC2;
+
+ if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_FT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+ if(NextRow_FT4()) return;
+
+ clutP=(clY<<10)+clX;
+
+ YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);
+ YAdjust+=(TWin.Position.y0<<11)+(TWin.Position.x0>>1);
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans)
+ {
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16);
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+
+ num=(xmax-xmin);
+ if(num==0) num=1;
+ difX=(right_u-posX)/num;
+ difY=(right_v-posY)/num;
+ difX2=difX<<1;
+ difY2=difY<<1;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+ xmax--;if(drawW<xmax) xmax=drawW;
+
+ for(j=xmin;j<xmax;j+=2)
+ {
+ XAdjust=(posX>>16)%TWin.Position.x1;
+ tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+ YAdjust+(XAdjust>>1)];
+ tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+ XAdjust=((posX+difX)>>16)%TWin.Position.x1;
+ tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
+ YAdjust+(XAdjust>>1)];
+ tC2=(tC2>>((XAdjust&1)<<2))&0xf;
+
+ GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
+ psxVuw[clutP+tC1]|
+ ((int)psxVuw[clutP+tC2])<<16);
+ posX+=difX2;
+ posY+=difY2;
+ }
+ if(j==xmax)
+ {
+ XAdjust=(posX>>16)%TWin.Position.x1;
+ tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+ YAdjust+(XAdjust>>1)];
+ tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+ GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+ }
+ }
+ if(NextRow_FT4()) return;
+ }
+ return;
+ }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16);
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+
+ num=(xmax-xmin);
+ if(num==0) num=1;
+ difX=(right_u-posX)/num;
+ difY=(right_v-posY)/num;
+ difX2=difX<<1;
+ difY2=difY<<1;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+ xmax--;if(drawW<xmax) xmax=drawW;
+
+ for(j=xmin;j<xmax;j+=2)
+ {
+ XAdjust=(posX>>16)%TWin.Position.x1;
+ tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+ YAdjust+(XAdjust>>1)];
+ tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+ XAdjust=((posX+difX)>>16)%TWin.Position.x1;
+ tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
+ YAdjust+(XAdjust>>1)];
+ tC2=(tC2>>((XAdjust&1)<<2))&0xf;
+
+ GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
+ psxVuw[clutP+tC1]|
+ ((int)psxVuw[clutP+tC2])<<16);
+ posX+=difX2;
+ posY+=difY2;
+ }
+ if(j==xmax)
+ {
+ XAdjust=(posX>>16)%TWin.Position.x1;
+ tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+ YAdjust+(XAdjust>>1)];
+ tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+ GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+ }
+ }
+ if(NextRow_FT4()) return;
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void drawPoly4TEx4_TW_S(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
+{
+ int num; 
+ int i,j,xmin,xmax,ymin,ymax;
+ int difX, difY, difX2, difY2;
+ int posX,posY,YAdjust,clutP,XAdjust;
+ short tC1,tC2;
+
+ if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_FT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+ if(NextRow_FT4()) return;
+
+ clutP=(clY<<10)+clX;
+
+ YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);
+ YAdjust+=(TWin.Position.y0<<11)+(TWin.Position.x0>>1);
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans)
+ {
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16);
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+
+ num=(xmax-xmin);
+ if(num==0) num=1;
+ difX=(right_u-posX)/num;
+ difY=(right_v-posY)/num;
+ difX2=difX<<1;
+ difY2=difY<<1;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+ xmax--;if(drawW<xmax) xmax=drawW;
+
+ for(j=xmin;j<xmax;j+=2)
+ {
+ XAdjust=(posX>>16)%TWin.Position.x1;
+ tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+ YAdjust+(XAdjust>>1)];
+ tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+ XAdjust=((posX+difX)>>16)%TWin.Position.x1;
+ tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
+ YAdjust+(XAdjust>>1)];
+ tC2=(tC2>>((XAdjust&1)<<2))&0xf;
+
+ GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
+ psxVuw[clutP+tC1]|
+ ((int)psxVuw[clutP+tC2])<<16);
+ posX+=difX2;
+ posY+=difY2;
+ }
+ if(j==xmax)
+ {
+ XAdjust=(posX>>16)%TWin.Position.x1;
+ tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+ YAdjust+(XAdjust>>1)];
+ tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+ GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+ }
+ }
+ if(NextRow_FT4()) return;
+ }
+ return;
+ }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16);
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+
+ num=(xmax-xmin);
+ if(num==0) num=1;
+ difX=(right_u-posX)/num;
+ difY=(right_v-posY)/num;
+ difX2=difX<<1;
+ difY2=difY<<1;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+ xmax--;if(drawW<xmax) xmax=drawW;
+
+ for(j=xmin;j<xmax;j+=2)
+ {
+ XAdjust=(posX>>16)%TWin.Position.x1;
+ tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+ YAdjust+(XAdjust>>1)];
+ tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+ XAdjust=((posX+difX)>>16)%TWin.Position.x1;
+ tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
+ YAdjust+(XAdjust>>1)];
+ tC2=(tC2>>((XAdjust&1)<<2))&0xf;
+
+ GetTextureTransColG32_SPR((uint32_t *)&psxVuw[(i<<10)+j],
+ psxVuw[clutP+tC1]|
+ ((int)psxVuw[clutP+tC2])<<16);
+ posX+=difX2;
+ posY+=difY2;
+ }
+ if(j==xmax)
+ {
+ XAdjust=(posX>>16)%TWin.Position.x1;
+ tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+ YAdjust+(XAdjust>>1)];
+ tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+ GetTextureTransColG_SPR(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+ }
+ }
+ if(NextRow_FT4()) return;
+ }
+}
+////////////////////////////////////////////////////////////////////////
+// POLY 3 F-SHADED TEX PAL 8
+////////////////////////////////////////////////////////////////////////
+
+void drawPoly3TEx8(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3,short clX, short clY)
+{
+ int i,j,xmin,xmax,ymin,ymax;
+ int difX, difY,difX2, difY2;
+ int posX,posY,YAdjust,clutP;
+ short tC1,tC2;
+
+ if(x1>drawW && x2>drawW && x3>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_FT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+ if(NextRow_FT()) return;
+
+ clutP=(clY<<10)+clX;
+
+ YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);
+
+ difX=delta_right_u;difX2=difX<<1;
+ difY=delta_right_v;difY2=difY<<1;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans)
+ {
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!
+ if(drawW<xmax) xmax=drawW;
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+
+ for(j=xmin;j<xmax;j+=2)
+ {
+ tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(posX>>16)];
+ tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+
+ ((posX+difX)>>16)];
+ GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
+ psxVuw[clutP+tC1]|
+ ((int)psxVuw[clutP+tC2])<<16);
+ posX+=difX2;
+ posY+=difY2;
+ }
+
+ if(j==xmax)
+ {
+ tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(posX>>16)];
+ GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+ }
+ }
+ if(NextRow_FT()) 
+ {
+ return;
+ }
+ }
+ return;
+ }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!
+ if(drawW<xmax) xmax=drawW;
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+
+ for(j=xmin;j<xmax;j+=2)
+ {
+ tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(posX>>16)];
+ tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+
+ ((posX+difX)>>16)];
+ GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
+ psxVuw[clutP+tC1]|
+ ((int)psxVuw[clutP+tC2])<<16);
+ posX+=difX2;
+ posY+=difY2;
+ }
+
+ if(j==xmax)
+ {
+ tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(posX>>16)];
+ GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+ }
+
+ }
+ if(NextRow_FT()) 
+ {
+ return;
+ }
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void drawPoly3TEx8_IL(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3,short clX, short clY)
+{
+ int i,j,xmin,xmax,ymin,ymax,n_xi,n_yi,TXV,TXU;
+ int difX, difY,difX2, difY2;
+ int posX,posY,YAdjust,clutP;
+ short tC1,tC2;
+
+ if(x1>drawW && x2>drawW && x3>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_FT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+ if(NextRow_FT()) return;
+
+ clutP=(clY<<10)+clX;
+
+ YAdjust=(GlobalTextAddrY<<10)+GlobalTextAddrX;
+
+ difX=delta_right_u;difX2=difX<<1;
+ difY=delta_right_v;difY2=difY<<1;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans)
+ {
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!
+ if(drawW<xmax) xmax=drawW;
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+
+ for(j=xmin;j<xmax;j+=2)
+ {
+ TXU=posX>>16;
+ TXV=posY>>16;
+ n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
+ n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
+
+ tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
+
+ TXU=(posX+difX)>>16;
+ TXV=(posY+difY)>>16;
+ n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
+ n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
+
+ tC2= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
+
+ GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
+ psxVuw[clutP+tC1]|
+ ((int)psxVuw[clutP+tC2])<<16);
+ posX+=difX2;
+ posY+=difY2;
+ }
+
+ if(j==xmax)
+ {
+ TXU=posX>>16;
+ TXV=posY>>16;
+ n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
+ n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
+
+ tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
+
+ GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+ }
+ }
+ if(NextRow_FT()) 
+ {
+ return;
+ }
+ }
+ return;
+ }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!
+ if(drawW<xmax) xmax=drawW;
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+
+ for(j=xmin;j<xmax;j+=2)
+ {
+ TXU=posX>>16;
+ TXV=posY>>16;
+ n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
+ n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
+
+ tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
+
+ TXU=(posX+difX)>>16;
+ TXV=(posY+difY)>>16;
+ n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
+ n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
+
+ tC2= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
+
+ GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
+ psxVuw[clutP+tC1]|
+ ((int)psxVuw[clutP+tC2])<<16);
+ posX+=difX2;
+ posY+=difY2;
+ }
+
+ if(j==xmax)
+ {
+ TXU=posX>>16;
+ TXV=posY>>16;
+ n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
+ n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
+
+ tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
+
+ GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+ }
+
+ }
+ if(NextRow_FT()) 
+ {
+ return;
+ }
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void drawPoly3TEx8_TW(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3,short clX, short clY)
+{
+ int i,j,xmin,xmax,ymin,ymax;
+ int difX, difY,difX2, difY2;
+ int posX,posY,YAdjust,clutP;
+ short tC1,tC2;
+
+ if(x1>drawW && x2>drawW && x3>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_FT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+ if(NextRow_FT()) return;
+
+ clutP=(clY<<10)+clX;
+
+ YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);
+ YAdjust+=(TWin.Position.y0<<11)+(TWin.Position.x0);
+
+ difX=delta_right_u;difX2=difX<<1;
+ difY=delta_right_v;difY2=difY<<1;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans)
+ {
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16);//-1; //!!!!!!!!!!!!!!!!
+ if(xmax>xmin) xmax--;
+
+ if(drawW<xmax) xmax=drawW;
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+
+ for(j=xmin;j<xmax;j+=2)
+ {
+ tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+ YAdjust+((posX>>16)%TWin.Position.x1)];
+ tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
+ YAdjust+(((posX+difX)>>16)%TWin.Position.x1)];
+ GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
+ psxVuw[clutP+tC1]|
+ ((int)psxVuw[clutP+tC2])<<16);
+ posX+=difX2;
+ posY+=difY2;
+ }
+
+ if(j==xmax)
+ {
+ tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+ YAdjust+((posX>>16)%TWin.Position.x1)];
+ GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+ }
+ }
+ if(NextRow_FT()) 
+ {
+ return;
+ }
+ }
+ return;
+ }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!
+ if(drawW<xmax) xmax=drawW;
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+
+ for(j=xmin;j<xmax;j+=2)
+ {
+ tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+ YAdjust+((posX>>16)%TWin.Position.x1)];
+ tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
+ YAdjust+(((posX+difX)>>16)%TWin.Position.x1)];
+ GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
+ psxVuw[clutP+tC1]|
+ ((int)psxVuw[clutP+tC2])<<16);
+ posX+=difX2;
+ posY+=difY2;
+ }
+
+ if(j==xmax)
+ {
+ tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+ YAdjust+((posX>>16)%TWin.Position.x1)];
+ GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+ }
+
+ }
+ if(NextRow_FT()) 
+ {
+ return;
+ }
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+#ifdef POLYQUAD3
+
+void drawPoly4TEx8_TRI(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
+{
+ drawPoly3TEx8(x2,y2,x3,y3,x4,y4,
+ tx2,ty2,tx3,ty3,tx4,ty4,
+ clX,clY);
+
+ drawPoly3TEx8(x1,y1,x2,y2,x4,y4,
+ tx1,ty1,tx2,ty2,tx4,ty4,
+ clX,clY);
+}
+
+#endif
+
+// more exact:
+
+void drawPoly4TEx8(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
+{
+ int num; 
+ int i,j,xmin,xmax,ymin,ymax;
+ int difX, difY, difX2, difY2;
+ int posX,posY,YAdjust,clutP;
+ short tC1,tC2;
+
+ if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_FT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+ if(NextRow_FT4()) return;
+
+ clutP=(clY<<10)+clX;
+
+ YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans)
+ {
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16);
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+
+ num=(xmax-xmin);
+ if(num==0) num=1;
+ difX=(right_u-posX)/num;
+ difY=(right_v-posY)/num;
+ difX2=difX<<1;
+ difY2=difY<<1;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+ xmax--;if(drawW<xmax) xmax=drawW;
+
+ for(j=xmin;j<xmax;j+=2)
+ {
+ tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(posX>>16)];
+ tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+
+ ((posX+difX)>>16)];
+ GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
+ psxVuw[clutP+tC1]|
+ ((int)psxVuw[clutP+tC2])<<16);
+ posX+=difX2;
+ posY+=difY2;
+ }
+ if(j==xmax)
+ {
+ tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(posX>>16)];
+ GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+ }
+ }
+ if(NextRow_FT4()) return;
+ }
+ return;
+ }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16);
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+
+ num=(xmax-xmin);
+ if(num==0) num=1;
+ difX=(right_u-posX)/num;
+ difY=(right_v-posY)/num;
+ difX2=difX<<1;
+ difY2=difY<<1;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+ xmax--;if(drawW<xmax) xmax=drawW;
+
+ for(j=xmin;j<xmax;j+=2)
+ {
+ tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(posX>>16)];
+ tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+
+ ((posX+difX)>>16)];
+ GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
+ psxVuw[clutP+tC1]|
+ ((int)psxVuw[clutP+tC2])<<16);
+ posX+=difX2;
+ posY+=difY2;
+ }
+ if(j==xmax)
+ {
+ tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(posX>>16)];
+ GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+ }
+ }
+ if(NextRow_FT4()) return;
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void drawPoly4TEx8_IL(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
+{
+ int num; 
+ int i,j,xmin,xmax,ymin,ymax,n_xi,n_yi,TXV,TXU;
+ int difX, difY, difX2, difY2;
+ int posX,posY,YAdjust,clutP;
+ short tC1,tC2;
+
+ if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_FT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+ if(NextRow_FT4()) return;
+
+ clutP=(clY<<10)+clX;
+
+ YAdjust=(GlobalTextAddrY<<10)+GlobalTextAddrX;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans)
+ {
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16);
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+
+ num=(xmax-xmin);
+ if(num==0) num=1;
+ difX=(right_u-posX)/num;
+ difY=(right_v-posY)/num;
+ difX2=difX<<1;
+ difY2=difY<<1;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+ xmax--;if(drawW<xmax) xmax=drawW;
+
+ for(j=xmin;j<xmax;j+=2)
+ {
+ TXU=posX>>16;
+ TXV=posY>>16;
+ n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
+ n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
+
+ tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
+
+ TXU=(posX+difX)>>16;
+ TXV=(posY+difY)>>16;
+ n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
+ n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
+
+ tC2= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
+
+ GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
+ psxVuw[clutP+tC1]|
+ ((int)psxVuw[clutP+tC2])<<16);
+ posX+=difX2;
+ posY+=difY2;
+ }
+ if(j==xmax)
+ {
+ TXU=posX>>16;
+ TXV=posY>>16;
+ n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
+ n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
+
+ tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
+
+ GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+ }
+ }
+ if(NextRow_FT4()) return;
+ }
+ return;
+ }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16);
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+
+ num=(xmax-xmin);
+ if(num==0) num=1;
+ difX=(right_u-posX)/num;
+ difY=(right_v-posY)/num;
+ difX2=difX<<1;
+ difY2=difY<<1;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+ xmax--;if(drawW<xmax) xmax=drawW;
+
+ for(j=xmin;j<xmax;j+=2)
+ {
+ TXU=posX>>16;
+ TXV=posY>>16;
+ n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
+ n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
+
+ tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
+
+ TXU=(posX+difX)>>16;
+ TXV=(posY+difY)>>16;
+ n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
+ n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
+ 
+ tC2= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
+
+ GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
+ psxVuw[clutP+tC1]|
+ ((int)psxVuw[clutP+tC2])<<16);
+ posX+=difX2;
+ posY+=difY2;
+ }
+ if(j==xmax)
+ {
+ TXU=posX>>16;
+ TXV=posY>>16;
+ n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
+ n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
+ tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
+ GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+ }
+ }
+ if(NextRow_FT4()) return;
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void drawPoly4TEx8_TW(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
+{
+ int num; 
+ int i, j, xmin, xmax, ymin, ymax;
+ int difX, difY, difX2, difY2;
+ int posX, posY, YAdjust, clutP;
+ short tC1, tC2;
+
+ if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_FT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+ if(NextRow_FT4()) return;
+
+ clutP=(clY<<10)+clX;
+
+ YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);
+ YAdjust+=(TWin.Position.y0<<11)+(TWin.Position.x0);
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans)
+ {
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16);
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+
+ num=(xmax-xmin);
+ if(num==0) num=1;
+ difX=(right_u-posX)/num;
+ difY=(right_v-posY)/num;
+ difX2=difX<<1;
+ difY2=difY<<1;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+ xmax--;if(drawW<xmax) xmax=drawW;
+
+ for(j=xmin;j<xmax;j+=2)
+ {
+ tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+ YAdjust+((posX>>16)%TWin.Position.x1)];
+ tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
+ YAdjust+(((posX+difX)>>16)%TWin.Position.x1)];
+ GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
+ psxVuw[clutP+tC1]|
+ ((int)psxVuw[clutP+tC2])<<16);
+ posX += difX2;
+ posY += difY2;
+ }
+ if(j==xmax)
+ {
+ tC1 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
+ YAdjust+((posX>>16)%TWin.Position.x1)];
+ GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+ }
+ }
+ if(NextRow_FT4()) return;
+ }
+ return;
+ }
+
+#endif
+
+
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16);
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+
+ num=(xmax-xmin);
+ if(num==0) num=1;
+ difX=(right_u-posX)/num;
+ difY=(right_v-posY)/num;
+ difX2=difX<<1;
+ difY2=difY<<1;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+ xmax--;if(drawW<xmax) xmax=drawW;
+
+ for(j=xmin;j<xmax;j+=2)
+ {
+ tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+ YAdjust+((posX>>16)%TWin.Position.x1)];
+ tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
+ YAdjust+(((posX+difX)>>16)%TWin.Position.x1)];
+ GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
+ psxVuw[clutP+tC1]|
+ ((int)psxVuw[clutP+tC2])<<16);
+ posX+=difX2;
+ posY+=difY2;
+ }
+ if(j==xmax)
+ {
+ tC1 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
+ YAdjust+((posX>>16)%TWin.Position.x1)];
+ GetTextureTransColG(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+ }
+ }
+ if(NextRow_FT4()) return;
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void drawPoly4TEx8_TW_S(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,short clX, short clY)
+{
+ int num; 
+ int i,j,xmin,xmax,ymin,ymax;
+ int difX, difY, difX2, difY2;
+ int posX,posY,YAdjust,clutP;
+ short tC1,tC2;
+
+ if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_FT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+ if(NextRow_FT4()) return;
+
+ clutP=(clY<<10)+clX;
+
+ YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);
+ YAdjust+=(TWin.Position.y0<<11)+(TWin.Position.x0);
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans)
+ {
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16);
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+
+ num=(xmax-xmin);
+ if(num==0) num=1;
+ difX=(right_u-posX)/num;
+ difY=(right_v-posY)/num;
+ difX2=difX<<1;
+ difY2=difY<<1;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+ xmax--;if(drawW<xmax) xmax=drawW;
+
+ for(j=xmin;j<xmax;j+=2)
+ {
+ tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+ YAdjust+((posX>>16)%TWin.Position.x1)];
+ tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
+ YAdjust+(((posX+difX)>>16)%TWin.Position.x1)];
+ GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
+ psxVuw[clutP+tC1]|
+ ((int)psxVuw[clutP+tC2])<<16);
+ posX+=difX2;
+ posY+=difY2;
+ }
+ if(j==xmax)
+ {
+ tC1 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
+ YAdjust+((posX>>16)%TWin.Position.x1)];
+ GetTextureTransColG_S(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+ }
+ }
+ if(NextRow_FT4()) return;
+ }
+ return;
+ }
+
+#endif
+
+
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16);
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+
+ num=(xmax-xmin);
+ if(num==0) num=1;
+ difX=(right_u-posX)/num;
+ difY=(right_v-posY)/num;
+ difX2=difX<<1;
+ difY2=difY<<1;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+ xmax--;if(drawW<xmax) xmax=drawW;
+
+ for(j=xmin;j<xmax;j+=2)
+ {
+ tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+ YAdjust+((posX>>16)%TWin.Position.x1)];
+ tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
+ YAdjust+(((posX+difX)>>16)%TWin.Position.x1)];
+ GetTextureTransColG32_SPR((uint32_t *)&psxVuw[(i<<10)+j],
+ psxVuw[clutP+tC1]|
+ ((int)psxVuw[clutP+tC2])<<16);
+ posX+=difX2;
+ posY+=difY2;
+ }
+ if(j==xmax)
+ {
+ tC1 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
+ YAdjust+((posX>>16)%TWin.Position.x1)];
+ GetTextureTransColG_SPR(&psxVuw[(i<<10)+j],psxVuw[clutP+tC1]);
+ }
+ }
+ if(NextRow_FT4()) return;
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+// POLY 3 F-SHADED TEX 15 BIT
+////////////////////////////////////////////////////////////////////////
+
+void drawPoly3TD(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3)
+{
+ int i,j,xmin,xmax,ymin,ymax;
+ int difX, difY,difX2, difY2;
+ int posX,posY;
+
+ if(x1>drawW && x2>drawW && x3>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+ 
+ if(!SetupSections_FT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+ if(NextRow_FT()) return;
+
+ difX=delta_right_u;difX2=difX<<1;
+ difY=delta_right_v;difY2=difY<<1;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans)
+ {
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!
+ if(drawW<xmax) xmax=drawW;
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+
+ for(j=xmin;j<xmax;j+=2)
+ {
+ GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
+ (((int)psxVuw[((((posY+difY)>>16)+GlobalTextAddrY)<<10)+((posX+difX)>>16)+GlobalTextAddrX])<<16)|
+ psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+((posX)>>16)+GlobalTextAddrX]);
+
+ posX+=difX2;
+ posY+=difY2;
+ }
+ if(j==xmax)
+ GetTextureTransColG_S(&psxVuw[(i<<10)+j],
+ psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+(posX>>16)+GlobalTextAddrX]);
+ }
+ if(NextRow_FT()) 
+ {
+ return;
+ }
+ }
+ return;
+ }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!
+ if(drawW<xmax) xmax=drawW;
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+
+ for(j=xmin;j<xmax;j+=2)
+ {
+ GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
+ (((int)psxVuw[((((posY+difY)>>16)+GlobalTextAddrY)<<10)+((posX+difX)>>16)+GlobalTextAddrX])<<16)|
+ psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+((posX)>>16)+GlobalTextAddrX]);
+
+ posX+=difX2;
+ posY+=difY2;
+ }
+ if(j==xmax)
+ GetTextureTransColG(&psxVuw[(i<<10)+j],
+ psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+(posX>>16)+GlobalTextAddrX]);
+ }
+ if(NextRow_FT()) 
+ {
+ return;
+ }
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void drawPoly3TD_TW(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3)
+{
+ int i,j,xmin,xmax,ymin,ymax;
+ int difX, difY,difX2, difY2;
+ int posX,posY;
+
+ if(x1>drawW && x2>drawW && x3>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+ 
+ if(!SetupSections_FT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+ if(NextRow_FT()) return;
+
+ difX=delta_right_u;difX2=difX<<1;
+ difY=delta_right_v;difY2=difY<<1;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans)
+ {
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!
+ if(drawW<xmax) xmax=drawW;
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+
+ for(j=xmin;j<xmax;j+=2)
+ {
+ GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
+ (((int)psxVuw[(((((posY+difY)>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
+ (((posX+difX)>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0])<<16)|
+ psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
+ (((posX)>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);
+
+ posX+=difX2;
+ posY+=difY2;
+ }
+ if(j==xmax)
+ GetTextureTransColG_S(&psxVuw[(i<<10)+j],
+ psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
+ ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);
+ }
+ if(NextRow_FT()) 
+ {
+ return;
+ }
+ }
+ return;
+ }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!
+ if(drawW<xmax) xmax=drawW;
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+
+ for(j=xmin;j<xmax;j+=2)
+ {
+ GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
+ (((int)psxVuw[(((((posY+difY)>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
+ (((posX+difX)>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0])<<16)|
+ psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
+ (((posX)>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);
+
+ posX+=difX2;
+ posY+=difY2;
+ }
+ if(j==xmax)
+ GetTextureTransColG(&psxVuw[(i<<10)+j],
+ psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
+ ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);
+ }
+ if(NextRow_FT()) 
+ {
+ return;
+ }
+ }
+}
+
+
+////////////////////////////////////////////////////////////////////////
+
+#ifdef POLYQUAD3
+
+void drawPoly4TD_TRI(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4)
+{
+ drawPoly3TD(x2,y2,x3,y3,x4,y4,
+ tx2,ty2,tx3,ty3,tx4,ty4);
+ drawPoly3TD(x1,y1,x2,y2,x4,y4,
+ tx1,ty1,tx2,ty2,tx4,ty4);
+}
+
+#endif
+
+// more exact:
+
+void drawPoly4TD(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4)
+{
+ int num; 
+ int i,j,xmin,xmax,ymin,ymax;
+ int difX, difY, difX2, difY2;
+ int posX,posY;
+
+ if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_FT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+ if(NextRow_FT4()) return;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans)
+ {
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16);
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+
+ num=(xmax-xmin);
+ if(num==0) num=1;
+ difX=(right_u-posX)/num;
+ difY=(right_v-posY)/num;
+ difX2=difX<<1;
+ difY2=difY<<1;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+ xmax--;if(drawW<xmax) xmax=drawW;
+
+ for(j=xmin;j<xmax;j+=2)
+ {
+ GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
+ (((int)psxVuw[((((posY+difY)>>16)+GlobalTextAddrY)<<10)+((posX+difX)>>16)+GlobalTextAddrX])<<16)|
+ psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+((posX)>>16)+GlobalTextAddrX]);
+
+ posX+=difX2;
+ posY+=difY2;
+ }
+ if(j==xmax)
+ GetTextureTransColG_S(&psxVuw[(i<<10)+j],
+ psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+(posX>>16)+GlobalTextAddrX]);
+ }
+ if(NextRow_FT4()) return;
+ }
+ return;
+ }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16);
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+
+ num=(xmax-xmin);
+ if(num==0) num=1;
+ difX=(right_u-posX)/num;
+ difY=(right_v-posY)/num;
+ difX2=difX<<1;
+ difY2=difY<<1;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+ xmax--;if(drawW<xmax) xmax=drawW;
+
+ for(j=xmin;j<xmax;j+=2)
+ {
+ GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
+ (((int)psxVuw[((((posY+difY)>>16)+GlobalTextAddrY)<<10)+((posX+difX)>>16)+GlobalTextAddrX])<<16)|
+ psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+((posX)>>16)+GlobalTextAddrX]);
+
+ posX+=difX2;
+ posY+=difY2;
+ }
+ if(j==xmax)
+ GetTextureTransColG(&psxVuw[(i<<10)+j],
+ psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+(posX>>16)+GlobalTextAddrX]);
+ }
+ if(NextRow_FT4()) return;
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void drawPoly4TD_TW(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4)
+{
+ int num; 
+ int i,j,xmin,xmax,ymin,ymax;
+ int difX, difY, difX2, difY2;
+ int posX,posY;
+
+ if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_FT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+ if(NextRow_FT4()) return;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans)
+ {
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16);
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+
+ num=(xmax-xmin);
+ if(num==0) num=1;
+ difX=(right_u-posX)/num;
+ difY=(right_v-posY)/num;
+ difX2=difX<<1;
+ difY2=difY<<1;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+ xmax--;if(drawW<xmax) xmax=drawW;
+
+ for(j=xmin;j<xmax;j+=2)
+ {
+ GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
+ (((int)psxVuw[(((((posY+difY)>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
+ (((posX+difX)>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0])<<16)|
+ psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY)<<10)+TWin.Position.y0+
+ ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);
+
+ posX+=difX2;
+ posY+=difY2;
+ }
+ if(j==xmax)
+ GetTextureTransColG_S(&psxVuw[(i<<10)+j],
+ psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
+ ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);
+ }
+ if(NextRow_FT4()) return;
+ }
+ return;
+ }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16);
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+
+ num=(xmax-xmin);
+ if(num==0) num=1;
+ difX=(right_u-posX)/num;
+ difY=(right_v-posY)/num;
+ difX2=difX<<1;
+ difY2=difY<<1;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+ xmax--;if(drawW<xmax) xmax=drawW;
+
+ for(j=xmin;j<xmax;j+=2)
+ {
+ GetTextureTransColG32((uint32_t *)&psxVuw[(i<<10)+j],
+ (((int)psxVuw[(((((posY+difY)>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
+ (((posX+difX)>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0])<<16)|
+ psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
+ ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);
+
+ posX+=difX2;
+ posY+=difY2;
+ }
+ if(j==xmax)
+ GetTextureTransColG(&psxVuw[(i<<10)+j],
+ psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
+ ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);
+ }
+ if(NextRow_FT4()) return;
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void drawPoly4TD_TW_S(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4)
+{
+ int num; 
+ int i,j,xmin,xmax,ymin,ymax;
+ int difX, difY, difX2, difY2;
+ int posX, posY;
+
+ if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_FT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+ if(NextRow_FT4()) return;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans)
+ {
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16);
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+
+ num=(xmax-xmin);
+ if(num==0) num=1;
+ difX=(right_u-posX)/num;
+ difY=(right_v-posY)/num;
+ difX2=difX<<1;
+ difY2=difY<<1;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+ xmax--;if(drawW<xmax) xmax=drawW;
+
+ for(j=xmin;j<xmax;j+=2)
+ {
+ GetTextureTransColG32_S((uint32_t *)&psxVuw[(i<<10)+j],
+ (((int)psxVuw[(((((posY+difY)>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
+ (((posX+difX)>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0])<<16)|
+ psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY)<<10)+TWin.Position.y0+
+ ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);
+
+ posX+=difX2;
+ posY+=difY2;
+ }
+ if(j==xmax)
+ GetTextureTransColG_S(&psxVuw[(i<<10)+j],
+ psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
+ ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);
+ }
+ if(NextRow_FT4()) return;
+ }
+ return;
+ }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16);
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+
+ num=(xmax-xmin);
+ if(num==0) num=1;
+ difX=(right_u-posX)/num;
+ difY=(right_v-posY)/num;
+ difX2=difX<<1;
+ difY2=difY<<1;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;}
+ xmax--;if(drawW<xmax) xmax=drawW;
+
+ for(j=xmin;j<xmax;j+=2)
+ {
+ GetTextureTransColG32_SPR((uint32_t *)&psxVuw[(i<<10)+j],
+ (((int)psxVuw[(((((posY+difY)>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
+ (((posX+difX)>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0])<<16)|
+ psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
+ ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);
+
+ posX+=difX2;
+ posY+=difY2;
+ }
+ if(j==xmax)
+ GetTextureTransColG_SPR(&psxVuw[(i<<10)+j],
+ psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
+ ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0]);
+ }
+ if(NextRow_FT4()) return;
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+// POLY 3/4 G-SHADED
+////////////////////////////////////////////////////////////////////////
+ 
+static __inline void drawPoly3Gi(short x1,short y1,short x2,short y2,short x3,short y3, int rgb1, int rgb2, int rgb3)
+{
+ int i,j,xmin,xmax,ymin,ymax;
+ int cR1,cG1,cB1;
+ int difR,difB,difG,difR2,difB2,difG2;
+
+ if(x1>drawW && x2>drawW && x3>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_G(x1,y1,x2,y2,x3,y3,rgb1,rgb2,rgb3)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+ if(NextRow_G()) return;
+
+ difR=delta_right_R;
+ difG=delta_right_G;
+ difB=delta_right_B;
+ difR2=difR<<1;
+ difG2=difG<<1;
+ difB2=difB<<1;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans && iDither!=2)
+ {
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16)-1;if(drawW<xmax) xmax=drawW;
+
+ if(xmax>=xmin)
+ {
+ cR1=left_R;
+ cG1=left_G;
+ cB1=left_B;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+
+ for(j=xmin;j<xmax;j+=2) 
+ {
+ *((uint32_t *)&psxVuw[(i<<10)+j])=
+ ((((cR1+difR) <<7)&0x7c000000)|(((cG1+difG) << 2)&0x03e00000)|(((cB1+difB)>>3)&0x001f0000)|
+ (((cR1) >> 9)&0x7c00)|(((cG1) >> 14)&0x03e0)|(((cB1) >> 19)&0x001f))|lSetMask;
+ 
+ cR1+=difR2;
+ cG1+=difG2;
+ cB1+=difB2;
+ }
+ if(j==xmax)
+ psxVuw[(i<<10)+j]=(((cR1 >> 9)&0x7c00)|((cG1 >> 14)&0x03e0)|((cB1 >> 19)&0x001f))|sSetMask;
+ }
+ if(NextRow_G()) return;
+ }
+ return;
+ }
+
+#endif
+
+ if(iDither==2)
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16)-1;if(drawW<xmax) xmax=drawW;
+
+ if(xmax>=xmin)
+ {
+ cR1=left_R;
+ cG1=left_G;
+ cB1=left_B;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+
+ for(j=xmin;j<=xmax;j++) 
+ {
+ GetShadeTransCol_Dither(&psxVuw[(i<<10)+j],(cB1>>16),(cG1>>16),(cR1>>16));
+
+ cR1+=difR;
+ cG1+=difG;
+ cB1+=difB;
+ }
+ }
+ if(NextRow_G()) return;
+ }
+ else
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16)-1;if(drawW<xmax) xmax=drawW;
+
+ if(xmax>=xmin)
+ {
+ cR1=left_R;
+ cG1=left_G;
+ cB1=left_B;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+
+ for(j=xmin;j<=xmax;j++) 
+ {
+ GetShadeTransCol(&psxVuw[(i<<10)+j],((cR1 >> 9)&0x7c00)|((cG1 >> 14)&0x03e0)|((cB1 >> 19)&0x001f));
+
+ cR1+=difR;
+ cG1+=difG;
+ cB1+=difB;
+ }
+ }
+ if(NextRow_G()) return;
+ }
+
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void drawPoly3G(int rgb1, int rgb2, int rgb3)
+{
+ drawPoly3Gi(lx0,ly0,lx1,ly1,lx2,ly2,rgb1,rgb2,rgb3);
+}
+
+// draw two g-shaded tris for right psx shading emulation
+
+void drawPoly4G(int rgb1, int rgb2, int rgb3, int rgb4)
+{
+ drawPoly3Gi(lx1,ly1,lx3,ly3,lx2,ly2,
+ rgb2,rgb4,rgb3);
+ drawPoly3Gi(lx0,ly0,lx1,ly1,lx2,ly2,
+ rgb1,rgb2,rgb3);
+}
+
+////////////////////////////////////////////////////////////////////////
+// POLY 3/4 G-SHADED TEX PAL4
+////////////////////////////////////////////////////////////////////////
+
+void drawPoly3TGEx4(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short clX, short clY,int col1, int col2, int col3)
+{
+ int i,j,xmin,xmax,ymin,ymax;
+ int cR1,cG1,cB1;
+ int difR,difB,difG,difR2,difB2,difG2;
+ int difX, difY,difX2, difY2;
+ int posX,posY,YAdjust,clutP,XAdjust;
+ short tC1,tC2;
+
+ if(x1>drawW && x2>drawW && x3>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_GT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3,col1,col2,col3)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+ if(NextRow_GT()) return;
+
+ clutP=(clY<<10)+clX;
+
+ YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);
+
+ difR=delta_right_R;
+ difG=delta_right_G;
+ difB=delta_right_B;
+ difR2=difR<<1;
+ difG2=difG<<1;
+ difB2=difB<<1;
+
+ difX=delta_right_u;difX2=difX<<1;
+ difY=delta_right_v;difY2=difY<<1;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans && !iDither)
+ {
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=((left_x) >> 16);
+ xmax=((right_x) >> 16)-1; //!!!!!!!!!!!!!
+ if(drawW<xmax) xmax=drawW;
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+ cR1=left_R;
+ cG1=left_G;
+ cB1=left_B;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+
+ for(j=xmin;j<xmax;j+=2) 
+ {
+ XAdjust=(posX>>16);
+ tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(XAdjust>>1)];
+ tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+ XAdjust=((posX+difX)>>16);
+ tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+
+ (XAdjust>>1)];
+ tC2=(tC2>>((XAdjust&1)<<2))&0xf;
+
+ GetTextureTransColGX32_S((uint32_t *)&psxVuw[(i<<10)+j],
+ psxVuw[clutP+tC1]|
+ ((int)psxVuw[clutP+tC2])<<16,
+ (cB1>>16)|((cB1+difB)&0xff0000),
+ (cG1>>16)|((cG1+difG)&0xff0000),
+ (cR1>>16)|((cR1+difR)&0xff0000));
+ posX+=difX2;
+ posY+=difY2;
+ cR1+=difR2;
+ cG1+=difG2;
+ cB1+=difB2;
+ }
+ if(j==xmax)
+ {
+ XAdjust=(posX>>16);
+ tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(XAdjust>>1)];
+ tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+ GetTextureTransColGX_S(&psxVuw[(i<<10)+j], 
+ psxVuw[clutP+tC1],
+ (cB1>>16),(cG1>>16),(cR1>>16));
+ }
+ }
+ if(NextRow_GT()) 
+ {
+ return;
+ }
+ }
+ return;
+ }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!
+ if(drawW<xmax) xmax=drawW;
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+ cR1=left_R;
+ cG1=left_G;
+ cB1=left_B;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+
+ for(j=xmin;j<=xmax;j++) 
+ {
+ XAdjust=(posX>>16);
+ tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(XAdjust>>1)];
+ tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+ if(iDither)
+ GetTextureTransColGX_Dither(&psxVuw[(i<<10)+j], 
+ psxVuw[clutP+tC1],
+ (cB1>>16),(cG1>>16),(cR1>>16));
+ else
+ GetTextureTransColGX(&psxVuw[(i<<10)+j], 
+ psxVuw[clutP+tC1],
+ (cB1>>16),(cG1>>16),(cR1>>16));
+ posX+=difX;
+ posY+=difY;
+ cR1+=difR;
+ cG1+=difG;
+ cB1+=difB;
+ }
+ }
+ if(NextRow_GT()) 
+ {
+ return;
+ }
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void drawPoly3TGEx4_IL(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short clX, short clY,int col1, int col2, int col3)
+{
+ int i,j,xmin,xmax,ymin,ymax,n_xi,n_yi,TXV;
+ int cR1,cG1,cB1;
+ int difR,difB,difG,difR2,difB2,difG2;
+ int difX, difY,difX2, difY2;
+ int posX,posY,YAdjust,clutP,XAdjust;
+ short tC1,tC2;
+
+ if(x1>drawW && x2>drawW && x3>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_GT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3,col1,col2,col3)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+ if(NextRow_GT()) return;
+
+ clutP=(clY<<10)+clX;
+
+ YAdjust=(GlobalTextAddrY<<10)+GlobalTextAddrX;
+
+ difR=delta_right_R;
+ difG=delta_right_G;
+ difB=delta_right_B;
+ difR2=difR<<1;
+ difG2=difG<<1;
+ difB2=difB<<1;
+
+ difX=delta_right_u;difX2=difX<<1;
+ difY=delta_right_v;difY2=difY<<1;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans && !iDither)
+ {
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=((left_x) >> 16);
+ xmax=((right_x) >> 16)-1; //!!!!!!!!!!!!!
+ if(drawW<xmax) xmax=drawW;
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+ cR1=left_R;
+ cG1=left_G;
+ cB1=left_B;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+
+ for(j=xmin;j<xmax;j+=2) 
+ {
+ XAdjust=(posX>>16);
+
+ TXV=posY>>16;
+ n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
+ n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
+ 
+ tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
+
+ XAdjust=((posX+difX)>>16);
+
+ TXV=(posY+difY)>>16;
+ n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
+ n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
+
+ tC2= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
+
+ GetTextureTransColGX32_S((uint32_t *)&psxVuw[(i<<10)+j],
+ psxVuw[clutP+tC1]|
+ ((int)psxVuw[clutP+tC2])<<16,
+ (cB1>>16)|((cB1+difB)&0xff0000),
+ (cG1>>16)|((cG1+difG)&0xff0000),
+ (cR1>>16)|((cR1+difR)&0xff0000));
+ posX+=difX2;
+ posY+=difY2;
+ cR1+=difR2;
+ cG1+=difG2;
+ cB1+=difB2;
+ }
+ if(j==xmax)
+ {
+ XAdjust=(posX>>16);
+
+ TXV=posY>>16;
+ n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
+ n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
+
+ tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
+
+ GetTextureTransColGX_S(&psxVuw[(i<<10)+j], 
+ psxVuw[clutP+tC1],
+ (cB1>>16),(cG1>>16),(cR1>>16));
+ }
+ }
+ if(NextRow_GT()) 
+ {
+ return;
+ }
+ }
+ return;
+ }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!
+ if(drawW<xmax) xmax=drawW;
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+ cR1=left_R;
+ cG1=left_G;
+ cB1=left_B;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+
+ for(j=xmin;j<=xmax;j++) 
+ {
+ XAdjust=(posX>>16);
+
+ TXV=posY>>16;
+ n_xi = ( ( XAdjust >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
+ n_yi = ( TXV & ~0xf ) + ( ( XAdjust >> 4 ) & 0xf );
+
+ tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((XAdjust & 0x03)<<2)) & 0x0f ;
+
+ if(iDither)
+ GetTextureTransColGX_Dither(&psxVuw[(i<<10)+j], 
+ psxVuw[clutP+tC1],
+ (cB1>>16),(cG1>>16),(cR1>>16));
+ else
+ GetTextureTransColGX(&psxVuw[(i<<10)+j], 
+ psxVuw[clutP+tC1],
+ (cB1>>16),(cG1>>16),(cR1>>16));
+ posX+=difX;
+ posY+=difY;
+ cR1+=difR;
+ cG1+=difG;
+ cB1+=difB;
+ }
+ }
+ if(NextRow_GT()) 
+ {
+ return;
+ }
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void drawPoly3TGEx4_TW(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short clX, short clY, int col1, int col2, int col3)
+{
+ int i, j, xmin, xmax, ymin, ymax;
+ int cR1, cG1, cB1;
+ int difR, difB, difG, difR2, difB2, difG2;
+ int difX, difY,difX2, difY2;
+ int posX, posY, YAdjust, clutP, XAdjust;
+ short tC1,tC2;
+
+ if(x1>drawW && x2>drawW && x3>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_GT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3,col1,col2,col3)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+ if(NextRow_GT()) return;
+
+ clutP=(clY<<10)+clX;
+
+ YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);
+ YAdjust+=(TWin.Position.y0<<11)+(TWin.Position.x0>>1);
+
+ difR=delta_right_R;
+ difG=delta_right_G;
+ difB=delta_right_B;
+ difR2=difR<<1;
+ difG2=difG<<1;
+ difB2=difB<<1;
+
+ difX=delta_right_u;difX2=difX<<1;
+ difY=delta_right_v;difY2=difY<<1;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans && !iDither)
+ {
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=((left_x) >> 16);
+ xmax=((right_x) >> 16)-1; //!!!!!!!!!!!!!
+ if(drawW<xmax) xmax=drawW;
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+ cR1=left_R;
+ cG1=left_G;
+ cB1=left_B;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+
+ for(j=xmin;j<xmax;j+=2) 
+ {
+ XAdjust=(posX>>16)%TWin.Position.x1;
+ tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+ YAdjust+(XAdjust>>1)];
+ tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+ XAdjust=((posX+difX)>>16)%TWin.Position.x1;
+ tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
+ YAdjust+(XAdjust>>1)];
+ tC2=(tC2>>((XAdjust&1)<<2))&0xf;
+ GetTextureTransColGX32_S((uint32_t *)&psxVuw[(i<<10)+j],
+ psxVuw[clutP+tC1]|
+ ((int)psxVuw[clutP+tC2])<<16,
+ (cB1>>16)|((cB1+difB)&0xff0000),
+ (cG1>>16)|((cG1+difG)&0xff0000),
+ (cR1>>16)|((cR1+difR)&0xff0000));
+ posX+=difX2;
+ posY+=difY2;
+ cR1+=difR2;
+ cG1+=difG2;
+ cB1+=difB2;
+ }
+ if(j==xmax)
+ {
+ XAdjust=(posX>>16)%TWin.Position.x1;
+ tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+ YAdjust+(XAdjust>>1)];
+ tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+ GetTextureTransColGX_S(&psxVuw[(i<<10)+j], 
+ psxVuw[clutP+tC1],
+ (cB1>>16),(cG1>>16),(cR1>>16));
+ }
+ }
+ if(NextRow_GT()) 
+ {
+ return;
+ }
+ }
+ return;
+ }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!
+ if(drawW<xmax) xmax=drawW;
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+ cR1=left_R;
+ cG1=left_G;
+ cB1=left_B;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+
+ for(j=xmin;j<=xmax;j++) 
+ {
+ XAdjust=(posX>>16)%TWin.Position.x1;
+ tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+ YAdjust+(XAdjust>>1)];
+ tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+ if(iDither)
+ GetTextureTransColGX_Dither(&psxVuw[(i<<10)+j], 
+ psxVuw[clutP+tC1],
+ (cB1>>16),(cG1>>16),(cR1>>16));
+ else
+ GetTextureTransColGX(&psxVuw[(i<<10)+j], 
+ psxVuw[clutP+tC1],
+ (cB1>>16),(cG1>>16),(cR1>>16));
+ posX+=difX;
+ posY+=difY;
+ cR1+=difR;
+ cG1+=difG;
+ cB1+=difB;
+ }
+ }
+ if(NextRow_GT()) 
+ {
+ return;
+ }
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+// note: the psx is doing g-shaded quads as two g-shaded tris,
+// like the following func... sadly texturing is not 100%
+// correct that way, so small texture distortions can 
+// happen... 
+
+void drawPoly4TGEx4_TRI_IL(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, 
+ short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, 
+ short clX, short clY,
+ int col1, int col2, int col3, int col4)
+{
+ drawPoly3TGEx4_IL(x2,y2,x3,y3,x4,y4,
+ tx2,ty2,tx3,ty3,tx4,ty4,
+ clX,clY,
+ col2,col4,col3);
+ drawPoly3TGEx4_IL(x1,y1,x2,y2,x4,y4,
+ tx1,ty1,tx2,ty2,tx4,ty4,
+ clX,clY,
+ col1,col2,col3);
+}
+
+#ifdef POLYQUAD3GT
+
+void drawPoly4TGEx4_TRI(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, 
+ short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, 
+ short clX, short clY,
+ int col1, int col2, int col3, int col4)
+{
+ drawPoly3TGEx4(x2,y2,x3,y3,x4,y4,
+ tx2,ty2,tx3,ty3,tx4,ty4,
+ clX,clY,
+ col2,col4,col3);
+ drawPoly3TGEx4(x1,y1,x2,y2,x4,y4,
+ tx1,ty1,tx2,ty2,tx4,ty4,
+ clX,clY,
+ col1,col2,col3);
+}
+
+#endif
+ 
+////////////////////////////////////////////////////////////////////////
+
+void drawPoly4TGEx4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, 
+ short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, 
+ short clX, short clY,
+ int col1, int col2, int col4, int col3)
+{
+ int num; 
+ int i,j,xmin,xmax,ymin,ymax;
+ int cR1,cG1,cB1;
+ int difR,difB,difG,difR2,difB2,difG2;
+ int difX, difY, difX2, difY2;
+ int posX,posY,YAdjust,clutP,XAdjust;
+ short tC1,tC2;
+
+ if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_GT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4,col1,col2,col3,col4)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+ if(NextRow_GT4()) return;
+
+ clutP=(clY<<10)+clX;
+
+ YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);
+
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans && !iDither)
+ {
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16);
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+
+ num=(xmax-xmin);
+ if(num==0) num=1;
+ difX=(right_u-posX)/num;
+ difY=(right_v-posY)/num;
+ difX2=difX<<1;
+ difY2=difY<<1;
+
+ cR1=left_R;
+ cG1=left_G;
+ cB1=left_B;
+ difR=(right_R-cR1)/num;
+ difG=(right_G-cG1)/num;
+ difB=(right_B-cB1)/num;
+ difR2=difR<<1;
+ difG2=difG<<1;
+ difB2=difB<<1;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+ xmax--;if(drawW<xmax) xmax=drawW;
+
+ for(j=xmin;j<xmax;j+=2)
+ {
+ XAdjust=(posX>>16);
+ tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(XAdjust>>1)];
+ tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+ XAdjust=((posX+difX)>>16);
+ tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+
+ (XAdjust>>1)];
+ tC2=(tC2>>((XAdjust&1)<<2))&0xf;
+
+ GetTextureTransColGX32_S((uint32_t *)&psxVuw[(i<<10)+j],
+ psxVuw[clutP+tC1]|
+ ((int)psxVuw[clutP+tC2])<<16,
+ (cB1>>16)|((cB1+difB)&0xff0000),
+ (cG1>>16)|((cG1+difG)&0xff0000),
+ (cR1>>16)|((cR1+difR)&0xff0000));
+ posX+=difX2;
+ posY+=difY2;
+ cR1+=difR2;
+ cG1+=difG2;
+ cB1+=difB2;
+ }
+ if(j==xmax)
+ {
+ XAdjust=(posX>>16);
+ tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+
+ (XAdjust>>1)];
+ tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+
+ GetTextureTransColGX_S(&psxVuw[(i<<10)+j], 
+ psxVuw[clutP+tC1],
+ (cB1>>16),(cG1>>16),(cR1>>16));
+ }
+ }
+ if(NextRow_GT4()) return;
+ }
+ return;
+ }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16);
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+
+ num=(xmax-xmin);
+ if(num==0) num=1;
+ difX=(right_u-posX)/num;
+ difY=(right_v-posY)/num;
+ difX2=difX<<1;
+ difY2=difY<<1;
+
+ cR1=left_R;
+ cG1=left_G;
+ cB1=left_B;
+ difR=(right_R-cR1)/num;
+ difG=(right_G-cG1)/num;
+ difB=(right_B-cB1)/num;
+ difR2=difR<<1;
+ difG2=difG<<1;
+ difB2=difB<<1;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+ xmax--;if(drawW<xmax) xmax=drawW;
+
+ for(j=xmin;j<=xmax;j++)
+ {
+ XAdjust=(posX>>16);
+ tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+
+ (XAdjust>>1)];
+ tC1=(tC1>>((XAdjust&1)<<2))&0xf;
+ if(iDither)
+ GetTextureTransColGX_Dither(&psxVuw[(i<<10)+j], 
+ psxVuw[clutP+tC1],
+ (cB1>>16),(cG1>>16),(cR1>>16));
+ else
+ GetTextureTransColGX(&psxVuw[(i<<10)+j], 
+ psxVuw[clutP+tC1],
+ (cB1>>16),(cG1>>16),(cR1>>16));
+ posX+=difX;
+ posY+=difY;
+ cR1+=difR;
+ cG1+=difG;
+ cB1+=difB;
+ }
+ }
+ if(NextRow_GT4()) return;
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void drawPoly4TGEx4_TW(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, 
+ short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, 
+ short clX, short clY,
+ int col1, int col2, int col3, int col4)
+{
+ drawPoly3TGEx4_TW(x2,y2,x3,y3,x4,y4,
+ tx2,ty2,tx3,ty3,tx4,ty4,
+ clX,clY,
+ col2,col4,col3);
+
+ drawPoly3TGEx4_TW(x1,y1,x2,y2,x4,y4,
+ tx1,ty1,tx2,ty2,tx4,ty4,
+ clX,clY,
+ col1,col2,col3);
+}
+
+////////////////////////////////////////////////////////////////////////
+// POLY 3/4 G-SHADED TEX PAL8
+////////////////////////////////////////////////////////////////////////
+
+void drawPoly3TGEx8(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short clX, short clY, int col1, int col2, int col3)
+{
+ int i,j,xmin,xmax,ymin,ymax;
+ int cR1,cG1,cB1;
+ int difR,difB,difG,difR2,difB2,difG2;
+ int difX, difY,difX2, difY2;
+ int posX,posY,YAdjust,clutP;
+ short tC1,tC2;
+
+ if(x1>drawW && x2>drawW && x3>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_GT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3,col1,col2,col3)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+ if(NextRow_GT()) return;
+
+ clutP=(clY<<10)+clX;
+
+ YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);
+
+ difR=delta_right_R;
+ difG=delta_right_G;
+ difB=delta_right_B;
+ difR2=difR<<1;
+ difG2=difG<<1;
+ difB2=difB<<1;
+ difX=delta_right_u;difX2=difX<<1;
+ difY=delta_right_v;difY2=difY<<1;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans && !iDither)
+ {
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16)-1; // !!!!!!!!!!!!!
+ if(drawW<xmax) xmax=drawW;
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+ cR1=left_R;
+ cG1=left_G;
+ cB1=left_B;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+
+ for(j=xmin;j<xmax;j+=2)
+ {
+ tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+((posX>>16))];
+ tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+
+ (((posX+difX)>>16))];
+ GetTextureTransColGX32_S((uint32_t *)&psxVuw[(i<<10)+j],
+ psxVuw[clutP+tC1]|
+ ((int)psxVuw[clutP+tC2])<<16,
+ (cB1>>16)|((cB1+difB)&0xff0000),
+ (cG1>>16)|((cG1+difG)&0xff0000),
+ (cR1>>16)|((cR1+difR)&0xff0000));
+ posX+=difX2;
+ posY+=difY2;
+ cR1+=difR2;
+ cG1+=difG2;
+ cB1+=difB2;
+ }
+ if(j==xmax)
+ {
+ tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+((posX>>16))];
+ GetTextureTransColGX_S(&psxVuw[(i<<10)+j], 
+ psxVuw[clutP+tC1],
+ (cB1>>16),(cG1>>16),(cR1>>16));
+ }
+ }
+ if(NextRow_GT()) 
+ {
+ return;
+ }
+ }
+ return;
+ }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!!!!!!!
+ if(drawW<xmax) xmax=drawW;
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+ cR1=left_R;
+ cG1=left_G;
+ cB1=left_B;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+
+ for(j=xmin;j<=xmax;j++)
+ {
+ tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+((posX>>16))];
+ if(iDither)
+ GetTextureTransColGX_Dither(&psxVuw[(i<<10)+j], 
+ psxVuw[clutP+tC1],
+ (cB1>>16),(cG1>>16),(cR1>>16));
+ else
+ GetTextureTransColGX(&psxVuw[(i<<10)+j], 
+ psxVuw[clutP+tC1],
+ (cB1>>16),(cG1>>16),(cR1>>16));
+ posX+=difX;
+ posY+=difY;
+ cR1+=difR;
+ cG1+=difG;
+ cB1+=difB;
+ }
+ }
+ if(NextRow_GT()) 
+ {
+ return;
+ }
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void drawPoly3TGEx8_IL(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short clX, short clY, int col1, int col2, int col3)
+{
+ int i,j,xmin,xmax,ymin,ymax,n_xi,n_yi,TXV,TXU;
+ int cR1,cG1,cB1;
+ int difR,difB,difG,difR2,difB2,difG2;
+ int difX, difY,difX2, difY2;
+ int posX,posY,YAdjust,clutP;
+ short tC1,tC2;
+
+ if(x1>drawW && x2>drawW && x3>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_GT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3,col1,col2,col3)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+ if(NextRow_GT()) return;
+
+ clutP=(clY<<10)+clX;
+
+ YAdjust=(GlobalTextAddrY<<10)+GlobalTextAddrX;
+
+ difR=delta_right_R;
+ difG=delta_right_G;
+ difB=delta_right_B;
+ difR2=difR<<1;
+ difG2=difG<<1;
+ difB2=difB<<1;
+ difX=delta_right_u;difX2=difX<<1;
+ difY=delta_right_v;difY2=difY<<1;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans && !iDither)
+ {
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16)-1; // !!!!!!!!!!!!!
+ if(drawW<xmax) xmax=drawW;
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+ cR1=left_R;
+ cG1=left_G;
+ cB1=left_B;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+
+ for(j=xmin;j<xmax;j+=2)
+ {
+ TXU=posX>>16;
+ TXV=posY>>16;
+ n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
+ n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
+
+ tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
+
+ TXU=(posX+difX)>>16;
+ TXV=(posY+difY)>>16;
+ n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
+ n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
+
+ tC2= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
+
+ GetTextureTransColGX32_S((uint32_t *)&psxVuw[(i<<10)+j],
+ psxVuw[clutP+tC1]|
+ ((int)psxVuw[clutP+tC2])<<16,
+ (cB1>>16)|((cB1+difB)&0xff0000),
+ (cG1>>16)|((cG1+difG)&0xff0000),
+ (cR1>>16)|((cR1+difR)&0xff0000));
+ posX+=difX2;
+ posY+=difY2;
+ cR1+=difR2;
+ cG1+=difG2;
+ cB1+=difB2;
+ }
+ if(j==xmax)
+ {
+ TXU=posX>>16;
+ TXV=posY>>16;
+ n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
+ n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
+
+ tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
+
+ GetTextureTransColGX_S(&psxVuw[(i<<10)+j], 
+ psxVuw[clutP+tC1],
+ (cB1>>16),(cG1>>16),(cR1>>16));
+ }
+ }
+ if(NextRow_GT()) 
+ {
+ return;
+ }
+ }
+ return;
+ }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!!!!!!!
+ if(drawW<xmax) xmax=drawW;
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+ cR1=left_R;
+ cG1=left_G;
+ cB1=left_B;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+
+ for(j=xmin;j<=xmax;j++)
+ {
+ TXU=posX>>16;
+ TXV=posY>>16;
+ n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
+ n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
+
+ tC1= (psxVuw[(n_yi<<10)+YAdjust+n_xi] >> ((TXU & 0x01)<<3)) & 0xff;
+
+ if(iDither)
+ GetTextureTransColGX_Dither(&psxVuw[(i<<10)+j], 
+ psxVuw[clutP+tC1],
+ (cB1>>16),(cG1>>16),(cR1>>16));
+ else
+ GetTextureTransColGX(&psxVuw[(i<<10)+j], 
+ psxVuw[clutP+tC1],
+ (cB1>>16),(cG1>>16),(cR1>>16));
+ posX+=difX;
+ posY+=difY;
+ cR1+=difR;
+ cG1+=difG;
+ cB1+=difB;
+ }
+ }
+ if(NextRow_GT()) 
+ {
+ return;
+ }
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void drawPoly3TGEx8_TW(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short clX, short clY, int col1, int col2, int col3)
+{
+ int i,j,xmin,xmax,ymin,ymax;
+ int cR1,cG1,cB1;
+ int difR,difB,difG,difR2,difB2,difG2;
+ int difX, difY,difX2, difY2;
+ int posX,posY,YAdjust,clutP;
+ short tC1,tC2;
+
+ if(x1>drawW && x2>drawW && x3>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_GT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3,col1,col2,col3)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+ if(NextRow_GT()) return;
+
+ clutP=(clY<<10)+clX;
+
+ YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);
+ YAdjust+=(TWin.Position.y0<<11)+(TWin.Position.x0);
+
+ difR=delta_right_R;
+ difG=delta_right_G;
+ difB=delta_right_B;
+ difR2=difR<<1;
+ difG2=difG<<1;
+ difB2=difB<<1;
+ difX=delta_right_u;difX2=difX<<1;
+ difY=delta_right_v;difY2=difY<<1;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans && !iDither)
+ {
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16)-1; // !!!!!!!!!!!!!
+ if(drawW<xmax) xmax=drawW;
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+ cR1=left_R;
+ cG1=left_G;
+ cB1=left_B;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+
+ for(j=xmin;j<xmax;j+=2)
+ {
+ tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+ YAdjust+((posX>>16)%TWin.Position.x1)];
+ tC2 = psxVub[((((posY+difY)>>16)%TWin.Position.y1)<<11)+
+ YAdjust+(((posX+difX)>>16)%TWin.Position.x1)];
+ 
+ GetTextureTransColGX32_S((uint32_t *)&psxVuw[(i<<10)+j],
+ psxVuw[clutP+tC1]|
+ ((int)psxVuw[clutP+tC2])<<16,
+ (cB1>>16)|((cB1+difB)&0xff0000),
+ (cG1>>16)|((cG1+difG)&0xff0000),
+ (cR1>>16)|((cR1+difR)&0xff0000));
+ posX+=difX2;
+ posY+=difY2;
+ cR1+=difR2;
+ cG1+=difG2;
+ cB1+=difB2;
+ }
+ if(j==xmax)
+ {
+ tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+ YAdjust+((posX>>16)%TWin.Position.x1)];
+ GetTextureTransColGX_S(&psxVuw[(i<<10)+j], 
+ psxVuw[clutP+tC1],
+ (cB1>>16),(cG1>>16),(cR1>>16));
+ }
+ }
+ if(NextRow_GT()) 
+ {
+ return;
+ }
+ }
+ return;
+ }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!!!!!!!
+ if(drawW<xmax) xmax=drawW;
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+ cR1=left_R;
+ cG1=left_G;
+ cB1=left_B;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+
+ for(j=xmin;j<=xmax;j++)
+ {
+ tC1 = psxVub[(((posY>>16)%TWin.Position.y1)<<11)+
+ YAdjust+((posX>>16)%TWin.Position.x1)];
+ if(iDither)
+ GetTextureTransColGX_Dither(&psxVuw[(i<<10)+j], 
+ psxVuw[clutP+tC1],
+ (cB1>>16),(cG1>>16),(cR1>>16));
+ else
+ GetTextureTransColGX(&psxVuw[(i<<10)+j], 
+ psxVuw[clutP+tC1],
+ (cB1>>16),(cG1>>16),(cR1>>16));
+ posX+=difX;
+ posY+=difY;
+ cR1+=difR;
+ cG1+=difG;
+ cB1+=difB;
+ }
+ }
+ if(NextRow_GT()) 
+ {
+ return;
+ }
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+// note: two g-shaded tris: small texture distortions can happen
+
+void drawPoly4TGEx8_TRI_IL(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, 
+ short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, 
+ short clX, short clY,
+ int col1, int col2, int col3, int col4)
+{
+ drawPoly3TGEx8_IL(x2,y2,x3,y3,x4,y4,
+ tx2,ty2,tx3,ty3,tx4,ty4,
+ clX,clY,
+ col2,col4,col3);
+ drawPoly3TGEx8_IL(x1,y1,x2,y2,x4,y4,
+ tx1,ty1,tx2,ty2,tx4,ty4,
+ clX,clY,
+ col1,col2,col3);
+}
+
+#ifdef POLYQUAD3GT
+ 
+void drawPoly4TGEx8_TRI(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, 
+ short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, 
+ short clX, short clY,
+ int col1, int col2, int col3, int col4)
+{
+ drawPoly3TGEx8(x2,y2,x3,y3,x4,y4,
+ tx2,ty2,tx3,ty3,tx4,ty4,
+ clX,clY,
+ col2,col4,col3);
+ drawPoly3TGEx8(x1,y1,x2,y2,x4,y4,
+ tx1,ty1,tx2,ty2,tx4,ty4,
+ clX,clY,
+ col1,col2,col3);
+}
+
+#endif
+
+void drawPoly4TGEx8(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, 
+ short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, 
+ short clX, short clY,
+ int col1, int col2, int col4, int col3)
+{
+ int num; 
+ int i,j,xmin,xmax,ymin,ymax;
+ int cR1,cG1,cB1;
+ int difR,difB,difG,difR2,difB2,difG2;
+ int difX, difY, difX2, difY2;
+ int posX,posY,YAdjust,clutP;
+ short tC1,tC2;
+
+ if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_GT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4,col1,col2,col3,col4)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+ if(NextRow_GT4()) return;
+
+ clutP=(clY<<10)+clX;
+
+ YAdjust=((GlobalTextAddrY)<<11)+(GlobalTextAddrX<<1);
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans && !iDither)
+ {
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16);
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+
+ num=(xmax-xmin);
+ if(num==0) num=1;
+ difX=(right_u-posX)/num;
+ difY=(right_v-posY)/num;
+ difX2=difX<<1;
+ difY2=difY<<1;
+
+ cR1=left_R;
+ cG1=left_G;
+ cB1=left_B;
+ difR=(right_R-cR1)/num;
+ difG=(right_G-cG1)/num;
+ difB=(right_B-cB1)/num;
+ difR2=difR<<1;
+ difG2=difG<<1;
+ difB2=difB<<1;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+ xmax--;if(drawW<xmax) xmax=drawW;
+
+ for(j=xmin;j<xmax;j+=2)
+ {
+ tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(posX>>16)];
+ tC2 = psxVub[(((posY+difY)>>5)&(int)0xFFFFF800)+YAdjust+
+ ((posX+difX)>>16)];
+
+ GetTextureTransColGX32_S((uint32_t *)&psxVuw[(i<<10)+j],
+ psxVuw[clutP+tC1]|
+ ((int)psxVuw[clutP+tC2])<<16,
+ (cB1>>16)|((cB1+difB)&0xff0000),
+ (cG1>>16)|((cG1+difG)&0xff0000),
+ (cR1>>16)|((cR1+difR)&0xff0000));
+ posX+=difX2;
+ posY+=difY2;
+ cR1+=difR2;
+ cG1+=difG2;
+ cB1+=difB2;
+ }
+ if(j==xmax)
+ {
+ tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(posX>>16)];
+ GetTextureTransColGX_S(&psxVuw[(i<<10)+j], 
+ psxVuw[clutP+tC1],
+ (cB1>>16),(cG1>>16),(cR1>>16));
+ }
+ }
+ if(NextRow_GT4()) return;
+ }
+ return;
+ }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16);
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+
+ num=(xmax-xmin);
+ if(num==0) num=1;
+ difX=(right_u-posX)/num;
+ difY=(right_v-posY)/num;
+ difX2=difX<<1;
+ difY2=difY<<1;
+
+ cR1=left_R;
+ cG1=left_G;
+ cB1=left_B;
+ difR=(right_R-cR1)/num;
+ difG=(right_G-cG1)/num;
+ difB=(right_B-cB1)/num;
+ difR2=difR<<1;
+ difG2=difG<<1;
+ difB2=difB<<1;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+ xmax--;if(drawW<xmax) xmax=drawW;
+
+ for(j=xmin;j<=xmax;j++)
+ {
+ tC1 = psxVub[((posY>>5)&(int)0xFFFFF800)+YAdjust+(posX>>16)];
+ if(iDither)
+ GetTextureTransColGX_Dither(&psxVuw[(i<<10)+j], 
+ psxVuw[clutP+tC1],
+ (cB1>>16),(cG1>>16),(cR1>>16));
+ else
+ GetTextureTransColGX(&psxVuw[(i<<10)+j], 
+ psxVuw[clutP+tC1],
+ (cB1>>16),(cG1>>16),(cR1>>16));
+ posX+=difX;
+ posY+=difY;
+ cR1+=difR;
+ cG1+=difG;
+ cB1+=difB;
+ }
+ }
+ if(NextRow_GT4()) return;
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void drawPoly4TGEx8_TW(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, 
+ short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, 
+ short clX, short clY,
+ int col1, int col2, int col3, int col4)
+{
+ drawPoly3TGEx8_TW(x2,y2,x3,y3,x4,y4,
+ tx2,ty2,tx3,ty3,tx4,ty4,
+ clX,clY,
+ col2,col4,col3);
+ drawPoly3TGEx8_TW(x1,y1,x2,y2,x4,y4,
+ tx1,ty1,tx2,ty2,tx4,ty4,
+ clX,clY,
+ col1,col2,col3);
+}
+
+////////////////////////////////////////////////////////////////////////
+// POLY 3 G-SHADED TEX 15 BIT
+////////////////////////////////////////////////////////////////////////
+
+void drawPoly3TGD(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, int col1, int col2, int col3)
+{
+ int i,j,xmin,xmax,ymin,ymax;
+ int cR1,cG1,cB1;
+ int difR,difB,difG,difR2,difB2,difG2;
+ int difX, difY,difX2, difY2;
+ int posX,posY;
+
+ if(x1>drawW && x2>drawW && x3>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_GT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3,col1,col2,col3)) return;
+
+ ymax=Ymax;
+
+ for(ymin=Ymin;ymin<drawY;ymin++)
+ if(NextRow_GT()) return;
+
+ difR=delta_right_R;
+ difG=delta_right_G;
+ difB=delta_right_B;
+ difR2=difR<<1;
+ difG2=difG<<1;
+ difB2=difB<<1;
+ difX=delta_right_u;difX2=difX<<1;
+ difY=delta_right_v;difY2=difY<<1;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans && !iDither)
+ { 
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!!!!
+ if(drawW<xmax) xmax=drawW;
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+ cR1=left_R;
+ cG1=left_G;
+ cB1=left_B;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+
+ for(j=xmin;j<xmax;j+=2)
+ {
+ GetTextureTransColGX32_S((uint32_t *)&psxVuw[(i<<10)+j],
+ (((int)psxVuw[((((posY+difY)>>16)+GlobalTextAddrY)<<10)+((posX+difX)>>16)+GlobalTextAddrX])<<16)|
+ psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+((posX)>>16)+GlobalTextAddrX],
+ (cB1>>16)|((cB1+difB)&0xff0000),
+ (cG1>>16)|((cG1+difG)&0xff0000),
+ (cR1>>16)|((cR1+difR)&0xff0000));
+ posX+=difX2;
+ posY+=difY2;
+ cR1+=difR2;
+ cG1+=difG2;
+ cB1+=difB2;
+ }
+ if(j==xmax)
+ GetTextureTransColGX_S(&psxVuw[(i<<10)+j],
+ psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+(posX>>16)+GlobalTextAddrX],
+ (cB1>>16),(cG1>>16),(cR1>>16));
+ }
+ if(NextRow_GT()) 
+ {
+ return;
+ }
+ }
+ return;
+ }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!!
+ if(drawW<xmax) xmax=drawW;
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+ cR1=left_R;
+ cG1=left_G;
+ cB1=left_B;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+
+ for(j=xmin;j<=xmax;j++)
+ {
+ if(iDither)
+ GetTextureTransColGX_Dither(&psxVuw[(i<<10)+j],
+ psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+(posX>>16)+GlobalTextAddrX],
+ (cB1>>16),(cG1>>16),(cR1>>16));
+ else
+ GetTextureTransColGX(&psxVuw[(i<<10)+j],
+ psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+(posX>>16)+GlobalTextAddrX],
+ (cB1>>16),(cG1>>16),(cR1>>16));
+ posX+=difX;
+ posY+=difY;
+ cR1+=difR;
+ cG1+=difG;
+ cB1+=difB;
+ }
+ }
+ if(NextRow_GT()) 
+ {
+ return;
+ }
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void drawPoly3TGD_TW(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, int col1, int col2, int col3)
+{
+ int i,j,xmin,xmax,ymin,ymax;
+ int cR1,cG1,cB1;
+ int difR,difB,difG,difR2,difB2,difG2;
+ int difX, difY,difX2, difY2;
+ int posX,posY;
+
+ if (x1>drawW && x2>drawW && x3>drawW) return;
+ if (y1>drawH && y2>drawH && y3>drawH) return;
+ if (x1<drawX && x2<drawX && x3<drawX) return;
+ if (y1<drawY && y2<drawY && y3<drawY) return;
+ if (drawY >= drawH) return;
+ if (drawX >= drawW) return; 
+
+ if (!SetupSections_GT(x1,y1,x2,y2,x3,y3,tx1,ty1,tx2,ty2,tx3,ty3,col1,col2,col3)) return;
+
+ ymax = Ymax;
+
+ for(ymin = Ymin; ymin < drawY; ymin++)
+ if(NextRow_GT()) return;
+
+ difR = delta_right_R;
+ difG = delta_right_G;
+ difB = delta_right_B;
+ difR2 = difR<<1;
+ difG2 = difG<<1;
+ difB2 = difB<<1;
+ difX = delta_right_u; difX2 = difX<<1;
+ difY = delta_right_v; difY2 = difY<<1;
+
+#ifdef FASTSOLID
+
+ if (!bCheckMask && !DrawSemiTrans && !iDither)
+ { 
+ for (i = ymin; i <= ymax; i++)
+ {
+ xmin = (left_x >> 16);
+ xmax = (right_x >> 16) - 1; //!!!!!!!!!!!!!!!!!!!!
+ if(drawW<xmax) xmax=drawW;
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+ cR1=left_R;
+ cG1=left_G;
+ cB1=left_B;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+
+ for(j=xmin;j<xmax;j+=2)
+ {
+ GetTextureTransColGX32_S((uint32_t *)&psxVuw[(i<<10)+j],
+ (((int)psxVuw[(((((posY+difY)>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
+ (((posX+difX)>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0])<<16)|
+ psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
+ (((posX)>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0],
+ (cB1>>16)|((cB1+difB)&0xff0000),
+ (cG1>>16)|((cG1+difG)&0xff0000),
+ (cR1>>16)|((cR1+difR)&0xff0000));
+ posX+=difX2;
+ posY+=difY2;
+ cR1+=difR2;
+ cG1+=difG2;
+ cB1+=difB2;
+ }
+ if(j==xmax)
+ GetTextureTransColGX_S(&psxVuw[(i<<10)+j],
+ psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
+ ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0],
+ (cB1>>16),(cG1>>16),(cR1>>16));
+ }
+ if(NextRow_GT()) 
+ {
+ return;
+ }
+ }
+ return;
+ }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16)-1; //!!!!!!!!!!!!!!!!!!
+ if(drawW<xmax) xmax=drawW;
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+ cR1=left_R;
+ cG1=left_G;
+ cB1=left_B;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+
+ for(j=xmin;j<=xmax;j++)
+ {
+ if(iDither)
+ GetTextureTransColGX_Dither(&psxVuw[(i<<10)+j],
+ psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
+ ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0],
+ (cB1>>16),(cG1>>16),(cR1>>16));
+ else
+ GetTextureTransColGX(&psxVuw[(i<<10)+j],
+ psxVuw[((((posY>>16)%TWin.Position.y1)+GlobalTextAddrY+TWin.Position.y0)<<10)+
+ ((posX>>16)%TWin.Position.x1)+GlobalTextAddrX+TWin.Position.x0],
+ (cB1>>16),(cG1>>16),(cR1>>16));
+ posX+=difX;
+ posY+=difY;
+ cR1+=difR;
+ cG1+=difG;
+ cB1+=difB;
+ }
+ }
+ if(NextRow_GT()) 
+ {
+ return;
+ }
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+// note: two g-shaded tris: small texture distortions can happen
+
+#ifdef POLYQUAD3GT
+
+void drawPoly4TGD_TRI(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, int col1, int col2, int col3, int col4)
+{
+ drawPoly3TGD(x2,y2,x3,y3,x4,y4,
+ tx2,ty2,tx3,ty3,tx4,ty4,
+ col2,col4,col3);
+ drawPoly3TGD(x1,y1,x2,y2,x4,y4,
+ tx1,ty1,tx2,ty2,tx4,ty4,
+ col1,col2,col3);
+}
+
+#endif
+
+void drawPoly4TGD(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, int col1, int col2, int col4, int col3)
+{
+ int num; 
+ int i,j,xmin,xmax,ymin,ymax;
+ int cR1,cG1,cB1;
+ int difR,difB,difG,difR2,difB2,difG2;
+ int difX, difY, difX2, difY2;
+ int posX,posY;
+
+ if(x1>drawW && x2>drawW && x3>drawW && x4>drawW) return;
+ if(y1>drawH && y2>drawH && y3>drawH && y4>drawH) return;
+ if(x1<drawX && x2<drawX && x3<drawX && x4<drawX) return;
+ if(y1<drawY && y2<drawY && y3<drawY && y4<drawY) return;
+ if(drawY>=drawH) return;
+ if(drawX>=drawW) return; 
+
+ if(!SetupSections_GT4(x1,y1,x2,y2,x3,y3,x4,y4,tx1,ty1,tx2,ty2,tx3,ty3,tx4,ty4,col1,col2,col3,col4)) return;
+
+ ymax = Ymax;
+
+ for (ymin = Ymin; ymin < drawY; ymin++)
+ if (NextRow_GT4()) return;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans && !iDither)
+ {
+ for (i = ymin; i <= ymax; i++)
+ {
+ xmin = (left_x >> 16);
+ xmax = (right_x >> 16);
+
+ if(xmax >= xmin)
+ {
+ posX = left_u;
+ posY = left_v;
+
+ num = (xmax-xmin);
+ if(num==0) num=1;
+ difX=(right_u-posX)/num;
+ difY=(right_v-posY)/num;
+ difX2=difX<<1;
+ difY2=difY<<1;
+
+ cR1=left_R;
+ cG1=left_G;
+ cB1=left_B;
+ difR=(right_R-cR1)/num;
+ difG=(right_G-cG1)/num;
+ difB=(right_B-cB1)/num;
+ difR2=difR<<1;
+ difG2=difG<<1;
+ difB2=difB<<1;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+ xmax--;if(drawW<xmax) xmax=drawW;
+
+ for(j=xmin;j<xmax;j+=2)
+ {
+ GetTextureTransColGX32_S((uint32_t *)&psxVuw[(i<<10)+j],
+ (((int)psxVuw[((((posY+difY)>>16)+GlobalTextAddrY)<<10)+((posX+difX)>>16)+GlobalTextAddrX])<<16)|
+ psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+((posX)>>16)+GlobalTextAddrX],
+ (cB1>>16)|((cB1+difB)&0xff0000),
+ (cG1>>16)|((cG1+difG)&0xff0000),
+ (cR1>>16)|((cR1+difR)&0xff0000));
+ posX+=difX2;
+ posY+=difY2;
+ cR1+=difR2;
+ cG1+=difG2;
+ cB1+=difB2;
+ }
+ if(j==xmax)
+ GetTextureTransColGX_S(&psxVuw[(i<<10)+j],
+ psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+(posX>>16)+GlobalTextAddrX],
+ (cB1>>16),(cG1>>16),(cR1>>16));
+ }
+ if(NextRow_GT4()) return;
+ }
+ return;
+ }
+
+#endif
+
+ for (i=ymin;i<=ymax;i++)
+ {
+ xmin=(left_x >> 16);
+ xmax=(right_x >> 16);
+
+ if(xmax>=xmin)
+ {
+ posX=left_u;
+ posY=left_v;
+
+ num=(xmax-xmin);
+ if(num==0) num=1;
+ difX=(right_u-posX)/num;
+ difY=(right_v-posY)/num;
+ difX2=difX<<1;
+ difY2=difY<<1;
+
+ cR1=left_R;
+ cG1=left_G;
+ cB1=left_B;
+ difR=(right_R-cR1)/num;
+ difG=(right_G-cG1)/num;
+ difB=(right_B-cB1)/num;
+ difR2=difR<<1;
+ difG2=difG<<1;
+ difB2=difB<<1;
+
+ if(xmin<drawX)
+ {j=drawX-xmin;xmin=drawX;posX+=j*difX;posY+=j*difY;cR1+=j*difR;cG1+=j*difG;cB1+=j*difB;}
+ xmax--;if(drawW<xmax) xmax=drawW;
+
+ for(j=xmin;j<=xmax;j++)
+ {
+ if(iDither)
+ GetTextureTransColGX(&psxVuw[(i<<10)+j],
+ psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+(posX>>16)+GlobalTextAddrX],
+ (cB1>>16),(cG1>>16),(cR1>>16));
+ else
+ GetTextureTransColGX(&psxVuw[(i<<10)+j],
+ psxVuw[(((posY>>16)+GlobalTextAddrY)<<10)+(posX>>16)+GlobalTextAddrX],
+ (cB1>>16),(cG1>>16),(cR1>>16));
+ posX+=difX;
+ posY+=difY;
+ cR1+=difR;
+ cG1+=difG;
+ cB1+=difB;
+ }
+ }
+ if(NextRow_GT4()) return;
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void drawPoly4TGD_TW(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, int col1, int col2, int col3, int col4)
+{
+ drawPoly3TGD_TW(x2,y2,x3,y3,x4,y4,
+ tx2,ty2,tx3,ty3,tx4,ty4,
+ col2,col4,col3);
+ drawPoly3TGD_TW(x1,y1,x2,y2,x4,y4,
+ tx1,ty1,tx2,ty2,tx4,ty4,
+ col1,col2,col3);
+}
+
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+
+
+/*
+// no real rect test, but it does its job the way I need it
+static __inline BOOL IsNoRect(void)
+{
+ if(lx0==lx1 && lx2==lx3) return FALSE;
+ if(lx0==lx2 && lx1==lx3) return FALSE;
+ if(lx0==lx3 && lx1==lx2) return FALSE;
+ return TRUE; 
+}
+*/
+
+// real rect test
+static __inline BOOL IsNoRect(void)
+{
+ //if(!(dwActFixes&0x200)) return FALSE;
+
+ if(ly0==ly1)
+ {
+ if(lx1==lx3 && ly3==ly2 && lx2==lx0) return FALSE;
+ if(lx1==lx2 && ly2==ly3 && lx3==lx0) return FALSE;
+ return TRUE;
+ }
+ 
+ if(ly0==ly2)
+ {
+ if(lx2==lx3 && ly3==ly1 && lx1==lx0) return FALSE;
+ if(lx2==lx1 && ly1==ly3 && lx3==lx0) return FALSE;
+ return TRUE;
+ }
+ 
+ if(ly0==ly3)
+ {
+ if(lx3==lx2 && ly2==ly1 && lx1==lx0) return FALSE;
+ if(lx3==lx1 && ly1==ly2 && lx2==lx0) return FALSE;
+ return TRUE;
+ }
+ return TRUE;
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void drawPoly3FT(unsigned char *baseAddr)
+{
+ uint32_t *gpuData = ((uint32_t *) baseAddr);
+
+ if(GlobalTextIL && GlobalTextTP<2)
+ {
+ if(GlobalTextTP==0)
+ drawPoly3TEx4_IL(lx0,ly0,lx1,ly1,lx2,ly2,
+ (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), 
+ ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
+ else
+ drawPoly3TEx8_IL(lx0,ly0,lx1,ly1,lx2,ly2,
+ (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), 
+ ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
+ return;
+ }
+
+ if(!bUsingTWin)// && !(dwActFixes&0x100))
+ {
+ switch(GlobalTextTP) // depending on texture mode
+ {
+ case 0:
+ drawPoly3TEx4(lx0,ly0,lx1,ly1,lx2,ly2,
+ (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), 
+ ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
+ return;
+ case 1:
+ drawPoly3TEx8(lx0,ly0,lx1,ly1,lx2,ly2,
+ (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), 
+ ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
+ return;
+ case 2:
+ drawPoly3TD(lx0,ly0,lx1,ly1,lx2,ly2,(gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff));
+ return;
+ }
+ return;
+ }
+
+ switch(GlobalTextTP) // depending on texture mode
+ {
+ case 0:
+ drawPoly3TEx4_TW(lx0,ly0,lx1,ly1,lx2,ly2,
+ (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), 
+ ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
+ return;
+ case 1:
+ drawPoly3TEx8_TW(lx0,ly0,lx1,ly1,lx2,ly2,
+ (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), 
+ ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
+ return;
+ case 2:
+ drawPoly3TD_TW(lx0,ly0,lx1,ly1,lx2,ly2,(gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff));
+ return;
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void drawPoly4FT(unsigned char *baseAddr)
+{
+ uint32_t *gpuData = ((uint32_t *) baseAddr);
+
+ if(GlobalTextIL && GlobalTextTP<2)
+ {
+ if(GlobalTextTP==0)
+ drawPoly4TEx4_IL(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
+ (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
+ else
+ drawPoly4TEx8_IL(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
+ (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
+ return;
+ }
+
+ if(!bUsingTWin)
+ {
+#ifdef POLYQUAD3GT
+ if(IsNoRect())
+ {
+ switch (GlobalTextTP)
+ {
+ case 0:
+ drawPoly4TEx4_TRI(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
+ (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
+ return;
+ case 1:
+ drawPoly4TEx8_TRI(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
+ (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
+ return;
+ case 2:
+ drawPoly4TD_TRI(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,(gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff));
+ return;
+ }
+ return;
+ }
+#endif
+ 
+ switch (GlobalTextTP)
+ {
+ case 0: // grandia investigations needed
+ drawPoly4TEx4(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
+ (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
+ return;
+ case 1:
+ drawPoly4TEx8(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
+ (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
+ return;
+ case 2:
+ drawPoly4TD(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,(gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff));
+ return;
+ }
+ return;
+ }
+
+ switch (GlobalTextTP)
+ {
+ case 0:
+ drawPoly4TEx4_TW(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
+ (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
+ return;
+ case 1:
+ drawPoly4TEx8_TW(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
+ (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff), ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
+ return;
+ case 2:
+ drawPoly4TD_TW(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,(gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[4] & 0x000000ff), ((gpuData[4]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),(gpuData[6] & 0x000000ff), ((gpuData[6]>>8) & 0x000000ff));
+ return;
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void drawPoly3GT(unsigned char * baseAddr)
+{
+ uint32_t *gpuData = ((uint32_t *) baseAddr);
+
+ if(GlobalTextIL && GlobalTextTP<2)
+ {
+ if(GlobalTextTP==0)
+ drawPoly3TGEx4_IL(lx0,ly0,lx1,ly1,lx2,ly2,
+ (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff), 
+ ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask),
+ gpuData[0],gpuData[3],gpuData[6]);
+ else
+ drawPoly3TGEx8_IL(lx0,ly0,lx1,ly1,lx2,ly2,
+ (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff), 
+ ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask),
+ gpuData[0],gpuData[3],gpuData[6]);
+ return;
+ }
+
+ if(!bUsingTWin)
+ {
+ switch (GlobalTextTP)
+ {
+ case 0:
+ drawPoly3TGEx4(lx0,ly0,lx1,ly1,lx2,ly2,
+ (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff), 
+ ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask),
+ gpuData[0],gpuData[3],gpuData[6]);
+ return;
+ case 1:
+ drawPoly3TGEx8(lx0,ly0,lx1,ly1,lx2,ly2,
+ (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff), 
+ ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask),
+ gpuData[0],gpuData[3],gpuData[6]);
+ return;
+ case 2:
+ drawPoly3TGD(lx0,ly0,lx1,ly1,lx2,ly2,(gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),gpuData[0],gpuData[3],gpuData[6]);
+ return;
+ }
+ return;
+ }
+
+ switch(GlobalTextTP)
+ {
+ case 0:
+ drawPoly3TGEx4_TW(lx0,ly0,lx1,ly1,lx2,ly2,
+ (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff), 
+ ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask),
+ gpuData[0],gpuData[3],gpuData[6]);
+ return;
+ case 1:
+ drawPoly3TGEx8_TW(lx0,ly0,lx1,ly1,lx2,ly2,
+ (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff), 
+ ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask),
+ gpuData[0],gpuData[3],gpuData[6]);
+ return;
+ case 2:
+ drawPoly3TGD_TW(lx0,ly0,lx1,ly1,lx2,ly2,(gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),gpuData[0],gpuData[3],gpuData[6]);
+ return;
+ }
+} 
+
+////////////////////////////////////////////////////////////////////////
+
+void drawPoly4GT(unsigned char *baseAddr)
+{
+ uint32_t *gpuData = ((uint32_t *) baseAddr);
+
+ if(GlobalTextIL && GlobalTextTP<2)
+ {
+ if(GlobalTextTP==0)
+ drawPoly4TGEx4_TRI_IL(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
+ (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[11] & 0x000000ff), ((gpuData[11]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),
+ ((gpuData[2]>>12) & 0x3f0),((gpuData[2]>>22) & iGPUHeightMask),
+ gpuData[0],gpuData[3],gpuData[6],gpuData[9]);
+ else
+ drawPoly4TGEx8_TRI_IL(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
+ (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[11] & 0x000000ff), ((gpuData[11]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),
+ ((gpuData[2]>>12) & 0x3f0),((gpuData[2]>>22) & iGPUHeightMask),
+ gpuData[0],gpuData[3],gpuData[6],gpuData[9]);
+ return;
+ }
+
+ if(!bUsingTWin)
+ {
+#ifdef POLYQUAD3GT
+ if(IsNoRect())
+ {
+ switch (GlobalTextTP)
+ {
+ case 0:
+ drawPoly4TGEx4_TRI(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
+ (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[11] & 0x000000ff), ((gpuData[11]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),
+ ((gpuData[2]>>12) & 0x3f0),((gpuData[2]>>22) & iGPUHeightMask),
+ gpuData[0],gpuData[3],gpuData[6],gpuData[9]);
+
+ return;
+ case 1:
+ drawPoly4TGEx8_TRI(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
+ (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[11] & 0x000000ff), ((gpuData[11]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),
+ ((gpuData[2]>>12) & 0x3f0),((gpuData[2]>>22) & iGPUHeightMask),
+ gpuData[0],gpuData[3],gpuData[6],gpuData[9]);
+ return;
+ case 2:
+ drawPoly4TGD_TRI(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,(gpuData[2] & 0x000000ff),((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[11] & 0x000000ff), ((gpuData[11]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),gpuData[0],gpuData[3],gpuData[6],gpuData[9]);
+ return;
+ }
+ return;
+ }
+#endif
+
+ switch (GlobalTextTP)
+ {
+ case 0:
+ drawPoly4TGEx4(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
+ (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[11] & 0x000000ff), ((gpuData[11]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),
+ ((gpuData[2]>>12) & 0x3f0),((gpuData[2]>>22) & iGPUHeightMask),
+ gpuData[0],gpuData[3],gpuData[6],gpuData[9]);
+
+ return;
+ case 1:
+ drawPoly4TGEx8(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
+ (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[11] & 0x000000ff), ((gpuData[11]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),
+ ((gpuData[2]>>12) & 0x3f0),((gpuData[2]>>22) & iGPUHeightMask),
+ gpuData[0],gpuData[3],gpuData[6],gpuData[9]);
+ return;
+ case 2:
+ drawPoly4TGD(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,(gpuData[2] & 0x000000ff),((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[11] & 0x000000ff), ((gpuData[11]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),gpuData[0],gpuData[3],gpuData[6],gpuData[9]);
+ return;
+ }
+ return;
+ }
+ 
+ switch (GlobalTextTP)
+ {
+ case 0:
+ drawPoly4TGEx4_TW(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
+ (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[11] & 0x000000ff), ((gpuData[11]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),
+ ((gpuData[2]>>12) & 0x3f0),((gpuData[2]>>22) & iGPUHeightMask),
+ gpuData[0],gpuData[3],gpuData[6],gpuData[9]);
+ return;
+ case 1:
+ drawPoly4TGEx8_TW(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,
+ (gpuData[2] & 0x000000ff), ((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[11] & 0x000000ff), ((gpuData[11]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),
+ ((gpuData[2]>>12) & 0x3f0),((gpuData[2]>>22) & iGPUHeightMask),
+ gpuData[0],gpuData[3],gpuData[6],gpuData[9]);
+ return;
+ case 2:
+ drawPoly4TGD_TW(lx0,ly0,lx1,ly1,lx3,ly3,lx2,ly2,(gpuData[2] & 0x000000ff),((gpuData[2]>>8) & 0x000000ff), (gpuData[5] & 0x000000ff), ((gpuData[5]>>8) & 0x000000ff),(gpuData[11] & 0x000000ff), ((gpuData[11]>>8) & 0x000000ff),(gpuData[8] & 0x000000ff), ((gpuData[8]>>8) & 0x000000ff),gpuData[0],gpuData[3],gpuData[6],gpuData[9]);
+ return;
+ }
+}
+ 
+////////////////////////////////////////////////////////////////////////
+// SPRITE FUNCS
+////////////////////////////////////////////////////////////////////////
+
+void DrawSoftwareSpriteTWin(unsigned char * baseAddr, int w, int h)
+{ 
+ uint32_t *gpuData = (uint32_t *)baseAddr;
+ short sx0,sy0,sx1,sy1,sx2,sy2,sx3,sy3;
+ short tx0,ty0,tx1,ty1,tx2,ty2,tx3,ty3;
+
+ sx0=lx0;
+ sy0=ly0;
+
+ sx0=sx3=sx0+PSXDisplay.DrawOffset.x;
+ sx1=sx2=sx0+w;
+ sy0=sy1=sy0+PSXDisplay.DrawOffset.y;
+ sy2=sy3=sy0+h;
+ 
+ tx0=tx3=gpuData[2]&0xff;
+ tx1=tx2=tx0+w;
+ ty0=ty1=(gpuData[2]>>8)&0xff;
+ ty2=ty3=ty0+h;
+
+ switch (GlobalTextTP)
+ {
+ case 0:
+ drawPoly4TEx4_TW_S(sx0,sy0,sx1,sy1,sx2,sy2,sx3,sy3,
+ tx0,ty0,tx1,ty1,tx2,ty2,tx3,ty3, 
+ ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
+ return;
+ case 1:
+ drawPoly4TEx8_TW_S(sx0,sy0,sx1,sy1,sx2,sy2,sx3,sy3,
+ tx0,ty0,tx1,ty1,tx2,ty2,tx3,ty3, 
+ ((gpuData[2]>>12) & 0x3f0), ((gpuData[2]>>22) & iGPUHeightMask));
+ return;
+ case 2:
+ drawPoly4TD_TW_S(sx0,sy0,sx1,sy1,sx2,sy2,sx3,sy3,
+ tx0,ty0,tx1,ty1,tx2,ty2,tx3,ty3);
+ return;
+ }
+} 
+
+////////////////////////////////////////////////////////////////////////
+
+void DrawSoftwareSpriteMirror(unsigned char * baseAddr, int w, int h)
+{
+ int sprtY,sprtX,sprtW,sprtH,lXDir,lYDir;
+ int clutY0,clutX0,clutP,textX0,textY0,sprtYa,sprCY,sprCX,sprA;
+ short tC;
+ uint32_t *gpuData = (uint32_t *)baseAddr;
+ sprtY = ly0;
+ sprtX = lx0;
+ sprtH = h;
+ sprtW = w;
+ clutY0 = (gpuData[2]>>22) & iGPUHeightMask;
+ clutX0 = (gpuData[2]>>12) & 0x3f0;
+ clutP = (clutY0<<11) + (clutX0<<1);
+ textY0 = ((gpuData[2]>>8) & 0x000000ff) + GlobalTextAddrY;
+ textX0 = (gpuData[2] & 0x000000ff);
+
+ sprtX+=PSXDisplay.DrawOffset.x;
+ sprtY+=PSXDisplay.DrawOffset.y;
+
+// while (sprtX>1023) sprtX-=1024;
+// while (sprtY>MAXYLINESMIN1) sprtY-=MAXYLINES;
+
+ if(sprtX>drawW)
+ {
+// if((sprtX+sprtW)>1023) sprtX-=1024;
+// else return;
+ return;
+ }
+
+ if(sprtY>drawH)
+ {
+// if ((sprtY+sprtH)>MAXYLINESMIN1) sprtY-=MAXYLINES;
+// else return;
+ return;
+ }
+
+ if(sprtY<drawY)
+ {
+ if((sprtY+sprtH)<drawY) return;
+ sprtH-=(drawY-sprtY);
+ textY0+=(drawY-sprtY);
+ sprtY=drawY;
+ }
+
+ if(sprtX<drawX)
+ {
+ if((sprtX+sprtW)<drawX) return;
+ sprtW-=(drawX-sprtX);
+ textX0+=(drawX-sprtX);
+ sprtX=drawX;
+ }
+
+ if((sprtY+sprtH)>drawH) sprtH=drawH-sprtY+1;
+ if((sprtX+sprtW)>drawW) sprtW=drawW-sprtX+1;
+
+ if(usMirror&0x1000) lXDir=-1; else lXDir=1;
+ if(usMirror&0x2000) lYDir=-1; else lYDir=1;
+
+ switch (GlobalTextTP)
+ {
+ case 0: // texture is 4-bit
+ 
+ sprtW=sprtW/2;
+ textX0=(GlobalTextAddrX<<1)+(textX0>>1);
+ sprtYa=(sprtY<<10);
+ clutP=(clutY0<<10)+clutX0;
+ for (sprCY=0;sprCY<sprtH;sprCY++)
+ for (sprCX=0;sprCX<sprtW;sprCX++)
+ {
+ tC= psxVub[((textY0+(sprCY*lYDir))<<11) + textX0 +(sprCX*lXDir)];
+ sprA=sprtYa+(sprCY<<10)+sprtX + (sprCX<<1);
+ GetTextureTransColG_SPR(&psxVuw[sprA],psxVuw[clutP+((tC>>4)&0xf)]);
+ GetTextureTransColG_SPR(&psxVuw[sprA+1],psxVuw[clutP+(tC&0xf)]);
+ }
+ return;
+
+ case 1: 
+
+ clutP>>=1;
+ for(sprCY=0;sprCY<sprtH;sprCY++)
+ for(sprCX=0;sprCX<sprtW;sprCX++)
+ { 
+ tC = psxVub[((textY0+(sprCY*lYDir))<<11)+(GlobalTextAddrX<<1) + textX0 + (sprCX*lXDir)] & 0xff;
+ GetTextureTransColG_SPR(&psxVuw[((sprtY+sprCY)<<10)+sprtX + sprCX],psxVuw[clutP+tC]);
+ }
+ return;
+
+
+ case 2:
+
+ for (sprCY=0;sprCY<sprtH;sprCY++)
+ for (sprCX=0;sprCX<sprtW;sprCX++)
+ { 
+ GetTextureTransColG_SPR(&psxVuw[((sprtY+sprCY)<<10)+sprtX+sprCX],
+ psxVuw[((textY0+(sprCY*lYDir))<<10)+GlobalTextAddrX + textX0 +(sprCX*lXDir)]);
+ }
+ return;
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void DrawSoftwareSprite_IL(unsigned char * baseAddr,short w,short h,int tx,int ty)
+{
+ int sprtY,sprtX,sprtW,sprtH,tdx,tdy;
+ uint32_t *gpuData = (uint32_t *)baseAddr;
+
+ sprtY = ly0;
+ sprtX = lx0;
+ sprtH = h;
+ sprtW = w;
+
+ sprtX+=PSXDisplay.DrawOffset.x;
+ sprtY+=PSXDisplay.DrawOffset.y;
+
+ if(sprtX>drawW) return;
+ if(sprtY>drawH) return;
+
+ tdx=tx+sprtW;
+ tdy=ty+sprtH;
+
+ sprtW+=sprtX;
+ sprtH+=sprtY;
+
+ // Pete is too lazy to make a faster version ;)
+
+ if(GlobalTextTP==0)
+ drawPoly4TEx4_IL(sprtX,sprtY,sprtX,sprtH,sprtW,sprtH,sprtW,sprtY,
+ tx,ty, tx,tdy, tdx,tdy, tdx,ty, 
+ (gpuData[2]>>12) & 0x3f0, ((gpuData[2]>>22) & iGPUHeightMask));
+
+
+ else
+ drawPoly4TEx8_IL(sprtX,sprtY,sprtX,sprtH,sprtW,sprtH,sprtW,sprtY,
+ tx,ty, tx,tdy, tdx,tdy, tdx,ty, 
+ (gpuData[2]>>12) & 0x3f0, ((gpuData[2]>>22) & iGPUHeightMask));
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void DrawSoftwareSprite(unsigned char *baseAddr, short w, short h, int tx, int ty)
+{
+ int sprtY, sprtX, sprtW, sprtH;
+ int clutY0, clutX0, clutP, textX0, textY0, sprtYa, sprCY, sprCX, sprA;
+ short tC, tC2;
+ uint32_t *gpuData = (uint32_t *)baseAddr;
+ unsigned char *pV;
+ BOOL bWT,bWS;
+
+ if(GlobalTextIL && GlobalTextTP<2)
+ {DrawSoftwareSprite_IL(baseAddr,w,h,tx,ty);return;}
+
+ sprtY = ly0;
+ sprtX = lx0;
+ sprtH = h;
+ sprtW = w;
+ clutY0 = (gpuData[2]>>22) & iGPUHeightMask;
+ clutX0 = (gpuData[2]>>12) & 0x3f0;
+
+ clutP = (clutY0<<11) + (clutX0<<1);
+
+ textY0 =ty+ GlobalTextAddrY;
+ textX0 =tx;
+
+ sprtX+=PSXDisplay.DrawOffset.x;
+ sprtY+=PSXDisplay.DrawOffset.y;
+
+ //while (sprtX>1023) sprtX-=1024;
+ //while (sprtY>MAXYLINESMIN1) sprtY-=MAXYLINES;
+
+ if(sprtX>drawW)
+ {
+// if((sprtX+sprtW)>1023) sprtX-=1024;
+// else return;
+ return;
+ }
+
+ if(sprtY>drawH)
+ {
+// if ((sprtY+sprtH)>MAXYLINESMIN1) sprtY-=MAXYLINES;
+// else return;
+ return;
+ }
+
+ if(sprtY<drawY)
+ {
+ if((sprtY+sprtH)<drawY) return;
+ sprtH-=(drawY-sprtY);
+ textY0+=(drawY-sprtY);
+ sprtY=drawY;
+ }
+
+ if(sprtX<drawX)
+ {
+ if((sprtX+sprtW)<drawX) return;
+
+ sprtW-=(drawX-sprtX);
+ textX0+=(drawX-sprtX);
+ sprtX=drawX;
+ }
+
+ if((sprtY+sprtH)>drawH) sprtH=drawH-sprtY+1;
+ if((sprtX+sprtW)>drawW) sprtW=drawW-sprtX+1;
+
+
+ bWT=FALSE;
+ bWS=FALSE;
+
+ switch (GlobalTextTP)
+ {
+ case 0:
+
+ if(textX0&1) {bWS=TRUE;sprtW--;}
+ if(sprtW&1) bWT=TRUE;
+ 
+ sprtW=sprtW>>1;
+ textX0=(GlobalTextAddrX<<1)+(textX0>>1)+(textY0<<11);
+ sprtYa=(sprtY<<10)+sprtX;
+ clutP=(clutY0<<10)+clutX0;
+
+#ifdef FASTSOLID
+ 
+ if(!bCheckMask && !DrawSemiTrans)
+ {
+ for (sprCY=0;sprCY<sprtH;sprCY++)
+ {
+ sprA=sprtYa+(sprCY<<10);
+ pV=&psxVub[(sprCY<<11)+textX0];
+
+ if(bWS)
+ {
+ tC=*pV++;
+ GetTextureTransColG_S(&psxVuw[sprA++],psxVuw[clutP+((tC>>4)&0xf)]);
+ }
+
+ for (sprCX=0;sprCX<sprtW;sprCX++,sprA+=2)
+ { 
+ tC=*pV++;
+
+ GetTextureTransColG32_S((uint32_t *)&psxVuw[sprA],
+ (((int)psxVuw[clutP+((tC>>4)&0xf)])<<16)|
+ psxVuw[clutP+(tC&0x0f)]);
+ }
+
+ if(bWT)
+ {
+ tC=*pV;
+ GetTextureTransColG_S(&psxVuw[sprA],psxVuw[clutP+(tC&0x0f)]);
+ }
+ }
+ return;
+ }
+
+#endif
+
+ for (sprCY=0;sprCY<sprtH;sprCY++)
+ {
+ sprA=sprtYa+(sprCY<<10);
+ pV=&psxVub[(sprCY<<11)+textX0];
+
+ if(bWS)
+ {
+ tC=*pV++;
+ GetTextureTransColG_SPR(&psxVuw[sprA++],psxVuw[clutP+((tC>>4)&0xf)]);
+ }
+
+ for (sprCX=0;sprCX<sprtW;sprCX++,sprA+=2)
+ { 
+ tC=*pV++;
+
+ GetTextureTransColG32_SPR((uint32_t *)&psxVuw[sprA],
+ (((int)psxVuw[clutP+((tC>>4)&0xf)])<<16)|
+ psxVuw[clutP+(tC&0x0f)]);
+ }
+
+ if(bWT)
+ {
+ tC=*pV;
+ GetTextureTransColG_SPR(&psxVuw[sprA],psxVuw[clutP+(tC&0x0f)]);
+ }
+ }
+ return;
+
+ case 1:
+ clutP>>=1;sprtW--;
+ textX0+=(GlobalTextAddrX<<1) + (textY0<<11);
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans)
+ {
+ for(sprCY=0;sprCY<sprtH;sprCY++)
+ {
+ sprA=((sprtY+sprCY)<<10)+sprtX;
+ pV=&psxVub[(sprCY<<11)+textX0];
+ for(sprCX=0;sprCX<sprtW;sprCX+=2,sprA+=2)
+ { 
+ tC = *pV++;tC2 = *pV++;
+ GetTextureTransColG32_S((uint32_t *)&psxVuw[sprA],
+ (((int)psxVuw[clutP+tC2])<<16)|
+ psxVuw[clutP+tC]);
+ }
+ if(sprCX==sprtW)
+ GetTextureTransColG_S(&psxVuw[sprA],psxVuw[clutP+(*pV)]);
+ }
+ return;
+ }
+
+#endif
+
+ for(sprCY=0;sprCY<sprtH;sprCY++)
+ {
+ sprA=((sprtY+sprCY)<<10)+sprtX;
+ pV=&psxVub[(sprCY<<11)+textX0];
+ for(sprCX=0;sprCX<sprtW;sprCX+=2,sprA+=2)
+ { 
+ tC = *pV++;tC2 = *pV++;
+ GetTextureTransColG32_SPR((uint32_t *)&psxVuw[sprA],
+ (((int)psxVuw[clutP+tC2])<<16)|
+ psxVuw[clutP+tC]);
+ }
+ if(sprCX==sprtW)
+ GetTextureTransColG_SPR(&psxVuw[sprA],psxVuw[clutP+(*pV)]);
+ }
+ return;
+
+ case 2:
+
+ textX0+=(GlobalTextAddrX) + (textY0<<10);
+ sprtW--;
+
+#ifdef FASTSOLID
+
+ if(!bCheckMask && !DrawSemiTrans)
+ {
+ for (sprCY=0;sprCY<sprtH;sprCY++)
+ {
+ sprA=((sprtY+sprCY)<<10)+sprtX;
+
+ for (sprCX=0;sprCX<sprtW;sprCX+=2,sprA+=2)
+ { 
+ GetTextureTransColG32_S((uint32_t *)&psxVuw[sprA],
+ (((int)psxVuw[(sprCY<<10) + textX0 + sprCX +1])<<16)|
+ psxVuw[(sprCY<<10) + textX0 + sprCX]);
+ }
+ if(sprCX==sprtW)
+ GetTextureTransColG_S(&psxVuw[sprA],
+ psxVuw[(sprCY<<10) + textX0 + sprCX]);
+
+ }
+ return;
+ }
+
+#endif
+
+ for (sprCY=0;sprCY<sprtH;sprCY++)
+ {
+ sprA=((sprtY+sprCY)<<10)+sprtX;
+
+ for (sprCX=0;sprCX<sprtW;sprCX+=2,sprA+=2)
+ { 
+ GetTextureTransColG32_SPR((uint32_t *)&psxVuw[sprA],
+ (((int)psxVuw[(sprCY<<10) + textX0 + sprCX +1])<<16)|
+ psxVuw[(sprCY<<10) + textX0 + sprCX]);
+ }
+ if(sprCX==sprtW)
+ GetTextureTransColG_SPR(&psxVuw[sprA],
+ psxVuw[(sprCY<<10) + textX0 + sprCX]);
+
+ }
+ return;
+ } 
+}
+ 
+///////////////////////////////////////////////////////////////////////
+
+/////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////
+// LINE FUNCS
+////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+
+void Line_E_SE_Shade(int x0, int y0, int x1, int y1, uint32_t rgb0, uint32_t rgb1)
+{
+ int dx, dy, incrE, incrSE, d;
+		uint32_t r0, g0, b0, r1, g1, b1;
+		int dr, dg, db;
+
+		r0 = (rgb0 & 0x00ff0000);
+		g0 = (rgb0 & 0x0000ff00) << 8;
+		b0 = (rgb0 & 0x000000ff) << 16;
+		r1 = (rgb1 & 0x00ff0000);
+		g1 = (rgb1 & 0x0000ff00) << 8;
+		b1 = (rgb1 & 0x000000ff) << 16;
+
+ dx = x1 - x0;
+ dy = y1 - y0;
+
+		if (dx > 0)
+		{
+			dr = ((int)r1 - (int)r0) / dx;
+			dg = ((int)g1 - (int)g0) / dx;
+			db = ((int)b1 - (int)b0) / dx;
+		}
+		else
+		{
+			dr = ((int)r1 - (int)r0);
+			dg = ((int)g1 - (int)g0);
+			db = ((int)b1 - (int)b0);
+		}
+
+ d = 2*dy - dx; /* Initial value of d */
+ incrE = 2*dy; /* incr. used for move to E */
+ incrSE = 2*(dy - dx); /* incr. used for move to SE */
+
+		if ((x0>=drawX)&&(x0<drawW)&&(y0>=drawY)&&(y0<drawH))
+			GetShadeTransCol(&psxVuw[(y0<<10)+x0],(unsigned short)(((r0 >> 9)&0x7c00)|((g0 >> 14)&0x03e0)|((b0 >> 19)&0x001f)));
+ while(x0 < x1)
+ {
+ if (d <= 0)
+ {
+ d = d + incrE; /* Choose E */
+ }
+ else
+ {
+ d = d + incrSE; /* Choose SE */
+ y0++;
+ }
+ x0++;
+
+				r0+=dr;
+				g0+=dg;
+				b0+=db;
+
+				if ((x0>=drawX)&&(x0<drawW)&&(y0>=drawY)&&(y0<drawH))
+					GetShadeTransCol(&psxVuw[(y0<<10)+x0],(unsigned short)(((r0 >> 9)&0x7c00)|((g0 >> 14)&0x03e0)|((b0 >> 19)&0x001f)));
+ }
+}
+
+///////////////////////////////////////////////////////////////////////
+
+void Line_S_SE_Shade(int x0, int y0, int x1, int y1, uint32_t rgb0, uint32_t rgb1)
+{
+ int dx, dy, incrS, incrSE, d;
+		uint32_t r0, g0, b0, r1, g1, b1;
+		int dr, dg, db;
+
+		r0 = (rgb0 & 0x00ff0000);
+		g0 = (rgb0 & 0x0000ff00) << 8;
+		b0 = (rgb0 & 0x000000ff) << 16;
+		r1 = (rgb1 & 0x00ff0000);
+		g1 = (rgb1 & 0x0000ff00) << 8;
+		b1 = (rgb1 & 0x000000ff) << 16;
+
+ dx = x1 - x0;
+ dy = y1 - y0;
+
+		if (dy > 0)
+		{
+			dr = ((int)r1 - (int)r0) / dy;
+			dg = ((int)g1 - (int)g0) / dy;
+			db = ((int)b1 - (int)b0) / dy;
+		}
+		else
+		{
+			dr = ((int)r1 - (int)r0);
+			dg = ((int)g1 - (int)g0);
+			db = ((int)b1 - (int)b0);
+		}
+
+ d = 2*dx - dy; /* Initial value of d */
+ incrS = 2*dx; /* incr. used for move to S */
+ incrSE = 2*(dx - dy); /* incr. used for move to SE */
+
+		if ((x0>=drawX)&&(x0<drawW)&&(y0>=drawY)&&(y0<drawH))
+			GetShadeTransCol(&psxVuw[(y0<<10)+x0],(unsigned short)(((r0 >> 9)&0x7c00)|((g0 >> 14)&0x03e0)|((b0 >> 19)&0x001f)));
+ while(y0 < y1)
+ {
+ if (d <= 0)
+ {
+ d = d + incrS; /* Choose S */
+ }
+ else
+ {
+ d = d + incrSE; /* Choose SE */
+ x0++;
+ }
+ y0++;
+
+				r0+=dr;
+				g0+=dg;
+				b0+=db;
+
+				if ((x0>=drawX)&&(x0<drawW)&&(y0>=drawY)&&(y0<drawH))
+					GetShadeTransCol(&psxVuw[(y0<<10)+x0],(unsigned short)(((r0 >> 9)&0x7c00)|((g0 >> 14)&0x03e0)|((b0 >> 19)&0x001f)));
+ }
+}
+
+///////////////////////////////////////////////////////////////////////
+
+void Line_N_NE_Shade(int x0, int y0, int x1, int y1, uint32_t rgb0, uint32_t rgb1)
+{
+ int dx, dy, incrN, incrNE, d;
+		uint32_t r0, g0, b0, r1, g1, b1;
+		int dr, dg, db;
+
+		r0 = (rgb0 & 0x00ff0000);
+		g0 = (rgb0 & 0x0000ff00) << 8;
+		b0 = (rgb0 & 0x000000ff) << 16;
+		r1 = (rgb1 & 0x00ff0000);
+		g1 = (rgb1 & 0x0000ff00) << 8;
+		b1 = (rgb1 & 0x000000ff) << 16;
+
+ dx = x1 - x0;
+ dy = -(y1 - y0);
+
+		if (dy > 0)
+		{
+			dr = ((uint32_t)r1 - (uint32_t)r0) / dy;
+			dg = ((uint32_t)g1 - (uint32_t)g0) / dy;
+			db = ((uint32_t)b1 - (uint32_t)b0) / dy;
+		}
+		else
+		{
+			dr = ((uint32_t)r1 - (uint32_t)r0);
+			dg = ((uint32_t)g1 - (uint32_t)g0);
+			db = ((uint32_t)b1 - (uint32_t)b0);
+		}
+
+ d = 2*dx - dy; /* Initial value of d */
+ incrN = 2*dx; /* incr. used for move to N */
+ incrNE = 2*(dx - dy); /* incr. used for move to NE */
+
+		if ((x0>=drawX)&&(x0<drawW)&&(y0>=drawY)&&(y0<drawH))
+			GetShadeTransCol(&psxVuw[(y0<<10)+x0],(unsigned short)(((r0 >> 9)&0x7c00)|((g0 >> 14)&0x03e0)|((b0 >> 19)&0x001f)));
+ while(y0 > y1)
+ {
+ if (d <= 0)
+ {
+ d = d + incrN; /* Choose N */
+ }
+ else
+ {
+ d = d + incrNE; /* Choose NE */
+ x0++;
+ }
+ y0--;
+
+				r0+=dr;
+				g0+=dg;
+				b0+=db;
+
+				if ((x0>=drawX)&&(x0<drawW)&&(y0>=drawY)&&(y0<drawH))
+					GetShadeTransCol(&psxVuw[(y0<<10)+x0],(unsigned short)(((r0 >> 9)&0x7c00)|((g0 >> 14)&0x03e0)|((b0 >> 19)&0x001f)));
+ }
+}
+
+///////////////////////////////////////////////////////////////////////
+
+void Line_E_NE_Shade(int x0, int y0, int x1, int y1, uint32_t rgb0, uint32_t rgb1)
+{
+ int dx, dy, incrE, incrNE, d;
+		uint32_t r0, g0, b0, r1, g1, b1;
+		int dr, dg, db;
+
+		r0 = (rgb0 & 0x00ff0000);
+		g0 = (rgb0 & 0x0000ff00) << 8;
+		b0 = (rgb0 & 0x000000ff) << 16;
+		r1 = (rgb1 & 0x00ff0000);
+		g1 = (rgb1 & 0x0000ff00) << 8;
+		b1 = (rgb1 & 0x000000ff) << 16;
+
+ dx = x1 - x0;
+ dy = -(y1 - y0);
+
+		if (dx > 0)
+		{
+			dr = ((int)r1 - (int)r0) / dx;
+			dg = ((int)g1 - (int)g0) / dx;
+			db = ((int)b1 - (int)b0) / dx;
+		}
+		else
+		{
+			dr = ((int)r1 - (int)r0);
+			dg = ((int)g1 - (int)g0);
+			db = ((int)b1 - (int)b0);
+		}
+
+ d = 2*dy - dx; /* Initial value of d */
+ incrE = 2*dy; /* incr. used for move to E */
+ incrNE = 2*(dy - dx); /* incr. used for move to NE */
+
+		if ((x0>=drawX)&&(x0<drawW)&&(y0>=drawY)&&(y0<drawH))
+			GetShadeTransCol(&psxVuw[(y0<<10)+x0],(unsigned short)(((r0 >> 9)&0x7c00)|((g0 >> 14)&0x03e0)|((b0 >> 19)&0x001f)));
+ while(x0 < x1)
+ {
+ if (d <= 0)
+ {
+ d = d + incrE; /* Choose E */
+ }
+ else
+ {
+ d = d + incrNE; /* Choose NE */
+ y0--;
+ }
+ x0++;
+
+				r0+=dr;
+				g0+=dg;
+				b0+=db;
+
+				if ((x0>=drawX)&&(x0<drawW)&&(y0>=drawY)&&(y0<drawH))
+					GetShadeTransCol(&psxVuw[(y0<<10)+x0],(unsigned short)(((r0 >> 9)&0x7c00)|((g0 >> 14)&0x03e0)|((b0 >> 19)&0x001f)));
+ }
+}
+
+///////////////////////////////////////////////////////////////////////
+
+void VertLineShade(int x, int y0, int y1, uint32_t rgb0, uint32_t rgb1)
+{
+ int y, dy;
+	uint32_t r0, g0, b0, r1, g1, b1;
+	int dr, dg, db;
+
+	r0 = (rgb0 & 0x00ff0000);
+	g0 = (rgb0 & 0x0000ff00) << 8;
+	b0 = (rgb0 & 0x000000ff) << 16;
+	r1 = (rgb1 & 0x00ff0000);
+	g1 = (rgb1 & 0x0000ff00) << 8;
+	b1 = (rgb1 & 0x000000ff) << 16;
+
+	dy = (y1 - y0);
+
+	if (dy > 0)
+	{
+		dr = ((int)r1 - (int)r0) / dy;
+		dg = ((int)g1 - (int)g0) / dy;
+		db = ((int)b1 - (int)b0) / dy;
+	}
+	else
+	{
+		dr = ((int)r1 - (int)r0);
+		dg = ((int)g1 - (int)g0);
+		db = ((int)b1 - (int)b0);
+	}
+
+	if (y0 < drawY)
+	{
+		r0+=dr*(drawY - y0);
+		g0+=dg*(drawY - y0);
+		b0+=db*(drawY - y0);
+		y0 = drawY;
+	}
+
+	if (y1 > drawH)
+		y1 = drawH;
+
+ for (y = y0; y <= y1; y++)
+	{
+		GetShadeTransCol(&psxVuw[(y<<10)+x],(unsigned short)(((r0 >> 9)&0x7c00)|((g0 >> 14)&0x03e0)|((b0 >> 19)&0x001f)));
+		r0+=dr;
+		g0+=dg;
+		b0+=db;
+	}
+}
+
+///////////////////////////////////////////////////////////////////////
+
+void HorzLineShade(int y, int x0, int x1, uint32_t rgb0, uint32_t rgb1)
+{
+ int x, dx;
+	uint32_t r0, g0, b0, r1, g1, b1;
+	int dr, dg, db;
+
+	r0 = (rgb0 & 0x00ff0000);
+	g0 = (rgb0 & 0x0000ff00) << 8;
+	b0 = (rgb0 & 0x000000ff) << 16;
+	r1 = (rgb1 & 0x00ff0000);
+	g1 = (rgb1 & 0x0000ff00) << 8;
+	b1 = (rgb1 & 0x000000ff) << 16;
+
+	dx = (x1 - x0);
+
+	if (dx > 0)
+	{
+		dr = ((int)r1 - (int)r0) / dx;
+		dg = ((int)g1 - (int)g0) / dx;
+		db = ((int)b1 - (int)b0) / dx;
+	}
+	else
+	{
+		dr = ((int)r1 - (int)r0);
+		dg = ((int)g1 - (int)g0);
+		db = ((int)b1 - (int)b0);
+	}
+
+	if (x0 < drawX)
+	{
+		r0+=dr*(drawX - x0);
+		g0+=dg*(drawX - x0);
+		b0+=db*(drawX - x0);
+		x0 = drawX;
+	}
+
+	if (x1 > drawW)
+		x1 = drawW;
+
+ for (x = x0; x <= x1; x++)
+	{
+		GetShadeTransCol(&psxVuw[(y<<10)+x],(unsigned short)(((r0 >> 9)&0x7c00)|((g0 >> 14)&0x03e0)|((b0 >> 19)&0x001f)));
+		r0+=dr;
+		g0+=dg;
+		b0+=db;
+	}
+}
+
+///////////////////////////////////////////////////////////////////////
+
+void Line_E_SE_Flat(int x0, int y0, int x1, int y1, unsigned short colour)
+{
+ int dx, dy, incrE, incrSE, d, x, y;
+
+ dx = x1 - x0;
+ dy = y1 - y0;
+ d = 2*dy - dx; /* Initial value of d */
+ incrE = 2*dy; /* incr. used for move to E */
+ incrSE = 2*(dy - dx); /* incr. used for move to SE */
+ x = x0;
+ y = y0;
+		if ((x>=drawX)&&(x<drawW)&&(y>=drawY)&&(y<drawH))
+			GetShadeTransCol(&psxVuw[(y<<10)+x], colour);
+ while(x < x1)
+ {
+ if (d <= 0)
+ {
+ d = d + incrE; /* Choose E */
+ x++;
+ }
+ else
+ {
+ d = d + incrSE; /* Choose SE */
+ x++;
+ y++;
+ }
+				if ((x>=drawX)&&(x<drawW)&&(y>=drawY)&&(y<drawH))
+					GetShadeTransCol(&psxVuw[(y<<10)+x], colour);
+ }
+}
+
+///////////////////////////////////////////////////////////////////////
+
+void Line_S_SE_Flat(int x0, int y0, int x1, int y1, unsigned short colour)
+{
+ int dx, dy, incrS, incrSE, d, x, y;
+
+ dx = x1 - x0;
+ dy = y1 - y0;
+ d = 2*dx - dy; /* Initial value of d */
+ incrS = 2*dx; /* incr. used for move to S */
+ incrSE = 2*(dx - dy); /* incr. used for move to SE */
+ x = x0;
+ y = y0;
+		if ((x>=drawX)&&(x<drawW)&&(y>=drawY)&&(y<drawH))
+			GetShadeTransCol(&psxVuw[(y<<10)+x], colour);
+ while(y < y1)
+ {
+ if (d <= 0)
+ {
+ d = d + incrS; /* Choose S */
+ y++;
+ }
+ else
+ {
+ d = d + incrSE; /* Choose SE */
+ x++;
+ y++;
+ }
+				if ((x>=drawX)&&(x<drawW)&&(y>=drawY)&&(y<drawH))
+					GetShadeTransCol(&psxVuw[(y<<10)+x], colour);
+ }
+}
+
+///////////////////////////////////////////////////////////////////////
+
+void Line_N_NE_Flat(int x0, int y0, int x1, int y1, unsigned short colour)
+{
+ int dx, dy, incrN, incrNE, d, x, y;
+
+ dx = x1 - x0;
+ dy = -(y1 - y0);
+ d = 2*dx - dy; /* Initial value of d */
+ incrN = 2*dx; /* incr. used for move to N */
+ incrNE = 2*(dx - dy); /* incr. used for move to NE */
+ x = x0;
+ y = y0;
+		if ((x>=drawX)&&(x<drawW)&&(y>=drawY)&&(y<drawH))
+			GetShadeTransCol(&psxVuw[(y<<10)+x], colour);
+ while(y > y1)
+ {
+ if (d <= 0)
+ {
+ d = d + incrN; /* Choose N */
+ y--;
+ }
+ else
+ {
+ d = d + incrNE; /* Choose NE */
+ x++;
+ y--;
+ }
+				if ((x>=drawX)&&(x<drawW)&&(y>=drawY)&&(y<drawH))
+					GetShadeTransCol(&psxVuw[(y<<10)+x], colour);
+ }
+}
+
+///////////////////////////////////////////////////////////////////////
+
+void Line_E_NE_Flat(int x0, int y0, int x1, int y1, unsigned short colour)
+{
+ int dx, dy, incrE, incrNE, d, x, y;
+
+ dx = x1 - x0;
+ dy = -(y1 - y0);
+ d = 2*dy - dx; /* Initial value of d */
+ incrE = 2*dy; /* incr. used for move to E */
+ incrNE = 2*(dy - dx); /* incr. used for move to NE */
+ x = x0;
+ y = y0;
+		if ((x>=drawX)&&(x<drawW)&&(y>=drawY)&&(y<drawH))
+			GetShadeTransCol(&psxVuw[(y<<10)+x], colour);
+ while(x < x1)
+ {
+ if (d <= 0)
+ {
+ d = d + incrE; /* Choose E */
+ x++;
+ }
+ else
+ {
+ d = d + incrNE; /* Choose NE */
+ x++;
+ y--;
+ }
+				if ((x>=drawX)&&(x<drawW)&&(y>=drawY)&&(y<drawH))
+					GetShadeTransCol(&psxVuw[(y<<10)+x], colour);
+ }
+}
+
+///////////////////////////////////////////////////////////////////////
+
+void VertLineFlat(int x, int y0, int y1, unsigned short colour)
+{
+	int y;
+
+	if (y0 < drawY)
+		y0 = drawY;
+
+	if (y1 > drawH)
+		y1 = drawH;
+
+ for (y = y0; y <= y1; y++)
+		GetShadeTransCol(&psxVuw[(y<<10)+x], colour);
+}
+
+///////////////////////////////////////////////////////////////////////
+
+void HorzLineFlat(int y, int x0, int x1, unsigned short colour)
+{
+	int x;
+
+	if (x0 < drawX)
+		x0 = drawX;
+
+	if (x1 > drawW)
+		x1 = drawW;
+
+	for (x = x0; x <= x1; x++)
+		GetShadeTransCol(&psxVuw[(y<<10)+x], colour);
+}
+
+///////////////////////////////////////////////////////////////////////
+
+/* Bresenham Line drawing function */
+void DrawSoftwareLineShade(int rgb0, int rgb1)
+{
+	short x0, y0, x1, y1, xt, yt;
+	int rgbt;
+	double m, dy, dx;
+
+	if(lx0>drawW && lx1>drawW) return;
+	if(ly0>drawH && ly1>drawH) return;
+	if(lx0<drawX && lx1<drawX) return;
+	if(ly0<drawY && ly1<drawY) return;
+	if(drawY>=drawH) return;
+	if(drawX>=drawW) return; 
+
+	x0 = lx0;
+	y0 = ly0;
+	x1 = lx1;
+	y1 = ly1;
+
+	dx = x1 - x0;
+	dy = y1 - y0;
+
+	if (dx == 0)
+	{
+		if (dy > 0)
+			VertLineShade(x0, y0, y1, rgb0, rgb1);
+		else
+			VertLineShade(x0, y1, y0, rgb1, rgb0);
+	}
+	else
+		if (dy == 0)
+		{
+			if (dx > 0)
+				HorzLineShade(y0, x0, x1, rgb0, rgb1);
+			else
+				HorzLineShade(y0, x1, x0, rgb1, rgb0);
+		}
+		else
+		{
+			if (dx < 0)
+			{
+				xt = x0;
+				yt = y0;
+				rgbt = rgb0;
+				x0 = x1;
+				y0 = y1;
+				rgb0 = rgb1;
+				x1 = xt;
+				y1 = yt;
+				rgb1 = rgbt;
+
+				dx = x1 - x0;
+				dy = y1 - y0;
+			}
+
+			m = dy/dx;
+
+			if (m >= 0)
+			{
+				if (m > 1)
+					Line_S_SE_Shade(x0, y0, x1, y1, rgb0, rgb1);
+				else
+					Line_E_SE_Shade(x0, y0, x1, y1, rgb0, rgb1);
+			}
+			else
+				if (m < -1)
+					Line_N_NE_Shade(x0, y0, x1, y1, rgb0, rgb1);
+				else
+					Line_E_NE_Shade(x0, y0, x1, y1, rgb0, rgb1);
+		}
+}
+
+///////////////////////////////////////////////////////////////////////
+
+void DrawSoftwareLineFlat(int rgb)
+{
+	short x0, y0, x1, y1, xt, yt;
+	double m, dy, dx;
+	unsigned short colour = 0;
+ 
+	if(lx0>drawW && lx1>drawW) return;
+	if(ly0>drawH && ly1>drawH) return;
+	if(lx0<drawX && lx1<drawX) return;
+	if(ly0<drawY && ly1<drawY) return;
+	if(drawY>=drawH) return;
+	if(drawX>=drawW) return; 
+
+	colour = ((rgb & 0x00f80000)>>9) | ((rgb & 0x0000f800)>>6) | ((rgb & 0x000000f8)>>3);
+
+	x0 = lx0;
+	y0 = ly0;
+	x1 = lx1;
+	y1 = ly1;
+
+	dx = x1 - x0;
+	dy = y1 - y0;
+
+	if (dx == 0)
+	{
+		if (dy == 0)
+			return; // Nothing to draw
+		else if (dy > 0)
+			VertLineFlat(x0, y0, y1, colour);
+		else
+			VertLineFlat(x0, y1, y0, colour);
+	}
+	else
+		if (dy == 0)
+		{
+			if (dx > 0)
+				HorzLineFlat(y0, x0, x1, colour);
+			else
+				HorzLineFlat(y0, x1, x0, colour);
+		}
+		else
+		{
+			if (dx < 0)
+			{
+				xt = x0;
+				yt = y0;
+				x0 = x1;
+				y0 = y1;
+				x1 = xt;
+				y1 = yt;
+
+				dx = x1 - x0;
+				dy = y1 - y0;
+			}
+
+			m = dy/dx;
+
+			if (m >= 0)
+			{
+				if (m > 1)
+					Line_S_SE_Flat(x0, y0, x1, y1, colour);
+				else
+					Line_E_SE_Flat(x0, y0, x1, y1, colour);
+			}
+			else
+				if (m < -1)
+					Line_N_NE_Flat(x0, y0, x1, y1, colour);
+				else
+					Line_E_NE_Flat(x0, y0, x1, y1, colour);
+		}
+}
+
+///////////////////////////////////////////////////////////////////////

pcsxr-1.9.92.tar.bz2/plugins/peopsxgl/soft.h -> pcsxr-1.9.93.tar.bz2/plugins/peopsxgl/soft.h Changed

@@ -1,58 +1,58 @@
-/***************************************************************************
-                         soft.h  -  description
-                             -------------------
-    begin                : Sun Oct 28 2001
-    copyright            : (C) 2001 by Pete Bernert
-    web                  : www.pbernert.com   
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version. See also the license.txt file for *
- *   additional informations.                                              *
- *                                                                         *
- ***************************************************************************/
-
-//*************************************************************************// 
-// History of changes:
-//
-// 2001/10/28 - Pete  
-// - generic cleanup for the Peops release
-//
-//*************************************************************************// 
-
-#ifndef _GPU_SOFT_H_
-#define _GPU_SOFT_H_
-
-// internally used defines
-
-#define RED(x) (x & 0xff)
-#define BLUE(x) ((x>>16) & 0xff)
-#define GREEN(x) ((x>>8) & 0xff)
-#define COLOR(x) (x & 0xffffff)
-
-///////////////////////////////////////////////////////////////////////
-
-void offsetPSXLine(void);
-void offsetPSX2(void);
-void offsetPSX3(void);
-void offsetPSX4(void);
-
-void FillSoftwareAreaTrans(short x0, short y0, short x1, short y1, unsigned short col);
-void FillSoftwareArea(short x0, short y0, short x1, short y1, unsigned short col);
-void drawPoly3G(int rgb1, int rgb2, int rgb3);
-void drawPoly4G(int rgb1, int rgb2, int rgb3, int rgb4);
-void drawPoly3F(int rgb);
-void drawPoly4F(int rgb);
-void drawPoly4FT(unsigned char *baseAddr);
-void drawPoly4GT(unsigned char *baseAddr);
-void drawPoly3FT(unsigned char *baseAddr);
-void drawPoly3GT(unsigned char *baseAddr);
-void DrawSoftwareSprite(unsigned char *baseAddr, short w, short h, int tx, int ty);
-void DrawSoftwareSpriteTWin(unsigned char *baseAddr, int w, int h);
-void DrawSoftwareSpriteMirror(unsigned char *baseAddr, int w, int h);
-
-#endif // _GPU_SOFT_H_
+/***************************************************************************
+                         soft.h  -  description
+                             -------------------
+    begin                : Sun Oct 28 2001
+    copyright            : (C) 2001 by Pete Bernert
+    web                  : www.pbernert.com   
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+//*************************************************************************// 
+// History of changes:
+//
+// 2001/10/28 - Pete  
+// - generic cleanup for the Peops release
+//
+//*************************************************************************// 
+
+#ifndef _GPU_SOFT_H_
+#define _GPU_SOFT_H_
+
+// internally used defines
+
+#define RED(x) (x & 0xff)
+#define BLUE(x) ((x>>16) & 0xff)
+#define GREEN(x) ((x>>8) & 0xff)
+#define COLOR(x) (x & 0xffffff)
+
+///////////////////////////////////////////////////////////////////////
+
+void offsetPSXLine(void);
+void offsetPSX2(void);
+void offsetPSX3(void);
+void offsetPSX4(void);
+
+void FillSoftwareAreaTrans(short x0, short y0, short x1, short y1, unsigned short col);
+void FillSoftwareArea(short x0, short y0, short x1, short y1, unsigned short col);
+void drawPoly3G(int rgb1, int rgb2, int rgb3);
+void drawPoly4G(int rgb1, int rgb2, int rgb3, int rgb4);
+void drawPoly3F(int rgb);
+void drawPoly4F(int rgb);
+void drawPoly4FT(unsigned char *baseAddr);
+void drawPoly4GT(unsigned char *baseAddr);
+void drawPoly3FT(unsigned char *baseAddr);
+void drawPoly3GT(unsigned char *baseAddr);
+void DrawSoftwareSprite(unsigned char *baseAddr, short w, short h, int tx, int ty);
+void DrawSoftwareSpriteTWin(unsigned char *baseAddr, int w, int h);
+void DrawSoftwareSpriteMirror(unsigned char *baseAddr, int w, int h);
+
+#endif // _GPU_SOFT_H_

pcsxr-1.9.92.tar.bz2/plugins/peopsxgl/stdafx.h -> pcsxr-1.9.93.tar.bz2/plugins/peopsxgl/stdafx.h Changed

@@ -1,21 +1,57 @@
-/***************************************************************************
- stdafx.h - description
- -------------------
- begin : Sun Mar 08 2009
- copyright : (C) 1999-2009 by Pete Bernert
- web : www.pbernert.com 
- ***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. See also the license.txt file for *
- * additional informations. *
- * *
- ***************************************************************************/
-
+/***************************************************************************
+ stdafx.h - description
+ -------------------
+ begin : Sun Mar 08 2009
+ copyright : (C) 1999-2009 by Pete Bernert
+ web : www.pbernert.com 
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+#ifdef _WINDOWS
+
+#define _CRT_SECURE_NO_WARNINGS
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdarg.h>
+#include <windows.h>
+#include <windowsx.h>
+#include <tchar.h>
+#include <mmsystem.h>
+#include "resource.h"
+
+#pragma warning (disable:4244)
+#pragma warning (disable:4761)
+
+#include <GL/gl.h>
+
+#elif defined(_MACGL)
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <OpenGL/gl.h>
+#include <math.h> 
+
+#define CALLBACK /* */
+
+#else
+
 #define __X11_C_
 #define __inline inline
 
@@ -32,14 +68,17 @@
 #include <X11/cursorfont.h> 
 
 #define CALLBACK /* */
-#define __inline inline
+
+#endif
 
 #include "gl_ext.h"
 
 #define SHADETEXBIT(x) ((x>>24) & 0x1)
 #define SEMITRANSBIT(x) ((x>>25) & 0x1)
 
+#ifndef _WINDOWS
 #ifndef GL_BGRA_EXT
 #define GL_BGRA_EXT GL_BGRA
 #endif
 #define GL_COLOR_INDEX8_EXT 0x80E5
+#endif

pcsxr-1.9.92.tar.bz2/plugins/peopsxgl/texture.c -> pcsxr-1.9.93.tar.bz2/plugins/peopsxgl/texture.c Changed

@@ -1,62 +1,62 @@
-/***************************************************************************
- texture.c - description
- -------------------
- begin : Sun Mar 08 2009
- copyright : (C) 1999-2009 by Pete Bernert
- web : www.pbernert.com 
- ***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. See also the license.txt file for *
- * additional informations. *
- * *
- ***************************************************************************/
-
+/***************************************************************************
+ texture.c - description
+ -------------------
+ begin : Sun Mar 08 2009
+ copyright : (C) 1999-2009 by Pete Bernert
+ web : www.pbernert.com 
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
 #include "stdafx.h"
 
 ////////////////////////////////////////////////////////////////////////////////////
 // Texture related functions are here !
-//
-// The texture handling is heart and soul of this gpu. The plugin was developed
-// 1999, by this time no shaders were available. Since the psx gpu is making
-// heavy use of CLUT (="color lookup tables", aka palettized textures), it was 
-// an interesting task to get those emulated at good speed on NV TNT cards 
-// (which was my major goal when I created the first "gpuPeteTNT"). Later cards 
-// (Geforce256) supported texture palettes by an OGL extension, but at some point
-// this support was dropped again by gfx card vendors.
-// Well, at least there is a certain advatage, if no texture palettes extension can
-// be used: it is possible to modify the textures in any way, allowing "hi-res" 
-// textures and other tweaks.
-//
-// My main texture caching is kinda complex: the plugin is allocating "n" 256x256 textures,
-// and it places small psx texture parts inside them. The plugin keeps track what 
-// part (with what palette) it had placed in which texture, so it can re-use this 
-// part again. The more ogl textures it can use, the better (of course the managing/
-// searching will be slower, but everything is faster than uploading textures again
-// and again to a gfx card). My first card (TNT1) had 16 MB Vram, and it worked
-// well with many games, but I recommend nowadays 64 MB Vram to get a good speed.
-//
-// Sadly, there is also a second kind of texture cache needed, for "psx texture windows".
-// Those are "repeated" textures, so a psx "texture window" needs to be put in 
-// a whole texture to use the GL_TEXTURE_WRAP_ features. This cache can get full very
-// fast in games which are having an heavy "texture window" usage, like RRT4. As an 
-// alternative, this plugin can use the OGL "palette" extension on texture windows, 
-// if available. Nowadays also a fragment shader can easily be used to emulate
-// texture wrapping in a texture atlas, so the main cache could hold the texture
-// windows as well (that's what I am doing in the OGL2 plugin). But currently the
-// OGL1 plugin is a "shader-free" zone, so heavy "texture window" games will cause
-// much texture uploads.
-//
-// Some final advice: take care if you change things in here. I've removed my ASM
-// handlers (they didn't cause much speed gain anyway) for readability/portability,
-// but still the functions/data structures used here are easy to mess up. I guess it
-// can be a pain in the ass to port the plugin to another byte order :)
-//
-////////////////////////////////////////////////////////////////////////////////////
+//
+// The texture handling is heart and soul of this gpu. The plugin was developed
+// 1999, by this time no shaders were available. Since the psx gpu is making
+// heavy use of CLUT (="color lookup tables", aka palettized textures), it was 
+// an interesting task to get those emulated at good speed on NV TNT cards 
+// (which was my major goal when I created the first "gpuPeteTNT"). Later cards 
+// (Geforce256) supported texture palettes by an OGL extension, but at some point
+// this support was dropped again by gfx card vendors.
+// Well, at least there is a certain advatage, if no texture palettes extension can
+// be used: it is possible to modify the textures in any way, allowing "hi-res" 
+// textures and other tweaks.
+//
+// My main texture caching is kinda complex: the plugin is allocating "n" 256x256 textures,
+// and it places small psx texture parts inside them. The plugin keeps track what 
+// part (with what palette) it had placed in which texture, so it can re-use this 
+// part again. The more ogl textures it can use, the better (of course the managing/
+// searching will be slower, but everything is faster than uploading textures again
+// and again to a gfx card). My first card (TNT1) had 16 MB Vram, and it worked
+// well with many games, but I recommend nowadays 64 MB Vram to get a good speed.
+//
+// Sadly, there is also a second kind of texture cache needed, for "psx texture windows".
+// Those are "repeated" textures, so a psx "texture window" needs to be put in 
+// a whole texture to use the GL_TEXTURE_WRAP_ features. This cache can get full very
+// fast in games which are having an heavy "texture window" usage, like RRT4. As an 
+// alternative, this plugin can use the OGL "palette" extension on texture windows, 
+// if available. Nowadays also a fragment shader can easily be used to emulate
+// texture wrapping in a texture atlas, so the main cache could hold the texture
+// windows as well (that's what I am doing in the OGL2 plugin). But currently the
+// OGL1 plugin is a "shader-free" zone, so heavy "texture window" games will cause
+// much texture uploads.
+//
+// Some final advice: take care if you change things in here. I've removed my ASM
+// handlers (they didn't cause much speed gain anyway) for readability/portability,
+// but still the functions/data structures used here are easy to mess up. I guess it
+// can be a pain in the ass to port the plugin to another byte order :)
+//
+////////////////////////////////////////////////////////////////////////////////////
 
 #define _IN_TEXTURE
 
@@ -80,9 +80,9 @@
 int iTexGarbageCollection=1;
 uint32_t dwTexPageComp=0;
 int iVRamSize=0;
-int iClampType=GL_CLAMP;
+int iClampType=GL_CLAMP;
 
-void (*LoadSubTexFn) (int,int,short,short);
+void (*LoadSubTexFn) (int,int,short,short);
 uint32_t (*PalTexturedColourFn) (uint32_t);
 
 ////////////////////////////////////////////////////////////////////////
@@ -111,7 +111,7 @@
 #define SOFFD 3072
 
 #define MAXWNDTEXCACHE 128
-
+
 #define XCHECK(pos1,pos2) ((pos1.c[0]>=pos2.c[1])&&(pos1.c[1]<=pos2.c[0])&&(pos1.c[2]>=pos2.c[3])&&(pos1.c[3]<=pos2.c[2]))
 #define INCHECK(pos2,pos1) ((pos1.c[0]<=pos2.c[0]) && (pos1.c[1]>=pos2.c[1]) && (pos1.c[2]<=pos2.c[2]) && (pos1.c[3]>=pos2.c[3]))
 
@@ -146,8 +146,12 @@
 ////////////////////////////////////////////////////////////////////////
 // texture cache implementation
 ////////////////////////////////////////////////////////////////////////
-
-// "texture window" cache entry
+
+#ifdef _WINDOWS
+#pragma pack(1)
+#endif
+
+// "texture window" cache entry
 
 typedef struct textureWndCacheEntryTag
 {
@@ -159,8 +163,8 @@
 EXLong pos;
 GLuint texname;
 } textureWndCacheEntry;
-
-// "standard texture" cache entry (12 byte per entry, as small as possible... we need lots of them)
+
+// "standard texture" cache entry (12 byte per entry, as small as possible... we need lots of them)
 
 typedef struct textureSubCacheEntryTagS 
 {
@@ -172,13 +176,17 @@
 unsigned char Opaque;
 } textureSubCacheEntryS;
 
-//---------------------------------------------
-
-#define MAXTPAGES_MAX 64
-#define MAXSORTTEX_MAX 196
-
-//---------------------------------------------
-
+#ifdef _WINDOWS
+#pragma pack()
+#endif
+
+//---------------------------------------------
+
+#define MAXTPAGES_MAX 64
+#define MAXSORTTEX_MAX 196
+
+//---------------------------------------------
+
 textureWndCacheEntry wcWndtexStore[MAXWNDTEXCACHE];
 textureSubCacheEntryS * pscSubtexStore[3][MAXTPAGES_MAX];
 EXLong * pxSsubtexLeft [MAXSORTTEX_MAX];
@@ -194,14 +202,14 @@
 GLubyte * texturebuffer = NULL;
 uint32_t g_x1,g_y1,g_x2,g_y2;
 unsigned char ubOpaqueDraw = 0;
-
-unsigned short MAXTPAGES = 32;
-unsigned short CLUTMASK = 0x7fff;
-unsigned short CLUTYMASK = 0x1ff;
-unsigned short MAXSORTTEX = 196;
-
+
+unsigned short MAXTPAGES = 32;
+unsigned short CLUTMASK = 0x7fff;
+unsigned short CLUTYMASK = 0x1ff;
+unsigned short MAXSORTTEX = 196;
+
 ////////////////////////////////////////////////////////////////////////
-// Texture color conversions... all my ASM funcs are removed for easier
+// Texture color conversions... all my ASM funcs are removed for easier
 // porting... and honestly: nowadays the speed gain would be pointless 
 ////////////////////////////////////////////////////////////////////////
 
@@ -518,7 +526,7 @@
 glBindTexture(GL_TEXTURE_2D,0);
 
 free(p);
-
+
 bDetail=malloc(MAXSORTTEX*sizeof(GLboolean));
 memset(bDetail,0,MAXSORTTEX*sizeof(GLboolean));
 b=glAreTexturesResident(MAXSORTTEX,uiStexturePage,bDetail);
@@ -529,9 +537,9 @@
 {
 if(bDetail[i]) iCnt++;
 uiStexturePage[i]=0;
- }
-
- free(bDetail);
+ }
+
+ free(bDetail);
 
 if(b) iSortTexCnt=MAXSORTTEX-min(1,iHiResTextures);
 else iSortTexCnt=iCnt-3+min(1,iHiResTextures); // place for menu&texwnd
@@ -544,24 +552,24 @@
 ////////////////////////////////////////////////////////////////////////
 
 void InitializeTextureStore() 
-{
- int i,j;
-
- if(iGPUHeight==1024)
- {
- MAXTPAGES = 64;
- CLUTMASK = 0xffff;
- CLUTYMASK = 0x3ff;
- MAXSORTTEX = 128;
- iTexGarbageCollection=0;
- }
- else
- {
- MAXTPAGES = 32;
- CLUTMASK = 0x7fff;
- CLUTYMASK = 0x1ff;
- MAXSORTTEX = 196;
- }
+{
+ int i,j;
+
+ if(iGPUHeight==1024)
+ {
+ MAXTPAGES = 64;
+ CLUTMASK = 0xffff;
+ CLUTYMASK = 0x3ff;
+ MAXSORTTEX = 128;
+ iTexGarbageCollection=0;
+ }
+ else
+ {
+ MAXTPAGES = 32;
+ CLUTMASK = 0x7fff;
+ CLUTYMASK = 0x1ff;
+ MAXSORTTEX = 196;
+ }
 
 memset(vertex,0,4*sizeof(OGLVertex)); // init vertices
 
@@ -707,15 +715,15 @@
 W+=X-1; 
 H+=Y-1;
 if(X<0) X=0;if(X>1023) X=1023;
- if(W<0) W=0;if(W>1023) W=1023;
- if(Y<0) Y=0;if(Y>iGPUHeightMask) Y=iGPUHeightMask;
- if(H<0) H=0;if(H>iGPUHeightMask) H=iGPUHeightMask;
+ if(W<0) W=0;if(W>1023) W=1023;
+ if(Y<0) Y=0;if(Y>iGPUHeightMask) Y=iGPUHeightMask;
+ if(H<0) H=0;if(H>iGPUHeightMask) H=iGPUHeightMask;
 W++;H++;
-
- if(iGPUHeight==1024) iYM=3;
-
- py1=min(iYM,Y>>8);
- py2=min(iYM,H>>8); // y: 0 or 1
+
+ if(iGPUHeight==1024) iYM=3;
+
+ py1=min(iYM,Y>>8);
+ py2=min(iYM,H>>8); // y: 0 or 1
 
 px1=max(0,(X>>6));
 px2=min(15,(W>>6));
@@ -800,16 +808,16 @@
 W+=X-1; 
 H+=Y-1;
 if(X<0) X=0;if(X>1023) X=1023;
- if(W<0) W=0;if(W>1023) W=1023;
- if(Y<0) Y=0;if(Y>iGPUHeightMask) Y=iGPUHeightMask;
- if(H<0) H=0;if(H>iGPUHeightMask) H=iGPUHeightMask;
+ if(W<0) W=0;if(W>1023) W=1023;
+ if(Y<0) Y=0;if(Y>iGPUHeightMask) Y=iGPUHeightMask;
+ if(H<0) H=0;if(H>iGPUHeightMask) H=iGPUHeightMask;
 W++;H++;
-
- if(iGPUHeight==1024) iYM=3;
 
- py1=min(iYM,Y>>8);
- py2=min(iYM,H>>8); // y: 0 or 1
- px1=max(0,(X>>6)-3); 
+ if(iGPUHeight==1024) iYM=3;
+
+ py1=min(iYM,Y>>8);
+ py2=min(iYM,H>>8); // y: 0 or 1
+ px1=max(0,(X>>6)-3); 
 px2=min(15,(W>>6)+3); // x: 0-15
 
 for(py=py1;py<=py2;py++)
@@ -839,10 +847,10 @@
 if(X>x1) x1=X;
 if(W<x2) x2=W;
 if(x2<x1) {sw=x1;x1=x2;x2=sw;}
-
- if (dwGPUVersion == 2)
- npos.l=0x00ff00ff;
- else
+
+ if (dwGPUVersion == 2)
+ npos.l=0x00ff00ff;
+ else
 npos.l=((x1-xa)<<(26-k))|((x2-xa)<<(18-k))|y1|y2;
 
 {
@@ -967,41 +975,41 @@
 {
 //--------------------------------------------------// 
 // 4bit texture load ..
- case 0:
- if(GlobalTextIL)
- {
- unsigned int TXV,TXU,n_xi,n_yi;
-
- wSRCPtr=psxVuw+palstart;
- for(row=0;row<16;row++)
- *px++=LPTCOL(*wSRCPtr++);
-
- column=g_y2-ldy;
- for(TXV=g_y1;TXV<=column;TXV++)
- {
- ldx=ldxo;
- for(TXU=g_x1;TXU<=g_x2-ldxo;TXU++)
- {
- 		 n_xi = ( ( TXU >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
-		 n_yi = ( TXV & ~0xf ) + ( ( TXU >> 4 ) & 0xf );
-
- s=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x03 ) << 2 ) ) & 0x0f ));
- *ta++=s;
-
- if(ldx) {*ta++=s;ldx--;}
- }
-
- if(ldy) 
- {ldy--;
- for(TXU=g_x1;TXU<=g_x2;TXU++)
- *ta++=*(ta-(g_x2-g_x1));
- }
- }
-
- DefineTextureWnd();
-
- break;
- }
+ case 0:
+ if(GlobalTextIL)
+ {
+ unsigned int TXV,TXU,n_xi,n_yi;
+
+ wSRCPtr=psxVuw+palstart;
+ for(row=0;row<16;row++)
+ *px++=LPTCOL(*wSRCPtr++);
+
+ column=g_y2-ldy;
+ for(TXV=g_y1;TXV<=column;TXV++)
+ {
+ ldx=ldxo;
+ for(TXU=g_x1;TXU<=g_x2-ldxo;TXU++)
+ {
+ 		 n_xi = ( ( TXU >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
+		 n_yi = ( TXV & ~0xf ) + ( ( TXU >> 4 ) & 0xf );
+
+ s=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x03 ) << 2 ) ) & 0x0f ));
+ *ta++=s;
+
+ if(ldx) {*ta++=s;ldx--;}
+ }
+
+ if(ldy) 
+ {ldy--;
+ for(TXU=g_x1;TXU<=g_x2;TXU++)
+ *ta++=*(ta-(g_x2-g_x1));
+ }
+ }
+
+ DefineTextureWnd();
+
+ break;
+ }
 
 
 start=((pageid-16*pmult)*128)+256*2048*pmult;
@@ -1044,45 +1052,45 @@
 break;
 //--------------------------------------------------// 
 // 8bit texture load ..
- case 1:
- if(GlobalTextIL)
- {
- unsigned int TXV,TXU,n_xi,n_yi;
-
- wSRCPtr=psxVuw+palstart;
- for(row=0;row<256;row++)
- *px++=LPTCOL(*wSRCPtr++);
-
- column=g_y2-ldy;
- for(TXV=g_y1;TXV<=column;TXV++)
- {
- ldx=ldxo;
- for(TXU=g_x1;TXU<=g_x2-ldxo;TXU++)
- {
- 		 n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
-		 n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
-
- s=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x01 ) << 3 ) ) & 0xff));
-
- *ta++=s;
- if(ldx) {*ta++=s;ldx--;}
- }
-
- if(ldy) 
- {ldy--;
- for(TXU=g_x1;TXU<=g_x2;TXU++)
- *ta++=*(ta-(g_x2-g_x1));
- }
-
- }
-
- DefineTextureWnd();
-
- break;
- }
-
+ case 1:
+ if(GlobalTextIL)
+ {
+ unsigned int TXV,TXU,n_xi,n_yi;
+
+ wSRCPtr=psxVuw+palstart;
+ for(row=0;row<256;row++)
+ *px++=LPTCOL(*wSRCPtr++);
+
+ column=g_y2-ldy;
+ for(TXV=g_y1;TXV<=column;TXV++)
+ {
+ ldx=ldxo;
+ for(TXU=g_x1;TXU<=g_x2-ldxo;TXU++)
+ {
+ 		 n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
+		 n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
+
+ s=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x01 ) << 3 ) ) & 0xff));
+
+ *ta++=s;
+ if(ldx) {*ta++=s;ldx--;}
+ }
+
+ if(ldy) 
+ {ldy--;
+ for(TXU=g_x1;TXU<=g_x2;TXU++)
+ *ta++=*(ta-(g_x2-g_x1));
+ }
+
+ }
+
+ DefineTextureWnd();
+
+ break;
+ }
+
 start=((pageid-16*pmult)*128)+256*2048*pmult;
-
+
 // not using a lookup table here... speeds up smaller texture areas
 cSRCPtr = psxVub + start + (2048*g_y1) + g_x1;
 LineOffset = 2048 - (g_x2-g_x1+1) +ldxo; 
@@ -1159,53 +1167,53 @@
 {
 //--------------------------------------------------// 
 // 4bit texture load ..
- case 0:
- //------------------- ZN STUFF
-
- if(GlobalTextIL)
- {
- unsigned int TXV,TXU,n_xi,n_yi;
-
- wSRCPtr=psxVuw+palstart;
-
- row=4;do
- {
- *px =LTCOL(*wSRCPtr);
- *(px+1)=LTCOL(*(wSRCPtr+1));
- *(px+2)=LTCOL(*(wSRCPtr+2));
- *(px+3)=LTCOL(*(wSRCPtr+3));
- row--;px+=4;wSRCPtr+=4;
- }
- while (row);
-
- column=g_y2-ldy;
- for(TXV=g_y1;TXV<=column;TXV++)
- {
- ldx=ldxo;
- for(TXU=g_x1;TXU<=g_x2-ldxo;TXU++)
- {
- 		 n_xi = ( ( TXU >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
-		 n_yi = ( TXV & ~0xf ) + ( ( TXU >> 4 ) & 0xf );
-
- s=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x03 ) << 2 ) ) & 0x0f ));
- *ta++=s;
-
- if(ldx) {*ta++=s;ldx--;}
- }
-
- if(ldy) 
- {ldy--;
- for(TXU=g_x1;TXU<=g_x2;TXU++)
- *ta++=*(ta-(g_x2-g_x1));
- }
- }
-
- DefineTextureWnd();
-
- break;
- }
-
- //-------------------
+ case 0:
+ //------------------- ZN STUFF
+
+ if(GlobalTextIL)
+ {
+ unsigned int TXV,TXU,n_xi,n_yi;
+
+ wSRCPtr=psxVuw+palstart;
+
+ row=4;do
+ {
+ *px =LTCOL(*wSRCPtr);
+ *(px+1)=LTCOL(*(wSRCPtr+1));
+ *(px+2)=LTCOL(*(wSRCPtr+2));
+ *(px+3)=LTCOL(*(wSRCPtr+3));
+ row--;px+=4;wSRCPtr+=4;
+ }
+ while (row);
+
+ column=g_y2-ldy;
+ for(TXV=g_y1;TXV<=column;TXV++)
+ {
+ ldx=ldxo;
+ for(TXU=g_x1;TXU<=g_x2-ldxo;TXU++)
+ {
+ 		 n_xi = ( ( TXU >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
+		 n_yi = ( TXV & ~0xf ) + ( ( TXU >> 4 ) & 0xf );
+
+ s=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x03 ) << 2 ) ) & 0x0f ));
+ *ta++=s;
+
+ if(ldx) {*ta++=s;ldx--;}
+ }
+
+ if(ldy) 
+ {ldy--;
+ for(TXU=g_x1;TXU<=g_x2;TXU++)
+ *ta++=*(ta-(g_x2-g_x1));
+ }
+ }
+
+ DefineTextureWnd();
+
+ break;
+ }
+
+ //-------------------
 
 start=((pageid-16*pmult)*128)+256*2048*pmult;
 // convert CLUT to 32bits .. and then use THAT as a lookup table
@@ -1245,51 +1253,51 @@
 break;
 //--------------------------------------------------//
 // 8bit texture load ..
- case 1:
- //------------ ZN STUFF
- if(GlobalTextIL)
- {
- unsigned int TXV,TXU,n_xi,n_yi;
-
- wSRCPtr=psxVuw+palstart;
-
- row=64;do
- {
- *px =LTCOL(*wSRCPtr);
- *(px+1)=LTCOL(*(wSRCPtr+1));
- *(px+2)=LTCOL(*(wSRCPtr+2));
- *(px+3)=LTCOL(*(wSRCPtr+3));
- row--;px+=4;wSRCPtr+=4;
- }
- while (row);
-
- column=g_y2-ldy;
- for(TXV=g_y1;TXV<=column;TXV++)
- {
- ldx=ldxo;
- for(TXU=g_x1;TXU<=g_x2-ldxo;TXU++)
- {
- 		 n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
-		 n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
-
- s=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x01 ) << 3 ) ) & 0xff));
- *ta++=s;
- if(ldx) {*ta++=s;ldx--;}
- }
-
- if(ldy) 
- {ldy--;
- for(TXU=g_x1;TXU<=g_x2;TXU++)
- *ta++=*(ta-(g_x2-g_x1));
- }
-
- }
-
- DefineTextureWnd();
-
- break;
- }
- //------------
+ case 1:
+ //------------ ZN STUFF
+ if(GlobalTextIL)
+ {
+ unsigned int TXV,TXU,n_xi,n_yi;
+
+ wSRCPtr=psxVuw+palstart;
+
+ row=64;do
+ {
+ *px =LTCOL(*wSRCPtr);
+ *(px+1)=LTCOL(*(wSRCPtr+1));
+ *(px+2)=LTCOL(*(wSRCPtr+2));
+ *(px+3)=LTCOL(*(wSRCPtr+3));
+ row--;px+=4;wSRCPtr+=4;
+ }
+ while (row);
+
+ column=g_y2-ldy;
+ for(TXV=g_y1;TXV<=column;TXV++)
+ {
+ ldx=ldxo;
+ for(TXU=g_x1;TXU<=g_x2-ldxo;TXU++)
+ {
+ 		 n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
+		 n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
+
+ s=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x01 ) << 3 ) ) & 0xff));
+ *ta++=s;
+ if(ldx) {*ta++=s;ldx--;}
+ }
+
+ if(ldy) 
+ {ldy--;
+ for(TXU=g_x1;TXU<=g_x2;TXU++)
+ *ta++=*(ta-(g_x2-g_x1));
+ }
+
+ }
+
+ DefineTextureWnd();
+
+ break;
+ }
+ //------------
 
 start=((pageid-16*pmult)*128)+256*2048*pmult; 
 
@@ -1367,30 +1375,30 @@
 {
 //--------------------------------------------------// 
 // 4bit texture load ..
- case 0:
- if(GlobalTextIL)
- {
- unsigned int TXV,TXU,n_xi,n_yi;
-
- wSRCPtr=psxVuw+palstart;
- for(row=0;row<16;row++)
- *px++=LPTCOL(*wSRCPtr++);
-
- for(TXV=g_y1;TXV<=g_y2;TXV++)
- {
- for(TXU=g_x1;TXU<=g_x2;TXU++)
- {
- 		 n_xi = ( ( TXU >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
-		 n_yi = ( TXV & ~0xf ) + ( ( TXU >> 4 ) & 0xf );
-
- *ta++=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x03 ) << 2 ) ) & 0x0f ));
- }
- }
-
- DefineTextureWnd();
-
- break;
- }
+ case 0:
+ if(GlobalTextIL)
+ {
+ unsigned int TXV,TXU,n_xi,n_yi;
+
+ wSRCPtr=psxVuw+palstart;
+ for(row=0;row<16;row++)
+ *px++=LPTCOL(*wSRCPtr++);
+
+ for(TXV=g_y1;TXV<=g_y2;TXV++)
+ {
+ for(TXU=g_x1;TXU<=g_x2;TXU++)
+ {
+ 		 n_xi = ( ( TXU >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
+		 n_yi = ( TXV & ~0xf ) + ( ( TXU >> 4 ) & 0xf );
+
+ *ta++=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x03 ) << 2 ) ) & 0x0f ));
+ }
+ }
+
+ DefineTextureWnd();
+
+ break;
+ }
 
 start=((pageid-16*pmult)*128)+256*2048*pmult;
 
@@ -1421,30 +1429,30 @@
 break;
 //--------------------------------------------------// 
 // 8bit texture load ..
- case 1:
- if(GlobalTextIL)
- {
- unsigned int TXV,TXU,n_xi,n_yi;
-
- wSRCPtr=psxVuw+palstart;
- for(row=0;row<256;row++)
- *px++=LPTCOL(*wSRCPtr++);
-
- for(TXV=g_y1;TXV<=g_y2;TXV++)
- {
- for(TXU=g_x1;TXU<=g_x2;TXU++)
- {
- 		 n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
-		 n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
-
- *ta++=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x01 ) << 3 ) ) & 0xff));
- }
- }
-
- DefineTextureWnd();
-
- break;
- }
+ case 1:
+ if(GlobalTextIL)
+ {
+ unsigned int TXV,TXU,n_xi,n_yi;
+
+ wSRCPtr=psxVuw+palstart;
+ for(row=0;row<256;row++)
+ *px++=LPTCOL(*wSRCPtr++);
+
+ for(TXV=g_y1;TXV<=g_y2;TXV++)
+ {
+ for(TXU=g_x1;TXU<=g_x2;TXU++)
+ {
+ 		 n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
+		 n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
+
+ *ta++=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x01 ) << 3 ) ) & 0xff));
+ }
+ }
+
+ DefineTextureWnd();
+
+ break;
+ }
 
 start=((pageid-16*pmult)*128)+256*2048*pmult;
 
@@ -1509,39 +1517,39 @@
 {
 //--------------------------------------------------// 
 // 4bit texture load ..
- case 0:
- if(GlobalTextIL)
- {
- unsigned int TXV,TXU,n_xi,n_yi;
-
- wSRCPtr=psxVuw+palstart;
-
- row=4;do
- {
- *px =LTCOL(*wSRCPtr);
- *(px+1)=LTCOL(*(wSRCPtr+1));
- *(px+2)=LTCOL(*(wSRCPtr+2));
- *(px+3)=LTCOL(*(wSRCPtr+3));
- row--;px+=4;wSRCPtr+=4;
- }
- while (row);
-
- for(TXV=g_y1;TXV<=g_y2;TXV++)
- {
- for(TXU=g_x1;TXU<=g_x2;TXU++)
- {
- 		 n_xi = ( ( TXU >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
-		 n_yi = ( TXV & ~0xf ) + ( ( TXU >> 4 ) & 0xf );
-
- *ta++=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x03 ) << 2 ) ) & 0x0f ));
- }
- }
-
- DefineTextureWnd();
-
- break;
- }
-
+ case 0:
+ if(GlobalTextIL)
+ {
+ unsigned int TXV,TXU,n_xi,n_yi;
+
+ wSRCPtr=psxVuw+palstart;
+
+ row=4;do
+ {
+ *px =LTCOL(*wSRCPtr);
+ *(px+1)=LTCOL(*(wSRCPtr+1));
+ *(px+2)=LTCOL(*(wSRCPtr+2));
+ *(px+3)=LTCOL(*(wSRCPtr+3));
+ row--;px+=4;wSRCPtr+=4;
+ }
+ while (row);
+
+ for(TXV=g_y1;TXV<=g_y2;TXV++)
+ {
+ for(TXU=g_x1;TXU<=g_x2;TXU++)
+ {
+ 		 n_xi = ( ( TXU >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
+		 n_yi = ( TXV & ~0xf ) + ( ( TXU >> 4 ) & 0xf );
+
+ *ta++=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x03 ) << 2 ) ) & 0x0f ));
+ }
+ }
+
+ DefineTextureWnd();
+
+ break;
+ }
+
 start=((pageid-16*pmult)*128)+256*2048*pmult;
 
 // convert CLUT to 32bits .. and then use THAT as a lookup table
@@ -1571,39 +1579,39 @@
 break;
 //--------------------------------------------------//
 // 8bit texture load ..
- case 1:
- if(GlobalTextIL)
- {
- unsigned int TXV,TXU,n_xi,n_yi;
-
- wSRCPtr=psxVuw+palstart;
-
- row=64;do
- {
- *px =LTCOL(*wSRCPtr);
- *(px+1)=LTCOL(*(wSRCPtr+1));
- *(px+2)=LTCOL(*(wSRCPtr+2));
- *(px+3)=LTCOL(*(wSRCPtr+3));
- row--;px+=4;wSRCPtr+=4;
- }
- while (row);
-
- for(TXV=g_y1;TXV<=g_y2;TXV++)
- {
- for(TXU=g_x1;TXU<=g_x2;TXU++)
- {
- 		 n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
-		 n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
-
- *ta++=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x01 ) << 3 ) ) & 0xff));
- }
- }
-
- DefineTextureWnd();
-
- break;
- }
-
+ case 1:
+ if(GlobalTextIL)
+ {
+ unsigned int TXV,TXU,n_xi,n_yi;
+
+ wSRCPtr=psxVuw+palstart;
+
+ row=64;do
+ {
+ *px =LTCOL(*wSRCPtr);
+ *(px+1)=LTCOL(*(wSRCPtr+1));
+ *(px+2)=LTCOL(*(wSRCPtr+2));
+ *(px+3)=LTCOL(*(wSRCPtr+3));
+ row--;px+=4;wSRCPtr+=4;
+ }
+ while (row);
+
+ for(TXV=g_y1;TXV<=g_y2;TXV++)
+ {
+ for(TXU=g_x1;TXU<=g_x2;TXU++)
+ {
+ 		 n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
+		 n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
+
+ *ta++=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x01 ) << 3 ) ) & 0xff));
+ }
+ }
+
+ DefineTextureWnd();
+
+ break;
+ }
+
 start=((pageid-16*pmult)*128)+256*2048*pmult;
 
 // not using a lookup table here... speeds up smaller texture areas
@@ -1707,7 +1715,7 @@
 uint32_t start,row,column,j,sxh,sxm;
 unsigned char *ta;
 unsigned char *cSRCPtr;
- uint32_t LineOffset;
+ uint32_t LineOffset;
 int pmult = pageid / 16;
 
 ta = (unsigned char *)texturepart;
@@ -1716,8 +1724,8 @@
 {
 //--------------------------------------------------// 
 // 4bit texture load ..
- case 0:
- start=((pageid-16*pmult)*128)+256*2048*pmult;
+ case 0:
+ start=((pageid-16*pmult)*128)+256*2048*pmult;
 
 sxm=g_x1&1;sxh=g_x1>>1;
 if(sxm) j=g_x1+1; else j=g_x1;
@@ -1740,7 +1748,7 @@
 break;
 //--------------------------------------------------// 
 // 8bit texture load ..
- case 1:
+ case 1:
 start=((pageid-16*pmult)*128)+256*2048*pmult;
 
 // not using a lookup table here... speeds up smaller texture areas
@@ -1768,7 +1776,7 @@
 unsigned char *ta,s;
 unsigned char *cSRCPtr,*cOSRCPtr;
 uint32_t LineOffset;
- int pmult = pageid / 16;
+ int pmult = pageid / 16;
 
 ldxo = TWin.Position.x1-TWin.OPosition.x1;
 ldy = TWin.Position.y1-TWin.OPosition.y1;
@@ -1780,7 +1788,7 @@
 //--------------------------------------------------// 
 // 4bit texture load ..
 case 0:
- start=((pageid-16*pmult)*128)+256*2048*pmult;
+ start=((pageid-16*pmult)*128)+256*2048*pmult;
 
 sxm=g_x1&1;sxh=g_x1>>1;
 if(sxm) j=g_x1+1; else j=g_x1;
@@ -1813,8 +1821,8 @@
 break;
 //--------------------------------------------------// 
 // 8bit texture load ..
- case 1:
- start=((pageid-16*pmult)*128)+256*2048*pmult;
+ case 1:
+ start=((pageid-16*pmult)*128)+256*2048*pmult;
 
 cSRCPtr = psxVub + start + (2048*g_y1) + g_x1;
 LineOffset = 2048 - (g_x2-g_x1+1) +ldxo; 
@@ -1863,7 +1871,7 @@
 cx = ((GivenClutId << 4) & 0x3F0);
 cy = ((GivenClutId >> 6) & CLUTYMASK);
 GivenClutId = (GivenClutId & CLUTMASK) | (DrawSemiTrans << 30);
-
+
 // palette check sum
 {
 uint32_t l = 0,row;
@@ -2122,7 +2130,7 @@
 {
 pD=(unsigned char *)&psxVuw[startxy];
 startxy+=1024;
-
+
 for(row=xrMovieArea.x0;row<sx0;row+=2)
 {
 lu1=*((uint32_t *)pD);pD+=3;
@@ -2137,7 +2145,7 @@
 {
 lu1=*((uint32_t *)pD);
 *ta++=XMBLUE(lu1)|XMGREEN(lu1)|XMRED(lu1)|1;
- }
+ }
 }
 }
 else
@@ -2531,7 +2539,7 @@
 if(bFakeFrontBuffer) bIgnoreNextTile=TRUE;
 CheckVRamReadEx(x1,y1,x1+x2,y1+y2);
 return 0;
- }
+ }
 
 /////////////////////////
 
@@ -2723,36 +2731,36 @@
 {
 //--------------------------------------------------// 
 // 4bit texture load ..
- case 0:
- if(GlobalTextIL)
- {
- unsigned int TXV,TXU,n_xi,n_yi;
-
- wSRCPtr=psxVuw+palstart;
-
- row=4;do
- {
- *px =LTCOL(*wSRCPtr);
- *(px+1)=LTCOL(*(wSRCPtr+1));
- *(px+2)=LTCOL(*(wSRCPtr+2));
- *(px+3)=LTCOL(*(wSRCPtr+3));
- row--;px+=4;wSRCPtr+=4;
- }
- while (row);
-
- for(TXV=y1;TXV<=y2;TXV++)
- {
- for(TXU=x1;TXU<=x2;TXU++)
- {
- 		 n_xi = ( ( TXU >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
-		 n_yi = ( TXV & ~0xf ) + ( ( TXU >> 4 ) & 0xf );
-
- *ta++=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x03 ) << 2 ) ) & 0x0f ));
- }
- ta+=xalign;
- }
- break;
- }
+ case 0:
+ if(GlobalTextIL)
+ {
+ unsigned int TXV,TXU,n_xi,n_yi;
+
+ wSRCPtr=psxVuw+palstart;
+
+ row=4;do
+ {
+ *px =LTCOL(*wSRCPtr);
+ *(px+1)=LTCOL(*(wSRCPtr+1));
+ *(px+2)=LTCOL(*(wSRCPtr+2));
+ *(px+3)=LTCOL(*(wSRCPtr+3));
+ row--;px+=4;wSRCPtr+=4;
+ }
+ while (row);
+
+ for(TXV=y1;TXV<=y2;TXV++)
+ {
+ for(TXU=x1;TXU<=x2;TXU++)
+ {
+ 		 n_xi = ( ( TXU >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
+		 n_yi = ( TXV & ~0xf ) + ( ( TXU >> 4 ) & 0xf );
+
+ *ta++=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x03 ) << 2 ) ) & 0x0f ));
+ }
+ ta+=xalign;
+ }
+ break;
+ }
 
 start=((pageid-16*pmult)<<7)+524288*pmult;
 // convert CLUT to 32bits .. and then use THAT as a lookup table
@@ -2797,37 +2805,37 @@
 break;
 //--------------------------------------------------// 
 // 8bit texture load ..
- case 1:
- if(GlobalTextIL)
- {
- unsigned int TXV,TXU,n_xi,n_yi;
-
- wSRCPtr=psxVuw+palstart;
-
- row=64;do
- {
- *px =LTCOL(*wSRCPtr);
- *(px+1)=LTCOL(*(wSRCPtr+1));
- *(px+2)=LTCOL(*(wSRCPtr+2));
- *(px+3)=LTCOL(*(wSRCPtr+3));
- row--;px+=4;wSRCPtr+=4;
- }
- while (row);
-
- for(TXV=y1;TXV<=y2;TXV++)
- {
- for(TXU=x1;TXU<=x2;TXU++)
- {
- 		 n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
-		 n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
-
- *ta++=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x01 ) << 3 ) ) & 0xff));
- }
- ta+=xalign;
- }
-
- break;
- }
+ case 1:
+ if(GlobalTextIL)
+ {
+ unsigned int TXV,TXU,n_xi,n_yi;
+
+ wSRCPtr=psxVuw+palstart;
+
+ row=64;do
+ {
+ *px =LTCOL(*wSRCPtr);
+ *(px+1)=LTCOL(*(wSRCPtr+1));
+ *(px+2)=LTCOL(*(wSRCPtr+2));
+ *(px+3)=LTCOL(*(wSRCPtr+3));
+ row--;px+=4;wSRCPtr+=4;
+ }
+ while (row);
+
+ for(TXV=y1;TXV<=y2;TXV++)
+ {
+ for(TXU=x1;TXU<=x2;TXU++)
+ {
+ 		 n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
+		 n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
+
+ *ta++=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x01 ) << 3 ) ) & 0xff));
+ }
+ ta+=xalign;
+ }
+
+ break;
+ }
 
 start=((pageid-16*pmult)<<7)+524288*pmult;
 
@@ -3049,9 +3057,9 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
-//
-// load texture part (packed)
-//
+//
+// load texture part (packed)
+//
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
@@ -3091,35 +3099,35 @@
 {
 //--------------------------------------------------// 
 // 4bit texture load ..
- case 0:
- if(GlobalTextIL)
- {
- unsigned int TXV,TXU,n_xi,n_yi;
-
- wSRCPtr=psxVuw+palstart;
- row=4;do
- {
- *px =LPTCOL(*wSRCPtr);
- *(px+1)=LPTCOL(*(wSRCPtr+1));
- *(px+2)=LPTCOL(*(wSRCPtr+2));
- *(px+3)=LPTCOL(*(wSRCPtr+3));
- row--;px+=4;wSRCPtr+=4;
- }
- while (row);
-
- for(TXV=y1;TXV<=y2;TXV++)
- {
- for(TXU=x1;TXU<=x2;TXU++)
- {
- 		 n_xi = ( ( TXU >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
-		 n_yi = ( TXV & ~0xf ) + ( ( TXU >> 4 ) & 0xf );
-
- *ta++=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x03 ) << 2 ) ) & 0x0f ));
- }
- ta+=xalign;
- }
- break;
- }
+ case 0:
+ if(GlobalTextIL)
+ {
+ unsigned int TXV,TXU,n_xi,n_yi;
+
+ wSRCPtr=psxVuw+palstart;
+ row=4;do
+ {
+ *px =LPTCOL(*wSRCPtr);
+ *(px+1)=LPTCOL(*(wSRCPtr+1));
+ *(px+2)=LPTCOL(*(wSRCPtr+2));
+ *(px+3)=LPTCOL(*(wSRCPtr+3));
+ row--;px+=4;wSRCPtr+=4;
+ }
+ while (row);
+
+ for(TXV=y1;TXV<=y2;TXV++)
+ {
+ for(TXU=x1;TXU<=x2;TXU++)
+ {
+ 		 n_xi = ( ( TXU >> 2 ) & ~0x3c ) + ( ( TXV << 2 ) & 0x3c );
+		 n_yi = ( TXV & ~0xf ) + ( ( TXU >> 4 ) & 0xf );
+
+ *ta++=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x03 ) << 2 ) ) & 0x0f ));
+ }
+ ta+=xalign;
+ }
+ break;
+ }
 
 start=((pageid-16*pmult)<<7)+524288*pmult;
 
@@ -3162,37 +3170,37 @@
 break;
 //--------------------------------------------------// 
 // 8bit texture load ..
- case 1:
- if(GlobalTextIL)
- {
- unsigned int TXV,TXU,n_xi,n_yi;
-
- wSRCPtr=psxVuw+palstart;
-
- row=64;do
- {
- *px =LPTCOL(*wSRCPtr);
- *(px+1)=LPTCOL(*(wSRCPtr+1));
- *(px+2)=LPTCOL(*(wSRCPtr+2));
- *(px+3)=LPTCOL(*(wSRCPtr+3));
- row--;px+=4;wSRCPtr+=4;
- }
- while (row);
-
- for(TXV=y1;TXV<=y2;TXV++)
- {
- for(TXU=x1;TXU<=x2;TXU++)
- {
- 		 n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
-		 n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
-
- *ta++=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x01 ) << 3 ) ) & 0xff));
- }
- ta+=xalign;
- }
-
- break;
- }
+ case 1:
+ if(GlobalTextIL)
+ {
+ unsigned int TXV,TXU,n_xi,n_yi;
+
+ wSRCPtr=psxVuw+palstart;
+
+ row=64;do
+ {
+ *px =LPTCOL(*wSRCPtr);
+ *(px+1)=LPTCOL(*(wSRCPtr+1));
+ *(px+2)=LPTCOL(*(wSRCPtr+2));
+ *(px+3)=LPTCOL(*(wSRCPtr+3));
+ row--;px+=4;wSRCPtr+=4;
+ }
+ while (row);
+
+ for(TXV=y1;TXV<=y2;TXV++)
+ {
+ for(TXU=x1;TXU<=x2;TXU++)
+ {
+ 		 n_xi = ( ( TXU >> 1 ) & ~0x78 ) + ( ( TXU << 2 ) & 0x40 ) + ( ( TXV << 3 ) & 0x38 );
+		 n_yi = ( TXV & ~0x7 ) + ( ( TXU >> 5 ) & 0x7 );
+
+ *ta++=*(pa+((*( psxVuw + ((GlobalTextAddrY + n_yi)*1024) + GlobalTextAddrX + n_xi ) >> ( ( TXU & 0x01 ) << 3 ) ) & 0xff));
+ }
+ ta+=xalign;
+ }
+
+ break;
+ }
 
 start=((pageid-16*pmult)<<7)+524288*pmult;
 
@@ -3425,17 +3433,17 @@
 }
 
 /////////////////////////////////////////////////////////////////////////////
-
-/////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////
-//
-// hires texture funcs
-//
-/////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////
-
+
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+//
+// hires texture funcs
+//
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+
 
 #define GET_RESULT(A, B, C, D) ((A != C || A != D) - (B != C || B != D))
 
@@ -4056,12 +4064,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
-//
-// ogl texture defines
-//
-/////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////
+//
+// ogl texture defines
+//
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
 
 void DefineSubTextureSortHiRes(void)
 {
@@ -4193,16 +4201,16 @@
 }
 
 /////////////////////////////////////////////////////////////////////////////
-
-/////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////
-//
-// texture cache garbage collection
-//
-/////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////
+
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+//
+// texture cache garbage collection
+//
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
 
 void DoTexGarbageCollection(void)
 {
@@ -4240,15 +4248,15 @@
 usLRUTexPage=LRUCleaned;
 }
 
-/////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////
-//
-// search cache for existing (already used) parts
-//
-/////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+//
+// search cache for existing (already used) parts
+//
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
 
 unsigned char * CheckTextureInSubSCache(int TextureMode, uint32_t GivenClutId, unsigned short * pCache)
 {
@@ -4472,7 +4480,7 @@
 if(ul)
 {
 //////////////////////////////////////////////////////
-
+
 {
 dwTexPageComp=0;
 
@@ -4548,15 +4556,15 @@
 return &tsx->Opaque;
 }
 
-/////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////
-//
-// search cache for free place (on compress)
-//
-/////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+//
+// search cache for free place (on compress)
+//
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
 
 BOOL GetCompressTexturePlace(textureSubCacheEntryS * tsx)
 {
@@ -4619,7 +4627,7 @@
 rfree=*ul;
 mx=ul->c[2]-2;
 my=ul->c[0]-2;
-
+
 if(rx<mx && ry<my)
 {
 ul->c[3]+=rx;
@@ -4683,15 +4691,15 @@
 return TRUE;
 }
 
-/////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////
-//
-// compress texture cache (to make place for new texture part, if needed)
-//
-/////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+//
+// compress texture cache (to make place for new texture part, if needed)
+//
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
 
 void CompressTextureSpace(void)
 {
@@ -4746,14 +4754,14 @@
 tsb->ClutID=0;
 }
 }
-
+
 // if(r.l!=tsx->pos.l)
 {
 cx=((tsx->ClutID << 4) & 0x3F0); 
 cy=((tsx->ClutID >> 6) & CLUTYMASK);
 
 if(j!=2)
- {
+ {
 // palette check sum
 l=0;lSRCPtr=(uint32_t *)(psxVuw+cx+(cy*1024));
 if(j==1) for(row=1;row<129;row++) l+=((*lSRCPtr++)-1)*row;
@@ -4766,9 +4774,9 @@
 }
 
 tsx->pos.l=r.l;
- if(!GetCompressTexturePlace(tsx)) // no place?
+ if(!GetCompressTexturePlace(tsx)) // no place?
 {
- for(i=0;i<3;i++) // -> clean up everything
+ for(i=0;i<3;i++) // -> clean up everything
 for(j=0;j<MAXTPAGES;j++)
 {
 tsb=pscSubtexStore[i][j];
@@ -4818,21 +4826,21 @@
 DrawSemiTrans=sOldDST;
 }
 
-/////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////
-//
-// main entry for searching/creating textures, called from prim.c
-//
-/////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+//
+// main entry for searching/creating textures, called from prim.c
+//
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
 
 GLuint SelectSubTextureS(int TextureMode, uint32_t GivenClutId) 
 {
 unsigned char * OPtr;unsigned short iCache;short cx,cy;
-
- // sort sow/tow infos for fast access
+
+ // sort sow/tow infos for fast access
 
 unsigned char ma1,ma2,mi1,mi2;
 if(gl_ux[0]>gl_ux[1]) {mi1=gl_ux[1];ma1=gl_ux[0];}
@@ -4852,10 +4860,10 @@
 else gl_ux[5]=mi1;
 if(ma1>ma2) gl_ux[4]=ma1; 
 else gl_ux[4]=ma2;
-
- // get clut infos in one 32 bit val
 
- if(TextureMode==2) // no clut here
+ // get clut infos in one 32 bit val
+
+ if(TextureMode==2) // no clut here
 {
 GivenClutId=CLUTUSED|(DrawSemiTrans<<30);cx=cy=0;
 
@@ -4867,7 +4875,7 @@
 cx=((GivenClutId << 4) & 0x3F0); // but here
 cy=((GivenClutId >> 6) & CLUTYMASK);
 GivenClutId=(GivenClutId&CLUTMASK)|(DrawSemiTrans<<30)|CLUTUSED;
-
+
 // palette check sum.. removed MMX asm, this easy func works as well
 {
 uint32_t l=0,row;
@@ -4880,22 +4888,22 @@
 }
 
 }
-
+
 // search cache
 iCache=0;
- OPtr=CheckTextureInSubSCache(TextureMode,GivenClutId,&iCache);
-
+ OPtr=CheckTextureInSubSCache(TextureMode,GivenClutId,&iCache);
+
 // cache full? compress and try again
 if(iCache==0xffff)
 {
 CompressTextureSpace();
 OPtr=CheckTextureInSubSCache(TextureMode,GivenClutId,&iCache);
- }
-
+ }
+
 // found? fine
 usLRUTexPage=iCache;
- if(!OPtr) return uiStexturePage[iCache];
-
+ if(!OPtr) return uiStexturePage[iCache];
+
 // not found? upload texture and store infos in cache
 gTexName=uiStexturePage[iCache];
 LoadSubTexFn(GlobalTexturePage,TextureMode,cx,cy);

pcsxr-1.9.92.tar.bz2/plugins/peopsxgl/texture.h -> pcsxr-1.9.93.tar.bz2/plugins/peopsxgl/texture.h Changed

@@ -1,68 +1,68 @@
-/***************************************************************************
-                          texture.h  -  description
-                             -------------------
-    begin                : Sun Mar 08 2009
-    copyright            : (C) 1999-2009 by Pete Bernert
-    web                  : www.pbernert.com   
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version. See also the license.txt file for *
- *   additional informations.                                              *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef _GPU_TEXTURE_H_
-#define _GPU_TEXTURE_H_
-
-#define TEXTUREPAGESIZE 256 * 256
-
-void           InitializeTextureStore();
-void           CleanupTextureStore();
-GLuint         LoadTextureWnd(int pageid, int TextureMode, uint32_t GivenClutId);
-GLuint         LoadTextureMovie(void);
-void           InvalidateTextureArea(int imageX0, int imageY0, int imageX1, int imageY1);
-void           InvalidateTextureAreaEx(void);
-void           LoadTexturePage(int pageid, int mode, short cx, short cy);
-void           ResetTextureArea(BOOL bDelTex);
-GLuint         SelectSubTextureS(int TextureMode, uint32_t GivenClutId);
-void           CheckTextureMemory(void);
-
-void           LoadSubTexturePage(int pageid, int mode, short cx, short cy);
-void           LoadSubTexturePageSort(int pageid, int mode, short cx, short cy);
-void           LoadPackedSubTexturePage(int pageid, int mode, short cx, short cy);
-void           LoadPackedSubTexturePageSort(int pageid, int mode, short cx, short cy);
-uint32_t       XP8RGBA(uint32_t BGR);
-uint32_t       XP8RGBAEx(uint32_t BGR);
-uint32_t       XP8RGBA_0(uint32_t BGR);
-uint32_t       XP8RGBAEx_0(uint32_t BGR);
-uint32_t       XP8BGRA_0(uint32_t BGR);
-uint32_t       XP8BGRAEx_0(uint32_t BGR);
-uint32_t       XP8RGBA_1(uint32_t BGR);
-uint32_t       XP8RGBAEx_1(uint32_t BGR);
-uint32_t       XP8BGRA_1(uint32_t BGR);
-uint32_t       XP8BGRAEx_1(uint32_t BGR);
-uint32_t       P8RGBA(uint32_t BGR);
-uint32_t       P8BGRA(uint32_t BGR);
-uint32_t       CP8RGBA_0(uint32_t BGR);
-uint32_t       CP8RGBAEx_0(uint32_t BGR);
-uint32_t       CP8BGRA_0(uint32_t BGR);
-uint32_t       CP8BGRAEx_0(uint32_t BGR);
-uint32_t       CP8RGBA(uint32_t BGR);
-uint32_t       CP8RGBAEx(uint32_t BGR);
-unsigned short XP5RGBA (unsigned short BGR);
-unsigned short XP5RGBA_0 (unsigned short BGR);
-unsigned short XP5RGBA_1 (unsigned short BGR);
-unsigned short P5RGBA (unsigned short BGR);
-unsigned short CP5RGBA_0 (unsigned short BGR);
-unsigned short XP4RGBA (unsigned short BGR);
-unsigned short XP4RGBA_0 (unsigned short BGR);
-unsigned short XP4RGBA_1 (unsigned short BGR);
-unsigned short P4RGBA (unsigned short BGR);
-unsigned short CP4RGBA_0 (unsigned short BGR);
-
-#endif // _TEXTURE_H_
+/***************************************************************************
+                          texture.h  -  description
+                             -------------------
+    begin                : Sun Mar 08 2009
+    copyright            : (C) 1999-2009 by Pete Bernert
+    web                  : www.pbernert.com   
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef _GPU_TEXTURE_H_
+#define _GPU_TEXTURE_H_
+
+#define TEXTUREPAGESIZE 256 * 256
+
+void           InitializeTextureStore();
+void           CleanupTextureStore();
+GLuint         LoadTextureWnd(int pageid, int TextureMode, uint32_t GivenClutId);
+GLuint         LoadTextureMovie(void);
+void           InvalidateTextureArea(int imageX0, int imageY0, int imageX1, int imageY1);
+void           InvalidateTextureAreaEx(void);
+void           LoadTexturePage(int pageid, int mode, short cx, short cy);
+void           ResetTextureArea(BOOL bDelTex);
+GLuint         SelectSubTextureS(int TextureMode, uint32_t GivenClutId);
+void           CheckTextureMemory(void);
+
+void           LoadSubTexturePage(int pageid, int mode, short cx, short cy);
+void           LoadSubTexturePageSort(int pageid, int mode, short cx, short cy);
+void           LoadPackedSubTexturePage(int pageid, int mode, short cx, short cy);
+void           LoadPackedSubTexturePageSort(int pageid, int mode, short cx, short cy);
+uint32_t       XP8RGBA(uint32_t BGR);
+uint32_t       XP8RGBAEx(uint32_t BGR);
+uint32_t       XP8RGBA_0(uint32_t BGR);
+uint32_t       XP8RGBAEx_0(uint32_t BGR);
+uint32_t       XP8BGRA_0(uint32_t BGR);
+uint32_t       XP8BGRAEx_0(uint32_t BGR);
+uint32_t       XP8RGBA_1(uint32_t BGR);
+uint32_t       XP8RGBAEx_1(uint32_t BGR);
+uint32_t       XP8BGRA_1(uint32_t BGR);
+uint32_t       XP8BGRAEx_1(uint32_t BGR);
+uint32_t       P8RGBA(uint32_t BGR);
+uint32_t       P8BGRA(uint32_t BGR);
+uint32_t       CP8RGBA_0(uint32_t BGR);
+uint32_t       CP8RGBAEx_0(uint32_t BGR);
+uint32_t       CP8BGRA_0(uint32_t BGR);
+uint32_t       CP8BGRAEx_0(uint32_t BGR);
+uint32_t       CP8RGBA(uint32_t BGR);
+uint32_t       CP8RGBAEx(uint32_t BGR);
+unsigned short XP5RGBA (unsigned short BGR);
+unsigned short XP5RGBA_0 (unsigned short BGR);
+unsigned short XP5RGBA_1 (unsigned short BGR);
+unsigned short P5RGBA (unsigned short BGR);
+unsigned short CP5RGBA_0 (unsigned short BGR);
+unsigned short XP4RGBA (unsigned short BGR);
+unsigned short XP4RGBA_0 (unsigned short BGR);
+unsigned short XP4RGBA_1 (unsigned short BGR);
+unsigned short P4RGBA (unsigned short BGR);
+unsigned short CP4RGBA_0 (unsigned short BGR);
+
+#endif // _TEXTURE_H_

pcsxr-1.9.92.tar.bz2/po/LINGUAS -> pcsxr-1.9.93.tar.bz2/po/LINGUAS Changed

pcsxr-1.9.92.tar.bz2/po/Makefile.in.in -> pcsxr-1.9.93.tar.bz2/po/Makefile.in.in Changed

@@ -1,26 +1,31 @@
 # Makefile for program source directory in GNU NLS utilities package.
 # Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns@gmail.com>
 #
-# This file file be copied and used freely without restrictions. It can
-# be used in projects which are not available under the GNU Public License
+# This file may be copied and used freely without restrictions. It may
+# be used in projects which are not available under a GNU Public License,
 # but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
 #
 # - Modified by Owen Taylor <otaylor@redhat.com> to use GETTEXT_PACKAGE
 # instead of PACKAGE and to look for po2tbl in ./ not in intl/
 #
 # - Modified by jacob berkman <jacob@ximian.com> to install
 # Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
+#
+# - Modified by Rodney Dawes <dobey.pwns@gmail.com> for use with intltool
+#
+# We have the following line for use by intltoolize:
+# INTLTOOL_MAKEFILE
 
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 
-SHELL = /bin/sh
-@SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
+top_builddir = @top_builddir@
 VPATH = @srcdir@
 
 prefix = @prefix@
@@ -28,64 +33,60 @@
 datadir = @datadir@
 datarootdir = @datarootdir@
 libdir = @libdir@
-localedir = $(libdir)/locale
-gnulocaledir = $(datadir)/locale
-gettextsrcdir = $(datadir)/glib-2.0/gettext/po
+DATADIRNAME = @DATADIRNAME@
+itlocaledir = $(prefix)/$(DATADIRNAME)/locale
 subdir = po
+install_sh = @install_sh@
+# Automake >= 1.8 provides @mkdir_p@.
+# Until it can be supposed, use the safe fallback:
+mkdir_p = $(install_sh) -d
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
 
-CC = @CC@
-GENCAT = @GENCAT@
 GMSGFMT = @GMSGFMT@
 MSGFMT = @MSGFMT@
 XGETTEXT = @XGETTEXT@
-MSGMERGE = msgmerge
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
+GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
+
+ALL_LINGUAS = @ALL_LINGUAS@
 
-DEFS = @DEFS@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
+PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
 
-INCLUDES = -I.. -I$(top_srcdir)/intl
+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep '^$$lang$$' $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep '^$$lang$$'`"; then printf "$$lang "; fi; done; fi)
 
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
+USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
 
-SOURCES = 
-POFILES = @POFILES@
-GMOFILES = @GMOFILES@
-DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(GETTEXT_PACKAGE).pot \
-$(POFILES) $(GMOFILES) $(SOURCES)
+POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
+
+DISTFILES = Makefile.in.in POTFILES.in $(POFILES)
+EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS
 
 POTFILES = \
+# This comment gets stripped out
 
-CATALOGS = @CATALOGS@
-#CATOBJEXT = @CATOBJEXT@
-#INSTOBJEXT = @INSTOBJEXT@
-CATOBJEXT = .gmo
-INSTOBJEXT = .mo
+CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
 
 .SUFFIXES:
-.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
-
-.c.o:
-	$(COMPILE) $<
+.SUFFIXES: .po .pox .gmo .mo .msg .cat
 
 .po.pox:
 	$(MAKE) $(GETTEXT_PACKAGE).pot
-	$(MSGMERGE) $< $(srcdir)/$(GETTEXT_PACKAGE).pot -o $*.pox
+	$(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
 
 .po.mo:
 	$(MSGFMT) -o $@ $<
 
 .po.gmo:
-	file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
-	 && rm -f $$file && $(GMSGFMT) -c -o $$file $<
+	file=`echo $* | sed 's,.*/,,'`.gmo \
+	 && rm -f $$file && $(GMSGFMT) -o $$file $<
 
 .po.cat:
 	sed -f ../intl/po2msg.sed < $< > $*.msg \
-	 && rm -f $@ && $(GENCAT) $@ $*.msg
+	 && rm -f $@ && gencat $@ $*.msg
 
 
 all: all-@USE_NLS@
@@ -93,141 +94,94 @@
 all-yes: $(CATALOGS)
 all-no:
 
-$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES)
-	$(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) --directory=$(top_srcdir) \
-	 --add-comments --keyword=_ --keyword=N_ \
- --flag=g_strdup_printf:1:c-format \
- --flag=g_string_printf:2:c-format \
- --flag=g_string_append_printf:2:c-format \
- --flag=g_error_new:3:c-format \
- --flag=g_set_error:4:c-format \
- --flag=g_markup_printf_escaped:1:c-format \
- --flag=g_log:3:c-format \
- --flag=g_print:1:c-format \
- --flag=g_printerr:1:c-format \
- --flag=g_printf:1:c-format \
- --flag=g_fprintf:2:c-format \
- --flag=g_sprintf:2:c-format \
- --flag=g_snprintf:3:c-format \
- --flag=g_scanner_error:2:c-format \
- --flag=g_scanner_warn:2:c-format \
-	 --files-from=$(srcdir)/POTFILES.in \
-	&& test ! -f $(GETTEXT_PACKAGE).po \
-	 || ( rm -f $(srcdir)/$(GETTEXT_PACKAGE).pot \
-		&& mv $(GETTEXT_PACKAGE).po $(srcdir)/$(GETTEXT_PACKAGE).pot )
-
-install: install-exec install-data
-install-exec:
+$(GETTEXT_PACKAGE).pot: $(POTFILES)
+	$(GENPOT)
+
+install: install-data
 install-data: install-data-@USE_NLS@
 install-data-no: all
 install-data-yes: all
-	if test -r "$(MKINSTALLDIRS)"; then \
-	 $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
-	else \
-	 $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
-	fi
-	@catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	 cat=`basename $$cat`; \
-	 case "$$cat" in \
-	 *.gmo) destdir=$(gnulocaledir);; \
-	 *) destdir=$(localedir);; \
-	 esac; \
-	 lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	 dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
-	 if test -r "$(MKINSTALLDIRS)"; then \
-	 $(MKINSTALLDIRS) $$dir; \
-	 else \
-	 $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
-	 fi; \
-	 if test -r $$cat; then \
-	 $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
-	 echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
+	linguas="$(USE_LINGUAS)"; \
+	for lang in $$linguas; do \
+	 dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
+	 $(mkdir_p) $$dir; \
+	 if test -r $$lang.gmo; then \
+	 $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
+	 echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
 	 else \
-	 $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
-	 echo "installing $(srcdir)/$$cat as" \
-		 "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
+	 $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
+	 echo "installing $(srcdir)/$$lang.gmo as" \
+		 "$$dir/$(GETTEXT_PACKAGE).mo"; \
 	 fi; \
-	 if test -r $$cat.m; then \
-	 $(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
-	 echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
+	 if test -r $$lang.gmo.m; then \
+	 $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
+	 echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
 	 else \
-	 if test -r $(srcdir)/$$cat.m ; then \
-	 $(INSTALL_DATA) $(srcdir)/$$cat.m \
-		$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
-	 echo "installing $(srcdir)/$$cat as" \
-		 "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
+	 if test -r $(srcdir)/$$lang.gmo.m ; then \
+	 $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
+		$$dir/$(GETTEXT_PACKAGE).mo.m; \
+	 echo "installing $(srcdir)/$$lang.gmo.m as" \
+		 "$$dir/$(GETTEXT_PACKAGE).mo.m"; \
 	 else \
 	 true; \
 	 fi; \
 	 fi; \
 	done
-	if test "$(PACKAGE)" = "glib"; then \
-	 if test -r "$(MKINSTALLDIRS)"; then \
-	 $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
-	 else \
-	 $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
-	 fi; \
-	 $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
-			 $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
-	else \
-	 : ; \
-	fi
+
+# Empty stubs to satisfy archaic automake needs
+dvi info tags TAGS ID:
 
 # Define this as empty until I found a useful application.
-installcheck:
+install-exec installcheck:
 
 uninstall:
-	catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	 cat=`basename $$cat`; \
-	 lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	 rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
-	 rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
-	 rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
-	 rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
+	linguas="$(USE_LINGUAS)"; \
+	for lang in $$linguas; do \
+	 rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
+	 rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
 	done
-	if test "$(PACKAGE)" = "glib"; then \
-	 rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
-	fi
-
-check: all
 
-dvi info tags TAGS ID:
+check: all $(GETTEXT_PACKAGE).pot
+	rm -f missing notexist
+	srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
+	if [ -r missing -o -r notexist ]; then \
+	 exit 1; \
+	fi
 
 mostlyclean:
-	rm -f core core.* *.pox $(GETTEXT_PACKAGE).po *.old.po cat-id-tbl.tmp
-	rm -fr *.o
+	rm -f *.pox *.old.po cat-id-tbl.tmp
+	rm -f .intltool-merge-cache
 
 clean: mostlyclean
 
 distclean: clean
-	rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m
+	rm -f Makefile Makefile.in POTFILES stamp-it
+	rm -f *.mo *.msg *.cat *.cat.m *.gmo
 
 maintainer-clean: distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-	rm -f $(GMOFILES)
 
-distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: update-po $(DISTFILES)
+distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
+dist distdir: $(DISTFILES)
 	dists="$(DISTFILES)"; \
+	extra_dists="$(EXTRA_DISTFILES)"; \
+	for file in $$extra_dists; do \
+	 test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \
+	done; \
 	for file in $$dists; do \
-	 ln $(srcdir)/$$file $(distdir) 2> /dev/null \
-	 || cp -p $(srcdir)/$$file $(distdir); \
+	 test -f $$file || file="$(srcdir)/$$file"; \
+	 ln $$file $(distdir) 2> /dev/null \
+	 || cp -p $$file $(distdir); \
 	done
 
 update-po: Makefile
 	$(MAKE) $(GETTEXT_PACKAGE).pot
 	tmpdir=`pwd`; \
-	cd $(srcdir); \
-	catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	 cat=`basename $$cat`; \
-	 lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+	linguas="$(USE_LINGUAS)"; \
+	for lang in $$linguas; do \
 	 echo "$$lang:"; \
-	 if $(MSGMERGE) $$lang.po $(GETTEXT_PACKAGE).pot -o $$tmpdir/$$lang.new.po; then \
-	 if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+	 result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
+	 if $$result; then \
+	 if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
 	 rm -f $$tmpdir/$$lang.new.po; \
 else \
 	 if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
@@ -239,32 +193,20 @@
 	 fi; \
 	 fi; \
 	 else \
-	 echo "msgmerge for $$cat failed!"; \
+	 echo "msgmerge for $$lang.gmo failed!"; \
 	 rm -f $$tmpdir/$$lang.new.po; \
 	 fi; \
 	done
 
-# POTFILES is created from POTFILES.in by stripping comments, empty lines
-# and Intltool tags (enclosed in square brackets), and appending a full
-# relative path to them
-POTFILES: POTFILES.in
-	( if test 'x$(srcdir)' != 'x.'; then \
-	 posrcprefix='$(top_srcdir)/'; \
-	 else \
-	 posrcprefix="../"; \
-	 fi; \
-	 rm -f $@-t $@ \
-	 && (sed -e '/^#/d' 						\
-		 -e "s/^\[.*\] +//" 					\
-		 -e '/^[ 	]*$$/d' 				\
-		 -e "s@.*@	$$posrcprefix& \\\\@" < $(srcdir)/$@.in	\
-		| sed -e '$$s/\\$$//') > $@-t \
-	 && chmod a-w $@-t \
-	 && mv $@-t $@ )
-
-Makefile: Makefile.in.in ../config.status POTFILES
-	cd .. \
-	 && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
+Makefile POTFILES: stamp-it
+	@if test ! -f $@; then \
+	 rm -f stamp-it; \
+	 $(MAKE) stamp-it; \
+	fi
+
+stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
+	cd $(top_builddir) \
+	 && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
 	 $(SHELL) ./config.status
 
 # Tell versions [3.59,3.63) of GNU make not to export all variables.

pcsxr-1.9.92.tar.bz2/po/Makevars -> pcsxr-1.9.93.tar.bz2/po/Makevars Changed

pcsxr-1.9.92.tar.bz2/po/POTFILES.in -> pcsxr-1.9.93.tar.bz2/po/POTFILES.in Changed

@@ -1,4 +1,4 @@
-data/pcsx.glade2
+[type: gettext/glade]data/pcsxr.ui
 gui/AboutDlg.c
 gui/AboutDlg.h
 gui/Cheat.c
@@ -8,7 +8,7 @@
 gui/Config.c
 gui/DebugMemory.c
 gui/DebugMemory.h
-gui/Gtk2Gui.c
+gui/GtkGui.c
 gui/Linux.h
 gui/LnxMain.c
 gui/MemcardDlg.c
@@ -39,21 +39,21 @@
 libpcsxcore/socket.c
 libpcsxcore/spu.c
 plugins/dfcdrom/cdr.c
-plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2
+[type: gettext/glade]plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui
 plugins/dfcdrom/cdrcfg-0.1df/main.c
 plugins/dfcdrom/cdr-linux.c
 plugins/dfcdrom/cdr-null.c
 plugins/dfcdrom/cfg.c
 plugins/dfinput/analog.c
 plugins/dfinput/cfg.c
-plugins/dfinput/cfg-gtk2.c
-plugins/dfinput/dfinput.glade2
+plugins/dfinput/cfg-gtk.c
+[type: gettext/glade]plugins/dfinput/dfinput.ui
 plugins/dfinput/pad.c
 plugins/dfinput/sdljoy.c
 plugins/dfinput/xkb.c
 plugins/dfnet/cfg.c
 plugins/dfnet/dfnet.c
-plugins/dfnet/dfnet.glade2
+[type: gettext/glade]plugins/dfnet/dfnet.ui
 plugins/dfnet/dfnet.h
 plugins/dfnet/gui.c
 plugins/dfnet/unix.c
@@ -64,18 +64,17 @@
 plugins/dfsound/freeze.c
 plugins/dfsound/nullsnd.c
 plugins/dfsound/oss.c
-plugins/dfsound/psemu.c
 plugins/dfsound/pulseaudio.c
 plugins/dfsound/registers.c
 plugins/dfsound/reverb.c
 plugins/dfsound/spu.c
-plugins/dfsound/spucfg-0.1df/dfsound.glade2
+[type: gettext/glade]plugins/dfsound/spucfg-0.1df/dfsound.ui
 plugins/dfsound/xa.c
 plugins/dfxvideo/cfg.c
 plugins/dfxvideo/draw.c
 plugins/dfxvideo/fps.c
 plugins/dfxvideo/gpu.c
-plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2
+[type: gettext/glade]plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui
 plugins/dfxvideo/key.c
 plugins/dfxvideo/menu.c
 plugins/dfxvideo/prim.c
@@ -85,20 +84,17 @@
 plugins/peopsxgl/draw.c
 plugins/peopsxgl/fps.c
 plugins/peopsxgl/gpu.c
-plugins/peopsxgl/gpucfg/callbacks.c
-plugins/peopsxgl/gpucfg/interface.c
 plugins/peopsxgl/gpucfg/main.c
-plugins/peopsxgl/gpucfg/support.c
+[type: gettext/glade]plugins/peopsxgl/gpucfg/peopsxgl.ui
 plugins/peopsxgl/key.c
 plugins/peopsxgl/menu.c
 plugins/peopsxgl/prim.c
 plugins/peopsxgl/soft.c
 plugins/peopsxgl/texture.c
 plugins/bladesio1/gui.c
-plugins/bladesio1/settings.c
-plugins/bladesio1/settings.h
+plugins/bladesio1/cfg.c
 plugins/bladesio1/sio1.c
-plugins/bladesio1/sio1.glade2
+[type: gettext/glade]plugins/bladesio1/sio1.ui
 plugins/bladesio1/sio1.h
 win32/gui/AboutDlg.c
 win32/gui/CheatDlg.c

pcsxr-1.9.93.tar.bz2/po/fr_FR.po Added

@@ -0,0 +1,3494 @@
+# French translation of pcsxr.
+# Copyright (C) 2010 Jean-André Santoni
+# This file is distributed under the same license as the pcsxr package.
+# Jean-André Santoni <jean.andre.santoni@gmail.com>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: pcsxr 1.0\n"
+"Report-Msgid-Bugs-To: whistler_wmz@users.sf.net\n"
+"POT-Creation-Date: 2013-03-02 03:33+0400\n"
+"PO-Revision-Date: 2011-06-04 13:44+0400\n"
+"Last-Translator: Jean-André Santoni <jean.andre.santoni@gmail.com>\n"
+"Language-Team: French <jean.andre.santoni@gmail.com>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ../data/pcsxr.ui.h:1 ../win32/gui/CheatDlg.c:166
+msgid "Edit Cheat Codes"
+msgstr "Modifier les codes"
+
+#: ../data/pcsxr.ui.h:2
+msgid "Cheat Codes"
+msgstr "Codes de triche"
+
+#: ../data/pcsxr.ui.h:3 ../gui/Cheat.c:1113 ../win32/gui/CheatDlg.c:678
+msgid "Cheat Search"
+msgstr "Recherche de code"
+
+#: ../data/pcsxr.ui.h:4 ../win32/gui/CheatDlg.c:680
+msgid "Search For:"
+msgstr "Critère de recherche"
+
+#: ../data/pcsxr.ui.h:5 ../win32/gui/CheatDlg.c:681
+msgid "Data Type:"
+msgstr "Type de donnée :"
+
+#: ../data/pcsxr.ui.h:6 ../gui/Cheat.c:645 ../win32/gui/CheatDlg.c:506
+#: ../win32/gui/CheatDlg.c:597 ../win32/gui/CheatDlg.c:682
+msgid "Value:"
+msgstr "Valeur :"
+
+#: ../data/pcsxr.ui.h:7 ../win32/gui/CheatDlg.c:683
+msgid "Data Base:"
+msgstr "Base numérique :"
+
+#: ../data/pcsxr.ui.h:8 ../win32/gui/CheatDlg.c:684
+msgid "To:"
+msgstr "A:"
+
+#: ../data/pcsxr.ui.h:9 ../win32/gui/CheatDlg.c:504
+msgid "Freeze"
+msgstr "Geler"
+
+#: ../data/pcsxr.ui.h:10 ../win32/gui/CheatDlg.c:595
+msgid "Modify"
+msgstr "Modifier"
+
+#: ../data/pcsxr.ui.h:11
+msgid "Copy"
+msgstr "Copier"
+
+#: ../data/pcsxr.ui.h:12
+msgid "label_resultsfound"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:13
+msgid "Search"
+msgstr "Rechercher"
+
+#: ../data/pcsxr.ui.h:14
+msgid "Restart"
+msgstr "Redémarrer"
+
+#: ../data/pcsxr.ui.h:15
+msgid "Cheat Search"
+msgstr "Recherche de codes"
+
+#: ../data/pcsxr.ui.h:16 ../gui/ConfDlg.c:113
+msgid "Configure PCSXR"
+msgstr "Configurer PCSXR"
+
+#: ../data/pcsxr.ui.h:17
+msgid "Graphics:"
+msgstr "Graphismes:"
+
+#: ../data/pcsxr.ui.h:18
+msgid "Sound:"
+msgstr "Son :"
+
+#: ../data/pcsxr.ui.h:19
+#, fuzzy
+msgid "Controller 1:"
+msgstr "Contrôleur 1"
+
+#: ../data/pcsxr.ui.h:20
+msgid "Controller 2:"
+msgstr "Contrôleur 2:"
+
+#: ../data/pcsxr.ui.h:21
+msgid "CD-ROM:"
+msgstr "CD-ROM :"
+
+#: ../data/pcsxr.ui.h:22
+msgid "Search in:"
+msgstr "Chercher dans :"
+
+#: ../data/pcsxr.ui.h:23
+msgid "Select Folder to Search"
+msgstr "Sélectionnez un dossier"
+
+#: ../data/pcsxr.ui.h:24
+#, fuzzy
+msgid "Link cable:"
+msgstr "Activer"
+
+#: ../data/pcsxr.ui.h:25
+msgid "Plugins"
+msgstr "Greffons"
+
+#: ../data/pcsxr.ui.h:26
+msgid "BIOS:"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:27
+msgid "BIOS"
+msgstr "BIOS"
+
+#: ../data/pcsxr.ui.h:28
+msgid "Configure CPU"
+msgstr "Configurer le CPU"
+
+#: ../data/pcsxr.ui.h:29
+msgid "SPU IRQ Always Enabled"
+msgstr "SPU IRQ toujours activé"
+
+#: ../data/pcsxr.ui.h:30
+msgid "Black & White Movies"
+msgstr "Films en noir & blanc"
+
+#: ../data/pcsxr.ui.h:31 ../gui/Plugin.c:239
+#, c-format
+msgid "SIO IRQ Always Enabled"
+msgstr "SIO IRQ toujours activé"
+
+#: ../data/pcsxr.ui.h:32
+msgid "Disable XA Decoding"
+msgstr "Désativer le décodage XA"
+
+#: ../data/pcsxr.ui.h:33
+msgid "Disable CD Audio"
+msgstr "Désactiver CD Audio"
+
+#: ../data/pcsxr.ui.h:34 ../win32/gui/WndMain.c:1331
+msgid "Slow Boot"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:35
+msgid "Enable Interpreter CPU"
+msgstr "Activer l'interpréteur CPU"
+
+#: ../data/pcsxr.ui.h:36 ../win32/gui/WndMain.c:1334
+msgid "Enable Console Output"
+msgstr "Activer la sortie console"
+
+#: ../data/pcsxr.ui.h:37 ../win32/gui/WndMain.c:1335
+msgid "Enable Debugger"
+msgstr "Activer le débuggeur"
+
+#: ../data/pcsxr.ui.h:38 ../win32/gui/WndMain.c:1337
+msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:39 ../win32/gui/WndMain.c:1338
+msgid "InuYasha Sengoku Battle Fix"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:40 ../win32/gui/WndMain.c:1339
+msgid "Widescreen (GTE Hack)"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:41
+msgid "Options"
+msgstr "Options"
+
+#: ../data/pcsxr.ui.h:42 ../win32/gui/WndMain.c:1332
+msgid "Autodetect"
+msgstr "Autodétection"
+
+#: ../data/pcsxr.ui.h:43
+msgid "System Type"
+msgstr "Type de système"
+
+#: ../data/pcsxr.ui.h:44
+msgid "PCSXR"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:45
+msgid "_File"
+msgstr "_Fichier"
+
+#: ../data/pcsxr.ui.h:46
+msgid "Run _CD"
+msgstr "Lancer à partir du _CD"
+
+#: ../data/pcsxr.ui.h:47
+msgid "Run _ISO..."
+msgstr "Lancer un _ISO"
+
+#: ../data/pcsxr.ui.h:48
+msgid "Run _BIOS"
+msgstr "Lancer le _BIOS"
+
+#: ../data/pcsxr.ui.h:49
+msgid "Run _EXE..."
+msgstr "Lancer un _EXE"
+
+#: ../data/pcsxr.ui.h:50
+msgid "E_xit"
+msgstr "Quitter"
+
+#: ../data/pcsxr.ui.h:51
+msgid "_Emulator"
+msgstr "Émulateur"
+
+#: ../data/pcsxr.ui.h:52
+msgid "_Continue"
+msgstr "_Continuer"
+
+#: ../data/pcsxr.ui.h:53
+msgid "_Reset"
+msgstr "_Rétablir"
+
+#: ../data/pcsxr.ui.h:54
+#, fuzzy
+msgid "_Shutdown"
+msgstr "Droite-bas"
+
+#: ../data/pcsxr.ui.h:55
+msgid "S_witch ISO..."
+msgstr "Changer d'ISO"
+
+#: ../data/pcsxr.ui.h:56
+msgid "_Save State"
+msgstr "_Sauver un état"
+
+#: ../data/pcsxr.ui.h:57
+msgid "Slot _1"
+msgstr "Emplacement _1"
+
+#: ../data/pcsxr.ui.h:58
+msgid "Slot _2"
+msgstr "Emplacement _2"
+
+#: ../data/pcsxr.ui.h:59
+msgid "Slot _3"
+msgstr "Emplacement _3"
+
+#: ../data/pcsxr.ui.h:60
+msgid "Slot _4"
+msgstr "Emplacement _4"
+
+#: ../data/pcsxr.ui.h:61
+msgid "Slot _5"
+msgstr "Emplacement _5"
+
+#: ../data/pcsxr.ui.h:62
+msgid "Slot _6"
+msgstr "Emplacement _6"
+
+#: ../data/pcsxr.ui.h:63
+msgid "Slot _7"
+msgstr "Emplacement _7"
+
+#: ../data/pcsxr.ui.h:64
+msgid "Slot _8"
+msgstr "Emplacement _8"
+
+#: ../data/pcsxr.ui.h:65
+msgid "Slot _9"
+msgstr "Emplacement _9"
+
+#: ../data/pcsxr.ui.h:66
+msgid "_Other..."
+msgstr "Autre..."
+
+#: ../data/pcsxr.ui.h:67
+msgid "_Load State"
+msgstr "Charger un état"
+
+#: ../data/pcsxr.ui.h:68
+msgid "_Configuration"
+msgstr "_Configuration"
+
+#: ../data/pcsxr.ui.h:69
+msgid "_Plugins & BIOS..."
+msgstr "Greffons & BIOS..."
+
+#: ../data/pcsxr.ui.h:70
+msgid "_Graphics..."
+msgstr "_Graphismes..."
+
+#: ../data/pcsxr.ui.h:71
+msgid "_Sound..."
+msgstr "_Son"
+
+#: ../data/pcsxr.ui.h:72
+msgid "CD-_ROM..."
+msgstr "CD-_ROM..."
+
+#: ../data/pcsxr.ui.h:73
+msgid "C_ontrollers..."
+msgstr "C_ontrôleurs..."
+
+#: ../data/pcsxr.ui.h:74
+#, fuzzy
+msgid "_Link cable..."
+msgstr "Activer"
+
+#: ../data/pcsxr.ui.h:75
+msgid "_Netplay..."
+msgstr "Jeu en réseau..."
+
+#: ../data/pcsxr.ui.h:76
+msgid "_CPU..."
+msgstr "_CPU..."
+
+#: ../data/pcsxr.ui.h:77
+msgid "_Memory Cards..."
+msgstr "Cartes _mémoires..."
+
+#: ../data/pcsxr.ui.h:78
+msgid "Chea_t"
+msgstr "_Triche"
+
+#: ../data/pcsxr.ui.h:79
+msgid "_Browse..."
+msgstr "Parcourrir"
+
+#: ../data/pcsxr.ui.h:80
+msgid "_Search..."
+msgstr "Rechercher..."
+
+#: ../data/pcsxr.ui.h:81
+msgid "Memory _Dump"
+msgstr "_Dump mémoire"
+
+#: ../data/pcsxr.ui.h:82
+msgid "_Help"
+msgstr "Aide"
+
+#: ../data/pcsxr.ui.h:83
+msgid "_About PCSXR..."
+msgstr "À propos"
+
+#: ../data/pcsxr.ui.h:84
+msgid "Run CD"
+msgstr "Lancer à partir du CD"
+
+#: ../data/pcsxr.ui.h:85
+msgid "Run ISO Image"
+msgstr "Lancer une image ISO"
+
+#: ../data/pcsxr.ui.h:86
+msgid "Continue Emulation"
+msgstr "Continuer l'émulation"
+
+#: ../data/pcsxr.ui.h:87
+msgid "Switch ISO Image"
+msgstr "Changer d'image ISO"
+
+#: ../data/pcsxr.ui.h:88
+msgid "Configure Memory Cards"
+msgstr "Configurer les cartes mémoires"
+
+#: ../data/pcsxr.ui.h:89
+msgid "Configure Graphics"
+msgstr "Configurer les graphismes"
+
+#: ../data/pcsxr.ui.h:90 ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:1
+msgid "Configure Sound"
+msgstr "Configurer le son"
+
+#: ../data/pcsxr.ui.h:91
+msgid "Configure CD-ROM"
+msgstr "Configurer le CD-ROM"
+
+#: ../data/pcsxr.ui.h:92
+msgid "Configure Controllers"
+msgstr "Configurer les contrôleurs"
+
+#: ../data/pcsxr.ui.h:93
+msgid "New"
+msgstr "Nouveau"
+
+#: ../data/pcsxr.ui.h:94
+msgid "Format"
+msgstr "Formater"
+
+#: ../data/pcsxr.ui.h:95
+msgid "Un/Delete"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:96
+msgid "Memory Card 1"
+msgstr "Carte mémoire 1"
+
+#: ../data/pcsxr.ui.h:97
+msgid "Memory Card 2"
+msgstr "Carte mémoire 2"
+
+#: ../data/pcsxr.ui.h:98 ../gui/DebugMemory.c:119
+msgid "Memory Dump"
+msgstr "Dump mémoire"
+
+#: ../data/pcsxr.ui.h:99 ../gui/DebugMemory.c:205
+msgid "Address (Hexadecimal):"
+msgstr "Adresse (Hexadécimal) :"
+
+#: ../data/pcsxr.ui.h:100
+msgid "Raw Dump..."
+msgstr "Dump brut..."
+
+#: ../data/pcsxr.ui.h:101
+msgid "Patch Memory..."
+msgstr "Patcher la mémoire..."
+
+#: ../data/pcsxr.ui.h:102
+msgid "Configure NetPlay"
+msgstr "Configurer le jeu en réseau"
+
+#: ../data/pcsxr.ui.h:103
+msgid "NetPlay"
+msgstr "Jeu en réseau"
+
+#: ../data/pcsxr.ui.h:104
+#, fuzzy
+msgid "NTSC"
+msgstr ""
+"NTSC\n"
+"PAL"
+
+#: ../data/pcsxr.ui.h:105
+msgid "PAL"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:106 ../win32/gui/CheatDlg.c:692
+msgid "8-bit"
+msgstr "8-bit"
+
+#: ../data/pcsxr.ui.h:107 ../win32/gui/CheatDlg.c:693
+msgid "16-bit"
+msgstr "16-bit"
+
+#: ../data/pcsxr.ui.h:108 ../win32/gui/CheatDlg.c:694
+msgid "32-bit"
+msgstr "32-bit"
+
+#: ../data/pcsxr.ui.h:109 ../win32/gui/CheatDlg.c:402
+msgid "Equal Value"
+msgstr "Valeur égale"
+
+#: ../data/pcsxr.ui.h:110 ../win32/gui/CheatDlg.c:403
+msgid "Not Equal Value"
+msgstr "Valeur non égale"
+
+#: ../data/pcsxr.ui.h:111 ../win32/gui/CheatDlg.c:404
+msgid "Range"
+msgstr "Intervale"
+
+#: ../data/pcsxr.ui.h:112 ../win32/gui/CheatDlg.c:407
+msgid "Increased By"
+msgstr "Augmentée de"
+
+#: ../data/pcsxr.ui.h:113 ../win32/gui/CheatDlg.c:408
+msgid "Decreased By"
+msgstr "Diminuée de"
+
+#: ../data/pcsxr.ui.h:114 ../win32/gui/CheatDlg.c:409
+msgid "Increased"
+msgstr "Augmentée"
+
+#: ../data/pcsxr.ui.h:115 ../win32/gui/CheatDlg.c:410
+msgid "Decreased"
+msgstr "Diminuée"
+
+#: ../data/pcsxr.ui.h:116 ../win32/gui/CheatDlg.c:411
+msgid "Different"
+msgstr "Différente"
+
+#: ../data/pcsxr.ui.h:117 ../win32/gui/CheatDlg.c:412
+msgid "No Change"
+msgstr "Inchangée"
+
+#: ../data/pcsxr.ui.h:118 ../win32/gui/CheatDlg.c:695
+msgid "Decimal"
+msgstr "Décimal"
+
+#: ../data/pcsxr.ui.h:119 ../win32/gui/CheatDlg.c:696
+msgid "Hexadecimal"
+msgstr "Hexadécimal"
+
+#: ../gui/AboutDlg.c:71
+msgid ""
+"(C) 1999-2003 PCSX Team\n"
+"(C) 2005-2009 PCSX-df Team\n"
+"(C) 2009-2011 PCSX-Reloaded Team"
+msgstr ""
+"(C) 1999-2003 L'équipe PCSX\n"
+"(C) 2005-2009 L'équipe PCSX-df\n"
+"(C) 2009-2010 L'équipe PCSX-Reloaded "
+
+#: ../gui/AboutDlg.c:76
+msgid ""
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+msgstr ""
+
+#: ../gui/AboutDlg.c:100
+msgid "translator-credits"
+msgstr ""
+
+#: ../gui/AboutDlg.c:101
+msgid "A PlayStation emulator."
+msgstr "Un émulateur PlayStation"
+
+#: ../gui/Cheat.c:101 ../win32/gui/CheatDlg.c:116
+msgid "Add New Cheat"
+msgstr "Ajouter un nouveau code"
+
+#: ../gui/Cheat.c:109 ../gui/Cheat.c:192
+msgid "Cheat Description:"
+msgstr "Description du code :"
+
+#: ../gui/Cheat.c:117 ../gui/Cheat.c:201 ../win32/gui/CheatDlg.c:68
+#: ../win32/gui/CheatDlg.c:118
+msgid "Cheat Code:"
+msgstr "Code de triche :"
+
+#: ../gui/Cheat.c:147 ../gui/Cheat.c:241 ../gui/LnxMain.c:425
+#: ../win32/gui/ConfigurePlugins.c:330
+msgid "Error"
+msgstr "Erreur"
+
+#: ../gui/Cheat.c:147 ../gui/Cheat.c:241 ../win32/gui/CheatDlg.c:91
+#: ../win32/gui/CheatDlg.c:132
+msgid "Invalid cheat code!"
+msgstr "Code de triche invalide !"
+
+#: ../gui/Cheat.c:184 ../win32/gui/CheatDlg.c:66
+msgid "Edit Cheat"
+msgstr "Modifier un code"
+
+#: ../gui/Cheat.c:307
+msgid "Open Cheat File"
+msgstr "Ouvrir un fichier de codes"
+
+#: ../gui/Cheat.c:317 ../gui/Cheat.c:357
+msgid "PCSXR Cheat Code Files (*.cht)"
+msgstr "Codes de triche PCSXR (*.cht)"
+
+#: ../gui/Cheat.c:322 ../gui/GtkGui.c:491 ../gui/GtkGui.c:643
+#: ../win32/gui/WndMain.c:1483 ../win32/gui/WndMain.c:1564
+msgid "All Files"
+msgstr "Tous les fichiers"
+
+#: ../gui/Cheat.c:347
+msgid "Save Cheat File"
+msgstr "Sauver le fichier de triche"
+
+#: ../gui/Cheat.c:362
+msgid "All Files (*.*)"
+msgstr "Tous les fichiers (*.*)"
+
+#: ../gui/Cheat.c:401
+msgid "Cheat Codes"
+msgstr "Codes de triche"
+
+#: ../gui/Cheat.c:408
+msgid "Enable"
+msgstr "Activer"
+
+#: ../gui/Cheat.c:416 ../win32/gui/CheatDlg.c:185
+msgid "Description"
+msgstr "Description"
+
+#: ../gui/Cheat.c:544 ../win32/gui/CheatDlg.c:457
+msgid "Too many addresses found."
+msgstr "Trop d'adresses trouvées."
+
+#: ../gui/Cheat.c:553 ../win32/gui/CheatDlg.c:466
+#, c-format
+msgid "%.8X Current: %u (%.2X), Previous: %u (%.2X)"
+msgstr "%.8X Courrant: %u (%.2X), Précédant: %u (%.2X)"
+
+#: ../gui/Cheat.c:558 ../win32/gui/CheatDlg.c:471
+#, c-format
+msgid "%.8X Current: %u (%.4X), Previous: %u (%.4X)"
+msgstr "%.8X Courrant: %u (%.4X), Précédant: %u (%.4X)"
+
+#: ../gui/Cheat.c:563 ../win32/gui/CheatDlg.c:476
+#, c-format
+msgid "%.8X Current: %u (%.8X), Previous: %u (%.8X)"
+msgstr "%.8X Courrant: %u (%.8X), Précédant: %u (%.8X)"
+
+#: ../gui/Cheat.c:578 ../win32/gui/CheatDlg.c:492
+#, c-format
+msgid "Founded Addresses: %d"
+msgstr "Adresses trouvées : %d"
+
+#: ../gui/Cheat.c:586 ../win32/gui/CheatDlg.c:448
+msgid "Enter the values and start your search."
+msgstr "Entrer les valeur et commencer la recherche."
+
+#: ../gui/Cheat.c:628
+msgid "Freeze value"
+msgstr "Geler la valeur"
+
+#: ../gui/Cheat.c:634 ../win32/gui/CheatDlg.c:67 ../win32/gui/CheatDlg.c:117
+msgid "Description:"
+msgstr "Description :"
+
+#: ../gui/Cheat.c:727
+msgid "Modify value"
+msgstr "Modifier la valeur"
+
+#: ../gui/Cheat.c:735
+msgid "New value:"
+msgstr "Nouvelle valeur :"
+
+#: ../gui/Cheat.c:1119
+msgid "Search Results"
+msgstr "Résultats de recherche"
+
+#. TODO Check whether configuration is required when we choose the plugin, and set the state of the
+#. button appropriately. New gtk tooltip API should allow us to put a tooltip explanation for
+#. disabled widgets
+#. TODO If combo screen hasn't been opened and the user chooses the menu config option, confs.Combo will be null and cause a segfault
+#. printf("Configuring plugin %s\n", filename);
+#: ../gui/ConfDlg.c:256 ../gui/ConfDlg.c:277 ../gui/ConfDlg.c:298
+#: ../gui/ConfDlg.c:319 ../gui/ConfDlg.c:340 ../gui/ConfDlg.c:399
+msgid "No configuration required"
+msgstr "Pas besoin de configuration"
+
+#: ../gui/ConfDlg.c:256 ../gui/ConfDlg.c:277 ../gui/ConfDlg.c:298
+#: ../gui/ConfDlg.c:319 ../gui/ConfDlg.c:340 ../gui/ConfDlg.c:399
+msgid "This plugin doesn't need to be configured."
+msgstr "Ce greffon ne nécessite pas de configuration."
+
+#: ../gui/ConfDlg.c:402
+msgid "Please select a plugin."
+msgstr ""
+
+#: ../gui/ConfDlg.c:647
+#, c-format
+msgid "Could not open BIOS directory: '%s'\n"
+msgstr "Impossible d'ouvrir le dossier des BIOS : '%s'\n"
+
+#: ../gui/ConfDlg.c:698 ../gui/ConfDlg.c:801 ../gui/LnxMain.c:168
+#, c-format
+msgid "Could not open directory: '%s'\n"
+msgstr "Impossible d'ouvrir le dossier : '%s'\n"
+
+#. The BIOS list always contains the PCSXR internal BIOS
+#: ../gui/ConfDlg.c:769
+msgid "Simulate PSX BIOS"
+msgstr "Simuler le BIOS PSX"
+
+#: ../gui/DebugMemory.c:127
+msgid "Start Address (Hexadecimal):"
+msgstr "Adresse de départ (Hexadécimal) :"
+
+#: ../gui/DebugMemory.c:138
+msgid "Length (Decimal):"
+msgstr "Longueur (Décimal) :"
+
+#: ../gui/DebugMemory.c:164
+msgid "Dump to File"
+msgstr "Dumper dans un fichier"
+
+#: ../gui/DebugMemory.c:179
+#, c-format
+msgid "Error writing to %s!"
+msgstr "Erreur lors de l'écriture dans %s !"
+
+#: ../gui/DebugMemory.c:197
+msgid "Memory Patch"
+msgstr "Patch mémoire"
+
+#: ../gui/DebugMemory.c:216
+msgid "Value (Hexa string):"
+msgstr "Valeur (Chaine hexa) :"
+
+#: ../gui/DebugMemory.c:283
+msgid "Memory Viewer"
+msgstr "Visualiseur de mémoire"
+
+#: ../gui/DebugMemory.c:289
+msgid "Address"
+msgstr "Adresse"
+
+#: ../gui/DebugMemory.c:307
+msgid "Text"
+msgstr "Texte"
+
+#: ../gui/GtkGui.c:146
+msgid "Ready"
+msgstr "Prêt"
+
+#: ../gui/GtkGui.c:191
+msgid "Emulation Paused."
+msgstr "Émulation en pause."
+
+#: ../gui/GtkGui.c:474
+msgid "Select PSX EXE File"
+msgstr "Sélectionner un fichier EXE PSX"
+
+#: ../gui/GtkGui.c:487
+msgid "PlayStation Executable Files"
+msgstr "Fichiers exécutables PlayStation"
+
+#: ../gui/GtkGui.c:524
+msgid "Not a valid PSX file"
+msgstr "Ceci n'est pas un fichier PSX valide"
+
+#: ../gui/GtkGui.c:524
+msgid "The file does not appear to be a valid Playstation executable"
+msgstr "Le fichier n'est pas un exécutable PlayStation valide"
+
+#: ../gui/GtkGui.c:553 ../gui/GtkGui.c:725
+msgid "CD ROM failed"
+msgstr "Plantage du CD ROM"
+
+#: ../gui/GtkGui.c:553 ../gui/GtkGui.c:725 ../win32/gui/WndMain.c:472
+#: ../win32/gui/WndMain.c:526 ../win32/gui/WndMain.c:596
+#, c-format
+msgid "The CD does not appear to be a valid Playstation CD"
+msgstr "Ce CD n'est pas un CD de PlayStation valide"
+
+#: ../gui/GtkGui.c:564 ../gui/GtkGui.c:736 ../win32/gui/WndMain.c:482
+#: ../win32/gui/WndMain.c:536 ../win32/gui/WndMain.c:606
+#, c-format
+msgid "Could not load CD-ROM!"
+msgstr "Impossible de charger le CD-ROM !"
+
+#: ../gui/GtkGui.c:564 ../gui/GtkGui.c:736
+msgid "The CD-ROM could not be loaded"
+msgstr "Le CD-ROM n'a pas pû être chargé"
+
+#: ../gui/GtkGui.c:578
+msgid "Could not run BIOS"
+msgstr "Impossible de lancer le BIOS"
+
+#: ../gui/GtkGui.c:578
+msgid "Running BIOS is not supported with Internal HLE BIOS."
+msgstr "Le lancement du BIOS n'est pas supporté en mode Internal HLE BIOS."
+
+#: ../gui/GtkGui.c:608
+msgid "Open PSX Disc Image File"
+msgstr "Ouvrir une image de disque PSX"
+
+#: ../gui/GtkGui.c:638
+#, fuzzy
+msgid "PSX Image Files (*.bin, *.img, *.mdf, *.iso, *.cue, *.pbp, *.cbn)"
+msgstr "Images de disques PSX (*.bin, *.img, *.mdf, *.iso)"
+
+#: ../gui/GtkGui.c:894
+#, c-format
+msgid "Loaded state %s."
+msgstr "État chargé %s."
+
+#: ../gui/GtkGui.c:897
+#, c-format
+msgid "Error loading state %s!"
+msgstr "Érreur lors du chargement de l'état %s !"
+
+#: ../gui/GtkGui.c:908
+#, c-format
+msgid "Saved state %s."
+msgstr "État sauvé %s."
+
+#: ../gui/GtkGui.c:910
+#, c-format
+msgid "Error saving state %s!"
+msgstr "Érreur lors de l'enregistrement de l'état %s !"
+
+#: ../gui/GtkGui.c:945 ../gui/GtkGui.c:973
+msgid "Select State File"
+msgstr "Sélectionner un fichier d'état"
+
+#: ../gui/GtkGui.c:1016
+msgid "Notice"
+msgstr ""
+
+#: ../gui/LnxMain.c:62
+#, c-format
+msgid "Creating memory card: %s\n"
+msgstr "Création de la carte mémoire : %s\n"
+
+#: ../gui/LnxMain.c:329
+#, fuzzy
+msgid ""
+" pcsxr [options] [file]\n"
+"\toptions:\n"
+"\t-runcd\t\tRuns CD-ROM\n"
+"\t-cdfile FILE\tRuns a CD image file\n"
+"\t-nogui\t\tDon't open the GTK GUI\n"
+"\t-cfg FILE\tLoads desired configuration file (default: ~/.pcsxr/pcsxr.cfg)\n"
+"\t-psxout\t\tEnable PSX output\n"
+"\t-slowboot\tEnable BIOS Logo\n"
+"\t-load STATENUM\tLoads savestate STATENUM (1-9)\n"
+"\t-h -help\tDisplay this message\n"
+"\tfile\t\tLoads file\n"
+msgstr ""
+" pcsxr [options] [fichier]\n"
+"\toptions:\n"
+"\t-runcd\t\tLance à partir du CD-ROM\n"
+"\t-cdfile FILE\tLance une image CD\n"
+"\t-nogui\t\tDésactiver l'interface graphique\n"
+"\t-cfg FILE\tCharge le fichier de configuration désiré (par défaut: ~/.pcsxr/"
+"pcsxr.cfg)\n"
+"\t-psxout\t\tActiver la sortie PSX\n"
+"\t-load STATENUM\tCharge la sauvegarde d'état STATENUM (1-9)\n"
+"\t-h -help\tAffiche ce message\n"
+"\tfile\t\tFichier a charger\n"
+
+#: ../gui/LnxMain.c:366
+#, c-format
+msgid ""
+"PCSXR cannot be configured without using the GUI -- you should restart "
+"without -nogui.\n"
+msgstr ""
+"PCSXR ne peut pas être configuré sans l'interface graphique -- recommencez "
+"sans -nogui.\n"
+
+#: ../gui/LnxMain.c:425
+msgid "Failed loading plugins!"
+msgstr "Impossible de charger les greffons !"
+
+#: ../gui/LnxMain.c:444
+#, c-format
+msgid "Could not load CD-ROM!\n"
+msgstr "Impossible de charger le CD-ROM !\n"
+
+#: ../gui/LnxMain.c:485
+#, c-format
+msgid "PSX emulator couldn't be initialized.\n"
+msgstr "L'émulateur PSX n'a pas pu être initialisé.\n"
+
+#: ../gui/MemcardDlg.c:56
+msgid "Icon"
+msgstr "Icone"
+
+#: ../gui/MemcardDlg.c:62 ../win32/gui/WndMain.c:778
+msgid "Title"
+msgstr "Titre"
+
+#: ../gui/MemcardDlg.c:68 ../win32/gui/WndMain.c:784
+msgid "Status"
+msgstr "Statut"
+
+#: ../gui/MemcardDlg.c:74
+msgid "ID"
+msgstr "ID"
+
+#: ../gui/MemcardDlg.c:80
+msgid "Name"
+msgstr "Nom"
+
+#: ../gui/MemcardDlg.c:118 ../win32/gui/WndMain.c:989
+msgid "Deleted"
+msgstr "Supprimé"
+
+#: ../gui/MemcardDlg.c:120 ../gui/MemcardDlg.c:129 ../win32/gui/WndMain.c:990
+#: ../win32/gui/WndMain.c:993
+msgid "Free"
+msgstr "Libre"
+
+#: ../gui/MemcardDlg.c:123 ../win32/gui/WndMain.c:992
+msgid "Used"
+msgstr "Utilisé"
+
+#: ../gui/MemcardDlg.c:125
+msgid "Link"
+msgstr ""
+
+#: ../gui/MemcardDlg.c:127
+msgid "End link"
+msgstr ""
+
+#. Ask for name of memory card
+#: ../gui/MemcardDlg.c:305
+msgid "Select A File"
+msgstr "Selectionner un fichier"
+
+#: ../gui/MemcardDlg.c:345
+msgid "Format this Memory Card?"
+msgstr "Formater cette carte mémoire ?"
+
+#: ../gui/MemcardDlg.c:347
+msgid ""
+"If you format the memory card, the card will be empty, and any existing data "
+"overwritten."
+msgstr ""
+"Si vous formatez la carte mémoire, la carte sera vidée, et toute donnée "
+"existante perdue."
+
+#: ../gui/MemcardDlg.c:350
+msgid "Format card"
+msgstr "Formater la carte"
+
+#. Ask for name of new memory card
+#: ../gui/MemcardDlg.c:372
+msgid "Create a new Memory Card"
+msgstr "Créer une nouvelle carte"
+
+#: ../gui/MemcardDlg.c:381
+msgid "New Memory Card.mcd"
+msgstr "Nouvelle carte mémoire.mcd"
+
+#. No free slots available on the destination card
+#: ../gui/MemcardDlg.c:511
+msgid "No free space on memory card"
+msgstr "Pas d'emplacement libre sur la carte mémoire"
+
+#: ../gui/MemcardDlg.c:512
+msgid ""
+"There are no free slots available on the target memory card. Please delete a "
+"slot first."
+msgstr ""
+"Il n'y a pas d'emplacement disponible sur la carte mémoire sélectionnée. Il "
+"faut d'abord libérer un emplacement."
+
+#: ../gui/MemcardDlg.c:671
+msgid "Memory Card Manager"
+msgstr "Gestionnaire de carte mémoire"
+
+#: ../gui/Plugin.c:240
+#, c-format
+msgid "SIO IRQ Not Always Enabled"
+msgstr "SIO IRQ Pas toujours activé"
+
+#: ../gui/Plugin.c:246
+#, c-format
+msgid "Black & White Mdecs Only Enabled"
+msgstr ""
+
+#: ../gui/Plugin.c:247
+#, c-format
+msgid "Black & White Mdecs Only Disabled"
+msgstr ""
+
+#: ../gui/Plugin.c:253
+#, c-format
+msgid "XA Enabled"
+msgstr "XA Activé"
+
+#: ../gui/Plugin.c:254
+#, c-format
+msgid "XA Disabled"
+msgstr "XA Désactivé"
+
+#: ../gui/Plugin.c:326
+msgid "Error opening CD-ROM plugin!"
+msgstr "Erreur lors de l'ouverture du greffon CD-ROM !"
+
+#: ../gui/Plugin.c:328
+msgid "Error opening SPU plugin!"
+msgstr "Erreur lors de l'ouverture du greffon SPU !"
+
+#: ../gui/Plugin.c:331
+msgid "Error opening GPU plugin!"
+msgstr "Erreur lors de l'ouverture du greffon GPU !"
+
+#: ../gui/Plugin.c:333
+msgid "Error opening Controller 1 plugin!"
+msgstr "Erreur lors de l'ouverture du greffon Contrôleur 1 !"
+
+#: ../gui/Plugin.c:337
+msgid "Error opening Controller 2 plugin!"
+msgstr "Erreur lors de l'ouverture du greffon Contrôleur 2 !"
+
+#: ../gui/Plugin.c:342
+#, fuzzy
+msgid "Error opening SIO1 plugin!"
+msgstr "Erreur lors de l'ouverture du greffon SPU !"
+
+#: ../gui/Plugin.c:424
+msgid "Error closing CD-ROM plugin!"
+msgstr "Erreur lors de la fermeture du greffon CD-ROM !"
+
+#: ../gui/Plugin.c:426
+msgid "Error closing SPU plugin!"
+msgstr "Erreur lors de la fermeture du greffon SPU !"
+
+#: ../gui/Plugin.c:428
+msgid "Error closing Controller 1 Plugin!"
+msgstr "Erreur lors de la fermeture du greffon Contrôleur 1 !"
+
+#: ../gui/Plugin.c:430
+msgid "Error closing Controller 2 plugin!"
+msgstr "Erreur lors de la fermeture du greffon Contrôleur 2 !"
+
+#: ../gui/Plugin.c:432
+msgid "Error closing GPU plugin!"
+msgstr "Erreur lors de la fermeture du greffon GPU !"
+
+#: ../gui/Plugin.c:435
+#, fuzzy
+msgid "Error closing SIO1 plugin!"
+msgstr "Erreur lors de la fermeture du greffon SPU !"
+
+#: ../libpcsxcore/cdriso.c:423
+#, fuzzy, c-format
+msgid ""
+"\n"
+"could not open: %s\n"
+msgstr "Impossible d'ouvrir le dossier : '%s'\n"
+
+#: ../libpcsxcore/cdriso.c:1043
+#, c-format
+msgid "Track %.2d (%s) - Start %.2d:%.2d:%.2d, Length %.2d:%.2d:%.2d\n"
+msgstr "Piste %.2d (%s) - Début %.2d:%.2d:%.2d, Durée %.2d:%.2d:%.2d\n"
+
+#: ../libpcsxcore/cdriso.c:1064
+#, c-format
+msgid "Loaded CD Image: %s"
+msgstr "Image CD Chargée : %s"
+
+#: ../libpcsxcore/cheat.c:147
+#, c-format
+msgid "Cheats loaded from: %s\n"
+msgstr "Codes chargées à partir de : %s\n"
+
+#: ../libpcsxcore/cheat.c:179
+#, c-format
+msgid "Cheats saved to: %s\n"
+msgstr "Codes sauvegardés dans : %s\n"
+
+#: ../libpcsxcore/cheat.c:322 ../libpcsxcore/cheat.c:443
+msgid "(Untitled)"
+msgstr "(Sans titre)"
+
+#: ../libpcsxcore/debug.c:321
+msgid "Error allocating memory"
+msgstr "Érreur d'allocation mémoire"
+
+#: ../libpcsxcore/debug.c:326
+msgid "Unable to start debug server.\n"
+msgstr "Impossible de démarrer le serveur de débuggage.\n"
+
+#: ../libpcsxcore/debug.c:330
+msgid "Debugger started.\n"
+msgstr "Débuggeur lancé.\n"
+
+#: ../libpcsxcore/debug.c:337
+msgid "Debugger stopped.\n"
+msgstr "Débuggeur arrêté.\n"
+
+#: ../libpcsxcore/misc.c:350
+#, c-format
+msgid "CD-ROM Label: %.32s\n"
+msgstr "Label CD-ROM : %.32s\n"
+
+#: ../libpcsxcore/misc.c:351
+#, c-format
+msgid "CD-ROM ID: %.9s\n"
+msgstr "ID CD-ROM : %.9s\n"
+
+#: ../libpcsxcore/misc.c:415
+#, c-format
+msgid "Error opening file: %s.\n"
+msgstr "Érreur en ouvrant le fichier %s.\n"
+
+#: ../libpcsxcore/misc.c:458
+#, c-format
+msgid "Unknown CPE opcode %02x at position %08x.\n"
+msgstr "Opcode CPE inconnu %02x à la position %08x.\n"
+
+#: ../libpcsxcore/misc.c:486
+msgid "This file does not appear to be a valid PSX file.\n"
+msgstr "Ce fichier n'est pas un fichier PSX valide.\n"
+
+#: ../libpcsxcore/plugins.c:190
+#, c-format
+msgid "Error loading %s: %s"
+msgstr "Erreur lors du chargement %s : %s"
+
+#: ../libpcsxcore/plugins.c:234
+#, fuzzy, c-format
+msgid ""
+"Could not load GPU plugin %s!\n"
+"%s"
+msgstr "Impossible de charger le greffon GPU %s !"
+
+#: ../libpcsxcore/plugins.c:310
+#, fuzzy, c-format
+msgid ""
+"Could not load CD-ROM plugin %s!\n"
+"%s"
+msgstr "Impossible de charger le greffon CD-ROM %s !"
+
+#: ../libpcsxcore/plugins.c:359
+#, fuzzy, c-format
+msgid ""
+"Could not load SPU plugin %s!\n"
+"%s"
+msgstr "Impossible de charger le greffon SPU %s !"
+
+#: ../libpcsxcore/plugins.c:499
+#, fuzzy, c-format
+msgid ""
+"Could not load Controller 1 plugin %s!\n"
+"%s"
+msgstr "Impossible de charger le greffon Contrôleur 1 %s !"
+
+#: ../libpcsxcore/plugins.c:558
+#, fuzzy, c-format
+msgid ""
+"Could not load Controller 2 plugin %s!\n"
+"%s"
+msgstr "Impossible de charger le greffon Contrôleur 2 %s !"
+
+#: ../libpcsxcore/plugins.c:604
+#, fuzzy, c-format
+msgid ""
+"Could not load NetPlay plugin %s!\n"
+"%s"
+msgstr "Impossible de charger le greffon de jeu en réseau %s !"
+
+#: ../libpcsxcore/plugins.c:682
+#, fuzzy, c-format
+msgid ""
+"Could not load SIO1 plugin %s!\n"
+"%s"
+msgstr "Impossible de charger le greffon SIO1 %s !"
+
+#: ../libpcsxcore/plugins.c:770
+#, c-format
+msgid "Error initializing CD-ROM plugin: %d"
+msgstr "Erreur lors de l'initialisation du greffon CD-ROM : %d"
+
+#: ../libpcsxcore/plugins.c:772
+#, c-format
+msgid "Error initializing GPU plugin: %d"
+msgstr "Erreur lors de l'initialisation du greffon GPU : %d"
+
+#: ../libpcsxcore/plugins.c:774
+#, c-format
+msgid "Error initializing SPU plugin: %d"
+msgstr "Erreur lors de l'initialisation du greffon SPU : %d"
+
+#: ../libpcsxcore/plugins.c:776
+#, c-format
+msgid "Error initializing Controller 1 plugin: %d"
+msgstr "Erreur lors de l'initialisation du greffon Contrôleur 1 : %d"
+
+#: ../libpcsxcore/plugins.c:778
+#, c-format
+msgid "Error initializing Controller 2 plugin: %d"
+msgstr "Erreur lors de l'initialisation du greffon Contrôleur 2 : %d"
+
+#: ../libpcsxcore/plugins.c:782
+#, c-format
+msgid "Error initializing NetPlay plugin: %d"
+msgstr "Erreur lors de l'initialisation du greffon de jeu en réseau : %d"
+
+#: ../libpcsxcore/plugins.c:787
+#, c-format
+msgid "Error initializing SIO1 plugin: %d"
+msgstr "Erreur lors de l'initialisation du greffon SIO1 : %d"
+
+#: ../libpcsxcore/plugins.c:790
+msgid "Plugins loaded.\n"
+msgstr "Greffons chargés.\n"
+
+#: ../libpcsxcore/ppf.c:219
+#, c-format
+msgid "Invalid PPF patch: %s.\n"
+msgstr "Patch PPF invalide / %s.\n"
+
+#: ../libpcsxcore/ppf.c:295
+#, c-format
+msgid "Unsupported PPF version (%d).\n"
+msgstr "Version PPF non supportée (%d).\n"
+
+#. build address array
+#: ../libpcsxcore/ppf.c:334
+#, c-format
+msgid "Loaded PPF %d.0 patch: %s.\n"
+msgstr "Patch PPF %d.0 chargé : %s.\n"
+
+#: ../libpcsxcore/ppf.c:384
+#, fuzzy, c-format
+msgid "Loaded SBI file: %s.\n"
+msgstr "Image CD Chargée : %s"
+
+#: ../libpcsxcore/psxmem.c:78
+msgid "Error allocating memory!"
+msgstr "Erreur d'allocation mémoire !"
+
+#: ../libpcsxcore/psxmem.c:121
+#, c-format
+msgid "Could not open BIOS:\"%s\". Enabling HLE Bios!\n"
+msgstr "Impossible d'ouvrir le BIOS : \"%s\". Activation du BIOS HLE !\n"
+
+#: ../libpcsxcore/r3000a.c:34
+#, c-format
+msgid "Running PCSXR Version %s (%s).\n"
+msgstr "Version PCSXR Lancée %s (%s).\n"
+
+#: ../libpcsxcore/sio.c:843
+msgid "Connection closed!\n"
+msgstr "Connection fermée !\n"
+
+#: ../libpcsxcore/sio.c:876
+#, c-format
+msgid "No memory card value was specified - creating a default card %s\n"
+msgstr ""
+"Pas de carte mémoire spécifiée - création d'une carte mémoire par défaut %s\n"
+
+#: ../libpcsxcore/sio.c:880
+#, c-format
+msgid "The memory card %s doesn't exist - creating it\n"
+msgstr "La carte mémoire %s n'existe pas - création de la carte mémoire\n"
+
+#: ../libpcsxcore/sio.c:896
+#, c-format
+msgid "Memory card %s failed to load!\n"
+msgstr "Problème lors du chargement de la carte mémoire %s!\n"
+
+#: ../libpcsxcore/sio.c:900
+#, c-format
+msgid "Loading memory card %s\n"
+msgstr "Chargement de la carte mémoire %s\n"
+
+#: ../plugins/dfcdrom/cdr.c:25
+msgid "CD-ROM Drive Reader"
+msgstr "Lecteur CR-ROM"
+
+#: ../plugins/dfcdrom/cdr.c:27
+msgid "CDR NULL Plugin"
+msgstr "Greffon CDR NULL"
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:1
+#: ../plugins/dfcdrom/cdrcfg-0.1df/main.c:217
+msgid "CDR configuration"
+msgstr "Configuration CDR"
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:2
+msgid "Choose your CD-ROM device or type its path if it's not listed"
+msgstr ""
+"Choisissez votre lecteur de CD-ROM ou entrez son chemin s'il n'est pas listé"
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:3
+msgid "Select read mode:"
+msgstr "Mode de lecture :"
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:4
+msgid "Cache Size (Def. 64):"
+msgstr "Taille du cache (Def. 64) :"
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:5
+msgid "Spindown Time:"
+msgstr "Temps de rotation :"
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:6
+msgid "Cdrom Speed (Def. 0 = MAX):"
+msgstr "Vitesse de lecture (Def. 0 = MAX) :"
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:7
+msgid "Enable subchannel read"
+msgstr "Activer la lecture sous-canal"
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:8
+msgid "Normal (No Cache)"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:9
+#, fuzzy
+msgid "Threaded - Faster (With Cache)"
+msgstr ""
+"Normal (Sans Cache)\n"
+"Threadé - Plus rapide (Avec Cache)"
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:10
+msgid "Default"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:11
+msgid "125ms"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:12
+msgid "250ms"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:13
+msgid "500ms"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:14
+msgid "1s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:15
+msgid "2s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:16
+msgid "4s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:17
+msgid "8s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:18
+msgid "16s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:19
+msgid "32s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:20
+msgid "1min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:21
+msgid "2min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:22
+msgid "4min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:23
+msgid "8min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:24
+msgid "16min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:25
+msgid "32min"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk.c:49
+msgid "D-Pad Up"
+msgstr "Pavé directionnel Haut"
+
+#: ../plugins/dfinput/cfg-gtk.c:50
+msgid "D-Pad Down"
+msgstr "Pavé directionnel Bas"
+
+#: ../plugins/dfinput/cfg-gtk.c:51
+msgid "D-Pad Left"
+msgstr "Pavé directionnel Gauche"
+
+#: ../plugins/dfinput/cfg-gtk.c:52
+msgid "D-Pad Right"
+msgstr "Pavé directionnel Droite"
+
+#: ../plugins/dfinput/cfg-gtk.c:53
+msgid "Cross"
+msgstr "Croix"
+
+#: ../plugins/dfinput/cfg-gtk.c:54
+msgid "Circle"
+msgstr "Rond"
+
+#: ../plugins/dfinput/cfg-gtk.c:55
+msgid "Square"
+msgstr "Carré"
+
+#: ../plugins/dfinput/cfg-gtk.c:56
+msgid "Triangle"
+msgstr "Triangle"
+
+#: ../plugins/dfinput/cfg-gtk.c:57
+msgid "L1"
+msgstr "L1"
+
+#: ../plugins/dfinput/cfg-gtk.c:58
+msgid "R1"
+msgstr "R1"
+
+#: ../plugins/dfinput/cfg-gtk.c:59
+msgid "L2"
+msgstr "L2"
+
+#: ../plugins/dfinput/cfg-gtk.c:60
+msgid "R2"
+msgstr "R2"
+
+#: ../plugins/dfinput/cfg-gtk.c:61
+msgid "Select"
+msgstr "Select"
+
+#: ../plugins/dfinput/cfg-gtk.c:62
+msgid "Start"
+msgstr "Start"
+
+#: ../plugins/dfinput/cfg-gtk.c:63
+msgid "L3"
+msgstr "L3"
+
+#: ../plugins/dfinput/cfg-gtk.c:64
+msgid "R3"
+msgstr "R3"
+
+#: ../plugins/dfinput/cfg-gtk.c:65
+#, fuzzy
+msgid "Analog"
+msgstr ""
+"Pavé digital\n"
+"Pavé analogique"
+
+#: ../plugins/dfinput/cfg-gtk.c:69
+msgid "L-Stick Right"
+msgstr "L-Stick Droite"
+
+#: ../plugins/dfinput/cfg-gtk.c:70
+msgid "L-Stick Left"
+msgstr "L-Stick Gauche"
+
+#: ../plugins/dfinput/cfg-gtk.c:71
+msgid "L-Stick Down"
+msgstr "L-Stick Bas"
+
+#: ../plugins/dfinput/cfg-gtk.c:72
+msgid "L-Stick Up"
+msgstr "L-Stick Haut"
+
+#: ../plugins/dfinput/cfg-gtk.c:73
+msgid "R-Stick Right"
+msgstr "R-Stick Droite"
+
+#: ../plugins/dfinput/cfg-gtk.c:74
+msgid "R-Stick Left"
+msgstr "R-Stick Gauche"
+
+#: ../plugins/dfinput/cfg-gtk.c:75
+msgid "R-Stick Down"
+msgstr "R-Stick Bas"
+
+#: ../plugins/dfinput/cfg-gtk.c:76
+msgid "R-Stick Up"
+msgstr "R-Stick Haut"
+
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
+msgid "Centered"
+msgstr "Centré"
+
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
+msgid "Up"
+msgstr "Haut"
+
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
+msgid "Right"
+msgstr "Droite"
+
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
+msgid "Rightup"
+msgstr "Droite-haut"
+
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
+msgid "Down"
+msgstr "Bas"
+
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
+msgid "Rightdown"
+msgstr "Droite-bas"
+
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
+msgid "Left"
+msgstr "Gauche"
+
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
+msgid "Leftup"
+msgstr "Gauche-haut"
+
+#: ../plugins/dfinput/cfg-gtk.c:104 ../plugins/dfinput/cfg-gtk.c:143
+msgid "Leftdown"
+msgstr "Gauche-bas"
+
+#: ../plugins/dfinput/cfg-gtk.c:108 ../plugins/dfinput/cfg-gtk.c:147
+#, c-format
+msgid "Joystick: Button %d"
+msgstr "Joystick : Bouton %d"
+
+#: ../plugins/dfinput/cfg-gtk.c:112 ../plugins/dfinput/cfg-gtk.c:151
+#, c-format
+msgid "Joystick: Axis %d%c"
+msgstr "Joystick: Axe %d%c"
+
+#: ../plugins/dfinput/cfg-gtk.c:117 ../plugins/dfinput/cfg-gtk.c:156
+#, c-format
+msgid "Joystick: Hat %d %s"
+msgstr "Joystick: Tête %d %s"
+
+#: ../plugins/dfinput/cfg-gtk.c:132 ../plugins/dfinput/cfg-gtk.c:171
+msgid "Keyboard:"
+msgstr "Clavier :"
+
+#: ../plugins/dfinput/cfg-gtk.c:136 ../plugins/dfinput/cfg-gtk.c:175
+msgid "(Not Set)"
+msgstr "(Non défini)"
+
+#: ../plugins/dfinput/cfg-gtk.c:575
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:14
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:68
+msgid "None"
+msgstr "Aucun"
+
+#: ../plugins/dfinput/cfg-gtk.c:623
+msgid "Gamepad/Keyboard Input Configuration"
+msgstr "Configuration clavier/manette"
+
+#: ../plugins/dfinput/cfg-gtk.c:629 ../plugins/dfinput/cfg-gtk.c:649
+msgid "Key"
+msgstr "Touche"
+
+#: ../plugins/dfinput/cfg-gtk.c:635 ../plugins/dfinput/cfg-gtk.c:655
+msgid "Button"
+msgstr "Bouton"
+
+#: ../plugins/dfinput/dfinput.ui.h:1
+msgid "Device:"
+msgstr "Contrôleur :"
+
+#: ../plugins/dfinput/dfinput.ui.h:2
+msgid "Type:"
+msgstr "Type :"
+
+#: ../plugins/dfinput/dfinput.ui.h:3
+msgid "Visual vibration"
+msgstr ""
+
+#: ../plugins/dfinput/dfinput.ui.h:4
+msgid "Change"
+msgstr "Changer"
+
+#: ../plugins/dfinput/dfinput.ui.h:5
+msgid "Reset"
+msgstr "Reset"
+
+#: ../plugins/dfinput/dfinput.ui.h:6
+msgid "Controller 1"
+msgstr "Contrôleur 1"
+
+#: ../plugins/dfinput/dfinput.ui.h:7
+msgid "Controller 2"
+msgstr "Contrôleur 2"
+
+#: ../plugins/dfinput/dfinput.ui.h:8
+msgid "Multi-Threaded (Recommended)"
+msgstr "Multi-Threadé (Recommandé)"
+
+#: ../plugins/dfinput/dfinput.ui.h:9 ../win32/gui/WndMain.c:1342
+msgid "Options"
+msgstr "Options"
+
+#: ../plugins/dfinput/dfinput.ui.h:10
+#, fuzzy
+msgid "Digital Pad"
+msgstr ""
+"Pavé digital\n"
+"Pavé analogique"
+
+#: ../plugins/dfinput/dfinput.ui.h:11
+#, fuzzy
+msgid "Analog Pad"
+msgstr ""
+"Pavé digital\n"
+"Pavé analogique"
+
+#: ../plugins/dfinput/dfinput.ui.h:12
+msgid "Mouse"
+msgstr ""
+
+#: ../plugins/dfinput/pad.c:33
+#, fuzzy
+msgid "Gamepad/Keyboard/Mouse Input"
+msgstr "Entrées clavier/manette"
+
+#. increase that with each version
+#: ../plugins/dfnet/dfnet.c:23
+msgid "Socket Driver"
+msgstr "Pilote Socket"
+
+#: ../plugins/dfnet/dfnet.c:161
+#, c-format
+msgid "error connecting to %s: %s\n"
+msgstr "erreur lors de la connection à %s: %s\n"
+
+#: ../plugins/dfnet/dfnet.c:186
+msgid "Error allocating memory!\n"
+msgstr "Erreur d'allocation mémoire !\n"
+
+#: ../plugins/dfnet/dfnet.ui.h:1
+msgid "Start Game"
+msgstr "Lancer le jeu"
+
+#: ../plugins/dfnet/dfnet.ui.h:2
+msgid "Play Offline"
+msgstr "Jouer hors-ligne"
+
+#: ../plugins/dfnet/dfnet.ui.h:3
+msgid ""
+"Select here if you'll be Server (Player1) or Client (Player2).\n"
+"\n"
+"If you select Server you must Copy your IP address to the Clipboard and "
+"paste if (Ctrl+V) wherever the Client can see it.\n"
+"\n"
+"If you selected Client please enter the IP address the Server gave to you in "
+"the IP Address Control."
+msgstr ""
+"Choisissez si vous voulez être serveur (Joueur 1) ou client (Joueur 2).\n"
+"\n"
+"Si vous avez choisi serveur, vous devez copier votre IP dans le presse-"
+"papieret la coller (Ctrl+V) quelque part où le client pourra la voir.\n"
+"\n"
+"Si vous avez choisi client, veuillez entrer l'adresse IP que le serveur "
+"vousaura fournie dans la zone Adresse IP."
+
+#: ../plugins/dfnet/dfnet.ui.h:8 ../plugins/bladesio1/sio1.ui.h:6
+msgid "Copy PC IP to Clipboard"
+msgstr "Copier l'IP du PC dans le presse-papier"
+
+#: ../plugins/dfnet/dfnet.ui.h:9 ../plugins/bladesio1/sio1.ui.h:7
+msgid "Server (Player1)"
+msgstr "Serveur (Joueur 1)"
+
+#: ../plugins/dfnet/dfnet.ui.h:10 ../plugins/bladesio1/sio1.ui.h:8
+msgid "Client (Player2)"
+msgstr "Client (Joueur 2)"
+
+#: ../plugins/dfnet/dfnet.ui.h:11 ../plugins/bladesio1/sio1.ui.h:10
+msgid ""
+"Do not change if not necessary (remember it must be changed on both sides)."
+msgstr "Ne changer que si nécessaire (doit être modifié des deux cotés)."
+
+#: ../plugins/dfnet/dfnet.ui.h:12 ../plugins/bladesio1/sio1.ui.h:11
+msgid "Port Number"
+msgstr "Numéro de port"
+
+#: ../plugins/dfnet/gui.c:30 ../plugins/dfnet/gui.c:112
+#: ../plugins/bladesio1/gui.c:82 ../win32/gui/ConfigurePlugins.c:669
+msgid "NetPlay"
+msgstr "Jeu en réseau"
+
+#: ../plugins/dfnet/gui.c:38
+msgid "Nothing to configure"
+msgstr "Rien à configurer"
+
+#: ../plugins/dfnet/gui.c:94 ../plugins/bladesio1/gui.c:94
+#, c-format
+msgid "IP %s"
+msgstr "IP %s"
+
+#: ../plugins/dfnet/gui.c:165
+msgid "Waiting for connection..."
+msgstr "En attente de connexion..."
+
+#: ../plugins/dfnet/gui.c:168
+msgid "The Client should now Start a Connection, waiting..."
+msgstr "En attente de connection du client..."
+
+#: ../plugins/dfsound/spu.c:66
+msgid "DirectSound Driver"
+msgstr "Pilote DirectSound"
+
+#: ../plugins/dfsound/spu.c:68
+msgid "Mac OS X Sound"
+msgstr "Son Mac OS X"
+
+#: ../plugins/dfsound/spu.c:70
+msgid "ALSA Sound"
+msgstr "Son ALSA"
+
+#: ../plugins/dfsound/spu.c:72
+msgid "OSS Sound"
+msgstr "Son OSS"
+
+#: ../plugins/dfsound/spu.c:74
+msgid "SDL Sound"
+msgstr "Son SDL"
+
+#: ../plugins/dfsound/spu.c:76
+#, fuzzy
+msgid "OpenAL Sound"
+msgstr "Son ALSA"
+
+#: ../plugins/dfsound/spu.c:78
+msgid "PulseAudio Sound"
+msgstr "Son PulseAudio"
+
+#: ../plugins/dfsound/spu.c:80
+msgid "NULL Sound"
+msgstr "Son NULL"
+
+#: ../plugins/dfsound/spu.c:83
+msgid ""
+"P.E.Op.S. Sound Driver V1.7\n"
+"Coded by Pete Bernert and the P.E.Op.S. team\n"
+msgstr ""
+"Pilote de son P.E.Op.S. V1.7\n"
+"Codé par Pete Bernert et l'équipe P.E.Op.S.\n"
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:2
+msgid "Volume:"
+msgstr "Volume :"
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:3
+msgid "Interpolation:"
+msgstr "Interpolation :"
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:4
+msgid "Reverb:"
+msgstr "Réverbération :"
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:5
+msgid "Adjust XA speed"
+msgstr "Ajuster la vitesse XA"
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:6
+msgid "Choose this if XA music is played too quickly."
+msgstr "À sélectionner si la musique XA est jouée trop rapidement."
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:7
+msgid "High compatibility mode"
+msgstr "Mode haute compatibilité"
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:8
+msgid "Use the asynchronous SPU interface."
+msgstr "Utiliser l'interface SPU asynchrone."
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:9
+msgid "SPU IRQ Wait"
+msgstr "Attente SPU IRQ"
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:10
+msgid "Wait for CPU; only useful for some games."
+msgstr "Attendre le CPU; utile pour quelques jeux."
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:11
+msgid "Single channel sound"
+msgstr "Mono"
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:12
+msgid "Play only one channel for a performance boost."
+msgstr "Joueur seulement un canal pour de meilleures performances."
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:13
+msgid "Frequency Response - Output Filter"
+msgstr "Fréquence de réponse - Filtre de sortie"
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:15
+msgid "Simple"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:16
+#, fuzzy
+msgid "Gaussian"
+msgstr "Russe"
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:17
+msgid "Cubic"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:18
+msgid "Off"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:19
+#, fuzzy
+msgid "Playstation"
+msgstr ""
+"Désactivée\n"
+"Simple\n"
+"PlayStation"
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:20
+msgid "Low"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:21
+msgid "Medium"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:22
+msgid "Loud"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:23
+msgid "Loudest"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpu.c:82
+msgid "Soft Driver"
+msgstr "Pilote Soft"
+
+#: ../plugins/dfxvideo/gpu.c:83
+msgid ""
+"P.E.Op.S. Soft Driver V1.17\n"
+"Coded by Pete Bernert and the P.E.Op.S. team\n"
+msgstr ""
+"Pilote Soft P.E.Op.S. V1.17\n"
+"Codé par Pete Bernert et l'équipe P.E.Op.S.\n"
+
+#: ../plugins/dfxvideo/gpu.c:85
+msgid "SoftGL Driver"
+msgstr "Pilote SoftGL"
+
+#: ../plugins/dfxvideo/gpu.c:86
+msgid ""
+"P.E.Op.S. SoftGL Driver V1.17\n"
+"Coded by Pete Bernert and the P.E.Op.S. team\n"
+msgstr ""
+"Pilote SoftGL P.E.Op.S. V1.17\n"
+"Codé par Pete Bernert et l'équipe P.E.Op.S.\n"
+
+#: ../plugins/dfxvideo/gpu.c:88
+msgid "XVideo Driver"
+msgstr "Pilote XVideo"
+
+#: ../plugins/dfxvideo/gpu.c:89
+msgid ""
+"P.E.Op.S. Xvideo Driver V1.17\n"
+"Coded by Pete Bernert and the P.E.Op.S. team\n"
+msgstr ""
+"Pilote XVideo P.E.Op.S. V1.17\n"
+"Codé par Pete Bernert et l'équipe P.E.Op.S.\n"
+
+#: ../plugins/dfxvideo/gpu.c:92
+msgid "Pete Bernert and the P.E.Op.S. team"
+msgstr "Pete Bernert et l'équipe P.E.Op.S."
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:1
+msgid "Configure X11 Video"
+msgstr "Configuration Video X11"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:2
+msgid "Initial Window Size:"
+msgstr "Taille de fenêtre initiale :"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:3
+msgid "Stretching:"
+msgstr "Étirement :"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:4
+msgid "Dithering:"
+msgstr "Tramage :"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:5
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:4
+msgid "Fullscreen"
+msgstr "Plein écran"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:6
+msgid "Toggle windowed/fullscreen mode."
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:7
+msgid "Maintain 4:3 Aspect Ratio"
+msgstr "Maintenir le rapport 4:3"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:8
+msgid "Show FPS"
+msgstr "Afficher le FPS"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:9
+msgid "Toggle whether the FPS will be shown."
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:10
+msgid "Enable frame skipping"
+msgstr "Activer le saut d'images"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:11
+msgid "Skip frames when rendering."
+msgstr "Sauter des images au rendu."
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:12
+msgid "Set FPS"
+msgstr "Dénifir le FPS"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:13
+msgid "Enable this if games display too quickly."
+msgstr "À activer si les jeux s'affichent trop rapidement."
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:14
+msgid "200.0"
+msgstr "200.0"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:15
+msgid "Autodetect FPS limit"
+msgstr "Autodétection de la limite FPS"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:16
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:36
+msgid "Use game fixes"
+msgstr "Activer les correctifs de jeu"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:17
+msgid "Disable CPU Saving"
+msgstr "Désactiver la sauvegarde CPU"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:18
+msgid "For precise framerate"
+msgstr "Pour un taux de rafraichissement précis"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:19
+msgid "Odd/even bit hack"
+msgstr "Hack des bits pairs/impairs"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:20
+msgid "Chrono Cross"
+msgstr "Chrono Cross"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:21
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:45
+msgid "PC FPS calculation"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:22
+msgid "Better FPS limit in some"
+msgstr "Meilleure limite FPS dans certains"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:23
+msgid "Expand screen width"
+msgstr "Étendre la largeur d'écran"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:24
+msgid "Capcom fighting games"
+msgstr "Jeux de combat Capcom"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:25
+msgid "Ignore brightness color"
+msgstr "Ignorer la luminance"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:26
+msgid "Black screens in Lunar"
+msgstr "Écrans noirs dans Lunar"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:27
+msgid "Disable coordinate check"
+msgstr "Désactiver la vérification des coordonnées"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:28
+msgid "Compatibility mode"
+msgstr "Mode compatibilité"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:29
+msgid "Lazy screen update"
+msgstr "Rafraichissement paresseux"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:30
+msgid "Pandemonium 2"
+msgstr "Pandemonium 2"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:31
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:46
+msgid "Old frame skipping"
+msgstr "Ancien saut d'image"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:32
+msgid "Skip every second frame"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:33
+msgid "Repeated flat tex triangles"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:34
+msgid "Needed by Dark Forces"
+msgstr "Requis pour Dark Froces"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:35
+msgid "Draw quads with triangles"
+msgstr "Dessiner les quads avec des triangles"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:36
+msgid "better g-colors, worse textures"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:37
+msgid "Fake 'gpu busy' states"
+msgstr "Faux états 'GPU occupé'"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:38
+msgid "Toggle busy flags after drawing"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:39
+msgid "0: Off (fastest)"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:40
+msgid "1: Game dependant"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:41
+msgid "2: Always"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:42
+msgid "320x240"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:43
+msgid "640x480"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:44
+msgid "800x600"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:45
+msgid "1024x768"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:46
+msgid "1152x864"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:47
+msgid "1280x1024"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:48
+msgid "1600x1200"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:49
+msgid "0: None"
+msgstr "0: Aucun"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:50
+msgid "1: 2xSai"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:51
+msgid "2: 2xSuperSai"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:52
+msgid "3: SuperEagle"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:53
+msgid "4: Scale2x"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:54
+msgid "5: Scale3x"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:55
+msgid "6: HQ2X"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:56
+msgid "7: HQ3X"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpu.c:97
+msgid "OpenGL Driver"
+msgstr "Pilote OpenGL"
+
+#: ../plugins/peopsxgl/gpu.c:99
+msgid "Pete Bernert"
+msgstr "Pete Bernert"
+
+#: ../plugins/peopsxgl/gpu.c:100
+msgid ""
+"Based on P.E.Op.S. MesaGL Driver V1.78\n"
+"Coded by Pete Bernert\n"
+msgstr ""
+"Basé sur le pilote MesaGL P.E.Op.S. V1.78\n"
+"Codé par Pete Bernert\n"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:1
+#, fuzzy
+msgid "OpenGL Driver configuration"
+msgstr "Configuration CDR"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:2
+msgid "Width:"
+msgstr "Largeur :"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:3
+msgid "Height:"
+msgstr "Hauteur :"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:5
+msgid "Dithering"
+msgstr "Tramage"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:6
+msgid "Keep psx aspect ratio"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:7
+msgid "Window options"
+msgstr "Options d'écran"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:8
+msgid "Quality:"
+msgstr "Qualité :"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:9
+msgid "Filtering:"
+msgstr "Filtrage"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:10
+msgid "HiRes Tex:"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:11
+msgid "VRam size in MBytes (0..1024, 0=auto):"
+msgstr "Taille VRam en MBytes (0..1024, 0=auto) :"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:12
+msgid "Textures"
+msgstr "Textures"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:13
+msgid "Show FPS display on startup"
+msgstr "Afficher le FPS au démarrage"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:14
+msgid "Use FPS limit"
+msgstr "Limiter les FPS"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:15
+#, fuzzy
+msgid "FPS limit auto-detector"
+msgstr "Limite FPS auto"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:16
+msgid "FPS limit manual"
+msgstr "Limite FPS manuelle"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:17
+msgid "FPS"
+msgstr "FPS"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:18
+msgid "Use Frame skipping"
+msgstr "Saut d'image"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:19
+msgid "Framerate"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:20
+msgid "Offscreen drawing:"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:21
+msgid "Framebuffer textures:"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:22
+msgid "Framebuffer access:"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:23
+msgid "Mask bit detection (Needed by a few games, zbuffer)"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:24
+msgid "Alpha multipass (Correct opaque texture areas)"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:25
+msgid "Advanced blending (Accurate psx color emulation)"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:26
+msgid "Compatibility"
+msgstr "Compatibilité"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:27
+msgid "Scanlines Blending (0..255, -1=dot):"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:28
+msgid "Unfiltered MDECs (Small movie speedup)"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:29
+msgid "Force 15 bit framebuffer updates (Faster movies)"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:30
+msgid "Line mode (Polygons will not get filled)"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:31
+msgid "Polygon anti-aliasing (Slow with most cards)"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:32
+#, fuzzy
+msgid "Use OpenGL extensions (Recommended)"
+msgstr "Extentions OpenGL (Recommandé)"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:33
+#, fuzzy
+msgid "Screen smoothing (Can be slow or unsupported)"
+msgstr "Lissage d'écran (peut être lent ou non supporté)"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:34
+msgid "Gte accuracy"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:35
+msgid "Misc"
+msgstr "Divers"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:37
+#, fuzzy
+msgid "Battle cursor (FF7)"
+msgstr "01: Curseur de bataille (FF7)"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:38
+msgid "Yellow rect (FF9)"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:39
+msgid "Direct FB updates"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:40
+#, fuzzy
+msgid "Black brightness (Lunar)"
+msgstr "Écrans noirs dans Lunar"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:41
+msgid "Swap front detection"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:42
+#, fuzzy
+msgid "Disable coord check"
+msgstr "Désactiver la vérification des coordonnées"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:43
+msgid "No blue glitches (LoD)"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:44
+msgid "Soft FB access"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:47
+msgid "No subtr. blending"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:48
+msgid "Lazy upload (DW7)"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:49
+#, fuzzy
+msgid "Odd/even hack"
+msgstr "Hack des bits pairs/impairs"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:50
+#, fuzzy
+msgid "Adjust screen width"
+msgstr "Étendre la largeur d'écran"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:51
+msgid "Old texture filtering"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:52
+msgid "Additional uploads"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:53
+#, fuzzy
+msgid "Unused"
+msgstr "Utilisé"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:54
+#, fuzzy
+msgid "Fake 'GPU busy'"
+msgstr "Faux états 'GPU occupé'"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:55
+msgid "Special game fixes"
+msgstr "Correctifs spécifique aux jeux"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:56
+#, fuzzy
+msgid "Fast"
+msgstr "Coller"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:57
+msgid "Autoconfigure for fast display"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:58
+msgid "Beautiful"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:59
+msgid "Auto configure for beautiful display"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:60
+#, fuzzy
+msgid "None - Fastest, most glitches"
+msgstr "0: Aucun - Le plus rapide, mais des glitches"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:61
+msgid "Minimum - Missing screens"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:62
+msgid "Standard - OK for most games"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:63
+msgid "Enhanced - Shows more stuff"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:64
+msgid "Extended - Causing garbage"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:65
+#, fuzzy
+msgid "None (Standard)"
+msgstr "0: Aucun (Défaut)"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:66
+msgid "2xSaI (Much vram needed)"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:67
+msgid "Scaled (Needs tex filtering)"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:69
+msgid "Standard - Glitches will happen"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:70
+msgid "Extended - No black borders"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:71
+msgid "Standard without sprites - Unfiltered 2D"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:72
+msgid "Extended without sprites - Unfiltered 2D"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:73
+msgid "Standard + smoothed sprites"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:74
+msgid "Extended + smoothed sprites"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:75
+msgid "Don't care - Use driver's default textures"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:76
+msgid "4444 - Fast, but less colorful"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:77
+msgid "5551 - Nice colors, bad transparency"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:78
+msgid "8888 - Best colors, more ram needed"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:79
+msgid "BGR8888 - Faster on some cards"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:80
+#, fuzzy
+msgid "Emulated VRam - Ok most times"
+msgstr "0: VRam émulée - Ok la plupart du temps"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:81
+msgid "Gfx card buffer reads"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:82
+msgid "Gfx card buffer moves"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:83
+msgid "Gfx card buffer reads and moves"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:84
+msgid "Full Software (FVP)"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:85
+#, fuzzy
+msgid "Emulated VRam - Needs FVP"
+msgstr "0: VRam émulée - Nécessite FVP"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:86
+msgid "Black - Fast, no effects"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:87
+msgid "Gfx card buffer - Can be slow"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:88
+msgid "Gfx card and soft - Slow"
+msgstr ""
+
+#: ../plugins/bladesio1/gui.c:112
+#, fuzzy
+msgid "Link Cable Configuration"
+msgstr "Configuration"
+
+#. *************************************************************************
+#. #define SIO1_DEBUG 1
+#: ../plugins/bladesio1/sio1.c:44
+msgid "sio1Blade"
+msgstr ""
+
+#. *************************************************************************
+#: ../plugins/bladesio1/sio1.ui.h:1 ../win32/gui/AboutDlg.c:48
+#: ../win32/gui/AboutDlg.c:52 ../win32/gui/CheatDlg.c:69
+#: ../win32/gui/CheatDlg.c:119 ../win32/gui/ConfigurePlugins.c:529
+#: ../win32/gui/ConfigurePlugins.c:667 ../win32/gui/WndMain.c:1088
+#: ../win32/gui/WndMain.c:1324
+msgid "OK"
+msgstr "OK"
+
+#: ../plugins/bladesio1/sio1.ui.h:2
+msgid "CANCEL"
+msgstr ""
+
+#: ../plugins/bladesio1/sio1.ui.h:3
+#, fuzzy
+msgid ""
+"Select here if you'll be Server (Player1) or Client (Player2).\n"
+"If you select Server you must Copy your IP address to the Clipboard and "
+"paste if (Ctrl+V) wherever the Client can see it.\n"
+"If you selected Client please enter the IP address the Server gave to you in "
+"the IP Address Control."
+msgstr ""
+"Choisissez si vous voulez être serveur (Joueur 1) ou client (Joueur 2).\n"
+"\n"
+"Si vous avez choisi serveur, vous devez copier votre IP dans le presse-"
+"papieret la coller (Ctrl+V) quelque part où le client pourra la voir.\n"
+"\n"
+"Si vous avez choisi client, veuillez entrer l'adresse IP que le serveur "
+"vousaura fournie dans la zone Adresse IP."
+
+#: ../plugins/bladesio1/sio1.ui.h:9
+#, fuzzy
+msgid "Disabled"
+msgstr "XA Désactivé"
+
+#: ../win32/gui/AboutDlg.c:26
+msgid ""
+"PCSXR - A PlayStation Emulator\n"
+"\n"
+"Original Authors:\n"
+"main coder: linuzappz\n"
+"co-coders: shadow\n"
+"ex-coders: Nocomp, Pete Bernett, nik3d\n"
+"Webmaster: AkumaX"
+msgstr ""
+"PCSXR - Un émulateur PlayStation\n"
+"\n"
+"Auteurs originaux :\n"
+"principal développeur : linuzappz\n"
+"co-développeurs : shadow\n"
+"ex-développeurs : Nocomp, Pete Bernett, nik3d\n"
+"webmestre : AkumaX"
+
+#: ../win32/gui/AboutDlg.c:35
+msgid ""
+"PCSX-df Authors:\n"
+"Ryan Schultz, Andrew Burton, Stephen Chao,\n"
+"Marcus Comstedt, Stefan Sikora\n"
+"\n"
+"PCSX-Reloaded By:\n"
+"edgbla, shalma, Wei Mingzhi, et al.\n"
+"\n"
+"http://pcsxr.codeplex.com/"
+msgstr ""
+"Auteurs de PCSX-df :\n"
+"Ryan Schultz, Andrew Burton, Stephen Chao,\n"
+"Marcus Comstedt, Stefan Sikora\n"
+"\n"
+"PCSX-Reloaded par :\n"
+"edgbla, shalma, Wei Mingzhi, et al.\n"
+"\n"
+"http://pcsxr.codeplex.com/"
+
+#: ../win32/gui/AboutDlg.c:46
+msgid "About"
+msgstr "À propos"
+
+#: ../win32/gui/AboutDlg.c:49
+msgid "PCSXR EMU\n"
+msgstr "PCSXR EMU\n"
+
+#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
+#: ../win32/gui/CheatDlg.c:270
+msgid "Yes"
+msgstr "Oui"
+
+#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
+#: ../win32/gui/CheatDlg.c:270
+msgid "No"
+msgstr "Non"
+
+#: ../win32/gui/CheatDlg.c:70 ../win32/gui/CheatDlg.c:120
+#: ../win32/gui/ConfigurePlugins.c:530 ../win32/gui/ConfigurePlugins.c:668
+#: ../win32/gui/WndMain.c:1089 ../win32/gui/WndMain.c:1325
+msgid "Cancel"
+msgstr "Annuler"
+
+#: ../win32/gui/CheatDlg.c:168
+msgid "&Add Code"
+msgstr "&Ajouter code"
+
+#: ../win32/gui/CheatDlg.c:169
+msgid "&Edit Code"
+msgstr "&Modifier code"
+
+#: ../win32/gui/CheatDlg.c:170
+msgid "&Remove Code"
+msgstr "&Supprimer code"
+
+#: ../win32/gui/CheatDlg.c:171
+msgid "&Enable/Disable"
+msgstr "&Activer/Désactiver"
+
+#: ../win32/gui/CheatDlg.c:172
+msgid "&Load..."
+msgstr "&Chargement..."
+
+#: ../win32/gui/CheatDlg.c:173
+msgid "&Save As..."
+msgstr "&Enregistrer sous..."
+
+#: ../win32/gui/CheatDlg.c:174
+msgid "&Close"
+msgstr "&Fermer"
+
+#: ../win32/gui/CheatDlg.c:190
+msgid "Enabled"
+msgstr "Activé"
+
+#: ../win32/gui/CheatDlg.c:282 ../win32/gui/CheatDlg.c:311
+msgid "PCSXR Cheat Code Files"
+msgstr "Fichier de codes de triche PCSXR"
+
+#: ../win32/gui/CheatDlg.c:453
+msgid "No addresses found."
+msgstr "Pas d'adresses trouvées."
+
+#: ../win32/gui/CheatDlg.c:505 ../win32/gui/CheatDlg.c:596
+msgid "Address:"
+msgstr "Adresse :"
+
+#: ../win32/gui/CheatDlg.c:566
+#, c-format
+msgid "Freeze %.8X"
+msgstr "Geler %.8X"
+
+#: ../win32/gui/CheatDlg.c:685
+msgid "&Freeze"
+msgstr "&Geler"
+
+#: ../win32/gui/CheatDlg.c:686
+msgid "&Modify"
+msgstr "&Modifier"
+
+#: ../win32/gui/CheatDlg.c:687
+msgid "&Copy"
+msgstr "&Copier"
+
+#: ../win32/gui/CheatDlg.c:688
+msgid "&Search"
+msgstr "&Rechercher"
+
+#: ../win32/gui/CheatDlg.c:689
+msgid "&New Search"
+msgstr "&Nouvelle recherche"
+
+#: ../win32/gui/CheatDlg.c:690
+msgid "C&lose"
+msgstr "&Fermer"
+
+#: ../win32/gui/ConfigurePlugins.c:234
+msgid "Simulate Psx Bios"
+msgstr "Simuler le BIOS PSX"
+
+#: ../win32/gui/ConfigurePlugins.c:330
+msgid "Configuration not OK!"
+msgstr "Problème de configuration !"
+
+#: ../win32/gui/ConfigurePlugins.c:445
+msgid "This plugin reports that should work correctly"
+msgstr "Ce greffon devrait fonctionner correctement"
+
+#: ../win32/gui/ConfigurePlugins.c:446
+msgid "This plugin reports that should not work correctly"
+msgstr "Ce greffon ne va pas fonctionner correctement"
+
+#: ../win32/gui/ConfigurePlugins.c:509
+msgid "Select Plugins Directory"
+msgstr "Sélectionner un dossier de plugins"
+
+#: ../win32/gui/ConfigurePlugins.c:518
+msgid "Select Bios Directory"
+msgstr "Slectionner un dossier de BIOS"
+
+#: ../win32/gui/ConfigurePlugins.c:527
+msgid "Configuration"
+msgstr "Configuration"
+
+#: ../win32/gui/ConfigurePlugins.c:531
+msgid "Graphics"
+msgstr "Graphismes"
+
+#: ../win32/gui/ConfigurePlugins.c:532
+msgid "First Controller"
+msgstr "Contrôleur 1"
+
+#: ../win32/gui/ConfigurePlugins.c:533
+msgid "Second Controller"
+msgstr "Contrôleur 2"
+
+#: ../win32/gui/ConfigurePlugins.c:534
+msgid "Sound"
+msgstr "Son"
+
+#: ../win32/gui/ConfigurePlugins.c:535
+msgid "Cdrom"
+msgstr "CD-ROM"
+
+#: ../win32/gui/ConfigurePlugins.c:536
+#, fuzzy
+msgid "Link cable"
+msgstr "Activer"
+
+#: ../win32/gui/ConfigurePlugins.c:537
+msgid "Bios"
+msgstr "BIOS"
+
+#: ../win32/gui/ConfigurePlugins.c:538
+msgid "Set Bios Directory"
+msgstr "Définir le dossier des BIOS"
+
+#: ../win32/gui/ConfigurePlugins.c:539
+msgid "Set Plugins Directory"
+msgstr "Définir le dossier des greffons"
+
+#: ../win32/gui/ConfigurePlugins.c:540 ../win32/gui/ConfigurePlugins.c:543
+#: ../win32/gui/ConfigurePlugins.c:546 ../win32/gui/ConfigurePlugins.c:549
+#: ../win32/gui/ConfigurePlugins.c:552 ../win32/gui/ConfigurePlugins.c:555
+#: ../win32/gui/ConfigurePlugins.c:670
+msgid "Configure..."
+msgstr "Configurer..."
+
+#: ../win32/gui/ConfigurePlugins.c:541 ../win32/gui/ConfigurePlugins.c:544
+#: ../win32/gui/ConfigurePlugins.c:547 ../win32/gui/ConfigurePlugins.c:550
+#: ../win32/gui/ConfigurePlugins.c:553 ../win32/gui/ConfigurePlugins.c:556
+#: ../win32/gui/ConfigurePlugins.c:671
+msgid "Test..."
+msgstr "Tester..."
+
+#: ../win32/gui/ConfigurePlugins.c:542 ../win32/gui/ConfigurePlugins.c:545
+#: ../win32/gui/ConfigurePlugins.c:548 ../win32/gui/ConfigurePlugins.c:551
+#: ../win32/gui/ConfigurePlugins.c:554 ../win32/gui/ConfigurePlugins.c:557
+#: ../win32/gui/ConfigurePlugins.c:672
+msgid "About..."
+msgstr "À propos..."
+
+#: ../win32/gui/ConfigurePlugins.c:665
+msgid "NetPlay Configuration"
+msgstr "Configuration du jeu en réseau"
+
+#: ../win32/gui/ConfigurePlugins.c:673
+msgid ""
+"Note: The NetPlay Plugin Directory should be the same as the other Plugins."
+msgstr ""
+"NB : Le dossier du greffon de jeu en réseau doit être le même que pour les "
+"autres greffons."
+
+#: ../win32/gui/plugin.c:94 ../win32/gui/WndMain.c:331
+#, c-format
+msgid "*PCSXR*: Saved State %d"
+msgstr "*PCSXR*: État sauvé %d"
+
+#: ../win32/gui/plugin.c:95 ../win32/gui/WndMain.c:332
+#, c-format
+msgid "*PCSXR*: Error Saving State %d"
+msgstr "*PCSXR*: Erreur lors de la sauvegarde de l'état %d"
+
+#: ../win32/gui/plugin.c:111 ../win32/gui/WndMain.c:309
+#, c-format
+msgid "*PCSXR*: Loaded State %d"
+msgstr "*PCSXR*: État chargé %d"
+
+#: ../win32/gui/plugin.c:112 ../win32/gui/WndMain.c:310
+#, c-format
+msgid "*PCSXR*: Error Loading State %d"
+msgstr "*PCSXR*: Erreur lors du chargement de l'état %d"
+
+#: ../win32/gui/plugin.c:123
+#, c-format
+msgid "*PCSXR*: Sio Irq Always Enabled"
+msgstr "*PCSXR*: SIO IRQ toujours activé"
+
+#: ../win32/gui/plugin.c:124
+#, c-format
+msgid "*PCSXR*: Sio Irq Not Always Enabled"
+msgstr "*PCSXR*: SIO IRQ pas toujours activé"
+
+#: ../win32/gui/plugin.c:131
+#, c-format
+msgid "*PCSXR*: Black&White Mdecs Only Enabled"
+msgstr ""
+
+#: ../win32/gui/plugin.c:132
+#, c-format
+msgid "*PCSXR*: Black&White Mdecs Only Disabled"
+msgstr ""
+
+#: ../win32/gui/plugin.c:139
+#, c-format
+msgid "*PCSXR*: Xa Enabled"
+msgstr "*PCSXR*: XA Activé"
+
+#: ../win32/gui/plugin.c:140
+#, c-format
+msgid "*PCSXR*: Xa Disabled"
+msgstr "*PCSXR*: XA Désactivé"
+
+#: ../win32/gui/plugin.c:149
+msgid "*PCSXR*: CdRom Case Opened"
+msgstr "*PCSXR*: Lecteur CD-ROM ouvert"
+
+#: ../win32/gui/plugin.c:155
+msgid "*PCSXR*: CdRom Case Closed"
+msgstr "*PCSXR*: Lecteur CD-ROM fermé"
+
+#: ../win32/gui/plugin.c:181
+msgid "Connecting..."
+msgstr "Connexion..."
+
+#: ../win32/gui/plugin.c:183 ../win32/gui/plugin.c:190
+#, c-format
+msgid "Please wait while connecting... %c\n"
+msgstr "Merci de bien vouloir patienter durant la connexion... %c\n"
+
+#: ../win32/gui/plugin.c:218
+msgid "Error Opening CDR Plugin"
+msgstr "Erreur au chargement du greffon CDR"
+
+#: ../win32/gui/plugin.c:281
+#, c-format
+msgid "Error Opening GPU Plugin (%d)"
+msgstr "Erreur au chargement du greffon GPU (%d)"
+
+#: ../win32/gui/plugin.c:283
+#, c-format
+msgid "Error Opening SPU Plugin (%d)"
+msgstr "Erreur au chargement du greffon SPU (%d)"
+
+#: ../win32/gui/plugin.c:286
+#, c-format
+msgid "Error Opening PAD1 Plugin (%d)"
+msgstr "Erreur au chargement du greffon Contrôleur 1 (%d)"
+
+#: ../win32/gui/plugin.c:290
+#, c-format
+msgid "Error Opening PAD2 Plugin (%d)"
+msgstr "Erreur au chargement du greffon Contrôleur 2 (%d)"
+
+#: ../win32/gui/plugin.c:295
+#, fuzzy, c-format
+msgid "Error Opening SIO1 plugin (%d)"
+msgstr "Erreur au chargement du greffon SPU (%d)"
+
+#: ../win32/gui/plugin.c:325
+msgid "Error Closing CDR Plugin"
+msgstr "Erreur à la fermeture du greffon CDR"
+
+#: ../win32/gui/plugin.c:327
+msgid "Error Closing GPU Plugin"
+msgstr "Erreur à la fermeture du greffon GPU"
+
+#: ../win32/gui/plugin.c:329
+msgid "Error Closing SPU Plugin"
+msgstr "Erreur à la fermeture du greffon SPU"
+
+#: ../win32/gui/plugin.c:332
+#, fuzzy
+msgid "Error Closing SIO1 plugin"
+msgstr "Erreur à la fermeture du greffon SPU"
+
+#: ../win32/gui/plugin.c:354
+#, c-format
+msgid "CDRinit error: %d"
+msgstr "Erreur lors de l'initialisation du greffon CDR : %d"
+
+#: ../win32/gui/plugin.c:356
+#, c-format
+msgid "GPUinit error: %d"
+msgstr "Erreur lors de l'initialisation du greffon GPU : %d"
+
+#: ../win32/gui/plugin.c:358
+#, c-format
+msgid "SPUinit error: %d"
+msgstr "Erreur lors de l'initialisation du greffon SPU : %d"
+
+#: ../win32/gui/plugin.c:360
+#, c-format
+msgid "PAD1init error: %d"
+msgstr "Erreur lors de l'initialisation du greffon Contrôleur 1 : %d"
+
+#: ../win32/gui/plugin.c:362
+#, c-format
+msgid "PAD2init error: %d"
+msgstr "Erreur lors de l'initialisation du greffon Contrôleur 2 : %d"
+
+#: ../win32/gui/plugin.c:365
+#, fuzzy, c-format
+msgid "SIO1init error: %d"
+msgstr "Erreur lors de l'initialisation du greffon SPU : %d"
+
+#: ../win32/gui/plugin.c:370
+#, c-format
+msgid "NETinit error: %d"
+msgstr "Erreur lors de l'initialisation du greffon de jeu en réseau : %d"
+
+#: ../win32/gui/WndMain.c:77
+msgid "Arabic"
+msgstr "Arabe"
+
+#: ../win32/gui/WndMain.c:78
+msgid "Catalan"
+msgstr "Catalan"
+
+#: ../win32/gui/WndMain.c:79
+msgid "German"
+msgstr "Allemand"
+
+#: ../win32/gui/WndMain.c:80
+msgid "Greek"
+msgstr "Grec"
+
+#: ../win32/gui/WndMain.c:81 ../win32/gui/WndMain.c:1699
+#: ../win32/gui/WndMain.c:1701
+msgid "English"
+msgstr "Anglais"
+
+#: ../win32/gui/WndMain.c:82
+msgid "Spanish"
+msgstr "Espagnol"
+
+#: ../win32/gui/WndMain.c:83
+msgid "French"
+msgstr "Français"
+
+#: ../win32/gui/WndMain.c:84
+msgid "Italian"
+msgstr "Italien"
+
+#: ../win32/gui/WndMain.c:85
+msgid "Portuguese"
+msgstr "Portugais"
+
+#: ../win32/gui/WndMain.c:86
+msgid "Portuguese (Brazilian)"
+msgstr "Portugais (Brézilien)"
+
+#: ../win32/gui/WndMain.c:87
+msgid "Romanian"
+msgstr "Roumain"
+
+#: ../win32/gui/WndMain.c:88
+msgid "Russian"
+msgstr "Russe"
+
+#: ../win32/gui/WndMain.c:89
+msgid "Simplified Chinese"
+msgstr "Chinois simplifié"
+
+#: ../win32/gui/WndMain.c:90
+msgid "Traditional Chinese"
+msgstr "Chinois traditionnel"
+
+#: ../win32/gui/WndMain.c:91
+msgid "Japanese"
+msgstr "Japonais"
+
+#: ../win32/gui/WndMain.c:92
+msgid "Korean"
+msgstr "Koréen"
+
+#: ../win32/gui/WndMain.c:215
+#, fuzzy
+msgid ""
+"Usage: pcsxr [options]\n"
+"\toptions:\n"
+"\t-nogui\t\tDon't open the GUI\n"
+"\t-psxout\t\tEnable PSX output\n"
+"\t-slowboot\tEnable BIOS logo\n"
+"\t-runcd\t\tRuns CD-ROM (requires -nogui)\n"
+"\t-cdfile FILE\tRuns a CD image file (requires -nogui)\n"
+"\t-help\t\tDisplay this message"
+msgstr ""
+"Usage: pcsxr [options]\n"
+"\toptions:\n"
+"\t-nogui\t\tDésactiver l'interface graphique\n"
+"\t-psxout\t\tActiver la sortie PSX\n"
+"\t-runcd\t\tLancer à partir du CD-ROM (requière -nogui)\n"
+"\t-cdfile FILE\tLance une image CD (requière -nogui)\n"
+"\t-help\tAffiche ce message"
+
+#: ../win32/gui/WndMain.c:350 ../win32/gui/WndMain.c:396
+msgid "PCSXR State Format"
+msgstr "Format d'état PCSXR"
+
+#: ../win32/gui/WndMain.c:377
+#, c-format
+msgid "*PCSXR*: Loaded State %s"
+msgstr "*PCSXR*: État chargé %s"
+
+#: ../win32/gui/WndMain.c:378
+#, c-format
+msgid "*PCSXR*: Error Loading State %s"
+msgstr "*PCSXR*: Erreur lors du chargement de l'état %s"
+
+#: ../win32/gui/WndMain.c:423
+#, c-format
+msgid "*PCSXR*: Saved State %s"
+msgstr "*PCSXR*: État %s sauvegardé"
+
+#: ../win32/gui/WndMain.c:424
+#, c-format
+msgid "*PCSXR*: Error Saving State %s"
+msgstr "*PCSXR*: Erreur lors de la sauvegarde de l'état %s"
+
+#: ../win32/gui/WndMain.c:493
+msgid "Running BIOS is not supported with Internal HLE Bios."
+msgstr "Le lancement du BIOS n'est pas supporté en mode Internal HLE BIOS."
+
+#: ../win32/gui/WndMain.c:790
+msgid "Game ID"
+msgstr "ID du jeu"
+
+#: ../win32/gui/WndMain.c:796
+msgid "Game"
+msgstr "Jeu"
+
+#: ../win32/gui/WndMain.c:978
+msgid "mid link block"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:981
+msgid "terminiting link block"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1086
+msgid "Memcard Manager"
+msgstr "Gestionnaire de carte mémoire"
+
+#: ../win32/gui/WndMain.c:1090 ../win32/gui/WndMain.c:1093
+msgid "Select Mcd"
+msgstr "Sélectionner une carte mémoire"
+
+#: ../win32/gui/WndMain.c:1091 ../win32/gui/WndMain.c:1094
+msgid "Format Mcd"
+msgstr "Formater la carte mémoire"
+
+#: ../win32/gui/WndMain.c:1092 ../win32/gui/WndMain.c:1095
+msgid "Reload Mcd"
+msgstr "Recharger la carte mémoire"
+
+#: ../win32/gui/WndMain.c:1096
+msgid "-> Copy ->"
+msgstr "-> Copier ->"
+
+#: ../win32/gui/WndMain.c:1097
+msgid "<- Copy <-"
+msgstr "<- Copier <-"
+
+#: ../win32/gui/WndMain.c:1098
+msgid "Paste"
+msgstr "Coller"
+
+#: ../win32/gui/WndMain.c:1099
+msgid "<- Un/Delete"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1100
+msgid "Un/Delete ->"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1102
+msgid "Memory Card 1"
+msgstr "Carte mémoire 1"
+
+#: ../win32/gui/WndMain.c:1103
+msgid "Memory Card 2"
+msgstr "Carte mémoire 2"
+
+#: ../win32/gui/WndMain.c:1158
+msgid "Are you sure you want to paste this selection?"
+msgstr "Êtes-vous sûr de vouloir coller cette sélection ?"
+
+#: ../win32/gui/WndMain.c:1158 ../win32/gui/WndMain.c:1269
+#: ../win32/gui/WndMain.c:1276
+msgid "Confirmation"
+msgstr "Confirmation"
+
+#: ../win32/gui/WndMain.c:1269 ../win32/gui/WndMain.c:1276
+msgid "Are you sure you want to format this Memory Card?"
+msgstr "Êtes vous sûr de vouloir formater cette carte mémoire ?"
+
+#: ../win32/gui/WndMain.c:1322
+msgid "Cpu Config"
+msgstr "Configuration CPU"
+
+#: ../win32/gui/WndMain.c:1327
+msgid "Disable Xa Decoding"
+msgstr "Désactiver le décodage XA"
+
+#: ../win32/gui/WndMain.c:1328
+msgid "Sio Irq Always Enabled"
+msgstr "SIO IRQ toujours activé"
+
+#: ../win32/gui/WndMain.c:1329
+msgid "Black && White Movies"
+msgstr "Films en noir et blanc"
+
+#: ../win32/gui/WndMain.c:1330
+msgid "Disable Cd audio"
+msgstr "Désactiver CD Audio"
+
+#: ../win32/gui/WndMain.c:1333
+msgid "Enable Interpreter Cpu"
+msgstr "Activer l'interpréteur CPU"
+
+#: ../win32/gui/WndMain.c:1336
+msgid "Spu Irq Always Enabled"
+msgstr "SPU IRQ toujours activé"
+
+#: ../win32/gui/WndMain.c:1340
+msgid "Hide cursor"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1343
+msgid "Psx System Type"
+msgstr "Type de système PSX"
+
+#: ../win32/gui/WndMain.c:1453
+msgid "Psx Mcd Format (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
+msgstr "Format de carte mémoire PSX (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
+
+#: ../win32/gui/WndMain.c:1458
+msgid "Psx Memory Card (*.mcr;*.mc)"
+msgstr "Carte mémoire PSX (*.mcr;*.mc)"
+
+#: ../win32/gui/WndMain.c:1463
+msgid "CVGS Memory Card (*.mem;*.vgs)"
+msgstr "Carte mémoire CVGS (*.mem;*.vgs)"
+
+#: ../win32/gui/WndMain.c:1468
+msgid "Bleem Memory Card (*.mcd)"
+msgstr "Carte mémoire Bleem (*.mcd)"
+
+#: ../win32/gui/WndMain.c:1473
+msgid "DexDrive Memory Card (*.gme)"
+msgstr "Carte mémoire DexDrive (*.gme)"
+
+#: ../win32/gui/WndMain.c:1478
+msgid "DataDeck Memory Card (*.ddf)"
+msgstr "Carte mémoire DataDeck (*.ddf)"
+
+#: ../win32/gui/WndMain.c:1522
+msgid "Psx Exe Format"
+msgstr "Format EXE PSX"
+
+#: ../win32/gui/WndMain.c:1559
+#, fuzzy
+msgid "Psx Isos (*.iso;*.mdf;*.img;*.bin;*.cue;*.pbp;*.cbn)"
+msgstr "ISOs PSX (*.iso;*.mdf;*.img;*.bin)"
+
+#: ../win32/gui/WndMain.c:1635
+msgid "&File"
+msgstr "&Fichier"
+
+#: ../win32/gui/WndMain.c:1636
+msgid "E&xit"
+msgstr "Quitter"
+
+#: ../win32/gui/WndMain.c:1638
+msgid "Run &EXE..."
+msgstr "Lancer un EXE..."
+
+#: ../win32/gui/WndMain.c:1639
+msgid "Run &BIOS"
+msgstr "Lancer le BIOS"
+
+#: ../win32/gui/WndMain.c:1640
+msgid "Run &ISO..."
+msgstr "Lancer un ISO..."
+
+#: ../win32/gui/WndMain.c:1641
+msgid "Run &CD"
+msgstr "Lancer à partir du CD"
+
+#: ../win32/gui/WndMain.c:1643
+msgid "&Emulator"
+msgstr "Émulateur"
+
+#: ../win32/gui/WndMain.c:1644
+msgid "&States"
+msgstr "États"
+
+#: ../win32/gui/WndMain.c:1646
+msgid "S&witch ISO..."
+msgstr "Changer d'ISO..."
+
+#: ../win32/gui/WndMain.c:1648
+#, fuzzy
+msgid "S&hutdown"
+msgstr "Droite-bas"
+
+#: ../win32/gui/WndMain.c:1649
+msgid "Re&set"
+msgstr "&Reset"
+
+#: ../win32/gui/WndMain.c:1650
+msgid "&Run"
+msgstr "&Lancer"
+
+#: ../win32/gui/WndMain.c:1651
+msgid "&Save"
+msgstr "&Sauvegarder"
+
+#: ../win32/gui/WndMain.c:1652
+msgid "&Load"
+msgstr "&Charger"
+
+#: ../win32/gui/WndMain.c:1653 ../win32/gui/WndMain.c:1663
+msgid "&Other..."
+msgstr "&Autre..."
+
+#: ../win32/gui/WndMain.c:1654 ../win32/gui/WndMain.c:1664
+msgid "Slot &9"
+msgstr "Emplacement &9"
+
+#: ../win32/gui/WndMain.c:1655 ../win32/gui/WndMain.c:1665
+msgid "Slot &8"
+msgstr "Emplacement &8"
+
+#: ../win32/gui/WndMain.c:1656 ../win32/gui/WndMain.c:1666
+msgid "Slot &7"
+msgstr "Emplacement &7"
+
+#: ../win32/gui/WndMain.c:1657 ../win32/gui/WndMain.c:1667
+msgid "Slot &6"
+msgstr "Emplacement &6"
+
+#: ../win32/gui/WndMain.c:1658 ../win32/gui/WndMain.c:1668
+msgid "Slot &5"
+msgstr "Emplacement &5"
+
+#: ../win32/gui/WndMain.c:1659 ../win32/gui/WndMain.c:1669
+msgid "Slot &4"
+msgstr "Emplacement &4"
+
+#: ../win32/gui/WndMain.c:1660 ../win32/gui/WndMain.c:1670
+msgid "Slot &3"
+msgstr "Emplacement &3"
+
+#: ../win32/gui/WndMain.c:1661 ../win32/gui/WndMain.c:1671
+msgid "Slot &2"
+msgstr "Emplacement &2"
+
+#: ../win32/gui/WndMain.c:1662 ../win32/gui/WndMain.c:1672
+msgid "Slot &1"
+msgstr "Emplacement &1"
+
+#: ../win32/gui/WndMain.c:1674
+msgid "&Configuration"
+msgstr "&Configuration"
+
+#: ../win32/gui/WndMain.c:1675
+msgid "Cheat &Search..."
+msgstr "&Recherche de codes..."
+
+#: ../win32/gui/WndMain.c:1676
+msgid "Ch&eat Code..."
+msgstr "Cod&es de triche..."
+
+#: ../win32/gui/WndMain.c:1679
+msgid "&Language"
+msgstr "&Langue"
+
+#: ../win32/gui/WndMain.c:1705
+msgid "&Memory cards..."
+msgstr "Cartes &Mémoires..."
+
+#: ../win32/gui/WndMain.c:1706
+msgid "C&PU..."
+msgstr "C&PU..."
+
+#: ../win32/gui/WndMain.c:1708
+msgid "&NetPlay..."
+msgstr "&Jeu en réseau..."
+
+#: ../win32/gui/WndMain.c:1710
+#, fuzzy
+msgid "&Link cable..."
+msgstr "Activer"
+
+#: ../win32/gui/WndMain.c:1711
+msgid "&Controllers..."
+msgstr "&Contrôleurs..."
+
+#: ../win32/gui/WndMain.c:1712
+msgid "CD-&ROM..."
+msgstr "CD-&ROM..."
+
+#: ../win32/gui/WndMain.c:1713
+msgid "&Sound..."
+msgstr "&Son..."
+
+#: ../win32/gui/WndMain.c:1714
+msgid "&Graphics..."
+msgstr "&Graphismes..."
+
+#: ../win32/gui/WndMain.c:1716
+msgid "&Plugins && Bios..."
+msgstr "&Greffons && BIOS..."
+
+#: ../win32/gui/WndMain.c:1718
+msgid "&Help"
+msgstr "&Aide"
+
+#: ../win32/gui/WndMain.c:1719
+msgid "&About..."
+msgstr "À propos..."
+
+#: ../win32/gui/WndMain.c:1870
+msgid "Pcsxr Msg"
+msgstr "Message PCSXR"
+
+#: ../win32/gui/WndMain.c:1873
+msgid "Error Loading Symbol"
+msgstr "Erreur au chargement du symbole"
+
+#~ msgid "Controller 1: "
+#~ msgstr "Contrôleur 1: "
+
+#~ msgid "Sio1 Driver"
+#~ msgstr "Pilote SIO1"
+
+#~ msgid ""
+#~ "8-bit\n"
+#~ "16-bit\n"
+#~ "32-bit"
+#~ msgstr ""
+#~ "8-bit\n"
+#~ "16-bit\n"
+#~ "32-bit"
+
+#~ msgid "CD-ROM..."
+#~ msgstr "CD-ROM..."
+
+#~ msgid "Continue..."
+#~ msgstr "Continuer..."
+
+#~ msgid "Controllers..."
+#~ msgstr "Contrôleurs..."
+
+#~ msgid ""
+#~ "Decimal\n"
+#~ "Hexadecimal"
+#~ msgstr ""
+#~ "Décimale\n"
+#~ "Héxadecimale"
+
+#~ msgid ""
+#~ "Equal Value\n"
+#~ "Not Equal Value\n"
+#~ "Range\n"
+#~ "Increased By\n"
+#~ "Decreased By\n"
+#~ "Increased\n"
+#~ "Decreased\n"
+#~ "Different\n"
+#~ "No Change"
+#~ msgstr ""
+#~ "Valeur égale\n"
+#~ "Valeur non égale\n"
+#~ "Intervale\n"
+#~ "Augmentée de\n"
+#~ "Diminuée de\n"
+#~ "Augmentée\n"
+#~ "Diminuée\n"
+#~ "Différente\n"
+#~ "Inchangée"
+
+#~ msgid "Graphics..."
+#~ msgstr "Graphismes..."
+
+#~ msgid "Memcards..."
+#~ msgstr "Cartes mémoires..."
+
+#~ msgid "Run ISO..."
+#~ msgstr "Lancer une image ISO..."
+
+#~ msgid "Sound..."
+#~ msgstr "Son..."
+
+#~ msgid "Switch ISO..."
+#~ msgstr "Changer d'ISO..."
+
+#~ msgid "Error: Glade interface could not be loaded!"
+#~ msgstr "Erreur: l'interface Glade n'a pas pu être chargée !"
+
+#~ msgid ""
+#~ "0: None\n"
+#~ "1: 2xSai\n"
+#~ "2: 2xSuperSai\n"
+#~ "3: SuperEagle\n"
+#~ "4: Scale2x\n"
+#~ "5: Scale3x\n"
+#~ "6: HQ2X\n"
+#~ "7: HQ3X"
+#~ msgstr ""
+#~ "0: Aucun\n"
+#~ "1: 2xSai\n"
+#~ "2: 2xSuperSai\n"
+#~ "3: SuperEagle\n"
+#~ "4: Scale2x\n"
+#~ "5: Scale3x\n"
+#~ "6: HQ2X\n"
+#~ "7: HQ3X"
+
+#~ msgid ""
+#~ "0: Off (fastest)\n"
+#~ "1: Game dependant\n"
+#~ "2: Always"
+#~ msgstr ""
+#~ "0: Désactivé (rapide)\n"
+#~ "1: Selon le jeu\n"
+#~ "2: Toujours"
+
+#~ msgid ""
+#~ "320x240\n"
+#~ "640x480\n"
+#~ "800x600\n"
+#~ "1024x768\n"
+#~ "1152x864\n"
+#~ "1280x1024\n"
+#~ "1600x1200"
+#~ msgstr ""
+#~ "320x240\n"
+#~ "640x480\n"
+#~ "800x600\n"
+#~ "1024x768\n"
+#~ "1152x864\n"
+#~ "1280x1024\n"
+#~ "1600x1200"
+
+#~ msgid "Compatibility"
+#~ msgstr "Compatibilité"
+
+#~ msgid "Framerate"
+#~ msgstr "Taux de rafraichissement"
+
+#~ msgid "Screen"
+#~ msgstr "Écran"
+
+#~ msgid "General"
+#~ msgstr "Général"
+
+#~ msgid "XA Music"
+#~ msgstr "Musique XA"
+
+#~ msgid ""
+#~ "None\n"
+#~ "Low\n"
+#~ "Medium\n"
+#~ "Loud\n"
+#~ "Loudest"
+#~ msgstr ""
+#~ "Muet\n"
+#~ "Bas\n"
+#~ "Moyen\n"
+#~ "Fort\n"
+#~ "Le plus fort"
+
+#~ msgid ""
+#~ "None\n"
+#~ "Simple\n"
+#~ "Gaussian\n"
+#~ "Cubic"
+#~ msgstr ""
+#~ "Aucune\n"
+#~ "Simple\n"
+#~ "Gaussienne\n"
+#~ "Cubique"
+
+#~ msgid ""
+#~ "Default\n"
+#~ "125ms\n"
+#~ "250ms\n"
+#~ "500ms\n"
+#~ "1s\n"
+#~ "2s\n"
+#~ "4s\n"
+#~ "8s\n"
+#~ "16s\n"
+#~ "32s\n"
+#~ "1min\n"
+#~ "2min\n"
+#~ "4min\n"
+#~ "8min\n"
+#~ "16min\n"
+#~ "32min"
+#~ msgstr ""
+#~ "Défaut\n"
+#~ "125ms\n"
+#~ "250ms\n"
+#~ "500ms\n"
+#~ "1s\n"
+#~ "2s\n"
+#~ "4s\n"
+#~ "8s\n"
+#~ "16s\n"
+#~ "32s\n"
+#~ "1min\n"
+#~ "2min\n"
+#~ "4min\n"
+#~ "8min\n"
+#~ "16min\n"
+#~ "32min"
+
+#~ msgid "Select CD-ROM device"
+#~ msgstr "Sélectionner un lecteur CD-ROM"
+
+#~ msgid "10000: unused"
+#~ msgstr "10000: Inutilisé"
+
+#~ msgid "Coded by: Pete Bernert"
+#~ msgstr "Codé par : Pete Bernert"
+
+#~ msgid "http://www.pbernert.com"
+#~ msgstr "http://www.pbernert.com"

pcsxr-1.9.93.tar.bz2/po/hu_HU.po Added

@@ -0,0 +1,3532 @@
+# Italian translation of pcsxr
+# Copyright (C) 2010 Giovanni Scafora
+# This file is distributed under the same license as the pcsxr package.
+# Giovanni Scafora <giovanni@archlinux.org>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: pcsxr 1.0\n"
+"Report-Msgid-Bugs-To: whistler_wmz@users.sf.net\n"
+"POT-Creation-Date: 2013-03-02 03:33+0400\n"
+"PO-Revision-Date: 2011-06-04 13:43+0400\n"
+"Last-Translator: Delirious <delirious@freemail.hu>\n"
+"Language-Team: Delirious <delirious@freemail.hu>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Hungarian\n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: ../data/pcsxr.ui.h:1 ../win32/gui/CheatDlg.c:166
+msgid "Edit Cheat Codes"
+msgstr "Csalás kódok szerkesztése"
+
+#: ../data/pcsxr.ui.h:2
+msgid "Cheat Codes"
+msgstr "Csalás kódok"
+
+#: ../data/pcsxr.ui.h:3 ../gui/Cheat.c:1113 ../win32/gui/CheatDlg.c:678
+msgid "Cheat Search"
+msgstr "Csalás keresés"
+
+#: ../data/pcsxr.ui.h:4 ../win32/gui/CheatDlg.c:680
+msgid "Search For:"
+msgstr "A következő keresése:"
+
+#: ../data/pcsxr.ui.h:5 ../win32/gui/CheatDlg.c:681
+msgid "Data Type:"
+msgstr "Adat fajta:"
+
+#: ../data/pcsxr.ui.h:6 ../gui/Cheat.c:645 ../win32/gui/CheatDlg.c:506
+#: ../win32/gui/CheatDlg.c:597 ../win32/gui/CheatDlg.c:682
+msgid "Value:"
+msgstr "Érték:"
+
+#: ../data/pcsxr.ui.h:7 ../win32/gui/CheatDlg.c:683
+msgid "Data Base:"
+msgstr "Adatbázis:"
+
+#: ../data/pcsxr.ui.h:8 ../win32/gui/CheatDlg.c:684
+msgid "To:"
+msgstr "Ide:"
+
+#: ../data/pcsxr.ui.h:9 ../win32/gui/CheatDlg.c:504
+msgid "Freeze"
+msgstr "Fagyasztás"
+
+#: ../data/pcsxr.ui.h:10 ../win32/gui/CheatDlg.c:595
+msgid "Modify"
+msgstr "Módosítás"
+
+#: ../data/pcsxr.ui.h:11
+msgid "Copy"
+msgstr "Másolás"
+
+#: ../data/pcsxr.ui.h:12
+msgid "label_resultsfound"
+msgstr "címke_eredmény találva"
+
+#: ../data/pcsxr.ui.h:13
+msgid "Search"
+msgstr "Keresés"
+
+#: ../data/pcsxr.ui.h:14
+msgid "Restart"
+msgstr "Újraindítás"
+
+#: ../data/pcsxr.ui.h:15
+msgid "Cheat Search"
+msgstr "Csalás keresés"
+
+#: ../data/pcsxr.ui.h:16 ../gui/ConfDlg.c:113
+msgid "Configure PCSXR"
+msgstr "PCSXR beállítása"
+
+#: ../data/pcsxr.ui.h:17
+msgid "Graphics:"
+msgstr "Kép:"
+
+#: ../data/pcsxr.ui.h:18
+msgid "Sound:"
+msgstr "Hang:"
+
+#: ../data/pcsxr.ui.h:19
+#, fuzzy
+msgid "Controller 1:"
+msgstr "Egyes irányító"
+
+#: ../data/pcsxr.ui.h:20
+msgid "Controller 2:"
+msgstr "2. irányító:"
+
+#: ../data/pcsxr.ui.h:21
+msgid "CD-ROM:"
+msgstr "CD-ROM:"
+
+#: ../data/pcsxr.ui.h:22
+msgid "Search in:"
+msgstr "Keresés itt:"
+
+#: ../data/pcsxr.ui.h:23
+msgid "Select Folder to Search"
+msgstr "Keresési mappa kiválasztása"
+
+#: ../data/pcsxr.ui.h:24
+#, fuzzy
+msgid "Link cable:"
+msgstr "Bekapcsolás"
+
+#: ../data/pcsxr.ui.h:25
+msgid "Plugins"
+msgstr "Plugin"
+
+#: ../data/pcsxr.ui.h:26
+msgid "BIOS:"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:27
+msgid "BIOS"
+msgstr "BIOS"
+
+#: ../data/pcsxr.ui.h:28
+msgid "Configure CPU"
+msgstr "Processzor beállítások"
+
+#: ../data/pcsxr.ui.h:29
+msgid "SPU IRQ Always Enabled"
+msgstr "Hang IRQ mindig bekacsolva"
+
+#: ../data/pcsxr.ui.h:30
+msgid "Black & White Movies"
+msgstr "Fekete-fehér videók"
+
+#: ../data/pcsxr.ui.h:31 ../gui/Plugin.c:239
+#, c-format
+msgid "SIO IRQ Always Enabled"
+msgstr "SIO IRQ mindig bekapcsolva"
+
+#: ../data/pcsxr.ui.h:32
+msgid "Disable XA Decoding"
+msgstr "XA kódolás kikapcsolása"
+
+#: ../data/pcsxr.ui.h:33
+msgid "Disable CD Audio"
+msgstr "CD hang kikapcsolása"
+
+#: ../data/pcsxr.ui.h:34 ../win32/gui/WndMain.c:1331
+msgid "Slow Boot"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:35
+msgid "Enable Interpreter CPU"
+msgstr "Processzor interpreter használata"
+
+#: ../data/pcsxr.ui.h:36 ../win32/gui/WndMain.c:1334
+msgid "Enable Console Output"
+msgstr "Konzol kimenet bekapcsolása"
+
+#: ../data/pcsxr.ui.h:37 ../win32/gui/WndMain.c:1335
+msgid "Enable Debugger"
+msgstr "Hibakereső bekapcsolása"
+
+#: ../data/pcsxr.ui.h:38 ../win32/gui/WndMain.c:1337
+msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
+msgstr "Parasite Eve 2, Vandal Hearts 1/2 javítás"
+
+#: ../data/pcsxr.ui.h:39 ../win32/gui/WndMain.c:1338
+msgid "InuYasha Sengoku Battle Fix"
+msgstr "InuYasha Sengoku Battle javítás"
+
+#: ../data/pcsxr.ui.h:40 ../win32/gui/WndMain.c:1339
+msgid "Widescreen (GTE Hack)"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:41
+msgid "Options"
+msgstr "Beállítások"
+
+#: ../data/pcsxr.ui.h:42 ../win32/gui/WndMain.c:1332
+msgid "Autodetect"
+msgstr "Automatikus észlelés"
+
+#: ../data/pcsxr.ui.h:43
+msgid "System Type"
+msgstr "Rendszer típus"
+
+#: ../data/pcsxr.ui.h:44
+msgid "PCSXR"
+msgstr "PCSXR"
+
+#: ../data/pcsxr.ui.h:45
+msgid "_File"
+msgstr "_Fájl"
+
+#: ../data/pcsxr.ui.h:46
+msgid "Run _CD"
+msgstr "CD _indítása"
+
+#: ../data/pcsxr.ui.h:47
+msgid "Run _ISO..."
+msgstr "ISO _futtatása......"
+
+#: ../data/pcsxr.ui.h:48
+msgid "Run _BIOS"
+msgstr "BIOS _futtatása"
+
+#: ../data/pcsxr.ui.h:49
+msgid "Run _EXE..."
+msgstr "EXE _futtatása..."
+
+#: ../data/pcsxr.ui.h:50
+msgid "E_xit"
+msgstr "E_xit"
+
+#: ../data/pcsxr.ui.h:51
+msgid "_Emulator"
+msgstr "_Emulátor"
+
+#: ../data/pcsxr.ui.h:52
+msgid "_Continue"
+msgstr "_Folytatás"
+
+#: ../data/pcsxr.ui.h:53
+msgid "_Reset"
+msgstr "_Alapra állítás"
+
+#: ../data/pcsxr.ui.h:54
+#, fuzzy
+msgid "_Shutdown"
+msgstr "Jobbra le"
+
+#: ../data/pcsxr.ui.h:55
+msgid "S_witch ISO..."
+msgstr "S_ami ISO..."
+
+#: ../data/pcsxr.ui.h:56
+msgid "_Save State"
+msgstr "_Állás mentés"
+
+#: ../data/pcsxr.ui.h:57
+msgid "Slot _1"
+msgstr "Slot _1"
+
+#: ../data/pcsxr.ui.h:58
+msgid "Slot _2"
+msgstr "Slot _2"
+
+#: ../data/pcsxr.ui.h:59
+msgid "Slot _3"
+msgstr "Slot _3"
+
+#: ../data/pcsxr.ui.h:60
+msgid "Slot _4"
+msgstr "Slot _4"
+
+#: ../data/pcsxr.ui.h:61
+msgid "Slot _5"
+msgstr "Slot _5"
+
+#: ../data/pcsxr.ui.h:62
+msgid "Slot _6"
+msgstr "Slot _6"
+
+#: ../data/pcsxr.ui.h:63
+msgid "Slot _7"
+msgstr "Slot _7"
+
+#: ../data/pcsxr.ui.h:64
+msgid "Slot _8"
+msgstr "Slot _8"
+
+#: ../data/pcsxr.ui.h:65
+msgid "Slot _9"
+msgstr "Slot _9"
+
+#: ../data/pcsxr.ui.h:66
+msgid "_Other..."
+msgstr "_Egyebek..."
+
+#: ../data/pcsxr.ui.h:67
+msgid "_Load State"
+msgstr "_Állás betöltése"
+
+#: ../data/pcsxr.ui.h:68
+msgid "_Configuration"
+msgstr "_Beállítások"
+
+#: ../data/pcsxr.ui.h:69
+msgid "_Plugins & BIOS..."
+msgstr "_Pluginok és BIOS..."
+
+#: ../data/pcsxr.ui.h:70
+msgid "_Graphics..."
+msgstr "_Kép..."
+
+#: ../data/pcsxr.ui.h:71
+msgid "_Sound..."
+msgstr "_Hang..."
+
+#: ../data/pcsxr.ui.h:72
+msgid "CD-_ROM..."
+msgstr "CD-_ROM..."
+
+#: ../data/pcsxr.ui.h:73
+msgid "C_ontrollers..."
+msgstr "C_ontrollers..."
+
+#: ../data/pcsxr.ui.h:74
+#, fuzzy
+msgid "_Link cable..."
+msgstr "Bekapcsolás"
+
+#: ../data/pcsxr.ui.h:75
+msgid "_Netplay..."
+msgstr "_Netplay..."
+
+#: ../data/pcsxr.ui.h:76
+msgid "_CPU..."
+msgstr "_Processzor..."
+
+#: ../data/pcsxr.ui.h:77
+msgid "_Memory Cards..."
+msgstr "_Memória kártyák..."
+
+#: ../data/pcsxr.ui.h:78
+msgid "Chea_t"
+msgstr "Chea_t"
+
+#: ../data/pcsxr.ui.h:79
+msgid "_Browse..."
+msgstr "_Tallózás..."
+
+#: ../data/pcsxr.ui.h:80
+msgid "_Search..."
+msgstr "_Keresés..."
+
+#: ../data/pcsxr.ui.h:81
+msgid "Memory _Dump"
+msgstr "Memória _mentés"
+
+#: ../data/pcsxr.ui.h:82
+msgid "_Help"
+msgstr "_Súgó"
+
+#: ../data/pcsxr.ui.h:83
+msgid "_About PCSXR..."
+msgstr "_A PCSXR névjegye..."
+
+#: ../data/pcsxr.ui.h:84
+msgid "Run CD"
+msgstr "CD indítása"
+
+#: ../data/pcsxr.ui.h:85
+msgid "Run ISO Image"
+msgstr "ISO képfájl futtatása"
+
+#: ../data/pcsxr.ui.h:86
+msgid "Continue Emulation"
+msgstr "Emuláció folytatása"
+
+#: ../data/pcsxr.ui.h:87
+msgid "Switch ISO Image"
+msgstr "ISO képfájl csere"
+
+#: ../data/pcsxr.ui.h:88
+msgid "Configure Memory Cards"
+msgstr "Memóriakártyák beállításai"
+
+#: ../data/pcsxr.ui.h:89
+msgid "Configure Graphics"
+msgstr "Grafikai beállítások"
+
+#: ../data/pcsxr.ui.h:90 ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:1
+msgid "Configure Sound"
+msgstr "Hang beállítások"
+
+#: ../data/pcsxr.ui.h:91
+msgid "Configure CD-ROM"
+msgstr "CD-ROM beállítás"
+
+#: ../data/pcsxr.ui.h:92
+msgid "Configure Controllers"
+msgstr "Irányítók beállítása"
+
+#: ../data/pcsxr.ui.h:93
+msgid "New"
+msgstr "Új"
+
+#: ../data/pcsxr.ui.h:94
+msgid "Format"
+msgstr "Formátum"
+
+#: ../data/pcsxr.ui.h:95
+msgid "Un/Delete"
+msgstr "Nem/törlés"
+
+#: ../data/pcsxr.ui.h:96
+msgid "Memory Card 1"
+msgstr "Memória kártya 1"
+
+#: ../data/pcsxr.ui.h:97
+msgid "Memory Card 2"
+msgstr "Memória kártya 2"
+
+#: ../data/pcsxr.ui.h:98 ../gui/DebugMemory.c:119
+msgid "Memory Dump"
+msgstr "Mentett memóriatartalom"
+
+#: ../data/pcsxr.ui.h:99 ../gui/DebugMemory.c:205
+msgid "Address (Hexadecimal):"
+msgstr "Címzés (hexadecimális):"
+
+#: ../data/pcsxr.ui.h:100
+msgid "Raw Dump..."
+msgstr "Nyers mentés..."
+
+#: ../data/pcsxr.ui.h:101
+msgid "Patch Memory..."
+msgstr "Memória hibajavítás..."
+
+#: ../data/pcsxr.ui.h:102
+msgid "Configure NetPlay"
+msgstr "Internetes játék beállításai"
+
+#: ../data/pcsxr.ui.h:103
+msgid "NetPlay"
+msgstr "Internetes játék"
+
+#: ../data/pcsxr.ui.h:104
+#, fuzzy
+msgid "NTSC"
+msgstr ""
+"NTSC\n"
+"PAL"
+
+#: ../data/pcsxr.ui.h:105
+msgid "PAL"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:106 ../win32/gui/CheatDlg.c:692
+msgid "8-bit"
+msgstr "8 bit"
+
+#: ../data/pcsxr.ui.h:107 ../win32/gui/CheatDlg.c:693
+msgid "16-bit"
+msgstr "16 bit"
+
+#: ../data/pcsxr.ui.h:108 ../win32/gui/CheatDlg.c:694
+msgid "32-bit"
+msgstr "32 bit"
+
+#: ../data/pcsxr.ui.h:109 ../win32/gui/CheatDlg.c:402
+msgid "Equal Value"
+msgstr "Azonos érték"
+
+#: ../data/pcsxr.ui.h:110 ../win32/gui/CheatDlg.c:403
+msgid "Not Equal Value"
+msgstr "Eltérő érték"
+
+#: ../data/pcsxr.ui.h:111 ../win32/gui/CheatDlg.c:404
+msgid "Range"
+msgstr "Tartomány"
+
+#: ../data/pcsxr.ui.h:112 ../win32/gui/CheatDlg.c:407
+msgid "Increased By"
+msgstr "Megnövelve"
+
+#: ../data/pcsxr.ui.h:113 ../win32/gui/CheatDlg.c:408
+msgid "Decreased By"
+msgstr "Csökkentve"
+
+#: ../data/pcsxr.ui.h:114 ../win32/gui/CheatDlg.c:409
+msgid "Increased"
+msgstr "Növelve"
+
+#: ../data/pcsxr.ui.h:115 ../win32/gui/CheatDlg.c:410
+msgid "Decreased"
+msgstr "Csökkentve"
+
+#: ../data/pcsxr.ui.h:116 ../win32/gui/CheatDlg.c:411
+msgid "Different"
+msgstr "Különböző"
+
+#: ../data/pcsxr.ui.h:117 ../win32/gui/CheatDlg.c:412
+msgid "No Change"
+msgstr "Nincs változtatás"
+
+#: ../data/pcsxr.ui.h:118 ../win32/gui/CheatDlg.c:695
+msgid "Decimal"
+msgstr "Decimális"
+
+#: ../data/pcsxr.ui.h:119 ../win32/gui/CheatDlg.c:696
+msgid "Hexadecimal"
+msgstr "Hexadecimális"
+
+#: ../gui/AboutDlg.c:71
+msgid ""
+"(C) 1999-2003 PCSX Team\n"
+"(C) 2005-2009 PCSX-df Team\n"
+"(C) 2009-2011 PCSX-Reloaded Team"
+msgstr ""
+
+#: ../gui/AboutDlg.c:76
+msgid ""
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+msgstr ""
+"Ez a program szabad szoftver; terjeszthető illetve módosítható a Free "
+"Software Foundation által kiadott GNU General Public License dokumentumában "
+"leírtak; akár a licenc 2-es, akár (tetszőleges) későbbi változata szerint.\n"
+"\n"
+"Ez a program abban a reményben kerül közreadásra, hogy hasznos lesz, de "
+"minden egyéb GARANCIA NÉLKÜL, az ELADHATÓSÁGRA vagy VALAMELY CÉLRA VALÓ "
+"ALKALMAZHATÓSÁGRA való származtatott garanciát is beleértve. További "
+"részleteket a GNU General Public License tartalmaz.\n"
+"\n"
+"A felhasználónak a programmal együtt meg kell kapnia a GNU General Public "
+"License egy példányát; ha mégsem kapta meg, akkor írjon a következő címre: "
+"Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, "
+"MA02110-1301 USA."
+
+#: ../gui/AboutDlg.c:100
+msgid "translator-credits"
+msgstr "Magyarítást Delirious készítette <delirious@freemail.hu>"
+
+#: ../gui/AboutDlg.c:101
+msgid "A PlayStation emulator."
+msgstr "A PlayStation emulátor."
+
+#: ../gui/Cheat.c:101 ../win32/gui/CheatDlg.c:116
+msgid "Add New Cheat"
+msgstr "Új csalás felvétele"
+
+#: ../gui/Cheat.c:109 ../gui/Cheat.c:192
+msgid "Cheat Description:"
+msgstr "Csalás leírás:"
+
+#: ../gui/Cheat.c:117 ../gui/Cheat.c:201 ../win32/gui/CheatDlg.c:68
+#: ../win32/gui/CheatDlg.c:118
+msgid "Cheat Code:"
+msgstr "Csalás kód:"
+
+#: ../gui/Cheat.c:147 ../gui/Cheat.c:241 ../gui/LnxMain.c:425
+#: ../win32/gui/ConfigurePlugins.c:330
+msgid "Error"
+msgstr "Hiba"
+
+#: ../gui/Cheat.c:147 ../gui/Cheat.c:241 ../win32/gui/CheatDlg.c:91
+#: ../win32/gui/CheatDlg.c:132
+msgid "Invalid cheat code!"
+msgstr "Érvénytelen csalás kód!"
+
+#: ../gui/Cheat.c:184 ../win32/gui/CheatDlg.c:66
+msgid "Edit Cheat"
+msgstr "Csalás szerkesztése"
+
+#: ../gui/Cheat.c:307
+msgid "Open Cheat File"
+msgstr "Csalás fájl megnyitása"
+
+#: ../gui/Cheat.c:317 ../gui/Cheat.c:357
+msgid "PCSXR Cheat Code Files (*.cht)"
+msgstr "PCSXR csalás kód fájlok (*.cht)"
+
+#: ../gui/Cheat.c:322 ../gui/GtkGui.c:491 ../gui/GtkGui.c:643
+#: ../win32/gui/WndMain.c:1483 ../win32/gui/WndMain.c:1564
+msgid "All Files"
+msgstr "Minden fájl"
+
+#: ../gui/Cheat.c:347
+msgid "Save Cheat File"
+msgstr "Csalás fájl mentése"
+
+#: ../gui/Cheat.c:362
+msgid "All Files (*.*)"
+msgstr "Minden fájl (*.*)"
+
+#: ../gui/Cheat.c:401
+msgid "Cheat Codes"
+msgstr "Csalás kódok"
+
+#: ../gui/Cheat.c:408
+msgid "Enable"
+msgstr "Bekapcsolás"
+
+#: ../gui/Cheat.c:416 ../win32/gui/CheatDlg.c:185
+msgid "Description"
+msgstr "Ismertető"
+
+#: ../gui/Cheat.c:544 ../win32/gui/CheatDlg.c:457
+msgid "Too many addresses found."
+msgstr "Túl sok cím található."
+
+#: ../gui/Cheat.c:553 ../win32/gui/CheatDlg.c:466
+#, c-format
+msgid "%.8X Current: %u (%.2X), Previous: %u (%.2X)"
+msgstr "%.8X Jelenlegi: %u (%.2X), Előző: %u (%.2X)"
+
+#: ../gui/Cheat.c:558 ../win32/gui/CheatDlg.c:471
+#, c-format
+msgid "%.8X Current: %u (%.4X), Previous: %u (%.4X)"
+msgstr "%.8X Jelenlegi: %u (%.4X), Előző: %u (%.4X)"
+
+#: ../gui/Cheat.c:563 ../win32/gui/CheatDlg.c:476
+#, c-format
+msgid "%.8X Current: %u (%.8X), Previous: %u (%.8X)"
+msgstr "%.8X Jelenlegi: %u (%.8X), Előző: %u (%.8X)"
+
+#: ../gui/Cheat.c:578 ../win32/gui/CheatDlg.c:492
+#, c-format
+msgid "Founded Addresses: %d"
+msgstr "Cím találatok: %d"
+
+#: ../gui/Cheat.c:586 ../win32/gui/CheatDlg.c:448
+msgid "Enter the values and start your search."
+msgstr "Gépeld be a kívánt értékeket és indítsd el a keresést."
+
+#: ../gui/Cheat.c:628
+msgid "Freeze value"
+msgstr "Érték fagyasztása"
+
+#: ../gui/Cheat.c:634 ../win32/gui/CheatDlg.c:67 ../win32/gui/CheatDlg.c:117
+msgid "Description:"
+msgstr "Ismertető:"
+
+#: ../gui/Cheat.c:727
+msgid "Modify value"
+msgstr "Érték módosítása"
+
+#: ../gui/Cheat.c:735
+msgid "New value:"
+msgstr "Új érték:"
+
+#: ../gui/Cheat.c:1119
+msgid "Search Results"
+msgstr "Keresési találatok"
+
+#. TODO Check whether configuration is required when we choose the plugin, and set the state of the
+#. button appropriately. New gtk tooltip API should allow us to put a tooltip explanation for
+#. disabled widgets
+#. TODO If combo screen hasn't been opened and the user chooses the menu config option, confs.Combo will be null and cause a segfault
+#. printf("Configuring plugin %s\n", filename);
+#: ../gui/ConfDlg.c:256 ../gui/ConfDlg.c:277 ../gui/ConfDlg.c:298
+#: ../gui/ConfDlg.c:319 ../gui/ConfDlg.c:340 ../gui/ConfDlg.c:399
+msgid "No configuration required"
+msgstr "Beállítás nem szükséges"
+
+#: ../gui/ConfDlg.c:256 ../gui/ConfDlg.c:277 ../gui/ConfDlg.c:298
+#: ../gui/ConfDlg.c:319 ../gui/ConfDlg.c:340 ../gui/ConfDlg.c:399
+msgid "This plugin doesn't need to be configured."
+msgstr "Ezt a plugint nem kell beállítani."
+
+#: ../gui/ConfDlg.c:402
+msgid "Please select a plugin."
+msgstr ""
+
+#: ../gui/ConfDlg.c:647
+#, c-format
+msgid "Could not open BIOS directory: '%s'\n"
+msgstr "A BIOS könyvtár nem nyitható meg: '%s'\n"
+
+#: ../gui/ConfDlg.c:698 ../gui/ConfDlg.c:801 ../gui/LnxMain.c:168
+#, c-format
+msgid "Could not open directory: '%s'\n"
+msgstr "A könyvtár nem nyitható meg: '%s'\n"
+
+#. The BIOS list always contains the PCSXR internal BIOS
+#: ../gui/ConfDlg.c:769
+msgid "Simulate PSX BIOS"
+msgstr "PSX BIOS szimulálása"
+
+#: ../gui/DebugMemory.c:127
+msgid "Start Address (Hexadecimal):"
+msgstr "Címzés kezdése (hexadecimális): "
+
+#: ../gui/DebugMemory.c:138
+msgid "Length (Decimal):"
+msgstr "Hossz (tizedes):"
+
+#: ../gui/DebugMemory.c:164
+msgid "Dump to File"
+msgstr "Mentés fájlba"
+
+#: ../gui/DebugMemory.c:179
+#, c-format
+msgid "Error writing to %s!"
+msgstr "%s írása közben hiba lépett fel!"
+
+#: ../gui/DebugMemory.c:197
+msgid "Memory Patch"
+msgstr "Memória hibajavítás"
+
+#: ../gui/DebugMemory.c:216
+msgid "Value (Hexa string):"
+msgstr "Érték (hexa sztring):"
+
+#: ../gui/DebugMemory.c:283
+msgid "Memory Viewer"
+msgstr "Memória betekintő"
+
+#: ../gui/DebugMemory.c:289
+msgid "Address"
+msgstr "Címzés"
+
+#: ../gui/DebugMemory.c:307
+msgid "Text"
+msgstr "Szöveg"
+
+#: ../gui/GtkGui.c:146
+msgid "Ready"
+msgstr "Kész"
+
+#: ../gui/GtkGui.c:191
+msgid "Emulation Paused."
+msgstr "Emuláció szüneteltetve."
+
+#: ../gui/GtkGui.c:474
+msgid "Select PSX EXE File"
+msgstr "PSX EXE fájl választás"
+
+#: ../gui/GtkGui.c:487
+msgid "PlayStation Executable Files"
+msgstr "PlayStation futtatható fájlok"
+
+#: ../gui/GtkGui.c:524
+msgid "Not a valid PSX file"
+msgstr "Nem megfelelő PSX fájl"
+
+#: ../gui/GtkGui.c:524
+msgid "The file does not appear to be a valid Playstation executable"
+msgstr "A fájl nem tűnik PlayStation futtatható fájlnak"
+
+#: ../gui/GtkGui.c:553 ../gui/GtkGui.c:725
+msgid "CD ROM failed"
+msgstr "CD ROM hiba"
+
+#: ../gui/GtkGui.c:553 ../gui/GtkGui.c:725 ../win32/gui/WndMain.c:472
+#: ../win32/gui/WndMain.c:526 ../win32/gui/WndMain.c:596
+#, c-format
+msgid "The CD does not appear to be a valid Playstation CD"
+msgstr "Úgy tűnik a CD lemez nem PlayStation CD formátum"
+
+#: ../gui/GtkGui.c:564 ../gui/GtkGui.c:736 ../win32/gui/WndMain.c:482
+#: ../win32/gui/WndMain.c:536 ../win32/gui/WndMain.c:606
+#, c-format
+msgid "Could not load CD-ROM!"
+msgstr "CD-ROM betöltése sikertelen!"
+
+#: ../gui/GtkGui.c:564 ../gui/GtkGui.c:736
+msgid "The CD-ROM could not be loaded"
+msgstr "CD-ROM nem tölthető be"
+
+#: ../gui/GtkGui.c:578
+msgid "Could not run BIOS"
+msgstr "BIOS nem futtatható"
+
+#: ../gui/GtkGui.c:578
+msgid "Running BIOS is not supported with Internal HLE BIOS."
+msgstr "BIOS használata nem támogatott belső HLE BIOS esetén."
+
+#: ../gui/GtkGui.c:608
+msgid "Open PSX Disc Image File"
+msgstr "PSX lemez képfájl megnyitása"
+
+#: ../gui/GtkGui.c:638
+#, fuzzy
+msgid "PSX Image Files (*.bin, *.img, *.mdf, *.iso, *.cue, *.pbp, *.cbn)"
+msgstr "PSX képfájlok (*.bin, *.img, *.mdf, *.iso)"
+
+#: ../gui/GtkGui.c:894
+#, c-format
+msgid "Loaded state %s."
+msgstr "Betöltött állás %s."
+
+#: ../gui/GtkGui.c:897
+#, c-format
+msgid "Error loading state %s!"
+msgstr "Hiba a mentett állás betöltése közben %s!"
+
+#: ../gui/GtkGui.c:908
+#, c-format
+msgid "Saved state %s."
+msgstr "Mentett állás %s."
+
+#: ../gui/GtkGui.c:910
+#, c-format
+msgid "Error saving state %s!"
+msgstr "Hiba az állás mentése közben %s!"
+
+#: ../gui/GtkGui.c:945 ../gui/GtkGui.c:973
+msgid "Select State File"
+msgstr "Állás mentés választás"
+
+#: ../gui/GtkGui.c:1016
+msgid "Notice"
+msgstr "Megjegyzés"
+
+#: ../gui/LnxMain.c:62
+#, c-format
+msgid "Creating memory card: %s\n"
+msgstr "Memória kártya létrehozása: %s\n"
+
+#: ../gui/LnxMain.c:329
+#, fuzzy
+msgid ""
+" pcsxr [options] [file]\n"
+"\toptions:\n"
+"\t-runcd\t\tRuns CD-ROM\n"
+"\t-cdfile FILE\tRuns a CD image file\n"
+"\t-nogui\t\tDon't open the GTK GUI\n"
+"\t-cfg FILE\tLoads desired configuration file (default: ~/.pcsxr/pcsxr.cfg)\n"
+"\t-psxout\t\tEnable PSX output\n"
+"\t-slowboot\tEnable BIOS Logo\n"
+"\t-load STATENUM\tLoads savestate STATENUM (1-9)\n"
+"\t-h -help\tDisplay this message\n"
+"\tfile\t\tLoads file\n"
+msgstr ""
+" pcsxr [beállítások] [fájl]\n"
+"\toptions:\n"
+"\t-runcd\t\tCD-ROM futtatása\n"
+"\t-cdfile FILE\tCD képfájl futtatása\n"
+"\t-nogui\t\tNe nyíljon meg a GTK GUI\n"
+"\t-cfg FILE\tA kívánt konfigurációs fájl betöltése (alap: ~/.pcsxr/pcsxr."
+"cfg)\n"
+"\t-psxout\t\tPSX kimenet bekapcsolása\n"
+"\t-load STATENUM\tÁllásmentés betöltése STATENUM (1-9)\n"
+"\t-h -help\tAz üzenet megjelenítése\n"
+"\tfile\t\tFájl betöltése\n"
+
+#: ../gui/LnxMain.c:366
+#, c-format
+msgid ""
+"PCSXR cannot be configured without using the GUI -- you should restart "
+"without -nogui.\n"
+msgstr ""
+"PCSXR nem konfigurálható a GUI használata nélkül -- újraindítás szükséges -"
+"nogui nélkül.\n"
+
+#: ../gui/LnxMain.c:425
+msgid "Failed loading plugins!"
+msgstr "Pluginok betöltése sikertelen!"
+
+#: ../gui/LnxMain.c:444
+#, c-format
+msgid "Could not load CD-ROM!\n"
+msgstr "CD-ROM nem tölthető be!\n"
+
+#: ../gui/LnxMain.c:485
+#, c-format
+msgid "PSX emulator couldn't be initialized.\n"
+msgstr "PSX emulátor incializálása sikertelen.\n"
+
+#: ../gui/MemcardDlg.c:56
+msgid "Icon"
+msgstr "Ikon"
+
+#: ../gui/MemcardDlg.c:62 ../win32/gui/WndMain.c:778
+msgid "Title"
+msgstr "Cím"
+
+#: ../gui/MemcardDlg.c:68 ../win32/gui/WndMain.c:784
+msgid "Status"
+msgstr "Állapot"
+
+#: ../gui/MemcardDlg.c:74
+msgid "ID"
+msgstr "Azonosító"
+
+#: ../gui/MemcardDlg.c:80
+msgid "Name"
+msgstr "Név"
+
+#: ../gui/MemcardDlg.c:118 ../win32/gui/WndMain.c:989
+msgid "Deleted"
+msgstr "Törölve"
+
+#: ../gui/MemcardDlg.c:120 ../gui/MemcardDlg.c:129 ../win32/gui/WndMain.c:990
+#: ../win32/gui/WndMain.c:993
+msgid "Free"
+msgstr "Üres"
+
+#: ../gui/MemcardDlg.c:123 ../win32/gui/WndMain.c:992
+msgid "Used"
+msgstr "Foglalt"
+
+#: ../gui/MemcardDlg.c:125
+msgid "Link"
+msgstr ""
+
+#: ../gui/MemcardDlg.c:127
+msgid "End link"
+msgstr ""
+
+#. Ask for name of memory card
+#: ../gui/MemcardDlg.c:305
+msgid "Select A File"
+msgstr "Fájl választás"
+
+#: ../gui/MemcardDlg.c:345
+msgid "Format this Memory Card?"
+msgstr "Formázod a memória kártyát?"
+
+#: ../gui/MemcardDlg.c:347
+msgid ""
+"If you format the memory card, the card will be empty, and any existing data "
+"overwritten."
+msgstr ""
+"Ha leformázod a memória kártyát, akkor a kártya üres lesz és minden meglévő "
+"adat el fog veszni."
+
+#: ../gui/MemcardDlg.c:350
+msgid "Format card"
+msgstr "Kártya formázása"
+
+#. Ask for name of new memory card
+#: ../gui/MemcardDlg.c:372
+msgid "Create a new Memory Card"
+msgstr "Új memória kártya létrehozása"
+
+#: ../gui/MemcardDlg.c:381
+msgid "New Memory Card.mcd"
+msgstr "Új memória kártya.mcd"
+
+#. No free slots available on the destination card
+#: ../gui/MemcardDlg.c:511
+msgid "No free space on memory card"
+msgstr "Nincs szabad hely a memória kártyán"
+
+#: ../gui/MemcardDlg.c:512
+msgid ""
+"There are no free slots available on the target memory card. Please delete a "
+"slot first."
+msgstr ""
+"Nincs szabad mentési blokk a cél memória kártyán. Először törölj egy blokkot."
+
+#: ../gui/MemcardDlg.c:671
+msgid "Memory Card Manager"
+msgstr "Memória kártya intéző"
+
+#: ../gui/Plugin.c:240
+#, c-format
+msgid "SIO IRQ Not Always Enabled"
+msgstr "SIO IRQ nincs mindig bekapcsolva"
+
+#: ../gui/Plugin.c:246
+#, c-format
+msgid "Black & White Mdecs Only Enabled"
+msgstr "Csak fekete és fehér Mdecs használata"
+
+#: ../gui/Plugin.c:247
+#, c-format
+msgid "Black & White Mdecs Only Disabled"
+msgstr "Csak fekete és fehér Mdecs kikapcsolva"
+
+#: ../gui/Plugin.c:253
+#, c-format
+msgid "XA Enabled"
+msgstr "XA bekapcsolva"
+
+#: ../gui/Plugin.c:254
+#, c-format
+msgid "XA Disabled"
+msgstr "XA kikapcsolva"
+
+#: ../gui/Plugin.c:326
+msgid "Error opening CD-ROM plugin!"
+msgstr "Hiba a CD-ROM plugin megnyitásakor!"
+
+#: ../gui/Plugin.c:328
+msgid "Error opening SPU plugin!"
+msgstr "Hiba a hang plugin megnyitásakor!"
+
+#: ../gui/Plugin.c:331
+msgid "Error opening GPU plugin!"
+msgstr "Hiba a kép plugin megnyitásakor!"
+
+#: ../gui/Plugin.c:333
+msgid "Error opening Controller 1 plugin!"
+msgstr "Hiba az egyes irányító plugin megnyitásakor!"
+
+#: ../gui/Plugin.c:337
+msgid "Error opening Controller 2 plugin!"
+msgstr "Hiba a kettes irányító plugin megnyitásakor!"
+
+#: ../gui/Plugin.c:342
+#, fuzzy
+msgid "Error opening SIO1 plugin!"
+msgstr "Hiba a hang plugin megnyitásakor!"
+
+#: ../gui/Plugin.c:424
+msgid "Error closing CD-ROM plugin!"
+msgstr "Hiba a CD-ROM plugin bezárásakor!"
+
+#: ../gui/Plugin.c:426
+msgid "Error closing SPU plugin!"
+msgstr "Hiba a hang plugin bezárásakor!"
+
+#: ../gui/Plugin.c:428
+msgid "Error closing Controller 1 Plugin!"
+msgstr "Hiba az egyes irányító plugin bezárásakor!"
+
+#: ../gui/Plugin.c:430
+msgid "Error closing Controller 2 plugin!"
+msgstr "Hiba a kettes irányító plugin bezárásakor!"
+
+#: ../gui/Plugin.c:432
+msgid "Error closing GPU plugin!"
+msgstr "Hiba a kép plugin bezárásakor!"
+
+#: ../gui/Plugin.c:435
+#, fuzzy
+msgid "Error closing SIO1 plugin!"
+msgstr "Hiba a hang plugin bezárásakor!"
+
+#: ../libpcsxcore/cdriso.c:423
+#, fuzzy, c-format
+msgid ""
+"\n"
+"could not open: %s\n"
+msgstr "A könyvtár nem nyitható meg: '%s'\n"
+
+#: ../libpcsxcore/cdriso.c:1043
+#, c-format
+msgid "Track %.2d (%s) - Start %.2d:%.2d:%.2d, Length %.2d:%.2d:%.2d\n"
+msgstr "Sáv %.2d (%s) - Kezdet %.2d:%.2d:%.2d, Hosszúság %.2d:%.2d:%.2d\n"
+
+#: ../libpcsxcore/cdriso.c:1064
+#, c-format
+msgid "Loaded CD Image: %s"
+msgstr "Betöltött CD képfájl: %s"
+
+#: ../libpcsxcore/cheat.c:147
+#, c-format
+msgid "Cheats loaded from: %s\n"
+msgstr "Csalások betöltve innen: %s\n"
+
+#: ../libpcsxcore/cheat.c:179
+#, c-format
+msgid "Cheats saved to: %s\n"
+msgstr "Csalások mentve ide: %s\n"
+
+#: ../libpcsxcore/cheat.c:322 ../libpcsxcore/cheat.c:443
+msgid "(Untitled)"
+msgstr "(Cím nélküli)"
+
+#: ../libpcsxcore/debug.c:321
+msgid "Error allocating memory"
+msgstr "Memóriafoglalási hiba"
+
+#: ../libpcsxcore/debug.c:326
+msgid "Unable to start debug server.\n"
+msgstr "Hibakereső szervert nem lehetett elindítani.\n"
+
+#: ../libpcsxcore/debug.c:330
+msgid "Debugger started.\n"
+msgstr "Hibakereső elindítva.\n"
+
+#: ../libpcsxcore/debug.c:337
+msgid "Debugger stopped.\n"
+msgstr "Hibakereső leállítva.\n"
+
+#: ../libpcsxcore/misc.c:350
+#, c-format
+msgid "CD-ROM Label: %.32s\n"
+msgstr "CD-ROM címke: %.32s\n"
+
+#: ../libpcsxcore/misc.c:351
+#, c-format
+msgid "CD-ROM ID: %.9s\n"
+msgstr "CD-ROM azonosító: %.9s\n"
+
+#: ../libpcsxcore/misc.c:415
+#, c-format
+msgid "Error opening file: %s.\n"
+msgstr "Hiba a fájl megnyitása közben: %s.\n"
+
+#: ../libpcsxcore/misc.c:458
+#, c-format
+msgid "Unknown CPE opcode %02x at position %08x.\n"
+msgstr "Ismeretlen CPE művelet-kód: %02x ezen a helyen: %08x.\n"
+
+#: ../libpcsxcore/misc.c:486
+msgid "This file does not appear to be a valid PSX file.\n"
+msgstr "A fájl nem tűnik érvényes PSX fájlnak.\n"
+
+#: ../libpcsxcore/plugins.c:190
+#, c-format
+msgid "Error loading %s: %s"
+msgstr "Hiba a(z) %s: %s betöltése közben"
+
+#: ../libpcsxcore/plugins.c:234
+#, fuzzy, c-format
+msgid ""
+"Could not load GPU plugin %s!\n"
+"%s"
+msgstr "%s grafikai plugin nem tölthető be!"
+
+#: ../libpcsxcore/plugins.c:310
+#, fuzzy, c-format
+msgid ""
+"Could not load CD-ROM plugin %s!\n"
+"%s"
+msgstr "%s CD-ROM plugin nem tölthető be!"
+
+#: ../libpcsxcore/plugins.c:359
+#, fuzzy, c-format
+msgid ""
+"Could not load SPU plugin %s!\n"
+"%s"
+msgstr "%s hang plugin nem tölthető be!"
+
+#: ../libpcsxcore/plugins.c:499
+#, fuzzy, c-format
+msgid ""
+"Could not load Controller 1 plugin %s!\n"
+"%s"
+msgstr "Az egyes irányító plugin: %s nem tölthető be!"
+
+#: ../libpcsxcore/plugins.c:558
+#, fuzzy, c-format
+msgid ""
+"Could not load Controller 2 plugin %s!\n"
+"%s"
+msgstr "A kettes irányító plugin: %s nem tölthető be!"
+
+#: ../libpcsxcore/plugins.c:604
+#, fuzzy, c-format
+msgid ""
+"Could not load NetPlay plugin %s!\n"
+"%s"
+msgstr "%s NetPlay plugin nem tölthető be!"
+
+#: ../libpcsxcore/plugins.c:682
+#, fuzzy, c-format
+msgid ""
+"Could not load SIO1 plugin %s!\n"
+"%s"
+msgstr "%s SIO1 plugin nem tölthető be!"
+
+#: ../libpcsxcore/plugins.c:770
+#, c-format
+msgid "Error initializing CD-ROM plugin: %d"
+msgstr "Hiba a CD-ROM plugin iniciálásakor: %d"
+
+#: ../libpcsxcore/plugins.c:772
+#, c-format
+msgid "Error initializing GPU plugin: %d"
+msgstr "Error initializing GPU plugin: %d"
+
+#: ../libpcsxcore/plugins.c:774
+#, c-format
+msgid "Error initializing SPU plugin: %d"
+msgstr "Hiba a hang plugin iniciálásakor: %d"
+
+#: ../libpcsxcore/plugins.c:776
+#, c-format
+msgid "Error initializing Controller 1 plugin: %d"
+msgstr "Hiba az egyes irányító plugin iniciálásakor: %d"
+
+#: ../libpcsxcore/plugins.c:778
+#, c-format
+msgid "Error initializing Controller 2 plugin: %d"
+msgstr "Hiba a kettes irányító plugin iniciálásakor: %d"
+
+#: ../libpcsxcore/plugins.c:782
+#, c-format
+msgid "Error initializing NetPlay plugin: %d"
+msgstr "Hiba a NetPlay plugin iniciálásakor: %d"
+
+#: ../libpcsxcore/plugins.c:787
+#, c-format
+msgid "Error initializing SIO1 plugin: %d"
+msgstr "Hiba a SIO1 plugin iniciálásakor: %d"
+
+#: ../libpcsxcore/plugins.c:790
+msgid "Plugins loaded.\n"
+msgstr "Pluginok betöltve.\n"
+
+#: ../libpcsxcore/ppf.c:219
+#, c-format
+msgid "Invalid PPF patch: %s.\n"
+msgstr "Érvénytelen PPF patch: %s.\n"
+
+#: ../libpcsxcore/ppf.c:295
+#, c-format
+msgid "Unsupported PPF version (%d).\n"
+msgstr "Nem támogatott PPF verzió (%d).\n"
+
+#. build address array
+#: ../libpcsxcore/ppf.c:334
+#, c-format
+msgid "Loaded PPF %d.0 patch: %s.\n"
+msgstr "PPF %d.0 patch betöltve: %s.\n"
+
+#: ../libpcsxcore/ppf.c:384
+#, c-format
+msgid "Loaded SBI file: %s.\n"
+msgstr "SBI fájl betöltve: %s.\n"
+
+#: ../libpcsxcore/psxmem.c:78
+msgid "Error allocating memory!"
+msgstr "Memóriafoglalási hiba!"
+
+#: ../libpcsxcore/psxmem.c:121
+#, c-format
+msgid "Could not open BIOS:\"%s\". Enabling HLE Bios!\n"
+msgstr "BIOS nem nyitható meg:\"%s\". HLE Bios használata!\n"
+
+#: ../libpcsxcore/r3000a.c:34
+#, c-format
+msgid "Running PCSXR Version %s (%s).\n"
+msgstr "PCSXR %s (%s) verzió fut.\n"
+
+#: ../libpcsxcore/sio.c:843
+msgid "Connection closed!\n"
+msgstr "Kapcsolat lezárva!\n"
+
+#: ../libpcsxcore/sio.c:876
+#, c-format
+msgid "No memory card value was specified - creating a default card %s\n"
+msgstr ""
+"Nincs megadva memóriakártyához tartozó érték - alapértelmezett kártya "
+"létrehozása %s\n"
+
+#: ../libpcsxcore/sio.c:880
+#, c-format
+msgid "The memory card %s doesn't exist - creating it\n"
+msgstr "Nincs %s. memóriakártya - létrehozása folyamatban\n"
+
+#: ../libpcsxcore/sio.c:896
+#, c-format
+msgid "Memory card %s failed to load!\n"
+msgstr "%s. memóriakártya betöltése sikertelen!\n"
+
+#: ../libpcsxcore/sio.c:900
+#, c-format
+msgid "Loading memory card %s\n"
+msgstr "%s. memóriakártya betöltése\n"
+
+#: ../plugins/dfcdrom/cdr.c:25
+msgid "CD-ROM Drive Reader"
+msgstr "CD-ROM olvasó"
+
+#: ../plugins/dfcdrom/cdr.c:27
+msgid "CDR NULL Plugin"
+msgstr "CDR NULL plugin"
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:1
+#: ../plugins/dfcdrom/cdrcfg-0.1df/main.c:217
+msgid "CDR configuration"
+msgstr "CD-ROM beállítások"
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:2
+msgid "Choose your CD-ROM device or type its path if it's not listed"
+msgstr ""
+"Válassz CD-ROM eszközt vagy gépeld be az elérési útját ha nincs a "
+"felsoroltak közt"
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:3
+msgid "Select read mode:"
+msgstr "Válassz olvasási módot:"
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:4
+msgid "Cache Size (Def. 64):"
+msgstr "Gyorsítótár mérete (Def. 64):"
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:5
+msgid "Spindown Time:"
+msgstr "Lelassulási idő:"
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:6
+msgid "Cdrom Speed (Def. 0 = MAX):"
+msgstr "CD-ROM sebessége (alap. 0 = MAX):"
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:7
+msgid "Enable subchannel read"
+msgstr "Segéd csatorna olvasás használata"
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:8
+msgid "Normal (No Cache)"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:9
+#, fuzzy
+msgid "Threaded - Faster (With Cache)"
+msgstr ""
+"Normál (gyorsítótár nélkül)\n"
+"Szálanként - Gyorsabb (gyorsítótárral)"
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:10
+msgid "Default"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:11
+msgid "125ms"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:12
+msgid "250ms"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:13
+msgid "500ms"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:14
+msgid "1s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:15
+msgid "2s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:16
+msgid "4s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:17
+msgid "8s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:18
+msgid "16s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:19
+msgid "32s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:20
+msgid "1min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:21
+msgid "2min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:22
+msgid "4min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:23
+msgid "8min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:24
+msgid "16min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:25
+msgid "32min"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk.c:49
+msgid "D-Pad Up"
+msgstr "Digitális FEL"
+
+#: ../plugins/dfinput/cfg-gtk.c:50
+msgid "D-Pad Down"
+msgstr "Digitális LE"
+
+#: ../plugins/dfinput/cfg-gtk.c:51
+msgid "D-Pad Left"
+msgstr "Digitális BALRA"
+
+#: ../plugins/dfinput/cfg-gtk.c:52
+msgid "D-Pad Right"
+msgstr "Digitális JOBBRA"
+
+#: ../plugins/dfinput/cfg-gtk.c:53
+msgid "Cross"
+msgstr "KERESZT"
+
+#: ../plugins/dfinput/cfg-gtk.c:54
+msgid "Circle"
+msgstr "KÖR"
+
+#: ../plugins/dfinput/cfg-gtk.c:55
+msgid "Square"
+msgstr "NÉGYSZÖG"
+
+#: ../plugins/dfinput/cfg-gtk.c:56
+msgid "Triangle"
+msgstr "HÁROMSZÖG"
+
+#: ../plugins/dfinput/cfg-gtk.c:57
+msgid "L1"
+msgstr "L1"
+
+#: ../plugins/dfinput/cfg-gtk.c:58
+msgid "R1"
+msgstr "R1"
+
+#: ../plugins/dfinput/cfg-gtk.c:59
+msgid "L2"
+msgstr "L2"
+
+#: ../plugins/dfinput/cfg-gtk.c:60
+msgid "R2"
+msgstr "R2"
+
+#: ../plugins/dfinput/cfg-gtk.c:61
+msgid "Select"
+msgstr "Select"
+
+#: ../plugins/dfinput/cfg-gtk.c:62
+msgid "Start"
+msgstr "Start"
+
+#: ../plugins/dfinput/cfg-gtk.c:63
+msgid "L3"
+msgstr "L3"
+
+#: ../plugins/dfinput/cfg-gtk.c:64
+msgid "R3"
+msgstr "R3"
+
+#: ../plugins/dfinput/cfg-gtk.c:65
+#, fuzzy
+msgid "Analog"
+msgstr "Analóg irányító"
+
+#: ../plugins/dfinput/cfg-gtk.c:69
+msgid "L-Stick Right"
+msgstr "Bal kar jobbra"
+
+#: ../plugins/dfinput/cfg-gtk.c:70
+msgid "L-Stick Left"
+msgstr "Bal kar jobbra"
+
+#: ../plugins/dfinput/cfg-gtk.c:71
+msgid "L-Stick Down"
+msgstr "Bal kar le"
+
+#: ../plugins/dfinput/cfg-gtk.c:72
+msgid "L-Stick Up"
+msgstr "Bal kar fel"
+
+#: ../plugins/dfinput/cfg-gtk.c:73
+msgid "R-Stick Right"
+msgstr "Jobb kar jobbra"
+
+#: ../plugins/dfinput/cfg-gtk.c:74
+msgid "R-Stick Left"
+msgstr "Jobb kar balra"
+
+#: ../plugins/dfinput/cfg-gtk.c:75
+msgid "R-Stick Down"
+msgstr "Jobb kar le"
+
+#: ../plugins/dfinput/cfg-gtk.c:76
+msgid "R-Stick Up"
+msgstr "Jobb kar fel"
+
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
+msgid "Centered"
+msgstr "Középen"
+
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
+msgid "Up"
+msgstr "Fel"
+
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
+msgid "Right"
+msgstr "Jobbra"
+
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
+msgid "Rightup"
+msgstr "Jobbra fel"
+
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
+msgid "Down"
+msgstr "Le"
+
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
+msgid "Rightdown"
+msgstr "Jobbra le"
+
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
+msgid "Left"
+msgstr "Balra"
+
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
+msgid "Leftup"
+msgstr "Balra fel"
+
+#: ../plugins/dfinput/cfg-gtk.c:104 ../plugins/dfinput/cfg-gtk.c:143
+msgid "Leftdown"
+msgstr "Balra le"
+
+#: ../plugins/dfinput/cfg-gtk.c:108 ../plugins/dfinput/cfg-gtk.c:147
+#, c-format
+msgid "Joystick: Button %d"
+msgstr "Joystick: %d gomb"
+
+#: ../plugins/dfinput/cfg-gtk.c:112 ../plugins/dfinput/cfg-gtk.c:151
+#, c-format
+msgid "Joystick: Axis %d%c"
+msgstr "Joystick: %d%c irány"
+
+#: ../plugins/dfinput/cfg-gtk.c:117 ../plugins/dfinput/cfg-gtk.c:156
+#, c-format
+msgid "Joystick: Hat %d %s"
+msgstr "Joystick: %d %s hat"
+
+#: ../plugins/dfinput/cfg-gtk.c:132 ../plugins/dfinput/cfg-gtk.c:171
+msgid "Keyboard:"
+msgstr "Billentyűzet:"
+
+#: ../plugins/dfinput/cfg-gtk.c:136 ../plugins/dfinput/cfg-gtk.c:175
+msgid "(Not Set)"
+msgstr "(Nincs beállítva)"
+
+#: ../plugins/dfinput/cfg-gtk.c:575
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:14
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:68
+msgid "None"
+msgstr "Nincs"
+
+#: ../plugins/dfinput/cfg-gtk.c:623
+msgid "Gamepad/Keyboard Input Configuration"
+msgstr "Játékirányító/Billentyűzet bemeneti beállítás"
+
+#: ../plugins/dfinput/cfg-gtk.c:629 ../plugins/dfinput/cfg-gtk.c:649
+msgid "Key"
+msgstr "Billentyű"
+
+#: ../plugins/dfinput/cfg-gtk.c:635 ../plugins/dfinput/cfg-gtk.c:655
+msgid "Button"
+msgstr "Gomb"
+
+#: ../plugins/dfinput/dfinput.ui.h:1
+msgid "Device:"
+msgstr "Eszköz:"
+
+#: ../plugins/dfinput/dfinput.ui.h:2
+msgid "Type:"
+msgstr "Típus:"
+
+#: ../plugins/dfinput/dfinput.ui.h:3
+msgid "Visual vibration"
+msgstr ""
+
+#: ../plugins/dfinput/dfinput.ui.h:4
+msgid "Change"
+msgstr "Változtatás"
+
+#: ../plugins/dfinput/dfinput.ui.h:5
+msgid "Reset"
+msgstr "Alapra állítás"
+
+#: ../plugins/dfinput/dfinput.ui.h:6
+msgid "Controller 1"
+msgstr "Egyes irányító"
+
+#: ../plugins/dfinput/dfinput.ui.h:7
+msgid "Controller 2"
+msgstr "Kettes irányító"
+
+#: ../plugins/dfinput/dfinput.ui.h:8
+msgid "Multi-Threaded (Recommended)"
+msgstr "Többszálas (ajánlott)"
+
+#: ../plugins/dfinput/dfinput.ui.h:9 ../win32/gui/WndMain.c:1342
+msgid "Options"
+msgstr "Lehetőségek"
+
+#: ../plugins/dfinput/dfinput.ui.h:10
+msgid "Digital Pad"
+msgstr "Digitális irányító"
+
+#: ../plugins/dfinput/dfinput.ui.h:11
+msgid "Analog Pad"
+msgstr "Analóg irányító"
+
+#: ../plugins/dfinput/dfinput.ui.h:12
+msgid "Mouse"
+msgstr ""
+
+#: ../plugins/dfinput/pad.c:33
+#, fuzzy
+msgid "Gamepad/Keyboard/Mouse Input"
+msgstr "Játékirányító/Billentyűzet bemenet"
+
+#. increase that with each version
+#: ../plugins/dfnet/dfnet.c:23
+msgid "Socket Driver"
+msgstr "Socket illesztőprogram"
+
+#: ../plugins/dfnet/dfnet.c:161
+#, c-format
+msgid "error connecting to %s: %s\n"
+msgstr "hiba a következőhöz történő kapcsolódáskor: %s: %s\n"
+
+#: ../plugins/dfnet/dfnet.c:186
+msgid "Error allocating memory!\n"
+msgstr "Memória kiosztási hiba!\n"
+
+#: ../plugins/dfnet/dfnet.ui.h:1
+msgid "Start Game"
+msgstr "Játék indítása"
+
+#: ../plugins/dfnet/dfnet.ui.h:2
+msgid "Play Offline"
+msgstr "Offline játék"
+
+#: ../plugins/dfnet/dfnet.ui.h:3
+msgid ""
+"Select here if you'll be Server (Player1) or Client (Player2).\n"
+"\n"
+"If you select Server you must Copy your IP address to the Clipboard and "
+"paste if (Ctrl+V) wherever the Client can see it.\n"
+"\n"
+"If you selected Client please enter the IP address the Server gave to you in "
+"the IP Address Control."
+msgstr ""
+"Válaszd ezt ha te létesítesz szervert (1. játékos) vagy ha kliens leszel (2. "
+"játékos).\n"
+"\n"
+"Ha szervert választasz, másold az IP címedet a vágólapra és szúrd be (Ctrl"
+"+V) bárhová, ahol a kliens látni fogja.\n"
+"\n"
+"Ha klienset választottál, írd be az IP címedet amit a szerver adott az IP "
+"cím vezérlőnél."
+
+#: ../plugins/dfnet/dfnet.ui.h:8 ../plugins/bladesio1/sio1.ui.h:6
+msgid "Copy PC IP to Clipboard"
+msgstr "A számítógép IP címének másolása vágólapra"
+
+#: ../plugins/dfnet/dfnet.ui.h:9 ../plugins/bladesio1/sio1.ui.h:7
+msgid "Server (Player1)"
+msgstr "Szerver (1. játékos)"
+
+#: ../plugins/dfnet/dfnet.ui.h:10 ../plugins/bladesio1/sio1.ui.h:8
+msgid "Client (Player2)"
+msgstr "Kliens (2. játékos)"
+
+#: ../plugins/dfnet/dfnet.ui.h:11 ../plugins/bladesio1/sio1.ui.h:10
+msgid ""
+"Do not change if not necessary (remember it must be changed on both sides)."
+msgstr ""
+"Ne változtasd ha nem muszály (ne feledd, mindkét oldalon módosítani kell)."
+
+#: ../plugins/dfnet/dfnet.ui.h:12 ../plugins/bladesio1/sio1.ui.h:11
+msgid "Port Number"
+msgstr "Port száma"
+
+#: ../plugins/dfnet/gui.c:30 ../plugins/dfnet/gui.c:112
+#: ../plugins/bladesio1/gui.c:82 ../win32/gui/ConfigurePlugins.c:669
+msgid "NetPlay"
+msgstr "Internetes játék"
+
+#: ../plugins/dfnet/gui.c:38
+msgid "Nothing to configure"
+msgstr "Nincs mit beállítani"
+
+#: ../plugins/dfnet/gui.c:94 ../plugins/bladesio1/gui.c:94
+#, c-format
+msgid "IP %s"
+msgstr "IP %s"
+
+#: ../plugins/dfnet/gui.c:165
+msgid "Waiting for connection..."
+msgstr "Várakozás a csatlakozásra..."
+
+#: ../plugins/dfnet/gui.c:168
+msgid "The Client should now Start a Connection, waiting..."
+msgstr "A kliens kapcsolatot kezdeményez, várjon..."
+
+#: ../plugins/dfsound/spu.c:66
+msgid "DirectSound Driver"
+msgstr "DirectSound driver"
+
+#: ../plugins/dfsound/spu.c:68
+msgid "Mac OS X Sound"
+msgstr "Mac OS X hang"
+
+#: ../plugins/dfsound/spu.c:70
+msgid "ALSA Sound"
+msgstr "ALSA hang"
+
+#: ../plugins/dfsound/spu.c:72
+msgid "OSS Sound"
+msgstr "OSS hang"
+
+#: ../plugins/dfsound/spu.c:74
+msgid "SDL Sound"
+msgstr "SDL hang"
+
+#: ../plugins/dfsound/spu.c:76
+#, fuzzy
+msgid "OpenAL Sound"
+msgstr "ALSA hang"
+
+#: ../plugins/dfsound/spu.c:78
+msgid "PulseAudio Sound"
+msgstr "PulseAudio hang"
+
+#: ../plugins/dfsound/spu.c:80
+msgid "NULL Sound"
+msgstr "NULL hang"
+
+#: ../plugins/dfsound/spu.c:83
+msgid ""
+"P.E.Op.S. Sound Driver V1.7\n"
+"Coded by Pete Bernert and the P.E.Op.S. team\n"
+msgstr ""
+"P.E.Op.S. Sound Driver V1.7\n"
+"Fejlesztő Pete Bernert és a P.E.Op.S. team\n"
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:2
+msgid "Volume:"
+msgstr "Hangerő:"
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:3
+msgid "Interpolation:"
+msgstr "Interpoláció:"
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:4
+msgid "Reverb:"
+msgstr "Utózengés:"
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:5
+msgid "Adjust XA speed"
+msgstr "XA sebesség beállítása"
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:6
+msgid "Choose this if XA music is played too quickly."
+msgstr "Válaszd ezt, ha az XA zene túl gyors."
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:7
+msgid "High compatibility mode"
+msgstr "Magas kompatibilitási mód"
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:8
+msgid "Use the asynchronous SPU interface."
+msgstr "Aszinkron hang interfész használata."
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:9
+msgid "SPU IRQ Wait"
+msgstr "Hang IRQ várakozás"
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:10
+msgid "Wait for CPU; only useful for some games."
+msgstr "Processzorra várás; csak néhány játéknál hasznos."
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:11
+msgid "Single channel sound"
+msgstr "Egycsatornás hang"
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:12
+msgid "Play only one channel for a performance boost."
+msgstr "Csupán egy csatorna lejátszása a teljesítmény növelés érdekében."
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:13
+msgid "Frequency Response - Output Filter"
+msgstr "Frekvencia reakció - Kimeneti szűrő"
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:15
+msgid "Simple"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:16
+#, fuzzy
+msgid "Gaussian"
+msgstr "Orosz"
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:17
+msgid "Cubic"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:18
+msgid "Off"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:19
+#, fuzzy
+msgid "Playstation"
+msgstr ""
+"Ki\n"
+"Egyszerű\n"
+"PlayStation"
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:20
+msgid "Low"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:21
+msgid "Medium"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:22
+msgid "Loud"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:23
+msgid "Loudest"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpu.c:82
+msgid "Soft Driver"
+msgstr "Soft driver"
+
+#: ../plugins/dfxvideo/gpu.c:83
+msgid ""
+"P.E.Op.S. Soft Driver V1.17\n"
+"Coded by Pete Bernert and the P.E.Op.S. team\n"
+msgstr ""
+"P.E.Op.S. Soft Driver V1.17\n"
+"Fejlesztő Pete Bernert és a P.E.Op.S. team\n"
+
+#: ../plugins/dfxvideo/gpu.c:85
+msgid "SoftGL Driver"
+msgstr "SoftGL Driver"
+
+#: ../plugins/dfxvideo/gpu.c:86
+msgid ""
+"P.E.Op.S. SoftGL Driver V1.17\n"
+"Coded by Pete Bernert and the P.E.Op.S. team\n"
+msgstr ""
+"P.E.Op.S. SoftGL Driver V1.17\n"
+"Fejlesztő Pete Bernert és a P.E.Op.S. team\n"
+
+#: ../plugins/dfxvideo/gpu.c:88
+msgid "XVideo Driver"
+msgstr "XVideo driver"
+
+#: ../plugins/dfxvideo/gpu.c:89
+msgid ""
+"P.E.Op.S. Xvideo Driver V1.17\n"
+"Coded by Pete Bernert and the P.E.Op.S. team\n"
+msgstr ""
+"P.E.Op.S. Xvideo driver V1.17\n"
+"Fejlesztő Pete Bernert és a P.E.Op.S. team\n"
+
+#: ../plugins/dfxvideo/gpu.c:92
+msgid "Pete Bernert and the P.E.Op.S. team"
+msgstr "Fejlesztő Pete Bernert és a P.E.Op.S. team"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:1
+msgid "Configure X11 Video"
+msgstr "X11 Video beállítása"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:2
+msgid "Initial Window Size:"
+msgstr "Induló ablak mérete:"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:3
+msgid "Stretching:"
+msgstr "Nyújtás:"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:4
+msgid "Dithering:"
+msgstr "Szürkeárnyalás:"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:5
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:4
+msgid "Fullscreen"
+msgstr "Teljes képernyő"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:6
+msgid "Toggle windowed/fullscreen mode."
+msgstr "Váltás ablakos/teljes képernyős mód között."
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:7
+msgid "Maintain 4:3 Aspect Ratio"
+msgstr "4:3 méretarány megtartása"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:8
+msgid "Show FPS"
+msgstr "FPS megjelenítése"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:9
+msgid "Toggle whether the FPS will be shown."
+msgstr "Váltás az FPS megjelenítéstől függően."
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:10
+msgid "Enable frame skipping"
+msgstr "Képkocka kihagyás használata"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:11
+msgid "Skip frames when rendering."
+msgstr "Képkockák kihagyása rendereléskor."
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:12
+msgid "Set FPS"
+msgstr "FPS megadás"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:13
+msgid "Enable this if games display too quickly."
+msgstr "Kapcsold be ezt, ha a játékok megjelenítése túl gyors"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:14
+msgid "200.0"
+msgstr "200.0"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:15
+msgid "Autodetect FPS limit"
+msgstr "FPS korlát automatikus észlelése"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:16
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:36
+msgid "Use game fixes"
+msgstr "Játék javítások használata"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:17
+msgid "Disable CPU Saving"
+msgstr "Processzor mentés kikapcsolása"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:18
+msgid "For precise framerate"
+msgstr "A pontos képfrissítéshez"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:19
+msgid "Odd/even bit hack"
+msgstr "Páratlan/páros bit hack"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:20
+msgid "Chrono Cross"
+msgstr "Chrono Cross"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:21
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:45
+msgid "PC FPS calculation"
+msgstr "PC FPS kalkuláció"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:22
+msgid "Better FPS limit in some"
+msgstr "Jobb FPS korlátozás némelyikben"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:23
+msgid "Expand screen width"
+msgstr "Képernyő szélesség nyújtása"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:24
+msgid "Capcom fighting games"
+msgstr "Capcom verekedős játékok"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:25
+msgid "Ignore brightness color"
+msgstr "Világos szín kihagyása"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:26
+msgid "Black screens in Lunar"
+msgstr "Lunar fekete képernyője"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:27
+msgid "Disable coordinate check"
+msgstr "Helyzeti ellenőrzés kikapcsolása"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:28
+msgid "Compatibility mode"
+msgstr "Kompatibilitási mód"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:29
+msgid "Lazy screen update"
+msgstr "Lassú képernyő frissítése"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:30
+msgid "Pandemonium 2"
+msgstr "Pandemonium 2"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:31
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:46
+msgid "Old frame skipping"
+msgstr "Régi képkocka kihagyás"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:32
+msgid "Skip every second frame"
+msgstr "Minden második képkocka kihagyása"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:33
+msgid "Repeated flat tex triangles"
+msgstr "Ismétlődő lapos textúra háromszögek"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:34
+msgid "Needed by Dark Forces"
+msgstr "Dark Forces játékhoz szükséges"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:35
+msgid "Draw quads with triangles"
+msgstr "Négyszögek megrajzolása háromszögekkel"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:36
+msgid "better g-colors, worse textures"
+msgstr "Jobb G-színek, roszabb textúrák"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:37
+msgid "Fake 'gpu busy' states"
+msgstr "Hamis 'gpu foglalt' állapot"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:38
+msgid "Toggle busy flags after drawing"
+msgstr "Foglalt jelzés elhelyezése megrajzolás után"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:39
+msgid "0: Off (fastest)"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:40
+msgid "1: Game dependant"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:41
+msgid "2: Always"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:42
+msgid "320x240"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:43
+msgid "640x480"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:44
+msgid "800x600"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:45
+msgid "1024x768"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:46
+msgid "1152x864"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:47
+msgid "1280x1024"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:48
+msgid "1600x1200"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:49
+#, fuzzy
+msgid "0: None"
+msgstr "0: Nessuno"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:50
+msgid "1: 2xSai"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:51
+msgid "2: 2xSuperSai"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:52
+msgid "3: SuperEagle"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:53
+msgid "4: Scale2x"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:54
+msgid "5: Scale3x"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:55
+msgid "6: HQ2X"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:56
+msgid "7: HQ3X"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpu.c:97
+msgid "OpenGL Driver"
+msgstr "OpenGL driver"
+
+#: ../plugins/peopsxgl/gpu.c:99
+msgid "Pete Bernert"
+msgstr "Pete Bernert"
+
+#: ../plugins/peopsxgl/gpu.c:100
+msgid ""
+"Based on P.E.Op.S. MesaGL Driver V1.78\n"
+"Coded by Pete Bernert\n"
+msgstr ""
+"P.E.Op.S. MesaGL driver V1.78 alapján\n"
+"Fejlesztő Pete Bernert\n"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:1
+msgid "OpenGL Driver configuration"
+msgstr "OpenGL driver beállítás"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:2
+msgid "Width:"
+msgstr "Szélesség:"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:3
+msgid "Height:"
+msgstr "Magasság:"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:5
+msgid "Dithering"
+msgstr "Remegés"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:6
+msgid "Keep psx aspect ratio"
+msgstr "PSX képarány megtartása"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:7
+msgid "Window options"
+msgstr "Ablak beállítások"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:8
+msgid "Quality:"
+msgstr "Minőség:"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:9
+msgid "Filtering:"
+msgstr "Szűrés:"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:10
+msgid "HiRes Tex:"
+msgstr "Nagyfelbontású textúrák:"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:11
+msgid "VRam size in MBytes (0..1024, 0=auto):"
+msgstr "Videómemória mérete MB értékben (0..1024, 0=auto):"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:12
+msgid "Textures"
+msgstr "Textúrák"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:13
+msgid "Show FPS display on startup"
+msgstr "FPS megjelenítése indításkor"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:14
+msgid "Use FPS limit"
+msgstr "FPS korlátozás használata"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:15
+msgid "FPS limit auto-detector"
+msgstr "FPS korlát automatikus észlelő"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:16
+msgid "FPS limit manual"
+msgstr "FPS korlát kezelő"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:17
+msgid "FPS"
+msgstr "FPS"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:18
+msgid "Use Frame skipping"
+msgstr "Képkocka kihagyás"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:19
+msgid "Framerate"
+msgstr "Képfrissítési frekvencia"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:20
+msgid "Offscreen drawing:"
+msgstr "Képernyőn kívülre helyezés:"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:21
+msgid "Framebuffer textures:"
+msgstr "Képkocka-puffer textúrák:"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:22
+msgid "Framebuffer access:"
+msgstr "Képkocka-puffer hozzáférés:"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:23
+msgid "Mask bit detection (Needed by a few games, zbuffer)"
+msgstr "Maszk bit észlelés (Szükséges néhány játékhoz, zbuffer)"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:24
+msgid "Alpha multipass (Correct opaque texture areas)"
+msgstr "Alpha multipass (megfelelő nem áttetsző textúra területek)"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:25
+msgid "Advanced blending (Accurate psx color emulation)"
+msgstr "Fejlett keverés (pontos psx szín emuláció)"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:26
+msgid "Compatibility"
+msgstr "Kompatibilitás"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:27
+msgid "Scanlines Blending (0..255, -1=dot):"
+msgstr "Képsorok keverése (0..255, -1=pont):"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:28
+msgid "Unfiltered MDECs (Small movie speedup)"
+msgstr "Szűretlen MDEC-ek (Kisebb videó gyorsulás)"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:29
+msgid "Force 15 bit framebuffer updates (Faster movies)"
+msgstr "15 bites kényszerített képkocka-puffer frissítés (gyorsabb videók)"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:30
+msgid "Line mode (Polygons will not get filled)"
+msgstr "Vonal mód (Poligonok nem lesznek kitöltve)"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:31
+msgid "Polygon anti-aliasing (Slow with most cards)"
+msgstr "Poligon élsímítás (Lassú a legtöbb kártyával)"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:32
+msgid "Use OpenGL extensions (Recommended)"
+msgstr "OpenGL kiterjesztés használata (Ajánlott)"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:33
+msgid "Screen smoothing (Can be slow or unsupported)"
+msgstr "Kép finomítás (Lassú lehet, vagy nincs támogatva)"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:34
+msgid "Gte accuracy"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:35
+msgid "Misc"
+msgstr "Egyebek"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:37
+msgid "Battle cursor (FF7)"
+msgstr "Csata kurzor (Final Fantasy 7)"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:38
+msgid "Yellow rect (FF9)"
+msgstr "Sárga háromszögek (Final Fantasy 9)"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:39
+msgid "Direct FB updates"
+msgstr "Közvetlen FB frissítések"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:40
+msgid "Black brightness (Lunar)"
+msgstr "Fekete fényesség (Lunar)"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:41
+msgid "Swap front detection"
+msgstr "Felcserélt előtér észlelés"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:42
+msgid "Disable coord check"
+msgstr "Koordináció ellenőrzés kikapcsolása"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:43
+msgid "No blue glitches (LoD)"
+msgstr "Nincsenek kék képhibák (Legend of Dragoon)"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:44
+msgid "Soft FB access"
+msgstr "Szoftveres FB hozzáférés"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:47
+msgid "No subtr. blending"
+msgstr "Keverés kiszűrése nélkül"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:48
+msgid "Lazy upload (DW7)"
+msgstr "Lassú feltöltés (Dragon Warrior 7)"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:49
+msgid "Odd/even hack"
+msgstr "Páratlan/páros hack"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:50
+msgid "Adjust screen width"
+msgstr "Kép szélesség beállítása"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:51
+msgid "Old texture filtering"
+msgstr "Régi textúra szűrő"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:52
+msgid "Additional uploads"
+msgstr "További feltöltések"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:53
+msgid "Unused"
+msgstr "Használatlan"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:54
+msgid "Fake 'GPU busy'"
+msgstr "Hamis 'gpu foglalt'"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:55
+msgid "Special game fixes"
+msgstr "Speciális játék javítások"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:56
+msgid "Fast"
+msgstr "Gyors"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:57
+msgid "Autoconfigure for fast display"
+msgstr "Automatikus beállítás a gyors megjelenítéshez"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:58
+msgid "Beautiful"
+msgstr "Szép"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:59
+msgid "Auto configure for beautiful display"
+msgstr "Automatikus beállítás a szép megjelenítéshez"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:60
+msgid "None - Fastest, most glitches"
+msgstr "Nincs - Leggyorsabb, legtöbb képhiba"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:61
+msgid "Minimum - Missing screens"
+msgstr "Minimum - Hiányzó képrészletek"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:62
+msgid "Standard - OK for most games"
+msgstr "Általános - Jó a legtöbb játékhoz"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:63
+msgid "Enhanced - Shows more stuff"
+msgstr "Fokozott - Több dolog jelenik meg"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:64
+msgid "Extended - Causing garbage"
+msgstr "Kibővített - Hibákat okozhat"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:65
+msgid "None (Standard)"
+msgstr "Nincs (Általános)"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:66
+msgid "2xSaI (Much vram needed)"
+msgstr "2xSaI (Sok videó memória szükséges)"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:67
+msgid "Scaled (Needs tex filtering)"
+msgstr "Méretarányos (Textúra szűrés szükséges)"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:69
+msgid "Standard - Glitches will happen"
+msgstr "Általános - Képhibák lehetnek"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:70
+msgid "Extended - No black borders"
+msgstr "Kibővített - Nincsenek fekete szélek"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:71
+msgid "Standard without sprites - Unfiltered 2D"
+msgstr "Általános sprite-ok nélkül - Szűrés nélküli 2D"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:72
+msgid "Extended without sprites - Unfiltered 2D"
+msgstr "Kibővített sprite-ok nélkül - Szűrés nélküli 2D"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:73
+msgid "Standard + smoothed sprites"
+msgstr "Általános + finom sprite-ok"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:74
+msgid "Extended + smoothed sprites"
+msgstr "Kiterjesztett + mosott sprite-ok"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:75
+msgid "Don't care - Use driver's default textures"
+msgstr "Mindegy - A driver alapértelmezett textúráinak használata"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:76
+msgid "4444 - Fast, but less colorful"
+msgstr "4444 - Gyors, de kevesebb a szín"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:77
+msgid "5551 - Nice colors, bad transparency"
+msgstr "5551 - Szép színek, rossz átlátszóság"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:78
+msgid "8888 - Best colors, more ram needed"
+msgstr "8888 - Legszebb színek, több memóriát igényel"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:79
+msgid "BGR8888 - Faster on some cards"
+msgstr "BGR8888 - Gyorsabb néhány kártyán"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:80
+msgid "Emulated VRam - Ok most times"
+msgstr "Emulált VRam - Többnyire megfelelő"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:81
+msgid "Gfx card buffer reads"
+msgstr "Videókártya puffer olvasás"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:82
+msgid "Gfx card buffer moves"
+msgstr "Videókártya puffer áthelyezés"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:83
+msgid "Gfx card buffer reads and moves"
+msgstr "Videókártya puffer olvasás és áthelyezés"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:84
+msgid "Full Software (FVP)"
+msgstr "Teljes szoftveres (FVP)"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:85
+msgid "Emulated VRam - Needs FVP"
+msgstr "Emulált VRam - FVP szükséges"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:86
+msgid "Black - Fast, no effects"
+msgstr "Fekete - Gyors, nincs effektus"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:87
+msgid "Gfx card buffer - Can be slow"
+msgstr "Videókártya puffer - Lassú lehet"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:88
+msgid "Gfx card and soft - Slow"
+msgstr "Videókártya és szoftveres - Lassú"
+
+#: ../plugins/bladesio1/gui.c:112
+#, fuzzy
+msgid "Link Cable Configuration"
+msgstr "Beállítás"
+
+#. *************************************************************************
+#. #define SIO1_DEBUG 1
+#: ../plugins/bladesio1/sio1.c:44
+msgid "sio1Blade"
+msgstr ""
+
+#. *************************************************************************
+#: ../plugins/bladesio1/sio1.ui.h:1 ../win32/gui/AboutDlg.c:48
+#: ../win32/gui/AboutDlg.c:52 ../win32/gui/CheatDlg.c:69
+#: ../win32/gui/CheatDlg.c:119 ../win32/gui/ConfigurePlugins.c:529
+#: ../win32/gui/ConfigurePlugins.c:667 ../win32/gui/WndMain.c:1088
+#: ../win32/gui/WndMain.c:1324
+msgid "OK"
+msgstr "Rendben"
+
+#: ../plugins/bladesio1/sio1.ui.h:2
+msgid "CANCEL"
+msgstr ""
+
+#: ../plugins/bladesio1/sio1.ui.h:3
+#, fuzzy
+msgid ""
+"Select here if you'll be Server (Player1) or Client (Player2).\n"
+"If you select Server you must Copy your IP address to the Clipboard and "
+"paste if (Ctrl+V) wherever the Client can see it.\n"
+"If you selected Client please enter the IP address the Server gave to you in "
+"the IP Address Control."
+msgstr ""
+"Válaszd ezt ha te létesítesz szervert (1. játékos) vagy ha kliens leszel (2. "
+"játékos).\n"
+"\n"
+"Ha szervert választasz, másold az IP címedet a vágólapra és szúrd be (Ctrl"
+"+V) bárhová, ahol a kliens látni fogja.\n"
+"\n"
+"Ha klienset választottál, írd be az IP címedet amit a szerver adott az IP "
+"cím vezérlőnél."
+
+#: ../plugins/bladesio1/sio1.ui.h:9
+#, fuzzy
+msgid "Disabled"
+msgstr "XA kikapcsolva"
+
+#: ../win32/gui/AboutDlg.c:26
+msgid ""
+"PCSXR - A PlayStation Emulator\n"
+"\n"
+"Original Authors:\n"
+"main coder: linuzappz\n"
+"co-coders: shadow\n"
+"ex-coders: Nocomp, Pete Bernett, nik3d\n"
+"Webmaster: AkumaX"
+msgstr ""
+"PCSXR - A PlayStation Emulátor\n"
+"\n"
+"Eredeti fejlesztők:\n"
+"Vezető programozó: linuzappz\n"
+"Segéd programozók: shadow\n"
+"Előző programozók: Nocomp, Pete Bernett, nik3d\n"
+"Webmester: AkumaX"
+
+#: ../win32/gui/AboutDlg.c:35
+msgid ""
+"PCSX-df Authors:\n"
+"Ryan Schultz, Andrew Burton, Stephen Chao,\n"
+"Marcus Comstedt, Stefan Sikora\n"
+"\n"
+"PCSX-Reloaded By:\n"
+"edgbla, shalma, Wei Mingzhi, et al.\n"
+"\n"
+"http://pcsxr.codeplex.com/"
+msgstr ""
+"PCSX-df fejlesztők:\n"
+"Ryan Schultz, Andrew Burton, Stephen Chao,\n"
+"Marcus Comstedt, Stefan Sikora\n"
+"\n"
+"PCSX-Reloaded fejlesztők:\n"
+"edgbla, Wei Mingzhi, et al.\n"
+"http://pcsxr.codeplex.com/\n"
+"Magyar fordítás: Delirious"
+
+#: ../win32/gui/AboutDlg.c:46
+msgid "About"
+msgstr "A program névjegye"
+
+#: ../win32/gui/AboutDlg.c:49
+msgid "PCSXR EMU\n"
+msgstr "PCSXR EMULÁTOR\n"
+
+#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
+#: ../win32/gui/CheatDlg.c:270
+msgid "Yes"
+msgstr "Igen"
+
+#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
+#: ../win32/gui/CheatDlg.c:270
+msgid "No"
+msgstr "Nem"
+
+#: ../win32/gui/CheatDlg.c:70 ../win32/gui/CheatDlg.c:120
+#: ../win32/gui/ConfigurePlugins.c:530 ../win32/gui/ConfigurePlugins.c:668
+#: ../win32/gui/WndMain.c:1089 ../win32/gui/WndMain.c:1325
+msgid "Cancel"
+msgstr "Mégsem"
+
+#: ../win32/gui/CheatDlg.c:168
+msgid "&Add Code"
+msgstr "&Kód felvétele"
+
+#: ../win32/gui/CheatDlg.c:169
+msgid "&Edit Code"
+msgstr "&Kód szerkesztése"
+
+#: ../win32/gui/CheatDlg.c:170
+msgid "&Remove Code"
+msgstr "&Kód eltávolítása"
+
+#: ../win32/gui/CheatDlg.c:171
+msgid "&Enable/Disable"
+msgstr "&Bekapcsolás/Kikapcsolás"
+
+#: ../win32/gui/CheatDlg.c:172
+msgid "&Load..."
+msgstr "&Betöltés..."
+
+#: ../win32/gui/CheatDlg.c:173
+msgid "&Save As..."
+msgstr "&Mentés másként..."
+
+#: ../win32/gui/CheatDlg.c:174
+msgid "&Close"
+msgstr "&Bezárás"
+
+#: ../win32/gui/CheatDlg.c:190
+msgid "Enabled"
+msgstr "Bekapcsolva"
+
+#: ../win32/gui/CheatDlg.c:282 ../win32/gui/CheatDlg.c:311
+msgid "PCSXR Cheat Code Files"
+msgstr "PCSXR csalás kód fájlok"
+
+#: ../win32/gui/CheatDlg.c:453
+msgid "No addresses found."
+msgstr "Nem találhatóak címek."
+
+#: ../win32/gui/CheatDlg.c:505 ../win32/gui/CheatDlg.c:596
+msgid "Address:"
+msgstr "Cím:"
+
+#: ../win32/gui/CheatDlg.c:566
+#, c-format
+msgid "Freeze %.8X"
+msgstr "Fagyasztás %.8x"
+
+#: ../win32/gui/CheatDlg.c:685
+msgid "&Freeze"
+msgstr "&Fagyasztás"
+
+#: ../win32/gui/CheatDlg.c:686
+msgid "&Modify"
+msgstr "&Módosítás"
+
+#: ../win32/gui/CheatDlg.c:687
+msgid "&Copy"
+msgstr "&Másolás"
+
+#: ../win32/gui/CheatDlg.c:688
+msgid "&Search"
+msgstr "&Keresés"
+
+#: ../win32/gui/CheatDlg.c:689
+msgid "&New Search"
+msgstr "&Új keresés"
+
+#: ../win32/gui/CheatDlg.c:690
+msgid "C&lose"
+msgstr "B&ezárás"
+
+#: ../win32/gui/ConfigurePlugins.c:234
+msgid "Simulate Psx Bios"
+msgstr "PSX BIOS szimulálása"
+
+#: ../win32/gui/ConfigurePlugins.c:330
+msgid "Configuration not OK!"
+msgstr "Nem megfelelő beállítás!"
+
+#: ../win32/gui/ConfigurePlugins.c:445
+msgid "This plugin reports that should work correctly"
+msgstr "Ez a plugin megfelelően fog működni"
+
+#: ../win32/gui/ConfigurePlugins.c:446
+msgid "This plugin reports that should not work correctly"
+msgstr "Ez a plugin nem fog megfelelően működni"
+
+#: ../win32/gui/ConfigurePlugins.c:509
+msgid "Select Plugins Directory"
+msgstr "Plugin könyvtár megadása"
+
+#: ../win32/gui/ConfigurePlugins.c:518
+msgid "Select Bios Directory"
+msgstr "BIOS könyvtár megadása"
+
+#: ../win32/gui/ConfigurePlugins.c:527
+msgid "Configuration"
+msgstr "Beállítás"
+
+#: ../win32/gui/ConfigurePlugins.c:531
+msgid "Graphics"
+msgstr "Kép"
+
+#: ../win32/gui/ConfigurePlugins.c:532
+msgid "First Controller"
+msgstr "Egyes irányító"
+
+#: ../win32/gui/ConfigurePlugins.c:533
+msgid "Second Controller"
+msgstr "Kettes irányító"
+
+#: ../win32/gui/ConfigurePlugins.c:534
+msgid "Sound"
+msgstr "Hang"
+
+#: ../win32/gui/ConfigurePlugins.c:535
+msgid "Cdrom"
+msgstr "CD-ROM"
+
+#: ../win32/gui/ConfigurePlugins.c:536
+#, fuzzy
+msgid "Link cable"
+msgstr "Bekapcsolás"
+
+#: ../win32/gui/ConfigurePlugins.c:537
+msgid "Bios"
+msgstr "BIOS"
+
+#: ../win32/gui/ConfigurePlugins.c:538
+msgid "Set Bios Directory"
+msgstr "BIOS könyvtára"
+
+#: ../win32/gui/ConfigurePlugins.c:539
+msgid "Set Plugins Directory"
+msgstr "Pluginok könyvtára"
+
+#: ../win32/gui/ConfigurePlugins.c:540 ../win32/gui/ConfigurePlugins.c:543
+#: ../win32/gui/ConfigurePlugins.c:546 ../win32/gui/ConfigurePlugins.c:549
+#: ../win32/gui/ConfigurePlugins.c:552 ../win32/gui/ConfigurePlugins.c:555
+#: ../win32/gui/ConfigurePlugins.c:670
+msgid "Configure..."
+msgstr "Beállítás..."
+
+#: ../win32/gui/ConfigurePlugins.c:541 ../win32/gui/ConfigurePlugins.c:544
+#: ../win32/gui/ConfigurePlugins.c:547 ../win32/gui/ConfigurePlugins.c:550
+#: ../win32/gui/ConfigurePlugins.c:553 ../win32/gui/ConfigurePlugins.c:556
+#: ../win32/gui/ConfigurePlugins.c:671
+msgid "Test..."
+msgstr "Tesztelés..."
+
+#: ../win32/gui/ConfigurePlugins.c:542 ../win32/gui/ConfigurePlugins.c:545
+#: ../win32/gui/ConfigurePlugins.c:548 ../win32/gui/ConfigurePlugins.c:551
+#: ../win32/gui/ConfigurePlugins.c:554 ../win32/gui/ConfigurePlugins.c:557
+#: ../win32/gui/ConfigurePlugins.c:672
+msgid "About..."
+msgstr "Névjegy..."
+
+#: ../win32/gui/ConfigurePlugins.c:665
+msgid "NetPlay Configuration"
+msgstr "Internetes játék beállítása"
+
+#: ../win32/gui/ConfigurePlugins.c:673
+msgid ""
+"Note: The NetPlay Plugin Directory should be the same as the other Plugins."
+msgstr ""
+"Megjegyzés: A NetPlay plugin könyvtár azonos a többi plugin könyvtárával."
+
+#: ../win32/gui/plugin.c:94 ../win32/gui/WndMain.c:331
+#, c-format
+msgid "*PCSXR*: Saved State %d"
+msgstr "*PCSXR*: Elmentett állás %d"
+
+#: ../win32/gui/plugin.c:95 ../win32/gui/WndMain.c:332
+#, c-format
+msgid "*PCSXR*: Error Saving State %d"
+msgstr "*PCSXR*: Hiba az állás mentése közben %d"
+
+#: ../win32/gui/plugin.c:111 ../win32/gui/WndMain.c:309
+#, c-format
+msgid "*PCSXR*: Loaded State %d"
+msgstr "*PCSXR*: Betöltött elmentett állás %d"
+
+#: ../win32/gui/plugin.c:112 ../win32/gui/WndMain.c:310
+#, c-format
+msgid "*PCSXR*: Error Loading State %d"
+msgstr "*PCSXR*: Hiba a mentett állás betöltése közben %d"
+
+#: ../win32/gui/plugin.c:123
+#, c-format
+msgid "*PCSXR*: Sio Irq Always Enabled"
+msgstr "*PCSXR*: Sio IRQ mindig bekapcsolva"
+
+#: ../win32/gui/plugin.c:124
+#, c-format
+msgid "*PCSXR*: Sio Irq Not Always Enabled"
+msgstr "*PCSXR*: Sio IRQ nincs mindig bekapcsolva"
+
+#: ../win32/gui/plugin.c:131
+#, c-format
+msgid "*PCSXR*: Black&White Mdecs Only Enabled"
+msgstr "*PCSXR*: Csak fekete és fehér Mdecs használata"
+
+#: ../win32/gui/plugin.c:132
+#, c-format
+msgid "*PCSXR*: Black&White Mdecs Only Disabled"
+msgstr "*PCSXR*: Csak fekete és fehér Mdecs nincs használva"
+
+#: ../win32/gui/plugin.c:139
+#, c-format
+msgid "*PCSXR*: Xa Enabled"
+msgstr "*PCSXR*: Xa bekapcsolva"
+
+#: ../win32/gui/plugin.c:140
+#, c-format
+msgid "*PCSXR*: Xa Disabled"
+msgstr "*PCSXR*: Xa kikapcsolva"
+
+#: ../win32/gui/plugin.c:149
+msgid "*PCSXR*: CdRom Case Opened"
+msgstr "*PCSXR*: CD-ROM tálca nyitva"
+
+#: ../win32/gui/plugin.c:155
+msgid "*PCSXR*: CdRom Case Closed"
+msgstr "*PCSXR*: CD-ROM tálca zárva"
+
+#: ../win32/gui/plugin.c:181
+msgid "Connecting..."
+msgstr "Csatlakozás..."
+
+#: ../win32/gui/plugin.c:183 ../win32/gui/plugin.c:190
+#, c-format
+msgid "Please wait while connecting... %c\n"
+msgstr "Kis türelem, csatlakozás folyamatban... %c\n"
+
+#: ../win32/gui/plugin.c:218
+msgid "Error Opening CDR Plugin"
+msgstr "Hiba a CD-ROM plugin megnyitásakor"
+
+#: ../win32/gui/plugin.c:281
+#, c-format
+msgid "Error Opening GPU Plugin (%d)"
+msgstr "Hiba a kép plugin megnyitáskor (%d)"
+
+#: ../win32/gui/plugin.c:283
+#, c-format
+msgid "Error Opening SPU Plugin (%d)"
+msgstr "Hiba a hang plugin megnyitáskor (%d)"
+
+#: ../win32/gui/plugin.c:286
+#, c-format
+msgid "Error Opening PAD1 Plugin (%d)"
+msgstr "Hiba az egyes irányító plugin megnyitásakor (%d)"
+
+#: ../win32/gui/plugin.c:290
+#, c-format
+msgid "Error Opening PAD2 Plugin (%d)"
+msgstr "Hiba a kettes irányító plugin megnyitásakor (%d)"
+
+#: ../win32/gui/plugin.c:295
+#, fuzzy, c-format
+msgid "Error Opening SIO1 plugin (%d)"
+msgstr "Hiba a hang plugin megnyitáskor (%d)"
+
+#: ../win32/gui/plugin.c:325
+msgid "Error Closing CDR Plugin"
+msgstr "Hiba a CD-ROM plugin bezárásakor"
+
+#: ../win32/gui/plugin.c:327
+msgid "Error Closing GPU Plugin"
+msgstr "Hiba a kép plugin bezárásakor"
+
+#: ../win32/gui/plugin.c:329
+msgid "Error Closing SPU Plugin"
+msgstr "Hiba a hang plugin bezárásakor"
+
+#: ../win32/gui/plugin.c:332
+#, fuzzy
+msgid "Error Closing SIO1 plugin"
+msgstr "Hiba a hang plugin bezárásakor"
+
+#: ../win32/gui/plugin.c:354
+#, c-format
+msgid "CDRinit error: %d"
+msgstr "CD-ROM inicializálási hiba: %d"
+
+#: ../win32/gui/plugin.c:356
+#, c-format
+msgid "GPUinit error: %d"
+msgstr "Kép plugin inicializálási hiba: %d"
+
+#: ../win32/gui/plugin.c:358
+#, c-format
+msgid "SPUinit error: %d"
+msgstr "Hang plugin inicializálási hiba: %d"
+
+#: ../win32/gui/plugin.c:360
+#, c-format
+msgid "PAD1init error: %d"
+msgstr "Egyes irányító plugin inicializálási hiba: %d"
+
+#: ../win32/gui/plugin.c:362
+#, c-format
+msgid "PAD2init error: %d"
+msgstr "Kettes irányító plugin inicializálási hiba: %d"
+
+#: ../win32/gui/plugin.c:365
+#, fuzzy, c-format
+msgid "SIO1init error: %d"
+msgstr "Hang plugin inicializálási hiba: %d"
+
+#: ../win32/gui/plugin.c:370
+#, c-format
+msgid "NETinit error: %d"
+msgstr "Internetes plugin inicializálási hiba: %d"
+
+#: ../win32/gui/WndMain.c:77
+msgid "Arabic"
+msgstr "Arab"
+
+#: ../win32/gui/WndMain.c:78
+msgid "Catalan"
+msgstr "Katalán"
+
+#: ../win32/gui/WndMain.c:79
+msgid "German"
+msgstr "Német"
+
+#: ../win32/gui/WndMain.c:80
+msgid "Greek"
+msgstr "Görög"
+
+#: ../win32/gui/WndMain.c:81 ../win32/gui/WndMain.c:1699
+#: ../win32/gui/WndMain.c:1701
+msgid "English"
+msgstr "Angol"
+
+#: ../win32/gui/WndMain.c:82
+msgid "Spanish"
+msgstr "Spanyol"
+
+#: ../win32/gui/WndMain.c:83
+msgid "French"
+msgstr "Francia"
+
+#: ../win32/gui/WndMain.c:84
+msgid "Italian"
+msgstr "Olasz"
+
+#: ../win32/gui/WndMain.c:85
+msgid "Portuguese"
+msgstr "Portugál"
+
+#: ../win32/gui/WndMain.c:86
+msgid "Portuguese (Brazilian)"
+msgstr "Portugál (brazil)"
+
+#: ../win32/gui/WndMain.c:87
+msgid "Romanian"
+msgstr "Román"
+
+#: ../win32/gui/WndMain.c:88
+msgid "Russian"
+msgstr "Orosz"
+
+#: ../win32/gui/WndMain.c:89
+msgid "Simplified Chinese"
+msgstr "Egyszerűsített kínai"
+
+#: ../win32/gui/WndMain.c:90
+msgid "Traditional Chinese"
+msgstr "Hagyományos kínai"
+
+#: ../win32/gui/WndMain.c:91
+msgid "Japanese"
+msgstr "Japán"
+
+#: ../win32/gui/WndMain.c:92
+msgid "Korean"
+msgstr "Koreai"
+
+#: ../win32/gui/WndMain.c:215
+#, fuzzy
+msgid ""
+"Usage: pcsxr [options]\n"
+"\toptions:\n"
+"\t-nogui\t\tDon't open the GUI\n"
+"\t-psxout\t\tEnable PSX output\n"
+"\t-slowboot\tEnable BIOS logo\n"
+"\t-runcd\t\tRuns CD-ROM (requires -nogui)\n"
+"\t-cdfile FILE\tRuns a CD image file (requires -nogui)\n"
+"\t-help\t\tDisplay this message"
+msgstr ""
+"Használat: pcsxr [beállítások]\n"
+"\toptions:\n"
+"\t-nogui\t\tNe nyíljon meg a GUI\n"
+"\t-psxout\t\tPSX kimenet bekapcsolása\n"
+"\t-runcd\t\tCD-ROM futtatása (-nogui szükséges)\n"
+"\t-cdfile FILE\tCD képfájl futtatása (-nogui szükséges)\n"
+"\t-help\t\tAz üzenet megjelenítése"
+
+#: ../win32/gui/WndMain.c:350 ../win32/gui/WndMain.c:396
+msgid "PCSXR State Format"
+msgstr "PCSXR állás mentés formátum"
+
+#: ../win32/gui/WndMain.c:377
+#, c-format
+msgid "*PCSXR*: Loaded State %s"
+msgstr "*PCSXR*: Betöltött állás %s"
+
+#: ../win32/gui/WndMain.c:378
+#, c-format
+msgid "*PCSXR*: Error Loading State %s"
+msgstr "*PCSXR*: Hiba a mentett állás betöltése közben %s"
+
+#: ../win32/gui/WndMain.c:423
+#, c-format
+msgid "*PCSXR*: Saved State %s"
+msgstr "*PCSXR*: Mentett állás %s"
+
+#: ../win32/gui/WndMain.c:424
+#, c-format
+msgid "*PCSXR*: Error Saving State %s"
+msgstr "*PCSXR*: Hiba az állás mentése közben %s"
+
+#: ../win32/gui/WndMain.c:493
+msgid "Running BIOS is not supported with Internal HLE Bios."
+msgstr "BIOS használata nem támogatott belső HLE Bios esetén."
+
+#: ../win32/gui/WndMain.c:790
+msgid "Game ID"
+msgstr "Játék azonosító"
+
+#: ../win32/gui/WndMain.c:796
+msgid "Game"
+msgstr "Játék"
+
+#: ../win32/gui/WndMain.c:978
+msgid "mid link block"
+msgstr "mid link block"
+
+#: ../win32/gui/WndMain.c:981
+msgid "terminiting link block"
+msgstr "link block megszakítása"
+
+#: ../win32/gui/WndMain.c:1086
+msgid "Memcard Manager"
+msgstr "Memória kártya kezelő"
+
+#: ../win32/gui/WndMain.c:1090 ../win32/gui/WndMain.c:1093
+msgid "Select Mcd"
+msgstr "Választás"
+
+#: ../win32/gui/WndMain.c:1091 ../win32/gui/WndMain.c:1094
+msgid "Format Mcd"
+msgstr "Formázás"
+
+#: ../win32/gui/WndMain.c:1092 ../win32/gui/WndMain.c:1095
+msgid "Reload Mcd"
+msgstr "Újratöltés"
+
+#: ../win32/gui/WndMain.c:1096
+msgid "-> Copy ->"
+msgstr "-> Másolás ->"
+
+#: ../win32/gui/WndMain.c:1097
+msgid "<- Copy <-"
+msgstr "<- Másolás <-"
+
+#: ../win32/gui/WndMain.c:1098
+msgid "Paste"
+msgstr "Beszúrás"
+
+#: ../win32/gui/WndMain.c:1099
+msgid "<- Un/Delete"
+msgstr "<- Nem/törlés"
+
+#: ../win32/gui/WndMain.c:1100
+msgid "Un/Delete ->"
+msgstr "Nem/törlés ->"
+
+#: ../win32/gui/WndMain.c:1102
+msgid "Memory Card 1"
+msgstr "Memória kártya 1"
+
+#: ../win32/gui/WndMain.c:1103
+msgid "Memory Card 2"
+msgstr "Memória kártya 2"
+
+#: ../win32/gui/WndMain.c:1158
+msgid "Are you sure you want to paste this selection?"
+msgstr "Valóban be akarod szúrni a kijelölést?"
+
+#: ../win32/gui/WndMain.c:1158 ../win32/gui/WndMain.c:1269
+#: ../win32/gui/WndMain.c:1276
+msgid "Confirmation"
+msgstr "Megerősítés"
+
+#: ../win32/gui/WndMain.c:1269 ../win32/gui/WndMain.c:1276
+msgid "Are you sure you want to format this Memory Card?"
+msgstr "Valóban le kívánod formázni ezt a Memória kártyát?"
+
+#: ../win32/gui/WndMain.c:1322
+msgid "Cpu Config"
+msgstr "Processzor beállítás"
+
+#: ../win32/gui/WndMain.c:1327
+msgid "Disable Xa Decoding"
+msgstr "Xa kódolás kikapcsolása"
+
+#: ../win32/gui/WndMain.c:1328
+msgid "Sio Irq Always Enabled"
+msgstr "Sio IRQ mindig bekapcsolva"
+
+#: ../win32/gui/WndMain.c:1329
+msgid "Black && White Movies"
+msgstr "Fekete &fehér videók"
+
+#: ../win32/gui/WndMain.c:1330
+msgid "Disable Cd audio"
+msgstr "CD hang kikapcsolása"
+
+#: ../win32/gui/WndMain.c:1333
+msgid "Enable Interpreter Cpu"
+msgstr "Processzor interpretáló rutin bekapcsolása"
+
+#: ../win32/gui/WndMain.c:1336
+msgid "Spu Irq Always Enabled"
+msgstr "Hang IRQ mindig bekapcsolva"
+
+#: ../win32/gui/WndMain.c:1340
+msgid "Hide cursor"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1343
+msgid "Psx System Type"
+msgstr "PSX régió"
+
+#: ../win32/gui/WndMain.c:1453
+msgid "Psx Mcd Format (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
+msgstr "Psx memória kártya formátum (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
+
+#: ../win32/gui/WndMain.c:1458
+msgid "Psx Memory Card (*.mcr;*.mc)"
+msgstr "Psx memória kártya (*.mcr;*.mc)"
+
+#: ../win32/gui/WndMain.c:1463
+msgid "CVGS Memory Card (*.mem;*.vgs)"
+msgstr "CVSG memória kártya (*.mem;*.vgs)"
+
+#: ../win32/gui/WndMain.c:1468
+msgid "Bleem Memory Card (*.mcd)"
+msgstr "Bleem memória kártya (*.mcd)"
+
+#: ../win32/gui/WndMain.c:1473
+msgid "DexDrive Memory Card (*.gme)"
+msgstr "DexDrive memória kártya (*.gme)"
+
+#: ../win32/gui/WndMain.c:1478
+msgid "DataDeck Memory Card (*.ddf)"
+msgstr "DataDeck memória kártya (*.ddf)"
+
+#: ../win32/gui/WndMain.c:1522
+msgid "Psx Exe Format"
+msgstr "Psx exe formátum"
+
+#: ../win32/gui/WndMain.c:1559
+#, fuzzy
+msgid "Psx Isos (*.iso;*.mdf;*.img;*.bin;*.cue;*.pbp;*.cbn)"
+msgstr "Psx képfájlok (*.iso;*.mdf;*.img;*.bin)"
+
+#: ../win32/gui/WndMain.c:1635
+msgid "&File"
+msgstr "&Fájl"
+
+#: ../win32/gui/WndMain.c:1636
+msgid "E&xit"
+msgstr "K&ilépés"
+
+#: ../win32/gui/WndMain.c:1638
+msgid "Run &EXE..."
+msgstr "&EXE indítása..."
+
+#: ../win32/gui/WndMain.c:1639
+msgid "Run &BIOS"
+msgstr "&BIOS indítása"
+
+#: ../win32/gui/WndMain.c:1640
+msgid "Run &ISO..."
+msgstr "&ISO megnyitása..."
+
+#: ../win32/gui/WndMain.c:1641
+msgid "Run &CD"
+msgstr "&CD indítása"
+
+#: ../win32/gui/WndMain.c:1643
+msgid "&Emulator"
+msgstr "&Emulátor"
+
+#: ../win32/gui/WndMain.c:1644
+msgid "&States"
+msgstr "&Állapot"
+
+#: ../win32/gui/WndMain.c:1646
+msgid "S&witch ISO..."
+msgstr "ISO v&áltás..."
+
+#: ../win32/gui/WndMain.c:1648
+#, fuzzy
+msgid "S&hutdown"
+msgstr "Jobbra le"
+
+#: ../win32/gui/WndMain.c:1649
+msgid "Re&set"
+msgstr "Al&apra állítás"
+
+#: ../win32/gui/WndMain.c:1650
+msgid "&Run"
+msgstr "&Indítás"
+
+#: ../win32/gui/WndMain.c:1651
+msgid "&Save"
+msgstr "&Mentés"
+
+#: ../win32/gui/WndMain.c:1652
+msgid "&Load"
+msgstr "&Betöltés"
+
+#: ../win32/gui/WndMain.c:1653 ../win32/gui/WndMain.c:1663
+msgid "&Other..."
+msgstr "&Más..."
+
+#: ../win32/gui/WndMain.c:1654 ../win32/gui/WndMain.c:1664
+msgid "Slot &9"
+msgstr "&Kilencedik hely"
+
+#: ../win32/gui/WndMain.c:1655 ../win32/gui/WndMain.c:1665
+msgid "Slot &8"
+msgstr "&Nyolcadik hely"
+
+#: ../win32/gui/WndMain.c:1656 ../win32/gui/WndMain.c:1666
+msgid "Slot &7"
+msgstr "&Hetedik hely"
+
+#: ../win32/gui/WndMain.c:1657 ../win32/gui/WndMain.c:1667
+msgid "Slot &6"
+msgstr "&Hatodik hely"
+
+#: ../win32/gui/WndMain.c:1658 ../win32/gui/WndMain.c:1668
+msgid "Slot &5"
+msgstr "&Ötödik hely"
+
+#: ../win32/gui/WndMain.c:1659 ../win32/gui/WndMain.c:1669
+msgid "Slot &4"
+msgstr "&Negyedik hely"
+
+#: ../win32/gui/WndMain.c:1660 ../win32/gui/WndMain.c:1670
+msgid "Slot &3"
+msgstr "&Harmadik hely"
+
+#: ../win32/gui/WndMain.c:1661 ../win32/gui/WndMain.c:1671
+msgid "Slot &2"
+msgstr "&Második hely"
+
+#: ../win32/gui/WndMain.c:1662 ../win32/gui/WndMain.c:1672
+msgid "Slot &1"
+msgstr "&Első hely"
+
+#: ../win32/gui/WndMain.c:1674
+msgid "&Configuration"
+msgstr "&Beállítások"
+
+#: ../win32/gui/WndMain.c:1675
+msgid "Cheat &Search..."
+msgstr "Csalás &keresése..."
+
+#: ../win32/gui/WndMain.c:1676
+msgid "Ch&eat Code..."
+msgstr "Cs&alás kód..."
+
+#: ../win32/gui/WndMain.c:1679
+msgid "&Language"
+msgstr "&Nyelv"
+
+#: ../win32/gui/WndMain.c:1705
+msgid "&Memory cards..."
+msgstr "&Memória kártyák..."
+
+#: ../win32/gui/WndMain.c:1706
+msgid "C&PU..."
+msgstr "P&rocesszor..."
+
+#: ../win32/gui/WndMain.c:1708
+msgid "&NetPlay..."
+msgstr "&Internetes játék..."
+
+#: ../win32/gui/WndMain.c:1710
+#, fuzzy
+msgid "&Link cable..."
+msgstr "Bekapcsolás"
+
+#: ../win32/gui/WndMain.c:1711
+msgid "&Controllers..."
+msgstr "&Irányítók..."
+
+#: ../win32/gui/WndMain.c:1712
+msgid "CD-&ROM..."
+msgstr "CD-&ROM..."
+
+#: ../win32/gui/WndMain.c:1713
+msgid "&Sound..."
+msgstr "&Hang..."
+
+#: ../win32/gui/WndMain.c:1714
+msgid "&Graphics..."
+msgstr "&Kép..."
+
+#: ../win32/gui/WndMain.c:1716
+msgid "&Plugins && Bios..."
+msgstr "&Pluginok és BIOS..."
+
+#: ../win32/gui/WndMain.c:1718
+msgid "&Help"
+msgstr "&Súgó"
+
+#: ../win32/gui/WndMain.c:1719
+msgid "&About..."
+msgstr "&A program névjegye..."
+
+#: ../win32/gui/WndMain.c:1870
+msgid "Pcsxr Msg"
+msgstr "Pcsxr üzenet"
+
+#: ../win32/gui/WndMain.c:1873
+msgid "Error Loading Symbol"
+msgstr "Hiba a szimbólum betöltése közben"
+
+#~ msgid "Controller 1: "
+#~ msgstr "1. irányító: "
+
+#~ msgid "Sio1 Driver"
+#~ msgstr "Sio1 Driver"
+
+#~ msgid ""
+#~ "8-bit\n"
+#~ "16-bit\n"
+#~ "32-bit"
+#~ msgstr ""
+#~ "8-bit\n"
+#~ "16-bit\n"
+#~ "32-bit"
+
+#~ msgid "CD-ROM..."
+#~ msgstr "CD-ROM..."
+
+#~ msgid "Continue..."
+#~ msgstr "Folytatása..."
+
+#~ msgid "Controllers..."
+#~ msgstr "Irányítók..."
+
+#~ msgid ""
+#~ "Decimal\n"
+#~ "Hexadecimal"
+#~ msgstr ""
+#~ "Decimális\n"
+#~ "Hexadecimális"
+
+#~ msgid ""
+#~ "Equal Value\n"
+#~ "Not Equal Value\n"
+#~ "Range\n"
+#~ "Increased By\n"
+#~ "Decreased By\n"
+#~ "Increased\n"
+#~ "Decreased\n"
+#~ "Different\n"
+#~ "No Change"
+#~ msgstr ""
+#~ "Equal Value\n"
+#~ "Egyenlő érték\n"
+#~ "Nem egyenlő érték\n"
+#~ "Hatótáv\n"
+#~ "Növelve ennyivel\n"
+#~ "Csökkentve ennyivel\n"
+#~ "Növelve\n"
+#~ "Csökkentve\n"
+#~ "Különböző\n"
+#~ "Változatlan"
+
+#~ msgid "Graphics..."
+#~ msgstr "Kép..."
+
+#~ msgid "Memcards..."
+#~ msgstr "Memória kártyák..."
+
+#~ msgid "Run ISO..."
+#~ msgstr "ISO futtatása..."
+
+#~ msgid "Sound..."
+#~ msgstr "Hang..."
+
+#~ msgid "Switch ISO..."
+#~ msgstr "ISO váltás..."
+
+#~ msgid "Error: Glade interface could not be loaded!"
+#~ msgstr "Hiba: Glade interfész nem tölthető be!"
+
+#~ msgid ""
+#~ "0: None\n"
+#~ "1: 2xSai\n"
+#~ "2: 2xSuperSai\n"
+#~ "3: SuperEagle\n"
+#~ "4: Scale2x\n"
+#~ "5: Scale3x\n"
+#~ "6: HQ2X\n"
+#~ "7: HQ3X"
+#~ msgstr ""
+#~ "0: Nincs\n"
+#~ "1: 2xSai\n"
+#~ "2: 2xSuperSai\n"
+#~ "3: SuperEagle\n"
+#~ "4: Scale2x\n"
+#~ "5: Scale3x\n"
+#~ "6: HQ2X\n"
+#~ "7: HQ3X"
+
+#~ msgid ""
+#~ "0: Off (fastest)\n"
+#~ "1: Game dependant\n"
+#~ "2: Always"
+#~ msgstr ""
+#~ "0: Ki (leggyorsabb)\n"
+#~ "1: Játék alárendelt\n"
+#~ "2: Mindig"
+
+#~ msgid ""
+#~ "320x240\n"
+#~ "640x480\n"
+#~ "800x600\n"
+#~ "1024x768\n"
+#~ "1152x864\n"
+#~ "1280x1024\n"
+#~ "1600x1200"
+#~ msgstr ""
+#~ "320x240\n"
+#~ "640x480\n"
+#~ "800x600\n"
+#~ "1024x768\n"
+#~ "1152x864\n"
+#~ "1280x1024\n"
+#~ "1600x1200"
+
+#~ msgid "Compatibility"
+#~ msgstr "Kompatibilitás"
+
+#~ msgid "Framerate"
+#~ msgstr "Képfrissítési frekvencia"
+
+#~ msgid "Screen"
+#~ msgstr "Képernyő"
+
+#~ msgid "General"
+#~ msgstr "Általános"
+
+#~ msgid "XA Music"
+#~ msgstr "XA zene"
+
+#~ msgid ""
+#~ "None\n"
+#~ "Low\n"
+#~ "Medium\n"
+#~ "Loud\n"
+#~ "Loudest"
+#~ msgstr ""
+#~ "Nincs\n"
+#~ "Halk\n"
+#~ "Közepes\n"
+#~ "Hangos\n"
+#~ "Leghangosabb"
+
+#~ msgid ""
+#~ "None\n"
+#~ "Simple\n"
+#~ "Gaussian\n"
+#~ "Cubic"
+#~ msgstr ""
+#~ "Nincs\n"
+#~ "Egyszerű\n"
+#~ "Gauss\n"
+#~ "Köbös"
+
+#~ msgid ""
+#~ "Default\n"
+#~ "125ms\n"
+#~ "250ms\n"
+#~ "500ms\n"
+#~ "1s\n"
+#~ "2s\n"
+#~ "4s\n"
+#~ "8s\n"
+#~ "16s\n"
+#~ "32s\n"
+#~ "1min\n"
+#~ "2min\n"
+#~ "4min\n"
+#~ "8min\n"
+#~ "16min\n"
+#~ "32min"
+#~ msgstr ""
+#~ "Alapérték\n"
+#~ "125 ms\n"
+#~ "250 ms\n"
+#~ "500 ms\n"
+#~ "1 s\n"
+#~ "2 s\n"
+#~ "4 s\n"
+#~ "8 s\n"
+#~ "16 s\n"
+#~ "32 s\n"
+#~ "1 perc\n"
+#~ "2 perc\n"
+#~ "4 perc\n"
+#~ "8 perc\n"
+#~ "16 perc\n"
+#~ "32 perc"
+
+#~ msgid "Select CD-ROM device"
+#~ msgstr "Válassz CD-ROM eszközt"
+
+#~ msgid "hseparator"
+#~ msgstr "hseparator"
+
+#, fuzzy
+#~ msgid "COFF files not supported.\n"
+#~ msgstr "File COFF non supportato.\n"
+
+#, fuzzy
+#~ msgid "PC fps calculation"
+#~ msgstr "Calcolo degli fps del PC"
+
+#, fuzzy
+#~ msgid "Scanlines"
+#~ msgstr "Scanlines"
+
+#, fuzzy
+#~ msgid "Adapted from P.E.Op.S OpenGL GPU by Pete Bernert"
+#~ msgstr "Adattato da P.E.Op.S OpenGL GPU da Pete Bernert"
+
+#, fuzzy
+#~ msgid "Homepage: http://www.pbernert.com"
+#~ msgstr "Homepage: http://www.pbernert.com"
+
+#, fuzzy
+#~ msgid "Version: 1.78"
+#~ msgstr "Versione: 1.78"
+
+#~ msgid "Error Closing PAD1 Plugin"
+#~ msgstr "Hiba az egyes irányító plugin bezárásakor"
+
+#~ msgid "Error Closing PAD2 Plugin"
+#~ msgstr "Hiba a kettes irányító plugin bezárásakor"
+
+#~ msgid "Internal HLE Bios"
+#~ msgstr "Bios HLE interno"
+
+#, fuzzy
+#~ msgid "Dump Memory..."
+#~ msgstr "&Memory card..."
+
+#~ msgid ""
+#~ "(C) 1999-2003 PCSX Team\n"
+#~ "(C) 2005-2006 Ryan Schultz\n"
+#~ "(C) 2005-2006 Andrew Burton\n"
+#~ "(C) 2008-2009 Wei Mingzhi"
+#~ msgstr ""
+#~ "(C) 1999-2003 PCSX Team\n"
+#~ "(C) 2005-2006 Ryan Schultz\n"
+#~ "(C) 2005-2006 Andrew Burton\n"
+#~ "(C) 2008-2009 Wei Mingzhi"
+
+#~ msgid "PulseAudio Simple Sound"
+#~ msgstr "Audio PulseAudio semplice"

pcsxr-1.9.92.tar.bz2/po/it.po -> pcsxr-1.9.93.tar.bz2/po/it.po Changed

@@ -1,3115 +1,3614 @@
-# Italian translation of pcsxr
-# Copyright (C) 2010 Giovanni Scafora
-# This file is distributed under the same license as the pcsxr package.
-# Giovanni Scafora <giovanni@archlinux.org>, 2010.
-# 
+# Italian translation of pcsxr
+# Copyright (C) 2010 Giovanni Scafora
+# This file is distributed under the same license as the pcsxr package.
+# Giovanni Scafora <giovanni@archlinux.org>, 2010.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: pcsxr 1.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-10 14:04+0800\n"
-"PO-Revision-Date: 2010-03-15 16:00+0200\n"
+"Report-Msgid-Bugs-To: whistler_wmz@users.sf.net\n"
+"POT-Creation-Date: 2013-03-02 03:33+0400\n"
+"PO-Revision-Date: 2011-06-04 13:45+0400\n"
 "Last-Translator: Giovanni Scafora <giovanni@archlinux.org>\n"
 "Language-Team: Arch Linux Italian Team <giovanni@archlinux.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../win32/gui/AboutDlg.c:26
-msgid ""
-"PCSX - A PlayStation Emulator\n"
-"\n"
-"Original Authors:\n"
-"main coder: linuzappz\n"
-"co-coders: shadow\n"
-"ex-coders: Nocomp, Pete Bernett, nik3d\n"
-"Webmaster: AkumaX"
+#: ../data/pcsxr.ui.h:1 ../win32/gui/CheatDlg.c:166
+msgid "Edit Cheat Codes"
+msgstr "Modifica i codici dei cheat"
+
+#: ../data/pcsxr.ui.h:2
+msgid "Cheat Codes"
+msgstr "Codici cheat"
+
+#: ../data/pcsxr.ui.h:3 ../gui/Cheat.c:1113 ../win32/gui/CheatDlg.c:678
+msgid "Cheat Search"
+msgstr "Cerca cheat"
+
+#: ../data/pcsxr.ui.h:4 ../win32/gui/CheatDlg.c:680
+msgid "Search For:"
+msgstr "Cerca per:"
+
+#: ../data/pcsxr.ui.h:5 ../win32/gui/CheatDlg.c:681
+msgid "Data Type:"
+msgstr "Tipo di dato:"
+
+#: ../data/pcsxr.ui.h:6 ../gui/Cheat.c:645 ../win32/gui/CheatDlg.c:506
+#: ../win32/gui/CheatDlg.c:597 ../win32/gui/CheatDlg.c:682
+msgid "Value:"
+msgstr "Valore:"
+
+#: ../data/pcsxr.ui.h:7 ../win32/gui/CheatDlg.c:683
+msgid "Data Base:"
+msgstr "Base di dato:"
+
+#: ../data/pcsxr.ui.h:8 ../win32/gui/CheatDlg.c:684
+msgid "To:"
+msgstr "A:"
+
+#: ../data/pcsxr.ui.h:9 ../win32/gui/CheatDlg.c:504
+msgid "Freeze"
+msgstr "Blocca"
+
+#: ../data/pcsxr.ui.h:10 ../win32/gui/CheatDlg.c:595
+msgid "Modify"
+msgstr "Modifica"
+
+#: ../data/pcsxr.ui.h:11
+msgid "Copy"
+msgstr "Copia"
+
+#: ../data/pcsxr.ui.h:12
+msgid "label_resultsfound"
+msgstr "etichetta_risultatitrovati"
+
+#: ../data/pcsxr.ui.h:13
+msgid "Search"
+msgstr "Cerca"
+
+#: ../data/pcsxr.ui.h:14
+msgid "Restart"
+msgstr "Riavvia"
+
+#: ../data/pcsxr.ui.h:15
+msgid "Cheat Search"
+msgstr "Cerca cheat"
+
+#: ../data/pcsxr.ui.h:16 ../gui/ConfDlg.c:113
+msgid "Configure PCSXR"
+msgstr "Configura PCSXR"
+
+#: ../data/pcsxr.ui.h:17
+msgid "Graphics:"
+msgstr "Video:"
+
+#: ../data/pcsxr.ui.h:18
+msgid "Sound:"
+msgstr "Audio:"
+
+#: ../data/pcsxr.ui.h:19
+#, fuzzy
+msgid "Controller 1:"
+msgstr "Controller 1"
+
+#: ../data/pcsxr.ui.h:20
+msgid "Controller 2:"
+msgstr "Controller 2:"
+
+#: ../data/pcsxr.ui.h:21
+msgid "CD-ROM:"
+msgstr "CD-ROM:"
+
+#: ../data/pcsxr.ui.h:22
+msgid "Search in:"
+msgstr "Cerca in:"
+
+#: ../data/pcsxr.ui.h:23
+msgid "Select Folder to Search"
+msgstr "Seleziona una cartella per la ricerca"
+
+#: ../data/pcsxr.ui.h:24
+#, fuzzy
+msgid "Link cable:"
+msgstr "Abilita"
+
+#: ../data/pcsxr.ui.h:25
+msgid "Plugins"
+msgstr "Plugin"
+
+#: ../data/pcsxr.ui.h:26
+msgid "BIOS:"
 msgstr ""
-"PCSX, un emulatore della PlayStation\n"
-"\n"
-"Autori originari:\n"
-"programmatore principale: linuzappz\n"
-"co-programmatori: shadow\n"
-"ex-programmatori: Nocomp, Pete Bernett, nik3d\n"
-"Webmaster: AkumaX"
 
-#: ../win32/gui/AboutDlg.c:35
+#: ../data/pcsxr.ui.h:27
+msgid "BIOS"
+msgstr "BIOS"
+
+#: ../data/pcsxr.ui.h:28
+msgid "Configure CPU"
+msgstr "Configura la CPU"
+
+#: ../data/pcsxr.ui.h:29
+msgid "SPU IRQ Always Enabled"
+msgstr "SPU IRQ sempre abilitato"
+
+#: ../data/pcsxr.ui.h:30
+msgid "Black & White Movies"
+msgstr "Filmati in bianco e nero"
+
+#: ../data/pcsxr.ui.h:31 ../gui/Plugin.c:239
+#, c-format
+msgid "SIO IRQ Always Enabled"
+msgstr "SIO IRQ sempre abilitato"
+
+#: ../data/pcsxr.ui.h:32
+msgid "Disable XA Decoding"
+msgstr "Disabilita il decoding XA"
+
+#: ../data/pcsxr.ui.h:33
+msgid "Disable CD Audio"
+msgstr "Disabilita CD audio"
+
+#: ../data/pcsxr.ui.h:34 ../win32/gui/WndMain.c:1331
+msgid "Slow Boot"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:35
+msgid "Enable Interpreter CPU"
+msgstr "Abilita l'interprete della CPU"
+
+#: ../data/pcsxr.ui.h:36 ../win32/gui/WndMain.c:1334
+msgid "Enable Console Output"
+msgstr "Abilita l'output sulla console"
+
+#: ../data/pcsxr.ui.h:37 ../win32/gui/WndMain.c:1335
+msgid "Enable Debugger"
+msgstr "Abilita il debugger"
+
+#: ../data/pcsxr.ui.h:38 ../win32/gui/WndMain.c:1337
+msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
+msgstr "Parasite Eve 2, Vandal Hearts 1/2 Fix"
+
+#: ../data/pcsxr.ui.h:39 ../win32/gui/WndMain.c:1338
+msgid "InuYasha Sengoku Battle Fix"
+msgstr "InuYasha Sengoku Battle Fix"
+
+#: ../data/pcsxr.ui.h:40 ../win32/gui/WndMain.c:1339
+msgid "Widescreen (GTE Hack)"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:41
+msgid "Options"
+msgstr "Opzioni"
+
+#: ../data/pcsxr.ui.h:42 ../win32/gui/WndMain.c:1332
+msgid "Autodetect"
+msgstr "Rileva automaticamente"
+
+#: ../data/pcsxr.ui.h:43
+msgid "System Type"
+msgstr "Regione del sistema"
+
+#: ../data/pcsxr.ui.h:44
+msgid "PCSXR"
+msgstr "PCSXR"
+
+#: ../data/pcsxr.ui.h:45
+msgid "_File"
+msgstr "_File"
+
+#: ../data/pcsxr.ui.h:46
+msgid "Run _CD"
+msgstr "Avvia _CD"
+
+#: ../data/pcsxr.ui.h:47
+msgid "Run _ISO..."
+msgstr "Avvia _ISO..."
+
+#: ../data/pcsxr.ui.h:48
+msgid "Run _BIOS"
+msgstr "Avvia _BIOS"
+
+#: ../data/pcsxr.ui.h:49
+msgid "Run _EXE..."
+msgstr "Avvia _EXE..."
+
+#: ../data/pcsxr.ui.h:50
+msgid "E_xit"
+msgstr "E_sci"
+
+#: ../data/pcsxr.ui.h:51
+msgid "_Emulator"
+msgstr "_Emulatore"
+
+#: ../data/pcsxr.ui.h:52
+msgid "_Continue"
+msgstr "_Continua"
+
+#: ../data/pcsxr.ui.h:53
+msgid "_Reset"
+msgstr "_Resetta"
+
+#: ../data/pcsxr.ui.h:54
 #, fuzzy
-msgid ""
-"PCSX-df Authors:\n"
-"Ryan Schultz, Andrew Burton, Stephen Chao,\n"
-"Marcus Comstedt, Stefan Sikora\n"
-"\n"
-"PCSX-Reloaded By:\n"
-"Blade_Arma, Wei Mingzhi, et al.\n"
-"\n"
-"http://pcsxr.codeplex.com/"
+msgid "_Shutdown"
+msgstr "In basso a destra"
+
+#: ../data/pcsxr.ui.h:55
+msgid "S_witch ISO..."
+msgstr "C_ambia ISO..."
+
+#: ../data/pcsxr.ui.h:56
+msgid "_Save State"
+msgstr "_Salva stato"
+
+#: ../data/pcsxr.ui.h:57
+msgid "Slot _1"
+msgstr "Slot _1"
+
+#: ../data/pcsxr.ui.h:58
+msgid "Slot _2"
+msgstr "Slot _2"
+
+#: ../data/pcsxr.ui.h:59
+msgid "Slot _3"
+msgstr "Slot _3"
+
+#: ../data/pcsxr.ui.h:60
+msgid "Slot _4"
+msgstr "Slot _4"
+
+#: ../data/pcsxr.ui.h:61
+msgid "Slot _5"
+msgstr "Slot _5"
+
+#: ../data/pcsxr.ui.h:62
+msgid "Slot _6"
 msgstr ""
-"Autori di PCSX-df:\n"
-"Ryan Schultz, Andrew Burton, Stephen Chao,\n"
-"Marcus Comstedt, Stefan Sikora\n"
-"\n"
-"PCSX-Reloaded di:\n"
-"Wei Mingzhi\n"
-"\n"
-"http://www.codeplex.com/pcsxr"
 
-#: ../win32/gui/AboutDlg.c:46 ../plugins/peopsxgl/gpucfg/interface.c:831
-msgid "About"
-msgstr "Informazioni"
+#: ../data/pcsxr.ui.h:63
+msgid "Slot _7"
+msgstr ""
 
-#: ../win32/gui/AboutDlg.c:48 ../win32/gui/AboutDlg.c:52
-#: ../win32/gui/CheatDlg.c:69 ../win32/gui/CheatDlg.c:119
-#: ../win32/gui/ConfigurePlugins.c:483 ../win32/gui/ConfigurePlugins.c:614
-#: ../win32/gui/WndMain.c:974 ../win32/gui/WndMain.c:1210
-#: ../plugins/peopsxgl/gpucfg/interface.c:130
-#: ../plugins/peopsxgl/gpucfg/interface.c:843
-msgid "OK"
-msgstr "OK"
+#: ../data/pcsxr.ui.h:64
+msgid "Slot _8"
+msgstr ""
 
-#: ../win32/gui/AboutDlg.c:49
-msgid "PCSX EMU\n"
-msgstr "PCSX EMU\n"
+#: ../data/pcsxr.ui.h:65
+msgid "Slot _9"
+msgstr ""
 
-#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
-#: ../win32/gui/CheatDlg.c:270
-msgid "Yes"
-msgstr "Sì"
+#: ../data/pcsxr.ui.h:66
+msgid "_Other..."
+msgstr "_Altri..."
 
-#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
-#: ../win32/gui/CheatDlg.c:270
-msgid "No"
-msgstr "No"
+#: ../data/pcsxr.ui.h:67
+msgid "_Load State"
+msgstr "_Carica stato"
 
-#: ../win32/gui/CheatDlg.c:66 ../gui/Cheat.c:194
-msgid "Edit Cheat"
-msgstr "Modifica cheat"
+#: ../data/pcsxr.ui.h:68
+msgid "_Configuration"
+msgstr "_Configurazione"
 
-#: ../win32/gui/CheatDlg.c:67 ../win32/gui/CheatDlg.c:117 ../gui/Cheat.c:636
-msgid "Description:"
-msgstr "Descrizione:"
+#: ../data/pcsxr.ui.h:69
+msgid "_Plugins & BIOS..."
+msgstr "_Plugin e BIOS..."
 
-#: ../win32/gui/CheatDlg.c:68 ../win32/gui/CheatDlg.c:118 ../gui/Cheat.c:125
-#: ../gui/Cheat.c:211
-msgid "Cheat Code:"
-msgstr "Codice cheat:"
+#: ../data/pcsxr.ui.h:70
+msgid "_Graphics..."
+msgstr "_Video..."
 
-#: ../win32/gui/CheatDlg.c:70 ../win32/gui/CheatDlg.c:120
-#: ../win32/gui/ConfigurePlugins.c:484 ../win32/gui/ConfigurePlugins.c:615
-#: ../win32/gui/WndMain.c:975 ../win32/gui/WndMain.c:1211
-#: ../plugins/peopsxgl/gpucfg/interface.c:338
-msgid "Cancel"
-msgstr "Annulla"
+#: ../data/pcsxr.ui.h:71
+msgid "_Sound..."
+msgstr "_Audio..."
 
-#: ../win32/gui/CheatDlg.c:91 ../win32/gui/CheatDlg.c:132 ../gui/Cheat.c:155
-#: ../gui/Cheat.c:251
-msgid "Invalid cheat code!"
-msgstr "Codice del cheat non valido!"
+#: ../data/pcsxr.ui.h:72
+msgid "CD-_ROM..."
+msgstr "CD-_ROM..."
 
-#: ../win32/gui/CheatDlg.c:116 ../gui/Cheat.c:109
-msgid "Add New Cheat"
-msgstr "Aggiungi un nuovo cheat"
+#: ../data/pcsxr.ui.h:73
+msgid "C_ontrollers..."
+msgstr "C_ontroller..."
 
-#: ../win32/gui/CheatDlg.c:166 ../data/pcsx.glade2:2534
-msgid "Edit Cheat Codes"
-msgstr "Modifica i codici dei cheat"
+#: ../data/pcsxr.ui.h:74
+#, fuzzy
+msgid "_Link cable..."
+msgstr "Abilita"
 
-#: ../win32/gui/CheatDlg.c:168
-msgid "&Add Code"
-msgstr "&Aggiungi un codice"
+#: ../data/pcsxr.ui.h:75
+msgid "_Netplay..."
+msgstr "_Netplay..."
 
-#: ../win32/gui/CheatDlg.c:169
-msgid "&Edit Code"
-msgstr "&Modifica un codice"
+#: ../data/pcsxr.ui.h:76
+msgid "_CPU..."
+msgstr "_CPU..."
+
+#: ../data/pcsxr.ui.h:77
+msgid "_Memory Cards..."
+msgstr "_Memory card..."
+
+#: ../data/pcsxr.ui.h:78
+msgid "Chea_t"
+msgstr "Chea_t"
+
+#: ../data/pcsxr.ui.h:79
+msgid "_Browse..."
+msgstr "_Visualizza..."
+
+#: ../data/pcsxr.ui.h:80
+msgid "_Search..."
+msgstr "_Cerca..."
+
+#: ../data/pcsxr.ui.h:81
+msgid "Memory _Dump"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:82
+msgid "_Help"
+msgstr "_Aiuto"
+
+#: ../data/pcsxr.ui.h:83
+msgid "_About PCSXR..."
+msgstr "_Informazioni su PCSXR..."
+
+#: ../data/pcsxr.ui.h:84
+msgid "Run CD"
+msgstr "Avvia il CD"
+
+#: ../data/pcsxr.ui.h:85
+msgid "Run ISO Image"
+msgstr "Avvia l'immagine ISO"
+
+#: ../data/pcsxr.ui.h:86
+msgid "Continue Emulation"
+msgstr "Continua l'emulazione"
+
+#: ../data/pcsxr.ui.h:87
+msgid "Switch ISO Image"
+msgstr "Cambia l'immagine ISO"
+
+#: ../data/pcsxr.ui.h:88
+msgid "Configure Memory Cards"
+msgstr "Configura la memory card"
+
+#: ../data/pcsxr.ui.h:89
+msgid "Configure Graphics"
+msgstr "Configura il video"
+
+#: ../data/pcsxr.ui.h:90 ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:1
+msgid "Configure Sound"
+msgstr "Configura l'audio"
+
+#: ../data/pcsxr.ui.h:91
+msgid "Configure CD-ROM"
+msgstr "Configura il CD-ROM"
+
+#: ../data/pcsxr.ui.h:92
+msgid "Configure Controllers"
+msgstr "Configura i controller"
+
+#: ../data/pcsxr.ui.h:93
+msgid "New"
+msgstr "Nuovo"
+
+#: ../data/pcsxr.ui.h:94
+msgid "Format"
+msgstr "Formatta"
+
+#: ../data/pcsxr.ui.h:95
+msgid "Un/Delete"
+msgstr "Non/Elimina"
+
+#: ../data/pcsxr.ui.h:96
+msgid "Memory Card 1"
+msgstr "Memory card 1"
+
+#: ../data/pcsxr.ui.h:97
+msgid "Memory Card 2"
+msgstr "Memory card 2"
+
+#: ../data/pcsxr.ui.h:98 ../gui/DebugMemory.c:119
+msgid "Memory Dump"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:99 ../gui/DebugMemory.c:205
+#, fuzzy
+msgid "Address (Hexadecimal):"
+msgstr "Esadecimale"
+
+#: ../data/pcsxr.ui.h:100
+msgid "Raw Dump..."
+msgstr ""
 
-#: ../win32/gui/CheatDlg.c:170
-msgid "&Remove Code"
-msgstr "&Rimuovi un codice"
+#: ../data/pcsxr.ui.h:101
+msgid "Patch Memory..."
+msgstr ""
 
-#: ../win32/gui/CheatDlg.c:171
-msgid "&Enable/Disable"
-msgstr "&Abilita/Disabilita"
+#: ../data/pcsxr.ui.h:102
+msgid "Configure NetPlay"
+msgstr "Configura il NetPlay"
 
-#: ../win32/gui/CheatDlg.c:172
-msgid "&Load..."
-msgstr "&Carica..."
+#: ../data/pcsxr.ui.h:103
+msgid "NetPlay"
+msgstr "NetPlay"
 
-#: ../win32/gui/CheatDlg.c:173
-msgid "&Save As..."
-msgstr "&Salva come..."
+#: ../data/pcsxr.ui.h:104
+#, fuzzy
+msgid "NTSC"
+msgstr ""
+"NTSC\n"
+"PAL"
 
-#: ../win32/gui/CheatDlg.c:174
-msgid "&Close"
-msgstr "&Chiudi"
+#: ../data/pcsxr.ui.h:105
+msgid "PAL"
+msgstr ""
 
-#: ../win32/gui/CheatDlg.c:185 ../gui/Cheat.c:413
-msgid "Description"
-msgstr "Descrizione"
+#: ../data/pcsxr.ui.h:106 ../win32/gui/CheatDlg.c:692
+msgid "8-bit"
+msgstr "8-bit"
 
-#: ../win32/gui/CheatDlg.c:190
-msgid "Enabled"
-msgstr "Abilitato"
+#: ../data/pcsxr.ui.h:107 ../win32/gui/CheatDlg.c:693
+msgid "16-bit"
+msgstr "16-bit"
 
-#: ../win32/gui/CheatDlg.c:282 ../win32/gui/CheatDlg.c:311
-msgid "PCSX Cheat Code Files"
-msgstr "File del codice dei cheat di PCSX"
+#: ../data/pcsxr.ui.h:108 ../win32/gui/CheatDlg.c:694
+msgid "32-bit"
+msgstr "32-bit"
 
-#: ../win32/gui/CheatDlg.c:402
+#: ../data/pcsxr.ui.h:109 ../win32/gui/CheatDlg.c:402
 msgid "Equal Value"
 msgstr "Stesso valore"
 
-#: ../win32/gui/CheatDlg.c:403
+#: ../data/pcsxr.ui.h:110 ../win32/gui/CheatDlg.c:403
 msgid "Not Equal Value"
 msgstr "Valore diverso"
 
-#: ../win32/gui/CheatDlg.c:404
+#: ../data/pcsxr.ui.h:111 ../win32/gui/CheatDlg.c:404
 msgid "Range"
 msgstr "Scala"
 
-#: ../win32/gui/CheatDlg.c:407
+#: ../data/pcsxr.ui.h:112 ../win32/gui/CheatDlg.c:407
 msgid "Increased By"
 msgstr "Incrementato da"
 
-#: ../win32/gui/CheatDlg.c:408
+#: ../data/pcsxr.ui.h:113 ../win32/gui/CheatDlg.c:408
 msgid "Decreased By"
 msgstr "Decrementato da"
 
-#: ../win32/gui/CheatDlg.c:409
+#: ../data/pcsxr.ui.h:114 ../win32/gui/CheatDlg.c:409
 msgid "Increased"
 msgstr "Incrementato"
 
-#: ../win32/gui/CheatDlg.c:410
+#: ../data/pcsxr.ui.h:115 ../win32/gui/CheatDlg.c:410
 msgid "Decreased"
 msgstr "Decrementato"
 
-#: ../win32/gui/CheatDlg.c:411
+#: ../data/pcsxr.ui.h:116 ../win32/gui/CheatDlg.c:411
 msgid "Different"
 msgstr "Differente"
 
-#: ../win32/gui/CheatDlg.c:412
+#: ../data/pcsxr.ui.h:117 ../win32/gui/CheatDlg.c:412
 msgid "No Change"
 msgstr "Nessun cambio"
 
-#: ../win32/gui/CheatDlg.c:448 ../gui/Cheat.c:585
-msgid "Enter the values and start your search."
-msgstr "Digita i valori ed inizia la tua ricerca."
+#: ../data/pcsxr.ui.h:118 ../win32/gui/CheatDlg.c:695
+msgid "Decimal"
+msgstr "Decimale"
 
-#: ../win32/gui/CheatDlg.c:453
-msgid "No addresses found."
-msgstr "Non è stato trovato nessun indirizzo."
+#: ../data/pcsxr.ui.h:119 ../win32/gui/CheatDlg.c:696
+msgid "Hexadecimal"
+msgstr "Esadecimale"
+
+#: ../gui/AboutDlg.c:71
+msgid ""
+"(C) 1999-2003 PCSX Team\n"
+"(C) 2005-2009 PCSX-df Team\n"
+"(C) 2009-2011 PCSX-Reloaded Team"
+msgstr ""
+
+#: ../gui/AboutDlg.c:76
+#, fuzzy
+msgid ""
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+msgstr ""
+"This program is free software; you can redistribute it\n"
+"and/or modify it under the terms of the GNU General\n"
+"Public License as published by the Free Software\n"
+"Foundation; either version 2 of the License, or (at your\n"
+"option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be\n"
+"useful, but WITHOUT ANY WARRANTY; without even\n"
+"the implied warranty of MERCHANTABILITY or\n"
+"FITNESS FOR A PARTICULAR PURPOSE. See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General\n"
+"Public License along with this program; if not, write to\n"
+"the Free Software Foundation, Inc."
+
+#: ../gui/AboutDlg.c:100
+msgid "translator-credits"
+msgstr ""
+"Traduzione italiana a cura di Giovanni Scafora <giovanni@archlinux.org>"
+
+#: ../gui/AboutDlg.c:101
+msgid "A PlayStation emulator."
+msgstr "Un emulatore della PlayStation."
+
+#: ../gui/Cheat.c:101 ../win32/gui/CheatDlg.c:116
+msgid "Add New Cheat"
+msgstr "Aggiungi un nuovo cheat"
+
+#: ../gui/Cheat.c:109 ../gui/Cheat.c:192
+msgid "Cheat Description:"
+msgstr "Descrizione del cheat:"
+
+#: ../gui/Cheat.c:117 ../gui/Cheat.c:201 ../win32/gui/CheatDlg.c:68
+#: ../win32/gui/CheatDlg.c:118
+msgid "Cheat Code:"
+msgstr "Codice cheat:"
+
+#: ../gui/Cheat.c:147 ../gui/Cheat.c:241 ../gui/LnxMain.c:425
+#: ../win32/gui/ConfigurePlugins.c:330
+msgid "Error"
+msgstr "Errore"
+
+#: ../gui/Cheat.c:147 ../gui/Cheat.c:241 ../win32/gui/CheatDlg.c:91
+#: ../win32/gui/CheatDlg.c:132
+msgid "Invalid cheat code!"
+msgstr "Codice del cheat non valido!"
+
+#: ../gui/Cheat.c:184 ../win32/gui/CheatDlg.c:66
+msgid "Edit Cheat"
+msgstr "Modifica cheat"
+
+#: ../gui/Cheat.c:307
+msgid "Open Cheat File"
+msgstr "Apri il file del cheat"
+
+#: ../gui/Cheat.c:317 ../gui/Cheat.c:357
+msgid "PCSXR Cheat Code Files (*.cht)"
+msgstr "File cheat di PCSXR (*.cht)"
+
+#: ../gui/Cheat.c:322 ../gui/GtkGui.c:491 ../gui/GtkGui.c:643
+#: ../win32/gui/WndMain.c:1483 ../win32/gui/WndMain.c:1564
+msgid "All Files"
+msgstr "Tutti i file"
+
+#: ../gui/Cheat.c:347
+msgid "Save Cheat File"
+msgstr "Salva il file del cheat"
+
+#: ../gui/Cheat.c:362
+msgid "All Files (*.*)"
+msgstr "Tutti i file (*.*)"
+
+#: ../gui/Cheat.c:401
+msgid "Cheat Codes"
+msgstr "Codici cheat"
+
+#: ../gui/Cheat.c:408
+msgid "Enable"
+msgstr "Abilita"
 
-#: ../win32/gui/CheatDlg.c:457 ../gui/Cheat.c:543
+#: ../gui/Cheat.c:416 ../win32/gui/CheatDlg.c:185
+msgid "Description"
+msgstr "Descrizione"
+
+#: ../gui/Cheat.c:544 ../win32/gui/CheatDlg.c:457
 msgid "Too many addresses found."
 msgstr "Sono stati trovati troppi indirizzi."
 
-#: ../win32/gui/CheatDlg.c:466 ../gui/Cheat.c:552
+#: ../gui/Cheat.c:553 ../win32/gui/CheatDlg.c:466
 #, c-format
 msgid "%.8X Current: %u (%.2X), Previous: %u (%.2X)"
 msgstr "%.8X Attuale: %u (%.2X), Precedente: %u (%.2X)"
 
-#: ../win32/gui/CheatDlg.c:471 ../gui/Cheat.c:557
+#: ../gui/Cheat.c:558 ../win32/gui/CheatDlg.c:471
 #, c-format
 msgid "%.8X Current: %u (%.4X), Previous: %u (%.4X)"
 msgstr "%.8X Attuale: %u (%.4X), Precedente: %u (%.4X)"
 
-#: ../win32/gui/CheatDlg.c:476 ../gui/Cheat.c:562
+#: ../gui/Cheat.c:563 ../win32/gui/CheatDlg.c:476
 #, c-format
 msgid "%.8X Current: %u (%.8X), Previous: %u (%.8X)"
 msgstr "%.8X Attuale: %u (%.8X), Precedente: %u (%.8X)"
 
-#: ../win32/gui/CheatDlg.c:492 ../gui/Cheat.c:577
+#: ../gui/Cheat.c:578 ../win32/gui/CheatDlg.c:492
 #, c-format
 msgid "Founded Addresses: %d"
 msgstr "Indirizzi trovati: %d"
 
-#: ../win32/gui/CheatDlg.c:504 ../data/pcsx.glade2:2930
-msgid "Freeze"
-msgstr "Blocca"
+#: ../gui/Cheat.c:586 ../win32/gui/CheatDlg.c:448
+msgid "Enter the values and start your search."
+msgstr "Digita i valori ed inizia la tua ricerca."
 
-#: ../win32/gui/CheatDlg.c:505 ../win32/gui/CheatDlg.c:596
-msgid "Address:"
-msgstr "Indirizzo:"
+#: ../gui/Cheat.c:628
+msgid "Freeze value"
+msgstr "Blocca valore"
 
-#: ../win32/gui/CheatDlg.c:506 ../win32/gui/CheatDlg.c:597
-#: ../win32/gui/CheatDlg.c:682 ../gui/Cheat.c:647 ../data/pcsx.glade2:2773
-msgid "Value:"
-msgstr "Valore:"
+#: ../gui/Cheat.c:634 ../win32/gui/CheatDlg.c:67 ../win32/gui/CheatDlg.c:117
+msgid "Description:"
+msgstr "Descrizione:"
 
-#: ../win32/gui/CheatDlg.c:566
-#, c-format
-msgid "Freeze %.8X"
-msgstr "Blocca %.8x"
+#: ../gui/Cheat.c:727
+msgid "Modify value"
+msgstr "Modifica il valore"
 
-#: ../win32/gui/CheatDlg.c:595 ../data/pcsx.glade2:2966
-msgid "Modify"
-msgstr "Modifica"
+#: ../gui/Cheat.c:735
+msgid "New value:"
+msgstr "Nuovo valore:"
 
-#: ../win32/gui/CheatDlg.c:678 ../gui/Cheat.c:1129 ../data/pcsx.glade2:2703
-msgid "Cheat Search"
-msgstr "Cerca cheat"
+#: ../gui/Cheat.c:1119
+msgid "Search Results"
+msgstr "Risultati della ricerca"
 
-#: ../win32/gui/CheatDlg.c:680 ../data/pcsx.glade2:2751
-msgid "Search For:"
-msgstr "Cerca per:"
+#. TODO Check whether configuration is required when we choose the plugin, and set the state of the
+#. button appropriately. New gtk tooltip API should allow us to put a tooltip explanation for
+#. disabled widgets
+#. TODO If combo screen hasn't been opened and the user chooses the menu config option, confs.Combo will be null and cause a segfault
+#. printf("Configuring plugin %s\n", filename);
+#: ../gui/ConfDlg.c:256 ../gui/ConfDlg.c:277 ../gui/ConfDlg.c:298
+#: ../gui/ConfDlg.c:319 ../gui/ConfDlg.c:340 ../gui/ConfDlg.c:399
+msgid "No configuration required"
+msgstr "Non necessita di essere configurato"
 
-#: ../win32/gui/CheatDlg.c:681 ../data/pcsx.glade2:2761
-msgid "Data Type:"
-msgstr "Tipo di dato:"
+#: ../gui/ConfDlg.c:256 ../gui/ConfDlg.c:277 ../gui/ConfDlg.c:298
+#: ../gui/ConfDlg.c:319 ../gui/ConfDlg.c:340 ../gui/ConfDlg.c:399
+msgid "This plugin doesn't need to be configured."
+msgstr "Questo plugin non necessita di essere configurato."
 
-#: ../win32/gui/CheatDlg.c:683 ../data/pcsx.glade2:2785
-msgid "Data Base:"
-msgstr "Base di dato:"
+#: ../gui/ConfDlg.c:402
+msgid "Please select a plugin."
+msgstr ""
 
-#: ../win32/gui/CheatDlg.c:684 ../data/pcsx.glade2:2845
-msgid "To:"
-msgstr "A:"
+#: ../gui/ConfDlg.c:647
+#, c-format
+msgid "Could not open BIOS directory: '%s'\n"
+msgstr "Impossibile aprire la cartella del BIOS: '%s'\n"
 
-#: ../win32/gui/CheatDlg.c:685
-msgid "&Freeze"
-msgstr "&Blocca"
+#: ../gui/ConfDlg.c:698 ../gui/ConfDlg.c:801 ../gui/LnxMain.c:168
+#, c-format
+msgid "Could not open directory: '%s'\n"
+msgstr "Impossibile aprire la cartella: '%s'\n"
 
-#: ../win32/gui/CheatDlg.c:686
-msgid "&Modify"
-msgstr "&Modifica"
+#. The BIOS list always contains the PCSXR internal BIOS
+#: ../gui/ConfDlg.c:769
+msgid "Simulate PSX BIOS"
+msgstr ""
 
-#: ../win32/gui/CheatDlg.c:687
-msgid "&Copy"
-msgstr "&Copia"
+#: ../gui/DebugMemory.c:127
+#, fuzzy
+msgid "Start Address (Hexadecimal):"
+msgstr "Esadecimale"
 
-#: ../win32/gui/CheatDlg.c:688
-msgid "&Search"
-msgstr "&Cerca"
+#: ../gui/DebugMemory.c:138
+msgid "Length (Decimal):"
+msgstr ""
 
-#: ../win32/gui/CheatDlg.c:689
-msgid "&New Search"
-msgstr "&Nuova ricerca"
+#: ../gui/DebugMemory.c:164
+msgid "Dump to File"
+msgstr ""
 
-#: ../win32/gui/CheatDlg.c:690
-msgid "C&lose"
-msgstr "C&hiudi"
+#: ../gui/DebugMemory.c:179
+#, fuzzy, c-format
+msgid "Error writing to %s!"
+msgstr "Si è verificato un errore durante il salvataggio dello stato %s!"
 
-#: ../win32/gui/CheatDlg.c:692
-msgid "8-bit"
-msgstr "8-bit"
+#: ../gui/DebugMemory.c:197
+#, fuzzy
+msgid "Memory Patch"
+msgstr "Memory card 1"
 
-#: ../win32/gui/CheatDlg.c:693
-msgid "16-bit"
-msgstr "16-bit"
+#: ../gui/DebugMemory.c:216
+#, fuzzy
+msgid "Value (Hexa string):"
+msgstr "Esadecimale"
 
-#: ../win32/gui/CheatDlg.c:694
-msgid "32-bit"
-msgstr "32-bit"
+#: ../gui/DebugMemory.c:283
+#, fuzzy
+msgid "Memory Viewer"
+msgstr "Memory card 1"
 
-#: ../win32/gui/CheatDlg.c:695
-msgid "Decimal"
-msgstr "Decimale"
+#: ../gui/DebugMemory.c:289
+#, fuzzy
+msgid "Address"
+msgstr "Indirizzo:"
 
-#: ../win32/gui/CheatDlg.c:696
-msgid "Hexadecimal"
-msgstr "Esadecimale"
+#: ../gui/DebugMemory.c:307
+#, fuzzy
+msgid "Text"
+msgstr "Strutture"
 
-#: ../win32/gui/ConfigurePlugins.c:219
-msgid "Simulate Psx Bios"
-msgstr ""
+#: ../gui/GtkGui.c:146
+msgid "Ready"
+msgstr "Pronto"
 
-#: ../win32/gui/ConfigurePlugins.c:305
-msgid "Configuration not OK!"
-msgstr "La configurazione non è corretta!"
+#: ../gui/GtkGui.c:191
+msgid "Emulation Paused."
+msgstr "L'emulazione è stata messa in pausa."
 
-#: ../win32/gui/ConfigurePlugins.c:305 ../gui/Cheat.c:155 ../gui/Cheat.c:251
-#: ../gui/LnxMain.c:418
-msgid "Error"
-msgstr "Errore"
+#: ../gui/GtkGui.c:474
+msgid "Select PSX EXE File"
+msgstr "Seleziona un file EXE della PSX"
 
-#: ../win32/gui/ConfigurePlugins.c:406
-msgid "This plugin reports that should work correctly"
-msgstr "Questo plugin dovrebbe funzionare correttamente"
+#: ../gui/GtkGui.c:487
+msgid "PlayStation Executable Files"
+msgstr "File eseguibili della PlayStation"
 
-#: ../win32/gui/ConfigurePlugins.c:407
-msgid "This plugin reports that should not work correctly"
-msgstr "Questo plugin potrebbe non funzionare correttamente"
+#: ../gui/GtkGui.c:524
+msgid "Not a valid PSX file"
+msgstr "Non è un file valido della PSX"
 
-#: ../win32/gui/ConfigurePlugins.c:463
-msgid "Select Plugins Directory"
-msgstr "Seleziona la cartella dei plugin"
+#: ../gui/GtkGui.c:524
+msgid "The file does not appear to be a valid Playstation executable"
+msgstr "Il file non sembra essere un eseguibile valido della Playstation"
 
-#: ../win32/gui/ConfigurePlugins.c:472
-msgid "Select Bios Directory"
-msgstr "Seleziona la cartella del bios"
+#: ../gui/GtkGui.c:553 ../gui/GtkGui.c:725
+msgid "CD ROM failed"
+msgstr "Si è verificato un problema con il CD ROM"
 
-#: ../win32/gui/ConfigurePlugins.c:481
-msgid "Configuration"
-msgstr "Configurazione"
+#: ../gui/GtkGui.c:553 ../gui/GtkGui.c:725 ../win32/gui/WndMain.c:472
+#: ../win32/gui/WndMain.c:526 ../win32/gui/WndMain.c:596
+#, c-format
+msgid "The CD does not appear to be a valid Playstation CD"
+msgstr "Il CD inserito non sembra essere un valido CD della Playstation"
 
-#: ../win32/gui/ConfigurePlugins.c:485
-msgid "Graphics"
-msgstr "Video"
+#: ../gui/GtkGui.c:564 ../gui/GtkGui.c:736 ../win32/gui/WndMain.c:482
+#: ../win32/gui/WndMain.c:536 ../win32/gui/WndMain.c:606
+#, c-format
+msgid "Could not load CD-ROM!"
+msgstr "Impossibile caricare il CD-ROM!"
 
-#: ../win32/gui/ConfigurePlugins.c:486
-msgid "First Controller"
-msgstr "Primo controller"
+#: ../gui/GtkGui.c:564 ../gui/GtkGui.c:736
+msgid "The CD-ROM could not be loaded"
+msgstr "Impossibile caricare il CD-ROM"
 
-#: ../win32/gui/ConfigurePlugins.c:487
-msgid "Second Controller"
-msgstr "Secondo controller"
+#: ../gui/GtkGui.c:578
+msgid "Could not run BIOS"
+msgstr "Impossibile avviare il BIOS"
 
-#: ../win32/gui/ConfigurePlugins.c:488
-msgid "Sound"
-msgstr "Audio"
+#: ../gui/GtkGui.c:578
+msgid "Running BIOS is not supported with Internal HLE BIOS."
+msgstr "L'avvio del BIOS non è supportato con il BIOS HLE interno."
 
-#: ../win32/gui/ConfigurePlugins.c:489
-msgid "Cdrom"
-msgstr "Cdrom"
+#: ../gui/GtkGui.c:608
+msgid "Open PSX Disc Image File"
+msgstr "Apri il file immagine del disco PSX"
 
-#: ../win32/gui/ConfigurePlugins.c:490
-msgid "Bios"
-msgstr "Bios"
+#: ../gui/GtkGui.c:638
+#, fuzzy
+msgid "PSX Image Files (*.bin, *.img, *.mdf, *.iso, *.cue, *.pbp, *.cbn)"
+msgstr "File immagine PSX (*.bin, *.img, *.mdf, *.iso)"
 
-#: ../win32/gui/ConfigurePlugins.c:491
-msgid "Set Bios Directory"
-msgstr "Imposta la cartella del bios"
+#: ../gui/GtkGui.c:894
+#, c-format
+msgid "Loaded state %s."
+msgstr "È stato caricato lo stato %s."
 
-#: ../win32/gui/ConfigurePlugins.c:492
-msgid "Set Plugins Directory"
-msgstr "Imposta la cartella dei plugin"
+#: ../gui/GtkGui.c:897
+#, c-format
+msgid "Error loading state %s!"
+msgstr "Si è verificato un errore durante il caricamento dello stato %s!"
 
-#: ../win32/gui/ConfigurePlugins.c:493 ../win32/gui/ConfigurePlugins.c:496
-#: ../win32/gui/ConfigurePlugins.c:499 ../win32/gui/ConfigurePlugins.c:502
-#: ../win32/gui/ConfigurePlugins.c:505 ../win32/gui/ConfigurePlugins.c:617
-msgid "Configure..."
-msgstr "Configura..."
+#: ../gui/GtkGui.c:908
+#, c-format
+msgid "Saved state %s."
+msgstr "È stato salvato lo stato %s."
 
-#: ../win32/gui/ConfigurePlugins.c:494 ../win32/gui/ConfigurePlugins.c:497
-#: ../win32/gui/ConfigurePlugins.c:500 ../win32/gui/ConfigurePlugins.c:503
-#: ../win32/gui/ConfigurePlugins.c:506 ../win32/gui/ConfigurePlugins.c:618
-msgid "Test..."
-msgstr "Prova..."
+#: ../gui/GtkGui.c:910
+#, c-format
+msgid "Error saving state %s!"
+msgstr "Si è verificato un errore durante il salvataggio dello stato %s!"
 
-#: ../win32/gui/ConfigurePlugins.c:495 ../win32/gui/ConfigurePlugins.c:498
-#: ../win32/gui/ConfigurePlugins.c:501 ../win32/gui/ConfigurePlugins.c:504
-#: ../win32/gui/ConfigurePlugins.c:507 ../win32/gui/ConfigurePlugins.c:619
-msgid "About..."
-msgstr "Informazioni..."
+#: ../gui/GtkGui.c:945 ../gui/GtkGui.c:973
+msgid "Select State File"
+msgstr "Seleziona il file dello stato"
 
-#: ../win32/gui/ConfigurePlugins.c:612
-msgid "NetPlay Configuration"
-msgstr "Configurazione del NetPlay"
+#: ../gui/GtkGui.c:1016
+msgid "Notice"
+msgstr "Avviso"
 
-#: ../win32/gui/ConfigurePlugins.c:616 ../plugins/dfnet/gui.c:31
-#: ../plugins/dfnet/gui.c:112
-msgid "NetPlay"
-msgstr "NetPlay"
+#: ../gui/LnxMain.c:62
+#, c-format
+msgid "Creating memory card: %s\n"
+msgstr "Creazione in corso della memory card: %s\n"
 
-#: ../win32/gui/ConfigurePlugins.c:620
+#: ../gui/LnxMain.c:329
+#, fuzzy
 msgid ""
-"Note: The NetPlay Plugin Directory should be the same as the other Plugins."
+" pcsxr [options] [file]\n"
+"\toptions:\n"
+"\t-runcd\t\tRuns CD-ROM\n"
+"\t-cdfile FILE\tRuns a CD image file\n"
+"\t-nogui\t\tDon't open the GTK GUI\n"
+"\t-cfg FILE\tLoads desired configuration file (default: ~/.pcsxr/pcsxr.cfg)\n"
+"\t-psxout\t\tEnable PSX output\n"
+"\t-slowboot\tEnable BIOS Logo\n"
+"\t-load STATENUM\tLoads savestate STATENUM (1-9)\n"
+"\t-h -help\tDisplay this message\n"
+"\tfile\t\tLoads file\n"
 msgstr ""
-"Nota: la cartella del plugin NetPlay dovrebbe essere la stessa degli altri "
-"plugin."
-
-#: ../win32/gui/plugin.c:90 ../win32/gui/WndMain.c:281
-#, c-format
-msgid "*PCSX*: Saved State %d"
-msgstr "*PCSX*: è stato salvato lo stato %d"
+" pcsxr [opzioni] [file]\n"
+"\topzioni:\n"
+"\t-runcd\t\tAvvia il CD-ROM\n"
+"\t-cdfile FILE\tAvvia un immagine del CD\n"
+"\t-nogui\t\tNon apre la GUI GTK\n"
+"\t-cfg FILE\tCarica il file della configurazione desiderata (default: ~/."
+"pcsxr/pcsxr.cfg)\n"
+"\t-psxout\t\tAbilita l'output della PSX\n"
+"\t-load STATENUM\tCarica salvataggio (1-5)\n"
+"\t-h -help\tVisualizza questo messaggio\n"
+"\tfile\t\tCarica un file\n"
 
-#: ../win32/gui/plugin.c:91 ../win32/gui/WndMain.c:282
+#: ../gui/LnxMain.c:366
 #, c-format
-msgid "*PCSX*: Error Saving State %d"
+msgid ""
+"PCSXR cannot be configured without using the GUI -- you should restart "
+"without -nogui.\n"
 msgstr ""
-"*PCSX*: si è verificato un errore durante il salvataggio dello stato %d"
+"PCSXR non può essere configurato senza una GUI, dovresti riavviare senza "
+"l'opzione -nogui.\n"
 
-#: ../win32/gui/plugin.c:107 ../win32/gui/WndMain.c:259
-#, c-format
-msgid "*PCSX*: Loaded State %d"
-msgstr "*PCSX*: è stato caricato lo stato %d"
+#: ../gui/LnxMain.c:425
+msgid "Failed loading plugins!"
+msgstr "Il caricamento dei plugin non è andato a buon fine!"
 
-#: ../win32/gui/plugin.c:108 ../win32/gui/WndMain.c:260
+#: ../gui/LnxMain.c:444
 #, c-format
-msgid "*PCSX*: Error Loading State %d"
-msgstr ""
-"*PCSX*: si è verificato un errore durante il caricamento dello stato %d"
+msgid "Could not load CD-ROM!\n"
+msgstr "Impossibile caricare il CD-ROM!\n"
 
-#: ../win32/gui/plugin.c:119
+#: ../gui/LnxMain.c:485
 #, c-format
-msgid "*PCSX*: Sio Irq Always Enabled"
-msgstr "*PCSX*: sio irq è sempre abilitato"
+msgid "PSX emulator couldn't be initialized.\n"
+msgstr "Impossibile inizializzare l'emulatore PSX.\n"
 
-#: ../win32/gui/plugin.c:120
-#, c-format
-msgid "*PCSX*: Sio Irq Not Always Enabled"
-msgstr "*PCSX*: sio irq non è sempre abilitato"
+#: ../gui/MemcardDlg.c:56
+msgid "Icon"
+msgstr "Icona"
 
-#: ../win32/gui/plugin.c:127
-#, c-format
-msgid "*PCSX*: Black&White Mdecs Only Enabled"
-msgstr "*PCSX*: abilita solo i filmati in bianco e nero"
+#: ../gui/MemcardDlg.c:62 ../win32/gui/WndMain.c:778
+msgid "Title"
+msgstr "Titolo"
 
-#: ../win32/gui/plugin.c:128
-#, c-format
-msgid "*PCSX*: Black&White Mdecs Only Disabled"
-msgstr "*PCSX*: disabilita solo i filmati in bianco e nero"
+#: ../gui/MemcardDlg.c:68 ../win32/gui/WndMain.c:784
+msgid "Status"
+msgstr "Stato"
 
-#: ../win32/gui/plugin.c:135
-#, c-format
-msgid "*PCSX*: Xa Enabled"
-msgstr "*PCSX*: abilita Xa"
+#: ../gui/MemcardDlg.c:74
+msgid "ID"
+msgstr "ID"
 
-#: ../win32/gui/plugin.c:136
-#, c-format
-msgid "*PCSX*: Xa Disabled"
-msgstr "*PCSX*: disabilita Xa"
+#: ../gui/MemcardDlg.c:80
+msgid "Name"
+msgstr "Nome"
 
-#: ../win32/gui/plugin.c:145
-msgid "*PCSX*: CdRom Case Opened"
-msgstr "*PCSX*: il vano del CdRom è aperto"
+#: ../gui/MemcardDlg.c:118 ../win32/gui/WndMain.c:989
+msgid "Deleted"
+msgstr "Eliminato"
 
-#: ../win32/gui/plugin.c:150
-msgid "*PCSX*: CdRom Case Closed"
-msgstr "*PCSX*: il vano del CdRom è chiuso"
+#: ../gui/MemcardDlg.c:120 ../gui/MemcardDlg.c:129 ../win32/gui/WndMain.c:990
+#: ../win32/gui/WndMain.c:993
+msgid "Free"
+msgstr "Libero"
 
-#: ../win32/gui/plugin.c:177
-msgid "Connecting..."
-msgstr "Connessione in corso..."
+#: ../gui/MemcardDlg.c:123 ../win32/gui/WndMain.c:992
+msgid "Used"
+msgstr "Usato"
 
-#: ../win32/gui/plugin.c:179 ../win32/gui/plugin.c:186
-#, c-format
-msgid "Please wait while connecting... %c\n"
-msgstr "Attendere prego, connessione in corso... %c\n"
+#: ../gui/MemcardDlg.c:125
+msgid "Link"
+msgstr ""
 
-#: ../win32/gui/plugin.c:214
-msgid "Error Opening CDR Plugin"
-msgstr "Si è verificato un errore durante l'apertura del plugin del CD-ROM"
+#: ../gui/MemcardDlg.c:127
+msgid "End link"
+msgstr ""
 
-#: ../win32/gui/plugin.c:277
-#, c-format
-msgid "Error Opening GPU Plugin (%d)"
-msgstr "Si è verificato un errore durante l'apertura del plugin della GPU (%d)"
+#. Ask for name of memory card
+#: ../gui/MemcardDlg.c:305
+msgid "Select A File"
+msgstr "Seleziona un file"
 
-#: ../win32/gui/plugin.c:279
-#, c-format
-msgid "Error Opening SPU Plugin (%d)"
-msgstr "Si è verificato un errore durante l'apertura del plugin della SPU (%d)"
+#: ../gui/MemcardDlg.c:345
+msgid "Format this Memory Card?"
+msgstr "Formatto questa memory card?"
 
-#: ../win32/gui/plugin.c:282
-#, c-format
-msgid "Error Opening PAD1 Plugin (%d)"
-msgstr "Si è verificato un errore durante l'apertura del plugin del PAD1 (%d)"
+#: ../gui/MemcardDlg.c:347
+msgid ""
+"If you format the memory card, the card will be empty, and any existing data "
+"overwritten."
+msgstr ""
+"Se formatti la memory card, questa sarà svuotata e tutti i dati esistenti "
+"saranno sovrascritti."
 
-#: ../win32/gui/plugin.c:284
-#, c-format
-msgid "Error Opening PAD2 Plugin (%d)"
-msgstr "Si è verificato un errore durante l'apertura del plugin del PAD2 (%d)"
+#: ../gui/MemcardDlg.c:350
+msgid "Format card"
+msgstr "Formatta la memory card"
 
-#: ../win32/gui/plugin.c:314
-msgid "Error Closing CDR Plugin"
-msgstr "Si è verificato un errore durante la chiusura del plugin del CD-ROM"
+#. Ask for name of new memory card
+#: ../gui/MemcardDlg.c:372
+msgid "Create a new Memory Card"
+msgstr "Crea una nuova memory card"
 
-#: ../win32/gui/plugin.c:316
-msgid "Error Closing GPU Plugin"
-msgstr "Si è verificato un errore durante la chiusura del plugin della GPU"
+#: ../gui/MemcardDlg.c:381
+msgid "New Memory Card.mcd"
+msgstr "Nuova memory card.mcd"
 
-#: ../win32/gui/plugin.c:318
-msgid "Error Closing SPU Plugin"
-msgstr "Si è verificato un errore durante la chiusura del plugin della SPU"
+#. No free slots available on the destination card
+#: ../gui/MemcardDlg.c:511
+msgid "No free space on memory card"
+msgstr "Non c'è spazio libero sulla memory card"
 
-#: ../win32/gui/plugin.c:336
-#, c-format
-msgid "CDRinit error: %d"
-msgstr "CDRinit errore: %d"
+#: ../gui/MemcardDlg.c:512
+msgid ""
+"There are no free slots available on the target memory card. Please delete a "
+"slot first."
+msgstr ""
+"Non vi sono slot liberi disponibili nella memory card. Elimina almeno uno "
+"slot."
 
-#: ../win32/gui/plugin.c:338
-#, c-format
-msgid "GPUinit error: %d"
-msgstr "GPUinit errore: %d"
+#: ../gui/MemcardDlg.c:671
+msgid "Memory Card Manager"
+msgstr "Gestore della memory card"
 
-#: ../win32/gui/plugin.c:340
+#: ../gui/Plugin.c:240
 #, c-format
-msgid "SPUinit error: %d"
-msgstr "SPUinit errore: %d"
+msgid "SIO IRQ Not Always Enabled"
+msgstr "SIO IRQ non sempre abilitato"
 
-#: ../win32/gui/plugin.c:342
+#: ../gui/Plugin.c:246
 #, c-format
-msgid "PAD1init error: %d"
-msgstr "PAD1init errore: %d"
+msgid "Black & White Mdecs Only Enabled"
+msgstr "Abilita solo i filmati in bianco e nero"
 
-#: ../win32/gui/plugin.c:344
+#: ../gui/Plugin.c:247
 #, c-format
-msgid "PAD2init error: %d"
-msgstr "PAD2init errore: %d"
+msgid "Black & White Mdecs Only Disabled"
+msgstr "Disabilita solo i filmati in bianco e nero"
 
-#: ../win32/gui/plugin.c:347
+#: ../gui/Plugin.c:253
 #, c-format
-msgid "NETinit error: %d"
-msgstr "NETinit errore: %d"
-
-#: ../win32/gui/WndMain.c:76
-msgid "Arabic"
-msgstr "Arabo"
-
-#: ../win32/gui/WndMain.c:77
-msgid "Catalan"
-msgstr "Catalano"
-
-#: ../win32/gui/WndMain.c:78
-msgid "German"
-msgstr "Tedesco"
-
-#: ../win32/gui/WndMain.c:79
-msgid "Greek"
-msgstr "Greco"
+msgid "XA Enabled"
+msgstr "XA abilitato"
 
-#: ../win32/gui/WndMain.c:80 ../win32/gui/WndMain.c:1566
-#: ../win32/gui/WndMain.c:1568
-msgid "English"
-msgstr "Inglese"
+#: ../gui/Plugin.c:254
+#, c-format
+msgid "XA Disabled"
+msgstr "XA disabilitato"
 
-#: ../win32/gui/WndMain.c:81
-msgid "Spanish"
-msgstr "Spagnolo"
+#: ../gui/Plugin.c:326
+msgid "Error opening CD-ROM plugin!"
+msgstr "Si è verificato un errore durante l'apertura del plugin del CD-ROM!"
 
-#: ../win32/gui/WndMain.c:82
-msgid "French"
-msgstr "Francese"
+#: ../gui/Plugin.c:328
+msgid "Error opening SPU plugin!"
+msgstr "Si è verificato un errore durante l'apertura del plugin della SPU!"
 
-#: ../win32/gui/WndMain.c:83
-msgid "Italian"
-msgstr "Italiano"
+#: ../gui/Plugin.c:331
+msgid "Error opening GPU plugin!"
+msgstr "Si è verificato un errore durante l'apertura del plugin della GPU!"
 
-#: ../win32/gui/WndMain.c:84
-msgid "Portuguese"
-msgstr "Portoghese"
+#: ../gui/Plugin.c:333
+msgid "Error opening Controller 1 plugin!"
+msgstr ""
+"Si è verificato un errore durante l'apertura del plugin del controller 1!"
 
-#: ../win32/gui/WndMain.c:85
-msgid "Portuguese (Brazilian)"
-msgstr "Portoghese (Brasiliano)"
+#: ../gui/Plugin.c:337
+msgid "Error opening Controller 2 plugin!"
+msgstr ""
+"Si è verificato un errore durante l'apertura del plugin del controller 2!"
 
-#: ../win32/gui/WndMain.c:86
-msgid "Romanian"
-msgstr "Rumeno"
+#: ../gui/Plugin.c:342
+#, fuzzy
+msgid "Error opening SIO1 plugin!"
+msgstr "Si è verificato un errore durante l'apertura del plugin della SPU!"
 
-#: ../win32/gui/WndMain.c:87
-msgid "Russian"
-msgstr "Russo"
+#: ../gui/Plugin.c:424
+msgid "Error closing CD-ROM plugin!"
+msgstr "Si è verificato un errore durante la chiusura del plugin del CD-ROM!"
 
-#: ../win32/gui/WndMain.c:88
-msgid "Simplified Chinese"
-msgstr "Cinese semplificato"
+#: ../gui/Plugin.c:426
+msgid "Error closing SPU plugin!"
+msgstr "Si è verificato un errore durante la chiusura del plugin della SPU!"
 
-#: ../win32/gui/WndMain.c:89
-msgid "Traditional Chinese"
-msgstr "Cinese tradizionale"
+#: ../gui/Plugin.c:428
+msgid "Error closing Controller 1 Plugin!"
+msgstr ""
+"Si è verificato un errore durante la chiusura del plugin del controller 1!"
 
-#: ../win32/gui/WndMain.c:90
-msgid "Japanese"
-msgstr "Giapponese"
+#: ../gui/Plugin.c:430
+msgid "Error closing Controller 2 plugin!"
+msgstr ""
+"Si è verificato un errore durante la chiusura del plugin del controller 2!"
 
-#: ../win32/gui/WndMain.c:91
-msgid "Korean"
-msgstr "Coreano"
+#: ../gui/Plugin.c:432
+msgid "Error closing GPU plugin!"
+msgstr "Si è verificato un errore durante la chiusura del plugin della GPU!"
 
-#: ../win32/gui/WndMain.c:300 ../win32/gui/WndMain.c:352
-msgid "PCSX State Format"
-msgstr "Formato dei salvataggi di PCSX"
+#: ../gui/Plugin.c:435
+#, fuzzy
+msgid "Error closing SIO1 plugin!"
+msgstr "Si è verificato un errore durante la chiusura del plugin della SPU!"
 
-#: ../win32/gui/WndMain.c:327
-#, c-format
-msgid "*PCSX*: Loaded State %s"
-msgstr "*PCSX*: è stato caricato lo stato %s"
+#: ../libpcsxcore/cdriso.c:423
+#, fuzzy, c-format
+msgid ""
+"\n"
+"could not open: %s\n"
+msgstr "Impossibile aprire la cartella: '%s'\n"
 
-#: ../win32/gui/WndMain.c:328
+#: ../libpcsxcore/cdriso.c:1043
 #, c-format
-msgid "*PCSX*: Error Loading State %s"
+msgid "Track %.2d (%s) - Start %.2d:%.2d:%.2d, Length %.2d:%.2d:%.2d\n"
 msgstr ""
-"*PCSX*: si è verificato un errore durante il caricamento dello stato %s"
 
-#: ../win32/gui/WndMain.c:379
+#: ../libpcsxcore/cdriso.c:1064
 #, c-format
-msgid "*PCSX*: Saved State %s"
-msgstr "*PCSX*: è stato salvato lo stato %s"
+msgid "Loaded CD Image: %s"
+msgstr "È stata caricata l'immagine del CD: %s"
 
-#: ../win32/gui/WndMain.c:380
+#: ../libpcsxcore/cheat.c:147
 #, c-format
-msgid "*PCSX*: Error Saving State %s"
-msgstr ""
-"*PCSX*: si è verificato un errore durante il salvataggio dello stato %s"
+msgid "Cheats loaded from: %s\n"
+msgstr "Cheat caricati da: %s\n"
 
-#: ../win32/gui/WndMain.c:429 ../win32/gui/WndMain.c:478 ../gui/Gtk2Gui.c:485
-#: ../gui/Gtk2Gui.c:610
-msgid "The CD does not appear to be a valid Playstation CD"
-msgstr "Il CD inserito non sembra essere un valido CD della Playstation"
+#: ../libpcsxcore/cheat.c:179
+#, c-format
+msgid "Cheats saved to: %s\n"
+msgstr "Cheat salvati in: %s\n"
 
-#: ../win32/gui/WndMain.c:435 ../win32/gui/WndMain.c:484 ../gui/Gtk2Gui.c:493
-#: ../gui/Gtk2Gui.c:618
-msgid "Could not load CD-ROM!"
-msgstr "Impossibile caricare il CD-ROM!"
+#: ../libpcsxcore/cheat.c:322 ../libpcsxcore/cheat.c:443
+msgid "(Untitled)"
+msgstr "(Senza titolo)"
 
-#: ../win32/gui/WndMain.c:445
-msgid "Running BIOS is not supported with Internal HLE Bios."
-msgstr "L'avvio del BIOS non è supportato dal bios interno HLE."
+#: ../libpcsxcore/debug.c:321
+msgid "Error allocating memory"
+msgstr "Si è verificato un errore durante l'allocazione della memoria"
 
-#: ../win32/gui/WndMain.c:664 ../gui/MemcardDlg.c:62
-msgid "Title"
-msgstr "Titolo"
+#: ../libpcsxcore/debug.c:326
+msgid "Unable to start debug server.\n"
+msgstr "Impossibile avviare il server del debug.\n"
 
-#: ../win32/gui/WndMain.c:670 ../gui/MemcardDlg.c:68
-msgid "Status"
-msgstr "Stato"
+#: ../libpcsxcore/debug.c:330
+msgid "Debugger started.\n"
+msgstr "Il debugger è stato avviato.\n"
 
-#: ../win32/gui/WndMain.c:676
-msgid "Game ID"
-msgstr "ID del gioco"
+#: ../libpcsxcore/debug.c:337
+msgid "Debugger stopped.\n"
+msgstr "Il debugger è stato fermato.\n"
 
-#: ../win32/gui/WndMain.c:682
-msgid "Game"
-msgstr "Gioco"
+#: ../libpcsxcore/misc.c:350
+#, c-format
+msgid "CD-ROM Label: %.32s\n"
+msgstr ""
 
-#: ../win32/gui/WndMain.c:864
-msgid "mid link block"
-msgstr "mid link block"
+#: ../libpcsxcore/misc.c:351
+#, c-format
+msgid "CD-ROM ID: %.9s\n"
+msgstr ""
 
-#: ../win32/gui/WndMain.c:867
-msgid "terminiting link block"
-msgstr "terminiting link block"
+#: ../libpcsxcore/misc.c:415
+#, c-format
+msgid "Error opening file: %s.\n"
+msgstr "Si è verificato un errore durante l'apertura del file: %s.\n"
 
-#: ../win32/gui/WndMain.c:875 ../gui/MemcardDlg.c:155 ../gui/MemcardDlg.c:260
-msgid "Deleted"
-msgstr "Eliminato"
+#: ../libpcsxcore/misc.c:458
+#, c-format
+msgid "Unknown CPE opcode %02x at position %08x.\n"
+msgstr "Opcode CPE sconosciuto %02x alla posizione %08x.\n"
 
-#: ../win32/gui/WndMain.c:876 ../win32/gui/WndMain.c:879
-#: ../gui/MemcardDlg.c:157 ../gui/MemcardDlg.c:161 ../gui/MemcardDlg.c:262
-#: ../gui/MemcardDlg.c:266
-msgid "Free"
-msgstr "Libero"
+#: ../libpcsxcore/misc.c:486
+msgid "This file does not appear to be a valid PSX file.\n"
+msgstr "Questo file non sembra essere un file valido di PSX.\n"
 
-#: ../win32/gui/WndMain.c:878 ../gui/MemcardDlg.c:159 ../gui/MemcardDlg.c:264
-msgid "Used"
-msgstr "Usato"
+#: ../libpcsxcore/plugins.c:190
+#, c-format
+msgid "Error loading %s: %s"
+msgstr "Si è verificato un errore durante il caricamento di %s: %s"
 
-#: ../win32/gui/WndMain.c:972
-msgid "Memcard Manager"
-msgstr "Gestore della memory card"
+#: ../libpcsxcore/plugins.c:234
+#, fuzzy, c-format
+msgid ""
+"Could not load GPU plugin %s!\n"
+"%s"
+msgstr "Impossibile caricare il plugin %s della GPU!"
 
-#: ../win32/gui/WndMain.c:976 ../win32/gui/WndMain.c:979
-msgid "Select Mcd"
-msgstr "Seleziona la memory card"
+#: ../libpcsxcore/plugins.c:310
+#, fuzzy, c-format
+msgid ""
+"Could not load CD-ROM plugin %s!\n"
+"%s"
+msgstr "Impossibile caricare il plugin %s del CD-ROM!"
 
-#: ../win32/gui/WndMain.c:977 ../win32/gui/WndMain.c:980
-msgid "Format Mcd"
-msgstr "Formatta la memory card"
+#: ../libpcsxcore/plugins.c:359
+#, fuzzy, c-format
+msgid ""
+"Could not load SPU plugin %s!\n"
+"%s"
+msgstr "Impossibile caricare il plugin %s della SPU!"
 
-#: ../win32/gui/WndMain.c:978 ../win32/gui/WndMain.c:981
-msgid "Reload Mcd"
-msgstr "Ricarica la memory card"
+#: ../libpcsxcore/plugins.c:499
+#, fuzzy, c-format
+msgid ""
+"Could not load Controller 1 plugin %s!\n"
+"%s"
+msgstr "Impossibile caricare il plugin %s del controller 1!"
 
-#: ../win32/gui/WndMain.c:982
-msgid "-> Copy ->"
-msgstr "-> Copia ->"
+#: ../libpcsxcore/plugins.c:558
+#, fuzzy, c-format
+msgid ""
+"Could not load Controller 2 plugin %s!\n"
+"%s"
+msgstr "Impossibile caricare il plugin %s del controller 2!"
 
-#: ../win32/gui/WndMain.c:983
-msgid "<- Copy <-"
-msgstr "<- Copia <-"
+#: ../libpcsxcore/plugins.c:604
+#, fuzzy, c-format
+msgid ""
+"Could not load NetPlay plugin %s!\n"
+"%s"
+msgstr "Impossibile caricare il plugin %s di NetPlay!"
 
-#: ../win32/gui/WndMain.c:984
-msgid "Paste"
-msgstr "Incolla"
+#: ../libpcsxcore/plugins.c:682
+#, fuzzy, c-format
+msgid ""
+"Could not load SIO1 plugin %s!\n"
+"%s"
+msgstr "Impossibile caricare il plugin %s della SIO1!"
 
-#: ../win32/gui/WndMain.c:985
-msgid "<- Un/Delete"
-msgstr "<- Non/Elimina"
+#: ../libpcsxcore/plugins.c:770
+#, c-format
+msgid "Error initializing CD-ROM plugin: %d"
+msgstr ""
+"Si è verificato un errore durante l'inizializzazione del plugin del CD-ROM: "
+"%d"
 
-#: ../win32/gui/WndMain.c:986
-msgid "Un/Delete ->"
-msgstr "Non/Elimina ->"
+#: ../libpcsxcore/plugins.c:772
+#, c-format
+msgid "Error initializing GPU plugin: %d"
+msgstr ""
+"Si è verificato un errore durante l'inizializzazione del plugin della GPU: %d"
 
-#: ../win32/gui/WndMain.c:988
-msgid "Memory Card 1"
-msgstr "Memory card 1"
+#: ../libpcsxcore/plugins.c:774
+#, c-format
+msgid "Error initializing SPU plugin: %d"
+msgstr ""
+"Si è verificato un errore durante l'inizializzazione del plugin della SPU: %d"
 
-#: ../win32/gui/WndMain.c:989
-msgid "Memory Card 2"
-msgstr "Memory card 2"
+#: ../libpcsxcore/plugins.c:776
+#, c-format
+msgid "Error initializing Controller 1 plugin: %d"
+msgstr ""
+"Si è verificato un errore durante l'inizializzazione del plugin del "
+"controller 1: %d"
 
-#: ../win32/gui/WndMain.c:1044
-msgid "Are you sure you want to paste this selection?"
-msgstr "Sei sicuro di voler incollare questa selezione?"
+#: ../libpcsxcore/plugins.c:778
+#, c-format
+msgid "Error initializing Controller 2 plugin: %d"
+msgstr ""
+"Si è verificato un errore durante l'inizializzazione del plugin del "
+"controller 2: %d"
 
-#: ../win32/gui/WndMain.c:1044 ../win32/gui/WndMain.c:1155
-#: ../win32/gui/WndMain.c:1162
-msgid "Confirmation"
-msgstr "Conferma"
+#: ../libpcsxcore/plugins.c:782
+#, c-format
+msgid "Error initializing NetPlay plugin: %d"
+msgstr ""
+"Si è verificato un errore durante l'inizializzazione del plugin di NetPlay: "
+"%d"
 
-#: ../win32/gui/WndMain.c:1155 ../win32/gui/WndMain.c:1162
-msgid "Are you sure you want to format this Memory Card?"
-msgstr "Sei sicuro di voler formattare questa memory card?"
+#: ../libpcsxcore/plugins.c:787
+#, c-format
+msgid "Error initializing SIO1 plugin: %d"
+msgstr ""
+"Si è verificato un errore durante l'inizializzazione del plugin della SIO1: "
+"%d"
 
-#: ../win32/gui/WndMain.c:1208
-msgid "Cpu Config"
-msgstr "Configurazione della Cpu"
+#: ../libpcsxcore/plugins.c:790
+msgid "Plugins loaded.\n"
+msgstr "Plugin caricati.\n"
 
-#: ../win32/gui/WndMain.c:1213
-msgid "Disable Xa Decoding"
-msgstr "Disabilita il decoding Xa"
+#: ../libpcsxcore/ppf.c:219
+#, c-format
+msgid "Invalid PPF patch: %s.\n"
+msgstr "Patch PPF non valida: %s.\n"
 
-#: ../win32/gui/WndMain.c:1214
-msgid "Sio Irq Always Enabled"
-msgstr "Sio irq sempre abilitato"
+#: ../libpcsxcore/ppf.c:295
+#, c-format
+msgid "Unsupported PPF version (%d).\n"
+msgstr "Versione PPF non supportata (%d).\n"
 
-#: ../win32/gui/WndMain.c:1215
-msgid "Black && White Movies"
-msgstr "Filmati in bianco e nero"
+#. build address array
+#: ../libpcsxcore/ppf.c:334
+#, c-format
+msgid "Loaded PPF %d.0 patch: %s.\n"
+msgstr "Caricata la patch PPF %d.0: %s.\n"
 
-#: ../win32/gui/WndMain.c:1216
-msgid "Disable Cd audio"
-msgstr "Disabilita cd audio"
+#: ../libpcsxcore/ppf.c:384
+#, fuzzy, c-format
+msgid "Loaded SBI file: %s.\n"
+msgstr "È stata caricata l'immagine del CD: %s"
 
-#: ../win32/gui/WndMain.c:1217 ../data/pcsx.glade2:1595
-msgid "Autodetect"
-msgstr "Rileva automaticamente"
+#: ../libpcsxcore/psxmem.c:78
+msgid "Error allocating memory!"
+msgstr "Si è verificato un errore durante l'allocazione della memoria!"
 
-#: ../win32/gui/WndMain.c:1218
-msgid "Enable Interpreter Cpu"
-msgstr "Abilita l'interprete della cpu"
+#: ../libpcsxcore/psxmem.c:121
+#, c-format
+msgid "Could not open BIOS:\"%s\". Enabling HLE Bios!\n"
+msgstr "Impossibile aprire il BIOS:\"%s\". Sto abilitando il bios HLE!\n"
 
-#: ../win32/gui/WndMain.c:1219 ../data/pcsx.glade2:1451
-msgid "Enable Console Output"
-msgstr "Abilita l'output sulla console"
+#: ../libpcsxcore/r3000a.c:34
+#, c-format
+msgid "Running PCSXR Version %s (%s).\n"
+msgstr "Avvio in corso di PCSXR versione %s (%s).\n"
 
-#: ../win32/gui/WndMain.c:1220 ../data/pcsx.glade2:1401
-msgid "Enable Debugger"
-msgstr "Abilita il debugger"
+#: ../libpcsxcore/sio.c:843
+msgid "Connection closed!\n"
+msgstr "Connessione chiusa!\n"
 
-#: ../win32/gui/WndMain.c:1221
-msgid "Spu Irq Always Enabled"
-msgstr "Spu irq sempre abilitato"
+#: ../libpcsxcore/sio.c:876
+#, c-format
+msgid "No memory card value was specified - creating a default card %s\n"
+msgstr ""
+"Nessun valore specificato per la memory card, sto creando una card di "
+"default %s\n"
 
-#: ../win32/gui/WndMain.c:1222 ../data/pcsx.glade2:1538
-msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
-msgstr "Parasite Eve 2, Vandal Hearts 1/2 Fix"
+#: ../libpcsxcore/sio.c:880
+#, c-format
+msgid "The memory card %s doesn't exist - creating it\n"
+msgstr "La memory card %s non esiste, la sto creando\n"
 
-#: ../win32/gui/WndMain.c:1223 ../data/pcsx.glade2:1553
-msgid "InuYasha Sengoku Battle Fix"
-msgstr "InuYasha Sengoku Battle Fix"
+#: ../libpcsxcore/sio.c:896
+#, c-format
+msgid "Memory card %s failed to load!\n"
+msgstr "Impossibile caricare la memory card %s!\n"
 
-#: ../win32/gui/WndMain.c:1225
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:277
-#: ../plugins/dfinput/dfinput.glade2:448
-msgid "Options"
-msgstr "Opzioni"
+#: ../libpcsxcore/sio.c:900
+#, c-format
+msgid "Loading memory card %s\n"
+msgstr "Sto caricando la memory card %s\n"
 
-#: ../win32/gui/WndMain.c:1226
-msgid "Psx System Type"
-msgstr "Regione del sistema"
+#: ../plugins/dfcdrom/cdr.c:25
+msgid "CD-ROM Drive Reader"
+msgstr "Lettore del dispositivo CD-ROM"
 
-#: ../win32/gui/WndMain.c:1330
-msgid "Psx Mcd Format (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
+#: ../plugins/dfcdrom/cdr.c:27
+msgid "CDR NULL Plugin"
+msgstr "Plugin NULL CDR"
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:1
+#: ../plugins/dfcdrom/cdrcfg-0.1df/main.c:217
+msgid "CDR configuration"
+msgstr "Configurazione del CD-ROM"
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:2
+msgid "Choose your CD-ROM device or type its path if it's not listed"
 msgstr ""
-"Formato memory card della psx (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
+"Scegli il tuo dispositivo CD-ROM o digita il suo path se non è elencato"
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:3
+msgid "Select read mode:"
+msgstr "Seleziona la modalità di lettura:"
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:4
+msgid "Cache Size (Def. 64):"
+msgstr "Dimensione della cache (def. 64)"
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:5
+msgid "Spindown Time:"
+msgstr "Tempo di spindown:"
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:6
+msgid "Cdrom Speed (Def. 0 = MAX):"
+msgstr "Velocità del cdrom (def. 0 = MAX):"
 
-#: ../win32/gui/WndMain.c:1335
-msgid "Psx Memory Card (*.mcr;*.mc)"
-msgstr "Memory card psx (*.mcr;*.mc)"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:7
+msgid "Enable subchannel read"
+msgstr "Abilita la lettura del subchannel"
 
-#: ../win32/gui/WndMain.c:1340
-msgid "CVGS Memory Card (*.mem;*.vgs)"
-msgstr "Memory card CVSG (*.mem;*.vgs)"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:8
+msgid "Normal (No Cache)"
+msgstr ""
 
-#: ../win32/gui/WndMain.c:1345
-msgid "Bleem Memory Card (*.mcd)"
-msgstr "Memory card bleem (*.mcd)"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:9
+#, fuzzy
+msgid "Threaded - Faster (With Cache)"
+msgstr ""
+"Normale (senza cache)\n"
+"Threaded, veloce (con la cache)"
 
-#: ../win32/gui/WndMain.c:1350
-msgid "DexDrive Memory Card (*.gme)"
-msgstr "Memory card DexDrive (*.gme)"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:10
+msgid "Default"
+msgstr ""
 
-#: ../win32/gui/WndMain.c:1355
-msgid "DataDeck Memory Card (*.ddf)"
-msgstr "Memory card DataDeck (*.ddf)"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:11
+msgid "125ms"
+msgstr ""
 
-#: ../win32/gui/WndMain.c:1360 ../win32/gui/WndMain.c:1441 ../gui/Cheat.c:321
-#: ../gui/Gtk2Gui.c:422 ../gui/Gtk2Gui.c:561
-msgid "All Files"
-msgstr "Tutti i file"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:12
+msgid "250ms"
+msgstr ""
 
-#: ../win32/gui/WndMain.c:1399
-msgid "Psx Exe Format"
-msgstr "Formato exe della Psx"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:13
+msgid "500ms"
+msgstr ""
 
-#: ../win32/gui/WndMain.c:1436
-msgid "Psx Isos (*.iso;*.mdf;*.img;*.bin)"
-msgstr "ISO della psx (*.iso;*.mdf;*.img;*.bin)"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:14
+msgid "1s"
+msgstr ""
 
-#: ../win32/gui/WndMain.c:1512
-msgid "&File"
-msgstr "&File"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:15
+msgid "2s"
+msgstr ""
 
-#: ../win32/gui/WndMain.c:1513
-msgid "E&xit"
-msgstr "E&sci"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:16
+msgid "4s"
+msgstr ""
 
-#: ../win32/gui/WndMain.c:1515
-msgid "Run &EXE..."
-msgstr "Avvia &EXE..."
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:17
+msgid "8s"
+msgstr ""
 
-#: ../win32/gui/WndMain.c:1516
-msgid "Run &BIOS"
-msgstr "Avvia &BIOS"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:18
+msgid "16s"
+msgstr ""
 
-#: ../win32/gui/WndMain.c:1517
-msgid "Run &ISO..."
-msgstr "Avvia &ISO..."
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:19
+msgid "32s"
+msgstr ""
 
-#: ../win32/gui/WndMain.c:1518
-msgid "Run &CD"
-msgstr "Avvia &CD"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:20
+msgid "1min"
+msgstr ""
 
-#: ../win32/gui/WndMain.c:1520
-msgid "&Emulator"
-msgstr "&Emulatore"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:21
+msgid "2min"
+msgstr ""
 
-#: ../win32/gui/WndMain.c:1521
-msgid "&States"
-msgstr "&Stati"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:22
+msgid "4min"
+msgstr ""
 
-#: ../win32/gui/WndMain.c:1523
-msgid "S&witch ISO..."
-msgstr "C&ambia ISO..."
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:23
+msgid "8min"
+msgstr ""
 
-#: ../win32/gui/WndMain.c:1525
-msgid "Re&set"
-msgstr "Re&setta"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:24
+msgid "16min"
+msgstr ""
 
-#: ../win32/gui/WndMain.c:1526
-msgid "&Run"
-msgstr "&Avvia"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:25
+msgid "32min"
+msgstr ""
 
-#: ../win32/gui/WndMain.c:1527
-msgid "&Save"
-msgstr "&Salva"
+#: ../plugins/dfinput/cfg-gtk.c:49
+msgid "D-Pad Up"
+msgstr "D-Pad Su"
 
-#: ../win32/gui/WndMain.c:1528
-msgid "&Load"
-msgstr "&Carica"
+#: ../plugins/dfinput/cfg-gtk.c:50
+msgid "D-Pad Down"
+msgstr "D-Pad Giù"
 
-#: ../win32/gui/WndMain.c:1529 ../win32/gui/WndMain.c:1535
-msgid "&Other..."
-msgstr "&Altro..."
+#: ../plugins/dfinput/cfg-gtk.c:51
+msgid "D-Pad Left"
+msgstr "D-Pad Sinistra"
 
-#: ../win32/gui/WndMain.c:1530 ../win32/gui/WndMain.c:1536
-msgid "Slot &5"
-msgstr "Slot &5"
+#: ../plugins/dfinput/cfg-gtk.c:52
+msgid "D-Pad Right"
+msgstr "D-Pad Destra"
 
-#: ../win32/gui/WndMain.c:1531 ../win32/gui/WndMain.c:1537
-msgid "Slot &4"
-msgstr "Slot &4"
+#: ../plugins/dfinput/cfg-gtk.c:53
+msgid "Cross"
+msgstr "Croce"
 
-#: ../win32/gui/WndMain.c:1532 ../win32/gui/WndMain.c:1538
-msgid "Slot &3"
-msgstr "Slot &3"
+#: ../plugins/dfinput/cfg-gtk.c:54
+msgid "Circle"
+msgstr "Cerchio"
 
-#: ../win32/gui/WndMain.c:1533 ../win32/gui/WndMain.c:1539
-msgid "Slot &2"
-msgstr "Slot &2"
+#: ../plugins/dfinput/cfg-gtk.c:55
+msgid "Square"
+msgstr "Quadrato"
 
-#: ../win32/gui/WndMain.c:1534 ../win32/gui/WndMain.c:1540
-msgid "Slot &1"
-msgstr "Slot &1"
+#: ../plugins/dfinput/cfg-gtk.c:56
+msgid "Triangle"
+msgstr "Triangolo"
 
-#: ../win32/gui/WndMain.c:1542
-msgid "&Configuration"
-msgstr "&Configurazione"
+#: ../plugins/dfinput/cfg-gtk.c:57
+msgid "L1"
+msgstr "L1"
 
-#: ../win32/gui/WndMain.c:1543
-msgid "Cheat &Search..."
-msgstr "Cerca &cheat..."
+#: ../plugins/dfinput/cfg-gtk.c:58
+msgid "R1"
+msgstr "R1"
 
-#: ../win32/gui/WndMain.c:1544
-msgid "Ch&eat Code..."
-msgstr "Codice ch&eat..."
+#: ../plugins/dfinput/cfg-gtk.c:59
+msgid "L2"
+msgstr "L2"
 
-#: ../win32/gui/WndMain.c:1547
-msgid "&Language"
-msgstr "&Lingua"
+#: ../plugins/dfinput/cfg-gtk.c:60
+msgid "R2"
+msgstr "R2"
 
-#: ../win32/gui/WndMain.c:1572
-msgid "&Memory cards..."
-msgstr "&Memory card..."
+#: ../plugins/dfinput/cfg-gtk.c:61
+msgid "Select"
+msgstr "Tasto Select"
 
-#: ../win32/gui/WndMain.c:1573
-msgid "C&PU..."
-msgstr "C&PU..."
+#: ../plugins/dfinput/cfg-gtk.c:62
+msgid "Start"
+msgstr "Tasto Start"
 
-#: ../win32/gui/WndMain.c:1575
-msgid "&NetPlay..."
-msgstr "&NetPlay..."
+#: ../plugins/dfinput/cfg-gtk.c:63
+msgid "L3"
+msgstr "L3"
 
-#: ../win32/gui/WndMain.c:1577
-msgid "&Controllers..."
-msgstr "&Controller..."
+#: ../plugins/dfinput/cfg-gtk.c:64
+msgid "R3"
+msgstr "R3"
 
-#: ../win32/gui/WndMain.c:1578
-msgid "CD-&ROM..."
-msgstr "CD-&ROM..."
+#: ../plugins/dfinput/cfg-gtk.c:65
+#, fuzzy
+msgid "Analog"
+msgstr ""
+"Pad digitale\n"
+"Pad analogico"
 
-#: ../win32/gui/WndMain.c:1579
-msgid "&Sound..."
-msgstr "&Audio..."
+#: ../plugins/dfinput/cfg-gtk.c:69
+msgid "L-Stick Right"
+msgstr "L-Stick Destra"
 
-#: ../win32/gui/WndMain.c:1580
-msgid "&Graphics..."
-msgstr "&Video..."
+#: ../plugins/dfinput/cfg-gtk.c:70
+msgid "L-Stick Left"
+msgstr "L-Stick Sinistra"
 
-#: ../win32/gui/WndMain.c:1582
-msgid "&Plugins && Bios..."
-msgstr "&Plugin e Bios..."
+#: ../plugins/dfinput/cfg-gtk.c:71
+msgid "L-Stick Down"
+msgstr "L-Stick Giù"
 
-#: ../win32/gui/WndMain.c:1584
-msgid "&Help"
-msgstr "&Aiuto"
+#: ../plugins/dfinput/cfg-gtk.c:72
+msgid "L-Stick Up"
+msgstr "L-Stick Su"
 
-#: ../win32/gui/WndMain.c:1585
-msgid "&About..."
-msgstr "&Informazioni..."
+#: ../plugins/dfinput/cfg-gtk.c:73
+msgid "R-Stick Right"
+msgstr "R-Stick Destra"
 
-#: ../win32/gui/WndMain.c:1764
-msgid "Pcsx Msg"
-msgstr "Messaggio di pcsx"
+#: ../plugins/dfinput/cfg-gtk.c:74
+msgid "R-Stick Left"
+msgstr "R-Stick Sinistra"
 
-#: ../win32/gui/WndMain.c:1767
-msgid "Error Loading Symbol"
-msgstr "Si è verificato un errore durante il caricamento del simbolo"
+#: ../plugins/dfinput/cfg-gtk.c:75
+msgid "R-Stick Down"
+msgstr "R-Stick Giù"
 
-#: ../gui/AboutDlg.c:74
-msgid ""
-"(C) 1999-2003 PCSX Team\n"
-"(C) 2005-2009 PCSX-df Team\n"
-"(C) 2009-2010 PCSX-Reloaded Team"
-msgstr ""
+#: ../plugins/dfinput/cfg-gtk.c:76
+msgid "R-Stick Up"
+msgstr "R-Stick Su"
 
-#: ../gui/AboutDlg.c:79
-#, fuzzy
-msgid ""
-"This program is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"this program; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA."
-msgstr ""
-"This program is free software; you can redistribute it\n"
-"and/or modify it under the terms of the GNU General\n"
-"Public License as published by the Free Software\n"
-"Foundation; either version 2 of the License, or (at your\n"
-"option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be\n"
-"useful, but WITHOUT ANY WARRANTY; without even\n"
-"the implied warranty of MERCHANTABILITY or\n"
-"FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General\n"
-"Public License along with this program; if not, write to\n"
-"the Free Software Foundation, Inc."
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
+msgid "Centered"
+msgstr "Centrato"
 
-#: ../gui/AboutDlg.c:102
-msgid "translator-credits"
-msgstr ""
-"Traduzione italiana a cura di Giovanni Scafora <giovanni@archlinux.org>"
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
+msgid "Up"
+msgstr "Su"
 
-#: ../gui/AboutDlg.c:103
-msgid "A PlayStation emulator."
-msgstr "Un emulatore della PlayStation."
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
+msgid "Right"
+msgstr "Destra"
 
-#: ../gui/Cheat.c:117 ../gui/Cheat.c:202
-msgid "Cheat Description:"
-msgstr "Descrizione del cheat:"
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
+msgid "Rightup"
+msgstr "In alto a destra"
 
-#: ../gui/Cheat.c:306
-msgid "Open Cheat File"
-msgstr "Apri il file del cheat"
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
+msgid "Down"
+msgstr "Giù"
 
-#: ../gui/Cheat.c:316 ../gui/Cheat.c:356
-msgid "PCSX Cheat Code Files (*.cht)"
-msgstr "File cheat di PCSX (*.cht)"
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
+msgid "Rightdown"
+msgstr "In basso a destra"
 
-#: ../gui/Cheat.c:346
-msgid "Save Cheat File"
-msgstr "Salva il file del cheat"
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
+msgid "Left"
+msgstr "Sinistra"
 
-#: ../gui/Cheat.c:361
-msgid "All Files (*.*)"
-msgstr "Tutti i file (*.*)"
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
+msgid "Leftup"
+msgstr "In alto a sinistra"
 
-#: ../gui/Cheat.c:394 ../gui/Cheat.c:1124 ../gui/ConfDlg.c:104
-#: ../gui/ConfDlg.c:200 ../gui/DebugMemory.c:259
-msgid "Error: Glade interface could not be loaded!"
-msgstr "Errore: impossibile caricare l'interfaccia di glade!"
+#: ../plugins/dfinput/cfg-gtk.c:104 ../plugins/dfinput/cfg-gtk.c:143
+msgid "Leftdown"
+msgstr "In basso a sinistra"
 
-#: ../gui/Cheat.c:399
-msgid "Cheat Codes"
-msgstr "Codici cheat"
+#: ../plugins/dfinput/cfg-gtk.c:108 ../plugins/dfinput/cfg-gtk.c:147
+#, c-format
+msgid "Joystick: Button %d"
+msgstr "Joystick: Pulsante %d"
 
-#: ../gui/Cheat.c:405
-msgid "Enable"
-msgstr "Abilita"
+#: ../plugins/dfinput/cfg-gtk.c:112 ../plugins/dfinput/cfg-gtk.c:151
+#, c-format
+msgid "Joystick: Axis %d%c"
+msgstr "Joystick: Asse %d%c"
 
-#: ../gui/Cheat.c:630
-msgid "Freeze value"
-msgstr "Blocca valore"
+#: ../plugins/dfinput/cfg-gtk.c:117 ../plugins/dfinput/cfg-gtk.c:156
+#, c-format
+msgid "Joystick: Hat %d %s"
+msgstr "Joystick: hat %d %s"
 
-#: ../gui/Cheat.c:729
-msgid "Modify value"
-msgstr "Modifica il valore"
+#: ../plugins/dfinput/cfg-gtk.c:132 ../plugins/dfinput/cfg-gtk.c:171
+msgid "Keyboard:"
+msgstr "Tastiera:"
 
-#: ../gui/Cheat.c:737
-msgid "New value:"
-msgstr "Nuovo valore:"
+#: ../plugins/dfinput/cfg-gtk.c:136 ../plugins/dfinput/cfg-gtk.c:175
+msgid "(Not Set)"
+msgstr "(Nessuna impostazione)"
 
-#: ../gui/Cheat.c:1134
-msgid "Search Results"
-msgstr "Risultati della ricerca"
+#: ../plugins/dfinput/cfg-gtk.c:575
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:14
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:68
+msgid "None"
+msgstr "Nessuno"
 
-#: ../gui/ConfDlg.c:112 ../data/pcsx.glade2:778
-msgid "Configure PCSX"
-msgstr "Configura PCSX"
+#: ../plugins/dfinput/cfg-gtk.c:623
+msgid "Gamepad/Keyboard Input Configuration"
+msgstr "Configurazione input del gamepad/tastiera"
 
-#: ../gui/ConfDlg.c:237 ../gui/ConfDlg.c:258 ../gui/ConfDlg.c:279
-#: ../gui/ConfDlg.c:300 ../gui/ConfDlg.c:355
-msgid "No configuration required"
-msgstr "Non necessita di essere configurato"
+#: ../plugins/dfinput/cfg-gtk.c:629 ../plugins/dfinput/cfg-gtk.c:649
+msgid "Key"
+msgstr "Tasto"
 
-#: ../gui/ConfDlg.c:237 ../gui/ConfDlg.c:258 ../gui/ConfDlg.c:279
-#: ../gui/ConfDlg.c:300 ../gui/ConfDlg.c:355
-msgid "This plugin doesn't need to be configured."
-msgstr "Questo plugin non necessita di essere configurato."
+#: ../plugins/dfinput/cfg-gtk.c:635 ../plugins/dfinput/cfg-gtk.c:655
+msgid "Button"
+msgstr "Pulsante"
 
-#: ../gui/ConfDlg.c:581
-#, c-format
-msgid "Could not open BIOS directory: '%s'\n"
-msgstr "Impossibile aprire la cartella del BIOS: '%s'\n"
+#: ../plugins/dfinput/dfinput.ui.h:1
+msgid "Device:"
+msgstr "Dispositivo:"
 
-#: ../gui/ConfDlg.c:611 ../gui/ConfDlg.c:704 ../gui/LnxMain.c:168
-#, c-format
-msgid "Could not open directory: '%s'\n"
-msgstr "Impossibile aprire la cartella: '%s'\n"
+#: ../plugins/dfinput/dfinput.ui.h:2
+msgid "Type:"
+msgstr "Tipo:"
 
-#: ../gui/ConfDlg.c:675
-msgid "Simulate PSX BIOS"
+#: ../plugins/dfinput/dfinput.ui.h:3
+msgid "Visual vibration"
 msgstr ""
 
-#: ../gui/DebugMemory.c:103 ../data/pcsx.glade2:3178
-msgid "Memory Dump"
-msgstr ""
+#: ../plugins/dfinput/dfinput.ui.h:4
+msgid "Change"
+msgstr "Cambia"
 
-#: ../gui/DebugMemory.c:111
-#, fuzzy
-msgid "Start Address (Hexadecimal):"
-msgstr "Esadecimale"
+#: ../plugins/dfinput/dfinput.ui.h:5
+msgid "Reset"
+msgstr "Resetta"
 
-#: ../gui/DebugMemory.c:121
-msgid "Length (Decimal):"
-msgstr ""
+#: ../plugins/dfinput/dfinput.ui.h:6
+msgid "Controller 1"
+msgstr "Controller 1"
 
-#: ../gui/DebugMemory.c:147
-msgid "Dump to File"
-msgstr ""
+#: ../plugins/dfinput/dfinput.ui.h:7
+msgid "Controller 2"
+msgstr "Controller 2"
 
-#: ../gui/DebugMemory.c:162
-#, fuzzy, c-format
-msgid "Error writing to %s!"
-msgstr "Si è verificato un errore durante il salvataggio dello stato %s!"
+#: ../plugins/dfinput/dfinput.ui.h:8
+msgid "Multi-Threaded (Recommended)"
+msgstr "Multi-Threaded (consigliato)"
 
-#: ../gui/DebugMemory.c:180
-#, fuzzy
-msgid "Memory Patch"
-msgstr "Memory card 1"
+#: ../plugins/dfinput/dfinput.ui.h:9 ../win32/gui/WndMain.c:1342
+msgid "Options"
+msgstr "Opzioni"
 
-#: ../gui/DebugMemory.c:188 ../data/pcsx.glade2:3199
+#: ../plugins/dfinput/dfinput.ui.h:10
 #, fuzzy
-msgid "Address (Hexadecimal):"
-msgstr "Esadecimale"
+msgid "Digital Pad"
+msgstr ""
+"Pad digitale\n"
+"Pad analogico"
 
-#: ../gui/DebugMemory.c:198
+#: ../plugins/dfinput/dfinput.ui.h:11
 #, fuzzy
-msgid "Value (Hexa string):"
-msgstr "Esadecimale"
+msgid "Analog Pad"
+msgstr ""
+"Pad digitale\n"
+"Pad analogico"
 
-#: ../gui/DebugMemory.c:264
-#, fuzzy
-msgid "Memory Viewer"
-msgstr "Memory card 1"
+#: ../plugins/dfinput/dfinput.ui.h:12
+msgid "Mouse"
+msgstr ""
 
-#: ../gui/DebugMemory.c:269
+#: ../plugins/dfinput/pad.c:33
 #, fuzzy
-msgid "Address"
-msgstr "Indirizzo:"
+msgid "Gamepad/Keyboard/Mouse Input"
+msgstr "Input del gamepad/tastiera"
 
-#: ../gui/DebugMemory.c:287
+#. increase that with each version
+#: ../plugins/dfnet/dfnet.c:23
 #, fuzzy
-msgid "Text"
-msgstr "Strutture"
-
-#: ../gui/Gtk2Gui.c:113
-msgid "Ready"
-msgstr "Pronto"
-
-#: ../gui/Gtk2Gui.c:154
-msgid "Emulation Paused."
-msgstr "L'emulazione è stata messa in pausa."
-
-#: ../gui/Gtk2Gui.c:405
-msgid "Select PSX EXE File"
-msgstr "Seleziona un file EXE della PSX"
-
-#: ../gui/Gtk2Gui.c:418
-msgid "PlayStation Executable Files"
-msgstr "File eseguibili della PlayStation"
-
-#: ../gui/Gtk2Gui.c:454
-msgid "Not a valid PSX file"
-msgstr "Non è un file valido della PSX"
-
-#: ../gui/Gtk2Gui.c:454
-msgid "The file does not appear to be a valid Playstation executable"
-msgstr "Il file non sembra essere un eseguibile valido della Playstation"
+msgid "Socket Driver"
+msgstr "Driver SoftGL"
 
-#: ../gui/Gtk2Gui.c:485 ../gui/Gtk2Gui.c:610
-msgid "CD ROM failed"
-msgstr "Si è verificato un problema con il CD ROM"
+#: ../plugins/dfnet/dfnet.c:161
+#, fuzzy, c-format
+msgid "error connecting to %s: %s\n"
+msgstr "Si è verificato un errore durante il caricamento di %s: %s"
 
-#: ../gui/Gtk2Gui.c:493 ../gui/Gtk2Gui.c:618
-msgid "The CD-ROM could not be loaded"
-msgstr "Impossibile caricare il CD-ROM"
+#: ../plugins/dfnet/dfnet.c:186
+#, fuzzy
+msgid "Error allocating memory!\n"
+msgstr "Si è verificato un errore durante l'allocazione della memoria!"
 
-#: ../gui/Gtk2Gui.c:507
-msgid "Could not run BIOS"
-msgstr "Impossibile avviare il BIOS"
+#: ../plugins/dfnet/dfnet.ui.h:1
+#, fuzzy
+msgid "Start Game"
+msgstr "Tasto Start"
 
-#: ../gui/Gtk2Gui.c:507
-msgid "Running BIOS is not supported with Internal HLE BIOS."
-msgstr "L'avvio del BIOS non è supportato con il BIOS HLE interno."
+#: ../plugins/dfnet/dfnet.ui.h:2
+msgid "Play Offline"
+msgstr ""
 
-#: ../gui/Gtk2Gui.c:536
-msgid "Open PSX Disc Image File"
-msgstr "Apri il file immagine del disco PSX"
+#: ../plugins/dfnet/dfnet.ui.h:3
+msgid ""
+"Select here if you'll be Server (Player1) or Client (Player2).\n"
+"\n"
+"If you select Server you must Copy your IP address to the Clipboard and "
+"paste if (Ctrl+V) wherever the Client can see it.\n"
+"\n"
+"If you selected Client please enter the IP address the Server gave to you in "
+"the IP Address Control."
+msgstr ""
 
-#: ../gui/Gtk2Gui.c:556
-msgid "PSX Image Files (*.bin, *.img, *.mdf, *.iso)"
-msgstr "File immagine PSX (*.bin, *.img, *.mdf, *.iso)"
+#: ../plugins/dfnet/dfnet.ui.h:8 ../plugins/bladesio1/sio1.ui.h:6
+msgid "Copy PC IP to Clipboard"
+msgstr ""
 
-#: ../gui/Gtk2Gui.c:771
-#, c-format
-msgid "Loaded state %s."
-msgstr "È stato caricato lo stato %s."
+#: ../plugins/dfnet/dfnet.ui.h:9 ../plugins/bladesio1/sio1.ui.h:7
+msgid "Server (Player1)"
+msgstr ""
 
-#: ../gui/Gtk2Gui.c:774
-#, c-format
-msgid "Error loading state %s!"
-msgstr "Si è verificato un errore durante il caricamento dello stato %s!"
+#: ../plugins/dfnet/dfnet.ui.h:10 ../plugins/bladesio1/sio1.ui.h:8
+msgid "Client (Player2)"
+msgstr ""
 
-#: ../gui/Gtk2Gui.c:785
-#, c-format
-msgid "Saved state %s."
-msgstr "È stato salvato lo stato %s."
+#: ../plugins/dfnet/dfnet.ui.h:11 ../plugins/bladesio1/sio1.ui.h:10
+msgid ""
+"Do not change if not necessary (remember it must be changed on both sides)."
+msgstr ""
 
-#: ../gui/Gtk2Gui.c:787
-#, c-format
-msgid "Error saving state %s!"
-msgstr "Si è verificato un errore durante il salvataggio dello stato %s!"
+#: ../plugins/dfnet/dfnet.ui.h:12 ../plugins/bladesio1/sio1.ui.h:11
+msgid "Port Number"
+msgstr ""
 
-#: ../gui/Gtk2Gui.c:822 ../gui/Gtk2Gui.c:850
-msgid "Select State File"
-msgstr "Seleziona il file dello stato"
+#: ../plugins/dfnet/gui.c:30 ../plugins/dfnet/gui.c:112
+#: ../plugins/bladesio1/gui.c:82 ../win32/gui/ConfigurePlugins.c:669
+msgid "NetPlay"
+msgstr "NetPlay"
 
-#: ../gui/Gtk2Gui.c:893
-msgid "Notice"
-msgstr "Avviso"
+#: ../plugins/dfnet/gui.c:38
+msgid "Nothing to configure"
+msgstr ""
 
-#: ../gui/LnxMain.c:62
+#: ../plugins/dfnet/gui.c:94 ../plugins/bladesio1/gui.c:94
 #, c-format
-msgid "Creating memory card: %s\n"
-msgstr "Creazione in corso della memory card: %s\n"
+msgid "IP %s"
+msgstr ""
 
-#: ../gui/LnxMain.c:325
-msgid ""
-" pcsx [options] [file]\n"
-"\toptions:\n"
-"\t-runcd\t\tRuns CD-ROM\n"
-"\t-cdfile FILE\tRuns a CD image file\n"
-"\t-nogui\t\tDon't open the GTK GUI\n"
-"\t-cfg FILE\tLoads desired configuration file (default: ~/.pcsx/pcsx.cfg)\n"
-"\t-psxout\t\tEnable PSX output\n"
-"\t-load STATENUM\tLoads savestate STATENUM (1-5)\n"
-"\t-h -help\tDisplay this message\n"
-"\tfile\t\tLoads file\n"
+#: ../plugins/dfnet/gui.c:165
+msgid "Waiting for connection..."
 msgstr ""
-" pcsx [opzioni] [file]\n"
-"\topzioni:\n"
-"\t-runcd\t\tAvvia il CD-ROM\n"
-"\t-cdfile FILE\tAvvia un immagine del CD\n"
-"\t-nogui\t\tNon apre la GUI GTK\n"
-"\t-cfg FILE\tCarica il file della configurazione desiderata (default: ~/."
-"pcsx/pcsx.cfg)\n"
-"\t-psxout\t\tAbilita l'output della PSX\n"
-"\t-load STATENUM\tCarica salvataggio (1-5)\n"
-"\t-h -help\tVisualizza questo messaggio\n"
-"\tfile\t\tCarica un file\n"
 
-#: ../gui/LnxMain.c:362
-#, c-format
-msgid ""
-"PCSX cannot be configured without using the GUI -- you should restart "
-"without -nogui.\n"
+#: ../plugins/dfnet/gui.c:168
+msgid "The Client should now Start a Connection, waiting..."
 msgstr ""
-"PCSX non può essere configurato senza una GUI, dovresti riavviare senza "
-"l'opzione -nogui.\n"
 
-#: ../gui/LnxMain.c:418
-msgid "Failed loading plugins!"
-msgstr "Il caricamento dei plugin non è andato a buon fine!"
+#: ../plugins/dfsound/spu.c:66
+#, fuzzy
+msgid "DirectSound Driver"
+msgstr "Driver XVideo"
 
-#: ../gui/LnxMain.c:435
-#, c-format
-msgid "Could not load CD-ROM!\n"
-msgstr "Impossibile caricare il CD-ROM!\n"
+#: ../plugins/dfsound/spu.c:68
+msgid "Mac OS X Sound"
+msgstr "Audio Mac OS X"
 
-#: ../gui/LnxMain.c:466
-#, c-format
-msgid "PSX emulator couldn't be initialized.\n"
-msgstr "Impossibile inizializzare l'emulatore PSX.\n"
+#: ../plugins/dfsound/spu.c:70
+msgid "ALSA Sound"
+msgstr "Audio ALSA"
 
-#: ../gui/MemcardDlg.c:56
-msgid "Icon"
-msgstr "Icona"
+#: ../plugins/dfsound/spu.c:72
+#, fuzzy
+msgid "OSS Sound"
+msgstr "Audio OSS"
 
-#: ../gui/MemcardDlg.c:74
-msgid "ID"
-msgstr "ID"
+#: ../plugins/dfsound/spu.c:74
+#, fuzzy
+msgid "SDL Sound"
+msgstr "Audio OSS"
 
-#: ../gui/MemcardDlg.c:80
-msgid "Name"
-msgstr "Nome"
+#: ../plugins/dfsound/spu.c:76
+#, fuzzy
+msgid "OpenAL Sound"
+msgstr "Audio ALSA"
 
-#: ../gui/MemcardDlg.c:323
-msgid "Select A File"
-msgstr "Seleziona un file"
+#: ../plugins/dfsound/spu.c:78
+msgid "PulseAudio Sound"
+msgstr "Audio PulseAudio"
 
-#: ../gui/MemcardDlg.c:364
-msgid "Format this Memory Card?"
-msgstr "Formatto questa memory card?"
+#: ../plugins/dfsound/spu.c:80
+msgid "NULL Sound"
+msgstr "Senza audio"
 
-#: ../gui/MemcardDlg.c:366
+#: ../plugins/dfsound/spu.c:83
+#, fuzzy
 msgid ""
-"If you format the memory card, the card will be empty, and any existing data "
-"overwritten."
+"P.E.Op.S. Sound Driver V1.7\n"
+"Coded by Pete Bernert and the P.E.Op.S. team\n"
 msgstr ""
-"Se formatti la memory card, questa sarà svuotata e tutti i dati esistenti "
-"saranno sovrascritti."
-
-#: ../gui/MemcardDlg.c:369
-msgid "Format card"
-msgstr "Formatta la memory card"
+"P.E.Op.S. OSS Driver V1.7\n"
+"Scritto da Pete Bernert e dal team P.E.Op.S.\n"
 
-#: ../gui/MemcardDlg.c:393
-msgid "Create a new Memory Card"
-msgstr "Crea una nuova memory card"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:2
+msgid "Volume:"
+msgstr "Volume:"
 
-#: ../gui/MemcardDlg.c:402
-msgid "New Memory Card.mcd"
-msgstr "Nuova memory card.mcd"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:3
+msgid "Interpolation:"
+msgstr "Interpolazione:"
 
-#: ../gui/MemcardDlg.c:503
-msgid "No free space on memory card"
-msgstr "Non c'è spazio libero sulla memory card"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:4
+msgid "Reverb:"
+msgstr "Riverbero:"
 
-#: ../gui/MemcardDlg.c:504
-msgid ""
-"There are no free slots available on the target memory card. Please delete a "
-"slot first."
-msgstr ""
-"Non vi sono slot liberi disponibili nella memory card. Elimina almeno uno "
-"slot."
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:5
+msgid "Adjust XA speed"
+msgstr "Aggiusta la velocità di XA"
 
-#: ../gui/MemcardDlg.c:667
-msgid "Memory Card Manager"
-msgstr "Gestore della memory card"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:6
+msgid "Choose this if XA music is played too quickly."
+msgstr "Seleziona se la musica di XA si ascoltasse troppo rapidamente."
 
-#: ../gui/Plugin.c:211 ../data/pcsx.glade2:1487
-#, c-format
-msgid "SIO IRQ Always Enabled"
-msgstr "SIO IRQ sempre abilitato"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:7
+msgid "High compatibility mode"
+msgstr "Alto modo di compatibilità"
 
-#: ../gui/Plugin.c:212
-#, c-format
-msgid "SIO IRQ Not Always Enabled"
-msgstr "SIO IRQ non sempre abilitato"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:8
+msgid "Use the asynchronous SPU interface."
+msgstr "Usa l'interfaccia asincrona della SPU."
 
-#: ../gui/Plugin.c:218
-#, c-format
-msgid "Black & White Mdecs Only Enabled"
-msgstr "Abilita solo i filmati in bianco e nero"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:9
+msgid "SPU IRQ Wait"
+msgstr "Attesa dell'IRQ della SPU"
 
-#: ../gui/Plugin.c:219
-#, c-format
-msgid "Black & White Mdecs Only Disabled"
-msgstr "Disabilita solo i filmati in bianco e nero"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:10
+msgid "Wait for CPU; only useful for some games."
+msgstr "Attende la CPU; utile solo per alcuni giochi."
 
-#: ../gui/Plugin.c:225
-#, c-format
-msgid "XA Enabled"
-msgstr "XA abilitato"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:11
+msgid "Single channel sound"
+msgstr "Audio del singolo canale"
 
-#: ../gui/Plugin.c:226
-#, c-format
-msgid "XA Disabled"
-msgstr "XA disabilitato"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:12
+msgid "Play only one channel for a performance boost."
+msgstr "Suona solo un canale, per una prestazione migliore."
 
-#: ../gui/Plugin.c:288
-msgid "Error opening CD-ROM plugin!"
-msgstr "Si è verificato un errore durante l'apertura del plugin del CD-ROM!"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:13
+msgid "Frequency Response - Output Filter"
+msgstr ""
 
-#: ../gui/Plugin.c:290
-msgid "Error opening SPU plugin!"
-msgstr "Si è verificato un errore durante l'apertura del plugin della SPU!"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:15
+msgid "Simple"
+msgstr ""
 
-#: ../gui/Plugin.c:293
-msgid "Error opening GPU plugin!"
-msgstr "Si è verificato un errore durante l'apertura del plugin della GPU!"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:16
+#, fuzzy
+msgid "Gaussian"
+msgstr "Russo"
 
-#: ../gui/Plugin.c:295
-msgid "Error opening Controller 1 plugin!"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:17
+msgid "Cubic"
 msgstr ""
-"Si è verificato un errore durante l'apertura del plugin del controller 1!"
 
-#: ../gui/Plugin.c:297
-msgid "Error opening Controller 2 plugin!"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:18
+msgid "Off"
 msgstr ""
-"Si è verificato un errore durante l'apertura del plugin del controller 2!"
 
-#: ../gui/Plugin.c:377
-msgid "Error closing CD-ROM plugin!"
-msgstr "Si è verificato un errore durante la chiusura del plugin del CD-ROM!"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:19
+#, fuzzy
+msgid "Playstation"
+msgstr ""
+"Disattivato\n"
+"Semplice\n"
+"Playstation"
 
-#: ../gui/Plugin.c:379
-msgid "Error closing SPU plugin!"
-msgstr "Si è verificato un errore durante la chiusura del plugin della SPU!"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:20
+msgid "Low"
+msgstr ""
 
-#: ../gui/Plugin.c:381
-msgid "Error closing Controller 1 Plugin!"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:21
+msgid "Medium"
 msgstr ""
-"Si è verificato un errore durante la chiusura del plugin del controller 1!"
 
-#: ../gui/Plugin.c:383
-msgid "Error closing Controller 2 plugin!"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:22
+msgid "Loud"
 msgstr ""
-"Si è verificato un errore durante la chiusura del plugin del controller 2!"
 
-#: ../gui/Plugin.c:385
-msgid "Error closing GPU plugin!"
-msgstr "Si è verificato un errore durante la chiusura del plugin della GPU!"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:23
+msgid "Loudest"
+msgstr ""
 
-#: ../libpcsxcore/cdriso.c:658
-#, c-format
-msgid "Track %.2d (%s) - Start %.2d:%.2d:%.2d, Length %.2d:%.2d:%.2d\n"
+#: ../plugins/dfxvideo/gpu.c:82
+#, fuzzy
+msgid "Soft Driver"
+msgstr "Driver SoftGL"
+
+#: ../plugins/dfxvideo/gpu.c:83
+#, fuzzy
+msgid ""
+"P.E.Op.S. Soft Driver V1.17\n"
+"Coded by Pete Bernert and the P.E.Op.S. team\n"
 msgstr ""
+"Driver P.E.Op.S. SoftGL V1.17\n"
+"Scritto da Pete Bernert e dal team P.E.Op.S.\n"
 
-#: ../libpcsxcore/cdriso.c:677
-#, c-format
-msgid "Loaded CD Image: %s"
-msgstr "È stata caricata l'immagine del CD: %s"
+#: ../plugins/dfxvideo/gpu.c:85
+msgid "SoftGL Driver"
+msgstr "Driver SoftGL"
 
-#: ../libpcsxcore/cheat.c:147
-#, c-format
-msgid "Cheats loaded from: %s\n"
-msgstr "Cheat caricati da: %s\n"
+#: ../plugins/dfxvideo/gpu.c:86
+msgid ""
+"P.E.Op.S. SoftGL Driver V1.17\n"
+"Coded by Pete Bernert and the P.E.Op.S. team\n"
+msgstr ""
+"Driver P.E.Op.S. SoftGL V1.17\n"
+"Scritto da Pete Bernert e dal team P.E.Op.S.\n"
 
-#: ../libpcsxcore/cheat.c:179
-#, c-format
-msgid "Cheats saved to: %s\n"
-msgstr "Cheat salvati in: %s\n"
+#: ../plugins/dfxvideo/gpu.c:88
+msgid "XVideo Driver"
+msgstr "Driver XVideo"
 
-#: ../libpcsxcore/cheat.c:322 ../libpcsxcore/cheat.c:443
-msgid "(Untitled)"
-msgstr "(Senza titolo)"
+#: ../plugins/dfxvideo/gpu.c:89
+msgid ""
+"P.E.Op.S. Xvideo Driver V1.17\n"
+"Coded by Pete Bernert and the P.E.Op.S. team\n"
+msgstr ""
+"Driver P.E.Op.S. Xvideo V1.17\n"
+"Scritto da Pete Bernert e dal team P.E.Op.S.\n"
 
-#: ../libpcsxcore/debug.c:317
-msgid "Error allocating memory"
-msgstr "Si è verificato un errore durante l'allocazione della memoria"
+#: ../plugins/dfxvideo/gpu.c:92
+msgid "Pete Bernert and the P.E.Op.S. team"
+msgstr "Pete Bernert ed il team P.E.Op.S."
 
-#: ../libpcsxcore/debug.c:322
-msgid "Unable to start debug server.\n"
-msgstr "Impossibile avviare il server del debug.\n"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:1
+msgid "Configure X11 Video"
+msgstr "Configura X11 Video"
 
-#: ../libpcsxcore/debug.c:326
-msgid "Debugger started.\n"
-msgstr "Il debugger è stato avviato.\n"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:2
+msgid "Initial Window Size:"
+msgstr "Dimensione iniziale della finestra:"
 
-#: ../libpcsxcore/debug.c:333
-msgid "Debugger stopped.\n"
-msgstr "Il debugger è stato fermato.\n"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:3
+msgid "Stretching:"
+msgstr "Allungamento:"
 
-#: ../libpcsxcore/misc.c:342
-#, c-format
-msgid "CD-ROM Label: %.32s\n"
-msgstr ""
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:4
+msgid "Dithering:"
+msgstr "Retinatura:"
 
-#: ../libpcsxcore/misc.c:343
-#, fuzzy, c-format
-msgid "CD-ROM ID: %.9s\n"
-msgstr "CD-ROM:"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:5
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:4
+msgid "Fullscreen"
+msgstr "Schermo intero"
 
-#: ../libpcsxcore/misc.c:388
-#, c-format
-msgid "Error opening file: %s.\n"
-msgstr "Si è verificato un errore durante l'apertura del file: %s.\n"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:6
+msgid "Toggle windowed/fullscreen mode."
+msgstr "Commuta modo finestra/schermo intero."
 
-#: ../libpcsxcore/misc.c:428
-#, c-format
-msgid "Unknown CPE opcode %02x at position %08x.\n"
-msgstr "Opcode CPE sconosciuto %02x alla posizione %08x.\n"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:7
+msgid "Maintain 4:3 Aspect Ratio"
+msgstr "Mantiene la proporzione dell'aspetto a 4:3"
 
-#: ../libpcsxcore/misc.c:435
-msgid "COFF files not supported.\n"
-msgstr "File COFF non supportato.\n"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:8
+msgid "Show FPS"
+msgstr "Visualizza gli FPS"
 
-#: ../libpcsxcore/misc.c:439
-msgid "This file does not appear to be a valid PSX file.\n"
-msgstr "Questo file non sembra essere un file valido di PSX.\n"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:9
+msgid "Toggle whether the FPS will be shown."
+msgstr "Commuta quando saranno visualizzati gli FPS."
 
-#: ../libpcsxcore/plugins.c:181
-#, c-format
-msgid "Error loading %s: %s"
-msgstr "Si è verificato un errore durante il caricamento di %s: %s"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:10
+msgid "Enable frame skipping"
+msgstr "Abilita il salto dei frame"
 
-#: ../libpcsxcore/plugins.c:221
-#, c-format
-msgid "Could not load GPU plugin %s!"
-msgstr "Impossibile caricare il plugin %s della GPU!"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:11
+msgid "Skip frames when rendering."
+msgstr "Salta i frame durante il rendering."
 
-#: ../libpcsxcore/plugins.c:292
-#, c-format
-msgid "Could not load CD-ROM plugin %s!"
-msgstr "Impossibile caricare il plugin %s del CD-ROM!"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:12
+msgid "Set FPS"
+msgstr "Imposta gli FPS"
 
-#: ../libpcsxcore/plugins.c:340
-#, c-format
-msgid "Could not load SPU plugin %s!"
-msgstr "Impossibile caricare il plugin %s della SPU!"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:13
+msgid "Enable this if games display too quickly."
+msgstr "Abilita se i giochi sono visualizzati troppo rapidamente."
 
-#: ../libpcsxcore/plugins.c:477
-#, c-format
-msgid "Could not load Controller 1 plugin %s!"
-msgstr "Impossibile caricare il plugin %s del controller 1!"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:14
+msgid "200.0"
+msgstr "200.0"
 
-#: ../libpcsxcore/plugins.c:531
-#, c-format
-msgid "Could not load Controller 2 plugin %s!"
-msgstr "Impossibile caricare il plugin %s del controller 2!"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:15
+msgid "Autodetect FPS limit"
+msgstr "Rileva automaticamente il limite degli FPS"
 
-#: ../libpcsxcore/plugins.c:574
-#, c-format
-msgid "Could not load NetPlay plugin %s!"
-msgstr "Impossibile caricare il plugin %s di NetPlay!"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:16
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:36
+msgid "Use game fixes"
+msgstr "Usa le difficoltà del gioco"
 
-#: ../libpcsxcore/plugins.c:654
-#, fuzzy, c-format
-msgid "Could not load SIO1 plugin %s!"
-msgstr "Impossibile caricare il plugin %s della SPU!"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:17
+msgid "Disable CPU Saving"
+msgstr "Disabilita il salvataggio della CPU"
 
-#: ../libpcsxcore/plugins.c:739
-#, c-format
-msgid "Error initializing CD-ROM plugin: %d"
-msgstr ""
-"Si è verificato un errore durante l'inizializzazione del plugin del CD-ROM: %"
-"d"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:18
+msgid "For precise framerate"
+msgstr "Per framerate preciso"
 
-#: ../libpcsxcore/plugins.c:741
-#, c-format
-msgid "Error initializing GPU plugin: %d"
-msgstr ""
-"Si è verificato un errore durante l'inizializzazione del plugin della GPU: %d"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:19
+msgid "Odd/even bit hack"
+msgstr "Hack del bit dispari/pari"
 
-#: ../libpcsxcore/plugins.c:743
-#, c-format
-msgid "Error initializing SPU plugin: %d"
-msgstr ""
-"Si è verificato un errore durante l'inizializzazione del plugin della SPU: %d"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:20
+msgid "Chrono Cross"
+msgstr "Chrono Cross"
 
-#: ../libpcsxcore/plugins.c:745
-#, c-format
-msgid "Error initializing Controller 1 plugin: %d"
-msgstr ""
-"Si è verificato un errore durante l'inizializzazione del plugin del "
-"controller 1: %d"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:21
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:45
+msgid "PC FPS calculation"
+msgstr "Calcolo degli FPS del PC"
 
-#: ../libpcsxcore/plugins.c:747
-#, c-format
-msgid "Error initializing Controller 2 plugin: %d"
-msgstr ""
-"Si è verificato un errore durante l'inizializzazione del plugin del "
-"controller 2: %d"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:22
+msgid "Better FPS limit in some"
+msgstr "Miglior limite degli FPS in qualche"
 
-#: ../libpcsxcore/plugins.c:751
-#, c-format
-msgid "Error initializing NetPlay plugin: %d"
-msgstr ""
-"Si è verificato un errore durante l'inizializzazione del plugin di NetPlay: %"
-"d"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:23
+msgid "Expand screen width"
+msgstr "Espandi la larghezza dello schermo"
 
-#: ../libpcsxcore/plugins.c:756
-#, fuzzy, c-format
-msgid "Error initializing SIO1 plugin: %d"
-msgstr ""
-"Si è verificato un errore durante l'inizializzazione del plugin della SPU: %d"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:24
+msgid "Capcom fighting games"
+msgstr "Giochi di combattimento della Capcom"
 
-#: ../libpcsxcore/plugins.c:759
-msgid "Plugins loaded.\n"
-msgstr "Plugin caricati.\n"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:25
+msgid "Ignore brightness color"
+msgstr "Ignora il colore della luminosità"
 
-#: ../libpcsxcore/ppf.c:216
-#, c-format
-msgid "Invalid PPF patch: %s.\n"
-msgstr "Patch PPF non valida: %s.\n"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:26
+msgid "Black screens in Lunar"
+msgstr "Schermi neri in Lunar"
 
-#: ../libpcsxcore/ppf.c:292
-#, c-format
-msgid "Unsupported PPF version (%d).\n"
-msgstr "Versione PPF non supportata (%d).\n"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:27
+msgid "Disable coordinate check"
+msgstr "Disabilita il controllo della coordinata"
 
-#: ../libpcsxcore/ppf.c:331
-#, c-format
-msgid "Loaded PPF %d.0 patch: %s.\n"
-msgstr "Caricata la patch PPF %d.0: %s.\n"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:28
+msgid "Compatibility mode"
+msgstr "Modo di compatibilità"
 
-#: ../libpcsxcore/psxmem.c:80
-msgid "Error allocating memory!"
-msgstr "Si è verificato un errore durante l'allocazione della memoria!"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:29
+msgid "Lazy screen update"
+msgstr "Aggiorna schermo pigro"
 
-#: ../libpcsxcore/psxmem.c:122
-#, c-format
-msgid "Could not open BIOS:\"%s\". Enabling HLE Bios!\n"
-msgstr "Impossibile aprire il BIOS:\"%s\". Sto abilitando il bios HLE!\n"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:30
+msgid "Pandemonium 2"
+msgstr "Pandemonium 2"
 
-#: ../libpcsxcore/r3000a.c:33
-#, c-format
-msgid "Running PCSX Version %s (%s).\n"
-msgstr "Avvio in corso di PCSX versione %s (%s).\n"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:31
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:46
+msgid "Old frame skipping"
+msgstr "Vecchio salto del frame"
 
-#: ../libpcsxcore/sio.c:345
-msgid "Connection closed!\n"
-msgstr "Connessione chiusa!\n"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:32
+msgid "Skip every second frame"
+msgstr "Salta ogni secondo frame"
 
-#: ../libpcsxcore/sio.c:371
-#, c-format
-msgid "No memory card value was specified - creating a default card %s\n"
-msgstr ""
-"Nessun valore specificato per la memory card, sto creando una card di "
-"default %s\n"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:33
+msgid "Repeated flat tex triangles"
+msgstr "Triangoli della struttura piana ripetuti"
 
-#: ../libpcsxcore/sio.c:375
-#, c-format
-msgid "The memory card %s doesn't exist - creating it\n"
-msgstr "La memory card %s non esiste, la sto creando\n"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:34
+msgid "Needed by Dark Forces"
+msgstr "Richiesto da Dark Forces"
 
-#: ../libpcsxcore/sio.c:391
-#, c-format
-msgid "Memory card %s failed to load!\n"
-msgstr "Impossibile caricare la memory card %s!\n"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:35
+msgid "Draw quads with triangles"
+msgstr "Disegna quadrati con trinagoli"
 
-#: ../libpcsxcore/sio.c:395
-#, c-format
-msgid "Loading memory card %s\n"
-msgstr "Sto caricando la memory card %s\n"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:36
+msgid "better g-colors, worse textures"
+msgstr "Miglior g-color, strutture poco definite"
 
-#: ../plugins/dfxvideo/gpu.c:55
-msgid "SoftGL Driver"
-msgstr "Driver SoftGL"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:37
+#, fuzzy
+msgid "Fake 'gpu busy' states"
+msgstr "Simula lo stato di 'gpu occupata'"
 
-#: ../plugins/dfxvideo/gpu.c:56
-msgid ""
-"P.E.Op.S. SoftGL Driver V1.17\n"
-"Coded by Pete Bernert and the P.E.Op.S. team\n"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:38
+msgid "Toggle busy flags after drawing"
 msgstr ""
-"Driver P.E.Op.S. SoftGL V1.17\n"
-"Scritto da Pete Bernert e dal team P.E.Op.S.\n"
 
-#: ../plugins/dfxvideo/gpu.c:58
-msgid "XVideo Driver"
-msgstr "Driver XVideo"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:39
+msgid "0: Off (fastest)"
+msgstr ""
 
-#: ../plugins/dfxvideo/gpu.c:59
-msgid ""
-"P.E.Op.S. Xvideo Driver V1.17\n"
-"Coded by Pete Bernert and the P.E.Op.S. team\n"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:40
+msgid "1: Game dependant"
 msgstr ""
-"Driver P.E.Op.S. Xvideo V1.17\n"
-"Scritto da Pete Bernert e dal team P.E.Op.S.\n"
 
-#: ../plugins/dfxvideo/gpu.c:62
-msgid "Pete Bernert and the P.E.Op.S. team"
-msgstr "Pete Bernert ed il team P.E.Op.S."
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:41
+msgid "2: Always"
+msgstr ""
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:8
-msgid "Configure X11 Video"
-msgstr "Configura X11 Video"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:42
+msgid "320x240"
+msgstr ""
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:45
-msgid "Initial Window Size:"
-msgstr "Dimensione iniziale della finestra:"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:43
+msgid "640x480"
+msgstr ""
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:56
-msgid "Stretching:"
-msgstr "Allungamento:"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:44
+msgid "800x600"
+msgstr ""
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:69
-msgid "Dithering:"
-msgstr "Retinatura:"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:45
+msgid "1024x768"
+msgstr ""
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:82
-msgid ""
-"320x240\n"
-"640x480\n"
-"800x600\n"
-"1024x768\n"
-"1152x864\n"
-"1280x1024\n"
-"1600x1200"
-msgstr ""
-"320x240\n"
-"640x480\n"
-"800x600\n"
-"1024x768\n"
-"1152x864\n"
-"1280x1024\n"
-"1600x1200"
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:101
-msgid ""
-"0: None\n"
-"1: 2xSai\n"
-"2: 2xSuperSai\n"
-"3: SuperEagle\n"
-"4: Scale2x\n"
-"5: Scale3x\n"
-"6: HQ2X\n"
-"7: HQ3X"
-msgstr ""
-"0: Nessuno\n"
-"1: 2xSai\n"
-"2: 2xSuperSai\n"
-"3: SuperEagle\n"
-"4: Scala2x\n"
-"5: Scala3x\n"
-"6: HQ2X\n"
-"7: HQ3X"
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:123
-msgid ""
-"0: Off (fastest)\n"
-"1: Game dependant\n"
-"2: Always"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:46
+msgid "1152x864"
 msgstr ""
-"0: Disattivato (più veloce)\n"
-"1: Dipendente dal gioco\n"
-"2: Sempre"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:146
-msgid "Maintain 4:3 Aspect Ratio"
-msgstr "Mantiene la proporzione dell'aspetto a 4:3"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:47
+msgid "1280x1024"
+msgstr ""
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:161
-#: ../plugins/peopsxgl/gpucfg/interface.c:322
-msgid "Fullscreen"
-msgstr "Schermo intero"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:48
+msgid "1600x1200"
+msgstr ""
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:165
-msgid "Toggle windowed/fullscreen mode."
-msgstr "Commuta modo finestra/schermo intero."
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:49
+msgid "0: None"
+msgstr "0: Nessuno"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:187
-msgid "Screen"
-msgstr "Schermo"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:50
+msgid "1: 2xSai"
+msgstr ""
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:216
-msgid "Show FPS"
-msgstr "Visualizza gli FPS"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:51
+msgid "2: 2xSuperSai"
+msgstr ""
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:220
-msgid "Toggle whether the FPS will be shown."
-msgstr "Commuta quando saranno visualizzati gli FPS."
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:52
+msgid "3: SuperEagle"
+msgstr ""
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:232
-msgid "Autodetect FPS limit"
-msgstr "Rileva automaticamente il limite degli FPS"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:53
+msgid "4: Scale2x"
+msgstr ""
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:236
-msgid "Enable this if games display too quickly."
-msgstr "Abilita se i giochi sono visualizzati troppo rapidamente."
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:54
+msgid "5: Scale3x"
+msgstr ""
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:249
-msgid "Enable frame skipping"
-msgstr "Abilita il salto dei frame"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:55
+msgid "6: HQ2X"
+msgstr ""
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:253
-msgid "Skip frames when rendering."
-msgstr "Salta i frame durante il rendering."
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:56
+msgid "7: HQ3X"
+msgstr ""
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:270
-msgid "Set FPS"
-msgstr "Imposta gli FPS"
+#: ../plugins/peopsxgl/gpu.c:97
+msgid "OpenGL Driver"
+msgstr "Driver OpenGL"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:287
-msgid "200.0"
-msgstr "200.0"
+#: ../plugins/peopsxgl/gpu.c:99
+msgid "Pete Bernert"
+msgstr "Pete Bernert"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:310
-msgid "Framerate"
-msgstr "Framerate"
+#: ../plugins/peopsxgl/gpu.c:100
+msgid ""
+"Based on P.E.Op.S. MesaGL Driver V1.78\n"
+"Coded by Pete Bernert\n"
+msgstr ""
+"Basato sul driver P.E.Op.S. MesaGL V1.78\n"
+"Scritto da Pete Bernert\n"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:339
-#: ../plugins/peopsxgl/gpucfg/interface.c:568
-msgid "Use game fixes"
-msgstr "Usa le difficoltà del gioco"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:1
+msgid "OpenGL Driver configuration"
+msgstr "Configurazione del driver OpenGL"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:366
-msgid "better g-colors, worse textures"
-msgstr "Miglior g-color, strutture poco definite"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:2
+msgid "Width:"
+msgstr "Larghezza:"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:381
-msgid "Needed by Dark Forces"
-msgstr "Richiesto da Dark Forces"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:3
+msgid "Height:"
+msgstr "Altezza:"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:394
-msgid "Draw quads with triangles"
-msgstr "Disegna quadrati con trinagoli"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:5
+msgid "Dithering"
+msgstr "Retinatura"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:410
-msgid "Repeated flat tex triangles"
-msgstr "Triangoli della struttura piana ripetuti"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:6
+msgid "Keep psx aspect ratio"
+msgstr "Mantiene la proporzione dell'aspetto della psx"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:426
-msgid "Disable CPU Saving"
-msgstr "Disabilita il salvataggio della CPU"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:7
+msgid "Window options"
+msgstr "Opzioni della finestra"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:442
-msgid "Odd/even bit hack"
-msgstr "Hack del bit dispari/pari"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:8
+msgid "Quality:"
+msgstr "Qualità"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:458
-msgid "For precise framerate"
-msgstr "Per framerate preciso"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:9
+msgid "Filtering:"
+msgstr "Filtraggio:"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:473
-msgid "Better FPS limit in some"
-msgstr "Miglior limite degli FPS in qualche"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:10
+msgid "HiRes Tex:"
+msgstr "Struttura ad alta risoluzione:"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:486
-msgid "PC FPS calculation"
-msgstr "Calcolo degli FPS del PC"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:11
+msgid "VRam size in MBytes (0..1024, 0=auto):"
+msgstr "Dimensione della VRam in MByte (0..1024, 0=auto):"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:504
-msgid "Pandemonium 2"
-msgstr "Pandemonium 2"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:12
+msgid "Textures"
+msgstr "Strutture"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:517
-msgid "Lazy screen update"
-msgstr "Aggiorna schermo pigro"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:13
+msgid "Show FPS display on startup"
+msgstr "Visualizza gli FPS all'avvio"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:535
-msgid "Skip every second frame"
-msgstr "Salta ogni secondo frame"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:14
+msgid "Use FPS limit"
+msgstr "Usa il limite degli FPS"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:548
-#: ../plugins/peopsxgl/gpucfg/interface.c:640
-msgid "Old frame skipping"
-msgstr "Vecchio salto del frame"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:15
+#, fuzzy
+msgid "FPS limit auto-detector"
+msgstr "Autorilevamento del limite degli FPS"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:564
-msgid "Expand screen width"
-msgstr "Espandi la larghezza dello schermo"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:16
+msgid "FPS limit manual"
+msgstr "Limite manuale degli FPS"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:580
-msgid "Ignore brightness color"
-msgstr "Ignora il colore della luminosità"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:17
+msgid "FPS"
+msgstr "FPS"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:596
-msgid "Disable coordinate check"
-msgstr "Disabilita il controllo della coordinata"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:18
+msgid "Use Frame skipping"
+msgstr "Usa il salto dei frame"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:614
-msgid "Chrono Cross"
-msgstr "Chrono Cross"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:19
+msgid "Framerate"
+msgstr "Framerate"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:627
-msgid "Capcom fighting games"
-msgstr "Giochi di combattimento della Capcom"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:20
+#, fuzzy
+msgid "Offscreen drawing:"
+msgstr "Disegno fuori schermo:"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:642
-msgid "Black screens in Lunar"
-msgstr "Schermi neri in Lunar"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:21
+msgid "Framebuffer textures:"
+msgstr "Strutture del framebuffer:"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:657
-msgid "Compatibility mode"
-msgstr "Modo di compatibilità"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:22
+msgid "Framebuffer access:"
+msgstr "Accesso del framebuffer:"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:670
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:23
 #, fuzzy
-msgid "Fake 'gpu busy' states"
-msgstr "Simula lo stato di 'gpu occupata'"
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:688
-msgid "Toggle busy flags after drawing"
-msgstr ""
+msgid "Mask bit detection (Needed by a few games, zbuffer)"
+msgstr "Rilevazione del bit mask (richiesto da pochi giochi, zbuffer)"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:713
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:268
-msgid "Compatibility"
-msgstr "Compatibilità"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:24
+#, fuzzy
+msgid "Alpha multipass (Correct opaque texture areas)"
+msgstr "Alpha Multipass (corregge le aree opache della struttura)"
 
-#: ../data/pcsx.glade2:7
-msgid "PCSX"
-msgstr "PCSX"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:25
+msgid "Advanced blending (Accurate psx color emulation)"
+msgstr "Mescolamento avanzato (emulazione accurata del colore della psx)"
 
-#: ../data/pcsx.glade2:21
-msgid "_File"
-msgstr "_File"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:26
+msgid "Compatibility"
+msgstr "Compatibilità"
 
-#: ../data/pcsx.glade2:27
-msgid "Run _CD"
-msgstr "Avvia _CD"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:27
+#, fuzzy
+msgid "Scanlines Blending (0..255, -1=dot):"
+msgstr "Fusione (0..255, -1=punto):"
 
-#: ../data/pcsx.glade2:45
-msgid "Run _ISO..."
-msgstr "Avvia _ISO..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:28
+#, fuzzy
+msgid "Unfiltered MDECs (Small movie speedup)"
+msgstr "MDECs non filtrati (basso guadagno di velocità nei filmati)"
 
-#: ../data/pcsx.glade2:62
-msgid "Run _BIOS"
-msgstr "Avvia _BIOS"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:29
+#, fuzzy
+msgid "Force 15 bit framebuffer updates (Faster movies)"
+msgstr "Forza a 15 bit gli aggiornamenti del framebuffer (filmati velocissimi)"
 
-#: ../data/pcsx.glade2:79
-msgid "Run _EXE..."
-msgstr "Avvia _EXE..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:30
+#, fuzzy
+msgid "Line mode (Polygons will not get filled)"
+msgstr "Modalità linea (i poligoni non saranno riempiti)"
 
-#: ../data/pcsx.glade2:101
-msgid "E_xit"
-msgstr "E_sci"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:31
+#, fuzzy
+msgid "Polygon anti-aliasing (Slow with most cards)"
+msgstr "Poligono anti-aliasing (lento con la maggior parte delle schede)"
 
-#: ../data/pcsx.glade2:123
-msgid "_Emulator"
-msgstr "_Emulatore"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:32
+#, fuzzy
+msgid "Use OpenGL extensions (Recommended)"
+msgstr "Usa le estensioni OpenGL (consigliato)"
 
-#: ../data/pcsx.glade2:129
-msgid "_Continue"
-msgstr "_Continua"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:33
+#, fuzzy
+msgid "Screen smoothing (Can be slow or unsupported)"
+msgstr "Schermo uniforme (può essere lento o non supportato)"
 
-#: ../data/pcsx.glade2:146
-msgid "_Reset"
-msgstr "_Resetta"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:34
+msgid "Gte accuracy"
+msgstr ""
 
-#: ../data/pcsx.glade2:168
-msgid "S_witch ISO..."
-msgstr "C_ambia ISO..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:35
+msgid "Misc"
+msgstr "Varie"
 
-#: ../data/pcsx.glade2:190
-msgid "_Save State"
-msgstr "_Salva stato"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:37
+#, fuzzy
+msgid "Battle cursor (FF7)"
+msgstr "Cursore della battaglia (Final Fantasy 7)"
 
-#: ../data/pcsx.glade2:199 ../data/pcsx.glade2:280
-msgid "Slot _1"
-msgstr "Slot _1"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:38
+#, fuzzy
+msgid "Yellow rect (FF9)"
+msgstr "Rettangolo giallo (Final Fantasy 9)"
 
-#: ../data/pcsx.glade2:208 ../data/pcsx.glade2:289
-msgid "Slot _2"
-msgstr "Slot _2"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:39
+#, fuzzy
+msgid "Direct FB updates"
+msgstr "Aggiornamenti del Direct FB"
 
-#: ../data/pcsx.glade2:217 ../data/pcsx.glade2:298
-msgid "Slot _3"
-msgstr "Slot _3"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:40
+#, fuzzy
+msgid "Black brightness (Lunar)"
+msgstr "Luminosità bassa (Lunar)"
 
-#: ../data/pcsx.glade2:226 ../data/pcsx.glade2:307
-msgid "Slot _4"
-msgstr "Slot _4"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:41
+#, fuzzy
+msgid "Swap front detection"
+msgstr "Rilevamento dell'inversione frontale"
 
-#: ../data/pcsx.glade2:235 ../data/pcsx.glade2:316
-msgid "Slot _5"
-msgstr "Slot _5"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:42
+#, fuzzy
+msgid "Disable coord check"
+msgstr "Disabilita il controllo della coordinata"
 
-#: ../data/pcsx.glade2:243 ../data/pcsx.glade2:324
-msgid "_Other..."
-msgstr "_Altri..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:43
+#, fuzzy
+msgid "No blue glitches (LoD)"
+msgstr "Senza spurie blu (Legend of Dragoon)"
 
-#: ../data/pcsx.glade2:271
-msgid "_Load State"
-msgstr "_Carica stato"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:44
+#, fuzzy
+msgid "Soft FB access"
+msgstr "Accesso al FB via software"
 
-#: ../data/pcsx.glade2:357
-msgid "_Configuration"
-msgstr "_Configurazione"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:47
+#, fuzzy
+msgid "No subtr. blending"
+msgstr "Senza sottrazione nella fusione"
 
-#: ../data/pcsx.glade2:363
-msgid "_Plugins & BIOS..."
-msgstr "_Plugin e BIOS..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:48
+#, fuzzy
+msgid "Lazy upload (DW7)"
+msgstr "Upload pigro (Dragon Warrior 7)"
 
-#: ../data/pcsx.glade2:385
-msgid "_Graphics..."
-msgstr "_Video..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:49
+#, fuzzy
+msgid "Odd/even hack"
+msgstr "Hack del bit dispari/pari"
 
-#: ../data/pcsx.glade2:400
-msgid "_Sound..."
-msgstr "_Audio..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:50
+#, fuzzy
+msgid "Adjust screen width"
+msgstr "Aggiusta la larghezza dello schermo"
 
-#: ../data/pcsx.glade2:415
-msgid "CD-_ROM..."
-msgstr "CD-_ROM..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:51
+#, fuzzy
+msgid "Old texture filtering"
+msgstr "Filtraggio della struttura vecchia"
 
-#: ../data/pcsx.glade2:430
-msgid "C_ontrollers..."
-msgstr "C_ontroller..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:52
+#, fuzzy
+msgid "Additional uploads"
+msgstr "Invio di dati addizionali"
 
-#: ../data/pcsx.glade2:450
-msgid "_CPU..."
-msgstr "_CPU..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:53
+#, fuzzy
+msgid "Unused"
+msgstr "Usato"
 
-#: ../data/pcsx.glade2:466
-msgid "_Memory Cards..."
-msgstr "_Memory card..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:54
+#, fuzzy
+msgid "Fake 'GPU busy'"
+msgstr "Simula lo stato di 'gpu occupata'"
 
-#: ../data/pcsx.glade2:483
-msgid "_Netplay..."
-msgstr "_Netplay..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:55
+msgid "Special game fixes"
+msgstr "Attiva il gioco speciale"
 
-#: ../data/pcsx.glade2:504
-msgid "Chea_t"
-msgstr "Chea_t"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:56
+#, fuzzy
+msgid "Fast"
+msgstr "Incolla"
 
-#: ../data/pcsx.glade2:513
-msgid "_Browse..."
-msgstr "_Visualizza..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:57
+msgid "Autoconfigure for fast display"
+msgstr ""
 
-#: ../data/pcsx.glade2:528
-msgid "_Search..."
-msgstr "_Cerca..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:58
+msgid "Beautiful"
+msgstr ""
 
-#: ../data/pcsx.glade2:554
-msgid "Memory _Dump"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:59
+msgid "Auto configure for beautiful display"
 msgstr ""
 
-#: ../data/pcsx.glade2:574
-msgid "_Help"
-msgstr "_Aiuto"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:60
+#, fuzzy
+msgid "None - Fastest, most glitches"
+msgstr "0: Nessuno, velocissimo, più disturbi"
 
-#: ../data/pcsx.glade2:580
-msgid "_About PCSX..."
-msgstr "_Informazioni su PCSX..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:61
+#, fuzzy
+msgid "Minimum - Missing screens"
+msgstr "1: Minimo, schermi mancanti"
 
-#: ../data/pcsx.glade2:613 ../data/pcsx.glade2:614
-msgid "Run CD"
-msgstr "Avvia il CD"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:62
+#, fuzzy
+msgid "Standard - OK for most games"
+msgstr "2: Standard, va bene per la maggior parte dei giochi"
 
-#: ../data/pcsx.glade2:626
-msgid "Run ISO Image"
-msgstr "Avvia l'immagine ISO"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:63
+#, fuzzy
+msgid "Enhanced - Shows more stuff"
+msgstr "3: Migliorato, visualizza più cose"
 
-#: ../data/pcsx.glade2:627
-msgid "Run ISO..."
-msgstr "Avvia ISO..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:64
+#, fuzzy
+msgid "Extended - Causing garbage"
+msgstr "4: Esteso, produce risultati poco apprezzabili"
 
-#: ../data/pcsx.glade2:648
-msgid "Continue Emulation"
-msgstr "Continua l'emulazione"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:65
+#, fuzzy
+msgid "None (Standard)"
+msgstr "0: Nessuno (standard)"
 
-#: ../data/pcsx.glade2:649
-msgid "Continue..."
-msgstr "Continua..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:66
+#, fuzzy
+msgid "2xSaI (Much vram needed)"
+msgstr "1: 2xSaI (richiede più vram)"
 
-#: ../data/pcsx.glade2:661
-msgid "Switch ISO Image"
-msgstr "Cambia l'immagine ISO"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:67
+#, fuzzy
+msgid "Scaled (Needs tex filtering)"
+msgstr "2: Scalato (necessita del filtraggio della struttura)"
 
-#: ../data/pcsx.glade2:662
-msgid "Switch ISO..."
-msgstr "Cambia ISO..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:69
+#, fuzzy
+msgid "Standard - Glitches will happen"
+msgstr "1: Standard, si verificheranno dei disturbi"
 
-#: ../data/pcsx.glade2:683 ../data/pcsx.glade2:1810
-msgid "Configure Memory Cards"
-msgstr "Configura la memory card"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:70
+#, fuzzy
+msgid "Extended - No black borders"
+msgstr "2: Esteso, senza bordi neri"
 
-#: ../data/pcsx.glade2:684
-msgid "Memcards..."
-msgstr "Memory card..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:71
+#, fuzzy
+msgid "Standard without sprites - Unfiltered 2D"
+msgstr "3: Standard senza immagini, 2D non filtrato"
 
-#: ../data/pcsx.glade2:696
-msgid "Configure Graphics"
-msgstr "Configura il video"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:72
+#, fuzzy
+msgid "Extended without sprites - Unfiltered 2D"
+msgstr "4: Esteso senza immagini, 2D non filtrato"
 
-#: ../data/pcsx.glade2:697
-msgid "Graphics..."
-msgstr "Video..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:73
+#, fuzzy
+msgid "Standard + smoothed sprites"
+msgstr "5: Standard + immagini uniformi"
 
-#: ../data/pcsx.glade2:709 ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:8
-msgid "Configure Sound"
-msgstr "Configura l'audio"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:74
+#, fuzzy
+msgid "Extended + smoothed sprites"
+msgstr "6: Esteso + immagini uniformi"
 
-#: ../data/pcsx.glade2:710
-msgid "Sound..."
-msgstr "Audio..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:75
+#, fuzzy
+msgid "Don't care - Use driver's default textures"
+msgstr "0: non se ne preoccupa, usa le strutture di default del driver"
 
-#: ../data/pcsx.glade2:722
-msgid "Configure CD-ROM"
-msgstr "Configura il CD-ROM"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:76
+#, fuzzy
+msgid "4444 - Fast, but less colorful"
+msgstr "1: 4444, veloce, ma meno colorito"
 
-#: ../data/pcsx.glade2:723
-msgid "CD-ROM..."
-msgstr "CD-ROM..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:77
+#, fuzzy
+msgid "5551 - Nice colors, bad transparency"
+msgstr "2: 5551, colori piacevoli, cattiva trasparenza"
 
-#: ../data/pcsx.glade2:735
-msgid "Configure Controllers"
-msgstr "Configura i controller"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:78
+#, fuzzy
+msgid "8888 - Best colors, more ram needed"
+msgstr "3: 8888, colori migliori, richiede più ram"
 
-#: ../data/pcsx.glade2:736
-msgid "Controllers..."
-msgstr "Controller..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:79
+#, fuzzy
+msgid "BGR8888 - Faster on some cards"
+msgstr "4: BGR8888, velocissimo su alcune schede"
 
-#: ../data/pcsx.glade2:879
-msgid "Select Folder to Search"
-msgstr "Seleziona una cartella per la ricerca"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:80
+#, fuzzy
+msgid "Emulated VRam - Ok most times"
+msgstr "0: Vram emulata, funziona quasi sempre bene"
 
-#: ../data/pcsx.glade2:895
-msgid "Search in:"
-msgstr "Cerca in:"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:81
+#, fuzzy
+msgid "Gfx card buffer reads"
+msgstr "1: Legge il buffer Gfx della scheda"
 
-#: ../data/pcsx.glade2:1168
-msgid "Graphics:"
-msgstr "Video:"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:82
+#, fuzzy
+msgid "Gfx card buffer moves"
+msgstr "2: Sposta il buffer Gfx della scheda"
 
-#: ../data/pcsx.glade2:1181
-msgid "Sound:"
-msgstr "Audio:"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:83
+#, fuzzy
+msgid "Gfx card buffer reads and moves"
+msgstr "1: Legge il buffer Gfx della scheda"
 
-#: ../data/pcsx.glade2:1196
-msgid "Controller 1: "
-msgstr "Controller 1: "
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:84
+#, fuzzy
+msgid "Full Software (FVP)"
+msgstr "4: Software completo (FVP)"
 
-#: ../data/pcsx.glade2:1211
-msgid "Controller 2:"
-msgstr "Controller 2:"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:85
+#, fuzzy
+msgid "Emulated VRam - Needs FVP"
+msgstr "0: Vram emulata, richiede FVP"
 
-#: ../data/pcsx.glade2:1226
-msgid "CD-ROM:"
-msgstr "CD-ROM:"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:86
+#, fuzzy
+msgid "Black - Fast, no effects"
+msgstr "1: Nero, veloce, nessun effetto"
 
-#: ../data/pcsx.glade2:1264
-msgid "Plugins"
-msgstr "Plugin"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:87
+#, fuzzy
+msgid "Gfx card buffer - Can be slow"
+msgstr "2: Gfx card buffer, può essere lento"
 
-#: ../data/pcsx.glade2:1325
-msgid "BIOS"
-msgstr "BIOS"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:88
+msgid "Gfx card and soft - Slow"
+msgstr ""
 
-#: ../data/pcsx.glade2:1375
-msgid "Configure CPU"
-msgstr "Configura la CPU"
+#: ../plugins/bladesio1/gui.c:112
+#, fuzzy
+msgid "Link Cable Configuration"
+msgstr "Configurazione"
 
-#: ../data/pcsx.glade2:1419
-msgid "SPU IRQ Always Enabled"
-msgstr "SPU IRQ sempre abilitato"
+#. *************************************************************************
+#. #define SIO1_DEBUG 1
+#: ../plugins/bladesio1/sio1.c:44
+msgid "sio1Blade"
+msgstr ""
 
-#: ../data/pcsx.glade2:1435
-msgid "Black & White Movies"
-msgstr "Filmati in bianco e nero"
+#. *************************************************************************
+#: ../plugins/bladesio1/sio1.ui.h:1 ../win32/gui/AboutDlg.c:48
+#: ../win32/gui/AboutDlg.c:52 ../win32/gui/CheatDlg.c:69
+#: ../win32/gui/CheatDlg.c:119 ../win32/gui/ConfigurePlugins.c:529
+#: ../win32/gui/ConfigurePlugins.c:667 ../win32/gui/WndMain.c:1088
+#: ../win32/gui/WndMain.c:1324
+msgid "OK"
+msgstr "OK"
 
-#: ../data/pcsx.glade2:1469
-msgid "Enable Interpreter CPU"
-msgstr "Abilita l'interprete della CPU"
+#: ../plugins/bladesio1/sio1.ui.h:2
+msgid "CANCEL"
+msgstr ""
 
-#: ../data/pcsx.glade2:1503
-msgid "Disable CD Audio"
-msgstr "Disabilita CD audio"
+#: ../plugins/bladesio1/sio1.ui.h:3
+msgid ""
+"Select here if you'll be Server (Player1) or Client (Player2).\n"
+"If you select Server you must Copy your IP address to the Clipboard and "
+"paste if (Ctrl+V) wherever the Client can see it.\n"
+"If you selected Client please enter the IP address the Server gave to you in "
+"the IP Address Control."
+msgstr ""
 
-#: ../data/pcsx.glade2:1519
-msgid "Disable XA Decoding"
-msgstr "Disabilita il decoding XA"
+#: ../plugins/bladesio1/sio1.ui.h:9
+#, fuzzy
+msgid "Disabled"
+msgstr "XA disabilitato"
 
-#: ../data/pcsx.glade2:1571
-msgid "Options"
-msgstr "Opzioni"
+#: ../win32/gui/AboutDlg.c:26
+msgid ""
+"PCSXR - A PlayStation Emulator\n"
+"\n"
+"Original Authors:\n"
+"main coder: linuzappz\n"
+"co-coders: shadow\n"
+"ex-coders: Nocomp, Pete Bernett, nik3d\n"
+"Webmaster: AkumaX"
+msgstr ""
+"PCSXR, un emulatore della PlayStation\n"
+"\n"
+"Autori originari:\n"
+"programmatore principale: linuzappz\n"
+"co-programmatori: shadow\n"
+"ex-programmatori: Nocomp, Pete Bernett, nik3d\n"
+"Webmaster: AkumaX"
 
-#: ../data/pcsx.glade2:1612
+#: ../win32/gui/AboutDlg.c:35
 msgid ""
-"NTSC\n"
-"PAL"
+"PCSX-df Authors:\n"
+"Ryan Schultz, Andrew Burton, Stephen Chao,\n"
+"Marcus Comstedt, Stefan Sikora\n"
+"\n"
+"PCSX-Reloaded By:\n"
+"edgbla, shalma, Wei Mingzhi, et al.\n"
+"\n"
+"http://pcsxr.codeplex.com/"
 msgstr ""
-"NTSC\n"
-"PAL"
+"Autori di PCSX-df:\n"
+"Ryan Schultz, Andrew Burton, Stephen Chao,\n"
+"Marcus Comstedt, Stefan Sikora\n"
+"\n"
+"PCSX-Reloaded di:\n"
+"edgbla, shalma, Wei Mingzhi\n"
+"\n"
+"http://www.codeplex.com/pcsxr"
 
-#: ../data/pcsx.glade2:1626
-msgid "System Type"
-msgstr "Regione del sistema"
+#: ../win32/gui/AboutDlg.c:46
+msgid "About"
+msgstr "Informazioni"
 
-#: ../data/pcsx.glade2:1674
-msgid "Configure NetPlay"
-msgstr "Configura il NetPlay"
+#: ../win32/gui/AboutDlg.c:49
+msgid "PCSXR EMU\n"
+msgstr "PCSXR EMU\n"
 
-#: ../data/pcsx.glade2:1760
-msgid "NetPlay"
-msgstr "NetPlay"
+#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
+#: ../win32/gui/CheatDlg.c:270
+msgid "Yes"
+msgstr "Sì"
 
-#: ../data/pcsx.glade2:1886 ../data/pcsx.glade2:2283
-msgid "New"
-msgstr "Nuovo"
+#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
+#: ../win32/gui/CheatDlg.c:270
+msgid "No"
+msgstr "No"
 
-#: ../data/pcsx.glade2:1936 ../data/pcsx.glade2:2333
-msgid "Format"
-msgstr "Formatta"
+#: ../win32/gui/CheatDlg.c:70 ../win32/gui/CheatDlg.c:120
+#: ../win32/gui/ConfigurePlugins.c:530 ../win32/gui/ConfigurePlugins.c:668
+#: ../win32/gui/WndMain.c:1089 ../win32/gui/WndMain.c:1325
+msgid "Cancel"
+msgstr "Annulla"
+
+#: ../win32/gui/CheatDlg.c:168
+msgid "&Add Code"
+msgstr "&Aggiungi un codice"
+
+#: ../win32/gui/CheatDlg.c:169
+msgid "&Edit Code"
+msgstr "&Modifica un codice"
+
+#: ../win32/gui/CheatDlg.c:170
+msgid "&Remove Code"
+msgstr "&Rimuovi un codice"
 
-#: ../data/pcsx.glade2:1986 ../data/pcsx.glade2:2383
-msgid "Un/Delete"
-msgstr "Non/Elimina"
+#: ../win32/gui/CheatDlg.c:171
+msgid "&Enable/Disable"
+msgstr "&Abilita/Disabilita"
 
-#: ../data/pcsx.glade2:2079
-msgid "Memory Card 1"
-msgstr "Memory card 1"
+#: ../win32/gui/CheatDlg.c:172
+msgid "&Load..."
+msgstr "&Carica..."
 
-#: ../data/pcsx.glade2:2139 ../data/pcsx.glade2:2189 ../data/pcsx.glade2:3002
-msgid "Copy"
-msgstr "Copia"
+#: ../win32/gui/CheatDlg.c:173
+msgid "&Save As..."
+msgstr "&Salva come..."
 
-#: ../data/pcsx.glade2:2476
-msgid "Memory Card 2"
-msgstr "Memory card 2"
+#: ../win32/gui/CheatDlg.c:174
+msgid "&Close"
+msgstr "&Chiudi"
 
-#: ../data/pcsx.glade2:2572
-msgid "Cheat Codes"
-msgstr "Codici cheat"
+#: ../win32/gui/CheatDlg.c:190
+msgid "Enabled"
+msgstr "Abilitato"
 
-#: ../data/pcsx.glade2:2736
-msgid ""
-"8-bit\n"
-"16-bit\n"
-"32-bit"
-msgstr ""
-"8-bit\n"
-"16-bit\n"
-"32-bit"
+#: ../win32/gui/CheatDlg.c:282 ../win32/gui/CheatDlg.c:311
+msgid "PCSXR Cheat Code Files"
+msgstr "File del codice dei cheat di PCSXR"
 
-#: ../data/pcsx.glade2:2799
-msgid ""
-"Equal Value\n"
-"Not Equal Value\n"
-"Range\n"
-"Increased By\n"
-"Decreased By\n"
-"Increased\n"
-"Decreased\n"
-"Different\n"
-"No Change"
-msgstr ""
-"Stesso valore\n"
-"Valore diverso\n"
-"Scala\n"
-"Incrementato da\n"
-"Decrementato da\n"
-"Incrementato\n"
-"Decrementato\n"
-"Differente\n"
-"Nessun cambio"
-
-#: ../data/pcsx.glade2:2831
-msgid ""
-"Decimal\n"
-"Hexadecimal"
-msgstr ""
-"Decimale\n"
-"Esadecimale"
+#: ../win32/gui/CheatDlg.c:453
+msgid "No addresses found."
+msgstr "Non è stato trovato nessun indirizzo."
 
-#: ../data/pcsx.glade2:3035
-msgid "label_resultsfound"
-msgstr "etichetta_risultatitrovati"
+#: ../win32/gui/CheatDlg.c:505 ../win32/gui/CheatDlg.c:596
+msgid "Address:"
+msgstr "Indirizzo:"
 
-#: ../data/pcsx.glade2:3070
-msgid "Search"
-msgstr "Cerca"
+#: ../win32/gui/CheatDlg.c:566
+#, c-format
+msgid "Freeze %.8X"
+msgstr "Blocca %.8x"
 
-#: ../data/pcsx.glade2:3106
-msgid "Restart"
-msgstr "Riavvia"
+#: ../win32/gui/CheatDlg.c:685
+msgid "&Freeze"
+msgstr "&Blocca"
 
-#: ../data/pcsx.glade2:3135
-msgid "Cheat Search"
-msgstr "Cerca cheat"
+#: ../win32/gui/CheatDlg.c:686
+msgid "&Modify"
+msgstr "&Modifica"
 
-#: ../data/pcsx.glade2:3291
-msgid "Raw Dump..."
-msgstr ""
+#: ../win32/gui/CheatDlg.c:687
+msgid "&Copy"
+msgstr "&Copia"
 
-#: ../data/pcsx.glade2:3326
-msgid "Patch Memory..."
-msgstr ""
+#: ../win32/gui/CheatDlg.c:688
+msgid "&Search"
+msgstr "&Cerca"
 
-#: ../plugins/dfsound/spu.c:38
-msgid "Mac OS X Sound"
-msgstr "Audio Mac OS X"
+#: ../win32/gui/CheatDlg.c:689
+msgid "&New Search"
+msgstr "&Nuova ricerca"
 
-#: ../plugins/dfsound/spu.c:40
-msgid "ALSA Sound"
-msgstr "Audio ALSA"
+#: ../win32/gui/CheatDlg.c:690
+msgid "C&lose"
+msgstr "C&hiudi"
 
-#: ../plugins/dfsound/spu.c:42
-#, fuzzy
-msgid "OSS Sound"
-msgstr "Audio OSS"
+#: ../win32/gui/ConfigurePlugins.c:234
+msgid "Simulate Psx Bios"
+msgstr ""
 
-#: ../plugins/dfsound/spu.c:44
-#, fuzzy
-msgid "SDL Sound"
-msgstr "Audio OSS"
+#: ../win32/gui/ConfigurePlugins.c:330
+msgid "Configuration not OK!"
+msgstr "La configurazione non è corretta!"
 
-#: ../plugins/dfsound/spu.c:46
-msgid "PulseAudio Sound"
-msgstr "Audio PulseAudio"
+#: ../win32/gui/ConfigurePlugins.c:445
+msgid "This plugin reports that should work correctly"
+msgstr "Questo plugin dovrebbe funzionare correttamente"
 
-#: ../plugins/dfsound/spu.c:48
-msgid "NULL Sound"
-msgstr "Senza audio"
+#: ../win32/gui/ConfigurePlugins.c:446
+msgid "This plugin reports that should not work correctly"
+msgstr "Questo plugin potrebbe non funzionare correttamente"
 
-#: ../plugins/dfsound/spu.c:51
-#, fuzzy
-msgid ""
-"P.E.Op.S. Sound Driver V1.7\n"
-"Coded by Pete Bernert and the P.E.Op.S. team\n"
-msgstr ""
-"P.E.Op.S. OSS Driver V1.7\n"
-"Scritto da Pete Bernert e dal team P.E.Op.S.\n"
+#: ../win32/gui/ConfigurePlugins.c:509
+msgid "Select Plugins Directory"
+msgstr "Seleziona la cartella dei plugin"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:42
-msgid "Volume:"
-msgstr "Volume:"
+#: ../win32/gui/ConfigurePlugins.c:518
+msgid "Select Bios Directory"
+msgstr "Seleziona la cartella del bios"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:54
-msgid "Interpolation:"
-msgstr "Interpolazione:"
+#: ../win32/gui/ConfigurePlugins.c:527
+msgid "Configuration"
+msgstr "Configurazione"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:68
-msgid "Reverb:"
-msgstr "Riverbero:"
+#: ../win32/gui/ConfigurePlugins.c:531
+msgid "Graphics"
+msgstr "Video"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:81
-msgid ""
-"Low\n"
-"Medium\n"
-"Loud\n"
-"Loudest"
-msgstr ""
-"Basso\n"
-"Medio\n"
-"Alto\n"
-"Altissimo"
+#: ../win32/gui/ConfigurePlugins.c:532
+msgid "First Controller"
+msgstr "Primo controller"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:95
-msgid ""
-"Off\n"
-"Simple\n"
-"Playstation"
-msgstr ""
-"Disattivato\n"
-"Semplice\n"
-"Playstation"
+#: ../win32/gui/ConfigurePlugins.c:533
+msgid "Second Controller"
+msgstr "Secondo controller"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:111
-msgid ""
-"None\n"
-"Simple\n"
-"Gaussian\n"
-"Cubic"
-msgstr ""
-"Nessuno\n"
-"Semplice\n"
-"Gaussiano\n"
-"Cubico"
+#: ../win32/gui/ConfigurePlugins.c:534
+msgid "Sound"
+msgstr "Audio"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:132
-msgid "General"
-msgstr "Generale"
+#: ../win32/gui/ConfigurePlugins.c:535
+msgid "Cdrom"
+msgstr "Cdrom"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:163
-msgid "Adjust XA speed"
-msgstr "Aggiusta la velocità di XA"
+#: ../win32/gui/ConfigurePlugins.c:536
+#, fuzzy
+msgid "Link cable"
+msgstr "Abilita"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:167
-msgid "Choose this if XA music is played too quickly."
-msgstr "Seleziona se la musica di XA si ascoltasse troppo rapidamente."
+#: ../win32/gui/ConfigurePlugins.c:537
+msgid "Bios"
+msgstr "Bios"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:184
-msgid "XA Music"
-msgstr "Musica XA"
+#: ../win32/gui/ConfigurePlugins.c:538
+msgid "Set Bios Directory"
+msgstr "Imposta la cartella del bios"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:215
-msgid "High compatibility mode"
-msgstr "Alto modo di compatibilità"
+#: ../win32/gui/ConfigurePlugins.c:539
+msgid "Set Plugins Directory"
+msgstr "Imposta la cartella dei plugin"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:219
-msgid "Use the asynchronous SPU interface."
-msgstr "Usa l'interfaccia asincrona della SPU."
+#: ../win32/gui/ConfigurePlugins.c:540 ../win32/gui/ConfigurePlugins.c:543
+#: ../win32/gui/ConfigurePlugins.c:546 ../win32/gui/ConfigurePlugins.c:549
+#: ../win32/gui/ConfigurePlugins.c:552 ../win32/gui/ConfigurePlugins.c:555
+#: ../win32/gui/ConfigurePlugins.c:670
+msgid "Configure..."
+msgstr "Configura..."
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:231
-msgid "SPU IRQ Wait"
-msgstr "Attesa dell'IRQ della SPU"
+#: ../win32/gui/ConfigurePlugins.c:541 ../win32/gui/ConfigurePlugins.c:544
+#: ../win32/gui/ConfigurePlugins.c:547 ../win32/gui/ConfigurePlugins.c:550
+#: ../win32/gui/ConfigurePlugins.c:553 ../win32/gui/ConfigurePlugins.c:556
+#: ../win32/gui/ConfigurePlugins.c:671
+msgid "Test..."
+msgstr "Prova..."
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:235
-msgid "Wait for CPU; only useful for some games."
-msgstr "Attende la CPU; utile solo per alcuni giochi."
+#: ../win32/gui/ConfigurePlugins.c:542 ../win32/gui/ConfigurePlugins.c:545
+#: ../win32/gui/ConfigurePlugins.c:548 ../win32/gui/ConfigurePlugins.c:551
+#: ../win32/gui/ConfigurePlugins.c:554 ../win32/gui/ConfigurePlugins.c:557
+#: ../win32/gui/ConfigurePlugins.c:672
+msgid "About..."
+msgstr "Informazioni..."
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:247
-msgid "Single channel sound"
-msgstr "Audio del singolo canale"
+#: ../win32/gui/ConfigurePlugins.c:665
+msgid "NetPlay Configuration"
+msgstr "Configurazione del NetPlay"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:251
-msgid "Play only one channel for a performance boost."
-msgstr "Suona solo un canale, per una prestazione migliore."
+#: ../win32/gui/ConfigurePlugins.c:673
+msgid ""
+"Note: The NetPlay Plugin Directory should be the same as the other Plugins."
+msgstr ""
+"Nota: la cartella del plugin NetPlay dovrebbe essere la stessa degli altri "
+"plugin."
 
-#: ../plugins/dfcdrom/cdr-libcdio.c:29 ../plugins/dfcdrom/cdr-linux.c:29
-msgid "CD-ROM Drive Reader"
-msgstr "Lettore del dispositivo CD-ROM"
+#: ../win32/gui/plugin.c:94 ../win32/gui/WndMain.c:331
+#, c-format
+msgid "*PCSXR*: Saved State %d"
+msgstr "*PCSXR*: è stato salvato lo stato %d"
 
-#: ../plugins/dfcdrom/cdr-null.c:26
-msgid "CDR NULL Plugin"
-msgstr "Plugin NULL CDR"
+#: ../win32/gui/plugin.c:95 ../win32/gui/WndMain.c:332
+#, c-format
+msgid "*PCSXR*: Error Saving State %d"
+msgstr ""
+"*PCSXR*: si è verificato un errore durante il salvataggio dello stato %d"
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/main.c:219
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:8
-msgid "CDR configuration"
-msgstr "Configurazione del CD-ROM"
+#: ../win32/gui/plugin.c:111 ../win32/gui/WndMain.c:309
+#, c-format
+msgid "*PCSXR*: Loaded State %d"
+msgstr "*PCSXR*: è stato caricato lo stato %d"
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:33
-msgid "Choose your CD-ROM device or type its path if it's not listed"
+#: ../win32/gui/plugin.c:112 ../win32/gui/WndMain.c:310
+#, c-format
+msgid "*PCSXR*: Error Loading State %d"
 msgstr ""
-"Scegli il tuo dispositivo CD-ROM o digita il suo path se non è elencato"
+"*PCSXR*: si è verificato un errore durante il caricamento dello stato %d"
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:44
-msgid "Select CD-ROM device"
-msgstr "Seleziona il dispositivo CD-ROM"
+#: ../win32/gui/plugin.c:123
+#, c-format
+msgid "*PCSXR*: Sio Irq Always Enabled"
+msgstr "*PCSXR*: sio irq è sempre abilitato"
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:72
-msgid "Select read mode:"
-msgstr "Seleziona la modalità di lettura:"
+#: ../win32/gui/plugin.c:124
+#, c-format
+msgid "*PCSXR*: Sio Irq Not Always Enabled"
+msgstr "*PCSXR*: sio irq non è sempre abilitato"
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:83
-msgid ""
-"Normal (No Cache)\n"
-"Threaded - Faster (With Cache)"
-msgstr ""
-"Normale (senza cache)\n"
-"Threaded, veloce (con la cache)"
+#: ../win32/gui/plugin.c:131
+#, c-format
+msgid "*PCSXR*: Black&White Mdecs Only Enabled"
+msgstr "*PCSXR*: abilita solo i filmati in bianco e nero"
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:114
-msgid "Cache Size (Def. 64):"
-msgstr "Dimensione della cache (def. 64)"
+#: ../win32/gui/plugin.c:132
+#, c-format
+msgid "*PCSXR*: Black&White Mdecs Only Disabled"
+msgstr "*PCSXR*: disabilita solo i filmati in bianco e nero"
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:159
-msgid "Spindown Time:"
-msgstr "Tempo di spindown:"
+#: ../win32/gui/plugin.c:139
+#, c-format
+msgid "*PCSXR*: Xa Enabled"
+msgstr "*PCSXR*: abilita Xa"
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:170
-msgid ""
-"Default\n"
-"125ms\n"
-"250ms\n"
-"500ms\n"
-"1s\n"
-"2s\n"
-"4s\n"
-"8s\n"
-"16s\n"
-"32s\n"
-"1min\n"
-"2min\n"
-"4min\n"
-"8min\n"
-"16min\n"
-"32min"
-msgstr ""
-"Default\n"
-"125ms\n"
-"250ms\n"
-"500ms\n"
-"1s\n"
-"2s\n"
-"4s\n"
-"8s\n"
-"16s\n"
-"32s\n"
-"1min\n"
-"2min\n"
-"4min\n"
-"8min\n"
-"16min\n"
-"32min"
-
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:216
-msgid "Cdrom Speed (Def. 0 = MAX):"
-msgstr "Velocità del cdrom (def. 0 = MAX):"
+#: ../win32/gui/plugin.c:140
+#, c-format
+msgid "*PCSXR*: Xa Disabled"
+msgstr "*PCSXR*: disabilita Xa"
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:248
-msgid "hseparator"
-msgstr "hseparator"
+#: ../win32/gui/plugin.c:149
+msgid "*PCSXR*: CdRom Case Opened"
+msgstr "*PCSXR*: il vano del CdRom è aperto"
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:258
-msgid "Enable subchannel read"
-msgstr "Abilita la lettura del subchannel"
+#: ../win32/gui/plugin.c:155
+msgid "*PCSXR*: CdRom Case Closed"
+msgstr "*PCSXR*: il vano del CdRom è chiuso"
 
-#: ../plugins/peopsxgl/gpu.c:61
-msgid "OpenGL Driver"
-msgstr "Driver OpenGL"
+#: ../win32/gui/plugin.c:181
+msgid "Connecting..."
+msgstr "Connessione in corso..."
 
-#: ../plugins/peopsxgl/gpu.c:63
-msgid "Pete Bernert"
-msgstr "Pete Bernert"
+#: ../win32/gui/plugin.c:183 ../win32/gui/plugin.c:190
+#, c-format
+msgid "Please wait while connecting... %c\n"
+msgstr "Attendere prego, connessione in corso... %c\n"
 
-#: ../plugins/peopsxgl/gpu.c:64
-msgid ""
-"Based on P.E.Op.S. MesaGL Driver V1.78\n"
-"Coded by Pete Bernert\n"
-msgstr ""
-"Basato sul driver P.E.Op.S. MesaGL V1.78\n"
-"Scritto da Pete Bernert\n"
+#: ../win32/gui/plugin.c:218
+msgid "Error Opening CDR Plugin"
+msgstr "Si è verificato un errore durante l'apertura del plugin del CD-ROM"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:118
-msgid "OpenGL Driver configuration"
-msgstr "Configurazione del driver OpenGL"
+#: ../win32/gui/plugin.c:281
+#, c-format
+msgid "Error Opening GPU Plugin (%d)"
+msgstr "Si è verificato un errore durante l'apertura del plugin della GPU (%d)"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:138
-msgid "Textures"
-msgstr "Strutture"
+#: ../win32/gui/plugin.c:283
+#, c-format
+msgid "Error Opening SPU Plugin (%d)"
+msgstr "Si è verificato un errore durante l'apertura del plugin della SPU (%d)"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:161
-msgid "Quality:"
-msgstr "Qualità"
+#: ../win32/gui/plugin.c:286
+#, c-format
+msgid "Error Opening PAD1 Plugin (%d)"
+msgstr "Si è verificato un errore durante l'apertura del plugin del PAD1 (%d)"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:178
-#: ../plugins/peopsxgl/gpucfg/interface.c:191
-msgid "0: don't care - Use driver's default textures"
-msgstr "0: non se ne preoccupa, usa le strutture di default del driver"
+#: ../win32/gui/plugin.c:290
+#, c-format
+msgid "Error Opening PAD2 Plugin (%d)"
+msgstr "Si è verificato un errore durante l'apertura del plugin del PAD2 (%d)"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:179
-msgid "1: 4444 - Fast, but less colorful"
-msgstr "1: 4444, veloce, ma meno colorito"
+#: ../win32/gui/plugin.c:295
+#, fuzzy, c-format
+msgid "Error Opening SIO1 plugin (%d)"
+msgstr "Si è verificato un errore durante l'apertura del plugin della SPU (%d)"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:180
-msgid "2: 5551 - Nice colors, bad transparency"
-msgstr "2: 5551, colori piacevoli, cattiva trasparenza"
+#: ../win32/gui/plugin.c:325
+msgid "Error Closing CDR Plugin"
+msgstr "Si è verificato un errore durante la chiusura del plugin del CD-ROM"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:181
-msgid "3: 8888 - Best colors, more ram needed"
-msgstr "3: 8888, colori migliori, richiede più ram"
+#: ../win32/gui/plugin.c:327
+msgid "Error Closing GPU Plugin"
+msgstr "Si è verificato un errore durante la chiusura del plugin della GPU"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:182
-msgid "4: BGR8888 - Faster on some cards"
-msgstr "4: BGR8888, velocissimo su alcune schede"
+#: ../win32/gui/plugin.c:329
+msgid "Error Closing SPU Plugin"
+msgstr "Si è verificato un errore durante la chiusura del plugin della SPU"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:193
-msgid "VRam size in MBytes (0..1024, 0=auto):"
-msgstr "Dimensione della VRam in MByte (0..1024, 0=auto):"
+#: ../win32/gui/plugin.c:332
+#, fuzzy
+msgid "Error Closing SIO1 plugin"
+msgstr "Si è verificato un errore durante la chiusura del plugin della SPU"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:210
-#: ../plugins/peopsxgl/gpucfg/interface.c:225
-msgid "0: None"
-msgstr "0: Nessuno"
+#: ../win32/gui/plugin.c:354
+#, c-format
+msgid "CDRinit error: %d"
+msgstr "CDRinit errore: %d"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:211
-msgid "1: Standard - Glitches will happen"
-msgstr "1: Standard, si verificheranno dei disturbi"
+#: ../win32/gui/plugin.c:356
+#, c-format
+msgid "GPUinit error: %d"
+msgstr "GPUinit errore: %d"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:212
-msgid "2: Extended - No black borders"
-msgstr "2: Esteso, senza bordi neri"
+#: ../win32/gui/plugin.c:358
+#, c-format
+msgid "SPUinit error: %d"
+msgstr "SPUinit errore: %d"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:213
-msgid "3: Standard without sprites - unfiltered 2D"
-msgstr "3: Standard senza immagini, 2D non filtrato"
+#: ../win32/gui/plugin.c:360
+#, c-format
+msgid "PAD1init error: %d"
+msgstr "PAD1init errore: %d"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:214
-msgid "4: Extended without sprites - unfiltered 2D"
-msgstr "4: Esteso senza immagini, 2D non filtrato"
+#: ../win32/gui/plugin.c:362
+#, c-format
+msgid "PAD2init error: %d"
+msgstr "PAD2init errore: %d"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:215
-msgid "5: Standard + smoothed sprites"
-msgstr "5: Standard + immagini uniformi"
+#: ../win32/gui/plugin.c:365
+#, fuzzy, c-format
+msgid "SIO1init error: %d"
+msgstr "SPUinit errore: %d"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:216
-msgid "6: Extended + smoothed sprites"
-msgstr "6: Esteso + immagini uniformi"
+#: ../win32/gui/plugin.c:370
+#, c-format
+msgid "NETinit error: %d"
+msgstr "NETinit errore: %d"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:227
-msgid "Filtering:"
-msgstr "Filtraggio:"
+#: ../win32/gui/WndMain.c:77
+msgid "Arabic"
+msgstr "Arabo"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:235
-msgid "HiRes Tex:"
-msgstr "Struttura ad alta risoluzione:"
+#: ../win32/gui/WndMain.c:78
+msgid "Catalan"
+msgstr "Catalano"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:252
-#: ../plugins/peopsxgl/gpucfg/interface.c:263
-msgid "0: None (standard)"
-msgstr "0: Nessuno (standard)"
+#: ../win32/gui/WndMain.c:79
+msgid "German"
+msgstr "Tedesco"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:253
-msgid "1: 2xSaI (much vram needed)"
-msgstr "1: 2xSaI (richiede più vram)"
+#: ../win32/gui/WndMain.c:80
+msgid "Greek"
+msgstr "Greco"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:254
-msgid "2: Scaled (needs tex filtering)"
-msgstr "2: Scalato (necessita del filtraggio della struttura)"
+#: ../win32/gui/WndMain.c:81 ../win32/gui/WndMain.c:1699
+#: ../win32/gui/WndMain.c:1701
+msgid "English"
+msgstr "Inglese"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:265
-msgid "Window options"
-msgstr "Opzioni della finestra"
+#: ../win32/gui/WndMain.c:82
+msgid "Spanish"
+msgstr "Spagnolo"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:296
-msgid "Width:"
-msgstr "Larghezza:"
+#: ../win32/gui/WndMain.c:83
+msgid "French"
+msgstr "Francese"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:305
-msgid "Height:"
-msgstr "Altezza:"
+#: ../win32/gui/WndMain.c:84
+msgid "Italian"
+msgstr "Italiano"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:314
-msgid "Keep psx aspect ratio"
-msgstr "Mantiene la proporzione dell'aspetto della psx"
+#: ../win32/gui/WndMain.c:85
+msgid "Portuguese"
+msgstr "Portoghese"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:330
-msgid "Dithering"
-msgstr "Retinatura"
+#: ../win32/gui/WndMain.c:86
+msgid "Portuguese (Brazilian)"
+msgstr "Portoghese (Brasiliano)"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:346
-msgid "Framerate"
-msgstr "Framerate"
+#: ../win32/gui/WndMain.c:87
+msgid "Romanian"
+msgstr "Rumeno"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:369
-msgid "FPS"
-msgstr "FPS"
+#: ../win32/gui/WndMain.c:88
+msgid "Russian"
+msgstr "Russo"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:377
-msgid "FPS limit manual"
-msgstr "Limite manuale degli FPS"
+#: ../win32/gui/WndMain.c:89
+msgid "Simplified Chinese"
+msgstr "Cinese semplificato"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:386
-msgid "Show FPS display on startup"
-msgstr "Visualizza gli FPS all'avvio"
+#: ../win32/gui/WndMain.c:90
+msgid "Traditional Chinese"
+msgstr "Cinese tradizionale"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:394
-msgid "Use FPS limit"
-msgstr "Usa il limite degli FPS"
+#: ../win32/gui/WndMain.c:91
+msgid "Japanese"
+msgstr "Giapponese"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:402
-msgid "FPS limit auto-detection"
-msgstr "Autorilevamento del limite degli FPS"
+#: ../win32/gui/WndMain.c:92
+msgid "Korean"
+msgstr "Coreano"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:411
-msgid "Use Frame skipping"
-msgstr "Usa il salto dei frame"
+#: ../win32/gui/WndMain.c:215
+msgid ""
+"Usage: pcsxr [options]\n"
+"\toptions:\n"
+"\t-nogui\t\tDon't open the GUI\n"
+"\t-psxout\t\tEnable PSX output\n"
+"\t-slowboot\tEnable BIOS logo\n"
+"\t-runcd\t\tRuns CD-ROM (requires -nogui)\n"
+"\t-cdfile FILE\tRuns a CD image file (requires -nogui)\n"
+"\t-help\t\tDisplay this message"
+msgstr ""
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:419
-msgid "Compatibility"
-msgstr "Compatibilità"
+#: ../win32/gui/WndMain.c:350 ../win32/gui/WndMain.c:396
+msgid "PCSXR State Format"
+msgstr "Formato dei salvataggi di PCSXR"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:434
-msgid "Advanced blending (Accurate psx color emulation)"
-msgstr "Mescolamento avanzato (emulazione accurata del colore della psx)"
+#: ../win32/gui/WndMain.c:377
+#, c-format
+msgid "*PCSXR*: Loaded State %s"
+msgstr "*PCSXR*: è stato caricato lo stato %s"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:442
-msgid "Framebuffer textures:"
-msgstr "Strutture del framebuffer:"
+#: ../win32/gui/WndMain.c:378
+#, c-format
+msgid "*PCSXR*: Error Loading State %s"
+msgstr ""
+"*PCSXR*: si è verificato un errore durante il caricamento dello stato %s"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:450
-msgid "Offscreen Drawing:"
-msgstr "Disegno fuori schermo:"
+#: ../win32/gui/WndMain.c:423
+#, c-format
+msgid "*PCSXR*: Saved State %s"
+msgstr "*PCSXR*: è stato salvato lo stato %s"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:458
-msgid "Framebuffer access:"
-msgstr "Accesso del framebuffer:"
+#: ../win32/gui/WndMain.c:424
+#, c-format
+msgid "*PCSXR*: Error Saving State %s"
+msgstr ""
+"*PCSXR*: si è verificato un errore durante il salvataggio dello stato %s"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:466
-msgid "Alpha Multipass (correct opaque texture areas)"
-msgstr "Alpha Multipass (corregge le aree opache della struttura)"
+#: ../win32/gui/WndMain.c:493
+msgid "Running BIOS is not supported with Internal HLE Bios."
+msgstr "L'avvio del BIOS non è supportato dal bios interno HLE."
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:474
-msgid "Mask bit detection (needed by a few games, zbuffer)"
-msgstr "Rilevazione del bit mask (richiesto da pochi giochi, zbuffer)"
+#: ../win32/gui/WndMain.c:790
+msgid "Game ID"
+msgstr "ID del gioco"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:491
-#: ../plugins/peopsxgl/gpucfg/interface.c:504
-msgid "0: None - Fastest, most glitches"
-msgstr "0: Nessuno, velocissimo, più disturbi"
+#: ../win32/gui/WndMain.c:796
+msgid "Game"
+msgstr "Gioco"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:492
-msgid "1: Minimum - Missing screens"
-msgstr "1: Minimo, schermi mancanti"
+#: ../win32/gui/WndMain.c:978
+msgid "mid link block"
+msgstr "mid link block"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:493
-msgid "2: Standard - OK for most games"
-msgstr "2: Standard, va bene per la maggior parte dei giochi"
+#: ../win32/gui/WndMain.c:981
+msgid "terminiting link block"
+msgstr "terminiting link block"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:494
-msgid "3: Enhanced - Shows more stuff"
-msgstr "3: Migliorato, visualizza più cose"
+#: ../win32/gui/WndMain.c:1086
+msgid "Memcard Manager"
+msgstr "Gestore della memory card"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:495
-msgid "4: Extended - Causing garbage"
-msgstr "4: Esteso, produce risultati poco apprezzabili"
+#: ../win32/gui/WndMain.c:1090 ../win32/gui/WndMain.c:1093
+msgid "Select Mcd"
+msgstr "Seleziona la memory card"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:515
-#: ../plugins/peopsxgl/gpucfg/interface.c:527
-msgid "0: Emulated vram - Needs FVP"
-msgstr "0: Vram emulata, richiede FVP"
+#: ../win32/gui/WndMain.c:1091 ../win32/gui/WndMain.c:1094
+msgid "Format Mcd"
+msgstr "Formatta la memory card"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:516
-msgid "1: Black - Fast, no effects"
-msgstr "1: Nero, veloce, nessun effetto"
+#: ../win32/gui/WndMain.c:1092 ../win32/gui/WndMain.c:1095
+msgid "Reload Mcd"
+msgstr "Ricarica la memory card"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:517
-msgid "2: Gfx card buffer - Can be slow"
-msgstr "2: Gfx card buffer, può essere lento"
+#: ../win32/gui/WndMain.c:1096
+msgid "-> Copy ->"
+msgstr "-> Copia ->"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:518
-msgid "3: Gfx card & soft - slow"
-msgstr "3: Gfx card e soft, lento"
+#: ../win32/gui/WndMain.c:1097
+msgid "<- Copy <-"
+msgstr "<- Copia <-"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:538
-#: ../plugins/peopsxgl/gpucfg/interface.c:551
-msgid "0: Emulated vram - ok most times"
-msgstr "0: Vram emulata, funziona quasi sempre bene"
+#: ../win32/gui/WndMain.c:1098
+msgid "Paste"
+msgstr "Incolla"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:539
-msgid "1: Gfx card buffer reads"
-msgstr "1: Legge il buffer Gfx della scheda"
+#: ../win32/gui/WndMain.c:1099
+msgid "<- Un/Delete"
+msgstr "<- Non/Elimina"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:540
-msgid "2: Gfx card buffer moves"
-msgstr "2: Sposta il buffer Gfx della scheda"
+#: ../win32/gui/WndMain.c:1100
+msgid "Un/Delete ->"
+msgstr "Non/Elimina ->"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:541
-msgid "3: Gfx buffer reads & moves"
-msgstr "3: Legge e sposta il buffer Gfx"
+#: ../win32/gui/WndMain.c:1102
+msgid "Memory Card 1"
+msgstr "Memory card 1"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:542
-msgid "4: Full Software (FVP)"
-msgstr "4: Software completo (FVP)"
+#: ../win32/gui/WndMain.c:1103
+msgid "Memory Card 2"
+msgstr "Memory card 2"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:553
-msgid "Special game fixes"
-msgstr "Attiva il gioco speciale"
+#: ../win32/gui/WndMain.c:1158
+msgid "Are you sure you want to paste this selection?"
+msgstr "Sei sicuro di voler incollare questa selezione?"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:576
-msgid "Battle cursor (FF7)"
-msgstr "Cursore della battaglia (Final Fantasy 7)"
+#: ../win32/gui/WndMain.c:1158 ../win32/gui/WndMain.c:1269
+#: ../win32/gui/WndMain.c:1276
+msgid "Confirmation"
+msgstr "Conferma"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:584
-msgid "Direct FB updates"
-msgstr "Aggiornamenti del Direct FB"
+#: ../win32/gui/WndMain.c:1269 ../win32/gui/WndMain.c:1276
+msgid "Are you sure you want to format this Memory Card?"
+msgstr "Sei sicuro di voler formattare questa memory card?"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:592
-msgid "Black brightness (Lunar)"
-msgstr "Luminosità bassa (Lunar)"
+#: ../win32/gui/WndMain.c:1322
+msgid "Cpu Config"
+msgstr "Configurazione della Cpu"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:600
-msgid "Swap front detection"
-msgstr "Rilevamento dell'inversione frontale"
+#: ../win32/gui/WndMain.c:1327
+msgid "Disable Xa Decoding"
+msgstr "Disabilita il decoding Xa"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:608
-msgid "Disable coord check"
-msgstr "Disabilita il controllo della coordinata"
+#: ../win32/gui/WndMain.c:1328
+msgid "Sio Irq Always Enabled"
+msgstr "Sio irq sempre abilitato"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:616
-msgid "No blue glitches (LoD)"
-msgstr "Senza spurie blu (Legend of Dragoon)"
+#: ../win32/gui/WndMain.c:1329
+msgid "Black && White Movies"
+msgstr "Filmati in bianco e nero"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:624
-msgid "Soft FB access"
-msgstr "Accesso al FB via software"
+#: ../win32/gui/WndMain.c:1330
+msgid "Disable Cd audio"
+msgstr "Disabilita cd audio"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:632
-msgid "PC fps calculation"
-msgstr "Calcolo degli fps del PC"
+#: ../win32/gui/WndMain.c:1333
+msgid "Enable Interpreter Cpu"
+msgstr "Abilita l'interprete della cpu"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:648
-msgid "Yellow rect (FF9)"
-msgstr "Rettangolo giallo (Final Fantasy 9)"
+#: ../win32/gui/WndMain.c:1336
+msgid "Spu Irq Always Enabled"
+msgstr "Spu irq sempre abilitato"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:656
-msgid "No subtr. blending"
-msgstr "Senza sottrazione nella fusione"
+#: ../win32/gui/WndMain.c:1340
+msgid "Hide cursor"
+msgstr ""
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:664
-msgid "Lazy upload (DW7)"
-msgstr "Upload pigro (Dragon Warrior 7)"
+#: ../win32/gui/WndMain.c:1343
+msgid "Psx System Type"
+msgstr "Regione del sistema"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:672
-msgid "Odd/even hack"
-msgstr "Hack del dispari/pari"
+#: ../win32/gui/WndMain.c:1453
+msgid "Psx Mcd Format (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
+msgstr ""
+"Formato memory card della psx (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:680
-msgid "Adjust screen width"
-msgstr "Aggiusta la larghezza dello schermo"
+#: ../win32/gui/WndMain.c:1458
+msgid "Psx Memory Card (*.mcr;*.mc)"
+msgstr "Memory card psx (*.mcr;*.mc)"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:688
-msgid "Old texture filtering"
-msgstr "Filtraggio della struttura vecchia"
+#: ../win32/gui/WndMain.c:1463
+msgid "CVGS Memory Card (*.mem;*.vgs)"
+msgstr "Memory card CVSG (*.mem;*.vgs)"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:696
-msgid "Additional uploads"
-msgstr "Invio di dati addizionali"
+#: ../win32/gui/WndMain.c:1468
+msgid "Bleem Memory Card (*.mcd)"
+msgstr "Memory card bleem (*.mcd)"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:704
-msgid "unused"
-msgstr "Inutilizzato"
+#: ../win32/gui/WndMain.c:1473
+msgid "DexDrive Memory Card (*.gme)"
+msgstr "Memory card DexDrive (*.gme)"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:712
-msgid "Fake 'gpu busy'"
-msgstr "Simula lo stato di 'gpu occupata'"
+#: ../win32/gui/WndMain.c:1478
+msgid "DataDeck Memory Card (*.ddf)"
+msgstr "Memory card DataDeck (*.ddf)"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:720
-msgid "Misc"
-msgstr "Varie"
+#: ../win32/gui/WndMain.c:1522
+msgid "Psx Exe Format"
+msgstr "Formato exe della Psx"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:743
-msgid "Scanlines"
-msgstr "Scanlines"
+#: ../win32/gui/WndMain.c:1559
+#, fuzzy
+msgid "Psx Isos (*.iso;*.mdf;*.img;*.bin;*.cue;*.pbp;*.cbn)"
+msgstr "ISO della psx (*.iso;*.mdf;*.img;*.bin)"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:751
-msgid "Blending (0..255, -1=dot):"
-msgstr "Fusione (0..255, -1=punto):"
+#: ../win32/gui/WndMain.c:1635
+msgid "&File"
+msgstr "&File"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:759
-msgid "Screen smoothing (can be slow or unsupported)"
-msgstr "Schermo uniforme (può essere lento o non supportato)"
+#: ../win32/gui/WndMain.c:1636
+msgid "E&xit"
+msgstr "E&sci"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:767
-msgid "Use OpenGL extensions (recommended)"
-msgstr "Usa le estensioni OpenGL (consigliato)"
+#: ../win32/gui/WndMain.c:1638
+msgid "Run &EXE..."
+msgstr "Avvia &EXE..."
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:775
-msgid "Polygon anti-aliasing (slow with most cards)"
-msgstr "Poligono anti-aliasing (lento con la maggior parte delle schede)"
+#: ../win32/gui/WndMain.c:1639
+msgid "Run &BIOS"
+msgstr "Avvia &BIOS"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:783
-msgid "Line mode (polygons will not get filled)"
-msgstr "Modalità linea (i poligoni non saranno riempiti)"
+#: ../win32/gui/WndMain.c:1640
+msgid "Run &ISO..."
+msgstr "Avvia &ISO..."
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:791
-msgid "Force 15 bit framebuffer updates (faster movies)"
-msgstr "Forza a 15 bit gli aggiornamenti del framebuffer (filmati velocissimi)"
+#: ../win32/gui/WndMain.c:1641
+msgid "Run &CD"
+msgstr "Avvia &CD"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:799
-msgid "Unfiltered MDECs (small movie speedup)"
-msgstr "MDECs non filtrati (basso guadagno di velocità nei filmati)"
+#: ../win32/gui/WndMain.c:1643
+msgid "&Emulator"
+msgstr "&Emulatore"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:852
-msgid "Adapted from P.E.Op.S OpenGL GPU by Pete Bernert"
-msgstr "Adattato da P.E.Op.S OpenGL GPU da Pete Bernert"
+#: ../win32/gui/WndMain.c:1644
+msgid "&States"
+msgstr "&Stati"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:861
-msgid "Homepage: http://www.pbernert.com"
-msgstr "Homepage: http://www.pbernert.com"
+#: ../win32/gui/WndMain.c:1646
+msgid "S&witch ISO..."
+msgstr "C&ambia ISO..."
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:879
-msgid "Version: 1.78"
-msgstr "Versione: 1.78"
+#: ../win32/gui/WndMain.c:1648
+#, fuzzy
+msgid "S&hutdown"
+msgstr "In basso a destra"
 
-#: ../plugins/dfinput/cfg-gtk2.c:48
-msgid "D-Pad Up"
-msgstr "D-Pad Su"
+#: ../win32/gui/WndMain.c:1649
+msgid "Re&set"
+msgstr "Re&setta"
 
-#: ../plugins/dfinput/cfg-gtk2.c:49
-msgid "D-Pad Down"
-msgstr "D-Pad Giù"
+#: ../win32/gui/WndMain.c:1650
+msgid "&Run"
+msgstr "&Avvia"
 
-#: ../plugins/dfinput/cfg-gtk2.c:50
-msgid "D-Pad Left"
-msgstr "D-Pad Sinistra"
+#: ../win32/gui/WndMain.c:1651
+msgid "&Save"
+msgstr "&Salva"
 
-#: ../plugins/dfinput/cfg-gtk2.c:51
-msgid "D-Pad Right"
-msgstr "D-Pad Destra"
+#: ../win32/gui/WndMain.c:1652
+msgid "&Load"
+msgstr "&Carica"
 
-#: ../plugins/dfinput/cfg-gtk2.c:52
-msgid "Cross"
-msgstr "Croce"
+#: ../win32/gui/WndMain.c:1653 ../win32/gui/WndMain.c:1663
+msgid "&Other..."
+msgstr "&Altro..."
 
-#: ../plugins/dfinput/cfg-gtk2.c:53
-msgid "Circle"
-msgstr "Cerchio"
+#: ../win32/gui/WndMain.c:1654 ../win32/gui/WndMain.c:1664
+#, fuzzy
+msgid "Slot &9"
+msgstr "Slot &5"
 
-#: ../plugins/dfinput/cfg-gtk2.c:54
-msgid "Square"
-msgstr "Quadrato"
+#: ../win32/gui/WndMain.c:1655 ../win32/gui/WndMain.c:1665
+#, fuzzy
+msgid "Slot &8"
+msgstr "Slot &5"
 
-#: ../plugins/dfinput/cfg-gtk2.c:55
-msgid "Triangle"
-msgstr "Triangolo"
+#: ../win32/gui/WndMain.c:1656 ../win32/gui/WndMain.c:1666
+#, fuzzy
+msgid "Slot &7"
+msgstr "Slot &5"
 
-#: ../plugins/dfinput/cfg-gtk2.c:56
-msgid "L1"
-msgstr "L1"
+#: ../win32/gui/WndMain.c:1657 ../win32/gui/WndMain.c:1667
+#, fuzzy
+msgid "Slot &6"
+msgstr "Slot &5"
 
-#: ../plugins/dfinput/cfg-gtk2.c:57
-msgid "R1"
-msgstr "R1"
+#: ../win32/gui/WndMain.c:1658 ../win32/gui/WndMain.c:1668
+msgid "Slot &5"
+msgstr "Slot &5"
 
-#: ../plugins/dfinput/cfg-gtk2.c:58
-msgid "L2"
-msgstr "L2"
+#: ../win32/gui/WndMain.c:1659 ../win32/gui/WndMain.c:1669
+msgid "Slot &4"
+msgstr "Slot &4"
 
-#: ../plugins/dfinput/cfg-gtk2.c:59
-msgid "R2"
-msgstr "R2"
+#: ../win32/gui/WndMain.c:1660 ../win32/gui/WndMain.c:1670
+msgid "Slot &3"
+msgstr "Slot &3"
 
-#: ../plugins/dfinput/cfg-gtk2.c:60
-msgid "Select"
-msgstr "Tasto Select"
+#: ../win32/gui/WndMain.c:1661 ../win32/gui/WndMain.c:1671
+msgid "Slot &2"
+msgstr "Slot &2"
 
-#: ../plugins/dfinput/cfg-gtk2.c:61
-msgid "Start"
-msgstr "Tasto Start"
+#: ../win32/gui/WndMain.c:1662 ../win32/gui/WndMain.c:1672
+msgid "Slot &1"
+msgstr "Slot &1"
 
-#: ../plugins/dfinput/cfg-gtk2.c:62
-msgid "L3"
-msgstr "L3"
+#: ../win32/gui/WndMain.c:1674
+msgid "&Configuration"
+msgstr "&Configurazione"
 
-#: ../plugins/dfinput/cfg-gtk2.c:63
-msgid "R3"
-msgstr "R3"
+#: ../win32/gui/WndMain.c:1675
+msgid "Cheat &Search..."
+msgstr "Cerca &cheat..."
 
-#: ../plugins/dfinput/cfg-gtk2.c:67
-msgid "L-Stick Right"
-msgstr "L-Stick Destra"
+#: ../win32/gui/WndMain.c:1676
+msgid "Ch&eat Code..."
+msgstr "Codice ch&eat..."
 
-#: ../plugins/dfinput/cfg-gtk2.c:68
-msgid "L-Stick Left"
-msgstr "L-Stick Sinistra"
+#: ../win32/gui/WndMain.c:1679
+msgid "&Language"
+msgstr "&Lingua"
 
-#: ../plugins/dfinput/cfg-gtk2.c:69
-msgid "L-Stick Down"
-msgstr "L-Stick Giù"
+#: ../win32/gui/WndMain.c:1705
+msgid "&Memory cards..."
+msgstr "&Memory card..."
 
-#: ../plugins/dfinput/cfg-gtk2.c:70
-msgid "L-Stick Up"
-msgstr "L-Stick Su"
+#: ../win32/gui/WndMain.c:1706
+msgid "C&PU..."
+msgstr "C&PU..."
 
-#: ../plugins/dfinput/cfg-gtk2.c:71
-msgid "R-Stick Right"
-msgstr "R-Stick Destra"
+#: ../win32/gui/WndMain.c:1708
+msgid "&NetPlay..."
+msgstr "&NetPlay..."
 
-#: ../plugins/dfinput/cfg-gtk2.c:72
-msgid "R-Stick Left"
-msgstr "R-Stick Sinistra"
+#: ../win32/gui/WndMain.c:1710
+#, fuzzy
+msgid "&Link cable..."
+msgstr "Abilita"
 
-#: ../plugins/dfinput/cfg-gtk2.c:73
-msgid "R-Stick Down"
-msgstr "R-Stick Giù"
+#: ../win32/gui/WndMain.c:1711
+msgid "&Controllers..."
+msgstr "&Controller..."
 
-#: ../plugins/dfinput/cfg-gtk2.c:74
-msgid "R-Stick Up"
-msgstr "R-Stick Su"
+#: ../win32/gui/WndMain.c:1712
+msgid "CD-&ROM..."
+msgstr "CD-&ROM..."
 
-#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
-msgid "Centered"
-msgstr "Centrato"
+#: ../win32/gui/WndMain.c:1713
+msgid "&Sound..."
+msgstr "&Audio..."
 
-#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
-msgid "Up"
-msgstr "Su"
+#: ../win32/gui/WndMain.c:1714
+msgid "&Graphics..."
+msgstr "&Video..."
 
-#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
-msgid "Right"
-msgstr "Destra"
+#: ../win32/gui/WndMain.c:1716
+msgid "&Plugins && Bios..."
+msgstr "&Plugin e Bios..."
 
-#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
-msgid "Rightup"
-msgstr "In alto a destra"
+#: ../win32/gui/WndMain.c:1718
+msgid "&Help"
+msgstr "&Aiuto"
 
-#: ../plugins/dfinput/cfg-gtk2.c:104 ../plugins/dfinput/cfg-gtk2.c:143
-msgid "Down"
-msgstr "Giù"
+#: ../win32/gui/WndMain.c:1719
+msgid "&About..."
+msgstr "&Informazioni..."
 
-#: ../plugins/dfinput/cfg-gtk2.c:104 ../plugins/dfinput/cfg-gtk2.c:143
-msgid "Rightdown"
-msgstr "In basso a destra"
+#: ../win32/gui/WndMain.c:1870
+msgid "Pcsxr Msg"
+msgstr "Messaggio di pcsxr"
 
-#: ../plugins/dfinput/cfg-gtk2.c:104 ../plugins/dfinput/cfg-gtk2.c:143
-msgid "Left"
-msgstr "Sinistra"
+#: ../win32/gui/WndMain.c:1873
+msgid "Error Loading Symbol"
+msgstr "Si è verificato un errore durante il caricamento del simbolo"
 
-#: ../plugins/dfinput/cfg-gtk2.c:104 ../plugins/dfinput/cfg-gtk2.c:143
-msgid "Leftup"
-msgstr "In alto a sinistra"
+#~ msgid "Controller 1: "
+#~ msgstr "Controller 1: "
 
-#: ../plugins/dfinput/cfg-gtk2.c:105 ../plugins/dfinput/cfg-gtk2.c:144
-msgid "Leftdown"
-msgstr "In basso a sinistra"
+#, fuzzy
+#~ msgid "Sio1 Driver"
+#~ msgstr "Driver SoftGL"
 
-#: ../plugins/dfinput/cfg-gtk2.c:109 ../plugins/dfinput/cfg-gtk2.c:148
-#, c-format
-msgid "Joystick: Button %d"
-msgstr "Joystick: Pulsante %d"
+#~ msgid ""
+#~ "8-bit\n"
+#~ "16-bit\n"
+#~ "32-bit"
+#~ msgstr ""
+#~ "8-bit\n"
+#~ "16-bit\n"
+#~ "32-bit"
 
-#: ../plugins/dfinput/cfg-gtk2.c:113 ../plugins/dfinput/cfg-gtk2.c:152
-#, c-format
-msgid "Joystick: Axis %d%c"
-msgstr "Joystick: Asse %d%c"
+#~ msgid "CD-ROM..."
+#~ msgstr "CD-ROM..."
 
-#: ../plugins/dfinput/cfg-gtk2.c:118 ../plugins/dfinput/cfg-gtk2.c:157
-#, c-format
-msgid "Joystick: Hat %d %s"
-msgstr "Joystick: hat %d %s"
+#~ msgid "Continue..."
+#~ msgstr "Continua..."
 
-#: ../plugins/dfinput/cfg-gtk2.c:133 ../plugins/dfinput/cfg-gtk2.c:172
-msgid "Keyboard:"
-msgstr "Tastiera:"
+#~ msgid "Controllers..."
+#~ msgstr "Controller..."
 
-#: ../plugins/dfinput/cfg-gtk2.c:137 ../plugins/dfinput/cfg-gtk2.c:176
-msgid "(Not Set)"
-msgstr "(Nessuna impostazione)"
+#~ msgid ""
+#~ "Decimal\n"
+#~ "Hexadecimal"
+#~ msgstr ""
+#~ "Decimale\n"
+#~ "Esadecimale"
 
-#: ../plugins/dfinput/cfg-gtk2.c:539
-msgid "None"
-msgstr "Nessuno"
+#~ msgid ""
+#~ "Equal Value\n"
+#~ "Not Equal Value\n"
+#~ "Range\n"
+#~ "Increased By\n"
+#~ "Decreased By\n"
+#~ "Increased\n"
+#~ "Decreased\n"
+#~ "Different\n"
+#~ "No Change"
+#~ msgstr ""
+#~ "Stesso valore\n"
+#~ "Valore diverso\n"
+#~ "Scala\n"
+#~ "Incrementato da\n"
+#~ "Decrementato da\n"
+#~ "Incrementato\n"
+#~ "Decrementato\n"
+#~ "Differente\n"
+#~ "Nessun cambio"
 
-#: ../plugins/dfinput/cfg-gtk2.c:581
-msgid "Gamepad/Keyboard Input Configuration"
-msgstr "Configurazione input del gamepad/tastiera"
+#~ msgid "Graphics..."
+#~ msgstr "Video..."
 
-#: ../plugins/dfinput/cfg-gtk2.c:587 ../plugins/dfinput/cfg-gtk2.c:607
-msgid "Key"
-msgstr "Tasto"
+#~ msgid "Memcards..."
+#~ msgstr "Memory card..."
 
-#: ../plugins/dfinput/cfg-gtk2.c:593 ../plugins/dfinput/cfg-gtk2.c:613
-msgid "Button"
-msgstr "Pulsante"
+#~ msgid "Run ISO..."
+#~ msgstr "Avvia ISO..."
 
-#: ../plugins/dfinput/pad.c:22
-msgid "Gamepad/Keyboard Input"
-msgstr "Input del gamepad/tastiera"
+#~ msgid "Sound..."
+#~ msgstr "Audio..."
 
-#: ../plugins/dfinput/dfinput.glade2:35 ../plugins/dfinput/dfinput.glade2:232
-msgid "Device:"
-msgstr "Dispositivo:"
+#~ msgid "Switch ISO..."
+#~ msgstr "Cambia ISO..."
 
-#: ../plugins/dfinput/dfinput.glade2:66 ../plugins/dfinput/dfinput.glade2:263
-msgid "Type:"
-msgstr "Tipo:"
+#~ msgid "Error: Glade interface could not be loaded!"
+#~ msgstr "Errore: impossibile caricare l'interfaccia di glade!"
 
-#: ../plugins/dfinput/dfinput.glade2:78 ../plugins/dfinput/dfinput.glade2:275
-msgid ""
-"Digital Pad\n"
-"Analog Pad"
-msgstr ""
-"Pad digitale\n"
-"Pad analogico"
+#~ msgid ""
+#~ "0: None\n"
+#~ "1: 2xSai\n"
+#~ "2: 2xSuperSai\n"
+#~ "3: SuperEagle\n"
+#~ "4: Scale2x\n"
+#~ "5: Scale3x\n"
+#~ "6: HQ2X\n"
+#~ "7: HQ3X"
+#~ msgstr ""
+#~ "0: Nessuno\n"
+#~ "1: 2xSai\n"
+#~ "2: 2xSuperSai\n"
+#~ "3: SuperEagle\n"
+#~ "4: Scala2x\n"
+#~ "5: Scala3x\n"
+#~ "6: HQ2X\n"
+#~ "7: HQ3X"
 
-#: ../plugins/dfinput/dfinput.glade2:149 ../plugins/dfinput/dfinput.glade2:346
-msgid "Change"
-msgstr "Cambia"
+#~ msgid ""
+#~ "0: Off (fastest)\n"
+#~ "1: Game dependant\n"
+#~ "2: Always"
+#~ msgstr ""
+#~ "0: Disattivato (più veloce)\n"
+#~ "1: Dipendente dal gioco\n"
+#~ "2: Sempre"
 
-#: ../plugins/dfinput/dfinput.glade2:185 ../plugins/dfinput/dfinput.glade2:382
-msgid "Reset"
-msgstr "Resetta"
+#~ msgid ""
+#~ "320x240\n"
+#~ "640x480\n"
+#~ "800x600\n"
+#~ "1024x768\n"
+#~ "1152x864\n"
+#~ "1280x1024\n"
+#~ "1600x1200"
+#~ msgstr ""
+#~ "320x240\n"
+#~ "640x480\n"
+#~ "800x600\n"
+#~ "1024x768\n"
+#~ "1152x864\n"
+#~ "1280x1024\n"
+#~ "1600x1200"
 
-#: ../plugins/dfinput/dfinput.glade2:210
-msgid "Controller 1"
-msgstr "Controller 1"
+#~ msgid "Compatibility"
+#~ msgstr "Compatibilità"
 
-#: ../plugins/dfinput/dfinput.glade2:412
-msgid "Controller 2"
-msgstr "Controller 2"
+#~ msgid "Framerate"
+#~ msgstr "Framerate"
 
-#: ../plugins/dfinput/dfinput.glade2:427
-msgid "Multi-Threaded (Recommended)"
-msgstr "Multi-Threaded (consigliato)"
+#~ msgid "Screen"
+#~ msgstr "Schermo"
 
-#: ../plugins/dfnet/dfnet.c:23
-#, fuzzy
-msgid "Socket Driver"
-msgstr "Driver SoftGL"
+#~ msgid "General"
+#~ msgstr "Generale"
 
-#: ../plugins/dfnet/dfnet.c:161
-#, fuzzy, c-format
-msgid "error connecting to %s: %s\n"
-msgstr "Si è verificato un errore durante il caricamento di %s: %s"
+#~ msgid "XA Music"
+#~ msgstr "Musica XA"
 
-#: ../plugins/dfnet/dfnet.c:186
 #, fuzzy
-msgid "Error allocating memory!\n"
-msgstr "Si è verificato un errore durante l'allocazione della memoria!"
-
-#: ../plugins/dfnet/gui.c:39
-msgid "Nothing to configure"
-msgstr ""
+#~ msgid ""
+#~ "None\n"
+#~ "Low\n"
+#~ "Medium\n"
+#~ "Loud\n"
+#~ "Loudest"
+#~ msgstr ""
+#~ "Basso\n"
+#~ "Medio\n"
+#~ "Alto\n"
+#~ "Altissimo"
 
-#: ../plugins/dfnet/gui.c:95
-#, c-format
-msgid "IP %s"
-msgstr ""
+#~ msgid ""
+#~ "None\n"
+#~ "Simple\n"
+#~ "Gaussian\n"
+#~ "Cubic"
+#~ msgstr ""
+#~ "Nessuno\n"
+#~ "Semplice\n"
+#~ "Gaussiano\n"
+#~ "Cubico"
 
-#: ../plugins/dfnet/gui.c:165
-msgid "Waiting for connection..."
-msgstr ""
+#~ msgid ""
+#~ "Default\n"
+#~ "125ms\n"
+#~ "250ms\n"
+#~ "500ms\n"
+#~ "1s\n"
+#~ "2s\n"
+#~ "4s\n"
+#~ "8s\n"
+#~ "16s\n"
+#~ "32s\n"
+#~ "1min\n"
+#~ "2min\n"
+#~ "4min\n"
+#~ "8min\n"
+#~ "16min\n"
+#~ "32min"
+#~ msgstr ""
+#~ "Default\n"
+#~ "125ms\n"
+#~ "250ms\n"
+#~ "500ms\n"
+#~ "1s\n"
+#~ "2s\n"
+#~ "4s\n"
+#~ "8s\n"
+#~ "16s\n"
+#~ "32s\n"
+#~ "1min\n"
+#~ "2min\n"
+#~ "4min\n"
+#~ "8min\n"
+#~ "16min\n"
+#~ "32min"
+
+#~ msgid "Select CD-ROM device"
+#~ msgstr "Seleziona il dispositivo CD-ROM"
+
+#~ msgid "hseparator"
+#~ msgstr "hseparator"
 
-#: ../plugins/dfnet/gui.c:168
-msgid "The Client should now Start a Connection, waiting..."
-msgstr ""
+#, fuzzy
+#~ msgid "10000: unused"
+#~ msgstr "Inutilizzato"
 
-#: ../plugins/dfnet/dfnet.glade2:23
-msgid ""
-"Select here if you'll be Server (Player1) or Client (Player2).\n"
-"\n"
-"If you select Server you must Copy your IP address to the Clipboard and "
-"paste if (Ctrl+V) wherever the Client can see it.\n"
-"\n"
-"If you selected Client please enter the IP address the Server gave to you in "
-"the IP Address Control."
-msgstr ""
+#, fuzzy
+#~ msgid "1000: Odd/even hack"
+#~ msgstr "Hack del dispari/pari"
 
-#: ../plugins/dfnet/dfnet.glade2:63
-msgid "Copy PC IP to Clipboard"
-msgstr ""
+#, fuzzy
+#~ msgid "100: Old frame skipping"
+#~ msgstr "Vecchio salto del frame"
 
-#: ../plugins/dfnet/dfnet.glade2:94
-msgid "Server (Player1)"
-msgstr ""
+#, fuzzy
+#~ msgid "20000: fake 'gpu busy'"
+#~ msgstr "Simula lo stato di 'gpu occupata'"
 
-#: ../plugins/dfnet/dfnet.glade2:104
-msgid "Client (Player2)"
-msgstr ""
+#, fuzzy
+#~ msgid "3: Gfx buffer reads "
+#~ msgstr "3: Legge e sposta il buffer Gfx"
 
-#: ../plugins/dfnet/dfnet.glade2:130
-msgid ""
-"Do not change if not necessary (remember it must be changed on both sides)."
-msgstr ""
+#, fuzzy
+#~ msgid "3: Gfx card "
+#~ msgstr "3: Gfx card e soft, lento"
 
-#: ../plugins/dfnet/dfnet.glade2:143
-msgid "Port Number"
-msgstr ""
+#, fuzzy
+#~ msgid "80: PC fps calculation"
+#~ msgstr "Calcolo degli fps del PC"
 
-#: ../plugins/dfnet/dfnet.glade2:202
 #, fuzzy
-msgid "Start Game"
-msgstr "Tasto Start"
+#~ msgid "Coded by: Pete Bernert"
+#~ msgstr "Pete Bernert"
 
-#: ../plugins/dfnet/dfnet.glade2:240
-msgid "Play Offline"
-msgstr ""
+#~ msgid "Scanlines"
+#~ msgstr "Scanlines"
 
-#: ../plugins/bladesio1/sio1.c:29
 #, fuzzy
-msgid "Sio1 Driver"
-msgstr "Driver SoftGL"
+#~ msgid "http://www.pbernert.com"
+#~ msgstr "Homepage: http://www.pbernert.com"
+
+#~ msgid "COFF files not supported.\n"
+#~ msgstr "File COFF non supportato.\n"
+
+#~ msgid "Adapted from P.E.Op.S OpenGL GPU by Pete Bernert"
+#~ msgstr "Adattato da P.E.Op.S OpenGL GPU da Pete Bernert"
+
+#~ msgid "Version: 1.78"
+#~ msgstr "Versione: 1.78"
 
 #, fuzzy
 #~ msgid "CD-ROM Device Reader"
@@ -3129,12 +3628,12 @@
 #~ msgstr "&Memory card..."
 
 #~ msgid ""
-#~ "(C) 1999-2003 PCSX Team\n"
+#~ "(C) 1999-2003 PCSX Team\n"
 #~ "(C) 2005-2006 Ryan Schultz\n"
 #~ "(C) 2005-2006 Andrew Burton\n"
 #~ "(C) 2008-2009 Wei Mingzhi"
 #~ msgstr ""
-#~ "(C) 1999-2003 PCSX Team\n"
+#~ "(C) 1999-2003 PCSX Team\n"
 #~ "(C) 2005-2006 Ryan Schultz\n"
 #~ "(C) 2005-2006 Andrew Burton\n"
 #~ "(C) 2008-2009 Wei Mingzhi"

pcsxr-1.9.93.tar.bz2/po/pcsxr.pot Added

@@ -0,0 +1,3167 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: whistler_wmz@users.sf.net\n"
+"POT-Creation-Date: 2013-03-02 03:33+0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../data/pcsxr.ui.h:1 ../win32/gui/CheatDlg.c:166
+msgid "Edit Cheat Codes"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:2
+msgid "Cheat Codes"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:3 ../gui/Cheat.c:1113 ../win32/gui/CheatDlg.c:678
+msgid "Cheat Search"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:4 ../win32/gui/CheatDlg.c:680
+msgid "Search For:"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:5 ../win32/gui/CheatDlg.c:681
+msgid "Data Type:"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:6 ../gui/Cheat.c:645 ../win32/gui/CheatDlg.c:506
+#: ../win32/gui/CheatDlg.c:597 ../win32/gui/CheatDlg.c:682
+msgid "Value:"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:7 ../win32/gui/CheatDlg.c:683
+msgid "Data Base:"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:8 ../win32/gui/CheatDlg.c:684
+msgid "To:"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:9 ../win32/gui/CheatDlg.c:504
+msgid "Freeze"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:10 ../win32/gui/CheatDlg.c:595
+msgid "Modify"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:11
+msgid "Copy"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:12
+msgid "label_resultsfound"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:13
+msgid "Search"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:14
+msgid "Restart"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:15
+msgid "Cheat Search"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:16 ../gui/ConfDlg.c:113
+msgid "Configure PCSXR"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:17
+msgid "Graphics:"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:18
+msgid "Sound:"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:19
+msgid "Controller 1:"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:20
+msgid "Controller 2:"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:21
+msgid "CD-ROM:"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:22
+msgid "Search in:"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:23
+msgid "Select Folder to Search"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:24
+msgid "Link cable:"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:25
+msgid "Plugins"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:26
+msgid "BIOS:"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:27
+msgid "BIOS"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:28
+msgid "Configure CPU"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:29
+msgid "SPU IRQ Always Enabled"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:30
+msgid "Black & White Movies"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:31 ../gui/Plugin.c:239
+#, c-format
+msgid "SIO IRQ Always Enabled"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:32
+msgid "Disable XA Decoding"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:33
+msgid "Disable CD Audio"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:34 ../win32/gui/WndMain.c:1331
+msgid "Slow Boot"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:35
+msgid "Enable Interpreter CPU"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:36 ../win32/gui/WndMain.c:1334
+msgid "Enable Console Output"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:37 ../win32/gui/WndMain.c:1335
+msgid "Enable Debugger"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:38 ../win32/gui/WndMain.c:1337
+msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:39 ../win32/gui/WndMain.c:1338
+msgid "InuYasha Sengoku Battle Fix"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:40 ../win32/gui/WndMain.c:1339
+msgid "Widescreen (GTE Hack)"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:41
+msgid "Options"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:42 ../win32/gui/WndMain.c:1332
+msgid "Autodetect"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:43
+msgid "System Type"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:44
+msgid "PCSXR"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:45
+msgid "_File"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:46
+msgid "Run _CD"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:47
+msgid "Run _ISO..."
+msgstr ""
+
+#: ../data/pcsxr.ui.h:48
+msgid "Run _BIOS"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:49
+msgid "Run _EXE..."
+msgstr ""
+
+#: ../data/pcsxr.ui.h:50
+msgid "E_xit"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:51
+msgid "_Emulator"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:52
+msgid "_Continue"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:53
+msgid "_Reset"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:54
+msgid "_Shutdown"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:55
+msgid "S_witch ISO..."
+msgstr ""
+
+#: ../data/pcsxr.ui.h:56
+msgid "_Save State"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:57
+msgid "Slot _1"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:58
+msgid "Slot _2"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:59
+msgid "Slot _3"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:60
+msgid "Slot _4"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:61
+msgid "Slot _5"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:62
+msgid "Slot _6"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:63
+msgid "Slot _7"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:64
+msgid "Slot _8"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:65
+msgid "Slot _9"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:66
+msgid "_Other..."
+msgstr ""
+
+#: ../data/pcsxr.ui.h:67
+msgid "_Load State"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:68
+msgid "_Configuration"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:69
+msgid "_Plugins & BIOS..."
+msgstr ""
+
+#: ../data/pcsxr.ui.h:70
+msgid "_Graphics..."
+msgstr ""
+
+#: ../data/pcsxr.ui.h:71
+msgid "_Sound..."
+msgstr ""
+
+#: ../data/pcsxr.ui.h:72
+msgid "CD-_ROM..."
+msgstr ""
+
+#: ../data/pcsxr.ui.h:73
+msgid "C_ontrollers..."
+msgstr ""
+
+#: ../data/pcsxr.ui.h:74
+msgid "_Link cable..."
+msgstr ""
+
+#: ../data/pcsxr.ui.h:75
+msgid "_Netplay..."
+msgstr ""
+
+#: ../data/pcsxr.ui.h:76
+msgid "_CPU..."
+msgstr ""
+
+#: ../data/pcsxr.ui.h:77
+msgid "_Memory Cards..."
+msgstr ""
+
+#: ../data/pcsxr.ui.h:78
+msgid "Chea_t"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:79
+msgid "_Browse..."
+msgstr ""
+
+#: ../data/pcsxr.ui.h:80
+msgid "_Search..."
+msgstr ""
+
+#: ../data/pcsxr.ui.h:81
+msgid "Memory _Dump"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:82
+msgid "_Help"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:83
+msgid "_About PCSXR..."
+msgstr ""
+
+#: ../data/pcsxr.ui.h:84
+msgid "Run CD"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:85
+msgid "Run ISO Image"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:86
+msgid "Continue Emulation"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:87
+msgid "Switch ISO Image"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:88
+msgid "Configure Memory Cards"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:89
+msgid "Configure Graphics"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:90 ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:1
+msgid "Configure Sound"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:91
+msgid "Configure CD-ROM"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:92
+msgid "Configure Controllers"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:93
+msgid "New"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:94
+msgid "Format"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:95
+msgid "Un/Delete"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:96
+msgid "Memory Card 1"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:97
+msgid "Memory Card 2"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:98 ../gui/DebugMemory.c:119
+msgid "Memory Dump"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:99 ../gui/DebugMemory.c:205
+msgid "Address (Hexadecimal):"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:100
+msgid "Raw Dump..."
+msgstr ""
+
+#: ../data/pcsxr.ui.h:101
+msgid "Patch Memory..."
+msgstr ""
+
+#: ../data/pcsxr.ui.h:102
+msgid "Configure NetPlay"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:103
+msgid "NetPlay"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:104
+msgid "NTSC"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:105
+msgid "PAL"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:106 ../win32/gui/CheatDlg.c:692
+msgid "8-bit"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:107 ../win32/gui/CheatDlg.c:693
+msgid "16-bit"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:108 ../win32/gui/CheatDlg.c:694
+msgid "32-bit"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:109 ../win32/gui/CheatDlg.c:402
+msgid "Equal Value"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:110 ../win32/gui/CheatDlg.c:403
+msgid "Not Equal Value"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:111 ../win32/gui/CheatDlg.c:404
+msgid "Range"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:112 ../win32/gui/CheatDlg.c:407
+msgid "Increased By"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:113 ../win32/gui/CheatDlg.c:408
+msgid "Decreased By"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:114 ../win32/gui/CheatDlg.c:409
+msgid "Increased"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:115 ../win32/gui/CheatDlg.c:410
+msgid "Decreased"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:116 ../win32/gui/CheatDlg.c:411
+msgid "Different"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:117 ../win32/gui/CheatDlg.c:412
+msgid "No Change"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:118 ../win32/gui/CheatDlg.c:695
+msgid "Decimal"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:119 ../win32/gui/CheatDlg.c:696
+msgid "Hexadecimal"
+msgstr ""
+
+#: ../gui/AboutDlg.c:71
+msgid ""
+"(C) 1999-2003 PCSX Team\n"
+"(C) 2005-2009 PCSX-df Team\n"
+"(C) 2009-2011 PCSX-Reloaded Team"
+msgstr ""
+
+#: ../gui/AboutDlg.c:76
+msgid ""
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+msgstr ""
+
+#: ../gui/AboutDlg.c:100
+msgid "translator-credits"
+msgstr ""
+
+#: ../gui/AboutDlg.c:101
+msgid "A PlayStation emulator."
+msgstr ""
+
+#: ../gui/Cheat.c:101 ../win32/gui/CheatDlg.c:116
+msgid "Add New Cheat"
+msgstr ""
+
+#: ../gui/Cheat.c:109 ../gui/Cheat.c:192
+msgid "Cheat Description:"
+msgstr ""
+
+#: ../gui/Cheat.c:117 ../gui/Cheat.c:201 ../win32/gui/CheatDlg.c:68
+#: ../win32/gui/CheatDlg.c:118
+msgid "Cheat Code:"
+msgstr ""
+
+#: ../gui/Cheat.c:147 ../gui/Cheat.c:241 ../gui/LnxMain.c:425
+#: ../win32/gui/ConfigurePlugins.c:330
+msgid "Error"
+msgstr ""
+
+#: ../gui/Cheat.c:147 ../gui/Cheat.c:241 ../win32/gui/CheatDlg.c:91
+#: ../win32/gui/CheatDlg.c:132
+msgid "Invalid cheat code!"
+msgstr ""
+
+#: ../gui/Cheat.c:184 ../win32/gui/CheatDlg.c:66
+msgid "Edit Cheat"
+msgstr ""
+
+#: ../gui/Cheat.c:307
+msgid "Open Cheat File"
+msgstr ""
+
+#: ../gui/Cheat.c:317 ../gui/Cheat.c:357
+msgid "PCSXR Cheat Code Files (*.cht)"
+msgstr ""
+
+#: ../gui/Cheat.c:322 ../gui/GtkGui.c:491 ../gui/GtkGui.c:643
+#: ../win32/gui/WndMain.c:1483 ../win32/gui/WndMain.c:1564
+msgid "All Files"
+msgstr ""
+
+#: ../gui/Cheat.c:347
+msgid "Save Cheat File"
+msgstr ""
+
+#: ../gui/Cheat.c:362
+msgid "All Files (*.*)"
+msgstr ""
+
+#: ../gui/Cheat.c:401
+msgid "Cheat Codes"
+msgstr ""
+
+#: ../gui/Cheat.c:408
+msgid "Enable"
+msgstr ""
+
+#: ../gui/Cheat.c:416 ../win32/gui/CheatDlg.c:185
+msgid "Description"
+msgstr ""
+
+#: ../gui/Cheat.c:544 ../win32/gui/CheatDlg.c:457
+msgid "Too many addresses found."
+msgstr ""
+
+#: ../gui/Cheat.c:553 ../win32/gui/CheatDlg.c:466
+#, c-format
+msgid "%.8X Current: %u (%.2X), Previous: %u (%.2X)"
+msgstr ""
+
+#: ../gui/Cheat.c:558 ../win32/gui/CheatDlg.c:471
+#, c-format
+msgid "%.8X Current: %u (%.4X), Previous: %u (%.4X)"
+msgstr ""
+
+#: ../gui/Cheat.c:563 ../win32/gui/CheatDlg.c:476
+#, c-format
+msgid "%.8X Current: %u (%.8X), Previous: %u (%.8X)"
+msgstr ""
+
+#: ../gui/Cheat.c:578 ../win32/gui/CheatDlg.c:492
+#, c-format
+msgid "Founded Addresses: %d"
+msgstr ""
+
+#: ../gui/Cheat.c:586 ../win32/gui/CheatDlg.c:448
+msgid "Enter the values and start your search."
+msgstr ""
+
+#: ../gui/Cheat.c:628
+msgid "Freeze value"
+msgstr ""
+
+#: ../gui/Cheat.c:634 ../win32/gui/CheatDlg.c:67 ../win32/gui/CheatDlg.c:117
+msgid "Description:"
+msgstr ""
+
+#: ../gui/Cheat.c:727
+msgid "Modify value"
+msgstr ""
+
+#: ../gui/Cheat.c:735
+msgid "New value:"
+msgstr ""
+
+#: ../gui/Cheat.c:1119
+msgid "Search Results"
+msgstr ""
+
+#. TODO Check whether configuration is required when we choose the plugin, and set the state of the
+#. button appropriately. New gtk tooltip API should allow us to put a tooltip explanation for
+#. disabled widgets
+#. TODO If combo screen hasn't been opened and the user chooses the menu config option, confs.Combo will be null and cause a segfault
+#. printf("Configuring plugin %s\n", filename);
+#: ../gui/ConfDlg.c:256 ../gui/ConfDlg.c:277 ../gui/ConfDlg.c:298
+#: ../gui/ConfDlg.c:319 ../gui/ConfDlg.c:340 ../gui/ConfDlg.c:399
+msgid "No configuration required"
+msgstr ""
+
+#: ../gui/ConfDlg.c:256 ../gui/ConfDlg.c:277 ../gui/ConfDlg.c:298
+#: ../gui/ConfDlg.c:319 ../gui/ConfDlg.c:340 ../gui/ConfDlg.c:399
+msgid "This plugin doesn't need to be configured."
+msgstr ""
+
+#: ../gui/ConfDlg.c:402
+msgid "Please select a plugin."
+msgstr ""
+
+#: ../gui/ConfDlg.c:647
+#, c-format
+msgid "Could not open BIOS directory: '%s'\n"
+msgstr ""
+
+#: ../gui/ConfDlg.c:698 ../gui/ConfDlg.c:801 ../gui/LnxMain.c:168
+#, c-format
+msgid "Could not open directory: '%s'\n"
+msgstr ""
+
+#. The BIOS list always contains the PCSXR internal BIOS
+#: ../gui/ConfDlg.c:769
+msgid "Simulate PSX BIOS"
+msgstr ""
+
+#: ../gui/DebugMemory.c:127
+msgid "Start Address (Hexadecimal):"
+msgstr ""
+
+#: ../gui/DebugMemory.c:138
+msgid "Length (Decimal):"
+msgstr ""
+
+#: ../gui/DebugMemory.c:164
+msgid "Dump to File"
+msgstr ""
+
+#: ../gui/DebugMemory.c:179
+#, c-format
+msgid "Error writing to %s!"
+msgstr ""
+
+#: ../gui/DebugMemory.c:197
+msgid "Memory Patch"
+msgstr ""
+
+#: ../gui/DebugMemory.c:216
+msgid "Value (Hexa string):"
+msgstr ""
+
+#: ../gui/DebugMemory.c:283
+msgid "Memory Viewer"
+msgstr ""
+
+#: ../gui/DebugMemory.c:289
+msgid "Address"
+msgstr ""
+
+#: ../gui/DebugMemory.c:307
+msgid "Text"
+msgstr ""
+
+#: ../gui/GtkGui.c:146
+msgid "Ready"
+msgstr ""
+
+#: ../gui/GtkGui.c:191
+msgid "Emulation Paused."
+msgstr ""
+
+#: ../gui/GtkGui.c:474
+msgid "Select PSX EXE File"
+msgstr ""
+
+#: ../gui/GtkGui.c:487
+msgid "PlayStation Executable Files"
+msgstr ""
+
+#: ../gui/GtkGui.c:524
+msgid "Not a valid PSX file"
+msgstr ""
+
+#: ../gui/GtkGui.c:524
+msgid "The file does not appear to be a valid Playstation executable"
+msgstr ""
+
+#: ../gui/GtkGui.c:553 ../gui/GtkGui.c:725
+msgid "CD ROM failed"
+msgstr ""
+
+#: ../gui/GtkGui.c:553 ../gui/GtkGui.c:725 ../win32/gui/WndMain.c:472
+#: ../win32/gui/WndMain.c:526 ../win32/gui/WndMain.c:596
+#, c-format
+msgid "The CD does not appear to be a valid Playstation CD"
+msgstr ""
+
+#: ../gui/GtkGui.c:564 ../gui/GtkGui.c:736 ../win32/gui/WndMain.c:482
+#: ../win32/gui/WndMain.c:536 ../win32/gui/WndMain.c:606
+#, c-format
+msgid "Could not load CD-ROM!"
+msgstr ""
+
+#: ../gui/GtkGui.c:564 ../gui/GtkGui.c:736
+msgid "The CD-ROM could not be loaded"
+msgstr ""
+
+#: ../gui/GtkGui.c:578
+msgid "Could not run BIOS"
+msgstr ""
+
+#: ../gui/GtkGui.c:578
+msgid "Running BIOS is not supported with Internal HLE BIOS."
+msgstr ""
+
+#: ../gui/GtkGui.c:608
+msgid "Open PSX Disc Image File"
+msgstr ""
+
+#: ../gui/GtkGui.c:638
+msgid "PSX Image Files (*.bin, *.img, *.mdf, *.iso, *.cue, *.pbp, *.cbn)"
+msgstr ""
+
+#: ../gui/GtkGui.c:894
+#, c-format
+msgid "Loaded state %s."
+msgstr ""
+
+#: ../gui/GtkGui.c:897
+#, c-format
+msgid "Error loading state %s!"
+msgstr ""
+
+#: ../gui/GtkGui.c:908
+#, c-format
+msgid "Saved state %s."
+msgstr ""
+
+#: ../gui/GtkGui.c:910
+#, c-format
+msgid "Error saving state %s!"
+msgstr ""
+
+#: ../gui/GtkGui.c:945 ../gui/GtkGui.c:973
+msgid "Select State File"
+msgstr ""
+
+#: ../gui/GtkGui.c:1016
+msgid "Notice"
+msgstr ""
+
+#: ../gui/LnxMain.c:62
+#, c-format
+msgid "Creating memory card: %s\n"
+msgstr ""
+
+#: ../gui/LnxMain.c:329
+msgid ""
+" pcsxr [options] [file]\n"
+"\toptions:\n"
+"\t-runcd\t\tRuns CD-ROM\n"
+"\t-cdfile FILE\tRuns a CD image file\n"
+"\t-nogui\t\tDon't open the GTK GUI\n"
+"\t-cfg FILE\tLoads desired configuration file (default: ~/.pcsxr/pcsxr.cfg)\n"
+"\t-psxout\t\tEnable PSX output\n"
+"\t-slowboot\tEnable BIOS Logo\n"
+"\t-load STATENUM\tLoads savestate STATENUM (1-9)\n"
+"\t-h -help\tDisplay this message\n"
+"\tfile\t\tLoads file\n"
+msgstr ""
+
+#: ../gui/LnxMain.c:366
+#, c-format
+msgid ""
+"PCSXR cannot be configured without using the GUI -- you should restart "
+"without -nogui.\n"
+msgstr ""
+
+#: ../gui/LnxMain.c:425
+msgid "Failed loading plugins!"
+msgstr ""
+
+#: ../gui/LnxMain.c:444
+#, c-format
+msgid "Could not load CD-ROM!\n"
+msgstr ""
+
+#: ../gui/LnxMain.c:485
+#, c-format
+msgid "PSX emulator couldn't be initialized.\n"
+msgstr ""
+
+#: ../gui/MemcardDlg.c:56
+msgid "Icon"
+msgstr ""
+
+#: ../gui/MemcardDlg.c:62 ../win32/gui/WndMain.c:778
+msgid "Title"
+msgstr ""
+
+#: ../gui/MemcardDlg.c:68 ../win32/gui/WndMain.c:784
+msgid "Status"
+msgstr ""
+
+#: ../gui/MemcardDlg.c:74
+msgid "ID"
+msgstr ""
+
+#: ../gui/MemcardDlg.c:80
+msgid "Name"
+msgstr ""
+
+#: ../gui/MemcardDlg.c:118 ../win32/gui/WndMain.c:989
+msgid "Deleted"
+msgstr ""
+
+#: ../gui/MemcardDlg.c:120 ../gui/MemcardDlg.c:129 ../win32/gui/WndMain.c:990
+#: ../win32/gui/WndMain.c:993
+msgid "Free"
+msgstr ""
+
+#: ../gui/MemcardDlg.c:123 ../win32/gui/WndMain.c:992
+msgid "Used"
+msgstr ""
+
+#: ../gui/MemcardDlg.c:125
+msgid "Link"
+msgstr ""
+
+#: ../gui/MemcardDlg.c:127
+msgid "End link"
+msgstr ""
+
+#. Ask for name of memory card
+#: ../gui/MemcardDlg.c:305
+msgid "Select A File"
+msgstr ""
+
+#: ../gui/MemcardDlg.c:345
+msgid "Format this Memory Card?"
+msgstr ""
+
+#: ../gui/MemcardDlg.c:347
+msgid ""
+"If you format the memory card, the card will be empty, and any existing data "
+"overwritten."
+msgstr ""
+
+#: ../gui/MemcardDlg.c:350
+msgid "Format card"
+msgstr ""
+
+#. Ask for name of new memory card
+#: ../gui/MemcardDlg.c:372
+msgid "Create a new Memory Card"
+msgstr ""
+
+#: ../gui/MemcardDlg.c:381
+msgid "New Memory Card.mcd"
+msgstr ""
+
+#. No free slots available on the destination card
+#: ../gui/MemcardDlg.c:511
+msgid "No free space on memory card"
+msgstr ""
+
+#: ../gui/MemcardDlg.c:512
+msgid ""
+"There are no free slots available on the target memory card. Please delete a "
+"slot first."
+msgstr ""
+
+#: ../gui/MemcardDlg.c:671
+msgid "Memory Card Manager"
+msgstr ""
+
+#: ../gui/Plugin.c:240
+#, c-format
+msgid "SIO IRQ Not Always Enabled"
+msgstr ""
+
+#: ../gui/Plugin.c:246
+#, c-format
+msgid "Black & White Mdecs Only Enabled"
+msgstr ""
+
+#: ../gui/Plugin.c:247
+#, c-format
+msgid "Black & White Mdecs Only Disabled"
+msgstr ""
+
+#: ../gui/Plugin.c:253
+#, c-format
+msgid "XA Enabled"
+msgstr ""
+
+#: ../gui/Plugin.c:254
+#, c-format
+msgid "XA Disabled"
+msgstr ""
+
+#: ../gui/Plugin.c:326
+msgid "Error opening CD-ROM plugin!"
+msgstr ""
+
+#: ../gui/Plugin.c:328
+msgid "Error opening SPU plugin!"
+msgstr ""
+
+#: ../gui/Plugin.c:331
+msgid "Error opening GPU plugin!"
+msgstr ""
+
+#: ../gui/Plugin.c:333
+msgid "Error opening Controller 1 plugin!"
+msgstr ""
+
+#: ../gui/Plugin.c:337
+msgid "Error opening Controller 2 plugin!"
+msgstr ""
+
+#: ../gui/Plugin.c:342
+msgid "Error opening SIO1 plugin!"
+msgstr ""
+
+#: ../gui/Plugin.c:424
+msgid "Error closing CD-ROM plugin!"
+msgstr ""
+
+#: ../gui/Plugin.c:426
+msgid "Error closing SPU plugin!"
+msgstr ""
+
+#: ../gui/Plugin.c:428
+msgid "Error closing Controller 1 Plugin!"
+msgstr ""
+
+#: ../gui/Plugin.c:430
+msgid "Error closing Controller 2 plugin!"
+msgstr ""
+
+#: ../gui/Plugin.c:432
+msgid "Error closing GPU plugin!"
+msgstr ""
+
+#: ../gui/Plugin.c:435
+msgid "Error closing SIO1 plugin!"
+msgstr ""
+
+#: ../libpcsxcore/cdriso.c:423
+#, c-format
+msgid ""
+"\n"
+"could not open: %s\n"
+msgstr ""
+
+#: ../libpcsxcore/cdriso.c:1043
+#, c-format
+msgid "Track %.2d (%s) - Start %.2d:%.2d:%.2d, Length %.2d:%.2d:%.2d\n"
+msgstr ""
+
+#: ../libpcsxcore/cdriso.c:1064
+#, c-format
+msgid "Loaded CD Image: %s"
+msgstr ""
+
+#: ../libpcsxcore/cheat.c:147
+#, c-format
+msgid "Cheats loaded from: %s\n"
+msgstr ""
+
+#: ../libpcsxcore/cheat.c:179
+#, c-format
+msgid "Cheats saved to: %s\n"
+msgstr ""
+
+#: ../libpcsxcore/cheat.c:322 ../libpcsxcore/cheat.c:443
+msgid "(Untitled)"
+msgstr ""
+
+#: ../libpcsxcore/debug.c:321
+msgid "Error allocating memory"
+msgstr ""
+
+#: ../libpcsxcore/debug.c:326
+msgid "Unable to start debug server.\n"
+msgstr ""
+
+#: ../libpcsxcore/debug.c:330
+msgid "Debugger started.\n"
+msgstr ""
+
+#: ../libpcsxcore/debug.c:337
+msgid "Debugger stopped.\n"
+msgstr ""
+
+#: ../libpcsxcore/misc.c:350
+#, c-format
+msgid "CD-ROM Label: %.32s\n"
+msgstr ""
+
+#: ../libpcsxcore/misc.c:351
+#, c-format
+msgid "CD-ROM ID: %.9s\n"
+msgstr ""
+
+#: ../libpcsxcore/misc.c:415
+#, c-format
+msgid "Error opening file: %s.\n"
+msgstr ""
+
+#: ../libpcsxcore/misc.c:458
+#, c-format
+msgid "Unknown CPE opcode %02x at position %08x.\n"
+msgstr ""
+
+#: ../libpcsxcore/misc.c:486
+msgid "This file does not appear to be a valid PSX file.\n"
+msgstr ""
+
+#: ../libpcsxcore/plugins.c:190
+#, c-format
+msgid "Error loading %s: %s"
+msgstr ""
+
+#: ../libpcsxcore/plugins.c:234
+#, c-format
+msgid ""
+"Could not load GPU plugin %s!\n"
+"%s"
+msgstr ""
+
+#: ../libpcsxcore/plugins.c:310
+#, c-format
+msgid ""
+"Could not load CD-ROM plugin %s!\n"
+"%s"
+msgstr ""
+
+#: ../libpcsxcore/plugins.c:359
+#, c-format
+msgid ""
+"Could not load SPU plugin %s!\n"
+"%s"
+msgstr ""
+
+#: ../libpcsxcore/plugins.c:499
+#, c-format
+msgid ""
+"Could not load Controller 1 plugin %s!\n"
+"%s"
+msgstr ""
+
+#: ../libpcsxcore/plugins.c:558
+#, c-format
+msgid ""
+"Could not load Controller 2 plugin %s!\n"
+"%s"
+msgstr ""
+
+#: ../libpcsxcore/plugins.c:604
+#, c-format
+msgid ""
+"Could not load NetPlay plugin %s!\n"
+"%s"
+msgstr ""
+
+#: ../libpcsxcore/plugins.c:682
+#, c-format
+msgid ""
+"Could not load SIO1 plugin %s!\n"
+"%s"
+msgstr ""
+
+#: ../libpcsxcore/plugins.c:770
+#, c-format
+msgid "Error initializing CD-ROM plugin: %d"
+msgstr ""
+
+#: ../libpcsxcore/plugins.c:772
+#, c-format
+msgid "Error initializing GPU plugin: %d"
+msgstr ""
+
+#: ../libpcsxcore/plugins.c:774
+#, c-format
+msgid "Error initializing SPU plugin: %d"
+msgstr ""
+
+#: ../libpcsxcore/plugins.c:776
+#, c-format
+msgid "Error initializing Controller 1 plugin: %d"
+msgstr ""
+
+#: ../libpcsxcore/plugins.c:778
+#, c-format
+msgid "Error initializing Controller 2 plugin: %d"
+msgstr ""
+
+#: ../libpcsxcore/plugins.c:782
+#, c-format
+msgid "Error initializing NetPlay plugin: %d"
+msgstr ""
+
+#: ../libpcsxcore/plugins.c:787
+#, c-format
+msgid "Error initializing SIO1 plugin: %d"
+msgstr ""
+
+#: ../libpcsxcore/plugins.c:790
+msgid "Plugins loaded.\n"
+msgstr ""
+
+#: ../libpcsxcore/ppf.c:219
+#, c-format
+msgid "Invalid PPF patch: %s.\n"
+msgstr ""
+
+#: ../libpcsxcore/ppf.c:295
+#, c-format
+msgid "Unsupported PPF version (%d).\n"
+msgstr ""
+
+#. build address array
+#: ../libpcsxcore/ppf.c:334
+#, c-format
+msgid "Loaded PPF %d.0 patch: %s.\n"
+msgstr ""
+
+#: ../libpcsxcore/ppf.c:384
+#, c-format
+msgid "Loaded SBI file: %s.\n"
+msgstr ""
+
+#: ../libpcsxcore/psxmem.c:78
+msgid "Error allocating memory!"
+msgstr ""
+
+#: ../libpcsxcore/psxmem.c:121
+#, c-format
+msgid "Could not open BIOS:\"%s\". Enabling HLE Bios!\n"
+msgstr ""
+
+#: ../libpcsxcore/r3000a.c:34
+#, c-format
+msgid "Running PCSXR Version %s (%s).\n"
+msgstr ""
+
+#: ../libpcsxcore/sio.c:843
+msgid "Connection closed!\n"
+msgstr ""
+
+#: ../libpcsxcore/sio.c:876
+#, c-format
+msgid "No memory card value was specified - creating a default card %s\n"
+msgstr ""
+
+#: ../libpcsxcore/sio.c:880
+#, c-format
+msgid "The memory card %s doesn't exist - creating it\n"
+msgstr ""
+
+#: ../libpcsxcore/sio.c:896
+#, c-format
+msgid "Memory card %s failed to load!\n"
+msgstr ""
+
+#: ../libpcsxcore/sio.c:900
+#, c-format
+msgid "Loading memory card %s\n"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdr.c:25
+msgid "CD-ROM Drive Reader"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdr.c:27
+msgid "CDR NULL Plugin"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:1
+#: ../plugins/dfcdrom/cdrcfg-0.1df/main.c:217
+msgid "CDR configuration"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:2
+msgid "Choose your CD-ROM device or type its path if it's not listed"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:3
+msgid "Select read mode:"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:4
+msgid "Cache Size (Def. 64):"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:5
+msgid "Spindown Time:"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:6
+msgid "Cdrom Speed (Def. 0 = MAX):"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:7
+msgid "Enable subchannel read"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:8
+msgid "Normal (No Cache)"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:9
+msgid "Threaded - Faster (With Cache)"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:10
+msgid "Default"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:11
+msgid "125ms"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:12
+msgid "250ms"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:13
+msgid "500ms"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:14
+msgid "1s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:15
+msgid "2s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:16
+msgid "4s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:17
+msgid "8s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:18
+msgid "16s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:19
+msgid "32s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:20
+msgid "1min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:21
+msgid "2min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:22
+msgid "4min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:23
+msgid "8min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:24
+msgid "16min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:25
+msgid "32min"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk.c:49
+msgid "D-Pad Up"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk.c:50
+msgid "D-Pad Down"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk.c:51
+msgid "D-Pad Left"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk.c:52
+msgid "D-Pad Right"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk.c:53
+msgid "Cross"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk.c:54
+msgid "Circle"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk.c:55
+msgid "Square"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk.c:56
+msgid "Triangle"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk.c:57
+msgid "L1"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk.c:58
+msgid "R1"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk.c:59
+msgid "L2"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk.c:60
+msgid "R2"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk.c:61
+msgid "Select"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk.c:62
+msgid "Start"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk.c:63
+msgid "L3"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk.c:64
+msgid "R3"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk.c:65
+msgid "Analog"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk.c:69
+msgid "L-Stick Right"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk.c:70
+msgid "L-Stick Left"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk.c:71
+msgid "L-Stick Down"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk.c:72
+msgid "L-Stick Up"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk.c:73
+msgid "R-Stick Right"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk.c:74
+msgid "R-Stick Left"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk.c:75
+msgid "R-Stick Down"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk.c:76
+msgid "R-Stick Up"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
+msgid "Centered"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
+msgid "Up"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
+msgid "Right"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
+msgid "Rightup"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
+msgid "Down"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
+msgid "Rightdown"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
+msgid "Left"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
+msgid "Leftup"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk.c:104 ../plugins/dfinput/cfg-gtk.c:143
+msgid "Leftdown"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk.c:108 ../plugins/dfinput/cfg-gtk.c:147
+#, c-format
+msgid "Joystick: Button %d"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk.c:112 ../plugins/dfinput/cfg-gtk.c:151
+#, c-format
+msgid "Joystick: Axis %d%c"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk.c:117 ../plugins/dfinput/cfg-gtk.c:156
+#, c-format
+msgid "Joystick: Hat %d %s"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk.c:132 ../plugins/dfinput/cfg-gtk.c:171
+msgid "Keyboard:"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk.c:136 ../plugins/dfinput/cfg-gtk.c:175
+msgid "(Not Set)"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk.c:575
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:14
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:68
+msgid "None"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk.c:623
+msgid "Gamepad/Keyboard Input Configuration"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk.c:629 ../plugins/dfinput/cfg-gtk.c:649
+msgid "Key"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk.c:635 ../plugins/dfinput/cfg-gtk.c:655
+msgid "Button"
+msgstr ""
+
+#: ../plugins/dfinput/dfinput.ui.h:1
+msgid "Device:"
+msgstr ""
+
+#: ../plugins/dfinput/dfinput.ui.h:2
+msgid "Type:"
+msgstr ""
+
+#: ../plugins/dfinput/dfinput.ui.h:3
+msgid "Visual vibration"
+msgstr ""
+
+#: ../plugins/dfinput/dfinput.ui.h:4
+msgid "Change"
+msgstr ""
+
+#: ../plugins/dfinput/dfinput.ui.h:5
+msgid "Reset"
+msgstr ""
+
+#: ../plugins/dfinput/dfinput.ui.h:6
+msgid "Controller 1"
+msgstr ""
+
+#: ../plugins/dfinput/dfinput.ui.h:7
+msgid "Controller 2"
+msgstr ""
+
+#: ../plugins/dfinput/dfinput.ui.h:8
+msgid "Multi-Threaded (Recommended)"
+msgstr ""
+
+#: ../plugins/dfinput/dfinput.ui.h:9 ../win32/gui/WndMain.c:1342
+msgid "Options"
+msgstr ""
+
+#: ../plugins/dfinput/dfinput.ui.h:10
+msgid "Digital Pad"
+msgstr ""
+
+#: ../plugins/dfinput/dfinput.ui.h:11
+msgid "Analog Pad"
+msgstr ""
+
+#: ../plugins/dfinput/dfinput.ui.h:12
+msgid "Mouse"
+msgstr ""
+
+#: ../plugins/dfinput/pad.c:33
+msgid "Gamepad/Keyboard/Mouse Input"
+msgstr ""
+
+#. increase that with each version
+#: ../plugins/dfnet/dfnet.c:23
+msgid "Socket Driver"
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.c:161
+#, c-format
+msgid "error connecting to %s: %s\n"
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.c:186
+msgid "Error allocating memory!\n"
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.ui.h:1
+msgid "Start Game"
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.ui.h:2
+msgid "Play Offline"
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.ui.h:3
+msgid ""
+"Select here if you'll be Server (Player1) or Client (Player2).\n"
+"\n"
+"If you select Server you must Copy your IP address to the Clipboard and "
+"paste if (Ctrl+V) wherever the Client can see it.\n"
+"\n"
+"If you selected Client please enter the IP address the Server gave to you in "
+"the IP Address Control."
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.ui.h:8 ../plugins/bladesio1/sio1.ui.h:6
+msgid "Copy PC IP to Clipboard"
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.ui.h:9 ../plugins/bladesio1/sio1.ui.h:7
+msgid "Server (Player1)"
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.ui.h:10 ../plugins/bladesio1/sio1.ui.h:8
+msgid "Client (Player2)"
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.ui.h:11 ../plugins/bladesio1/sio1.ui.h:10
+msgid ""
+"Do not change if not necessary (remember it must be changed on both sides)."
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.ui.h:12 ../plugins/bladesio1/sio1.ui.h:11
+msgid "Port Number"
+msgstr ""
+
+#: ../plugins/dfnet/gui.c:30 ../plugins/dfnet/gui.c:112
+#: ../plugins/bladesio1/gui.c:82 ../win32/gui/ConfigurePlugins.c:669
+msgid "NetPlay"
+msgstr ""
+
+#: ../plugins/dfnet/gui.c:38
+msgid "Nothing to configure"
+msgstr ""
+
+#: ../plugins/dfnet/gui.c:94 ../plugins/bladesio1/gui.c:94
+#, c-format
+msgid "IP %s"
+msgstr ""
+
+#: ../plugins/dfnet/gui.c:165
+msgid "Waiting for connection..."
+msgstr ""
+
+#: ../plugins/dfnet/gui.c:168
+msgid "The Client should now Start a Connection, waiting..."
+msgstr ""
+
+#: ../plugins/dfsound/spu.c:66
+msgid "DirectSound Driver"
+msgstr ""
+
+#: ../plugins/dfsound/spu.c:68
+msgid "Mac OS X Sound"
+msgstr ""
+
+#: ../plugins/dfsound/spu.c:70
+msgid "ALSA Sound"
+msgstr ""
+
+#: ../plugins/dfsound/spu.c:72
+msgid "OSS Sound"
+msgstr ""
+
+#: ../plugins/dfsound/spu.c:74
+msgid "SDL Sound"
+msgstr ""
+
+#: ../plugins/dfsound/spu.c:76
+msgid "OpenAL Sound"
+msgstr ""
+
+#: ../plugins/dfsound/spu.c:78
+msgid "PulseAudio Sound"
+msgstr ""
+
+#: ../plugins/dfsound/spu.c:80
+msgid "NULL Sound"
+msgstr ""
+
+#: ../plugins/dfsound/spu.c:83
+msgid ""
+"P.E.Op.S. Sound Driver V1.7\n"
+"Coded by Pete Bernert and the P.E.Op.S. team\n"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:2
+msgid "Volume:"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:3
+msgid "Interpolation:"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:4
+msgid "Reverb:"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:5
+msgid "Adjust XA speed"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:6
+msgid "Choose this if XA music is played too quickly."
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:7
+msgid "High compatibility mode"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:8
+msgid "Use the asynchronous SPU interface."
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:9
+msgid "SPU IRQ Wait"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:10
+msgid "Wait for CPU; only useful for some games."
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:11
+msgid "Single channel sound"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:12
+msgid "Play only one channel for a performance boost."
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:13
+msgid "Frequency Response - Output Filter"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:15
+msgid "Simple"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:16
+msgid "Gaussian"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:17
+msgid "Cubic"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:18
+msgid "Off"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:19
+msgid "Playstation"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:20
+msgid "Low"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:21
+msgid "Medium"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:22
+msgid "Loud"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:23
+msgid "Loudest"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpu.c:82
+msgid "Soft Driver"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpu.c:83
+msgid ""
+"P.E.Op.S. Soft Driver V1.17\n"
+"Coded by Pete Bernert and the P.E.Op.S. team\n"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpu.c:85
+msgid "SoftGL Driver"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpu.c:86
+msgid ""
+"P.E.Op.S. SoftGL Driver V1.17\n"
+"Coded by Pete Bernert and the P.E.Op.S. team\n"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpu.c:88
+msgid "XVideo Driver"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpu.c:89
+msgid ""
+"P.E.Op.S. Xvideo Driver V1.17\n"
+"Coded by Pete Bernert and the P.E.Op.S. team\n"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpu.c:92
+msgid "Pete Bernert and the P.E.Op.S. team"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:1
+msgid "Configure X11 Video"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:2
+msgid "Initial Window Size:"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:3
+msgid "Stretching:"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:4
+msgid "Dithering:"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:5
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:4
+msgid "Fullscreen"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:6
+msgid "Toggle windowed/fullscreen mode."
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:7
+msgid "Maintain 4:3 Aspect Ratio"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:8
+msgid "Show FPS"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:9
+msgid "Toggle whether the FPS will be shown."
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:10
+msgid "Enable frame skipping"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:11
+msgid "Skip frames when rendering."
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:12
+msgid "Set FPS"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:13
+msgid "Enable this if games display too quickly."
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:14
+msgid "200.0"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:15
+msgid "Autodetect FPS limit"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:16
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:36
+msgid "Use game fixes"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:17
+msgid "Disable CPU Saving"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:18
+msgid "For precise framerate"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:19
+msgid "Odd/even bit hack"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:20
+msgid "Chrono Cross"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:21
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:45
+msgid "PC FPS calculation"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:22
+msgid "Better FPS limit in some"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:23
+msgid "Expand screen width"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:24
+msgid "Capcom fighting games"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:25
+msgid "Ignore brightness color"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:26
+msgid "Black screens in Lunar"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:27
+msgid "Disable coordinate check"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:28
+msgid "Compatibility mode"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:29
+msgid "Lazy screen update"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:30
+msgid "Pandemonium 2"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:31
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:46
+msgid "Old frame skipping"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:32
+msgid "Skip every second frame"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:33
+msgid "Repeated flat tex triangles"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:34
+msgid "Needed by Dark Forces"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:35
+msgid "Draw quads with triangles"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:36
+msgid "better g-colors, worse textures"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:37
+msgid "Fake 'gpu busy' states"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:38
+msgid "Toggle busy flags after drawing"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:39
+msgid "0: Off (fastest)"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:40
+msgid "1: Game dependant"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:41
+msgid "2: Always"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:42
+msgid "320x240"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:43
+msgid "640x480"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:44
+msgid "800x600"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:45
+msgid "1024x768"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:46
+msgid "1152x864"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:47
+msgid "1280x1024"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:48
+msgid "1600x1200"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:49
+msgid "0: None"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:50
+msgid "1: 2xSai"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:51
+msgid "2: 2xSuperSai"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:52
+msgid "3: SuperEagle"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:53
+msgid "4: Scale2x"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:54
+msgid "5: Scale3x"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:55
+msgid "6: HQ2X"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:56
+msgid "7: HQ3X"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpu.c:97
+msgid "OpenGL Driver"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpu.c:99
+msgid "Pete Bernert"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpu.c:100
+msgid ""
+"Based on P.E.Op.S. MesaGL Driver V1.78\n"
+"Coded by Pete Bernert\n"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:1
+msgid "OpenGL Driver configuration"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:2
+msgid "Width:"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:3
+msgid "Height:"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:5
+msgid "Dithering"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:6
+msgid "Keep psx aspect ratio"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:7
+msgid "Window options"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:8
+msgid "Quality:"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:9
+msgid "Filtering:"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:10
+msgid "HiRes Tex:"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:11
+msgid "VRam size in MBytes (0..1024, 0=auto):"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:12
+msgid "Textures"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:13
+msgid "Show FPS display on startup"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:14
+msgid "Use FPS limit"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:15
+msgid "FPS limit auto-detector"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:16
+msgid "FPS limit manual"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:17
+msgid "FPS"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:18
+msgid "Use Frame skipping"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:19
+msgid "Framerate"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:20
+msgid "Offscreen drawing:"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:21
+msgid "Framebuffer textures:"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:22
+msgid "Framebuffer access:"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:23
+msgid "Mask bit detection (Needed by a few games, zbuffer)"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:24
+msgid "Alpha multipass (Correct opaque texture areas)"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:25
+msgid "Advanced blending (Accurate psx color emulation)"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:26
+msgid "Compatibility"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:27
+msgid "Scanlines Blending (0..255, -1=dot):"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:28
+msgid "Unfiltered MDECs (Small movie speedup)"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:29
+msgid "Force 15 bit framebuffer updates (Faster movies)"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:30
+msgid "Line mode (Polygons will not get filled)"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:31
+msgid "Polygon anti-aliasing (Slow with most cards)"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:32
+msgid "Use OpenGL extensions (Recommended)"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:33
+msgid "Screen smoothing (Can be slow or unsupported)"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:34
+msgid "Gte accuracy"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:35
+msgid "Misc"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:37
+msgid "Battle cursor (FF7)"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:38
+msgid "Yellow rect (FF9)"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:39
+msgid "Direct FB updates"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:40
+msgid "Black brightness (Lunar)"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:41
+msgid "Swap front detection"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:42
+msgid "Disable coord check"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:43
+msgid "No blue glitches (LoD)"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:44
+msgid "Soft FB access"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:47
+msgid "No subtr. blending"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:48
+msgid "Lazy upload (DW7)"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:49
+msgid "Odd/even hack"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:50
+msgid "Adjust screen width"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:51
+msgid "Old texture filtering"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:52
+msgid "Additional uploads"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:53
+msgid "Unused"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:54
+msgid "Fake 'GPU busy'"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:55
+msgid "Special game fixes"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:56
+msgid "Fast"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:57
+msgid "Autoconfigure for fast display"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:58
+msgid "Beautiful"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:59
+msgid "Auto configure for beautiful display"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:60
+msgid "None - Fastest, most glitches"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:61
+msgid "Minimum - Missing screens"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:62
+msgid "Standard - OK for most games"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:63
+msgid "Enhanced - Shows more stuff"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:64
+msgid "Extended - Causing garbage"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:65
+msgid "None (Standard)"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:66
+msgid "2xSaI (Much vram needed)"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:67
+msgid "Scaled (Needs tex filtering)"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:69
+msgid "Standard - Glitches will happen"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:70
+msgid "Extended - No black borders"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:71
+msgid "Standard without sprites - Unfiltered 2D"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:72
+msgid "Extended without sprites - Unfiltered 2D"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:73
+msgid "Standard + smoothed sprites"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:74
+msgid "Extended + smoothed sprites"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:75
+msgid "Don't care - Use driver's default textures"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:76
+msgid "4444 - Fast, but less colorful"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:77
+msgid "5551 - Nice colors, bad transparency"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:78
+msgid "8888 - Best colors, more ram needed"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:79
+msgid "BGR8888 - Faster on some cards"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:80
+msgid "Emulated VRam - Ok most times"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:81
+msgid "Gfx card buffer reads"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:82
+msgid "Gfx card buffer moves"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:83
+msgid "Gfx card buffer reads and moves"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:84
+msgid "Full Software (FVP)"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:85
+msgid "Emulated VRam - Needs FVP"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:86
+msgid "Black - Fast, no effects"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:87
+msgid "Gfx card buffer - Can be slow"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:88
+msgid "Gfx card and soft - Slow"
+msgstr ""
+
+#: ../plugins/bladesio1/gui.c:112
+msgid "Link Cable Configuration"
+msgstr ""
+
+#. *************************************************************************
+#. #define SIO1_DEBUG 1
+#: ../plugins/bladesio1/sio1.c:44
+msgid "sio1Blade"
+msgstr ""
+
+#. *************************************************************************
+#: ../plugins/bladesio1/sio1.ui.h:1 ../win32/gui/AboutDlg.c:48
+#: ../win32/gui/AboutDlg.c:52 ../win32/gui/CheatDlg.c:69
+#: ../win32/gui/CheatDlg.c:119 ../win32/gui/ConfigurePlugins.c:529
+#: ../win32/gui/ConfigurePlugins.c:667 ../win32/gui/WndMain.c:1088
+#: ../win32/gui/WndMain.c:1324
+msgid "OK"
+msgstr ""
+
+#: ../plugins/bladesio1/sio1.ui.h:2
+msgid "CANCEL"
+msgstr ""
+
+#: ../plugins/bladesio1/sio1.ui.h:3
+msgid ""
+"Select here if you'll be Server (Player1) or Client (Player2).\n"
+"If you select Server you must Copy your IP address to the Clipboard and "
+"paste if (Ctrl+V) wherever the Client can see it.\n"
+"If you selected Client please enter the IP address the Server gave to you in "
+"the IP Address Control."
+msgstr ""
+
+#: ../plugins/bladesio1/sio1.ui.h:9
+msgid "Disabled"
+msgstr ""
+
+#: ../win32/gui/AboutDlg.c:26
+msgid ""
+"PCSXR - A PlayStation Emulator\n"
+"\n"
+"Original Authors:\n"
+"main coder: linuzappz\n"
+"co-coders: shadow\n"
+"ex-coders: Nocomp, Pete Bernett, nik3d\n"
+"Webmaster: AkumaX"
+msgstr ""
+
+#: ../win32/gui/AboutDlg.c:35
+msgid ""
+"PCSX-df Authors:\n"
+"Ryan Schultz, Andrew Burton, Stephen Chao,\n"
+"Marcus Comstedt, Stefan Sikora\n"
+"\n"
+"PCSX-Reloaded By:\n"
+"edgbla, shalma, Wei Mingzhi, et al.\n"
+"\n"
+"http://pcsxr.codeplex.com/"
+msgstr ""
+
+#: ../win32/gui/AboutDlg.c:46
+msgid "About"
+msgstr ""
+
+#: ../win32/gui/AboutDlg.c:49
+msgid "PCSXR EMU\n"
+msgstr ""
+
+#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
+#: ../win32/gui/CheatDlg.c:270
+msgid "Yes"
+msgstr ""
+
+#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
+#: ../win32/gui/CheatDlg.c:270
+msgid "No"
+msgstr ""
+
+#: ../win32/gui/CheatDlg.c:70 ../win32/gui/CheatDlg.c:120
+#: ../win32/gui/ConfigurePlugins.c:530 ../win32/gui/ConfigurePlugins.c:668
+#: ../win32/gui/WndMain.c:1089 ../win32/gui/WndMain.c:1325
+msgid "Cancel"
+msgstr ""
+
+#: ../win32/gui/CheatDlg.c:168
+msgid "&Add Code"
+msgstr ""
+
+#: ../win32/gui/CheatDlg.c:169
+msgid "&Edit Code"
+msgstr ""
+
+#: ../win32/gui/CheatDlg.c:170
+msgid "&Remove Code"
+msgstr ""
+
+#: ../win32/gui/CheatDlg.c:171
+msgid "&Enable/Disable"
+msgstr ""
+
+#: ../win32/gui/CheatDlg.c:172
+msgid "&Load..."
+msgstr ""
+
+#: ../win32/gui/CheatDlg.c:173
+msgid "&Save As..."
+msgstr ""
+
+#: ../win32/gui/CheatDlg.c:174
+msgid "&Close"
+msgstr ""
+
+#: ../win32/gui/CheatDlg.c:190
+msgid "Enabled"
+msgstr ""
+
+#: ../win32/gui/CheatDlg.c:282 ../win32/gui/CheatDlg.c:311
+msgid "PCSXR Cheat Code Files"
+msgstr ""
+
+#: ../win32/gui/CheatDlg.c:453
+msgid "No addresses found."
+msgstr ""
+
+#: ../win32/gui/CheatDlg.c:505 ../win32/gui/CheatDlg.c:596
+msgid "Address:"
+msgstr ""
+
+#: ../win32/gui/CheatDlg.c:566
+#, c-format
+msgid "Freeze %.8X"
+msgstr ""
+
+#: ../win32/gui/CheatDlg.c:685
+msgid "&Freeze"
+msgstr ""
+
+#: ../win32/gui/CheatDlg.c:686
+msgid "&Modify"
+msgstr ""
+
+#: ../win32/gui/CheatDlg.c:687
+msgid "&Copy"
+msgstr ""
+
+#: ../win32/gui/CheatDlg.c:688
+msgid "&Search"
+msgstr ""
+
+#: ../win32/gui/CheatDlg.c:689
+msgid "&New Search"
+msgstr ""
+
+#: ../win32/gui/CheatDlg.c:690
+msgid "C&lose"
+msgstr ""
+
+#: ../win32/gui/ConfigurePlugins.c:234
+msgid "Simulate Psx Bios"
+msgstr ""
+
+#: ../win32/gui/ConfigurePlugins.c:330
+msgid "Configuration not OK!"
+msgstr ""
+
+#: ../win32/gui/ConfigurePlugins.c:445
+msgid "This plugin reports that should work correctly"
+msgstr ""
+
+#: ../win32/gui/ConfigurePlugins.c:446
+msgid "This plugin reports that should not work correctly"
+msgstr ""
+
+#: ../win32/gui/ConfigurePlugins.c:509
+msgid "Select Plugins Directory"
+msgstr ""
+
+#: ../win32/gui/ConfigurePlugins.c:518
+msgid "Select Bios Directory"
+msgstr ""
+
+#: ../win32/gui/ConfigurePlugins.c:527
+msgid "Configuration"
+msgstr ""
+
+#: ../win32/gui/ConfigurePlugins.c:531
+msgid "Graphics"
+msgstr ""
+
+#: ../win32/gui/ConfigurePlugins.c:532
+msgid "First Controller"
+msgstr ""
+
+#: ../win32/gui/ConfigurePlugins.c:533
+msgid "Second Controller"
+msgstr ""
+
+#: ../win32/gui/ConfigurePlugins.c:534
+msgid "Sound"
+msgstr ""
+
+#: ../win32/gui/ConfigurePlugins.c:535
+msgid "Cdrom"
+msgstr ""
+
+#: ../win32/gui/ConfigurePlugins.c:536
+msgid "Link cable"
+msgstr ""
+
+#: ../win32/gui/ConfigurePlugins.c:537
+msgid "Bios"
+msgstr ""
+
+#: ../win32/gui/ConfigurePlugins.c:538
+msgid "Set Bios Directory"
+msgstr ""
+
+#: ../win32/gui/ConfigurePlugins.c:539
+msgid "Set Plugins Directory"
+msgstr ""
+
+#: ../win32/gui/ConfigurePlugins.c:540 ../win32/gui/ConfigurePlugins.c:543
+#: ../win32/gui/ConfigurePlugins.c:546 ../win32/gui/ConfigurePlugins.c:549
+#: ../win32/gui/ConfigurePlugins.c:552 ../win32/gui/ConfigurePlugins.c:555
+#: ../win32/gui/ConfigurePlugins.c:670
+msgid "Configure..."
+msgstr ""
+
+#: ../win32/gui/ConfigurePlugins.c:541 ../win32/gui/ConfigurePlugins.c:544
+#: ../win32/gui/ConfigurePlugins.c:547 ../win32/gui/ConfigurePlugins.c:550
+#: ../win32/gui/ConfigurePlugins.c:553 ../win32/gui/ConfigurePlugins.c:556
+#: ../win32/gui/ConfigurePlugins.c:671
+msgid "Test..."
+msgstr ""
+
+#: ../win32/gui/ConfigurePlugins.c:542 ../win32/gui/ConfigurePlugins.c:545
+#: ../win32/gui/ConfigurePlugins.c:548 ../win32/gui/ConfigurePlugins.c:551
+#: ../win32/gui/ConfigurePlugins.c:554 ../win32/gui/ConfigurePlugins.c:557
+#: ../win32/gui/ConfigurePlugins.c:672
+msgid "About..."
+msgstr ""
+
+#: ../win32/gui/ConfigurePlugins.c:665
+msgid "NetPlay Configuration"
+msgstr ""
+
+#: ../win32/gui/ConfigurePlugins.c:673
+msgid ""
+"Note: The NetPlay Plugin Directory should be the same as the other Plugins."
+msgstr ""
+
+#: ../win32/gui/plugin.c:94 ../win32/gui/WndMain.c:331
+#, c-format
+msgid "*PCSXR*: Saved State %d"
+msgstr ""
+
+#: ../win32/gui/plugin.c:95 ../win32/gui/WndMain.c:332
+#, c-format
+msgid "*PCSXR*: Error Saving State %d"
+msgstr ""
+
+#: ../win32/gui/plugin.c:111 ../win32/gui/WndMain.c:309
+#, c-format
+msgid "*PCSXR*: Loaded State %d"
+msgstr ""
+
+#: ../win32/gui/plugin.c:112 ../win32/gui/WndMain.c:310
+#, c-format
+msgid "*PCSXR*: Error Loading State %d"
+msgstr ""
+
+#: ../win32/gui/plugin.c:123
+#, c-format
+msgid "*PCSXR*: Sio Irq Always Enabled"
+msgstr ""
+
+#: ../win32/gui/plugin.c:124
+#, c-format
+msgid "*PCSXR*: Sio Irq Not Always Enabled"
+msgstr ""
+
+#: ../win32/gui/plugin.c:131
+#, c-format
+msgid "*PCSXR*: Black&White Mdecs Only Enabled"
+msgstr ""
+
+#: ../win32/gui/plugin.c:132
+#, c-format
+msgid "*PCSXR*: Black&White Mdecs Only Disabled"
+msgstr ""
+
+#: ../win32/gui/plugin.c:139
+#, c-format
+msgid "*PCSXR*: Xa Enabled"
+msgstr ""
+
+#: ../win32/gui/plugin.c:140
+#, c-format
+msgid "*PCSXR*: Xa Disabled"
+msgstr ""
+
+#: ../win32/gui/plugin.c:149
+msgid "*PCSXR*: CdRom Case Opened"
+msgstr ""
+
+#: ../win32/gui/plugin.c:155
+msgid "*PCSXR*: CdRom Case Closed"
+msgstr ""
+
+#: ../win32/gui/plugin.c:181
+msgid "Connecting..."
+msgstr ""
+
+#: ../win32/gui/plugin.c:183 ../win32/gui/plugin.c:190
+#, c-format
+msgid "Please wait while connecting... %c\n"
+msgstr ""
+
+#: ../win32/gui/plugin.c:218
+msgid "Error Opening CDR Plugin"
+msgstr ""
+
+#: ../win32/gui/plugin.c:281
+#, c-format
+msgid "Error Opening GPU Plugin (%d)"
+msgstr ""
+
+#: ../win32/gui/plugin.c:283
+#, c-format
+msgid "Error Opening SPU Plugin (%d)"
+msgstr ""
+
+#: ../win32/gui/plugin.c:286
+#, c-format
+msgid "Error Opening PAD1 Plugin (%d)"
+msgstr ""
+
+#: ../win32/gui/plugin.c:290
+#, c-format
+msgid "Error Opening PAD2 Plugin (%d)"
+msgstr ""
+
+#: ../win32/gui/plugin.c:295
+#, c-format
+msgid "Error Opening SIO1 plugin (%d)"
+msgstr ""
+
+#: ../win32/gui/plugin.c:325
+msgid "Error Closing CDR Plugin"
+msgstr ""
+
+#: ../win32/gui/plugin.c:327
+msgid "Error Closing GPU Plugin"
+msgstr ""
+
+#: ../win32/gui/plugin.c:329
+msgid "Error Closing SPU Plugin"
+msgstr ""
+
+#: ../win32/gui/plugin.c:332
+msgid "Error Closing SIO1 plugin"
+msgstr ""
+
+#: ../win32/gui/plugin.c:354
+#, c-format
+msgid "CDRinit error: %d"
+msgstr ""
+
+#: ../win32/gui/plugin.c:356
+#, c-format
+msgid "GPUinit error: %d"
+msgstr ""
+
+#: ../win32/gui/plugin.c:358
+#, c-format
+msgid "SPUinit error: %d"
+msgstr ""
+
+#: ../win32/gui/plugin.c:360
+#, c-format
+msgid "PAD1init error: %d"
+msgstr ""
+
+#: ../win32/gui/plugin.c:362
+#, c-format
+msgid "PAD2init error: %d"
+msgstr ""
+
+#: ../win32/gui/plugin.c:365
+#, c-format
+msgid "SIO1init error: %d"
+msgstr ""
+
+#: ../win32/gui/plugin.c:370
+#, c-format
+msgid "NETinit error: %d"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:77
+msgid "Arabic"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:78
+msgid "Catalan"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:79
+msgid "German"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:80
+msgid "Greek"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:81 ../win32/gui/WndMain.c:1699
+#: ../win32/gui/WndMain.c:1701
+msgid "English"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:82
+msgid "Spanish"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:83
+msgid "French"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:84
+msgid "Italian"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:85
+msgid "Portuguese"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:86
+msgid "Portuguese (Brazilian)"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:87
+msgid "Romanian"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:88
+msgid "Russian"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:89
+msgid "Simplified Chinese"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:90
+msgid "Traditional Chinese"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:91
+msgid "Japanese"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:92
+msgid "Korean"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:215
+msgid ""
+"Usage: pcsxr [options]\n"
+"\toptions:\n"
+"\t-nogui\t\tDon't open the GUI\n"
+"\t-psxout\t\tEnable PSX output\n"
+"\t-slowboot\tEnable BIOS logo\n"
+"\t-runcd\t\tRuns CD-ROM (requires -nogui)\n"
+"\t-cdfile FILE\tRuns a CD image file (requires -nogui)\n"
+"\t-help\t\tDisplay this message"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:350 ../win32/gui/WndMain.c:396
+msgid "PCSXR State Format"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:377
+#, c-format
+msgid "*PCSXR*: Loaded State %s"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:378
+#, c-format
+msgid "*PCSXR*: Error Loading State %s"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:423
+#, c-format
+msgid "*PCSXR*: Saved State %s"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:424
+#, c-format
+msgid "*PCSXR*: Error Saving State %s"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:493
+msgid "Running BIOS is not supported with Internal HLE Bios."
+msgstr ""
+
+#: ../win32/gui/WndMain.c:790
+msgid "Game ID"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:796
+msgid "Game"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:978
+msgid "mid link block"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:981
+msgid "terminiting link block"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1086
+msgid "Memcard Manager"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1090 ../win32/gui/WndMain.c:1093
+msgid "Select Mcd"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1091 ../win32/gui/WndMain.c:1094
+msgid "Format Mcd"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1092 ../win32/gui/WndMain.c:1095
+msgid "Reload Mcd"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1096
+msgid "-> Copy ->"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1097
+msgid "<- Copy <-"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1098
+msgid "Paste"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1099
+msgid "<- Un/Delete"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1100
+msgid "Un/Delete ->"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1102
+msgid "Memory Card 1"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1103
+msgid "Memory Card 2"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1158
+msgid "Are you sure you want to paste this selection?"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1158 ../win32/gui/WndMain.c:1269
+#: ../win32/gui/WndMain.c:1276
+msgid "Confirmation"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1269 ../win32/gui/WndMain.c:1276
+msgid "Are you sure you want to format this Memory Card?"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1322
+msgid "Cpu Config"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1327
+msgid "Disable Xa Decoding"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1328
+msgid "Sio Irq Always Enabled"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1329
+msgid "Black && White Movies"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1330
+msgid "Disable Cd audio"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1333
+msgid "Enable Interpreter Cpu"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1336
+msgid "Spu Irq Always Enabled"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1340
+msgid "Hide cursor"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1343
+msgid "Psx System Type"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1453
+msgid "Psx Mcd Format (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1458
+msgid "Psx Memory Card (*.mcr;*.mc)"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1463
+msgid "CVGS Memory Card (*.mem;*.vgs)"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1468
+msgid "Bleem Memory Card (*.mcd)"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1473
+msgid "DexDrive Memory Card (*.gme)"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1478
+msgid "DataDeck Memory Card (*.ddf)"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1522
+msgid "Psx Exe Format"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1559
+msgid "Psx Isos (*.iso;*.mdf;*.img;*.bin;*.cue;*.pbp;*.cbn)"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1635
+msgid "&File"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1636
+msgid "E&xit"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1638
+msgid "Run &EXE..."
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1639
+msgid "Run &BIOS"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1640
+msgid "Run &ISO..."
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1641
+msgid "Run &CD"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1643
+msgid "&Emulator"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1644
+msgid "&States"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1646
+msgid "S&witch ISO..."
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1648
+msgid "S&hutdown"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1649
+msgid "Re&set"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1650
+msgid "&Run"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1651
+msgid "&Save"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1652
+msgid "&Load"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1653 ../win32/gui/WndMain.c:1663
+msgid "&Other..."
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1654 ../win32/gui/WndMain.c:1664
+msgid "Slot &9"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1655 ../win32/gui/WndMain.c:1665
+msgid "Slot &8"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1656 ../win32/gui/WndMain.c:1666
+msgid "Slot &7"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1657 ../win32/gui/WndMain.c:1667
+msgid "Slot &6"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1658 ../win32/gui/WndMain.c:1668
+msgid "Slot &5"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1659 ../win32/gui/WndMain.c:1669
+msgid "Slot &4"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1660 ../win32/gui/WndMain.c:1670
+msgid "Slot &3"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1661 ../win32/gui/WndMain.c:1671
+msgid "Slot &2"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1662 ../win32/gui/WndMain.c:1672
+msgid "Slot &1"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1674
+msgid "&Configuration"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1675
+msgid "Cheat &Search..."
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1676
+msgid "Ch&eat Code..."
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1679
+msgid "&Language"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1705
+msgid "&Memory cards..."
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1706
+msgid "C&PU..."
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1708
+msgid "&NetPlay..."
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1710
+msgid "&Link cable..."
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1711
+msgid "&Controllers..."
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1712
+msgid "CD-&ROM..."
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1713
+msgid "&Sound..."
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1714
+msgid "&Graphics..."
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1716
+msgid "&Plugins && Bios..."
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1718
+msgid "&Help"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1719
+msgid "&About..."
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1870
+msgid "Pcsxr Msg"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:1873
+msgid "Error Loading Symbol"
+msgstr ""

pcsxr-1.9.92.tar.bz2/po/pt_BR.po -> pcsxr-1.9.93.tar.bz2/po/pt_BR.po Changed

@@ -1,1621 +1,1848 @@
-# Translation of pcsx.pot to Portuguese from Brazil
-# This file is distributed under the same license as the pcsx reloaded package.
-# Tibério Vítor <tvtoon@gmail.com>, 2009.
+# Translation of pcsx.pot to Portuguese from Brazil
+# This file is distributed under the same license as the pcsx reloaded package.
+# Tibério Vítor <tvtoon@gmail.com>, 2009.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: pcsx-df\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-10 14:04+0800\n"
-"PO-Revision-Date: 2009-11-28 23:57+0700\n"
+"Project-Id-Version: pcsxr 1.0\n"
+"Report-Msgid-Bugs-To: whistler_wmz@users.sf.net\n"
+"POT-Creation-Date: 2013-03-02 03:33+0400\n"
+"PO-Revision-Date: 2011-06-04 13:45+0400\n"
 "Last-Translator: Wei Mingzhi <whistler@openoffice.org>\n"
 "Language-Team: PoBRE <romhackers@gmail.com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.2\n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../win32/gui/AboutDlg.c:26
-msgid ""
-"PCSX - A PlayStation Emulator\n"
-"\n"
-"Original Authors:\n"
-"main coder: linuzappz\n"
-"co-coders: shadow\n"
-"ex-coders: Nocomp, Pete Bernett, nik3d\n"
-"Webmaster: AkumaX"
-msgstr ""
-"PCSX - Um Emulador de PlayStation\n"
-"\n"
-"Autores Originais:\n"
-"Programador principal: linuzappz\n"
-"Programador auxiliar: shadow\n"
-"Ex-programadores: Nocomp, Pete Bernett, nik3d\n"
-"Webmaster: AkumaX"
-
-#: ../win32/gui/AboutDlg.c:35
-#, fuzzy
-msgid ""
-"PCSX-df Authors:\n"
-"Ryan Schultz, Andrew Burton, Stephen Chao,\n"
-"Marcus Comstedt, Stefan Sikora\n"
-"\n"
-"PCSX-Reloaded By:\n"
-"Blade_Arma, Wei Mingzhi, et al.\n"
-"\n"
-"http://pcsxr.codeplex.com/"
-msgstr ""
-"Autores do PCSX-df:\n"
-"Ryan Schultz, Andrew Burton, Stephen Chao,\n"
-"Marcus Comstedt, Stefan Sikora\n"
-"\n"
-"PCSX Reloaded por:\n"
-"Wei Mingzhi\n"
-"\n"
-"http://www.codeplex.com/pcsxr"
+#: ../data/pcsxr.ui.h:1 ../win32/gui/CheatDlg.c:166
+msgid "Edit Cheat Codes"
+msgstr "Editar Códigos de Trapaça"
 
-#: ../win32/gui/AboutDlg.c:46 ../plugins/peopsxgl/gpucfg/interface.c:831
-msgid "About"
-msgstr "Sobre"
+#: ../data/pcsxr.ui.h:2
+msgid "Cheat Codes"
+msgstr "Códigos de trapaça"
 
-#: ../win32/gui/AboutDlg.c:48 ../win32/gui/AboutDlg.c:52
-#: ../win32/gui/CheatDlg.c:69 ../win32/gui/CheatDlg.c:119
-#: ../win32/gui/ConfigurePlugins.c:483 ../win32/gui/ConfigurePlugins.c:614
-#: ../win32/gui/WndMain.c:974 ../win32/gui/WndMain.c:1210
-#: ../plugins/peopsxgl/gpucfg/interface.c:130
-#: ../plugins/peopsxgl/gpucfg/interface.c:843
-msgid "OK"
-msgstr "OK"
+#: ../data/pcsxr.ui.h:3 ../gui/Cheat.c:1113 ../win32/gui/CheatDlg.c:678
+msgid "Cheat Search"
+msgstr "Procurar por trapaça"
 
-#: ../win32/gui/AboutDlg.c:49
-msgid "PCSX EMU\n"
-msgstr "EMULADOR PCSX\n"
+#: ../data/pcsxr.ui.h:4 ../win32/gui/CheatDlg.c:680
+msgid "Search For:"
+msgstr "Buscar por:"
 
-#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
-#: ../win32/gui/CheatDlg.c:270
-msgid "Yes"
-msgstr "Sim"
+#: ../data/pcsxr.ui.h:5 ../win32/gui/CheatDlg.c:681
+msgid "Data Type:"
+msgstr "Tipo de dados:"
 
-#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
-#: ../win32/gui/CheatDlg.c:270
-msgid "No"
-msgstr "Não"
+#: ../data/pcsxr.ui.h:6 ../gui/Cheat.c:645 ../win32/gui/CheatDlg.c:506
+#: ../win32/gui/CheatDlg.c:597 ../win32/gui/CheatDlg.c:682
+msgid "Value:"
+msgstr "Valor:"
 
-#: ../win32/gui/CheatDlg.c:66 ../gui/Cheat.c:194
-msgid "Edit Cheat"
-msgstr "Editar Trapaça"
+#: ../data/pcsxr.ui.h:7 ../win32/gui/CheatDlg.c:683
+msgid "Data Base:"
+msgstr "Banco de dados:"
 
-#: ../win32/gui/CheatDlg.c:67 ../win32/gui/CheatDlg.c:117 ../gui/Cheat.c:636
-msgid "Description:"
-msgstr "Descrição:"
+#: ../data/pcsxr.ui.h:8 ../win32/gui/CheatDlg.c:684
+msgid "To:"
+msgstr "Para:"
 
-#: ../win32/gui/CheatDlg.c:68 ../win32/gui/CheatDlg.c:118 ../gui/Cheat.c:125
-#: ../gui/Cheat.c:211
-msgid "Cheat Code:"
-msgstr "Código de Trapaça:"
+#: ../data/pcsxr.ui.h:9 ../win32/gui/CheatDlg.c:504
+msgid "Freeze"
+msgstr "Parar"
 
-#: ../win32/gui/CheatDlg.c:70 ../win32/gui/CheatDlg.c:120
-#: ../win32/gui/ConfigurePlugins.c:484 ../win32/gui/ConfigurePlugins.c:615
-#: ../win32/gui/WndMain.c:975 ../win32/gui/WndMain.c:1211
-#: ../plugins/peopsxgl/gpucfg/interface.c:338
-msgid "Cancel"
-msgstr "Cancelar"
+#: ../data/pcsxr.ui.h:10 ../win32/gui/CheatDlg.c:595
+msgid "Modify"
+msgstr "Modificar"
 
-#: ../win32/gui/CheatDlg.c:91 ../win32/gui/CheatDlg.c:132 ../gui/Cheat.c:155
-#: ../gui/Cheat.c:251
-msgid "Invalid cheat code!"
-msgstr "Código de trapaça inválido!"
+#: ../data/pcsxr.ui.h:11
+msgid "Copy"
+msgstr "Copiar"
 
-#: ../win32/gui/CheatDlg.c:116 ../gui/Cheat.c:109
-msgid "Add New Cheat"
-msgstr "Adicionar nova Trapaça"
+#: ../data/pcsxr.ui.h:12
+msgid "label_resultsfound"
+msgstr "Resultados encontrados:"
 
-#: ../win32/gui/CheatDlg.c:166 ../data/pcsx.glade2:2534
-msgid "Edit Cheat Codes"
-msgstr "Editar Códigos de Trapaça"
+#: ../data/pcsxr.ui.h:13
+msgid "Search"
+msgstr "Buscar"
 
-#: ../win32/gui/CheatDlg.c:168
-msgid "&Add Code"
-msgstr "&Adicionar código"
+#: ../data/pcsxr.ui.h:14
+msgid "Restart"
+msgstr "Reiniciar"
 
-#: ../win32/gui/CheatDlg.c:169
-msgid "&Edit Code"
-msgstr "&Editar trapaça"
+#: ../data/pcsxr.ui.h:15
+msgid "Cheat Search"
+msgstr "Busca de trapaças"
 
-#: ../win32/gui/CheatDlg.c:170
-msgid "&Remove Code"
-msgstr "&Remover trapaça"
+#: ../data/pcsxr.ui.h:16 ../gui/ConfDlg.c:113
+msgid "Configure PCSXR"
+msgstr "Configurar PCSXR"
 
-#: ../win32/gui/CheatDlg.c:171
-msgid "&Enable/Disable"
-msgstr "Ativar ou desativar"
+#: ../data/pcsxr.ui.h:17
+msgid "Graphics:"
+msgstr "Gráficos:"
 
-#: ../win32/gui/CheatDlg.c:172
-msgid "&Load..."
-msgstr "&Carregar..."
+#: ../data/pcsxr.ui.h:18
+msgid "Sound:"
+msgstr "Áudio:"
 
-#: ../win32/gui/CheatDlg.c:173
-msgid "&Save As..."
-msgstr "&Salvar como..."
+#: ../data/pcsxr.ui.h:19
+#, fuzzy
+msgid "Controller 1:"
+msgstr "Controle 1"
 
-#: ../win32/gui/CheatDlg.c:174
-msgid "&Close"
-msgstr "&Fechar"
+#: ../data/pcsxr.ui.h:20
+msgid "Controller 2:"
+msgstr "Controle 2:"
 
-#: ../win32/gui/CheatDlg.c:185 ../gui/Cheat.c:413
-msgid "Description"
-msgstr "Descrição"
+#: ../data/pcsxr.ui.h:21
+msgid "CD-ROM:"
+msgstr "CD-ROM:"
 
-#: ../win32/gui/CheatDlg.c:190
-msgid "Enabled"
-msgstr "Ligado"
+#: ../data/pcsxr.ui.h:22
+msgid "Search in:"
+msgstr "Buscar em:"
 
-#: ../win32/gui/CheatDlg.c:282 ../win32/gui/CheatDlg.c:311
-msgid "PCSX Cheat Code Files"
-msgstr "Arquivos de trapaça do PCSX"
+#: ../data/pcsxr.ui.h:23
+msgid "Select Folder to Search"
+msgstr "Selecione o diretório para a busca"
 
-#: ../win32/gui/CheatDlg.c:402
-msgid "Equal Value"
-msgstr "Valores igual à"
+#: ../data/pcsxr.ui.h:24
+#, fuzzy
+msgid "Link cable:"
+msgstr "Ligar"
 
-#: ../win32/gui/CheatDlg.c:403
-msgid "Not Equal Value"
-msgstr "Valores diferente de"
+#: ../data/pcsxr.ui.h:25
+msgid "Plugins"
+msgstr "Extensões"
 
-#: ../win32/gui/CheatDlg.c:404
-msgid "Range"
-msgstr "Intervalo"
+#: ../data/pcsxr.ui.h:26
+msgid "BIOS:"
+msgstr ""
 
-#: ../win32/gui/CheatDlg.c:407
-msgid "Increased By"
-msgstr "Somado por"
+#: ../data/pcsxr.ui.h:27
+msgid "BIOS"
+msgstr "BIOS"
 
-#: ../win32/gui/CheatDlg.c:408
-msgid "Decreased By"
-msgstr "Subtraído por"
+#: ../data/pcsxr.ui.h:28
+msgid "Configure CPU"
+msgstr "Configurar CPU"
 
-#: ../win32/gui/CheatDlg.c:409
-msgid "Increased"
-msgstr "Maiores"
+#: ../data/pcsxr.ui.h:29
+msgid "SPU IRQ Always Enabled"
+msgstr "IRQ da SPU sempre ativada"
 
-#: ../win32/gui/CheatDlg.c:410
-msgid "Decreased"
-msgstr "Menores"
+#: ../data/pcsxr.ui.h:30
+msgid "Black & White Movies"
+msgstr "Filmes em preto e branco"
 
-#: ../win32/gui/CheatDlg.c:411
-msgid "Different"
-msgstr "Diferentes"
+#: ../data/pcsxr.ui.h:31 ../gui/Plugin.c:239
+#, c-format
+msgid "SIO IRQ Always Enabled"
+msgstr "IRQ SIO sempre ativada"
 
-#: ../win32/gui/CheatDlg.c:412
-msgid "No Change"
-msgstr "Sem mudanças"
+#: ../data/pcsxr.ui.h:32
+msgid "Disable XA Decoding"
+msgstr "Desativar decodificação de XA"
 
-#: ../win32/gui/CheatDlg.c:448 ../gui/Cheat.c:585
-msgid "Enter the values and start your search."
-msgstr "Digite algum número para começar a pesquisa."
+#: ../data/pcsxr.ui.h:33
+msgid "Disable CD Audio"
+msgstr "Desativar áudio de CD"
 
-#: ../win32/gui/CheatDlg.c:453
-msgid "No addresses found."
-msgstr "Nenhum endereço encontrado com esse número."
+#: ../data/pcsxr.ui.h:34 ../win32/gui/WndMain.c:1331
+msgid "Slow Boot"
+msgstr ""
 
-#: ../win32/gui/CheatDlg.c:457 ../gui/Cheat.c:543
-msgid "Too many addresses found."
-msgstr "Muitos endereços encontrados com esse número, refine a pesquisa."
+#: ../data/pcsxr.ui.h:35
+msgid "Enable Interpreter CPU"
+msgstr "Ativar interpretador da CPU"
 
-#: ../win32/gui/CheatDlg.c:466 ../gui/Cheat.c:552
-#, c-format
-msgid "%.8X Current: %u (%.2X), Previous: %u (%.2X)"
-msgstr "%.8X Atual: %u (%.2X), Anterior: %u (%.2X)"
+#: ../data/pcsxr.ui.h:36 ../win32/gui/WndMain.c:1334
+msgid "Enable Console Output"
+msgstr "Ativar saída no terminal"
 
-#: ../win32/gui/CheatDlg.c:471 ../gui/Cheat.c:557
-#, c-format
-msgid "%.8X Current: %u (%.4X), Previous: %u (%.4X)"
-msgstr "%.8X Atual: %u (%.4X), Anterior: %u (%.4X)"
+#: ../data/pcsxr.ui.h:37 ../win32/gui/WndMain.c:1335
+msgid "Enable Debugger"
+msgstr "Ligar debugger"
 
-#: ../win32/gui/CheatDlg.c:476 ../gui/Cheat.c:562
-#, c-format
-msgid "%.8X Current: %u (%.8X), Previous: %u (%.8X)"
-msgstr "%.8X Atual: %u (%.8X), Anterior: %u (%.8X)"
+#: ../data/pcsxr.ui.h:38 ../win32/gui/WndMain.c:1337
+msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
+msgstr "Correção para Parasite Eve 2, Vandal Hearts..."
 
-#: ../win32/gui/CheatDlg.c:492 ../gui/Cheat.c:577
-#, c-format
-msgid "Founded Addresses: %d"
-msgstr "Endereços com o número: %d"
+#: ../data/pcsxr.ui.h:39 ../win32/gui/WndMain.c:1338
+msgid "InuYasha Sengoku Battle Fix"
+msgstr "Correção para InuYasha, Sengoku Battle..."
 
-#: ../win32/gui/CheatDlg.c:504 ../data/pcsx.glade2:2930
-msgid "Freeze"
-msgstr "Parar"
+#: ../data/pcsxr.ui.h:40 ../win32/gui/WndMain.c:1339
+msgid "Widescreen (GTE Hack)"
+msgstr ""
 
-#: ../win32/gui/CheatDlg.c:505 ../win32/gui/CheatDlg.c:596
-msgid "Address:"
-msgstr "Endereço:"
+#: ../data/pcsxr.ui.h:41
+msgid "Options"
+msgstr "Opções"
 
-#: ../win32/gui/CheatDlg.c:506 ../win32/gui/CheatDlg.c:597
-#: ../win32/gui/CheatDlg.c:682 ../gui/Cheat.c:647 ../data/pcsx.glade2:2773
-msgid "Value:"
-msgstr "Valor:"
+#: ../data/pcsxr.ui.h:42 ../win32/gui/WndMain.c:1332
+msgid "Autodetect"
+msgstr "Detectar Automaticamente"
 
-#: ../win32/gui/CheatDlg.c:566
-#, c-format
-msgid "Freeze %.8X"
-msgstr "Parar %.8X"
+#: ../data/pcsxr.ui.h:43
+msgid "System Type"
+msgstr "Tipo do sistema"
 
-#: ../win32/gui/CheatDlg.c:595 ../data/pcsx.glade2:2966
-msgid "Modify"
-msgstr "Modificar"
+#: ../data/pcsxr.ui.h:44
+msgid "PCSXR"
+msgstr "PCSXR"
 
-#: ../win32/gui/CheatDlg.c:678 ../gui/Cheat.c:1129 ../data/pcsx.glade2:2703
-msgid "Cheat Search"
-msgstr "Procurar por trapaça"
+#: ../data/pcsxr.ui.h:45
+msgid "_File"
+msgstr "_Arquivo"
 
-#: ../win32/gui/CheatDlg.c:680 ../data/pcsx.glade2:2751
-msgid "Search For:"
-msgstr "Buscar por:"
+#: ../data/pcsxr.ui.h:46
+msgid "Run _CD"
+msgstr "Rodar _CD"
 
-#: ../win32/gui/CheatDlg.c:681 ../data/pcsx.glade2:2761
-msgid "Data Type:"
-msgstr "Tipo de dados:"
+#: ../data/pcsxr.ui.h:47
+msgid "Run _ISO..."
+msgstr "Rodar _imagem de CD..."
 
-#: ../win32/gui/CheatDlg.c:683 ../data/pcsx.glade2:2785
-msgid "Data Base:"
-msgstr "Banco de dados:"
+#: ../data/pcsxr.ui.h:48
+msgid "Run _BIOS"
+msgstr "Rodar pela _BIOS"
 
-#: ../win32/gui/CheatDlg.c:684 ../data/pcsx.glade2:2845
-msgid "To:"
-msgstr "Para:"
+#: ../data/pcsxr.ui.h:49
+msgid "Run _EXE..."
+msgstr "Rodar _EXE do PSX..."
 
-#: ../win32/gui/CheatDlg.c:685
-msgid "&Freeze"
-msgstr "&Parar"
+#: ../data/pcsxr.ui.h:50
+msgid "E_xit"
+msgstr "_Sair"
 
-#: ../win32/gui/CheatDlg.c:686
-msgid "&Modify"
-msgstr "&Modificar"
+#: ../data/pcsxr.ui.h:51
+msgid "_Emulator"
+msgstr "_Emulador"
 
-#: ../win32/gui/CheatDlg.c:687
-msgid "&Copy"
-msgstr "&Copiar"
+#: ../data/pcsxr.ui.h:52
+msgid "_Continue"
+msgstr "_Continue"
 
-#: ../win32/gui/CheatDlg.c:688
-msgid "&Search"
-msgstr "&Buscar"
-
-#: ../win32/gui/CheatDlg.c:689
-msgid "&New Search"
-msgstr "&Nova busca"
+#: ../data/pcsxr.ui.h:53
+msgid "_Reset"
+msgstr "_Reiniciar"
 
-#: ../win32/gui/CheatDlg.c:690
-msgid "C&lose"
-msgstr "Fe&char"
+#: ../data/pcsxr.ui.h:54
+msgid "_Shutdown"
+msgstr ""
 
-#: ../win32/gui/CheatDlg.c:692
-msgid "8-bit"
-msgstr "8-bit"
+#: ../data/pcsxr.ui.h:55
+msgid "S_witch ISO..."
+msgstr "_Trocar de imagem de CD..."
 
-#: ../win32/gui/CheatDlg.c:693
-msgid "16-bit"
-msgstr "16-bit"
+#: ../data/pcsxr.ui.h:56
+msgid "_Save State"
+msgstr "_Salvar estado"
 
-#: ../win32/gui/CheatDlg.c:694
-msgid "32-bit"
-msgstr "32-bit"
+#: ../data/pcsxr.ui.h:57
+msgid "Slot _1"
+msgstr "Unidade _1"
 
-#: ../win32/gui/CheatDlg.c:695
-msgid "Decimal"
-msgstr "Decimal"
+#: ../data/pcsxr.ui.h:58
+msgid "Slot _2"
+msgstr "Unidade _2"
 
-#: ../win32/gui/CheatDlg.c:696
-msgid "Hexadecimal"
-msgstr "Hexadecimal"
+#: ../data/pcsxr.ui.h:59
+msgid "Slot _3"
+msgstr "Unidade _3"
 
-#: ../win32/gui/ConfigurePlugins.c:219
-msgid "Simulate Psx Bios"
-msgstr ""
+#: ../data/pcsxr.ui.h:60
+msgid "Slot _4"
+msgstr "Unidade _4"
 
-#: ../win32/gui/ConfigurePlugins.c:305
-msgid "Configuration not OK!"
-msgstr "Não configurou corretamente!"
+#: ../data/pcsxr.ui.h:61
+msgid "Slot _5"
+msgstr "Unidade _5"
 
-#: ../win32/gui/ConfigurePlugins.c:305 ../gui/Cheat.c:155 ../gui/Cheat.c:251
-#: ../gui/LnxMain.c:418
-msgid "Error"
-msgstr "Erro"
+#: ../data/pcsxr.ui.h:62
+msgid "Slot _6"
+msgstr "Unidade _6"
 
-#: ../win32/gui/ConfigurePlugins.c:406
-msgid "This plugin reports that should work correctly"
-msgstr "Esta extensão informou que deve funcionar corretamente."
+#: ../data/pcsxr.ui.h:63
+msgid "Slot _7"
+msgstr "Unidade _7"
 
-#: ../win32/gui/ConfigurePlugins.c:407
-msgid "This plugin reports that should not work correctly"
-msgstr "Esta extensão informou que não deve funcionar corretamente."
+#: ../data/pcsxr.ui.h:64
+msgid "Slot _8"
+msgstr "Unidade _8"
 
-#: ../win32/gui/ConfigurePlugins.c:463
-msgid "Select Plugins Directory"
-msgstr "Escolha o diretório das extensões"
+#: ../data/pcsxr.ui.h:65
+msgid "Slot _9"
+msgstr "Unidade _9"
 
-#: ../win32/gui/ConfigurePlugins.c:472
-msgid "Select Bios Directory"
-msgstr "Escolha o diretório da BIOS"
+#: ../data/pcsxr.ui.h:66
+msgid "_Other..."
+msgstr "_Outros..."
 
-#: ../win32/gui/ConfigurePlugins.c:481
-msgid "Configuration"
-msgstr "Configuração"
+#: ../data/pcsxr.ui.h:67
+msgid "_Load State"
+msgstr "_Carregar estado"
 
-#: ../win32/gui/ConfigurePlugins.c:485
-msgid "Graphics"
-msgstr "Gráficos"
+#: ../data/pcsxr.ui.h:68
+msgid "_Configuration"
+msgstr "C_onfiguração"
 
-#: ../win32/gui/ConfigurePlugins.c:486
-msgid "First Controller"
-msgstr "Controle 1"
+#: ../data/pcsxr.ui.h:69
+msgid "_Plugins & BIOS..."
+msgstr "_Extensões e BIOS..."
 
-#: ../win32/gui/ConfigurePlugins.c:487
-msgid "Second Controller"
-msgstr "Controle 2"
+#: ../data/pcsxr.ui.h:70
+msgid "_Graphics..."
+msgstr "_Gráficos..."
 
-#: ../win32/gui/ConfigurePlugins.c:488
-msgid "Sound"
-msgstr "Áudio"
+#: ../data/pcsxr.ui.h:71
+msgid "_Sound..."
+msgstr "Á_udio..."
 
-#: ../win32/gui/ConfigurePlugins.c:489
-msgid "Cdrom"
-msgstr "CDROM"
+#: ../data/pcsxr.ui.h:72
+msgid "CD-_ROM..."
+msgstr "CD_ROM..."
 
-#: ../win32/gui/ConfigurePlugins.c:490
-msgid "Bios"
-msgstr "BIOS"
+#: ../data/pcsxr.ui.h:73
+msgid "C_ontrollers..."
+msgstr "C_ontroles..."
 
-#: ../win32/gui/ConfigurePlugins.c:491
-msgid "Set Bios Directory"
-msgstr "Escolher o diretório da BIOS"
+#: ../data/pcsxr.ui.h:74
+#, fuzzy
+msgid "_Link cable..."
+msgstr "Ligar"
 
-#: ../win32/gui/ConfigurePlugins.c:492
-msgid "Set Plugins Directory"
-msgstr "Escolher o diretório das extensões"
+#: ../data/pcsxr.ui.h:75
+msgid "_Netplay..."
+msgstr "Jogo em _rede..."
 
-#: ../win32/gui/ConfigurePlugins.c:493 ../win32/gui/ConfigurePlugins.c:496
-#: ../win32/gui/ConfigurePlugins.c:499 ../win32/gui/ConfigurePlugins.c:502
-#: ../win32/gui/ConfigurePlugins.c:505 ../win32/gui/ConfigurePlugins.c:617
-msgid "Configure..."
-msgstr "Configurar..."
+#: ../data/pcsxr.ui.h:76
+msgid "_CPU..."
+msgstr "_CPU..."
 
-#: ../win32/gui/ConfigurePlugins.c:494 ../win32/gui/ConfigurePlugins.c:497
-#: ../win32/gui/ConfigurePlugins.c:500 ../win32/gui/ConfigurePlugins.c:503
-#: ../win32/gui/ConfigurePlugins.c:506 ../win32/gui/ConfigurePlugins.c:618
-msgid "Test..."
-msgstr "Testar..."
+#: ../data/pcsxr.ui.h:77
+msgid "_Memory Cards..."
+msgstr "Cartões de _memória..."
 
-#: ../win32/gui/ConfigurePlugins.c:495 ../win32/gui/ConfigurePlugins.c:498
-#: ../win32/gui/ConfigurePlugins.c:501 ../win32/gui/ConfigurePlugins.c:504
-#: ../win32/gui/ConfigurePlugins.c:507 ../win32/gui/ConfigurePlugins.c:619
-msgid "About..."
-msgstr "Sobre..."
+#: ../data/pcsxr.ui.h:78
+msgid "Chea_t"
+msgstr "T_rapaça"
 
-#: ../win32/gui/ConfigurePlugins.c:612
-msgid "NetPlay Configuration"
-msgstr "Configuração do jogo em rede"
+#: ../data/pcsxr.ui.h:79
+msgid "_Browse..."
+msgstr "_Navegar..."
 
-#: ../win32/gui/ConfigurePlugins.c:616 ../plugins/dfnet/gui.c:31
-#: ../plugins/dfnet/gui.c:112
-msgid "NetPlay"
-msgstr "Jogo em rede"
+#: ../data/pcsxr.ui.h:80
+msgid "_Search..."
+msgstr "_Buscar..."
 
-#: ../win32/gui/ConfigurePlugins.c:620
-msgid ""
-"Note: The NetPlay Plugin Directory should be the same as the other Plugins."
+#: ../data/pcsxr.ui.h:81
+msgid "Memory _Dump"
 msgstr ""
-"Observação: o diretório da extensão de jogo em rede deve ser o mesmo que "
-"odas outras extensões."
 
-#: ../win32/gui/plugin.c:90 ../win32/gui/WndMain.c:281
-#, c-format
-msgid "*PCSX*: Saved State %d"
-msgstr "PCSX: Estado \"%d\" salvo."
+#: ../data/pcsxr.ui.h:82
+msgid "_Help"
+msgstr "_Ajuda"
 
-#: ../win32/gui/plugin.c:91 ../win32/gui/WndMain.c:282
-#, c-format
-msgid "*PCSX*: Error Saving State %d"
-msgstr "PCSX: Erro ao salvar o estado \"%d\"!"
+#: ../data/pcsxr.ui.h:83
+msgid "_About PCSXR..."
+msgstr "_Sobre o PCSXR..."
 
-#: ../win32/gui/plugin.c:107 ../win32/gui/WndMain.c:259
-#, c-format
-msgid "*PCSX*: Loaded State %d"
-msgstr "PCSX: Estado \"%d\" carregado."
+#: ../data/pcsxr.ui.h:84
+msgid "Run CD"
+msgstr ""
 
-#: ../win32/gui/plugin.c:108 ../win32/gui/WndMain.c:260
-#, c-format
-msgid "*PCSX*: Error Loading State %d"
-msgstr "PCSX: Erro ao carregar o estado \"%d\"!"
+#: ../data/pcsxr.ui.h:85
+msgid "Run ISO Image"
+msgstr ""
 
-#: ../win32/gui/plugin.c:119
-#, c-format
-msgid "*PCSX*: Sio Irq Always Enabled"
-msgstr "PCSX: IRQ SIO sempre ativada."
+#: ../data/pcsxr.ui.h:86
+msgid "Continue Emulation"
+msgstr ""
 
-#: ../win32/gui/plugin.c:120
-#, c-format
-msgid "*PCSX*: Sio Irq Not Always Enabled"
-msgstr "PCSX: IRQ SIO nem sempre ativada."
+#: ../data/pcsxr.ui.h:87
+msgid "Switch ISO Image"
+msgstr ""
 
-#: ../win32/gui/plugin.c:127
-#, c-format
-msgid "*PCSX*: Black&White Mdecs Only Enabled"
-msgstr "PCSX: Mdecs apenas em preto e branco."
+#: ../data/pcsxr.ui.h:88
+msgid "Configure Memory Cards"
+msgstr "Configurar cartões de memória"
 
-#: ../win32/gui/plugin.c:128
-#, c-format
-msgid "*PCSX*: Black&White Mdecs Only Disabled"
-msgstr "PCSX: Mdecs coloridas."
+#: ../data/pcsxr.ui.h:89
+msgid "Configure Graphics"
+msgstr ""
 
-#: ../win32/gui/plugin.c:135
-#, c-format
-msgid "*PCSX*: Xa Enabled"
-msgstr "PCSX: XA Ligado."
+#: ../data/pcsxr.ui.h:90 ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:1
+msgid "Configure Sound"
+msgstr "Configurar áudio"
 
-#: ../win32/gui/plugin.c:136
-#, c-format
-msgid "*PCSX*: Xa Disabled"
-msgstr "PCSX: XA Desligado."
+#: ../data/pcsxr.ui.h:91
+msgid "Configure CD-ROM"
+msgstr "Configurar CD-ROM"
 
-#: ../win32/gui/plugin.c:145
-msgid "*PCSX*: CdRom Case Opened"
-msgstr "PCSX: Bandeja do CDROM aberta."
+#: ../data/pcsxr.ui.h:92
+msgid "Configure Controllers"
+msgstr ""
 
-#: ../win32/gui/plugin.c:150
-msgid "*PCSX*: CdRom Case Closed"
-msgstr "PCSX: Bandeja do CDROM fechada."
+#: ../data/pcsxr.ui.h:93
+msgid "New"
+msgstr ""
 
-#: ../win32/gui/plugin.c:177
-msgid "Connecting..."
-msgstr "Conectando..."
+#: ../data/pcsxr.ui.h:94
+msgid "Format"
+msgstr "Formatar"
 
-#: ../win32/gui/plugin.c:179 ../win32/gui/plugin.c:186
-#, c-format
-msgid "Please wait while connecting... %c\n"
-msgstr "Por favor, espere enquanto o emulador se conecta... %c\n"
+#: ../data/pcsxr.ui.h:95
+msgid "Un/Delete"
+msgstr "Apagar/Desfazer"
 
-#: ../win32/gui/plugin.c:214
-msgid "Error Opening CDR Plugin"
-msgstr "Erro ao abrir a extensão de CDROM!"
+#: ../data/pcsxr.ui.h:96
+msgid "Memory Card 1"
+msgstr "Cartão de memória 1"
 
-#: ../win32/gui/plugin.c:277
-#, c-format
-msgid "Error Opening GPU Plugin (%d)"
-msgstr "Erro ao abrir a extensão de GPU (%d)!"
+#: ../data/pcsxr.ui.h:97
+msgid "Memory Card 2"
+msgstr "Cartão de memória 2"
 
-#: ../win32/gui/plugin.c:279
-#, c-format
-msgid "Error Opening SPU Plugin (%d)"
-msgstr "Erro ao abrir a extensão de SPU (%d)!"
+#: ../data/pcsxr.ui.h:98 ../gui/DebugMemory.c:119
+msgid "Memory Dump"
+msgstr ""
 
-#: ../win32/gui/plugin.c:282
-#, c-format
-msgid "Error Opening PAD1 Plugin (%d)"
-msgstr "Erro ao abrir a extensão do controle 1 (%d)!"
+#: ../data/pcsxr.ui.h:99 ../gui/DebugMemory.c:205
+#, fuzzy
+msgid "Address (Hexadecimal):"
+msgstr "Hexadecimal"
 
-#: ../win32/gui/plugin.c:284
-#, c-format
-msgid "Error Opening PAD2 Plugin (%d)"
-msgstr "Erro ao abrir a extensão do controle 2 (%d)!"
+#: ../data/pcsxr.ui.h:100
+msgid "Raw Dump..."
+msgstr ""
 
-#: ../win32/gui/plugin.c:314
-msgid "Error Closing CDR Plugin"
-msgstr "Erro ao fechar a extensão de CDROM!"
+#: ../data/pcsxr.ui.h:101
+msgid "Patch Memory..."
+msgstr ""
 
-#: ../win32/gui/plugin.c:316
-msgid "Error Closing GPU Plugin"
-msgstr "Erro ao fechar a extensão de GPU!"
+#: ../data/pcsxr.ui.h:102
+msgid "Configure NetPlay"
+msgstr "Configurar jogo em rede"
 
-#: ../win32/gui/plugin.c:318
-msgid "Error Closing SPU Plugin"
-msgstr "Erro ao fechar a extensão de SPU!"
+#: ../data/pcsxr.ui.h:103
+msgid "NetPlay"
+msgstr "Jogo em rede"
 
-#: ../win32/gui/plugin.c:336
-#, c-format
-msgid "CDRinit error: %d"
-msgstr "Erro ao iniciar o CDROM: %d"
+#: ../data/pcsxr.ui.h:104
+#, fuzzy
+msgid "NTSC"
+msgstr ""
+"NTSC\n"
+"PAL"
 
-#: ../win32/gui/plugin.c:338
-#, c-format
-msgid "GPUinit error: %d"
-msgstr "Erro ao iniciar a GPU: %d"
+#: ../data/pcsxr.ui.h:105
+msgid "PAL"
+msgstr ""
 
-#: ../win32/gui/plugin.c:340
-#, c-format
-msgid "SPUinit error: %d"
-msgstr "Erro ao iniciar a SPU: %d"
+#: ../data/pcsxr.ui.h:106 ../win32/gui/CheatDlg.c:692
+msgid "8-bit"
+msgstr "8-bit"
 
-#: ../win32/gui/plugin.c:342
-#, c-format
-msgid "PAD1init error: %d"
-msgstr "Erro ao iniciar o controle 1: %d"
+#: ../data/pcsxr.ui.h:107 ../win32/gui/CheatDlg.c:693
+msgid "16-bit"
+msgstr "16-bit"
 
-#: ../win32/gui/plugin.c:344
-#, c-format
-msgid "PAD2init error: %d"
-msgstr "Erro ao iniciar o controle 2: %d"
+#: ../data/pcsxr.ui.h:108 ../win32/gui/CheatDlg.c:694
+msgid "32-bit"
+msgstr "32-bit"
 
-#: ../win32/gui/plugin.c:347
-#, c-format
-msgid "NETinit error: %d"
-msgstr "Erro ao iniciar a rede: %d"
+#: ../data/pcsxr.ui.h:109 ../win32/gui/CheatDlg.c:402
+msgid "Equal Value"
+msgstr "Valores igual à"
 
-#: ../win32/gui/WndMain.c:76
-msgid "Arabic"
-msgstr "Arábico"
+#: ../data/pcsxr.ui.h:110 ../win32/gui/CheatDlg.c:403
+msgid "Not Equal Value"
+msgstr "Valores diferente de"
 
-#: ../win32/gui/WndMain.c:77
-msgid "Catalan"
-msgstr "Catalão"
+#: ../data/pcsxr.ui.h:111 ../win32/gui/CheatDlg.c:404
+msgid "Range"
+msgstr "Intervalo"
 
-#: ../win32/gui/WndMain.c:78
-msgid "German"
-msgstr "Alemão"
+#: ../data/pcsxr.ui.h:112 ../win32/gui/CheatDlg.c:407
+msgid "Increased By"
+msgstr "Somado por"
 
-#: ../win32/gui/WndMain.c:79
-msgid "Greek"
-msgstr "Grego"
+#: ../data/pcsxr.ui.h:113 ../win32/gui/CheatDlg.c:408
+msgid "Decreased By"
+msgstr "Subtraído por"
 
-#: ../win32/gui/WndMain.c:80 ../win32/gui/WndMain.c:1566
-#: ../win32/gui/WndMain.c:1568
-msgid "English"
-msgstr "Inglês"
+#: ../data/pcsxr.ui.h:114 ../win32/gui/CheatDlg.c:409
+msgid "Increased"
+msgstr "Maiores"
 
-#: ../win32/gui/WndMain.c:81
-msgid "Spanish"
-msgstr "Espanhol"
+#: ../data/pcsxr.ui.h:115 ../win32/gui/CheatDlg.c:410
+msgid "Decreased"
+msgstr "Menores"
 
-#: ../win32/gui/WndMain.c:82
-msgid "French"
-msgstr "Francês"
+#: ../data/pcsxr.ui.h:116 ../win32/gui/CheatDlg.c:411
+msgid "Different"
+msgstr "Diferentes"
 
-#: ../win32/gui/WndMain.c:83
-msgid "Italian"
-msgstr "Italiano"
+#: ../data/pcsxr.ui.h:117 ../win32/gui/CheatDlg.c:412
+msgid "No Change"
+msgstr "Sem mudanças"
 
-#: ../win32/gui/WndMain.c:84
-msgid "Portuguese"
-msgstr "Português"
+#: ../data/pcsxr.ui.h:118 ../win32/gui/CheatDlg.c:695
+msgid "Decimal"
+msgstr "Decimal"
 
-#: ../win32/gui/WndMain.c:85
-#, fuzzy
-msgid "Portuguese (Brazilian)"
-msgstr "Português"
+#: ../data/pcsxr.ui.h:119 ../win32/gui/CheatDlg.c:696
+msgid "Hexadecimal"
+msgstr "Hexadecimal"
 
-#: ../win32/gui/WndMain.c:86
-msgid "Romanian"
-msgstr "Romeno"
+#: ../gui/AboutDlg.c:71
+msgid ""
+"(C) 1999-2003 PCSX Team\n"
+"(C) 2005-2009 PCSX-df Team\n"
+"(C) 2009-2011 PCSX-Reloaded Team"
+msgstr ""
 
-#: ../win32/gui/WndMain.c:87
-msgid "Russian"
-msgstr "Russo"
+#: ../gui/AboutDlg.c:76
+#, fuzzy
+msgid ""
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+msgstr ""
+"This program is free software; you can redistribute it\n"
+"and/or modify it under the terms of the GNU General\n"
+"Public License as published by the Free Software\n"
+"Foundation; either version 2 of the License, or (at your\n"
+"option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be\n"
+"useful, but WITHOUT ANY WARRANTY; without even\n"
+"the implied warranty of MERCHANTABILITY or\n"
+"FITNESS FOR A PARTICULAR PURPOSE. See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General\n"
+"Public License along with this program; if not, write to\n"
+"the Free Software Foundation, Inc."
 
-#: ../win32/gui/WndMain.c:88
-msgid "Simplified Chinese"
-msgstr "Chinês Simplificado"
+#: ../gui/AboutDlg.c:100
+msgid "translator-credits"
+msgstr ""
+"Tradução para português brasileiro por Tibério Vítor (tvtoon@gmail.com)"
 
-#: ../win32/gui/WndMain.c:89
-msgid "Traditional Chinese"
-msgstr "Chinês Tradicional"
+#: ../gui/AboutDlg.c:101
+msgid "A PlayStation emulator."
+msgstr "Um emulador de PlayStation."
 
-#: ../win32/gui/WndMain.c:90
-msgid "Japanese"
-msgstr "Japonês"
+#: ../gui/Cheat.c:101 ../win32/gui/CheatDlg.c:116
+msgid "Add New Cheat"
+msgstr "Adicionar nova Trapaça"
 
-#: ../win32/gui/WndMain.c:91
-msgid "Korean"
-msgstr "Coreano"
+#: ../gui/Cheat.c:109 ../gui/Cheat.c:192
+msgid "Cheat Description:"
+msgstr "Descrição da trapaça:"
 
-#: ../win32/gui/WndMain.c:300 ../win32/gui/WndMain.c:352
-msgid "PCSX State Format"
-msgstr "Formato dos estados salvos do PCSX"
+#: ../gui/Cheat.c:117 ../gui/Cheat.c:201 ../win32/gui/CheatDlg.c:68
+#: ../win32/gui/CheatDlg.c:118
+msgid "Cheat Code:"
+msgstr "Código de Trapaça:"
 
-#: ../win32/gui/WndMain.c:327
-#, c-format
-msgid "*PCSX*: Loaded State %s"
-msgstr "PCSX: Arquivo de estado \"%s\" carregado."
+#: ../gui/Cheat.c:147 ../gui/Cheat.c:241 ../gui/LnxMain.c:425
+#: ../win32/gui/ConfigurePlugins.c:330
+msgid "Error"
+msgstr "Erro"
 
-#: ../win32/gui/WndMain.c:328
-#, c-format
-msgid "*PCSX*: Error Loading State %s"
-msgstr "PCSX: Erro ao carregar o arquivo de estado \"%s\"!"
+#: ../gui/Cheat.c:147 ../gui/Cheat.c:241 ../win32/gui/CheatDlg.c:91
+#: ../win32/gui/CheatDlg.c:132
+msgid "Invalid cheat code!"
+msgstr "Código de trapaça inválido!"
 
-#: ../win32/gui/WndMain.c:379
-#, c-format
-msgid "*PCSX*: Saved State %s"
-msgstr "PCSX: Arquivo de estado \"%s\" salvo."
+#: ../gui/Cheat.c:184 ../win32/gui/CheatDlg.c:66
+msgid "Edit Cheat"
+msgstr "Editar Trapaça"
 
-#: ../win32/gui/WndMain.c:380
-#, c-format
-msgid "*PCSX*: Error Saving State %s"
-msgstr "PCSX: Erro ao salvar o arquivo de estado \"%s\"!"
+#: ../gui/Cheat.c:307
+msgid "Open Cheat File"
+msgstr "Abrir arquivo de trapaça"
 
-#: ../win32/gui/WndMain.c:429 ../win32/gui/WndMain.c:478 ../gui/Gtk2Gui.c:485
-#: ../gui/Gtk2Gui.c:610
-msgid "The CD does not appear to be a valid Playstation CD"
-msgstr "Esse CD não parece ser um CD de PlayStation!"
+#: ../gui/Cheat.c:317 ../gui/Cheat.c:357
+msgid "PCSXR Cheat Code Files (*.cht)"
+msgstr "Arquivos de trapaça do PCSXR (*.cht)"
 
-#: ../win32/gui/WndMain.c:435 ../win32/gui/WndMain.c:484 ../gui/Gtk2Gui.c:493
-#: ../gui/Gtk2Gui.c:618
-msgid "Could not load CD-ROM!"
-msgstr "Não pôde carregar o CDROM!"
+#: ../gui/Cheat.c:322 ../gui/GtkGui.c:491 ../gui/GtkGui.c:643
+#: ../win32/gui/WndMain.c:1483 ../win32/gui/WndMain.c:1564
+msgid "All Files"
+msgstr "Todos os arquivos"
 
-#: ../win32/gui/WndMain.c:445
-msgid "Running BIOS is not supported with Internal HLE Bios."
-msgstr "Iniciar pela BIOS não é suportado com a BIOS HLE interna."
+#: ../gui/Cheat.c:347
+msgid "Save Cheat File"
+msgstr "Salvar um arquivo de trapaça"
 
-#: ../win32/gui/WndMain.c:664 ../gui/MemcardDlg.c:62
-msgid "Title"
-msgstr "Título"
+#: ../gui/Cheat.c:362
+msgid "All Files (*.*)"
+msgstr "Todos os arquivos (*.*)"
 
-#: ../win32/gui/WndMain.c:670 ../gui/MemcardDlg.c:68
-msgid "Status"
-msgstr "Estado"
+#: ../gui/Cheat.c:401
+msgid "Cheat Codes"
+msgstr "Códigos de trapaça"
 
-#: ../win32/gui/WndMain.c:676
-msgid "Game ID"
-msgstr "ID do Jogo"
+#: ../gui/Cheat.c:408
+msgid "Enable"
+msgstr "Ligar"
 
-#: ../win32/gui/WndMain.c:682
-msgid "Game"
-msgstr "Jogo"
+#: ../gui/Cheat.c:416 ../win32/gui/CheatDlg.c:185
+msgid "Description"
+msgstr "Descrição"
 
-#: ../win32/gui/WndMain.c:864
-msgid "mid link block"
-msgstr "bloco de ligação intermediário"
+#: ../gui/Cheat.c:544 ../win32/gui/CheatDlg.c:457
+msgid "Too many addresses found."
+msgstr "Muitos endereços encontrados com esse número, refine a pesquisa."
 
-#: ../win32/gui/WndMain.c:867
-msgid "terminiting link block"
-msgstr "bloco final da ligação"
+#: ../gui/Cheat.c:553 ../win32/gui/CheatDlg.c:466
+#, c-format
+msgid "%.8X Current: %u (%.2X), Previous: %u (%.2X)"
+msgstr "%.8X Atual: %u (%.2X), Anterior: %u (%.2X)"
 
-#: ../win32/gui/WndMain.c:875 ../gui/MemcardDlg.c:155 ../gui/MemcardDlg.c:260
-msgid "Deleted"
-msgstr "Apagado"
+#: ../gui/Cheat.c:558 ../win32/gui/CheatDlg.c:471
+#, c-format
+msgid "%.8X Current: %u (%.4X), Previous: %u (%.4X)"
+msgstr "%.8X Atual: %u (%.4X), Anterior: %u (%.4X)"
 
-#: ../win32/gui/WndMain.c:876 ../win32/gui/WndMain.c:879
-#: ../gui/MemcardDlg.c:157 ../gui/MemcardDlg.c:161 ../gui/MemcardDlg.c:262
-#: ../gui/MemcardDlg.c:266
-msgid "Free"
-msgstr "Liberado"
+#: ../gui/Cheat.c:563 ../win32/gui/CheatDlg.c:476
+#, c-format
+msgid "%.8X Current: %u (%.8X), Previous: %u (%.8X)"
+msgstr "%.8X Atual: %u (%.8X), Anterior: %u (%.8X)"
 
-#: ../win32/gui/WndMain.c:878 ../gui/MemcardDlg.c:159 ../gui/MemcardDlg.c:264
-msgid "Used"
-msgstr "Usado"
+#: ../gui/Cheat.c:578 ../win32/gui/CheatDlg.c:492
+#, c-format
+msgid "Founded Addresses: %d"
+msgstr "Endereços com o número: %d"
 
-#: ../win32/gui/WndMain.c:972
-msgid "Memcard Manager"
-msgstr "Gerenciador de cartões de memória"
+#: ../gui/Cheat.c:586 ../win32/gui/CheatDlg.c:448
+msgid "Enter the values and start your search."
+msgstr "Digite algum número para começar a pesquisa."
 
-#: ../win32/gui/WndMain.c:976 ../win32/gui/WndMain.c:979
-msgid "Select Mcd"
-msgstr "Selecionar cartão"
+#: ../gui/Cheat.c:628
+msgid "Freeze value"
+msgstr "Congelar valor"
 
-#: ../win32/gui/WndMain.c:977 ../win32/gui/WndMain.c:980
-msgid "Format Mcd"
-msgstr "Formatar cartão"
+#: ../gui/Cheat.c:634 ../win32/gui/CheatDlg.c:67 ../win32/gui/CheatDlg.c:117
+msgid "Description:"
+msgstr "Descrição:"
 
-#: ../win32/gui/WndMain.c:978 ../win32/gui/WndMain.c:981
-msgid "Reload Mcd"
-msgstr "Reiniciar cartão"
+#: ../gui/Cheat.c:727
+msgid "Modify value"
+msgstr "Modificar valor"
 
-#: ../win32/gui/WndMain.c:982
-msgid "-> Copy ->"
-msgstr "-> Copiar ->"
+#: ../gui/Cheat.c:735
+msgid "New value:"
+msgstr "Novo valor:"
 
-#: ../win32/gui/WndMain.c:983
-msgid "<- Copy <-"
-msgstr "<- Copiar <-"
+#: ../gui/Cheat.c:1119
+msgid "Search Results"
+msgstr "Resultados da busca"
 
-#: ../win32/gui/WndMain.c:984
-msgid "Paste"
-msgstr "Colar"
+#. TODO Check whether configuration is required when we choose the plugin, and set the state of the
+#. button appropriately. New gtk tooltip API should allow us to put a tooltip explanation for
+#. disabled widgets
+#. TODO If combo screen hasn't been opened and the user chooses the menu config option, confs.Combo will be null and cause a segfault
+#. printf("Configuring plugin %s\n", filename);
+#: ../gui/ConfDlg.c:256 ../gui/ConfDlg.c:277 ../gui/ConfDlg.c:298
+#: ../gui/ConfDlg.c:319 ../gui/ConfDlg.c:340 ../gui/ConfDlg.c:399
+msgid "No configuration required"
+msgstr "Não necessita de configuração"
 
-#: ../win32/gui/WndMain.c:985
-msgid "<- Un/Delete"
-msgstr "<- Apagar/Desfazer"
+#: ../gui/ConfDlg.c:256 ../gui/ConfDlg.c:277 ../gui/ConfDlg.c:298
+#: ../gui/ConfDlg.c:319 ../gui/ConfDlg.c:340 ../gui/ConfDlg.c:399
+msgid "This plugin doesn't need to be configured."
+msgstr "Esta extensão não pode ser configurada."
 
-#: ../win32/gui/WndMain.c:986
-msgid "Un/Delete ->"
-msgstr "Apagar/Desfazer ->"
+#: ../gui/ConfDlg.c:402
+msgid "Please select a plugin."
+msgstr ""
 
-#: ../win32/gui/WndMain.c:988
-msgid "Memory Card 1"
-msgstr "Cartão de memória 1"
+#: ../gui/ConfDlg.c:647
+#, c-format
+msgid "Could not open BIOS directory: '%s'\n"
+msgstr "Não conseguiu abrir o diretório \"%s\", da BIOS!\n"
 
-#: ../win32/gui/WndMain.c:989
-msgid "Memory Card 2"
-msgstr "Cartão de memória 2"
+#: ../gui/ConfDlg.c:698 ../gui/ConfDlg.c:801 ../gui/LnxMain.c:168
+#, c-format
+msgid "Could not open directory: '%s'\n"
+msgstr "Não conseguiu abrir o diretório \"%s\"!\n"
 
-#: ../win32/gui/WndMain.c:1044
-msgid "Are you sure you want to paste this selection?"
-msgstr "Você tem certeza que quer colar o selecionado?"
+#. The BIOS list always contains the PCSXR internal BIOS
+#: ../gui/ConfDlg.c:769
+msgid "Simulate PSX BIOS"
+msgstr ""
 
-#: ../win32/gui/WndMain.c:1044 ../win32/gui/WndMain.c:1155
-#: ../win32/gui/WndMain.c:1162
-msgid "Confirmation"
-msgstr "Confirmação"
+#: ../gui/DebugMemory.c:127
+#, fuzzy
+msgid "Start Address (Hexadecimal):"
+msgstr "Hexadecimal"
 
-#: ../win32/gui/WndMain.c:1155 ../win32/gui/WndMain.c:1162
-msgid "Are you sure you want to format this Memory Card?"
-msgstr "Você tem certeza que quer formatar esse Cartão de Memória?"
+#: ../gui/DebugMemory.c:138
+msgid "Length (Decimal):"
+msgstr ""
 
-#: ../win32/gui/WndMain.c:1208
-msgid "Cpu Config"
-msgstr "Configuração da CPU"
+#: ../gui/DebugMemory.c:164
+msgid "Dump to File"
+msgstr ""
 
-#: ../win32/gui/WndMain.c:1213
-msgid "Disable Xa Decoding"
-msgstr "Desativar decodificação de XA"
+#: ../gui/DebugMemory.c:179
+#, fuzzy, c-format
+msgid "Error writing to %s!"
+msgstr "Erro ao salvar o arquivo de estado \"%s\"!"
 
-#: ../win32/gui/WndMain.c:1214
-msgid "Sio Irq Always Enabled"
-msgstr "IRQ SIO sempre ativado"
+#: ../gui/DebugMemory.c:197
+#, fuzzy
+msgid "Memory Patch"
+msgstr "Cartão de memória 1"
 
-#: ../win32/gui/WndMain.c:1215
-msgid "Black && White Movies"
-msgstr "Filmes em preto e branco"
+#: ../gui/DebugMemory.c:216
+#, fuzzy
+msgid "Value (Hexa string):"
+msgstr "Hexadecimal"
 
-#: ../win32/gui/WndMain.c:1216
-msgid "Disable Cd audio"
-msgstr "Desativar áudio de CD"
+#: ../gui/DebugMemory.c:283
+#, fuzzy
+msgid "Memory Viewer"
+msgstr "Cartão de memória 1"
 
-#: ../win32/gui/WndMain.c:1217 ../data/pcsx.glade2:1595
-msgid "Autodetect"
-msgstr "Detectar Automaticamente"
+#: ../gui/DebugMemory.c:289
+#, fuzzy
+msgid "Address"
+msgstr "Endereço:"
 
-#: ../win32/gui/WndMain.c:1218
-msgid "Enable Interpreter Cpu"
-msgstr "Ativar interpretador da CPU"
+#: ../gui/DebugMemory.c:307
+#, fuzzy
+msgid "Text"
+msgstr "Texturas"
 
-#: ../win32/gui/WndMain.c:1219 ../data/pcsx.glade2:1451
-msgid "Enable Console Output"
-msgstr "Ativar saída no terminal"
+#: ../gui/GtkGui.c:146
+msgid "Ready"
+msgstr ""
 
-#: ../win32/gui/WndMain.c:1220 ../data/pcsx.glade2:1401
-msgid "Enable Debugger"
-msgstr "Ligar debugger"
+#: ../gui/GtkGui.c:191
+msgid "Emulation Paused."
+msgstr ""
 
-#: ../win32/gui/WndMain.c:1221
-msgid "Spu Irq Always Enabled"
-msgstr "IRQ da SPU sempre ligada"
+#: ../gui/GtkGui.c:474
+msgid "Select PSX EXE File"
+msgstr "Selecione o arquivo executável de PSX"
 
-#: ../win32/gui/WndMain.c:1222 ../data/pcsx.glade2:1538
-msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
-msgstr "Correção para Parasite Eve 2, Vandal Hearts..."
+#: ../gui/GtkGui.c:487
+msgid "PlayStation Executable Files"
+msgstr "Arquivos executáveis do PlayStation"
 
-#: ../win32/gui/WndMain.c:1223 ../data/pcsx.glade2:1553
-msgid "InuYasha Sengoku Battle Fix"
-msgstr "Correção para InuYasha, Sengoku Battle..."
+#: ../gui/GtkGui.c:524
+msgid "Not a valid PSX file"
+msgstr "Não é um arquivo válido de PSX"
 
-#: ../win32/gui/WndMain.c:1225
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:277
-#: ../plugins/dfinput/dfinput.glade2:448
-msgid "Options"
-msgstr "Opções"
+#: ../gui/GtkGui.c:524
+msgid "The file does not appear to be a valid Playstation executable"
+msgstr "Esse arquivo não parece ser um executável válido de PlayStation!"
 
-#: ../win32/gui/WndMain.c:1226
-msgid "Psx System Type"
-msgstr "Tipo de sistema do PSX"
+#: ../gui/GtkGui.c:553 ../gui/GtkGui.c:725
+msgid "CD ROM failed"
+msgstr "CDROM falhou"
 
-#: ../win32/gui/WndMain.c:1330
-msgid "Psx Mcd Format (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
-msgstr "Qualquer formato (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
+#: ../gui/GtkGui.c:553 ../gui/GtkGui.c:725 ../win32/gui/WndMain.c:472
+#: ../win32/gui/WndMain.c:526 ../win32/gui/WndMain.c:596
+#, c-format
+msgid "The CD does not appear to be a valid Playstation CD"
+msgstr "Esse CD não parece ser um CD de PlayStation!"
 
-#: ../win32/gui/WndMain.c:1335
-msgid "Psx Memory Card (*.mcr;*.mc)"
-msgstr "Cartão de memória binário (*.mcr;*.mc)"
+#: ../gui/GtkGui.c:564 ../gui/GtkGui.c:736 ../win32/gui/WndMain.c:482
+#: ../win32/gui/WndMain.c:536 ../win32/gui/WndMain.c:606
+#, c-format
+msgid "Could not load CD-ROM!"
+msgstr "Não pôde carregar o CDROM!"
 
-#: ../win32/gui/WndMain.c:1340
-msgid "CVGS Memory Card (*.mem;*.vgs)"
-msgstr "Cartão de memória do CVGS (*.mem;*.vgs)"
+#: ../gui/GtkGui.c:564 ../gui/GtkGui.c:736
+msgid "The CD-ROM could not be loaded"
+msgstr ""
 
-#: ../win32/gui/WndMain.c:1345
-msgid "Bleem Memory Card (*.mcd)"
-msgstr "Cartão de memória do Bleem (*.mcd)"
+#: ../gui/GtkGui.c:578
+msgid "Could not run BIOS"
+msgstr "Não conseguiu iniciar a BIOS"
 
-#: ../win32/gui/WndMain.c:1350
-msgid "DexDrive Memory Card (*.gme)"
-msgstr "Cartão de memória do DexDrive (*.gme)"
+#: ../gui/GtkGui.c:578
+msgid "Running BIOS is not supported with Internal HLE BIOS."
+msgstr "Iniciar pela BIOS não é suportado com a BIOS HLE interno."
 
-#: ../win32/gui/WndMain.c:1355
-msgid "DataDeck Memory Card (*.ddf)"
-msgstr "Cartão de memória do DataDeck (*.ddf)"
+#: ../gui/GtkGui.c:608
+msgid "Open PSX Disc Image File"
+msgstr "Abrir arquivo de imagem de CD de PSX"
 
-#: ../win32/gui/WndMain.c:1360 ../win32/gui/WndMain.c:1441 ../gui/Cheat.c:321
-#: ../gui/Gtk2Gui.c:422 ../gui/Gtk2Gui.c:561
-msgid "All Files"
-msgstr "Todos os arquivos"
+#: ../gui/GtkGui.c:638
+#, fuzzy
+msgid "PSX Image Files (*.bin, *.img, *.mdf, *.iso, *.cue, *.pbp, *.cbn)"
+msgstr "Arquivo de imagens de CD de PSX (*.bin, *.img, *.mdf, *.iso)"
 
-#: ../win32/gui/WndMain.c:1399
-msgid "Psx Exe Format"
-msgstr "Formato executável do PSX"
+#: ../gui/GtkGui.c:894
+#, c-format
+msgid "Loaded state %s."
+msgstr "Arquivo de estado \"%s\" carregado."
 
-#: ../win32/gui/WndMain.c:1436
-msgid "Psx Isos (*.iso;*.mdf;*.img;*.bin)"
-msgstr "Imagens de CD (*.iso;*.mdf;*.img;*.bin)"
+#: ../gui/GtkGui.c:897
+#, c-format
+msgid "Error loading state %s!"
+msgstr "Erro ao carregar o arquivo de estado \"%s\"!"
 
-#: ../win32/gui/WndMain.c:1512
-msgid "&File"
-msgstr "&Arquivo"
+#: ../gui/GtkGui.c:908
+#, c-format
+msgid "Saved state %s."
+msgstr "Arquivo de estado \"%s\" salvo."
 
-#: ../win32/gui/WndMain.c:1513
-msgid "E&xit"
-msgstr "&Sair"
+#: ../gui/GtkGui.c:910
+#, c-format
+msgid "Error saving state %s!"
+msgstr "Erro ao salvar o arquivo de estado \"%s\"!"
 
-#: ../win32/gui/WndMain.c:1515
-msgid "Run &EXE..."
-msgstr "Rodar &EXE..."
+#: ../gui/GtkGui.c:945 ../gui/GtkGui.c:973
+msgid "Select State File"
+msgstr "Selecione o arquivo de estado"
 
-#: ../win32/gui/WndMain.c:1516
-msgid "Run &BIOS"
-msgstr "Iniciar pela &BIOS"
+#: ../gui/GtkGui.c:1016
+msgid "Notice"
+msgstr "Aviso"
 
-#: ../win32/gui/WndMain.c:1517
-msgid "Run &ISO..."
-msgstr "Rodar &imagem de CD..."
+#: ../gui/LnxMain.c:62
+#, c-format
+msgid "Creating memory card: %s\n"
+msgstr "Criando cartão de memória \"%s\"\n"
 
-#: ../win32/gui/WndMain.c:1518
-msgid "Run &CD"
-msgstr "Rodar &CD"
+#: ../gui/LnxMain.c:329
+#, fuzzy
+msgid ""
+" pcsxr [options] [file]\n"
+"\toptions:\n"
+"\t-runcd\t\tRuns CD-ROM\n"
+"\t-cdfile FILE\tRuns a CD image file\n"
+"\t-nogui\t\tDon't open the GTK GUI\n"
+"\t-cfg FILE\tLoads desired configuration file (default: ~/.pcsxr/pcsxr.cfg)\n"
+"\t-psxout\t\tEnable PSX output\n"
+"\t-slowboot\tEnable BIOS Logo\n"
+"\t-load STATENUM\tLoads savestate STATENUM (1-9)\n"
+"\t-h -help\tDisplay this message\n"
+"\tfile\t\tLoads file\n"
+msgstr ""
+" pcsxr [opções] [arquivo]\n"
+"\topções:\n"
+"\t-runcd\t\tExecuta direto pelo CD-ROM\n"
+"\t-cdfile ARQUIVO\tRoda um arquivo de imagem de CD\n"
+"\t-nogui\t\tNão abre o GUI da GTK\n"
+"\t-cfg ARQUIVO\tCarrega uma configuração alternativa (padrão: ~/.pcsxr/pcsxr."
+"cfg)\n"
+"\t-psxout\t\tAtiva a saída do PSX no console\n"
+"\t-load NÚMERO_ESTADO\tCarrega um estado entre 1-5\n"
+"\t-h -help\tMostra essa mensagem\n"
+"\t[arquivo]\t\tCarrega um arquivo.\n"
 
-#: ../win32/gui/WndMain.c:1520
-msgid "&Emulator"
-msgstr "&Emulador"
+#: ../gui/LnxMain.c:366
+#, c-format
+msgid ""
+"PCSXR cannot be configured without using the GUI -- you should restart "
+"without -nogui.\n"
+msgstr ""
+"PCSXR não pode ser configurado sem o GUI -- reinicie sem a opção -nogui.\n"
 
-#: ../win32/gui/WndMain.c:1521
-msgid "&States"
-msgstr "&Estados"
+#: ../gui/LnxMain.c:425
+msgid "Failed loading plugins!"
+msgstr "Não conseguiu carregar as extensões!"
 
-#: ../win32/gui/WndMain.c:1523
-msgid "S&witch ISO..."
-msgstr "T&rocar de imagem de CD..."
+#: ../gui/LnxMain.c:444
+#, c-format
+msgid "Could not load CD-ROM!\n"
+msgstr "Não pôde carregar o CD-ROM!\n"
 
-#: ../win32/gui/WndMain.c:1525
-msgid "Re&set"
-msgstr "Re&iniciar"
+#: ../gui/LnxMain.c:485
+#, c-format
+msgid "PSX emulator couldn't be initialized.\n"
+msgstr "O emulador não pôde ser inicializado.\n"
 
-#: ../win32/gui/WndMain.c:1526
-msgid "&Run"
-msgstr "&Executar"
+#: ../gui/MemcardDlg.c:56
+msgid "Icon"
+msgstr "Ícone"
 
-#: ../win32/gui/WndMain.c:1527
-msgid "&Save"
-msgstr "&Salvar"
+#: ../gui/MemcardDlg.c:62 ../win32/gui/WndMain.c:778
+msgid "Title"
+msgstr "Título"
 
-#: ../win32/gui/WndMain.c:1528
-msgid "&Load"
-msgstr "&Carregar"
+#: ../gui/MemcardDlg.c:68 ../win32/gui/WndMain.c:784
+msgid "Status"
+msgstr "Estado"
 
-#: ../win32/gui/WndMain.c:1529 ../win32/gui/WndMain.c:1535
-msgid "&Other..."
-msgstr "&Outros..."
+#: ../gui/MemcardDlg.c:74
+msgid "ID"
+msgstr "ID"
 
-#: ../win32/gui/WndMain.c:1530 ../win32/gui/WndMain.c:1536
-msgid "Slot &5"
-msgstr "Unidade &5"
+#: ../gui/MemcardDlg.c:80
+msgid "Name"
+msgstr "Nome"
 
-#: ../win32/gui/WndMain.c:1531 ../win32/gui/WndMain.c:1537
-msgid "Slot &4"
-msgstr "Unidade &4"
+#: ../gui/MemcardDlg.c:118 ../win32/gui/WndMain.c:989
+msgid "Deleted"
+msgstr "Apagado"
 
-#: ../win32/gui/WndMain.c:1532 ../win32/gui/WndMain.c:1538
-msgid "Slot &3"
-msgstr "Unidade &3"
+#: ../gui/MemcardDlg.c:120 ../gui/MemcardDlg.c:129 ../win32/gui/WndMain.c:990
+#: ../win32/gui/WndMain.c:993
+msgid "Free"
+msgstr "Liberado"
 
-#: ../win32/gui/WndMain.c:1533 ../win32/gui/WndMain.c:1539
-msgid "Slot &2"
-msgstr "Unidade &2"
+#: ../gui/MemcardDlg.c:123 ../win32/gui/WndMain.c:992
+msgid "Used"
+msgstr "Usado"
 
-#: ../win32/gui/WndMain.c:1534 ../win32/gui/WndMain.c:1540
-msgid "Slot &1"
-msgstr "Unidade &1"
+#: ../gui/MemcardDlg.c:125
+msgid "Link"
+msgstr ""
 
-#: ../win32/gui/WndMain.c:1542
-msgid "&Configuration"
-msgstr "&Configuração"
+#: ../gui/MemcardDlg.c:127
+msgid "End link"
+msgstr ""
 
-#: ../win32/gui/WndMain.c:1543
-msgid "Cheat &Search..."
-msgstr "Procurar por &trapaça..."
+#. Ask for name of memory card
+#: ../gui/MemcardDlg.c:305
+msgid "Select A File"
+msgstr ""
 
-#: ../win32/gui/WndMain.c:1544
-msgid "Ch&eat Code..."
-msgstr "&Código de trapaça..."
+#: ../gui/MemcardDlg.c:345
+msgid "Format this Memory Card?"
+msgstr "Formatar esse cartão de memória?"
 
-#: ../win32/gui/WndMain.c:1547
-msgid "&Language"
-msgstr "&Linguagem"
+#: ../gui/MemcardDlg.c:347
+msgid ""
+"If you format the memory card, the card will be empty, and any existing data "
+"overwritten."
+msgstr "Ao formatar o cartão de memória, todo o conteúdo será zerado."
 
-#: ../win32/gui/WndMain.c:1572
-msgid "&Memory cards..."
-msgstr "&Cartões de memória..."
+#: ../gui/MemcardDlg.c:350
+msgid "Format card"
+msgstr "Formatar cartão"
 
-#: ../win32/gui/WndMain.c:1573
-msgid "C&PU..."
-msgstr "C&PU..."
+#. Ask for name of new memory card
+#: ../gui/MemcardDlg.c:372
+msgid "Create a new Memory Card"
+msgstr ""
 
-#: ../win32/gui/WndMain.c:1575
-msgid "&NetPlay..."
-msgstr "&Jogo em rede..."
+#: ../gui/MemcardDlg.c:381
+msgid "New Memory Card.mcd"
+msgstr ""
 
-#: ../win32/gui/WndMain.c:1577
-msgid "&Controllers..."
-msgstr "&Controles..."
+#. No free slots available on the destination card
+#: ../gui/MemcardDlg.c:511
+msgid "No free space on memory card"
+msgstr ""
 
-#: ../win32/gui/WndMain.c:1578
-msgid "CD-&ROM..."
-msgstr "CD&ROM..."
+#: ../gui/MemcardDlg.c:512
+msgid ""
+"There are no free slots available on the target memory card. Please delete a "
+"slot first."
+msgstr ""
 
-#: ../win32/gui/WndMain.c:1579
-msgid "&Sound..."
-msgstr "Á&udio..."
+#: ../gui/MemcardDlg.c:671
+msgid "Memory Card Manager"
+msgstr "Gerenciador de cartões de memória"
 
-#: ../win32/gui/WndMain.c:1580
-msgid "&Graphics..."
-msgstr "&Gráficos..."
+#: ../gui/Plugin.c:240
+#, c-format
+msgid "SIO IRQ Not Always Enabled"
+msgstr "IRQ SIO nem sempre ativada"
 
-#: ../win32/gui/WndMain.c:1582
-msgid "&Plugins && Bios..."
-msgstr "&Extensões e BIOS..."
+#: ../gui/Plugin.c:246
+#, c-format
+msgid "Black & White Mdecs Only Enabled"
+msgstr "Mdecs apenas em preto e branco ativado"
 
-#: ../win32/gui/WndMain.c:1584
-msgid "&Help"
-msgstr "&Ajuda"
+#: ../gui/Plugin.c:247
+#, c-format
+msgid "Black & White Mdecs Only Disabled"
+msgstr "Mdecs apenas em preto e branco desativado"
 
-#: ../win32/gui/WndMain.c:1585
-msgid "&About..."
-msgstr "&Sobre..."
+#: ../gui/Plugin.c:253
+#, c-format
+msgid "XA Enabled"
+msgstr "XA Ligado"
 
-#: ../win32/gui/WndMain.c:1764
-msgid "Pcsx Msg"
-msgstr "Mensagens do PCSX"
+#: ../gui/Plugin.c:254
+#, c-format
+msgid "XA Disabled"
+msgstr "XA Desligado"
 
-#: ../win32/gui/WndMain.c:1767
-msgid "Error Loading Symbol"
-msgstr "Erro ao carregar símbolo"
+#: ../gui/Plugin.c:326
+msgid "Error opening CD-ROM plugin!"
+msgstr "Erro ao abrir a extensão de CD-ROM!"
 
-#: ../gui/AboutDlg.c:74
-msgid ""
-"(C) 1999-2003 PCSX Team\n"
-"(C) 2005-2009 PCSX-df Team\n"
-"(C) 2009-2010 PCSX-Reloaded Team"
-msgstr ""
+#: ../gui/Plugin.c:328
+msgid "Error opening SPU plugin!"
+msgstr "Erro ao abrir a extensão de SPU!"
+
+#: ../gui/Plugin.c:331
+msgid "Error opening GPU plugin!"
+msgstr "Erro ao abrir a extensão de GPU!"
 
-#: ../gui/AboutDlg.c:79
+#: ../gui/Plugin.c:333
+msgid "Error opening Controller 1 plugin!"
+msgstr "Erro ao abrir a extensão do Controle 1!"
+
+#: ../gui/Plugin.c:337
+msgid "Error opening Controller 2 plugin!"
+msgstr "Erro ao abrir a extensão do Controle 2!"
+
+#: ../gui/Plugin.c:342
 #, fuzzy
+msgid "Error opening SIO1 plugin!"
+msgstr "Erro ao abrir a extensão de SPU!"
+
+#: ../gui/Plugin.c:424
+msgid "Error closing CD-ROM plugin!"
+msgstr "Erro ao fechar a extensão de CD-ROM!"
+
+#: ../gui/Plugin.c:426
+msgid "Error closing SPU plugin!"
+msgstr "Erro ao fechar a extensão de SPU!"
+
+#: ../gui/Plugin.c:428
+msgid "Error closing Controller 1 Plugin!"
+msgstr "Erro ao fechar a extensão do Controle 1!"
+
+#: ../gui/Plugin.c:430
+msgid "Error closing Controller 2 plugin!"
+msgstr "Erro ao fechar a extensão de Controle 2!"
+
+#: ../gui/Plugin.c:432
+msgid "Error closing GPU plugin!"
+msgstr "Erro ao fechar a extensão de GPU!"
+
+#: ../gui/Plugin.c:435
+#, fuzzy
+msgid "Error closing SIO1 plugin!"
+msgstr "Erro ao fechar a extensão de SPU!"
+
+#: ../libpcsxcore/cdriso.c:423
+#, fuzzy, c-format
 msgid ""
-"This program is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"this program; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA."
+"could not open: %s\n"
+msgstr "Não conseguiu abrir o diretório \"%s\"!\n"
+
+#: ../libpcsxcore/cdriso.c:1043
+#, c-format
+msgid "Track %.2d (%s) - Start %.2d:%.2d:%.2d, Length %.2d:%.2d:%.2d\n"
 msgstr ""
-"This program is free software; you can redistribute it\n"
-"and/or modify it under the terms of the GNU General\n"
-"Public License as published by the Free Software\n"
-"Foundation; either version 2 of the License, or (at your\n"
-"option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be\n"
-"useful, but WITHOUT ANY WARRANTY; without even\n"
-"the implied warranty of MERCHANTABILITY or\n"
-"FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General\n"
-"Public License along with this program; if not, write to\n"
-"the Free Software Foundation, Inc."
 
-#: ../gui/AboutDlg.c:102
-msgid "translator-credits"
+#: ../libpcsxcore/cdriso.c:1064
+#, c-format
+msgid "Loaded CD Image: %s"
+msgstr "Carregou a imagem de CD \"%s\"."
+
+#: ../libpcsxcore/cheat.c:147
+#, c-format
+msgid "Cheats loaded from: %s\n"
+msgstr "Trapaças de \"%s\" carregadas.\n"
+
+#: ../libpcsxcore/cheat.c:179
+#, c-format
+msgid "Cheats saved to: %s\n"
+msgstr "Trapaças salvas para \"%s\".\n"
+
+#: ../libpcsxcore/cheat.c:322 ../libpcsxcore/cheat.c:443
+msgid "(Untitled)"
+msgstr "(Sem título)"
+
+#: ../libpcsxcore/debug.c:321
+msgid "Error allocating memory"
+msgstr "Erro ao alocar memória"
+
+#: ../libpcsxcore/debug.c:326
+msgid "Unable to start debug server.\n"
 msgstr ""
-"Tradução para português brasileiro por Tibério Vítor (tvtoon@gmail.com)"
 
-#: ../gui/AboutDlg.c:103
-msgid "A PlayStation emulator."
-msgstr "Um emulador de PlayStation."
+#: ../libpcsxcore/debug.c:330
+msgid "Debugger started.\n"
+msgstr ""
 
-#: ../gui/Cheat.c:117 ../gui/Cheat.c:202
-msgid "Cheat Description:"
-msgstr "Descrição da trapaça:"
+#: ../libpcsxcore/debug.c:337
+msgid "Debugger stopped.\n"
+msgstr ""
 
-#: ../gui/Cheat.c:306
-msgid "Open Cheat File"
-msgstr "Abrir arquivo de trapaça"
+#: ../libpcsxcore/misc.c:350
+#, c-format
+msgid "CD-ROM Label: %.32s\n"
+msgstr ""
 
-#: ../gui/Cheat.c:316 ../gui/Cheat.c:356
-msgid "PCSX Cheat Code Files (*.cht)"
-msgstr "Arquivos de trapaça do PCSX (*.cht)"
+#: ../libpcsxcore/misc.c:351
+#, c-format
+msgid "CD-ROM ID: %.9s\n"
+msgstr ""
 
-#: ../gui/Cheat.c:346
-msgid "Save Cheat File"
-msgstr "Salvar um arquivo de trapaça"
+#: ../libpcsxcore/misc.c:415
+#, c-format
+msgid "Error opening file: %s.\n"
+msgstr "Erro ao abrir o arquivo \"%s\"!\n"
 
-#: ../gui/Cheat.c:361
-msgid "All Files (*.*)"
-msgstr "Todos os arquivos (*.*)"
+#: ../libpcsxcore/misc.c:458
+#, c-format
+msgid "Unknown CPE opcode %02x at position %08x.\n"
+msgstr "Código operacional CPE %02x desconhecido, na posição %08x.\n"
+
+#: ../libpcsxcore/misc.c:486
+msgid "This file does not appear to be a valid PSX file.\n"
+msgstr "Esse arquivo não parece ser um arquivo válido de PSX!\n"
+
+#: ../libpcsxcore/plugins.c:190
+#, c-format
+msgid "Error loading %s: %s"
+msgstr "Erro carregando \"%s\": \"%s\""
+
+#: ../libpcsxcore/plugins.c:234
+#, fuzzy, c-format
+msgid ""
+"Could not load GPU plugin %s!\n"
+"%s"
+msgstr "Não conseguiu carregar a extensão de GPU \"%s\"!"
+
+#: ../libpcsxcore/plugins.c:310
+#, fuzzy, c-format
+msgid ""
+"Could not load CD-ROM plugin %s!\n"
+"%s"
+msgstr "Não conseguiu carregar a extensão de CD-ROM \"%s\"!"
+
+#: ../libpcsxcore/plugins.c:359
+#, fuzzy, c-format
+msgid ""
+"Could not load SPU plugin %s!\n"
+"%s"
+msgstr "Não conseguiu carregar a extensão de SPU \"%s\"!"
+
+#: ../libpcsxcore/plugins.c:499
+#, fuzzy, c-format
+msgid ""
+"Could not load Controller 1 plugin %s!\n"
+"%s"
+msgstr "Não conseguiu carregar a extensão do Controle 1 \"%s\"!"
+
+#: ../libpcsxcore/plugins.c:558
+#, fuzzy, c-format
+msgid ""
+"Could not load Controller 2 plugin %s!\n"
+"%s"
+msgstr "Não conseguiu carregar a extensão do Controle 2 \"%s\"!"
+
+#: ../libpcsxcore/plugins.c:604
+#, fuzzy, c-format
+msgid ""
+"Could not load NetPlay plugin %s!\n"
+"%s"
+msgstr "Não conseguiu carregar a extensão de jogo em rede \"%s\"!"
+
+#: ../libpcsxcore/plugins.c:682
+#, fuzzy, c-format
+msgid ""
+"Could not load SIO1 plugin %s!\n"
+"%s"
+msgstr "Não conseguiu carregar a extensão de SIO1 \"%s\"!"
+
+#: ../libpcsxcore/plugins.c:770
+#, c-format
+msgid "Error initializing CD-ROM plugin: %d"
+msgstr "Erro ao iniciar a extensão de CD-ROM \"%d\"!"
+
+#: ../libpcsxcore/plugins.c:772
+#, c-format
+msgid "Error initializing GPU plugin: %d"
+msgstr "Erro ao iniciar a extensão de GPU \"%d\"!"
+
+#: ../libpcsxcore/plugins.c:774
+#, c-format
+msgid "Error initializing SPU plugin: %d"
+msgstr "Erro ao iniciar a extensão de SPU \"%d\"!"
+
+#: ../libpcsxcore/plugins.c:776
+#, c-format
+msgid "Error initializing Controller 1 plugin: %d"
+msgstr "Erro ao iniciar a extensão do Controle 1 \"%d\"!"
+
+#: ../libpcsxcore/plugins.c:778
+#, c-format
+msgid "Error initializing Controller 2 plugin: %d"
+msgstr "Erro ao iniciar a extensão do Controle 2 \"%d\"!"
+
+#: ../libpcsxcore/plugins.c:782
+#, c-format
+msgid "Error initializing NetPlay plugin: %d"
+msgstr "Erro ao iniciar a extensão de jogo em rede \"%d\"!"
+
+#: ../libpcsxcore/plugins.c:787
+#, c-format
+msgid "Error initializing SIO1 plugin: %d"
+msgstr "Erro ao iniciar a extensão de SIO1 \"%d\"!"
+
+#: ../libpcsxcore/plugins.c:790
+msgid "Plugins loaded.\n"
+msgstr "Extensões carregadas.\n"
+
+#: ../libpcsxcore/ppf.c:219
+#, c-format
+msgid "Invalid PPF patch: %s.\n"
+msgstr ""
+
+#: ../libpcsxcore/ppf.c:295
+#, c-format
+msgid "Unsupported PPF version (%d).\n"
+msgstr ""
+
+#. build address array
+#: ../libpcsxcore/ppf.c:334
+#, fuzzy, c-format
+msgid "Loaded PPF %d.0 patch: %s.\n"
+msgstr "Arquivo de estado \"%s\" carregado."
+
+#: ../libpcsxcore/ppf.c:384
+#, fuzzy, c-format
+msgid "Loaded SBI file: %s.\n"
+msgstr "Carregou a imagem de CD \"%s\"."
+
+#: ../libpcsxcore/psxmem.c:78
+msgid "Error allocating memory!"
+msgstr "Erro ao alocar memória!"
+
+#: ../libpcsxcore/psxmem.c:121
+#, c-format
+msgid "Could not open BIOS:\"%s\". Enabling HLE Bios!\n"
+msgstr "Não conseguiu abrir a BIOS\"%s\". Usando BIOS HLE!\n"
+
+#: ../libpcsxcore/r3000a.c:34
+#, c-format
+msgid "Running PCSXR Version %s (%s).\n"
+msgstr "Rodando o PCSXR Versão %s (%s).\n"
+
+#: ../libpcsxcore/sio.c:843
+msgid "Connection closed!\n"
+msgstr "Conexão encerrada!\n"
+
+#: ../libpcsxcore/sio.c:876
+#, c-format
+msgid "No memory card value was specified - creating a default card %s\n"
+msgstr "Nenhum cartão de memória foi especificado, criando um \"%s\" padrão.\n"
+
+#: ../libpcsxcore/sio.c:880
+#, c-format
+msgid "The memory card %s doesn't exist - creating it\n"
+msgstr "O cartão de memória \"%s\" não existe, será criado.\n"
+
+#: ../libpcsxcore/sio.c:896
+#, c-format
+msgid "Memory card %s failed to load!\n"
+msgstr "Cartão de memória \"%s\" falhou para carregar!\n"
+
+#: ../libpcsxcore/sio.c:900
+#, c-format
+msgid "Loading memory card %s\n"
+msgstr "Carregando cartão de memória \"%s\".\n"
+
+#: ../plugins/dfcdrom/cdr.c:25
+msgid "CD-ROM Drive Reader"
+msgstr "Leitor de unidade de CDROM"
+
+#: ../plugins/dfcdrom/cdr.c:27
+msgid "CDR NULL Plugin"
+msgstr "Sem unidade de CDROM"
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:1
+#: ../plugins/dfcdrom/cdrcfg-0.1df/main.c:217
+msgid "CDR configuration"
+msgstr "Configuração do CDROM"
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:2
+msgid "Choose your CD-ROM device or type its path if it's not listed"
+msgstr ""
+"Escolha sua unidade de CDROM ou digite o dispositivo caso não esteja listado."
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:3
+msgid "Select read mode:"
+msgstr "Selecione o modo de leitura:"
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:4
+msgid "Cache Size (Def. 64):"
+msgstr "Tamanho do armazenamento (o padrão é 64):"
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:5
+msgid "Spindown Time:"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:6
+msgid "Cdrom Speed (Def. 0 = MAX):"
+msgstr "Velocidade do CDROM (o padrão é 0, ou seja, o máximo):"
 
-#: ../gui/Cheat.c:394 ../gui/Cheat.c:1124 ../gui/ConfDlg.c:104
-#: ../gui/ConfDlg.c:200 ../gui/DebugMemory.c:259
-msgid "Error: Glade interface could not be loaded!"
-msgstr "Erro: o ambiente Glade não pôde ser carregado!"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:7
+msgid "Enable subchannel read"
+msgstr "Ligar leitura de subcanal"
 
-#: ../gui/Cheat.c:399
-msgid "Cheat Codes"
-msgstr "Códigos de trapaça"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:8
+msgid "Normal (No Cache)"
+msgstr ""
 
-#: ../gui/Cheat.c:405
-msgid "Enable"
-msgstr "Ligar"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:9
+msgid "Threaded - Faster (With Cache)"
+msgstr ""
 
-#: ../gui/Cheat.c:630
-msgid "Freeze value"
-msgstr "Congelar valor"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:10
+msgid "Default"
+msgstr ""
 
-#: ../gui/Cheat.c:729
-msgid "Modify value"
-msgstr "Modificar valor"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:11
+msgid "125ms"
+msgstr ""
 
-#: ../gui/Cheat.c:737
-msgid "New value:"
-msgstr "Novo valor:"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:12
+msgid "250ms"
+msgstr ""
 
-#: ../gui/Cheat.c:1134
-msgid "Search Results"
-msgstr "Resultados da busca"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:13
+msgid "500ms"
+msgstr ""
 
-#: ../gui/ConfDlg.c:112 ../data/pcsx.glade2:778
-msgid "Configure PCSX"
-msgstr "Configurar PCSX"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:14
+msgid "1s"
+msgstr ""
 
-#: ../gui/ConfDlg.c:237 ../gui/ConfDlg.c:258 ../gui/ConfDlg.c:279
-#: ../gui/ConfDlg.c:300 ../gui/ConfDlg.c:355
-msgid "No configuration required"
-msgstr "Não necessita de configuração"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:15
+msgid "2s"
+msgstr ""
 
-#: ../gui/ConfDlg.c:237 ../gui/ConfDlg.c:258 ../gui/ConfDlg.c:279
-#: ../gui/ConfDlg.c:300 ../gui/ConfDlg.c:355
-msgid "This plugin doesn't need to be configured."
-msgstr "Esta extensão não pode ser configurada."
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:16
+msgid "4s"
+msgstr ""
 
-#: ../gui/ConfDlg.c:581
-#, c-format
-msgid "Could not open BIOS directory: '%s'\n"
-msgstr "Não conseguiu abrir o diretório \"%s\", da BIOS!\n"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:17
+msgid "8s"
+msgstr ""
 
-#: ../gui/ConfDlg.c:611 ../gui/ConfDlg.c:704 ../gui/LnxMain.c:168
-#, c-format
-msgid "Could not open directory: '%s'\n"
-msgstr "Não conseguiu abrir o diretório \"%s\"!\n"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:18
+msgid "16s"
+msgstr ""
 
-#: ../gui/ConfDlg.c:675
-msgid "Simulate PSX BIOS"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:19
+msgid "32s"
 msgstr ""
 
-#: ../gui/DebugMemory.c:103 ../data/pcsx.glade2:3178
-msgid "Memory Dump"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:20
+msgid "1min"
 msgstr ""
 
-#: ../gui/DebugMemory.c:111
-#, fuzzy
-msgid "Start Address (Hexadecimal):"
-msgstr "Hexadecimal"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:21
+msgid "2min"
+msgstr ""
 
-#: ../gui/DebugMemory.c:121
-msgid "Length (Decimal):"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:22
+msgid "4min"
 msgstr ""
 
-#: ../gui/DebugMemory.c:147
-msgid "Dump to File"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:23
+msgid "8min"
 msgstr ""
 
-#: ../gui/DebugMemory.c:162
-#, fuzzy, c-format
-msgid "Error writing to %s!"
-msgstr "Erro ao salvar o arquivo de estado \"%s\"!"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:24
+msgid "16min"
+msgstr ""
 
-#: ../gui/DebugMemory.c:180
-#, fuzzy
-msgid "Memory Patch"
-msgstr "Cartão de memória 1"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:25
+msgid "32min"
+msgstr ""
 
-#: ../gui/DebugMemory.c:188 ../data/pcsx.glade2:3199
-#, fuzzy
-msgid "Address (Hexadecimal):"
-msgstr "Hexadecimal"
+#: ../plugins/dfinput/cfg-gtk.c:49
+msgid "D-Pad Up"
+msgstr ""
 
-#: ../gui/DebugMemory.c:198
-#, fuzzy
-msgid "Value (Hexa string):"
-msgstr "Hexadecimal"
+#: ../plugins/dfinput/cfg-gtk.c:50
+msgid "D-Pad Down"
+msgstr ""
 
-#: ../gui/DebugMemory.c:264
-#, fuzzy
-msgid "Memory Viewer"
-msgstr "Cartão de memória 1"
+#: ../plugins/dfinput/cfg-gtk.c:51
+msgid "D-Pad Left"
+msgstr ""
 
-#: ../gui/DebugMemory.c:269
-#, fuzzy
-msgid "Address"
-msgstr "Endereço:"
+#: ../plugins/dfinput/cfg-gtk.c:52
+msgid "D-Pad Right"
+msgstr ""
 
-#: ../gui/DebugMemory.c:287
-#, fuzzy
-msgid "Text"
-msgstr "Texturas"
+#: ../plugins/dfinput/cfg-gtk.c:53
+msgid "Cross"
+msgstr ""
 
-#: ../gui/Gtk2Gui.c:113
-msgid "Ready"
+#: ../plugins/dfinput/cfg-gtk.c:54
+msgid "Circle"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:154
-msgid "Emulation Paused."
+#: ../plugins/dfinput/cfg-gtk.c:55
+msgid "Square"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:405
-msgid "Select PSX EXE File"
-msgstr "Selecione o arquivo executável de PSX"
+#: ../plugins/dfinput/cfg-gtk.c:56
+msgid "Triangle"
+msgstr ""
 
-#: ../gui/Gtk2Gui.c:418
-msgid "PlayStation Executable Files"
-msgstr "Arquivos executáveis do PlayStation"
+#: ../plugins/dfinput/cfg-gtk.c:57
+msgid "L1"
+msgstr "L1"
 
-#: ../gui/Gtk2Gui.c:454
-msgid "Not a valid PSX file"
-msgstr "Não é um arquivo válido de PSX"
+#: ../plugins/dfinput/cfg-gtk.c:58
+msgid "R1"
+msgstr "R1"
 
-#: ../gui/Gtk2Gui.c:454
-msgid "The file does not appear to be a valid Playstation executable"
-msgstr "Esse arquivo não parece ser um executável válido de PlayStation!"
+#: ../plugins/dfinput/cfg-gtk.c:59
+msgid "L2"
+msgstr "L2"
 
-#: ../gui/Gtk2Gui.c:485 ../gui/Gtk2Gui.c:610
-msgid "CD ROM failed"
-msgstr "CDROM falhou"
+#: ../plugins/dfinput/cfg-gtk.c:60
+msgid "R2"
+msgstr "R2"
 
-#: ../gui/Gtk2Gui.c:493 ../gui/Gtk2Gui.c:618
-msgid "The CD-ROM could not be loaded"
+#: ../plugins/dfinput/cfg-gtk.c:61
+msgid "Select"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:507
-msgid "Could not run BIOS"
-msgstr "Não conseguiu iniciar a BIOS"
+#: ../plugins/dfinput/cfg-gtk.c:62
+msgid "Start"
+msgstr ""
 
-#: ../gui/Gtk2Gui.c:507
-msgid "Running BIOS is not supported with Internal HLE BIOS."
-msgstr "Iniciar pela BIOS não é suportado com a BIOS HLE interno."
+#: ../plugins/dfinput/cfg-gtk.c:63
+msgid "L3"
+msgstr ""
 
-#: ../gui/Gtk2Gui.c:536
-msgid "Open PSX Disc Image File"
-msgstr "Abrir arquivo de imagem de CD de PSX"
+#: ../plugins/dfinput/cfg-gtk.c:64
+msgid "R3"
+msgstr ""
 
-#: ../gui/Gtk2Gui.c:556
-msgid "PSX Image Files (*.bin, *.img, *.mdf, *.iso)"
-msgstr "Arquivo de imagens de CD de PSX (*.bin, *.img, *.mdf, *.iso)"
+#: ../plugins/dfinput/cfg-gtk.c:65
+msgid "Analog"
+msgstr ""
 
-#: ../gui/Gtk2Gui.c:771
-#, c-format
-msgid "Loaded state %s."
-msgstr "Arquivo de estado \"%s\" carregado."
+#: ../plugins/dfinput/cfg-gtk.c:69
+msgid "L-Stick Right"
+msgstr ""
 
-#: ../gui/Gtk2Gui.c:774
-#, c-format
-msgid "Error loading state %s!"
-msgstr "Erro ao carregar o arquivo de estado \"%s\"!"
+#: ../plugins/dfinput/cfg-gtk.c:70
+msgid "L-Stick Left"
+msgstr ""
 
-#: ../gui/Gtk2Gui.c:785
-#, c-format
-msgid "Saved state %s."
-msgstr "Arquivo de estado \"%s\" salvo."
+#: ../plugins/dfinput/cfg-gtk.c:71
+msgid "L-Stick Down"
+msgstr ""
 
-#: ../gui/Gtk2Gui.c:787
-#, c-format
-msgid "Error saving state %s!"
-msgstr "Erro ao salvar o arquivo de estado \"%s\"!"
+#: ../plugins/dfinput/cfg-gtk.c:72
+msgid "L-Stick Up"
+msgstr ""
 
-#: ../gui/Gtk2Gui.c:822 ../gui/Gtk2Gui.c:850
-msgid "Select State File"
-msgstr "Selecione o arquivo de estado"
+#: ../plugins/dfinput/cfg-gtk.c:73
+msgid "R-Stick Right"
+msgstr ""
 
-#: ../gui/Gtk2Gui.c:893
-msgid "Notice"
-msgstr "Aviso"
+#: ../plugins/dfinput/cfg-gtk.c:74
+msgid "R-Stick Left"
+msgstr ""
 
-#: ../gui/LnxMain.c:62
-#, c-format
-msgid "Creating memory card: %s\n"
-msgstr "Criando cartão de memória \"%s\"\n"
+#: ../plugins/dfinput/cfg-gtk.c:75
+msgid "R-Stick Down"
+msgstr ""
 
-#: ../gui/LnxMain.c:325
-msgid ""
-" pcsx [options] [file]\n"
-"\toptions:\n"
-"\t-runcd\t\tRuns CD-ROM\n"
-"\t-cdfile FILE\tRuns a CD image file\n"
-"\t-nogui\t\tDon't open the GTK GUI\n"
-"\t-cfg FILE\tLoads desired configuration file (default: ~/.pcsx/pcsx.cfg)\n"
-"\t-psxout\t\tEnable PSX output\n"
-"\t-load STATENUM\tLoads savestate STATENUM (1-5)\n"
-"\t-h -help\tDisplay this message\n"
-"\tfile\t\tLoads file\n"
+#: ../plugins/dfinput/cfg-gtk.c:76
+msgid "R-Stick Up"
 msgstr ""
-" pcsx [opções] [arquivo]\n"
-"\topções:\n"
-"\t-runcd\t\tExecuta direto pelo CD-ROM\n"
-"\t-cdfile ARQUIVO\tRoda um arquivo de imagem de CD\n"
-"\t-nogui\t\tNão abre o GUI da GTK\n"
-"\t-cfg ARQUIVO\tCarrega uma configuração alternativa (padrão: ~/.pcsx/pcsx."
-"cfg)\n"
-"\t-psxout\t\tAtiva a saída do PSX no console\n"
-"\t-load NÚMERO_ESTADO\tCarrega um estado entre 1-5\n"
-"\t-h -help\tMostra essa mensagem\n"
-"\t[arquivo]\t\tCarrega um arquivo.\n"
 
-#: ../gui/LnxMain.c:362
-#, c-format
-msgid ""
-"PCSX cannot be configured without using the GUI -- you should restart "
-"without -nogui.\n"
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
+msgid "Centered"
 msgstr ""
-"PCSX não pode ser configurado sem o GUI -- reinicie sem a opção -nogui.\n"
 
-#: ../gui/LnxMain.c:418
-msgid "Failed loading plugins!"
-msgstr "Não conseguiu carregar as extensões!"
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
+msgid "Up"
+msgstr ""
 
-#: ../gui/LnxMain.c:435
-#, c-format
-msgid "Could not load CD-ROM!\n"
-msgstr "Não pôde carregar o CD-ROM!\n"
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
+msgid "Right"
+msgstr ""
 
-#: ../gui/LnxMain.c:466
-#, c-format
-msgid "PSX emulator couldn't be initialized.\n"
-msgstr "O emulador não pôde ser inicializado.\n"
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
+msgid "Rightup"
+msgstr ""
 
-#: ../gui/MemcardDlg.c:56
-msgid "Icon"
-msgstr "Ícone"
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
+msgid "Down"
+msgstr ""
 
-#: ../gui/MemcardDlg.c:74
-msgid "ID"
-msgstr "ID"
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
+msgid "Rightdown"
+msgstr ""
 
-#: ../gui/MemcardDlg.c:80
-msgid "Name"
-msgstr "Nome"
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
+msgid "Left"
+msgstr ""
 
-#: ../gui/MemcardDlg.c:323
-msgid "Select A File"
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
+msgid "Leftup"
 msgstr ""
 
-#: ../gui/MemcardDlg.c:364
-msgid "Format this Memory Card?"
-msgstr "Formatar esse cartão de memória?"
+#: ../plugins/dfinput/cfg-gtk.c:104 ../plugins/dfinput/cfg-gtk.c:143
+msgid "Leftdown"
+msgstr ""
 
-#: ../gui/MemcardDlg.c:366
-msgid ""
-"If you format the memory card, the card will be empty, and any existing data "
-"overwritten."
-msgstr "Ao formatar o cartão de memória, todo o conteúdo será zerado."
+#: ../plugins/dfinput/cfg-gtk.c:108 ../plugins/dfinput/cfg-gtk.c:147
+#, c-format
+msgid "Joystick: Button %d"
+msgstr ""
 
-#: ../gui/MemcardDlg.c:369
-msgid "Format card"
-msgstr "Formatar cartão"
+#: ../plugins/dfinput/cfg-gtk.c:112 ../plugins/dfinput/cfg-gtk.c:151
+#, c-format
+msgid "Joystick: Axis %d%c"
+msgstr ""
 
-#: ../gui/MemcardDlg.c:393
-msgid "Create a new Memory Card"
+#: ../plugins/dfinput/cfg-gtk.c:117 ../plugins/dfinput/cfg-gtk.c:156
+#, c-format
+msgid "Joystick: Hat %d %s"
 msgstr ""
 
-#: ../gui/MemcardDlg.c:402
-msgid "New Memory Card.mcd"
+#: ../plugins/dfinput/cfg-gtk.c:132 ../plugins/dfinput/cfg-gtk.c:171
+msgid "Keyboard:"
 msgstr ""
 
-#: ../gui/MemcardDlg.c:503
-msgid "No free space on memory card"
+#: ../plugins/dfinput/cfg-gtk.c:136 ../plugins/dfinput/cfg-gtk.c:175
+msgid "(Not Set)"
 msgstr ""
 
-#: ../gui/MemcardDlg.c:504
-msgid ""
-"There are no free slots available on the target memory card. Please delete a "
-"slot first."
+#: ../plugins/dfinput/cfg-gtk.c:575
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:14
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:68
+msgid "None"
 msgstr ""
 
-#: ../gui/MemcardDlg.c:667
-msgid "Memory Card Manager"
-msgstr "Gerenciador de cartões de memória"
+#: ../plugins/dfinput/cfg-gtk.c:623
+msgid "Gamepad/Keyboard Input Configuration"
+msgstr ""
 
-#: ../gui/Plugin.c:211 ../data/pcsx.glade2:1487
-#, c-format
-msgid "SIO IRQ Always Enabled"
-msgstr "IRQ SIO sempre ativada"
+#: ../plugins/dfinput/cfg-gtk.c:629 ../plugins/dfinput/cfg-gtk.c:649
+msgid "Key"
+msgstr ""
 
-#: ../gui/Plugin.c:212
-#, c-format
-msgid "SIO IRQ Not Always Enabled"
-msgstr "IRQ SIO nem sempre ativada"
+#: ../plugins/dfinput/cfg-gtk.c:635 ../plugins/dfinput/cfg-gtk.c:655
+msgid "Button"
+msgstr ""
 
-#: ../gui/Plugin.c:218
-#, c-format
-msgid "Black & White Mdecs Only Enabled"
-msgstr "Mdecs apenas em preto e branco ativado"
+#: ../plugins/dfinput/dfinput.ui.h:1
+msgid "Device:"
+msgstr ""
 
-#: ../gui/Plugin.c:219
-#, c-format
-msgid "Black & White Mdecs Only Disabled"
-msgstr "Mdecs apenas em preto e branco desativado"
+#: ../plugins/dfinput/dfinput.ui.h:2
+msgid "Type:"
+msgstr ""
+
+#: ../plugins/dfinput/dfinput.ui.h:3
+msgid "Visual vibration"
+msgstr ""
 
-#: ../gui/Plugin.c:225
-#, c-format
-msgid "XA Enabled"
-msgstr "XA Ligado"
+#: ../plugins/dfinput/dfinput.ui.h:4
+msgid "Change"
+msgstr ""
 
-#: ../gui/Plugin.c:226
-#, c-format
-msgid "XA Disabled"
-msgstr "XA Desligado"
+#: ../plugins/dfinput/dfinput.ui.h:5
+msgid "Reset"
+msgstr ""
 
-#: ../gui/Plugin.c:288
-msgid "Error opening CD-ROM plugin!"
-msgstr "Erro ao abrir a extensão de CD-ROM!"
+#: ../plugins/dfinput/dfinput.ui.h:6
+msgid "Controller 1"
+msgstr "Controle 1"
 
-#: ../gui/Plugin.c:290
-msgid "Error opening SPU plugin!"
-msgstr "Erro ao abrir a extensão de SPU!"
+#: ../plugins/dfinput/dfinput.ui.h:7
+msgid "Controller 2"
+msgstr "Controle 2"
 
-#: ../gui/Plugin.c:293
-msgid "Error opening GPU plugin!"
-msgstr "Erro ao abrir a extensão de GPU!"
+#: ../plugins/dfinput/dfinput.ui.h:8
+msgid "Multi-Threaded (Recommended)"
+msgstr ""
 
-#: ../gui/Plugin.c:295
-msgid "Error opening Controller 1 plugin!"
-msgstr "Erro ao abrir a extensão do Controle 1!"
+#: ../plugins/dfinput/dfinput.ui.h:9 ../win32/gui/WndMain.c:1342
+msgid "Options"
+msgstr "Opções"
 
-#: ../gui/Plugin.c:297
-msgid "Error opening Controller 2 plugin!"
-msgstr "Erro ao abrir a extensão do Controle 2!"
+#: ../plugins/dfinput/dfinput.ui.h:10
+msgid "Digital Pad"
+msgstr ""
 
-#: ../gui/Plugin.c:377
-msgid "Error closing CD-ROM plugin!"
-msgstr "Erro ao fechar a extensão de CD-ROM!"
+#: ../plugins/dfinput/dfinput.ui.h:11
+msgid "Analog Pad"
+msgstr ""
 
-#: ../gui/Plugin.c:379
-msgid "Error closing SPU plugin!"
-msgstr "Erro ao fechar a extensão de SPU!"
+#: ../plugins/dfinput/dfinput.ui.h:12
+msgid "Mouse"
+msgstr ""
 
-#: ../gui/Plugin.c:381
-msgid "Error closing Controller 1 Plugin!"
-msgstr "Erro ao fechar a extensão do Controle 1!"
+#: ../plugins/dfinput/pad.c:33
+#, fuzzy
+msgid "Gamepad/Keyboard/Mouse Input"
+msgstr "Entrada do gamepad ou teclado"
 
-#: ../gui/Plugin.c:383
-msgid "Error closing Controller 2 plugin!"
-msgstr "Erro ao fechar a extensão de Controle 2!"
+#. increase that with each version
+#: ../plugins/dfnet/dfnet.c:23
+#, fuzzy
+msgid "Socket Driver"
+msgstr "Extensão SoftGL"
 
-#: ../gui/Plugin.c:385
-msgid "Error closing GPU plugin!"
-msgstr "Erro ao fechar a extensão de GPU!"
+#: ../plugins/dfnet/dfnet.c:161
+#, fuzzy, c-format
+msgid "error connecting to %s: %s\n"
+msgstr "Erro carregando \"%s\": \"%s\""
 
-#: ../libpcsxcore/cdriso.c:658
-#, c-format
-msgid "Track %.2d (%s) - Start %.2d:%.2d:%.2d, Length %.2d:%.2d:%.2d\n"
+#: ../plugins/dfnet/dfnet.c:186
+#, fuzzy
+msgid "Error allocating memory!\n"
+msgstr "Erro ao alocar memória!"
+
+#: ../plugins/dfnet/dfnet.ui.h:1
+msgid "Start Game"
 msgstr ""
 
-#: ../libpcsxcore/cdriso.c:677
-#, c-format
-msgid "Loaded CD Image: %s"
-msgstr "Carregou a imagem de CD \"%s\"."
+#: ../plugins/dfnet/dfnet.ui.h:2
+msgid "Play Offline"
+msgstr ""
 
-#: ../libpcsxcore/cheat.c:147
-#, c-format
-msgid "Cheats loaded from: %s\n"
-msgstr "Trapaças de \"%s\" carregadas.\n"
+#: ../plugins/dfnet/dfnet.ui.h:3
+msgid ""
+"Select here if you'll be Server (Player1) or Client (Player2).\n"
+"\n"
+"If you select Server you must Copy your IP address to the Clipboard and "
+"paste if (Ctrl+V) wherever the Client can see it.\n"
+"\n"
+"If you selected Client please enter the IP address the Server gave to you in "
+"the IP Address Control."
+msgstr ""
 
-#: ../libpcsxcore/cheat.c:179
-#, c-format
-msgid "Cheats saved to: %s\n"
-msgstr "Trapaças salvas para \"%s\".\n"
+#: ../plugins/dfnet/dfnet.ui.h:8 ../plugins/bladesio1/sio1.ui.h:6
+msgid "Copy PC IP to Clipboard"
+msgstr ""
 
-#: ../libpcsxcore/cheat.c:322 ../libpcsxcore/cheat.c:443
-msgid "(Untitled)"
-msgstr "(Sem título)"
+#: ../plugins/dfnet/dfnet.ui.h:9 ../plugins/bladesio1/sio1.ui.h:7
+msgid "Server (Player1)"
+msgstr ""
 
-#: ../libpcsxcore/debug.c:317
-msgid "Error allocating memory"
-msgstr "Erro ao alocar memória"
+#: ../plugins/dfnet/dfnet.ui.h:10 ../plugins/bladesio1/sio1.ui.h:8
+msgid "Client (Player2)"
+msgstr ""
 
-#: ../libpcsxcore/debug.c:322
-msgid "Unable to start debug server.\n"
+#: ../plugins/dfnet/dfnet.ui.h:11 ../plugins/bladesio1/sio1.ui.h:10
+msgid ""
+"Do not change if not necessary (remember it must be changed on both sides)."
 msgstr ""
 
-#: ../libpcsxcore/debug.c:326
-msgid "Debugger started.\n"
+#: ../plugins/dfnet/dfnet.ui.h:12 ../plugins/bladesio1/sio1.ui.h:11
+msgid "Port Number"
 msgstr ""
 
-#: ../libpcsxcore/debug.c:333
-msgid "Debugger stopped.\n"
+#: ../plugins/dfnet/gui.c:30 ../plugins/dfnet/gui.c:112
+#: ../plugins/bladesio1/gui.c:82 ../win32/gui/ConfigurePlugins.c:669
+msgid "NetPlay"
+msgstr "Jogo em rede"
+
+#: ../plugins/dfnet/gui.c:38
+msgid "Nothing to configure"
 msgstr ""
 
-#: ../libpcsxcore/misc.c:342
+#: ../plugins/dfnet/gui.c:94 ../plugins/bladesio1/gui.c:94
 #, c-format
-msgid "CD-ROM Label: %.32s\n"
+msgid "IP %s"
 msgstr ""
 
-#: ../libpcsxcore/misc.c:343
-#, fuzzy, c-format
-msgid "CD-ROM ID: %.9s\n"
-msgstr "CD-ROM:"
+#: ../plugins/dfnet/gui.c:165
+msgid "Waiting for connection..."
+msgstr ""
 
-#: ../libpcsxcore/misc.c:388
-#, c-format
-msgid "Error opening file: %s.\n"
-msgstr "Erro ao abrir o arquivo \"%s\"!\n"
+#: ../plugins/dfnet/gui.c:168
+msgid "The Client should now Start a Connection, waiting..."
+msgstr ""
 
-#: ../libpcsxcore/misc.c:428
-#, c-format
-msgid "Unknown CPE opcode %02x at position %08x.\n"
-msgstr "Código operacional CPE %02x desconhecido, na posição %08x.\n"
+#: ../plugins/dfsound/spu.c:66
+#, fuzzy
+msgid "DirectSound Driver"
+msgstr "Extensão XVideo"
 
-#: ../libpcsxcore/misc.c:435
-msgid "COFF files not supported.\n"
-msgstr "Arquivos COFF não são suportados!\n"
+#: ../plugins/dfsound/spu.c:68
+msgid "Mac OS X Sound"
+msgstr ""
 
-#: ../libpcsxcore/misc.c:439
-msgid "This file does not appear to be a valid PSX file.\n"
-msgstr "Esse arquivo não parece ser um arquivo válido de PSX!\n"
+#: ../plugins/dfsound/spu.c:70
+msgid "ALSA Sound"
+msgstr "Sistema ALSA"
 
-#: ../libpcsxcore/plugins.c:181
-#, c-format
-msgid "Error loading %s: %s"
-msgstr "Erro carregando \"%s\": \"%s\""
+#: ../plugins/dfsound/spu.c:72
+#, fuzzy
+msgid "OSS Sound"
+msgstr "Sistema OSS"
 
-#: ../libpcsxcore/plugins.c:221
-#, c-format
-msgid "Could not load GPU plugin %s!"
-msgstr "Não conseguiu carregar a extensão de GPU \"%s\"!"
+#: ../plugins/dfsound/spu.c:74
+#, fuzzy
+msgid "SDL Sound"
+msgstr "Sistema OSS"
 
-#: ../libpcsxcore/plugins.c:292
-#, c-format
-msgid "Could not load CD-ROM plugin %s!"
-msgstr "Não conseguiu carregar a extensão de CD-ROM \"%s\"!"
+#: ../plugins/dfsound/spu.c:76
+#, fuzzy
+msgid "OpenAL Sound"
+msgstr "Sistema ALSA"
 
-#: ../libpcsxcore/plugins.c:340
-#, c-format
-msgid "Could not load SPU plugin %s!"
-msgstr "Não conseguiu carregar a extensão de SPU \"%s\"!"
+#: ../plugins/dfsound/spu.c:78
+msgid "PulseAudio Sound"
+msgstr ""
 
-#: ../libpcsxcore/plugins.c:477
-#, c-format
-msgid "Could not load Controller 1 plugin %s!"
-msgstr "Não conseguiu carregar a extensão do Controle 1 \"%s\"!"
+#: ../plugins/dfsound/spu.c:80
+msgid "NULL Sound"
+msgstr "Sem som"
 
-#: ../libpcsxcore/plugins.c:531
-#, c-format
-msgid "Could not load Controller 2 plugin %s!"
-msgstr "Não conseguiu carregar a extensão do Controle 2 \"%s\"!"
+#: ../plugins/dfsound/spu.c:83
+#, fuzzy
+msgid ""
+"P.E.Op.S. Sound Driver V1.7\n"
+"Coded by Pete Bernert and the P.E.Op.S. team\n"
+msgstr ""
+"Extensão OSS P.E.Op.S. V1.7\n"
+"Programada por Pete Bernert e a equipe do P.E.Op.S.\n"
 
-#: ../libpcsxcore/plugins.c:574
-#, c-format
-msgid "Could not load NetPlay plugin %s!"
-msgstr "Não conseguiu carregar a extensão de jogo em rede \"%s\"!"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:2
+msgid "Volume:"
+msgstr "Volume:"
 
-#: ../libpcsxcore/plugins.c:654
-#, fuzzy, c-format
-msgid "Could not load SIO1 plugin %s!"
-msgstr "Não conseguiu carregar a extensão de SPU \"%s\"!"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:3
+msgid "Interpolation:"
+msgstr "Interpolação:"
 
-#: ../libpcsxcore/plugins.c:739
-#, c-format
-msgid "Error initializing CD-ROM plugin: %d"
-msgstr "Erro ao iniciar a extensão de CD-ROM \"%d\"!"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:4
+msgid "Reverb:"
+msgstr "Reversão:"
 
-#: ../libpcsxcore/plugins.c:741
-#, c-format
-msgid "Error initializing GPU plugin: %d"
-msgstr "Erro ao iniciar a extensão de GPU \"%d\"!"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:5
+msgid "Adjust XA speed"
+msgstr "Ajustar velocidade da XA"
 
-#: ../libpcsxcore/plugins.c:743
-#, c-format
-msgid "Error initializing SPU plugin: %d"
-msgstr "Erro ao iniciar a extensão de SPU \"%d\"!"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:6
+msgid "Choose this if XA music is played too quickly."
+msgstr "Selecione isso se a música XA estiver tocando rápido demais."
 
-#: ../libpcsxcore/plugins.c:745
-#, c-format
-msgid "Error initializing Controller 1 plugin: %d"
-msgstr "Erro ao iniciar a extensão do Controle 1 \"%d\"!"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:7
+msgid "High compatibility mode"
+msgstr "Modo de alta compatibilidade"
 
-#: ../libpcsxcore/plugins.c:747
-#, c-format
-msgid "Error initializing Controller 2 plugin: %d"
-msgstr "Erro ao iniciar a extensão do Controle 2 \"%d\"!"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:8
+msgid "Use the asynchronous SPU interface."
+msgstr "Usar o ambiente assíncrono da SPU."
 
-#: ../libpcsxcore/plugins.c:751
-#, c-format
-msgid "Error initializing NetPlay plugin: %d"
-msgstr "Erro ao iniciar a extensão de jogo em rede \"%d\"!"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:9
+msgid "SPU IRQ Wait"
+msgstr "Esperar pela IRQ da SPU"
 
-#: ../libpcsxcore/plugins.c:756
-#, fuzzy, c-format
-msgid "Error initializing SIO1 plugin: %d"
-msgstr "Erro ao iniciar a extensão de SPU \"%d\"!"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:10
+msgid "Wait for CPU; only useful for some games."
+msgstr "Esperar pela CPU; útil apenas em alguns jogos."
 
-#: ../libpcsxcore/plugins.c:759
-msgid "Plugins loaded.\n"
-msgstr "Extensões carregadas.\n"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:11
+msgid "Single channel sound"
+msgstr "Som em canal único"
 
-#: ../libpcsxcore/ppf.c:216
-#, c-format
-msgid "Invalid PPF patch: %s.\n"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:12
+msgid "Play only one channel for a performance boost."
+msgstr "Tocar apenas um canal para melhorar o desempenho."
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:13
+msgid "Frequency Response - Output Filter"
 msgstr ""
 
-#: ../libpcsxcore/ppf.c:292
-#, c-format
-msgid "Unsupported PPF version (%d).\n"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:15
+msgid "Simple"
 msgstr ""
 
-#: ../libpcsxcore/ppf.c:331
-#, fuzzy, c-format
-msgid "Loaded PPF %d.0 patch: %s.\n"
-msgstr "Arquivo de estado \"%s\" carregado."
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:16
+#, fuzzy
+msgid "Gaussian"
+msgstr "Russo"
 
-#: ../libpcsxcore/psxmem.c:80
-msgid "Error allocating memory!"
-msgstr "Erro ao alocar memória!"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:17
+msgid "Cubic"
+msgstr ""
 
-#: ../libpcsxcore/psxmem.c:122
-#, c-format
-msgid "Could not open BIOS:\"%s\". Enabling HLE Bios!\n"
-msgstr "Não conseguiu abrir a BIOS\"%s\". Usando BIOS HLE!\n"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:18
+msgid "Off"
+msgstr ""
 
-#: ../libpcsxcore/r3000a.c:33
-#, c-format
-msgid "Running PCSX Version %s (%s).\n"
-msgstr "Rodando o PCSX Versão %s (%s).\n"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:19
+#, fuzzy
+msgid "Playstation"
+msgstr ""
+"Desligada\n"
+"Simples\n"
+"PlayStation"
 
-#: ../libpcsxcore/sio.c:345
-msgid "Connection closed!\n"
-msgstr "Conexão encerrada!\n"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:20
+msgid "Low"
+msgstr ""
 
-#: ../libpcsxcore/sio.c:371
-#, c-format
-msgid "No memory card value was specified - creating a default card %s\n"
-msgstr "Nenhum cartão de memória foi especificado, criando um \"%s\" padrão.\n"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:21
+msgid "Medium"
+msgstr ""
 
-#: ../libpcsxcore/sio.c:375
-#, c-format
-msgid "The memory card %s doesn't exist - creating it\n"
-msgstr "O cartão de memória \"%s\" não existe, será criado.\n"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:22
+msgid "Loud"
+msgstr ""
 
-#: ../libpcsxcore/sio.c:391
-#, c-format
-msgid "Memory card %s failed to load!\n"
-msgstr "Cartão de memória \"%s\" falhou para carregar!\n"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:23
+msgid "Loudest"
+msgstr ""
 
-#: ../libpcsxcore/sio.c:395
-#, c-format
-msgid "Loading memory card %s\n"
-msgstr "Carregando cartão de memória \"%s\".\n"
+#: ../plugins/dfxvideo/gpu.c:82
+#, fuzzy
+msgid "Soft Driver"
+msgstr "Extensão SoftGL"
+
+#: ../plugins/dfxvideo/gpu.c:83
+#, fuzzy
+msgid ""
+"P.E.Op.S. Soft Driver V1.17\n"
+"Coded by Pete Bernert and the P.E.Op.S. team\n"
+msgstr ""
+"Extensão OSS P.E.Op.S. V1.7\n"
+"Programada por Pete Bernert e a equipe do P.E.Op.S.\n"
 
-#: ../plugins/dfxvideo/gpu.c:55
+#: ../plugins/dfxvideo/gpu.c:85
 msgid "SoftGL Driver"
 msgstr "Extensão SoftGL"
 
-#: ../plugins/dfxvideo/gpu.c:56
+#: ../plugins/dfxvideo/gpu.c:86
 msgid ""
 "P.E.Op.S. SoftGL Driver V1.17\n"
 "Coded by Pete Bernert and the P.E.Op.S. team\n"
 msgstr ""
 
-#: ../plugins/dfxvideo/gpu.c:58
+#: ../plugins/dfxvideo/gpu.c:88
 msgid "XVideo Driver"
 msgstr "Extensão XVideo"
 
-#: ../plugins/dfxvideo/gpu.c:59
+#: ../plugins/dfxvideo/gpu.c:89
 msgid ""
 "P.E.Op.S. Xvideo Driver V1.17\n"
 "Coded by Pete Bernert and the P.E.Op.S. team\n"
@@ -1623,1443 +1850,1669 @@
 "Extensão Xvideo P.E.Op.S. V1.17\n"
 "Programada por Pete Bernert e a equipe do P.E.Op.S.\n"
 
-#: ../plugins/dfxvideo/gpu.c:62
+#: ../plugins/dfxvideo/gpu.c:92
 msgid "Pete Bernert and the P.E.Op.S. team"
 msgstr "Pete Bernert e a equipe do P.E.Op.S."
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:8
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:1
 msgid "Configure X11 Video"
 msgstr "Configurar vídeo do X11"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:45
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:2
 msgid "Initial Window Size:"
 msgstr "Tamanho inicial da janela:"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:56
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:3
 msgid "Stretching:"
 msgstr "Escalonamento:"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:69
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:4
 msgid "Dithering:"
 msgstr "Colorização:"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:82
-msgid ""
-"320x240\n"
-"640x480\n"
-"800x600\n"
-"1024x768\n"
-"1152x864\n"
-"1280x1024\n"
-"1600x1200"
-msgstr ""
-"320x240\n"
-"640x480\n"
-"800x600\n"
-"1024x768\n"
-"1152x864\n"
-"1280x1024\n"
-"1600x1200"
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:101
-msgid ""
-"0: None\n"
-"1: 2xSai\n"
-"2: 2xSuperSai\n"
-"3: SuperEagle\n"
-"4: Scale2x\n"
-"5: Scale3x\n"
-"6: HQ2X\n"
-"7: HQ3X"
-msgstr ""
-"0: Nenhum\n"
-"1: 2xSai\n"
-"2: 2xSuperSai\n"
-"3: SuperEagle\n"
-"4: Scale2x\n"
-"5: Scale3x\n"
-"6: HQ2X\n"
-"7: HQ3X"
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:123
-msgid ""
-"0: Off (fastest)\n"
-"1: Game dependant\n"
-"2: Always"
-msgstr ""
-"0: Desligado (mais rápido)\n"
-"1: Depende do Jogo\n"
-"2: Sempre"
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:146
-msgid "Maintain 4:3 Aspect Ratio"
-msgstr "Manter proporção 4:3"
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:161
-#: ../plugins/peopsxgl/gpucfg/interface.c:322
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:5
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:4
 msgid "Fullscreen"
 msgstr "Tela cheia"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:165
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:6
 msgid "Toggle windowed/fullscreen mode."
 msgstr "Alternar entre tela cheia e janela."
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:187
-msgid "Screen"
-msgstr "Tela"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:7
+msgid "Maintain 4:3 Aspect Ratio"
+msgstr "Manter proporção 4:3"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:216
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:8
 msgid "Show FPS"
 msgstr "Mostrar taxa de FPS"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:220
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:9
 msgid "Toggle whether the FPS will be shown."
 msgstr "Ligar ou desligar a exibição da taxa de FPS."
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:232
-msgid "Autodetect FPS limit"
-msgstr "Detectar automaticamente limite de FPS"
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:236
-msgid "Enable this if games display too quickly."
-msgstr "Ligue isso se os jogos ficarem rápidos demais."
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:249
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:10
 msgid "Enable frame skipping"
 msgstr "Ligar pulo de quadros"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:253
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:11
 msgid "Skip frames when rendering."
 msgstr "Pula quadros ao exibir."
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:270
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:12
 msgid "Set FPS"
 msgstr "Limite de FPS"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:287
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:13
+msgid "Enable this if games display too quickly."
+msgstr "Ligue isso se os jogos ficarem rápidos demais."
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:14
 msgid "200.0"
 msgstr "200.0"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:310
-msgid "Framerate"
-msgstr "Taxa de FPS"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:15
+msgid "Autodetect FPS limit"
+msgstr "Detectar automaticamente limite de FPS"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:339
-#: ../plugins/peopsxgl/gpucfg/interface.c:568
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:16
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:36
 msgid "Use game fixes"
 msgstr "Usar consertos específicos"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:366
-msgid "better g-colors, worse textures"
-msgstr "Transparências melhores, texturas piores."
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:381
-msgid "Needed by Dark Forces"
-msgstr "Necessário para Dark Forces."
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:394
-msgid "Draw quads with triangles"
-msgstr "Desenhar quadrados com triângulos"
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:410
-msgid "Repeated flat tex triangles"
-msgstr "Triângulos de textura plana repetidos"
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:426
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:17
 msgid "Disable CPU Saving"
 msgstr "Desativar salvamento da CPU"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:442
-msgid "Odd/even bit hack"
-msgstr "Hack do bit ímpar/par"
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:458
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:18
 msgid "For precise framerate"
 msgstr "Para uma taxa de FPS precisa."
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:473
-msgid "Better FPS limit in some"
-msgstr "Melhor limitação de FPS em alguns jogos."
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:19
+msgid "Odd/even bit hack"
+msgstr "Hack do bit ímpar/par"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:20
+msgid "Chrono Cross"
+msgstr "Para Chrono Cross."
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:486
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:21
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:45
 msgid "PC FPS calculation"
 msgstr "Cálculo de FPS feito pelo PC"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:504
-msgid "Pandemonium 2"
-msgstr "Para Pandemonium 2."
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:517
-msgid "Lazy screen update"
-msgstr "Atualização tardia da tela"
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:535
-msgid "Skip every second frame"
-msgstr "Pula cada segundo quadro de uma taxa."
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:548
-#: ../plugins/peopsxgl/gpucfg/interface.c:640
-msgid "Old frame skipping"
-msgstr "Pulo de quadros antigo"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:22
+msgid "Better FPS limit in some"
+msgstr "Melhor limitação de FPS em alguns jogos."
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:564
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:23
 msgid "Expand screen width"
 msgstr "Expandir largura da tela"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:580
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:24
+msgid "Capcom fighting games"
+msgstr "Para jogos de luta da Capcom."
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:25
 msgid "Ignore brightness color"
 msgstr "Ignorar brilho das cores"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:596
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:26
+msgid "Black screens in Lunar"
+msgstr "Telas pretas de Lunar."
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:27
 msgid "Disable coordinate check"
 msgstr "Desativar checagem de coordenadas"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:614
-msgid "Chrono Cross"
-msgstr "Para Chrono Cross."
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:28
+msgid "Compatibility mode"
+msgstr "Modo de compatibilidade."
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:627
-msgid "Capcom fighting games"
-msgstr "Para jogos de luta da Capcom."
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:29
+msgid "Lazy screen update"
+msgstr "Atualização tardia da tela"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:642
-msgid "Black screens in Lunar"
-msgstr "Telas pretas de Lunar."
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:30
+msgid "Pandemonium 2"
+msgstr "Para Pandemonium 2."
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:657
-msgid "Compatibility mode"
-msgstr "Modo de compatibilidade."
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:31
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:46
+msgid "Old frame skipping"
+msgstr "Pulo de quadros antigo"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:32
+msgid "Skip every second frame"
+msgstr "Pula cada segundo quadro de uma taxa."
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:33
+msgid "Repeated flat tex triangles"
+msgstr "Triângulos de textura plana repetidos"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:34
+msgid "Needed by Dark Forces"
+msgstr "Necessário para Dark Forces."
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:35
+msgid "Draw quads with triangles"
+msgstr "Desenhar quadrados com triângulos"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:36
+msgid "better g-colors, worse textures"
+msgstr "Transparências melhores, texturas piores."
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:670
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:37
 #, fuzzy
 msgid "Fake 'gpu busy' states"
 msgstr "Imitar estado 'GPU ocupada'"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:688
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:38
 msgid "Toggle busy flags after drawing"
 msgstr ""
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:713
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:268
-msgid "Compatibility"
-msgstr "Compatibilidade"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:39
+msgid "0: Off (fastest)"
+msgstr ""
 
-#: ../data/pcsx.glade2:7
-msgid "PCSX"
-msgstr "PCSX"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:40
+msgid "1: Game dependant"
+msgstr ""
 
-#: ../data/pcsx.glade2:21
-msgid "_File"
-msgstr "_Arquivo"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:41
+msgid "2: Always"
+msgstr ""
 
-#: ../data/pcsx.glade2:27
-msgid "Run _CD"
-msgstr "Rodar _CD"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:42
+msgid "320x240"
+msgstr ""
 
-#: ../data/pcsx.glade2:45
-msgid "Run _ISO..."
-msgstr "Rodar _imagem de CD..."
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:43
+msgid "640x480"
+msgstr ""
 
-#: ../data/pcsx.glade2:62
-msgid "Run _BIOS"
-msgstr "Rodar pela _BIOS"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:44
+msgid "800x600"
+msgstr ""
 
-#: ../data/pcsx.glade2:79
-msgid "Run _EXE..."
-msgstr "Rodar _EXE do PSX..."
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:45
+msgid "1024x768"
+msgstr ""
 
-#: ../data/pcsx.glade2:101
-msgid "E_xit"
-msgstr "_Sair"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:46
+msgid "1152x864"
+msgstr ""
 
-#: ../data/pcsx.glade2:123
-msgid "_Emulator"
-msgstr "_Emulador"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:47
+msgid "1280x1024"
+msgstr ""
 
-#: ../data/pcsx.glade2:129
-msgid "_Continue"
-msgstr "_Continue"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:48
+msgid "1600x1200"
+msgstr ""
 
-#: ../data/pcsx.glade2:146
-msgid "_Reset"
-msgstr "_Reiniciar"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:49
+msgid "0: None"
+msgstr "0: Nenhum"
 
-#: ../data/pcsx.glade2:168
-msgid "S_witch ISO..."
-msgstr "_Trocar de imagem de CD..."
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:50
+msgid "1: 2xSai"
+msgstr ""
 
-#: ../data/pcsx.glade2:190
-msgid "_Save State"
-msgstr "_Salvar estado"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:51
+msgid "2: 2xSuperSai"
+msgstr ""
 
-#: ../data/pcsx.glade2:199 ../data/pcsx.glade2:280
-msgid "Slot _1"
-msgstr "Unidade _1"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:52
+msgid "3: SuperEagle"
+msgstr ""
 
-#: ../data/pcsx.glade2:208 ../data/pcsx.glade2:289
-msgid "Slot _2"
-msgstr "Unidade _2"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:53
+msgid "4: Scale2x"
+msgstr ""
 
-#: ../data/pcsx.glade2:217 ../data/pcsx.glade2:298
-msgid "Slot _3"
-msgstr "Unidade _3"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:54
+msgid "5: Scale3x"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:55
+msgid "6: HQ2X"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:56
+msgid "7: HQ3X"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpu.c:97
+msgid "OpenGL Driver"
+msgstr "Extensão OpenGL"
+
+#: ../plugins/peopsxgl/gpu.c:99
+msgid "Pete Bernert"
+msgstr "Pete Bernert"
+
+#: ../plugins/peopsxgl/gpu.c:100
+msgid ""
+"Based on P.E.Op.S. MesaGL Driver V1.78\n"
+"Coded by Pete Bernert\n"
+msgstr ""
+"Baseada na extensão MesaGL P.E.Op.S. V1.78\n"
+"Programada por Pete Bernert\n"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:1
+msgid "OpenGL Driver configuration"
+msgstr "Configuração da extensão OpenGL"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:2
+msgid "Width:"
+msgstr "Largura:"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:3
+msgid "Height:"
+msgstr "Altura:"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:5
+msgid "Dithering"
+msgstr "Colorização"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:6
+msgid "Keep psx aspect ratio"
+msgstr "Manter proporção do PSX"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:7
+msgid "Window options"
+msgstr "Opções da janela"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:8
+msgid "Quality:"
+msgstr "Qualidade:"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:9
+msgid "Filtering:"
+msgstr "Filtragem:"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:10
+msgid "HiRes Tex:"
+msgstr "Textura em alta resolução:"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:11
+msgid "VRam size in MBytes (0..1024, 0=auto):"
+msgstr "Tamanho da VRAM em MBytes (0..1024, 0=automático):"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:12
+msgid "Textures"
+msgstr "Texturas"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:13
+msgid "Show FPS display on startup"
+msgstr "Mostrar taxa de FPS ao iniciar"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:14
+msgid "Use FPS limit"
+msgstr "Usar limite de FPS"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:15
+#, fuzzy
+msgid "FPS limit auto-detector"
+msgstr "Autodetecção do limite de FPS"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:16
+msgid "FPS limit manual"
+msgstr "Limite manual de FPS"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:17
+msgid "FPS"
+msgstr "FPS"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:18
+msgid "Use Frame skipping"
+msgstr "Usar pulo de quadros"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:19
+msgid "Framerate"
+msgstr "Taxa de FPS"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:20
+#, fuzzy
+msgid "Offscreen drawing:"
+msgstr "Desenhos de fora da tela:"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:21
+msgid "Framebuffer textures:"
+msgstr "Texturas do framebuffer:"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:22
+msgid "Framebuffer access:"
+msgstr "Acesso ao framebuffer:"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:23
+#, fuzzy
+msgid "Mask bit detection (Needed by a few games, zbuffer)"
+msgstr "Detecção do bit mascarador (necessário para alguns jogos, zbuffer)"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:24
+#, fuzzy
+msgid "Alpha multipass (Correct opaque texture areas)"
+msgstr "Multipassagem dos canais alfa (áreas opacas de texturas corretas)"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:25
+msgid "Advanced blending (Accurate psx color emulation)"
+msgstr "Mesclagem avançada (emulação precisa das cores do PSX)"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:26
+msgid "Compatibility"
+msgstr "Compatibilidade"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:27
+#, fuzzy
+msgid "Scanlines Blending (0..255, -1=dot):"
+msgstr "Mesclagem (0..255, -1=por ponto):"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:28
+#, fuzzy
+msgid "Unfiltered MDECs (Small movie speedup)"
+msgstr "MDECs sem filtragem (pequeno ganho de velocidade nos filmes)"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:29
+#, fuzzy
+msgid "Force 15 bit framebuffer updates (Faster movies)"
+msgstr "Forçar atualizações do framebuffer em 15 bit (filmes mais rápidos)"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:30
+#, fuzzy
+msgid "Line mode (Polygons will not get filled)"
+msgstr "Modo de linhas (polígonos não serão tratados)"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:31
+#, fuzzy
+msgid "Polygon anti-aliasing (Slow with most cards)"
+msgstr "Anti-aliasing de polígonos (lento com a maioria das placas)"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:32
+#, fuzzy
+msgid "Use OpenGL extensions (Recommended)"
+msgstr "Usar extensões OpenGL (recomendado)"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:33
+#, fuzzy
+msgid "Screen smoothing (Can be slow or unsupported)"
+msgstr "Filtragem da tela inteira (pode ser lenta ou não suportada)"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:34
+msgid "Gte accuracy"
+msgstr ""
 
-#: ../data/pcsx.glade2:226 ../data/pcsx.glade2:307
-msgid "Slot _4"
-msgstr "Unidade _4"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:35
+msgid "Misc"
+msgstr "Miscelânea"
 
-#: ../data/pcsx.glade2:235 ../data/pcsx.glade2:316
-msgid "Slot _5"
-msgstr "Unidade _5"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:37
+#, fuzzy
+msgid "Battle cursor (FF7)"
+msgstr "Cursor da batalha (Final Fantasy 7)"
 
-#: ../data/pcsx.glade2:243 ../data/pcsx.glade2:324
-msgid "_Other..."
-msgstr "_Outros..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:38
+#, fuzzy
+msgid "Yellow rect (FF9)"
+msgstr "Retângulo amarelo (Final Fantasy 9)"
 
-#: ../data/pcsx.glade2:271
-msgid "_Load State"
-msgstr "_Carregar estado"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:39
+#, fuzzy
+msgid "Direct FB updates"
+msgstr "Atualização direta do framebuffer"
 
-#: ../data/pcsx.glade2:357
-msgid "_Configuration"
-msgstr "C_onfiguração"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:40
+#, fuzzy
+msgid "Black brightness (Lunar)"
+msgstr "Brilho no mínimo (Lunar)"
 
-#: ../data/pcsx.glade2:363
-msgid "_Plugins & BIOS..."
-msgstr "_Extensões e BIOS..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:41
+#, fuzzy
+msgid "Swap front detection"
+msgstr "Detecção da inversão frontal"
 
-#: ../data/pcsx.glade2:385
-msgid "_Graphics..."
-msgstr "_Gráficos..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:42
+#, fuzzy
+msgid "Disable coord check"
+msgstr "Desligar checagem de coordenadas"
 
-#: ../data/pcsx.glade2:400
-msgid "_Sound..."
-msgstr "Á_udio..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:43
+#, fuzzy
+msgid "No blue glitches (LoD)"
+msgstr "Sem sujeira azul (Legend of Dragoon)"
 
-#: ../data/pcsx.glade2:415
-msgid "CD-_ROM..."
-msgstr "CD_ROM..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:44
+#, fuzzy
+msgid "Soft FB access"
+msgstr "Acesso ao framebuffer por software"
 
-#: ../data/pcsx.glade2:430
-msgid "C_ontrollers..."
-msgstr "C_ontroles..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:47
+#, fuzzy
+msgid "No subtr. blending"
+msgstr "Sem subtração na mesclagem"
 
-#: ../data/pcsx.glade2:450
-msgid "_CPU..."
-msgstr "_CPU..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:48
+#, fuzzy
+msgid "Lazy upload (DW7)"
+msgstr "Atualização tardia (Dragon Warrior 7)"
 
-#: ../data/pcsx.glade2:466
-msgid "_Memory Cards..."
-msgstr "Cartões de _memória..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:49
+#, fuzzy
+msgid "Odd/even hack"
+msgstr "Hack do bit ímpar/par"
 
-#: ../data/pcsx.glade2:483
-msgid "_Netplay..."
-msgstr "Jogo em _rede..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:50
+#, fuzzy
+msgid "Adjust screen width"
+msgstr "Ajustar largura da tela"
 
-#: ../data/pcsx.glade2:504
-msgid "Chea_t"
-msgstr "T_rapaça"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:51
+#, fuzzy
+msgid "Old texture filtering"
+msgstr "Filtragem de textura antiga"
 
-#: ../data/pcsx.glade2:513
-msgid "_Browse..."
-msgstr "_Navegar..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:52
+#, fuzzy
+msgid "Additional uploads"
+msgstr "Envio de dados adicionais"
 
-#: ../data/pcsx.glade2:528
-msgid "_Search..."
-msgstr "_Buscar..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:53
+#, fuzzy
+msgid "Unused"
+msgstr "Usado"
 
-#: ../data/pcsx.glade2:554
-msgid "Memory _Dump"
-msgstr ""
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:54
+#, fuzzy
+msgid "Fake 'GPU busy'"
+msgstr "Imitar estado 'GPU ocupada'"
 
-#: ../data/pcsx.glade2:574
-msgid "_Help"
-msgstr "_Ajuda"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:55
+msgid "Special game fixes"
+msgstr "Consertos específicos para jogos"
 
-#: ../data/pcsx.glade2:580
-msgid "_About PCSX..."
-msgstr "_Sobre o PCSX..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:56
+#, fuzzy
+msgid "Fast"
+msgstr "Colar"
 
-#: ../data/pcsx.glade2:613 ../data/pcsx.glade2:614
-msgid "Run CD"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:57
+msgid "Autoconfigure for fast display"
 msgstr ""
 
-#: ../data/pcsx.glade2:626
-msgid "Run ISO Image"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:58
+msgid "Beautiful"
 msgstr ""
 
-#: ../data/pcsx.glade2:627
-msgid "Run ISO..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:59
+msgid "Auto configure for beautiful display"
 msgstr ""
 
-#: ../data/pcsx.glade2:648
-msgid "Continue Emulation"
-msgstr ""
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:60
+#, fuzzy
+msgid "None - Fastest, most glitches"
+msgstr "0: Nenhuma - Mais rápido e mais problemas"
 
-#: ../data/pcsx.glade2:649
-msgid "Continue..."
-msgstr ""
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:61
+#, fuzzy
+msgid "Minimum - Missing screens"
+msgstr "1: Mínimo - Perde algumas telas"
 
-#: ../data/pcsx.glade2:661
-msgid "Switch ISO Image"
-msgstr ""
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:62
+#, fuzzy
+msgid "Standard - OK for most games"
+msgstr "2: Padrão - Bom para a maioria dos jogos"
 
-#: ../data/pcsx.glade2:662
-msgid "Switch ISO..."
-msgstr ""
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:63
+#, fuzzy
+msgid "Enhanced - Shows more stuff"
+msgstr "3: Aumentado - Mostra mais coisas"
 
-#: ../data/pcsx.glade2:683 ../data/pcsx.glade2:1810
-msgid "Configure Memory Cards"
-msgstr "Configurar cartões de memória"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:64
+#, fuzzy
+msgid "Extended - Causing garbage"
+msgstr "4: Extendido - Pode causar lixo na tela"
 
-#: ../data/pcsx.glade2:684
-msgid "Memcards..."
-msgstr "Cartões de memória..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:65
+#, fuzzy
+msgid "None (Standard)"
+msgstr "0: Nenhuma (padrão)"
 
-#: ../data/pcsx.glade2:696
-msgid "Configure Graphics"
-msgstr ""
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:66
+#, fuzzy
+msgid "2xSaI (Much vram needed)"
+msgstr "1: 2xSaI (muita VRAM usada)"
 
-#: ../data/pcsx.glade2:697
-msgid "Graphics..."
-msgstr "Gráficos..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:67
+#, fuzzy
+msgid "Scaled (Needs tex filtering)"
+msgstr "2: Escalonado (precisa ativar filtragem)"
 
-#: ../data/pcsx.glade2:709 ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:8
-msgid "Configure Sound"
-msgstr "Configurar áudio"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:69
+#, fuzzy
+msgid "Standard - Glitches will happen"
+msgstr "1: Padrão - Problemas vão acontecer"
 
-#: ../data/pcsx.glade2:710
-msgid "Sound..."
-msgstr "Áudio..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:70
+#, fuzzy
+msgid "Extended - No black borders"
+msgstr "2: Extendido - Sem bordas escuras"
 
-#: ../data/pcsx.glade2:722
-msgid "Configure CD-ROM"
-msgstr "Configurar CD-ROM"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:71
+#, fuzzy
+msgid "Standard without sprites - Unfiltered 2D"
+msgstr "3: Padrão sem sprites - 2D sem filtro"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:72
+#, fuzzy
+msgid "Extended without sprites - Unfiltered 2D"
+msgstr "4: Extendido sem sprites - 2D sem filtro"
 
-#: ../data/pcsx.glade2:723
-msgid "CD-ROM..."
-msgstr "CD-ROM..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:73
+#, fuzzy
+msgid "Standard + smoothed sprites"
+msgstr "5: Padrão mais sprites filtrados"
 
-#: ../data/pcsx.glade2:735
-msgid "Configure Controllers"
-msgstr ""
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:74
+#, fuzzy
+msgid "Extended + smoothed sprites"
+msgstr "6: Extendido mais sprites filtrados"
 
-#: ../data/pcsx.glade2:736
-msgid "Controllers..."
-msgstr "Controles..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:75
+#, fuzzy
+msgid "Don't care - Use driver's default textures"
+msgstr "0: tanto faz - usar textura padrão da placa"
 
-#: ../data/pcsx.glade2:879
-msgid "Select Folder to Search"
-msgstr "Selecione o diretório para a busca"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:76
+#, fuzzy
+msgid "4444 - Fast, but less colorful"
+msgstr "1: 4444 - Rápido, mas sem muitas cores"
 
-#: ../data/pcsx.glade2:895
-msgid "Search in:"
-msgstr "Buscar em:"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:77
+#, fuzzy
+msgid "5551 - Nice colors, bad transparency"
+msgstr "2: 5551 - Cores bonitas, transparência ruim"
 
-#: ../data/pcsx.glade2:1168
-msgid "Graphics:"
-msgstr "Gráficos:"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:78
+#, fuzzy
+msgid "8888 - Best colors, more ram needed"
+msgstr "3: 8888 - Melhor padrão, o que mais usa RAM"
 
-#: ../data/pcsx.glade2:1181
-msgid "Sound:"
-msgstr "Áudio:"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:79
+#, fuzzy
+msgid "BGR8888 - Faster on some cards"
+msgstr "4: BGR8888 - Mais rápido em algumas placas"
 
-#: ../data/pcsx.glade2:1196
-msgid "Controller 1: "
-msgstr "Controle 1:"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:80
+#, fuzzy
+msgid "Emulated VRam - Ok most times"
+msgstr "0: VRAM Emulada - bom na maioria das vezes"
 
-#: ../data/pcsx.glade2:1211
-msgid "Controller 2:"
-msgstr "Controle 2:"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:81
+#, fuzzy
+msgid "Gfx card buffer reads"
+msgstr "1: Leitura do buffer da placa"
 
-#: ../data/pcsx.glade2:1226
-msgid "CD-ROM:"
-msgstr "CD-ROM:"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:82
+#, fuzzy
+msgid "Gfx card buffer moves"
+msgstr "2: Escrita no buffer da placa"
 
-#: ../data/pcsx.glade2:1264
-msgid "Plugins"
-msgstr "Extensões"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:83
+#, fuzzy
+msgid "Gfx card buffer reads and moves"
+msgstr "1: Leitura do buffer da placa"
 
-#: ../data/pcsx.glade2:1325
-msgid "BIOS"
-msgstr "BIOS"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:84
+#, fuzzy
+msgid "Full Software (FVP)"
+msgstr "4: Todo em software (FVP)"
 
-#: ../data/pcsx.glade2:1375
-msgid "Configure CPU"
-msgstr "Configurar CPU"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:85
+#, fuzzy
+msgid "Emulated VRam - Needs FVP"
+msgstr "0: VRAM emulada - precisa do FVP"
 
-#: ../data/pcsx.glade2:1419
-msgid "SPU IRQ Always Enabled"
-msgstr "IRQ da SPU sempre ativada"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:86
+#, fuzzy
+msgid "Black - Fast, no effects"
+msgstr "1: Preto - Rápido, sem efeitos"
 
-#: ../data/pcsx.glade2:1435
-msgid "Black & White Movies"
-msgstr "Filmes em preto e branco"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:87
+#, fuzzy
+msgid "Gfx card buffer - Can be slow"
+msgstr "2: Usar buffer da placa - Pode ficar lento"
 
-#: ../data/pcsx.glade2:1469
-msgid "Enable Interpreter CPU"
-msgstr "Ativar interpretador da CPU"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:88
+msgid "Gfx card and soft - Slow"
+msgstr ""
 
-#: ../data/pcsx.glade2:1503
-msgid "Disable CD Audio"
-msgstr "Desativar áudio de CD"
+#: ../plugins/bladesio1/gui.c:112
+#, fuzzy
+msgid "Link Cable Configuration"
+msgstr "Configuração"
 
-#: ../data/pcsx.glade2:1519
-msgid "Disable XA Decoding"
-msgstr "Desativar decodificação de XA"
+#. *************************************************************************
+#. #define SIO1_DEBUG 1
+#: ../plugins/bladesio1/sio1.c:44
+msgid "sio1Blade"
+msgstr ""
 
-#: ../data/pcsx.glade2:1571
-msgid "Options"
-msgstr "Opções"
+#. *************************************************************************
+#: ../plugins/bladesio1/sio1.ui.h:1 ../win32/gui/AboutDlg.c:48
+#: ../win32/gui/AboutDlg.c:52 ../win32/gui/CheatDlg.c:69
+#: ../win32/gui/CheatDlg.c:119 ../win32/gui/ConfigurePlugins.c:529
+#: ../win32/gui/ConfigurePlugins.c:667 ../win32/gui/WndMain.c:1088
+#: ../win32/gui/WndMain.c:1324
+msgid "OK"
+msgstr "OK"
 
-#: ../data/pcsx.glade2:1612
-msgid ""
-"NTSC\n"
-"PAL"
+#: ../plugins/bladesio1/sio1.ui.h:2
+msgid "CANCEL"
 msgstr ""
-"NTSC\n"
-"PAL"
 
-#: ../data/pcsx.glade2:1626
-msgid "System Type"
-msgstr "Tipo do sistema"
+#: ../plugins/bladesio1/sio1.ui.h:3
+msgid ""
+"Select here if you'll be Server (Player1) or Client (Player2).\n"
+"If you select Server you must Copy your IP address to the Clipboard and "
+"paste if (Ctrl+V) wherever the Client can see it.\n"
+"If you selected Client please enter the IP address the Server gave to you in "
+"the IP Address Control."
+msgstr ""
 
-#: ../data/pcsx.glade2:1674
-msgid "Configure NetPlay"
-msgstr "Configurar jogo em rede"
+#: ../plugins/bladesio1/sio1.ui.h:9
+#, fuzzy
+msgid "Disabled"
+msgstr "XA Desligado"
 
-#: ../data/pcsx.glade2:1760
-msgid "NetPlay"
-msgstr "Jogo em rede"
+#: ../win32/gui/AboutDlg.c:26
+msgid ""
+"PCSXR - A PlayStation Emulator\n"
+"\n"
+"Original Authors:\n"
+"main coder: linuzappz\n"
+"co-coders: shadow\n"
+"ex-coders: Nocomp, Pete Bernett, nik3d\n"
+"Webmaster: AkumaX"
+msgstr ""
+"PCSXR - Um Emulador de PlayStation\n"
+"\n"
+"Autores Originais:\n"
+"Programador principal: linuzappz\n"
+"Programador auxiliar: shadow\n"
+"Ex-programadores: Nocomp, Pete Bernett, nik3d\n"
+"Webmaster: AkumaX"
 
-#: ../data/pcsx.glade2:1886 ../data/pcsx.glade2:2283
-msgid "New"
+#: ../win32/gui/AboutDlg.c:35
+msgid ""
+"PCSX-df Authors:\n"
+"Ryan Schultz, Andrew Burton, Stephen Chao,\n"
+"Marcus Comstedt, Stefan Sikora\n"
+"\n"
+"PCSX-Reloaded By:\n"
+"edgbla, shalma, Wei Mingzhi, et al.\n"
+"\n"
+"http://pcsxr.codeplex.com/"
 msgstr ""
+"Autores do PCSX-df:\n"
+"Ryan Schultz, Andrew Burton, Stephen Chao,\n"
+"Marcus Comstedt, Stefan Sikora\n"
+"\n"
+"PCSX Reloaded por:\n"
+"edgbla, shalma, Wei Mingzhi\n"
+"\n"
+"http://www.codeplex.com/pcsxr"
+
+#: ../win32/gui/AboutDlg.c:46
+msgid "About"
+msgstr "Sobre"
+
+#: ../win32/gui/AboutDlg.c:49
+msgid "PCSXR EMU\n"
+msgstr "EMULADOR PCSXR\n"
+
+#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
+#: ../win32/gui/CheatDlg.c:270
+msgid "Yes"
+msgstr "Sim"
 
-#: ../data/pcsx.glade2:1936 ../data/pcsx.glade2:2333
-msgid "Format"
-msgstr "Formatar"
+#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
+#: ../win32/gui/CheatDlg.c:270
+msgid "No"
+msgstr "Não"
 
-#: ../data/pcsx.glade2:1986 ../data/pcsx.glade2:2383
-msgid "Un/Delete"
-msgstr "Apagar/Desfazer"
+#: ../win32/gui/CheatDlg.c:70 ../win32/gui/CheatDlg.c:120
+#: ../win32/gui/ConfigurePlugins.c:530 ../win32/gui/ConfigurePlugins.c:668
+#: ../win32/gui/WndMain.c:1089 ../win32/gui/WndMain.c:1325
+msgid "Cancel"
+msgstr "Cancelar"
 
-#: ../data/pcsx.glade2:2079
-msgid "Memory Card 1"
-msgstr "Cartão de memória 1"
+#: ../win32/gui/CheatDlg.c:168
+msgid "&Add Code"
+msgstr "&Adicionar código"
 
-#: ../data/pcsx.glade2:2139 ../data/pcsx.glade2:2189 ../data/pcsx.glade2:3002
-msgid "Copy"
-msgstr "Copiar"
+#: ../win32/gui/CheatDlg.c:169
+msgid "&Edit Code"
+msgstr "&Editar trapaça"
 
-#: ../data/pcsx.glade2:2476
-msgid "Memory Card 2"
-msgstr "Cartão de memória 2"
+#: ../win32/gui/CheatDlg.c:170
+msgid "&Remove Code"
+msgstr "&Remover trapaça"
 
-#: ../data/pcsx.glade2:2572
-msgid "Cheat Codes"
-msgstr "Códigos de trapaça"
+#: ../win32/gui/CheatDlg.c:171
+msgid "&Enable/Disable"
+msgstr "Ativar ou desativar"
 
-#: ../data/pcsx.glade2:2736
-msgid ""
-"8-bit\n"
-"16-bit\n"
-"32-bit"
-msgstr ""
-"8-bit\n"
-"16-bit\n"
-"32-bit"
+#: ../win32/gui/CheatDlg.c:172
+msgid "&Load..."
+msgstr "&Carregar..."
 
-#: ../data/pcsx.glade2:2799
-msgid ""
-"Equal Value\n"
-"Not Equal Value\n"
-"Range\n"
-"Increased By\n"
-"Decreased By\n"
-"Increased\n"
-"Decreased\n"
-"Different\n"
-"No Change"
-msgstr ""
-"Valor igual à\n"
-"Valor diferente de\n"
-"Intervalo\n"
-"Somado por\n"
-"Subtraído por\n"
-"Aumentado\n"
-"Diminuído\n"
-"Diferente\n"
-"Sem mudanças"
-
-#: ../data/pcsx.glade2:2831
-msgid ""
-"Decimal\n"
-"Hexadecimal"
-msgstr ""
-"Decimal\n"
-"Hexadecimal"
+#: ../win32/gui/CheatDlg.c:173
+msgid "&Save As..."
+msgstr "&Salvar como..."
 
-#: ../data/pcsx.glade2:3035
-msgid "label_resultsfound"
-msgstr "Resultados encontrados:"
+#: ../win32/gui/CheatDlg.c:174
+msgid "&Close"
+msgstr "&Fechar"
 
-#: ../data/pcsx.glade2:3070
-msgid "Search"
-msgstr "Buscar"
+#: ../win32/gui/CheatDlg.c:190
+msgid "Enabled"
+msgstr "Ligado"
 
-#: ../data/pcsx.glade2:3106
-msgid "Restart"
-msgstr "Reiniciar"
+#: ../win32/gui/CheatDlg.c:282 ../win32/gui/CheatDlg.c:311
+msgid "PCSXR Cheat Code Files"
+msgstr "Arquivos de trapaça do PCSXR"
 
-#: ../data/pcsx.glade2:3135
-msgid "Cheat Search"
-msgstr "Busca de trapaças"
+#: ../win32/gui/CheatDlg.c:453
+msgid "No addresses found."
+msgstr "Nenhum endereço encontrado com esse número."
 
-#: ../data/pcsx.glade2:3291
-msgid "Raw Dump..."
-msgstr ""
+#: ../win32/gui/CheatDlg.c:505 ../win32/gui/CheatDlg.c:596
+msgid "Address:"
+msgstr "Endereço:"
 
-#: ../data/pcsx.glade2:3326
-msgid "Patch Memory..."
-msgstr ""
+#: ../win32/gui/CheatDlg.c:566
+#, c-format
+msgid "Freeze %.8X"
+msgstr "Parar %.8X"
 
-#: ../plugins/dfsound/spu.c:38
-msgid "Mac OS X Sound"
-msgstr ""
+#: ../win32/gui/CheatDlg.c:685
+msgid "&Freeze"
+msgstr "&Parar"
 
-#: ../plugins/dfsound/spu.c:40
-msgid "ALSA Sound"
-msgstr "Sistema ALSA"
+#: ../win32/gui/CheatDlg.c:686
+msgid "&Modify"
+msgstr "&Modificar"
 
-#: ../plugins/dfsound/spu.c:42
-#, fuzzy
-msgid "OSS Sound"
-msgstr "Sistema OSS"
+#: ../win32/gui/CheatDlg.c:687
+msgid "&Copy"
+msgstr "&Copiar"
 
-#: ../plugins/dfsound/spu.c:44
-#, fuzzy
-msgid "SDL Sound"
-msgstr "Sistema OSS"
+#: ../win32/gui/CheatDlg.c:688
+msgid "&Search"
+msgstr "&Buscar"
 
-#: ../plugins/dfsound/spu.c:46
-msgid "PulseAudio Sound"
-msgstr ""
+#: ../win32/gui/CheatDlg.c:689
+msgid "&New Search"
+msgstr "&Nova busca"
 
-#: ../plugins/dfsound/spu.c:48
-msgid "NULL Sound"
-msgstr "Sem som"
+#: ../win32/gui/CheatDlg.c:690
+msgid "C&lose"
+msgstr "Fe&char"
 
-#: ../plugins/dfsound/spu.c:51
-#, fuzzy
-msgid ""
-"P.E.Op.S. Sound Driver V1.7\n"
-"Coded by Pete Bernert and the P.E.Op.S. team\n"
+#: ../win32/gui/ConfigurePlugins.c:234
+msgid "Simulate Psx Bios"
 msgstr ""
-"Extensão OSS P.E.Op.S. V1.7\n"
-"Programada por Pete Bernert e a equipe do P.E.Op.S.\n"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:42
-msgid "Volume:"
-msgstr "Volume:"
+#: ../win32/gui/ConfigurePlugins.c:330
+msgid "Configuration not OK!"
+msgstr "Não configurou corretamente!"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:54
-msgid "Interpolation:"
-msgstr "Interpolação:"
+#: ../win32/gui/ConfigurePlugins.c:445
+msgid "This plugin reports that should work correctly"
+msgstr "Esta extensão informou que deve funcionar corretamente."
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:68
-msgid "Reverb:"
-msgstr "Reversão:"
+#: ../win32/gui/ConfigurePlugins.c:446
+msgid "This plugin reports that should not work correctly"
+msgstr "Esta extensão informou que não deve funcionar corretamente."
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:81
-msgid ""
-"Low\n"
-"Medium\n"
-"Loud\n"
-"Loudest"
-msgstr ""
-"Mínimo\n"
-"Médio\n"
-"Alto\n"
-"Máximo"
+#: ../win32/gui/ConfigurePlugins.c:509
+msgid "Select Plugins Directory"
+msgstr "Escolha o diretório das extensões"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:95
-msgid ""
-"Off\n"
-"Simple\n"
-"Playstation"
-msgstr ""
-"Desligada\n"
-"Simples\n"
-"PlayStation"
+#: ../win32/gui/ConfigurePlugins.c:518
+msgid "Select Bios Directory"
+msgstr "Escolha o diretório da BIOS"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:111
-msgid ""
-"None\n"
-"Simple\n"
-"Gaussian\n"
-"Cubic"
-msgstr ""
-"Nenhuma\n"
-"Simples\n"
-"Gaussiana\n"
-"Cúbica"
+#: ../win32/gui/ConfigurePlugins.c:527
+msgid "Configuration"
+msgstr "Configuração"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:132
-msgid "General"
-msgstr "Geral"
+#: ../win32/gui/ConfigurePlugins.c:531
+msgid "Graphics"
+msgstr "Gráficos"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:163
-msgid "Adjust XA speed"
-msgstr "Ajustar velocidade da XA"
+#: ../win32/gui/ConfigurePlugins.c:532
+msgid "First Controller"
+msgstr "Controle 1"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:167
-msgid "Choose this if XA music is played too quickly."
-msgstr "Selecione isso se a música XA estiver tocando rápido demais."
+#: ../win32/gui/ConfigurePlugins.c:533
+msgid "Second Controller"
+msgstr "Controle 2"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:184
-msgid "XA Music"
-msgstr "Música XA"
+#: ../win32/gui/ConfigurePlugins.c:534
+msgid "Sound"
+msgstr "Áudio"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:215
-msgid "High compatibility mode"
-msgstr "Modo de alta compatibilidade"
+#: ../win32/gui/ConfigurePlugins.c:535
+msgid "Cdrom"
+msgstr "CDROM"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:219
-msgid "Use the asynchronous SPU interface."
-msgstr "Usar o ambiente assíncrono da SPU."
+#: ../win32/gui/ConfigurePlugins.c:536
+#, fuzzy
+msgid "Link cable"
+msgstr "Ligar"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:231
-msgid "SPU IRQ Wait"
-msgstr "Esperar pela IRQ da SPU"
+#: ../win32/gui/ConfigurePlugins.c:537
+msgid "Bios"
+msgstr "BIOS"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:235
-msgid "Wait for CPU; only useful for some games."
-msgstr "Esperar pela CPU; útil apenas em alguns jogos."
+#: ../win32/gui/ConfigurePlugins.c:538
+msgid "Set Bios Directory"
+msgstr "Escolher o diretório da BIOS"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:247
-msgid "Single channel sound"
-msgstr "Som em canal único"
+#: ../win32/gui/ConfigurePlugins.c:539
+msgid "Set Plugins Directory"
+msgstr "Escolher o diretório das extensões"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:251
-msgid "Play only one channel for a performance boost."
-msgstr "Tocar apenas um canal para melhorar o desempenho."
+#: ../win32/gui/ConfigurePlugins.c:540 ../win32/gui/ConfigurePlugins.c:543
+#: ../win32/gui/ConfigurePlugins.c:546 ../win32/gui/ConfigurePlugins.c:549
+#: ../win32/gui/ConfigurePlugins.c:552 ../win32/gui/ConfigurePlugins.c:555
+#: ../win32/gui/ConfigurePlugins.c:670
+msgid "Configure..."
+msgstr "Configurar..."
 
-#: ../plugins/dfcdrom/cdr-libcdio.c:29 ../plugins/dfcdrom/cdr-linux.c:29
-msgid "CD-ROM Drive Reader"
-msgstr "Leitor de unidade de CDROM"
+#: ../win32/gui/ConfigurePlugins.c:541 ../win32/gui/ConfigurePlugins.c:544
+#: ../win32/gui/ConfigurePlugins.c:547 ../win32/gui/ConfigurePlugins.c:550
+#: ../win32/gui/ConfigurePlugins.c:553 ../win32/gui/ConfigurePlugins.c:556
+#: ../win32/gui/ConfigurePlugins.c:671
+msgid "Test..."
+msgstr "Testar..."
 
-#: ../plugins/dfcdrom/cdr-null.c:26
-msgid "CDR NULL Plugin"
-msgstr "Sem unidade de CDROM"
+#: ../win32/gui/ConfigurePlugins.c:542 ../win32/gui/ConfigurePlugins.c:545
+#: ../win32/gui/ConfigurePlugins.c:548 ../win32/gui/ConfigurePlugins.c:551
+#: ../win32/gui/ConfigurePlugins.c:554 ../win32/gui/ConfigurePlugins.c:557
+#: ../win32/gui/ConfigurePlugins.c:672
+msgid "About..."
+msgstr "Sobre..."
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/main.c:219
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:8
-msgid "CDR configuration"
-msgstr "Configuração do CDROM"
+#: ../win32/gui/ConfigurePlugins.c:665
+msgid "NetPlay Configuration"
+msgstr "Configuração do jogo em rede"
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:33
-msgid "Choose your CD-ROM device or type its path if it's not listed"
+#: ../win32/gui/ConfigurePlugins.c:673
+msgid ""
+"Note: The NetPlay Plugin Directory should be the same as the other Plugins."
 msgstr ""
-"Escolha sua unidade de CDROM ou digite o dispositivo caso não esteja listado."
+"Observação: o diretório da extensão de jogo em rede deve ser o mesmo que "
+"odas outras extensões."
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:44
-msgid "Select CD-ROM device"
-msgstr "Selecione uma unidade de CDROM"
+#: ../win32/gui/plugin.c:94 ../win32/gui/WndMain.c:331
+#, c-format
+msgid "*PCSXR*: Saved State %d"
+msgstr "PCSXR: Estado \"%d\" salvo."
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:72
-msgid "Select read mode:"
-msgstr "Selecione o modo de leitura:"
+#: ../win32/gui/plugin.c:95 ../win32/gui/WndMain.c:332
+#, c-format
+msgid "*PCSXR*: Error Saving State %d"
+msgstr "PCSXR: Erro ao salvar o estado \"%d\"!"
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:83
-msgid ""
-"Normal (No Cache)\n"
-"Threaded - Faster (With Cache)"
-msgstr ""
+#: ../win32/gui/plugin.c:111 ../win32/gui/WndMain.c:309
+#, c-format
+msgid "*PCSXR*: Loaded State %d"
+msgstr "PCSXR: Estado \"%d\" carregado."
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:114
-msgid "Cache Size (Def. 64):"
-msgstr "Tamanho do armazenamento (o padrão é 64):"
+#: ../win32/gui/plugin.c:112 ../win32/gui/WndMain.c:310
+#, c-format
+msgid "*PCSXR*: Error Loading State %d"
+msgstr "PCSXR: Erro ao carregar o estado \"%d\"!"
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:159
-msgid "Spindown Time:"
-msgstr ""
+#: ../win32/gui/plugin.c:123
+#, c-format
+msgid "*PCSXR*: Sio Irq Always Enabled"
+msgstr "PCSXR: IRQ SIO sempre ativada."
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:170
-msgid ""
-"Default\n"
-"125ms\n"
-"250ms\n"
-"500ms\n"
-"1s\n"
-"2s\n"
-"4s\n"
-"8s\n"
-"16s\n"
-"32s\n"
-"1min\n"
-"2min\n"
-"4min\n"
-"8min\n"
-"16min\n"
-"32min"
-msgstr ""
-
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:216
-msgid "Cdrom Speed (Def. 0 = MAX):"
-msgstr "Velocidade do CDROM (o padrão é 0, ou seja, o máximo):"
+#: ../win32/gui/plugin.c:124
+#, c-format
+msgid "*PCSXR*: Sio Irq Not Always Enabled"
+msgstr "PCSXR: IRQ SIO nem sempre ativada."
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:248
-msgid "hseparator"
-msgstr ""
+#: ../win32/gui/plugin.c:131
+#, c-format
+msgid "*PCSXR*: Black&White Mdecs Only Enabled"
+msgstr "PCSXR: Mdecs apenas em preto e branco."
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:258
-msgid "Enable subchannel read"
-msgstr "Ligar leitura de subcanal"
+#: ../win32/gui/plugin.c:132
+#, c-format
+msgid "*PCSXR*: Black&White Mdecs Only Disabled"
+msgstr "PCSXR: Mdecs coloridas."
 
-#: ../plugins/peopsxgl/gpu.c:61
-msgid "OpenGL Driver"
-msgstr "Extensão OpenGL"
+#: ../win32/gui/plugin.c:139
+#, c-format
+msgid "*PCSXR*: Xa Enabled"
+msgstr "PCSXR: XA Ligado."
 
-#: ../plugins/peopsxgl/gpu.c:63
-msgid "Pete Bernert"
-msgstr "Pete Bernert"
+#: ../win32/gui/plugin.c:140
+#, c-format
+msgid "*PCSXR*: Xa Disabled"
+msgstr "PCSXR: XA Desligado."
 
-#: ../plugins/peopsxgl/gpu.c:64
-msgid ""
-"Based on P.E.Op.S. MesaGL Driver V1.78\n"
-"Coded by Pete Bernert\n"
-msgstr ""
-"Baseada na extensão MesaGL P.E.Op.S. V1.78\n"
-"Programada por Pete Bernert\n"
+#: ../win32/gui/plugin.c:149
+msgid "*PCSXR*: CdRom Case Opened"
+msgstr "PCSXR: Bandeja do CDROM aberta."
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:118
-msgid "OpenGL Driver configuration"
-msgstr "Configuração da extensão OpenGL"
+#: ../win32/gui/plugin.c:155
+msgid "*PCSXR*: CdRom Case Closed"
+msgstr "PCSXR: Bandeja do CDROM fechada."
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:138
-msgid "Textures"
-msgstr "Texturas"
+#: ../win32/gui/plugin.c:181
+msgid "Connecting..."
+msgstr "Conectando..."
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:161
-msgid "Quality:"
-msgstr "Qualidade:"
+#: ../win32/gui/plugin.c:183 ../win32/gui/plugin.c:190
+#, c-format
+msgid "Please wait while connecting... %c\n"
+msgstr "Por favor, espere enquanto o emulador se conecta... %c\n"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:178
-#: ../plugins/peopsxgl/gpucfg/interface.c:191
-msgid "0: don't care - Use driver's default textures"
-msgstr "0: tanto faz - usar textura padrão da placa"
+#: ../win32/gui/plugin.c:218
+msgid "Error Opening CDR Plugin"
+msgstr "Erro ao abrir a extensão de CDROM!"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:179
-msgid "1: 4444 - Fast, but less colorful"
-msgstr "1: 4444 - Rápido, mas sem muitas cores"
+#: ../win32/gui/plugin.c:281
+#, c-format
+msgid "Error Opening GPU Plugin (%d)"
+msgstr "Erro ao abrir a extensão de GPU (%d)!"
+
+#: ../win32/gui/plugin.c:283
+#, c-format
+msgid "Error Opening SPU Plugin (%d)"
+msgstr "Erro ao abrir a extensão de SPU (%d)!"
+
+#: ../win32/gui/plugin.c:286
+#, c-format
+msgid "Error Opening PAD1 Plugin (%d)"
+msgstr "Erro ao abrir a extensão do controle 1 (%d)!"
+
+#: ../win32/gui/plugin.c:290
+#, c-format
+msgid "Error Opening PAD2 Plugin (%d)"
+msgstr "Erro ao abrir a extensão do controle 2 (%d)!"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:180
-msgid "2: 5551 - Nice colors, bad transparency"
-msgstr "2: 5551 - Cores bonitas, transparência ruim"
+#: ../win32/gui/plugin.c:295
+#, fuzzy, c-format
+msgid "Error Opening SIO1 plugin (%d)"
+msgstr "Erro ao abrir a extensão de SPU (%d)!"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:181
-msgid "3: 8888 - Best colors, more ram needed"
-msgstr "3: 8888 - Melhor padrão, o que mais usa RAM"
+#: ../win32/gui/plugin.c:325
+msgid "Error Closing CDR Plugin"
+msgstr "Erro ao fechar a extensão de CDROM!"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:182
-msgid "4: BGR8888 - Faster on some cards"
-msgstr "4: BGR8888 - Mais rápido em algumas placas"
+#: ../win32/gui/plugin.c:327
+msgid "Error Closing GPU Plugin"
+msgstr "Erro ao fechar a extensão de GPU!"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:193
-msgid "VRam size in MBytes (0..1024, 0=auto):"
-msgstr "Tamanho da VRAM em MBytes (0..1024, 0=automático):"
+#: ../win32/gui/plugin.c:329
+msgid "Error Closing SPU Plugin"
+msgstr "Erro ao fechar a extensão de SPU!"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:210
-#: ../plugins/peopsxgl/gpucfg/interface.c:225
-msgid "0: None"
-msgstr "0: Nenhum"
+#: ../win32/gui/plugin.c:332
+#, fuzzy
+msgid "Error Closing SIO1 plugin"
+msgstr "Erro ao fechar a extensão de SPU!"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:211
-msgid "1: Standard - Glitches will happen"
-msgstr "1: Padrão - Problemas vão acontecer"
+#: ../win32/gui/plugin.c:354
+#, c-format
+msgid "CDRinit error: %d"
+msgstr "Erro ao iniciar o CDROM: %d"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:212
-msgid "2: Extended - No black borders"
-msgstr "2: Extendido - Sem bordas escuras"
+#: ../win32/gui/plugin.c:356
+#, c-format
+msgid "GPUinit error: %d"
+msgstr "Erro ao iniciar a GPU: %d"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:213
-msgid "3: Standard without sprites - unfiltered 2D"
-msgstr "3: Padrão sem sprites - 2D sem filtro"
+#: ../win32/gui/plugin.c:358
+#, c-format
+msgid "SPUinit error: %d"
+msgstr "Erro ao iniciar a SPU: %d"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:214
-msgid "4: Extended without sprites - unfiltered 2D"
-msgstr "4: Extendido sem sprites - 2D sem filtro"
+#: ../win32/gui/plugin.c:360
+#, c-format
+msgid "PAD1init error: %d"
+msgstr "Erro ao iniciar o controle 1: %d"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:215
-msgid "5: Standard + smoothed sprites"
-msgstr "5: Padrão mais sprites filtrados"
+#: ../win32/gui/plugin.c:362
+#, c-format
+msgid "PAD2init error: %d"
+msgstr "Erro ao iniciar o controle 2: %d"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:216
-msgid "6: Extended + smoothed sprites"
-msgstr "6: Extendido mais sprites filtrados"
+#: ../win32/gui/plugin.c:365
+#, fuzzy, c-format
+msgid "SIO1init error: %d"
+msgstr "Erro ao iniciar a SPU: %d"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:227
-msgid "Filtering:"
-msgstr "Filtragem:"
+#: ../win32/gui/plugin.c:370
+#, c-format
+msgid "NETinit error: %d"
+msgstr "Erro ao iniciar a rede: %d"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:235
-msgid "HiRes Tex:"
-msgstr "Textura em alta resolução:"
+#: ../win32/gui/WndMain.c:77
+msgid "Arabic"
+msgstr "Arábico"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:252
-#: ../plugins/peopsxgl/gpucfg/interface.c:263
-msgid "0: None (standard)"
-msgstr "0: Nenhuma (padrão)"
+#: ../win32/gui/WndMain.c:78
+msgid "Catalan"
+msgstr "Catalão"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:253
-msgid "1: 2xSaI (much vram needed)"
-msgstr "1: 2xSaI (muita VRAM usada)"
+#: ../win32/gui/WndMain.c:79
+msgid "German"
+msgstr "Alemão"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:254
-msgid "2: Scaled (needs tex filtering)"
-msgstr "2: Escalonado (precisa ativar filtragem)"
+#: ../win32/gui/WndMain.c:80
+msgid "Greek"
+msgstr "Grego"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:265
-msgid "Window options"
-msgstr "Opções da janela"
+#: ../win32/gui/WndMain.c:81 ../win32/gui/WndMain.c:1699
+#: ../win32/gui/WndMain.c:1701
+msgid "English"
+msgstr "Inglês"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:296
-msgid "Width:"
-msgstr "Largura:"
+#: ../win32/gui/WndMain.c:82
+msgid "Spanish"
+msgstr "Espanhol"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:305
-msgid "Height:"
-msgstr "Altura:"
+#: ../win32/gui/WndMain.c:83
+msgid "French"
+msgstr "Francês"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:314
-msgid "Keep psx aspect ratio"
-msgstr "Manter proporção do PSX"
+#: ../win32/gui/WndMain.c:84
+msgid "Italian"
+msgstr "Italiano"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:330
-msgid "Dithering"
-msgstr "Colorização"
+#: ../win32/gui/WndMain.c:85
+msgid "Portuguese"
+msgstr "Português"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:346
-msgid "Framerate"
-msgstr "Taxa de FPS"
+#: ../win32/gui/WndMain.c:86
+#, fuzzy
+msgid "Portuguese (Brazilian)"
+msgstr "Português"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:369
-msgid "FPS"
-msgstr "FPS"
+#: ../win32/gui/WndMain.c:87
+msgid "Romanian"
+msgstr "Romeno"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:377
-msgid "FPS limit manual"
-msgstr "Limite manual de FPS"
+#: ../win32/gui/WndMain.c:88
+msgid "Russian"
+msgstr "Russo"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:386
-msgid "Show FPS display on startup"
-msgstr "Mostrar taxa de FPS ao iniciar"
+#: ../win32/gui/WndMain.c:89
+msgid "Simplified Chinese"
+msgstr "Chinês Simplificado"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:394
-msgid "Use FPS limit"
-msgstr "Usar limite de FPS"
+#: ../win32/gui/WndMain.c:90
+msgid "Traditional Chinese"
+msgstr "Chinês Tradicional"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:402
-msgid "FPS limit auto-detection"
-msgstr "Autodetecção do limite de FPS"
+#: ../win32/gui/WndMain.c:91
+msgid "Japanese"
+msgstr "Japonês"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:411
-msgid "Use Frame skipping"
-msgstr "Usar pulo de quadros"
+#: ../win32/gui/WndMain.c:92
+msgid "Korean"
+msgstr "Coreano"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:419
-msgid "Compatibility"
-msgstr "Compatibilidade"
+#: ../win32/gui/WndMain.c:215
+msgid ""
+"Usage: pcsxr [options]\n"
+"\toptions:\n"
+"\t-nogui\t\tDon't open the GUI\n"
+"\t-psxout\t\tEnable PSX output\n"
+"\t-slowboot\tEnable BIOS logo\n"
+"\t-runcd\t\tRuns CD-ROM (requires -nogui)\n"
+"\t-cdfile FILE\tRuns a CD image file (requires -nogui)\n"
+"\t-help\t\tDisplay this message"
+msgstr ""
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:434
-msgid "Advanced blending (Accurate psx color emulation)"
-msgstr "Mesclagem avançada (emulação precisa das cores do PSX)"
+#: ../win32/gui/WndMain.c:350 ../win32/gui/WndMain.c:396
+msgid "PCSXR State Format"
+msgstr "Formato dos estados salvos do PCSXR"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:442
-msgid "Framebuffer textures:"
-msgstr "Texturas do framebuffer:"
+#: ../win32/gui/WndMain.c:377
+#, c-format
+msgid "*PCSXR*: Loaded State %s"
+msgstr "PCSXR: Arquivo de estado \"%s\" carregado."
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:450
-msgid "Offscreen Drawing:"
-msgstr "Desenhos de fora da tela:"
+#: ../win32/gui/WndMain.c:378
+#, c-format
+msgid "*PCSXR*: Error Loading State %s"
+msgstr "PCSXR: Erro ao carregar o arquivo de estado \"%s\"!"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:458
-msgid "Framebuffer access:"
-msgstr "Acesso ao framebuffer:"
+#: ../win32/gui/WndMain.c:423
+#, c-format
+msgid "*PCSXR*: Saved State %s"
+msgstr "PCSXR: Arquivo de estado \"%s\" salvo."
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:466
-msgid "Alpha Multipass (correct opaque texture areas)"
-msgstr "Multipassagem dos canais alfa (áreas opacas de texturas corretas)"
+#: ../win32/gui/WndMain.c:424
+#, c-format
+msgid "*PCSXR*: Error Saving State %s"
+msgstr "PCSXR: Erro ao salvar o arquivo de estado \"%s\"!"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:474
-msgid "Mask bit detection (needed by a few games, zbuffer)"
-msgstr "Detecção do bit mascarador (necessário para alguns jogos, zbuffer)"
+#: ../win32/gui/WndMain.c:493
+msgid "Running BIOS is not supported with Internal HLE Bios."
+msgstr "Iniciar pela BIOS não é suportado com a BIOS HLE interna."
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:491
-#: ../plugins/peopsxgl/gpucfg/interface.c:504
-msgid "0: None - Fastest, most glitches"
-msgstr "0: Nenhuma - Mais rápido e mais problemas"
+#: ../win32/gui/WndMain.c:790
+msgid "Game ID"
+msgstr "ID do Jogo"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:492
-msgid "1: Minimum - Missing screens"
-msgstr "1: Mínimo - Perde algumas telas"
+#: ../win32/gui/WndMain.c:796
+msgid "Game"
+msgstr "Jogo"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:493
-msgid "2: Standard - OK for most games"
-msgstr "2: Padrão - Bom para a maioria dos jogos"
+#: ../win32/gui/WndMain.c:978
+msgid "mid link block"
+msgstr "bloco de ligação intermediário"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:494
-msgid "3: Enhanced - Shows more stuff"
-msgstr "3: Aumentado - Mostra mais coisas"
+#: ../win32/gui/WndMain.c:981
+msgid "terminiting link block"
+msgstr "bloco final da ligação"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:495
-msgid "4: Extended - Causing garbage"
-msgstr "4: Extendido - Pode causar lixo na tela"
+#: ../win32/gui/WndMain.c:1086
+msgid "Memcard Manager"
+msgstr "Gerenciador de cartões de memória"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:515
-#: ../plugins/peopsxgl/gpucfg/interface.c:527
-msgid "0: Emulated vram - Needs FVP"
-msgstr "0: VRAM emulada - precisa do FVP"
+#: ../win32/gui/WndMain.c:1090 ../win32/gui/WndMain.c:1093
+msgid "Select Mcd"
+msgstr "Selecionar cartão"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:516
-msgid "1: Black - Fast, no effects"
-msgstr "1: Preto - Rápido, sem efeitos"
+#: ../win32/gui/WndMain.c:1091 ../win32/gui/WndMain.c:1094
+msgid "Format Mcd"
+msgstr "Formatar cartão"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:517
-msgid "2: Gfx card buffer - Can be slow"
-msgstr "2: Usar buffer da placa - Pode ficar lento"
+#: ../win32/gui/WndMain.c:1092 ../win32/gui/WndMain.c:1095
+msgid "Reload Mcd"
+msgstr "Reiniciar cartão"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:518
-msgid "3: Gfx card & soft - slow"
-msgstr "3: Placa e software - Lento"
+#: ../win32/gui/WndMain.c:1096
+msgid "-> Copy ->"
+msgstr "-> Copiar ->"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:538
-#: ../plugins/peopsxgl/gpucfg/interface.c:551
-msgid "0: Emulated vram - ok most times"
-msgstr "0: VRAM Emulada - bom na maioria das vezes"
+#: ../win32/gui/WndMain.c:1097
+msgid "<- Copy <-"
+msgstr "<- Copiar <-"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:539
-msgid "1: Gfx card buffer reads"
-msgstr "1: Leitura do buffer da placa"
+#: ../win32/gui/WndMain.c:1098
+msgid "Paste"
+msgstr "Colar"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:540
-msgid "2: Gfx card buffer moves"
-msgstr "2: Escrita no buffer da placa"
+#: ../win32/gui/WndMain.c:1099
+msgid "<- Un/Delete"
+msgstr "<- Apagar/Desfazer"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:541
-msgid "3: Gfx buffer reads & moves"
-msgstr "3: Leitura e Escrita no buffer da placa"
+#: ../win32/gui/WndMain.c:1100
+msgid "Un/Delete ->"
+msgstr "Apagar/Desfazer ->"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:542
-msgid "4: Full Software (FVP)"
-msgstr "4: Todo em software (FVP)"
+#: ../win32/gui/WndMain.c:1102
+msgid "Memory Card 1"
+msgstr "Cartão de memória 1"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:553
-msgid "Special game fixes"
-msgstr "Consertos específicos para jogos"
+#: ../win32/gui/WndMain.c:1103
+msgid "Memory Card 2"
+msgstr "Cartão de memória 2"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:576
-msgid "Battle cursor (FF7)"
-msgstr "Cursor da batalha (Final Fantasy 7)"
+#: ../win32/gui/WndMain.c:1158
+msgid "Are you sure you want to paste this selection?"
+msgstr "Você tem certeza que quer colar o selecionado?"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:584
-msgid "Direct FB updates"
-msgstr "Atualização direta do framebuffer"
+#: ../win32/gui/WndMain.c:1158 ../win32/gui/WndMain.c:1269
+#: ../win32/gui/WndMain.c:1276
+msgid "Confirmation"
+msgstr "Confirmação"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:592
-msgid "Black brightness (Lunar)"
-msgstr "Brilho no mínimo (Lunar)"
+#: ../win32/gui/WndMain.c:1269 ../win32/gui/WndMain.c:1276
+msgid "Are you sure you want to format this Memory Card?"
+msgstr "Você tem certeza que quer formatar esse Cartão de Memória?"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:600
-msgid "Swap front detection"
-msgstr "Detecção da inversão frontal"
+#: ../win32/gui/WndMain.c:1322
+msgid "Cpu Config"
+msgstr "Configuração da CPU"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:608
-msgid "Disable coord check"
-msgstr "Desligar checagem de coordenadas"
+#: ../win32/gui/WndMain.c:1327
+msgid "Disable Xa Decoding"
+msgstr "Desativar decodificação de XA"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:616
-msgid "No blue glitches (LoD)"
-msgstr "Sem sujeira azul (Legend of Dragoon)"
+#: ../win32/gui/WndMain.c:1328
+msgid "Sio Irq Always Enabled"
+msgstr "IRQ SIO sempre ativado"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:624
-msgid "Soft FB access"
-msgstr "Acesso ao framebuffer por software"
+#: ../win32/gui/WndMain.c:1329
+msgid "Black && White Movies"
+msgstr "Filmes em preto e branco"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:632
-msgid "PC fps calculation"
-msgstr "Cálculo do FPS feito pelo PC"
+#: ../win32/gui/WndMain.c:1330
+msgid "Disable Cd audio"
+msgstr "Desativar áudio de CD"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:648
-msgid "Yellow rect (FF9)"
-msgstr "Retângulo amarelo (Final Fantasy 9)"
+#: ../win32/gui/WndMain.c:1333
+msgid "Enable Interpreter Cpu"
+msgstr "Ativar interpretador da CPU"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:656
-msgid "No subtr. blending"
-msgstr "Sem subtração na mesclagem"
+#: ../win32/gui/WndMain.c:1336
+msgid "Spu Irq Always Enabled"
+msgstr "IRQ da SPU sempre ligada"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:664
-msgid "Lazy upload (DW7)"
-msgstr "Atualização tardia (Dragon Warrior 7)"
+#: ../win32/gui/WndMain.c:1340
+msgid "Hide cursor"
+msgstr ""
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:672
-msgid "Odd/even hack"
-msgstr "Hack do ímpar/par"
+#: ../win32/gui/WndMain.c:1343
+msgid "Psx System Type"
+msgstr "Tipo de sistema do PSX"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:680
-msgid "Adjust screen width"
-msgstr "Ajustar largura da tela"
+#: ../win32/gui/WndMain.c:1453
+msgid "Psx Mcd Format (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
+msgstr "Qualquer formato (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:688
-msgid "Old texture filtering"
-msgstr "Filtragem de textura antiga"
+#: ../win32/gui/WndMain.c:1458
+msgid "Psx Memory Card (*.mcr;*.mc)"
+msgstr "Cartão de memória binário (*.mcr;*.mc)"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:696
-msgid "Additional uploads"
-msgstr "Envio de dados adicionais"
+#: ../win32/gui/WndMain.c:1463
+msgid "CVGS Memory Card (*.mem;*.vgs)"
+msgstr "Cartão de memória do CVGS (*.mem;*.vgs)"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:704
-msgid "unused"
-msgstr "Não usado"
+#: ../win32/gui/WndMain.c:1468
+msgid "Bleem Memory Card (*.mcd)"
+msgstr "Cartão de memória do Bleem (*.mcd)"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:712
-msgid "Fake 'gpu busy'"
-msgstr "Imitar estado 'GPU ocupada'"
+#: ../win32/gui/WndMain.c:1473
+msgid "DexDrive Memory Card (*.gme)"
+msgstr "Cartão de memória do DexDrive (*.gme)"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:720
-msgid "Misc"
-msgstr "Miscelânea"
+#: ../win32/gui/WndMain.c:1478
+msgid "DataDeck Memory Card (*.ddf)"
+msgstr "Cartão de memória do DataDeck (*.ddf)"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:743
-msgid "Scanlines"
-msgstr "Scanlines"
+#: ../win32/gui/WndMain.c:1522
+msgid "Psx Exe Format"
+msgstr "Formato executável do PSX"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:751
-msgid "Blending (0..255, -1=dot):"
-msgstr "Mesclagem (0..255, -1=por ponto):"
+#: ../win32/gui/WndMain.c:1559
+#, fuzzy
+msgid "Psx Isos (*.iso;*.mdf;*.img;*.bin;*.cue;*.pbp;*.cbn)"
+msgstr "Imagens de CD (*.iso;*.mdf;*.img;*.bin)"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:759
-msgid "Screen smoothing (can be slow or unsupported)"
-msgstr "Filtragem da tela inteira (pode ser lenta ou não suportada)"
+#: ../win32/gui/WndMain.c:1635
+msgid "&File"
+msgstr "&Arquivo"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:767
-msgid "Use OpenGL extensions (recommended)"
-msgstr "Usar extensões OpenGL (recomendado)"
+#: ../win32/gui/WndMain.c:1636
+msgid "E&xit"
+msgstr "&Sair"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:775
-msgid "Polygon anti-aliasing (slow with most cards)"
-msgstr "Anti-aliasing de polígonos (lento com a maioria das placas)"
+#: ../win32/gui/WndMain.c:1638
+msgid "Run &EXE..."
+msgstr "Rodar &EXE..."
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:783
-msgid "Line mode (polygons will not get filled)"
-msgstr "Modo de linhas (polígonos não serão tratados)"
+#: ../win32/gui/WndMain.c:1639
+msgid "Run &BIOS"
+msgstr "Iniciar pela &BIOS"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:791
-msgid "Force 15 bit framebuffer updates (faster movies)"
-msgstr "Forçar atualizações do framebuffer em 15 bit (filmes mais rápidos)"
+#: ../win32/gui/WndMain.c:1640
+msgid "Run &ISO..."
+msgstr "Rodar &imagem de CD..."
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:799
-msgid "Unfiltered MDECs (small movie speedup)"
-msgstr "MDECs sem filtragem (pequeno ganho de velocidade nos filmes)"
+#: ../win32/gui/WndMain.c:1641
+msgid "Run &CD"
+msgstr "Rodar &CD"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:852
-msgid "Adapted from P.E.Op.S OpenGL GPU by Pete Bernert"
-msgstr "Adaptado da extensão de GPU OpenGL P.E.Op.S por Pete Bernert"
+#: ../win32/gui/WndMain.c:1643
+msgid "&Emulator"
+msgstr "&Emulador"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:861
-msgid "Homepage: http://www.pbernert.com"
-msgstr "Página: http://www.pbernert.com"
+#: ../win32/gui/WndMain.c:1644
+msgid "&States"
+msgstr "&Estados"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:879
-msgid "Version: 1.78"
-msgstr "Versão: 1.78"
+#: ../win32/gui/WndMain.c:1646
+msgid "S&witch ISO..."
+msgstr "T&rocar de imagem de CD..."
 
-#: ../plugins/dfinput/cfg-gtk2.c:48
-msgid "D-Pad Up"
+#: ../win32/gui/WndMain.c:1648
+msgid "S&hutdown"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:49
-msgid "D-Pad Down"
-msgstr ""
+#: ../win32/gui/WndMain.c:1649
+msgid "Re&set"
+msgstr "Re&iniciar"
 
-#: ../plugins/dfinput/cfg-gtk2.c:50
-msgid "D-Pad Left"
-msgstr ""
+#: ../win32/gui/WndMain.c:1650
+msgid "&Run"
+msgstr "&Executar"
 
-#: ../plugins/dfinput/cfg-gtk2.c:51
-msgid "D-Pad Right"
-msgstr ""
+#: ../win32/gui/WndMain.c:1651
+msgid "&Save"
+msgstr "&Salvar"
 
-#: ../plugins/dfinput/cfg-gtk2.c:52
-msgid "Cross"
-msgstr ""
+#: ../win32/gui/WndMain.c:1652
+msgid "&Load"
+msgstr "&Carregar"
 
-#: ../plugins/dfinput/cfg-gtk2.c:53
-msgid "Circle"
-msgstr ""
+#: ../win32/gui/WndMain.c:1653 ../win32/gui/WndMain.c:1663
+msgid "&Other..."
+msgstr "&Outros..."
 
-#: ../plugins/dfinput/cfg-gtk2.c:54
-msgid "Square"
-msgstr ""
+#: ../win32/gui/WndMain.c:1654 ../win32/gui/WndMain.c:1664
+msgid "Slot &9"
+msgstr "Unidade &9"
 
-#: ../plugins/dfinput/cfg-gtk2.c:55
-msgid "Triangle"
-msgstr ""
+#: ../win32/gui/WndMain.c:1655 ../win32/gui/WndMain.c:1665
+msgid "Slot &8"
+msgstr "Unidade &8"
 
-#: ../plugins/dfinput/cfg-gtk2.c:56
-msgid "L1"
-msgstr "L1"
+#: ../win32/gui/WndMain.c:1656 ../win32/gui/WndMain.c:1666
+msgid "Slot &7"
+msgstr "Unidade &7"
 
-#: ../plugins/dfinput/cfg-gtk2.c:57
-msgid "R1"
-msgstr "R1"
+#: ../win32/gui/WndMain.c:1657 ../win32/gui/WndMain.c:1667
+msgid "Slot &6"
+msgstr "Unidade &6"
 
-#: ../plugins/dfinput/cfg-gtk2.c:58
-msgid "L2"
-msgstr "L2"
+#: ../win32/gui/WndMain.c:1658 ../win32/gui/WndMain.c:1668
+msgid "Slot &5"
+msgstr "Unidade &5"
 
-#: ../plugins/dfinput/cfg-gtk2.c:59
-msgid "R2"
-msgstr "R2"
+#: ../win32/gui/WndMain.c:1659 ../win32/gui/WndMain.c:1669
+msgid "Slot &4"
+msgstr "Unidade &4"
 
-#: ../plugins/dfinput/cfg-gtk2.c:60
-msgid "Select"
-msgstr ""
+#: ../win32/gui/WndMain.c:1660 ../win32/gui/WndMain.c:1670
+msgid "Slot &3"
+msgstr "Unidade &3"
 
-#: ../plugins/dfinput/cfg-gtk2.c:61
-msgid "Start"
-msgstr ""
+#: ../win32/gui/WndMain.c:1661 ../win32/gui/WndMain.c:1671
+msgid "Slot &2"
+msgstr "Unidade &2"
 
-#: ../plugins/dfinput/cfg-gtk2.c:62
-msgid "L3"
-msgstr ""
+#: ../win32/gui/WndMain.c:1662 ../win32/gui/WndMain.c:1672
+msgid "Slot &1"
+msgstr "Unidade &1"
 
-#: ../plugins/dfinput/cfg-gtk2.c:63
-msgid "R3"
-msgstr ""
+#: ../win32/gui/WndMain.c:1674
+msgid "&Configuration"
+msgstr "&Configuração"
 
-#: ../plugins/dfinput/cfg-gtk2.c:67
-msgid "L-Stick Right"
-msgstr ""
+#: ../win32/gui/WndMain.c:1675
+msgid "Cheat &Search..."
+msgstr "Procurar por &trapaça..."
 
-#: ../plugins/dfinput/cfg-gtk2.c:68
-msgid "L-Stick Left"
-msgstr ""
+#: ../win32/gui/WndMain.c:1676
+msgid "Ch&eat Code..."
+msgstr "&Código de trapaça..."
 
-#: ../plugins/dfinput/cfg-gtk2.c:69
-msgid "L-Stick Down"
-msgstr ""
+#: ../win32/gui/WndMain.c:1679
+msgid "&Language"
+msgstr "&Linguagem"
 
-#: ../plugins/dfinput/cfg-gtk2.c:70
-msgid "L-Stick Up"
-msgstr ""
+#: ../win32/gui/WndMain.c:1705
+msgid "&Memory cards..."
+msgstr "&Cartões de memória..."
 
-#: ../plugins/dfinput/cfg-gtk2.c:71
-msgid "R-Stick Right"
-msgstr ""
+#: ../win32/gui/WndMain.c:1706
+msgid "C&PU..."
+msgstr "C&PU..."
 
-#: ../plugins/dfinput/cfg-gtk2.c:72
-msgid "R-Stick Left"
-msgstr ""
+#: ../win32/gui/WndMain.c:1708
+msgid "&NetPlay..."
+msgstr "&Jogo em rede..."
 
-#: ../plugins/dfinput/cfg-gtk2.c:73
-msgid "R-Stick Down"
-msgstr ""
+#: ../win32/gui/WndMain.c:1710
+#, fuzzy
+msgid "&Link cable..."
+msgstr "Ligar"
 
-#: ../plugins/dfinput/cfg-gtk2.c:74
-msgid "R-Stick Up"
-msgstr ""
+#: ../win32/gui/WndMain.c:1711
+msgid "&Controllers..."
+msgstr "&Controles..."
 
-#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
-msgid "Centered"
-msgstr ""
+#: ../win32/gui/WndMain.c:1712
+msgid "CD-&ROM..."
+msgstr "CD&ROM..."
 
-#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
-msgid "Up"
-msgstr ""
+#: ../win32/gui/WndMain.c:1713
+msgid "&Sound..."
+msgstr "Á&udio..."
 
-#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
-msgid "Right"
-msgstr ""
+#: ../win32/gui/WndMain.c:1714
+msgid "&Graphics..."
+msgstr "&Gráficos..."
 
-#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
-msgid "Rightup"
-msgstr ""
+#: ../win32/gui/WndMain.c:1716
+msgid "&Plugins && Bios..."
+msgstr "&Extensões e BIOS..."
 
-#: ../plugins/dfinput/cfg-gtk2.c:104 ../plugins/dfinput/cfg-gtk2.c:143
-msgid "Down"
-msgstr ""
+#: ../win32/gui/WndMain.c:1718
+msgid "&Help"
+msgstr "&Ajuda"
 
-#: ../plugins/dfinput/cfg-gtk2.c:104 ../plugins/dfinput/cfg-gtk2.c:143
-msgid "Rightdown"
-msgstr ""
+#: ../win32/gui/WndMain.c:1719
+msgid "&About..."
+msgstr "&Sobre..."
 
-#: ../plugins/dfinput/cfg-gtk2.c:104 ../plugins/dfinput/cfg-gtk2.c:143
-msgid "Left"
-msgstr ""
+#: ../win32/gui/WndMain.c:1870
+msgid "Pcsxr Msg"
+msgstr "Mensagens do PCSXR"
 
-#: ../plugins/dfinput/cfg-gtk2.c:104 ../plugins/dfinput/cfg-gtk2.c:143
-msgid "Leftup"
-msgstr ""
+#: ../win32/gui/WndMain.c:1873
+msgid "Error Loading Symbol"
+msgstr "Erro ao carregar símbolo"
 
-#: ../plugins/dfinput/cfg-gtk2.c:105 ../plugins/dfinput/cfg-gtk2.c:144
-msgid "Leftdown"
-msgstr ""
+#~ msgid "Controller 1: "
+#~ msgstr "Controle 1:"
 
-#: ../plugins/dfinput/cfg-gtk2.c:109 ../plugins/dfinput/cfg-gtk2.c:148
-#, c-format
-msgid "Joystick: Button %d"
-msgstr ""
+#, fuzzy
+#~ msgid "Sio1 Driver"
+#~ msgstr "Extensão SoftGL"
 
-#: ../plugins/dfinput/cfg-gtk2.c:113 ../plugins/dfinput/cfg-gtk2.c:152
-#, c-format
-msgid "Joystick: Axis %d%c"
-msgstr ""
+#~ msgid ""
+#~ "8-bit\n"
+#~ "16-bit\n"
+#~ "32-bit"
+#~ msgstr ""
+#~ "8-bit\n"
+#~ "16-bit\n"
+#~ "32-bit"
 
-#: ../plugins/dfinput/cfg-gtk2.c:118 ../plugins/dfinput/cfg-gtk2.c:157
-#, c-format
-msgid "Joystick: Hat %d %s"
-msgstr ""
+#~ msgid "CD-ROM..."
+#~ msgstr "CD-ROM..."
 
-#: ../plugins/dfinput/cfg-gtk2.c:133 ../plugins/dfinput/cfg-gtk2.c:172
-msgid "Keyboard:"
-msgstr ""
+#~ msgid "Controllers..."
+#~ msgstr "Controles..."
 
-#: ../plugins/dfinput/cfg-gtk2.c:137 ../plugins/dfinput/cfg-gtk2.c:176
-msgid "(Not Set)"
-msgstr ""
+#~ msgid ""
+#~ "Decimal\n"
+#~ "Hexadecimal"
+#~ msgstr ""
+#~ "Decimal\n"
+#~ "Hexadecimal"
 
-#: ../plugins/dfinput/cfg-gtk2.c:539
-msgid "None"
-msgstr ""
+#~ msgid ""
+#~ "Equal Value\n"
+#~ "Not Equal Value\n"
+#~ "Range\n"
+#~ "Increased By\n"
+#~ "Decreased By\n"
+#~ "Increased\n"
+#~ "Decreased\n"
+#~ "Different\n"
+#~ "No Change"
+#~ msgstr ""
+#~ "Valor igual à\n"
+#~ "Valor diferente de\n"
+#~ "Intervalo\n"
+#~ "Somado por\n"
+#~ "Subtraído por\n"
+#~ "Aumentado\n"
+#~ "Diminuído\n"
+#~ "Diferente\n"
+#~ "Sem mudanças"
 
-#: ../plugins/dfinput/cfg-gtk2.c:581
-msgid "Gamepad/Keyboard Input Configuration"
-msgstr ""
+#~ msgid "Graphics..."
+#~ msgstr "Gráficos..."
 
-#: ../plugins/dfinput/cfg-gtk2.c:587 ../plugins/dfinput/cfg-gtk2.c:607
-msgid "Key"
-msgstr ""
+#~ msgid "Memcards..."
+#~ msgstr "Cartões de memória..."
 
-#: ../plugins/dfinput/cfg-gtk2.c:593 ../plugins/dfinput/cfg-gtk2.c:613
-msgid "Button"
-msgstr ""
+#~ msgid "Sound..."
+#~ msgstr "Áudio..."
 
-#: ../plugins/dfinput/pad.c:22
-msgid "Gamepad/Keyboard Input"
-msgstr "Entrada do gamepad ou teclado"
+#~ msgid "Error: Glade interface could not be loaded!"
+#~ msgstr "Erro: o ambiente Glade não pôde ser carregado!"
 
-#: ../plugins/dfinput/dfinput.glade2:35 ../plugins/dfinput/dfinput.glade2:232
-msgid "Device:"
-msgstr ""
+#~ msgid ""
+#~ "0: None\n"
+#~ "1: 2xSai\n"
+#~ "2: 2xSuperSai\n"
+#~ "3: SuperEagle\n"
+#~ "4: Scale2x\n"
+#~ "5: Scale3x\n"
+#~ "6: HQ2X\n"
+#~ "7: HQ3X"
+#~ msgstr ""
+#~ "0: Nenhum\n"
+#~ "1: 2xSai\n"
+#~ "2: 2xSuperSai\n"
+#~ "3: SuperEagle\n"
+#~ "4: Scale2x\n"
+#~ "5: Scale3x\n"
+#~ "6: HQ2X\n"
+#~ "7: HQ3X"
 
-#: ../plugins/dfinput/dfinput.glade2:66 ../plugins/dfinput/dfinput.glade2:263
-msgid "Type:"
-msgstr ""
+#~ msgid ""
+#~ "0: Off (fastest)\n"
+#~ "1: Game dependant\n"
+#~ "2: Always"
+#~ msgstr ""
+#~ "0: Desligado (mais rápido)\n"
+#~ "1: Depende do Jogo\n"
+#~ "2: Sempre"
 
-#: ../plugins/dfinput/dfinput.glade2:78 ../plugins/dfinput/dfinput.glade2:275
-msgid ""
-"Digital Pad\n"
-"Analog Pad"
-msgstr ""
+#~ msgid ""
+#~ "320x240\n"
+#~ "640x480\n"
+#~ "800x600\n"
+#~ "1024x768\n"
+#~ "1152x864\n"
+#~ "1280x1024\n"
+#~ "1600x1200"
+#~ msgstr ""
+#~ "320x240\n"
+#~ "640x480\n"
+#~ "800x600\n"
+#~ "1024x768\n"
+#~ "1152x864\n"
+#~ "1280x1024\n"
+#~ "1600x1200"
 
-#: ../plugins/dfinput/dfinput.glade2:149 ../plugins/dfinput/dfinput.glade2:346
-msgid "Change"
-msgstr ""
+#~ msgid "Compatibility"
+#~ msgstr "Compatibilidade"
 
-#: ../plugins/dfinput/dfinput.glade2:185 ../plugins/dfinput/dfinput.glade2:382
-msgid "Reset"
-msgstr ""
+#~ msgid "Framerate"
+#~ msgstr "Taxa de FPS"
 
-#: ../plugins/dfinput/dfinput.glade2:210
-msgid "Controller 1"
-msgstr "Controle 1"
+#~ msgid "Screen"
+#~ msgstr "Tela"
 
-#: ../plugins/dfinput/dfinput.glade2:412
-msgid "Controller 2"
-msgstr "Controle 2"
+#~ msgid "General"
+#~ msgstr "Geral"
 
-#: ../plugins/dfinput/dfinput.glade2:427
-msgid "Multi-Threaded (Recommended)"
-msgstr ""
+#~ msgid "XA Music"
+#~ msgstr "Música XA"
 
-#: ../plugins/dfnet/dfnet.c:23
 #, fuzzy
-msgid "Socket Driver"
-msgstr "Extensão SoftGL"
+#~ msgid ""
+#~ "None\n"
+#~ "Low\n"
+#~ "Medium\n"
+#~ "Loud\n"
+#~ "Loudest"
+#~ msgstr ""
+#~ "Mínimo\n"
+#~ "Médio\n"
+#~ "Alto\n"
+#~ "Máximo"
 
-#: ../plugins/dfnet/dfnet.c:161
-#, fuzzy, c-format
-msgid "error connecting to %s: %s\n"
-msgstr "Erro carregando \"%s\": \"%s\""
+#~ msgid ""
+#~ "None\n"
+#~ "Simple\n"
+#~ "Gaussian\n"
+#~ "Cubic"
+#~ msgstr ""
+#~ "Nenhuma\n"
+#~ "Simples\n"
+#~ "Gaussiana\n"
+#~ "Cúbica"
 
-#: ../plugins/dfnet/dfnet.c:186
-#, fuzzy
-msgid "Error allocating memory!\n"
-msgstr "Erro ao alocar memória!"
+#~ msgid "Select CD-ROM device"
+#~ msgstr "Selecione uma unidade de CDROM"
 
-#: ../plugins/dfnet/gui.c:39
-msgid "Nothing to configure"
-msgstr ""
+#, fuzzy
+#~ msgid "10000: unused"
+#~ msgstr "Não usado"
 
-#: ../plugins/dfnet/gui.c:95
-#, c-format
-msgid "IP %s"
-msgstr ""
+#, fuzzy
+#~ msgid "1000: Odd/even hack"
+#~ msgstr "Hack do ímpar/par"
 
-#: ../plugins/dfnet/gui.c:165
-msgid "Waiting for connection..."
-msgstr ""
+#, fuzzy
+#~ msgid "100: Old frame skipping"
+#~ msgstr "Pulo de quadros antigo"
 
-#: ../plugins/dfnet/gui.c:168
-msgid "The Client should now Start a Connection, waiting..."
-msgstr ""
+#, fuzzy
+#~ msgid "20000: fake 'gpu busy'"
+#~ msgstr "Imitar estado 'GPU ocupada'"
 
-#: ../plugins/dfnet/dfnet.glade2:23
-msgid ""
-"Select here if you'll be Server (Player1) or Client (Player2).\n"
-"\n"
-"If you select Server you must Copy your IP address to the Clipboard and "
-"paste if (Ctrl+V) wherever the Client can see it.\n"
-"\n"
-"If you selected Client please enter the IP address the Server gave to you in "
-"the IP Address Control."
-msgstr ""
+#, fuzzy
+#~ msgid "3: Gfx buffer reads "
+#~ msgstr "3: Leitura e Escrita no buffer da placa"
 
-#: ../plugins/dfnet/dfnet.glade2:63
-msgid "Copy PC IP to Clipboard"
-msgstr ""
+#, fuzzy
+#~ msgid "3: Gfx card "
+#~ msgstr "3: Placa e software - Lento"
 
-#: ../plugins/dfnet/dfnet.glade2:94
-msgid "Server (Player1)"
-msgstr ""
+#, fuzzy
+#~ msgid "80: PC fps calculation"
+#~ msgstr "Cálculo do FPS feito pelo PC"
 
-#: ../plugins/dfnet/dfnet.glade2:104
-msgid "Client (Player2)"
-msgstr ""
+#, fuzzy
+#~ msgid "Coded by: Pete Bernert"
+#~ msgstr "Pete Bernert"
 
-#: ../plugins/dfnet/dfnet.glade2:130
-msgid ""
-"Do not change if not necessary (remember it must be changed on both sides)."
-msgstr ""
+#~ msgid "Scanlines"
+#~ msgstr "Scanlines"
 
-#: ../plugins/dfnet/dfnet.glade2:143
-msgid "Port Number"
-msgstr ""
+#, fuzzy
+#~ msgid "http://www.pbernert.com"
+#~ msgstr "Página: http://www.pbernert.com"
 
-#: ../plugins/dfnet/dfnet.glade2:202
-msgid "Start Game"
-msgstr ""
+#~ msgid "COFF files not supported.\n"
+#~ msgstr "Arquivos COFF não são suportados!\n"
 
-#: ../plugins/dfnet/dfnet.glade2:240
-msgid "Play Offline"
-msgstr ""
+#~ msgid "Adapted from P.E.Op.S OpenGL GPU by Pete Bernert"
+#~ msgstr "Adaptado da extensão de GPU OpenGL P.E.Op.S por Pete Bernert"
 
-#: ../plugins/bladesio1/sio1.c:29
-#, fuzzy
-msgid "Sio1 Driver"
-msgstr "Extensão SoftGL"
+#~ msgid "Version: 1.78"
+#~ msgstr "Versão: 1.78"
 
 #, fuzzy
 #~ msgid "CD-ROM Device Reader"
@@ -3079,7 +3532,7 @@
 #~ msgstr "&Cartões de memória..."
 
 #~ msgid ""
-#~ "(C) 1999-2003 PCSX Team\n"
+#~ "(C) 1999-2003 PCSX Team\n"
 #~ "(C) 2005-2006 Ryan Schultz\n"
 #~ "(C) 2005-2006 Andrew Burton\n"
 #~ "(C) 2008-2009 Wei Mingzhi"

pcsxr-1.9.92.tar.bz2/po/ru_RU.po -> pcsxr-1.9.93.tar.bz2/po/ru_RU.po Changed

@@ -1,3052 +1,3222 @@
-# Russian translation of pcsxr.
-# Copyright (C) 2010 edgbla
-# This file is distributed under the same license as the pcsxr package.
-# 
-# Blade_Arma <edgbla@yandex.ru>, 2010.
+# Russian translation of pcsxr.
+# Copyright (C) 2010 edgbla
+# This file is distributed under the same license as the pcsxr package.
+#
+# Blade_Arma <edgbla@yandex.ru>, 2010, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: pcsxr 1.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-10 14:04+0800\n"
-"PO-Revision-Date: 2010-07-01 23:53+0400\n"
+"Report-Msgid-Bugs-To: whistler_wmz@users.sf.net\n"
+"POT-Creation-Date: 2013-03-02 03:33+0400\n"
+"PO-Revision-Date: 2013-03-02 03:35+0400\n"
 "Last-Translator: Blade_Arma <edgbla@yandex.ru>\n"
 "Language-Team: American English <kde-i18n-doc@kde.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
+"X-Generator: Lokalize 1.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../win32/gui/AboutDlg.c:26
-msgid ""
-"PCSX - A PlayStation Emulator\n"
-"\n"
-"Original Authors:\n"
-"main coder: linuzappz\n"
-"co-coders: shadow\n"
-"ex-coders: Nocomp, Pete Bernett, nik3d\n"
-"Webmaster: AkumaX"
+#: ../data/pcsxr.ui.h:1 ../win32/gui/CheatDlg.c:166
+msgid "Edit Cheat Codes"
+msgstr "Редактировать чит код"
+
+#: ../data/pcsxr.ui.h:2
+msgid "Cheat Codes"
+msgstr "Чит коды"
+
+#: ../data/pcsxr.ui.h:3 ../gui/Cheat.c:1113 ../win32/gui/CheatDlg.c:678
+msgid "Cheat Search"
+msgstr "Поиск читов"
+
+#: ../data/pcsxr.ui.h:4 ../win32/gui/CheatDlg.c:680
+msgid "Search For:"
+msgstr "Искать для:"
+
+#: ../data/pcsxr.ui.h:5 ../win32/gui/CheatDlg.c:681
+msgid "Data Type:"
+msgstr "Тип данных:"
+
+#: ../data/pcsxr.ui.h:6 ../gui/Cheat.c:645 ../win32/gui/CheatDlg.c:506
+#: ../win32/gui/CheatDlg.c:597 ../win32/gui/CheatDlg.c:682
+msgid "Value:"
+msgstr "Значение:"
+
+#: ../data/pcsxr.ui.h:7 ../win32/gui/CheatDlg.c:683
+msgid "Data Base:"
+msgstr "Основание:"
+
+#: ../data/pcsxr.ui.h:8 ../win32/gui/CheatDlg.c:684
+msgid "To:"
+msgstr "До:"
+
+#: ../data/pcsxr.ui.h:9 ../win32/gui/CheatDlg.c:504
+msgid "Freeze"
+msgstr "Заморозить"
+
+#: ../data/pcsxr.ui.h:10 ../win32/gui/CheatDlg.c:595
+msgid "Modify"
+msgstr "Изменить"
+
+#: ../data/pcsxr.ui.h:11
+msgid "Copy"
+msgstr "Копировать"
+
+#: ../data/pcsxr.ui.h:12
+msgid "label_resultsfound"
 msgstr ""
 
-#: ../win32/gui/AboutDlg.c:35
-msgid ""
-"PCSX-df Authors:\n"
-"Ryan Schultz, Andrew Burton, Stephen Chao,\n"
-"Marcus Comstedt, Stefan Sikora\n"
-"\n"
-"PCSX-Reloaded By:\n"
-"Blade_Arma, Wei Mingzhi, et al.\n"
-"\n"
-"http://pcsxr.codeplex.com/"
+#: ../data/pcsxr.ui.h:13
+msgid "Search"
+msgstr "Поиск"
+
+#: ../data/pcsxr.ui.h:14
+msgid "Restart"
+msgstr "Рестарт"
+
+#: ../data/pcsxr.ui.h:15
+msgid "Cheat Search"
+msgstr "Поиск читов"
+
+#: ../data/pcsxr.ui.h:16 ../gui/ConfDlg.c:113
+msgid "Configure PCSXR"
+msgstr "Настройка PCSXR"
+
+#: ../data/pcsxr.ui.h:17
+msgid "Graphics:"
+msgstr "Графика:"
+
+#: ../data/pcsxr.ui.h:18
+msgid "Sound:"
+msgstr "Звук:"
+
+#: ../data/pcsxr.ui.h:19
+msgid "Controller 1:"
+msgstr "Контроллер 1:"
+
+#: ../data/pcsxr.ui.h:20
+msgid "Controller 2:"
+msgstr "Контроллер 2:"
+
+#: ../data/pcsxr.ui.h:21
+msgid "CD-ROM:"
+msgstr "CD-привод:"
+
+#: ../data/pcsxr.ui.h:22
+msgid "Search in:"
+msgstr "Искать в:"
+
+#: ../data/pcsxr.ui.h:23
+msgid "Select Folder to Search"
+msgstr "Выберите каталог для поиска"
+
+#: ../data/pcsxr.ui.h:24
+msgid "Link cable:"
+msgstr "Соединительный кабель:"
+
+#: ../data/pcsxr.ui.h:25
+msgid "Plugins"
+msgstr "Плагины"
+
+#: ../data/pcsxr.ui.h:26
+msgid "BIOS:"
+msgstr "БИОС:"
+
+#: ../data/pcsxr.ui.h:27
+msgid "BIOS"
+msgstr "БИОС"
+
+#: ../data/pcsxr.ui.h:28
+msgid "Configure CPU"
+msgstr "Настройка ЦПУ"
+
+#: ../data/pcsxr.ui.h:29
+msgid "SPU IRQ Always Enabled"
+msgstr "Удерживание линии прерывания SPU"
+
+#: ../data/pcsxr.ui.h:30
+msgid "Black & White Movies"
+msgstr "Чёрно-белые видео заставки"
+
+#: ../data/pcsxr.ui.h:31 ../gui/Plugin.c:239
+#, c-format
+msgid "SIO IRQ Always Enabled"
+msgstr "Удерживание линии прерывания SIO"
+
+#: ../data/pcsxr.ui.h:32
+msgid "Disable XA Decoding"
+msgstr "Выключить декодирование XA"
+
+#: ../data/pcsxr.ui.h:33
+msgid "Disable CD Audio"
+msgstr "Выключить CD музыку"
+
+#: ../data/pcsxr.ui.h:34 ../win32/gui/WndMain.c:1331
+msgid "Slow Boot"
+msgstr "Включить загрузку через оболочку BIOS"
+
+#: ../data/pcsxr.ui.h:35
+msgid "Enable Interpreter CPU"
+msgstr "Включить интерпретатор ЦПУ"
+
+#: ../data/pcsxr.ui.h:36 ../win32/gui/WndMain.c:1334
+msgid "Enable Console Output"
+msgstr "Включить вывод в консоль"
+
+#: ../data/pcsxr.ui.h:37 ../win32/gui/WndMain.c:1335
+msgid "Enable Debugger"
+msgstr "Включить отладчик"
+
+#: ../data/pcsxr.ui.h:38 ../win32/gui/WndMain.c:1337
+msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
+msgstr "Исправление для Parasite Eve 2 и Vandal Hearts"
+
+#: ../data/pcsxr.ui.h:39 ../win32/gui/WndMain.c:1338
+msgid "InuYasha Sengoku Battle Fix"
+msgstr "Исправление для InuYasha Sengoku Battle"
+
+#: ../data/pcsxr.ui.h:40 ../win32/gui/WndMain.c:1339
+msgid "Widescreen (GTE Hack)"
+msgstr "Широкоформатный режим (GTE хак)"
+
+#: ../data/pcsxr.ui.h:41
+msgid "Options"
+msgstr "Опции"
+
+#: ../data/pcsxr.ui.h:42 ../win32/gui/WndMain.c:1332
+msgid "Autodetect"
+msgstr "Авто-определение"
+
+#: ../data/pcsxr.ui.h:43
+msgid "System Type"
+msgstr "Тип системы"
+
+#: ../data/pcsxr.ui.h:44
+msgid "PCSXR"
 msgstr ""
 
-#: ../win32/gui/AboutDlg.c:46 ../plugins/peopsxgl/gpucfg/interface.c:831
-msgid "About"
-msgstr "О PCSX"
-
-#: ../win32/gui/AboutDlg.c:48 ../win32/gui/AboutDlg.c:52
-#: ../win32/gui/CheatDlg.c:69 ../win32/gui/CheatDlg.c:119
-#: ../win32/gui/ConfigurePlugins.c:483 ../win32/gui/ConfigurePlugins.c:614
-#: ../win32/gui/WndMain.c:974 ../win32/gui/WndMain.c:1210
-#: ../plugins/peopsxgl/gpucfg/interface.c:130
-#: ../plugins/peopsxgl/gpucfg/interface.c:843
-msgid "OK"
-msgstr "Ок"
+#: ../data/pcsxr.ui.h:45
+msgid "_File"
+msgstr "Файл(_F)"
 
-#: ../win32/gui/AboutDlg.c:49
-msgid "PCSX EMU\n"
-msgstr "PCSX EMU\n"
+#: ../data/pcsxr.ui.h:46
+msgid "Run _CD"
+msgstr "Запустить _CD"
 
-#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
-#: ../win32/gui/CheatDlg.c:270
-msgid "Yes"
-msgstr "Да"
+#: ../data/pcsxr.ui.h:47
+msgid "Run _ISO..."
+msgstr "Запустить _ISO"
 
-#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
-#: ../win32/gui/CheatDlg.c:270
-msgid "No"
-msgstr "Нет"
+#: ../data/pcsxr.ui.h:48
+msgid "Run _BIOS"
+msgstr "Запустить _BIOS"
 
-#: ../win32/gui/CheatDlg.c:66 ../gui/Cheat.c:194
-msgid "Edit Cheat"
-msgstr "Редактирование чита"
+#: ../data/pcsxr.ui.h:49
+msgid "Run _EXE..."
+msgstr "Запустить _EXE"
 
-#: ../win32/gui/CheatDlg.c:67 ../win32/gui/CheatDlg.c:117 ../gui/Cheat.c:636
-msgid "Description:"
-msgstr "Описание:"
+#: ../data/pcsxr.ui.h:50
+msgid "E_xit"
+msgstr "Выход"
 
-#: ../win32/gui/CheatDlg.c:68 ../win32/gui/CheatDlg.c:118 ../gui/Cheat.c:125
-#: ../gui/Cheat.c:211
-msgid "Cheat Code:"
-msgstr "Чит код:"
+#: ../data/pcsxr.ui.h:51
+msgid "_Emulator"
+msgstr "Эмулятор(_E)"
 
-#: ../win32/gui/CheatDlg.c:70 ../win32/gui/CheatDlg.c:120
-#: ../win32/gui/ConfigurePlugins.c:484 ../win32/gui/ConfigurePlugins.c:615
-#: ../win32/gui/WndMain.c:975 ../win32/gui/WndMain.c:1211
-#: ../plugins/peopsxgl/gpucfg/interface.c:338
-msgid "Cancel"
-msgstr "Отмена"
+#: ../data/pcsxr.ui.h:52
+msgid "_Continue"
+msgstr "Продолжить(_C)"
 
-#: ../win32/gui/CheatDlg.c:91 ../win32/gui/CheatDlg.c:132 ../gui/Cheat.c:155
-#: ../gui/Cheat.c:251
-msgid "Invalid cheat code!"
-msgstr "Неверный чит код!"
+#: ../data/pcsxr.ui.h:53
+msgid "_Reset"
+msgstr "Сброс(_R)"
 
-#: ../win32/gui/CheatDlg.c:116 ../gui/Cheat.c:109
-msgid "Add New Cheat"
-msgstr "Добавить новый чит"
+#: ../data/pcsxr.ui.h:54
+msgid "_Shutdown"
+msgstr "Выключить(_S)"
 
-#: ../win32/gui/CheatDlg.c:166 ../data/pcsx.glade2:2534
-msgid "Edit Cheat Codes"
-msgstr "Редактировать чит код"
+#: ../data/pcsxr.ui.h:55
+msgid "S_witch ISO..."
+msgstr "Сменить ISO..."
 
-#: ../win32/gui/CheatDlg.c:168
-msgid "&Add Code"
-msgstr "Добавить код(&A)"
+#: ../data/pcsxr.ui.h:56
+msgid "_Save State"
+msgstr "Сохранить состояние"
 
-#: ../win32/gui/CheatDlg.c:169
-msgid "&Edit Code"
-msgstr "Редактировать код(&E):"
+#: ../data/pcsxr.ui.h:57
+msgid "Slot _1"
+msgstr "Слот _1"
 
-#: ../win32/gui/CheatDlg.c:170
-msgid "&Remove Code"
-msgstr "Удалить код(&R)"
+#: ../data/pcsxr.ui.h:58
+msgid "Slot _2"
+msgstr "Слот _2"
 
-#: ../win32/gui/CheatDlg.c:171
-msgid "&Enable/Disable"
-msgstr "Включить/Выключить(&E)"
+#: ../data/pcsxr.ui.h:59
+msgid "Slot _3"
+msgstr "Слот _3"
 
-#: ../win32/gui/CheatDlg.c:172
-msgid "&Load..."
-msgstr "Загрузить(&L)..."
+#: ../data/pcsxr.ui.h:60
+msgid "Slot _4"
+msgstr "Слот _4"
 
-#: ../win32/gui/CheatDlg.c:173
-msgid "&Save As..."
-msgstr "Сохранить как(&S)..."
+#: ../data/pcsxr.ui.h:61
+msgid "Slot _5"
+msgstr "Слот _5"
 
-#: ../win32/gui/CheatDlg.c:174
-msgid "&Close"
-msgstr "Закрыть(&C)"
+#: ../data/pcsxr.ui.h:62
+msgid "Slot _6"
+msgstr "Слот _6"
 
-#: ../win32/gui/CheatDlg.c:185 ../gui/Cheat.c:413
-msgid "Description"
-msgstr "Описание"
+#: ../data/pcsxr.ui.h:63
+msgid "Slot _7"
+msgstr "Слот _7"
 
-#: ../win32/gui/CheatDlg.c:190
-msgid "Enabled"
-msgstr "Включено"
+#: ../data/pcsxr.ui.h:64
+msgid "Slot _8"
+msgstr "Слот _8"
 
-#: ../win32/gui/CheatDlg.c:282 ../win32/gui/CheatDlg.c:311
-msgid "PCSX Cheat Code Files"
-msgstr "Файл чит кодов PCSX (*.cht)"
+#: ../data/pcsxr.ui.h:65
+msgid "Slot _9"
+msgstr "Слот _9"
 
-#: ../win32/gui/CheatDlg.c:402
-msgid "Equal Value"
-msgstr "Равно значению"
+#: ../data/pcsxr.ui.h:66
+msgid "_Other..."
+msgstr "Другой..."
 
-#: ../win32/gui/CheatDlg.c:403
-msgid "Not Equal Value"
-msgstr "Не равно значению"
+#: ../data/pcsxr.ui.h:67
+msgid "_Load State"
+msgstr "Загрузить состояние(_L)"
 
-#: ../win32/gui/CheatDlg.c:404
-msgid "Range"
-msgstr "Диапазон"
+#: ../data/pcsxr.ui.h:68
+msgid "_Configuration"
+msgstr "Настройка(_C)"
 
-#: ../win32/gui/CheatDlg.c:407
-msgid "Increased By"
-msgstr "Увеличилось на"
+#: ../data/pcsxr.ui.h:69
+msgid "_Plugins & BIOS..."
+msgstr "Плагины и биос..."
 
-#: ../win32/gui/CheatDlg.c:408
-msgid "Decreased By"
-msgstr "Уменьшилось на"
+#: ../data/pcsxr.ui.h:70
+msgid "_Graphics..."
+msgstr "Графика..."
 
-#: ../win32/gui/CheatDlg.c:409
-msgid "Increased"
-msgstr "Увеличилось"
+#: ../data/pcsxr.ui.h:71
+msgid "_Sound..."
+msgstr "Звук..."
 
-#: ../win32/gui/CheatDlg.c:410
-msgid "Decreased"
-msgstr "Уменьшилось"
+#: ../data/pcsxr.ui.h:72
+msgid "CD-_ROM..."
+msgstr "CD-привод..."
 
-#: ../win32/gui/CheatDlg.c:411
-msgid "Different"
-msgstr "Изменилось"
+#: ../data/pcsxr.ui.h:73
+msgid "C_ontrollers..."
+msgstr "Управление..."
 
-#: ../win32/gui/CheatDlg.c:412
-msgid "No Change"
-msgstr "Не изменилось"
+#: ../data/pcsxr.ui.h:74
+msgid "_Link cable..."
+msgstr "Соединительный кабель..."
 
-#: ../win32/gui/CheatDlg.c:448 ../gui/Cheat.c:585
-msgid "Enter the values and start your search."
-msgstr "Введите значение и начните поиск."
+#: ../data/pcsxr.ui.h:75
+msgid "_Netplay..."
+msgstr "Сетевая игра..."
 
-#: ../win32/gui/CheatDlg.c:453
-msgid "No addresses found."
-msgstr "Адреса не найдены."
+#: ../data/pcsxr.ui.h:76
+msgid "_CPU..."
+msgstr "ЦПУ..."
 
-#: ../win32/gui/CheatDlg.c:457 ../gui/Cheat.c:543
-msgid "Too many addresses found."
-msgstr "Слишком много адресов найдено."
+#: ../data/pcsxr.ui.h:77
+msgid "_Memory Cards..."
+msgstr "Карты памяти..."
 
-#: ../win32/gui/CheatDlg.c:466 ../gui/Cheat.c:552
-#, c-format
-msgid "%.8X Current: %u (%.2X), Previous: %u (%.2X)"
-msgstr "%.8X Текущее: %u (%.2X), Предыдущее: %u (%.2X)"
+#: ../data/pcsxr.ui.h:78
+msgid "Chea_t"
+msgstr "Читы"
 
-#: ../win32/gui/CheatDlg.c:471 ../gui/Cheat.c:557
-#, c-format
-msgid "%.8X Current: %u (%.4X), Previous: %u (%.4X)"
-msgstr "%.8X Текущее: %u (%.4X), Предыдущее: %u (%.4X)"
+#: ../data/pcsxr.ui.h:79
+msgid "_Browse..."
+msgstr "Обзор..."
 
-#: ../win32/gui/CheatDlg.c:476 ../gui/Cheat.c:562
-#, c-format
-msgid "%.8X Current: %u (%.8X), Previous: %u (%.8X)"
-msgstr "%.8X Текущее: %u (%.8X), Предыдущее: %u (%.8X)"
+#: ../data/pcsxr.ui.h:80
+msgid "_Search..."
+msgstr "Поиск..."
 
-#: ../win32/gui/CheatDlg.c:492 ../gui/Cheat.c:577
-#, c-format
-msgid "Founded Addresses: %d"
-msgstr "Найденные адреса: %d"
+#: ../data/pcsxr.ui.h:81
+msgid "Memory _Dump"
+msgstr "Дамп памяти"
 
-#: ../win32/gui/CheatDlg.c:504 ../data/pcsx.glade2:2930
-msgid "Freeze"
-msgstr "Заморозить"
+#: ../data/pcsxr.ui.h:82
+msgid "_Help"
+msgstr "Помошь(_H)"
 
-#: ../win32/gui/CheatDlg.c:505 ../win32/gui/CheatDlg.c:596
-msgid "Address:"
-msgstr "Адрес:"
+#: ../data/pcsxr.ui.h:83
+msgid "_About PCSXR..."
+msgstr "О PCSXR..."
 
-#: ../win32/gui/CheatDlg.c:506 ../win32/gui/CheatDlg.c:597
-#: ../win32/gui/CheatDlg.c:682 ../gui/Cheat.c:647 ../data/pcsx.glade2:2773
-msgid "Value:"
-msgstr "Значение:"
+#: ../data/pcsxr.ui.h:84
+msgid "Run CD"
+msgstr "Запустить CD"
 
-#: ../win32/gui/CheatDlg.c:566
-#, c-format
-msgid "Freeze %.8X"
-msgstr "Заморозить %.8X"
+#: ../data/pcsxr.ui.h:85
+msgid "Run ISO Image"
+msgstr "Запустить образ ISO"
 
-#: ../win32/gui/CheatDlg.c:595 ../data/pcsx.glade2:2966
-msgid "Modify"
-msgstr "Изменить"
+#: ../data/pcsxr.ui.h:86
+msgid "Continue Emulation"
+msgstr "Продолжить эмуляцию"
 
-#: ../win32/gui/CheatDlg.c:678 ../gui/Cheat.c:1129 ../data/pcsx.glade2:2703
-msgid "Cheat Search"
-msgstr "Поиск читов"
+#: ../data/pcsxr.ui.h:87
+msgid "Switch ISO Image"
+msgstr "Сменить образ ISO"
 
-#: ../win32/gui/CheatDlg.c:680 ../data/pcsx.glade2:2751
-msgid "Search For:"
-msgstr "Искать для:"
+#: ../data/pcsxr.ui.h:88
+msgid "Configure Memory Cards"
+msgstr "Настройка карт памяти"
 
-#: ../win32/gui/CheatDlg.c:681 ../data/pcsx.glade2:2761
-msgid "Data Type:"
-msgstr "Тип данных:"
+#: ../data/pcsxr.ui.h:89
+msgid "Configure Graphics"
+msgstr "Настройка видео"
 
-#: ../win32/gui/CheatDlg.c:683 ../data/pcsx.glade2:2785
-msgid "Data Base:"
-msgstr "Основание:"
+#: ../data/pcsxr.ui.h:90 ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:1
+msgid "Configure Sound"
+msgstr "Настройка звука"
 
-#: ../win32/gui/CheatDlg.c:684 ../data/pcsx.glade2:2845
-msgid "To:"
-msgstr "До:"
+#: ../data/pcsxr.ui.h:91
+msgid "Configure CD-ROM"
+msgstr "Настройка CD-привода"
 
-#: ../win32/gui/CheatDlg.c:685
-msgid "&Freeze"
-msgstr "Заморозить"
+#: ../data/pcsxr.ui.h:92
+msgid "Configure Controllers"
+msgstr "Настройка управления"
 
-#: ../win32/gui/CheatDlg.c:686
-msgid "&Modify"
-msgstr "Изменить"
+#: ../data/pcsxr.ui.h:93
+msgid "New"
+msgstr "Создать"
 
-#: ../win32/gui/CheatDlg.c:687
-msgid "&Copy"
-msgstr "Копировать"
+#: ../data/pcsxr.ui.h:94
+msgid "Format"
+msgstr "Форматировать"
 
-#: ../win32/gui/CheatDlg.c:688
-msgid "&Search"
-msgstr "Поиск"
+#: ../data/pcsxr.ui.h:95
+msgid "Un/Delete"
+msgstr "Восстановить блок"
 
-#: ../win32/gui/CheatDlg.c:689
-msgid "&New Search"
-msgstr "Новый поиск"
+#: ../data/pcsxr.ui.h:96
+msgid "Memory Card 1"
+msgstr "Карта памяти 1"
 
-#: ../win32/gui/CheatDlg.c:690
-msgid "C&lose"
-msgstr "Закрыть"
+#: ../data/pcsxr.ui.h:97
+msgid "Memory Card 2"
+msgstr "Карта памяти 2"
 
-#: ../win32/gui/CheatDlg.c:692
+#: ../data/pcsxr.ui.h:98 ../gui/DebugMemory.c:119
+msgid "Memory Dump"
+msgstr "Дамп памяти"
+
+#: ../data/pcsxr.ui.h:99 ../gui/DebugMemory.c:205
+msgid "Address (Hexadecimal):"
+msgstr "Адрес (шестнадцатиричный):"
+
+#: ../data/pcsxr.ui.h:100
+msgid "Raw Dump..."
+msgstr "\"Сырой\" дамп"
+
+#: ../data/pcsxr.ui.h:101
+msgid "Patch Memory..."
+msgstr "Патч памяти..."
+
+#: ../data/pcsxr.ui.h:102
+msgid "Configure NetPlay"
+msgstr "Настройка сетевой игры"
+
+#: ../data/pcsxr.ui.h:103
+msgid "NetPlay"
+msgstr "Сетевая игра"
+
+#: ../data/pcsxr.ui.h:104
+msgid "NTSC"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:105
+msgid "PAL"
+msgstr ""
+
+#: ../data/pcsxr.ui.h:106 ../win32/gui/CheatDlg.c:692
 msgid "8-bit"
 msgstr "8-бит"
 
-#: ../win32/gui/CheatDlg.c:693
+#: ../data/pcsxr.ui.h:107 ../win32/gui/CheatDlg.c:693
 msgid "16-bit"
 msgstr "16-бит"
 
-#: ../win32/gui/CheatDlg.c:694
+#: ../data/pcsxr.ui.h:108 ../win32/gui/CheatDlg.c:694
 msgid "32-bit"
 msgstr "32-бита"
 
-#: ../win32/gui/CheatDlg.c:695
-msgid "Decimal"
-msgstr "Десятичное"
+#: ../data/pcsxr.ui.h:109 ../win32/gui/CheatDlg.c:402
+msgid "Equal Value"
+msgstr "Равно значению"
 
-#: ../win32/gui/CheatDlg.c:696
-msgid "Hexadecimal"
-msgstr "Шестнадцатеричное"
+#: ../data/pcsxr.ui.h:110 ../win32/gui/CheatDlg.c:403
+msgid "Not Equal Value"
+msgstr "Не равно значению"
 
-#: ../win32/gui/ConfigurePlugins.c:219
-msgid "Simulate Psx Bios"
-msgstr "Симулировать биос psx"
+#: ../data/pcsxr.ui.h:111 ../win32/gui/CheatDlg.c:404
+msgid "Range"
+msgstr "Диапазон"
 
-#: ../win32/gui/ConfigurePlugins.c:305
-msgid "Configuration not OK!"
-msgstr "Настройка не завершена!"
+#: ../data/pcsxr.ui.h:112 ../win32/gui/CheatDlg.c:407
+msgid "Increased By"
+msgstr "Увеличилось на"
 
-#: ../win32/gui/ConfigurePlugins.c:305 ../gui/Cheat.c:155 ../gui/Cheat.c:251
-#: ../gui/LnxMain.c:418
-msgid "Error"
-msgstr "Ошибка"
+#: ../data/pcsxr.ui.h:113 ../win32/gui/CheatDlg.c:408
+msgid "Decreased By"
+msgstr "Уменьшилось на"
 
-#: ../win32/gui/ConfigurePlugins.c:406
-msgid "This plugin reports that should work correctly"
-msgstr "Плагин готов к работе"
+#: ../data/pcsxr.ui.h:114 ../win32/gui/CheatDlg.c:409
+msgid "Increased"
+msgstr "Увеличилось"
+
+#: ../data/pcsxr.ui.h:115 ../win32/gui/CheatDlg.c:410
+msgid "Decreased"
+msgstr "Уменьшилось"
+
+#: ../data/pcsxr.ui.h:116 ../win32/gui/CheatDlg.c:411
+msgid "Different"
+msgstr "Изменилось"
 
-#: ../win32/gui/ConfigurePlugins.c:407
-msgid "This plugin reports that should not work correctly"
-msgstr "Плагин вернул сообщение об ошибке"
+#: ../data/pcsxr.ui.h:117 ../win32/gui/CheatDlg.c:412
+msgid "No Change"
+msgstr "Не изменилось"
 
-#: ../win32/gui/ConfigurePlugins.c:463
-msgid "Select Plugins Directory"
-msgstr "Каталог с плагинами"
+#: ../data/pcsxr.ui.h:118 ../win32/gui/CheatDlg.c:695
+msgid "Decimal"
+msgstr "Десятичное"
 
-#: ../win32/gui/ConfigurePlugins.c:472
-msgid "Select Bios Directory"
-msgstr "Каталог с биосами"
+#: ../data/pcsxr.ui.h:119 ../win32/gui/CheatDlg.c:696
+msgid "Hexadecimal"
+msgstr "Шестнадцатеричное"
 
-#: ../win32/gui/ConfigurePlugins.c:481
-msgid "Configuration"
-msgstr "Настройка"
+#: ../gui/AboutDlg.c:71
+msgid ""
+"(C) 1999-2003 PCSX Team\n"
+"(C) 2005-2009 PCSX-df Team\n"
+"(C) 2009-2011 PCSX-Reloaded Team"
+msgstr ""
+"(C) 1999-2003 Команда PCSX\n"
+"(C) 2005-2009 Команда PCSX-df\n"
+"(C) 2009-2011 Команда PCSX-Reloaded"
 
-#: ../win32/gui/ConfigurePlugins.c:485
-msgid "Graphics"
-msgstr "Графика"
+#: ../gui/AboutDlg.c:76
+msgid ""
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+msgstr ""
 
-#: ../win32/gui/ConfigurePlugins.c:486
-msgid "First Controller"
-msgstr "Первый контроллер"
+#: ../gui/AboutDlg.c:100
+msgid "translator-credits"
+msgstr "edgbla"
 
-#: ../win32/gui/ConfigurePlugins.c:487
-msgid "Second Controller"
-msgstr "Второй контроллер"
+#: ../gui/AboutDlg.c:101
+msgid "A PlayStation emulator."
+msgstr "Эмулятор PlayStation."
 
-#: ../win32/gui/ConfigurePlugins.c:488
-msgid "Sound"
-msgstr "Звук"
+#: ../gui/Cheat.c:101 ../win32/gui/CheatDlg.c:116
+msgid "Add New Cheat"
+msgstr "Добавить новый чит"
 
-#: ../win32/gui/ConfigurePlugins.c:489
-msgid "Cdrom"
-msgstr "CD-привод"
+#: ../gui/Cheat.c:109 ../gui/Cheat.c:192
+msgid "Cheat Description:"
+msgstr "Описание чита:"
 
-#: ../win32/gui/ConfigurePlugins.c:490
-msgid "Bios"
-msgstr "Биос"
+#: ../gui/Cheat.c:117 ../gui/Cheat.c:201 ../win32/gui/CheatDlg.c:68
+#: ../win32/gui/CheatDlg.c:118
+msgid "Cheat Code:"
+msgstr "Чит код:"
 
-#: ../win32/gui/ConfigurePlugins.c:491
-msgid "Set Bios Directory"
-msgstr "Выберите каталог с биосами"
+#: ../gui/Cheat.c:147 ../gui/Cheat.c:241 ../gui/LnxMain.c:425
+#: ../win32/gui/ConfigurePlugins.c:330
+msgid "Error"
+msgstr "Ошибка"
 
-#: ../win32/gui/ConfigurePlugins.c:492
-msgid "Set Plugins Directory"
-msgstr "Выберите каталог с плагинами"
+#: ../gui/Cheat.c:147 ../gui/Cheat.c:241 ../win32/gui/CheatDlg.c:91
+#: ../win32/gui/CheatDlg.c:132
+msgid "Invalid cheat code!"
+msgstr "Неверный чит код!"
 
-#: ../win32/gui/ConfigurePlugins.c:493 ../win32/gui/ConfigurePlugins.c:496
-#: ../win32/gui/ConfigurePlugins.c:499 ../win32/gui/ConfigurePlugins.c:502
-#: ../win32/gui/ConfigurePlugins.c:505 ../win32/gui/ConfigurePlugins.c:617
-msgid "Configure..."
-msgstr "Настройка..."
+#: ../gui/Cheat.c:184 ../win32/gui/CheatDlg.c:66
+msgid "Edit Cheat"
+msgstr "Редактирование чита"
 
-#: ../win32/gui/ConfigurePlugins.c:494 ../win32/gui/ConfigurePlugins.c:497
-#: ../win32/gui/ConfigurePlugins.c:500 ../win32/gui/ConfigurePlugins.c:503
-#: ../win32/gui/ConfigurePlugins.c:506 ../win32/gui/ConfigurePlugins.c:618
-msgid "Test..."
-msgstr "Тест..."
+#: ../gui/Cheat.c:307
+msgid "Open Cheat File"
+msgstr "Открыть файл чита"
 
-#: ../win32/gui/ConfigurePlugins.c:495 ../win32/gui/ConfigurePlugins.c:498
-#: ../win32/gui/ConfigurePlugins.c:501 ../win32/gui/ConfigurePlugins.c:504
-#: ../win32/gui/ConfigurePlugins.c:507 ../win32/gui/ConfigurePlugins.c:619
-msgid "About..."
-msgstr "О..."
+#: ../gui/Cheat.c:317 ../gui/Cheat.c:357
+msgid "PCSXR Cheat Code Files (*.cht)"
+msgstr "Файлы читов PCSXR (*.cht)"
 
-#: ../win32/gui/ConfigurePlugins.c:612
-msgid "NetPlay Configuration"
-msgstr "Настройка сетевой игры"
+#: ../gui/Cheat.c:322 ../gui/GtkGui.c:491 ../gui/GtkGui.c:643
+#: ../win32/gui/WndMain.c:1483 ../win32/gui/WndMain.c:1564
+msgid "All Files"
+msgstr "Все файлы"
 
-#: ../win32/gui/ConfigurePlugins.c:616 ../plugins/dfnet/gui.c:31
-#: ../plugins/dfnet/gui.c:112
-msgid "NetPlay"
-msgstr "Сетевая игра"
+#: ../gui/Cheat.c:347
+msgid "Save Cheat File"
+msgstr "Сохранить чит файл"
 
-#: ../win32/gui/ConfigurePlugins.c:620
-msgid ""
-"Note: The NetPlay Plugin Directory should be the same as the other Plugins."
-msgstr ""
-"Внимание! NetPlay плагин должен находится в том же каталоге что и остальные "
-"плагины."
+#: ../gui/Cheat.c:362
+msgid "All Files (*.*)"
+msgstr "Все файлы (*.*)"
 
-#: ../win32/gui/plugin.c:90 ../win32/gui/WndMain.c:281
-#, c-format
-msgid "*PCSX*: Saved State %d"
-msgstr "*PCSX*: Состояние сохранено %d"
+#: ../gui/Cheat.c:401
+msgid "Cheat Codes"
+msgstr "Чит коды"
 
-#: ../win32/gui/plugin.c:91 ../win32/gui/WndMain.c:282
-#, c-format
-msgid "*PCSX*: Error Saving State %d"
-msgstr "*PCSX*: Ошибка сохранения состояния %d"
+#: ../gui/Cheat.c:408
+msgid "Enable"
+msgstr "Включить"
 
-#: ../win32/gui/plugin.c:107 ../win32/gui/WndMain.c:259
-#, c-format
-msgid "*PCSX*: Loaded State %d"
-msgstr "PCSX*: Состояние загружено %d"
+#: ../gui/Cheat.c:416 ../win32/gui/CheatDlg.c:185
+msgid "Description"
+msgstr "Описание"
 
-#: ../win32/gui/plugin.c:108 ../win32/gui/WndMain.c:260
-#, c-format
-msgid "*PCSX*: Error Loading State %d"
-msgstr "*PCSX*: Ошибка загрузки состояния %d"
+#: ../gui/Cheat.c:544 ../win32/gui/CheatDlg.c:457
+msgid "Too many addresses found."
+msgstr "Слишком много адресов найдено."
 
-#: ../win32/gui/plugin.c:119
+#: ../gui/Cheat.c:553 ../win32/gui/CheatDlg.c:466
 #, c-format
-msgid "*PCSX*: Sio Irq Always Enabled"
-msgstr "*PCSX*: Удерживание линии прерывания SIO включено"
+msgid "%.8X Current: %u (%.2X), Previous: %u (%.2X)"
+msgstr "%.8X Текущее: %u (%.2X), Предыдущее: %u (%.2X)"
 
-#: ../win32/gui/plugin.c:120
+#: ../gui/Cheat.c:558 ../win32/gui/CheatDlg.c:471
 #, c-format
-msgid "*PCSX*: Sio Irq Not Always Enabled"
-msgstr "*PCSX*: Удерживание линии прерывания SIO выключено"
+msgid "%.8X Current: %u (%.4X), Previous: %u (%.4X)"
+msgstr "%.8X Текущее: %u (%.4X), Предыдущее: %u (%.4X)"
 
-#: ../win32/gui/plugin.c:127
+#: ../gui/Cheat.c:563 ../win32/gui/CheatDlg.c:476
 #, c-format
-msgid "*PCSX*: Black&White Mdecs Only Enabled"
-msgstr "*PCSX*: Режим чёрно-белых видео вставок (Mdecs) включен"
+msgid "%.8X Current: %u (%.8X), Previous: %u (%.8X)"
+msgstr "%.8X Текущее: %u (%.8X), Предыдущее: %u (%.8X)"
 
-#: ../win32/gui/plugin.c:128
+#: ../gui/Cheat.c:578 ../win32/gui/CheatDlg.c:492
 #, c-format
-msgid "*PCSX*: Black&White Mdecs Only Disabled"
-msgstr "*PCSX*: Режим чёрно-белых видео вставок (Mdecs) выключен"
+msgid "Founded Addresses: %d"
+msgstr "Найденные адреса: %d"
 
-#: ../win32/gui/plugin.c:135
-#, c-format
-msgid "*PCSX*: Xa Enabled"
-msgstr "*PCSX*: Xa включено"
+#: ../gui/Cheat.c:586 ../win32/gui/CheatDlg.c:448
+msgid "Enter the values and start your search."
+msgstr "Введите значение и начните поиск."
 
-#: ../win32/gui/plugin.c:136
-#, c-format
-msgid "*PCSX*: Xa Disabled"
-msgstr "*PCSX*: Xa выключено"
+#: ../gui/Cheat.c:628
+msgid "Freeze value"
+msgstr "Заморозить значение"
 
-#: ../win32/gui/plugin.c:145
-msgid "*PCSX*: CdRom Case Opened"
-msgstr "*PCSX*: крышка CD-привода открыта"
+#: ../gui/Cheat.c:634 ../win32/gui/CheatDlg.c:67 ../win32/gui/CheatDlg.c:117
+msgid "Description:"
+msgstr "Описание:"
 
-#: ../win32/gui/plugin.c:150
-msgid "*PCSX*: CdRom Case Closed"
-msgstr "*PCSX*: крышка CD-привода закрыта"
+#: ../gui/Cheat.c:727
+msgid "Modify value"
+msgstr "Изменить значение"
 
-#: ../win32/gui/plugin.c:177
-msgid "Connecting..."
-msgstr "Соединение..."
+#: ../gui/Cheat.c:735
+msgid "New value:"
+msgstr "Новое значение:"
 
-#: ../win32/gui/plugin.c:179 ../win32/gui/plugin.c:186
-#, c-format
-msgid "Please wait while connecting... %c\n"
-msgstr "Идёт соединение, подождите... %c\n"
+#: ../gui/Cheat.c:1119
+msgid "Search Results"
+msgstr "Результат поиска"
 
-#: ../win32/gui/plugin.c:214
-msgid "Error Opening CDR Plugin"
-msgstr "Ошибка открытия CDR плагина"
+#. TODO Check whether configuration is required when we choose the plugin, and set the state of the
+#. button appropriately. New gtk tooltip API should allow us to put a tooltip explanation for
+#. disabled widgets
+#. TODO If combo screen hasn't been opened and the user chooses the menu config option, confs.Combo will be null and cause a segfault
+#. printf("Configuring plugin %s\n", filename);
+#: ../gui/ConfDlg.c:256 ../gui/ConfDlg.c:277 ../gui/ConfDlg.c:298
+#: ../gui/ConfDlg.c:319 ../gui/ConfDlg.c:340 ../gui/ConfDlg.c:399
+msgid "No configuration required"
+msgstr "Настройка не требуется"
 
-#: ../win32/gui/plugin.c:277
-#, c-format
-msgid "Error Opening GPU Plugin (%d)"
-msgstr "Ошибка открытия GPU плагина (%d)"
+#: ../gui/ConfDlg.c:256 ../gui/ConfDlg.c:277 ../gui/ConfDlg.c:298
+#: ../gui/ConfDlg.c:319 ../gui/ConfDlg.c:340 ../gui/ConfDlg.c:399
+msgid "This plugin doesn't need to be configured."
+msgstr "Плагин не нуждается в настройке."
 
-#: ../win32/gui/plugin.c:279
-#, c-format
-msgid "Error Opening SPU Plugin (%d)"
-msgstr "Ошибка открытия SPU плагина (%d)"
+#: ../gui/ConfDlg.c:402
+msgid "Please select a plugin."
+msgstr "Выберите пожалуйста плагин."
 
-#: ../win32/gui/plugin.c:282
+#: ../gui/ConfDlg.c:647
 #, c-format
-msgid "Error Opening PAD1 Plugin (%d)"
-msgstr "Ошибка открытия PAD1 плагина (%d)"
+msgid "Could not open BIOS directory: '%s'\n"
+msgstr "Не удалось открыть каталог с биосами BIOS: \"%s\"\n"
 
-#: ../win32/gui/plugin.c:284
+#: ../gui/ConfDlg.c:698 ../gui/ConfDlg.c:801 ../gui/LnxMain.c:168
 #, c-format
-msgid "Error Opening PAD2 Plugin (%d)"
-msgstr "Ошибка открытия PAD2 плагина (%d)"
-
-#: ../win32/gui/plugin.c:314
-msgid "Error Closing CDR Plugin"
-msgstr "Ошибка при закрытии CD-ROM плагина (%d)"
-
-#: ../win32/gui/plugin.c:316
-msgid "Error Closing GPU Plugin"
-msgstr "Ошибка при закрытии GPU плагина"
+msgid "Could not open directory: '%s'\n"
+msgstr "Не удалось открыть каталог: '%s'\n"
 
-#: ../win32/gui/plugin.c:318
-msgid "Error Closing SPU Plugin"
-msgstr "Ошибка при закрытии SPU плагина"
+#. The BIOS list always contains the PCSXR internal BIOS
+#: ../gui/ConfDlg.c:769
+msgid "Simulate PSX BIOS"
+msgstr "Симулировать биос psx"
 
-#: ../win32/gui/plugin.c:336
-#, c-format
-msgid "CDRinit error: %d"
-msgstr "Ошибка в CDRinit: %d"
+#: ../gui/DebugMemory.c:127
+msgid "Start Address (Hexadecimal):"
+msgstr "Начальный адрес (шестнадцатиричный):"
 
-#: ../win32/gui/plugin.c:338
-#, c-format
-msgid "GPUinit error: %d"
-msgstr "Ошибка в GPUinit: %d"
+#: ../gui/DebugMemory.c:138
+msgid "Length (Decimal):"
+msgstr "Длина (десятичный):"
 
-#: ../win32/gui/plugin.c:340
-#, c-format
-msgid "SPUinit error: %d"
-msgstr "Ошибка в SPUinit: %d"
+#: ../gui/DebugMemory.c:164
+msgid "Dump to File"
+msgstr "Дамп в файл"
 
-#: ../win32/gui/plugin.c:342
+#: ../gui/DebugMemory.c:179
 #, c-format
-msgid "PAD1init error: %d"
-msgstr "Ошибка в PAD1init: %d"
+msgid "Error writing to %s!"
+msgstr "Ошибка записи в %s!"
 
-#: ../win32/gui/plugin.c:344
-#, c-format
-msgid "PAD2init error: %d"
-msgstr "Ошибка в PAD2init: %d"
+#: ../gui/DebugMemory.c:197
+msgid "Memory Patch"
+msgstr "Патч памяти"
 
-#: ../win32/gui/plugin.c:347
-#, c-format
-msgid "NETinit error: %d"
-msgstr "Ошибка в NETinit: %d"
+#: ../gui/DebugMemory.c:216
+msgid "Value (Hexa string):"
+msgstr "Значение (Hexa string):"
 
-#: ../win32/gui/WndMain.c:76
-msgid "Arabic"
-msgstr "Арабский"
+#: ../gui/DebugMemory.c:283
+msgid "Memory Viewer"
+msgstr "Просмотр памяти"
 
-#: ../win32/gui/WndMain.c:77
-msgid "Catalan"
-msgstr "Каталанский"
+#: ../gui/DebugMemory.c:289
+msgid "Address"
+msgstr "Адрес"
 
-#: ../win32/gui/WndMain.c:78
-msgid "German"
-msgstr "Немецкий"
+#: ../gui/DebugMemory.c:307
+msgid "Text"
+msgstr "Текст"
 
-#: ../win32/gui/WndMain.c:79
-msgid "Greek"
-msgstr "Греческий"
+#: ../gui/GtkGui.c:146
+msgid "Ready"
+msgstr "Готово"
 
-#: ../win32/gui/WndMain.c:80 ../win32/gui/WndMain.c:1566
-#: ../win32/gui/WndMain.c:1568
-msgid "English"
-msgstr "Английский"
+#: ../gui/GtkGui.c:191
+msgid "Emulation Paused."
+msgstr "Эмуляция приостановлена."
 
-#: ../win32/gui/WndMain.c:81
-msgid "Spanish"
-msgstr "Испанский"
+#: ../gui/GtkGui.c:474
+msgid "Select PSX EXE File"
+msgstr "Выберите PSX EXE файл"
 
-#: ../win32/gui/WndMain.c:82
-msgid "French"
-msgstr "Французский"
+#: ../gui/GtkGui.c:487
+msgid "PlayStation Executable Files"
+msgstr "Выполняемые файлы PlayStation"
 
-#: ../win32/gui/WndMain.c:83
-msgid "Italian"
-msgstr "Итальянский"
+#: ../gui/GtkGui.c:524
+msgid "Not a valid PSX file"
+msgstr "Недопустимый формат файла"
 
-#: ../win32/gui/WndMain.c:84
-msgid "Portuguese"
-msgstr "Португальский"
+#: ../gui/GtkGui.c:524
+msgid "The file does not appear to be a valid Playstation executable"
+msgstr "Файл не является запускным файлом PlayStation"
 
-#: ../win32/gui/WndMain.c:85
-msgid "Portuguese (Brazilian)"
-msgstr "Португальский (Бразильский)"
+#: ../gui/GtkGui.c:553 ../gui/GtkGui.c:725
+msgid "CD ROM failed"
+msgstr "Ошибка CD-привода"
 
-#: ../win32/gui/WndMain.c:86
-msgid "Romanian"
-msgstr "Румынский"
+#: ../gui/GtkGui.c:553 ../gui/GtkGui.c:725 ../win32/gui/WndMain.c:472
+#: ../win32/gui/WndMain.c:526 ../win32/gui/WndMain.c:596
+#, c-format
+msgid "The CD does not appear to be a valid Playstation CD"
+msgstr "Установленный CD-диск не является диском PlayStation"
 
-#: ../win32/gui/WndMain.c:87
-msgid "Russian"
-msgstr "Русский"
+#: ../gui/GtkGui.c:564 ../gui/GtkGui.c:736 ../win32/gui/WndMain.c:482
+#: ../win32/gui/WndMain.c:536 ../win32/gui/WndMain.c:606
+#, c-format
+msgid "Could not load CD-ROM!"
+msgstr "Не удалось загрузить CD-ROM!"
 
-#: ../win32/gui/WndMain.c:88
-msgid "Simplified Chinese"
-msgstr "Китайский упрощенный"
+#: ../gui/GtkGui.c:564 ../gui/GtkGui.c:736
+msgid "The CD-ROM could not be loaded"
+msgstr "Не удалось загрузить CD-ROM"
 
-#: ../win32/gui/WndMain.c:89
-msgid "Traditional Chinese"
-msgstr "Китайский традиционный "
+#: ../gui/GtkGui.c:578
+msgid "Could not run BIOS"
+msgstr "Не удалось запустить биос"
 
-#: ../win32/gui/WndMain.c:90
-msgid "Japanese"
-msgstr "Японский"
+#: ../gui/GtkGui.c:578
+msgid "Running BIOS is not supported with Internal HLE BIOS."
+msgstr ""
+"Стандартная оболочка, позволяющая управлять картами памяти и проигрывать DA "
+"музыку, при использовании HLE-биоса недоступна."
 
-#: ../win32/gui/WndMain.c:91
-msgid "Korean"
-msgstr "Корейский"
+#: ../gui/GtkGui.c:608
+msgid "Open PSX Disc Image File"
+msgstr "Открыть образ PSX диска"
 
-#: ../win32/gui/WndMain.c:300 ../win32/gui/WndMain.c:352
-msgid "PCSX State Format"
-msgstr "Формат состояния PCSX"
+#: ../gui/GtkGui.c:638
+msgid "PSX Image Files (*.bin, *.img, *.mdf, *.iso, *.cue, *.pbp, *.cbn)"
+msgstr "Образы PSX дисков (*.bin, *.img, *.mdf, *.iso, *.cue, *.pbp, *.cbn)"
 
-#: ../win32/gui/WndMain.c:327
+#: ../gui/GtkGui.c:894
 #, c-format
-msgid "*PCSX*: Loaded State %s"
-msgstr "*PCSX*: Состояние загружено %s"
+msgid "Loaded state %s."
+msgstr "Состояние загружено %s."
 
-#: ../win32/gui/WndMain.c:328
+#: ../gui/GtkGui.c:897
 #, c-format
-msgid "*PCSX*: Error Loading State %s"
-msgstr "*PCSX*: Ошибка загрузки состояния %s"
+msgid "Error loading state %s!"
+msgstr "Ошибка загрузки состояния %s!"
 
-#: ../win32/gui/WndMain.c:379
+#: ../gui/GtkGui.c:908
 #, c-format
-msgid "*PCSX*: Saved State %s"
-msgstr "*PCSX*: Состояние сохранено %s"
+msgid "Saved state %s."
+msgstr "Состояние сохранено %s."
 
-#: ../win32/gui/WndMain.c:380
+#: ../gui/GtkGui.c:910
 #, c-format
-msgid "*PCSX*: Error Saving State %s"
-msgstr "*PCSX*: Ошибка сохранения состояния %s"
+msgid "Error saving state %s!"
+msgstr "Ошибка сохранения состояния %s!"
 
-#: ../win32/gui/WndMain.c:429 ../win32/gui/WndMain.c:478 ../gui/Gtk2Gui.c:485
-#: ../gui/Gtk2Gui.c:610
-msgid "The CD does not appear to be a valid Playstation CD"
-msgstr "Установленный CD-диск не является диском PlayStation"
+#: ../gui/GtkGui.c:945 ../gui/GtkGui.c:973
+msgid "Select State File"
+msgstr "Выберите файл состояния"
 
-#: ../win32/gui/WndMain.c:435 ../win32/gui/WndMain.c:484 ../gui/Gtk2Gui.c:493
-#: ../gui/Gtk2Gui.c:618
-msgid "Could not load CD-ROM!"
-msgstr "Не удалось загрузить CD-ROM!"
+#: ../gui/GtkGui.c:1016
+msgid "Notice"
+msgstr "Сообщение"
 
-#: ../win32/gui/WndMain.c:445
-msgid "Running BIOS is not supported with Internal HLE Bios."
+#: ../gui/LnxMain.c:62
+#, c-format
+msgid "Creating memory card: %s\n"
+msgstr "Создание карты памяти: %s\n"
+
+#: ../gui/LnxMain.c:329
+msgid ""
+" pcsxr [options] [file]\n"
+"\toptions:\n"
+"\t-runcd\t\tRuns CD-ROM\n"
+"\t-cdfile FILE\tRuns a CD image file\n"
+"\t-nogui\t\tDon't open the GTK GUI\n"
+"\t-cfg FILE\tLoads desired configuration file (default: ~/.pcsxr/pcsxr.cfg)\n"
+"\t-psxout\t\tEnable PSX output\n"
+"\t-slowboot\tEnable BIOS Logo\n"
+"\t-load STATENUM\tLoads savestate STATENUM (1-9)\n"
+"\t-h -help\tDisplay this message\n"
+"\tfile\t\tLoads file\n"
 msgstr ""
-"Стандартная оболочка, позволяющая управлять картами памяти и проигрывать DA "
-"музыку, при использовании HLE-биоса недоступна."
+" pcsxr [опции] [файл]\n"
+"\tопции:\n"
+"\t-runcd\t\tЗапустить с CD-привода\n"
+"\t-cdfile FILE\tЗапустить с файла образа CD\n"
+"\t-nogui\t\tНе использовать графический интерфейс GTK\n"
+"\t-cfg FILE\tУказать файл конфигурации (по умолчанию: ~/.pcsxr/pcsxr.cfg)\n"
+"\t-psxout\t\tВключить вывод PSX\n"
+"\t-slowboot\t\tВключить загрузку через оболочку BIOS\n"
+"\t-load STATENUM\tЗагрузить состояние с номером STATENUM (1-9)\n"
+"\t-h -help\tПоказать это сообщение\n"
+"\tfile\t\tЗагрузить файл\n"
+
+#: ../gui/LnxMain.c:366
+#, c-format
+msgid ""
+"PCSXR cannot be configured without using the GUI -- you should restart "
+"without -nogui.\n"
+msgstr ""
+"PCSXR не может быть настроен без использования графического интерфейса -- "
+"необходимо перезапустить эмулятор без опции -nogui.\n"
+
+#: ../gui/LnxMain.c:425
+msgid "Failed loading plugins!"
+msgstr "Ошибка загрузки плагинов!"
+
+#: ../gui/LnxMain.c:444
+#, c-format
+msgid "Could not load CD-ROM!\n"
+msgstr "Не удалось загрузить CD-ROM!\n"
 
-#: ../win32/gui/WndMain.c:664 ../gui/MemcardDlg.c:62
+#: ../gui/LnxMain.c:485
+#, c-format
+msgid "PSX emulator couldn't be initialized.\n"
+msgstr "Ошибка инициализации эмулятора.\n"
+
+#: ../gui/MemcardDlg.c:56
+msgid "Icon"
+msgstr "Иконка"
+
+#: ../gui/MemcardDlg.c:62 ../win32/gui/WndMain.c:778
 msgid "Title"
 msgstr "Название"
 
-#: ../win32/gui/WndMain.c:670 ../gui/MemcardDlg.c:68
+#: ../gui/MemcardDlg.c:68 ../win32/gui/WndMain.c:784
 msgid "Status"
 msgstr "Статус"
 
-#: ../win32/gui/WndMain.c:676
-msgid "Game ID"
-msgstr "Идентификатор игры"
-
-#: ../win32/gui/WndMain.c:682
-msgid "Game"
-msgstr "Игра"
-
-#: ../win32/gui/WndMain.c:864
-msgid "mid link block"
-msgstr "соединительный блок"
+#: ../gui/MemcardDlg.c:74
+msgid "ID"
+msgstr "Идентификатор"
 
-#: ../win32/gui/WndMain.c:867
-msgid "terminiting link block"
-msgstr "завершающий соединительный блок"
+#: ../gui/MemcardDlg.c:80
+msgid "Name"
+msgstr "Название"
 
-#: ../win32/gui/WndMain.c:875 ../gui/MemcardDlg.c:155 ../gui/MemcardDlg.c:260
+#: ../gui/MemcardDlg.c:118 ../win32/gui/WndMain.c:989
 msgid "Deleted"
 msgstr "Удалено"
 
-#: ../win32/gui/WndMain.c:876 ../win32/gui/WndMain.c:879
-#: ../gui/MemcardDlg.c:157 ../gui/MemcardDlg.c:161 ../gui/MemcardDlg.c:262
-#: ../gui/MemcardDlg.c:266
+#: ../gui/MemcardDlg.c:120 ../gui/MemcardDlg.c:129 ../win32/gui/WndMain.c:990
+#: ../win32/gui/WndMain.c:993
 msgid "Free"
 msgstr "Свободно"
 
-#: ../win32/gui/WndMain.c:878 ../gui/MemcardDlg.c:159 ../gui/MemcardDlg.c:264
+#: ../gui/MemcardDlg.c:123 ../win32/gui/WndMain.c:992
 msgid "Used"
 msgstr "Использовано"
 
-#: ../win32/gui/WndMain.c:972
-msgid "Memcard Manager"
-msgstr "Менеджер карт памяти"
+#: ../gui/MemcardDlg.c:125
+msgid "Link"
+msgstr "Соединительный блок"
 
-#: ../win32/gui/WndMain.c:976 ../win32/gui/WndMain.c:979
-msgid "Select Mcd"
-msgstr "Выбрать"
+#: ../gui/MemcardDlg.c:127
+msgid "End link"
+msgstr "Последний блок"
 
-#: ../win32/gui/WndMain.c:977 ../win32/gui/WndMain.c:980
-msgid "Format Mcd"
-msgstr "Форматировать"
+#. Ask for name of memory card
+#: ../gui/MemcardDlg.c:305
+msgid "Select A File"
+msgstr "Выберите файл"
 
-#: ../win32/gui/WndMain.c:978 ../win32/gui/WndMain.c:981
-msgid "Reload Mcd"
-msgstr "Перезагрузить"
+#: ../gui/MemcardDlg.c:345
+msgid "Format this Memory Card?"
+msgstr "Отформатировать карту памяти?"
 
-#: ../win32/gui/WndMain.c:982
-msgid "-> Copy ->"
-msgstr "-> Копировать ->"
+#: ../gui/MemcardDlg.c:347
+msgid ""
+"If you format the memory card, the card will be empty, and any existing data "
+"overwritten."
+msgstr ""
+"При форматировании все данные на карте памяти будут безвозвратно утеряны."
 
-#: ../win32/gui/WndMain.c:983
-msgid "<- Copy <-"
-msgstr "<- Копировать <-"
+#: ../gui/MemcardDlg.c:350
+msgid "Format card"
+msgstr "Отформатировать карту памяти"
 
-#: ../win32/gui/WndMain.c:984
-msgid "Paste"
-msgstr "Вставить"
+#. Ask for name of new memory card
+#: ../gui/MemcardDlg.c:372
+msgid "Create a new Memory Card"
+msgstr "Создать новую карту памяти"
 
-#: ../win32/gui/WndMain.c:985
-msgid "<- Un/Delete"
-msgstr "<- Восстановить блок"
+#: ../gui/MemcardDlg.c:381
+msgid "New Memory Card.mcd"
+msgstr ""
 
-#: ../win32/gui/WndMain.c:986
-msgid "Un/Delete ->"
-msgstr "Восстановить блок ->"
+#. No free slots available on the destination card
+#: ../gui/MemcardDlg.c:511
+msgid "No free space on memory card"
+msgstr "Недостаточно места на карте памяти"
 
-#: ../win32/gui/WndMain.c:988
-msgid "Memory Card 1"
-msgstr "Карта памяти 1"
+#: ../gui/MemcardDlg.c:512
+msgid ""
+"There are no free slots available on the target memory card. Please delete a "
+"slot first."
+msgstr "Недостаточно свободных блоков на карте памяти."
 
-#: ../win32/gui/WndMain.c:989
-msgid "Memory Card 2"
-msgstr "Карта памяти 2"
+#: ../gui/MemcardDlg.c:671
+msgid "Memory Card Manager"
+msgstr "Менеджер карт памяти"
 
-#: ../win32/gui/WndMain.c:1044
-msgid "Are you sure you want to paste this selection?"
-msgstr "Вы уверены в том, что хотите вставить выделенное?"
+#: ../gui/Plugin.c:240
+#, c-format
+msgid "SIO IRQ Not Always Enabled"
+msgstr "Удерживание линии прерывания SIO выключено"
 
-#: ../win32/gui/WndMain.c:1044 ../win32/gui/WndMain.c:1155
-#: ../win32/gui/WndMain.c:1162
-msgid "Confirmation"
-msgstr "Подтверждение"
+#: ../gui/Plugin.c:246
+#, c-format
+msgid "Black & White Mdecs Only Enabled"
+msgstr "Режим чёрно-белых видео вставок (Mdecs) включен"
 
-#: ../win32/gui/WndMain.c:1155 ../win32/gui/WndMain.c:1162
-msgid "Are you sure you want to format this Memory Card?"
-msgstr "Вы уверены в том, что хотите отформатировать карту памяти?"
+#: ../gui/Plugin.c:247
+#, c-format
+msgid "Black & White Mdecs Only Disabled"
+msgstr "Режим чёрно-белых видео вставок (Mdecs) выключен"
 
-#: ../win32/gui/WndMain.c:1208
-msgid "Cpu Config"
-msgstr "Настройка ЦПУ"
+#: ../gui/Plugin.c:253
+#, c-format
+msgid "XA Enabled"
+msgstr "XA включено"
 
-#: ../win32/gui/WndMain.c:1213
-msgid "Disable Xa Decoding"
-msgstr "Отключить декодирование XA"
+#: ../gui/Plugin.c:254
+#, c-format
+msgid "XA Disabled"
+msgstr "XA выключено"
 
-#: ../win32/gui/WndMain.c:1214
-msgid "Sio Irq Always Enabled"
-msgstr "Удерживание линии прерывания SIO"
+#: ../gui/Plugin.c:326
+msgid "Error opening CD-ROM plugin!"
+msgstr "Ошибка открытия CD-ROM плагина!"
 
-#: ../win32/gui/WndMain.c:1215
-msgid "Black && White Movies"
-msgstr "Чёрно-белые заставки"
+#: ../gui/Plugin.c:328
+msgid "Error opening SPU plugin!"
+msgstr "Ошибка открытия SPU плагина!"
 
-#: ../win32/gui/WndMain.c:1216
-msgid "Disable Cd audio"
-msgstr "Выключить CD музыку"
+#: ../gui/Plugin.c:331
+msgid "Error opening GPU plugin!"
+msgstr "Ошибка открытия GPU плагина!"
 
-#: ../win32/gui/WndMain.c:1217 ../data/pcsx.glade2:1595
-msgid "Autodetect"
-msgstr "Авто-определение"
+#: ../gui/Plugin.c:333
+msgid "Error opening Controller 1 plugin!"
+msgstr "Ошибка открытия PAD1 плагина!"
 
-#: ../win32/gui/WndMain.c:1218
-msgid "Enable Interpreter Cpu"
-msgstr "Включить интерпретатор ЦПУ"
+#: ../gui/Plugin.c:337
+msgid "Error opening Controller 2 plugin!"
+msgstr "Ошибка открытия PAD2 плагина!"
 
-#: ../win32/gui/WndMain.c:1219 ../data/pcsx.glade2:1451
-msgid "Enable Console Output"
-msgstr "Включить вывод в консоль"
+#: ../gui/Plugin.c:342
+msgid "Error opening SIO1 plugin!"
+msgstr "Ошибка открытия SIO1 плагина!"
 
-#: ../win32/gui/WndMain.c:1220 ../data/pcsx.glade2:1401
-msgid "Enable Debugger"
-msgstr "Включить отладчик"
+#: ../gui/Plugin.c:424
+msgid "Error closing CD-ROM plugin!"
+msgstr "Ошибка при закрытии CD-ROM плагина!"
 
-#: ../win32/gui/WndMain.c:1221
-msgid "Spu Irq Always Enabled"
-msgstr "Удерживание линии прерывания SPU"
+#: ../gui/Plugin.c:426
+msgid "Error closing SPU plugin!"
+msgstr "Ошибка при закрытии SPU плагина!"
 
-#: ../win32/gui/WndMain.c:1222 ../data/pcsx.glade2:1538
-msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
-msgstr "Исправление для Parasite Eve 2 и Vandal Hearts"
+#: ../gui/Plugin.c:428
+msgid "Error closing Controller 1 Plugin!"
+msgstr "Ошибка при закрытии PAD1 плагина!"
 
-#: ../win32/gui/WndMain.c:1223 ../data/pcsx.glade2:1553
-msgid "InuYasha Sengoku Battle Fix"
-msgstr "Исправление для InuYasha Sengoku Battle"
+#: ../gui/Plugin.c:430
+msgid "Error closing Controller 2 plugin!"
+msgstr "Ошибка при закрытии PAD2 плагина!"
 
-#: ../win32/gui/WndMain.c:1225
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:277
-#: ../plugins/dfinput/dfinput.glade2:448
-msgid "Options"
-msgstr "Опции"
+#: ../gui/Plugin.c:432
+msgid "Error closing GPU plugin!"
+msgstr "Ошибка при закрытии GPU плагина!"
 
-#: ../win32/gui/WndMain.c:1226
-msgid "Psx System Type"
-msgstr "Тип системы psx"
+#: ../gui/Plugin.c:435
+msgid "Error closing SIO1 plugin!"
+msgstr "Ошибка при закрытии SIO1 плагина!"
 
-#: ../win32/gui/WndMain.c:1330
-msgid "Psx Mcd Format (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
-msgstr "Форматы карт памяти psx (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
+#: ../libpcsxcore/cdriso.c:423
+#, c-format
+msgid ""
+"\n"
+"could not open: %s\n"
+msgstr ""
+"\n"
+"Не удалось открыть: %s\n"
 
-#: ../win32/gui/WndMain.c:1335
-msgid "Psx Memory Card (*.mcr;*.mc)"
-msgstr "Карта памяти psx (*.mcr;*.mc)"
+#: ../libpcsxcore/cdriso.c:1043
+#, c-format
+msgid "Track %.2d (%s) - Start %.2d:%.2d:%.2d, Length %.2d:%.2d:%.2d\n"
+msgstr "Трек %.2d (%s) - Начало %.2d:%.2d:%.2d, Длина %.2d:%.2d:%.2d\n"
 
-#: ../win32/gui/WndMain.c:1340
-msgid "CVGS Memory Card (*.mem;*.vgs)"
-msgstr "Карта памяти CVGS (*.mem;*.vgs)"
+#: ../libpcsxcore/cdriso.c:1064
+#, c-format
+msgid "Loaded CD Image: %s"
+msgstr "Загружен образ CD: %s"
 
-#: ../win32/gui/WndMain.c:1345
-msgid "Bleem Memory Card (*.mcd)"
-msgstr "Карта памяти Bleem (*.mcd)"
+#: ../libpcsxcore/cheat.c:147
+#, c-format
+msgid "Cheats loaded from: %s\n"
+msgstr "Чит загружен из: %s\n"
 
-#: ../win32/gui/WndMain.c:1350
-msgid "DexDrive Memory Card (*.gme)"
-msgstr "Карта памяти DexDrive (*.gme)"
+#: ../libpcsxcore/cheat.c:179
+#, c-format
+msgid "Cheats saved to: %s\n"
+msgstr "Чит сохранён в: %s\n"
 
-#: ../win32/gui/WndMain.c:1355
-msgid "DataDeck Memory Card (*.ddf)"
-msgstr "Карта памяти DataDeck (*.ddf)"
+#: ../libpcsxcore/cheat.c:322 ../libpcsxcore/cheat.c:443
+msgid "(Untitled)"
+msgstr "(без названия)"
 
-#: ../win32/gui/WndMain.c:1360 ../win32/gui/WndMain.c:1441 ../gui/Cheat.c:321
-#: ../gui/Gtk2Gui.c:422 ../gui/Gtk2Gui.c:561
-msgid "All Files"
-msgstr "Все файлы"
+#: ../libpcsxcore/debug.c:321
+msgid "Error allocating memory"
+msgstr "Ошибка выделения памяти"
 
-#: ../win32/gui/WndMain.c:1399
-msgid "Psx Exe Format"
-msgstr "Psx exe формат"
+#: ../libpcsxcore/debug.c:326
+msgid "Unable to start debug server.\n"
+msgstr "Не удалось запустить сервер отладки.\n"
 
-#: ../win32/gui/WndMain.c:1436
-msgid "Psx Isos (*.iso;*.mdf;*.img;*.bin)"
-msgstr "Образы диска psx (*.iso;*.mdf;*.img;*.bin)"
+#: ../libpcsxcore/debug.c:330
+msgid "Debugger started.\n"
+msgstr "Дебаггер запущен.\n"
 
-#: ../win32/gui/WndMain.c:1512
-msgid "&File"
-msgstr "Файл(&F)"
+#: ../libpcsxcore/debug.c:337
+msgid "Debugger stopped.\n"
+msgstr "Дебаггер остановлен.\n"
 
-#: ../win32/gui/WndMain.c:1513
-msgid "E&xit"
-msgstr "Выход(&X)"
+#: ../libpcsxcore/misc.c:350
+#, c-format
+msgid "CD-ROM Label: %.32s\n"
+msgstr "Метка CD диска: %.32s\n"
 
-#: ../win32/gui/WndMain.c:1515
-msgid "Run &EXE..."
-msgstr "Запустить EXE"
+#: ../libpcsxcore/misc.c:351
+#, c-format
+msgid "CD-ROM ID: %.9s\n"
+msgstr "Идентификатор CD диска: %.9s\n"
 
-#: ../win32/gui/WndMain.c:1516
-msgid "Run &BIOS"
-msgstr "Запустить BIOS"
+#: ../libpcsxcore/misc.c:415
+#, c-format
+msgid "Error opening file: %s.\n"
+msgstr "Ошибка открытия файла: %s.\n"
 
-#: ../win32/gui/WndMain.c:1517
-msgid "Run &ISO..."
-msgstr "Запустить ISO"
+#: ../libpcsxcore/misc.c:458
+#, c-format
+msgid "Unknown CPE opcode %02x at position %08x.\n"
+msgstr "Неизвестный опкод CPE %02x по адресу %08x.\n"
 
-#: ../win32/gui/WndMain.c:1518
-msgid "Run &CD"
-msgstr "Запустить CD"
+#: ../libpcsxcore/misc.c:486
+msgid "This file does not appear to be a valid PSX file.\n"
+msgstr "This file does not appear to be a valid PSX file.\n"
 
-#: ../win32/gui/WndMain.c:1520
-msgid "&Emulator"
-msgstr "Эмулятор(&E)"
+#: ../libpcsxcore/plugins.c:190
+#, c-format
+msgid "Error loading %s: %s"
+msgstr "Ошибка загрузки %s: %s"
 
-#: ../win32/gui/WndMain.c:1521
-msgid "&States"
-msgstr "Состояния(&S)"
+#: ../libpcsxcore/plugins.c:234
+#, c-format
+msgid ""
+"Could not load GPU plugin %s!\n"
+"%s"
+msgstr "Не удалось загрузить GPU плагин %s!"
 
-#: ../win32/gui/WndMain.c:1523
-msgid "S&witch ISO..."
-msgstr "Изменить ISO(&W)..."
+#: ../libpcsxcore/plugins.c:310
+#, c-format
+msgid ""
+"Could not load CD-ROM plugin %s!\n"
+"%s"
+msgstr "Не удалось загрузить CD-ROM плагин %s!"
 
-#: ../win32/gui/WndMain.c:1525
-msgid "Re&set"
-msgstr "Сброс(&S)"
+#: ../libpcsxcore/plugins.c:359
+#, c-format
+msgid ""
+"Could not load SPU plugin %s!\n"
+"%s"
+msgstr "Не удалось загрузить SPU плагин %s!"
 
-#: ../win32/gui/WndMain.c:1526
-msgid "&Run"
-msgstr "Старт(&R)"
+#: ../libpcsxcore/plugins.c:499
+#, c-format
+msgid ""
+"Could not load Controller 1 plugin %s!\n"
+"%s"
+msgstr "Не удалось загрузить PAD1 плагин %s!"
 
-#: ../win32/gui/WndMain.c:1527
-msgid "&Save"
-msgstr "Сохранить(&S)"
+#: ../libpcsxcore/plugins.c:558
+#, c-format
+msgid ""
+"Could not load Controller 2 plugin %s!\n"
+"%s"
+msgstr "Не удалось загрузить PAD2 плагин %s!"
 
-#: ../win32/gui/WndMain.c:1528
-msgid "&Load"
-msgstr "Загрузить(&L)"
+#: ../libpcsxcore/plugins.c:604
+#, c-format
+msgid ""
+"Could not load NetPlay plugin %s!\n"
+"%s"
+msgstr "Не удалось загрузить NetPlay плагин %s!"
 
-#: ../win32/gui/WndMain.c:1529 ../win32/gui/WndMain.c:1535
-msgid "&Other..."
-msgstr "Другой(&O)..."
+#: ../libpcsxcore/plugins.c:682
+#, c-format
+msgid ""
+"Could not load SIO1 plugin %s!\n"
+"%s"
+msgstr "Не удалось загрузить SIO1 плагин %s!"
 
-#: ../win32/gui/WndMain.c:1530 ../win32/gui/WndMain.c:1536
-msgid "Slot &5"
-msgstr "Слот 5(&5)"
+#: ../libpcsxcore/plugins.c:770
+#, c-format
+msgid "Error initializing CD-ROM plugin: %d"
+msgstr "Ошибка инициализации CD-ROM плагина: %d"
 
-#: ../win32/gui/WndMain.c:1531 ../win32/gui/WndMain.c:1537
-msgid "Slot &4"
-msgstr "Слот 4(&4)"
+#: ../libpcsxcore/plugins.c:772
+#, c-format
+msgid "Error initializing GPU plugin: %d"
+msgstr "Ошибка инициализации GPU плагина: %d"
 
-#: ../win32/gui/WndMain.c:1532 ../win32/gui/WndMain.c:1538
-msgid "Slot &3"
-msgstr "Слот 3(&3)"
+#: ../libpcsxcore/plugins.c:774
+#, c-format
+msgid "Error initializing SPU plugin: %d"
+msgstr "Ошибка инициализации SPU плагина: %d"
 
-#: ../win32/gui/WndMain.c:1533 ../win32/gui/WndMain.c:1539
-msgid "Slot &2"
-msgstr "Слот 2(&2)"
+#: ../libpcsxcore/plugins.c:776
+#, c-format
+msgid "Error initializing Controller 1 plugin: %d"
+msgstr "Ошибка инициализации PAD1 плагина: %d"
 
-#: ../win32/gui/WndMain.c:1534 ../win32/gui/WndMain.c:1540
-msgid "Slot &1"
-msgstr "Слот 1(&1)"
+#: ../libpcsxcore/plugins.c:778
+#, c-format
+msgid "Error initializing Controller 2 plugin: %d"
+msgstr "Ошибка инициализации PAD2 плагина: %d"
 
-#: ../win32/gui/WndMain.c:1542
-msgid "&Configuration"
-msgstr "Настройка(&C)"
+#: ../libpcsxcore/plugins.c:782
+#, c-format
+msgid "Error initializing NetPlay plugin: %d"
+msgstr "Ошибка инициализации NetPlay плагина: %d"
 
-#: ../win32/gui/WndMain.c:1543
-msgid "Cheat &Search..."
-msgstr "Поиск читов...(&S)"
+#: ../libpcsxcore/plugins.c:787
+#, c-format
+msgid "Error initializing SIO1 plugin: %d"
+msgstr "Ошибка инициализации SIO1 плагина: %d"
 
-#: ../win32/gui/WndMain.c:1544
-msgid "Ch&eat Code..."
-msgstr "Чит код...(&E)"
+#: ../libpcsxcore/plugins.c:790
+msgid "Plugins loaded.\n"
+msgstr "Плагины загружены.\n"
 
-#: ../win32/gui/WndMain.c:1547
-msgid "&Language"
-msgstr "Язык(&L)"
+#: ../libpcsxcore/ppf.c:219
+#, c-format
+msgid "Invalid PPF patch: %s.\n"
+msgstr "Неверный PPF патч: %s。\n"
 
-#: ../win32/gui/WndMain.c:1572
-msgid "&Memory cards..."
-msgstr "Карты памяти(&M)..."
+#: ../libpcsxcore/ppf.c:295
+#, c-format
+msgid "Unsupported PPF version (%d).\n"
+msgstr "Неподдерживаемая версия PPF(%d).\n"
 
-#: ../win32/gui/WndMain.c:1573
-msgid "C&PU..."
-msgstr "ЦПУ(&P)..."
+#. build address array
+#: ../libpcsxcore/ppf.c:334
+#, c-format
+msgid "Loaded PPF %d.0 patch: %s.\n"
+msgstr "Загружен PPF %d.0 патч: %s。\n"
 
-#: ../win32/gui/WndMain.c:1575
-msgid "&NetPlay..."
-msgstr "Сетевая игра..."
+#: ../libpcsxcore/ppf.c:384
+#, c-format
+msgid "Loaded SBI file: %s.\n"
+msgstr "Загружен SBI файл: %s\n"
 
-#: ../win32/gui/WndMain.c:1577
-msgid "&Controllers..."
-msgstr "Управление..."
+#: ../libpcsxcore/psxmem.c:78
+msgid "Error allocating memory!"
+msgstr "Ошибка выделения памяти!"
 
-#: ../win32/gui/WndMain.c:1578
-msgid "CD-&ROM..."
-msgstr "CD-привод(&R)..."
+#: ../libpcsxcore/psxmem.c:121
+#, c-format
+msgid "Could not open BIOS:\"%s\". Enabling HLE Bios!\n"
+msgstr "Could not open BIOS:\"%s\". Enabling HLE Bios!\n"
 
-#: ../win32/gui/WndMain.c:1579
-msgid "&Sound..."
-msgstr "Звук..."
+#: ../libpcsxcore/r3000a.c:34
+#, c-format
+msgid "Running PCSXR Version %s (%s).\n"
+msgstr "Запуск PCSXR версии %s (%s) 執行中。\n"
 
-#: ../win32/gui/WndMain.c:1580
-msgid "&Graphics..."
-msgstr "Графика..."
+#: ../libpcsxcore/sio.c:843
+msgid "Connection closed!\n"
+msgstr "Соединение закрыто!\n"
 
-#: ../win32/gui/WndMain.c:1582
-msgid "&Plugins && Bios..."
-msgstr "Плагины и биос(&P)..."
+#: ../libpcsxcore/sio.c:876
+#, c-format
+msgid "No memory card value was specified - creating a default card %s\n"
+msgstr "Карта памяти не указана - создана новая карта %s\n"
 
-#: ../win32/gui/WndMain.c:1584
-msgid "&Help"
-msgstr "Помощь(&H)"
+#: ../libpcsxcore/sio.c:880
+#, c-format
+msgid "The memory card %s doesn't exist - creating it\n"
+msgstr "Карта памяти %s не существует - создана новая\n"
 
-#: ../win32/gui/WndMain.c:1585
-msgid "&About..."
-msgstr "О(&A)..."
+#: ../libpcsxcore/sio.c:896
+#, c-format
+msgid "Memory card %s failed to load!\n"
+msgstr "Ошибка загрузки карты памяти %s!\n"
 
-#: ../win32/gui/WndMain.c:1764
-msgid "Pcsx Msg"
-msgstr "Сообщение pcsx"
+#: ../libpcsxcore/sio.c:900
+#, c-format
+msgid "Loading memory card %s\n"
+msgstr "Загрузка карты памяти %s\n"
 
-#: ../win32/gui/WndMain.c:1767
-msgid "Error Loading Symbol"
-msgstr "Ошибка загрузки символа"
+#: ../plugins/dfcdrom/cdr.c:25
+msgid "CD-ROM Drive Reader"
+msgstr ""
 
-#: ../gui/AboutDlg.c:74
-msgid ""
-"(C) 1999-2003 PCSX Team\n"
-"(C) 2005-2009 PCSX-df Team\n"
-"(C) 2009-2010 PCSX-Reloaded Team"
+#: ../plugins/dfcdrom/cdr.c:27
+msgid "CDR NULL Plugin"
 msgstr ""
 
-#: ../gui/AboutDlg.c:79
-msgid ""
-"This program is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"this program; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA."
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:1
+#: ../plugins/dfcdrom/cdrcfg-0.1df/main.c:217
+msgid "CDR configuration"
+msgstr "Настройка CDR"
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:2
+msgid "Choose your CD-ROM device or type its path if it's not listed"
 msgstr ""
+"Выберите CD-привод или введите свой путь, если устройства нету в списке"
 
-#: ../gui/AboutDlg.c:102
-msgid "translator-credits"
-msgstr "edgbla"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:3
+msgid "Select read mode:"
+msgstr "Режим чтения:"
 
-#: ../gui/AboutDlg.c:103
-msgid "A PlayStation emulator."
-msgstr "Эмулятор PlayStation."
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:4
+msgid "Cache Size (Def. 64):"
+msgstr "Размер кеша (по умолчанию 64):"
 
-#: ../gui/Cheat.c:117 ../gui/Cheat.c:202
-msgid "Cheat Description:"
-msgstr "Описание чита:"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:5
+msgid "Spindown Time:"
+msgstr "Время до остановки шпинделя cd-привода"
 
-#: ../gui/Cheat.c:306
-msgid "Open Cheat File"
-msgstr "Открыть файл чита"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:6
+msgid "Cdrom Speed (Def. 0 = MAX):"
+msgstr "Скорость вращения диска (по умолчанию 0 = максимальная):"
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:7
+msgid "Enable subchannel read"
+msgstr "Включить чтение субканальных данных"
 
-#: ../gui/Cheat.c:316 ../gui/Cheat.c:356
-msgid "PCSX Cheat Code Files (*.cht)"
-msgstr "Файлы читов PCSX (*.cht)"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:8
+msgid "Normal (No Cache)"
+msgstr "Обычный (Кеширование недоступно)"
 
-#: ../gui/Cheat.c:346
-msgid "Save Cheat File"
-msgstr "Сохранить чит файл"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:9
+msgid "Threaded - Faster (With Cache)"
+msgstr "В отдельном потоке - (Кеширование)"
 
-#: ../gui/Cheat.c:361
-msgid "All Files (*.*)"
-msgstr "Все файлы (*.*)"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:10
+msgid "Default"
+msgstr "По умолчанию"
 
-#: ../gui/Cheat.c:394 ../gui/Cheat.c:1124 ../gui/ConfDlg.c:104
-#: ../gui/ConfDlg.c:200 ../gui/DebugMemory.c:259
-msgid "Error: Glade interface could not be loaded!"
-msgstr "Ошибка: интерфейс Glade не может быть загружен!"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:11
+msgid "125ms"
+msgstr "125мс"
 
-#: ../gui/Cheat.c:399
-msgid "Cheat Codes"
-msgstr "Чит коды"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:12
+msgid "250ms"
+msgstr "250мс"
 
-#: ../gui/Cheat.c:405
-msgid "Enable"
-msgstr "Включить"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:13
+msgid "500ms"
+msgstr "500мс"
 
-#: ../gui/Cheat.c:630
-msgid "Freeze value"
-msgstr "Заморозить значение"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:14
+msgid "1s"
+msgstr "1с"
 
-#: ../gui/Cheat.c:729
-msgid "Modify value"
-msgstr "Изменить значение"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:15
+msgid "2s"
+msgstr "2с"
 
-#: ../gui/Cheat.c:737
-msgid "New value:"
-msgstr "Новое значение:"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:16
+msgid "4s"
+msgstr "4с"
 
-#: ../gui/Cheat.c:1134
-msgid "Search Results"
-msgstr "Результат поиска"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:17
+msgid "8s"
+msgstr "8с"
 
-#: ../gui/ConfDlg.c:112 ../data/pcsx.glade2:778
-msgid "Configure PCSX"
-msgstr "Настройка PCSX"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:18
+msgid "16s"
+msgstr "16с"
 
-#: ../gui/ConfDlg.c:237 ../gui/ConfDlg.c:258 ../gui/ConfDlg.c:279
-#: ../gui/ConfDlg.c:300 ../gui/ConfDlg.c:355
-msgid "No configuration required"
-msgstr "Настройка не требуется"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:19
+msgid "32s"
+msgstr "32с"
 
-#: ../gui/ConfDlg.c:237 ../gui/ConfDlg.c:258 ../gui/ConfDlg.c:279
-#: ../gui/ConfDlg.c:300 ../gui/ConfDlg.c:355
-msgid "This plugin doesn't need to be configured."
-msgstr "Плагин не нуждается в настройке."
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:20
+msgid "1min"
+msgstr "1мин"
 
-#: ../gui/ConfDlg.c:581
-#, c-format
-msgid "Could not open BIOS directory: '%s'\n"
-msgstr "Не удалось открыть каталог с биосами BIOS: \"%s\"\n"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:21
+msgid "2min"
+msgstr "2мин"
 
-#: ../gui/ConfDlg.c:611 ../gui/ConfDlg.c:704 ../gui/LnxMain.c:168
-#, c-format
-msgid "Could not open directory: '%s'\n"
-msgstr "Не удалось открыть каталог: '%s'\n"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:22
+msgid "4min"
+msgstr "4мин"
 
-#: ../gui/ConfDlg.c:675
-msgid "Simulate PSX BIOS"
-msgstr "Симулировать биос psx"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:23
+msgid "8min"
+msgstr "8мин"
 
-#: ../gui/DebugMemory.c:103 ../data/pcsx.glade2:3178
-msgid "Memory Dump"
-msgstr "Дамп памяти"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:24
+msgid "16min"
+msgstr "16мин"
 
-#: ../gui/DebugMemory.c:111
-msgid "Start Address (Hexadecimal):"
-msgstr "Начальный адрес (шестнадцатиричный):"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:25
+msgid "32min"
+msgstr "32мин"
 
-#: ../gui/DebugMemory.c:121
-msgid "Length (Decimal):"
-msgstr "Длина (десятичный):"
+#: ../plugins/dfinput/cfg-gtk.c:49
+msgid "D-Pad Up"
+msgstr ""
 
-#: ../gui/DebugMemory.c:147
-msgid "Dump to File"
-msgstr "Дамп в файл"
+#: ../plugins/dfinput/cfg-gtk.c:50
+msgid "D-Pad Down"
+msgstr ""
 
-#: ../gui/DebugMemory.c:162
-#, c-format
-msgid "Error writing to %s!"
-msgstr "Ошибка записи в %s!"
+#: ../plugins/dfinput/cfg-gtk.c:51
+msgid "D-Pad Left"
+msgstr ""
 
-#: ../gui/DebugMemory.c:180
-msgid "Memory Patch"
-msgstr "Патч памяти"
+#: ../plugins/dfinput/cfg-gtk.c:52
+msgid "D-Pad Right"
+msgstr ""
 
-#: ../gui/DebugMemory.c:188 ../data/pcsx.glade2:3199
-msgid "Address (Hexadecimal):"
-msgstr "Адрес (шестнадцатиричный):"
+#: ../plugins/dfinput/cfg-gtk.c:53
+msgid "Cross"
+msgstr ""
 
-#: ../gui/DebugMemory.c:198
-msgid "Value (Hexa string):"
-msgstr "Значение (Hexa string):"
+#: ../plugins/dfinput/cfg-gtk.c:54
+msgid "Circle"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk.c:55
+msgid "Square"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk.c:56
+msgid "Triangle"
+msgstr ""
 
-#: ../gui/DebugMemory.c:264
-msgid "Memory Viewer"
-msgstr "Просмотр памяти"
+#: ../plugins/dfinput/cfg-gtk.c:57
+msgid "L1"
+msgstr ""
 
-#: ../gui/DebugMemory.c:269
-msgid "Address"
-msgstr "Адрес"
+#: ../plugins/dfinput/cfg-gtk.c:58
+msgid "R1"
+msgstr ""
 
-#: ../gui/DebugMemory.c:287
-msgid "Text"
-msgstr "Текст"
+#: ../plugins/dfinput/cfg-gtk.c:59
+msgid "L2"
+msgstr ""
 
-#: ../gui/Gtk2Gui.c:113
-msgid "Ready"
-msgstr "Готово"
+#: ../plugins/dfinput/cfg-gtk.c:60
+msgid "R2"
+msgstr ""
 
-#: ../gui/Gtk2Gui.c:154
-msgid "Emulation Paused."
-msgstr "Эмуляция приостановлена."
+#: ../plugins/dfinput/cfg-gtk.c:61
+msgid "Select"
+msgstr ""
 
-#: ../gui/Gtk2Gui.c:405
-msgid "Select PSX EXE File"
-msgstr "Выберите PSX EXE файл"
+#: ../plugins/dfinput/cfg-gtk.c:62
+msgid "Start"
+msgstr ""
 
-#: ../gui/Gtk2Gui.c:418
-msgid "PlayStation Executable Files"
-msgstr "Выполняемые файлы PlayStation"
+#: ../plugins/dfinput/cfg-gtk.c:63
+msgid "L3"
+msgstr ""
 
-#: ../gui/Gtk2Gui.c:454
-msgid "Not a valid PSX file"
-msgstr "Недопустимый формат файла"
+#: ../plugins/dfinput/cfg-gtk.c:64
+msgid "R3"
+msgstr ""
 
-#: ../gui/Gtk2Gui.c:454
-msgid "The file does not appear to be a valid Playstation executable"
-msgstr "Файл не является запускным файлом PlayStation"
+#: ../plugins/dfinput/cfg-gtk.c:65
+msgid "Analog"
+msgstr "Аналоговый контроллер "
 
-#: ../gui/Gtk2Gui.c:485 ../gui/Gtk2Gui.c:610
-msgid "CD ROM failed"
-msgstr "Ошибка CD-привода"
+#: ../plugins/dfinput/cfg-gtk.c:69
+msgid "L-Stick Right"
+msgstr ""
 
-#: ../gui/Gtk2Gui.c:493 ../gui/Gtk2Gui.c:618
-msgid "The CD-ROM could not be loaded"
-msgstr "Не удалось загрузить CD-ROM"
+#: ../plugins/dfinput/cfg-gtk.c:70
+msgid "L-Stick Left"
+msgstr ""
 
-#: ../gui/Gtk2Gui.c:507
-msgid "Could not run BIOS"
-msgstr "Не удалось запустить биос"
+#: ../plugins/dfinput/cfg-gtk.c:71
+msgid "L-Stick Down"
+msgstr ""
 
-#: ../gui/Gtk2Gui.c:507
-msgid "Running BIOS is not supported with Internal HLE BIOS."
+#: ../plugins/dfinput/cfg-gtk.c:72
+msgid "L-Stick Up"
 msgstr ""
-"Стандартная оболочка, позволяющая управлять картами памяти и проигрывать DA "
-"музыку, при использовании HLE-биоса недоступна."
 
-#: ../gui/Gtk2Gui.c:536
-msgid "Open PSX Disc Image File"
-msgstr "Открыть образ PSX диска"
+#: ../plugins/dfinput/cfg-gtk.c:73
+msgid "R-Stick Right"
+msgstr ""
 
-#: ../gui/Gtk2Gui.c:556
-msgid "PSX Image Files (*.bin, *.img, *.mdf, *.iso)"
-msgstr "Образы PSX дисков (*.bin, *.img, *.mdf, *.iso)"
+#: ../plugins/dfinput/cfg-gtk.c:74
+msgid "R-Stick Left"
+msgstr ""
 
-#: ../gui/Gtk2Gui.c:771
-#, c-format
-msgid "Loaded state %s."
-msgstr "Состояние загружено %s."
+#: ../plugins/dfinput/cfg-gtk.c:75
+msgid "R-Stick Down"
+msgstr ""
 
-#: ../gui/Gtk2Gui.c:774
-#, c-format
-msgid "Error loading state %s!"
-msgstr "Ошибка загрузки состояния %s!"
+#: ../plugins/dfinput/cfg-gtk.c:76
+msgid "R-Stick Up"
+msgstr ""
 
-#: ../gui/Gtk2Gui.c:785
-#, c-format
-msgid "Saved state %s."
-msgstr "Состояние сохранено %s."
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
+msgid "Centered"
+msgstr "Отцентровано"
 
-#: ../gui/Gtk2Gui.c:787
-#, c-format
-msgid "Error saving state %s!"
-msgstr "Ошибка сохранения состояния %s!"
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
+msgid "Up"
+msgstr ""
 
-#: ../gui/Gtk2Gui.c:822 ../gui/Gtk2Gui.c:850
-msgid "Select State File"
-msgstr "Выберите файл состояния"
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
+msgid "Right"
+msgstr ""
 
-#: ../gui/Gtk2Gui.c:893
-msgid "Notice"
-msgstr "Сообщение"
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
+msgid "Rightup"
+msgstr ""
 
-#: ../gui/LnxMain.c:62
-#, c-format
-msgid "Creating memory card: %s\n"
-msgstr "Создание карты памяти: %s\n"
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
+msgid "Down"
+msgstr ""
 
-#: ../gui/LnxMain.c:325
-msgid ""
-" pcsx [options] [file]\n"
-"\toptions:\n"
-"\t-runcd\t\tRuns CD-ROM\n"
-"\t-cdfile FILE\tRuns a CD image file\n"
-"\t-nogui\t\tDon't open the GTK GUI\n"
-"\t-cfg FILE\tLoads desired configuration file (default: ~/.pcsx/pcsx.cfg)\n"
-"\t-psxout\t\tEnable PSX output\n"
-"\t-load STATENUM\tLoads savestate STATENUM (1-5)\n"
-"\t-h -help\tDisplay this message\n"
-"\tfile\t\tLoads file\n"
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
+msgid "Rightdown"
 msgstr ""
-" pcsx [опции] [файл]\n"
-"\tопции:\n"
-"\t-runcd\t\tЗапустить с CD-привода\n"
-"\t-cdfile FILE\tЗапустить с файла образа CD\n"
-"\t-nogui\t\tНе использовать графический интерфейс GTK\n"
-"\t-cfg FILE\tУказать файл конфигурации (по умолчанию: ~/.pcsx/pcsx.cfg)\n"
-"\t-psxout\t\tВключить вывод PSX\n"
-"\t-load STATENUM\tЗагрузить состояние с номером STATENUM (1-5)\n"
-"\t-h -help\tПоказать это сообщение\n"
-"\tfile\t\tЗагрузить файл\n"
 
-#: ../gui/LnxMain.c:362
-#, c-format
-msgid ""
-"PCSX cannot be configured without using the GUI -- you should restart "
-"without -nogui.\n"
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
+msgid "Left"
 msgstr ""
-"PCSX не может быть настроен без использования графического интерфейса -- "
-"необходимо перезапустить эмулятор без опции -nogui.\n"
 
-#: ../gui/LnxMain.c:418
-msgid "Failed loading plugins!"
-msgstr "Ошибка загрузки плагинов!"
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
+msgid "Leftup"
+msgstr ""
 
-#: ../gui/LnxMain.c:435
-#, c-format
-msgid "Could not load CD-ROM!\n"
-msgstr "Не удалось загрузить CD-ROM!\n"
+#: ../plugins/dfinput/cfg-gtk.c:104 ../plugins/dfinput/cfg-gtk.c:143
+msgid "Leftdown"
+msgstr ""
 
-#: ../gui/LnxMain.c:466
+#: ../plugins/dfinput/cfg-gtk.c:108 ../plugins/dfinput/cfg-gtk.c:147
 #, c-format
-msgid "PSX emulator couldn't be initialized.\n"
-msgstr "Ошибка инициализации эмулятора.\n"
+msgid "Joystick: Button %d"
+msgstr "Джойстик: Кнопка %d"
 
-#: ../gui/MemcardDlg.c:56
-msgid "Icon"
-msgstr "Иконка"
+#: ../plugins/dfinput/cfg-gtk.c:112 ../plugins/dfinput/cfg-gtk.c:151
+#, c-format
+msgid "Joystick: Axis %d%c"
+msgstr "Джойстик: Ось %d%c"
 
-#: ../gui/MemcardDlg.c:74
-msgid "ID"
-msgstr "Идентификатор"
+#: ../plugins/dfinput/cfg-gtk.c:117 ../plugins/dfinput/cfg-gtk.c:156
+#, c-format
+msgid "Joystick: Hat %d %s"
+msgstr "Джойстик: Крестовина %d %s"
 
-#: ../gui/MemcardDlg.c:80
-msgid "Name"
-msgstr "Название"
+#: ../plugins/dfinput/cfg-gtk.c:132 ../plugins/dfinput/cfg-gtk.c:171
+msgid "Keyboard:"
+msgstr "Клавиатура:"
 
-#: ../gui/MemcardDlg.c:323
-msgid "Select A File"
-msgstr "Выберите файл"
+#: ../plugins/dfinput/cfg-gtk.c:136 ../plugins/dfinput/cfg-gtk.c:175
+msgid "(Not Set)"
+msgstr "(Не установлено)"
 
-#: ../gui/MemcardDlg.c:364
-msgid "Format this Memory Card?"
-msgstr "Отформатировать карту памяти?"
+#: ../plugins/dfinput/cfg-gtk.c:575
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:14
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:68
+msgid "None"
+msgstr "Нету"
 
-#: ../gui/MemcardDlg.c:366
-msgid ""
-"If you format the memory card, the card will be empty, and any existing data "
-"overwritten."
-msgstr ""
-"При форматировании все данные на карте памяти будут безвозвратно утеряны."
+#: ../plugins/dfinput/cfg-gtk.c:623
+msgid "Gamepad/Keyboard Input Configuration"
+msgstr "Настройка Gamepad/Keyboard"
 
-#: ../gui/MemcardDlg.c:369
-msgid "Format card"
-msgstr "Отформатировать карту памяти"
+#: ../plugins/dfinput/cfg-gtk.c:629 ../plugins/dfinput/cfg-gtk.c:649
+msgid "Key"
+msgstr "Клавиша"
 
-#: ../gui/MemcardDlg.c:393
-msgid "Create a new Memory Card"
-msgstr "Создать новую карту памяти"
+#: ../plugins/dfinput/cfg-gtk.c:635 ../plugins/dfinput/cfg-gtk.c:655
+msgid "Button"
+msgstr "Кнопка"
 
-#: ../gui/MemcardDlg.c:402
-msgid "New Memory Card.mcd"
-msgstr ""
+#: ../plugins/dfinput/dfinput.ui.h:1
+msgid "Device:"
+msgstr "Устройство:"
 
-#: ../gui/MemcardDlg.c:503
-msgid "No free space on memory card"
-msgstr "Недостаточно места на карте памяти"
+#: ../plugins/dfinput/dfinput.ui.h:2
+msgid "Type:"
+msgstr "Тип:"
 
-#: ../gui/MemcardDlg.c:504
-msgid ""
-"There are no free slots available on the target memory card. Please delete a "
-"slot first."
-msgstr "Недостаточно свободных блоков на карте памяти."
+#: ../plugins/dfinput/dfinput.ui.h:3
+msgid "Visual vibration"
+msgstr "Экранная вибрация"
 
-#: ../gui/MemcardDlg.c:667
-msgid "Memory Card Manager"
-msgstr "Менеджер карт памяти"
+#: ../plugins/dfinput/dfinput.ui.h:4
+msgid "Change"
+msgstr "Изменить"
 
-#: ../gui/Plugin.c:211 ../data/pcsx.glade2:1487
-#, c-format
-msgid "SIO IRQ Always Enabled"
-msgstr "Удерживание линии прерывания SIO"
+#: ../plugins/dfinput/dfinput.ui.h:5
+msgid "Reset"
+msgstr "Сброс"
 
-#: ../gui/Plugin.c:212
-#, c-format
-msgid "SIO IRQ Not Always Enabled"
-msgstr "Удерживание линии прерывания SIO выключено"
+#: ../plugins/dfinput/dfinput.ui.h:6
+msgid "Controller 1"
+msgstr "Контроллер 1"
 
-#: ../gui/Plugin.c:218
-#, c-format
-msgid "Black & White Mdecs Only Enabled"
-msgstr "Режим чёрно-белых видео вставок (Mdecs) включен"
+#: ../plugins/dfinput/dfinput.ui.h:7
+msgid "Controller 2"
+msgstr "Контроллер 2"
 
-#: ../gui/Plugin.c:219
-#, c-format
-msgid "Black & White Mdecs Only Disabled"
-msgstr "Режим чёрно-белых видео вставок (Mdecs) выключен"
+#: ../plugins/dfinput/dfinput.ui.h:8
+msgid "Multi-Threaded (Recommended)"
+msgstr "В отдельном потоке (Рекомендуется)"
 
-#: ../gui/Plugin.c:225
-#, c-format
-msgid "XA Enabled"
-msgstr "XA включено"
+#: ../plugins/dfinput/dfinput.ui.h:9 ../win32/gui/WndMain.c:1342
+msgid "Options"
+msgstr "Опции"
 
-#: ../gui/Plugin.c:226
-#, c-format
-msgid "XA Disabled"
-msgstr "XA выключено"
+#: ../plugins/dfinput/dfinput.ui.h:10
+msgid "Digital Pad"
+msgstr "Стандартный контроллер"
 
-#: ../gui/Plugin.c:288
-msgid "Error opening CD-ROM plugin!"
-msgstr "Ошибка открытия CD-ROM плагина!"
+#: ../plugins/dfinput/dfinput.ui.h:11
+msgid "Analog Pad"
+msgstr "Аналоговый контроллер"
 
-#: ../gui/Plugin.c:290
-msgid "Error opening SPU plugin!"
-msgstr "Ошибка открытия SPU плагина!"
+#: ../plugins/dfinput/dfinput.ui.h:12
+msgid "Mouse"
+msgstr "Мышь"
 
-#: ../gui/Plugin.c:293
-msgid "Error opening GPU plugin!"
-msgstr "Ошибка открытия GPU плагина!"
+#: ../plugins/dfinput/pad.c:33
+msgid "Gamepad/Keyboard/Mouse Input"
+msgstr "Настройка Gamepad/Keyboard/Mouse"
 
-#: ../gui/Plugin.c:295
-msgid "Error opening Controller 1 plugin!"
-msgstr "Ошибка открытия PAD1 плагина!"
+#. increase that with each version
+#: ../plugins/dfnet/dfnet.c:23
+msgid "Socket Driver"
+msgstr ""
 
-#: ../gui/Plugin.c:297
-msgid "Error opening Controller 2 plugin!"
-msgstr "Ошибка открытия PAD2 плагина!"
+#: ../plugins/dfnet/dfnet.c:161
+#, c-format
+msgid "error connecting to %s: %s\n"
+msgstr "Ошибка соединения с %s: %s\n"
 
-#: ../gui/Plugin.c:377
-msgid "Error closing CD-ROM plugin!"
-msgstr "Ошибка при закрытии CD-ROM плагина!"
+#: ../plugins/dfnet/dfnet.c:186
+msgid "Error allocating memory!\n"
+msgstr "Ошибка выделения памяти!\n"
 
-#: ../gui/Plugin.c:379
-msgid "Error closing SPU plugin!"
-msgstr "Ошибка при закрытии SPU плагина!"
+#: ../plugins/dfnet/dfnet.ui.h:1
+msgid "Start Game"
+msgstr "Начать сетевую игру"
 
-#: ../gui/Plugin.c:381
-msgid "Error closing Controller 1 Plugin!"
-msgstr "Ошибка при закрытии PAD1 плагина!"
+#: ../plugins/dfnet/dfnet.ui.h:2
+msgid "Play Offline"
+msgstr "Начать без использования сети"
 
-#: ../gui/Plugin.c:383
-msgid "Error closing Controller 2 plugin!"
-msgstr "Ошибка при закрытии PAD2 плагина!"
+#: ../plugins/dfnet/dfnet.ui.h:3
+msgid ""
+"Select here if you'll be Server (Player1) or Client (Player2).\n"
+"\n"
+"If you select Server you must Copy your IP address to the Clipboard and "
+"paste if (Ctrl+V) wherever the Client can see it.\n"
+"\n"
+"If you selected Client please enter the IP address the Server gave to you in "
+"the IP Address Control."
+msgstr ""
+"Выберите здесь сторону: Сервер (Игрок 1) или Клиент (Игрок 2)\n"
+"\n"
+"Если вы выбрали Сервер - скопируйте IP адрес в буфер обмена и вставьте (Ctrl"
+"+V) куда-либо, чтобы Клиент мог его видеть.\n"
+"\n"
+"Если вы выбрали Клиента - введите полученный IP адрес Сервера в "
+"соответствующее поле."
 
-#: ../gui/Plugin.c:385
-msgid "Error closing GPU plugin!"
-msgstr "Ошибка при закрытии GPU плагина!"
+#: ../plugins/dfnet/dfnet.ui.h:8 ../plugins/bladesio1/sio1.ui.h:6
+msgid "Copy PC IP to Clipboard"
+msgstr "Скопировать IP адрес в буфер обмена"
 
-#: ../libpcsxcore/cdriso.c:658
-#, c-format
-msgid "Track %.2d (%s) - Start %.2d:%.2d:%.2d, Length %.2d:%.2d:%.2d\n"
-msgstr "Трек %.2d (%s) - Начало %.2d:%.2d:%.2d, Длина %.2d:%.2d:%.2d\n"
+#: ../plugins/dfnet/dfnet.ui.h:9 ../plugins/bladesio1/sio1.ui.h:7
+msgid "Server (Player1)"
+msgstr "Сервер (Игрок 1)"
 
-#: ../libpcsxcore/cdriso.c:677
-#, c-format
-msgid "Loaded CD Image: %s"
-msgstr "Загружен образ CD: %s"
+#: ../plugins/dfnet/dfnet.ui.h:10 ../plugins/bladesio1/sio1.ui.h:8
+msgid "Client (Player2)"
+msgstr "Клиент (Игрок 2)"
 
-#: ../libpcsxcore/cheat.c:147
-#, c-format
-msgid "Cheats loaded from: %s\n"
-msgstr "Чит загружен из: %s\n"
+#: ../plugins/dfnet/dfnet.ui.h:11 ../plugins/bladesio1/sio1.ui.h:10
+msgid ""
+"Do not change if not necessary (remember it must be changed on both sides)."
+msgstr ""
+"Не меняйте без особой необходимости (помните что порты должны быть одинаковы "
+"для обеих сторон)"
 
-#: ../libpcsxcore/cheat.c:179
-#, c-format
-msgid "Cheats saved to: %s\n"
-msgstr "Чит сохранён в: %s\n"
+#: ../plugins/dfnet/dfnet.ui.h:12 ../plugins/bladesio1/sio1.ui.h:11
+msgid "Port Number"
+msgstr "Номер порта"
 
-#: ../libpcsxcore/cheat.c:322 ../libpcsxcore/cheat.c:443
-msgid "(Untitled)"
-msgstr "(без названия)"
+#: ../plugins/dfnet/gui.c:30 ../plugins/dfnet/gui.c:112
+#: ../plugins/bladesio1/gui.c:82 ../win32/gui/ConfigurePlugins.c:669
+msgid "NetPlay"
+msgstr "Сетевая игра"
 
-#: ../libpcsxcore/debug.c:317
-msgid "Error allocating memory"
-msgstr "Ошибка выделения памяти"
+#: ../plugins/dfnet/gui.c:38
+msgid "Nothing to configure"
+msgstr "Не подлежит настройке"
 
-#: ../libpcsxcore/debug.c:322
-msgid "Unable to start debug server.\n"
-msgstr "Не удалось запустить сервер отладки.\n"
+#: ../plugins/dfnet/gui.c:94 ../plugins/bladesio1/gui.c:94
+#, c-format
+msgid "IP %s"
+msgstr ""
 
-#: ../libpcsxcore/debug.c:326
-msgid "Debugger started.\n"
-msgstr "Дебаггер запущен.\n"
+#: ../plugins/dfnet/gui.c:165
+msgid "Waiting for connection..."
+msgstr "Ожидание соединения..."
 
-#: ../libpcsxcore/debug.c:333
-msgid "Debugger stopped.\n"
-msgstr "Дебаггер остановлен.\n"
+#: ../plugins/dfnet/gui.c:168
+msgid "The Client should now Start a Connection, waiting..."
+msgstr "Ожидание соединения с клиентом..."
 
-#: ../libpcsxcore/misc.c:342
-#, c-format
-msgid "CD-ROM Label: %.32s\n"
+#: ../plugins/dfsound/spu.c:66
+msgid "DirectSound Driver"
 msgstr ""
 
-#: ../libpcsxcore/misc.c:343
-#, fuzzy, c-format
-msgid "CD-ROM ID: %.9s\n"
-msgstr "CD-привод:"
-
-#: ../libpcsxcore/misc.c:388
-#, c-format
-msgid "Error opening file: %s.\n"
-msgstr "Ошибка открытия файла: %s.\n"
+#: ../plugins/dfsound/spu.c:68
+msgid "Mac OS X Sound"
+msgstr ""
 
-#: ../libpcsxcore/misc.c:428
-#, c-format
-msgid "Unknown CPE opcode %02x at position %08x.\n"
-msgstr "Неизвестный опкод CPE %02x по адресу %08x.\n"
+#: ../plugins/dfsound/spu.c:70
+msgid "ALSA Sound"
+msgstr ""
 
-#: ../libpcsxcore/misc.c:435
-msgid "COFF files not supported.\n"
-msgstr "Формат COFF не поддерживается.\n"
+#: ../plugins/dfsound/spu.c:72
+msgid "OSS Sound"
+msgstr ""
 
-#: ../libpcsxcore/misc.c:439
-msgid "This file does not appear to be a valid PSX file.\n"
-msgstr "This file does not appear to be a valid PSX file.\n"
+#: ../plugins/dfsound/spu.c:74
+msgid "SDL Sound"
+msgstr ""
 
-#: ../libpcsxcore/plugins.c:181
-#, c-format
-msgid "Error loading %s: %s"
-msgstr "Ошибка загрузки %s: %s"
+#: ../plugins/dfsound/spu.c:76
+msgid "OpenAL Sound"
+msgstr ""
 
-#: ../libpcsxcore/plugins.c:221
-#, c-format
-msgid "Could not load GPU plugin %s!"
-msgstr "Не удалось загрузить GPU плагин %s!"
+#: ../plugins/dfsound/spu.c:78
+msgid "PulseAudio Sound"
+msgstr ""
 
-#: ../libpcsxcore/plugins.c:292
-#, c-format
-msgid "Could not load CD-ROM plugin %s!"
-msgstr "Не удалось загрузить CD-ROM плагин %s!"
+#: ../plugins/dfsound/spu.c:80
+msgid "NULL Sound"
+msgstr ""
 
-#: ../libpcsxcore/plugins.c:340
-#, c-format
-msgid "Could not load SPU plugin %s!"
-msgstr "Не удалось загрузить SPU плагин %s!"
+#: ../plugins/dfsound/spu.c:83
+msgid ""
+"P.E.Op.S. Sound Driver V1.7\n"
+"Coded by Pete Bernert and the P.E.Op.S. team\n"
+msgstr ""
 
-#: ../libpcsxcore/plugins.c:477
-#, c-format
-msgid "Could not load Controller 1 plugin %s!"
-msgstr "Не удалось загрузить PAD1 плагин %s!"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:2
+msgid "Volume:"
+msgstr "Громкость:"
 
-#: ../libpcsxcore/plugins.c:531
-#, c-format
-msgid "Could not load Controller 2 plugin %s!"
-msgstr "Не удалось загрузить PAD2 плагин %s!"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:3
+msgid "Interpolation:"
+msgstr "Интерполяция:"
 
-#: ../libpcsxcore/plugins.c:574
-#, c-format
-msgid "Could not load NetPlay plugin %s!"
-msgstr "Не удалось загрузить NetPlay плагин %s!"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:4
+msgid "Reverb:"
+msgstr "Реверберация:"
 
-#: ../libpcsxcore/plugins.c:654
-#, fuzzy, c-format
-msgid "Could not load SIO1 plugin %s!"
-msgstr "Не удалось загрузить SPU плагин %s!"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:5
+msgid "Adjust XA speed"
+msgstr "Корректировка скорости проигрывания XA"
 
-#: ../libpcsxcore/plugins.c:739
-#, c-format
-msgid "Error initializing CD-ROM plugin: %d"
-msgstr "Ошибка инициализации CD-ROM плагина: %d"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:6
+msgid "Choose this if XA music is played too quickly."
+msgstr "Установить в том случае, когда XA музыка играет слишком быстро."
 
-#: ../libpcsxcore/plugins.c:741
-#, c-format
-msgid "Error initializing GPU plugin: %d"
-msgstr "Ошибка инициализации GPU плагина: %d"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:7
+msgid "High compatibility mode"
+msgstr "Режим повышенной совместимости"
 
-#: ../libpcsxcore/plugins.c:743
-#, c-format
-msgid "Error initializing SPU plugin: %d"
-msgstr "Ошибка инициализации SPU плагина: %d"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:8
+msgid "Use the asynchronous SPU interface."
+msgstr "Использовать асинхронный интерфейс SPU"
 
-#: ../libpcsxcore/plugins.c:745
-#, c-format
-msgid "Error initializing Controller 1 plugin: %d"
-msgstr "Ошибка инициализации PAD1 плагина: %d"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:9
+msgid "SPU IRQ Wait"
+msgstr "Ожидать SPU IRQ"
 
-#: ../libpcsxcore/plugins.c:747
-#, c-format
-msgid "Error initializing Controller 2 plugin: %d"
-msgstr "Ошибка инициализации PAD2 плагина: %d"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:10
+msgid "Wait for CPU; only useful for some games."
+msgstr "Ожидать CPU; имеет смысл только для некоторых игр."
 
-#: ../libpcsxcore/plugins.c:751
-#, c-format
-msgid "Error initializing NetPlay plugin: %d"
-msgstr "Ошибка инициализации NetPlay плагина: %d"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:11
+msgid "Single channel sound"
+msgstr "Одноканальный звук"
 
-#: ../libpcsxcore/plugins.c:756
-#, fuzzy, c-format
-msgid "Error initializing SIO1 plugin: %d"
-msgstr "Ошибка инициализации SPU плагина: %d"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:12
+msgid "Play only one channel for a performance boost."
+msgstr "Проигрывать только один канал, для прироста производительности"
 
-#: ../libpcsxcore/plugins.c:759
-msgid "Plugins loaded.\n"
-msgstr "Плагины загружены.\n"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:13
+msgid "Frequency Response - Output Filter"
+msgstr ""
 
-#: ../libpcsxcore/ppf.c:216
-#, c-format
-msgid "Invalid PPF patch: %s.\n"
-msgstr "Неверный PPF патч: %s。\n"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:15
+msgid "Simple"
+msgstr "Простая"
 
-#: ../libpcsxcore/ppf.c:292
-#, c-format
-msgid "Unsupported PPF version (%d).\n"
-msgstr "Неподдерживаемая версия PPF(%d).\n"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:16
+msgid "Gaussian"
+msgstr "Гаусса"
 
-#: ../libpcsxcore/ppf.c:331
-#, c-format
-msgid "Loaded PPF %d.0 patch: %s.\n"
-msgstr "Загружен PPF %d.0 патч: %s。\n"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:17
+msgid "Cubic"
+msgstr "Кубическая"
 
-#: ../libpcsxcore/psxmem.c:80
-msgid "Error allocating memory!"
-msgstr "Ошибка выделения памяти!"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:18
+msgid "Off"
+msgstr "Выключена"
 
-#: ../libpcsxcore/psxmem.c:122
-#, c-format
-msgid "Could not open BIOS:\"%s\". Enabling HLE Bios!\n"
-msgstr "Could not open BIOS:\"%s\". Enabling HLE Bios!\n"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:19
+msgid "Playstation"
+msgstr "Playstation"
 
-#: ../libpcsxcore/r3000a.c:33
-#, c-format
-msgid "Running PCSX Version %s (%s).\n"
-msgstr "Запуск PCSX версии %s (%s) 執行中。\n"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:20
+msgid "Low"
+msgstr "Низкая"
 
-#: ../libpcsxcore/sio.c:345
-msgid "Connection closed!\n"
-msgstr "Соединение закрыто!\n"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:21
+msgid "Medium"
+msgstr "Средняя"
 
-#: ../libpcsxcore/sio.c:371
-#, c-format
-msgid "No memory card value was specified - creating a default card %s\n"
-msgstr "Карта памяти не указана - создана новая карта %s\n"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:22
+msgid "Loud"
+msgstr "Сильная"
 
-#: ../libpcsxcore/sio.c:375
-#, c-format
-msgid "The memory card %s doesn't exist - creating it\n"
-msgstr "Карта памяти %s не существует - создана новая\n"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:23
+msgid "Loudest"
+msgstr "Максимальная"
 
-#: ../libpcsxcore/sio.c:391
-#, c-format
-msgid "Memory card %s failed to load!\n"
-msgstr "Ошибка загрузки карты памяти %s!\n"
+#: ../plugins/dfxvideo/gpu.c:82
+msgid "Soft Driver"
+msgstr ""
 
-#: ../libpcsxcore/sio.c:395
-#, c-format
-msgid "Loading memory card %s\n"
-msgstr "Загрузка карты памяти %s\n"
+#: ../plugins/dfxvideo/gpu.c:83
+msgid ""
+"P.E.Op.S. Soft Driver V1.17\n"
+"Coded by Pete Bernert and the P.E.Op.S. team\n"
+msgstr ""
 
-#: ../plugins/dfxvideo/gpu.c:55
+#: ../plugins/dfxvideo/gpu.c:85
 msgid "SoftGL Driver"
 msgstr ""
 
-#: ../plugins/dfxvideo/gpu.c:56
+#: ../plugins/dfxvideo/gpu.c:86
 msgid ""
 "P.E.Op.S. SoftGL Driver V1.17\n"
 "Coded by Pete Bernert and the P.E.Op.S. team\n"
 msgstr ""
 
-#: ../plugins/dfxvideo/gpu.c:58
+#: ../plugins/dfxvideo/gpu.c:88
 msgid "XVideo Driver"
 msgstr ""
 
-#: ../plugins/dfxvideo/gpu.c:59
+#: ../plugins/dfxvideo/gpu.c:89
 msgid ""
 "P.E.Op.S. Xvideo Driver V1.17\n"
 "Coded by Pete Bernert and the P.E.Op.S. team\n"
 msgstr ""
 
-#: ../plugins/dfxvideo/gpu.c:62
+#: ../plugins/dfxvideo/gpu.c:92
 msgid "Pete Bernert and the P.E.Op.S. team"
 msgstr ""
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:8
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:1
 msgid "Configure X11 Video"
 msgstr "Настройка X11 Video"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:45
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:2
 msgid "Initial Window Size:"
 msgstr "Размер окна:"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:56
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:3
 msgid "Stretching:"
 msgstr "Растяжение:"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:69
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:4
 msgid "Dithering:"
 msgstr "Дизеринг:"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:82
-msgid ""
-"320x240\n"
-"640x480\n"
-"800x600\n"
-"1024x768\n"
-"1152x864\n"
-"1280x1024\n"
-"1600x1200"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:101
-msgid ""
-"0: None\n"
-"1: 2xSai\n"
-"2: 2xSuperSai\n"
-"3: SuperEagle\n"
-"4: Scale2x\n"
-"5: Scale3x\n"
-"6: HQ2X\n"
-"7: HQ3X"
-msgstr ""
-"0: Выключено\n"
-"1: 2xSai\n"
-"2: 2xSuperSai\n"
-"3: SuperEagle\n"
-"4: Scale2x\n"
-"5: Scale3x\n"
-"6: HQ2X\n"
-"7: HQ3X"
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:123
-msgid ""
-"0: Off (fastest)\n"
-"1: Game dependant\n"
-"2: Always"
-msgstr ""
-"0: Выключен (быстрейший режим)\n"
-"1: Устанавливается игрой\n"
-"2: Включен всегда"
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:146
-msgid "Maintain 4:3 Aspect Ratio"
-msgstr "Сохранять соотношение сторон 4:3"
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:161
-#: ../plugins/peopsxgl/gpucfg/interface.c:322
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:5
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:4
 msgid "Fullscreen"
 msgstr "Полноэкранный режим"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:165
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:6
 msgid "Toggle windowed/fullscreen mode."
 msgstr "Переключение между оконным/полноэкранным режимами."
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:187
-msgid "Screen"
-msgstr "Экран"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:7
+msgid "Maintain 4:3 Aspect Ratio"
+msgstr "Сохранять соотношение сторон 4:3"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:216
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:8
 msgid "Show FPS"
 msgstr "Отображать FPS"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:220
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:9
 msgid "Toggle whether the FPS will be shown."
 msgstr "Отображать FPS при старте эмуляции."
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:232
-msgid "Autodetect FPS limit"
-msgstr "Авто-определение FPS"
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:236
-msgid "Enable this if games display too quickly."
-msgstr ""
-"Следует включить для автоматического определения и ограничения скорости игры."
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:249
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:10
 msgid "Enable frame skipping"
 msgstr "Включить пропуск кадров"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:253
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:11
 msgid "Skip frames when rendering."
 msgstr "Пропуск кадров при отрисовке."
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:270
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:12
 msgid "Set FPS"
 msgstr "Установить FPS"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:287
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:13
+msgid "Enable this if games display too quickly."
+msgstr ""
+"Следует включить для автоматического определения и ограничения скорости игры."
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:14
 msgid "200.0"
-msgstr "200.0"
+msgstr ""
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:310
-msgid "Framerate"
-msgstr "Частота кадров"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:15
+msgid "Autodetect FPS limit"
+msgstr "Авто-определение FPS"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:339
-#: ../plugins/peopsxgl/gpucfg/interface.c:568
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:16
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:36
 msgid "Use game fixes"
 msgstr "Исправления для некоторых игр"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:366
-msgid "better g-colors, worse textures"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:381
-msgid "Needed by Dark Forces"
-msgstr "Необходимо для Dark Forces"
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:394
-msgid "Draw quads with triangles"
-msgstr "Рисовать четырёхугольники треугольниками"
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:410
-msgid "Repeated flat tex triangles"
-msgstr ""
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:426
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:17
 msgid "Disable CPU Saving"
 msgstr "Выключить экономию ресурсов ЦПУ"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:442
-msgid "Odd/even bit hack"
-msgstr "Хак бита ODE"
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:458
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:18
 msgid "For precise framerate"
 msgstr "Для повышения точности частоты смены кадров"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:473
-msgid "Better FPS limit in some"
-msgstr "Возможно более точное ограничение FPS"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:19
+msgid "Odd/even bit hack"
+msgstr "Хак бита ODE"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:486
-msgid "PC FPS calculation"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:20
+msgid "Chrono Cross"
 msgstr ""
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:504
-msgid "Pandemonium 2"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:21
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:45
+msgid "PC FPS calculation"
 msgstr ""
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:517
-msgid "Lazy screen update"
-msgstr "\"Ленивое\" обновление экрана"
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:535
-msgid "Skip every second frame"
-msgstr "Пропускать каждый второй кадр"
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:548
-#: ../plugins/peopsxgl/gpucfg/interface.c:640
-msgid "Old frame skipping"
-msgstr "Старый режим пропуска кадров"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:22
+msgid "Better FPS limit in some"
+msgstr "Возможно более точное ограничение FPS"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:564
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:23
 msgid "Expand screen width"
 msgstr "Увеличить ширину экрана"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:580
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:24
+msgid "Capcom fighting games"
+msgstr "Файтинги от Capcom"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:25
 msgid "Ignore brightness color"
 msgstr "Игнорировать яркость цвета"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:596
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:26
+msgid "Black screens in Lunar"
+msgstr "Чёрный экран в LunarSSSC"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:27
 msgid "Disable coordinate check"
 msgstr "Выключить проверку координат"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:614
-msgid "Chrono Cross"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:28
+msgid "Compatibility mode"
+msgstr "Режим совместимости"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:29
+msgid "Lazy screen update"
+msgstr "\"Ленивое\" обновление экрана"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:30
+msgid "Pandemonium 2"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:31
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:46
+msgid "Old frame skipping"
+msgstr "Старый режим пропуска кадров"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:32
+msgid "Skip every second frame"
+msgstr "Пропускать каждый второй кадр"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:33
+msgid "Repeated flat tex triangles"
 msgstr ""
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:627
-msgid "Capcom fighting games"
-msgstr "Файтинги от Capcom"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:34
+msgid "Needed by Dark Forces"
+msgstr "Необходимо для Dark Forces"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:642
-msgid "Black screens in Lunar"
-msgstr "Чёрный экран в LunarSSSC"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:35
+msgid "Draw quads with triangles"
+msgstr "Рисовать четырёхугольники треугольниками"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:657
-msgid "Compatibility mode"
-msgstr "Режим совместимости"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:36
+msgid "better g-colors, worse textures"
+msgstr "Улучшенное затенение, худшее текстурирование"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:670
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:37
 msgid "Fake 'gpu busy' states"
 msgstr "Имитация 'занятости' gpu "
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:688
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:38
 msgid "Toggle busy flags after drawing"
 msgstr "Переключить флаг занятости после отрисовки"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:713
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:268
-msgid "Compatibility"
-msgstr "Совместимость"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:39
+msgid "0: Off (fastest)"
+msgstr "0: Выключен (быстрейший режим)"
 
-#: ../data/pcsx.glade2:7
-msgid "PCSX"
-msgstr "PCSX"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:40
+msgid "1: Game dependant"
+msgstr "1: Устанавливается игрой"
 
-#: ../data/pcsx.glade2:21
-msgid "_File"
-msgstr "Файл(_F)"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:41
+msgid "2: Always"
+msgstr "2: Включен всегда"
 
-#: ../data/pcsx.glade2:27
-msgid "Run _CD"
-msgstr "Запустить _CD"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:42
+msgid "320x240"
+msgstr ""
 
-#: ../data/pcsx.glade2:45
-msgid "Run _ISO..."
-msgstr "Запустить _ISO"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:43
+msgid "640x480"
+msgstr ""
 
-#: ../data/pcsx.glade2:62
-msgid "Run _BIOS"
-msgstr "Запустить _BIOS"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:44
+msgid "800x600"
+msgstr ""
 
-#: ../data/pcsx.glade2:79
-msgid "Run _EXE..."
-msgstr "Запустить _EXE"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:45
+msgid "1024x768"
+msgstr ""
 
-#: ../data/pcsx.glade2:101
-msgid "E_xit"
-msgstr "Выход"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:46
+msgid "1152x864"
+msgstr ""
 
-#: ../data/pcsx.glade2:123
-msgid "_Emulator"
-msgstr "Эмулятор(_E)"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:47
+msgid "1280x1024"
+msgstr ""
 
-#: ../data/pcsx.glade2:129
-msgid "_Continue"
-msgstr "Продолжить(_C)"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:48
+msgid "1600x1200"
+msgstr ""
 
-#: ../data/pcsx.glade2:146
-msgid "_Reset"
-msgstr "Сброс(_R)"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:49
+msgid "0: None"
+msgstr "0: Выключено"
 
-#: ../data/pcsx.glade2:168
-msgid "S_witch ISO..."
-msgstr "Сменить ISO..."
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:50
+msgid "1: 2xSai"
+msgstr ""
 
-#: ../data/pcsx.glade2:190
-msgid "_Save State"
-msgstr "Сохранить состояние"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:51
+msgid "2: 2xSuperSai"
+msgstr ""
 
-#: ../data/pcsx.glade2:199 ../data/pcsx.glade2:280
-msgid "Slot _1"
-msgstr "Слот _1"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:52
+msgid "3: SuperEagle"
+msgstr ""
 
-#: ../data/pcsx.glade2:208 ../data/pcsx.glade2:289
-msgid "Slot _2"
-msgstr "Слот _2"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:53
+msgid "4: Scale2x"
+msgstr ""
 
-#: ../data/pcsx.glade2:217 ../data/pcsx.glade2:298
-msgid "Slot _3"
-msgstr "Слот _3"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:54
+msgid "5: Scale3x"
+msgstr ""
 
-#: ../data/pcsx.glade2:226 ../data/pcsx.glade2:307
-msgid "Slot _4"
-msgstr "Слот _4"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:55
+msgid "6: HQ2X"
+msgstr ""
 
-#: ../data/pcsx.glade2:235 ../data/pcsx.glade2:316
-msgid "Slot _5"
-msgstr "Слот _5"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:56
+msgid "7: HQ3X"
+msgstr ""
 
-#: ../data/pcsx.glade2:243 ../data/pcsx.glade2:324
-msgid "_Other..."
-msgstr "Другой..."
+#: ../plugins/peopsxgl/gpu.c:97
+msgid "OpenGL Driver"
+msgstr ""
 
-#: ../data/pcsx.glade2:271
-msgid "_Load State"
-msgstr "Загрузить состояние(_L)"
+#: ../plugins/peopsxgl/gpu.c:99
+msgid "Pete Bernert"
+msgstr ""
 
-#: ../data/pcsx.glade2:357
-msgid "_Configuration"
-msgstr "Настройка(_C)"
+#: ../plugins/peopsxgl/gpu.c:100
+msgid ""
+"Based on P.E.Op.S. MesaGL Driver V1.78\n"
+"Coded by Pete Bernert\n"
+msgstr ""
 
-#: ../data/pcsx.glade2:363
-msgid "_Plugins & BIOS..."
-msgstr "Плагины и биос..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:1
+msgid "OpenGL Driver configuration"
+msgstr "Настройка OpenGL Driver"
 
-#: ../data/pcsx.glade2:385
-msgid "_Graphics..."
-msgstr "Графика..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:2
+msgid "Width:"
+msgstr "Ширина:"
 
-#: ../data/pcsx.glade2:400
-msgid "_Sound..."
-msgstr "Звук..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:3
+msgid "Height:"
+msgstr "Высота:"
 
-#: ../data/pcsx.glade2:415
-msgid "CD-_ROM..."
-msgstr "CD-привод..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:5
+msgid "Dithering"
+msgstr "Дизеринг"
 
-#: ../data/pcsx.glade2:430
-msgid "C_ontrollers..."
-msgstr "Управление..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:6
+msgid "Keep psx aspect ratio"
+msgstr "Сохранять пропорции картинки psx"
 
-#: ../data/pcsx.glade2:450
-msgid "_CPU..."
-msgstr "ЦПУ..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:7
+msgid "Window options"
+msgstr "Опции окна"
 
-#: ../data/pcsx.glade2:466
-msgid "_Memory Cards..."
-msgstr "Карты памяти..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:8
+msgid "Quality:"
+msgstr "Качество:"
 
-#: ../data/pcsx.glade2:483
-msgid "_Netplay..."
-msgstr "Сетевая игра..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:9
+msgid "Filtering:"
+msgstr "Фильтрация:"
 
-#: ../data/pcsx.glade2:504
-msgid "Chea_t"
-msgstr "Читы"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:10
+msgid "HiRes Tex:"
+msgstr "HiRes текстуры:"
 
-#: ../data/pcsx.glade2:513
-msgid "_Browse..."
-msgstr "Обзор..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:11
+msgid "VRam size in MBytes (0..1024, 0=auto):"
+msgstr "Размер видеопамяти в мегабайтах (0..1024, 0=авто):"
 
-#: ../data/pcsx.glade2:528
-msgid "_Search..."
-msgstr "Поиск..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:12
+msgid "Textures"
+msgstr "Текстуры"
 
-#: ../data/pcsx.glade2:554
-msgid "Memory _Dump"
-msgstr "Дамп памяти"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:13
+msgid "Show FPS display on startup"
+msgstr "Отображать FPS дисплей при старте"
 
-#: ../data/pcsx.glade2:574
-msgid "_Help"
-msgstr "Помошь(_H)"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:14
+msgid "Use FPS limit"
+msgstr "Включить ограничение FPS"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:15
+msgid "FPS limit auto-detector"
+msgstr "Авто-определение FPS"
 
-#: ../data/pcsx.glade2:580
-msgid "_About PCSX..."
-msgstr "О PCSX..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:16
+msgid "FPS limit manual"
+msgstr "Ручное ограничение FPS"
 
-#: ../data/pcsx.glade2:613 ../data/pcsx.glade2:614
-msgid "Run CD"
-msgstr "Запустить CD"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:17
+msgid "FPS"
+msgstr ""
 
-#: ../data/pcsx.glade2:626
-msgid "Run ISO Image"
-msgstr "Запустить образ ISO"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:18
+msgid "Use Frame skipping"
+msgstr "Пропуск кадров"
 
-#: ../data/pcsx.glade2:627
-msgid "Run ISO..."
-msgstr "Запустить ISO..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:19
+msgid "Framerate"
+msgstr "Частота кадров"
 
-#: ../data/pcsx.glade2:648
-msgid "Continue Emulation"
-msgstr "Продолжить эмуляцию"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:20
+msgid "Offscreen drawing:"
+msgstr "Внеэкранная отрисовка:"
 
-#: ../data/pcsx.glade2:649
-msgid "Continue..."
-msgstr "Продолжить..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:21
+msgid "Framebuffer textures:"
+msgstr ""
 
-#: ../data/pcsx.glade2:661
-msgid "Switch ISO Image"
-msgstr "Сменить образ ISO"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:22
+msgid "Framebuffer access:"
+msgstr ""
 
-#: ../data/pcsx.glade2:662
-msgid "Switch ISO..."
-msgstr "Сменить ISO..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:23
+msgid "Mask bit detection (Needed by a few games, zbuffer)"
+msgstr "Эмуляция маскирования (используется в нескольких играх, zbuffer)"
 
-#: ../data/pcsx.glade2:683 ../data/pcsx.glade2:1810
-msgid "Configure Memory Cards"
-msgstr "Настройка карт памяти"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:24
+msgid "Alpha multipass (Correct opaque texture areas)"
+msgstr "Многопроходная отрисовка текстур с прозрачностью"
 
-#: ../data/pcsx.glade2:684
-msgid "Memcards..."
-msgstr "Карты памяти..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:25
+msgid "Advanced blending (Accurate psx color emulation)"
+msgstr "Улучшенное смешивание (более точная эмуляция цветов psx)"
 
-#: ../data/pcsx.glade2:696
-msgid "Configure Graphics"
-msgstr "Настройка видео"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:26
+msgid "Compatibility"
+msgstr "Совместимость"
 
-#: ../data/pcsx.glade2:697
-msgid "Graphics..."
-msgstr "Графика..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:27
+msgid "Scanlines Blending (0..255, -1=dot):"
+msgstr "Смешивание (0..255, -1=точка):"
 
-#: ../data/pcsx.glade2:709 ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:8
-msgid "Configure Sound"
-msgstr "Настройка звука"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:28
+msgid "Unfiltered MDECs (Small movie speedup)"
+msgstr ""
+"Не фильтровать MDECs (некоторый прирост скорости при проигрывании "
+"видеовставок)"
 
-#: ../data/pcsx.glade2:710
-msgid "Sound..."
-msgstr "Звук..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:29
+msgid "Force 15 bit framebuffer updates (Faster movies)"
+msgstr ""
 
-#: ../data/pcsx.glade2:722
-msgid "Configure CD-ROM"
-msgstr "Настройка CD-привода"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:30
+msgid "Line mode (Polygons will not get filled)"
+msgstr "Режим линий (отрисовываются только края полигонов)"
 
-#: ../data/pcsx.glade2:723
-msgid "CD-ROM..."
-msgstr "CD-привод..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:31
+msgid "Polygon anti-aliasing (Slow with most cards)"
+msgstr "Антиалиасинг полигонов (медленно на большинстве карт)"
 
-#: ../data/pcsx.glade2:735
-msgid "Configure Controllers"
-msgstr "Настройка управления"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:32
+msgid "Use OpenGL extensions (Recommended)"
+msgstr "Использовать расширения OpenGL (рекомендуется)"
 
-#: ../data/pcsx.glade2:736
-msgid "Controllers..."
-msgstr "Контроллеры..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:33
+msgid "Screen smoothing (Can be slow or unsupported)"
+msgstr "Полноэкранное сглаживание (может быть медленно или не поддерживатся)"
 
-#: ../data/pcsx.glade2:879
-msgid "Select Folder to Search"
-msgstr "Выберите каталог для поиска"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:34
+msgid "Gte accuracy"
+msgstr "Повышенная точность (GTE)"
 
-#: ../data/pcsx.glade2:895
-msgid "Search in:"
-msgstr "Каталог с плагинами:"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:35
+msgid "Misc"
+msgstr "Разное"
 
-#: ../data/pcsx.glade2:1168
-msgid "Graphics:"
-msgstr "Графика:"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:37
+msgid "Battle cursor (FF7)"
+msgstr "Курсор в режиме боя (FF7)"
 
-#: ../data/pcsx.glade2:1181
-msgid "Sound:"
-msgstr "Звук:"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:38
+msgid "Yellow rect (FF9)"
+msgstr "Жёлтый прямоугольник (FF9)"
 
-#: ../data/pcsx.glade2:1196
-msgid "Controller 1: "
-msgstr "Контроллер 1:"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:39
+msgid "Direct FB updates"
+msgstr ""
 
-#: ../data/pcsx.glade2:1211
-msgid "Controller 2:"
-msgstr "Контроллер 2:"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:40
+msgid "Black brightness (Lunar)"
+msgstr "Чёрный экран в LunarSSSC"
 
-#: ../data/pcsx.glade2:1226
-msgid "CD-ROM:"
-msgstr "CD-привод:"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:41
+msgid "Swap front detection"
+msgstr ""
 
-#: ../data/pcsx.glade2:1264
-msgid "Plugins"
-msgstr "Плагины"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:42
+msgid "Disable coord check"
+msgstr "Выключить проверку координат"
 
-#: ../data/pcsx.glade2:1325
-msgid "BIOS"
-msgstr "Биос"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:43
+msgid "No blue glitches (LoD)"
+msgstr ""
 
-#: ../data/pcsx.glade2:1375
-msgid "Configure CPU"
-msgstr "Настройка ЦПУ"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:44
+msgid "Soft FB access"
+msgstr ""
 
-#: ../data/pcsx.glade2:1419
-msgid "SPU IRQ Always Enabled"
-msgstr "Удерживание линии прерывания SPU"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:47
+msgid "No subtr. blending"
+msgstr "Отключить вычитающее смешивание"
 
-#: ../data/pcsx.glade2:1435
-msgid "Black & White Movies"
-msgstr "Чёрно-белые видео заставки"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:48
+msgid "Lazy upload (DW7)"
+msgstr "\"Ленивая\" загрузка (DW7)"
 
-#: ../data/pcsx.glade2:1469
-msgid "Enable Interpreter CPU"
-msgstr "Включить интерпретатор ЦПУ"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:49
+msgid "Odd/even hack"
+msgstr "Хак бита ODE"
 
-#: ../data/pcsx.glade2:1503
-msgid "Disable CD Audio"
-msgstr "Выключить CD музыку"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:50
+msgid "Adjust screen width"
+msgstr "Корректировка ширины экрана"
 
-#: ../data/pcsx.glade2:1519
-msgid "Disable XA Decoding"
-msgstr "Выключить декодирование XA"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:51
+msgid "Old texture filtering"
+msgstr "Старый режим текстурной фильтрации"
 
-#: ../data/pcsx.glade2:1571
-msgid "Options"
-msgstr "Опции"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:52
+msgid "Additional uploads"
+msgstr ""
 
-#: ../data/pcsx.glade2:1612
-msgid ""
-"NTSC\n"
-"PAL"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:53
+msgid "Unused"
+msgstr "Не используется"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:54
+msgid "Fake 'GPU busy'"
+msgstr "Имитация 'занятости' gpu"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:55
+msgid "Special game fixes"
+msgstr "Исправления для некоторых игр"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:56
+msgid "Fast"
+msgstr "Наибыстро"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:57
+msgid "Autoconfigure for fast display"
+msgstr "Автоконфигурирование для наибыстрейшего отображения"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:58
+msgid "Beautiful"
+msgstr "Наилучше"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:59
+msgid "Auto configure for beautiful display"
+msgstr "Автоконфигурирование для наилучшего отображения"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:60
+msgid "None - Fastest, most glitches"
 msgstr ""
 
-#: ../data/pcsx.glade2:1626
-msgid "System Type"
-msgstr "Тип системы"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:61
+msgid "Minimum - Missing screens"
+msgstr ""
 
-#: ../data/pcsx.glade2:1674
-msgid "Configure NetPlay"
-msgstr "Настройка сетевой игры"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:62
+msgid "Standard - OK for most games"
+msgstr ""
 
-#: ../data/pcsx.glade2:1760
-msgid "NetPlay"
-msgstr "Сетевая игра"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:63
+msgid "Enhanced - Shows more stuff"
+msgstr ""
 
-#: ../data/pcsx.glade2:1886 ../data/pcsx.glade2:2283
-msgid "New"
-msgstr "Создать"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:64
+msgid "Extended - Causing garbage"
+msgstr ""
 
-#: ../data/pcsx.glade2:1936 ../data/pcsx.glade2:2333
-msgid "Format"
-msgstr "Форматировать"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:65
+msgid "None (Standard)"
+msgstr "0: None (стандартный)"
 
-#: ../data/pcsx.glade2:1986 ../data/pcsx.glade2:2383
-msgid "Un/Delete"
-msgstr "Восстановить блок"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:66
+msgid "2xSaI (Much vram needed)"
+msgstr "1: 2xSaI (требуется много видеопамяти)"
 
-#: ../data/pcsx.glade2:2079
-msgid "Memory Card 1"
-msgstr "Карта памяти 1"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:67
+msgid "Scaled (Needs tex filtering)"
+msgstr "2: Scaled (используется совместно с текстурной фильтрацией)"
 
-#: ../data/pcsx.glade2:2139 ../data/pcsx.glade2:2189 ../data/pcsx.glade2:3002
-msgid "Copy"
-msgstr "Копировать"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:69
+msgid "Standard - Glitches will happen"
+msgstr ""
 
-#: ../data/pcsx.glade2:2476
-msgid "Memory Card 2"
-msgstr "Карта памяти 2"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:70
+msgid "Extended - No black borders"
+msgstr ""
 
-#: ../data/pcsx.glade2:2572
-msgid "Cheat Codes"
-msgstr "Чит коды"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:71
+msgid "Standard without sprites - Unfiltered 2D"
+msgstr ""
 
-#: ../data/pcsx.glade2:2736
-msgid ""
-"8-bit\n"
-"16-bit\n"
-"32-bit"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:72
+msgid "Extended without sprites - Unfiltered 2D"
 msgstr ""
-"8-бит\n"
-"16-бит\n"
-"32-бита"
 
-#: ../data/pcsx.glade2:2799
-msgid ""
-"Equal Value\n"
-"Not Equal Value\n"
-"Range\n"
-"Increased By\n"
-"Decreased By\n"
-"Increased\n"
-"Decreased\n"
-"Different\n"
-"No Change"
-msgstr ""
-"Равно значению\n"
-"Не равно значению\n"
-"Диапазон\n"
-"Увеличилось на\n"
-"Уменьшилось на\n"
-"Увеличилось\n"
-"Уменьшилось\n"
-"Изменилось\n"
-"Не изменилось"
-
-#: ../data/pcsx.glade2:2831
-msgid ""
-"Decimal\n"
-"Hexadecimal"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:73
+msgid "Standard + smoothed sprites"
 msgstr ""
-"Десятичное\n"
-"Шестнадцатиричное"
 
-#: ../data/pcsx.glade2:3035
-msgid "label_resultsfound"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:74
+msgid "Extended + smoothed sprites"
 msgstr ""
 
-#: ../data/pcsx.glade2:3070
-msgid "Search"
-msgstr "Поиск"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:75
+msgid "Don't care - Use driver's default textures"
+msgstr "0: Использовать формат текстур по-умолчанию"
 
-#: ../data/pcsx.glade2:3106
-msgid "Restart"
-msgstr "Рестарт"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:76
+msgid "4444 - Fast, but less colorful"
+msgstr "1: 4444 - Быстро, плохая цветопередача"
 
-#: ../data/pcsx.glade2:3135
-msgid "Cheat Search"
-msgstr "Поиск читов"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:77
+msgid "5551 - Nice colors, bad transparency"
+msgstr "2: 5551 - Хорошая цветопередача, проблемы с прозрачностью"
 
-#: ../data/pcsx.glade2:3291
-msgid "Raw Dump..."
-msgstr "\"Сырой\" дамп"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:78
+msgid "8888 - Best colors, more ram needed"
+msgstr "3: 8888 - Лучшая цветопередача, требует много памяти"
 
-#: ../data/pcsx.glade2:3326
-msgid "Patch Memory..."
-msgstr "Патч памяти..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:79
+msgid "BGR8888 - Faster on some cards"
+msgstr "4: BGR8888 - Быстро на некоторых видеокартах"
 
-#: ../plugins/dfsound/spu.c:38
-msgid "Mac OS X Sound"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:80
+msgid "Emulated VRam - Ok most times"
 msgstr ""
 
-#: ../plugins/dfsound/spu.c:40
-msgid "ALSA Sound"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:81
+msgid "Gfx card buffer reads"
 msgstr ""
 
-#: ../plugins/dfsound/spu.c:42
-msgid "OSS Sound"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:82
+msgid "Gfx card buffer moves"
 msgstr ""
 
-#: ../plugins/dfsound/spu.c:44
-msgid "SDL Sound"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:83
+msgid "Gfx card buffer reads and moves"
 msgstr ""
 
-#: ../plugins/dfsound/spu.c:46
-msgid "PulseAudio Sound"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:84
+msgid "Full Software (FVP)"
 msgstr ""
 
-#: ../plugins/dfsound/spu.c:48
-msgid "NULL Sound"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:85
+msgid "Emulated VRam - Needs FVP"
 msgstr ""
 
-#: ../plugins/dfsound/spu.c:51
-msgid ""
-"P.E.Op.S. Sound Driver V1.7\n"
-"Coded by Pete Bernert and the P.E.Op.S. team\n"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:86
+msgid "Black - Fast, no effects"
 msgstr ""
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:42
-msgid "Volume:"
-msgstr "Громкость:"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:87
+msgid "Gfx card buffer - Can be slow"
+msgstr ""
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:54
-msgid "Interpolation:"
-msgstr "Интерполяция:"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:88
+msgid "Gfx card and soft - Slow"
+msgstr ""
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:68
-msgid "Reverb:"
-msgstr "Реверберация:"
+#: ../plugins/bladesio1/gui.c:112
+msgid "Link Cable Configuration"
+msgstr "Настройка Link Cable"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:81
-msgid ""
-"Low\n"
-"Medium\n"
-"Loud\n"
-"Loudest"
+#. *************************************************************************
+#. #define SIO1_DEBUG 1
+#: ../plugins/bladesio1/sio1.c:44
+msgid "sio1Blade"
 msgstr ""
-"Минимальная\n"
-"Средняя\n"
-"Сильная\n"
-"Максимальная"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:95
-msgid ""
-"Off\n"
-"Simple\n"
-"Playstation"
-msgstr ""
-"Выключена\n"
-"Простая\n"
-"Playstation"
+#. *************************************************************************
+#: ../plugins/bladesio1/sio1.ui.h:1 ../win32/gui/AboutDlg.c:48
+#: ../win32/gui/AboutDlg.c:52 ../win32/gui/CheatDlg.c:69
+#: ../win32/gui/CheatDlg.c:119 ../win32/gui/ConfigurePlugins.c:529
+#: ../win32/gui/ConfigurePlugins.c:667 ../win32/gui/WndMain.c:1088
+#: ../win32/gui/WndMain.c:1324
+msgid "OK"
+msgstr "ПРИНЯТЬ"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:111
+#: ../plugins/bladesio1/sio1.ui.h:2
+msgid "CANCEL"
+msgstr "ОТМЕНИТЬ"
+
+#: ../plugins/bladesio1/sio1.ui.h:3
 msgid ""
-"None\n"
-"Simple\n"
-"Gaussian\n"
-"Cubic"
+"Select here if you'll be Server (Player1) or Client (Player2).\n"
+"If you select Server you must Copy your IP address to the Clipboard and "
+"paste if (Ctrl+V) wherever the Client can see it.\n"
+"If you selected Client please enter the IP address the Server gave to you in "
+"the IP Address Control."
 msgstr ""
-"Выключена\n"
-"Линейная\n"
-"Гаусса\n"
-"Кубическая"
+"Выберите здесь сторону: Сервер (Игрок 1) или Клиент (Игрок 2)\n"
+"Если вы выбрали Сервер - скопируйте IP адрес в буфер обмена и вставьте (Ctrl"
+"+V) куда-либо, чтобы Клиент мог его видеть.\n"
+"Если вы выбрали Клиента - введите полученный IP адрес Сервера в "
+"соответствующее поле."
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:132
-msgid "General"
-msgstr "Главные"
+#: ../plugins/bladesio1/sio1.ui.h:9
+msgid "Disabled"
+msgstr "Выключено"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:163
-msgid "Adjust XA speed"
-msgstr "Корректировка скорости проигрывания XA"
+#: ../win32/gui/AboutDlg.c:26
+msgid ""
+"PCSXR - A PlayStation Emulator\n"
+"\n"
+"Original Authors:\n"
+"main coder: linuzappz\n"
+"co-coders: shadow\n"
+"ex-coders: Nocomp, Pete Bernett, nik3d\n"
+"Webmaster: AkumaX"
+msgstr ""
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:167
-msgid "Choose this if XA music is played too quickly."
-msgstr "Установить в том случае, когда XA музыка играет слишком быстро."
+#: ../win32/gui/AboutDlg.c:35
+msgid ""
+"PCSX-df Authors:\n"
+"Ryan Schultz, Andrew Burton, Stephen Chao,\n"
+"Marcus Comstedt, Stefan Sikora\n"
+"\n"
+"PCSX-Reloaded By:\n"
+"edgbla, shalma, Wei Mingzhi, et al.\n"
+"\n"
+"http://pcsxr.codeplex.com/"
+msgstr ""
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:184
-msgid "XA Music"
-msgstr "XA музыка"
+#: ../win32/gui/AboutDlg.c:46
+msgid "About"
+msgstr "О PCSXR"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:215
-msgid "High compatibility mode"
-msgstr "Режим повышенной совместимости"
+#: ../win32/gui/AboutDlg.c:49
+msgid "PCSXR EMU\n"
+msgstr "PCSXR EMU\n"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:219
-msgid "Use the asynchronous SPU interface."
-msgstr "Использовать асинхронный интерфейс SPU"
+#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
+#: ../win32/gui/CheatDlg.c:270
+msgid "Yes"
+msgstr "Да"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:231
-msgid "SPU IRQ Wait"
-msgstr ""
+#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
+#: ../win32/gui/CheatDlg.c:270
+msgid "No"
+msgstr "Нет"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:235
-msgid "Wait for CPU; only useful for some games."
-msgstr "Ожидать CPU; имеет смысл только для некоторых игр."
+#: ../win32/gui/CheatDlg.c:70 ../win32/gui/CheatDlg.c:120
+#: ../win32/gui/ConfigurePlugins.c:530 ../win32/gui/ConfigurePlugins.c:668
+#: ../win32/gui/WndMain.c:1089 ../win32/gui/WndMain.c:1325
+msgid "Cancel"
+msgstr "Отмена"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:247
-msgid "Single channel sound"
-msgstr "Одноканальный звук"
+#: ../win32/gui/CheatDlg.c:168
+msgid "&Add Code"
+msgstr "Добавить код(&A)"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:251
-msgid "Play only one channel for a performance boost."
-msgstr "Проигрывать только один канал, для прироста производительности"
+#: ../win32/gui/CheatDlg.c:169
+msgid "&Edit Code"
+msgstr "Редактировать код(&E):"
 
-#: ../plugins/dfcdrom/cdr-libcdio.c:29 ../plugins/dfcdrom/cdr-linux.c:29
-msgid "CD-ROM Drive Reader"
-msgstr ""
+#: ../win32/gui/CheatDlg.c:170
+msgid "&Remove Code"
+msgstr "Удалить код(&R)"
 
-#: ../plugins/dfcdrom/cdr-null.c:26
-msgid "CDR NULL Plugin"
-msgstr ""
+#: ../win32/gui/CheatDlg.c:171
+msgid "&Enable/Disable"
+msgstr "Включить/Выключить(&E)"
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/main.c:219
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:8
-msgid "CDR configuration"
-msgstr "Настройка CDR"
+#: ../win32/gui/CheatDlg.c:172
+msgid "&Load..."
+msgstr "Загрузить(&L)..."
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:33
-msgid "Choose your CD-ROM device or type its path if it's not listed"
-msgstr ""
-"Выберите CD-привод или введите свой путь, если устройства нету в списке"
+#: ../win32/gui/CheatDlg.c:173
+msgid "&Save As..."
+msgstr "Сохранить как(&S)..."
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:44
-msgid "Select CD-ROM device"
-msgstr "Выберите CD-привод"
+#: ../win32/gui/CheatDlg.c:174
+msgid "&Close"
+msgstr "Закрыть(&C)"
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:72
-msgid "Select read mode:"
-msgstr "Режим чтения:"
+#: ../win32/gui/CheatDlg.c:190
+msgid "Enabled"
+msgstr "Включено"
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:83
-msgid ""
-"Normal (No Cache)\n"
-"Threaded - Faster (With Cache)"
-msgstr ""
-"Обычный (Кеширование недоступно)\n"
-"В отдельном потоке - (Кеширование)"
+#: ../win32/gui/CheatDlg.c:282 ../win32/gui/CheatDlg.c:311
+msgid "PCSXR Cheat Code Files"
+msgstr "Файл чит кодов PCSXR (*.cht)"
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:114
-msgid "Cache Size (Def. 64):"
-msgstr "Размер кеша (по умолчанию 64):"
+#: ../win32/gui/CheatDlg.c:453
+msgid "No addresses found."
+msgstr "Адреса не найдены."
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:159
-msgid "Spindown Time:"
-msgstr "Время до остановки шпинделя cd-привода"
+#: ../win32/gui/CheatDlg.c:505 ../win32/gui/CheatDlg.c:596
+msgid "Address:"
+msgstr "Адрес:"
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:170
-msgid ""
-"Default\n"
-"125ms\n"
-"250ms\n"
-"500ms\n"
-"1s\n"
-"2s\n"
-"4s\n"
-"8s\n"
-"16s\n"
-"32s\n"
-"1min\n"
-"2min\n"
-"4min\n"
-"8min\n"
-"16min\n"
-"32min"
-msgstr ""
-"По умолчанию\n"
-"125мс\n"
-"250мс\n"
-"500мс\n"
-"1с\n"
-"2с\n"
-"4с\n"
-"8с\n"
-"16с\n"
-"32с\n"
-"1мин\n"
-"2мин\n"
-"4мин\n"
-"8мин\n"
-"16мин\n"
-"32мин"
-
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:216
-msgid "Cdrom Speed (Def. 0 = MAX):"
-msgstr "Скорость вращения диска (по умолчанию 0 = максимальная):"
+#: ../win32/gui/CheatDlg.c:566
+#, c-format
+msgid "Freeze %.8X"
+msgstr "Заморозить %.8X"
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:248
-msgid "hseparator"
-msgstr ""
+#: ../win32/gui/CheatDlg.c:685
+msgid "&Freeze"
+msgstr "Заморозить"
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:258
-msgid "Enable subchannel read"
-msgstr "Включить чтение субканальных данных"
+#: ../win32/gui/CheatDlg.c:686
+msgid "&Modify"
+msgstr "Изменить"
 
-#: ../plugins/peopsxgl/gpu.c:61
-msgid "OpenGL Driver"
-msgstr ""
+#: ../win32/gui/CheatDlg.c:687
+msgid "&Copy"
+msgstr "Копировать"
 
-#: ../plugins/peopsxgl/gpu.c:63
-msgid "Pete Bernert"
-msgstr ""
+#: ../win32/gui/CheatDlg.c:688
+msgid "&Search"
+msgstr "Поиск"
 
-#: ../plugins/peopsxgl/gpu.c:64
-msgid ""
-"Based on P.E.Op.S. MesaGL Driver V1.78\n"
-"Coded by Pete Bernert\n"
-msgstr ""
+#: ../win32/gui/CheatDlg.c:689
+msgid "&New Search"
+msgstr "Новый поиск"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:118
-msgid "OpenGL Driver configuration"
-msgstr "Настройка OpenGL Driver"
+#: ../win32/gui/CheatDlg.c:690
+msgid "C&lose"
+msgstr "Закрыть"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:138
-msgid "Textures"
-msgstr "Текстуры"
+#: ../win32/gui/ConfigurePlugins.c:234
+msgid "Simulate Psx Bios"
+msgstr "Симулировать биос psx"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:161
-msgid "Quality:"
-msgstr "Качество:"
+#: ../win32/gui/ConfigurePlugins.c:330
+msgid "Configuration not OK!"
+msgstr "Настройка не завершена!"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:178
-#: ../plugins/peopsxgl/gpucfg/interface.c:191
-msgid "0: don't care - Use driver's default textures"
-msgstr ""
+#: ../win32/gui/ConfigurePlugins.c:445
+msgid "This plugin reports that should work correctly"
+msgstr "Плагин готов к работе"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:179
-msgid "1: 4444 - Fast, but less colorful"
-msgstr ""
+#: ../win32/gui/ConfigurePlugins.c:446
+msgid "This plugin reports that should not work correctly"
+msgstr "Плагин вернул сообщение об ошибке"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:180
-msgid "2: 5551 - Nice colors, bad transparency"
-msgstr ""
+#: ../win32/gui/ConfigurePlugins.c:509
+msgid "Select Plugins Directory"
+msgstr "Каталог с плагинами"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:181
-msgid "3: 8888 - Best colors, more ram needed"
-msgstr ""
+#: ../win32/gui/ConfigurePlugins.c:518
+msgid "Select Bios Directory"
+msgstr "Каталог с биосами"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:182
-msgid "4: BGR8888 - Faster on some cards"
-msgstr ""
+#: ../win32/gui/ConfigurePlugins.c:527
+msgid "Configuration"
+msgstr "Настройка"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:193
-msgid "VRam size in MBytes (0..1024, 0=auto):"
-msgstr "Размер видеопамяти в мегабайтах (0..1024, 0=авто):"
+#: ../win32/gui/ConfigurePlugins.c:531
+msgid "Graphics"
+msgstr "Графика"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:210
-#: ../plugins/peopsxgl/gpucfg/interface.c:225
-msgid "0: None"
-msgstr ""
+#: ../win32/gui/ConfigurePlugins.c:532
+msgid "First Controller"
+msgstr "Первый контроллер"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:211
-msgid "1: Standard - Glitches will happen"
-msgstr ""
+#: ../win32/gui/ConfigurePlugins.c:533
+msgid "Second Controller"
+msgstr "Второй контроллер"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:212
-msgid "2: Extended - No black borders"
-msgstr ""
+#: ../win32/gui/ConfigurePlugins.c:534
+msgid "Sound"
+msgstr "Звук"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:213
-msgid "3: Standard without sprites - unfiltered 2D"
-msgstr ""
+#: ../win32/gui/ConfigurePlugins.c:535
+msgid "Cdrom"
+msgstr "CD-привод"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:214
-msgid "4: Extended without sprites - unfiltered 2D"
-msgstr ""
+#: ../win32/gui/ConfigurePlugins.c:536
+msgid "Link cable"
+msgstr "Соединительный кабель"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:215
-msgid "5: Standard + smoothed sprites"
-msgstr ""
+#: ../win32/gui/ConfigurePlugins.c:537
+msgid "Bios"
+msgstr "Биос"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:216
-msgid "6: Extended + smoothed sprites"
-msgstr ""
+#: ../win32/gui/ConfigurePlugins.c:538
+msgid "Set Bios Directory"
+msgstr "Выберите каталог с биосами"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:227
-msgid "Filtering:"
-msgstr "Фильтрация:"
+#: ../win32/gui/ConfigurePlugins.c:539
+msgid "Set Plugins Directory"
+msgstr "Выберите каталог с плагинами"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:235
-msgid "HiRes Tex:"
-msgstr "HiRes текстуры:"
+#: ../win32/gui/ConfigurePlugins.c:540 ../win32/gui/ConfigurePlugins.c:543
+#: ../win32/gui/ConfigurePlugins.c:546 ../win32/gui/ConfigurePlugins.c:549
+#: ../win32/gui/ConfigurePlugins.c:552 ../win32/gui/ConfigurePlugins.c:555
+#: ../win32/gui/ConfigurePlugins.c:670
+msgid "Configure..."
+msgstr "Настройка..."
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:252
-#: ../plugins/peopsxgl/gpucfg/interface.c:263
-msgid "0: None (standard)"
-msgstr "0: None (стандартный)"
+#: ../win32/gui/ConfigurePlugins.c:541 ../win32/gui/ConfigurePlugins.c:544
+#: ../win32/gui/ConfigurePlugins.c:547 ../win32/gui/ConfigurePlugins.c:550
+#: ../win32/gui/ConfigurePlugins.c:553 ../win32/gui/ConfigurePlugins.c:556
+#: ../win32/gui/ConfigurePlugins.c:671
+msgid "Test..."
+msgstr "Тест..."
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:253
-msgid "1: 2xSaI (much vram needed)"
-msgstr "1: 2xSaI (требуется много видеопамяти)"
+#: ../win32/gui/ConfigurePlugins.c:542 ../win32/gui/ConfigurePlugins.c:545
+#: ../win32/gui/ConfigurePlugins.c:548 ../win32/gui/ConfigurePlugins.c:551
+#: ../win32/gui/ConfigurePlugins.c:554 ../win32/gui/ConfigurePlugins.c:557
+#: ../win32/gui/ConfigurePlugins.c:672
+msgid "About..."
+msgstr "О..."
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:254
-msgid "2: Scaled (needs tex filtering)"
-msgstr "2: Scaled (используется совместно с текстурной фильтрацией)"
+#: ../win32/gui/ConfigurePlugins.c:665
+msgid "NetPlay Configuration"
+msgstr "Настройка сетевой игры"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:265
-msgid "Window options"
-msgstr "Опции окна"
+#: ../win32/gui/ConfigurePlugins.c:673
+msgid ""
+"Note: The NetPlay Plugin Directory should be the same as the other Plugins."
+msgstr ""
+"Внимание! NetPlay плагин должен находится в том же каталоге что и остальные "
+"плагины."
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:296
-msgid "Width:"
-msgstr "Ширина:"
+#: ../win32/gui/plugin.c:94 ../win32/gui/WndMain.c:331
+#, c-format
+msgid "*PCSXR*: Saved State %d"
+msgstr "*PCSXR*: Состояние сохранено %d"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:305
-msgid "Height:"
-msgstr "Высота:"
+#: ../win32/gui/plugin.c:95 ../win32/gui/WndMain.c:332
+#, c-format
+msgid "*PCSXR*: Error Saving State %d"
+msgstr "*PCSXR*: Ошибка сохранения состояния %d"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:314
-msgid "Keep psx aspect ratio"
-msgstr "Сохранять пропорции картинки psx"
+#: ../win32/gui/plugin.c:111 ../win32/gui/WndMain.c:309
+#, c-format
+msgid "*PCSXR*: Loaded State %d"
+msgstr "PCSXR*: Состояние загружено %d"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:330
-msgid "Dithering"
-msgstr "Дизеринг"
+#: ../win32/gui/plugin.c:112 ../win32/gui/WndMain.c:310
+#, c-format
+msgid "*PCSXR*: Error Loading State %d"
+msgstr "*PCSXR*: Ошибка загрузки состояния %d"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:346
-msgid "Framerate"
-msgstr "Частота кадров"
+#: ../win32/gui/plugin.c:123
+#, c-format
+msgid "*PCSXR*: Sio Irq Always Enabled"
+msgstr "*PCSXR*: Удерживание линии прерывания SIO включено"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:369
-msgid "FPS"
-msgstr ""
+#: ../win32/gui/plugin.c:124
+#, c-format
+msgid "*PCSXR*: Sio Irq Not Always Enabled"
+msgstr "*PCSXR*: Удерживание линии прерывания SIO выключено"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:377
-msgid "FPS limit manual"
-msgstr "Ручное ограничение FPS"
+#: ../win32/gui/plugin.c:131
+#, c-format
+msgid "*PCSXR*: Black&White Mdecs Only Enabled"
+msgstr "*PCSXR*: Режим чёрно-белых видео вставок (Mdecs) включен"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:386
-msgid "Show FPS display on startup"
-msgstr "Отображать FPS дисплей при старте"
+#: ../win32/gui/plugin.c:132
+#, c-format
+msgid "*PCSXR*: Black&White Mdecs Only Disabled"
+msgstr "*PCSXR*: Режим чёрно-белых видео вставок (Mdecs) выключен"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:394
-msgid "Use FPS limit"
-msgstr "Включить ограничение FPS"
+#: ../win32/gui/plugin.c:139
+#, c-format
+msgid "*PCSXR*: Xa Enabled"
+msgstr "*PCSXR*: Xa включено"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:402
-msgid "FPS limit auto-detection"
-msgstr "Авто-определение FPS"
+#: ../win32/gui/plugin.c:140
+#, c-format
+msgid "*PCSXR*: Xa Disabled"
+msgstr "*PCSXR*: Xa выключено"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:411
-msgid "Use Frame skipping"
-msgstr "Пропуск кадров"
+#: ../win32/gui/plugin.c:149
+msgid "*PCSXR*: CdRom Case Opened"
+msgstr "*PCSXR*: крышка CD-привода открыта"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:419
-msgid "Compatibility"
-msgstr "Совместимость"
+#: ../win32/gui/plugin.c:155
+msgid "*PCSXR*: CdRom Case Closed"
+msgstr "*PCSXR*: крышка CD-привода закрыта"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:434
-msgid "Advanced blending (Accurate psx color emulation)"
-msgstr "Улучшенное смешивание (более точная эмуляция цветов psx)"
+#: ../win32/gui/plugin.c:181
+msgid "Connecting..."
+msgstr "Соединение..."
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:442
-msgid "Framebuffer textures:"
-msgstr ""
+#: ../win32/gui/plugin.c:183 ../win32/gui/plugin.c:190
+#, c-format
+msgid "Please wait while connecting... %c\n"
+msgstr "Идёт соединение, подождите... %c\n"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:450
-msgid "Offscreen Drawing:"
-msgstr "Внеэкранная отрисовка:"
+#: ../win32/gui/plugin.c:218
+msgid "Error Opening CDR Plugin"
+msgstr "Ошибка открытия CDR плагина"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:458
-msgid "Framebuffer access:"
-msgstr ""
+#: ../win32/gui/plugin.c:281
+#, c-format
+msgid "Error Opening GPU Plugin (%d)"
+msgstr "Ошибка открытия GPU плагина (%d)"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:466
-msgid "Alpha Multipass (correct opaque texture areas)"
-msgstr "Многопроходная отрисовка текстур с прозрачностью"
+#: ../win32/gui/plugin.c:283
+#, c-format
+msgid "Error Opening SPU Plugin (%d)"
+msgstr "Ошибка открытия SPU плагина (%d)"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:474
-msgid "Mask bit detection (needed by a few games, zbuffer)"
-msgstr "Эмуляция маскирования (используется в нескольких играх, zbuffer)"
+#: ../win32/gui/plugin.c:286
+#, c-format
+msgid "Error Opening PAD1 Plugin (%d)"
+msgstr "Ошибка открытия PAD1 плагина (%d)"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:491
-#: ../plugins/peopsxgl/gpucfg/interface.c:504
-msgid "0: None - Fastest, most glitches"
-msgstr ""
+#: ../win32/gui/plugin.c:290
+#, c-format
+msgid "Error Opening PAD2 Plugin (%d)"
+msgstr "Ошибка открытия PAD2 плагина (%d)"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:492
-msgid "1: Minimum - Missing screens"
-msgstr ""
+#: ../win32/gui/plugin.c:295
+#, c-format
+msgid "Error Opening SIO1 plugin (%d)"
+msgstr "Ошибка открытия SIO1 плагина (%d)"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:493
-msgid "2: Standard - OK for most games"
-msgstr ""
+#: ../win32/gui/plugin.c:325
+msgid "Error Closing CDR Plugin"
+msgstr "Ошибка при закрытии CD-ROM плагина (%d)"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:494
-msgid "3: Enhanced - Shows more stuff"
-msgstr ""
+#: ../win32/gui/plugin.c:327
+msgid "Error Closing GPU Plugin"
+msgstr "Ошибка при закрытии GPU плагина"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:495
-msgid "4: Extended - Causing garbage"
-msgstr ""
+#: ../win32/gui/plugin.c:329
+msgid "Error Closing SPU Plugin"
+msgstr "Ошибка при закрытии SPU плагина"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:515
-#: ../plugins/peopsxgl/gpucfg/interface.c:527
-msgid "0: Emulated vram - Needs FVP"
-msgstr ""
+#: ../win32/gui/plugin.c:332
+msgid "Error Closing SIO1 plugin"
+msgstr "Ошибка при закрытии SIO1 плагина"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:516
-msgid "1: Black - Fast, no effects"
-msgstr ""
+#: ../win32/gui/plugin.c:354
+#, c-format
+msgid "CDRinit error: %d"
+msgstr "Ошибка в CDRinit: %d"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:517
-msgid "2: Gfx card buffer - Can be slow"
-msgstr ""
+#: ../win32/gui/plugin.c:356
+#, c-format
+msgid "GPUinit error: %d"
+msgstr "Ошибка в GPUinit: %d"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:518
-msgid "3: Gfx card & soft - slow"
-msgstr ""
+#: ../win32/gui/plugin.c:358
+#, c-format
+msgid "SPUinit error: %d"
+msgstr "Ошибка в SPUinit: %d"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:538
-#: ../plugins/peopsxgl/gpucfg/interface.c:551
-msgid "0: Emulated vram - ok most times"
-msgstr ""
+#: ../win32/gui/plugin.c:360
+#, c-format
+msgid "PAD1init error: %d"
+msgstr "Ошибка в PAD1init: %d"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:539
-msgid "1: Gfx card buffer reads"
-msgstr ""
+#: ../win32/gui/plugin.c:362
+#, c-format
+msgid "PAD2init error: %d"
+msgstr "Ошибка в PAD2init: %d"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:540
-msgid "2: Gfx card buffer moves"
-msgstr ""
+#: ../win32/gui/plugin.c:365
+#, c-format
+msgid "SIO1init error: %d"
+msgstr "Ошибка в SIO1init: %d"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:541
-msgid "3: Gfx buffer reads & moves"
-msgstr ""
+#: ../win32/gui/plugin.c:370
+#, c-format
+msgid "NETinit error: %d"
+msgstr "Ошибка в NETinit: %d"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:542
-msgid "4: Full Software (FVP)"
-msgstr ""
+#: ../win32/gui/WndMain.c:77
+msgid "Arabic"
+msgstr "Арабский"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:553
-msgid "Special game fixes"
-msgstr "Исправления для некоторых игр"
+#: ../win32/gui/WndMain.c:78
+msgid "Catalan"
+msgstr "Каталанский"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:576
-msgid "Battle cursor (FF7)"
-msgstr "Курсор в режиме боя (FF7)"
+#: ../win32/gui/WndMain.c:79
+msgid "German"
+msgstr "Немецкий"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:584
-msgid "Direct FB updates"
-msgstr ""
+#: ../win32/gui/WndMain.c:80
+msgid "Greek"
+msgstr "Греческий"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:592
-msgid "Black brightness (Lunar)"
-msgstr "Чёрный экран в LunarSSSC"
+#: ../win32/gui/WndMain.c:81 ../win32/gui/WndMain.c:1699
+#: ../win32/gui/WndMain.c:1701
+msgid "English"
+msgstr "Английский"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:600
-msgid "Swap front detection"
-msgstr ""
+#: ../win32/gui/WndMain.c:82
+msgid "Spanish"
+msgstr "Испанский"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:608
-msgid "Disable coord check"
-msgstr "Выключить проверку координат"
+#: ../win32/gui/WndMain.c:83
+msgid "French"
+msgstr "Французский"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:616
-msgid "No blue glitches (LoD)"
-msgstr ""
+#: ../win32/gui/WndMain.c:84
+msgid "Italian"
+msgstr "Итальянский"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:624
-msgid "Soft FB access"
-msgstr ""
+#: ../win32/gui/WndMain.c:85
+msgid "Portuguese"
+msgstr "Португальский"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:632
-msgid "PC fps calculation"
-msgstr ""
+#: ../win32/gui/WndMain.c:86
+msgid "Portuguese (Brazilian)"
+msgstr "Португальский (Бразильский)"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:648
-msgid "Yellow rect (FF9)"
-msgstr ""
+#: ../win32/gui/WndMain.c:87
+msgid "Romanian"
+msgstr "Румынский"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:656
-msgid "No subtr. blending"
-msgstr "Отключить вычитающее смешивание"
+#: ../win32/gui/WndMain.c:88
+msgid "Russian"
+msgstr "Русский"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:664
-msgid "Lazy upload (DW7)"
-msgstr "\"Ленивая\" загрузка (DW7)"
+#: ../win32/gui/WndMain.c:89
+msgid "Simplified Chinese"
+msgstr "Китайский упрощенный"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:672
-msgid "Odd/even hack"
-msgstr "Хак бита ODE"
+#: ../win32/gui/WndMain.c:90
+msgid "Traditional Chinese"
+msgstr "Китайский традиционный "
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:680
-msgid "Adjust screen width"
-msgstr "Корректировка ширины экрана"
+#: ../win32/gui/WndMain.c:91
+msgid "Japanese"
+msgstr "Японский"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:688
-msgid "Old texture filtering"
-msgstr "Старый режим текстурной фильтрации"
+#: ../win32/gui/WndMain.c:92
+msgid "Korean"
+msgstr "Корейский"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:696
-msgid "Additional uploads"
+#: ../win32/gui/WndMain.c:215
+msgid ""
+"Usage: pcsxr [options]\n"
+"\toptions:\n"
+"\t-nogui\t\tDon't open the GUI\n"
+"\t-psxout\t\tEnable PSX output\n"
+"\t-slowboot\tEnable BIOS logo\n"
+"\t-runcd\t\tRuns CD-ROM (requires -nogui)\n"
+"\t-cdfile FILE\tRuns a CD image file (requires -nogui)\n"
+"\t-help\t\tDisplay this message"
 msgstr ""
+"Использовать: pcsxr [опции] [файл]\n"
+"\tопции:\n"
+"\t-nogui\t\tНе использовать графический интерфейс\n"
+"\t-psxout\t\tВключить вывод PSX\n"
+"\t-slowboot\t\tВключить загрузку через оболочку BIOS\n"
+"\t-runcd\t\tЗапустить с CD-привода (требует -nogui)\n"
+"\t-cdfile FILE\tЗапустить с файла образа CD (требует -nogui)\n"
+"\t-h -help\tПоказать это сообщение"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:704
-msgid "unused"
-msgstr "не используется"
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:712
-msgid "Fake 'gpu busy'"
-msgstr "Имитация 'занятости' gpu"
-
-#: ../plugins/peopsxgl/gpucfg/interface.c:720
-msgid "Misc"
-msgstr "Разное"
+#: ../win32/gui/WndMain.c:350 ../win32/gui/WndMain.c:396
+msgid "PCSXR State Format"
+msgstr "Формат состояния PCSXR"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:743
-msgid "Scanlines"
-msgstr "Скан-линии"
+#: ../win32/gui/WndMain.c:377
+#, c-format
+msgid "*PCSXR*: Loaded State %s"
+msgstr "*PCSXR*: Состояние загружено %s"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:751
-msgid "Blending (0..255, -1=dot):"
-msgstr "Смешивание (0..255, -1=точка):"
+#: ../win32/gui/WndMain.c:378
+#, c-format
+msgid "*PCSXR*: Error Loading State %s"
+msgstr "*PCSXR*: Ошибка загрузки состояния %s"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:759
-msgid "Screen smoothing (can be slow or unsupported)"
-msgstr "Полноэкранное сглаживание (может быть медленно или неподдерживатся)"
+#: ../win32/gui/WndMain.c:423
+#, c-format
+msgid "*PCSXR*: Saved State %s"
+msgstr "*PCSXR*: Состояние сохранено %s"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:767
-msgid "Use OpenGL extensions (recommended)"
-msgstr "Использовать расширения OpenGL (рекомендуется)"
+#: ../win32/gui/WndMain.c:424
+#, c-format
+msgid "*PCSXR*: Error Saving State %s"
+msgstr "*PCSXR*: Ошибка сохранения состояния %s"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:775
-msgid "Polygon anti-aliasing (slow with most cards)"
-msgstr "Антиалиясинг полигонов (медленно на большинстве карт)"
+#: ../win32/gui/WndMain.c:493
+msgid "Running BIOS is not supported with Internal HLE Bios."
+msgstr ""
+"Стандартная оболочка, позволяющая управлять картами памяти и проигрывать DA "
+"музыку, при использовании HLE-биоса недоступна."
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:783
-msgid "Line mode (polygons will not get filled)"
-msgstr "Режим линий (отрисовываются только края полигонов)"
+#: ../win32/gui/WndMain.c:790
+msgid "Game ID"
+msgstr "Идентификатор игры"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:791
-msgid "Force 15 bit framebuffer updates (faster movies)"
-msgstr ""
+#: ../win32/gui/WndMain.c:796
+msgid "Game"
+msgstr "Игра"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:799
-msgid "Unfiltered MDECs (small movie speedup)"
-msgstr ""
-"Не фильтровать MDECs (некоторый прирост скорости при проигрывании "
-"видеовставок)"
+#: ../win32/gui/WndMain.c:978
+msgid "mid link block"
+msgstr "соединительный блок"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:852
-msgid "Adapted from P.E.Op.S OpenGL GPU by Pete Bernert"
-msgstr "Адаптированно из \"P.E.Op.S OpenGL GPU\" от Pete Bernert"
+#: ../win32/gui/WndMain.c:981
+msgid "terminiting link block"
+msgstr "завершающий соединительный блок"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:861
-msgid "Homepage: http://www.pbernert.com"
-msgstr "Домашняя страница: http://www.pbernert.com"
+#: ../win32/gui/WndMain.c:1086
+msgid "Memcard Manager"
+msgstr "Менеджер карт памяти"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:879
-msgid "Version: 1.78"
-msgstr "Версия: 1.78"
+#: ../win32/gui/WndMain.c:1090 ../win32/gui/WndMain.c:1093
+msgid "Select Mcd"
+msgstr "Выбрать"
 
-#: ../plugins/dfinput/cfg-gtk2.c:48
-msgid "D-Pad Up"
-msgstr ""
+#: ../win32/gui/WndMain.c:1091 ../win32/gui/WndMain.c:1094
+msgid "Format Mcd"
+msgstr "Форматировать"
 
-#: ../plugins/dfinput/cfg-gtk2.c:49
-msgid "D-Pad Down"
-msgstr ""
+#: ../win32/gui/WndMain.c:1092 ../win32/gui/WndMain.c:1095
+msgid "Reload Mcd"
+msgstr "Перезагрузить"
 
-#: ../plugins/dfinput/cfg-gtk2.c:50
-msgid "D-Pad Left"
-msgstr ""
+#: ../win32/gui/WndMain.c:1096
+msgid "-> Copy ->"
+msgstr "-> Копировать ->"
 
-#: ../plugins/dfinput/cfg-gtk2.c:51
-msgid "D-Pad Right"
-msgstr ""
+#: ../win32/gui/WndMain.c:1097
+msgid "<- Copy <-"
+msgstr "<- Копировать <-"
 
-#: ../plugins/dfinput/cfg-gtk2.c:52
-msgid "Cross"
-msgstr ""
+#: ../win32/gui/WndMain.c:1098
+msgid "Paste"
+msgstr "Вставить"
 
-#: ../plugins/dfinput/cfg-gtk2.c:53
-msgid "Circle"
-msgstr ""
+#: ../win32/gui/WndMain.c:1099
+msgid "<- Un/Delete"
+msgstr "<- Восстановить блок"
 
-#: ../plugins/dfinput/cfg-gtk2.c:54
-msgid "Square"
-msgstr ""
+#: ../win32/gui/WndMain.c:1100
+msgid "Un/Delete ->"
+msgstr "Восстановить блок ->"
 
-#: ../plugins/dfinput/cfg-gtk2.c:55
-msgid "Triangle"
-msgstr ""
+#: ../win32/gui/WndMain.c:1102
+msgid "Memory Card 1"
+msgstr "Карта памяти 1"
 
-#: ../plugins/dfinput/cfg-gtk2.c:56
-msgid "L1"
-msgstr ""
+#: ../win32/gui/WndMain.c:1103
+msgid "Memory Card 2"
+msgstr "Карта памяти 2"
 
-#: ../plugins/dfinput/cfg-gtk2.c:57
-msgid "R1"
-msgstr ""
+#: ../win32/gui/WndMain.c:1158
+msgid "Are you sure you want to paste this selection?"
+msgstr "Вы уверены в том, что хотите вставить выделенное?"
 
-#: ../plugins/dfinput/cfg-gtk2.c:58
-msgid "L2"
-msgstr ""
+#: ../win32/gui/WndMain.c:1158 ../win32/gui/WndMain.c:1269
+#: ../win32/gui/WndMain.c:1276
+msgid "Confirmation"
+msgstr "Подтверждение"
 
-#: ../plugins/dfinput/cfg-gtk2.c:59
-msgid "R2"
-msgstr ""
+#: ../win32/gui/WndMain.c:1269 ../win32/gui/WndMain.c:1276
+msgid "Are you sure you want to format this Memory Card?"
+msgstr "Вы уверены в том, что хотите отформатировать карту памяти?"
 
-#: ../plugins/dfinput/cfg-gtk2.c:60
-msgid "Select"
-msgstr ""
+#: ../win32/gui/WndMain.c:1322
+msgid "Cpu Config"
+msgstr "Настройка ЦПУ"
 
-#: ../plugins/dfinput/cfg-gtk2.c:61
-msgid "Start"
-msgstr ""
+#: ../win32/gui/WndMain.c:1327
+msgid "Disable Xa Decoding"
+msgstr "Отключить декодирование XA"
 
-#: ../plugins/dfinput/cfg-gtk2.c:62
-msgid "L3"
-msgstr ""
+#: ../win32/gui/WndMain.c:1328
+msgid "Sio Irq Always Enabled"
+msgstr "Удерживание линии прерывания SIO"
 
-#: ../plugins/dfinput/cfg-gtk2.c:63
-msgid "R3"
-msgstr ""
+#: ../win32/gui/WndMain.c:1329
+msgid "Black && White Movies"
+msgstr "Чёрно-белые заставки"
 
-#: ../plugins/dfinput/cfg-gtk2.c:67
-msgid "L-Stick Right"
-msgstr ""
+#: ../win32/gui/WndMain.c:1330
+msgid "Disable Cd audio"
+msgstr "Выключить CD музыку"
 
-#: ../plugins/dfinput/cfg-gtk2.c:68
-msgid "L-Stick Left"
-msgstr ""
+#: ../win32/gui/WndMain.c:1333
+msgid "Enable Interpreter Cpu"
+msgstr "Включить интерпретатор ЦПУ"
 
-#: ../plugins/dfinput/cfg-gtk2.c:69
-msgid "L-Stick Down"
-msgstr ""
+#: ../win32/gui/WndMain.c:1336
+msgid "Spu Irq Always Enabled"
+msgstr "Удерживание линии прерывания SPU"
 
-#: ../plugins/dfinput/cfg-gtk2.c:70
-msgid "L-Stick Up"
-msgstr ""
+#: ../win32/gui/WndMain.c:1340
+msgid "Hide cursor"
+msgstr "Скрыть курсор"
 
-#: ../plugins/dfinput/cfg-gtk2.c:71
-msgid "R-Stick Right"
-msgstr ""
+#: ../win32/gui/WndMain.c:1343
+msgid "Psx System Type"
+msgstr "Тип системы psx"
 
-#: ../plugins/dfinput/cfg-gtk2.c:72
-msgid "R-Stick Left"
-msgstr ""
+#: ../win32/gui/WndMain.c:1453
+msgid "Psx Mcd Format (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
+msgstr "Форматы карт памяти psx (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:73
-msgid "R-Stick Down"
-msgstr ""
+#: ../win32/gui/WndMain.c:1458
+msgid "Psx Memory Card (*.mcr;*.mc)"
+msgstr "Карта памяти psx (*.mcr;*.mc)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:74
-msgid "R-Stick Up"
-msgstr ""
+#: ../win32/gui/WndMain.c:1463
+msgid "CVGS Memory Card (*.mem;*.vgs)"
+msgstr "Карта памяти CVGS (*.mem;*.vgs)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
-msgid "Centered"
-msgstr "Отцентровано"
+#: ../win32/gui/WndMain.c:1468
+msgid "Bleem Memory Card (*.mcd)"
+msgstr "Карта памяти Bleem (*.mcd)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
-msgid "Up"
-msgstr ""
+#: ../win32/gui/WndMain.c:1473
+msgid "DexDrive Memory Card (*.gme)"
+msgstr "Карта памяти DexDrive (*.gme)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
-msgid "Right"
-msgstr ""
+#: ../win32/gui/WndMain.c:1478
+msgid "DataDeck Memory Card (*.ddf)"
+msgstr "Карта памяти DataDeck (*.ddf)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
-msgid "Rightup"
-msgstr ""
+#: ../win32/gui/WndMain.c:1522
+msgid "Psx Exe Format"
+msgstr "Psx exe формат"
 
-#: ../plugins/dfinput/cfg-gtk2.c:104 ../plugins/dfinput/cfg-gtk2.c:143
-msgid "Down"
-msgstr ""
+#: ../win32/gui/WndMain.c:1559
+msgid "Psx Isos (*.iso;*.mdf;*.img;*.bin;*.cue;*.pbp;*.cbn)"
+msgstr "Образы диска psx (*.iso;*.mdf;*.img;*.bin;*.cue;*.pbp;*.cbn)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:104 ../plugins/dfinput/cfg-gtk2.c:143
-msgid "Rightdown"
-msgstr ""
+#: ../win32/gui/WndMain.c:1635
+msgid "&File"
+msgstr "Файл(&F)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:104 ../plugins/dfinput/cfg-gtk2.c:143
-msgid "Left"
-msgstr ""
+#: ../win32/gui/WndMain.c:1636
+msgid "E&xit"
+msgstr "Выход(&X)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:104 ../plugins/dfinput/cfg-gtk2.c:143
-msgid "Leftup"
-msgstr ""
+#: ../win32/gui/WndMain.c:1638
+msgid "Run &EXE..."
+msgstr "Запустить EXE"
 
-#: ../plugins/dfinput/cfg-gtk2.c:105 ../plugins/dfinput/cfg-gtk2.c:144
-msgid "Leftdown"
-msgstr ""
+#: ../win32/gui/WndMain.c:1639
+msgid "Run &BIOS"
+msgstr "Запустить BIOS"
 
-#: ../plugins/dfinput/cfg-gtk2.c:109 ../plugins/dfinput/cfg-gtk2.c:148
-#, c-format
-msgid "Joystick: Button %d"
-msgstr "Джойстик: Кнопка %d"
+#: ../win32/gui/WndMain.c:1640
+msgid "Run &ISO..."
+msgstr "Запустить ISO"
 
-#: ../plugins/dfinput/cfg-gtk2.c:113 ../plugins/dfinput/cfg-gtk2.c:152
-#, c-format
-msgid "Joystick: Axis %d%c"
-msgstr "Джойстик: Ось %d%c"
+#: ../win32/gui/WndMain.c:1641
+msgid "Run &CD"
+msgstr "Запустить CD"
 
-#: ../plugins/dfinput/cfg-gtk2.c:118 ../plugins/dfinput/cfg-gtk2.c:157
-#, c-format
-msgid "Joystick: Hat %d %s"
-msgstr "Джойстик: Крестовина %d %s"
+#: ../win32/gui/WndMain.c:1643
+msgid "&Emulator"
+msgstr "Эмулятор(&E)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:133 ../plugins/dfinput/cfg-gtk2.c:172
-msgid "Keyboard:"
-msgstr "Клавиатура:"
+#: ../win32/gui/WndMain.c:1644
+msgid "&States"
+msgstr "Состояния(&S)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:137 ../plugins/dfinput/cfg-gtk2.c:176
-msgid "(Not Set)"
-msgstr "(Не установлено)"
+#: ../win32/gui/WndMain.c:1646
+msgid "S&witch ISO..."
+msgstr "Изменить ISO(&W)..."
 
-#: ../plugins/dfinput/cfg-gtk2.c:539
-msgid "None"
-msgstr "Нету"
+#: ../win32/gui/WndMain.c:1648
+msgid "S&hutdown"
+msgstr "Выключить(&H)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:581
-msgid "Gamepad/Keyboard Input Configuration"
-msgstr "Настройка Gamepad/Keyboard"
+#: ../win32/gui/WndMain.c:1649
+msgid "Re&set"
+msgstr "Сброс(&S)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:587 ../plugins/dfinput/cfg-gtk2.c:607
-msgid "Key"
-msgstr "Клавиша"
+#: ../win32/gui/WndMain.c:1650
+msgid "&Run"
+msgstr "Старт(&R)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:593 ../plugins/dfinput/cfg-gtk2.c:613
-msgid "Button"
-msgstr "Кнопка"
+#: ../win32/gui/WndMain.c:1651
+msgid "&Save"
+msgstr "Сохранить(&S)"
 
-#: ../plugins/dfinput/pad.c:22
-msgid "Gamepad/Keyboard Input"
-msgstr ""
+#: ../win32/gui/WndMain.c:1652
+msgid "&Load"
+msgstr "Загрузить(&L)"
 
-#: ../plugins/dfinput/dfinput.glade2:35 ../plugins/dfinput/dfinput.glade2:232
-msgid "Device:"
-msgstr "Устройство:"
+#: ../win32/gui/WndMain.c:1653 ../win32/gui/WndMain.c:1663
+msgid "&Other..."
+msgstr "Другой(&O)..."
 
-#: ../plugins/dfinput/dfinput.glade2:66 ../plugins/dfinput/dfinput.glade2:263
-msgid "Type:"
-msgstr "Тип:"
+#: ../win32/gui/WndMain.c:1654 ../win32/gui/WndMain.c:1664
+msgid "Slot &9"
+msgstr "Слот &9"
 
-#: ../plugins/dfinput/dfinput.glade2:78 ../plugins/dfinput/dfinput.glade2:275
-msgid ""
-"Digital Pad\n"
-"Analog Pad"
-msgstr ""
-"Стандартный контроллер\n"
-"Аналоговый контроллер"
+#: ../win32/gui/WndMain.c:1655 ../win32/gui/WndMain.c:1665
+msgid "Slot &8"
+msgstr "Слот &8"
 
-#: ../plugins/dfinput/dfinput.glade2:149 ../plugins/dfinput/dfinput.glade2:346
-msgid "Change"
-msgstr "Изменить"
+#: ../win32/gui/WndMain.c:1656 ../win32/gui/WndMain.c:1666
+msgid "Slot &7"
+msgstr "Слот &7"
 
-#: ../plugins/dfinput/dfinput.glade2:185 ../plugins/dfinput/dfinput.glade2:382
-msgid "Reset"
-msgstr "Сброс"
+#: ../win32/gui/WndMain.c:1657 ../win32/gui/WndMain.c:1667
+msgid "Slot &6"
+msgstr "Слот &6"
 
-#: ../plugins/dfinput/dfinput.glade2:210
-msgid "Controller 1"
-msgstr "Контроллер 1"
+#: ../win32/gui/WndMain.c:1658 ../win32/gui/WndMain.c:1668
+msgid "Slot &5"
+msgstr "Слот 5(&5)"
 
-#: ../plugins/dfinput/dfinput.glade2:412
-msgid "Controller 2"
-msgstr "Контроллер 2"
+#: ../win32/gui/WndMain.c:1659 ../win32/gui/WndMain.c:1669
+msgid "Slot &4"
+msgstr "Слот 4(&4)"
 
-#: ../plugins/dfinput/dfinput.glade2:427
-msgid "Multi-Threaded (Recommended)"
-msgstr "В отдельном потоке (Рекомендуется)"
+#: ../win32/gui/WndMain.c:1660 ../win32/gui/WndMain.c:1670
+msgid "Slot &3"
+msgstr "Слот 3(&3)"
 
-#: ../plugins/dfnet/dfnet.c:23
-msgid "Socket Driver"
-msgstr ""
+#: ../win32/gui/WndMain.c:1661 ../win32/gui/WndMain.c:1671
+msgid "Slot &2"
+msgstr "Слот 2(&2)"
 
-#: ../plugins/dfnet/dfnet.c:161
-#, c-format
-msgid "error connecting to %s: %s\n"
-msgstr "Ошибка соединения с %s: %s\n"
+#: ../win32/gui/WndMain.c:1662 ../win32/gui/WndMain.c:1672
+msgid "Slot &1"
+msgstr "Слот 1(&1)"
 
-#: ../plugins/dfnet/dfnet.c:186
-msgid "Error allocating memory!\n"
-msgstr "Ошибка выделения памяти!\n"
+#: ../win32/gui/WndMain.c:1674
+msgid "&Configuration"
+msgstr "Настройка(&C)"
 
-#: ../plugins/dfnet/gui.c:39
-msgid "Nothing to configure"
-msgstr "Не подлежит настройке"
+#: ../win32/gui/WndMain.c:1675
+msgid "Cheat &Search..."
+msgstr "Поиск читов...(&S)"
 
-#: ../plugins/dfnet/gui.c:95
-#, c-format
-msgid "IP %s"
-msgstr ""
+#: ../win32/gui/WndMain.c:1676
+msgid "Ch&eat Code..."
+msgstr "Чит код...(&E)"
 
-#: ../plugins/dfnet/gui.c:165
-msgid "Waiting for connection..."
-msgstr "Ожидание соединения..."
+#: ../win32/gui/WndMain.c:1679
+msgid "&Language"
+msgstr "Язык(&L)"
 
-#: ../plugins/dfnet/gui.c:168
-msgid "The Client should now Start a Connection, waiting..."
-msgstr "Ожидание соединения с клиентом..."
+#: ../win32/gui/WndMain.c:1705
+msgid "&Memory cards..."
+msgstr "Карты памяти(&M)..."
 
-#: ../plugins/dfnet/dfnet.glade2:23
-msgid ""
-"Select here if you'll be Server (Player1) or Client (Player2).\n"
-"\n"
-"If you select Server you must Copy your IP address to the Clipboard and "
-"paste if (Ctrl+V) wherever the Client can see it.\n"
-"\n"
-"If you selected Client please enter the IP address the Server gave to you in "
-"the IP Address Control."
-msgstr ""
-"Выберите здесь сторону: Сервер (Игрок 1) или Клиент (Игрок 2)\n"
-"\n"
-"Если вы выбрали Сервер - скопируйте IP адрес в буфер обмена и вставьте (Ctrl"
-"+V) куда-либо, чтобы Клиент мог его видеть.\n"
-"\n"
-"Если вы выбрали Клиента - введите полученный IP адрес Сервера в "
-"соответствующее поле."
+#: ../win32/gui/WndMain.c:1706
+msgid "C&PU..."
+msgstr "ЦПУ(&P)..."
 
-#: ../plugins/dfnet/dfnet.glade2:63
-msgid "Copy PC IP to Clipboard"
-msgstr "Скопировать IP адрес в буфер обмена"
+#: ../win32/gui/WndMain.c:1708
+msgid "&NetPlay..."
+msgstr "Сетевая игра..."
 
-#: ../plugins/dfnet/dfnet.glade2:94
-msgid "Server (Player1)"
-msgstr "Сервер (Игрок 1)"
+#: ../win32/gui/WndMain.c:1710
+msgid "&Link cable..."
+msgstr "Соединительный кабель..."
 
-#: ../plugins/dfnet/dfnet.glade2:104
-msgid "Client (Player2)"
-msgstr "Клиент (Игрок 2)"
+#: ../win32/gui/WndMain.c:1711
+msgid "&Controllers..."
+msgstr "Управление..."
 
-#: ../plugins/dfnet/dfnet.glade2:130
-msgid ""
-"Do not change if not necessary (remember it must be changed on both sides)."
-msgstr ""
-"Не меняйте без особой необходимости (помните что порты должны быть одинаковы "
-"для обеих сторон)"
+#: ../win32/gui/WndMain.c:1712
+msgid "CD-&ROM..."
+msgstr "CD-привод(&R)..."
 
-#: ../plugins/dfnet/dfnet.glade2:143
-msgid "Port Number"
-msgstr "Номер порта"
+#: ../win32/gui/WndMain.c:1713
+msgid "&Sound..."
+msgstr "Звук..."
 
-#: ../plugins/dfnet/dfnet.glade2:202
-msgid "Start Game"
-msgstr "Начать сетевую игру"
+#: ../win32/gui/WndMain.c:1714
+msgid "&Graphics..."
+msgstr "Графика..."
 
-#: ../plugins/dfnet/dfnet.glade2:240
-msgid "Play Offline"
-msgstr "Начать без использования сети"
+#: ../win32/gui/WndMain.c:1716
+msgid "&Plugins && Bios..."
+msgstr "Плагины и биос(&P)..."
 
-#: ../plugins/bladesio1/sio1.c:29
-msgid "Sio1 Driver"
-msgstr ""
+#: ../win32/gui/WndMain.c:1718
+msgid "&Help"
+msgstr "Помощь(&H)"
 
-#, fuzzy
-#~ msgid "CD-ROM Device Reader"
-#~ msgstr "Выберите CD-привод"
+#: ../win32/gui/WndMain.c:1719
+msgid "&About..."
+msgstr "О(&A)..."
 
-#~ msgid "Error Closing PAD1 Plugin"
-#~ msgstr "Ошибка при закрытии PAD1 плагина"
+#: ../win32/gui/WndMain.c:1870
+msgid "Pcsxr Msg"
+msgstr "Сообщение pcsxr"
 
-#~ msgid "Error Closing PAD2 Plugin"
-#~ msgstr "Ошибка при закрытии PAD2 плагина"
+#: ../win32/gui/WndMain.c:1873
+msgid "Error Loading Symbol"
+msgstr "Ошибка загрузки символа"
 
-#~ msgid "Internal HLE Bios"
-#~ msgstr "Внутренний HLE-биос"
+#~ msgid "Controller 1: "
+#~ msgstr "Контроллер 1:"

pcsxr-1.9.92.tar.bz2/po/zh_CN.po -> pcsxr-1.9.93.tar.bz2/po/zh_CN.po Changed

@@ -6,1681 +6,1810 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: pcsxr 1.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-10 14:04+0800\n"
-"PO-Revision-Date: 2010-07-13 14:36+0800\n"
+"Report-Msgid-Bugs-To: whistler_wmz@users.sf.net\n"
+"POT-Creation-Date: 2013-03-02 03:33+0400\n"
+"PO-Revision-Date: 2012-10-23 17:31+0800\n"
 "Last-Translator: Wei Mingzhi <whistler_wmz@users.sf.net>\n"
 "Language-Team: Simplified Chinese <whistler@openoffice.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../win32/gui/AboutDlg.c:26
-msgid ""
-"PCSX - A PlayStation Emulator\n"
-"\n"
-"Original Authors:\n"
-"main coder: linuzappz\n"
-"co-coders: shadow\n"
-"ex-coders: Nocomp, Pete Bernett, nik3d\n"
-"Webmaster: AkumaX"
-msgstr ""
-"PCSX - 一个 PlayStation 模拟器\n"
-"\n"
-"原作者:\n"
-"主程序员: linuzappz\n"
-"辅助程序员: shadow\n"
-"前程序员: Nocomp, Pete Bernett, nik3d\n"
-"网络管理: AkumaX"
+#: ../data/pcsxr.ui.h:1 ../win32/gui/CheatDlg.c:166
+msgid "Edit Cheat Codes"
+msgstr "编辑作弊码"
 
-#: ../win32/gui/AboutDlg.c:35
-msgid ""
-"PCSX-df Authors:\n"
-"Ryan Schultz, Andrew Burton, Stephen Chao,\n"
-"Marcus Comstedt, Stefan Sikora\n"
-"\n"
-"PCSX-Reloaded By:\n"
-"Blade_Arma, Wei Mingzhi, et al.\n"
-"\n"
-"http://pcsxr.codeplex.com/"
+#: ../data/pcsxr.ui.h:2
+msgid "Cheat Codes"
+msgstr "作弊码"
+
+#: ../data/pcsxr.ui.h:3 ../gui/Cheat.c:1113 ../win32/gui/CheatDlg.c:678
+msgid "Cheat Search"
+msgstr "查找作弊码"
+
+#: ../data/pcsxr.ui.h:4 ../win32/gui/CheatDlg.c:680
+msgid "Search For:"
+msgstr "查找:"
+
+#: ../data/pcsxr.ui.h:5 ../win32/gui/CheatDlg.c:681
+msgid "Data Type:"
+msgstr "数据类型:"
+
+#: ../data/pcsxr.ui.h:6 ../gui/Cheat.c:645 ../win32/gui/CheatDlg.c:506
+#: ../win32/gui/CheatDlg.c:597 ../win32/gui/CheatDlg.c:682
+msgid "Value:"
+msgstr "值:"
+
+#: ../data/pcsxr.ui.h:7 ../win32/gui/CheatDlg.c:683
+msgid "Data Base:"
+msgstr "数据基:"
+
+#: ../data/pcsxr.ui.h:8 ../win32/gui/CheatDlg.c:684
+msgid "To:"
+msgstr "到:"
+
+#: ../data/pcsxr.ui.h:9 ../win32/gui/CheatDlg.c:504
+msgid "Freeze"
+msgstr "固定"
+
+#: ../data/pcsxr.ui.h:10 ../win32/gui/CheatDlg.c:595
+msgid "Modify"
+msgstr "修改"
+
+#: ../data/pcsxr.ui.h:11
+msgid "Copy"
+msgstr "复制"
+
+#: ../data/pcsxr.ui.h:12
+msgid "label_resultsfound"
+msgstr "label_resultsfound"
+
+#: ../data/pcsxr.ui.h:13
+msgid "Search"
+msgstr "查找"
+
+#: ../data/pcsxr.ui.h:14
+msgid "Restart"
+msgstr "复位"
+
+#: ../data/pcsxr.ui.h:15
+msgid "Cheat Search"
+msgstr "作弊码查找"
+
+#: ../data/pcsxr.ui.h:16 ../gui/ConfDlg.c:113
+msgid "Configure PCSXR"
+msgstr "配置 PCSXR"
+
+#: ../data/pcsxr.ui.h:17
+msgid "Graphics:"
+msgstr "图像:"
+
+#: ../data/pcsxr.ui.h:18
+msgid "Sound:"
+msgstr "声音:"
+
+#: ../data/pcsxr.ui.h:19
+#, fuzzy
+msgid "Controller 1:"
+msgstr "控制器 1"
+
+#: ../data/pcsxr.ui.h:20
+msgid "Controller 2:"
+msgstr "控制器 2:"
+
+#: ../data/pcsxr.ui.h:21
+msgid "CD-ROM:"
+msgstr "CD-ROM:"
+
+#: ../data/pcsxr.ui.h:22
+msgid "Search in:"
+msgstr "在此处查找插件:"
+
+#: ../data/pcsxr.ui.h:23
+msgid "Select Folder to Search"
+msgstr "选择要查找的文件夹"
+
+#: ../data/pcsxr.ui.h:24
+#, fuzzy
+msgid "Link cable:"
+msgstr "连接线"
+
+#: ../data/pcsxr.ui.h:25
+msgid "Plugins"
+msgstr "插件"
+
+#: ../data/pcsxr.ui.h:26
+msgid "BIOS:"
 msgstr ""
-"PCSX-df 开发者:\n"
-"Ryan Schultz, Andrew Burton, Stephen Chao,\n"
-"Marcus Comstedt, Stefan Sikora\n"
-"\n"
-"PCSX-Reloaded 开发者:\n"
-"Blade_Arma, Wei Mingzhi, et al.\n"
-"\n"
-"http://pcsxr.codeplex.com/"
 
-#: ../win32/gui/AboutDlg.c:46
-#: ../plugins/peopsxgl/gpucfg/interface.c:831
-msgid "About"
-msgstr "关于 PCSX"
-
-#: ../win32/gui/AboutDlg.c:48
-#: ../win32/gui/AboutDlg.c:52
-#: ../win32/gui/CheatDlg.c:69
-#: ../win32/gui/CheatDlg.c:119
-#: ../win32/gui/ConfigurePlugins.c:483
-#: ../win32/gui/ConfigurePlugins.c:614
-#: ../win32/gui/WndMain.c:974
-#: ../win32/gui/WndMain.c:1210
-#: ../plugins/peopsxgl/gpucfg/interface.c:130
-#: ../plugins/peopsxgl/gpucfg/interface.c:843
-msgid "OK"
-msgstr "确定"
+#: ../data/pcsxr.ui.h:27
+msgid "BIOS"
+msgstr "BIOS"
 
-#: ../win32/gui/AboutDlg.c:49
-msgid "PCSX EMU\n"
-msgstr "PCSX 模拟器\n"
+#: ../data/pcsxr.ui.h:28
+msgid "Configure CPU"
+msgstr "配置 CPU"
 
-#: ../win32/gui/CheatDlg.c:51
-#: ../win32/gui/CheatDlg.c:223
-#: ../win32/gui/CheatDlg.c:270
-msgid "Yes"
-msgstr "是"
+#: ../data/pcsxr.ui.h:29
+msgid "SPU IRQ Always Enabled"
+msgstr "SPU IRQ 总是启用"
 
-#: ../win32/gui/CheatDlg.c:51
-#: ../win32/gui/CheatDlg.c:223
-#: ../win32/gui/CheatDlg.c:270
-msgid "No"
-msgstr "否"
+#: ../data/pcsxr.ui.h:30
+msgid "Black & White Movies"
+msgstr "黑白电影"
 
-#: ../win32/gui/CheatDlg.c:66
-#: ../gui/Cheat.c:194
-msgid "Edit Cheat"
-msgstr "编辑作弊码"
+#: ../data/pcsxr.ui.h:31 ../gui/Plugin.c:239
+#, c-format
+msgid "SIO IRQ Always Enabled"
+msgstr "SIO IRQ 总是启用"
 
-#: ../win32/gui/CheatDlg.c:67
-#: ../win32/gui/CheatDlg.c:117
-#: ../gui/Cheat.c:636
-msgid "Description:"
-msgstr "描述:"
+#: ../data/pcsxr.ui.h:32
+msgid "Disable XA Decoding"
+msgstr "禁用 XA 解码"
 
-#: ../win32/gui/CheatDlg.c:68
-#: ../win32/gui/CheatDlg.c:118
-#: ../gui/Cheat.c:125
-#: ../gui/Cheat.c:211
-msgid "Cheat Code:"
-msgstr "作弊码:"
+#: ../data/pcsxr.ui.h:33
+msgid "Disable CD Audio"
+msgstr "禁用 CD 音频"
 
-#: ../win32/gui/CheatDlg.c:70
-#: ../win32/gui/CheatDlg.c:120
-#: ../win32/gui/ConfigurePlugins.c:484
-#: ../win32/gui/ConfigurePlugins.c:615
-#: ../win32/gui/WndMain.c:975
-#: ../win32/gui/WndMain.c:1211
-#: ../plugins/peopsxgl/gpucfg/interface.c:338
-msgid "Cancel"
-msgstr "取消"
+#: ../data/pcsxr.ui.h:34 ../win32/gui/WndMain.c:1331
+msgid "Slow Boot"
+msgstr "慢速启动"
 
-#: ../win32/gui/CheatDlg.c:91
-#: ../win32/gui/CheatDlg.c:132
-#: ../gui/Cheat.c:155
-#: ../gui/Cheat.c:251
-msgid "Invalid cheat code!"
-msgstr "非法作弊码!"
+#: ../data/pcsxr.ui.h:35
+msgid "Enable Interpreter CPU"
+msgstr "启用解释执行 CPU"
 
-#: ../win32/gui/CheatDlg.c:116
-#: ../gui/Cheat.c:109
-msgid "Add New Cheat"
-msgstr "添加新作弊码"
+#: ../data/pcsxr.ui.h:36 ../win32/gui/WndMain.c:1334
+msgid "Enable Console Output"
+msgstr "启用控制台输出"
 
-#: ../win32/gui/CheatDlg.c:166
-#: ../data/pcsx.glade2:2534
-msgid "Edit Cheat Codes"
-msgstr "编辑作弊码"
+#: ../data/pcsxr.ui.h:37 ../win32/gui/WndMain.c:1335
+msgid "Enable Debugger"
+msgstr "启用调试器"
 
-#: ../win32/gui/CheatDlg.c:168
-msgid "&Add Code"
-msgstr "添加作弊码(&A)"
+#: ../data/pcsxr.ui.h:38 ../win32/gui/WndMain.c:1337
+msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
+msgstr "Parasite Eve 2, Vandal Hearts 1/2 修正"
 
-#: ../win32/gui/CheatDlg.c:169
-msgid "&Edit Code"
-msgstr "编辑作弊码(&E)"
+#: ../data/pcsxr.ui.h:39 ../win32/gui/WndMain.c:1338
+msgid "InuYasha Sengoku Battle Fix"
+msgstr "InuYasha Sengoku Battle 修正"
 
-#: ../win32/gui/CheatDlg.c:170
-msgid "&Remove Code"
-msgstr "删除作弊码(&R)"
+#: ../data/pcsxr.ui.h:40 ../win32/gui/WndMain.c:1339
+msgid "Widescreen (GTE Hack)"
+msgstr "宽屏 (GTE Hack)"
 
-#: ../win32/gui/CheatDlg.c:171
-msgid "&Enable/Disable"
-msgstr "启用/禁用(&E)"
+#: ../data/pcsxr.ui.h:41
+msgid "Options"
+msgstr "选项"
 
-#: ../win32/gui/CheatDlg.c:172
-msgid "&Load..."
-msgstr "读取(&L)..."
+#: ../data/pcsxr.ui.h:42 ../win32/gui/WndMain.c:1332
+msgid "Autodetect"
+msgstr "自动检测"
 
-#: ../win32/gui/CheatDlg.c:173
-msgid "&Save As..."
-msgstr "另存为(&S)"
+#: ../data/pcsxr.ui.h:43
+msgid "System Type"
+msgstr "系统类型"
 
-#: ../win32/gui/CheatDlg.c:174
-msgid "&Close"
-msgstr "关闭(&C)"
+#: ../data/pcsxr.ui.h:44
+msgid "PCSXR"
+msgstr "PCSXR"
 
-#: ../win32/gui/CheatDlg.c:185
-#: ../gui/Cheat.c:413
-msgid "Description"
-msgstr "描述"
+#: ../data/pcsxr.ui.h:45
+msgid "_File"
+msgstr "文件(_F)"
 
-#: ../win32/gui/CheatDlg.c:190
-msgid "Enabled"
-msgstr "启用"
+#: ../data/pcsxr.ui.h:46
+msgid "Run _CD"
+msgstr "运行光盘(_C)"
 
-#: ../win32/gui/CheatDlg.c:282
-#: ../win32/gui/CheatDlg.c:311
-msgid "PCSX Cheat Code Files"
-msgstr "PCSX 作弊码文件"
+#: ../data/pcsxr.ui.h:47
+msgid "Run _ISO..."
+msgstr "运行 _ISO..."
 
-#: ../win32/gui/CheatDlg.c:402
-msgid "Equal Value"
-msgstr "等于数值"
+#: ../data/pcsxr.ui.h:48
+msgid "Run _BIOS"
+msgstr "运行 _BIOS"
 
-#: ../win32/gui/CheatDlg.c:403
-msgid "Not Equal Value"
-msgstr "不等于数值"
+#: ../data/pcsxr.ui.h:49
+msgid "Run _EXE..."
+msgstr "运行 _EXE..."
 
-#: ../win32/gui/CheatDlg.c:404
-msgid "Range"
-msgstr "范围"
+#: ../data/pcsxr.ui.h:50
+msgid "E_xit"
+msgstr "退出(_X)"
 
-#: ../win32/gui/CheatDlg.c:407
-msgid "Increased By"
-msgstr "增加数值"
+#: ../data/pcsxr.ui.h:51
+msgid "_Emulator"
+msgstr "模拟器(_E)"
 
-#: ../win32/gui/CheatDlg.c:408
-msgid "Decreased By"
-msgstr "减少数值"
+#: ../data/pcsxr.ui.h:52
+msgid "_Continue"
+msgstr "继续(_C)"
 
-#: ../win32/gui/CheatDlg.c:409
-msgid "Increased"
-msgstr "增加"
+#: ../data/pcsxr.ui.h:53
+msgid "_Reset"
+msgstr "复位(_R)"
 
-#: ../win32/gui/CheatDlg.c:410
-msgid "Decreased"
-msgstr "减少"
+#: ../data/pcsxr.ui.h:54
+msgid "_Shutdown"
+msgstr "关闭(_S)"
 
-#: ../win32/gui/CheatDlg.c:411
-msgid "Different"
-msgstr "不同"
+#: ../data/pcsxr.ui.h:55
+msgid "S_witch ISO..."
+msgstr "更换 ISO(_W)..."
 
-#: ../win32/gui/CheatDlg.c:412
-msgid "No Change"
-msgstr "无改变"
+#: ../data/pcsxr.ui.h:56
+msgid "_Save State"
+msgstr "即时存档(_S)"
 
-#: ../win32/gui/CheatDlg.c:448
-#: ../gui/Cheat.c:585
-msgid "Enter the values and start your search."
-msgstr "输入数值并开始查找。"
+#: ../data/pcsxr.ui.h:57
+msgid "Slot _1"
+msgstr "存档 _1"
 
-#: ../win32/gui/CheatDlg.c:453
-msgid "No addresses found."
-msgstr "未找到地址。"
+#: ../data/pcsxr.ui.h:58
+msgid "Slot _2"
+msgstr "存档 _2"
 
-#: ../win32/gui/CheatDlg.c:457
-#: ../gui/Cheat.c:543
-msgid "Too many addresses found."
-msgstr "找到过多的地址。"
+#: ../data/pcsxr.ui.h:59
+msgid "Slot _3"
+msgstr "存档 _3"
 
-#: ../win32/gui/CheatDlg.c:466
-#: ../gui/Cheat.c:552
-#, c-format
-msgid "%.8X Current: %u (%.2X), Previous: %u (%.2X)"
-msgstr "%.8X 当前值: %u (%.2X), 前次值: %u (%.2X)"
+#: ../data/pcsxr.ui.h:60
+msgid "Slot _4"
+msgstr "存档 _4"
 
-#: ../win32/gui/CheatDlg.c:471
-#: ../gui/Cheat.c:557
-#, c-format
-msgid "%.8X Current: %u (%.4X), Previous: %u (%.4X)"
-msgstr "%.8X 当前值: %u (%.4X), 前次值: %u (%.4X)"
+#: ../data/pcsxr.ui.h:61
+msgid "Slot _5"
+msgstr "存档 _5"
 
-#: ../win32/gui/CheatDlg.c:476
-#: ../gui/Cheat.c:562
-#, c-format
-msgid "%.8X Current: %u (%.8X), Previous: %u (%.8X)"
-msgstr "%.8X 当前值: %u (%.8X), 前次值: %u (%.8X)"
+#: ../data/pcsxr.ui.h:62
+msgid "Slot _6"
+msgstr "存档 _6"
 
-#: ../win32/gui/CheatDlg.c:492
-#: ../gui/Cheat.c:577
-#, c-format
-msgid "Founded Addresses: %d"
-msgstr "找到地址个数: %d"
+#: ../data/pcsxr.ui.h:63
+msgid "Slot _7"
+msgstr "存档 _7"
 
-#: ../win32/gui/CheatDlg.c:504
-#: ../data/pcsx.glade2:2930
-msgid "Freeze"
-msgstr "固定"
+#: ../data/pcsxr.ui.h:64
+msgid "Slot _8"
+msgstr "存档 _8"
 
-#: ../win32/gui/CheatDlg.c:505
-#: ../win32/gui/CheatDlg.c:596
-msgid "Address:"
-msgstr "地址:"
+#: ../data/pcsxr.ui.h:65
+msgid "Slot _9"
+msgstr "存档 _9"
 
-#: ../win32/gui/CheatDlg.c:506
-#: ../win32/gui/CheatDlg.c:597
-#: ../win32/gui/CheatDlg.c:682
-#: ../gui/Cheat.c:647
-#: ../data/pcsx.glade2:2773
-msgid "Value:"
-msgstr "值:"
+#: ../data/pcsxr.ui.h:66
+msgid "_Other..."
+msgstr "其它(_O)..."
 
-#: ../win32/gui/CheatDlg.c:566
-#, c-format
-msgid "Freeze %.8X"
-msgstr "固定 %.8X"
+#: ../data/pcsxr.ui.h:67
+msgid "_Load State"
+msgstr "即时读档(_L)"
 
-#: ../win32/gui/CheatDlg.c:595
-#: ../data/pcsx.glade2:2966
-msgid "Modify"
-msgstr "修改"
+#: ../data/pcsxr.ui.h:68
+msgid "_Configuration"
+msgstr "配置(_C)"
 
-#: ../win32/gui/CheatDlg.c:678
-#: ../gui/Cheat.c:1129
-#: ../data/pcsx.glade2:2703
-msgid "Cheat Search"
-msgstr "查找作弊码"
+#: ../data/pcsxr.ui.h:69
+msgid "_Plugins & BIOS..."
+msgstr "插件及 BIOS(_P)..."
 
-#: ../win32/gui/CheatDlg.c:680
-#: ../data/pcsx.glade2:2751
-msgid "Search For:"
-msgstr "查找:"
+#: ../data/pcsxr.ui.h:70
+msgid "_Graphics..."
+msgstr "图像(_G)..."
 
-#: ../win32/gui/CheatDlg.c:681
-#: ../data/pcsx.glade2:2761
-msgid "Data Type:"
-msgstr "数据类型:"
+#: ../data/pcsxr.ui.h:71
+msgid "_Sound..."
+msgstr "声音(_S)..."
 
-#: ../win32/gui/CheatDlg.c:683
-#: ../data/pcsx.glade2:2785
-msgid "Data Base:"
-msgstr "数据基:"
+#: ../data/pcsxr.ui.h:72
+msgid "CD-_ROM..."
+msgstr "CD-_ROM..."
 
-#: ../win32/gui/CheatDlg.c:684
-#: ../data/pcsx.glade2:2845
-msgid "To:"
-msgstr "到:"
+#: ../data/pcsxr.ui.h:73
+msgid "C_ontrollers..."
+msgstr "控制器(_O)..."
+
+#: ../data/pcsxr.ui.h:74
+#, fuzzy
+msgid "_Link cable..."
+msgstr "连接线"
+
+#: ../data/pcsxr.ui.h:75
+msgid "_Netplay..."
+msgstr "联网游戏(_N)..."
+
+#: ../data/pcsxr.ui.h:76
+msgid "_CPU..."
+msgstr "_CPU..."
+
+#: ../data/pcsxr.ui.h:77
+msgid "_Memory Cards..."
+msgstr "记忆卡(_M)..."
+
+#: ../data/pcsxr.ui.h:78
+msgid "Chea_t"
+msgstr "作弊码(_T)"
+
+#: ../data/pcsxr.ui.h:79
+msgid "_Browse..."
+msgstr "浏览(_B)..."
+
+#: ../data/pcsxr.ui.h:80
+msgid "_Search..."
+msgstr "查找(_S)..."
+
+#: ../data/pcsxr.ui.h:81
+msgid "Memory _Dump"
+msgstr "内存转储(_D)"
+
+#: ../data/pcsxr.ui.h:82
+msgid "_Help"
+msgstr "帮助(_H)"
+
+#: ../data/pcsxr.ui.h:83
+msgid "_About PCSXR..."
+msgstr "关于 PCSXR(_A)..."
+
+#: ../data/pcsxr.ui.h:84
+msgid "Run CD"
+msgstr "运行光碟"
+
+#: ../data/pcsxr.ui.h:85
+msgid "Run ISO Image"
+msgstr "运行 ISO 光盘镜像"
+
+#: ../data/pcsxr.ui.h:86
+msgid "Continue Emulation"
+msgstr "继续模拟"
+
+#: ../data/pcsxr.ui.h:87
+msgid "Switch ISO Image"
+msgstr "更换 ISO 光盘镜像"
+
+#: ../data/pcsxr.ui.h:88
+msgid "Configure Memory Cards"
+msgstr "配置记忆卡"
+
+#: ../data/pcsxr.ui.h:89
+msgid "Configure Graphics"
+msgstr "配置图像"
+
+#: ../data/pcsxr.ui.h:90 ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:1
+msgid "Configure Sound"
+msgstr "配置音频"
+
+#: ../data/pcsxr.ui.h:91
+msgid "Configure CD-ROM"
+msgstr "配置 CD-ROM"
+
+#: ../data/pcsxr.ui.h:92
+msgid "Configure Controllers"
+msgstr "配置控制器"
+
+#: ../data/pcsxr.ui.h:93
+msgid "New"
+msgstr "新建"
+
+#: ../data/pcsxr.ui.h:94
+msgid "Format"
+msgstr "格式化"
+
+#: ../data/pcsxr.ui.h:95
+msgid "Un/Delete"
+msgstr "删除/恢复"
+
+#: ../data/pcsxr.ui.h:96
+msgid "Memory Card 1"
+msgstr "记忆卡 1"
+
+#: ../data/pcsxr.ui.h:97
+msgid "Memory Card 2"
+msgstr "记忆卡 2"
+
+#: ../data/pcsxr.ui.h:98 ../gui/DebugMemory.c:119
+msgid "Memory Dump"
+msgstr "内存转储"
 
-#: ../win32/gui/CheatDlg.c:685
-msgid "&Freeze"
-msgstr "固定(&F)"
+#: ../data/pcsxr.ui.h:99 ../gui/DebugMemory.c:205
+msgid "Address (Hexadecimal):"
+msgstr "地址 (十六进制):"
 
-#: ../win32/gui/CheatDlg.c:686
-msgid "&Modify"
-msgstr "修改(&M)"
+#: ../data/pcsxr.ui.h:100
+msgid "Raw Dump..."
+msgstr "Raw 转储..."
 
-#: ../win32/gui/CheatDlg.c:687
-msgid "&Copy"
-msgstr "复制(&C)"
+#: ../data/pcsxr.ui.h:101
+msgid "Patch Memory..."
+msgstr "修改内存..."
 
-#: ../win32/gui/CheatDlg.c:688
-msgid "&Search"
-msgstr "查找(&S)"
+#: ../data/pcsxr.ui.h:102
+msgid "Configure NetPlay"
+msgstr "配置联网游戏"
 
-#: ../win32/gui/CheatDlg.c:689
-msgid "&New Search"
-msgstr "新查找(&N)"
+#: ../data/pcsxr.ui.h:103
+msgid "NetPlay"
+msgstr "联网游戏"
 
-#: ../win32/gui/CheatDlg.c:690
-msgid "C&lose"
-msgstr "关闭(&L)"
+#: ../data/pcsxr.ui.h:104
+msgid "NTSC"
+msgstr "NTSC"
 
-#: ../win32/gui/CheatDlg.c:692
+#: ../data/pcsxr.ui.h:105
+msgid "PAL"
+msgstr "PAL"
+
+#: ../data/pcsxr.ui.h:106 ../win32/gui/CheatDlg.c:692
 msgid "8-bit"
 msgstr "8 位"
 
-#: ../win32/gui/CheatDlg.c:693
+#: ../data/pcsxr.ui.h:107 ../win32/gui/CheatDlg.c:693
 msgid "16-bit"
 msgstr "16 位"
 
-#: ../win32/gui/CheatDlg.c:694
+#: ../data/pcsxr.ui.h:108 ../win32/gui/CheatDlg.c:694
 msgid "32-bit"
 msgstr "32 位"
 
-#: ../win32/gui/CheatDlg.c:695
-msgid "Decimal"
-msgstr "十进制"
+#: ../data/pcsxr.ui.h:109 ../win32/gui/CheatDlg.c:402
+msgid "Equal Value"
+msgstr "等于数值"
 
-#: ../win32/gui/CheatDlg.c:696
-msgid "Hexadecimal"
-msgstr "十六进制"
+#: ../data/pcsxr.ui.h:110 ../win32/gui/CheatDlg.c:403
+msgid "Not Equal Value"
+msgstr "不等于数值"
 
-#: ../win32/gui/ConfigurePlugins.c:219
-msgid "Simulate Psx Bios"
-msgstr "模拟 PS BIOS"
+#: ../data/pcsxr.ui.h:111 ../win32/gui/CheatDlg.c:404
+msgid "Range"
+msgstr "范围"
 
-#: ../win32/gui/ConfigurePlugins.c:305
-msgid "Configuration not OK!"
-msgstr "配置不正确!"
+#: ../data/pcsxr.ui.h:112 ../win32/gui/CheatDlg.c:407
+msgid "Increased By"
+msgstr "增加数值"
 
-#: ../win32/gui/ConfigurePlugins.c:305
-#: ../gui/Cheat.c:155
-#: ../gui/Cheat.c:251
-#: ../gui/LnxMain.c:418
-msgid "Error"
-msgstr "错误"
+#: ../data/pcsxr.ui.h:113 ../win32/gui/CheatDlg.c:408
+msgid "Decreased By"
+msgstr "减少数值"
 
-#: ../win32/gui/ConfigurePlugins.c:406
-msgid "This plugin reports that should work correctly"
-msgstr "此插件报告其可正常工作。"
+#: ../data/pcsxr.ui.h:114 ../win32/gui/CheatDlg.c:409
+msgid "Increased"
+msgstr "增加"
 
-#: ../win32/gui/ConfigurePlugins.c:407
-msgid "This plugin reports that should not work correctly"
-msgstr "此插件报告其不可正常工作。"
+#: ../data/pcsxr.ui.h:115 ../win32/gui/CheatDlg.c:410
+msgid "Decreased"
+msgstr "减少"
 
-#: ../win32/gui/ConfigurePlugins.c:463
-msgid "Select Plugins Directory"
-msgstr "选择插件目录"
+#: ../data/pcsxr.ui.h:116 ../win32/gui/CheatDlg.c:411
+msgid "Different"
+msgstr "不同"
 
-#: ../win32/gui/ConfigurePlugins.c:472
-msgid "Select Bios Directory"
-msgstr "选择 BIOS 目录"
+#: ../data/pcsxr.ui.h:117 ../win32/gui/CheatDlg.c:412
+msgid "No Change"
+msgstr "无改变"
 
-#: ../win32/gui/ConfigurePlugins.c:481
-msgid "Configuration"
-msgstr "配置"
+#: ../data/pcsxr.ui.h:118 ../win32/gui/CheatDlg.c:695
+msgid "Decimal"
+msgstr "十进制"
 
-#: ../win32/gui/ConfigurePlugins.c:485
-msgid "Graphics"
-msgstr "图像"
+#: ../data/pcsxr.ui.h:119 ../win32/gui/CheatDlg.c:696
+msgid "Hexadecimal"
+msgstr "十六进制"
 
-#: ../win32/gui/ConfigurePlugins.c:486
-msgid "First Controller"
-msgstr "主控制器"
+#: ../gui/AboutDlg.c:71
+msgid ""
+"(C) 1999-2003 PCSX Team\n"
+"(C) 2005-2009 PCSX-df Team\n"
+"(C) 2009-2011 PCSX-Reloaded Team"
+msgstr ""
+"(C) 1999-2003 PCSX 开发组\n"
+"(C) 2005-2009 PCSX-df 开发组\n"
+"(C) 2009-2010 PCSX-Reloaded 开发组 "
 
-#: ../win32/gui/ConfigurePlugins.c:487
-msgid "Second Controller"
-msgstr "辅控制器"
+#: ../gui/AboutDlg.c:76
+msgid ""
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+msgstr ""
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 
-#: ../win32/gui/ConfigurePlugins.c:488
-msgid "Sound"
-msgstr "声音"
+#: ../gui/AboutDlg.c:100
+msgid "translator-credits"
+msgstr "Wei Mingzhi <whistler@openoffice.org>"
 
-#: ../win32/gui/ConfigurePlugins.c:489
-msgid "Cdrom"
-msgstr "CD-ROM"
+#: ../gui/AboutDlg.c:101
+msgid "A PlayStation emulator."
+msgstr "一个 PlayStation 模拟器。"
 
-#: ../win32/gui/ConfigurePlugins.c:490
-msgid "Bios"
-msgstr "BIOS"
+#: ../gui/Cheat.c:101 ../win32/gui/CheatDlg.c:116
+msgid "Add New Cheat"
+msgstr "添加新作弊码"
 
-#: ../win32/gui/ConfigurePlugins.c:491
-msgid "Set Bios Directory"
-msgstr "设置 BIOS 目录"
+#: ../gui/Cheat.c:109 ../gui/Cheat.c:192
+msgid "Cheat Description:"
+msgstr "作弊码描述:"
 
-#: ../win32/gui/ConfigurePlugins.c:492
-msgid "Set Plugins Directory"
-msgstr "设置插件目录"
+#: ../gui/Cheat.c:117 ../gui/Cheat.c:201 ../win32/gui/CheatDlg.c:68
+#: ../win32/gui/CheatDlg.c:118
+msgid "Cheat Code:"
+msgstr "作弊码:"
 
-#: ../win32/gui/ConfigurePlugins.c:493
-#: ../win32/gui/ConfigurePlugins.c:496
-#: ../win32/gui/ConfigurePlugins.c:499
-#: ../win32/gui/ConfigurePlugins.c:502
-#: ../win32/gui/ConfigurePlugins.c:505
-#: ../win32/gui/ConfigurePlugins.c:617
-msgid "Configure..."
-msgstr "配置..."
+#: ../gui/Cheat.c:147 ../gui/Cheat.c:241 ../gui/LnxMain.c:425
+#: ../win32/gui/ConfigurePlugins.c:330
+msgid "Error"
+msgstr "错误"
 
-#: ../win32/gui/ConfigurePlugins.c:494
-#: ../win32/gui/ConfigurePlugins.c:497
-#: ../win32/gui/ConfigurePlugins.c:500
-#: ../win32/gui/ConfigurePlugins.c:503
-#: ../win32/gui/ConfigurePlugins.c:506
-#: ../win32/gui/ConfigurePlugins.c:618
-msgid "Test..."
-msgstr "测试..."
+#: ../gui/Cheat.c:147 ../gui/Cheat.c:241 ../win32/gui/CheatDlg.c:91
+#: ../win32/gui/CheatDlg.c:132
+msgid "Invalid cheat code!"
+msgstr "非法作弊码!"
 
-#: ../win32/gui/ConfigurePlugins.c:495
-#: ../win32/gui/ConfigurePlugins.c:498
-#: ../win32/gui/ConfigurePlugins.c:501
-#: ../win32/gui/ConfigurePlugins.c:504
-#: ../win32/gui/ConfigurePlugins.c:507
-#: ../win32/gui/ConfigurePlugins.c:619
-msgid "About..."
-msgstr "关于..."
+#: ../gui/Cheat.c:184 ../win32/gui/CheatDlg.c:66
+msgid "Edit Cheat"
+msgstr "编辑作弊码"
 
-#: ../win32/gui/ConfigurePlugins.c:612
-msgid "NetPlay Configuration"
-msgstr "联网游戏配置"
+#: ../gui/Cheat.c:307
+msgid "Open Cheat File"
+msgstr "打开作弊码文件"
 
-#: ../win32/gui/ConfigurePlugins.c:616
-#: ../plugins/dfnet/gui.c:31
-#: ../plugins/dfnet/gui.c:112
-msgid "NetPlay"
-msgstr "联网游戏"
+#: ../gui/Cheat.c:317 ../gui/Cheat.c:357
+msgid "PCSXR Cheat Code Files (*.cht)"
+msgstr "PCSXR 作弊码文件 (*.cht)"
 
-#: ../win32/gui/ConfigurePlugins.c:620
-msgid "Note: The NetPlay Plugin Directory should be the same as the other Plugins."
-msgstr "注意: 联网游戏插件应和其它插件放在同一目录中。"
+#: ../gui/Cheat.c:322 ../gui/GtkGui.c:491 ../gui/GtkGui.c:643
+#: ../win32/gui/WndMain.c:1483 ../win32/gui/WndMain.c:1564
+msgid "All Files"
+msgstr "所有文件"
 
-#: ../win32/gui/plugin.c:90
-#: ../win32/gui/WndMain.c:281
-#, c-format
-msgid "*PCSX*: Saved State %d"
-msgstr "*PCSX*: Saved State %d"
+#: ../gui/Cheat.c:347
+msgid "Save Cheat File"
+msgstr "保存作弊码文件"
 
-#: ../win32/gui/plugin.c:91
-#: ../win32/gui/WndMain.c:282
-#, c-format
-msgid "*PCSX*: Error Saving State %d"
-msgstr "*PCSX*: Error Saving State %d"
+#: ../gui/Cheat.c:362
+msgid "All Files (*.*)"
+msgstr "所有文件 (*.*)"
 
-#: ../win32/gui/plugin.c:107
-#: ../win32/gui/WndMain.c:259
-#, c-format
-msgid "*PCSX*: Loaded State %d"
-msgstr "*PCSX*: Loaded State %d"
+#: ../gui/Cheat.c:401
+msgid "Cheat Codes"
+msgstr "作弊码"
 
-#: ../win32/gui/plugin.c:108
-#: ../win32/gui/WndMain.c:260
-#, c-format
-msgid "*PCSX*: Error Loading State %d"
-msgstr "*PCSX*: Error Loading State %d"
+#: ../gui/Cheat.c:408
+msgid "Enable"
+msgstr "启用"
 
-#: ../win32/gui/plugin.c:119
-#, c-format
-msgid "*PCSX*: Sio Irq Always Enabled"
-msgstr "*PCSX*: Sio Irq Always Enabled"
+#: ../gui/Cheat.c:416 ../win32/gui/CheatDlg.c:185
+msgid "Description"
+msgstr "描述"
 
-#: ../win32/gui/plugin.c:120
-#, c-format
-msgid "*PCSX*: Sio Irq Not Always Enabled"
-msgstr "*PCSX*: Sio Irq Not Always Enabled"
+#: ../gui/Cheat.c:544 ../win32/gui/CheatDlg.c:457
+msgid "Too many addresses found."
+msgstr "找到过多的地址。"
 
-#: ../win32/gui/plugin.c:127
+#: ../gui/Cheat.c:553 ../win32/gui/CheatDlg.c:466
 #, c-format
-msgid "*PCSX*: Black&White Mdecs Only Enabled"
-msgstr "*PCSX*: Black&White Mdecs Only Enabled"
+msgid "%.8X Current: %u (%.2X), Previous: %u (%.2X)"
+msgstr "%.8X 当前值: %u (%.2X), 前次值: %u (%.2X)"
 
-#: ../win32/gui/plugin.c:128
+#: ../gui/Cheat.c:558 ../win32/gui/CheatDlg.c:471
 #, c-format
-msgid "*PCSX*: Black&White Mdecs Only Disabled"
-msgstr "*PCSX*: Black&White Mdecs Only Disabled"
+msgid "%.8X Current: %u (%.4X), Previous: %u (%.4X)"
+msgstr "%.8X 当前值: %u (%.4X), 前次值: %u (%.4X)"
 
-#: ../win32/gui/plugin.c:135
+#: ../gui/Cheat.c:563 ../win32/gui/CheatDlg.c:476
 #, c-format
-msgid "*PCSX*: Xa Enabled"
-msgstr "*PCSX*: Xa Enabled"
+msgid "%.8X Current: %u (%.8X), Previous: %u (%.8X)"
+msgstr "%.8X 当前值: %u (%.8X), 前次值: %u (%.8X)"
 
-#: ../win32/gui/plugin.c:136
+#: ../gui/Cheat.c:578 ../win32/gui/CheatDlg.c:492
 #, c-format
-msgid "*PCSX*: Xa Disabled"
-msgstr "*PCSX*: Xa Disabled"
+msgid "Founded Addresses: %d"
+msgstr "找到地址个数: %d"
+
+#: ../gui/Cheat.c:586 ../win32/gui/CheatDlg.c:448
+msgid "Enter the values and start your search."
+msgstr "输入数值并开始查找。"
 
-#: ../win32/gui/plugin.c:145
-msgid "*PCSX*: CdRom Case Opened"
-msgstr "*PCSX*: CdRom Case Opened"
+#: ../gui/Cheat.c:628
+msgid "Freeze value"
+msgstr "固定数值"
 
-#: ../win32/gui/plugin.c:150
-msgid "*PCSX*: CdRom Case Closed"
-msgstr "*PCSX*: CdRom Case Closed"
+#: ../gui/Cheat.c:634 ../win32/gui/CheatDlg.c:67 ../win32/gui/CheatDlg.c:117
+msgid "Description:"
+msgstr "描述:"
 
-#: ../win32/gui/plugin.c:177
-msgid "Connecting..."
-msgstr "正在连接..."
+#: ../gui/Cheat.c:727
+msgid "Modify value"
+msgstr "修改数值"
 
-#: ../win32/gui/plugin.c:179
-#: ../win32/gui/plugin.c:186
-#, c-format
-msgid "Please wait while connecting... %c\n"
-msgstr "请稍候，正在连接... %c\n"
+#: ../gui/Cheat.c:735
+msgid "New value:"
+msgstr "新值:"
 
-#: ../win32/gui/plugin.c:214
-msgid "Error Opening CDR Plugin"
-msgstr "无法打开 CDR 插件"
+#: ../gui/Cheat.c:1119
+msgid "Search Results"
+msgstr "查找结果"
 
-#: ../win32/gui/plugin.c:277
-#, c-format
-msgid "Error Opening GPU Plugin (%d)"
-msgstr "无法打开 GPU 插件 (%d)"
+#. TODO Check whether configuration is required when we choose the plugin, and set the state of the
+#. button appropriately. New gtk tooltip API should allow us to put a tooltip explanation for
+#. disabled widgets
+#. TODO If combo screen hasn't been opened and the user chooses the menu config option, confs.Combo will be null and cause a segfault
+#. printf("Configuring plugin %s\n", filename);
+#: ../gui/ConfDlg.c:256 ../gui/ConfDlg.c:277 ../gui/ConfDlg.c:298
+#: ../gui/ConfDlg.c:319 ../gui/ConfDlg.c:340 ../gui/ConfDlg.c:399
+msgid "No configuration required"
+msgstr "不需要配置"
 
-#: ../win32/gui/plugin.c:279
-#, c-format
-msgid "Error Opening SPU Plugin (%d)"
-msgstr "无法打开 SPU 插件 (%d)"
+#: ../gui/ConfDlg.c:256 ../gui/ConfDlg.c:277 ../gui/ConfDlg.c:298
+#: ../gui/ConfDlg.c:319 ../gui/ConfDlg.c:340 ../gui/ConfDlg.c:399
+msgid "This plugin doesn't need to be configured."
+msgstr "此插件需要被配置。"
 
-#: ../win32/gui/plugin.c:282
+#: ../gui/ConfDlg.c:402
+msgid "Please select a plugin."
+msgstr ""
+
+#: ../gui/ConfDlg.c:647
 #, c-format
-msgid "Error Opening PAD1 Plugin (%d)"
-msgstr "无法打开 PAD1 插件 (%d)"
+msgid "Could not open BIOS directory: '%s'\n"
+msgstr "无法打开 BIOS 目录: \"%s\"\n"
 
-#: ../win32/gui/plugin.c:284
+#: ../gui/ConfDlg.c:698 ../gui/ConfDlg.c:801 ../gui/LnxMain.c:168
 #, c-format
-msgid "Error Opening PAD2 Plugin (%d)"
-msgstr "无法打开 PAD2 插件 (%d)"
+msgid "Could not open directory: '%s'\n"
+msgstr "无法打开目录: \"%s\"\n"
 
-#: ../win32/gui/plugin.c:314
-msgid "Error Closing CDR Plugin"
-msgstr "无法关闭 CD-ROM 插件 (%d)"
+#. The BIOS list always contains the PCSXR internal BIOS
+#: ../gui/ConfDlg.c:769
+msgid "Simulate PSX BIOS"
+msgstr "模拟 PS BIOS"
 
-#: ../win32/gui/plugin.c:316
-msgid "Error Closing GPU Plugin"
-msgstr "无法关闭 GPU 插件"
+#: ../gui/DebugMemory.c:127
+msgid "Start Address (Hexadecimal):"
+msgstr "开始地址 (十六进制):"
 
-#: ../win32/gui/plugin.c:318
-msgid "Error Closing SPU Plugin"
-msgstr "无法关闭 SPU 插件"
+#: ../gui/DebugMemory.c:138
+msgid "Length (Decimal):"
+msgstr "长度 (十进制):"
 
-#: ../win32/gui/plugin.c:336
-#, c-format
-msgid "CDRinit error: %d"
-msgstr "CDRinit 错误: %d"
+#: ../gui/DebugMemory.c:164
+msgid "Dump to File"
+msgstr "转储至文件"
 
-#: ../win32/gui/plugin.c:338
+#: ../gui/DebugMemory.c:179
 #, c-format
-msgid "GPUinit error: %d"
-msgstr "GPUinit 错误: %d"
+msgid "Error writing to %s!"
+msgstr "写入到 %s 时出错!"
 
-#: ../win32/gui/plugin.c:340
-#, c-format
-msgid "SPUinit error: %d"
-msgstr "SPUinit 错误: %d"
+#: ../gui/DebugMemory.c:197
+msgid "Memory Patch"
+msgstr "内存修改"
 
-#: ../win32/gui/plugin.c:342
-#, c-format
-msgid "PAD1init error: %d"
-msgstr "PAD1init 错误: %d"
+#: ../gui/DebugMemory.c:216
+msgid "Value (Hexa string):"
+msgstr "数值 (十六进制串):"
 
-#: ../win32/gui/plugin.c:344
-#, c-format
-msgid "PAD2init error: %d"
-msgstr "PAD2init 错误: %d"
+#: ../gui/DebugMemory.c:283
+msgid "Memory Viewer"
+msgstr "内存查看器"
 
-#: ../win32/gui/plugin.c:347
-#, c-format
-msgid "NETinit error: %d"
-msgstr "NETinit 错误: %d"
+#: ../gui/DebugMemory.c:289
+msgid "Address"
+msgstr "地址"
 
-#: ../win32/gui/WndMain.c:76
-msgid "Arabic"
-msgstr "阿拉伯语"
+#: ../gui/DebugMemory.c:307
+msgid "Text"
+msgstr "文本"
 
-#: ../win32/gui/WndMain.c:77
-msgid "Catalan"
-msgstr "加泰隆尼亚语"
+#: ../gui/GtkGui.c:146
+msgid "Ready"
+msgstr "就绪"
 
-#: ../win32/gui/WndMain.c:78
-msgid "German"
-msgstr "德语"
+#: ../gui/GtkGui.c:191
+msgid "Emulation Paused."
+msgstr "模拟器已暂停。"
 
-#: ../win32/gui/WndMain.c:79
-msgid "Greek"
-msgstr "希腊语"
+#: ../gui/GtkGui.c:474
+msgid "Select PSX EXE File"
+msgstr "选择 PS EXE 文件"
 
-#: ../win32/gui/WndMain.c:80
-#: ../win32/gui/WndMain.c:1566
-#: ../win32/gui/WndMain.c:1568
-msgid "English"
-msgstr "英语"
+#: ../gui/GtkGui.c:487
+msgid "PlayStation Executable Files"
+msgstr "PlayStation 可执行文件"
 
-#: ../win32/gui/WndMain.c:81
-msgid "Spanish"
-msgstr "西班牙语"
+#: ../gui/GtkGui.c:524
+msgid "Not a valid PSX file"
+msgstr "不是一个合法的 PSX 文件"
 
-#: ../win32/gui/WndMain.c:82
-msgid "French"
-msgstr "法语"
+#: ../gui/GtkGui.c:524
+msgid "The file does not appear to be a valid Playstation executable"
+msgstr "此文件不是一个合法的 PlayStation 可执行文件"
 
-#: ../win32/gui/WndMain.c:83
-msgid "Italian"
-msgstr "意大利语"
+#: ../gui/GtkGui.c:553 ../gui/GtkGui.c:725
+msgid "CD ROM failed"
+msgstr "CD-ROM 失败"
 
-#: ../win32/gui/WndMain.c:84
-msgid "Portuguese"
-msgstr "葡萄牙语"
+#: ../gui/GtkGui.c:553 ../gui/GtkGui.c:725 ../win32/gui/WndMain.c:472
+#: ../win32/gui/WndMain.c:526 ../win32/gui/WndMain.c:596
+#, c-format
+msgid "The CD does not appear to be a valid Playstation CD"
+msgstr "此光盘不是一张合法的 PlayStation 光盘。"
 
-#: ../win32/gui/WndMain.c:85
-msgid "Portuguese (Brazilian)"
-msgstr "葡萄牙语 (巴西)"
+#: ../gui/GtkGui.c:564 ../gui/GtkGui.c:736 ../win32/gui/WndMain.c:482
+#: ../win32/gui/WndMain.c:536 ../win32/gui/WndMain.c:606
+#, c-format
+msgid "Could not load CD-ROM!"
+msgstr "无法加载光盘!"
 
-#: ../win32/gui/WndMain.c:86
-msgid "Romanian"
-msgstr "罗马尼亚语"
+#: ../gui/GtkGui.c:564 ../gui/GtkGui.c:736
+msgid "The CD-ROM could not be loaded"
+msgstr "无法加载 CD-ROM"
 
-#: ../win32/gui/WndMain.c:87
-msgid "Russian"
-msgstr "俄语"
+#: ../gui/GtkGui.c:578
+msgid "Could not run BIOS"
+msgstr "无法运行 BIOS"
 
-#: ../win32/gui/WndMain.c:88
-msgid "Simplified Chinese"
-msgstr "简体中文"
+#: ../gui/GtkGui.c:578
+msgid "Running BIOS is not supported with Internal HLE BIOS."
+msgstr "内部 HLE BIOS 不支持直接运行。"
 
-#: ../win32/gui/WndMain.c:89
-msgid "Traditional Chinese"
-msgstr "繁体中文"
+#: ../gui/GtkGui.c:608
+msgid "Open PSX Disc Image File"
+msgstr "打开 PS 光盘镜像文件"
 
-#: ../win32/gui/WndMain.c:90
-msgid "Japanese"
-msgstr "日语"
+#: ../gui/GtkGui.c:638
+#, fuzzy
+msgid "PSX Image Files (*.bin, *.img, *.mdf, *.iso, *.cue, *.pbp, *.cbn)"
+msgstr "PS 镜像文件 (*.bin, *.img, *.mdf, *.iso)"
 
-#: ../win32/gui/WndMain.c:91
-msgid "Korean"
-msgstr "朝鲜语"
+#: ../gui/GtkGui.c:894
+#, c-format
+msgid "Loaded state %s."
+msgstr "已读取存档 %s。"
 
-#: ../win32/gui/WndMain.c:300
-#: ../win32/gui/WndMain.c:352
-msgid "PCSX State Format"
-msgstr "PCSX 即时存档格式"
+#: ../gui/GtkGui.c:897
+#, c-format
+msgid "Error loading state %s!"
+msgstr "读取存档 %s 时出错。"
 
-#: ../win32/gui/WndMain.c:327
+#: ../gui/GtkGui.c:908
 #, c-format
-msgid "*PCSX*: Loaded State %s"
-msgstr "*PCSX*: Loaded State %s"
+msgid "Saved state %s."
+msgstr "已保存存档 %s"
 
-#: ../win32/gui/WndMain.c:328
+#: ../gui/GtkGui.c:910
 #, c-format
-msgid "*PCSX*: Error Loading State %s"
-msgstr "*PCSX*: Error Loading State %s"
+msgid "Error saving state %s!"
+msgstr "保存存档 %s 时出错。"
+
+#: ../gui/GtkGui.c:945 ../gui/GtkGui.c:973
+msgid "Select State File"
+msgstr "选择存档文件"
+
+#: ../gui/GtkGui.c:1016
+msgid "Notice"
+msgstr "警告"
 
-#: ../win32/gui/WndMain.c:379
+#: ../gui/LnxMain.c:62
 #, c-format
-msgid "*PCSX*: Saved State %s"
-msgstr "*PCSX*: Saved State %s"
+msgid "Creating memory card: %s\n"
+msgstr "建立记忆卡: %s\n"
+
+#: ../gui/LnxMain.c:329
+msgid ""
+" pcsxr [options] [file]\n"
+"\toptions:\n"
+"\t-runcd\t\tRuns CD-ROM\n"
+"\t-cdfile FILE\tRuns a CD image file\n"
+"\t-nogui\t\tDon't open the GTK GUI\n"
+"\t-cfg FILE\tLoads desired configuration file (default: ~/.pcsxr/pcsxr.cfg)\n"
+"\t-psxout\t\tEnable PSX output\n"
+"\t-slowboot\tEnable BIOS Logo\n"
+"\t-load STATENUM\tLoads savestate STATENUM (1-9)\n"
+"\t-h -help\tDisplay this message\n"
+"\tfile\t\tLoads file\n"
+msgstr ""
+" pcsxr [选项] [文件]\n"
+"\t选项:\n"
+"\t-runcd\t\t运行 CD-ROM\n"
+"\t-cdfile 文件\t运行一个 CD 镜像文件\n"
+"\t-nogui\t\t不使用 GTK 图形界面\n"
+"\t-cfg 文件\t加载一个特定的配置文件 (默认为: ~/.pcsxr/pcsxr.cfg)\n"
+"\t-psxout\t\t启用 PSX 输出\n"
+"\t-slowboot\t显示 BIOS 启动画面\n"
+"\t-load 编号\t加载指定编号的存档 (1-5)\n"
+"\t-h -help\t显示此信息\n"
+"\t文件\t\t加载文件\n"
 
-#: ../win32/gui/WndMain.c:380
+#: ../gui/LnxMain.c:366
 #, c-format
-msgid "*PCSX*: Error Saving State %s"
-msgstr "*PCSX*: Error Saving State %s"
+msgid ""
+"PCSXR cannot be configured without using the GUI -- you should restart "
+"without -nogui.\n"
+msgstr "PCSXR 不能在字符界面下配置 -- 请不使用 -nogui 参数重新启动程序\n"
 
-#: ../win32/gui/WndMain.c:429
-#: ../win32/gui/WndMain.c:478
-#: ../gui/Gtk2Gui.c:485
-#: ../gui/Gtk2Gui.c:610
-msgid "The CD does not appear to be a valid Playstation CD"
-msgstr "此光盘不是一张合法的 PlayStation 光盘。"
+#: ../gui/LnxMain.c:425
+msgid "Failed loading plugins!"
+msgstr "加载插件失败!"
 
-#: ../win32/gui/WndMain.c:435
-#: ../win32/gui/WndMain.c:484
-#: ../gui/Gtk2Gui.c:493
-#: ../gui/Gtk2Gui.c:618
-msgid "Could not load CD-ROM!"
-msgstr "无法加载光盘!"
+#: ../gui/LnxMain.c:444
+#, c-format
+msgid "Could not load CD-ROM!\n"
+msgstr "无法加载光盘。\n"
 
-#: ../win32/gui/WndMain.c:445
-msgid "Running BIOS is not supported with Internal HLE Bios."
-msgstr "内部 HLE BIOS 不支持直接运行。"
+#: ../gui/LnxMain.c:485
+#, c-format
+msgid "PSX emulator couldn't be initialized.\n"
+msgstr "无法初始化 PS 模拟器。\n"
 
-#: ../win32/gui/WndMain.c:664
-#: ../gui/MemcardDlg.c:62
+#: ../gui/MemcardDlg.c:56
+msgid "Icon"
+msgstr "图标"
+
+#: ../gui/MemcardDlg.c:62 ../win32/gui/WndMain.c:778
 msgid "Title"
 msgstr "标题"
 
-#: ../win32/gui/WndMain.c:670
-#: ../gui/MemcardDlg.c:68
+#: ../gui/MemcardDlg.c:68 ../win32/gui/WndMain.c:784
 msgid "Status"
 msgstr "状态"
 
-#: ../win32/gui/WndMain.c:676
-msgid "Game ID"
-msgstr "游戏 ID"
-
-#: ../win32/gui/WndMain.c:682
-msgid "Game"
-msgstr "游戏"
-
-#: ../win32/gui/WndMain.c:864
-msgid "mid link block"
-msgstr "中间链接块"
+#: ../gui/MemcardDlg.c:74
+msgid "ID"
+msgstr "ID"
 
-#: ../win32/gui/WndMain.c:867
-msgid "terminiting link block"
-msgstr "终止链接块"
+#: ../gui/MemcardDlg.c:80
+msgid "Name"
+msgstr "名称"
 
-#: ../win32/gui/WndMain.c:875
-#: ../gui/MemcardDlg.c:155
-#: ../gui/MemcardDlg.c:260
+#: ../gui/MemcardDlg.c:118 ../win32/gui/WndMain.c:989
 msgid "Deleted"
 msgstr "已删除"
 
-#: ../win32/gui/WndMain.c:876
-#: ../win32/gui/WndMain.c:879
-#: ../gui/MemcardDlg.c:157
-#: ../gui/MemcardDlg.c:161
-#: ../gui/MemcardDlg.c:262
-#: ../gui/MemcardDlg.c:266
+#: ../gui/MemcardDlg.c:120 ../gui/MemcardDlg.c:129 ../win32/gui/WndMain.c:990
+#: ../win32/gui/WndMain.c:993
 msgid "Free"
 msgstr "空闲"
 
-#: ../win32/gui/WndMain.c:878
-#: ../gui/MemcardDlg.c:159
-#: ../gui/MemcardDlg.c:264
+#: ../gui/MemcardDlg.c:123 ../win32/gui/WndMain.c:992
 msgid "Used"
 msgstr "已使用"
 
-#: ../win32/gui/WndMain.c:972
-msgid "Memcard Manager"
-msgstr "记忆卡管理器"
-
-#: ../win32/gui/WndMain.c:976
-#: ../win32/gui/WndMain.c:979
-msgid "Select Mcd"
-msgstr "选择"
-
-#: ../win32/gui/WndMain.c:977
-#: ../win32/gui/WndMain.c:980
-msgid "Format Mcd"
-msgstr "格式化"
-
-#: ../win32/gui/WndMain.c:978
-#: ../win32/gui/WndMain.c:981
-msgid "Reload Mcd"
-msgstr "重新加载"
-
-#: ../win32/gui/WndMain.c:982
-msgid "-> Copy ->"
-msgstr "-> 复制 ->"
-
-#: ../win32/gui/WndMain.c:983
-msgid "<- Copy <-"
-msgstr "<- 复制 <-"
-
-#: ../win32/gui/WndMain.c:984
-msgid "Paste"
-msgstr "粘贴"
-
-#: ../win32/gui/WndMain.c:985
-msgid "<- Un/Delete"
-msgstr "<- 删除/恢复"
-
-#: ../win32/gui/WndMain.c:986
-msgid "Un/Delete ->"
-msgstr "删除/恢复 ->"
-
-#: ../win32/gui/WndMain.c:988
-msgid "Memory Card 1"
-msgstr "记忆卡 1"
-
-#: ../win32/gui/WndMain.c:989
-msgid "Memory Card 2"
-msgstr "记忆卡 2"
+#: ../gui/MemcardDlg.c:125
+msgid "Link"
+msgstr ""
 
-#: ../win32/gui/WndMain.c:1044
-msgid "Are you sure you want to paste this selection?"
-msgstr "是否确认粘贴此选中内容?"
+#: ../gui/MemcardDlg.c:127
+msgid "End link"
+msgstr ""
 
-#: ../win32/gui/WndMain.c:1044
-#: ../win32/gui/WndMain.c:1155
-#: ../win32/gui/WndMain.c:1162
-msgid "Confirmation"
-msgstr "确认"
+#. Ask for name of memory card
+#: ../gui/MemcardDlg.c:305
+msgid "Select A File"
+msgstr "选择一个文件"
 
-#: ../win32/gui/WndMain.c:1155
-#: ../win32/gui/WndMain.c:1162
-msgid "Are you sure you want to format this Memory Card?"
-msgstr "是否确认格式化此记忆卡?"
+#: ../gui/MemcardDlg.c:345
+msgid "Format this Memory Card?"
+msgstr "格式化此记忆卡?"
 
-#: ../win32/gui/WndMain.c:1208
-msgid "Cpu Config"
-msgstr "CPU 配置"
+#: ../gui/MemcardDlg.c:347
+msgid ""
+"If you format the memory card, the card will be empty, and any existing data "
+"overwritten."
+msgstr "如果您选择格式化记忆卡，记忆卡将被清空，并且任何现有数据都将被覆盖。"
 
-#: ../win32/gui/WndMain.c:1213
-msgid "Disable Xa Decoding"
-msgstr "禁用 XA 解码"
+#: ../gui/MemcardDlg.c:350
+msgid "Format card"
+msgstr "格式化记忆卡"
 
-#: ../win32/gui/WndMain.c:1214
-msgid "Sio Irq Always Enabled"
-msgstr "SIO IRQ 总是启用"
+#. Ask for name of new memory card
+#: ../gui/MemcardDlg.c:372
+msgid "Create a new Memory Card"
+msgstr "新建记忆卡"
 
-#: ../win32/gui/WndMain.c:1215
-msgid "Black && White Movies"
-msgstr "黑白电影"
+#: ../gui/MemcardDlg.c:381
+msgid "New Memory Card.mcd"
+msgstr "新记忆卡.mcd"
 
-#: ../win32/gui/WndMain.c:1216
-msgid "Disable Cd audio"
-msgstr "禁用 CD 音频"
+#. No free slots available on the destination card
+#: ../gui/MemcardDlg.c:511
+msgid "No free space on memory card"
+msgstr "记忆卡无空余位置"
 
-#: ../win32/gui/WndMain.c:1217
-#: ../data/pcsx.glade2:1595
-msgid "Autodetect"
-msgstr "自动检测"
+#: ../gui/MemcardDlg.c:512
+msgid ""
+"There are no free slots available on the target memory card. Please delete a "
+"slot first."
+msgstr "目标记忆卡上无空余位置。请先删除一个存档。"
 
-#: ../win32/gui/WndMain.c:1218
-msgid "Enable Interpreter Cpu"
-msgstr "启用解释执行 CPU"
+#: ../gui/MemcardDlg.c:671
+msgid "Memory Card Manager"
+msgstr "记忆卡管理器"
 
-#: ../win32/gui/WndMain.c:1219
-#: ../data/pcsx.glade2:1451
-msgid "Enable Console Output"
-msgstr "启用控制台输出"
+#: ../gui/Plugin.c:240
+#, c-format
+msgid "SIO IRQ Not Always Enabled"
+msgstr "SIO IRQ 不总是启用"
 
-#: ../win32/gui/WndMain.c:1220
-#: ../data/pcsx.glade2:1401
-msgid "Enable Debugger"
-msgstr "启用调试器"
+#: ../gui/Plugin.c:246
+#, c-format
+msgid "Black & White Mdecs Only Enabled"
+msgstr "Black & White Mdecs Only 启用"
 
-#: ../win32/gui/WndMain.c:1221
-msgid "Spu Irq Always Enabled"
-msgstr "SPU IRQ 总是启用"
+#: ../gui/Plugin.c:247
+#, c-format
+msgid "Black & White Mdecs Only Disabled"
+msgstr "Black & White Mdecs Only 禁用"
 
-#: ../win32/gui/WndMain.c:1222
-#: ../data/pcsx.glade2:1538
-msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
-msgstr "Parasite Eve 2, Vandal Hearts 1/2 修正"
+#: ../gui/Plugin.c:253
+#, c-format
+msgid "XA Enabled"
+msgstr "XA 已启用"
 
-#: ../win32/gui/WndMain.c:1223
-#: ../data/pcsx.glade2:1553
-msgid "InuYasha Sengoku Battle Fix"
-msgstr "InuYasha Sengoku Battle 修正"
+#: ../gui/Plugin.c:254
+#, c-format
+msgid "XA Disabled"
+msgstr "XA 已禁用"
 
-#: ../win32/gui/WndMain.c:1225
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:277
-#: ../plugins/dfinput/dfinput.glade2:448
-msgid "Options"
-msgstr "选项"
+#: ../gui/Plugin.c:326
+msgid "Error opening CD-ROM plugin!"
+msgstr "无法打开CD-ROM 插件!"
 
-#: ../win32/gui/WndMain.c:1226
-msgid "Psx System Type"
-msgstr "PS 系统类型"
+#: ../gui/Plugin.c:328
+msgid "Error opening SPU plugin!"
+msgstr "无法打开 SPU 插件!"
 
-#: ../win32/gui/WndMain.c:1330
-msgid "Psx Mcd Format (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
-msgstr "PS 记忆卡格式 (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
+#: ../gui/Plugin.c:331
+msgid "Error opening GPU plugin!"
+msgstr "无法打开 GPU 插件!"
 
-#: ../win32/gui/WndMain.c:1335
-msgid "Psx Memory Card (*.mcr;*.mc)"
-msgstr "PS 记忆卡 (*.mcr;*.mc)"
+#: ../gui/Plugin.c:333
+msgid "Error opening Controller 1 plugin!"
+msgstr "无法打开 \"控制器 1\" 插件!"
 
-#: ../win32/gui/WndMain.c:1340
-msgid "CVGS Memory Card (*.mem;*.vgs)"
-msgstr "VGS 记忆卡 (*.mem;*.vgs)"
+#: ../gui/Plugin.c:337
+msgid "Error opening Controller 2 plugin!"
+msgstr "无法打开 \"控制器 2\" 插件!"
 
-#: ../win32/gui/WndMain.c:1345
-msgid "Bleem Memory Card (*.mcd)"
-msgstr "Bleem 记忆卡 (*.mcd)"
+#: ../gui/Plugin.c:342
+#, fuzzy
+msgid "Error opening SIO1 plugin!"
+msgstr "无法打开 SPU 插件!"
 
-#: ../win32/gui/WndMain.c:1350
-msgid "DexDrive Memory Card (*.gme)"
-msgstr "DexDrive 记忆卡 (*.gme)"
+#: ../gui/Plugin.c:424
+msgid "Error closing CD-ROM plugin!"
+msgstr "无法关闭 CD-ROM 插件!"
 
-#: ../win32/gui/WndMain.c:1355
-msgid "DataDeck Memory Card (*.ddf)"
-msgstr "DataDeck 记忆卡 (*.ddl)"
+#: ../gui/Plugin.c:426
+msgid "Error closing SPU plugin!"
+msgstr "无法关闭 SPU 插件!"
 
-#: ../win32/gui/WndMain.c:1360
-#: ../win32/gui/WndMain.c:1441
-#: ../gui/Cheat.c:321
-#: ../gui/Gtk2Gui.c:422
-#: ../gui/Gtk2Gui.c:561
-msgid "All Files"
-msgstr "所有文件"
+#: ../gui/Plugin.c:428
+msgid "Error closing Controller 1 Plugin!"
+msgstr "无法关闭 \"控制器 1\" 插件!"
 
-#: ../win32/gui/WndMain.c:1399
-msgid "Psx Exe Format"
-msgstr "PS EXE 格式"
+#: ../gui/Plugin.c:430
+msgid "Error closing Controller 2 plugin!"
+msgstr "无法关闭 \"控制器 2\" 插件!"
 
-#: ../win32/gui/WndMain.c:1436
-msgid "Psx Isos (*.iso;*.mdf;*.img;*.bin)"
-msgstr "PS 光盘镜像 (*.iso;*.mdf;*.img;*.bin)"
+#: ../gui/Plugin.c:432
+msgid "Error closing GPU plugin!"
+msgstr "无法关闭 GPU 插件!"
 
-#: ../win32/gui/WndMain.c:1512
-msgid "&File"
-msgstr "文件(&F)"
+#: ../gui/Plugin.c:435
+#, fuzzy
+msgid "Error closing SIO1 plugin!"
+msgstr "无法关闭 SPU 插件!"
 
-#: ../win32/gui/WndMain.c:1513
-msgid "E&xit"
-msgstr "退出(&X)"
+#: ../libpcsxcore/cdriso.c:423
+#, fuzzy, c-format
+msgid ""
+"\n"
+"could not open: %s\n"
+msgstr "无法打开目录: \"%s\"\n"
 
-#: ../win32/gui/WndMain.c:1515
-msgid "Run &EXE..."
-msgstr "运行 &EXE..."
+#: ../libpcsxcore/cdriso.c:1043
+#, c-format
+msgid "Track %.2d (%s) - Start %.2d:%.2d:%.2d, Length %.2d:%.2d:%.2d\n"
+msgstr "音轨 %.2d (%s) - 起始位置 %.2d:%.2d:%.2d, 长度 %.2d:%.2d:%.2d\n"
 
-#: ../win32/gui/WndMain.c:1516
-msgid "Run &BIOS"
-msgstr "运行 BIOS(&B)"
+#: ../libpcsxcore/cdriso.c:1064
+#, c-format
+msgid "Loaded CD Image: %s"
+msgstr "已加载 CD 镜像: %s"
 
-#: ../win32/gui/WndMain.c:1517
-msgid "Run &ISO..."
-msgstr "运行 &ISO..."
+#: ../libpcsxcore/cheat.c:147
+#, c-format
+msgid "Cheats loaded from: %s\n"
+msgstr "作弊码已加载: %s\n"
 
-#: ../win32/gui/WndMain.c:1518
-msgid "Run &CD"
-msgstr "运行光碟(&C)"
+#: ../libpcsxcore/cheat.c:179
+#, c-format
+msgid "Cheats saved to: %s\n"
+msgstr "作弊码己保存: %s\n"
 
-#: ../win32/gui/WndMain.c:1520
-msgid "&Emulator"
-msgstr "模拟器(&E)"
+#: ../libpcsxcore/cheat.c:322 ../libpcsxcore/cheat.c:443
+msgid "(Untitled)"
+msgstr "(未命名)"
 
-#: ../win32/gui/WndMain.c:1521
-msgid "&States"
-msgstr "存档(&S)"
+#: ../libpcsxcore/debug.c:321
+msgid "Error allocating memory"
+msgstr "分配内存错误"
 
-#: ../win32/gui/WndMain.c:1523
-msgid "S&witch ISO..."
-msgstr "更换 ISO(&W)..."
+#: ../libpcsxcore/debug.c:326
+msgid "Unable to start debug server.\n"
+msgstr "无法启动调试服务器。\n"
 
-#: ../win32/gui/WndMain.c:1525
-msgid "Re&set"
-msgstr "复位(&S)"
+#: ../libpcsxcore/debug.c:330
+msgid "Debugger started.\n"
+msgstr "调试器已启动。\n"
 
-#: ../win32/gui/WndMain.c:1526
-msgid "&Run"
-msgstr "运行(&R)"
+#: ../libpcsxcore/debug.c:337
+msgid "Debugger stopped.\n"
+msgstr "调试器已停止。\n"
 
-#: ../win32/gui/WndMain.c:1527
-msgid "&Save"
-msgstr "保存(&S)"
+#: ../libpcsxcore/misc.c:350
+#, c-format
+msgid "CD-ROM Label: %.32s\n"
+msgstr "CD-ROM 卷标: %.32s\n"
 
-#: ../win32/gui/WndMain.c:1528
-msgid "&Load"
-msgstr "读取(&L)"
+#: ../libpcsxcore/misc.c:351
+#, c-format
+msgid "CD-ROM ID: %.9s\n"
+msgstr "CD-ROM ID: %.9s\n"
 
-#: ../win32/gui/WndMain.c:1529
-#: ../win32/gui/WndMain.c:1535
-msgid "&Other..."
-msgstr "其它(&O)..."
+#: ../libpcsxcore/misc.c:415
+#, c-format
+msgid "Error opening file: %s.\n"
+msgstr "打开文件错误: %s。\n"
 
-#: ../win32/gui/WndMain.c:1530
-#: ../win32/gui/WndMain.c:1536
-msgid "Slot &5"
-msgstr "存档 5(&5)"
+#: ../libpcsxcore/misc.c:458
+#, c-format
+msgid "Unknown CPE opcode %02x at position %08x.\n"
+msgstr "未知 CPE 指令码 %02x 位于 %08x。\n"
 
-#: ../win32/gui/WndMain.c:1531
-#: ../win32/gui/WndMain.c:1537
-msgid "Slot &4"
-msgstr "存档 4(&4)"
+#: ../libpcsxcore/misc.c:486
+msgid "This file does not appear to be a valid PSX file.\n"
+msgstr "此文件不是一个合法的 PSX 文件。\n"
 
-#: ../win32/gui/WndMain.c:1532
-#: ../win32/gui/WndMain.c:1538
-msgid "Slot &3"
-msgstr "存档 3(&3)"
+#: ../libpcsxcore/plugins.c:190
+#, c-format
+msgid "Error loading %s: %s"
+msgstr "无法加载 %s: %s"
 
-#: ../win32/gui/WndMain.c:1533
-#: ../win32/gui/WndMain.c:1539
-msgid "Slot &2"
-msgstr "存档 2(&2)"
+#: ../libpcsxcore/plugins.c:234
+#, fuzzy, c-format
+msgid ""
+"Could not load GPU plugin %s!\n"
+"%s"
+msgstr "无法加载 GPU 插件 %s!"
 
-#: ../win32/gui/WndMain.c:1534
-#: ../win32/gui/WndMain.c:1540
-msgid "Slot &1"
-msgstr "存档 1(&1)"
+#: ../libpcsxcore/plugins.c:310
+#, fuzzy, c-format
+msgid ""
+"Could not load CD-ROM plugin %s!\n"
+"%s"
+msgstr "无法加载 CD-ROM 插件 %s!"
 
-#: ../win32/gui/WndMain.c:1542
-msgid "&Configuration"
-msgstr "配置(&C)"
+#: ../libpcsxcore/plugins.c:359
+#, fuzzy, c-format
+msgid ""
+"Could not load SPU plugin %s!\n"
+"%s"
+msgstr "无法加载 SPU 插件 %s!"
 
-#: ../win32/gui/WndMain.c:1543
-msgid "Cheat &Search..."
-msgstr "查找作弊码(&S)..."
+#: ../libpcsxcore/plugins.c:499
+#, fuzzy, c-format
+msgid ""
+"Could not load Controller 1 plugin %s!\n"
+"%s"
+msgstr "无法加载 \"控制器1\" 插件 %s!"
 
-#: ../win32/gui/WndMain.c:1544
-msgid "Ch&eat Code..."
-msgstr "作弊码(&E)..."
+#: ../libpcsxcore/plugins.c:558
+#, fuzzy, c-format
+msgid ""
+"Could not load Controller 2 plugin %s!\n"
+"%s"
+msgstr "无法加载 \"控制器2\" 插件 %s!"
 
-#: ../win32/gui/WndMain.c:1547
-msgid "&Language"
-msgstr "语言(&L)"
+#: ../libpcsxcore/plugins.c:604
+#, fuzzy, c-format
+msgid ""
+"Could not load NetPlay plugin %s!\n"
+"%s"
+msgstr "无法加载联网游戏插件 %s!"
 
-#: ../win32/gui/WndMain.c:1572
-msgid "&Memory cards..."
-msgstr "记忆卡(&M)..."
+#: ../libpcsxcore/plugins.c:682
+#, fuzzy, c-format
+msgid ""
+"Could not load SIO1 plugin %s!\n"
+"%s"
+msgstr "无法加载 SIO1 插件 %s!"
 
-#: ../win32/gui/WndMain.c:1573
-msgid "C&PU..."
-msgstr "C&PU..."
+#: ../libpcsxcore/plugins.c:770
+#, c-format
+msgid "Error initializing CD-ROM plugin: %d"
+msgstr "CD-ROM 插件初始化错误: %d"
 
-#: ../win32/gui/WndMain.c:1575
-msgid "&NetPlay..."
-msgstr "联网游戏(&N)..."
+#: ../libpcsxcore/plugins.c:772
+#, c-format
+msgid "Error initializing GPU plugin: %d"
+msgstr "GPU 插件初始化错误: %d"
 
-#: ../win32/gui/WndMain.c:1577
-msgid "&Controllers..."
-msgstr "控制器(&C)..."
+#: ../libpcsxcore/plugins.c:774
+#, c-format
+msgid "Error initializing SPU plugin: %d"
+msgstr "SPU 插件初始化错误: %d"
 
-#: ../win32/gui/WndMain.c:1578
-msgid "CD-&ROM..."
-msgstr "CD-&ROM..."
+#: ../libpcsxcore/plugins.c:776
+#, c-format
+msgid "Error initializing Controller 1 plugin: %d"
+msgstr "\"控制器1\" 插件初始化错误: %d"
 
-#: ../win32/gui/WndMain.c:1579
-msgid "&Sound..."
-msgstr "声音(&S)..."
+#: ../libpcsxcore/plugins.c:778
+#, c-format
+msgid "Error initializing Controller 2 plugin: %d"
+msgstr "\"控制器2\" 插件初始化错误: %d"
 
-#: ../win32/gui/WndMain.c:1580
-msgid "&Graphics..."
-msgstr "图像(&G)..."
+#: ../libpcsxcore/plugins.c:782
+#, c-format
+msgid "Error initializing NetPlay plugin: %d"
+msgstr "联网游戏插件初始化错误: %d"
 
-#: ../win32/gui/WndMain.c:1582
-msgid "&Plugins && Bios..."
-msgstr "插件及 BIOS(&P)..."
+#: ../libpcsxcore/plugins.c:787
+#, c-format
+msgid "Error initializing SIO1 plugin: %d"
+msgstr "SIO1 插件初始化错误: %d"
 
-#: ../win32/gui/WndMain.c:1584
-msgid "&Help"
-msgstr "帮助(&H)"
+#: ../libpcsxcore/plugins.c:790
+msgid "Plugins loaded.\n"
+msgstr "插件已加载。\n"
 
-#: ../win32/gui/WndMain.c:1585
-msgid "&About..."
-msgstr "关于(&A)..."
+#: ../libpcsxcore/ppf.c:219
+#, c-format
+msgid "Invalid PPF patch: %s.\n"
+msgstr "非法 PPF 补丁: %s。\n"
 
-#: ../win32/gui/WndMain.c:1764
-msgid "Pcsx Msg"
-msgstr "PCSX 消息"
+#: ../libpcsxcore/ppf.c:295
+#, c-format
+msgid "Unsupported PPF version (%d).\n"
+msgstr "不支持的 PPF 补丁版本 (%d)。\n"
 
-#: ../win32/gui/WndMain.c:1767
-msgid "Error Loading Symbol"
-msgstr "无法加载符号"
+#. build address array
+#: ../libpcsxcore/ppf.c:334
+#, c-format
+msgid "Loaded PPF %d.0 patch: %s.\n"
+msgstr "已加载 PPF %d.0 补丁文件: %s。\n"
 
-#: ../gui/AboutDlg.c:74
-msgid ""
-"(C) 1999-2003 PCSX Team\n"
-"(C) 2005-2009 PCSX-df Team\n"
-"(C) 2009-2010 PCSX-Reloaded Team"
-msgstr ""
-"(C) 1999-2003 PCSX 开发组\n"
-"(C) 2005-2009 PCSX-df 开发组\n"
-"(C) 2009-2010 PCSX-Reloaded 开发组"
+#: ../libpcsxcore/ppf.c:384
+#, c-format
+msgid "Loaded SBI file: %s.\n"
+msgstr "已加载 SBI 文件: %s。\n"
 
-#: ../gui/AboutDlg.c:79
-msgid ""
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA."
-msgstr ""
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA."
+#: ../libpcsxcore/psxmem.c:78
+msgid "Error allocating memory!"
+msgstr "分配内存错误!"
 
-#: ../gui/AboutDlg.c:102
-msgid "translator-credits"
-msgstr "Wei Mingzhi <whistler@openoffice.org>"
+#: ../libpcsxcore/psxmem.c:121
+#, c-format
+msgid "Could not open BIOS:\"%s\". Enabling HLE Bios!\n"
+msgstr "无法打开 BIOS: \"%s\"。使用内部 HLE Bios。\n"
 
-#: ../gui/AboutDlg.c:103
-msgid "A PlayStation emulator."
-msgstr "一个 PlayStation 模拟器。"
+#: ../libpcsxcore/r3000a.c:34
+#, c-format
+msgid "Running PCSXR Version %s (%s).\n"
+msgstr "正在运行 PCSXR 版本 %s (%s)。\n"
 
-#: ../gui/Cheat.c:117
-#: ../gui/Cheat.c:202
-msgid "Cheat Description:"
-msgstr "作弊码描述:"
+#: ../libpcsxcore/sio.c:843
+msgid "Connection closed!\n"
+msgstr "连接被关闭!\n"
 
-#: ../gui/Cheat.c:306
-msgid "Open Cheat File"
-msgstr "打开作弊码文件"
+#: ../libpcsxcore/sio.c:876
+#, c-format
+msgid "No memory card value was specified - creating a default card %s\n"
+msgstr "未指定记忆卡 - 创建一个默认的记忆卡 %s\n"
 
-#: ../gui/Cheat.c:316
-#: ../gui/Cheat.c:356
-msgid "PCSX Cheat Code Files (*.cht)"
-msgstr "PCSX 作弊码文件 (*.cht)"
+#: ../libpcsxcore/sio.c:880
+#, c-format
+msgid "The memory card %s doesn't exist - creating it\n"
+msgstr "记忆卡 %s 不存在 - 正在创建\n"
 
-#: ../gui/Cheat.c:346
-msgid "Save Cheat File"
-msgstr "保存作弊码文件"
+#: ../libpcsxcore/sio.c:896
+#, c-format
+msgid "Memory card %s failed to load!\n"
+msgstr "记忆卡 %s 读取失败!\n"
 
-#: ../gui/Cheat.c:361
-msgid "All Files (*.*)"
-msgstr "所有文件 (*.*)"
+#: ../libpcsxcore/sio.c:900
+#, c-format
+msgid "Loading memory card %s\n"
+msgstr "加载记忆卡 %s\n"
 
-#: ../gui/Cheat.c:394
-#: ../gui/Cheat.c:1124
-#: ../gui/ConfDlg.c:104
-#: ../gui/ConfDlg.c:200
-#: ../gui/DebugMemory.c:259
-msgid "Error: Glade interface could not be loaded!"
-msgstr "错误：无法加载 Glade 界面!"
+#: ../plugins/dfcdrom/cdr.c:25
+msgid "CD-ROM Drive Reader"
+msgstr "CD-ROM 设备读取插件"
 
-#: ../gui/Cheat.c:399
-msgid "Cheat Codes"
-msgstr "作弊码"
+#: ../plugins/dfcdrom/cdr.c:27
+msgid "CDR NULL Plugin"
+msgstr "CDR 空插件"
 
-#: ../gui/Cheat.c:405
-msgid "Enable"
-msgstr "启用"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:1
+#: ../plugins/dfcdrom/cdrcfg-0.1df/main.c:217
+msgid "CDR configuration"
+msgstr "CDR 配置"
 
-#: ../gui/Cheat.c:630
-msgid "Freeze value"
-msgstr "固定数值"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:2
+msgid "Choose your CD-ROM device or type its path if it's not listed"
+msgstr "请选择您的 CD-ROM 设备或直接输入设备路径"
 
-#: ../gui/Cheat.c:729
-msgid "Modify value"
-msgstr "修改数值"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:3
+msgid "Select read mode:"
+msgstr "选择读取模式:"
 
-#: ../gui/Cheat.c:737
-msgid "New value:"
-msgstr "新值:"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:4
+msgid "Cache Size (Def. 64):"
+msgstr "缓存大小 (默认为 64):"
 
-#: ../gui/Cheat.c:1134
-msgid "Search Results"
-msgstr "查找结果"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:5
+msgid "Spindown Time:"
+msgstr "电机停转时限:"
 
-#: ../gui/ConfDlg.c:112
-#: ../data/pcsx.glade2:778
-msgid "Configure PCSX"
-msgstr "配置 PCSX"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:6
+msgid "Cdrom Speed (Def. 0 = MAX):"
+msgstr "光驱速度 (默认 0 为最大速度):"
 
-#: ../gui/ConfDlg.c:237
-#: ../gui/ConfDlg.c:258
-#: ../gui/ConfDlg.c:279
-#: ../gui/ConfDlg.c:300
-#: ../gui/ConfDlg.c:355
-msgid "No configuration required"
-msgstr "不需要配置"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:7
+msgid "Enable subchannel read"
+msgstr "启用子通道读取"
 
-#: ../gui/ConfDlg.c:237
-#: ../gui/ConfDlg.c:258
-#: ../gui/ConfDlg.c:279
-#: ../gui/ConfDlg.c:300
-#: ../gui/ConfDlg.c:355
-msgid "This plugin doesn't need to be configured."
-msgstr "此插件需要被配置。"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:8
+msgid "Normal (No Cache)"
+msgstr "通常 (没有缓存)"
 
-#: ../gui/ConfDlg.c:581
-#, c-format
-msgid "Could not open BIOS directory: '%s'\n"
-msgstr "无法打开 BIOS 目录: \"%s\"\n"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:9
+msgid "Threaded - Faster (With Cache)"
+msgstr "多线程 - 较快 (使用缓存)"
 
-#: ../gui/ConfDlg.c:611
-#: ../gui/ConfDlg.c:704
-#: ../gui/LnxMain.c:168
-#, c-format
-msgid "Could not open directory: '%s'\n"
-msgstr "无法打开目录: \"%s\"\n"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:10
+msgid "Default"
+msgstr "默认"
 
-#: ../gui/ConfDlg.c:675
-msgid "Simulate PSX BIOS"
-msgstr "模拟 PS BIOS"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:11
+msgid "125ms"
+msgstr "125毫秒"
 
-#: ../gui/DebugMemory.c:103
-#: ../data/pcsx.glade2:3178
-msgid "Memory Dump"
-msgstr "内存转储"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:12
+msgid "250ms"
+msgstr "250毫秒"
 
-#: ../gui/DebugMemory.c:111
-msgid "Start Address (Hexadecimal):"
-msgstr "开始地址 (十六进制):"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:13
+msgid "500ms"
+msgstr "500毫秒"
 
-#: ../gui/DebugMemory.c:121
-msgid "Length (Decimal):"
-msgstr "长度 (十进制):"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:14
+msgid "1s"
+msgstr "1秒"
 
-#: ../gui/DebugMemory.c:147
-msgid "Dump to File"
-msgstr "转储至文件"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:15
+msgid "2s"
+msgstr "2秒"
 
-#: ../gui/DebugMemory.c:162
-#, c-format
-msgid "Error writing to %s!"
-msgstr "写入到 %s 时出错!"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:16
+msgid "4s"
+msgstr "4秒"
 
-#: ../gui/DebugMemory.c:180
-msgid "Memory Patch"
-msgstr "内存修改"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:17
+msgid "8s"
+msgstr "8秒"
 
-#: ../gui/DebugMemory.c:188
-#: ../data/pcsx.glade2:3199
-msgid "Address (Hexadecimal):"
-msgstr "地址 (十六进制):"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:18
+msgid "16s"
+msgstr "16秒"
 
-#: ../gui/DebugMemory.c:198
-msgid "Value (Hexa string):"
-msgstr "数值 (十六进制串):"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:19
+msgid "32s"
+msgstr "32秒"
 
-#: ../gui/DebugMemory.c:264
-msgid "Memory Viewer"
-msgstr "内存查看器"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:20
+msgid "1min"
+msgstr "1分钟"
 
-#: ../gui/DebugMemory.c:269
-msgid "Address"
-msgstr "地址"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:21
+msgid "2min"
+msgstr "2分钟"
 
-#: ../gui/DebugMemory.c:287
-msgid "Text"
-msgstr "文本"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:22
+msgid "4min"
+msgstr "4分钟"
 
-#: ../gui/Gtk2Gui.c:113
-msgid "Ready"
-msgstr "就绪"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:23
+msgid "8min"
+msgstr "8分钟"
 
-#: ../gui/Gtk2Gui.c:154
-msgid "Emulation Paused."
-msgstr "模拟器已暂停。"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:24
+msgid "16min"
+msgstr "16分钟"
 
-#: ../gui/Gtk2Gui.c:405
-msgid "Select PSX EXE File"
-msgstr "选择 PS EXE 文件"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:25
+msgid "32min"
+msgstr "32分钟"
 
-#: ../gui/Gtk2Gui.c:418
-msgid "PlayStation Executable Files"
-msgstr "PlayStation 可执行文件"
+#: ../plugins/dfinput/cfg-gtk.c:49
+msgid "D-Pad Up"
+msgstr "方向键上"
 
-#: ../gui/Gtk2Gui.c:454
-msgid "Not a valid PSX file"
-msgstr "不是一个合法的 PSX 文件"
+#: ../plugins/dfinput/cfg-gtk.c:50
+msgid "D-Pad Down"
+msgstr "方向键下"
 
-#: ../gui/Gtk2Gui.c:454
-msgid "The file does not appear to be a valid Playstation executable"
-msgstr "此文件不是一个合法的 PlayStation 可执行文件"
+#: ../plugins/dfinput/cfg-gtk.c:51
+msgid "D-Pad Left"
+msgstr "方向键左"
 
-#: ../gui/Gtk2Gui.c:485
-#: ../gui/Gtk2Gui.c:610
-msgid "CD ROM failed"
-msgstr "CD-ROM 失败"
+#: ../plugins/dfinput/cfg-gtk.c:52
+msgid "D-Pad Right"
+msgstr "方向键右"
 
-#: ../gui/Gtk2Gui.c:493
-#: ../gui/Gtk2Gui.c:618
-msgid "The CD-ROM could not be loaded"
-msgstr "无法加载 CD-ROM"
+#: ../plugins/dfinput/cfg-gtk.c:53
+msgid "Cross"
+msgstr "叉号键"
 
-#: ../gui/Gtk2Gui.c:507
-msgid "Could not run BIOS"
-msgstr "无法运行 BIOS"
+#: ../plugins/dfinput/cfg-gtk.c:54
+msgid "Circle"
+msgstr "圆圈键"
 
-#: ../gui/Gtk2Gui.c:507
-msgid "Running BIOS is not supported with Internal HLE BIOS."
-msgstr "内部 HLE BIOS 不支持直接运行。"
+#: ../plugins/dfinput/cfg-gtk.c:55
+msgid "Square"
+msgstr "方块键"
 
-#: ../gui/Gtk2Gui.c:536
-msgid "Open PSX Disc Image File"
-msgstr "打开 PS 光盘镜像文件"
+#: ../plugins/dfinput/cfg-gtk.c:56
+msgid "Triangle"
+msgstr "三角键"
 
-#: ../gui/Gtk2Gui.c:556
-msgid "PSX Image Files (*.bin, *.img, *.mdf, *.iso)"
-msgstr "PS 镜像文件 (*.bin, *.img, *.mdf, *.iso)"
+#: ../plugins/dfinput/cfg-gtk.c:57
+msgid "L1"
+msgstr "L1"
 
-#: ../gui/Gtk2Gui.c:771
-#, c-format
-msgid "Loaded state %s."
-msgstr "已读取存档 %s。"
+#: ../plugins/dfinput/cfg-gtk.c:58
+msgid "R1"
+msgstr "R1"
 
-#: ../gui/Gtk2Gui.c:774
-#, c-format
-msgid "Error loading state %s!"
-msgstr "读取存档 %s 时出错。"
+#: ../plugins/dfinput/cfg-gtk.c:59
+msgid "L2"
+msgstr "L2"
 
-#: ../gui/Gtk2Gui.c:785
-#, c-format
-msgid "Saved state %s."
-msgstr "已保存存档 %s"
+#: ../plugins/dfinput/cfg-gtk.c:60
+msgid "R2"
+msgstr "R2"
 
-#: ../gui/Gtk2Gui.c:787
-#, c-format
-msgid "Error saving state %s!"
-msgstr "保存存档 %s 时出错。"
+#: ../plugins/dfinput/cfg-gtk.c:61
+msgid "Select"
+msgstr "选择键"
 
-#: ../gui/Gtk2Gui.c:822
-#: ../gui/Gtk2Gui.c:850
-msgid "Select State File"
-msgstr "选择存档文件"
+#: ../plugins/dfinput/cfg-gtk.c:62
+msgid "Start"
+msgstr "开始键"
 
-#: ../gui/Gtk2Gui.c:893
-msgid "Notice"
-msgstr "警告"
+#: ../plugins/dfinput/cfg-gtk.c:63
+msgid "L3"
+msgstr "L3"
 
-#: ../gui/LnxMain.c:62
-#, c-format
-msgid "Creating memory card: %s\n"
-msgstr "建立记忆卡: %s\n"
+#: ../plugins/dfinput/cfg-gtk.c:64
+msgid "R3"
+msgstr "R3"
 
-#: ../gui/LnxMain.c:325
-msgid ""
-" pcsx [options] [file]\n"
-"\toptions:\n"
-"\t-runcd\t\tRuns CD-ROM\n"
-"\t-cdfile FILE\tRuns a CD image file\n"
-"\t-nogui\t\tDon't open the GTK GUI\n"
-"\t-cfg FILE\tLoads desired configuration file (default: ~/.pcsx/pcsx.cfg)\n"
-"\t-psxout\t\tEnable PSX output\n"
-"\t-load STATENUM\tLoads savestate STATENUM (1-5)\n"
-"\t-h -help\tDisplay this message\n"
-"\tfile\t\tLoads file\n"
-msgstr ""
-" pcsx [选项] [文件]\n"
-"\t选项:\n"
-"\t-runcd\t\t运行 CD-ROM\n"
-"\t-cdfile 文件\t运行一个 CD 镜像文件\n"
-"\t-nogui\t\t不使用 GTK 图形界面\n"
-"\t-cfg 文件\t加载一个特定的配置文件 (默认为: ~/.pcsx/pcsx.cfg)\n"
-"\t-psxout\t\t启用 PSX 输出\n"
-"\t-load 编号\t加载指定编号的存档 (1-5)\n"
-"\t-h -help\t显示此信息\n"
-"\t文件\t\t加载文件\n"
+#: ../plugins/dfinput/cfg-gtk.c:65
+msgid "Analog"
+msgstr "摇杆手柄"
 
-#: ../gui/LnxMain.c:362
-#, c-format
-msgid "PCSX cannot be configured without using the GUI -- you should restart without -nogui.\n"
-msgstr "PCSX 不能在字符界面下配置 -- 请不使用 -nogui 参数重新启动程序\n"
+#: ../plugins/dfinput/cfg-gtk.c:69
+msgid "L-Stick Right"
+msgstr "左摇杆右方向"
 
-#: ../gui/LnxMain.c:418
-msgid "Failed loading plugins!"
-msgstr "加载插件失败!"
+#: ../plugins/dfinput/cfg-gtk.c:70
+msgid "L-Stick Left"
+msgstr "左摇杆左方向"
 
-#: ../gui/LnxMain.c:435
-#, c-format
-msgid "Could not load CD-ROM!\n"
-msgstr "无法加载光盘。\n"
+#: ../plugins/dfinput/cfg-gtk.c:71
+msgid "L-Stick Down"
+msgstr "左摇杆下方向"
 
-#: ../gui/LnxMain.c:466
-#, c-format
-msgid "PSX emulator couldn't be initialized.\n"
-msgstr "无法初始化 PS 模拟器。\n"
+#: ../plugins/dfinput/cfg-gtk.c:72
+msgid "L-Stick Up"
+msgstr "左摇杆上方向"
 
-#: ../gui/MemcardDlg.c:56
-msgid "Icon"
-msgstr "图标"
+#: ../plugins/dfinput/cfg-gtk.c:73
+msgid "R-Stick Right"
+msgstr "右摇杆右方向"
 
-#: ../gui/MemcardDlg.c:74
-msgid "ID"
-msgstr "ID"
+#: ../plugins/dfinput/cfg-gtk.c:74
+msgid "R-Stick Left"
+msgstr "右摇杆左方向"
 
-#: ../gui/MemcardDlg.c:80
-msgid "Name"
-msgstr "名称"
+#: ../plugins/dfinput/cfg-gtk.c:75
+msgid "R-Stick Down"
+msgstr "右摇杆下方向"
 
-#: ../gui/MemcardDlg.c:323
-msgid "Select A File"
-msgstr "选择一个文件"
+#: ../plugins/dfinput/cfg-gtk.c:76
+msgid "R-Stick Up"
+msgstr "右摇杆上方向"
 
-#: ../gui/MemcardDlg.c:364
-msgid "Format this Memory Card?"
-msgstr "格式化此记忆卡?"
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
+msgid "Centered"
+msgstr "居中"
 
-#: ../gui/MemcardDlg.c:366
-msgid "If you format the memory card, the card will be empty, and any existing data overwritten."
-msgstr "如果您选择格式化记忆卡，记忆卡将被清空，并且任何现有数据都将被覆盖。"
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
+msgid "Up"
+msgstr "上"
 
-#: ../gui/MemcardDlg.c:369
-msgid "Format card"
-msgstr "格式化记忆卡"
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
+msgid "Right"
+msgstr "右方向键"
 
-#: ../gui/MemcardDlg.c:393
-msgid "Create a new Memory Card"
-msgstr "新建记忆卡"
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
+msgid "Rightup"
+msgstr "右上"
 
-#: ../gui/MemcardDlg.c:402
-msgid "New Memory Card.mcd"
-msgstr "新记忆卡.mcd"
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
+msgid "Down"
+msgstr "下"
 
-#: ../gui/MemcardDlg.c:503
-msgid "No free space on memory card"
-msgstr "记忆卡无空余位置"
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
+msgid "Rightdown"
+msgstr "右下"
 
-#: ../gui/MemcardDlg.c:504
-msgid "There are no free slots available on the target memory card. Please delete a slot first."
-msgstr "目标记忆卡上无空余位置。请先删除一个存档。"
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
+msgid "Left"
+msgstr "左"
 
-#: ../gui/MemcardDlg.c:667
-msgid "Memory Card Manager"
-msgstr "记忆卡管理器"
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
+msgid "Leftup"
+msgstr "左上"
 
-#: ../gui/Plugin.c:211
-#: ../data/pcsx.glade2:1487
-#, c-format
-msgid "SIO IRQ Always Enabled"
-msgstr "SIO IRQ 总是启用"
+#: ../plugins/dfinput/cfg-gtk.c:104 ../plugins/dfinput/cfg-gtk.c:143
+msgid "Leftdown"
+msgstr "左下"
 
-#: ../gui/Plugin.c:212
+#: ../plugins/dfinput/cfg-gtk.c:108 ../plugins/dfinput/cfg-gtk.c:147
 #, c-format
-msgid "SIO IRQ Not Always Enabled"
-msgstr "SIO IRQ 不总是启用"
+msgid "Joystick: Button %d"
+msgstr "手柄: 按钮 %d"
 
-#: ../gui/Plugin.c:218
+#: ../plugins/dfinput/cfg-gtk.c:112 ../plugins/dfinput/cfg-gtk.c:151
 #, c-format
-msgid "Black & White Mdecs Only Enabled"
-msgstr "Black & White Mdecs Only 启用"
+msgid "Joystick: Axis %d%c"
+msgstr "手柄: 轴 %d%c"
 
-#: ../gui/Plugin.c:219
+#: ../plugins/dfinput/cfg-gtk.c:117 ../plugins/dfinput/cfg-gtk.c:156
 #, c-format
-msgid "Black & White Mdecs Only Disabled"
-msgstr "Black & White Mdecs Only 禁用"
+msgid "Joystick: Hat %d %s"
+msgstr "Joystick: 操纵杆 %d %s"
 
-#: ../gui/Plugin.c:225
-#, c-format
-msgid "XA Enabled"
-msgstr "XA 已启用"
+#: ../plugins/dfinput/cfg-gtk.c:132 ../plugins/dfinput/cfg-gtk.c:171
+msgid "Keyboard:"
+msgstr "键盘:"
 
-#: ../gui/Plugin.c:226
-#, c-format
-msgid "XA Disabled"
-msgstr "XA 已禁用"
+#: ../plugins/dfinput/cfg-gtk.c:136 ../plugins/dfinput/cfg-gtk.c:175
+msgid "(Not Set)"
+msgstr "(未设定)"
 
-#: ../gui/Plugin.c:288
-msgid "Error opening CD-ROM plugin!"
-msgstr "无法打开CD-ROM 插件!"
+#: ../plugins/dfinput/cfg-gtk.c:575
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:14
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:68
+msgid "None"
+msgstr "无"
 
-#: ../gui/Plugin.c:290
-msgid "Error opening SPU plugin!"
-msgstr "无法打开 SPU 插件!"
+#: ../plugins/dfinput/cfg-gtk.c:623
+msgid "Gamepad/Keyboard Input Configuration"
+msgstr "手柄/键盘输入配置"
+
+#: ../plugins/dfinput/cfg-gtk.c:629 ../plugins/dfinput/cfg-gtk.c:649
+msgid "Key"
+msgstr "按钮"
+
+#: ../plugins/dfinput/cfg-gtk.c:635 ../plugins/dfinput/cfg-gtk.c:655
+msgid "Button"
+msgstr "按键"
+
+#: ../plugins/dfinput/dfinput.ui.h:1
+msgid "Device:"
+msgstr "设备:"
+
+#: ../plugins/dfinput/dfinput.ui.h:2
+msgid "Type:"
+msgstr "类型:"
+
+#: ../plugins/dfinput/dfinput.ui.h:3
+msgid "Visual vibration"
+msgstr "图像震动"
+
+#: ../plugins/dfinput/dfinput.ui.h:4
+msgid "Change"
+msgstr "更改"
+
+#: ../plugins/dfinput/dfinput.ui.h:5
+msgid "Reset"
+msgstr "重置"
+
+#: ../plugins/dfinput/dfinput.ui.h:6
+msgid "Controller 1"
+msgstr "控制器 1"
+
+#: ../plugins/dfinput/dfinput.ui.h:7
+msgid "Controller 2"
+msgstr "控制器 2"
+
+#: ../plugins/dfinput/dfinput.ui.h:8
+msgid "Multi-Threaded (Recommended)"
+msgstr "多线程 (推荐)"
+
+#: ../plugins/dfinput/dfinput.ui.h:9 ../win32/gui/WndMain.c:1342
+msgid "Options"
+msgstr "选项"
 
-#: ../gui/Plugin.c:293
-msgid "Error opening GPU plugin!"
-msgstr "无法打开 GPU 插件!"
+#: ../plugins/dfinput/dfinput.ui.h:10
+msgid "Digital Pad"
+msgstr "普通手柄"
 
-#: ../gui/Plugin.c:295
-msgid "Error opening Controller 1 plugin!"
-msgstr "无法打开 \"控制器 1\" 插件!"
+#: ../plugins/dfinput/dfinput.ui.h:11
+msgid "Analog Pad"
+msgstr "摇杆手柄"
 
-#: ../gui/Plugin.c:297
-msgid "Error opening Controller 2 plugin!"
-msgstr "无法打开 \"控制器 2\" 插件!"
+#: ../plugins/dfinput/dfinput.ui.h:12
+msgid "Mouse"
+msgstr "鼠标"
 
-#: ../gui/Plugin.c:377
-msgid "Error closing CD-ROM plugin!"
-msgstr "无法关闭 CD-ROM 插件!"
+#: ../plugins/dfinput/pad.c:33
+msgid "Gamepad/Keyboard/Mouse Input"
+msgstr "手柄/键盘/鼠标输入"
 
-#: ../gui/Plugin.c:379
-msgid "Error closing SPU plugin!"
-msgstr "无法关闭 SPU 插件!"
+#. increase that with each version
+#: ../plugins/dfnet/dfnet.c:23
+msgid "Socket Driver"
+msgstr "套接字驱动程序"
 
-#: ../gui/Plugin.c:381
-msgid "Error closing Controller 1 Plugin!"
-msgstr "无法关闭 \"控制器 1\" 插件!"
+#: ../plugins/dfnet/dfnet.c:161
+#, c-format
+msgid "error connecting to %s: %s\n"
+msgstr "无法连接到 %s: %s\n"
 
-#: ../gui/Plugin.c:383
-msgid "Error closing Controller 2 plugin!"
-msgstr "无法关闭 \"控制器 2\" 插件!"
+#: ../plugins/dfnet/dfnet.c:186
+msgid "Error allocating memory!\n"
+msgstr "分配内存错误!\n"
 
-#: ../gui/Plugin.c:385
-msgid "Error closing GPU plugin!"
-msgstr "无法关闭 GPU 插件!"
+#: ../plugins/dfnet/dfnet.ui.h:1
+msgid "Start Game"
+msgstr "开始游戏"
 
-#: ../libpcsxcore/cdriso.c:658
-#, c-format
-msgid "Track %.2d (%s) - Start %.2d:%.2d:%.2d, Length %.2d:%.2d:%.2d\n"
-msgstr "音轨 %.2d (%s) - 起始位置 %.2d:%.2d:%.2d, 长度 %.2d:%.2d:%.2d\n"
+#: ../plugins/dfnet/dfnet.ui.h:2
+msgid "Play Offline"
+msgstr "离线运行"
 
-#: ../libpcsxcore/cdriso.c:677
-#, c-format
-msgid "Loaded CD Image: %s"
-msgstr "已加载 CD 镜像: %s"
+#: ../plugins/dfnet/dfnet.ui.h:3
+msgid ""
+"Select here if you'll be Server (Player1) or Client (Player2).\n"
+"\n"
+"If you select Server you must Copy your IP address to the Clipboard and "
+"paste if (Ctrl+V) wherever the Client can see it.\n"
+"\n"
+"If you selected Client please enter the IP address the Server gave to you in "
+"the IP Address Control."
+msgstr ""
+"请在此选择作为服务器 (玩家 1) 还是作为客户端 (玩家 2) 来运行。\n"
+"\n"
+"如果您选择作为服务器，您必须复制本机 IP 地址到剪贴板并将此信息告知客户端。\n"
+"\n"
+"如果您选择作为客户端，请输入服务器方提供给您的 IP 地址。"
 
-#: ../libpcsxcore/cheat.c:147
-#, c-format
-msgid "Cheats loaded from: %s\n"
-msgstr "作弊码已加载: %s\n"
+#: ../plugins/dfnet/dfnet.ui.h:8 ../plugins/bladesio1/sio1.ui.h:6
+msgid "Copy PC IP to Clipboard"
+msgstr "将本机 IP 复制到剪贴板"
 
-#: ../libpcsxcore/cheat.c:179
-#, c-format
-msgid "Cheats saved to: %s\n"
-msgstr "作弊码己保存: %s\n"
+#: ../plugins/dfnet/dfnet.ui.h:9 ../plugins/bladesio1/sio1.ui.h:7
+msgid "Server (Player1)"
+msgstr "服务器 (玩家 1)"
 
-#: ../libpcsxcore/cheat.c:322
-#: ../libpcsxcore/cheat.c:443
-msgid "(Untitled)"
-msgstr "(未命名)"
+#: ../plugins/dfnet/dfnet.ui.h:10 ../plugins/bladesio1/sio1.ui.h:8
+msgid "Client (Player2)"
+msgstr "客户端 (玩家 2)"
 
-#: ../libpcsxcore/debug.c:317
-msgid "Error allocating memory"
-msgstr "分配内存错误"
+#: ../plugins/dfnet/dfnet.ui.h:11 ../plugins/bladesio1/sio1.ui.h:10
+msgid ""
+"Do not change if not necessary (remember it must be changed on both sides)."
+msgstr "如非必要，请勿改动 (必须在两端都要改动)。"
 
-#: ../libpcsxcore/debug.c:322
-msgid "Unable to start debug server.\n"
-msgstr "无法启动调试服务器。\n"
+#: ../plugins/dfnet/dfnet.ui.h:12 ../plugins/bladesio1/sio1.ui.h:11
+msgid "Port Number"
+msgstr "端口号"
 
-#: ../libpcsxcore/debug.c:326
-msgid "Debugger started.\n"
-msgstr "调试器已启动。\n"
+#: ../plugins/dfnet/gui.c:30 ../plugins/dfnet/gui.c:112
+#: ../plugins/bladesio1/gui.c:82 ../win32/gui/ConfigurePlugins.c:669
+msgid "NetPlay"
+msgstr "联网游戏"
 
-#: ../libpcsxcore/debug.c:333
-msgid "Debugger stopped.\n"
-msgstr "调试器已停止。\n"
+#: ../plugins/dfnet/gui.c:38
+msgid "Nothing to configure"
+msgstr "没有可以配置的项目"
 
-#: ../libpcsxcore/misc.c:342
+#: ../plugins/dfnet/gui.c:94 ../plugins/bladesio1/gui.c:94
 #, c-format
-msgid "CD-ROM Label: %.32s\n"
-msgstr "CD-ROM 卷标: %.32s\n"
+msgid "IP %s"
+msgstr "IP %s"
 
-#: ../libpcsxcore/misc.c:343
-#, c-format
-msgid "CD-ROM ID: %.9s\n"
-msgstr "CD-ROM ID: %.9s\n"
+#: ../plugins/dfnet/gui.c:165
+msgid "Waiting for connection..."
+msgstr "正在等待连接..."
 
-#: ../libpcsxcore/misc.c:388
-#, c-format
-msgid "Error opening file: %s.\n"
-msgstr "打开文件错误: %s。\n"
+#: ../plugins/dfnet/gui.c:168
+msgid "The Client should now Start a Connection, waiting..."
+msgstr "客户端应在此时发起连接，等待中..."
 
-#: ../libpcsxcore/misc.c:428
-#, c-format
-msgid "Unknown CPE opcode %02x at position %08x.\n"
-msgstr "未知 CPE 指令码 %02x 位于 %08x。\n"
+#: ../plugins/dfsound/spu.c:66
+msgid "DirectSound Driver"
+msgstr "DirectSound 驱动程序"
 
-#: ../libpcsxcore/misc.c:435
-msgid "COFF files not supported.\n"
-msgstr "COFF 文件尚未支持。\n"
+#: ../plugins/dfsound/spu.c:68
+msgid "Mac OS X Sound"
+msgstr "Mac OS X 声音"
 
-#: ../libpcsxcore/misc.c:439
-msgid "This file does not appear to be a valid PSX file.\n"
-msgstr "此文件不是一个合法的 PSX 文件。\n"
+#: ../plugins/dfsound/spu.c:70
+msgid "ALSA Sound"
+msgstr "ALSA 声音"
 
-#: ../libpcsxcore/plugins.c:181
-#, c-format
-msgid "Error loading %s: %s"
-msgstr "无法加载 %s: %s"
+#: ../plugins/dfsound/spu.c:72
+msgid "OSS Sound"
+msgstr "OSS 声音"
 
-#: ../libpcsxcore/plugins.c:221
-#, c-format
-msgid "Could not load GPU plugin %s!"
-msgstr "无法加载 GPU 插件 %s!"
+#: ../plugins/dfsound/spu.c:74
+msgid "SDL Sound"
+msgstr "SDL 声音"
 
-#: ../libpcsxcore/plugins.c:292
-#, c-format
-msgid "Could not load CD-ROM plugin %s!"
-msgstr "无法加载 CD-ROM 插件 %s!"
+#: ../plugins/dfsound/spu.c:76
+msgid "OpenAL Sound"
+msgstr "OpenAL 声音"
 
-#: ../libpcsxcore/plugins.c:340
-#, c-format
-msgid "Could not load SPU plugin %s!"
-msgstr "无法加载 SPU 插件 %s!"
+#: ../plugins/dfsound/spu.c:78
+msgid "PulseAudio Sound"
+msgstr "PulseAudio 声音"
 
-#: ../libpcsxcore/plugins.c:477
-#, c-format
-msgid "Could not load Controller 1 plugin %s!"
-msgstr "无法加载 \"控制器1\" 插件 %s!"
+#: ../plugins/dfsound/spu.c:80
+msgid "NULL Sound"
+msgstr "空声音"
 
-#: ../libpcsxcore/plugins.c:531
-#, c-format
-msgid "Could not load Controller 2 plugin %s!"
-msgstr "无法加载 \"控制器2\" 插件 %s!"
+#: ../plugins/dfsound/spu.c:83
+msgid ""
+"P.E.Op.S. Sound Driver V1.7\n"
+"Coded by Pete Bernert and the P.E.Op.S. team\n"
+msgstr ""
+"P.E.Op.S 声音驱动程序 V1.7\n"
+"编写: Pete Bernert 以及 P.E.Op.S. 开发组\n"
 
-#: ../libpcsxcore/plugins.c:574
-#, c-format
-msgid "Could not load NetPlay plugin %s!"
-msgstr "无法加载联网游戏插件 %s!"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:2
+msgid "Volume:"
+msgstr "音量:"
 
-#: ../libpcsxcore/plugins.c:654
-#, c-format
-msgid "Could not load SIO1 plugin %s!"
-msgstr "无法加载 SIO1 插件 %s!"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:3
+msgid "Interpolation:"
+msgstr "插值:"
 
-#: ../libpcsxcore/plugins.c:739
-#, c-format
-msgid "Error initializing CD-ROM plugin: %d"
-msgstr "CD-ROM 插件初始化错误: %d"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:4
+msgid "Reverb:"
+msgstr "回响:"
 
-#: ../libpcsxcore/plugins.c:741
-#, c-format
-msgid "Error initializing GPU plugin: %d"
-msgstr "GPU 插件初始化错误: %d"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:5
+msgid "Adjust XA speed"
+msgstr "调整 XA 速度"
 
-#: ../libpcsxcore/plugins.c:743
-#, c-format
-msgid "Error initializing SPU plugin: %d"
-msgstr "SPU 插件初始化错误: %d"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:6
+msgid "Choose this if XA music is played too quickly."
+msgstr "如 XA 音乐播放得太快，请选择此项。"
 
-#: ../libpcsxcore/plugins.c:745
-#, c-format
-msgid "Error initializing Controller 1 plugin: %d"
-msgstr "\"控制器1\" 插件初始化错误: %d"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:7
+msgid "High compatibility mode"
+msgstr "高兼容性模式"
 
-#: ../libpcsxcore/plugins.c:747
-#, c-format
-msgid "Error initializing Controller 2 plugin: %d"
-msgstr "\"控制器2\" 插件初始化错误: %d"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:8
+msgid "Use the asynchronous SPU interface."
+msgstr "使用异步 SPU 接口。"
 
-#: ../libpcsxcore/plugins.c:751
-#, c-format
-msgid "Error initializing NetPlay plugin: %d"
-msgstr "联网游戏插件初始化错误: %d"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:9
+msgid "SPU IRQ Wait"
+msgstr "SPU IRQ 等待"
 
-#: ../libpcsxcore/plugins.c:756
-#, c-format
-msgid "Error initializing SIO1 plugin: %d"
-msgstr "SIO1 插件初始化错误: %d"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:10
+msgid "Wait for CPU; only useful for some games."
+msgstr "等待 CPU; 仅在部分游戏中有用处。"
 
-#: ../libpcsxcore/plugins.c:759
-msgid "Plugins loaded.\n"
-msgstr "插件已加载。\n"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:11
+msgid "Single channel sound"
+msgstr "单声道"
 
-#: ../libpcsxcore/ppf.c:216
-#, c-format
-msgid "Invalid PPF patch: %s.\n"
-msgstr "非法 PPF 补丁: %s。\n"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:12
+msgid "Play only one channel for a performance boost."
+msgstr "仅播放一个声道以提升性能。"
 
-#: ../libpcsxcore/ppf.c:292
-#, c-format
-msgid "Unsupported PPF version (%d).\n"
-msgstr "不支持的 PPF 补丁版本 (%d)。\n"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:13
+msgid "Frequency Response - Output Filter"
+msgstr "频率响应 - 输出过滤"
 
-#: ../libpcsxcore/ppf.c:331
-#, c-format
-msgid "Loaded PPF %d.0 patch: %s.\n"
-msgstr "已加载 PPF %d.0 补丁文件: %s。\n"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:15
+msgid "Simple"
+msgstr "简易"
 
-#: ../libpcsxcore/psxmem.c:80
-msgid "Error allocating memory!"
-msgstr "分配内存错误!"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:16
+msgid "Gaussian"
+msgstr "高斯"
 
-#: ../libpcsxcore/psxmem.c:122
-#, c-format
-msgid "Could not open BIOS:\"%s\". Enabling HLE Bios!\n"
-msgstr "无法打开 BIOS: \"%s\"。使用内部 HLE Bios。\n"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:17
+msgid "Cubic"
+msgstr "三次"
 
-#: ../libpcsxcore/r3000a.c:33
-#, c-format
-msgid "Running PCSX Version %s (%s).\n"
-msgstr "正在运行 PCSX 版本 %s (%s)。\n"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:18
+msgid "Off"
+msgstr "关闭"
 
-#: ../libpcsxcore/sio.c:345
-msgid "Connection closed!\n"
-msgstr "连接被关闭!\n"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:19
+msgid "Playstation"
+msgstr "Playstation"
 
-#: ../libpcsxcore/sio.c:371
-#, c-format
-msgid "No memory card value was specified - creating a default card %s\n"
-msgstr "未指定记忆卡 - 创建一个默认的记忆卡 %s\n"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:20
+msgid "Low"
+msgstr "低"
 
-#: ../libpcsxcore/sio.c:375
-#, c-format
-msgid "The memory card %s doesn't exist - creating it\n"
-msgstr "记忆卡 %s 不存在 - 正在创建\n"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:21
+msgid "Medium"
+msgstr "中"
 
-#: ../libpcsxcore/sio.c:391
-#, c-format
-msgid "Memory card %s failed to load!\n"
-msgstr "记忆卡 %s 读取失败!\n"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:22
+msgid "Loud"
+msgstr "高"
 
-#: ../libpcsxcore/sio.c:395
-#, c-format
-msgid "Loading memory card %s\n"
-msgstr "加载记忆卡 %s\n"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:23
+msgid "Loudest"
+msgstr "最高"
+
+#: ../plugins/dfxvideo/gpu.c:82
+msgid "Soft Driver"
+msgstr "软件渲染驱动程序"
+
+#: ../plugins/dfxvideo/gpu.c:83
+msgid ""
+"P.E.Op.S. Soft Driver V1.17\n"
+"Coded by Pete Bernert and the P.E.Op.S. team\n"
+msgstr ""
+"P.E.Op.S Soft 驱动程序 V1.17\n"
+"编写: Pete Bernert 以及 P.E.Op.S. 开发组\n"
 
-#: ../plugins/dfxvideo/gpu.c:55
+#: ../plugins/dfxvideo/gpu.c:85
 msgid "SoftGL Driver"
 msgstr "SoftGL 驱动程序"
 
-#: ../plugins/dfxvideo/gpu.c:56
+#: ../plugins/dfxvideo/gpu.c:86
 msgid ""
 "P.E.Op.S. SoftGL Driver V1.17\n"
 "Coded by Pete Bernert and the P.E.Op.S. team\n"
@@ -1688,11 +1817,11 @@
 "P.E.Op.S SoftGL 驱动程序 V1.17\n"
 "编写: Pete Bernert 以及 P.E.Op.S. 开发组\n"
 
-#: ../plugins/dfxvideo/gpu.c:58
+#: ../plugins/dfxvideo/gpu.c:88
 msgid "XVideo Driver"
 msgstr "XVideo 驱动程序"
 
-#: ../plugins/dfxvideo/gpu.c:59
+#: ../plugins/dfxvideo/gpu.c:89
 msgid ""
 "P.E.Op.S. Xvideo Driver V1.17\n"
 "Coded by Pete Bernert and the P.E.Op.S. team\n"
@@ -1700,1491 +1829,1618 @@
 "P.E.Op.S XVideo 驱动程序 V1.17\n"
 "编写: Pete Bernert 以及 P.E.Op.S. 开发组\n"
 
-#: ../plugins/dfxvideo/gpu.c:62
+#: ../plugins/dfxvideo/gpu.c:92
 msgid "Pete Bernert and the P.E.Op.S. team"
 msgstr "Pete Bernert 及 P.E.Op.S. 开发组"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:8
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:1
 msgid "Configure X11 Video"
 msgstr "配置 X11 视频"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:45
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:2
 msgid "Initial Window Size:"
 msgstr "初始窗口大小:"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:56
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:3
 msgid "Stretching:"
 msgstr "拉抻:"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:69
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:4
 msgid "Dithering:"
 msgstr "抖动:"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:82
-msgid ""
-"320x240\n"
-"640x480\n"
-"800x600\n"
-"1024x768\n"
-"1152x864\n"
-"1280x1024\n"
-"1600x1200"
-msgstr ""
-"320x240\n"
-"640x480\n"
-"800x600\n"
-"1024x768\n"
-"1152x864\n"
-"1280x1024\n"
-"1600x1200"
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:101
-msgid ""
-"0: None\n"
-"1: 2xSai\n"
-"2: 2xSuperSai\n"
-"3: SuperEagle\n"
-"4: Scale2x\n"
-"5: Scale3x\n"
-"6: HQ2X\n"
-"7: HQ3X"
-msgstr ""
-"0: 无\n"
-"1: 2xSai\n"
-"2: 2xSuperSai\n"
-"3: SuperEagle\n"
-"4: Scale2x\n"
-"5: Scale3x\n"
-"6: HQ2X\n"
-"7: HQ3X"
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:123
-msgid ""
-"0: Off (fastest)\n"
-"1: Game dependant\n"
-"2: Always"
-msgstr ""
-"0: 关闭 (最快)\n"
-"1: 取决于游戏\n"
-"2: 总是"
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:146
-msgid "Maintain 4:3 Aspect Ratio"
-msgstr "维持 4:3 宽高比"
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:161
-#: ../plugins/peopsxgl/gpucfg/interface.c:322
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:5
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:4
 msgid "Fullscreen"
 msgstr "全屏"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:165
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:6
 msgid "Toggle windowed/fullscreen mode."
 msgstr "切换窗口/全屏模式"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:187
-msgid "Screen"
-msgstr "屏幕"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:7
+msgid "Maintain 4:3 Aspect Ratio"
+msgstr "维持 4:3 宽高比"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:216
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:8
 msgid "Show FPS"
 msgstr "显示 FPS"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:220
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:9
 msgid "Toggle whether the FPS will be shown."
 msgstr "切换 FPS (每秒帧数) 是否将被显示。"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:232
-msgid "Autodetect FPS limit"
-msgstr "自动检测 FPS 界限"
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:236
-msgid "Enable this if games display too quickly."
-msgstr "如果游戏运行得过快，请启用此项。"
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:249
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:10
 msgid "Enable frame skipping"
 msgstr "启用跳帧"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:253
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:11
 msgid "Skip frames when rendering."
 msgstr "渲染时跳帧。"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:270
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:12
 msgid "Set FPS"
 msgstr "设置 FPS"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:287
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:13
+msgid "Enable this if games display too quickly."
+msgstr "如果游戏运行得过快，请启用此项。"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:14
 msgid "200.0"
 msgstr "200.0"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:310
-msgid "Framerate"
-msgstr "帧率"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:15
+msgid "Autodetect FPS limit"
+msgstr "自动检测 FPS 界限"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:339
-#: ../plugins/peopsxgl/gpucfg/interface.c:568
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:16
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:36
 msgid "Use game fixes"
 msgstr "使用特定游戏修正"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:366
-msgid "better g-colors, worse textures"
-msgstr "较好的 g-colors, 较差的纹理"
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:381
-msgid "Needed by Dark Forces"
-msgstr "Dark Forces 运行需要"
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:394
-msgid "Draw quads with triangles"
-msgstr "使用三角形绘制 quad"
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:410
-msgid "Repeated flat tex triangles"
-msgstr "重复平滑多边形纹理"
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:426
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:17
 msgid "Disable CPU Saving"
 msgstr "禁用 CPU 保存"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:442
-msgid "Odd/even bit hack"
-msgstr "奇/偶位 hack"
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:458
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:18
 msgid "For precise framerate"
 msgstr "精确帧率"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:473
-msgid "Better FPS limit in some"
-msgstr "某些游戏中可取得较好的 FPS 界限值"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:19
+msgid "Odd/even bit hack"
+msgstr "奇/偶位 hack"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:20
+msgid "Chrono Cross"
+msgstr "Chrono Cross"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:486
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:21
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:45
 msgid "PC FPS calculation"
 msgstr "PC FPS 计算"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:504
-msgid "Pandemonium 2"
-msgstr "Pandemonium 2"
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:517
-msgid "Lazy screen update"
-msgstr "懒惰的屏幕更新"
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:535
-msgid "Skip every second frame"
-msgstr "每两帧跳过一帧"
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:548
-#: ../plugins/peopsxgl/gpucfg/interface.c:640
-msgid "Old frame skipping"
-msgstr "旧的跳帧方式"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:22
+msgid "Better FPS limit in some"
+msgstr "某些游戏中可取得较好的 FPS 界限值"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:564
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:23
 msgid "Expand screen width"
 msgstr "扩展屏幕宽度"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:580
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:24
+msgid "Capcom fighting games"
+msgstr "Capcom 格斗游戏"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:25
 msgid "Ignore brightness color"
 msgstr "忽略亮色"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:596
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:26
+msgid "Black screens in Lunar"
+msgstr "Lunar 中黑屏"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:27
 msgid "Disable coordinate check"
 msgstr "禁用坐标检查"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:614
-msgid "Chrono Cross"
-msgstr "Chrono Cross"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:28
+msgid "Compatibility mode"
+msgstr "兼容模式"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:627
-msgid "Capcom fighting games"
-msgstr "Capcom 格斗游戏"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:29
+msgid "Lazy screen update"
+msgstr "懒惰的屏幕更新"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:642
-msgid "Black screens in Lunar"
-msgstr "Lunar 中黑屏"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:30
+msgid "Pandemonium 2"
+msgstr "Pandemonium 2"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:657
-msgid "Compatibility mode"
-msgstr "兼容模式"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:31
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:46
+msgid "Old frame skipping"
+msgstr "旧的跳帧方式"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:32
+msgid "Skip every second frame"
+msgstr "每两帧跳过一帧"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:33
+msgid "Repeated flat tex triangles"
+msgstr "重复平滑多边形纹理"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:34
+msgid "Needed by Dark Forces"
+msgstr "Dark Forces 运行需要"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:35
+msgid "Draw quads with triangles"
+msgstr "使用三角形绘制 quad"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:670
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:36
+msgid "better g-colors, worse textures"
+msgstr "较好的 g-colors, 较差的纹理"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:37
 msgid "Fake 'gpu busy' states"
 msgstr "欺骗 'gpu 忙' 状态"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:688
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:38
 msgid "Toggle busy flags after drawing"
 msgstr "绘制后切换忙碌标志"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:713
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:268
-msgid "Compatibility"
-msgstr "兼容性"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:39
+msgid "0: Off (fastest)"
+msgstr "0: 关闭 (最快)"
 
-#: ../data/pcsx.glade2:7
-msgid "PCSX"
-msgstr "PCSX"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:40
+msgid "1: Game dependant"
+msgstr "1: 取决于游戏"
 
-#: ../data/pcsx.glade2:21
-msgid "_File"
-msgstr "文件(_F)"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:41
+msgid "2: Always"
+msgstr "2: 总是"
 
-#: ../data/pcsx.glade2:27
-msgid "Run _CD"
-msgstr "运行光盘(_C)"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:42
+msgid "320x240"
+msgstr "320x240"
 
-#: ../data/pcsx.glade2:45
-msgid "Run _ISO..."
-msgstr "运行 _ISO..."
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:43
+msgid "640x480"
+msgstr "640x480"
 
-#: ../data/pcsx.glade2:62
-msgid "Run _BIOS"
-msgstr "运行 _BIOS"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:44
+msgid "800x600"
+msgstr "800x600"
 
-#: ../data/pcsx.glade2:79
-msgid "Run _EXE..."
-msgstr "运行 _EXE..."
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:45
+msgid "1024x768"
+msgstr "1024x768"
 
-#: ../data/pcsx.glade2:101
-msgid "E_xit"
-msgstr "退出(_X)"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:46
+msgid "1152x864"
+msgstr "1152x864"
 
-#: ../data/pcsx.glade2:123
-msgid "_Emulator"
-msgstr "模拟器(_E)"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:47
+msgid "1280x1024"
+msgstr "1280x1024"
 
-#: ../data/pcsx.glade2:129
-msgid "_Continue"
-msgstr "继续(_C)"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:48
+msgid "1600x1200"
+msgstr "1600x1200"
 
-#: ../data/pcsx.glade2:146
-msgid "_Reset"
-msgstr "复位(_R)"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:49
+msgid "0: None"
+msgstr "0: 无"
 
-#: ../data/pcsx.glade2:168
-msgid "S_witch ISO..."
-msgstr "更换 ISO(_W)..."
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:50
+msgid "1: 2xSai"
+msgstr "1: 2xSai"
 
-#: ../data/pcsx.glade2:190
-msgid "_Save State"
-msgstr "即时存档(_S)"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:51
+msgid "2: 2xSuperSai"
+msgstr "2: 2xSuperSai"
 
-#: ../data/pcsx.glade2:199
-#: ../data/pcsx.glade2:280
-msgid "Slot _1"
-msgstr "存档 _1"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:52
+msgid "3: SuperEagle"
+msgstr "3: SuperEagle"
 
-#: ../data/pcsx.glade2:208
-#: ../data/pcsx.glade2:289
-msgid "Slot _2"
-msgstr "存档 _2"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:53
+msgid "4: Scale2x"
+msgstr "4: Scale2x"
 
-#: ../data/pcsx.glade2:217
-#: ../data/pcsx.glade2:298
-msgid "Slot _3"
-msgstr "存档 _3"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:54
+msgid "5: Scale3x"
+msgstr "5: Scale3x"
 
-#: ../data/pcsx.glade2:226
-#: ../data/pcsx.glade2:307
-msgid "Slot _4"
-msgstr "存档 _4"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:55
+msgid "6: HQ2X"
+msgstr "6: HQ2X"
 
-#: ../data/pcsx.glade2:235
-#: ../data/pcsx.glade2:316
-msgid "Slot _5"
-msgstr "存档 _5"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:56
+msgid "7: HQ3X"
+msgstr "7: HQ3X"
 
-#: ../data/pcsx.glade2:243
-#: ../data/pcsx.glade2:324
-msgid "_Other..."
-msgstr "其它(_O)..."
+#: ../plugins/peopsxgl/gpu.c:97
+msgid "OpenGL Driver"
+msgstr "OpenGL 驱动程序"
 
-#: ../data/pcsx.glade2:271
-msgid "_Load State"
-msgstr "即时读档(_L)"
+#: ../plugins/peopsxgl/gpu.c:99
+msgid "Pete Bernert"
+msgstr "Pete Bernert"
 
-#: ../data/pcsx.glade2:357
-msgid "_Configuration"
-msgstr "配置(_C)"
+#: ../plugins/peopsxgl/gpu.c:100
+msgid ""
+"Based on P.E.Op.S. MesaGL Driver V1.78\n"
+"Coded by Pete Bernert\n"
+msgstr ""
+"基于 P.E.Op.S MesaGL 驱动程序 V1.78\n"
+"作者: Pete Bernert\n"
 
-#: ../data/pcsx.glade2:363
-msgid "_Plugins & BIOS..."
-msgstr "插件及 BIOS(_P)..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:1
+msgid "OpenGL Driver configuration"
+msgstr "OpenGL 驱动程序配置"
 
-#: ../data/pcsx.glade2:385
-msgid "_Graphics..."
-msgstr "图像(_G)..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:2
+msgid "Width:"
+msgstr "宽度:"
 
-#: ../data/pcsx.glade2:400
-msgid "_Sound..."
-msgstr "声音(_S)..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:3
+msgid "Height:"
+msgstr "高度"
 
-#: ../data/pcsx.glade2:415
-msgid "CD-_ROM..."
-msgstr "CD-_ROM..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:5
+msgid "Dithering"
+msgstr "抖动"
 
-#: ../data/pcsx.glade2:430
-msgid "C_ontrollers..."
-msgstr "控制器(_O)..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:6
+msgid "Keep psx aspect ratio"
+msgstr "保持 psx 纵横比"
 
-#: ../data/pcsx.glade2:450
-msgid "_CPU..."
-msgstr "_CPU..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:7
+msgid "Window options"
+msgstr "窗口选项"
 
-#: ../data/pcsx.glade2:466
-msgid "_Memory Cards..."
-msgstr "记忆卡(_M)..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:8
+msgid "Quality:"
+msgstr "质量:"
 
-#: ../data/pcsx.glade2:483
-msgid "_Netplay..."
-msgstr "联网游戏(_N)..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:9
+msgid "Filtering:"
+msgstr "过滤:"
 
-#: ../data/pcsx.glade2:504
-msgid "Chea_t"
-msgstr "作弊码(_T)"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:10
+msgid "HiRes Tex:"
+msgstr "高分纹理:"
 
-#: ../data/pcsx.glade2:513
-msgid "_Browse..."
-msgstr "浏览(_B)..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:11
+msgid "VRam size in MBytes (0..1024, 0=auto):"
+msgstr "显存大小，以 MB 为单位 (0..1024, 0=自动):"
 
-#: ../data/pcsx.glade2:528
-msgid "_Search..."
-msgstr "查找(_S)..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:12
+msgid "Textures"
+msgstr "纹理"
 
-#: ../data/pcsx.glade2:554
-msgid "Memory _Dump"
-msgstr "内存转储(_D)"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:13
+msgid "Show FPS display on startup"
+msgstr "启动时显示 FPS"
 
-#: ../data/pcsx.glade2:574
-msgid "_Help"
-msgstr "帮助(_H)"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:14
+msgid "Use FPS limit"
+msgstr "启用 FPS 界限"
 
-#: ../data/pcsx.glade2:580
-msgid "_About PCSX..."
-msgstr "关于 PCSX(_A)..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:15
+msgid "FPS limit auto-detector"
+msgstr "FPS 界限自动检测"
 
-#: ../data/pcsx.glade2:613
-#: ../data/pcsx.glade2:614
-msgid "Run CD"
-msgstr "运行光碟"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:16
+msgid "FPS limit manual"
+msgstr "手动设置 FPS 界限"
 
-#: ../data/pcsx.glade2:626
-msgid "Run ISO Image"
-msgstr "运行 ISO 光盘镜像"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:17
+msgid "FPS"
+msgstr "FPS"
 
-#: ../data/pcsx.glade2:627
-msgid "Run ISO..."
-msgstr "运行 ISO..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:18
+msgid "Use Frame skipping"
+msgstr "启用跳帧"
 
-#: ../data/pcsx.glade2:648
-msgid "Continue Emulation"
-msgstr "继续模拟"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:19
+msgid "Framerate"
+msgstr "帧率"
 
-#: ../data/pcsx.glade2:649
-msgid "Continue..."
-msgstr "继续..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:20
+msgid "Offscreen drawing:"
+msgstr "离屏描绘:"
 
-#: ../data/pcsx.glade2:661
-msgid "Switch ISO Image"
-msgstr "更换 ISO 光盘镜像"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:21
+msgid "Framebuffer textures:"
+msgstr "帧缓冲纹理:"
 
-#: ../data/pcsx.glade2:662
-msgid "Switch ISO..."
-msgstr "更换 ISO..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:22
+msgid "Framebuffer access:"
+msgstr "帧缓冲访问:"
 
-#: ../data/pcsx.glade2:683
-#: ../data/pcsx.glade2:1810
-msgid "Configure Memory Cards"
-msgstr "配置记忆卡"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:23
+msgid "Mask bit detection (Needed by a few games, zbuffer)"
+msgstr "屏蔽位检测 (某些游戏需要)"
 
-#: ../data/pcsx.glade2:684
-msgid "Memcards..."
-msgstr "记忆卡..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:24
+msgid "Alpha multipass (Correct opaque texture areas)"
+msgstr "半透明多通道 (更正不透明的纹理区域)"
 
-#: ../data/pcsx.glade2:696
-msgid "Configure Graphics"
-msgstr "配置图像"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:25
+msgid "Advanced blending (Accurate psx color emulation)"
+msgstr "高级混合 (精确的 psx 色彩模拟)"
 
-#: ../data/pcsx.glade2:697
-msgid "Graphics..."
-msgstr "图像..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:26
+msgid "Compatibility"
+msgstr "兼容性"
 
-#: ../data/pcsx.glade2:709
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:8
-msgid "Configure Sound"
-msgstr "配置音频"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:27
+msgid "Scanlines Blending (0..255, -1=dot):"
+msgstr "混合 (0..255, -1=点阵):"
 
-#: ../data/pcsx.glade2:710
-msgid "Sound..."
-msgstr "声音..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:28
+msgid "Unfiltered MDECs (Small movie speedup)"
+msgstr "非过滤 MDEC (微小的影片加速)"
 
-#: ../data/pcsx.glade2:722
-msgid "Configure CD-ROM"
-msgstr "配置 CD-ROM"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:29
+msgid "Force 15 bit framebuffer updates (Faster movies)"
+msgstr "强制 15 位帧缓冲更新 (影片较快)"
 
-#: ../data/pcsx.glade2:723
-msgid "CD-ROM..."
-msgstr "CD-ROM..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:30
+msgid "Line mode (Polygons will not get filled)"
+msgstr "框架模式 (不填充多边形)"
 
-#: ../data/pcsx.glade2:735
-msgid "Configure Controllers"
-msgstr "配置控制器"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:31
+msgid "Polygon anti-aliasing (Slow with most cards)"
+msgstr "多边形抗锯齿 (对大多数显卡较慢)"
 
-#: ../data/pcsx.glade2:736
-msgid "Controllers..."
-msgstr "控制器..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:32
+msgid "Use OpenGL extensions (Recommended)"
+msgstr "使用 OpenGL 扩展 (推荐)"
 
-#: ../data/pcsx.glade2:879
-msgid "Select Folder to Search"
-msgstr "选择要查找的文件夹"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:33
+msgid "Screen smoothing (Can be slow or unsupported)"
+msgstr "屏幕平滑 (可能较慢或不被支持)"
 
-#: ../data/pcsx.glade2:895
-msgid "Search in:"
-msgstr "在此处查找插件:"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:34
+msgid "Gte accuracy"
+msgstr "Gte 精确"
 
-#: ../data/pcsx.glade2:1168
-msgid "Graphics:"
-msgstr "图像:"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:35
+msgid "Misc"
+msgstr "杂项"
 
-#: ../data/pcsx.glade2:1181
-msgid "Sound:"
-msgstr "声音:"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:37
+msgid "Battle cursor (FF7)"
+msgstr "战斗光标 (FF7)"
 
-#: ../data/pcsx.glade2:1196
-msgid "Controller 1: "
-msgstr "控制器 1:"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:38
+msgid "Yellow rect (FF9)"
+msgstr "黄色方块 (FF9)"
 
-#: ../data/pcsx.glade2:1211
-msgid "Controller 2:"
-msgstr "控制器 2:"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:39
+msgid "Direct FB updates"
+msgstr "直接 FB 更新"
 
-#: ../data/pcsx.glade2:1226
-msgid "CD-ROM:"
-msgstr "CD-ROM:"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:40
+msgid "Black brightness (Lunar)"
+msgstr "黑色亮度 (Lunar)"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:41
+msgid "Swap front detection"
+msgstr "Swap front 检测"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:42
+msgid "Disable coord check"
+msgstr "禁用坐标检查"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:43
+msgid "No blue glitches (LoD)"
+msgstr "去除蓝色干扰 (LoD)"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:44
+msgid "Soft FB access"
+msgstr "软件 FB 访问"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:47
+msgid "No subtr. blending"
+msgstr "无 subtr. 混合"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:48
+msgid "Lazy upload (DW7)"
+msgstr "懒惰上传 (DW7)"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:49
+msgid "Odd/even hack"
+msgstr "奇/偶位 hack"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:50
+msgid "Adjust screen width"
+msgstr "调整屏幕宽度"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:51
+msgid "Old texture filtering"
+msgstr "旧的纹理过滤"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:52
+msgid "Additional uploads"
+msgstr "附加上传"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:53
+msgid "Unused"
+msgstr "未使用"
 
-#: ../data/pcsx.glade2:1264
-msgid "Plugins"
-msgstr "插件"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:54
+msgid "Fake 'GPU busy'"
+msgstr "欺骗 'gpu 忙' 状态"
 
-#: ../data/pcsx.glade2:1325
-msgid "BIOS"
-msgstr "BIOS"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:55
+msgid "Special game fixes"
+msgstr "特定游戏修正"
 
-#: ../data/pcsx.glade2:1375
-msgid "Configure CPU"
-msgstr "配置 CPU"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:56
+msgid "Fast"
+msgstr "最佳速度"
 
-#: ../data/pcsx.glade2:1419
-msgid "SPU IRQ Always Enabled"
-msgstr "SPU IRQ 总是启用"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:57
+msgid "Autoconfigure for fast display"
+msgstr "自动配置为最佳性能"
 
-#: ../data/pcsx.glade2:1435
-msgid "Black & White Movies"
-msgstr "黑白电影"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:58
+msgid "Beautiful"
+msgstr "最佳外观"
 
-#: ../data/pcsx.glade2:1469
-msgid "Enable Interpreter CPU"
-msgstr "启用解释执行 CPU"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:59
+msgid "Auto configure for beautiful display"
+msgstr "自动配置为最佳外观"
 
-#: ../data/pcsx.glade2:1503
-msgid "Disable CD Audio"
-msgstr "禁用 CD 音频"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:60
+msgid "None - Fastest, most glitches"
+msgstr "无 - 最快，问题较多"
 
-#: ../data/pcsx.glade2:1519
-msgid "Disable XA Decoding"
-msgstr "禁用 XA 解码"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:61
+msgid "Minimum - Missing screens"
+msgstr "最小 - 丢失屏幕元素"
 
-#: ../data/pcsx.glade2:1571
-msgid "Options"
-msgstr "选项"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:62
+msgid "Standard - OK for most games"
+msgstr "标准 - 大多数游戏运行良好"
 
-#: ../data/pcsx.glade2:1612
-msgid ""
-"NTSC\n"
-"PAL"
-msgstr ""
-"NTSC\n"
-"PAL"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:63
+msgid "Enhanced - Shows more stuff"
+msgstr "增强 - 显示更多的东西"
 
-#: ../data/pcsx.glade2:1626
-msgid "System Type"
-msgstr "系统类型"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:64
+msgid "Extended - Causing garbage"
+msgstr "增强 - 可能导致错误"
 
-#: ../data/pcsx.glade2:1674
-msgid "Configure NetPlay"
-msgstr "配置联网游戏"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:65
+msgid "None (Standard)"
+msgstr "无 (标准)"
 
-#: ../data/pcsx.glade2:1760
-msgid "NetPlay"
-msgstr "联网游戏"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:66
+msgid "2xSaI (Much vram needed)"
+msgstr "2xSaI (需较多显存)"
 
-#: ../data/pcsx.glade2:1886
-#: ../data/pcsx.glade2:2283
-msgid "New"
-msgstr "新建"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:67
+msgid "Scaled (Needs tex filtering)"
+msgstr "拉伸 (需要纹理过滤)"
 
-#: ../data/pcsx.glade2:1936
-#: ../data/pcsx.glade2:2333
-msgid "Format"
-msgstr "格式化"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:69
+msgid "Standard - Glitches will happen"
+msgstr "标准 - 可能会发生问题"
 
-#: ../data/pcsx.glade2:1986
-#: ../data/pcsx.glade2:2383
-msgid "Un/Delete"
-msgstr "删除/恢复"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:70
+msgid "Extended - No black borders"
+msgstr "增强 - 去除黑框"
 
-#: ../data/pcsx.glade2:2079
-msgid "Memory Card 1"
-msgstr "记忆卡 1"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:71
+msgid "Standard without sprites - Unfiltered 2D"
+msgstr "标准，不含贴图 - 未过滤的 2D"
 
-#: ../data/pcsx.glade2:2139
-#: ../data/pcsx.glade2:2189
-#: ../data/pcsx.glade2:3002
-msgid "Copy"
-msgstr "复制"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:72
+msgid "Extended without sprites - Unfiltered 2D"
+msgstr "增强，不含贴图 - 未过滤的 2D"
 
-#: ../data/pcsx.glade2:2476
-msgid "Memory Card 2"
-msgstr "记忆卡 2"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:73
+msgid "Standard + smoothed sprites"
+msgstr "标准 + 平滑贴图"
 
-#: ../data/pcsx.glade2:2572
-msgid "Cheat Codes"
-msgstr "作弊码"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:74
+msgid "Extended + smoothed sprites"
+msgstr "增强 + 平滑贴图"
 
-#: ../data/pcsx.glade2:2736
-msgid ""
-"8-bit\n"
-"16-bit\n"
-"32-bit"
-msgstr ""
-"8 位\n"
-"16 位\n"
-"32 位"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:75
+msgid "Don't care - Use driver's default textures"
+msgstr "使用驱动程序的默认纹理"
 
-#: ../data/pcsx.glade2:2799
-msgid ""
-"Equal Value\n"
-"Not Equal Value\n"
-"Range\n"
-"Increased By\n"
-"Decreased By\n"
-"Increased\n"
-"Decreased\n"
-"Different\n"
-"No Change"
-msgstr ""
-"等于数值\n"
-"不等于数值\n"
-"范围\n"
-"增加数值\n"
-"减少数值\n"
-"增加\n"
-"减少\n"
-"改变\n"
-"无改变"
-
-#: ../data/pcsx.glade2:2831
-msgid ""
-"Decimal\n"
-"Hexadecimal"
-msgstr ""
-"十进制\n"
-"十六进制"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:76
+msgid "4444 - Fast, but less colorful"
+msgstr "4444 - 较快，较少颜色"
 
-#: ../data/pcsx.glade2:3035
-msgid "label_resultsfound"
-msgstr "label_resultsfound"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:77
+msgid "5551 - Nice colors, bad transparency"
+msgstr "5551 - 较好的颜色，较差的透明效果"
 
-#: ../data/pcsx.glade2:3070
-msgid "Search"
-msgstr "查找"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:78
+msgid "8888 - Best colors, more ram needed"
+msgstr "8888 - 最佳的颜色，需更多内存"
 
-#: ../data/pcsx.glade2:3106
-msgid "Restart"
-msgstr "复位"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:79
+msgid "BGR8888 - Faster on some cards"
+msgstr "BGR8888 - 某些显卡较快"
 
-#: ../data/pcsx.glade2:3135
-msgid "Cheat Search"
-msgstr "作弊码查找"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:80
+msgid "Emulated VRam - Ok most times"
+msgstr "模拟 vram - 大多数情况运行良好"
 
-#: ../data/pcsx.glade2:3291
-msgid "Raw Dump..."
-msgstr "Raw 转储..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:81
+msgid "Gfx card buffer reads"
+msgstr "Gfx 卡缓存读取"
 
-#: ../data/pcsx.glade2:3326
-msgid "Patch Memory..."
-msgstr "修改内存..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:82
+msgid "Gfx card buffer moves"
+msgstr "Gfx 卡缓存移动"
 
-#: ../plugins/dfsound/spu.c:38
-msgid "Mac OS X Sound"
-msgstr "Mac OS X 声音"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:83
+msgid "Gfx card buffer reads and moves"
+msgstr "Gfx 卡缓存读取及移动"
 
-#: ../plugins/dfsound/spu.c:40
-msgid "ALSA Sound"
-msgstr "ALSA 声音"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:84
+msgid "Full Software (FVP)"
+msgstr "纯软件 (FVP)"
 
-#: ../plugins/dfsound/spu.c:42
-msgid "OSS Sound"
-msgstr "OSS 声音"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:85
+msgid "Emulated VRam - Needs FVP"
+msgstr "模拟 vram - 需 FVP"
 
-#: ../plugins/dfsound/spu.c:44
-msgid "SDL Sound"
-msgstr "SDL 声音"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:86
+msgid "Black - Fast, no effects"
+msgstr "黑色 - 快，无特效"
 
-#: ../plugins/dfsound/spu.c:46
-msgid "PulseAudio Sound"
-msgstr "PulseAudio 声音"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:87
+msgid "Gfx card buffer - Can be slow"
+msgstr "Gfx 卡缓存 - 可能较慢"
 
-#: ../plugins/dfsound/spu.c:48
-msgid "NULL Sound"
-msgstr "空声音"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:88
+msgid "Gfx card and soft - Slow"
+msgstr "Gfx 卡及软件 - 慢"
 
-#: ../plugins/dfsound/spu.c:51
-msgid ""
-"P.E.Op.S. Sound Driver V1.7\n"
-"Coded by Pete Bernert and the P.E.Op.S. team\n"
-msgstr ""
-"P.E.Op.S 声音驱动程序 V1.7\n"
-"编写: Pete Bernert 以及 P.E.Op.S. 开发组\n"
+#: ../plugins/bladesio1/gui.c:112
+#, fuzzy
+msgid "Link Cable Configuration"
+msgstr "配置"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:42
-msgid "Volume:"
-msgstr "音量:"
+#. *************************************************************************
+#. #define SIO1_DEBUG 1
+#: ../plugins/bladesio1/sio1.c:44
+msgid "sio1Blade"
+msgstr ""
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:54
-msgid "Interpolation:"
-msgstr "插值:"
+#. *************************************************************************
+#: ../plugins/bladesio1/sio1.ui.h:1 ../win32/gui/AboutDlg.c:48
+#: ../win32/gui/AboutDlg.c:52 ../win32/gui/CheatDlg.c:69
+#: ../win32/gui/CheatDlg.c:119 ../win32/gui/ConfigurePlugins.c:529
+#: ../win32/gui/ConfigurePlugins.c:667 ../win32/gui/WndMain.c:1088
+#: ../win32/gui/WndMain.c:1324
+msgid "OK"
+msgstr "确定"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:68
-msgid "Reverb:"
-msgstr "回响:"
+#: ../plugins/bladesio1/sio1.ui.h:2
+msgid "CANCEL"
+msgstr ""
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:81
+#: ../plugins/bladesio1/sio1.ui.h:3
+#, fuzzy
 msgid ""
-"Low\n"
-"Medium\n"
-"Loud\n"
-"Loudest"
+"Select here if you'll be Server (Player1) or Client (Player2).\n"
+"If you select Server you must Copy your IP address to the Clipboard and "
+"paste if (Ctrl+V) wherever the Client can see it.\n"
+"If you selected Client please enter the IP address the Server gave to you in "
+"the IP Address Control."
 msgstr ""
-"低\n"
-"中\n"
-"高\n"
-"最高"
+"请在此选择作为服务器 (玩家 1) 还是作为客户端 (玩家 2) 来运行。\n"
+"\n"
+"如果您选择作为服务器，您必须复制本机 IP 地址到剪贴板并将此信息告知客户端。\n"
+"\n"
+"如果您选择作为客户端，请输入服务器方提供给您的 IP 地址。"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:95
+#: ../plugins/bladesio1/sio1.ui.h:9
+#, fuzzy
+msgid "Disabled"
+msgstr "XA 已禁用"
+
+#: ../win32/gui/AboutDlg.c:26
 msgid ""
-"Off\n"
-"Simple\n"
-"Playstation"
+"PCSXR - A PlayStation Emulator\n"
+"\n"
+"Original Authors:\n"
+"main coder: linuzappz\n"
+"co-coders: shadow\n"
+"ex-coders: Nocomp, Pete Bernett, nik3d\n"
+"Webmaster: AkumaX"
 msgstr ""
-"关\n"
-"简易\n"
-"Playstation"
+"PCSXR - 一个 PlayStation 模拟器\n"
+"\n"
+"原作者:\n"
+"主程序员: linuzappz\n"
+"辅助程序员: shadow\n"
+"前程序员: Nocomp, Pete Bernett, nik3d\n"
+"网络管理: AkumaX"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:111
+#: ../win32/gui/AboutDlg.c:35
 msgid ""
-"None\n"
-"Simple\n"
-"Gaussian\n"
-"Cubic"
+"PCSX-df Authors:\n"
+"Ryan Schultz, Andrew Burton, Stephen Chao,\n"
+"Marcus Comstedt, Stefan Sikora\n"
+"\n"
+"PCSX-Reloaded By:\n"
+"edgbla, shalma, Wei Mingzhi, et al.\n"
+"\n"
+"http://pcsxr.codeplex.com/"
 msgstr ""
-"无\n"
-"简易\n"
-"高斯\n"
-"立方"
-
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:132
-msgid "General"
-msgstr "一般"
-
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:163
-msgid "Adjust XA speed"
-msgstr "调整 XA 速度"
+"PCSX-df 开发者:\n"
+"Ryan Schultz, Andrew Burton, Stephen Chao,\n"
+"Marcus Comstedt, Stefan Sikora\n"
+"\n"
+"PCSX-Reloaded 开发者:\n"
+"edgbla, shalma, Wei Mingzhi, et al.\n"
+"\n"
+"http://pcsxr.codeplex.com/"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:167
-msgid "Choose this if XA music is played too quickly."
-msgstr "如 XA 音乐播放得太快，请选择此项。"
+#: ../win32/gui/AboutDlg.c:46
+msgid "About"
+msgstr "关于 PCSXR"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:184
-msgid "XA Music"
-msgstr "XA 音乐"
+#: ../win32/gui/AboutDlg.c:49
+msgid "PCSXR EMU\n"
+msgstr "PCSXR 模拟器\n"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:215
-msgid "High compatibility mode"
-msgstr "高兼容性模式"
+#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
+#: ../win32/gui/CheatDlg.c:270
+msgid "Yes"
+msgstr "是"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:219
-msgid "Use the asynchronous SPU interface."
-msgstr "使用异步 SPU 接口。"
+#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
+#: ../win32/gui/CheatDlg.c:270
+msgid "No"
+msgstr "否"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:231
-msgid "SPU IRQ Wait"
-msgstr "SPU IRQ 等待"
+#: ../win32/gui/CheatDlg.c:70 ../win32/gui/CheatDlg.c:120
+#: ../win32/gui/ConfigurePlugins.c:530 ../win32/gui/ConfigurePlugins.c:668
+#: ../win32/gui/WndMain.c:1089 ../win32/gui/WndMain.c:1325
+msgid "Cancel"
+msgstr "取消"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:235
-msgid "Wait for CPU; only useful for some games."
-msgstr "等待 CPU; 仅在部分游戏中有用处。"
+#: ../win32/gui/CheatDlg.c:168
+msgid "&Add Code"
+msgstr "添加作弊码(&A)"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:247
-msgid "Single channel sound"
-msgstr "单声道"
+#: ../win32/gui/CheatDlg.c:169
+msgid "&Edit Code"
+msgstr "编辑作弊码(&E)"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:251
-msgid "Play only one channel for a performance boost."
-msgstr "仅播放一个声道以提升性能。"
+#: ../win32/gui/CheatDlg.c:170
+msgid "&Remove Code"
+msgstr "删除作弊码(&R)"
 
-#: ../plugins/dfcdrom/cdr-libcdio.c:29
-#: ../plugins/dfcdrom/cdr-linux.c:29
-msgid "CD-ROM Drive Reader"
-msgstr "CD-ROM 设备读取插件"
+#: ../win32/gui/CheatDlg.c:171
+msgid "&Enable/Disable"
+msgstr "启用/禁用(&E)"
 
-#: ../plugins/dfcdrom/cdr-null.c:26
-msgid "CDR NULL Plugin"
-msgstr "CDR 空插件"
+#: ../win32/gui/CheatDlg.c:172
+msgid "&Load..."
+msgstr "读取(&L)..."
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/main.c:219
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:8
-msgid "CDR configuration"
-msgstr "CDR 配置"
+#: ../win32/gui/CheatDlg.c:173
+msgid "&Save As..."
+msgstr "另存为(&S)"
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:33
-msgid "Choose your CD-ROM device or type its path if it's not listed"
-msgstr "请选择您的 CD-ROM 设备或直接输入设备路径"
+#: ../win32/gui/CheatDlg.c:174
+msgid "&Close"
+msgstr "关闭(&C)"
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:44
-msgid "Select CD-ROM device"
-msgstr "选择 CD-ROM 设备"
+#: ../win32/gui/CheatDlg.c:190
+msgid "Enabled"
+msgstr "启用"
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:72
-msgid "Select read mode:"
-msgstr "选择读取模式:"
+#: ../win32/gui/CheatDlg.c:282 ../win32/gui/CheatDlg.c:311
+msgid "PCSXR Cheat Code Files"
+msgstr "PCSXR 作弊码文件"
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:83
-msgid ""
-"Normal (No Cache)\n"
-"Threaded - Faster (With Cache)"
-msgstr ""
-"正常 (无缓存)\n"
-"多线程 - 较快 (使用缓存)"
+#: ../win32/gui/CheatDlg.c:453
+msgid "No addresses found."
+msgstr "未找到地址。"
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:114
-msgid "Cache Size (Def. 64):"
-msgstr "缓存大小 (默认为 64):"
+#: ../win32/gui/CheatDlg.c:505 ../win32/gui/CheatDlg.c:596
+msgid "Address:"
+msgstr "地址:"
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:159
-msgid "Spindown Time:"
-msgstr "电机停转时限:"
+#: ../win32/gui/CheatDlg.c:566
+#, c-format
+msgid "Freeze %.8X"
+msgstr "固定 %.8X"
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:170
-msgid ""
-"Default\n"
-"125ms\n"
-"250ms\n"
-"500ms\n"
-"1s\n"
-"2s\n"
-"4s\n"
-"8s\n"
-"16s\n"
-"32s\n"
-"1min\n"
-"2min\n"
-"4min\n"
-"8min\n"
-"16min\n"
-"32min"
-msgstr ""
-"默认\n"
-"125 毫秒\n"
-"250 毫秒\n"
-"500 毫秒\n"
-"1 秒\n"
-"2 秒\n"
-"4 秒\n"
-"8 秒\n"
-"16 秒\n"
-"32 秒\n"
-"1 分钟\n"
-"2 分钟\n"
-"4 分钟\n"
-"8 分钟\n"
-"16 分钟\n"
-"32 分钟"
-
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:216
-msgid "Cdrom Speed (Def. 0 = MAX):"
-msgstr "光驱速度 (默认 0 为最大速度):"
+#: ../win32/gui/CheatDlg.c:685
+msgid "&Freeze"
+msgstr "固定(&F)"
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:248
-msgid "hseparator"
-msgstr "hseparator"
+#: ../win32/gui/CheatDlg.c:686
+msgid "&Modify"
+msgstr "修改(&M)"
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:258
-msgid "Enable subchannel read"
-msgstr "启用子通道读取"
+#: ../win32/gui/CheatDlg.c:687
+msgid "&Copy"
+msgstr "复制(&C)"
 
-#: ../plugins/peopsxgl/gpu.c:61
-msgid "OpenGL Driver"
-msgstr "OpenGL 驱动程序"
+#: ../win32/gui/CheatDlg.c:688
+msgid "&Search"
+msgstr "查找(&S)"
 
-#: ../plugins/peopsxgl/gpu.c:63
-msgid "Pete Bernert"
-msgstr "Pete Bernert"
+#: ../win32/gui/CheatDlg.c:689
+msgid "&New Search"
+msgstr "新查找(&N)"
 
-#: ../plugins/peopsxgl/gpu.c:64
-msgid ""
-"Based on P.E.Op.S. MesaGL Driver V1.78\n"
-"Coded by Pete Bernert\n"
-msgstr ""
-"基于 P.E.Op.S MesaGL 驱动程序 V1.78\n"
-"作者: Pete Bernert\n"
+#: ../win32/gui/CheatDlg.c:690
+msgid "C&lose"
+msgstr "关闭(&L)"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:118
-msgid "OpenGL Driver configuration"
-msgstr "OpenGL 驱动程序配置"
+#: ../win32/gui/ConfigurePlugins.c:234
+msgid "Simulate Psx Bios"
+msgstr "模拟 PS BIOS"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:138
-msgid "Textures"
-msgstr "纹理"
+#: ../win32/gui/ConfigurePlugins.c:330
+msgid "Configuration not OK!"
+msgstr "配置不正确!"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:161
-msgid "Quality:"
-msgstr "质量:"
+#: ../win32/gui/ConfigurePlugins.c:445
+msgid "This plugin reports that should work correctly"
+msgstr "此插件报告其可正常工作。"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:178
-#: ../plugins/peopsxgl/gpucfg/interface.c:191
-msgid "0: don't care - Use driver's default textures"
-msgstr "0: 使用驱动程序的默认纹理"
+#: ../win32/gui/ConfigurePlugins.c:446
+msgid "This plugin reports that should not work correctly"
+msgstr "此插件报告其不可正常工作。"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:179
-msgid "1: 4444 - Fast, but less colorful"
-msgstr "1: 4444 - 较快，较少颜色"
+#: ../win32/gui/ConfigurePlugins.c:509
+msgid "Select Plugins Directory"
+msgstr "选择插件目录"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:180
-msgid "2: 5551 - Nice colors, bad transparency"
-msgstr "2: 5551 - 较好的颜色，较差的透明效果"
+#: ../win32/gui/ConfigurePlugins.c:518
+msgid "Select Bios Directory"
+msgstr "选择 BIOS 目录"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:181
-msgid "3: 8888 - Best colors, more ram needed"
-msgstr "3: 8888 - 最佳的颜色，需更多内存"
+#: ../win32/gui/ConfigurePlugins.c:527
+msgid "Configuration"
+msgstr "配置"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:182
-msgid "4: BGR8888 - Faster on some cards"
-msgstr "4: BGR8888 - 某些显卡较快"
+#: ../win32/gui/ConfigurePlugins.c:531
+msgid "Graphics"
+msgstr "图像"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:193
-msgid "VRam size in MBytes (0..1024, 0=auto):"
-msgstr "显存大小，以 MB 为单位 (0..1024, 0=自动):"
+#: ../win32/gui/ConfigurePlugins.c:532
+msgid "First Controller"
+msgstr "主控制器"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:210
-#: ../plugins/peopsxgl/gpucfg/interface.c:225
-msgid "0: None"
-msgstr "0: 无"
+#: ../win32/gui/ConfigurePlugins.c:533
+msgid "Second Controller"
+msgstr "辅控制器"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:211
-msgid "1: Standard - Glitches will happen"
-msgstr "1: 标准 - 可能会发生问题"
+#: ../win32/gui/ConfigurePlugins.c:534
+msgid "Sound"
+msgstr "声音"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:212
-msgid "2: Extended - No black borders"
-msgstr "2: 增强 - 去除黑框"
+#: ../win32/gui/ConfigurePlugins.c:535
+msgid "Cdrom"
+msgstr "CD-ROM"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:213
-msgid "3: Standard without sprites - unfiltered 2D"
-msgstr "3: 标准，不含贴图 - 未过滤的 2D"
+#: ../win32/gui/ConfigurePlugins.c:536
+msgid "Link cable"
+msgstr "连接线"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:214
-msgid "4: Extended without sprites - unfiltered 2D"
-msgstr "4: 增强，不含贴图 - 未过滤的 2D"
+#: ../win32/gui/ConfigurePlugins.c:537
+msgid "Bios"
+msgstr "BIOS"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:215
-msgid "5: Standard + smoothed sprites"
-msgstr "5: 标准 + 平滑贴图"
+#: ../win32/gui/ConfigurePlugins.c:538
+msgid "Set Bios Directory"
+msgstr "设置 BIOS 目录"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:216
-msgid "6: Extended + smoothed sprites"
-msgstr "6: 增强 + 平滑贴图"
+#: ../win32/gui/ConfigurePlugins.c:539
+msgid "Set Plugins Directory"
+msgstr "设置插件目录"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:227
-msgid "Filtering:"
-msgstr "过滤:"
+#: ../win32/gui/ConfigurePlugins.c:540 ../win32/gui/ConfigurePlugins.c:543
+#: ../win32/gui/ConfigurePlugins.c:546 ../win32/gui/ConfigurePlugins.c:549
+#: ../win32/gui/ConfigurePlugins.c:552 ../win32/gui/ConfigurePlugins.c:555
+#: ../win32/gui/ConfigurePlugins.c:670
+msgid "Configure..."
+msgstr "配置..."
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:235
-msgid "HiRes Tex:"
-msgstr "高分纹理:"
+#: ../win32/gui/ConfigurePlugins.c:541 ../win32/gui/ConfigurePlugins.c:544
+#: ../win32/gui/ConfigurePlugins.c:547 ../win32/gui/ConfigurePlugins.c:550
+#: ../win32/gui/ConfigurePlugins.c:553 ../win32/gui/ConfigurePlugins.c:556
+#: ../win32/gui/ConfigurePlugins.c:671
+msgid "Test..."
+msgstr "测试..."
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:252
-#: ../plugins/peopsxgl/gpucfg/interface.c:263
-msgid "0: None (standard)"
-msgstr "0: 无 (标准)"
+#: ../win32/gui/ConfigurePlugins.c:542 ../win32/gui/ConfigurePlugins.c:545
+#: ../win32/gui/ConfigurePlugins.c:548 ../win32/gui/ConfigurePlugins.c:551
+#: ../win32/gui/ConfigurePlugins.c:554 ../win32/gui/ConfigurePlugins.c:557
+#: ../win32/gui/ConfigurePlugins.c:672
+msgid "About..."
+msgstr "关于..."
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:253
-msgid "1: 2xSaI (much vram needed)"
-msgstr "1: 2xSaI (需较多显存)"
+#: ../win32/gui/ConfigurePlugins.c:665
+msgid "NetPlay Configuration"
+msgstr "联网游戏配置"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:254
-msgid "2: Scaled (needs tex filtering)"
-msgstr "2: 拉伸 (需要纹理过滤)"
+#: ../win32/gui/ConfigurePlugins.c:673
+msgid ""
+"Note: The NetPlay Plugin Directory should be the same as the other Plugins."
+msgstr "注意: 联网游戏插件应和其它插件放在同一目录中。"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:265
-msgid "Window options"
-msgstr "窗口选项"
+#: ../win32/gui/plugin.c:94 ../win32/gui/WndMain.c:331
+#, c-format
+msgid "*PCSXR*: Saved State %d"
+msgstr "*PCSXR*: Saved State %d"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:296
-msgid "Width:"
-msgstr "宽度:"
+#: ../win32/gui/plugin.c:95 ../win32/gui/WndMain.c:332
+#, c-format
+msgid "*PCSXR*: Error Saving State %d"
+msgstr "*PCSXR*: Error Saving State %d"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:305
-msgid "Height:"
-msgstr "高度"
+#: ../win32/gui/plugin.c:111 ../win32/gui/WndMain.c:309
+#, c-format
+msgid "*PCSXR*: Loaded State %d"
+msgstr "*PCSXR*: Loaded State %d"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:314
-msgid "Keep psx aspect ratio"
-msgstr "保持 psx 纵横比"
+#: ../win32/gui/plugin.c:112 ../win32/gui/WndMain.c:310
+#, c-format
+msgid "*PCSXR*: Error Loading State %d"
+msgstr "*PCSXR*: Error Loading State %d"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:330
-msgid "Dithering"
-msgstr "抖动"
+#: ../win32/gui/plugin.c:123
+#, c-format
+msgid "*PCSXR*: Sio Irq Always Enabled"
+msgstr "*PCSXR*: Sio Irq Always Enabled"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:346
-msgid "Framerate"
-msgstr "帧率"
+#: ../win32/gui/plugin.c:124
+#, c-format
+msgid "*PCSXR*: Sio Irq Not Always Enabled"
+msgstr "*PCSXR*: Sio Irq Not Always Enabled"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:369
-msgid "FPS"
-msgstr "FPS"
+#: ../win32/gui/plugin.c:131
+#, c-format
+msgid "*PCSXR*: Black&White Mdecs Only Enabled"
+msgstr "*PCSXR*: Black&White Mdecs Only Enabled"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:377
-msgid "FPS limit manual"
-msgstr "手动设置 FPS 界限"
+#: ../win32/gui/plugin.c:132
+#, c-format
+msgid "*PCSXR*: Black&White Mdecs Only Disabled"
+msgstr "*PCSXR*: Black&White Mdecs Only Disabled"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:386
-msgid "Show FPS display on startup"
-msgstr "启动时显示 FPS"
+#: ../win32/gui/plugin.c:139
+#, c-format
+msgid "*PCSXR*: Xa Enabled"
+msgstr "*PCSXR*: Xa Enabled"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:394
-msgid "Use FPS limit"
-msgstr "启用 FPS 界限"
+#: ../win32/gui/plugin.c:140
+#, c-format
+msgid "*PCSXR*: Xa Disabled"
+msgstr "*PCSXR*: Xa Disabled"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:402
-msgid "FPS limit auto-detection"
-msgstr "FPS 界限自动检测"
+#: ../win32/gui/plugin.c:149
+msgid "*PCSXR*: CdRom Case Opened"
+msgstr "*PCSXR*: CdRom Case Opened"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:411
-msgid "Use Frame skipping"
-msgstr "启用跳帧"
+#: ../win32/gui/plugin.c:155
+msgid "*PCSXR*: CdRom Case Closed"
+msgstr "*PCSXR*: CdRom Case Closed"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:419
-msgid "Compatibility"
-msgstr "兼容性"
+#: ../win32/gui/plugin.c:181
+msgid "Connecting..."
+msgstr "正在连接..."
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:434
-msgid "Advanced blending (Accurate psx color emulation)"
-msgstr "高级混合 (精确的 psx 色彩模拟)"
+#: ../win32/gui/plugin.c:183 ../win32/gui/plugin.c:190
+#, c-format
+msgid "Please wait while connecting... %c\n"
+msgstr "请稍候，正在连接... %c\n"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:442
-msgid "Framebuffer textures:"
-msgstr "帧缓冲纹理:"
+#: ../win32/gui/plugin.c:218
+msgid "Error Opening CDR Plugin"
+msgstr "无法打开 CDR 插件"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:450
-msgid "Offscreen Drawing:"
-msgstr "离屏描绘:"
+#: ../win32/gui/plugin.c:281
+#, c-format
+msgid "Error Opening GPU Plugin (%d)"
+msgstr "无法打开 GPU 插件 (%d)"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:458
-msgid "Framebuffer access:"
-msgstr "帧缓冲访问:"
+#: ../win32/gui/plugin.c:283
+#, c-format
+msgid "Error Opening SPU Plugin (%d)"
+msgstr "无法打开 SPU 插件 (%d)"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:466
-msgid "Alpha Multipass (correct opaque texture areas)"
-msgstr "半透明多通道 (更正不透明的纹理区域)"
+#: ../win32/gui/plugin.c:286
+#, c-format
+msgid "Error Opening PAD1 Plugin (%d)"
+msgstr "无法打开 PAD1 插件 (%d)"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:474
-msgid "Mask bit detection (needed by a few games, zbuffer)"
-msgstr "屏蔽位检测 (某些游戏需要)"
+#: ../win32/gui/plugin.c:290
+#, c-format
+msgid "Error Opening PAD2 Plugin (%d)"
+msgstr "无法打开 PAD2 插件 (%d)"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:491
-#: ../plugins/peopsxgl/gpucfg/interface.c:504
-msgid "0: None - Fastest, most glitches"
-msgstr "0: 无 - 最快，问题较多"
+#: ../win32/gui/plugin.c:295
+#, fuzzy, c-format
+msgid "Error Opening SIO1 plugin (%d)"
+msgstr "无法打开 SPU 插件 (%d)"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:492
-msgid "1: Minimum - Missing screens"
-msgstr "1: 最小 - 丢失屏幕元素"
+#: ../win32/gui/plugin.c:325
+msgid "Error Closing CDR Plugin"
+msgstr "无法关闭 CD-ROM 插件 (%d)"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:493
-msgid "2: Standard - OK for most games"
-msgstr "2: 标准 - 大多数游戏运行良好"
+#: ../win32/gui/plugin.c:327
+msgid "Error Closing GPU Plugin"
+msgstr "无法关闭 GPU 插件"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:494
-msgid "3: Enhanced - Shows more stuff"
-msgstr "3: 增强 - 显示更多的东西"
+#: ../win32/gui/plugin.c:329
+msgid "Error Closing SPU Plugin"
+msgstr "无法关闭 SPU 插件"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:495
-msgid "4: Extended - Causing garbage"
-msgstr "4: 增强 - 可能导致错误"
+#: ../win32/gui/plugin.c:332
+#, fuzzy
+msgid "Error Closing SIO1 plugin"
+msgstr "无法关闭 SPU 插件"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:515
-#: ../plugins/peopsxgl/gpucfg/interface.c:527
-msgid "0: Emulated vram - Needs FVP"
-msgstr "0: 模拟 vram - 需 FVP"
+#: ../win32/gui/plugin.c:354
+#, c-format
+msgid "CDRinit error: %d"
+msgstr "CDRinit 错误: %d"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:516
-msgid "1: Black - Fast, no effects"
-msgstr "1: 黑色 - 快，无特效"
+#: ../win32/gui/plugin.c:356
+#, c-format
+msgid "GPUinit error: %d"
+msgstr "GPUinit 错误: %d"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:517
-msgid "2: Gfx card buffer - Can be slow"
-msgstr "2: Gfx 卡缓存 - 可能较慢"
+#: ../win32/gui/plugin.c:358
+#, c-format
+msgid "SPUinit error: %d"
+msgstr "SPUinit 错误: %d"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:518
-msgid "3: Gfx card & soft - slow"
-msgstr "3: Gfx 卡缓存与软件 - 较慢"
+#: ../win32/gui/plugin.c:360
+#, c-format
+msgid "PAD1init error: %d"
+msgstr "PAD1init 错误: %d"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:538
-#: ../plugins/peopsxgl/gpucfg/interface.c:551
-msgid "0: Emulated vram - ok most times"
-msgstr "0: 模拟 vram - 大多数情况运行良好"
+#: ../win32/gui/plugin.c:362
+#, c-format
+msgid "PAD2init error: %d"
+msgstr "PAD2init 错误: %d"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:539
-msgid "1: Gfx card buffer reads"
-msgstr "1: Gfx 卡缓存读取"
+#: ../win32/gui/plugin.c:365
+#, fuzzy, c-format
+msgid "SIO1init error: %d"
+msgstr "SPUinit 错误: %d"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:540
-msgid "2: Gfx card buffer moves"
-msgstr "2: Gfx 卡缓存移动"
+#: ../win32/gui/plugin.c:370
+#, c-format
+msgid "NETinit error: %d"
+msgstr "NETinit 错误: %d"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:541
-msgid "3: Gfx buffer reads & moves"
-msgstr "3: Gfx 卡缓存读取与移动"
+#: ../win32/gui/WndMain.c:77
+msgid "Arabic"
+msgstr "阿拉伯语"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:542
-msgid "4: Full Software (FVP)"
-msgstr "4: 纯软件 (FVP)"
+#: ../win32/gui/WndMain.c:78
+msgid "Catalan"
+msgstr "加泰隆尼亚语"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:553
-msgid "Special game fixes"
-msgstr "特定游戏修正"
+#: ../win32/gui/WndMain.c:79
+msgid "German"
+msgstr "德语"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:576
-msgid "Battle cursor (FF7)"
-msgstr "战斗光标 (FF7)"
+#: ../win32/gui/WndMain.c:80
+msgid "Greek"
+msgstr "希腊语"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:584
-msgid "Direct FB updates"
-msgstr "直接 FB 更新"
+#: ../win32/gui/WndMain.c:81 ../win32/gui/WndMain.c:1699
+#: ../win32/gui/WndMain.c:1701
+msgid "English"
+msgstr "英语"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:592
-msgid "Black brightness (Lunar)"
-msgstr "黑色亮度 (Lunar)"
+#: ../win32/gui/WndMain.c:82
+msgid "Spanish"
+msgstr "西班牙语"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:600
-msgid "Swap front detection"
-msgstr "Swap front 检测"
+#: ../win32/gui/WndMain.c:83
+msgid "French"
+msgstr "法语"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:608
-msgid "Disable coord check"
-msgstr "禁用坐标检查"
+#: ../win32/gui/WndMain.c:84
+msgid "Italian"
+msgstr "意大利语"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:616
-msgid "No blue glitches (LoD)"
-msgstr "去除蓝色干扰 (LoD)"
+#: ../win32/gui/WndMain.c:85
+msgid "Portuguese"
+msgstr "葡萄牙语"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:624
-msgid "Soft FB access"
-msgstr "软件 FB 访问"
+#: ../win32/gui/WndMain.c:86
+msgid "Portuguese (Brazilian)"
+msgstr "葡萄牙语 (巴西)"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:632
-msgid "PC fps calculation"
-msgstr "PC FPS 计算"
+#: ../win32/gui/WndMain.c:87
+msgid "Romanian"
+msgstr "罗马尼亚语"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:648
-msgid "Yellow rect (FF9)"
-msgstr "黄色方块 (FF9)"
+#: ../win32/gui/WndMain.c:88
+msgid "Russian"
+msgstr "俄语"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:656
-msgid "No subtr. blending"
-msgstr "无 subtr. 混合"
+#: ../win32/gui/WndMain.c:89
+msgid "Simplified Chinese"
+msgstr "简体中文"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:664
-msgid "Lazy upload (DW7)"
-msgstr "懒惰上传 (DW7)"
+#: ../win32/gui/WndMain.c:90
+msgid "Traditional Chinese"
+msgstr "繁体中文"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:672
-msgid "Odd/even hack"
-msgstr "奇/偶位 hack"
+#: ../win32/gui/WndMain.c:91
+msgid "Japanese"
+msgstr "日语"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:680
-msgid "Adjust screen width"
-msgstr "调整屏幕宽度"
+#: ../win32/gui/WndMain.c:92
+msgid "Korean"
+msgstr "朝鲜语"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:688
-msgid "Old texture filtering"
-msgstr "旧的纹理过滤"
+#: ../win32/gui/WndMain.c:215
+msgid ""
+"Usage: pcsxr [options]\n"
+"\toptions:\n"
+"\t-nogui\t\tDon't open the GUI\n"
+"\t-psxout\t\tEnable PSX output\n"
+"\t-slowboot\tEnable BIOS logo\n"
+"\t-runcd\t\tRuns CD-ROM (requires -nogui)\n"
+"\t-cdfile FILE\tRuns a CD image file (requires -nogui)\n"
+"\t-help\t\tDisplay this message"
+msgstr ""
+"用法: pcsxr [选项]\n"
+"\t选项:\n"
+"\t-nogui\t\t不打开 GUI\n"
+"\t-psxout\t\t启用 PSX 控制台输出\n"
+"\t-slowboot\t启用 BIOS 启动画面\n"
+"\t-runcd\t\t运行 CD-ROM (需要 -nogui)\n"
+"\t-cdfile FILE\t运行 CD 镜像文件 (需要 -nogui)\n"
+"\t-help\t\t显示此信息"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:696
-msgid "Additional uploads"
-msgstr "附加上传"
+#: ../win32/gui/WndMain.c:350 ../win32/gui/WndMain.c:396
+msgid "PCSXR State Format"
+msgstr "PCSXR 即时存档格式"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:704
-msgid "unused"
-msgstr "未使用"
+#: ../win32/gui/WndMain.c:377
+#, c-format
+msgid "*PCSXR*: Loaded State %s"
+msgstr "*PCSXR*: Loaded State %s"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:712
-msgid "Fake 'gpu busy'"
-msgstr "欺骗 'gpu 忙' 状态"
+#: ../win32/gui/WndMain.c:378
+#, c-format
+msgid "*PCSXR*: Error Loading State %s"
+msgstr "*PCSXR*: Error Loading State %s"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:720
-msgid "Misc"
-msgstr "杂项"
+#: ../win32/gui/WndMain.c:423
+#, c-format
+msgid "*PCSXR*: Saved State %s"
+msgstr "*PCSXR*: Saved State %s"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:743
-msgid "Scanlines"
-msgstr "扫描线"
+#: ../win32/gui/WndMain.c:424
+#, c-format
+msgid "*PCSXR*: Error Saving State %s"
+msgstr "*PCSXR*: Error Saving State %s"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:751
-msgid "Blending (0..255, -1=dot):"
-msgstr "混合 (0..255, -1=点阵):"
+#: ../win32/gui/WndMain.c:493
+msgid "Running BIOS is not supported with Internal HLE Bios."
+msgstr "内部 HLE BIOS 不支持直接运行。"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:759
-msgid "Screen smoothing (can be slow or unsupported)"
-msgstr "屏幕平滑 (可能较慢或不被支持)"
+#: ../win32/gui/WndMain.c:790
+msgid "Game ID"
+msgstr "游戏 ID"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:767
-msgid "Use OpenGL extensions (recommended)"
-msgstr "使用 OpenGL 扩展 (推荐)"
+#: ../win32/gui/WndMain.c:796
+msgid "Game"
+msgstr "游戏"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:775
-msgid "Polygon anti-aliasing (slow with most cards)"
-msgstr "多边形抗锯齿 (对大多数显卡较慢)"
+#: ../win32/gui/WndMain.c:978
+msgid "mid link block"
+msgstr "中间链接块"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:783
-msgid "Line mode (polygons will not get filled)"
-msgstr "框架模式 (不填充多边形)"
+#: ../win32/gui/WndMain.c:981
+msgid "terminiting link block"
+msgstr "终止链接块"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:791
-msgid "Force 15 bit framebuffer updates (faster movies)"
-msgstr "强制 15 位帧缓冲更新 (影片较快)"
+#: ../win32/gui/WndMain.c:1086
+msgid "Memcard Manager"
+msgstr "记忆卡管理器"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:799
-msgid "Unfiltered MDECs (small movie speedup)"
-msgstr "非过滤 MDEC (微小的影片加速)"
+#: ../win32/gui/WndMain.c:1090 ../win32/gui/WndMain.c:1093
+msgid "Select Mcd"
+msgstr "选择"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:852
-msgid "Adapted from P.E.Op.S OpenGL GPU by Pete Bernert"
-msgstr "基于 Pete Bernert 的 P.E.Op.S OpenGL GPU"
+#: ../win32/gui/WndMain.c:1091 ../win32/gui/WndMain.c:1094
+msgid "Format Mcd"
+msgstr "格式化"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:861
-msgid "Homepage: http://www.pbernert.com"
-msgstr "主页: http://www.pbernert.com"
+#: ../win32/gui/WndMain.c:1092 ../win32/gui/WndMain.c:1095
+msgid "Reload Mcd"
+msgstr "重新加载"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:879
-msgid "Version: 1.78"
-msgstr "版本: 1.78"
+#: ../win32/gui/WndMain.c:1096
+msgid "-> Copy ->"
+msgstr "-> 复制 ->"
 
-#: ../plugins/dfinput/cfg-gtk2.c:48
-msgid "D-Pad Up"
-msgstr "方向键上"
+#: ../win32/gui/WndMain.c:1097
+msgid "<- Copy <-"
+msgstr "<- 复制 <-"
 
-#: ../plugins/dfinput/cfg-gtk2.c:49
-msgid "D-Pad Down"
-msgstr "方向键下"
+#: ../win32/gui/WndMain.c:1098
+msgid "Paste"
+msgstr "粘贴"
 
-#: ../plugins/dfinput/cfg-gtk2.c:50
-msgid "D-Pad Left"
-msgstr "方向键左"
+#: ../win32/gui/WndMain.c:1099
+msgid "<- Un/Delete"
+msgstr "<- 删除/恢复"
 
-#: ../plugins/dfinput/cfg-gtk2.c:51
-msgid "D-Pad Right"
-msgstr "方向键右"
+#: ../win32/gui/WndMain.c:1100
+msgid "Un/Delete ->"
+msgstr "删除/恢复 ->"
 
-#: ../plugins/dfinput/cfg-gtk2.c:52
-msgid "Cross"
-msgstr "叉号键"
+#: ../win32/gui/WndMain.c:1102
+msgid "Memory Card 1"
+msgstr "记忆卡 1"
 
-#: ../plugins/dfinput/cfg-gtk2.c:53
-msgid "Circle"
-msgstr "圆圈键"
+#: ../win32/gui/WndMain.c:1103
+msgid "Memory Card 2"
+msgstr "记忆卡 2"
 
-#: ../plugins/dfinput/cfg-gtk2.c:54
-msgid "Square"
-msgstr "方块键"
+#: ../win32/gui/WndMain.c:1158
+msgid "Are you sure you want to paste this selection?"
+msgstr "是否确认粘贴此选中内容?"
 
-#: ../plugins/dfinput/cfg-gtk2.c:55
-msgid "Triangle"
-msgstr "三角键"
+#: ../win32/gui/WndMain.c:1158 ../win32/gui/WndMain.c:1269
+#: ../win32/gui/WndMain.c:1276
+msgid "Confirmation"
+msgstr "确认"
 
-#: ../plugins/dfinput/cfg-gtk2.c:56
-msgid "L1"
-msgstr "L1"
+#: ../win32/gui/WndMain.c:1269 ../win32/gui/WndMain.c:1276
+msgid "Are you sure you want to format this Memory Card?"
+msgstr "是否确认格式化此记忆卡?"
 
-#: ../plugins/dfinput/cfg-gtk2.c:57
-msgid "R1"
-msgstr "R1"
+#: ../win32/gui/WndMain.c:1322
+msgid "Cpu Config"
+msgstr "CPU 配置"
 
-#: ../plugins/dfinput/cfg-gtk2.c:58
-msgid "L2"
-msgstr "L2"
+#: ../win32/gui/WndMain.c:1327
+msgid "Disable Xa Decoding"
+msgstr "禁用 XA 解码"
 
-#: ../plugins/dfinput/cfg-gtk2.c:59
-msgid "R2"
-msgstr "R2"
+#: ../win32/gui/WndMain.c:1328
+msgid "Sio Irq Always Enabled"
+msgstr "SIO IRQ 总是启用"
 
-#: ../plugins/dfinput/cfg-gtk2.c:60
-msgid "Select"
-msgstr "选择键"
+#: ../win32/gui/WndMain.c:1329
+msgid "Black && White Movies"
+msgstr "黑白电影"
 
-#: ../plugins/dfinput/cfg-gtk2.c:61
-msgid "Start"
-msgstr "开始键"
+#: ../win32/gui/WndMain.c:1330
+msgid "Disable Cd audio"
+msgstr "禁用 CD 音频"
 
-#: ../plugins/dfinput/cfg-gtk2.c:62
-msgid "L3"
-msgstr "L3"
+#: ../win32/gui/WndMain.c:1333
+msgid "Enable Interpreter Cpu"
+msgstr "启用解释执行 CPU"
 
-#: ../plugins/dfinput/cfg-gtk2.c:63
-msgid "R3"
-msgstr "R3"
+#: ../win32/gui/WndMain.c:1336
+msgid "Spu Irq Always Enabled"
+msgstr "SPU IRQ 总是启用"
 
-#: ../plugins/dfinput/cfg-gtk2.c:67
-msgid "L-Stick Right"
-msgstr "左摇杆右方向"
+#: ../win32/gui/WndMain.c:1340
+msgid "Hide cursor"
+msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:68
-msgid "L-Stick Left"
-msgstr "左摇杆左方向"
+#: ../win32/gui/WndMain.c:1343
+msgid "Psx System Type"
+msgstr "PS 系统类型"
 
-#: ../plugins/dfinput/cfg-gtk2.c:69
-msgid "L-Stick Down"
-msgstr "左摇杆下方向"
+#: ../win32/gui/WndMain.c:1453
+msgid "Psx Mcd Format (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
+msgstr "PS 记忆卡格式 (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:70
-msgid "L-Stick Up"
-msgstr "左摇杆上方向"
+#: ../win32/gui/WndMain.c:1458
+msgid "Psx Memory Card (*.mcr;*.mc)"
+msgstr "PS 记忆卡 (*.mcr;*.mc)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:71
-msgid "R-Stick Right"
-msgstr "右摇杆右方向"
+#: ../win32/gui/WndMain.c:1463
+msgid "CVGS Memory Card (*.mem;*.vgs)"
+msgstr "VGS 记忆卡 (*.mem;*.vgs)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:72
-msgid "R-Stick Left"
-msgstr "右摇杆左方向"
+#: ../win32/gui/WndMain.c:1468
+msgid "Bleem Memory Card (*.mcd)"
+msgstr "Bleem 记忆卡 (*.mcd)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:73
-msgid "R-Stick Down"
-msgstr "右摇杆下方向"
+#: ../win32/gui/WndMain.c:1473
+msgid "DexDrive Memory Card (*.gme)"
+msgstr "DexDrive 记忆卡 (*.gme)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:74
-msgid "R-Stick Up"
-msgstr "右摇杆上方向"
+#: ../win32/gui/WndMain.c:1478
+msgid "DataDeck Memory Card (*.ddf)"
+msgstr "DataDeck 记忆卡 (*.ddl)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:103
-#: ../plugins/dfinput/cfg-gtk2.c:142
-msgid "Centered"
-msgstr "居中"
+#: ../win32/gui/WndMain.c:1522
+msgid "Psx Exe Format"
+msgstr "PS EXE 格式"
 
-#: ../plugins/dfinput/cfg-gtk2.c:103
-#: ../plugins/dfinput/cfg-gtk2.c:142
-msgid "Up"
-msgstr "上"
+#: ../win32/gui/WndMain.c:1559
+#, fuzzy
+msgid "Psx Isos (*.iso;*.mdf;*.img;*.bin;*.cue;*.pbp;*.cbn)"
+msgstr "PS 光盘镜像 (*.iso;*.mdf;*.img;*.bin)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:103
-#: ../plugins/dfinput/cfg-gtk2.c:142
-msgid "Right"
-msgstr "右方向键"
+#: ../win32/gui/WndMain.c:1635
+msgid "&File"
+msgstr "文件(&F)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:103
-#: ../plugins/dfinput/cfg-gtk2.c:142
-msgid "Rightup"
-msgstr "右上"
+#: ../win32/gui/WndMain.c:1636
+msgid "E&xit"
+msgstr "退出(&X)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:104
-#: ../plugins/dfinput/cfg-gtk2.c:143
-msgid "Down"
-msgstr "下"
+#: ../win32/gui/WndMain.c:1638
+msgid "Run &EXE..."
+msgstr "运行 &EXE..."
 
-#: ../plugins/dfinput/cfg-gtk2.c:104
-#: ../plugins/dfinput/cfg-gtk2.c:143
-msgid "Rightdown"
-msgstr "右下"
+#: ../win32/gui/WndMain.c:1639
+msgid "Run &BIOS"
+msgstr "运行 BIOS(&B)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:104
-#: ../plugins/dfinput/cfg-gtk2.c:143
-msgid "Left"
-msgstr "左"
+#: ../win32/gui/WndMain.c:1640
+msgid "Run &ISO..."
+msgstr "运行 &ISO..."
 
-#: ../plugins/dfinput/cfg-gtk2.c:104
-#: ../plugins/dfinput/cfg-gtk2.c:143
-msgid "Leftup"
-msgstr "左上"
+#: ../win32/gui/WndMain.c:1641
+msgid "Run &CD"
+msgstr "运行光碟(&C)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:105
-#: ../plugins/dfinput/cfg-gtk2.c:144
-msgid "Leftdown"
-msgstr "左下"
+#: ../win32/gui/WndMain.c:1643
+msgid "&Emulator"
+msgstr "模拟器(&E)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:109
-#: ../plugins/dfinput/cfg-gtk2.c:148
-#, c-format
-msgid "Joystick: Button %d"
-msgstr "手柄: 按钮 %d"
+#: ../win32/gui/WndMain.c:1644
+msgid "&States"
+msgstr "存档(&S)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:113
-#: ../plugins/dfinput/cfg-gtk2.c:152
-#, c-format
-msgid "Joystick: Axis %d%c"
-msgstr "手柄: 轴 %d%c"
+#: ../win32/gui/WndMain.c:1646
+msgid "S&witch ISO..."
+msgstr "更换 ISO(&W)..."
 
-#: ../plugins/dfinput/cfg-gtk2.c:118
-#: ../plugins/dfinput/cfg-gtk2.c:157
-#, c-format
-msgid "Joystick: Hat %d %s"
-msgstr "Joystick: 操纵杆 %d %s"
+#: ../win32/gui/WndMain.c:1648
+msgid "S&hutdown"
+msgstr "关闭(&H)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:133
-#: ../plugins/dfinput/cfg-gtk2.c:172
-msgid "Keyboard:"
-msgstr "键盘:"
+#: ../win32/gui/WndMain.c:1649
+msgid "Re&set"
+msgstr "复位(&S)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:137
-#: ../plugins/dfinput/cfg-gtk2.c:176
-msgid "(Not Set)"
-msgstr "(未设定)"
+#: ../win32/gui/WndMain.c:1650
+msgid "&Run"
+msgstr "运行(&R)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:539
-msgid "None"
-msgstr "无"
+#: ../win32/gui/WndMain.c:1651
+msgid "&Save"
+msgstr "保存(&S)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:581
-msgid "Gamepad/Keyboard Input Configuration"
-msgstr "手柄/键盘输入配置"
+#: ../win32/gui/WndMain.c:1652
+msgid "&Load"
+msgstr "读取(&L)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:587
-#: ../plugins/dfinput/cfg-gtk2.c:607
-msgid "Key"
-msgstr "按钮"
+#: ../win32/gui/WndMain.c:1653 ../win32/gui/WndMain.c:1663
+msgid "&Other..."
+msgstr "其它(&O)..."
 
-#: ../plugins/dfinput/cfg-gtk2.c:593
-#: ../plugins/dfinput/cfg-gtk2.c:613
-msgid "Button"
-msgstr "按键"
+#: ../win32/gui/WndMain.c:1654 ../win32/gui/WndMain.c:1664
+msgid "Slot &9"
+msgstr "存档 9(&9)"
 
-#: ../plugins/dfinput/pad.c:22
-msgid "Gamepad/Keyboard Input"
-msgstr "手柄/键盘输入"
+#: ../win32/gui/WndMain.c:1655 ../win32/gui/WndMain.c:1665
+msgid "Slot &8"
+msgstr "存档 8(&8)"
 
-#: ../plugins/dfinput/dfinput.glade2:35
-#: ../plugins/dfinput/dfinput.glade2:232
-msgid "Device:"
-msgstr "设备:"
+#: ../win32/gui/WndMain.c:1656 ../win32/gui/WndMain.c:1666
+msgid "Slot &7"
+msgstr "存档 7(&7)"
 
-#: ../plugins/dfinput/dfinput.glade2:66
-#: ../plugins/dfinput/dfinput.glade2:263
-msgid "Type:"
-msgstr "类型:"
+#: ../win32/gui/WndMain.c:1657 ../win32/gui/WndMain.c:1667
+msgid "Slot &6"
+msgstr "存档 6(&6)"
 
-#: ../plugins/dfinput/dfinput.glade2:78
-#: ../plugins/dfinput/dfinput.glade2:275
-msgid ""
-"Digital Pad\n"
-"Analog Pad"
-msgstr ""
-"普通手柄\n"
-"摇杆手柄"
+#: ../win32/gui/WndMain.c:1658 ../win32/gui/WndMain.c:1668
+msgid "Slot &5"
+msgstr "存档 5(&5)"
 
-#: ../plugins/dfinput/dfinput.glade2:149
-#: ../plugins/dfinput/dfinput.glade2:346
-msgid "Change"
-msgstr "更改"
+#: ../win32/gui/WndMain.c:1659 ../win32/gui/WndMain.c:1669
+msgid "Slot &4"
+msgstr "存档 4(&4)"
 
-#: ../plugins/dfinput/dfinput.glade2:185
-#: ../plugins/dfinput/dfinput.glade2:382
-msgid "Reset"
-msgstr "重置"
+#: ../win32/gui/WndMain.c:1660 ../win32/gui/WndMain.c:1670
+msgid "Slot &3"
+msgstr "存档 3(&3)"
 
-#: ../plugins/dfinput/dfinput.glade2:210
-msgid "Controller 1"
-msgstr "控制器 1"
+#: ../win32/gui/WndMain.c:1661 ../win32/gui/WndMain.c:1671
+msgid "Slot &2"
+msgstr "存档 2(&2)"
 
-#: ../plugins/dfinput/dfinput.glade2:412
-msgid "Controller 2"
-msgstr "控制器 2"
+#: ../win32/gui/WndMain.c:1662 ../win32/gui/WndMain.c:1672
+msgid "Slot &1"
+msgstr "存档 1(&1)"
 
-#: ../plugins/dfinput/dfinput.glade2:427
-msgid "Multi-Threaded (Recommended)"
-msgstr "多线程 (推荐)"
+#: ../win32/gui/WndMain.c:1674
+msgid "&Configuration"
+msgstr "配置(&C)"
 
-#: ../plugins/dfnet/dfnet.c:23
-msgid "Socket Driver"
-msgstr "套接字驱动程序"
+#: ../win32/gui/WndMain.c:1675
+msgid "Cheat &Search..."
+msgstr "查找作弊码(&S)..."
 
-#: ../plugins/dfnet/dfnet.c:161
-#, c-format
-msgid "error connecting to %s: %s\n"
-msgstr "无法连接到 %s: %s\n"
+#: ../win32/gui/WndMain.c:1676
+msgid "Ch&eat Code..."
+msgstr "作弊码(&E)..."
 
-#: ../plugins/dfnet/dfnet.c:186
-msgid "Error allocating memory!\n"
-msgstr "分配内存错误!\n"
+#: ../win32/gui/WndMain.c:1679
+msgid "&Language"
+msgstr "语言(&L)"
 
-#: ../plugins/dfnet/gui.c:39
-msgid "Nothing to configure"
-msgstr "没有可以配置的项目"
+#: ../win32/gui/WndMain.c:1705
+msgid "&Memory cards..."
+msgstr "记忆卡(&M)..."
 
-#: ../plugins/dfnet/gui.c:95
-#, c-format
-msgid "IP %s"
-msgstr "IP %s"
+#: ../win32/gui/WndMain.c:1706
+msgid "C&PU..."
+msgstr "C&PU..."
 
-#: ../plugins/dfnet/gui.c:165
-msgid "Waiting for connection..."
-msgstr "正在等待连接..."
+#: ../win32/gui/WndMain.c:1708
+msgid "&NetPlay..."
+msgstr "联网游戏(&N)..."
 
-#: ../plugins/dfnet/gui.c:168
-msgid "The Client should now Start a Connection, waiting..."
-msgstr "客户端应在此时发起连接，等待中..."
+#: ../win32/gui/WndMain.c:1710
+#, fuzzy
+msgid "&Link cable..."
+msgstr "连接线"
 
-#: ../plugins/dfnet/dfnet.glade2:23
-msgid ""
-"Select here if you'll be Server (Player1) or Client (Player2).\n"
-"\n"
-"If you select Server you must Copy your IP address to the Clipboard and paste if (Ctrl+V) wherever the Client can see it.\n"
-"\n"
-"If you selected Client please enter the IP address the Server gave to you in the IP Address Control."
-msgstr ""
-"请在此选择作为服务器 (玩家 1) 还是作为客户端 (玩家 2) 来运行。\n"
-"\n"
-"如果您选择作为服务器，您必须复制本机 IP 地址到剪贴板并将此信息告知客户端。\n"
-"\n"
-"如果您选择作为客户端，请输入服务器方提供给您的 IP 地址。"
+#: ../win32/gui/WndMain.c:1711
+msgid "&Controllers..."
+msgstr "控制器(&C)..."
 
-#: ../plugins/dfnet/dfnet.glade2:63
-msgid "Copy PC IP to Clipboard"
-msgstr "将本机 IP 复制到剪贴板"
+#: ../win32/gui/WndMain.c:1712
+msgid "CD-&ROM..."
+msgstr "CD-&ROM..."
 
-#: ../plugins/dfnet/dfnet.glade2:94
-msgid "Server (Player1)"
-msgstr "服务器 (玩家 1)"
+#: ../win32/gui/WndMain.c:1713
+msgid "&Sound..."
+msgstr "声音(&S)..."
 
-#: ../plugins/dfnet/dfnet.glade2:104
-msgid "Client (Player2)"
-msgstr "客户端 (玩家 2)"
+#: ../win32/gui/WndMain.c:1714
+msgid "&Graphics..."
+msgstr "图像(&G)..."
 
-#: ../plugins/dfnet/dfnet.glade2:130
-msgid "Do not change if not necessary (remember it must be changed on both sides)."
-msgstr "如非必要，请勿改动 (必须在两端都要改动)。"
+#: ../win32/gui/WndMain.c:1716
+msgid "&Plugins && Bios..."
+msgstr "插件及 BIOS(&P)..."
 
-#: ../plugins/dfnet/dfnet.glade2:143
-msgid "Port Number"
-msgstr "端口号"
+#: ../win32/gui/WndMain.c:1718
+msgid "&Help"
+msgstr "帮助(&H)"
 
-#: ../plugins/dfnet/dfnet.glade2:202
-msgid "Start Game"
-msgstr "开始游戏"
+#: ../win32/gui/WndMain.c:1719
+msgid "&About..."
+msgstr "关于(&A)..."
 
-#: ../plugins/dfnet/dfnet.glade2:240
-msgid "Play Offline"
-msgstr "离线运行"
+#: ../win32/gui/WndMain.c:1870
+msgid "Pcsxr Msg"
+msgstr "PCSXR 消息"
 
-#: ../plugins/bladesio1/sio1.c:29
-msgid "Sio1 Driver"
-msgstr "Sio1 驱动程序"
+#: ../win32/gui/WndMain.c:1873
+msgid "Error Loading Symbol"
+msgstr "无法加载符号"
 
+#~ msgid "Controller 1: "
+#~ msgstr "控制器 1:"
+
+#~ msgid "Sio1 Driver"
+#~ msgstr "Sio1 驱动程序"
+
+#~ msgid ""
+#~ "8-bit\n"
+#~ "16-bit\n"
+#~ "32-bit"
+#~ msgstr ""
+#~ "8 位\n"
+#~ "16 位\n"
+#~ "32 位"
+
+#~ msgid "CD-ROM..."
+#~ msgstr "CD-ROM..."
+
+#~ msgid "Continue..."
+#~ msgstr "继续..."
+
+#~ msgid "Controllers..."
+#~ msgstr "控制器..."
+
+#~ msgid ""
+#~ "Decimal\n"
+#~ "Hexadecimal"
+#~ msgstr ""
+#~ "十进制\n"
+#~ "十六进制"
+
+#~ msgid ""
+#~ "Equal Value\n"
+#~ "Not Equal Value\n"
+#~ "Range\n"
+#~ "Increased By\n"
+#~ "Decreased By\n"
+#~ "Increased\n"
+#~ "Decreased\n"
+#~ "Different\n"
+#~ "No Change"
+#~ msgstr ""
+#~ "等于数值\n"
+#~ "不等于数值\n"
+#~ "范围\n"
+#~ "增加数值\n"
+#~ "减少数值\n"
+#~ "增加\n"
+#~ "减少\n"
+#~ "改变\n"
+#~ "无改变"
+
+#~ msgid "Graphics..."
+#~ msgstr "图像..."
+
+#~ msgid "Memcards..."
+#~ msgstr "记忆卡..."
+
+#~ msgid "Run ISO..."
+#~ msgstr "运行 ISO..."
+
+#~ msgid "Sound..."
+#~ msgstr "声音..."
+
+#~ msgid "Switch ISO..."
+#~ msgstr "更换 ISO..."
+
+#~ msgid "Error: Glade interface could not be loaded!"
+#~ msgstr "错误：无法加载 Glade 界面!"
+
+#~ msgid ""
+#~ "0: None\n"
+#~ "1: 2xSai\n"
+#~ "2: 2xSuperSai\n"
+#~ "3: SuperEagle\n"
+#~ "4: Scale2x\n"
+#~ "5: Scale3x\n"
+#~ "6: HQ2X\n"
+#~ "7: HQ3X"
+#~ msgstr ""
+#~ "0: 无\n"
+#~ "1: 2xSai\n"
+#~ "2: 2xSuperSai\n"
+#~ "3: SuperEagle\n"
+#~ "4: Scale2x\n"
+#~ "5: Scale3x\n"
+#~ "6: HQ2X\n"
+#~ "7: HQ3X"
+
+#~ msgid ""
+#~ "0: Off (fastest)\n"
+#~ "1: Game dependant\n"
+#~ "2: Always"
+#~ msgstr ""
+#~ "0: 关闭 (最快)\n"
+#~ "1: 取决于游戏\n"
+#~ "2: 总是"
+
+#~ msgid ""
+#~ "320x240\n"
+#~ "640x480\n"
+#~ "800x600\n"
+#~ "1024x768\n"
+#~ "1152x864\n"
+#~ "1280x1024\n"
+#~ "1600x1200"
+#~ msgstr ""
+#~ "320x240\n"
+#~ "640x480\n"
+#~ "800x600\n"
+#~ "1024x768\n"
+#~ "1152x864\n"
+#~ "1280x1024\n"
+#~ "1600x1200"
+
+#~ msgid "Compatibility"
+#~ msgstr "兼容性"
+
+#~ msgid "Framerate"
+#~ msgstr "帧率"
+
+#~ msgid "Screen"
+#~ msgstr "屏幕"
+
+#~ msgid "General"
+#~ msgstr "一般"
+
+#~ msgid "XA Music"
+#~ msgstr "XA 音乐"
+
+#~ msgid ""
+#~ "None\n"
+#~ "Low\n"
+#~ "Medium\n"
+#~ "Loud\n"
+#~ "Loudest"
+#~ msgstr ""
+#~ "无\n"
+#~ "低\n"
+#~ "中\n"
+#~ "高\n"
+#~ "最高"
+
+#~ msgid ""
+#~ "None\n"
+#~ "Simple\n"
+#~ "Gaussian\n"
+#~ "Cubic"
+#~ msgstr ""
+#~ "无\n"
+#~ "简易\n"
+#~ "高斯\n"
+#~ "立方"
+
+#~ msgid ""
+#~ "Default\n"
+#~ "125ms\n"
+#~ "250ms\n"
+#~ "500ms\n"
+#~ "1s\n"
+#~ "2s\n"
+#~ "4s\n"
+#~ "8s\n"
+#~ "16s\n"
+#~ "32s\n"
+#~ "1min\n"
+#~ "2min\n"
+#~ "4min\n"
+#~ "8min\n"
+#~ "16min\n"
+#~ "32min"
+#~ msgstr ""
+#~ "默认\n"
+#~ "125 毫秒\n"
+#~ "250 毫秒\n"
+#~ "500 毫秒\n"
+#~ "1 秒\n"
+#~ "2 秒\n"
+#~ "4 秒\n"
+#~ "8 秒\n"
+#~ "16 秒\n"
+#~ "32 秒\n"
+#~ "1 分钟\n"
+#~ "2 分钟\n"
+#~ "4 分钟\n"
+#~ "8 分钟\n"
+#~ "16 分钟\n"
+#~ "32 分钟"
+
+#~ msgid "Select CD-ROM device"
+#~ msgstr "选择 CD-ROM 设备"
+
+#~ msgid "hseparator"
+#~ msgstr "hseparator"

pcsxr-1.9.92.tar.bz2/po/zh_TW.po -> pcsxr-1.9.93.tar.bz2/po/zh_TW.po Changed

@@ -6,1681 +6,1812 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: pcsxr 1.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-10 14:04+0800\n"
-"PO-Revision-Date: 2010-07-10 14:06+0700\n"
-"Last-Translator: Wei Mingzhi <whistler@openoffice.org>\n"
+"Report-Msgid-Bugs-To: whistler_wmz@users.sf.net\n"
+"POT-Creation-Date: 2013-03-02 03:33+0400\n"
+"PO-Revision-Date: 2011-06-04 13:46+0400\n"
+"Last-Translator: Wei Mingzhi <whistler_wmz@users.sf.net>\n"
 "Language-Team: Traditional Chinese <whistler@openoffice.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../win32/gui/AboutDlg.c:26
-msgid ""
-"PCSX - A PlayStation Emulator\n"
-"\n"
-"Original Authors:\n"
-"main coder: linuzappz\n"
-"co-coders: shadow\n"
-"ex-coders: Nocomp, Pete Bernett, nik3d\n"
-"Webmaster: AkumaX"
+#: ../data/pcsxr.ui.h:1 ../win32/gui/CheatDlg.c:166
+msgid "Edit Cheat Codes"
+msgstr "編輯金手指"
+
+#: ../data/pcsxr.ui.h:2
+msgid "Cheat Codes"
+msgstr "金手指碼"
+
+#: ../data/pcsxr.ui.h:3 ../gui/Cheat.c:1113 ../win32/gui/CheatDlg.c:678
+msgid "Cheat Search"
+msgstr "搜尋金手指碼"
+
+#: ../data/pcsxr.ui.h:4 ../win32/gui/CheatDlg.c:680
+msgid "Search For:"
+msgstr "搜尋:"
+
+#: ../data/pcsxr.ui.h:5 ../win32/gui/CheatDlg.c:681
+msgid "Data Type:"
+msgstr "數值類型:"
+
+#: ../data/pcsxr.ui.h:6 ../gui/Cheat.c:645 ../win32/gui/CheatDlg.c:506
+#: ../win32/gui/CheatDlg.c:597 ../win32/gui/CheatDlg.c:682
+msgid "Value:"
+msgstr "值:"
+
+#: ../data/pcsxr.ui.h:7 ../win32/gui/CheatDlg.c:683
+msgid "Data Base:"
+msgstr "數值基:"
+
+#: ../data/pcsxr.ui.h:8 ../win32/gui/CheatDlg.c:684
+msgid "To:"
+msgstr "至:"
+
+#: ../data/pcsxr.ui.h:9 ../win32/gui/CheatDlg.c:504
+msgid "Freeze"
+msgstr "固定"
+
+#: ../data/pcsxr.ui.h:10 ../win32/gui/CheatDlg.c:595
+msgid "Modify"
+msgstr "更改"
+
+#: ../data/pcsxr.ui.h:11
+msgid "Copy"
+msgstr "複制"
+
+#: ../data/pcsxr.ui.h:12
+msgid "label_resultsfound"
+msgstr "label_resultsfound"
+
+#: ../data/pcsxr.ui.h:13
+msgid "Search"
+msgstr "搜尋"
+
+#: ../data/pcsxr.ui.h:14
+msgid "Restart"
+msgstr "重新開始"
+
+#: ../data/pcsxr.ui.h:15
+msgid "Cheat Search"
+msgstr "金手指碼搜尋"
+
+#: ../data/pcsxr.ui.h:16 ../gui/ConfDlg.c:113
+msgid "Configure PCSXR"
+msgstr "設定 PCSXR"
+
+#: ../data/pcsxr.ui.h:17
+msgid "Graphics:"
+msgstr "圖像:"
+
+#: ../data/pcsxr.ui.h:18
+msgid "Sound:"
+msgstr "聲音:"
+
+#: ../data/pcsxr.ui.h:19
+#, fuzzy
+msgid "Controller 1:"
+msgstr "控制器 1"
+
+#: ../data/pcsxr.ui.h:20
+msgid "Controller 2:"
+msgstr "控制器 2:"
+
+#: ../data/pcsxr.ui.h:21
+msgid "CD-ROM:"
+msgstr "CD-ROM:"
+
+#: ../data/pcsxr.ui.h:22
+msgid "Search in:"
+msgstr "在此處檢索外掛:"
+
+#: ../data/pcsxr.ui.h:23
+msgid "Select Folder to Search"
+msgstr "選擇要檢索的資料夾"
+
+#: ../data/pcsxr.ui.h:24
+#, fuzzy
+msgid "Link cable:"
+msgstr "開啟"
+
+#: ../data/pcsxr.ui.h:25
+msgid "Plugins"
+msgstr "外掛"
+
+#: ../data/pcsxr.ui.h:26
+msgid "BIOS:"
 msgstr ""
-"PCSX - 一個 PlayStation 模擬器\n"
-"\n"
-"原作者:\n"
-"主程式: linuzappz\n"
-"輔助程式: shadow\n"
-"前程式: Nocomp, Pete Bernett, nik3d\n"
-"網站管理: AkumaX"
 
-#: ../win32/gui/AboutDlg.c:35
-msgid ""
-"PCSX-df Authors:\n"
-"Ryan Schultz, Andrew Burton, Stephen Chao,\n"
-"Marcus Comstedt, Stefan Sikora\n"
-"\n"
-"PCSX-Reloaded By:\n"
-"Blade_Arma, Wei Mingzhi, et al.\n"
-"\n"
-"http://pcsxr.codeplex.com/"
+#: ../data/pcsxr.ui.h:27
+msgid "BIOS"
+msgstr "BIOS"
+
+#: ../data/pcsxr.ui.h:28
+msgid "Configure CPU"
+msgstr "CPU 設定"
+
+#: ../data/pcsxr.ui.h:29
+msgid "SPU IRQ Always Enabled"
+msgstr "SPU IRQ 總是開啟"
+
+#: ../data/pcsxr.ui.h:30
+msgid "Black & White Movies"
+msgstr "黑白電影"
+
+#: ../data/pcsxr.ui.h:31 ../gui/Plugin.c:239
+#, c-format
+msgid "SIO IRQ Always Enabled"
+msgstr "SIO IRQ 總是開啟"
+
+#: ../data/pcsxr.ui.h:32
+msgid "Disable XA Decoding"
+msgstr "禁用 XA 解碼"
+
+#: ../data/pcsxr.ui.h:33
+msgid "Disable CD Audio"
+msgstr "禁用 CD 音頻"
+
+#: ../data/pcsxr.ui.h:34 ../win32/gui/WndMain.c:1331
+msgid "Slow Boot"
 msgstr ""
-"PCSX-df 開發者:\n"
-"Ryan Schultz, Andrew Burton, Stephen Chao,\n"
-"Marcus Comstedt, Stefan Sikora\n"
-"\n"
-"PCSX-Reloaded 開發者:\n"
-"Blade_Arma, Wei Mingzhi, et al.\n"
-"\n"
-"http://pcsxr.codeplex.com/"
 
-#: ../win32/gui/AboutDlg.c:46
-#: ../plugins/peopsxgl/gpucfg/interface.c:831
-msgid "About"
-msgstr "關於 PCSX"
-
-#: ../win32/gui/AboutDlg.c:48
-#: ../win32/gui/AboutDlg.c:52
-#: ../win32/gui/CheatDlg.c:69
-#: ../win32/gui/CheatDlg.c:119
-#: ../win32/gui/ConfigurePlugins.c:483
-#: ../win32/gui/ConfigurePlugins.c:614
-#: ../win32/gui/WndMain.c:974
-#: ../win32/gui/WndMain.c:1210
-#: ../plugins/peopsxgl/gpucfg/interface.c:130
-#: ../plugins/peopsxgl/gpucfg/interface.c:843
-msgid "OK"
-msgstr "確定"
+#: ../data/pcsxr.ui.h:35
+msgid "Enable Interpreter CPU"
+msgstr "開啟解釋執行 CPU"
 
-#: ../win32/gui/AboutDlg.c:49
-msgid "PCSX EMU\n"
-msgstr "PCSX 模擬器\n"
+#: ../data/pcsxr.ui.h:36 ../win32/gui/WndMain.c:1334
+msgid "Enable Console Output"
+msgstr "開啟控制台輸出"
 
-#: ../win32/gui/CheatDlg.c:51
-#: ../win32/gui/CheatDlg.c:223
-#: ../win32/gui/CheatDlg.c:270
-msgid "Yes"
-msgstr "是"
+#: ../data/pcsxr.ui.h:37 ../win32/gui/WndMain.c:1335
+msgid "Enable Debugger"
+msgstr "開啟調試器"
 
-#: ../win32/gui/CheatDlg.c:51
-#: ../win32/gui/CheatDlg.c:223
-#: ../win32/gui/CheatDlg.c:270
-msgid "No"
-msgstr "否"
+#: ../data/pcsxr.ui.h:38 ../win32/gui/WndMain.c:1337
+msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
+msgstr "Parasite Eve 2, Vandal Hearts 1/2 修正"
 
-#: ../win32/gui/CheatDlg.c:66
-#: ../gui/Cheat.c:194
-msgid "Edit Cheat"
-msgstr "編輯金手指"
+#: ../data/pcsxr.ui.h:39 ../win32/gui/WndMain.c:1338
+msgid "InuYasha Sengoku Battle Fix"
+msgstr "InuYasha Sengoku 戰斗修正"
 
-#: ../win32/gui/CheatDlg.c:67
-#: ../win32/gui/CheatDlg.c:117
-#: ../gui/Cheat.c:636
-msgid "Description:"
-msgstr "描述:"
+#: ../data/pcsxr.ui.h:40 ../win32/gui/WndMain.c:1339
+msgid "Widescreen (GTE Hack)"
+msgstr ""
 
-#: ../win32/gui/CheatDlg.c:68
-#: ../win32/gui/CheatDlg.c:118
-#: ../gui/Cheat.c:125
-#: ../gui/Cheat.c:211
-msgid "Cheat Code:"
-msgstr "金手指碼:"
+#: ../data/pcsxr.ui.h:41
+msgid "Options"
+msgstr "選項"
 
-#: ../win32/gui/CheatDlg.c:70
-#: ../win32/gui/CheatDlg.c:120
-#: ../win32/gui/ConfigurePlugins.c:484
-#: ../win32/gui/ConfigurePlugins.c:615
-#: ../win32/gui/WndMain.c:975
-#: ../win32/gui/WndMain.c:1211
-#: ../plugins/peopsxgl/gpucfg/interface.c:338
-msgid "Cancel"
-msgstr "取消"
+#: ../data/pcsxr.ui.h:42 ../win32/gui/WndMain.c:1332
+msgid "Autodetect"
+msgstr "自動檢測"
 
-#: ../win32/gui/CheatDlg.c:91
-#: ../win32/gui/CheatDlg.c:132
-#: ../gui/Cheat.c:155
-#: ../gui/Cheat.c:251
-msgid "Invalid cheat code!"
-msgstr "非法金手指碼!"
+#: ../data/pcsxr.ui.h:43
+msgid "System Type"
+msgstr "系統類型"
 
-#: ../win32/gui/CheatDlg.c:116
-#: ../gui/Cheat.c:109
-msgid "Add New Cheat"
-msgstr "添加新金手指"
+#: ../data/pcsxr.ui.h:44
+msgid "PCSXR"
+msgstr "PCSXR"
 
-#: ../win32/gui/CheatDlg.c:166
-#: ../data/pcsx.glade2:2534
-msgid "Edit Cheat Codes"
-msgstr "編輯金手指"
+#: ../data/pcsxr.ui.h:45
+msgid "_File"
+msgstr "檔案(_F)"
 
-#: ../win32/gui/CheatDlg.c:168
-msgid "&Add Code"
-msgstr "增加金手指碼(&A)"
+#: ../data/pcsxr.ui.h:46
+msgid "Run _CD"
+msgstr "執行光碟(_C)"
 
-#: ../win32/gui/CheatDlg.c:169
-msgid "&Edit Code"
-msgstr "編輯金手指(&E):"
+#: ../data/pcsxr.ui.h:47
+msgid "Run _ISO..."
+msgstr "執行 _ISO..."
 
-#: ../win32/gui/CheatDlg.c:170
-msgid "&Remove Code"
-msgstr "刪除金手指碼(&R)"
+#: ../data/pcsxr.ui.h:48
+msgid "Run _BIOS"
+msgstr "執行 _BIOS"
 
-#: ../win32/gui/CheatDlg.c:171
-msgid "&Enable/Disable"
-msgstr "開啟/關閉(&E)"
+#: ../data/pcsxr.ui.h:49
+msgid "Run _EXE..."
+msgstr "執行 _EXE..."
 
-#: ../win32/gui/CheatDlg.c:172
-msgid "&Load..."
-msgstr "讀取(&L)..."
+#: ../data/pcsxr.ui.h:50
+msgid "E_xit"
+msgstr "離開(_X)"
 
-#: ../win32/gui/CheatDlg.c:173
-msgid "&Save As..."
-msgstr "存儲為(&S)..."
+#: ../data/pcsxr.ui.h:51
+msgid "_Emulator"
+msgstr "模擬器(_E)"
 
-#: ../win32/gui/CheatDlg.c:174
-msgid "&Close"
-msgstr "關閉(&C)"
+#: ../data/pcsxr.ui.h:52
+msgid "_Continue"
+msgstr "繼續(_C)"
 
-#: ../win32/gui/CheatDlg.c:185
-#: ../gui/Cheat.c:413
-msgid "Description"
-msgstr "描述"
+#: ../data/pcsxr.ui.h:53
+msgid "_Reset"
+msgstr "複位(_R)"
 
-#: ../win32/gui/CheatDlg.c:190
-msgid "Enabled"
-msgstr "開啟"
+#: ../data/pcsxr.ui.h:54
+#, fuzzy
+msgid "_Shutdown"
+msgstr "右下"
 
-#: ../win32/gui/CheatDlg.c:282
-#: ../win32/gui/CheatDlg.c:311
-msgid "PCSX Cheat Code Files"
-msgstr "PCSX 金手指檔 (*.cht)"
+#: ../data/pcsxr.ui.h:55
+msgid "S_witch ISO..."
+msgstr "更換 ISO(_W)"
 
-#: ../win32/gui/CheatDlg.c:402
-msgid "Equal Value"
-msgstr "等于數值"
+#: ../data/pcsxr.ui.h:56
+msgid "_Save State"
+msgstr "存儲記錄(_S)"
 
-#: ../win32/gui/CheatDlg.c:403
-msgid "Not Equal Value"
-msgstr "不等于數值"
+#: ../data/pcsxr.ui.h:57
+msgid "Slot _1"
+msgstr "記錄 _1"
 
-#: ../win32/gui/CheatDlg.c:404
-msgid "Range"
-msgstr "範圍"
+#: ../data/pcsxr.ui.h:58
+msgid "Slot _2"
+msgstr "記錄 _2"
 
-#: ../win32/gui/CheatDlg.c:407
-msgid "Increased By"
-msgstr "增加數值"
+#: ../data/pcsxr.ui.h:59
+msgid "Slot _3"
+msgstr "記錄 _3"
 
-#: ../win32/gui/CheatDlg.c:408
-msgid "Decreased By"
-msgstr "減少數值"
+#: ../data/pcsxr.ui.h:60
+msgid "Slot _4"
+msgstr "記錄 _4"
 
-#: ../win32/gui/CheatDlg.c:409
-msgid "Increased"
-msgstr "增加"
+#: ../data/pcsxr.ui.h:61
+msgid "Slot _5"
+msgstr "記錄 _5"
 
-#: ../win32/gui/CheatDlg.c:410
-msgid "Decreased"
-msgstr "已減少"
+#: ../data/pcsxr.ui.h:62
+msgid "Slot _6"
+msgstr "記錄 _6"
 
-#: ../win32/gui/CheatDlg.c:411
-msgid "Different"
-msgstr "不同"
+#: ../data/pcsxr.ui.h:63
+msgid "Slot _7"
+msgstr "記錄 _7"
 
-#: ../win32/gui/CheatDlg.c:412
-msgid "No Change"
-msgstr "無改變"
+#: ../data/pcsxr.ui.h:64
+msgid "Slot _8"
+msgstr "記錄 _8"
 
-#: ../win32/gui/CheatDlg.c:448
-#: ../gui/Cheat.c:585
-msgid "Enter the values and start your search."
-msgstr "輸入數值並開始搜索。"
+#: ../data/pcsxr.ui.h:65
+msgid "Slot _9"
+msgstr "記錄 _9"
 
-#: ../win32/gui/CheatDlg.c:453
-msgid "No addresses found."
-msgstr "未找到位址。"
+#: ../data/pcsxr.ui.h:66
+msgid "_Other..."
+msgstr "其它(_O)..."
 
-#: ../win32/gui/CheatDlg.c:457
-#: ../gui/Cheat.c:543
-msgid "Too many addresses found."
-msgstr "找到過多位址。"
+#: ../data/pcsxr.ui.h:67
+msgid "_Load State"
+msgstr "讀取記錄(_L)"
 
-#: ../win32/gui/CheatDlg.c:466
-#: ../gui/Cheat.c:552
-#, c-format
-msgid "%.8X Current: %u (%.2X), Previous: %u (%.2X)"
-msgstr "%.8X 當前值: %u (%.2X), 前次值: %u (%.2X)"
+#: ../data/pcsxr.ui.h:68
+msgid "_Configuration"
+msgstr "設定(_C)"
 
-#: ../win32/gui/CheatDlg.c:471
-#: ../gui/Cheat.c:557
-#, c-format
-msgid "%.8X Current: %u (%.4X), Previous: %u (%.4X)"
-msgstr "%.8X 當前值: %u (%.4X), 前次值: %u (%.4X)"
+#: ../data/pcsxr.ui.h:69
+msgid "_Plugins & BIOS..."
+msgstr "外掛及 BIOS(_P)..."
 
-#: ../win32/gui/CheatDlg.c:476
-#: ../gui/Cheat.c:562
-#, c-format
-msgid "%.8X Current: %u (%.8X), Previous: %u (%.8X)"
-msgstr "%.8X 當前值: %u (%.8X), 前次值: %u (%.8X)"
+#: ../data/pcsxr.ui.h:70
+msgid "_Graphics..."
+msgstr "圖像(_G)..."
 
-#: ../win32/gui/CheatDlg.c:492
-#: ../gui/Cheat.c:577
-#, c-format
-msgid "Founded Addresses: %d"
-msgstr "找到位址: %d"
+#: ../data/pcsxr.ui.h:71
+msgid "_Sound..."
+msgstr "聲音(_S)..."
 
-#: ../win32/gui/CheatDlg.c:504
-#: ../data/pcsx.glade2:2930
-msgid "Freeze"
-msgstr "固定"
+#: ../data/pcsxr.ui.h:72
+msgid "CD-_ROM..."
+msgstr "CD-_ROM..."
 
-#: ../win32/gui/CheatDlg.c:505
-#: ../win32/gui/CheatDlg.c:596
-msgid "Address:"
-msgstr "位址:"
+#: ../data/pcsxr.ui.h:73
+msgid "C_ontrollers..."
+msgstr "控制器(_O)..."
 
-#: ../win32/gui/CheatDlg.c:506
-#: ../win32/gui/CheatDlg.c:597
-#: ../win32/gui/CheatDlg.c:682
-#: ../gui/Cheat.c:647
-#: ../data/pcsx.glade2:2773
-msgid "Value:"
-msgstr "值:"
+#: ../data/pcsxr.ui.h:74
+#, fuzzy
+msgid "_Link cable..."
+msgstr "開啟"
 
-#: ../win32/gui/CheatDlg.c:566
-#, c-format
-msgid "Freeze %.8X"
-msgstr "固定 %.8X"
+#: ../data/pcsxr.ui.h:75
+msgid "_Netplay..."
+msgstr "聯線遊戲(_N)..."
 
-#: ../win32/gui/CheatDlg.c:595
-#: ../data/pcsx.glade2:2966
-msgid "Modify"
-msgstr "更改"
+#: ../data/pcsxr.ui.h:76
+msgid "_CPU..."
+msgstr "_CPU..."
 
-#: ../win32/gui/CheatDlg.c:678
-#: ../gui/Cheat.c:1129
-#: ../data/pcsx.glade2:2703
-msgid "Cheat Search"
-msgstr "搜尋金手指碼"
+#: ../data/pcsxr.ui.h:77
+msgid "_Memory Cards..."
+msgstr "記憶卡(_M)..."
 
-#: ../win32/gui/CheatDlg.c:680
-#: ../data/pcsx.glade2:2751
-msgid "Search For:"
-msgstr "搜尋:"
+#: ../data/pcsxr.ui.h:78
+msgid "Chea_t"
+msgstr "金手指(_T)"
 
-#: ../win32/gui/CheatDlg.c:681
-#: ../data/pcsx.glade2:2761
-msgid "Data Type:"
-msgstr "數值類型:"
+#: ../data/pcsxr.ui.h:79
+msgid "_Browse..."
+msgstr "檢視(_B)..."
 
-#: ../win32/gui/CheatDlg.c:683
-#: ../data/pcsx.glade2:2785
-msgid "Data Base:"
-msgstr "數值基:"
+#: ../data/pcsxr.ui.h:80
+msgid "_Search..."
+msgstr "搜尋(_S)..."
 
-#: ../win32/gui/CheatDlg.c:684
-#: ../data/pcsx.glade2:2845
-msgid "To:"
-msgstr "至:"
+#: ../data/pcsxr.ui.h:81
+msgid "Memory _Dump"
+msgstr "記憶體轉儲(_D)"
 
-#: ../win32/gui/CheatDlg.c:685
-msgid "&Freeze"
-msgstr "固定(&F)"
+#: ../data/pcsxr.ui.h:82
+msgid "_Help"
+msgstr "說明(_H)"
 
-#: ../win32/gui/CheatDlg.c:686
-msgid "&Modify"
-msgstr "更改(&M)"
+#: ../data/pcsxr.ui.h:83
+msgid "_About PCSXR..."
+msgstr "關於 PCSXR(_A)..."
 
-#: ../win32/gui/CheatDlg.c:687
-msgid "&Copy"
-msgstr "複制(&C)"
+#: ../data/pcsxr.ui.h:84
+msgid "Run CD"
+msgstr "執行光碟"
 
-#: ../win32/gui/CheatDlg.c:688
-msgid "&Search"
-msgstr "搜尋(&S)"
+#: ../data/pcsxr.ui.h:85
+msgid "Run ISO Image"
+msgstr "執行 ISO 光碟映像"
 
-#: ../win32/gui/CheatDlg.c:689
-msgid "&New Search"
-msgstr "新搜尋(&N)"
+#: ../data/pcsxr.ui.h:86
+msgid "Continue Emulation"
+msgstr "繼續模擬"
 
-#: ../win32/gui/CheatDlg.c:690
-msgid "C&lose"
-msgstr "關閉(&L)"
+#: ../data/pcsxr.ui.h:87
+msgid "Switch ISO Image"
+msgstr "更換 ISO 光碟映像"
+
+#: ../data/pcsxr.ui.h:88
+msgid "Configure Memory Cards"
+msgstr "記憶卡設定"
+
+#: ../data/pcsxr.ui.h:89
+msgid "Configure Graphics"
+msgstr "圖像設定"
+
+#: ../data/pcsxr.ui.h:90 ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:1
+msgid "Configure Sound"
+msgstr "聲音設定"
+
+#: ../data/pcsxr.ui.h:91
+msgid "Configure CD-ROM"
+msgstr "CD-ROM 設定"
+
+#: ../data/pcsxr.ui.h:92
+msgid "Configure Controllers"
+msgstr "控制器設定"
+
+#: ../data/pcsxr.ui.h:93
+msgid "New"
+msgstr "新增"
+
+#: ../data/pcsxr.ui.h:94
+msgid "Format"
+msgstr "格式化"
+
+#: ../data/pcsxr.ui.h:95
+msgid "Un/Delete"
+msgstr "刪除/恢複"
+
+#: ../data/pcsxr.ui.h:96
+msgid "Memory Card 1"
+msgstr "記憶卡 1"
+
+#: ../data/pcsxr.ui.h:97
+msgid "Memory Card 2"
+msgstr "記憶卡 2"
+
+#: ../data/pcsxr.ui.h:98 ../gui/DebugMemory.c:119
+msgid "Memory Dump"
+msgstr "記憶體轉儲"
+
+#: ../data/pcsxr.ui.h:99 ../gui/DebugMemory.c:205
+msgid "Address (Hexadecimal):"
+msgstr "位址 (十六進制):"
+
+#: ../data/pcsxr.ui.h:100
+msgid "Raw Dump..."
+msgstr "Raw 轉儲..."
+
+#: ../data/pcsxr.ui.h:101
+msgid "Patch Memory..."
+msgstr "修改記憶體..."
+
+#: ../data/pcsxr.ui.h:102
+msgid "Configure NetPlay"
+msgstr "聯線遊戲設定"
+
+#: ../data/pcsxr.ui.h:103
+msgid "NetPlay"
+msgstr "聯線遊戲"
+
+#: ../data/pcsxr.ui.h:104
+#, fuzzy
+msgid "NTSC"
+msgstr ""
+"NTSC\n"
+"PAL"
+
+#: ../data/pcsxr.ui.h:105
+msgid "PAL"
+msgstr ""
 
-#: ../win32/gui/CheatDlg.c:692
+#: ../data/pcsxr.ui.h:106 ../win32/gui/CheatDlg.c:692
 msgid "8-bit"
 msgstr "8 位元"
 
-#: ../win32/gui/CheatDlg.c:693
+#: ../data/pcsxr.ui.h:107 ../win32/gui/CheatDlg.c:693
 msgid "16-bit"
 msgstr "16 位元"
 
-#: ../win32/gui/CheatDlg.c:694
+#: ../data/pcsxr.ui.h:108 ../win32/gui/CheatDlg.c:694
 msgid "32-bit"
 msgstr "32 位元"
 
-#: ../win32/gui/CheatDlg.c:695
-msgid "Decimal"
-msgstr "十進制"
+#: ../data/pcsxr.ui.h:109 ../win32/gui/CheatDlg.c:402
+msgid "Equal Value"
+msgstr "等于數值"
 
-#: ../win32/gui/CheatDlg.c:696
-msgid "Hexadecimal"
-msgstr "十六進制"
+#: ../data/pcsxr.ui.h:110 ../win32/gui/CheatDlg.c:403
+msgid "Not Equal Value"
+msgstr "不等于數值"
 
-#: ../win32/gui/ConfigurePlugins.c:219
-msgid "Simulate Psx Bios"
-msgstr "模擬 PS BIOS"
+#: ../data/pcsxr.ui.h:111 ../win32/gui/CheatDlg.c:404
+msgid "Range"
+msgstr "範圍"
 
-#: ../win32/gui/ConfigurePlugins.c:305
-msgid "Configuration not OK!"
-msgstr "設定不正確!"
+#: ../data/pcsxr.ui.h:112 ../win32/gui/CheatDlg.c:407
+msgid "Increased By"
+msgstr "增加數值"
 
-#: ../win32/gui/ConfigurePlugins.c:305
-#: ../gui/Cheat.c:155
-#: ../gui/Cheat.c:251
-#: ../gui/LnxMain.c:418
-msgid "Error"
-msgstr "錯誤"
+#: ../data/pcsxr.ui.h:113 ../win32/gui/CheatDlg.c:408
+msgid "Decreased By"
+msgstr "減少數值"
 
-#: ../win32/gui/ConfigurePlugins.c:406
-msgid "This plugin reports that should work correctly"
-msgstr "此外掛報告其可正常工作。"
+#: ../data/pcsxr.ui.h:114 ../win32/gui/CheatDlg.c:409
+msgid "Increased"
+msgstr "增加"
 
-#: ../win32/gui/ConfigurePlugins.c:407
-msgid "This plugin reports that should not work correctly"
-msgstr "此外掛報告其不可正常工作。"
+#: ../data/pcsxr.ui.h:115 ../win32/gui/CheatDlg.c:410
+msgid "Decreased"
+msgstr "已減少"
 
-#: ../win32/gui/ConfigurePlugins.c:463
-msgid "Select Plugins Directory"
-msgstr "選擇外掛目錄"
+#: ../data/pcsxr.ui.h:116 ../win32/gui/CheatDlg.c:411
+msgid "Different"
+msgstr "不同"
 
-#: ../win32/gui/ConfigurePlugins.c:472
-msgid "Select Bios Directory"
-msgstr "選擇 BIOS 目錄"
+#: ../data/pcsxr.ui.h:117 ../win32/gui/CheatDlg.c:412
+msgid "No Change"
+msgstr "無改變"
+
+#: ../data/pcsxr.ui.h:118 ../win32/gui/CheatDlg.c:695
+msgid "Decimal"
+msgstr "十進制"
+
+#: ../data/pcsxr.ui.h:119 ../win32/gui/CheatDlg.c:696
+msgid "Hexadecimal"
+msgstr "十六進制"
+
+#: ../gui/AboutDlg.c:71
+msgid ""
+"(C) 1999-2003 PCSX Team\n"
+"(C) 2005-2009 PCSX-df Team\n"
+"(C) 2009-2011 PCSX-Reloaded Team"
+msgstr ""
+"(C) 1999-2003 PCSX 開發組\n"
+"(C) 2005-2009 PCSX-df 開發組\n"
+"(C) 2009-2010 PCSX-Reloaded 開發組 "
 
-#: ../win32/gui/ConfigurePlugins.c:481
-msgid "Configuration"
-msgstr "設定"
+#: ../gui/AboutDlg.c:76
+msgid ""
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+msgstr ""
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 
-#: ../win32/gui/ConfigurePlugins.c:485
-msgid "Graphics"
-msgstr "圖像"
+#: ../gui/AboutDlg.c:100
+msgid "translator-credits"
+msgstr "Wei Mingzhi <whistler@openoffice.org>"
 
-#: ../win32/gui/ConfigurePlugins.c:486
-msgid "First Controller"
-msgstr "主控制器"
+#: ../gui/AboutDlg.c:101
+msgid "A PlayStation emulator."
+msgstr "一個 PlayStation 模擬器。"
 
-#: ../win32/gui/ConfigurePlugins.c:487
-msgid "Second Controller"
-msgstr "輔控制器"
+#: ../gui/Cheat.c:101 ../win32/gui/CheatDlg.c:116
+msgid "Add New Cheat"
+msgstr "添加新金手指"
 
-#: ../win32/gui/ConfigurePlugins.c:488
-msgid "Sound"
-msgstr "聲音"
+#: ../gui/Cheat.c:109 ../gui/Cheat.c:192
+msgid "Cheat Description:"
+msgstr "金手指描述:"
 
-#: ../win32/gui/ConfigurePlugins.c:489
-msgid "Cdrom"
-msgstr "CD-ROM"
+#: ../gui/Cheat.c:117 ../gui/Cheat.c:201 ../win32/gui/CheatDlg.c:68
+#: ../win32/gui/CheatDlg.c:118
+msgid "Cheat Code:"
+msgstr "金手指碼:"
 
-#: ../win32/gui/ConfigurePlugins.c:490
-msgid "Bios"
-msgstr "BIOS"
+#: ../gui/Cheat.c:147 ../gui/Cheat.c:241 ../gui/LnxMain.c:425
+#: ../win32/gui/ConfigurePlugins.c:330
+msgid "Error"
+msgstr "錯誤"
 
-#: ../win32/gui/ConfigurePlugins.c:491
-msgid "Set Bios Directory"
-msgstr "設定 BIOS 目錄"
+#: ../gui/Cheat.c:147 ../gui/Cheat.c:241 ../win32/gui/CheatDlg.c:91
+#: ../win32/gui/CheatDlg.c:132
+msgid "Invalid cheat code!"
+msgstr "非法金手指碼!"
 
-#: ../win32/gui/ConfigurePlugins.c:492
-msgid "Set Plugins Directory"
-msgstr "設定外掛目錄"
+#: ../gui/Cheat.c:184 ../win32/gui/CheatDlg.c:66
+msgid "Edit Cheat"
+msgstr "編輯金手指"
 
-#: ../win32/gui/ConfigurePlugins.c:493
-#: ../win32/gui/ConfigurePlugins.c:496
-#: ../win32/gui/ConfigurePlugins.c:499
-#: ../win32/gui/ConfigurePlugins.c:502
-#: ../win32/gui/ConfigurePlugins.c:505
-#: ../win32/gui/ConfigurePlugins.c:617
-msgid "Configure..."
-msgstr "設定..."
+#: ../gui/Cheat.c:307
+msgid "Open Cheat File"
+msgstr "打開金手指檔"
 
-#: ../win32/gui/ConfigurePlugins.c:494
-#: ../win32/gui/ConfigurePlugins.c:497
-#: ../win32/gui/ConfigurePlugins.c:500
-#: ../win32/gui/ConfigurePlugins.c:503
-#: ../win32/gui/ConfigurePlugins.c:506
-#: ../win32/gui/ConfigurePlugins.c:618
-msgid "Test..."
-msgstr "測試..."
+#: ../gui/Cheat.c:317 ../gui/Cheat.c:357
+msgid "PCSXR Cheat Code Files (*.cht)"
+msgstr "PCSXR 金手指檔 (*.cht)"
 
-#: ../win32/gui/ConfigurePlugins.c:495
-#: ../win32/gui/ConfigurePlugins.c:498
-#: ../win32/gui/ConfigurePlugins.c:501
-#: ../win32/gui/ConfigurePlugins.c:504
-#: ../win32/gui/ConfigurePlugins.c:507
-#: ../win32/gui/ConfigurePlugins.c:619
-msgid "About..."
-msgstr "關於..."
+#: ../gui/Cheat.c:322 ../gui/GtkGui.c:491 ../gui/GtkGui.c:643
+#: ../win32/gui/WndMain.c:1483 ../win32/gui/WndMain.c:1564
+msgid "All Files"
+msgstr "所有檔案"
 
-#: ../win32/gui/ConfigurePlugins.c:612
-msgid "NetPlay Configuration"
-msgstr "聯線遊戲設定"
+#: ../gui/Cheat.c:347
+msgid "Save Cheat File"
+msgstr "儲存金手指檔"
 
-#: ../win32/gui/ConfigurePlugins.c:616
-#: ../plugins/dfnet/gui.c:31
-#: ../plugins/dfnet/gui.c:112
-msgid "NetPlay"
-msgstr "聯線遊戲"
+#: ../gui/Cheat.c:362
+msgid "All Files (*.*)"
+msgstr "所有檔案 (*.*)"
 
-#: ../win32/gui/ConfigurePlugins.c:620
-msgid "Note: The NetPlay Plugin Directory should be the same as the other Plugins."
-msgstr "注意: 聯線遊戲外掛應和其它外掛放在同一資料夾中。"
+#: ../gui/Cheat.c:401
+msgid "Cheat Codes"
+msgstr "金手指碼"
 
-#: ../win32/gui/plugin.c:90
-#: ../win32/gui/WndMain.c:281
-#, c-format
-msgid "*PCSX*: Saved State %d"
-msgstr "*PCSX*: Saved State %d"
+#: ../gui/Cheat.c:408
+msgid "Enable"
+msgstr "開啟"
 
-#: ../win32/gui/plugin.c:91
-#: ../win32/gui/WndMain.c:282
-#, c-format
-msgid "*PCSX*: Error Saving State %d"
-msgstr "*PCSX*: Error Saving State %d"
+#: ../gui/Cheat.c:416 ../win32/gui/CheatDlg.c:185
+msgid "Description"
+msgstr "描述"
 
-#: ../win32/gui/plugin.c:107
-#: ../win32/gui/WndMain.c:259
-#, c-format
-msgid "*PCSX*: Loaded State %d"
-msgstr "*PCSX*: Loaded State %d"
+#: ../gui/Cheat.c:544 ../win32/gui/CheatDlg.c:457
+msgid "Too many addresses found."
+msgstr "找到過多位址。"
 
-#: ../win32/gui/plugin.c:108
-#: ../win32/gui/WndMain.c:260
+#: ../gui/Cheat.c:553 ../win32/gui/CheatDlg.c:466
 #, c-format
-msgid "*PCSX*: Error Loading State %d"
-msgstr "*PCSX*: Error Loading State %d"
+msgid "%.8X Current: %u (%.2X), Previous: %u (%.2X)"
+msgstr "%.8X 當前值: %u (%.2X), 前次值: %u (%.2X)"
 
-#: ../win32/gui/plugin.c:119
+#: ../gui/Cheat.c:558 ../win32/gui/CheatDlg.c:471
 #, c-format
-msgid "*PCSX*: Sio Irq Always Enabled"
-msgstr "*PCSX*: Sio Irq Always Enabled"
+msgid "%.8X Current: %u (%.4X), Previous: %u (%.4X)"
+msgstr "%.8X 當前值: %u (%.4X), 前次值: %u (%.4X)"
 
-#: ../win32/gui/plugin.c:120
+#: ../gui/Cheat.c:563 ../win32/gui/CheatDlg.c:476
 #, c-format
-msgid "*PCSX*: Sio Irq Not Always Enabled"
-msgstr "*PCSX*: Sio Irq Not Always Enabled"
+msgid "%.8X Current: %u (%.8X), Previous: %u (%.8X)"
+msgstr "%.8X 當前值: %u (%.8X), 前次值: %u (%.8X)"
 
-#: ../win32/gui/plugin.c:127
+#: ../gui/Cheat.c:578 ../win32/gui/CheatDlg.c:492
 #, c-format
-msgid "*PCSX*: Black&White Mdecs Only Enabled"
-msgstr "*PCSX*: Black&White Mdecs Only Enabled"
+msgid "Founded Addresses: %d"
+msgstr "找到位址: %d"
 
-#: ../win32/gui/plugin.c:128
-#, c-format
-msgid "*PCSX*: Black&White Mdecs Only Disabled"
-msgstr "*PCSX*: Black&White Mdecs Only Disabled"
+#: ../gui/Cheat.c:586 ../win32/gui/CheatDlg.c:448
+msgid "Enter the values and start your search."
+msgstr "輸入數值並開始搜索。"
 
-#: ../win32/gui/plugin.c:135
-#, c-format
-msgid "*PCSX*: Xa Enabled"
-msgstr "*PCSX*: Xa Enabled"
+#: ../gui/Cheat.c:628
+msgid "Freeze value"
+msgstr "固定數值"
 
-#: ../win32/gui/plugin.c:136
-#, c-format
-msgid "*PCSX*: Xa Disabled"
-msgstr "*PCSX*: Xa Disabled"
+#: ../gui/Cheat.c:634 ../win32/gui/CheatDlg.c:67 ../win32/gui/CheatDlg.c:117
+msgid "Description:"
+msgstr "描述:"
 
-#: ../win32/gui/plugin.c:145
-msgid "*PCSX*: CdRom Case Opened"
-msgstr "*PCSX*: CdRom Case Opened"
+#: ../gui/Cheat.c:727
+msgid "Modify value"
+msgstr "更改數值"
 
-#: ../win32/gui/plugin.c:150
-msgid "*PCSX*: CdRom Case Closed"
-msgstr "*PCSX*: CdRom Case Closed"
+#: ../gui/Cheat.c:735
+msgid "New value:"
+msgstr "新值:"
 
-#: ../win32/gui/plugin.c:177
-msgid "Connecting..."
-msgstr "正在連接..."
+#: ../gui/Cheat.c:1119
+msgid "Search Results"
+msgstr "搜尋結果"
 
-#: ../win32/gui/plugin.c:179
-#: ../win32/gui/plugin.c:186
-#, c-format
-msgid "Please wait while connecting... %c\n"
-msgstr "請稍候，正在連接... %c\n"
+#. TODO Check whether configuration is required when we choose the plugin, and set the state of the
+#. button appropriately. New gtk tooltip API should allow us to put a tooltip explanation for
+#. disabled widgets
+#. TODO If combo screen hasn't been opened and the user chooses the menu config option, confs.Combo will be null and cause a segfault
+#. printf("Configuring plugin %s\n", filename);
+#: ../gui/ConfDlg.c:256 ../gui/ConfDlg.c:277 ../gui/ConfDlg.c:298
+#: ../gui/ConfDlg.c:319 ../gui/ConfDlg.c:340 ../gui/ConfDlg.c:399
+msgid "No configuration required"
+msgstr "不需要設定"
 
-#: ../win32/gui/plugin.c:214
-msgid "Error Opening CDR Plugin"
-msgstr "無法開啟 CDR 外掛"
+#: ../gui/ConfDlg.c:256 ../gui/ConfDlg.c:277 ../gui/ConfDlg.c:298
+#: ../gui/ConfDlg.c:319 ../gui/ConfDlg.c:340 ../gui/ConfDlg.c:399
+msgid "This plugin doesn't need to be configured."
+msgstr "此外掛不需要被設定。"
 
-#: ../win32/gui/plugin.c:277
-#, c-format
-msgid "Error Opening GPU Plugin (%d)"
-msgstr "無法開啟 GPU 外掛 (%d)"
+#: ../gui/ConfDlg.c:402
+msgid "Please select a plugin."
+msgstr ""
 
-#: ../win32/gui/plugin.c:279
+#: ../gui/ConfDlg.c:647
 #, c-format
-msgid "Error Opening SPU Plugin (%d)"
-msgstr "無法開啟 SPU 外掛 (%d)"
+msgid "Could not open BIOS directory: '%s'\n"
+msgstr "無法開啟 BIOS 目錄: \"%s\"\n"
 
-#: ../win32/gui/plugin.c:282
+#: ../gui/ConfDlg.c:698 ../gui/ConfDlg.c:801 ../gui/LnxMain.c:168
 #, c-format
-msgid "Error Opening PAD1 Plugin (%d)"
-msgstr "無法開啟 PAD1 外掛 (%d)"
+msgid "Could not open directory: '%s'\n"
+msgstr "無法開啟目錄: \"%s\"\n"
 
-#: ../win32/gui/plugin.c:284
-#, c-format
-msgid "Error Opening PAD2 Plugin (%d)"
-msgstr "無法開啟 PAD2 外掛 (%d)"
+#. The BIOS list always contains the PCSXR internal BIOS
+#: ../gui/ConfDlg.c:769
+msgid "Simulate PSX BIOS"
+msgstr "模擬 PS BIOS"
 
-#: ../win32/gui/plugin.c:314
-msgid "Error Closing CDR Plugin"
-msgstr "無法關閉 CD-ROM 外掛 (%d)"
+#: ../gui/DebugMemory.c:127
+msgid "Start Address (Hexadecimal):"
+msgstr "起始位址 (十六進制):"
 
-#: ../win32/gui/plugin.c:316
-msgid "Error Closing GPU Plugin"
-msgstr "無法關閉 GPU 外掛"
+#: ../gui/DebugMemory.c:138
+msgid "Length (Decimal):"
+msgstr "長度 (十進制):"
 
-#: ../win32/gui/plugin.c:318
-msgid "Error Closing SPU Plugin"
-msgstr "無法關閉 SPU 外掛"
+#: ../gui/DebugMemory.c:164
+msgid "Dump to File"
+msgstr "轉儲至檔案"
 
-#: ../win32/gui/plugin.c:336
+#: ../gui/DebugMemory.c:179
 #, c-format
-msgid "CDRinit error: %d"
-msgstr "CDRinit 錯誤: %d"
+msgid "Error writing to %s!"
+msgstr "存儲至 %s 時出錯!"
 
-#: ../win32/gui/plugin.c:338
-#, c-format
-msgid "GPUinit error: %d"
-msgstr "GPUinit 錯誤: %d"
+#: ../gui/DebugMemory.c:197
+msgid "Memory Patch"
+msgstr "記憶體修改"
 
-#: ../win32/gui/plugin.c:340
-#, c-format
-msgid "SPUinit error: %d"
-msgstr "SPUinit 錯誤: %d"
+#: ../gui/DebugMemory.c:216
+msgid "Value (Hexa string):"
+msgstr "數值 (十六進制串):"
 
-#: ../win32/gui/plugin.c:342
-#, c-format
-msgid "PAD1init error: %d"
-msgstr "PAD1init 錯誤: %d"
+#: ../gui/DebugMemory.c:283
+msgid "Memory Viewer"
+msgstr "記憶體檢視"
 
-#: ../win32/gui/plugin.c:344
-#, c-format
-msgid "PAD2init error: %d"
-msgstr "PAD2init 錯誤: %d"
+#: ../gui/DebugMemory.c:289
+msgid "Address"
+msgstr "位址"
 
-#: ../win32/gui/plugin.c:347
-#, c-format
-msgid "NETinit error: %d"
-msgstr "NETinit 錯誤: %d"
+#: ../gui/DebugMemory.c:307
+msgid "Text"
+msgstr "文字"
 
-#: ../win32/gui/WndMain.c:76
-msgid "Arabic"
-msgstr "阿拉伯語"
+#: ../gui/GtkGui.c:146
+msgid "Ready"
+msgstr "就緒"
 
-#: ../win32/gui/WndMain.c:77
-msgid "Catalan"
-msgstr "加泰隆尼亞語"
+#: ../gui/GtkGui.c:191
+msgid "Emulation Paused."
+msgstr "模擬器已暫停。"
 
-#: ../win32/gui/WndMain.c:78
-msgid "German"
-msgstr "德語"
+#: ../gui/GtkGui.c:474
+msgid "Select PSX EXE File"
+msgstr "選擇 PS EXE 檔案"
 
-#: ../win32/gui/WndMain.c:79
-msgid "Greek"
-msgstr "希臘語"
+#: ../gui/GtkGui.c:487
+msgid "PlayStation Executable Files"
+msgstr "PlayStation 執行檔"
 
-#: ../win32/gui/WndMain.c:80
-#: ../win32/gui/WndMain.c:1566
-#: ../win32/gui/WndMain.c:1568
-msgid "English"
-msgstr "英語"
+#: ../gui/GtkGui.c:524
+msgid "Not a valid PSX file"
+msgstr "不是一個合法的 PSX 檔"
 
-#: ../win32/gui/WndMain.c:81
-msgid "Spanish"
-msgstr "西班牙語"
+#: ../gui/GtkGui.c:524
+msgid "The file does not appear to be a valid Playstation executable"
+msgstr "此文件不是一個合法的 PlayStation 執行檔"
 
-#: ../win32/gui/WndMain.c:82
-msgid "French"
-msgstr "法語"
+#: ../gui/GtkGui.c:553 ../gui/GtkGui.c:725
+msgid "CD ROM failed"
+msgstr "CD-ROM 失敗"
 
-#: ../win32/gui/WndMain.c:83
-msgid "Italian"
-msgstr "義大利語"
+#: ../gui/GtkGui.c:553 ../gui/GtkGui.c:725 ../win32/gui/WndMain.c:472
+#: ../win32/gui/WndMain.c:526 ../win32/gui/WndMain.c:596
+#, c-format
+msgid "The CD does not appear to be a valid Playstation CD"
+msgstr "此光碟不是一張合法的 PlayStation 光碟。"
 
-#: ../win32/gui/WndMain.c:84
-msgid "Portuguese"
-msgstr "葡萄牙語"
+#: ../gui/GtkGui.c:564 ../gui/GtkGui.c:736 ../win32/gui/WndMain.c:482
+#: ../win32/gui/WndMain.c:536 ../win32/gui/WndMain.c:606
+#, c-format
+msgid "Could not load CD-ROM!"
+msgstr "無法加載光碟!"
 
-#: ../win32/gui/WndMain.c:85
-msgid "Portuguese (Brazilian)"
-msgstr "葡萄牙語 (巴西)"
+#: ../gui/GtkGui.c:564 ../gui/GtkGui.c:736
+msgid "The CD-ROM could not be loaded"
+msgstr "無法加載 CD-ROM"
 
-#: ../win32/gui/WndMain.c:86
-msgid "Romanian"
-msgstr "羅馬尼亞語"
+#: ../gui/GtkGui.c:578
+msgid "Could not run BIOS"
+msgstr "無法執行 BIOS"
 
-#: ../win32/gui/WndMain.c:87
-msgid "Russian"
-msgstr "俄語"
+#: ../gui/GtkGui.c:578
+msgid "Running BIOS is not supported with Internal HLE BIOS."
+msgstr "內部 HLE BIOS 不支援直接執行。"
 
-#: ../win32/gui/WndMain.c:88
-msgid "Simplified Chinese"
-msgstr "簡體中文"
+#: ../gui/GtkGui.c:608
+msgid "Open PSX Disc Image File"
+msgstr "打開 PS 光碟映像檔"
 
-#: ../win32/gui/WndMain.c:89
-msgid "Traditional Chinese"
-msgstr "正體中文"
+#: ../gui/GtkGui.c:638
+#, fuzzy
+msgid "PSX Image Files (*.bin, *.img, *.mdf, *.iso, *.cue, *.pbp, *.cbn)"
+msgstr "PS 鏡像檔 (*.bin, *.img, *.mdf, *.iso)"
 
-#: ../win32/gui/WndMain.c:90
-msgid "Japanese"
-msgstr "日語"
+#: ../gui/GtkGui.c:894
+#, c-format
+msgid "Loaded state %s."
+msgstr "已讀取記錄 %s。"
 
-#: ../win32/gui/WndMain.c:91
-msgid "Korean"
-msgstr "韓國語"
+#: ../gui/GtkGui.c:897
+#, c-format
+msgid "Error loading state %s!"
+msgstr "讀取記錄 %s 時出錯。"
+
+#: ../gui/GtkGui.c:908
+#, c-format
+msgid "Saved state %s."
+msgstr "已存儲記錄 %s"
+
+#: ../gui/GtkGui.c:910
+#, c-format
+msgid "Error saving state %s!"
+msgstr "存儲記錄 %s 時出錯。"
 
-#: ../win32/gui/WndMain.c:300
-#: ../win32/gui/WndMain.c:352
-msgid "PCSX State Format"
-msgstr "PCSX 記錄格式"
+#: ../gui/GtkGui.c:945 ../gui/GtkGui.c:973
+msgid "Select State File"
+msgstr "選擇記錄檔案"
 
-#: ../win32/gui/WndMain.c:327
-#, c-format
-msgid "*PCSX*: Loaded State %s"
-msgstr "*PCSX*: Loaded State %s"
+#: ../gui/GtkGui.c:1016
+msgid "Notice"
+msgstr "警告"
 
-#: ../win32/gui/WndMain.c:328
+#: ../gui/LnxMain.c:62
 #, c-format
-msgid "*PCSX*: Error Loading State %s"
-msgstr "*PCSX*: Error Loading State %s"
+msgid "Creating memory card: %s\n"
+msgstr "創建記憶卡: %s\n"
 
-#: ../win32/gui/WndMain.c:379
-#, c-format
-msgid "*PCSX*: Saved State %s"
-msgstr "*PCSX*: Saved State %s"
+#: ../gui/LnxMain.c:329
+msgid ""
+" pcsxr [options] [file]\n"
+"\toptions:\n"
+"\t-runcd\t\tRuns CD-ROM\n"
+"\t-cdfile FILE\tRuns a CD image file\n"
+"\t-nogui\t\tDon't open the GTK GUI\n"
+"\t-cfg FILE\tLoads desired configuration file (default: ~/.pcsxr/pcsxr.cfg)\n"
+"\t-psxout\t\tEnable PSX output\n"
+"\t-slowboot\tEnable BIOS Logo\n"
+"\t-load STATENUM\tLoads savestate STATENUM (1-9)\n"
+"\t-h -help\tDisplay this message\n"
+"\tfile\t\tLoads file\n"
+msgstr ""
 
-#: ../win32/gui/WndMain.c:380
+#: ../gui/LnxMain.c:366
 #, c-format
-msgid "*PCSX*: Error Saving State %s"
-msgstr "*PCSX*: Error Saving State %s"
+msgid ""
+"PCSXR cannot be configured without using the GUI -- you should restart "
+"without -nogui.\n"
+msgstr "PCSXR 不能在字符界面下設定 -- 請不使用 -nogui 參數重新啟動程式\n"
 
-#: ../win32/gui/WndMain.c:429
-#: ../win32/gui/WndMain.c:478
-#: ../gui/Gtk2Gui.c:485
-#: ../gui/Gtk2Gui.c:610
-msgid "The CD does not appear to be a valid Playstation CD"
-msgstr "此光碟不是一張合法的 PlayStation 光碟。"
+#: ../gui/LnxMain.c:425
+msgid "Failed loading plugins!"
+msgstr "外掛加載失敗"
 
-#: ../win32/gui/WndMain.c:435
-#: ../win32/gui/WndMain.c:484
-#: ../gui/Gtk2Gui.c:493
-#: ../gui/Gtk2Gui.c:618
-msgid "Could not load CD-ROM!"
-msgstr "無法加載光碟!"
+#: ../gui/LnxMain.c:444
+#, c-format
+msgid "Could not load CD-ROM!\n"
+msgstr "無法加載光碟。\n"
 
-#: ../win32/gui/WndMain.c:445
-msgid "Running BIOS is not supported with Internal HLE Bios."
-msgstr "內部 HLE BIOS 不支援直接執行。"
+#: ../gui/LnxMain.c:485
+#, c-format
+msgid "PSX emulator couldn't be initialized.\n"
+msgstr "PS 模擬器無法初期化。\n"
+
+#: ../gui/MemcardDlg.c:56
+msgid "Icon"
+msgstr "圖符"
 
-#: ../win32/gui/WndMain.c:664
-#: ../gui/MemcardDlg.c:62
+#: ../gui/MemcardDlg.c:62 ../win32/gui/WndMain.c:778
 msgid "Title"
 msgstr "標題"
 
-#: ../win32/gui/WndMain.c:670
-#: ../gui/MemcardDlg.c:68
+#: ../gui/MemcardDlg.c:68 ../win32/gui/WndMain.c:784
 msgid "Status"
 msgstr "狀態"
 
-#: ../win32/gui/WndMain.c:676
-msgid "Game ID"
-msgstr "遊戲 ID"
-
-#: ../win32/gui/WndMain.c:682
-msgid "Game"
-msgstr "遊戲"
-
-#: ../win32/gui/WndMain.c:864
-msgid "mid link block"
-msgstr "mid link block"
+#: ../gui/MemcardDlg.c:74
+msgid "ID"
+msgstr "ID"
 
-#: ../win32/gui/WndMain.c:867
-msgid "terminiting link block"
-msgstr "terminiting link block"
+#: ../gui/MemcardDlg.c:80
+msgid "Name"
+msgstr "名稱"
 
-#: ../win32/gui/WndMain.c:875
-#: ../gui/MemcardDlg.c:155
-#: ../gui/MemcardDlg.c:260
+#: ../gui/MemcardDlg.c:118 ../win32/gui/WndMain.c:989
 msgid "Deleted"
 msgstr "已刪除"
 
-#: ../win32/gui/WndMain.c:876
-#: ../win32/gui/WndMain.c:879
-#: ../gui/MemcardDlg.c:157
-#: ../gui/MemcardDlg.c:161
-#: ../gui/MemcardDlg.c:262
-#: ../gui/MemcardDlg.c:266
+#: ../gui/MemcardDlg.c:120 ../gui/MemcardDlg.c:129 ../win32/gui/WndMain.c:990
+#: ../win32/gui/WndMain.c:993
 msgid "Free"
 msgstr "空閑"
 
-#: ../win32/gui/WndMain.c:878
-#: ../gui/MemcardDlg.c:159
-#: ../gui/MemcardDlg.c:264
+#: ../gui/MemcardDlg.c:123 ../win32/gui/WndMain.c:992
 msgid "Used"
 msgstr "已使用"
 
-#: ../win32/gui/WndMain.c:972
-msgid "Memcard Manager"
-msgstr "記憶卡管理器"
+#: ../gui/MemcardDlg.c:125
+msgid "Link"
+msgstr ""
 
-#: ../win32/gui/WndMain.c:976
-#: ../win32/gui/WndMain.c:979
-msgid "Select Mcd"
-msgstr "選擇"
+#: ../gui/MemcardDlg.c:127
+msgid "End link"
+msgstr ""
 
-#: ../win32/gui/WndMain.c:977
-#: ../win32/gui/WndMain.c:980
-msgid "Format Mcd"
-msgstr "格式化"
+#. Ask for name of memory card
+#: ../gui/MemcardDlg.c:305
+msgid "Select A File"
+msgstr "選擇檔案"
 
-#: ../win32/gui/WndMain.c:978
-#: ../win32/gui/WndMain.c:981
-msgid "Reload Mcd"
-msgstr "重新加載"
+#: ../gui/MemcardDlg.c:345
+msgid "Format this Memory Card?"
+msgstr "格式化此記憶卡?"
 
-#: ../win32/gui/WndMain.c:982
-msgid "-> Copy ->"
-msgstr "-> 複制 ->"
+#: ../gui/MemcardDlg.c:347
+msgid ""
+"If you format the memory card, the card will be empty, and any existing data "
+"overwritten."
+msgstr "如果您選擇格式化記憶卡，記憶卡將被清空，並且任何現有資料都將被覆蓋。"
 
-#: ../win32/gui/WndMain.c:983
-msgid "<- Copy <-"
-msgstr "<- 複制 <-"
+#: ../gui/MemcardDlg.c:350
+msgid "Format card"
+msgstr "格式化記憶卡"
 
-#: ../win32/gui/WndMain.c:984
-msgid "Paste"
-msgstr "粘貼"
+#. Ask for name of new memory card
+#: ../gui/MemcardDlg.c:372
+msgid "Create a new Memory Card"
+msgstr "新增記憶卡"
 
-#: ../win32/gui/WndMain.c:985
-msgid "<- Un/Delete"
-msgstr "<- 刪除/恢複"
+#: ../gui/MemcardDlg.c:381
+msgid "New Memory Card.mcd"
+msgstr "新記憶卡檔.mcd"
 
-#: ../win32/gui/WndMain.c:986
-msgid "Un/Delete ->"
-msgstr "刪除/恢複 ->"
+#. No free slots available on the destination card
+#: ../gui/MemcardDlg.c:511
+msgid "No free space on memory card"
+msgstr "記憶卡無空餘位置"
 
-#: ../win32/gui/WndMain.c:988
-msgid "Memory Card 1"
-msgstr "記憶卡 1"
+#: ../gui/MemcardDlg.c:512
+msgid ""
+"There are no free slots available on the target memory card. Please delete a "
+"slot first."
+msgstr "目的記憶卡無空餘位置。請先刪除一個檔案。"
 
-#: ../win32/gui/WndMain.c:989
-msgid "Memory Card 2"
-msgstr "記憶卡 2"
+#: ../gui/MemcardDlg.c:671
+msgid "Memory Card Manager"
+msgstr "記憶卡管理器"
 
-#: ../win32/gui/WndMain.c:1044
-msgid "Are you sure you want to paste this selection?"
-msgstr "是否確認粘貼此選中內容?"
+#: ../gui/Plugin.c:240
+#, c-format
+msgid "SIO IRQ Not Always Enabled"
+msgstr "SIO IRQ 不總是開啟"
 
-#: ../win32/gui/WndMain.c:1044
-#: ../win32/gui/WndMain.c:1155
-#: ../win32/gui/WndMain.c:1162
-msgid "Confirmation"
-msgstr "確認"
+#: ../gui/Plugin.c:246
+#, c-format
+msgid "Black & White Mdecs Only Enabled"
+msgstr "Black & White Mdecs Only 開啟"
 
-#: ../win32/gui/WndMain.c:1155
-#: ../win32/gui/WndMain.c:1162
-msgid "Are you sure you want to format this Memory Card?"
-msgstr "是否確認格式化此記憶卡?"
+#: ../gui/Plugin.c:247
+#, c-format
+msgid "Black & White Mdecs Only Disabled"
+msgstr "Black & White Mdecs Only 禁用"
 
-#: ../win32/gui/WndMain.c:1208
-msgid "Cpu Config"
-msgstr "CPU 設定"
+#: ../gui/Plugin.c:253
+#, c-format
+msgid "XA Enabled"
+msgstr "XA 已開啟"
 
-#: ../win32/gui/WndMain.c:1213
-msgid "Disable Xa Decoding"
-msgstr "禁用 XA 解碼"
+#: ../gui/Plugin.c:254
+#, c-format
+msgid "XA Disabled"
+msgstr "XA 已禁用"
 
-#: ../win32/gui/WndMain.c:1214
-msgid "Sio Irq Always Enabled"
-msgstr "SIO IRQ 總是開啟"
+#: ../gui/Plugin.c:326
+msgid "Error opening CD-ROM plugin!"
+msgstr "無法開啟 CD-ROM 外掛!"
 
-#: ../win32/gui/WndMain.c:1215
-msgid "Black && White Movies"
-msgstr "黑白電影"
+#: ../gui/Plugin.c:328
+msgid "Error opening SPU plugin!"
+msgstr "無法開啟 SPU 外掛!"
 
-#: ../win32/gui/WndMain.c:1216
-msgid "Disable Cd audio"
-msgstr "禁用 CD 音頻"
+#: ../gui/Plugin.c:331
+msgid "Error opening GPU plugin!"
+msgstr "無法開啟 GPU 外掛!"
 
-#: ../win32/gui/WndMain.c:1217
-#: ../data/pcsx.glade2:1595
-msgid "Autodetect"
-msgstr "自動檢測"
+#: ../gui/Plugin.c:333
+msgid "Error opening Controller 1 plugin!"
+msgstr "無法開啟 \"控制器 1\" 外掛!"
 
-#: ../win32/gui/WndMain.c:1218
-msgid "Enable Interpreter Cpu"
-msgstr "開啟解釋執行 CPU"
+#: ../gui/Plugin.c:337
+msgid "Error opening Controller 2 plugin!"
+msgstr "無法開啟 \"控制器 2\" 外掛!"
 
-#: ../win32/gui/WndMain.c:1219
-#: ../data/pcsx.glade2:1451
-msgid "Enable Console Output"
-msgstr "開啟控制台輸出"
+#: ../gui/Plugin.c:342
+#, fuzzy
+msgid "Error opening SIO1 plugin!"
+msgstr "無法開啟 SPU 外掛!"
 
-#: ../win32/gui/WndMain.c:1220
-#: ../data/pcsx.glade2:1401
-msgid "Enable Debugger"
-msgstr "開啟調試器"
+#: ../gui/Plugin.c:424
+msgid "Error closing CD-ROM plugin!"
+msgstr "無法關閉 CD-ROM 外掛!"
 
-#: ../win32/gui/WndMain.c:1221
-msgid "Spu Irq Always Enabled"
-msgstr "SPU IRQ 總是開啟"
+#: ../gui/Plugin.c:426
+msgid "Error closing SPU plugin!"
+msgstr "無法關閉 SPU 外掛!"
 
-#: ../win32/gui/WndMain.c:1222
-#: ../data/pcsx.glade2:1538
-msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
-msgstr "Parasite Eve 2, Vandal Hearts 1/2 修正"
+#: ../gui/Plugin.c:428
+msgid "Error closing Controller 1 Plugin!"
+msgstr "無法關閉 \"控制器 1\" 外掛!"
 
-#: ../win32/gui/WndMain.c:1223
-#: ../data/pcsx.glade2:1553
-msgid "InuYasha Sengoku Battle Fix"
-msgstr "InuYasha Sengoku 戰斗修正"
+#: ../gui/Plugin.c:430
+msgid "Error closing Controller 2 plugin!"
+msgstr "無法關閉 \"控制器 2\" 外掛!"
 
-#: ../win32/gui/WndMain.c:1225
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:277
-#: ../plugins/dfinput/dfinput.glade2:448
-msgid "Options"
-msgstr "選項"
+#: ../gui/Plugin.c:432
+msgid "Error closing GPU plugin!"
+msgstr "無法關閉 GPU 外掛!"
 
-#: ../win32/gui/WndMain.c:1226
-msgid "Psx System Type"
-msgstr "PS 系統類型"
+#: ../gui/Plugin.c:435
+#, fuzzy
+msgid "Error closing SIO1 plugin!"
+msgstr "無法關閉 SPU 外掛!"
 
-#: ../win32/gui/WndMain.c:1330
-msgid "Psx Mcd Format (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
-msgstr "PS 記憶卡格式 (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
+#: ../libpcsxcore/cdriso.c:423
+#, fuzzy, c-format
+msgid ""
+"\n"
+"could not open: %s\n"
+msgstr "無法開啟目錄: \"%s\"\n"
 
-#: ../win32/gui/WndMain.c:1335
-msgid "Psx Memory Card (*.mcr;*.mc)"
-msgstr "PS 記憶卡 (*.mcr;*.mc)"
+#: ../libpcsxcore/cdriso.c:1043
+#, c-format
+msgid "Track %.2d (%s) - Start %.2d:%.2d:%.2d, Length %.2d:%.2d:%.2d\n"
+msgstr "軌道 %.2d (%s) - 起始位置 %.2d:%.2d:%.2d, 長度 %.2d:%.2d:%.2d\n"
 
-#: ../win32/gui/WndMain.c:1340
-msgid "CVGS Memory Card (*.mem;*.vgs)"
-msgstr "VGS 記憶卡 (*.mem;*.vgs)"
+#: ../libpcsxcore/cdriso.c:1064
+#, c-format
+msgid "Loaded CD Image: %s"
+msgstr "已加載 CD 映像: %s"
 
-#: ../win32/gui/WndMain.c:1345
-msgid "Bleem Memory Card (*.mcd)"
-msgstr "Bleem 記憶卡 (*.mcd)"
+#: ../libpcsxcore/cheat.c:147
+#, c-format
+msgid "Cheats loaded from: %s\n"
+msgstr "金手指碼已加載: %s\n"
 
-#: ../win32/gui/WndMain.c:1350
-msgid "DexDrive Memory Card (*.gme)"
-msgstr "DexDrive 記憶卡 (*.gme)"
+#: ../libpcsxcore/cheat.c:179
+#, c-format
+msgid "Cheats saved to: %s\n"
+msgstr "金手指碼已保存: %s\n"
 
-#: ../win32/gui/WndMain.c:1355
-msgid "DataDeck Memory Card (*.ddf)"
-msgstr "DataDeck 記憶卡 (*.ddl)"
+#: ../libpcsxcore/cheat.c:322 ../libpcsxcore/cheat.c:443
+msgid "(Untitled)"
+msgstr "(未定名)"
 
-#: ../win32/gui/WndMain.c:1360
-#: ../win32/gui/WndMain.c:1441
-#: ../gui/Cheat.c:321
-#: ../gui/Gtk2Gui.c:422
-#: ../gui/Gtk2Gui.c:561
-msgid "All Files"
-msgstr "所有檔案"
+#: ../libpcsxcore/debug.c:321
+msgid "Error allocating memory"
+msgstr "分配記憶體錯誤"
 
-#: ../win32/gui/WndMain.c:1399
-msgid "Psx Exe Format"
-msgstr "PS EXE 格式"
+#: ../libpcsxcore/debug.c:326
+msgid "Unable to start debug server.\n"
+msgstr "無法啟動調試伺服器。\n"
 
-#: ../win32/gui/WndMain.c:1436
-msgid "Psx Isos (*.iso;*.mdf;*.img;*.bin)"
-msgstr "PS 鏡像檔 (*.iso;*.mdf;*.img;*.bin)"
+#: ../libpcsxcore/debug.c:330
+msgid "Debugger started.\n"
+msgstr "調試器已啟動。\n"
 
-#: ../win32/gui/WndMain.c:1512
-msgid "&File"
-msgstr "檔案(&F)"
+#: ../libpcsxcore/debug.c:337
+msgid "Debugger stopped.\n"
+msgstr "調試器已停止。\n"
 
-#: ../win32/gui/WndMain.c:1513
-msgid "E&xit"
-msgstr "離開(&X)"
+#: ../libpcsxcore/misc.c:350
+#, c-format
+msgid "CD-ROM Label: %.32s\n"
+msgstr "CD-ROM 卷標: %.32s\n"
 
-#: ../win32/gui/WndMain.c:1515
-msgid "Run &EXE..."
-msgstr "執行 EXE(&E)..."
+#: ../libpcsxcore/misc.c:351
+#, c-format
+msgid "CD-ROM ID: %.9s\n"
+msgstr "CD-ROM ID: %.9s\n"
 
-#: ../win32/gui/WndMain.c:1516
-msgid "Run &BIOS"
-msgstr "執行 BIOS(&B)"
+#: ../libpcsxcore/misc.c:415
+#, c-format
+msgid "Error opening file: %s.\n"
+msgstr "開啟檔案錯誤: %s.\n"
 
-#: ../win32/gui/WndMain.c:1517
-msgid "Run &ISO..."
-msgstr "執行 ISO(&I)..."
+#: ../libpcsxcore/misc.c:458
+#, c-format
+msgid "Unknown CPE opcode %02x at position %08x.\n"
+msgstr "未知 CPE opcode %02x 位於 %08x.\n"
 
-#: ../win32/gui/WndMain.c:1518
-msgid "Run &CD"
-msgstr "執行光碟(&C)"
+#: ../libpcsxcore/misc.c:486
+msgid "This file does not appear to be a valid PSX file.\n"
+msgstr "此檔案不是一個合法的 PSX 檔案。\n"
 
-#: ../win32/gui/WndMain.c:1520
-msgid "&Emulator"
-msgstr "模擬器(&E)"
+#: ../libpcsxcore/plugins.c:190
+#, c-format
+msgid "Error loading %s: %s"
+msgstr "無法加載 %s: %s"
 
-#: ../win32/gui/WndMain.c:1521
-msgid "&States"
-msgstr "記錄(&S)"
+#: ../libpcsxcore/plugins.c:234
+#, fuzzy, c-format
+msgid ""
+"Could not load GPU plugin %s!\n"
+"%s"
+msgstr "無法加載 GPU 外掛 %s!"
 
-#: ../win32/gui/WndMain.c:1523
-msgid "S&witch ISO..."
-msgstr "更換 ISO(&W)..."
+#: ../libpcsxcore/plugins.c:310
+#, fuzzy, c-format
+msgid ""
+"Could not load CD-ROM plugin %s!\n"
+"%s"
+msgstr "無法加載 CD-ROM 外掛 %s!"
+
+#: ../libpcsxcore/plugins.c:359
+#, fuzzy, c-format
+msgid ""
+"Could not load SPU plugin %s!\n"
+"%s"
+msgstr "無法加載 SPU 外掛 %s!"
 
-#: ../win32/gui/WndMain.c:1525
-msgid "Re&set"
-msgstr "複位(&S)"
+#: ../libpcsxcore/plugins.c:499
+#, fuzzy, c-format
+msgid ""
+"Could not load Controller 1 plugin %s!\n"
+"%s"
+msgstr "無法加載 \"控制器1\" 外掛 %s!"
 
-#: ../win32/gui/WndMain.c:1526
-msgid "&Run"
-msgstr "執行(&R)"
+#: ../libpcsxcore/plugins.c:558
+#, fuzzy, c-format
+msgid ""
+"Could not load Controller 2 plugin %s!\n"
+"%s"
+msgstr "無法加載 \"控制器2\" 外掛 %s!"
 
-#: ../win32/gui/WndMain.c:1527
-msgid "&Save"
-msgstr "存儲(&S)"
+#: ../libpcsxcore/plugins.c:604
+#, fuzzy, c-format
+msgid ""
+"Could not load NetPlay plugin %s!\n"
+"%s"
+msgstr "無法加載聯線遊戲外掛 %s!"
 
-#: ../win32/gui/WndMain.c:1528
-msgid "&Load"
-msgstr "讀取(&L)"
+#: ../libpcsxcore/plugins.c:682
+#, fuzzy, c-format
+msgid ""
+"Could not load SIO1 plugin %s!\n"
+"%s"
+msgstr "無法加載 SIO1 外掛 %s!"
 
-#: ../win32/gui/WndMain.c:1529
-#: ../win32/gui/WndMain.c:1535
-msgid "&Other..."
-msgstr "其它(&O)..."
+#: ../libpcsxcore/plugins.c:770
+#, c-format
+msgid "Error initializing CD-ROM plugin: %d"
+msgstr "CD-ROM 外掛初始化錯誤: %d"
 
-#: ../win32/gui/WndMain.c:1530
-#: ../win32/gui/WndMain.c:1536
-msgid "Slot &5"
-msgstr "記錄 5(&5)"
+#: ../libpcsxcore/plugins.c:772
+#, c-format
+msgid "Error initializing GPU plugin: %d"
+msgstr "GPU 外掛初始化錯誤: %d"
 
-#: ../win32/gui/WndMain.c:1531
-#: ../win32/gui/WndMain.c:1537
-msgid "Slot &4"
-msgstr "記錄 4(&4)"
+#: ../libpcsxcore/plugins.c:774
+#, c-format
+msgid "Error initializing SPU plugin: %d"
+msgstr "SPU 外掛初始化錯誤: %d"
 
-#: ../win32/gui/WndMain.c:1532
-#: ../win32/gui/WndMain.c:1538
-msgid "Slot &3"
-msgstr "記錄 3(&3)"
+#: ../libpcsxcore/plugins.c:776
+#, c-format
+msgid "Error initializing Controller 1 plugin: %d"
+msgstr "\"控制器1\" 外掛初始化錯誤: %d"
 
-#: ../win32/gui/WndMain.c:1533
-#: ../win32/gui/WndMain.c:1539
-msgid "Slot &2"
-msgstr "記錄 2(&2)"
+#: ../libpcsxcore/plugins.c:778
+#, c-format
+msgid "Error initializing Controller 2 plugin: %d"
+msgstr "\"控制器2\" 外掛初始化錯誤: %d"
 
-#: ../win32/gui/WndMain.c:1534
-#: ../win32/gui/WndMain.c:1540
-msgid "Slot &1"
-msgstr "記錄 1(&1)"
+#: ../libpcsxcore/plugins.c:782
+#, c-format
+msgid "Error initializing NetPlay plugin: %d"
+msgstr "聯線遊戲外掛初始化錯誤: %d"
 
-#: ../win32/gui/WndMain.c:1542
-msgid "&Configuration"
-msgstr "設定(&C)"
+#: ../libpcsxcore/plugins.c:787
+#, c-format
+msgid "Error initializing SIO1 plugin: %d"
+msgstr "SIO1 外掛初始化錯誤: %d"
 
-#: ../win32/gui/WndMain.c:1543
-msgid "Cheat &Search..."
-msgstr "搜尋金手指碼(&S)..."
+#: ../libpcsxcore/plugins.c:790
+msgid "Plugins loaded.\n"
+msgstr "外掛已加載。\n"
 
-#: ../win32/gui/WndMain.c:1544
-msgid "Ch&eat Code..."
-msgstr "金手指碼(&E)..."
+#: ../libpcsxcore/ppf.c:219
+#, c-format
+msgid "Invalid PPF patch: %s.\n"
+msgstr "無效 PPF 補丁: %s。\n"
 
-#: ../win32/gui/WndMain.c:1547
-msgid "&Language"
-msgstr "語言(&L)"
+#: ../libpcsxcore/ppf.c:295
+#, c-format
+msgid "Unsupported PPF version (%d).\n"
+msgstr "不支援的 PPF 補丁版本 (%d)。\n"
 
-#: ../win32/gui/WndMain.c:1572
-msgid "&Memory cards..."
-msgstr "記憶卡(&M)..."
+#. build address array
+#: ../libpcsxcore/ppf.c:334
+#, c-format
+msgid "Loaded PPF %d.0 patch: %s.\n"
+msgstr "已加載 PPF %d.0 補丁: %s。\n"
 
-#: ../win32/gui/WndMain.c:1573
-msgid "C&PU..."
-msgstr "CPU(&P)..."
+#: ../libpcsxcore/ppf.c:384
+#, fuzzy, c-format
+msgid "Loaded SBI file: %s.\n"
+msgstr "已加載 CD 映像: %s"
 
-#: ../win32/gui/WndMain.c:1575
-msgid "&NetPlay..."
-msgstr "聯線遊戲(&N)..."
+#: ../libpcsxcore/psxmem.c:78
+msgid "Error allocating memory!"
+msgstr "分配記憶體錯誤!"
 
-#: ../win32/gui/WndMain.c:1577
-msgid "&Controllers..."
-msgstr "控制器(&C)..."
+#: ../libpcsxcore/psxmem.c:121
+#, c-format
+msgid "Could not open BIOS:\"%s\". Enabling HLE Bios!\n"
+msgstr "無法開啟 BIOS: \"%s\"。使用內部 HLE Bios。\n"
 
-#: ../win32/gui/WndMain.c:1578
-msgid "CD-&ROM..."
-msgstr "CD-ROM(&R)..."
+#: ../libpcsxcore/r3000a.c:34
+#, c-format
+msgid "Running PCSXR Version %s (%s).\n"
+msgstr "PCSXR 版本 %s (%s) 執行中。\n"
 
-#: ../win32/gui/WndMain.c:1579
-msgid "&Sound..."
-msgstr "聲音(&S)..."
+#: ../libpcsxcore/sio.c:843
+msgid "Connection closed!\n"
+msgstr "連線被關閉!\n"
 
-#: ../win32/gui/WndMain.c:1580
-msgid "&Graphics..."
-msgstr "圖像(&G)..."
+#: ../libpcsxcore/sio.c:876
+#, c-format
+msgid "No memory card value was specified - creating a default card %s\n"
+msgstr "未指定記憶卡 - 創建一個新的記憶卡 %s\n"
 
-#: ../win32/gui/WndMain.c:1582
-msgid "&Plugins && Bios..."
-msgstr "外掛及 BIOS(&P)..."
+#: ../libpcsxcore/sio.c:880
+#, c-format
+msgid "The memory card %s doesn't exist - creating it\n"
+msgstr "記憶卡 %s 不存在 - 正在創建\n"
 
-#: ../win32/gui/WndMain.c:1584
-msgid "&Help"
-msgstr "說明(&H)"
+#: ../libpcsxcore/sio.c:896
+#, c-format
+msgid "Memory card %s failed to load!\n"
+msgstr "記憶卡 %s 讀取失敗!\n"
 
-#: ../win32/gui/WndMain.c:1585
-msgid "&About..."
-msgstr "關於(&A)..."
+#: ../libpcsxcore/sio.c:900
+#, c-format
+msgid "Loading memory card %s\n"
+msgstr "正在加載記憶卡 %s\n"
 
-#: ../win32/gui/WndMain.c:1764
-msgid "Pcsx Msg"
-msgstr "Pcsx 消息"
+#: ../plugins/dfcdrom/cdr.c:25
+msgid "CD-ROM Drive Reader"
+msgstr "CD-ROM 裝置讀取外掛"
 
-#: ../win32/gui/WndMain.c:1767
-msgid "Error Loading Symbol"
-msgstr "無法加載符號"
+#: ../plugins/dfcdrom/cdr.c:27
+msgid "CDR NULL Plugin"
+msgstr "CDR NULL 外掛"
 
-#: ../gui/AboutDlg.c:74
-msgid ""
-"(C) 1999-2003 PCSX Team\n"
-"(C) 2005-2009 PCSX-df Team\n"
-"(C) 2009-2010 PCSX-Reloaded Team"
-msgstr ""
-"(C) 1999-2003 PCSX 開發組\n"
-"(C) 2005-2009 PCSX-df 開發組\n"
-"(C) 2009-2010 PCSX-Reloaded 開發組"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:1
+#: ../plugins/dfcdrom/cdrcfg-0.1df/main.c:217
+msgid "CDR configuration"
+msgstr "CDR 設定"
 
-#: ../gui/AboutDlg.c:79
-msgid ""
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA."
-msgstr ""
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA."
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:2
+msgid "Choose your CD-ROM device or type its path if it's not listed"
+msgstr "選擇 CD-ROM 裝置，如未列出請輸入其路徑"
 
-#: ../gui/AboutDlg.c:102
-msgid "translator-credits"
-msgstr "Wei Mingzhi <whistler@openoffice.org>"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:3
+msgid "Select read mode:"
+msgstr "選擇讀取模式:"
 
-#: ../gui/AboutDlg.c:103
-msgid "A PlayStation emulator."
-msgstr "一個 PlayStation 模擬器。"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:4
+msgid "Cache Size (Def. 64):"
+msgstr "快取大小 (缺省 64):"
 
-#: ../gui/Cheat.c:117
-#: ../gui/Cheat.c:202
-msgid "Cheat Description:"
-msgstr "金手指描述:"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:5
+msgid "Spindown Time:"
+msgstr "電機停轉時限:"
 
-#: ../gui/Cheat.c:306
-msgid "Open Cheat File"
-msgstr "打開金手指檔"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:6
+msgid "Cdrom Speed (Def. 0 = MAX):"
+msgstr "Cdrom 速度 (缺省 0 = 最快):"
 
-#: ../gui/Cheat.c:316
-#: ../gui/Cheat.c:356
-msgid "PCSX Cheat Code Files (*.cht)"
-msgstr "PCSX 金手指檔 (*.cht)"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:7
+msgid "Enable subchannel read"
+msgstr "開啟子通道讀取"
 
-#: ../gui/Cheat.c:346
-msgid "Save Cheat File"
-msgstr "儲存金手指檔"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:8
+msgid "Normal (No Cache)"
+msgstr ""
 
-#: ../gui/Cheat.c:361
-msgid "All Files (*.*)"
-msgstr "所有檔案 (*.*)"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:9
+#, fuzzy
+msgid "Threaded - Faster (With Cache)"
+msgstr ""
+"正常 (無快取)\n"
+"多執行緒 - 較快 (使用快取)"
 
-#: ../gui/Cheat.c:394
-#: ../gui/Cheat.c:1124
-#: ../gui/ConfDlg.c:104
-#: ../gui/ConfDlg.c:200
-#: ../gui/DebugMemory.c:259
-msgid "Error: Glade interface could not be loaded!"
-msgstr "錯誤：無法加載 Glade 界面!"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:10
+msgid "Default"
+msgstr ""
 
-#: ../gui/Cheat.c:399
-msgid "Cheat Codes"
-msgstr "金手指碼"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:11
+msgid "125ms"
+msgstr ""
 
-#: ../gui/Cheat.c:405
-msgid "Enable"
-msgstr "開啟"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:12
+msgid "250ms"
+msgstr ""
 
-#: ../gui/Cheat.c:630
-msgid "Freeze value"
-msgstr "固定數值"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:13
+msgid "500ms"
+msgstr ""
 
-#: ../gui/Cheat.c:729
-msgid "Modify value"
-msgstr "更改數值"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:14
+msgid "1s"
+msgstr ""
 
-#: ../gui/Cheat.c:737
-msgid "New value:"
-msgstr "新值:"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:15
+msgid "2s"
+msgstr ""
 
-#: ../gui/Cheat.c:1134
-msgid "Search Results"
-msgstr "搜尋結果"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:16
+msgid "4s"
+msgstr ""
 
-#: ../gui/ConfDlg.c:112
-#: ../data/pcsx.glade2:778
-msgid "Configure PCSX"
-msgstr "設定 PCSX"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:17
+msgid "8s"
+msgstr ""
 
-#: ../gui/ConfDlg.c:237
-#: ../gui/ConfDlg.c:258
-#: ../gui/ConfDlg.c:279
-#: ../gui/ConfDlg.c:300
-#: ../gui/ConfDlg.c:355
-msgid "No configuration required"
-msgstr "不需要設定"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:18
+msgid "16s"
+msgstr ""
 
-#: ../gui/ConfDlg.c:237
-#: ../gui/ConfDlg.c:258
-#: ../gui/ConfDlg.c:279
-#: ../gui/ConfDlg.c:300
-#: ../gui/ConfDlg.c:355
-msgid "This plugin doesn't need to be configured."
-msgstr "此外掛不需要被設定。"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:19
+msgid "32s"
+msgstr ""
 
-#: ../gui/ConfDlg.c:581
-#, c-format
-msgid "Could not open BIOS directory: '%s'\n"
-msgstr "無法開啟 BIOS 目錄: \"%s\"\n"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:20
+msgid "1min"
+msgstr ""
 
-#: ../gui/ConfDlg.c:611
-#: ../gui/ConfDlg.c:704
-#: ../gui/LnxMain.c:168
-#, c-format
-msgid "Could not open directory: '%s'\n"
-msgstr "無法開啟目錄: \"%s\"\n"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:21
+msgid "2min"
+msgstr ""
 
-#: ../gui/ConfDlg.c:675
-msgid "Simulate PSX BIOS"
-msgstr "模擬 PS BIOS"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:22
+msgid "4min"
+msgstr ""
 
-#: ../gui/DebugMemory.c:103
-#: ../data/pcsx.glade2:3178
-msgid "Memory Dump"
-msgstr "記憶體轉儲"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:23
+msgid "8min"
+msgstr ""
 
-#: ../gui/DebugMemory.c:111
-msgid "Start Address (Hexadecimal):"
-msgstr "起始位址 (十六進制):"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:24
+msgid "16min"
+msgstr ""
 
-#: ../gui/DebugMemory.c:121
-msgid "Length (Decimal):"
-msgstr "長度 (十進制):"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:25
+msgid "32min"
+msgstr ""
 
-#: ../gui/DebugMemory.c:147
-msgid "Dump to File"
-msgstr "轉儲至檔案"
+#: ../plugins/dfinput/cfg-gtk.c:49
+msgid "D-Pad Up"
+msgstr "上方向鍵"
 
-#: ../gui/DebugMemory.c:162
-#, c-format
-msgid "Error writing to %s!"
-msgstr "存儲至 %s 時出錯!"
+#: ../plugins/dfinput/cfg-gtk.c:50
+msgid "D-Pad Down"
+msgstr "下方向鍵"
 
-#: ../gui/DebugMemory.c:180
-msgid "Memory Patch"
-msgstr "記憶體修改"
+#: ../plugins/dfinput/cfg-gtk.c:51
+msgid "D-Pad Left"
+msgstr "左方向鍵"
 
-#: ../gui/DebugMemory.c:188
-#: ../data/pcsx.glade2:3199
-msgid "Address (Hexadecimal):"
-msgstr "位址 (十六進制):"
+#: ../plugins/dfinput/cfg-gtk.c:52
+msgid "D-Pad Right"
+msgstr "右方向鍵"
 
-#: ../gui/DebugMemory.c:198
-msgid "Value (Hexa string):"
-msgstr "數值 (十六進制串):"
+#: ../plugins/dfinput/cfg-gtk.c:53
+msgid "Cross"
+msgstr "叉號鍵"
 
-#: ../gui/DebugMemory.c:264
-msgid "Memory Viewer"
-msgstr "記憶體檢視"
+#: ../plugins/dfinput/cfg-gtk.c:54
+msgid "Circle"
+msgstr "圓圈鍵"
 
-#: ../gui/DebugMemory.c:269
-msgid "Address"
-msgstr "位址"
+#: ../plugins/dfinput/cfg-gtk.c:55
+msgid "Square"
+msgstr "方塊鍵"
 
-#: ../gui/DebugMemory.c:287
-msgid "Text"
-msgstr "文字"
+#: ../plugins/dfinput/cfg-gtk.c:56
+msgid "Triangle"
+msgstr "三角鍵"
 
-#: ../gui/Gtk2Gui.c:113
-msgid "Ready"
-msgstr "就緒"
+#: ../plugins/dfinput/cfg-gtk.c:57
+msgid "L1"
+msgstr "L1"
 
-#: ../gui/Gtk2Gui.c:154
-msgid "Emulation Paused."
-msgstr "模擬器已暫停。"
+#: ../plugins/dfinput/cfg-gtk.c:58
+msgid "R1"
+msgstr "R1"
 
-#: ../gui/Gtk2Gui.c:405
-msgid "Select PSX EXE File"
-msgstr "選擇 PS EXE 檔案"
+#: ../plugins/dfinput/cfg-gtk.c:59
+msgid "L2"
+msgstr "L2"
 
-#: ../gui/Gtk2Gui.c:418
-msgid "PlayStation Executable Files"
-msgstr "PlayStation 執行檔"
+#: ../plugins/dfinput/cfg-gtk.c:60
+msgid "R2"
+msgstr "R2"
 
-#: ../gui/Gtk2Gui.c:454
-msgid "Not a valid PSX file"
-msgstr "不是一個合法的 PSX 檔"
+#: ../plugins/dfinput/cfg-gtk.c:61
+msgid "Select"
+msgstr "選擇鍵"
 
-#: ../gui/Gtk2Gui.c:454
-msgid "The file does not appear to be a valid Playstation executable"
-msgstr "此文件不是一個合法的 PlayStation 執行檔"
+#: ../plugins/dfinput/cfg-gtk.c:62
+msgid "Start"
+msgstr "開始鍵"
 
-#: ../gui/Gtk2Gui.c:485
-#: ../gui/Gtk2Gui.c:610
-msgid "CD ROM failed"
-msgstr "CD-ROM 失敗"
+#: ../plugins/dfinput/cfg-gtk.c:63
+msgid "L3"
+msgstr "L3"
 
-#: ../gui/Gtk2Gui.c:493
-#: ../gui/Gtk2Gui.c:618
-msgid "The CD-ROM could not be loaded"
-msgstr "無法加載 CD-ROM"
+#: ../plugins/dfinput/cfg-gtk.c:64
+msgid "R3"
+msgstr "R3"
 
-#: ../gui/Gtk2Gui.c:507
-msgid "Could not run BIOS"
-msgstr "無法執行 BIOS"
+#: ../plugins/dfinput/cfg-gtk.c:65
+#, fuzzy
+msgid "Analog"
+msgstr "類比手把"
 
-#: ../gui/Gtk2Gui.c:507
-msgid "Running BIOS is not supported with Internal HLE BIOS."
-msgstr "內部 HLE BIOS 不支援直接執行。"
+#: ../plugins/dfinput/cfg-gtk.c:69
+msgid "L-Stick Right"
+msgstr "左搖桿右方向"
 
-#: ../gui/Gtk2Gui.c:536
-msgid "Open PSX Disc Image File"
-msgstr "打開 PS 光碟映像檔"
+#: ../plugins/dfinput/cfg-gtk.c:70
+msgid "L-Stick Left"
+msgstr "左搖桿左方向"
 
-#: ../gui/Gtk2Gui.c:556
-msgid "PSX Image Files (*.bin, *.img, *.mdf, *.iso)"
-msgstr "PS 鏡像檔 (*.bin, *.img, *.mdf, *.iso)"
+#: ../plugins/dfinput/cfg-gtk.c:71
+msgid "L-Stick Down"
+msgstr "左搖桿下方向"
 
-#: ../gui/Gtk2Gui.c:771
-#, c-format
-msgid "Loaded state %s."
-msgstr "已讀取記錄 %s。"
+#: ../plugins/dfinput/cfg-gtk.c:72
+msgid "L-Stick Up"
+msgstr "左搖桿上方向"
 
-#: ../gui/Gtk2Gui.c:774
-#, c-format
-msgid "Error loading state %s!"
-msgstr "讀取記錄 %s 時出錯。"
+#: ../plugins/dfinput/cfg-gtk.c:73
+msgid "R-Stick Right"
+msgstr "右搖桿右方向"
 
-#: ../gui/Gtk2Gui.c:785
-#, c-format
-msgid "Saved state %s."
-msgstr "已存儲記錄 %s"
+#: ../plugins/dfinput/cfg-gtk.c:74
+msgid "R-Stick Left"
+msgstr "右搖桿左方向"
 
-#: ../gui/Gtk2Gui.c:787
-#, c-format
-msgid "Error saving state %s!"
-msgstr "存儲記錄 %s 時出錯。"
+#: ../plugins/dfinput/cfg-gtk.c:75
+msgid "R-Stick Down"
+msgstr "右搖桿下方向"
 
-#: ../gui/Gtk2Gui.c:822
-#: ../gui/Gtk2Gui.c:850
-msgid "Select State File"
-msgstr "選擇記錄檔案"
+#: ../plugins/dfinput/cfg-gtk.c:76
+msgid "R-Stick Up"
+msgstr "右搖桿上方向"
 
-#: ../gui/Gtk2Gui.c:893
-msgid "Notice"
-msgstr "警告"
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
+msgid "Centered"
+msgstr "居中"
 
-#: ../gui/LnxMain.c:62
-#, c-format
-msgid "Creating memory card: %s\n"
-msgstr "創建記憶卡: %s\n"
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
+msgid "Up"
+msgstr "上"
 
-#: ../gui/LnxMain.c:325
-msgid ""
-" pcsx [options] [file]\n"
-"\toptions:\n"
-"\t-runcd\t\tRuns CD-ROM\n"
-"\t-cdfile FILE\tRuns a CD image file\n"
-"\t-nogui\t\tDon't open the GTK GUI\n"
-"\t-cfg FILE\tLoads desired configuration file (default: ~/.pcsx/pcsx.cfg)\n"
-"\t-psxout\t\tEnable PSX output\n"
-"\t-load STATENUM\tLoads savestate STATENUM (1-5)\n"
-"\t-h -help\tDisplay this message\n"
-"\tfile\t\tLoads file\n"
-msgstr ""
-" pcsx [選項] [檔案]\n"
-"\t選項:\n"
-"\t-runcd\t\t執行 CD-ROM\n"
-"\t-cdfile 檔案\t執行 CD 鏡像檔\n"
-"\t-nogui\t\t不開啟 GTK GUI\n"
-"\t-cfg 檔案\t加載一個特定的設定檔案 (缺省為: ~/.pcsx/pcsx.cfg)\n"
-"\t-psxout\t\t開啟 PSX 輸出\n"
-"\t-load 編號\t加載指定編號的記錄 (1-5)\n"
-"\t-h -help\t顯示此說明\n"
-"\t檔案\t\t加載檔案\n"
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
+msgid "Right"
+msgstr "右"
 
-#: ../gui/LnxMain.c:362
-#, c-format
-msgid "PCSX cannot be configured without using the GUI -- you should restart without -nogui.\n"
-msgstr "PCSX 不能在字符界面下設定 -- 請不使用 -nogui 參數重新啟動程式\n"
+#: ../plugins/dfinput/cfg-gtk.c:102 ../plugins/dfinput/cfg-gtk.c:141
+msgid "Rightup"
+msgstr "右上"
 
-#: ../gui/LnxMain.c:418
-msgid "Failed loading plugins!"
-msgstr "外掛加載失敗"
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
+msgid "Down"
+msgstr "下"
 
-#: ../gui/LnxMain.c:435
-#, c-format
-msgid "Could not load CD-ROM!\n"
-msgstr "無法加載光碟。\n"
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
+msgid "Rightdown"
+msgstr "右下"
 
-#: ../gui/LnxMain.c:466
-#, c-format
-msgid "PSX emulator couldn't be initialized.\n"
-msgstr "PS 模擬器無法初期化。\n"
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
+msgid "Left"
+msgstr "左"
 
-#: ../gui/MemcardDlg.c:56
-msgid "Icon"
-msgstr "圖符"
+#: ../plugins/dfinput/cfg-gtk.c:103 ../plugins/dfinput/cfg-gtk.c:142
+msgid "Leftup"
+msgstr "左上"
 
-#: ../gui/MemcardDlg.c:74
-msgid "ID"
-msgstr "ID"
+#: ../plugins/dfinput/cfg-gtk.c:104 ../plugins/dfinput/cfg-gtk.c:143
+msgid "Leftdown"
+msgstr "左下"
 
-#: ../gui/MemcardDlg.c:80
-msgid "Name"
-msgstr "名稱"
+#: ../plugins/dfinput/cfg-gtk.c:108 ../plugins/dfinput/cfg-gtk.c:147
+#, c-format
+msgid "Joystick: Button %d"
+msgstr "手把: 按鈕 %d"
 
-#: ../gui/MemcardDlg.c:323
-msgid "Select A File"
-msgstr "選擇檔案"
+#: ../plugins/dfinput/cfg-gtk.c:112 ../plugins/dfinput/cfg-gtk.c:151
+#, c-format
+msgid "Joystick: Axis %d%c"
+msgstr "手把: 軸 %d%c"
 
-#: ../gui/MemcardDlg.c:364
-msgid "Format this Memory Card?"
-msgstr "格式化此記憶卡?"
+#: ../plugins/dfinput/cfg-gtk.c:117 ../plugins/dfinput/cfg-gtk.c:156
+#, c-format
+msgid "Joystick: Hat %d %s"
+msgstr "手把: Hat %d %s"
 
-#: ../gui/MemcardDlg.c:366
-msgid "If you format the memory card, the card will be empty, and any existing data overwritten."
-msgstr "如果您選擇格式化記憶卡，記憶卡將被清空，並且任何現有資料都將被覆蓋。"
+#: ../plugins/dfinput/cfg-gtk.c:132 ../plugins/dfinput/cfg-gtk.c:171
+msgid "Keyboard:"
+msgstr "鍵盤:"
 
-#: ../gui/MemcardDlg.c:369
-msgid "Format card"
-msgstr "格式化記憶卡"
+#: ../plugins/dfinput/cfg-gtk.c:136 ../plugins/dfinput/cfg-gtk.c:175
+msgid "(Not Set)"
+msgstr "(未設定)"
 
-#: ../gui/MemcardDlg.c:393
-msgid "Create a new Memory Card"
-msgstr "新增記憶卡"
+#: ../plugins/dfinput/cfg-gtk.c:575
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:14
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:68
+msgid "None"
+msgstr "無"
 
-#: ../gui/MemcardDlg.c:402
-msgid "New Memory Card.mcd"
-msgstr "新記憶卡檔.mcd"
+#: ../plugins/dfinput/cfg-gtk.c:623
+msgid "Gamepad/Keyboard Input Configuration"
+msgstr "手把/鍵盤輸入設定"
 
-#: ../gui/MemcardDlg.c:503
-msgid "No free space on memory card"
-msgstr "記憶卡無空餘位置"
+#: ../plugins/dfinput/cfg-gtk.c:629 ../plugins/dfinput/cfg-gtk.c:649
+msgid "Key"
+msgstr "按鍵"
 
-#: ../gui/MemcardDlg.c:504
-msgid "There are no free slots available on the target memory card. Please delete a slot first."
-msgstr "目的記憶卡無空餘位置。請先刪除一個檔案。"
+#: ../plugins/dfinput/cfg-gtk.c:635 ../plugins/dfinput/cfg-gtk.c:655
+msgid "Button"
+msgstr "按鈕"
 
-#: ../gui/MemcardDlg.c:667
-msgid "Memory Card Manager"
-msgstr "記憶卡管理器"
+#: ../plugins/dfinput/dfinput.ui.h:1
+msgid "Device:"
+msgstr "裝置:"
 
-#: ../gui/Plugin.c:211
-#: ../data/pcsx.glade2:1487
-#, c-format
-msgid "SIO IRQ Always Enabled"
-msgstr "SIO IRQ 總是開啟"
+#: ../plugins/dfinput/dfinput.ui.h:2
+msgid "Type:"
+msgstr "類型:"
 
-#: ../gui/Plugin.c:212
-#, c-format
-msgid "SIO IRQ Not Always Enabled"
-msgstr "SIO IRQ 不總是開啟"
+#: ../plugins/dfinput/dfinput.ui.h:3
+msgid "Visual vibration"
+msgstr ""
 
-#: ../gui/Plugin.c:218
-#, c-format
-msgid "Black & White Mdecs Only Enabled"
-msgstr "Black & White Mdecs Only 開啟"
+#: ../plugins/dfinput/dfinput.ui.h:4
+msgid "Change"
+msgstr "更改"
 
-#: ../gui/Plugin.c:219
-#, c-format
-msgid "Black & White Mdecs Only Disabled"
-msgstr "Black & White Mdecs Only 禁用"
+#: ../plugins/dfinput/dfinput.ui.h:5
+msgid "Reset"
+msgstr "重置"
 
-#: ../gui/Plugin.c:225
-#, c-format
-msgid "XA Enabled"
-msgstr "XA 已開啟"
+#: ../plugins/dfinput/dfinput.ui.h:6
+msgid "Controller 1"
+msgstr "控制器 1"
 
-#: ../gui/Plugin.c:226
-#, c-format
-msgid "XA Disabled"
-msgstr "XA 已禁用"
+#: ../plugins/dfinput/dfinput.ui.h:7
+msgid "Controller 2"
+msgstr "控制器 2"
 
-#: ../gui/Plugin.c:288
-msgid "Error opening CD-ROM plugin!"
-msgstr "無法開啟 CD-ROM 外掛!"
+#: ../plugins/dfinput/dfinput.ui.h:8
+msgid "Multi-Threaded (Recommended)"
+msgstr "多執行緒 (建議使用)"
 
-#: ../gui/Plugin.c:290
-msgid "Error opening SPU plugin!"
-msgstr "無法開啟 SPU 外掛!"
+#: ../plugins/dfinput/dfinput.ui.h:9 ../win32/gui/WndMain.c:1342
+msgid "Options"
+msgstr "選項"
 
-#: ../gui/Plugin.c:293
-msgid "Error opening GPU plugin!"
-msgstr "無法開啟 GPU 外掛!"
+#: ../plugins/dfinput/dfinput.ui.h:10
+msgid "Digital Pad"
+msgstr "普通手把"
 
-#: ../gui/Plugin.c:295
-msgid "Error opening Controller 1 plugin!"
-msgstr "無法開啟 \"控制器 1\" 外掛!"
+#: ../plugins/dfinput/dfinput.ui.h:11
+msgid "Analog Pad"
+msgstr "類比手把"
 
-#: ../gui/Plugin.c:297
-msgid "Error opening Controller 2 plugin!"
-msgstr "無法開啟 \"控制器 2\" 外掛!"
+#: ../plugins/dfinput/dfinput.ui.h:12
+msgid "Mouse"
+msgstr ""
 
-#: ../gui/Plugin.c:377
-msgid "Error closing CD-ROM plugin!"
-msgstr "無法關閉 CD-ROM 外掛!"
+#: ../plugins/dfinput/pad.c:33
+#, fuzzy
+msgid "Gamepad/Keyboard/Mouse Input"
+msgstr "手把/鍵盤輸入"
 
-#: ../gui/Plugin.c:379
-msgid "Error closing SPU plugin!"
-msgstr "無法關閉 SPU 外掛!"
+#. increase that with each version
+#: ../plugins/dfnet/dfnet.c:23
+msgid "Socket Driver"
+msgstr "Socket 驅動程式"
 
-#: ../gui/Plugin.c:381
-msgid "Error closing Controller 1 Plugin!"
-msgstr "無法關閉 \"控制器 1\" 外掛!"
+#: ../plugins/dfnet/dfnet.c:161
+#, c-format
+msgid "error connecting to %s: %s\n"
+msgstr "無法連線至 %s: %s\n"
 
-#: ../gui/Plugin.c:383
-msgid "Error closing Controller 2 plugin!"
-msgstr "無法關閉 \"控制器 2\" 外掛!"
+#: ../plugins/dfnet/dfnet.c:186
+msgid "Error allocating memory!\n"
+msgstr "分配記憶體錯誤!\n"
 
-#: ../gui/Plugin.c:385
-msgid "Error closing GPU plugin!"
-msgstr "無法關閉 GPU 外掛!"
+#: ../plugins/dfnet/dfnet.ui.h:1
+msgid "Start Game"
+msgstr "開始遊戲"
 
-#: ../libpcsxcore/cdriso.c:658
-#, c-format
-msgid "Track %.2d (%s) - Start %.2d:%.2d:%.2d, Length %.2d:%.2d:%.2d\n"
-msgstr "軌道 %.2d (%s) - 起始位置 %.2d:%.2d:%.2d, 長度 %.2d:%.2d:%.2d\n"
+#: ../plugins/dfnet/dfnet.ui.h:2
+msgid "Play Offline"
+msgstr "離線遊戲"
 
-#: ../libpcsxcore/cdriso.c:677
-#, c-format
-msgid "Loaded CD Image: %s"
-msgstr "已加載 CD 映像: %s"
+#: ../plugins/dfnet/dfnet.ui.h:3
+msgid ""
+"Select here if you'll be Server (Player1) or Client (Player2).\n"
+"\n"
+"If you select Server you must Copy your IP address to the Clipboard and "
+"paste if (Ctrl+V) wherever the Client can see it.\n"
+"\n"
+"If you selected Client please enter the IP address the Server gave to you in "
+"the IP Address Control."
+msgstr ""
+"在此選擇以伺服器端 (玩家 1) 還是客戶端 (玩家 2) 方式執行。\n"
+"\n"
+"如果您選擇伺服器端，您必須將您的 IP 地址複制到剪貼板並告知客戶端。\n"
+"\n"
+"如果您選擇客戶端，請輸入伺服器端提供給您的 IP 地址。"
 
-#: ../libpcsxcore/cheat.c:147
-#, c-format
-msgid "Cheats loaded from: %s\n"
-msgstr "金手指碼已加載: %s\n"
+#: ../plugins/dfnet/dfnet.ui.h:8 ../plugins/bladesio1/sio1.ui.h:6
+msgid "Copy PC IP to Clipboard"
+msgstr "將本機 IP 複制到剪貼板"
 
-#: ../libpcsxcore/cheat.c:179
-#, c-format
-msgid "Cheats saved to: %s\n"
-msgstr "金手指碼已保存: %s\n"
+#: ../plugins/dfnet/dfnet.ui.h:9 ../plugins/bladesio1/sio1.ui.h:7
+msgid "Server (Player1)"
+msgstr "伺服器 (玩家 1)"
 
-#: ../libpcsxcore/cheat.c:322
-#: ../libpcsxcore/cheat.c:443
-msgid "(Untitled)"
-msgstr "(未定名)"
+#: ../plugins/dfnet/dfnet.ui.h:10 ../plugins/bladesio1/sio1.ui.h:8
+msgid "Client (Player2)"
+msgstr "客戶端 (玩家 2)"
 
-#: ../libpcsxcore/debug.c:317
-msgid "Error allocating memory"
-msgstr "分配記憶體錯誤"
+#: ../plugins/dfnet/dfnet.ui.h:11 ../plugins/bladesio1/sio1.ui.h:10
+msgid ""
+"Do not change if not necessary (remember it must be changed on both sides)."
+msgstr "如非必要請勿更改 (必須在兩端都要更改)。"
 
-#: ../libpcsxcore/debug.c:322
-msgid "Unable to start debug server.\n"
-msgstr "無法啟動調試伺服器。\n"
+#: ../plugins/dfnet/dfnet.ui.h:12 ../plugins/bladesio1/sio1.ui.h:11
+msgid "Port Number"
+msgstr "Port 號"
 
-#: ../libpcsxcore/debug.c:326
-msgid "Debugger started.\n"
-msgstr "調試器已啟動。\n"
+#: ../plugins/dfnet/gui.c:30 ../plugins/dfnet/gui.c:112
+#: ../plugins/bladesio1/gui.c:82 ../win32/gui/ConfigurePlugins.c:669
+msgid "NetPlay"
+msgstr "聯線遊戲"
 
-#: ../libpcsxcore/debug.c:333
-msgid "Debugger stopped.\n"
-msgstr "調試器已停止。\n"
+#: ../plugins/dfnet/gui.c:38
+msgid "Nothing to configure"
+msgstr "沒有可以配置的內容"
 
-#: ../libpcsxcore/misc.c:342
+#: ../plugins/dfnet/gui.c:94 ../plugins/bladesio1/gui.c:94
 #, c-format
-msgid "CD-ROM Label: %.32s\n"
-msgstr "CD-ROM 卷標: %.32s\n"
+msgid "IP %s"
+msgstr "IP %s"
 
-#: ../libpcsxcore/misc.c:343
-#, c-format
-msgid "CD-ROM ID: %.9s\n"
-msgstr "CD-ROM ID: %.9s\n"
+#: ../plugins/dfnet/gui.c:165
+msgid "Waiting for connection..."
+msgstr "等待連線中..."
 
-#: ../libpcsxcore/misc.c:388
-#, c-format
-msgid "Error opening file: %s.\n"
-msgstr "開啟檔案錯誤: %s.\n"
+#: ../plugins/dfnet/gui.c:168
+msgid "The Client should now Start a Connection, waiting..."
+msgstr "客戶端現在應開始連線，等待中..."
 
-#: ../libpcsxcore/misc.c:428
-#, c-format
-msgid "Unknown CPE opcode %02x at position %08x.\n"
-msgstr "未知 CPE opcode %02x 位於 %08x.\n"
+#: ../plugins/dfsound/spu.c:66
+msgid "DirectSound Driver"
+msgstr "DirectSound 驅動程式"
 
-#: ../libpcsxcore/misc.c:435
-msgid "COFF files not supported.\n"
-msgstr "COFF 檔案不被支援.\n"
+#: ../plugins/dfsound/spu.c:68
+msgid "Mac OS X Sound"
+msgstr "Mac OS X 聲音"
 
-#: ../libpcsxcore/misc.c:439
-msgid "This file does not appear to be a valid PSX file.\n"
-msgstr "此檔案不是一個合法的 PSX 檔案。\n"
+#: ../plugins/dfsound/spu.c:70
+msgid "ALSA Sound"
+msgstr "ALSA 聲音"
 
-#: ../libpcsxcore/plugins.c:181
-#, c-format
-msgid "Error loading %s: %s"
-msgstr "無法加載 %s: %s"
+#: ../plugins/dfsound/spu.c:72
+msgid "OSS Sound"
+msgstr "OSS 聲音"
 
-#: ../libpcsxcore/plugins.c:221
-#, c-format
-msgid "Could not load GPU plugin %s!"
-msgstr "無法加載 GPU 外掛 %s!"
+#: ../plugins/dfsound/spu.c:74
+msgid "SDL Sound"
+msgstr "SDL 聲音"
 
-#: ../libpcsxcore/plugins.c:292
-#, c-format
-msgid "Could not load CD-ROM plugin %s!"
-msgstr "無法加載 CD-ROM 外掛 %s!"
+#: ../plugins/dfsound/spu.c:76
+#, fuzzy
+msgid "OpenAL Sound"
+msgstr "ALSA 聲音"
 
-#: ../libpcsxcore/plugins.c:340
-#, c-format
-msgid "Could not load SPU plugin %s!"
-msgstr "無法加載 SPU 外掛 %s!"
+#: ../plugins/dfsound/spu.c:78
+msgid "PulseAudio Sound"
+msgstr "PulseAudio 聲音"
 
-#: ../libpcsxcore/plugins.c:477
-#, c-format
-msgid "Could not load Controller 1 plugin %s!"
-msgstr "無法加載 \"控制器1\" 外掛 %s!"
+#: ../plugins/dfsound/spu.c:80
+msgid "NULL Sound"
+msgstr "NULL 聲音"
 
-#: ../libpcsxcore/plugins.c:531
-#, c-format
-msgid "Could not load Controller 2 plugin %s!"
-msgstr "無法加載 \"控制器2\" 外掛 %s!"
+#: ../plugins/dfsound/spu.c:83
+msgid ""
+"P.E.Op.S. Sound Driver V1.7\n"
+"Coded by Pete Bernert and the P.E.Op.S. team\n"
+msgstr ""
+"P.E.Op.S. Sound 驅動程式 V1.7\n"
+"由 Pete Bernert 及 P.E.Op.S. 開發組編寫\n"
 
-#: ../libpcsxcore/plugins.c:574
-#, c-format
-msgid "Could not load NetPlay plugin %s!"
-msgstr "無法加載聯線遊戲外掛 %s!"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:2
+msgid "Volume:"
+msgstr "音量:"
 
-#: ../libpcsxcore/plugins.c:654
-#, c-format
-msgid "Could not load SIO1 plugin %s!"
-msgstr "無法加載 SIO1 外掛 %s!"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:3
+msgid "Interpolation:"
+msgstr "插值:"
 
-#: ../libpcsxcore/plugins.c:739
-#, c-format
-msgid "Error initializing CD-ROM plugin: %d"
-msgstr "CD-ROM 外掛初始化錯誤: %d"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:4
+msgid "Reverb:"
+msgstr "回響:"
 
-#: ../libpcsxcore/plugins.c:741
-#, c-format
-msgid "Error initializing GPU plugin: %d"
-msgstr "GPU 外掛初始化錯誤: %d"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:5
+msgid "Adjust XA speed"
+msgstr "調整 XA 速度"
 
-#: ../libpcsxcore/plugins.c:743
-#, c-format
-msgid "Error initializing SPU plugin: %d"
-msgstr "SPU 外掛初始化錯誤: %d"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:6
+msgid "Choose this if XA music is played too quickly."
+msgstr "如 XA 音樂播放得過快，選中此項。"
 
-#: ../libpcsxcore/plugins.c:745
-#, c-format
-msgid "Error initializing Controller 1 plugin: %d"
-msgstr "\"控制器1\" 外掛初始化錯誤: %d"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:7
+msgid "High compatibility mode"
+msgstr "高相容性模式"
 
-#: ../libpcsxcore/plugins.c:747
-#, c-format
-msgid "Error initializing Controller 2 plugin: %d"
-msgstr "\"控制器2\" 外掛初始化錯誤: %d"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:8
+msgid "Use the asynchronous SPU interface."
+msgstr "使用異步 SPU 介面。"
 
-#: ../libpcsxcore/plugins.c:751
-#, c-format
-msgid "Error initializing NetPlay plugin: %d"
-msgstr "聯線遊戲外掛初始化錯誤: %d"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:9
+msgid "SPU IRQ Wait"
+msgstr "SPU IRQ 等待"
 
-#: ../libpcsxcore/plugins.c:756
-#, c-format
-msgid "Error initializing SIO1 plugin: %d"
-msgstr "SIO1 外掛初始化錯誤: %d"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:10
+msgid "Wait for CPU; only useful for some games."
+msgstr "等待 CPU；僅在一部分遊戲中有效。"
 
-#: ../libpcsxcore/plugins.c:759
-msgid "Plugins loaded.\n"
-msgstr "外掛已加載。\n"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:11
+msgid "Single channel sound"
+msgstr "單聲道聲音"
 
-#: ../libpcsxcore/ppf.c:216
-#, c-format
-msgid "Invalid PPF patch: %s.\n"
-msgstr "無效 PPF 補丁: %s。\n"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:12
+msgid "Play only one channel for a performance boost."
+msgstr "僅播放一個聲道以提高性能。"
 
-#: ../libpcsxcore/ppf.c:292
-#, c-format
-msgid "Unsupported PPF version (%d).\n"
-msgstr "不支援的 PPF 補丁版本 (%d)。\n"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:13
+msgid "Frequency Response - Output Filter"
+msgstr "頻率響應 - 輸出過濾"
 
-#: ../libpcsxcore/ppf.c:331
-#, c-format
-msgid "Loaded PPF %d.0 patch: %s.\n"
-msgstr "已加載 PPF %d.0 補丁: %s。\n"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:15
+msgid "Simple"
+msgstr ""
 
-#: ../libpcsxcore/psxmem.c:80
-msgid "Error allocating memory!"
-msgstr "分配記憶體錯誤!"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:16
+#, fuzzy
+msgid "Gaussian"
+msgstr "俄語"
 
-#: ../libpcsxcore/psxmem.c:122
-#, c-format
-msgid "Could not open BIOS:\"%s\". Enabling HLE Bios!\n"
-msgstr "無法開啟 BIOS: \"%s\"。使用內部 HLE Bios。\n"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:17
+msgid "Cubic"
+msgstr ""
 
-#: ../libpcsxcore/r3000a.c:33
-#, c-format
-msgid "Running PCSX Version %s (%s).\n"
-msgstr "PCSX 版本 %s (%s) 執行中。\n"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:18
+msgid "Off"
+msgstr ""
 
-#: ../libpcsxcore/sio.c:345
-msgid "Connection closed!\n"
-msgstr "連接被關閉!\n"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:19
+#, fuzzy
+msgid "Playstation"
+msgstr ""
+"關閉\n"
+"簡易\n"
+"Playstation"
 
-#: ../libpcsxcore/sio.c:371
-#, c-format
-msgid "No memory card value was specified - creating a default card %s\n"
-msgstr "未指定記憶卡 - 創建一個新的記憶卡 %s\n"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:20
+msgid "Low"
+msgstr ""
 
-#: ../libpcsxcore/sio.c:375
-#, c-format
-msgid "The memory card %s doesn't exist - creating it\n"
-msgstr "記憶卡 %s 不存在 - 正在創建\n"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:21
+msgid "Medium"
+msgstr ""
 
-#: ../libpcsxcore/sio.c:391
-#, c-format
-msgid "Memory card %s failed to load!\n"
-msgstr "記憶卡 %s 讀取失敗!\n"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:22
+msgid "Loud"
+msgstr ""
 
-#: ../libpcsxcore/sio.c:395
-#, c-format
-msgid "Loading memory card %s\n"
-msgstr "正在加載記憶卡 %s\n"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:23
+msgid "Loudest"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpu.c:82
+msgid "Soft Driver"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpu.c:83
+msgid ""
+"P.E.Op.S. Soft Driver V1.17\n"
+"Coded by Pete Bernert and the P.E.Op.S. team\n"
+msgstr ""
 
-#: ../plugins/dfxvideo/gpu.c:55
+#: ../plugins/dfxvideo/gpu.c:85
 msgid "SoftGL Driver"
 msgstr "SoftGL 驅動程式"
 
-#: ../plugins/dfxvideo/gpu.c:56
+#: ../plugins/dfxvideo/gpu.c:86
 msgid ""
 "P.E.Op.S. SoftGL Driver V1.17\n"
 "Coded by Pete Bernert and the P.E.Op.S. team\n"
@@ -1688,11 +1819,11 @@
 "P.E.Op.S. SoftGL Driver V1.17\n"
 "Coded by Pete Bernert and the P.E.Op.S. team\n"
 
-#: ../plugins/dfxvideo/gpu.c:58
+#: ../plugins/dfxvideo/gpu.c:88
 msgid "XVideo Driver"
 msgstr "XVideo 驅動程式"
 
-#: ../plugins/dfxvideo/gpu.c:59
+#: ../plugins/dfxvideo/gpu.c:89
 msgid ""
 "P.E.Op.S. Xvideo Driver V1.17\n"
 "Coded by Pete Bernert and the P.E.Op.S. team\n"
@@ -1700,1490 +1831,1613 @@
 "P.E.Op.S. Xvideo 驅動程序 V1.17\n"
 "由 Pete Bernert 及 P.E.Op.S. 開發組編寫\n"
 
-#: ../plugins/dfxvideo/gpu.c:62
+#: ../plugins/dfxvideo/gpu.c:92
 msgid "Pete Bernert and the P.E.Op.S. team"
 msgstr "Pete Bernert 和 P.E.Op.S. 開發組"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:8
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:1
 msgid "Configure X11 Video"
 msgstr "設定 X11 Video"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:45
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:2
 msgid "Initial Window Size:"
 msgstr "初始視窗大小:"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:56
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:3
 msgid "Stretching:"
 msgstr "拉抻:"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:69
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:4
 msgid "Dithering:"
 msgstr "抖動:"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:82
-msgid ""
-"320x240\n"
-"640x480\n"
-"800x600\n"
-"1024x768\n"
-"1152x864\n"
-"1280x1024\n"
-"1600x1200"
-msgstr ""
-"320x240\n"
-"640x480\n"
-"800x600\n"
-"1024x768\n"
-"1152x864\n"
-"1280x1024\n"
-"1600x1200"
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:101
-msgid ""
-"0: None\n"
-"1: 2xSai\n"
-"2: 2xSuperSai\n"
-"3: SuperEagle\n"
-"4: Scale2x\n"
-"5: Scale3x\n"
-"6: HQ2X\n"
-"7: HQ3X"
-msgstr ""
-"0: 無\n"
-"1: 2xSai\n"
-"2: 2xSuperSai\n"
-"3: SuperEagle\n"
-"4: Scale2x\n"
-"5: Scale3x\n"
-"6: HQ2X\n"
-"7: HQ3X"
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:123
-msgid ""
-"0: Off (fastest)\n"
-"1: Game dependant\n"
-"2: Always"
-msgstr ""
-"0: 關閉 (最快)\n"
-"1: 取決于遊戲\n"
-"2: 總是開啟"
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:146
-msgid "Maintain 4:3 Aspect Ratio"
-msgstr "維持 4:3 縱橫比"
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:161
-#: ../plugins/peopsxgl/gpucfg/interface.c:322
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:5
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:4
 msgid "Fullscreen"
 msgstr "全螢幕"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:165
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:6
 msgid "Toggle windowed/fullscreen mode."
 msgstr "切換視窗/全螢幕方式。"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:187
-msgid "Screen"
-msgstr "螢幕"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:7
+msgid "Maintain 4:3 Aspect Ratio"
+msgstr "維持 4:3 縱橫比"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:216
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:8
 msgid "Show FPS"
 msgstr "顯示 FPS"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:220
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:9
 msgid "Toggle whether the FPS will be shown."
 msgstr "切換 FPS 是否將被顯示。"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:232
-msgid "Autodetect FPS limit"
-msgstr "自動偵測 FPS 界限"
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:236
-msgid "Enable this if games display too quickly."
-msgstr "如遊戲顯示過快，請開啟此項。"
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:249
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:10
 msgid "Enable frame skipping"
 msgstr "開啟跳幀"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:253
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:11
 msgid "Skip frames when rendering."
 msgstr "渲染時跳幀。"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:270
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:12
 msgid "Set FPS"
 msgstr "設定 FPS"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:287
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:13
+msgid "Enable this if games display too quickly."
+msgstr "如遊戲顯示過快，請開啟此項。"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:14
 msgid "200.0"
 msgstr "200.0"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:310
-msgid "Framerate"
-msgstr "幀率"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:15
+msgid "Autodetect FPS limit"
+msgstr "自動偵測 FPS 界限"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:339
-#: ../plugins/peopsxgl/gpucfg/interface.c:568
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:16
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:36
 msgid "Use game fixes"
 msgstr "開啟遊戲修補"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:366
-msgid "better g-colors, worse textures"
-msgstr "較好的 g-colors，較差的紋理"
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:381
-msgid "Needed by Dark Forces"
-msgstr "Dark Forces 需要"
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:394
-msgid "Draw quads with triangles"
-msgstr "用三角形繪製 quad"
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:410
-msgid "Repeated flat tex triangles"
-msgstr "重復平滑多邊形紋理"
-
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:426
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:17
 msgid "Disable CPU Saving"
 msgstr "禁用 CPU Saving"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:442
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:18
+msgid "For precise framerate"
+msgstr "確保準確幀率"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:19
 msgid "Odd/even bit hack"
 msgstr "奇偶位修正"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:458
-msgid "For precise framerate"
-msgstr "確保準確幀率"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:20
+msgid "Chrono Cross"
+msgstr "Chrono Cross"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:21
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:45
+msgid "PC FPS calculation"
+msgstr "PC FPS 計算"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:473
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:22
 msgid "Better FPS limit in some"
 msgstr "部分遊戲中可取得更佳的 FPS 界限"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:486
-msgid "PC FPS calculation"
-msgstr "PC FPS 計算"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:23
+msgid "Expand screen width"
+msgstr "擴展熒幕寬度"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:504
-msgid "Pandemonium 2"
-msgstr "Pandemonium 2"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:24
+msgid "Capcom fighting games"
+msgstr "Capcom 格鬥遊戲"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:25
+msgid "Ignore brightness color"
+msgstr "忽略高亮度顏色"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:26
+msgid "Black screens in Lunar"
+msgstr "Lunar 中黑螢幕"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:27
+msgid "Disable coordinate check"
+msgstr "禁用坐標檢查"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:28
+msgid "Compatibility mode"
+msgstr "相容方式"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:517
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:29
 msgid "Lazy screen update"
 msgstr "延遲熒幕更新"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:535
-msgid "Skip every second frame"
-msgstr "每兩幀跳過一幀"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:30
+msgid "Pandemonium 2"
+msgstr "Pandemonium 2"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:548
-#: ../plugins/peopsxgl/gpucfg/interface.c:640
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:31
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:46
 msgid "Old frame skipping"
 msgstr "老式跳幀"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:564
-msgid "Expand screen width"
-msgstr "擴展熒幕寬度"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:32
+msgid "Skip every second frame"
+msgstr "每兩幀跳過一幀"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:580
-msgid "Ignore brightness color"
-msgstr "忽略高亮度顏色"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:33
+msgid "Repeated flat tex triangles"
+msgstr "重復平滑多邊形紋理"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:596
-msgid "Disable coordinate check"
-msgstr "禁用坐標檢查"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:34
+msgid "Needed by Dark Forces"
+msgstr "Dark Forces 需要"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:614
-msgid "Chrono Cross"
-msgstr "Chrono Cross"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:35
+msgid "Draw quads with triangles"
+msgstr "用三角形繪製 quad"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:627
-msgid "Capcom fighting games"
-msgstr "Capcom 格鬥遊戲"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:36
+msgid "better g-colors, worse textures"
+msgstr "較好的 g-colors，較差的紋理"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:642
-msgid "Black screens in Lunar"
-msgstr "Lunar 中黑螢幕"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:37
+msgid "Fake 'gpu busy' states"
+msgstr "欺騙 'gpu 忙'"
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:657
-msgid "Compatibility mode"
-msgstr "相容方式"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:38
+msgid "Toggle busy flags after drawing"
+msgstr "繪製後切換忙碌標誌"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:39
+msgid "0: Off (fastest)"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:40
+msgid "1: Game dependant"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:41
+msgid "2: Always"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:42
+msgid "320x240"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:43
+msgid "640x480"
+msgstr ""
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:44
+msgid "800x600"
+msgstr ""
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:670
-msgid "Fake 'gpu busy' states"
-msgstr "欺騙 'gpu 忙'"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:45
+msgid "1024x768"
+msgstr ""
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:688
-msgid "Toggle busy flags after drawing"
-msgstr "繪製後切換忙碌標誌"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:46
+msgid "1152x864"
+msgstr ""
 
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:713
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:268
-msgid "Compatibility"
-msgstr "相容性"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:47
+msgid "1280x1024"
+msgstr ""
 
-#: ../data/pcsx.glade2:7
-msgid "PCSX"
-msgstr "PCSX"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:48
+msgid "1600x1200"
+msgstr ""
 
-#: ../data/pcsx.glade2:21
-msgid "_File"
-msgstr "檔案(_F)"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:49
+#, fuzzy
+msgid "0: None"
+msgstr "無"
 
-#: ../data/pcsx.glade2:27
-msgid "Run _CD"
-msgstr "執行光碟(_C)"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:50
+msgid "1: 2xSai"
+msgstr ""
 
-#: ../data/pcsx.glade2:45
-msgid "Run _ISO..."
-msgstr "執行 _ISO..."
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:51
+msgid "2: 2xSuperSai"
+msgstr ""
 
-#: ../data/pcsx.glade2:62
-msgid "Run _BIOS"
-msgstr "執行 _BIOS"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:52
+msgid "3: SuperEagle"
+msgstr ""
 
-#: ../data/pcsx.glade2:79
-msgid "Run _EXE..."
-msgstr "執行 _EXE..."
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:53
+msgid "4: Scale2x"
+msgstr ""
 
-#: ../data/pcsx.glade2:101
-msgid "E_xit"
-msgstr "離開(_X)"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:54
+msgid "5: Scale3x"
+msgstr ""
 
-#: ../data/pcsx.glade2:123
-msgid "_Emulator"
-msgstr "模擬器(_E)"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:55
+msgid "6: HQ2X"
+msgstr ""
 
-#: ../data/pcsx.glade2:129
-msgid "_Continue"
-msgstr "繼續(_C)"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.ui.h:56
+msgid "7: HQ3X"
+msgstr ""
 
-#: ../data/pcsx.glade2:146
-msgid "_Reset"
-msgstr "複位(_R)"
+#: ../plugins/peopsxgl/gpu.c:97
+msgid "OpenGL Driver"
+msgstr "OpenGL 驅動程式"
 
-#: ../data/pcsx.glade2:168
-msgid "S_witch ISO..."
-msgstr "更換 ISO(_W)"
+#: ../plugins/peopsxgl/gpu.c:99
+msgid "Pete Bernert"
+msgstr "Pete Bernert"
 
-#: ../data/pcsx.glade2:190
-msgid "_Save State"
-msgstr "存儲記錄(_S)"
+#: ../plugins/peopsxgl/gpu.c:100
+msgid ""
+"Based on P.E.Op.S. MesaGL Driver V1.78\n"
+"Coded by Pete Bernert\n"
+msgstr ""
+"基于 P.E.Op.S. MesaGL 驅動程式 V1.78\n"
+"由 Pete Bernert 編寫\n"
 
-#: ../data/pcsx.glade2:199
-#: ../data/pcsx.glade2:280
-msgid "Slot _1"
-msgstr "記錄 _1"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:1
+msgid "OpenGL Driver configuration"
+msgstr "OpenGL 驅動程式設定"
 
-#: ../data/pcsx.glade2:208
-#: ../data/pcsx.glade2:289
-msgid "Slot _2"
-msgstr "記錄 _2"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:2
+msgid "Width:"
+msgstr "寬度:"
 
-#: ../data/pcsx.glade2:217
-#: ../data/pcsx.glade2:298
-msgid "Slot _3"
-msgstr "記錄 _3"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:3
+msgid "Height:"
+msgstr "高度:"
 
-#: ../data/pcsx.glade2:226
-#: ../data/pcsx.glade2:307
-msgid "Slot _4"
-msgstr "記錄 _4"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:5
+msgid "Dithering"
+msgstr "抖動"
 
-#: ../data/pcsx.glade2:235
-#: ../data/pcsx.glade2:316
-msgid "Slot _5"
-msgstr "記錄 _5"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:6
+msgid "Keep psx aspect ratio"
+msgstr "保持 psx 縱橫比"
 
-#: ../data/pcsx.glade2:243
-#: ../data/pcsx.glade2:324
-msgid "_Other..."
-msgstr "其它(_O)..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:7
+msgid "Window options"
+msgstr "視窗設定"
 
-#: ../data/pcsx.glade2:271
-msgid "_Load State"
-msgstr "讀取記錄(_L)"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:8
+msgid "Quality:"
+msgstr "質量:"
 
-#: ../data/pcsx.glade2:357
-msgid "_Configuration"
-msgstr "設定(_C)"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:9
+msgid "Filtering:"
+msgstr "過濾:"
 
-#: ../data/pcsx.glade2:363
-msgid "_Plugins & BIOS..."
-msgstr "外掛及 BIOS(_P)..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:10
+msgid "HiRes Tex:"
+msgstr "高分辨率紋理:"
 
-#: ../data/pcsx.glade2:385
-msgid "_Graphics..."
-msgstr "圖像(_G)..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:11
+msgid "VRam size in MBytes (0..1024, 0=auto):"
+msgstr "顯存大小 MB (0..1024, 0=自動):"
 
-#: ../data/pcsx.glade2:400
-msgid "_Sound..."
-msgstr "聲音(_S)..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:12
+msgid "Textures"
+msgstr "紋理"
 
-#: ../data/pcsx.glade2:415
-msgid "CD-_ROM..."
-msgstr "CD-_ROM..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:13
+msgid "Show FPS display on startup"
+msgstr "啟動時顯示 FPS"
 
-#: ../data/pcsx.glade2:430
-msgid "C_ontrollers..."
-msgstr "控制器(_O)..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:14
+msgid "Use FPS limit"
+msgstr "开啟 FPS 界限"
 
-#: ../data/pcsx.glade2:450
-msgid "_CPU..."
-msgstr "_CPU..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:15
+msgid "FPS limit auto-detector"
+msgstr "FPS 界限自動偵測"
 
-#: ../data/pcsx.glade2:466
-msgid "_Memory Cards..."
-msgstr "記憶卡(_M)..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:16
+msgid "FPS limit manual"
+msgstr "手動設定 FPS 界限"
 
-#: ../data/pcsx.glade2:483
-msgid "_Netplay..."
-msgstr "聯線遊戲(_N)..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:17
+msgid "FPS"
+msgstr "FPS"
 
-#: ../data/pcsx.glade2:504
-msgid "Chea_t"
-msgstr "金手指(_T)"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:18
+msgid "Use Frame skipping"
+msgstr "開啟跳幀"
 
-#: ../data/pcsx.glade2:513
-msgid "_Browse..."
-msgstr "檢視(_B)..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:19
+msgid "Framerate"
+msgstr "幀率"
 
-#: ../data/pcsx.glade2:528
-msgid "_Search..."
-msgstr "搜尋(_S)..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:20
+msgid "Offscreen drawing:"
+msgstr "離熒幕描繪:"
 
-#: ../data/pcsx.glade2:554
-msgid "Memory _Dump"
-msgstr "記憶體轉儲(_D)"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:21
+msgid "Framebuffer textures:"
+msgstr "Framebuffer 紋理:"
 
-#: ../data/pcsx.glade2:574
-msgid "_Help"
-msgstr "說明(_H)"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:22
+msgid "Framebuffer access:"
+msgstr "Framebuffer 存取:"
 
-#: ../data/pcsx.glade2:580
-msgid "_About PCSX..."
-msgstr "關於 PCSX(_A)..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:23
+msgid "Mask bit detection (Needed by a few games, zbuffer)"
+msgstr "屏蔽位偵測 (部分遊戲需要, zbuffer)"
 
-#: ../data/pcsx.glade2:613
-#: ../data/pcsx.glade2:614
-msgid "Run CD"
-msgstr "執行光碟"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:24
+msgid "Alpha multipass (Correct opaque texture areas)"
+msgstr "半透明多通道 (更正不透明的紋理區域)"
 
-#: ../data/pcsx.glade2:626
-msgid "Run ISO Image"
-msgstr "執行 ISO 光碟映像"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:25
+msgid "Advanced blending (Accurate psx color emulation)"
+msgstr "高級混合 (準確的 psx 顏色模擬)"
 
-#: ../data/pcsx.glade2:627
-msgid "Run ISO..."
-msgstr "執行 ISO..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:26
+msgid "Compatibility"
+msgstr "相容性"
 
-#: ../data/pcsx.glade2:648
-msgid "Continue Emulation"
-msgstr "繼續模擬"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:27
+msgid "Scanlines Blending (0..255, -1=dot):"
+msgstr "掃描線混合 (0..255, -1=dot):"
 
-#: ../data/pcsx.glade2:649
-msgid "Continue..."
-msgstr "繼續..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:28
+msgid "Unfiltered MDECs (Small movie speedup)"
+msgstr "非過濾 MDECs (微小的影片加速)"
 
-#: ../data/pcsx.glade2:661
-msgid "Switch ISO Image"
-msgstr "更換 ISO 光碟映像"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:29
+msgid "Force 15 bit framebuffer updates (Faster movies)"
+msgstr "強制 15 位 framebuffer 更新 (影片較快)"
 
-#: ../data/pcsx.glade2:662
-msgid "Switch ISO..."
-msgstr "更換 ISO..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:30
+msgid "Line mode (Polygons will not get filled)"
+msgstr "直線模式 (多邊形將不被填充)"
 
-#: ../data/pcsx.glade2:683
-#: ../data/pcsx.glade2:1810
-msgid "Configure Memory Cards"
-msgstr "記憶卡設定"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:31
+msgid "Polygon anti-aliasing (Slow with most cards)"
+msgstr "多邊形抗鋸齒 (對于大多數顯卡較慢)"
 
-#: ../data/pcsx.glade2:684
-msgid "Memcards..."
-msgstr "記憶卡..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:32
+msgid "Use OpenGL extensions (Recommended)"
+msgstr "使用 OpenGL 擴展 (建議使用)"
 
-#: ../data/pcsx.glade2:696
-msgid "Configure Graphics"
-msgstr "圖像設定"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:33
+msgid "Screen smoothing (Can be slow or unsupported)"
+msgstr "平滑熒幕 (可能較慢或不被支援)"
 
-#: ../data/pcsx.glade2:697
-msgid "Graphics..."
-msgstr "圖像..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:34
+msgid "Gte accuracy"
+msgstr ""
 
-#: ../data/pcsx.glade2:709
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:8
-msgid "Configure Sound"
-msgstr "聲音設定"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:35
+msgid "Misc"
+msgstr "雜項"
 
-#: ../data/pcsx.glade2:710
-msgid "Sound..."
-msgstr "聲音..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:37
+msgid "Battle cursor (FF7)"
+msgstr "戰鬥光標 (FF7)"
 
-#: ../data/pcsx.glade2:722
-msgid "Configure CD-ROM"
-msgstr "CD-ROM 設定"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:38
+msgid "Yellow rect (FF9)"
+msgstr "黃色方塊 (FF9)"
 
-#: ../data/pcsx.glade2:723
-msgid "CD-ROM..."
-msgstr "CD-ROM..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:39
+msgid "Direct FB updates"
+msgstr "直接 FB 更新"
 
-#: ../data/pcsx.glade2:735
-msgid "Configure Controllers"
-msgstr "控制器設定"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:40
+msgid "Black brightness (Lunar)"
+msgstr "黑色亮度 (Lunar)"
 
-#: ../data/pcsx.glade2:736
-msgid "Controllers..."
-msgstr "控制器..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:41
+msgid "Swap front detection"
+msgstr "swap front 偵測"
 
-#: ../data/pcsx.glade2:879
-msgid "Select Folder to Search"
-msgstr "選擇要檢索的資料夾"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:42
+msgid "Disable coord check"
+msgstr "禁用坐標檢查"
 
-#: ../data/pcsx.glade2:895
-msgid "Search in:"
-msgstr "在此處檢索外掛:"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:43
+msgid "No blue glitches (LoD)"
+msgstr "無藍色干擾 (LoD)"
 
-#: ../data/pcsx.glade2:1168
-msgid "Graphics:"
-msgstr "圖像:"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:44
+msgid "Soft FB access"
+msgstr "軟 FB 存取"
 
-#: ../data/pcsx.glade2:1181
-msgid "Sound:"
-msgstr "聲音:"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:47
+msgid "No subtr. blending"
+msgstr "無 subtr. 混合"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:48
+msgid "Lazy upload (DW7)"
+msgstr "延遲上傳 (DW7)"
 
-#: ../data/pcsx.glade2:1196
-msgid "Controller 1: "
-msgstr "控制器 1:"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:49
+msgid "Odd/even hack"
+msgstr "奇偶位修正"
 
-#: ../data/pcsx.glade2:1211
-msgid "Controller 2:"
-msgstr "控制器 2:"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:50
+msgid "Adjust screen width"
+msgstr "調整熒幕寬度"
 
-#: ../data/pcsx.glade2:1226
-msgid "CD-ROM:"
-msgstr "CD-ROM:"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:51
+msgid "Old texture filtering"
+msgstr "老式紋理過濾"
 
-#: ../data/pcsx.glade2:1264
-msgid "Plugins"
-msgstr "外掛"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:52
+msgid "Additional uploads"
+msgstr "附加上傳"
 
-#: ../data/pcsx.glade2:1325
-msgid "BIOS"
-msgstr "BIOS"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:53
+msgid "Unused"
+msgstr "未使用"
 
-#: ../data/pcsx.glade2:1375
-msgid "Configure CPU"
-msgstr "CPU 設定"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:54
+msgid "Fake 'GPU busy'"
+msgstr "欺騙 'gpu 忙'"
 
-#: ../data/pcsx.glade2:1419
-msgid "SPU IRQ Always Enabled"
-msgstr "SPU IRQ 總是開啟"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:55
+msgid "Special game fixes"
+msgstr "特定遊戲修正"
 
-#: ../data/pcsx.glade2:1435
-msgid "Black & White Movies"
-msgstr "黑白電影"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:56
+msgid "Fast"
+msgstr ""
 
-#: ../data/pcsx.glade2:1469
-msgid "Enable Interpreter CPU"
-msgstr "開啟解釋執行 CPU"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:57
+msgid "Autoconfigure for fast display"
+msgstr ""
 
-#: ../data/pcsx.glade2:1503
-msgid "Disable CD Audio"
-msgstr "禁用 CD 音頻"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:58
+msgid "Beautiful"
+msgstr ""
 
-#: ../data/pcsx.glade2:1519
-msgid "Disable XA Decoding"
-msgstr "禁用 XA 解碼"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:59
+msgid "Auto configure for beautiful display"
+msgstr ""
 
-#: ../data/pcsx.glade2:1571
-msgid "Options"
-msgstr "選項"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:60
+msgid "None - Fastest, most glitches"
+msgstr ""
 
-#: ../data/pcsx.glade2:1612
-msgid ""
-"NTSC\n"
-"PAL"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:61
+msgid "Minimum - Missing screens"
 msgstr ""
-"NTSC\n"
-"PAL"
 
-#: ../data/pcsx.glade2:1626
-msgid "System Type"
-msgstr "系統類型"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:62
+msgid "Standard - OK for most games"
+msgstr ""
 
-#: ../data/pcsx.glade2:1674
-msgid "Configure NetPlay"
-msgstr "聯線遊戲設定"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:63
+msgid "Enhanced - Shows more stuff"
+msgstr ""
 
-#: ../data/pcsx.glade2:1760
-msgid "NetPlay"
-msgstr "聯線遊戲"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:64
+msgid "Extended - Causing garbage"
+msgstr ""
 
-#: ../data/pcsx.glade2:1886
-#: ../data/pcsx.glade2:2283
-msgid "New"
-msgstr "新增"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:65
+msgid "None (Standard)"
+msgstr "無 (標準)"
 
-#: ../data/pcsx.glade2:1936
-#: ../data/pcsx.glade2:2333
-msgid "Format"
-msgstr "格式化"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:66
+msgid "2xSaI (Much vram needed)"
+msgstr ""
 
-#: ../data/pcsx.glade2:1986
-#: ../data/pcsx.glade2:2383
-msgid "Un/Delete"
-msgstr "刪除/恢複"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:67
+msgid "Scaled (Needs tex filtering)"
+msgstr ""
 
-#: ../data/pcsx.glade2:2079
-msgid "Memory Card 1"
-msgstr "記憶卡 1"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:69
+msgid "Standard - Glitches will happen"
+msgstr "標準 - 可能有問題"
 
-#: ../data/pcsx.glade2:2139
-#: ../data/pcsx.glade2:2189
-#: ../data/pcsx.glade2:3002
-msgid "Copy"
-msgstr "複制"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:70
+msgid "Extended - No black borders"
+msgstr "擴展 - 無黑色邊緣"
 
-#: ../data/pcsx.glade2:2476
-msgid "Memory Card 2"
-msgstr "記憶卡 2"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:71
+msgid "Standard without sprites - Unfiltered 2D"
+msgstr ""
 
-#: ../data/pcsx.glade2:2572
-msgid "Cheat Codes"
-msgstr "金手指碼"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:72
+msgid "Extended without sprites - Unfiltered 2D"
+msgstr ""
 
-#: ../data/pcsx.glade2:2736
-msgid ""
-"8-bit\n"
-"16-bit\n"
-"32-bit"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:73
+msgid "Standard + smoothed sprites"
 msgstr ""
-"8 位元\n"
-"16 位元\n"
-"32 位元"
 
-#: ../data/pcsx.glade2:2799
-msgid ""
-"Equal Value\n"
-"Not Equal Value\n"
-"Range\n"
-"Increased By\n"
-"Decreased By\n"
-"Increased\n"
-"Decreased\n"
-"Different\n"
-"No Change"
-msgstr ""
-"等于數值\n"
-"不等于數值\n"
-"範圍\n"
-"增加數值\n"
-"減少數值\n"
-"增加\n"
-"減少\n"
-"不同\n"
-"無變動"
-
-#: ../data/pcsx.glade2:2831
-msgid ""
-"Decimal\n"
-"Hexadecimal"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:74
+msgid "Extended + smoothed sprites"
 msgstr ""
-"十進制\n"
-"十六進制"
 
-#: ../data/pcsx.glade2:3035
-msgid "label_resultsfound"
-msgstr "label_resultsfound"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:75
+msgid "Don't care - Use driver's default textures"
+msgstr "不設定 - 使用驅動程式缺省紋理"
 
-#: ../data/pcsx.glade2:3070
-msgid "Search"
-msgstr "搜尋"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:76
+msgid "4444 - Fast, but less colorful"
+msgstr ""
 
-#: ../data/pcsx.glade2:3106
-msgid "Restart"
-msgstr "重新開始"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:77
+msgid "5551 - Nice colors, bad transparency"
+msgstr ""
 
-#: ../data/pcsx.glade2:3135
-msgid "Cheat Search"
-msgstr "金手指碼搜尋"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:78
+msgid "8888 - Best colors, more ram needed"
+msgstr ""
 
-#: ../data/pcsx.glade2:3291
-msgid "Raw Dump..."
-msgstr "Raw 轉儲..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:79
+msgid "BGR8888 - Faster on some cards"
+msgstr ""
 
-#: ../data/pcsx.glade2:3326
-msgid "Patch Memory..."
-msgstr "修改記憶體..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:80
+msgid "Emulated VRam - Ok most times"
+msgstr ""
 
-#: ../plugins/dfsound/spu.c:38
-msgid "Mac OS X Sound"
-msgstr "Mac OS X 聲音"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:81
+msgid "Gfx card buffer reads"
+msgstr ""
 
-#: ../plugins/dfsound/spu.c:40
-msgid "ALSA Sound"
-msgstr "ALSA 聲音"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:82
+msgid "Gfx card buffer moves"
+msgstr ""
 
-#: ../plugins/dfsound/spu.c:42
-msgid "OSS Sound"
-msgstr "OSS 聲音"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:83
+msgid "Gfx card buffer reads and moves"
+msgstr ""
 
-#: ../plugins/dfsound/spu.c:44
-msgid "SDL Sound"
-msgstr "SDL 聲音"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:84
+msgid "Full Software (FVP)"
+msgstr "全軟體 (FVP)"
 
-#: ../plugins/dfsound/spu.c:46
-msgid "PulseAudio Sound"
-msgstr "PulseAudio 聲音"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:85
+msgid "Emulated VRam - Needs FVP"
+msgstr ""
 
-#: ../plugins/dfsound/spu.c:48
-msgid "NULL Sound"
-msgstr "NULL 聲音"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:86
+msgid "Black - Fast, no effects"
+msgstr ""
 
-#: ../plugins/dfsound/spu.c:51
-msgid ""
-"P.E.Op.S. Sound Driver V1.7\n"
-"Coded by Pete Bernert and the P.E.Op.S. team\n"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:87
+msgid "Gfx card buffer - Can be slow"
 msgstr ""
-"P.E.Op.S. Sound 驅動程式 V1.7\n"
-"由 Pete Bernert 及 P.E.Op.S. 開發組編寫\n"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:42
-msgid "Volume:"
-msgstr "音量:"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:88
+msgid "Gfx card and soft - Slow"
+msgstr ""
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:54
-msgid "Interpolation:"
-msgstr "插值:"
+#: ../plugins/bladesio1/gui.c:112
+#, fuzzy
+msgid "Link Cable Configuration"
+msgstr "設定"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:68
-msgid "Reverb:"
-msgstr "回響:"
+#. *************************************************************************
+#. #define SIO1_DEBUG 1
+#: ../plugins/bladesio1/sio1.c:44
+msgid "sio1Blade"
+msgstr ""
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:81
-msgid ""
-"Low\n"
-"Medium\n"
-"Loud\n"
-"Loudest"
+#. *************************************************************************
+#: ../plugins/bladesio1/sio1.ui.h:1 ../win32/gui/AboutDlg.c:48
+#: ../win32/gui/AboutDlg.c:52 ../win32/gui/CheatDlg.c:69
+#: ../win32/gui/CheatDlg.c:119 ../win32/gui/ConfigurePlugins.c:529
+#: ../win32/gui/ConfigurePlugins.c:667 ../win32/gui/WndMain.c:1088
+#: ../win32/gui/WndMain.c:1324
+msgid "OK"
+msgstr "確定"
+
+#: ../plugins/bladesio1/sio1.ui.h:2
+msgid "CANCEL"
 msgstr ""
-"低\n"
-"中\n"
-"高\n"
-"最高"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:95
+#: ../plugins/bladesio1/sio1.ui.h:3
+#, fuzzy
 msgid ""
-"Off\n"
-"Simple\n"
-"Playstation"
+"Select here if you'll be Server (Player1) or Client (Player2).\n"
+"If you select Server you must Copy your IP address to the Clipboard and "
+"paste if (Ctrl+V) wherever the Client can see it.\n"
+"If you selected Client please enter the IP address the Server gave to you in "
+"the IP Address Control."
 msgstr ""
-"關閉\n"
-"簡易\n"
-"Playstation"
+"在此選擇以伺服器端 (玩家 1) 還是客戶端 (玩家 2) 方式執行。\n"
+"\n"
+"如果您選擇伺服器端，您必須將您的 IP 地址複制到剪貼板並告知客戶端。\n"
+"\n"
+"如果您選擇客戶端，請輸入伺服器端提供給您的 IP 地址。"
+
+#: ../plugins/bladesio1/sio1.ui.h:9
+#, fuzzy
+msgid "Disabled"
+msgstr "XA 已禁用"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:111
+#: ../win32/gui/AboutDlg.c:26
 msgid ""
-"None\n"
-"Simple\n"
-"Gaussian\n"
-"Cubic"
+"PCSXR - A PlayStation Emulator\n"
+"\n"
+"Original Authors:\n"
+"main coder: linuzappz\n"
+"co-coders: shadow\n"
+"ex-coders: Nocomp, Pete Bernett, nik3d\n"
+"Webmaster: AkumaX"
 msgstr ""
-"無\n"
-"簡易\n"
-"高斯\n"
-"立方"
+"PCSXR - 一個 PlayStation 模擬器\n"
+"\n"
+"原作者:\n"
+"主程式: linuzappz\n"
+"輔助程式: shadow\n"
+"前程式: Nocomp, Pete Bernett, nik3d\n"
+"網站管理: AkumaX"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:132
-msgid "General"
-msgstr "一般"
+#: ../win32/gui/AboutDlg.c:35
+msgid ""
+"PCSX-df Authors:\n"
+"Ryan Schultz, Andrew Burton, Stephen Chao,\n"
+"Marcus Comstedt, Stefan Sikora\n"
+"\n"
+"PCSX-Reloaded By:\n"
+"edgbla, shalma, Wei Mingzhi, et al.\n"
+"\n"
+"http://pcsxr.codeplex.com/"
+msgstr ""
+"PCSX-df 開發者:\n"
+"Ryan Schultz, Andrew Burton, Stephen Chao,\n"
+"Marcus Comstedt, Stefan Sikora\n"
+"\n"
+"PCSX-Reloaded 開發者:\n"
+"edgbla, shalma, Wei Mingzhi, et al.\n"
+"\n"
+"http://pcsxr.codeplex.com/"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:163
-msgid "Adjust XA speed"
-msgstr "調整 XA 速度"
+#: ../win32/gui/AboutDlg.c:46
+msgid "About"
+msgstr "關於 PCSXR"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:167
-msgid "Choose this if XA music is played too quickly."
-msgstr "如 XA 音樂播放得過快，選中此項。"
+#: ../win32/gui/AboutDlg.c:49
+msgid "PCSXR EMU\n"
+msgstr "PCSXR 模擬器\n"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:184
-msgid "XA Music"
-msgstr "XA 音樂"
+#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
+#: ../win32/gui/CheatDlg.c:270
+msgid "Yes"
+msgstr "是"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:215
-msgid "High compatibility mode"
-msgstr "高相容性模式"
+#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
+#: ../win32/gui/CheatDlg.c:270
+msgid "No"
+msgstr "否"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:219
-msgid "Use the asynchronous SPU interface."
-msgstr "使用異步 SPU 介面。"
+#: ../win32/gui/CheatDlg.c:70 ../win32/gui/CheatDlg.c:120
+#: ../win32/gui/ConfigurePlugins.c:530 ../win32/gui/ConfigurePlugins.c:668
+#: ../win32/gui/WndMain.c:1089 ../win32/gui/WndMain.c:1325
+msgid "Cancel"
+msgstr "取消"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:231
-msgid "SPU IRQ Wait"
-msgstr "SPU IRQ 等待"
+#: ../win32/gui/CheatDlg.c:168
+msgid "&Add Code"
+msgstr "增加金手指碼(&A)"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:235
-msgid "Wait for CPU; only useful for some games."
-msgstr "等待 CPU；僅在一部分遊戲中有效。"
+#: ../win32/gui/CheatDlg.c:169
+msgid "&Edit Code"
+msgstr "編輯金手指(&E):"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:247
-msgid "Single channel sound"
-msgstr "單聲道聲音"
+#: ../win32/gui/CheatDlg.c:170
+msgid "&Remove Code"
+msgstr "刪除金手指碼(&R)"
 
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:251
-msgid "Play only one channel for a performance boost."
-msgstr "僅播放一個聲道以提高性能。"
+#: ../win32/gui/CheatDlg.c:171
+msgid "&Enable/Disable"
+msgstr "開啟/關閉(&E)"
 
-#: ../plugins/dfcdrom/cdr-libcdio.c:29
-#: ../plugins/dfcdrom/cdr-linux.c:29
-msgid "CD-ROM Drive Reader"
-msgstr "CD-ROM 裝置讀取外掛"
+#: ../win32/gui/CheatDlg.c:172
+msgid "&Load..."
+msgstr "讀取(&L)..."
 
-#: ../plugins/dfcdrom/cdr-null.c:26
-msgid "CDR NULL Plugin"
-msgstr "CDR NULL 外掛"
+#: ../win32/gui/CheatDlg.c:173
+msgid "&Save As..."
+msgstr "存儲為(&S)..."
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/main.c:219
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:8
-msgid "CDR configuration"
-msgstr "CDR 設定"
+#: ../win32/gui/CheatDlg.c:174
+msgid "&Close"
+msgstr "關閉(&C)"
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:33
-msgid "Choose your CD-ROM device or type its path if it's not listed"
-msgstr "選擇 CD-ROM 裝置，如未列出請輸入其路徑"
+#: ../win32/gui/CheatDlg.c:190
+msgid "Enabled"
+msgstr "開啟"
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:44
-msgid "Select CD-ROM device"
-msgstr "選擇 CD-ROM 裝置"
+#: ../win32/gui/CheatDlg.c:282 ../win32/gui/CheatDlg.c:311
+msgid "PCSXR Cheat Code Files"
+msgstr "PCSXR 金手指檔 (*.cht)"
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:72
-msgid "Select read mode:"
-msgstr "選擇讀取模式:"
+#: ../win32/gui/CheatDlg.c:453
+msgid "No addresses found."
+msgstr "未找到位址。"
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:83
-msgid ""
-"Normal (No Cache)\n"
-"Threaded - Faster (With Cache)"
-msgstr ""
-"正常 (無快取)\n"
-"多執行緒 - 較快 (使用快取)"
+#: ../win32/gui/CheatDlg.c:505 ../win32/gui/CheatDlg.c:596
+msgid "Address:"
+msgstr "位址:"
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:114
-msgid "Cache Size (Def. 64):"
-msgstr "快取大小 (缺省 64):"
+#: ../win32/gui/CheatDlg.c:566
+#, c-format
+msgid "Freeze %.8X"
+msgstr "固定 %.8X"
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:159
-msgid "Spindown Time:"
-msgstr "電機停轉時限:"
+#: ../win32/gui/CheatDlg.c:685
+msgid "&Freeze"
+msgstr "固定(&F)"
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:170
-msgid ""
-"Default\n"
-"125ms\n"
-"250ms\n"
-"500ms\n"
-"1s\n"
-"2s\n"
-"4s\n"
-"8s\n"
-"16s\n"
-"32s\n"
-"1min\n"
-"2min\n"
-"4min\n"
-"8min\n"
-"16min\n"
-"32min"
-msgstr ""
-"缺省\n"
-"125 毫秒\n"
-"250 毫秒\n"
-"500 毫秒\n"
-"1 秒\n"
-"2 秒\n"
-"4 秒\n"
-"8 秒\n"
-"16 秒\n"
-"32 秒\n"
-"1 分鐘\n"
-"2 分鐘\n"
-"4 分鐘\n"
-"8 分鐘\n"
-"16 分鐘\n"
-"32 分鐘"
-
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:216
-msgid "Cdrom Speed (Def. 0 = MAX):"
-msgstr "Cdrom 速度 (缺省 0 = 最快):"
+#: ../win32/gui/CheatDlg.c:686
+msgid "&Modify"
+msgstr "更改(&M)"
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:248
-msgid "hseparator"
-msgstr "hseparator"
+#: ../win32/gui/CheatDlg.c:687
+msgid "&Copy"
+msgstr "複制(&C)"
 
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:258
-msgid "Enable subchannel read"
-msgstr "開啟子通道讀取"
+#: ../win32/gui/CheatDlg.c:688
+msgid "&Search"
+msgstr "搜尋(&S)"
 
-#: ../plugins/peopsxgl/gpu.c:61
-msgid "OpenGL Driver"
-msgstr "OpenGL 驅動程式"
+#: ../win32/gui/CheatDlg.c:689
+msgid "&New Search"
+msgstr "新搜尋(&N)"
 
-#: ../plugins/peopsxgl/gpu.c:63
-msgid "Pete Bernert"
-msgstr "Pete Bernert"
+#: ../win32/gui/CheatDlg.c:690
+msgid "C&lose"
+msgstr "關閉(&L)"
 
-#: ../plugins/peopsxgl/gpu.c:64
-msgid ""
-"Based on P.E.Op.S. MesaGL Driver V1.78\n"
-"Coded by Pete Bernert\n"
-msgstr ""
-"基于 P.E.Op.S. MesaGL 驅動程式 V1.78\n"
-"由 Pete Bernert 編寫\n"
+#: ../win32/gui/ConfigurePlugins.c:234
+msgid "Simulate Psx Bios"
+msgstr "模擬 PS BIOS"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:118
-msgid "OpenGL Driver configuration"
-msgstr "OpenGL 驅動程式設定"
+#: ../win32/gui/ConfigurePlugins.c:330
+msgid "Configuration not OK!"
+msgstr "設定不正確!"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:138
-msgid "Textures"
-msgstr "紋理"
+#: ../win32/gui/ConfigurePlugins.c:445
+msgid "This plugin reports that should work correctly"
+msgstr "此外掛報告其可正常工作。"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:161
-msgid "Quality:"
-msgstr "質量:"
+#: ../win32/gui/ConfigurePlugins.c:446
+msgid "This plugin reports that should not work correctly"
+msgstr "此外掛報告其不可正常工作。"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:178
-#: ../plugins/peopsxgl/gpucfg/interface.c:191
-msgid "0: don't care - Use driver's default textures"
-msgstr "0: 不設定 - 使用驅動程式缺省紋理"
+#: ../win32/gui/ConfigurePlugins.c:509
+msgid "Select Plugins Directory"
+msgstr "選擇外掛目錄"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:179
-msgid "1: 4444 - Fast, but less colorful"
-msgstr ""
+#: ../win32/gui/ConfigurePlugins.c:518
+msgid "Select Bios Directory"
+msgstr "選擇 BIOS 目錄"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:180
-msgid "2: 5551 - Nice colors, bad transparency"
-msgstr ""
+#: ../win32/gui/ConfigurePlugins.c:527
+msgid "Configuration"
+msgstr "設定"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:181
-msgid "3: 8888 - Best colors, more ram needed"
-msgstr ""
+#: ../win32/gui/ConfigurePlugins.c:531
+msgid "Graphics"
+msgstr "圖像"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:182
-msgid "4: BGR8888 - Faster on some cards"
-msgstr ""
+#: ../win32/gui/ConfigurePlugins.c:532
+msgid "First Controller"
+msgstr "主控制器"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:193
-msgid "VRam size in MBytes (0..1024, 0=auto):"
-msgstr "顯存大小 MB (0..1024, 0=自動):"
+#: ../win32/gui/ConfigurePlugins.c:533
+msgid "Second Controller"
+msgstr "輔控制器"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:210
-#: ../plugins/peopsxgl/gpucfg/interface.c:225
-msgid "0: None"
-msgstr "0: 無"
+#: ../win32/gui/ConfigurePlugins.c:534
+msgid "Sound"
+msgstr "聲音"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:211
-msgid "1: Standard - Glitches will happen"
-msgstr "1: 標準 - 可能有問題"
+#: ../win32/gui/ConfigurePlugins.c:535
+msgid "Cdrom"
+msgstr "CD-ROM"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:212
-msgid "2: Extended - No black borders"
-msgstr "2: 擴展 - 無黑色邊緣"
+#: ../win32/gui/ConfigurePlugins.c:536
+#, fuzzy
+msgid "Link cable"
+msgstr "開啟"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:213
-msgid "3: Standard without sprites - unfiltered 2D"
-msgstr ""
+#: ../win32/gui/ConfigurePlugins.c:537
+msgid "Bios"
+msgstr "BIOS"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:214
-msgid "4: Extended without sprites - unfiltered 2D"
-msgstr ""
+#: ../win32/gui/ConfigurePlugins.c:538
+msgid "Set Bios Directory"
+msgstr "設定 BIOS 目錄"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:215
-msgid "5: Standard + smoothed sprites"
-msgstr ""
+#: ../win32/gui/ConfigurePlugins.c:539
+msgid "Set Plugins Directory"
+msgstr "設定外掛目錄"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:216
-msgid "6: Extended + smoothed sprites"
-msgstr ""
+#: ../win32/gui/ConfigurePlugins.c:540 ../win32/gui/ConfigurePlugins.c:543
+#: ../win32/gui/ConfigurePlugins.c:546 ../win32/gui/ConfigurePlugins.c:549
+#: ../win32/gui/ConfigurePlugins.c:552 ../win32/gui/ConfigurePlugins.c:555
+#: ../win32/gui/ConfigurePlugins.c:670
+msgid "Configure..."
+msgstr "設定..."
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:227
-msgid "Filtering:"
-msgstr "過濾:"
+#: ../win32/gui/ConfigurePlugins.c:541 ../win32/gui/ConfigurePlugins.c:544
+#: ../win32/gui/ConfigurePlugins.c:547 ../win32/gui/ConfigurePlugins.c:550
+#: ../win32/gui/ConfigurePlugins.c:553 ../win32/gui/ConfigurePlugins.c:556
+#: ../win32/gui/ConfigurePlugins.c:671
+msgid "Test..."
+msgstr "測試..."
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:235
-msgid "HiRes Tex:"
-msgstr "高分辨率紋理:"
+#: ../win32/gui/ConfigurePlugins.c:542 ../win32/gui/ConfigurePlugins.c:545
+#: ../win32/gui/ConfigurePlugins.c:548 ../win32/gui/ConfigurePlugins.c:551
+#: ../win32/gui/ConfigurePlugins.c:554 ../win32/gui/ConfigurePlugins.c:557
+#: ../win32/gui/ConfigurePlugins.c:672
+msgid "About..."
+msgstr "關於..."
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:252
-#: ../plugins/peopsxgl/gpucfg/interface.c:263
-msgid "0: None (standard)"
-msgstr "0: 無 (標準)"
+#: ../win32/gui/ConfigurePlugins.c:665
+msgid "NetPlay Configuration"
+msgstr "聯線遊戲設定"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:253
-msgid "1: 2xSaI (much vram needed)"
-msgstr ""
+#: ../win32/gui/ConfigurePlugins.c:673
+msgid ""
+"Note: The NetPlay Plugin Directory should be the same as the other Plugins."
+msgstr "注意: 聯線遊戲外掛應和其它外掛放在同一資料夾中。"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:254
-msgid "2: Scaled (needs tex filtering)"
-msgstr ""
+#: ../win32/gui/plugin.c:94 ../win32/gui/WndMain.c:331
+#, c-format
+msgid "*PCSXR*: Saved State %d"
+msgstr "*PCSXR*: Saved State %d"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:265
-msgid "Window options"
-msgstr "視窗設定"
+#: ../win32/gui/plugin.c:95 ../win32/gui/WndMain.c:332
+#, c-format
+msgid "*PCSXR*: Error Saving State %d"
+msgstr "*PCSXR*: Error Saving State %d"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:296
-msgid "Width:"
-msgstr "寬度:"
+#: ../win32/gui/plugin.c:111 ../win32/gui/WndMain.c:309
+#, c-format
+msgid "*PCSXR*: Loaded State %d"
+msgstr "*PCSXR*: Loaded State %d"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:305
-msgid "Height:"
-msgstr "高度:"
+#: ../win32/gui/plugin.c:112 ../win32/gui/WndMain.c:310
+#, c-format
+msgid "*PCSXR*: Error Loading State %d"
+msgstr "*PCSXR*: Error Loading State %d"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:314
-msgid "Keep psx aspect ratio"
-msgstr "保持 psx 縱橫比"
+#: ../win32/gui/plugin.c:123
+#, c-format
+msgid "*PCSXR*: Sio Irq Always Enabled"
+msgstr "*PCSXR*: Sio Irq Always Enabled"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:330
-msgid "Dithering"
-msgstr "抖動"
+#: ../win32/gui/plugin.c:124
+#, c-format
+msgid "*PCSXR*: Sio Irq Not Always Enabled"
+msgstr "*PCSXR*: Sio Irq Not Always Enabled"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:346
-msgid "Framerate"
-msgstr "幀率"
+#: ../win32/gui/plugin.c:131
+#, c-format
+msgid "*PCSXR*: Black&White Mdecs Only Enabled"
+msgstr "*PCSXR*: Black&White Mdecs Only Enabled"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:369
-msgid "FPS"
-msgstr "FPS"
+#: ../win32/gui/plugin.c:132
+#, c-format
+msgid "*PCSXR*: Black&White Mdecs Only Disabled"
+msgstr "*PCSXR*: Black&White Mdecs Only Disabled"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:377
-msgid "FPS limit manual"
-msgstr "手動設定 FPS 界限"
+#: ../win32/gui/plugin.c:139
+#, c-format
+msgid "*PCSXR*: Xa Enabled"
+msgstr "*PCSXR*: Xa Enabled"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:386
-msgid "Show FPS display on startup"
-msgstr "啟動時顯示 FPS"
+#: ../win32/gui/plugin.c:140
+#, c-format
+msgid "*PCSXR*: Xa Disabled"
+msgstr "*PCSXR*: Xa Disabled"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:394
-msgid "Use FPS limit"
-msgstr "开啟 FPS 界限"
+#: ../win32/gui/plugin.c:149
+msgid "*PCSXR*: CdRom Case Opened"
+msgstr "*PCSXR*: CdRom Case Opened"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:402
-msgid "FPS limit auto-detection"
-msgstr "FPS 界限自動偵測"
+#: ../win32/gui/plugin.c:155
+msgid "*PCSXR*: CdRom Case Closed"
+msgstr "*PCSXR*: CdRom Case Closed"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:411
-msgid "Use Frame skipping"
-msgstr "開啟跳幀"
+#: ../win32/gui/plugin.c:181
+msgid "Connecting..."
+msgstr "正在連線..."
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:419
-msgid "Compatibility"
-msgstr "相容性"
+#: ../win32/gui/plugin.c:183 ../win32/gui/plugin.c:190
+#, c-format
+msgid "Please wait while connecting... %c\n"
+msgstr "請稍候，正在連線... %c\n"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:434
-msgid "Advanced blending (Accurate psx color emulation)"
-msgstr "高級混合 (準確的 psx 顏色模擬)"
+#: ../win32/gui/plugin.c:218
+msgid "Error Opening CDR Plugin"
+msgstr "無法開啟 CDR 外掛"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:442
-msgid "Framebuffer textures:"
-msgstr "Framebuffer 紋理:"
+#: ../win32/gui/plugin.c:281
+#, c-format
+msgid "Error Opening GPU Plugin (%d)"
+msgstr "無法開啟 GPU 外掛 (%d)"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:450
-msgid "Offscreen Drawing:"
-msgstr "離熒幕描繪:"
+#: ../win32/gui/plugin.c:283
+#, c-format
+msgid "Error Opening SPU Plugin (%d)"
+msgstr "無法開啟 SPU 外掛 (%d)"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:458
-msgid "Framebuffer access:"
-msgstr "Framebuffer 存取:"
+#: ../win32/gui/plugin.c:286
+#, c-format
+msgid "Error Opening PAD1 Plugin (%d)"
+msgstr "無法開啟 PAD1 外掛 (%d)"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:466
-msgid "Alpha Multipass (correct opaque texture areas)"
-msgstr "半透明多通道 (更正不透明的紋理區域)"
+#: ../win32/gui/plugin.c:290
+#, c-format
+msgid "Error Opening PAD2 Plugin (%d)"
+msgstr "無法開啟 PAD2 外掛 (%d)"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:474
-msgid "Mask bit detection (needed by a few games, zbuffer)"
-msgstr "屏蔽位偵測 (部分遊戲需要, zbuffer)"
+#: ../win32/gui/plugin.c:295
+#, fuzzy, c-format
+msgid "Error Opening SIO1 plugin (%d)"
+msgstr "無法開啟 SPU 外掛 (%d)"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:491
-#: ../plugins/peopsxgl/gpucfg/interface.c:504
-msgid "0: None - Fastest, most glitches"
-msgstr ""
+#: ../win32/gui/plugin.c:325
+msgid "Error Closing CDR Plugin"
+msgstr "無法關閉 CD-ROM 外掛 (%d)"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:492
-msgid "1: Minimum - Missing screens"
-msgstr ""
+#: ../win32/gui/plugin.c:327
+msgid "Error Closing GPU Plugin"
+msgstr "無法關閉 GPU 外掛"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:493
-msgid "2: Standard - OK for most games"
-msgstr ""
+#: ../win32/gui/plugin.c:329
+msgid "Error Closing SPU Plugin"
+msgstr "無法關閉 SPU 外掛"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:494
-msgid "3: Enhanced - Shows more stuff"
-msgstr ""
+#: ../win32/gui/plugin.c:332
+#, fuzzy
+msgid "Error Closing SIO1 plugin"
+msgstr "無法關閉 SPU 外掛"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:495
-msgid "4: Extended - Causing garbage"
-msgstr ""
+#: ../win32/gui/plugin.c:354
+#, c-format
+msgid "CDRinit error: %d"
+msgstr "CDRinit 錯誤: %d"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:515
-#: ../plugins/peopsxgl/gpucfg/interface.c:527
-msgid "0: Emulated vram - Needs FVP"
-msgstr ""
+#: ../win32/gui/plugin.c:356
+#, c-format
+msgid "GPUinit error: %d"
+msgstr "GPUinit 錯誤: %d"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:516
-msgid "1: Black - Fast, no effects"
-msgstr ""
+#: ../win32/gui/plugin.c:358
+#, c-format
+msgid "SPUinit error: %d"
+msgstr "SPUinit 錯誤: %d"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:517
-msgid "2: Gfx card buffer - Can be slow"
-msgstr ""
+#: ../win32/gui/plugin.c:360
+#, c-format
+msgid "PAD1init error: %d"
+msgstr "PAD1init 錯誤: %d"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:518
-msgid "3: Gfx card & soft - slow"
-msgstr ""
+#: ../win32/gui/plugin.c:362
+#, c-format
+msgid "PAD2init error: %d"
+msgstr "PAD2init 錯誤: %d"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:538
-#: ../plugins/peopsxgl/gpucfg/interface.c:551
-msgid "0: Emulated vram - ok most times"
-msgstr ""
+#: ../win32/gui/plugin.c:365
+#, fuzzy, c-format
+msgid "SIO1init error: %d"
+msgstr "SPUinit 錯誤: %d"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:539
-msgid "1: Gfx card buffer reads"
-msgstr ""
+#: ../win32/gui/plugin.c:370
+#, c-format
+msgid "NETinit error: %d"
+msgstr "NETinit 錯誤: %d"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:540
-msgid "2: Gfx card buffer moves"
-msgstr ""
+#: ../win32/gui/WndMain.c:77
+msgid "Arabic"
+msgstr "阿拉伯語"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:541
-msgid "3: Gfx buffer reads & moves"
-msgstr ""
+#: ../win32/gui/WndMain.c:78
+msgid "Catalan"
+msgstr "加泰隆尼亞語"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:542
-msgid "4: Full Software (FVP)"
-msgstr "4: 全軟體 (FVP)"
+#: ../win32/gui/WndMain.c:79
+msgid "German"
+msgstr "德語"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:553
-msgid "Special game fixes"
-msgstr "特定遊戲修正"
+#: ../win32/gui/WndMain.c:80
+msgid "Greek"
+msgstr "希臘語"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:576
-msgid "Battle cursor (FF7)"
-msgstr "戰鬥光標 (FF7)"
+#: ../win32/gui/WndMain.c:81 ../win32/gui/WndMain.c:1699
+#: ../win32/gui/WndMain.c:1701
+msgid "English"
+msgstr "英語"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:584
-msgid "Direct FB updates"
-msgstr "直接 FB 更新"
+#: ../win32/gui/WndMain.c:82
+msgid "Spanish"
+msgstr "西班牙語"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:592
-msgid "Black brightness (Lunar)"
-msgstr "黑色亮度 (Lunar)"
+#: ../win32/gui/WndMain.c:83
+msgid "French"
+msgstr "法語"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:600
-msgid "Swap front detection"
-msgstr "swap front 偵測"
+#: ../win32/gui/WndMain.c:84
+msgid "Italian"
+msgstr "義大利語"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:608
-msgid "Disable coord check"
-msgstr "禁用坐標檢查"
+#: ../win32/gui/WndMain.c:85
+msgid "Portuguese"
+msgstr "葡萄牙語"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:616
-msgid "No blue glitches (LoD)"
-msgstr "無藍色干擾 (LoD)"
+#: ../win32/gui/WndMain.c:86
+msgid "Portuguese (Brazilian)"
+msgstr "葡萄牙語 (巴西)"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:624
-msgid "Soft FB access"
-msgstr "軟 FB 存取"
+#: ../win32/gui/WndMain.c:87
+msgid "Romanian"
+msgstr "羅馬尼亞語"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:632
-msgid "PC fps calculation"
-msgstr "PC fps 計算"
+#: ../win32/gui/WndMain.c:88
+msgid "Russian"
+msgstr "俄語"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:648
-msgid "Yellow rect (FF9)"
-msgstr "黃色方塊 (FF9)"
+#: ../win32/gui/WndMain.c:89
+msgid "Simplified Chinese"
+msgstr "簡體中文"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:656
-msgid "No subtr. blending"
-msgstr "無 subtr. 混合"
+#: ../win32/gui/WndMain.c:90
+msgid "Traditional Chinese"
+msgstr "正體中文"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:664
-msgid "Lazy upload (DW7)"
-msgstr "延遲上傳 (DW7)"
+#: ../win32/gui/WndMain.c:91
+msgid "Japanese"
+msgstr "日語"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:672
-msgid "Odd/even hack"
-msgstr "奇偶位修正"
+#: ../win32/gui/WndMain.c:92
+msgid "Korean"
+msgstr "韓國語"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:680
-msgid "Adjust screen width"
-msgstr "調整熒幕寬度"
+#: ../win32/gui/WndMain.c:215
+msgid ""
+"Usage: pcsxr [options]\n"
+"\toptions:\n"
+"\t-nogui\t\tDon't open the GUI\n"
+"\t-psxout\t\tEnable PSX output\n"
+"\t-slowboot\tEnable BIOS logo\n"
+"\t-runcd\t\tRuns CD-ROM (requires -nogui)\n"
+"\t-cdfile FILE\tRuns a CD image file (requires -nogui)\n"
+"\t-help\t\tDisplay this message"
+msgstr ""
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:688
-msgid "Old texture filtering"
-msgstr "老式紋理過濾"
+#: ../win32/gui/WndMain.c:350 ../win32/gui/WndMain.c:396
+msgid "PCSXR State Format"
+msgstr "PCSXR 記錄格式"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:696
-msgid "Additional uploads"
-msgstr "附加上傳"
+#: ../win32/gui/WndMain.c:377
+#, c-format
+msgid "*PCSXR*: Loaded State %s"
+msgstr "*PCSXR*: Loaded State %s"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:704
-msgid "unused"
-msgstr "未使用"
+#: ../win32/gui/WndMain.c:378
+#, c-format
+msgid "*PCSXR*: Error Loading State %s"
+msgstr "*PCSXR*: Error Loading State %s"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:712
-msgid "Fake 'gpu busy'"
-msgstr "欺騙 'gpu 忙'"
+#: ../win32/gui/WndMain.c:423
+#, c-format
+msgid "*PCSXR*: Saved State %s"
+msgstr "*PCSXR*: Saved State %s"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:720
-msgid "Misc"
-msgstr "雜項"
+#: ../win32/gui/WndMain.c:424
+#, c-format
+msgid "*PCSXR*: Error Saving State %s"
+msgstr "*PCSXR*: Error Saving State %s"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:743
-msgid "Scanlines"
-msgstr "掃描線"
+#: ../win32/gui/WndMain.c:493
+msgid "Running BIOS is not supported with Internal HLE Bios."
+msgstr "內部 HLE BIOS 不支援直接執行。"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:751
-msgid "Blending (0..255, -1=dot):"
-msgstr "混合 (0..255, -1=dot):"
+#: ../win32/gui/WndMain.c:790
+msgid "Game ID"
+msgstr "遊戲 ID"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:759
-msgid "Screen smoothing (can be slow or unsupported)"
-msgstr "平滑熒幕 (可能較慢或不被支援)"
+#: ../win32/gui/WndMain.c:796
+msgid "Game"
+msgstr "遊戲"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:767
-msgid "Use OpenGL extensions (recommended)"
-msgstr "使用 OpenGL 擴展 (建議使用)"
+#: ../win32/gui/WndMain.c:978
+msgid "mid link block"
+msgstr "mid link block"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:775
-msgid "Polygon anti-aliasing (slow with most cards)"
-msgstr "多邊形抗鋸齒 (對于大多數顯卡較慢)"
+#: ../win32/gui/WndMain.c:981
+msgid "terminiting link block"
+msgstr "terminiting link block"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:783
-msgid "Line mode (polygons will not get filled)"
-msgstr "直線模式 (多邊形將不被填充)"
+#: ../win32/gui/WndMain.c:1086
+msgid "Memcard Manager"
+msgstr "記憶卡管理器"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:791
-msgid "Force 15 bit framebuffer updates (faster movies)"
-msgstr "強制 15 位 framebuffer 更新 (影片較快)"
+#: ../win32/gui/WndMain.c:1090 ../win32/gui/WndMain.c:1093
+msgid "Select Mcd"
+msgstr "選擇"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:799
-msgid "Unfiltered MDECs (small movie speedup)"
-msgstr "非過濾 MDECs (微小的影片加速)"
+#: ../win32/gui/WndMain.c:1091 ../win32/gui/WndMain.c:1094
+msgid "Format Mcd"
+msgstr "格式化"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:852
-msgid "Adapted from P.E.Op.S OpenGL GPU by Pete Bernert"
-msgstr "基於由 Pete Bernert 編寫的 P.E.Op.S OpenGL GPU"
+#: ../win32/gui/WndMain.c:1092 ../win32/gui/WndMain.c:1095
+msgid "Reload Mcd"
+msgstr "重新加載"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:861
-msgid "Homepage: http://www.pbernert.com"
-msgstr "網址: http://www.pbernert.com"
+#: ../win32/gui/WndMain.c:1096
+msgid "-> Copy ->"
+msgstr "-> 複制 ->"
 
-#: ../plugins/peopsxgl/gpucfg/interface.c:879
-msgid "Version: 1.78"
-msgstr "版本: 1.78"
+#: ../win32/gui/WndMain.c:1097
+msgid "<- Copy <-"
+msgstr "<- 複制 <-"
 
-#: ../plugins/dfinput/cfg-gtk2.c:48
-msgid "D-Pad Up"
-msgstr "上方向鍵"
+#: ../win32/gui/WndMain.c:1098
+msgid "Paste"
+msgstr "粘貼"
 
-#: ../plugins/dfinput/cfg-gtk2.c:49
-msgid "D-Pad Down"
-msgstr "下方向鍵"
+#: ../win32/gui/WndMain.c:1099
+msgid "<- Un/Delete"
+msgstr "<- 刪除/恢複"
 
-#: ../plugins/dfinput/cfg-gtk2.c:50
-msgid "D-Pad Left"
-msgstr "左方向鍵"
+#: ../win32/gui/WndMain.c:1100
+msgid "Un/Delete ->"
+msgstr "刪除/恢複 ->"
 
-#: ../plugins/dfinput/cfg-gtk2.c:51
-msgid "D-Pad Right"
-msgstr "右方向鍵"
+#: ../win32/gui/WndMain.c:1102
+msgid "Memory Card 1"
+msgstr "記憶卡 1"
 
-#: ../plugins/dfinput/cfg-gtk2.c:52
-msgid "Cross"
-msgstr "叉號鍵"
+#: ../win32/gui/WndMain.c:1103
+msgid "Memory Card 2"
+msgstr "記憶卡 2"
 
-#: ../plugins/dfinput/cfg-gtk2.c:53
-msgid "Circle"
-msgstr "圓圈鍵"
+#: ../win32/gui/WndMain.c:1158
+msgid "Are you sure you want to paste this selection?"
+msgstr "是否確認粘貼此選中內容?"
 
-#: ../plugins/dfinput/cfg-gtk2.c:54
-msgid "Square"
-msgstr "方塊鍵"
+#: ../win32/gui/WndMain.c:1158 ../win32/gui/WndMain.c:1269
+#: ../win32/gui/WndMain.c:1276
+msgid "Confirmation"
+msgstr "確認"
 
-#: ../plugins/dfinput/cfg-gtk2.c:55
-msgid "Triangle"
-msgstr "三角鍵"
+#: ../win32/gui/WndMain.c:1269 ../win32/gui/WndMain.c:1276
+msgid "Are you sure you want to format this Memory Card?"
+msgstr "是否確認格式化此記憶卡?"
 
-#: ../plugins/dfinput/cfg-gtk2.c:56
-msgid "L1"
-msgstr "L1"
+#: ../win32/gui/WndMain.c:1322
+msgid "Cpu Config"
+msgstr "CPU 設定"
 
-#: ../plugins/dfinput/cfg-gtk2.c:57
-msgid "R1"
-msgstr "R1"
+#: ../win32/gui/WndMain.c:1327
+msgid "Disable Xa Decoding"
+msgstr "禁用 XA 解碼"
 
-#: ../plugins/dfinput/cfg-gtk2.c:58
-msgid "L2"
-msgstr "L2"
+#: ../win32/gui/WndMain.c:1328
+msgid "Sio Irq Always Enabled"
+msgstr "SIO IRQ 總是開啟"
 
-#: ../plugins/dfinput/cfg-gtk2.c:59
-msgid "R2"
-msgstr "R2"
+#: ../win32/gui/WndMain.c:1329
+msgid "Black && White Movies"
+msgstr "黑白電影"
 
-#: ../plugins/dfinput/cfg-gtk2.c:60
-msgid "Select"
-msgstr "選擇鍵"
+#: ../win32/gui/WndMain.c:1330
+msgid "Disable Cd audio"
+msgstr "禁用 CD 音頻"
 
-#: ../plugins/dfinput/cfg-gtk2.c:61
-msgid "Start"
-msgstr "開始鍵"
+#: ../win32/gui/WndMain.c:1333
+msgid "Enable Interpreter Cpu"
+msgstr "開啟解釋執行 CPU"
 
-#: ../plugins/dfinput/cfg-gtk2.c:62
-msgid "L3"
-msgstr "L3"
+#: ../win32/gui/WndMain.c:1336
+msgid "Spu Irq Always Enabled"
+msgstr "SPU IRQ 總是開啟"
 
-#: ../plugins/dfinput/cfg-gtk2.c:63
-msgid "R3"
-msgstr "R3"
+#: ../win32/gui/WndMain.c:1340
+msgid "Hide cursor"
+msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:67
-msgid "L-Stick Right"
-msgstr "左搖桿右方向"
+#: ../win32/gui/WndMain.c:1343
+msgid "Psx System Type"
+msgstr "PS 系統類型"
 
-#: ../plugins/dfinput/cfg-gtk2.c:68
-msgid "L-Stick Left"
-msgstr "左搖桿左方向"
+#: ../win32/gui/WndMain.c:1453
+msgid "Psx Mcd Format (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
+msgstr "PS 記憶卡格式 (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:69
-msgid "L-Stick Down"
-msgstr "左搖桿下方向"
+#: ../win32/gui/WndMain.c:1458
+msgid "Psx Memory Card (*.mcr;*.mc)"
+msgstr "PS 記憶卡 (*.mcr;*.mc)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:70
-msgid "L-Stick Up"
-msgstr "左搖桿上方向"
+#: ../win32/gui/WndMain.c:1463
+msgid "CVGS Memory Card (*.mem;*.vgs)"
+msgstr "VGS 記憶卡 (*.mem;*.vgs)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:71
-msgid "R-Stick Right"
-msgstr "右搖桿右方向"
+#: ../win32/gui/WndMain.c:1468
+msgid "Bleem Memory Card (*.mcd)"
+msgstr "Bleem 記憶卡 (*.mcd)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:72
-msgid "R-Stick Left"
-msgstr "右搖桿左方向"
+#: ../win32/gui/WndMain.c:1473
+msgid "DexDrive Memory Card (*.gme)"
+msgstr "DexDrive 記憶卡 (*.gme)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:73
-msgid "R-Stick Down"
-msgstr "右搖桿下方向"
+#: ../win32/gui/WndMain.c:1478
+msgid "DataDeck Memory Card (*.ddf)"
+msgstr "DataDeck 記憶卡 (*.ddl)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:74
-msgid "R-Stick Up"
-msgstr "右搖桿上方向"
+#: ../win32/gui/WndMain.c:1522
+msgid "Psx Exe Format"
+msgstr "PS EXE 格式"
 
-#: ../plugins/dfinput/cfg-gtk2.c:103
-#: ../plugins/dfinput/cfg-gtk2.c:142
-msgid "Centered"
-msgstr "居中"
+#: ../win32/gui/WndMain.c:1559
+#, fuzzy
+msgid "Psx Isos (*.iso;*.mdf;*.img;*.bin;*.cue;*.pbp;*.cbn)"
+msgstr "PS 鏡像檔 (*.iso;*.mdf;*.img;*.bin)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:103
-#: ../plugins/dfinput/cfg-gtk2.c:142
-msgid "Up"
-msgstr "上"
+#: ../win32/gui/WndMain.c:1635
+msgid "&File"
+msgstr "檔案(&F)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:103
-#: ../plugins/dfinput/cfg-gtk2.c:142
-msgid "Right"
-msgstr "右"
+#: ../win32/gui/WndMain.c:1636
+msgid "E&xit"
+msgstr "離開(&X)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:103
-#: ../plugins/dfinput/cfg-gtk2.c:142
-msgid "Rightup"
-msgstr "右上"
+#: ../win32/gui/WndMain.c:1638
+msgid "Run &EXE..."
+msgstr "執行 EXE(&E)..."
 
-#: ../plugins/dfinput/cfg-gtk2.c:104
-#: ../plugins/dfinput/cfg-gtk2.c:143
-msgid "Down"
-msgstr "下"
+#: ../win32/gui/WndMain.c:1639
+msgid "Run &BIOS"
+msgstr "執行 BIOS(&B)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:104
-#: ../plugins/dfinput/cfg-gtk2.c:143
-msgid "Rightdown"
-msgstr "右下"
+#: ../win32/gui/WndMain.c:1640
+msgid "Run &ISO..."
+msgstr "執行 ISO(&I)..."
 
-#: ../plugins/dfinput/cfg-gtk2.c:104
-#: ../plugins/dfinput/cfg-gtk2.c:143
-msgid "Left"
-msgstr "左"
+#: ../win32/gui/WndMain.c:1641
+msgid "Run &CD"
+msgstr "執行光碟(&C)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:104
-#: ../plugins/dfinput/cfg-gtk2.c:143
-msgid "Leftup"
-msgstr "左上"
+#: ../win32/gui/WndMain.c:1643
+msgid "&Emulator"
+msgstr "模擬器(&E)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:105
-#: ../plugins/dfinput/cfg-gtk2.c:144
-msgid "Leftdown"
-msgstr "左下"
+#: ../win32/gui/WndMain.c:1644
+msgid "&States"
+msgstr "記錄(&S)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:109
-#: ../plugins/dfinput/cfg-gtk2.c:148
-#, c-format
-msgid "Joystick: Button %d"
-msgstr "手把: 按鈕 %d"
+#: ../win32/gui/WndMain.c:1646
+msgid "S&witch ISO..."
+msgstr "更換 ISO(&W)..."
 
-#: ../plugins/dfinput/cfg-gtk2.c:113
-#: ../plugins/dfinput/cfg-gtk2.c:152
-#, c-format
-msgid "Joystick: Axis %d%c"
-msgstr "手把: 軸 %d%c"
+#: ../win32/gui/WndMain.c:1648
+#, fuzzy
+msgid "S&hutdown"
+msgstr "右下"
 
-#: ../plugins/dfinput/cfg-gtk2.c:118
-#: ../plugins/dfinput/cfg-gtk2.c:157
-#, c-format
-msgid "Joystick: Hat %d %s"
-msgstr "手把: Hat %d %s"
+#: ../win32/gui/WndMain.c:1649
+msgid "Re&set"
+msgstr "複位(&S)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:133
-#: ../plugins/dfinput/cfg-gtk2.c:172
-msgid "Keyboard:"
-msgstr "鍵盤:"
+#: ../win32/gui/WndMain.c:1650
+msgid "&Run"
+msgstr "執行(&R)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:137
-#: ../plugins/dfinput/cfg-gtk2.c:176
-msgid "(Not Set)"
-msgstr "(未設定)"
+#: ../win32/gui/WndMain.c:1651
+msgid "&Save"
+msgstr "存儲(&S)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:539
-msgid "None"
-msgstr "無"
+#: ../win32/gui/WndMain.c:1652
+msgid "&Load"
+msgstr "讀取(&L)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:581
-msgid "Gamepad/Keyboard Input Configuration"
-msgstr "手把/鍵盤輸入設定"
+#: ../win32/gui/WndMain.c:1653 ../win32/gui/WndMain.c:1663
+msgid "&Other..."
+msgstr "其它(&O)..."
 
-#: ../plugins/dfinput/cfg-gtk2.c:587
-#: ../plugins/dfinput/cfg-gtk2.c:607
-msgid "Key"
-msgstr "按鍵"
+#: ../win32/gui/WndMain.c:1654 ../win32/gui/WndMain.c:1664
+msgid "Slot &9"
+msgstr "記錄 9(&9)"
 
-#: ../plugins/dfinput/cfg-gtk2.c:593
-#: ../plugins/dfinput/cfg-gtk2.c:613
-msgid "Button"
-msgstr "按鈕"
+#: ../win32/gui/WndMain.c:1655 ../win32/gui/WndMain.c:1665
+msgid "Slot &8"
+msgstr "記錄 8(&8)"
 
-#: ../plugins/dfinput/pad.c:22
-msgid "Gamepad/Keyboard Input"
-msgstr "手把/鍵盤輸入"
+#: ../win32/gui/WndMain.c:1656 ../win32/gui/WndMain.c:1666
+msgid "Slot &7"
+msgstr "記錄 7(&7)"
 
-#: ../plugins/dfinput/dfinput.glade2:35
-#: ../plugins/dfinput/dfinput.glade2:232
-msgid "Device:"
-msgstr "裝置:"
+#: ../win32/gui/WndMain.c:1657 ../win32/gui/WndMain.c:1667
+msgid "Slot &6"
+msgstr "記錄 6(&6)"
 
-#: ../plugins/dfinput/dfinput.glade2:66
-#: ../plugins/dfinput/dfinput.glade2:263
-msgid "Type:"
-msgstr "類型:"
+#: ../win32/gui/WndMain.c:1658 ../win32/gui/WndMain.c:1668
+msgid "Slot &5"
+msgstr "記錄 5(&5)"
 
-#: ../plugins/dfinput/dfinput.glade2:78
-#: ../plugins/dfinput/dfinput.glade2:275
-msgid ""
-"Digital Pad\n"
-"Analog Pad"
-msgstr ""
-"數字手把\n"
-"模擬手把"
+#: ../win32/gui/WndMain.c:1659 ../win32/gui/WndMain.c:1669
+msgid "Slot &4"
+msgstr "記錄 4(&4)"
 
-#: ../plugins/dfinput/dfinput.glade2:149
-#: ../plugins/dfinput/dfinput.glade2:346
-msgid "Change"
-msgstr "更改"
+#: ../win32/gui/WndMain.c:1660 ../win32/gui/WndMain.c:1670
+msgid "Slot &3"
+msgstr "記錄 3(&3)"
 
-#: ../plugins/dfinput/dfinput.glade2:185
-#: ../plugins/dfinput/dfinput.glade2:382
-msgid "Reset"
-msgstr "重置"
+#: ../win32/gui/WndMain.c:1661 ../win32/gui/WndMain.c:1671
+msgid "Slot &2"
+msgstr "記錄 2(&2)"
 
-#: ../plugins/dfinput/dfinput.glade2:210
-msgid "Controller 1"
-msgstr "控制器 1"
+#: ../win32/gui/WndMain.c:1662 ../win32/gui/WndMain.c:1672
+msgid "Slot &1"
+msgstr "記錄 1(&1)"
 
-#: ../plugins/dfinput/dfinput.glade2:412
-msgid "Controller 2"
-msgstr "控制器 2"
+#: ../win32/gui/WndMain.c:1674
+msgid "&Configuration"
+msgstr "設定(&C)"
 
-#: ../plugins/dfinput/dfinput.glade2:427
-msgid "Multi-Threaded (Recommended)"
-msgstr "多執行緒 (建議使用)"
+#: ../win32/gui/WndMain.c:1675
+msgid "Cheat &Search..."
+msgstr "搜尋金手指碼(&S)..."
 
-#: ../plugins/dfnet/dfnet.c:23
-msgid "Socket Driver"
-msgstr "Socket 驅動程式"
+#: ../win32/gui/WndMain.c:1676
+msgid "Ch&eat Code..."
+msgstr "金手指碼(&E)..."
 
-#: ../plugins/dfnet/dfnet.c:161
-#, c-format
-msgid "error connecting to %s: %s\n"
-msgstr "無法連線至 %s: %s\n"
+#: ../win32/gui/WndMain.c:1679
+msgid "&Language"
+msgstr "語言(&L)"
 
-#: ../plugins/dfnet/dfnet.c:186
-msgid "Error allocating memory!\n"
-msgstr "分配記憶體錯誤!\n"
+#: ../win32/gui/WndMain.c:1705
+msgid "&Memory cards..."
+msgstr "記憶卡(&M)..."
 
-#: ../plugins/dfnet/gui.c:39
-msgid "Nothing to configure"
-msgstr "沒有可以配置的內容"
+#: ../win32/gui/WndMain.c:1706
+msgid "C&PU..."
+msgstr "CPU(&P)..."
 
-#: ../plugins/dfnet/gui.c:95
-#, c-format
-msgid "IP %s"
-msgstr "IP %s"
+#: ../win32/gui/WndMain.c:1708
+msgid "&NetPlay..."
+msgstr "聯線遊戲(&N)..."
 
-#: ../plugins/dfnet/gui.c:165
-msgid "Waiting for connection..."
-msgstr "等待連線中..."
+#: ../win32/gui/WndMain.c:1710
+#, fuzzy
+msgid "&Link cable..."
+msgstr "開啟"
 
-#: ../plugins/dfnet/gui.c:168
-msgid "The Client should now Start a Connection, waiting..."
-msgstr "客戶端現在應開始連線，等待中..."
+#: ../win32/gui/WndMain.c:1711
+msgid "&Controllers..."
+msgstr "控制器(&C)..."
 
-#: ../plugins/dfnet/dfnet.glade2:23
-msgid ""
-"Select here if you'll be Server (Player1) or Client (Player2).\n"
-"\n"
-"If you select Server you must Copy your IP address to the Clipboard and paste if (Ctrl+V) wherever the Client can see it.\n"
-"\n"
-"If you selected Client please enter the IP address the Server gave to you in the IP Address Control."
-msgstr ""
-"在此選擇以伺服器端 (玩家 1) 還是客戶端 (玩家 2) 方式執行。\n"
-"\n"
-"如果您選擇伺服器端，您必須將您的 IP 地址複制到剪貼板並告知客戶端。\n"
-"\n"
-"如果您選擇客戶端，請輸入伺服器端提供給您的 IP 地址。"
+#: ../win32/gui/WndMain.c:1712
+msgid "CD-&ROM..."
+msgstr "CD-ROM(&R)..."
 
-#: ../plugins/dfnet/dfnet.glade2:63
-msgid "Copy PC IP to Clipboard"
-msgstr "將本機 IP 複制到剪貼板"
+#: ../win32/gui/WndMain.c:1713
+msgid "&Sound..."
+msgstr "聲音(&S)..."
 
-#: ../plugins/dfnet/dfnet.glade2:94
-msgid "Server (Player1)"
-msgstr "伺服器 (玩家 1)"
+#: ../win32/gui/WndMain.c:1714
+msgid "&Graphics..."
+msgstr "圖像(&G)..."
 
-#: ../plugins/dfnet/dfnet.glade2:104
-msgid "Client (Player2)"
-msgstr "客戶端 (玩家 2)"
+#: ../win32/gui/WndMain.c:1716
+msgid "&Plugins && Bios..."
+msgstr "外掛及 BIOS(&P)..."
 
-#: ../plugins/dfnet/dfnet.glade2:130
-msgid "Do not change if not necessary (remember it must be changed on both sides)."
-msgstr "如非必要請勿更改 (必須在兩端都要更改)。"
+#: ../win32/gui/WndMain.c:1718
+msgid "&Help"
+msgstr "說明(&H)"
 
-#: ../plugins/dfnet/dfnet.glade2:143
-msgid "Port Number"
-msgstr "Port 號"
+#: ../win32/gui/WndMain.c:1719
+msgid "&About..."
+msgstr "關於(&A)..."
 
-#: ../plugins/dfnet/dfnet.glade2:202
-msgid "Start Game"
-msgstr "開始遊戲"
+#: ../win32/gui/WndMain.c:1870
+msgid "Pcsxr Msg"
+msgstr "Pcsxr 消息"
 
-#: ../plugins/dfnet/dfnet.glade2:240
-msgid "Play Offline"
-msgstr "離線遊戲"
+#: ../win32/gui/WndMain.c:1873
+msgid "Error Loading Symbol"
+msgstr "無法加載符號"
 
-#: ../plugins/bladesio1/sio1.c:29
-msgid "Sio1 Driver"
-msgstr "Sio1 驅動程式"
+#~ msgid "Controller 1: "
+#~ msgstr "控制器 1:"
+
+#~ msgid "Sio1 Driver"
+#~ msgstr "Sio1 驅動程式"
+
+#~ msgid ""
+#~ "8-bit\n"
+#~ "16-bit\n"
+#~ "32-bit"
+#~ msgstr ""
+#~ "8 位元\n"
+#~ "16 位元\n"
+#~ "32 位元"
+
+#~ msgid "CD-ROM..."
+#~ msgstr "CD-ROM..."
+
+#~ msgid "Continue..."
+#~ msgstr "繼續..."
+
+#~ msgid "Controllers..."
+#~ msgstr "控制器..."
+
+#~ msgid ""
+#~ "Decimal\n"
+#~ "Hexadecimal"
+#~ msgstr ""
+#~ "十進制\n"
+#~ "十六進制"
+
+#~ msgid ""
+#~ "Equal Value\n"
+#~ "Not Equal Value\n"
+#~ "Range\n"
+#~ "Increased By\n"
+#~ "Decreased By\n"
+#~ "Increased\n"
+#~ "Decreased\n"
+#~ "Different\n"
+#~ "No Change"
+#~ msgstr ""
+#~ "等于數值\n"
+#~ "不等于數值\n"
+#~ "範圍\n"
+#~ "增加數值\n"
+#~ "減少數值\n"
+#~ "增加\n"
+#~ "減少\n"
+#~ "不同\n"
+#~ "無變動"
+
+#~ msgid "Graphics..."
+#~ msgstr "圖像..."
+
+#~ msgid "Memcards..."
+#~ msgstr "記憶卡..."
+
+#~ msgid "Run ISO..."
+#~ msgstr "執行 ISO..."
+
+#~ msgid "Sound..."
+#~ msgstr "聲音..."
+
+#~ msgid "Switch ISO..."
+#~ msgstr "更換 ISO..."
+
+#~ msgid "Error: Glade interface could not be loaded!"
+#~ msgstr "錯誤：無法加載 Glade 界面!"
+
+#~ msgid ""
+#~ "0: None\n"
+#~ "1: 2xSai\n"
+#~ "2: 2xSuperSai\n"
+#~ "3: SuperEagle\n"
+#~ "4: Scale2x\n"
+#~ "5: Scale3x\n"
+#~ "6: HQ2X\n"
+#~ "7: HQ3X"
+#~ msgstr ""
+#~ "0: 無\n"
+#~ "1: 2xSai\n"
+#~ "2: 2xSuperSai\n"
+#~ "3: SuperEagle\n"
+#~ "4: Scale2x\n"
+#~ "5: Scale3x\n"
+#~ "6: HQ2X\n"
+#~ "7: HQ3X"
+
+#~ msgid ""
+#~ "0: Off (fastest)\n"
+#~ "1: Game dependant\n"
+#~ "2: Always"
+#~ msgstr ""
+#~ "0: 關閉 (最快)\n"
+#~ "1: 取決于遊戲\n"
+#~ "2: 總是開啟"
+
+#~ msgid ""
+#~ "320x240\n"
+#~ "640x480\n"
+#~ "800x600\n"
+#~ "1024x768\n"
+#~ "1152x864\n"
+#~ "1280x1024\n"
+#~ "1600x1200"
+#~ msgstr ""
+#~ "320x240\n"
+#~ "640x480\n"
+#~ "800x600\n"
+#~ "1024x768\n"
+#~ "1152x864\n"
+#~ "1280x1024\n"
+#~ "1600x1200"
+
+#~ msgid "Compatibility"
+#~ msgstr "相容性"
+
+#~ msgid "Framerate"
+#~ msgstr "幀率"
+
+#~ msgid "Screen"
+#~ msgstr "螢幕"
+
+#~ msgid "General"
+#~ msgstr "一般"
+
+#~ msgid "XA Music"
+#~ msgstr "XA 音樂"
+
+#~ msgid ""
+#~ "None\n"
+#~ "Low\n"
+#~ "Medium\n"
+#~ "Loud\n"
+#~ "Loudest"
+#~ msgstr ""
+#~ "無\n"
+#~ "低\n"
+#~ "中\n"
+#~ "高\n"
+#~ "最高"
+
+#~ msgid ""
+#~ "None\n"
+#~ "Simple\n"
+#~ "Gaussian\n"
+#~ "Cubic"
+#~ msgstr ""
+#~ "無\n"
+#~ "簡易\n"
+#~ "高斯\n"
+#~ "立方"
+
+#~ msgid ""
+#~ "Default\n"
+#~ "125ms\n"
+#~ "250ms\n"
+#~ "500ms\n"
+#~ "1s\n"
+#~ "2s\n"
+#~ "4s\n"
+#~ "8s\n"
+#~ "16s\n"
+#~ "32s\n"
+#~ "1min\n"
+#~ "2min\n"
+#~ "4min\n"
+#~ "8min\n"
+#~ "16min\n"
+#~ "32min"
+#~ msgstr ""
+#~ "缺省\n"
+#~ "125 毫秒\n"
+#~ "250 毫秒\n"
+#~ "500 毫秒\n"
+#~ "1 秒\n"
+#~ "2 秒\n"
+#~ "4 秒\n"
+#~ "8 秒\n"
+#~ "16 秒\n"
+#~ "32 秒\n"
+#~ "1 分鐘\n"
+#~ "2 分鐘\n"
+#~ "4 分鐘\n"
+#~ "8 分鐘\n"
+#~ "16 分鐘\n"
+#~ "32 分鐘"
+
+#~ msgid "Select CD-ROM device"
+#~ msgstr "選擇 CD-ROM 裝置"
+
+#~ msgid "hseparator"
+#~ msgstr "hseparator"

pcsxr-1.9.93.tar.bz2/win32/._pcsxr.rc Added

pcsxr-1.9.92.tar.bz2/win32/config.h -> pcsxr-1.9.93.tar.bz2/win32/config.h Changed

@@ -1,50 +1,50 @@
-//
-// Copyright (c) 2008, Wei Mingzhi. All rights reserved.
-//
-// Use, redistribution and modification of this code is unrestricted as long as this
-// notice is preserved.
-//
-
-#ifndef CONFIG_H
-#define CONFIG_H
-
-#ifndef __i386__
-#define __i386__ 1
-#endif
-
-#include <windows.h>
-
-#ifndef MAXPATHLEN
-#define MAXPATHLEN 256
-#endif
-
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "1.9"
-#endif
-
-#ifndef PREFIX
-#define PREFIX "./"
-#endif
-
-#ifndef inline
-#ifdef _DEBUG
-#define inline /* */
-#else
-#ifdef _MSC_VER
-#define inline __forceinline
-#else
-#define inline __inline__
-#endif
-#endif
-#endif
-
-#ifdef _MSC_VER
-#pragma warning (disable:4133)
-#pragma warning (disable:4142)
-#pragma warning (disable:4244)
-#pragma warning (disable:4996)
-#pragma warning (disable:4018)
-#pragma warning (disable:4761)
-#endif
-
-#endif
+//
+// Copyright (c) 2008, Wei Mingzhi. All rights reserved.
+//
+// Use, redistribution and modification of this code is unrestricted as long as this
+// notice is preserved.
+//
+
+#ifndef CONFIG_H
+#define CONFIG_H
+
+#ifndef __i386__
+#define __i386__ 1
+#endif
+
+#include <windows.h>
+
+#ifndef MAXPATHLEN
+#define MAXPATHLEN 256
+#endif
+
+#ifndef PACKAGE_VERSION
+#define PACKAGE_VERSION "1.9"
+#endif
+
+#ifndef PREFIX
+#define PREFIX "./"
+#endif
+
+#ifndef inline
+#ifdef _DEBUG
+#define inline /* */
+#else
+#ifdef _MSC_VER
+#define inline __forceinline
+#else
+#define inline __inline__
+#endif
+#endif
+#endif
+
+#ifdef _MSC_VER
+#pragma warning (disable:4133)
+#pragma warning (disable:4142)
+#pragma warning (disable:4244)
+#pragma warning (disable:4996)
+#pragma warning (disable:4018)
+#pragma warning (disable:4761)
+#endif
+
+#endif

pcsxr-1.9.92.tar.bz2/win32/glue/stdint.h -> pcsxr-1.9.93.tar.bz2/win32/glue/stdint.h Changed

@@ -1,17 +1,17 @@
-//
-// Copyright (c) 2008, Wei Mingzhi. All rights reserved.
-//
-// Use, redistribution and modification of this code is unrestricted
-// as long as this notice is preserved.
-//
-// This code is provided with ABSOLUTELY NO WARRANTY.
-//
-
-#ifndef __STDINT_H
-#define __STDINT_H
-
-#ifdef _MSC_VER
-
+//
+// Copyright (c) 2008, Wei Mingzhi. All rights reserved.
+//
+// Use, redistribution and modification of this code is unrestricted
+// as long as this notice is preserved.
+//
+// This code is provided with ABSOLUTELY NO WARRANTY.
+//
+
+#ifndef __STDINT_H
+#define __STDINT_H
+
+#ifdef _MSC_VER
+
 typedef __int8  int8_t;
 typedef __int16 int16_t;
 typedef __int32 int32_t;
@@ -20,23 +20,23 @@
 typedef unsigned __int8  uint8_t;
 typedef unsigned __int16 uint16_t;
 typedef unsigned __int32 uint32_t;
-typedef unsigned __int64 uint64_t;
-
-#else
-
-typedef signed char int8_t;
-typedef signed short int16_t;
-typedef signed int int32_t;
-typedef signed __int64 int64_t;
-
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned int uint32_t;
-typedef unsigned __int64 uint64_t;
-
-#endif
-
-#define intptr_t int32_t
-#define uintptr_t uint32_t
-
-#endif
+typedef unsigned __int64 uint64_t;
+
+#else
+
+typedef signed char int8_t;
+typedef signed short int16_t;
+typedef signed int int32_t;
+typedef signed __int64 int64_t;
+
+typedef unsigned char uint8_t;
+typedef unsigned short uint16_t;
+typedef unsigned int uint32_t;
+typedef unsigned __int64 uint64_t;
+
+#endif
+
+#define intptr_t int32_t
+#define uintptr_t uint32_t
+
+#endif

pcsxr-1.9.92.tar.bz2/win32/glue/sys/mman.h -> pcsxr-1.9.93.tar.bz2/win32/glue/sys/mman.h Changed

@@ -1,20 +1,20 @@
-//
-// Copyright (c) 2008, Wei Mingzhi. All rights reserved.
-//
-// Use, redistribution and modification of this code is unrestricted
-// as long as this notice is preserved.
-//
-// This code is provided with ABSOLUTELY NO WARRANTY.
-//
-
-#ifndef MMAN_H
-#define MMAN_H
-
-#include <windows.h>
-
-#define mmap(start, length, prot, flags, fd, offset) \
-	((unsigned char *)VirtualAlloc(NULL, (length), MEM_COMMIT | MEM_RESERVE, PAGE_EXECUTE_READWRITE))
-
-#define munmap(start, length) do { VirtualFree((start), (length), MEM_RELEASE); } while (0)
-
-#endif
+//
+// Copyright (c) 2008, Wei Mingzhi. All rights reserved.
+//
+// Use, redistribution and modification of this code is unrestricted
+// as long as this notice is preserved.
+//
+// This code is provided with ABSOLUTELY NO WARRANTY.
+//
+
+#ifndef MMAN_H
+#define MMAN_H
+
+#include <windows.h>
+
+#define mmap(start, length, prot, flags, fd, offset) \
+	((unsigned char *)VirtualAlloc(NULL, (length), MEM_COMMIT | MEM_RESERVE, PAGE_EXECUTE_READWRITE))
+
+#define munmap(start, length) do { VirtualFree((start), (length), MEM_RELEASE); } while (0)
+
+#endif

pcsxr-1.9.92.tar.bz2/win32/gui/AboutDlg.c -> pcsxr-1.9.93.tar.bz2/win32/gui/AboutDlg.c Changed

@@ -1,68 +1,68 @@
-/* Pcsx - Pc Psx Emulator
- * Copyright (C) 1999-2003 Pcsx Team
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
- */
-
-#include <windows.h>
-#include <windowsx.h>
-#include "resource.h"
-#include "AboutDlg.h"
-#include "psxcommon.h"
-
-char *LabelAuthors = { N_(
-	"PCSX - A PlayStation Emulator\n\n"
-	"Original Authors:\n"
-	"main coder: linuzappz\n"
-	"co-coders: shadow\n"
-	"ex-coders: Nocomp, Pete Bernett, nik3d\n"
-	"Webmaster: AkumaX")
-};
-
-char *LabelGreets = { N_(
-	"PCSX-df Authors:\n"
-	"Ryan Schultz, Andrew Burton, Stephen Chao,\n"
-	"Marcus Comstedt, Stefan Sikora\n\n"
-	"PCSX-Reloaded By:\n"
-	"Blade_Arma, Wei Mingzhi, et al.\n\n"
-	"http://pcsxr.codeplex.com/")
-};
-
-LRESULT WINAPI AboutDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) {
-	switch (uMsg) {
-		case WM_INITDIALOG:
-			SetWindowText(hDlg, _("About"));
-
-			Button_SetText(GetDlgItem(hDlg, IDOK), _("OK"));
-			Static_SetText(GetDlgItem(hDlg, IDC_PCSX_ABOUT_TEXT), _("PCSX EMU\n"));
-			Static_SetText(GetDlgItem(hDlg, IDC_PCSX_ABOUT_AUTHORS), _(LabelAuthors));
-			Static_SetText(GetDlgItem(hDlg, IDC_PCSX_ABOUT_GREETS), _(LabelGreets));
-			Button_SetText(GetDlgItem(hDlg,IDOK), _("OK"));
-			return TRUE;
-
-		case WM_COMMAND:
-			switch (wParam) {
-				case IDOK:
-					EndDialog(hDlg, TRUE);
-					return TRUE;
-			}
-			break;
-
-		case WM_CLOSE:
-			EndDialog(hDlg, TRUE);
-			return TRUE;
-	}
-	return FALSE;
-}
+/* Pcsx - Pc Psx Emulator
+ * Copyright (C) 1999-2003 Pcsx Team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <windows.h>
+#include <windowsx.h>
+#include "resource.h"
+#include "AboutDlg.h"
+#include "psxcommon.h"
+
+char *LabelAuthors = { N_(
+	"PCSXR - A PlayStation Emulator\n\n"
+	"Original Authors:\n"
+	"main coder: linuzappz\n"
+	"co-coders: shadow\n"
+	"ex-coders: Nocomp, Pete Bernett, nik3d\n"
+	"Webmaster: AkumaX")
+};
+
+char *LabelGreets = { N_(
+	"PCSX-df Authors:\n"
+	"Ryan Schultz, Andrew Burton, Stephen Chao,\n"
+	"Marcus Comstedt, Stefan Sikora\n\n"
+	"PCSX-Reloaded By:\n"
+	"edgbla, shalma, Wei Mingzhi, et al.\n\n"
+	"http://pcsxr.codeplex.com/")
+};
+
+LRESULT WINAPI AboutDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) {
+	switch (uMsg) {
+		case WM_INITDIALOG:
+			SetWindowText(hDlg, _("About"));
+
+			Button_SetText(GetDlgItem(hDlg, IDOK), _("OK"));
+			Static_SetText(GetDlgItem(hDlg, IDC_PCSXR_ABOUT_TEXT), _("PCSXR EMU\n"));
+			Static_SetText(GetDlgItem(hDlg, IDC_PCSXR_ABOUT_AUTHORS), _(LabelAuthors));
+			Static_SetText(GetDlgItem(hDlg, IDC_PCSXR_ABOUT_GREETS), _(LabelGreets));
+			Button_SetText(GetDlgItem(hDlg,IDOK), _("OK"));
+			return TRUE;
+
+		case WM_COMMAND:
+			switch (wParam) {
+				case IDOK:
+					EndDialog(hDlg, TRUE);
+					return TRUE;
+			}
+			break;
+
+		case WM_CLOSE:
+			EndDialog(hDlg, TRUE);
+			return TRUE;
+	}
+	return FALSE;
+}

pcsxr-1.9.92.tar.bz2/win32/gui/AboutDlg.h -> pcsxr-1.9.93.tar.bz2/win32/gui/AboutDlg.h Changed

@@ -1,24 +1,24 @@
-/*  Pcsx - Pc Psx Emulator
- *  Copyright (C) 1999-2003  Pcsx Team
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
- */
-
-#ifndef _PCSX_ABOUTDLG_H_
-#define _PCSX_ABOUTDLG_H_
-
-LRESULT WINAPI AboutDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
-
-#endif
+/*  Pcsx - Pc Psx Emulator
+ *  Copyright (C) 1999-2003  Pcsx Team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef _PCSX_ABOUTDLG_H_
+#define _PCSX_ABOUTDLG_H_
+
+LRESULT WINAPI AboutDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+
+#endif

pcsxr-1.9.92.tar.bz2/win32/gui/CheatDlg.c -> pcsxr-1.9.93.tar.bz2/win32/gui/CheatDlg.c Changed

@@ -1,1021 +1,1021 @@
-/* Cheat Support for PCSX-Reloaded
- * Copyright (C) 2009, Wei Mingzhi <whistler_wmz@users.sf.net>.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
- */
-
-#include <windows.h>
-#include <windowsx.h>
-#ifndef _WIN32_IE
-#define _WIN32_IE 0x0400
-#endif
-#include <commctrl.h>
-#include <stdio.h>
-#include "psxcommon.h"
-#include "psxmem.h"
-#include "cheat.h"
-#include "resource.h"
-#include "Win32.h"
-
-static void UpdateCheatDlg(HWND hW) {
- HWND		List;
- LV_ITEM		item;
-	int			i;
-
-	List = GetDlgItem(hW, IDC_CODELIST);
-
-	ListView_DeleteAllItems(List);
-
-	for (i = 0; i < NumCheats; i++) {
-		memset(&item, 0, sizeof(item));
-
-		item.mask		= LVIF_TEXT;
-		item.iItem		= i;
-		item.pszText	= Cheats[i].Descr;
-		item.iSubItem	= 0;
-
-		SendMessage(List, LVM_INSERTITEM, 0, (LPARAM)&item);
-
-		item.pszText	= (Cheats[i].Enabled ? _("Yes") : _("No"));
-		item.iSubItem	= 1;
-
-		SendMessage(List, LVM_SETITEM, 0, (LPARAM)&item);
-	}
-}
-
-static int		iEditItem = -1;
-static char		szDescr[256], szCode[1024];
-
-static LRESULT WINAPI CheatEditDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) {
-	int		i;
-
-	switch (uMsg) {
-		case WM_INITDIALOG:
-			SetWindowText(hW, _("Edit Cheat"));
-			Static_SetText(GetDlgItem(hW, IDC_LABEL_DESCR), _("Description:"));
-			Static_SetText(GetDlgItem(hW, IDC_LABEL_CODE), _("Cheat Code:"));
-			Button_SetText(GetDlgItem(hW, IDOK), _("OK"));
-			Button_SetText(GetDlgItem(hW, IDCANCEL), _("Cancel"));
-
-			assert(iEditItem != -1 && iEditItem < NumCheats);
-
-			Edit_SetText(GetDlgItem(hW, IDC_DESCR), Cheats[iEditItem].Descr);
-
-			szCode[0] = '\0';
-			for (i = Cheats[iEditItem].First; i < Cheats[iEditItem].First + Cheats[iEditItem].n; i++) {
-				sprintf(szDescr, "%.8X %.4X\r\n", CheatCodes[i].Addr, CheatCodes[i].Val);
-				strcat(szCode, szDescr);
-			}
-			Edit_SetText(GetDlgItem(hW, IDC_CODE), szCode);
-			break;
-
-		case WM_COMMAND:
-			switch (LOWORD(wParam)) {
-				case IDOK:
-					Edit_GetText(GetDlgItem(hW, IDC_DESCR), szDescr, 256);
-					Edit_GetText(GetDlgItem(hW, IDC_CODE), szCode, 1024);
-
-					if (EditCheat(iEditItem, szDescr, szCode) != 0) {
-						SysMessage(_("Invalid cheat code!"));
-					}
-					else {
- EndDialog(hW, TRUE);
- return TRUE;
-					}
-					break;
-
-				case IDCANCEL:
-					EndDialog(hW, FALSE);
-					return TRUE;
-			}
-			break;
-
-		case WM_CLOSE:
-			EndDialog(hW, FALSE);
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-static LRESULT WINAPI CheatAddDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) {
-	switch (uMsg) {
-		case WM_INITDIALOG:
-			SetWindowText(hW, _("Add New Cheat"));
-			Static_SetText(GetDlgItem(hW, IDC_LABEL_DESCR), _("Description:"));
-			Static_SetText(GetDlgItem(hW, IDC_LABEL_CODE), _("Cheat Code:"));
-			Button_SetText(GetDlgItem(hW, IDOK), _("OK"));
-			Button_SetText(GetDlgItem(hW, IDCANCEL), _("Cancel"));
-			Edit_SetText(GetDlgItem(hW, IDC_DESCR), szDescr);
-			Edit_SetText(GetDlgItem(hW, IDC_CODE), szCode);
-			break;
-
-		case WM_COMMAND:
-			switch (LOWORD(wParam)) {
-				case IDOK:
-					Edit_GetText(GetDlgItem(hW, IDC_DESCR), szDescr, 256);
-					Edit_GetText(GetDlgItem(hW, IDC_CODE), szCode, 1024);
-
-					if (AddCheat(szDescr, szCode) != 0) {
-						SysMessage(_("Invalid cheat code!"));
-					}
-					else {
- EndDialog(hW, TRUE);
- return TRUE;
-					}
-					break;
-
-				case IDCANCEL:
-					EndDialog(hW, FALSE);
-					return TRUE;
-			}
-			break;
-
-		case WM_CLOSE:
-			EndDialog(hW, FALSE);
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-LRESULT WINAPI CheatDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) {
-	HWND			List;
-	LV_COLUMN		col;
-	LV_ITEM			item;
-	int				i;
-	OPENFILENAME	ofn;
-	char			szFileName[256];
-	char			szFileTitle[256];
-	char			szFilter[256];
-
-	switch (uMsg) {
-		case WM_INITDIALOG:
-			SetWindowText(hW, _("Edit Cheat Codes"));
-
-			Button_SetText(GetDlgItem(hW, IDC_ADDCODE), _("&Add Code"));
-			Button_SetText(GetDlgItem(hW, IDC_EDITCODE), _("&Edit Code"));
-			Button_SetText(GetDlgItem(hW, IDC_REMOVECODE), _("&Remove Code"));
-			Button_SetText(GetDlgItem(hW, IDC_TOGGLECODE), _("&Enable/Disable"));
-			Button_SetText(GetDlgItem(hW, IDC_LOADCODE), _("&Load..."));
-			Button_SetText(GetDlgItem(hW, IDC_SAVECODE), _("&Save As..."));
-			Button_SetText(GetDlgItem(hW, IDCANCEL), _("&Close"));
-
-			List = GetDlgItem(hW, IDC_CODELIST);
-
- SendMessage(List, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_FULLROWSELECT);
-
-			memset(&col, 0, sizeof(col));
-
-			col.mask	= LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM;
-			col.fmt		= LVCFMT_LEFT;
-
-			col.pszText		= _("Description");
-			col.cx			= 400;
-
-			SendMessage(List, LVM_INSERTCOLUMN, 0, (LPARAM)&col);
-
-			col.pszText		= _("Enabled");
-			col.cx			= 55;
-
-			SendMessage(List, LVM_INSERTCOLUMN, 1, (LPARAM)&col);
-
-			UpdateCheatDlg(hW);
-			break;
-
-		case WM_COMMAND:
-			switch (LOWORD(wParam)) {
-				case IDCANCEL:
-					EndDialog(hW, FALSE);
-					return TRUE;
-
-				case IDC_ADDCODE:
-					i = NumCheats;
-					szDescr[0] = '\0';
-					szCode[0] = '\0';
-
-					DialogBox(gApp.hInstance, MAKEINTRESOURCE(IDD_CHEATEDIT), hW, (DLGPROC)CheatAddDlgProc);
-
-					if (NumCheats > i) {
-						// new cheat added
-						List = GetDlgItem(hW, IDC_CODELIST);
-						memset(&item, 0, sizeof(item));
-
-						item.mask		= LVIF_TEXT;
-						item.iItem		= i;
-						item.pszText	= Cheats[i].Descr;
-						item.iSubItem	= 0;
-
-						SendMessage(List, LVM_INSERTITEM, 0, (LPARAM)&item);
-
-						item.pszText	= (Cheats[i].Enabled ? _("Yes") : _("No"));
-						item.iSubItem	= 1;
-
-						SendMessage(List, LVM_SETITEM, 0, (LPARAM)&item);
-					}
-					break;
-
-				case IDC_EDITCODE:
-					List = GetDlgItem(hW, IDC_CODELIST);
-					iEditItem = ListView_GetSelectionMark(List);
-
-					if (iEditItem != -1) {
-						DialogBox(gApp.hInstance, MAKEINTRESOURCE(IDD_CHEATEDIT), hW, (DLGPROC)CheatEditDlgProc);
-
-						memset(&item, 0, sizeof(item));
-
-						item.mask		= LVIF_TEXT;
-						item.iItem		= iEditItem;
-						item.pszText	= Cheats[iEditItem].Descr;
-						item.iSubItem	= 0;
-
-						SendMessage(List, LVM_SETITEM, 0, (LPARAM)&item);
-					}
-					break;
-
-				case IDC_REMOVECODE:
-					List = GetDlgItem(hW, IDC_CODELIST);
-					i = ListView_GetSelectionMark(List);
-
-					if (i != -1) {
-						RemoveCheat(i);
-						ListView_DeleteItem(List, i);
-						ListView_SetSelectionMark(List, -1);
-					}
-					break;
-
-				case IDC_TOGGLECODE:
-					List = GetDlgItem(hW, IDC_CODELIST);
-					i = ListView_GetSelectionMark(List);
-
-					if (i != -1) {
-						Cheats[i].Enabled ^= 1;
-
-						memset(&item, 0, sizeof(item));
-
-						item.mask		= LVIF_TEXT;
-						item.iItem		= i;
-						item.pszText	= (Cheats[i].Enabled ? _("Yes") : _("No"));
-						item.iSubItem	= 1;
-
-						SendMessage(List, LVM_SETITEM, 0, (LPARAM)&item);
-					}
-					break;
-
-				case IDC_LOADCODE:
-					memset(&szFileName, 0, sizeof(szFileName));
-					memset(&szFileTitle, 0, sizeof(szFileTitle));
-					memset(&szFilter, 0, sizeof(szFilter));
-
-					strcpy(szFilter, _("PCSX Cheat Code Files"));
-					strcatz(szFilter, "*.*");
-
-					ofn.lStructSize			= sizeof(OPENFILENAME);
-					ofn.hwndOwner			= hW;
-					ofn.lpstrFilter			= szFilter;
-					ofn.lpstrCustomFilter	= NULL;
-					ofn.nMaxCustFilter		= 0;
-					ofn.nFilterIndex		= 1;
-					ofn.lpstrFile			= szFileName;
-					ofn.nMaxFile			= 256;
-					ofn.lpstrInitialDir		= ".\\Cheats";
-					ofn.lpstrFileTitle		= szFileTitle;
-					ofn.nMaxFileTitle		= 256;
-					ofn.lpstrTitle			= NULL;
-					ofn.lpstrDefExt			= "CHT";
-					ofn.Flags				= OFN_HIDEREADONLY | OFN_NOCHANGEDIR;
-
-					if (GetOpenFileName((LPOPENFILENAME)&ofn)) {
-						LoadCheats(szFileName);
-						UpdateCheatDlg(hW);
-					}
-					break;
-
-				case IDC_SAVECODE:
-					memset(&szFileName, 0, sizeof(szFileName));
-					memset(&szFileTitle, 0, sizeof(szFileTitle));
-					memset(&szFilter, 0, sizeof(szFilter));
-
-					strcpy(szFilter, _("PCSX Cheat Code Files"));
-					strcatz(szFilter, "*.*");
-
-					ofn.lStructSize			= sizeof(OPENFILENAME);
-					ofn.hwndOwner			= hW;
-					ofn.lpstrFilter			= szFilter;
-					ofn.lpstrCustomFilter	= NULL;
-					ofn.nMaxCustFilter		= 0;
-					ofn.nFilterIndex		= 1;
-					ofn.lpstrFile			= szFileName;
-					ofn.nMaxFile			= 256;
-					ofn.lpstrInitialDir		= ".\\Cheats";
-					ofn.lpstrFileTitle		= szFileTitle;
-					ofn.nMaxFileTitle		= 256;
-					ofn.lpstrTitle			= NULL;
-					ofn.lpstrDefExt			= "CHT";
-					ofn.Flags				= OFN_HIDEREADONLY | OFN_NOCHANGEDIR | OFN_OVERWRITEPROMPT;
-
-					if (GetOpenFileName((LPOPENFILENAME)&ofn)) {
-						SaveCheats(szFileName);
-					}
-					break;
-			}
-			break;
-
-		case WM_NOTIFY:
-			switch (LOWORD(wParam)) {
-				case IDC_CODELIST:
-					List = GetDlgItem(hW, IDC_CODELIST);
-					i = ListView_GetSelectionMark(List);
-
-					if (i != -1) {
-						Button_Enable(GetDlgItem(hW, IDC_EDITCODE), TRUE);
-						Button_Enable(GetDlgItem(hW, IDC_REMOVECODE), TRUE);
-						Button_Enable(GetDlgItem(hW, IDC_TOGGLECODE), TRUE);
-					}
-					else {
-						Button_Enable(GetDlgItem(hW, IDC_EDITCODE), FALSE);
-						Button_Enable(GetDlgItem(hW, IDC_REMOVECODE), FALSE);
-						Button_Enable(GetDlgItem(hW, IDC_TOGGLECODE), FALSE);
-					}
-
-					Button_Enable(GetDlgItem(hW, IDC_SAVECODE), (NumCheats > 0));
-					break;
-			}
-			break;
-
-		case WM_CLOSE:
-			EndDialog(hW, FALSE);
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-#define SEARCH_EQUALVAL				0
-#define SEARCH_NOTEQUALVAL			1
-#define SEARCH_RANGE				2
-#define SEARCH_INCBY				3
-#define SEARCH_DECBY				4
-#define SEARCH_INC					5
-#define SEARCH_DEC					6
-#define SEARCH_DIFFERENT			7
-#define SEARCH_NOCHANGE				8
-
-#define SEARCHTYPE_8BIT				0
-#define SEARCHTYPE_16BIT			1
-#define SEARCHTYPE_32BIT			2
-
-#define SEARCHBASE_DEC				0
-#define SEARCHBASE_HEX				1
-
-static char current_search			= SEARCH_EQUALVAL;
-static char current_searchtype		= SEARCHTYPE_8BIT;
-static char current_searchbase		= SEARCHBASE_DEC;
-static uint32_t current_valuefrom	= 0;
-static uint32_t current_valueto		= 0;
-
-static void UpdateCheatSearchDlg(HWND hW) {
-	char		buf[256];
-	int			i;
-
-	SendMessage(GetDlgItem(hW, IDC_SEARCHFOR), CB_RESETCONTENT, 0, 0);
-	SendMessage(GetDlgItem(hW, IDC_RESLIST), LB_RESETCONTENT, 0, 0);
-
-	Button_Enable(GetDlgItem(hW, IDC_FREEZE), FALSE);
-	Button_Enable(GetDlgItem(hW, IDC_MODIFY), FALSE);
-	Button_Enable(GetDlgItem(hW, IDC_COPY), FALSE);
-
-	SendMessage(GetDlgItem(hW, IDC_SEARCHFOR), CB_ADDSTRING, 0, (LPARAM)_("Equal Value"));
-	SendMessage(GetDlgItem(hW, IDC_SEARCHFOR), CB_ADDSTRING, 0, (LPARAM)_("Not Equal Value"));
-	SendMessage(GetDlgItem(hW, IDC_SEARCHFOR), CB_ADDSTRING, 0, (LPARAM)_("Range"));
-
-	if (prevM != NULL) {
-		SendMessage(GetDlgItem(hW, IDC_SEARCHFOR), CB_ADDSTRING, 0, (LPARAM)_("Increased By"));
-		SendMessage(GetDlgItem(hW, IDC_SEARCHFOR), CB_ADDSTRING, 0, (LPARAM)_("Decreased By"));
-		SendMessage(GetDlgItem(hW, IDC_SEARCHFOR), CB_ADDSTRING, 0, (LPARAM)_("Increased"));
-		SendMessage(GetDlgItem(hW, IDC_SEARCHFOR), CB_ADDSTRING, 0, (LPARAM)_("Decreased"));
-		SendMessage(GetDlgItem(hW, IDC_SEARCHFOR), CB_ADDSTRING, 0, (LPARAM)_("Different"));
-		SendMessage(GetDlgItem(hW, IDC_SEARCHFOR), CB_ADDSTRING, 0, (LPARAM)_("No Change"));
-
-		ComboBox_Enable(GetDlgItem(hW, IDC_DATATYPE), FALSE);
-	}
-	else {
-		ComboBox_Enable(GetDlgItem(hW, IDC_DATATYPE), TRUE);
-	}
-
-	SendMessage(GetDlgItem(hW, IDC_SEARCHFOR), CB_SETCURSEL, (WPARAM)current_search, 0);
-
-	if (current_search == SEARCH_RANGE) {
-		ShowWindow(GetDlgItem(hW, IDC_LABEL_TO), SW_SHOW);
-		ShowWindow(GetDlgItem(hW, IDC_VALUETO), SW_SHOW);
-	}
-	else {
-		ShowWindow(GetDlgItem(hW, IDC_LABEL_TO), SW_HIDE);
-		ShowWindow(GetDlgItem(hW, IDC_VALUETO), SW_HIDE);
-	}
-
-	SendMessage(GetDlgItem(hW, IDC_DATATYPE), CB_SETCURSEL, (WPARAM)current_searchtype, 0);
-	SendMessage(GetDlgItem(hW, IDC_DATABASE), CB_SETCURSEL, (WPARAM)current_searchbase, 0);
-
-	if (current_searchbase == SEARCHBASE_HEX) {
-		sprintf(buf, "%X", current_valuefrom);
-		SetWindowText(GetDlgItem(hW, IDC_VALUEFROM), buf);
-		sprintf(buf, "%X", current_valueto);
-		SetWindowText(GetDlgItem(hW, IDC_VALUETO), buf);
-	}
-	else {
-		sprintf(buf, "%u", current_valuefrom);
-		SetWindowText(GetDlgItem(hW, IDC_VALUEFROM), buf);
-		sprintf(buf, "%u", current_valueto);
-		SetWindowText(GetDlgItem(hW, IDC_VALUETO), buf);
-	}
-
-	if (prevM == NULL) {
-		SendMessage(GetDlgItem(hW, IDC_RESLIST), LB_ADDSTRING, (WPARAM)0, (LPARAM)_("Enter the values and start your search."));
-		EnableWindow(GetDlgItem(hW, IDC_RESLIST), FALSE);
-	}
-	else {
-		if (NumSearchResults == 0) {
-			SendMessage(GetDlgItem(hW, IDC_RESLIST), LB_ADDSTRING, (WPARAM)0, (LPARAM)_("No addresses found."));
-			EnableWindow(GetDlgItem(hW, IDC_RESLIST), FALSE);
-		}
-		else if (NumSearchResults > 100) {
-			SendMessage(GetDlgItem(hW, IDC_RESLIST), LB_ADDSTRING, (WPARAM)0, (LPARAM)_("Too many addresses found."));
-			EnableWindow(GetDlgItem(hW, IDC_RESLIST), FALSE);
-		}
-		else {
-			for (i = 0; i < NumSearchResults; i++) {
-				u32 addr = SearchResults[i];
-
-				switch (current_searchtype) {
-					case SEARCHTYPE_8BIT:
-						sprintf(buf, _("%.8X Current: %u (%.2X), Previous: %u (%.2X)"),
-							addr, PSXMu8(addr), PSXMu8(addr), PrevMu8(addr), PrevMu8(addr));
-						break;
-
-					case SEARCHTYPE_16BIT:
-						sprintf(buf, _("%.8X Current: %u (%.4X), Previous: %u (%.4X)"),
-							addr, PSXMu16(addr), PSXMu16(addr), PrevMu16(addr), PrevMu16(addr));
-						break;
-
-					case SEARCHTYPE_32BIT:
-						sprintf(buf, _("%.8X Current: %u (%.8X), Previous: %u (%.8X)"),
-							addr, PSXMu32(addr), PSXMu32(addr), PrevMu32(addr), PrevMu32(addr));
-						break;
-
-					default:
-						assert(FALSE); // impossible
-						break;
-				}
-
-				SendMessage(GetDlgItem(hW, IDC_RESLIST), LB_ADDSTRING, (WPARAM)0, (LPARAM)buf);
-				SendMessage(GetDlgItem(hW, IDC_RESLIST), LB_SETITEMDATA, i, (LPARAM)i);
-			}
-			EnableWindow(GetDlgItem(hW, IDC_RESLIST), TRUE);
-		}
-	}
-
-	sprintf(buf, _("Founded Addresses: %d"), NumSearchResults);
-	Static_SetText(GetDlgItem(hW, IDC_LABEL_RESULTSFOUND), buf);
-}
-
-static int iCurItem = 0;
-
-static LRESULT WINAPI CheatFreezeProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) {
-	u32			val;
-	char		buf[256];
-
-	switch (uMsg) {
-		case WM_INITDIALOG:
-			SetWindowText(hW, _("Freeze"));
-			Static_SetText(GetDlgItem(hW, IDC_LABEL_ADDRESS), _("Address:"));
-			Static_SetText(GetDlgItem(hW, IDC_LABEL_VALUE), _("Value:"));
-
-			sprintf(buf, "%.8X", SearchResults[iCurItem]);
-			SetWindowText(GetDlgItem(hW, IDC_ADDRESS), buf);
-
-			switch (current_searchtype) {
-				case SEARCHTYPE_8BIT:
-					val = PSXMu8(SearchResults[iCurItem]);
-					break;
-
-				case SEARCHTYPE_16BIT:
-					val = PSXMu16(SearchResults[iCurItem]);
-					break;
-
-				case SEARCHTYPE_32BIT:
-					val = PSXMu32(SearchResults[iCurItem]);
-					break;
-
-				default:
-					assert(FALSE); // should not reach here
-					break;
-			}
-
-			sprintf(buf, "%u", val);
-			SetWindowText(GetDlgItem(hW, IDC_VALUE), buf);
-			break;
-
-		case WM_COMMAND:
-			switch (LOWORD(wParam)) {
-				case IDOK:
-					val = 0;
-					GetWindowText(GetDlgItem(hW, IDC_VALUE), buf, 255);
-					sscanf(buf, "%u", &val);
-
-					switch (current_searchtype) {
-						case SEARCHTYPE_8BIT:
-							if (val > (u32)0xFF) {
-								val = 0xFF;
-							}
-							sprintf(szCode, "%.8X %.4X", (SearchResults[iCurItem] & 0x1FFFFF) | (CHEAT_CONST8 << 24), val);
-							break;
-
-						case SEARCHTYPE_16BIT:
-							if (val > (u32)0xFFFF) {
-								val = 0xFFFF;
-							}
-							sprintf(szCode, "%.8X %.4X", (SearchResults[iCurItem] & 0x1FFFFF) | (CHEAT_CONST16 << 24), val);
-							break;
-
-						case SEARCHTYPE_32BIT:
-							sprintf(szCode, "%.8X %.4X\n%.8X %.4X",
-								(SearchResults[iCurItem] & 0x1FFFFF) | (CHEAT_CONST16 << 24), val & 0xFFFF,
-								((SearchResults[iCurItem] + 2) & 0x1FFFFF) | (CHEAT_CONST16 << 24), ((val & 0xFFFF0000) >> 16) & 0xFFFF);
-							break;
-
-						default:
-							assert(FALSE); // should not reach here
-							break;
-					}
-
-					sprintf(szDescr, _("Freeze %.8X"), SearchResults[iCurItem]);
-
-					if (DialogBox(gApp.hInstance, MAKEINTRESOURCE(IDD_CHEATEDIT), hW, (DLGPROC)CheatAddDlgProc)) {
-						Cheats[NumCheats - 1].Enabled = 1;
-						EndDialog(hW, TRUE);
-						return TRUE;
-					}
-					break;
-
-				case IDCANCEL:
-					EndDialog(hW, FALSE);
-					return TRUE;
-			}
-			break;
-
-		case WM_CLOSE:
-			EndDialog(hW, FALSE);
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-static LRESULT WINAPI CheatModifyProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) {
-	u32			val;
-	char		buf[256];
-
-	switch (uMsg) {
-		case WM_INITDIALOG:
-			SetWindowText(hW, _("Modify"));
-			Static_SetText(GetDlgItem(hW, IDC_LABEL_ADDRESS), _("Address:"));
-			Static_SetText(GetDlgItem(hW, IDC_LABEL_VALUE), _("Value:"));
-
-			sprintf(buf, "%.8X", SearchResults[iCurItem]);
-			SetWindowText(GetDlgItem(hW, IDC_ADDRESS), buf);
-
-			switch (current_searchtype) {
-				case SEARCHTYPE_8BIT:
-					val = PSXMu8(SearchResults[iCurItem]);
-					break;
-
-				case SEARCHTYPE_16BIT:
-					val = PSXMu16(SearchResults[iCurItem]);
-					break;
-
-				case SEARCHTYPE_32BIT:
-					val = PSXMu32(SearchResults[iCurItem]);
-					break;
-
-				default:
-					assert(FALSE); // should not reach here
-					break;
-			}
-
-			sprintf(buf, "%u", val);
-			SetWindowText(GetDlgItem(hW, IDC_VALUE), buf);
-			break;
-
-		case WM_COMMAND:
-			switch (LOWORD(wParam)) {
-				case IDOK:
-					val = 0;
-					GetWindowText(GetDlgItem(hW, IDC_VALUE), buf, 255);
-					sscanf(buf, "%u", &val);
-
-					switch (current_searchtype) {
-						case SEARCHTYPE_8BIT:
-							if (val > 0xFF) {
-								val = 0xFF;
-							}
-							psxMemWrite8(SearchResults[iCurItem], (u8)val);
-							break;
-
-						case SEARCHTYPE_16BIT:
-							if (val > 0xFFFF) {
-								val = 0xFFFF;
-							}
-							psxMemWrite16(SearchResults[iCurItem], (u16)val);
-							break;
-
-						case SEARCHTYPE_32BIT:
-							psxMemWrite32(SearchResults[iCurItem], (u32)val);
-							break;
-
-						default:
-							assert(FALSE); // should not reach here
-							break;
-					}
-
-					EndDialog(hW, TRUE);
-					return TRUE;
-
-				case IDCANCEL:
-					EndDialog(hW, TRUE);
-					return FALSE;
-			}
-			break;
-
-		case WM_CLOSE:
-			EndDialog(hW, TRUE);
-			return FALSE;
-	}
-
-	return FALSE;
-}
-
-LRESULT WINAPI CheatSearchDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) {
-	char			buf[256];
-	uint32_t		i;
-
-	switch (uMsg) {
-		case WM_INITDIALOG:
-			SetWindowText(hW, _("Cheat Search"));
-
-			Static_SetText(GetDlgItem(hW, IDC_LABEL_SEARCHFOR), _("Search For:"));
-			Static_SetText(GetDlgItem(hW, IDC_LABEL_DATATYPE), _("Data Type:"));
-			Static_SetText(GetDlgItem(hW, IDC_LABEL_VALUE), _("Value:"));
-			Static_SetText(GetDlgItem(hW, IDC_LABEL_DATABASE), _("Data Base:"));
-			Static_SetText(GetDlgItem(hW, IDC_LABEL_TO), _("To:"));
-			Button_SetText(GetDlgItem(hW, IDC_FREEZE), _("&Freeze"));
-			Button_SetText(GetDlgItem(hW, IDC_MODIFY), _("&Modify"));
-			Button_SetText(GetDlgItem(hW, IDC_COPY), _("&Copy"));
-			Button_SetText(GetDlgItem(hW, IDC_SEARCH), _("&Search"));
-			Button_SetText(GetDlgItem(hW, IDC_NEWSEARCH), _("&New Search"));
-			Button_SetText(GetDlgItem(hW, IDCANCEL), _("C&lose"));
-
-			SendMessage(GetDlgItem(hW, IDC_DATATYPE), CB_ADDSTRING, 0, (LPARAM)_("8-bit"));
-			SendMessage(GetDlgItem(hW, IDC_DATATYPE), CB_ADDSTRING, 0, (LPARAM)_("16-bit"));
-			SendMessage(GetDlgItem(hW, IDC_DATATYPE), CB_ADDSTRING, 0, (LPARAM)_("32-bit"));
-			SendMessage(GetDlgItem(hW, IDC_DATABASE), CB_ADDSTRING, 0, (LPARAM)_("Decimal"));
-			SendMessage(GetDlgItem(hW, IDC_DATABASE), CB_ADDSTRING, 0, (LPARAM)_("Hexadecimal"));
-
-			UpdateCheatSearchDlg(hW);
-			break;
-
-		case WM_COMMAND:
-			switch (LOWORD(wParam)) {
-				case IDCANCEL:
-					EndDialog(hW, FALSE);
-					return TRUE;
-
-				case IDC_FREEZE:
-					iCurItem = SendMessage(GetDlgItem(hW, IDC_RESLIST), LB_GETCURSEL, 0, 0);
-					DialogBox(gApp.hInstance, MAKEINTRESOURCE(IDD_CHEATVALEDIT), hW, (DLGPROC)CheatFreezeProc);
-					break;
-
-				case IDC_MODIFY:
-					iCurItem = SendMessage(GetDlgItem(hW, IDC_RESLIST), LB_GETCURSEL, 0, 0);
-					DialogBox(gApp.hInstance, MAKEINTRESOURCE(IDD_CHEATVALEDIT), hW, (DLGPROC)CheatModifyProc);
-					UpdateCheatSearchDlg(hW);
-					break;
-
-				case IDC_COPY:
-					i = SendMessage(GetDlgItem(hW, IDC_RESLIST), LB_GETCURSEL, 0, 0);
-					sprintf(buf, "%.8X", SearchResults[i]);
-
-					if (OpenClipboard(gApp.hWnd)) {
-						HGLOBAL hglbCopy = GlobalAlloc(GHND, 256);
-						char *p;
-
-						if (hglbCopy != NULL) {
-							p = (char *)GlobalLock(hglbCopy);
-							strcpy(p, buf);
-							GlobalUnlock(p);
-
-							EmptyClipboard();
-							SetClipboardData(CF_TEXT, (HANDLE)hglbCopy);
-						}
-
-						CloseClipboard();
-					}
-					break;
-
-				case IDC_SEARCH:
-					current_search = SendMessage(GetDlgItem(hW, IDC_SEARCHFOR), CB_GETCURSEL, 0, 0);
-					current_searchtype = SendMessage(GetDlgItem(hW, IDC_DATATYPE), CB_GETCURSEL, 0, 0);
-					current_searchbase = SendMessage(GetDlgItem(hW, IDC_DATABASE), CB_GETCURSEL, 0, 0);
-					current_valuefrom = 0;
-					current_valueto = 0;
-
-					if (current_searchbase == SEARCHBASE_DEC) {
-						GetWindowText(GetDlgItem(hW, IDC_VALUEFROM), (LPTSTR)buf, 255);
-						sscanf(buf, "%u", &current_valuefrom);
-						GetWindowText(GetDlgItem(hW, IDC_VALUETO), (LPTSTR)buf, 255);
-						sscanf(buf, "%u", &current_valueto);
-					}
-					else {
-						GetWindowText(GetDlgItem(hW, IDC_VALUEFROM), (LPTSTR)buf, 255);
-						sscanf(buf, "%x", &current_valuefrom);
-						GetWindowText(GetDlgItem(hW, IDC_VALUETO), (LPTSTR)buf, 255);
-						sscanf(buf, "%x", &current_valueto);
-					}
-
-					switch (current_searchtype) {
-						case SEARCHTYPE_8BIT:
-							if (current_valuefrom > (u32)0xFF) {
-								current_valuefrom = 0xFF;
-							}
-							if (current_valueto > (u32)0xFF) {
-								current_valueto = 0xFF;
-							}
-							break;
-
-						case SEARCHTYPE_16BIT:
-							if (current_valuefrom > (u32)0xFFFF) {
-								current_valuefrom = 0xFFFF;
-							}
-							if (current_valueto > (u32)0xFFFF) {
-								current_valueto = 0xFFFF;
-							}
-						break;
-					}
-
-					if (current_search == SEARCH_RANGE && current_valuefrom > current_valueto) {
-						u32 t = current_valuefrom;
-						current_valuefrom = current_valueto;
-						current_valueto = t;
-					}
-
-					switch (current_search) {
-						case SEARCH_EQUALVAL:
-							switch (current_searchtype) {
-								case SEARCHTYPE_8BIT:
-									CheatSearchEqual8((u8)current_valuefrom);
-									break;
-
-								case SEARCHTYPE_16BIT:
-									CheatSearchEqual16((u16)current_valuefrom);
-									break;
-
-								case SEARCHTYPE_32BIT:
-									CheatSearchEqual32((u32)current_valuefrom);
-									break;
-							}
-							break;
-
-						case SEARCH_NOTEQUALVAL:
-							switch (current_searchtype) {
-								case SEARCHTYPE_8BIT:
-									CheatSearchNotEqual8((u8)current_valuefrom);
-									break;
-
-								case SEARCHTYPE_16BIT:
-									CheatSearchNotEqual16((u16)current_valuefrom);
-									break;
-
-								case SEARCHTYPE_32BIT:
-									CheatSearchNotEqual32((u32)current_valuefrom);
-									break;
-							}
-							break;
-
-						case SEARCH_RANGE:
-							switch (current_searchtype) {
-								case SEARCHTYPE_8BIT:
-									CheatSearchRange8((u8)current_valuefrom, (u8)current_valueto);
-									break;
-
-								case SEARCHTYPE_16BIT:
-									CheatSearchRange16((u16)current_valuefrom, (u16)current_valueto);
-									break;
-
-								case SEARCHTYPE_32BIT:
-									CheatSearchRange32((u32)current_valuefrom, (u32)current_valueto);
-									break;
-							}
-							break;
-
-						case SEARCH_INCBY:
-							switch (current_searchtype) {
-								case SEARCHTYPE_8BIT:
-									CheatSearchIncreasedBy8((u8)current_valuefrom);
-									break;
-
-								case SEARCHTYPE_16BIT:
-									CheatSearchIncreasedBy16((u16)current_valuefrom);
-									break;
-
-								case SEARCHTYPE_32BIT:
-									CheatSearchIncreasedBy32((u32)current_valuefrom);
-									break;
-							}
-							break;
-
-						case SEARCH_DECBY:
-							switch (current_searchtype) {
-								case SEARCHTYPE_8BIT:
-									CheatSearchDecreasedBy8((u8)current_valuefrom);
-									break;
-
-								case SEARCHTYPE_16BIT:
-									CheatSearchDecreasedBy16((u16)current_valuefrom);
-									break;
-
-								case SEARCHTYPE_32BIT:
-									CheatSearchDecreasedBy32((u32)current_valuefrom);
-									break;
-							}
-							break;
-
-						case SEARCH_INC:
-							switch (current_searchtype) {
-								case SEARCHTYPE_8BIT:
-									CheatSearchIncreased8();
-									break;
-
-								case SEARCHTYPE_16BIT:
-									CheatSearchIncreased16();
-									break;
-
-								case SEARCHTYPE_32BIT:
-									CheatSearchIncreased32();
-									break;
-							}
-							break;
-
-						case SEARCH_DEC:
-							switch (current_searchtype) {
-								case SEARCHTYPE_8BIT:
-									CheatSearchDecreased8();
-									break;
-
-								case SEARCHTYPE_16BIT:
-									CheatSearchDecreased16();
-									break;
-
-								case SEARCHTYPE_32BIT:
-									CheatSearchDecreased32();
-									break;
-							}
-							break;
-
-						case SEARCH_DIFFERENT:
-							switch (current_searchtype) {
-								case SEARCHTYPE_8BIT:
-									CheatSearchDifferent8();
-									break;
-
-								case SEARCHTYPE_16BIT:
-									CheatSearchDifferent16();
-									break;
-
-								case SEARCHTYPE_32BIT:
-									CheatSearchDifferent32();
-									break;
-							}
-							break;
-
-						case SEARCH_NOCHANGE:
-							switch (current_searchtype) {
-								case SEARCHTYPE_8BIT:
-									CheatSearchNoChange8();
-									break;
-
-								case SEARCHTYPE_16BIT:
-									CheatSearchNoChange16();
-									break;
-
-								case SEARCHTYPE_32BIT:
-									CheatSearchNoChange32();
-									break;
-							}
-							break;
-
-						default:
-							assert(FALSE); // not possible
-							break;
-					}
-
-					UpdateCheatSearchDlg(hW);
-					break;
-
-				case IDC_NEWSEARCH:
-					FreeCheatSearchMem();
-					FreeCheatSearchResults();
-
-					current_search = SEARCH_EQUALVAL;
-					current_searchtype = SEARCHTYPE_8BIT;
-					current_searchbase = SEARCHBASE_DEC;
-					current_valuefrom = 0;
-					current_valueto = 0;
-
-					UpdateCheatSearchDlg(hW);
-					EnableWindow(GetDlgItem(hW, IDC_VALUEFROM), TRUE);
-					break;
-
-				case IDC_SEARCHFOR:
-					EnableWindow(GetDlgItem(hW, IDC_VALUEFROM), TRUE);
-
-					if (SendMessage(GetDlgItem(hW, IDC_SEARCHFOR), CB_GETCURSEL, 0, 0) == SEARCH_RANGE) {
-						ShowWindow(GetDlgItem(hW, IDC_LABEL_TO), SW_SHOW);
-						ShowWindow(GetDlgItem(hW, IDC_VALUETO), SW_SHOW);
-					}
-					else {
-						ShowWindow(GetDlgItem(hW, IDC_LABEL_TO), SW_HIDE);
-						ShowWindow(GetDlgItem(hW, IDC_VALUETO), SW_HIDE);
-
-						if (SendMessage(GetDlgItem(hW, IDC_SEARCHFOR), CB_GETCURSEL, 0, 0) >= SEARCH_INC) {
-							EnableWindow(GetDlgItem(hW, IDC_VALUEFROM), FALSE);
-						}
-					}
-					break;
-
-				case IDC_DATABASE:
-					if (SendMessage(GetDlgItem(hW, IDC_DATABASE), CB_GETCURSEL, 0, 0) == SEARCHBASE_DEC) {
-						if (current_searchbase == SEARCHBASE_HEX) {
-							GetWindowText(GetDlgItem(hW, IDC_VALUEFROM), (LPTSTR)buf, 255);
-							sscanf(buf, "%x", &i);
-							sprintf(buf, "%u", i);
-							SetWindowText(GetDlgItem(hW, IDC_VALUEFROM), (LPCTSTR)buf);
-
-							GetWindowText(GetDlgItem(hW, IDC_VALUETO), (LPTSTR)buf, 255);
-							sscanf(buf, "%x", &i);
-							sprintf(buf, "%u", i);
-							SetWindowText(GetDlgItem(hW, IDC_VALUETO), (LPCTSTR)buf);
-						}
-					}
-					else if (current_searchbase == SEARCHBASE_DEC){
-						GetWindowText(GetDlgItem(hW, IDC_VALUEFROM), (LPTSTR)buf, 255);
-						sscanf(buf, "%u", &i);
-						sprintf(buf, "%X", i);
-						SetWindowText(GetDlgItem(hW, IDC_VALUEFROM), (LPCTSTR)buf);
-
-						GetWindowText(GetDlgItem(hW, IDC_VALUETO), (LPTSTR)buf, 255);
-						sscanf(buf, "%u", &i);
-						sprintf(buf, "%X", i);
-						SetWindowText(GetDlgItem(hW, IDC_VALUETO), (LPCTSTR)buf);
-					}
-					current_searchbase = SendMessage(GetDlgItem(hW, IDC_DATABASE), CB_GETCURSEL, 0, 0);
-					break;
-
-				case IDC_RESLIST:
-					switch (HIWORD(wParam)) {
-						case LBN_SELCHANGE:
-							Button_Enable(GetDlgItem(hW, IDC_FREEZE), TRUE);
-							Button_Enable(GetDlgItem(hW, IDC_MODIFY), TRUE);
-							Button_Enable(GetDlgItem(hW, IDC_COPY), TRUE);
-							break;
-
-						case LBN_SELCANCEL:
-							Button_Enable(GetDlgItem(hW, IDC_FREEZE), FALSE);
-							Button_Enable(GetDlgItem(hW, IDC_MODIFY), FALSE);
-							Button_Enable(GetDlgItem(hW, IDC_COPY), FALSE);
-							break;
-					}
-					break;
-			}
-			break;
-
-		case WM_CLOSE:
-			EndDialog(hW, FALSE);
-			return TRUE;
-	}
-
-	return FALSE;
-}
+/* Cheat Support for PCSX-Reloaded
+ * Copyright (C) 2009, Wei Mingzhi <whistler_wmz@users.sf.net>.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <windows.h>
+#include <windowsx.h>
+#ifndef _WIN32_IE
+#define _WIN32_IE 0x0400
+#endif
+#include <commctrl.h>
+#include <stdio.h>
+#include "psxcommon.h"
+#include "psxmem.h"
+#include "cheat.h"
+#include "resource.h"
+#include "Win32.h"
+
+static void UpdateCheatDlg(HWND hW) {
+ HWND		List;
+ LV_ITEM		item;
+	int			i;
+
+	List = GetDlgItem(hW, IDC_CODELIST);
+
+	ListView_DeleteAllItems(List);
+
+	for (i = 0; i < NumCheats; i++) {
+		memset(&item, 0, sizeof(item));
+
+		item.mask		= LVIF_TEXT;
+		item.iItem		= i;
+		item.pszText	= Cheats[i].Descr;
+		item.iSubItem	= 0;
+
+		SendMessage(List, LVM_INSERTITEM, 0, (LPARAM)&item);
+
+		item.pszText	= (Cheats[i].Enabled ? _("Yes") : _("No"));
+		item.iSubItem	= 1;
+
+		SendMessage(List, LVM_SETITEM, 0, (LPARAM)&item);
+	}
+}
+
+static int		iEditItem = -1;
+static char		szDescr[256], szCode[1024];
+
+static LRESULT WINAPI CheatEditDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) {
+	int		i;
+
+	switch (uMsg) {
+		case WM_INITDIALOG:
+			SetWindowText(hW, _("Edit Cheat"));
+			Static_SetText(GetDlgItem(hW, IDC_LABEL_DESCR), _("Description:"));
+			Static_SetText(GetDlgItem(hW, IDC_LABEL_CODE), _("Cheat Code:"));
+			Button_SetText(GetDlgItem(hW, IDOK), _("OK"));
+			Button_SetText(GetDlgItem(hW, IDCANCEL), _("Cancel"));
+
+			assert(iEditItem != -1 && iEditItem < NumCheats);
+
+			Edit_SetText(GetDlgItem(hW, IDC_DESCR), Cheats[iEditItem].Descr);
+
+			szCode[0] = '\0';
+			for (i = Cheats[iEditItem].First; i < Cheats[iEditItem].First + Cheats[iEditItem].n; i++) {
+				sprintf(szDescr, "%.8X %.4X\r\n", CheatCodes[i].Addr, CheatCodes[i].Val);
+				strcat(szCode, szDescr);
+			}
+			Edit_SetText(GetDlgItem(hW, IDC_CODE), szCode);
+			break;
+
+		case WM_COMMAND:
+			switch (LOWORD(wParam)) {
+				case IDOK:
+					Edit_GetText(GetDlgItem(hW, IDC_DESCR), szDescr, 256);
+					Edit_GetText(GetDlgItem(hW, IDC_CODE), szCode, 1024);
+
+					if (EditCheat(iEditItem, szDescr, szCode) != 0) {
+						SysMessage(_("Invalid cheat code!"));
+					}
+					else {
+ EndDialog(hW, TRUE);
+ return TRUE;
+					}
+					break;
+
+				case IDCANCEL:
+					EndDialog(hW, FALSE);
+					return TRUE;
+			}
+			break;
+
+		case WM_CLOSE:
+			EndDialog(hW, FALSE);
+			return TRUE;
+	}
+
+	return FALSE;
+}
+
+static LRESULT WINAPI CheatAddDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) {
+	switch (uMsg) {
+		case WM_INITDIALOG:
+			SetWindowText(hW, _("Add New Cheat"));
+			Static_SetText(GetDlgItem(hW, IDC_LABEL_DESCR), _("Description:"));
+			Static_SetText(GetDlgItem(hW, IDC_LABEL_CODE), _("Cheat Code:"));
+			Button_SetText(GetDlgItem(hW, IDOK), _("OK"));
+			Button_SetText(GetDlgItem(hW, IDCANCEL), _("Cancel"));
+			Edit_SetText(GetDlgItem(hW, IDC_DESCR), szDescr);
+			Edit_SetText(GetDlgItem(hW, IDC_CODE), szCode);
+			break;
+
+		case WM_COMMAND:
+			switch (LOWORD(wParam)) {
+				case IDOK:
+					Edit_GetText(GetDlgItem(hW, IDC_DESCR), szDescr, 256);
+					Edit_GetText(GetDlgItem(hW, IDC_CODE), szCode, 1024);
+
+					if (AddCheat(szDescr, szCode) != 0) {
+						SysMessage(_("Invalid cheat code!"));
+					}
+					else {
+ EndDialog(hW, TRUE);
+ return TRUE;
+					}
+					break;
+
+				case IDCANCEL:
+					EndDialog(hW, FALSE);
+					return TRUE;
+			}
+			break;
+
+		case WM_CLOSE:
+			EndDialog(hW, FALSE);
+			return TRUE;
+	}
+
+	return FALSE;
+}
+
+LRESULT WINAPI CheatDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) {
+	HWND			List;
+	LV_COLUMN		col;
+	LV_ITEM			item;
+	int				i;
+	OPENFILENAME	ofn;
+	char			szFileName[256];
+	char			szFileTitle[256];
+	char			szFilter[256];
+
+	switch (uMsg) {
+		case WM_INITDIALOG:
+			SetWindowText(hW, _("Edit Cheat Codes"));
+
+			Button_SetText(GetDlgItem(hW, IDC_ADDCODE), _("&Add Code"));
+			Button_SetText(GetDlgItem(hW, IDC_EDITCODE), _("&Edit Code"));
+			Button_SetText(GetDlgItem(hW, IDC_REMOVECODE), _("&Remove Code"));
+			Button_SetText(GetDlgItem(hW, IDC_TOGGLECODE), _("&Enable/Disable"));
+			Button_SetText(GetDlgItem(hW, IDC_LOADCODE), _("&Load..."));
+			Button_SetText(GetDlgItem(hW, IDC_SAVECODE), _("&Save As..."));
+			Button_SetText(GetDlgItem(hW, IDCANCEL), _("&Close"));
+
+			List = GetDlgItem(hW, IDC_CODELIST);
+
+ SendMessage(List, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_FULLROWSELECT);
+
+			memset(&col, 0, sizeof(col));
+
+			col.mask	= LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM;
+			col.fmt		= LVCFMT_LEFT;
+
+			col.pszText		= _("Description");
+			col.cx			= 400;
+
+			SendMessage(List, LVM_INSERTCOLUMN, 0, (LPARAM)&col);
+
+			col.pszText		= _("Enabled");
+			col.cx			= 55;
+
+			SendMessage(List, LVM_INSERTCOLUMN, 1, (LPARAM)&col);
+
+			UpdateCheatDlg(hW);
+			break;
+
+		case WM_COMMAND:
+			switch (LOWORD(wParam)) {
+				case IDCANCEL:
+					EndDialog(hW, FALSE);
+					return TRUE;
+
+				case IDC_ADDCODE:
+					i = NumCheats;
+					szDescr[0] = '\0';
+					szCode[0] = '\0';
+
+					DialogBox(gApp.hInstance, MAKEINTRESOURCE(IDD_CHEATEDIT), hW, (DLGPROC)CheatAddDlgProc);
+
+					if (NumCheats > i) {
+						// new cheat added
+						List = GetDlgItem(hW, IDC_CODELIST);
+						memset(&item, 0, sizeof(item));
+
+						item.mask		= LVIF_TEXT;
+						item.iItem		= i;
+						item.pszText	= Cheats[i].Descr;
+						item.iSubItem	= 0;
+
+						SendMessage(List, LVM_INSERTITEM, 0, (LPARAM)&item);
+
+						item.pszText	= (Cheats[i].Enabled ? _("Yes") : _("No"));
+						item.iSubItem	= 1;
+
+						SendMessage(List, LVM_SETITEM, 0, (LPARAM)&item);
+					}
+					break;
+
+				case IDC_EDITCODE:
+					List = GetDlgItem(hW, IDC_CODELIST);
+					iEditItem = ListView_GetSelectionMark(List);
+
+					if (iEditItem != -1) {
+						DialogBox(gApp.hInstance, MAKEINTRESOURCE(IDD_CHEATEDIT), hW, (DLGPROC)CheatEditDlgProc);
+
+						memset(&item, 0, sizeof(item));
+
+						item.mask		= LVIF_TEXT;
+						item.iItem		= iEditItem;
+						item.pszText	= Cheats[iEditItem].Descr;
+						item.iSubItem	= 0;
+
+						SendMessage(List, LVM_SETITEM, 0, (LPARAM)&item);
+					}
+					break;
+
+				case IDC_REMOVECODE:
+					List = GetDlgItem(hW, IDC_CODELIST);
+					i = ListView_GetSelectionMark(List);
+
+					if (i != -1) {
+						RemoveCheat(i);
+						ListView_DeleteItem(List, i);
+						ListView_SetSelectionMark(List, -1);
+					}
+					break;
+
+				case IDC_TOGGLECODE:
+					List = GetDlgItem(hW, IDC_CODELIST);
+					i = ListView_GetSelectionMark(List);
+
+					if (i != -1) {
+						Cheats[i].Enabled ^= 1;
+
+						memset(&item, 0, sizeof(item));
+
+						item.mask		= LVIF_TEXT;
+						item.iItem		= i;
+						item.pszText	= (Cheats[i].Enabled ? _("Yes") : _("No"));
+						item.iSubItem	= 1;
+
+						SendMessage(List, LVM_SETITEM, 0, (LPARAM)&item);
+					}
+					break;
+
+				case IDC_LOADCODE:
+					memset(&szFileName, 0, sizeof(szFileName));
+					memset(&szFileTitle, 0, sizeof(szFileTitle));
+					memset(&szFilter, 0, sizeof(szFilter));
+
+					strcpy(szFilter, _("PCSXR Cheat Code Files"));
+					strcatz(szFilter, "*.*");
+
+					ofn.lStructSize			= sizeof(OPENFILENAME);
+					ofn.hwndOwner			= hW;
+					ofn.lpstrFilter			= szFilter;
+					ofn.lpstrCustomFilter	= NULL;
+					ofn.nMaxCustFilter		= 0;
+					ofn.nFilterIndex		= 1;
+					ofn.lpstrFile			= szFileName;
+					ofn.nMaxFile			= 256;
+					ofn.lpstrInitialDir		= ".\\Cheats";
+					ofn.lpstrFileTitle		= szFileTitle;
+					ofn.nMaxFileTitle		= 256;
+					ofn.lpstrTitle			= NULL;
+					ofn.lpstrDefExt			= "CHT";
+					ofn.Flags				= OFN_HIDEREADONLY | OFN_NOCHANGEDIR;
+
+					if (GetOpenFileName((LPOPENFILENAME)&ofn)) {
+						LoadCheats(szFileName);
+						UpdateCheatDlg(hW);
+					}
+					break;
+
+				case IDC_SAVECODE:
+					memset(&szFileName, 0, sizeof(szFileName));
+					memset(&szFileTitle, 0, sizeof(szFileTitle));
+					memset(&szFilter, 0, sizeof(szFilter));
+
+					strcpy(szFilter, _("PCSXR Cheat Code Files"));
+					strcatz(szFilter, "*.*");
+
+					ofn.lStructSize			= sizeof(OPENFILENAME);
+					ofn.hwndOwner			= hW;
+					ofn.lpstrFilter			= szFilter;
+					ofn.lpstrCustomFilter	= NULL;
+					ofn.nMaxCustFilter		= 0;
+					ofn.nFilterIndex		= 1;
+					ofn.lpstrFile			= szFileName;
+					ofn.nMaxFile			= 256;
+					ofn.lpstrInitialDir		= ".\\Cheats";
+					ofn.lpstrFileTitle		= szFileTitle;
+					ofn.nMaxFileTitle		= 256;
+					ofn.lpstrTitle			= NULL;
+					ofn.lpstrDefExt			= "CHT";
+					ofn.Flags				= OFN_HIDEREADONLY | OFN_NOCHANGEDIR | OFN_OVERWRITEPROMPT;
+
+					if (GetOpenFileName((LPOPENFILENAME)&ofn)) {
+						SaveCheats(szFileName);
+					}
+					break;
+			}
+			break;
+
+		case WM_NOTIFY:
+			switch (LOWORD(wParam)) {
+				case IDC_CODELIST:
+					List = GetDlgItem(hW, IDC_CODELIST);
+					i = ListView_GetSelectionMark(List);
+
+					if (i != -1) {
+						Button_Enable(GetDlgItem(hW, IDC_EDITCODE), TRUE);
+						Button_Enable(GetDlgItem(hW, IDC_REMOVECODE), TRUE);
+						Button_Enable(GetDlgItem(hW, IDC_TOGGLECODE), TRUE);
+					}
+					else {
+						Button_Enable(GetDlgItem(hW, IDC_EDITCODE), FALSE);
+						Button_Enable(GetDlgItem(hW, IDC_REMOVECODE), FALSE);
+						Button_Enable(GetDlgItem(hW, IDC_TOGGLECODE), FALSE);
+					}
+
+					Button_Enable(GetDlgItem(hW, IDC_SAVECODE), (NumCheats > 0));
+					break;
+			}
+			break;
+
+		case WM_CLOSE:
+			EndDialog(hW, FALSE);
+			return TRUE;
+	}
+
+	return FALSE;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+#define SEARCH_EQUALVAL				0
+#define SEARCH_NOTEQUALVAL			1
+#define SEARCH_RANGE				2
+#define SEARCH_INCBY				3
+#define SEARCH_DECBY				4
+#define SEARCH_INC					5
+#define SEARCH_DEC					6
+#define SEARCH_DIFFERENT			7
+#define SEARCH_NOCHANGE				8
+
+#define SEARCHTYPE_8BIT				0
+#define SEARCHTYPE_16BIT			1
+#define SEARCHTYPE_32BIT			2
+
+#define SEARCHBASE_DEC				0
+#define SEARCHBASE_HEX				1
+
+static char current_search			= SEARCH_EQUALVAL;
+static char current_searchtype		= SEARCHTYPE_8BIT;
+static char current_searchbase		= SEARCHBASE_DEC;
+static uint32_t current_valuefrom	= 0;
+static uint32_t current_valueto		= 0;
+
+static void UpdateCheatSearchDlg(HWND hW) {
+	char		buf[256];
+	int			i;
+
+	SendMessage(GetDlgItem(hW, IDC_SEARCHFOR), CB_RESETCONTENT, 0, 0);
+	SendMessage(GetDlgItem(hW, IDC_RESLIST), LB_RESETCONTENT, 0, 0);
+
+	Button_Enable(GetDlgItem(hW, IDC_FREEZE), FALSE);
+	Button_Enable(GetDlgItem(hW, IDC_MODIFY), FALSE);
+	Button_Enable(GetDlgItem(hW, IDC_COPY), FALSE);
+
+	SendMessage(GetDlgItem(hW, IDC_SEARCHFOR), CB_ADDSTRING, 0, (LPARAM)_("Equal Value"));
+	SendMessage(GetDlgItem(hW, IDC_SEARCHFOR), CB_ADDSTRING, 0, (LPARAM)_("Not Equal Value"));
+	SendMessage(GetDlgItem(hW, IDC_SEARCHFOR), CB_ADDSTRING, 0, (LPARAM)_("Range"));
+
+	if (prevM != NULL) {
+		SendMessage(GetDlgItem(hW, IDC_SEARCHFOR), CB_ADDSTRING, 0, (LPARAM)_("Increased By"));
+		SendMessage(GetDlgItem(hW, IDC_SEARCHFOR), CB_ADDSTRING, 0, (LPARAM)_("Decreased By"));
+		SendMessage(GetDlgItem(hW, IDC_SEARCHFOR), CB_ADDSTRING, 0, (LPARAM)_("Increased"));
+		SendMessage(GetDlgItem(hW, IDC_SEARCHFOR), CB_ADDSTRING, 0, (LPARAM)_("Decreased"));
+		SendMessage(GetDlgItem(hW, IDC_SEARCHFOR), CB_ADDSTRING, 0, (LPARAM)_("Different"));
+		SendMessage(GetDlgItem(hW, IDC_SEARCHFOR), CB_ADDSTRING, 0, (LPARAM)_("No Change"));
+
+		ComboBox_Enable(GetDlgItem(hW, IDC_DATATYPE), FALSE);
+	}
+	else {
+		ComboBox_Enable(GetDlgItem(hW, IDC_DATATYPE), TRUE);
+	}
+
+	SendMessage(GetDlgItem(hW, IDC_SEARCHFOR), CB_SETCURSEL, (WPARAM)current_search, 0);
+
+	if (current_search == SEARCH_RANGE) {
+		ShowWindow(GetDlgItem(hW, IDC_LABEL_TO), SW_SHOW);
+		ShowWindow(GetDlgItem(hW, IDC_VALUETO), SW_SHOW);
+	}
+	else {
+		ShowWindow(GetDlgItem(hW, IDC_LABEL_TO), SW_HIDE);
+		ShowWindow(GetDlgItem(hW, IDC_VALUETO), SW_HIDE);
+	}
+
+	SendMessage(GetDlgItem(hW, IDC_DATATYPE), CB_SETCURSEL, (WPARAM)current_searchtype, 0);
+	SendMessage(GetDlgItem(hW, IDC_DATABASE), CB_SETCURSEL, (WPARAM)current_searchbase, 0);
+
+	if (current_searchbase == SEARCHBASE_HEX) {
+		sprintf(buf, "%X", current_valuefrom);
+		SetWindowText(GetDlgItem(hW, IDC_VALUEFROM), buf);
+		sprintf(buf, "%X", current_valueto);
+		SetWindowText(GetDlgItem(hW, IDC_VALUETO), buf);
+	}
+	else {
+		sprintf(buf, "%u", current_valuefrom);
+		SetWindowText(GetDlgItem(hW, IDC_VALUEFROM), buf);
+		sprintf(buf, "%u", current_valueto);
+		SetWindowText(GetDlgItem(hW, IDC_VALUETO), buf);
+	}
+
+	if (prevM == NULL) {
+		SendMessage(GetDlgItem(hW, IDC_RESLIST), LB_ADDSTRING, (WPARAM)0, (LPARAM)_("Enter the values and start your search."));
+		EnableWindow(GetDlgItem(hW, IDC_RESLIST), FALSE);
+	}
+	else {
+		if (NumSearchResults == 0) {
+			SendMessage(GetDlgItem(hW, IDC_RESLIST), LB_ADDSTRING, (WPARAM)0, (LPARAM)_("No addresses found."));
+			EnableWindow(GetDlgItem(hW, IDC_RESLIST), FALSE);
+		}
+		else if (NumSearchResults > 100) {
+			SendMessage(GetDlgItem(hW, IDC_RESLIST), LB_ADDSTRING, (WPARAM)0, (LPARAM)_("Too many addresses found."));
+			EnableWindow(GetDlgItem(hW, IDC_RESLIST), FALSE);
+		}
+		else {
+			for (i = 0; i < NumSearchResults; i++) {
+				u32 addr = SearchResults[i];
+
+				switch (current_searchtype) {
+					case SEARCHTYPE_8BIT:
+						sprintf(buf, _("%.8X Current: %u (%.2X), Previous: %u (%.2X)"),
+							addr, PSXMu8(addr), PSXMu8(addr), PrevMu8(addr), PrevMu8(addr));
+						break;
+
+					case SEARCHTYPE_16BIT:
+						sprintf(buf, _("%.8X Current: %u (%.4X), Previous: %u (%.4X)"),
+							addr, PSXMu16(addr), PSXMu16(addr), PrevMu16(addr), PrevMu16(addr));
+						break;
+
+					case SEARCHTYPE_32BIT:
+						sprintf(buf, _("%.8X Current: %u (%.8X), Previous: %u (%.8X)"),
+							addr, PSXMu32(addr), PSXMu32(addr), PrevMu32(addr), PrevMu32(addr));
+						break;
+
+					default:
+						assert(FALSE); // impossible
+						break;
+				}
+
+				SendMessage(GetDlgItem(hW, IDC_RESLIST), LB_ADDSTRING, (WPARAM)0, (LPARAM)buf);
+				SendMessage(GetDlgItem(hW, IDC_RESLIST), LB_SETITEMDATA, i, (LPARAM)i);
+			}
+			EnableWindow(GetDlgItem(hW, IDC_RESLIST), TRUE);
+		}
+	}
+
+	sprintf(buf, _("Founded Addresses: %d"), NumSearchResults);
+	Static_SetText(GetDlgItem(hW, IDC_LABEL_RESULTSFOUND), buf);
+}
+
+static int iCurItem = 0;
+
+static LRESULT WINAPI CheatFreezeProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) {
+	u32			val;
+	char		buf[256];
+
+	switch (uMsg) {
+		case WM_INITDIALOG:
+			SetWindowText(hW, _("Freeze"));
+			Static_SetText(GetDlgItem(hW, IDC_LABEL_ADDRESS), _("Address:"));
+			Static_SetText(GetDlgItem(hW, IDC_LABEL_VALUE), _("Value:"));
+
+			sprintf(buf, "%.8X", SearchResults[iCurItem]);
+			SetWindowText(GetDlgItem(hW, IDC_ADDRESS), buf);
+
+			switch (current_searchtype) {
+				case SEARCHTYPE_8BIT:
+					val = PSXMu8(SearchResults[iCurItem]);
+					break;
+
+				case SEARCHTYPE_16BIT:
+					val = PSXMu16(SearchResults[iCurItem]);
+					break;
+
+				case SEARCHTYPE_32BIT:
+					val = PSXMu32(SearchResults[iCurItem]);
+					break;
+
+				default:
+					assert(FALSE); // should not reach here
+					break;
+			}
+
+			sprintf(buf, "%u", val);
+			SetWindowText(GetDlgItem(hW, IDC_VALUE), buf);
+			break;
+
+		case WM_COMMAND:
+			switch (LOWORD(wParam)) {
+				case IDOK:
+					val = 0;
+					GetWindowText(GetDlgItem(hW, IDC_VALUE), buf, 255);
+					sscanf(buf, "%u", &val);
+
+					switch (current_searchtype) {
+						case SEARCHTYPE_8BIT:
+							if (val > (u32)0xFF) {
+								val = 0xFF;
+							}
+							sprintf(szCode, "%.8X %.4X", (SearchResults[iCurItem] & 0x1FFFFF) | (CHEAT_CONST8 << 24), val);
+							break;
+
+						case SEARCHTYPE_16BIT:
+							if (val > (u32)0xFFFF) {
+								val = 0xFFFF;
+							}
+							sprintf(szCode, "%.8X %.4X", (SearchResults[iCurItem] & 0x1FFFFF) | (CHEAT_CONST16 << 24), val);
+							break;
+
+						case SEARCHTYPE_32BIT:
+							sprintf(szCode, "%.8X %.4X\n%.8X %.4X",
+								(SearchResults[iCurItem] & 0x1FFFFF) | (CHEAT_CONST16 << 24), val & 0xFFFF,
+								((SearchResults[iCurItem] + 2) & 0x1FFFFF) | (CHEAT_CONST16 << 24), ((val & 0xFFFF0000) >> 16) & 0xFFFF);
+							break;
+
+						default:
+							assert(FALSE); // should not reach here
+							break;
+					}
+
+					sprintf(szDescr, _("Freeze %.8X"), SearchResults[iCurItem]);
+
+					if (DialogBox(gApp.hInstance, MAKEINTRESOURCE(IDD_CHEATEDIT), hW, (DLGPROC)CheatAddDlgProc)) {
+						Cheats[NumCheats - 1].Enabled = 1;
+						EndDialog(hW, TRUE);
+						return TRUE;
+					}
+					break;
+
+				case IDCANCEL:
+					EndDialog(hW, FALSE);
+					return TRUE;
+			}
+			break;
+
+		case WM_CLOSE:
+			EndDialog(hW, FALSE);
+			return TRUE;
+	}
+
+	return FALSE;
+}
+
+static LRESULT WINAPI CheatModifyProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) {
+	u32			val;
+	char		buf[256];
+
+	switch (uMsg) {
+		case WM_INITDIALOG:
+			SetWindowText(hW, _("Modify"));
+			Static_SetText(GetDlgItem(hW, IDC_LABEL_ADDRESS), _("Address:"));
+			Static_SetText(GetDlgItem(hW, IDC_LABEL_VALUE), _("Value:"));
+
+			sprintf(buf, "%.8X", SearchResults[iCurItem]);
+			SetWindowText(GetDlgItem(hW, IDC_ADDRESS), buf);
+
+			switch (current_searchtype) {
+				case SEARCHTYPE_8BIT:
+					val = PSXMu8(SearchResults[iCurItem]);
+					break;
+
+				case SEARCHTYPE_16BIT:
+					val = PSXMu16(SearchResults[iCurItem]);
+					break;
+
+				case SEARCHTYPE_32BIT:
+					val = PSXMu32(SearchResults[iCurItem]);
+					break;
+
+				default:
+					assert(FALSE); // should not reach here
+					break;
+			}
+
+			sprintf(buf, "%u", val);
+			SetWindowText(GetDlgItem(hW, IDC_VALUE), buf);
+			break;
+
+		case WM_COMMAND:
+			switch (LOWORD(wParam)) {
+				case IDOK:
+					val = 0;
+					GetWindowText(GetDlgItem(hW, IDC_VALUE), buf, 255);
+					sscanf(buf, "%u", &val);
+
+					switch (current_searchtype) {
+						case SEARCHTYPE_8BIT:
+							if (val > 0xFF) {
+								val = 0xFF;
+							}
+							psxMemWrite8(SearchResults[iCurItem], (u8)val);
+							break;
+
+						case SEARCHTYPE_16BIT:
+							if (val > 0xFFFF) {
+								val = 0xFFFF;
+							}
+							psxMemWrite16(SearchResults[iCurItem], (u16)val);
+							break;
+
+						case SEARCHTYPE_32BIT:
+							psxMemWrite32(SearchResults[iCurItem], (u32)val);
+							break;
+
+						default:
+							assert(FALSE); // should not reach here
+							break;
+					}
+
+					EndDialog(hW, TRUE);
+					return TRUE;
+
+				case IDCANCEL:
+					EndDialog(hW, TRUE);
+					return FALSE;
+			}
+			break;
+
+		case WM_CLOSE:
+			EndDialog(hW, TRUE);
+			return FALSE;
+	}
+
+	return FALSE;
+}
+
+LRESULT WINAPI CheatSearchDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) {
+	char			buf[256];
+	uint32_t		i;
+
+	switch (uMsg) {
+		case WM_INITDIALOG:
+			SetWindowText(hW, _("Cheat Search"));
+
+			Static_SetText(GetDlgItem(hW, IDC_LABEL_SEARCHFOR), _("Search For:"));
+			Static_SetText(GetDlgItem(hW, IDC_LABEL_DATATYPE), _("Data Type:"));
+			Static_SetText(GetDlgItem(hW, IDC_LABEL_VALUE), _("Value:"));
+			Static_SetText(GetDlgItem(hW, IDC_LABEL_DATABASE), _("Data Base:"));
+			Static_SetText(GetDlgItem(hW, IDC_LABEL_TO), _("To:"));
+			Button_SetText(GetDlgItem(hW, IDC_FREEZE), _("&Freeze"));
+			Button_SetText(GetDlgItem(hW, IDC_MODIFY), _("&Modify"));
+			Button_SetText(GetDlgItem(hW, IDC_COPY), _("&Copy"));
+			Button_SetText(GetDlgItem(hW, IDC_SEARCH), _("&Search"));
+			Button_SetText(GetDlgItem(hW, IDC_NEWSEARCH), _("&New Search"));
+			Button_SetText(GetDlgItem(hW, IDCANCEL), _("C&lose"));
+
+			SendMessage(GetDlgItem(hW, IDC_DATATYPE), CB_ADDSTRING, 0, (LPARAM)_("8-bit"));
+			SendMessage(GetDlgItem(hW, IDC_DATATYPE), CB_ADDSTRING, 0, (LPARAM)_("16-bit"));
+			SendMessage(GetDlgItem(hW, IDC_DATATYPE), CB_ADDSTRING, 0, (LPARAM)_("32-bit"));
+			SendMessage(GetDlgItem(hW, IDC_DATABASE), CB_ADDSTRING, 0, (LPARAM)_("Decimal"));
+			SendMessage(GetDlgItem(hW, IDC_DATABASE), CB_ADDSTRING, 0, (LPARAM)_("Hexadecimal"));
+
+			UpdateCheatSearchDlg(hW);
+			break;
+
+		case WM_COMMAND:
+			switch (LOWORD(wParam)) {
+				case IDCANCEL:
+					EndDialog(hW, FALSE);
+					return TRUE;
+
+				case IDC_FREEZE:
+					iCurItem = SendMessage(GetDlgItem(hW, IDC_RESLIST), LB_GETCURSEL, 0, 0);
+					DialogBox(gApp.hInstance, MAKEINTRESOURCE(IDD_CHEATVALEDIT), hW, (DLGPROC)CheatFreezeProc);
+					break;
+
+				case IDC_MODIFY:
+					iCurItem = SendMessage(GetDlgItem(hW, IDC_RESLIST), LB_GETCURSEL, 0, 0);
+					DialogBox(gApp.hInstance, MAKEINTRESOURCE(IDD_CHEATVALEDIT), hW, (DLGPROC)CheatModifyProc);
+					UpdateCheatSearchDlg(hW);
+					break;
+
+				case IDC_COPY:
+					i = SendMessage(GetDlgItem(hW, IDC_RESLIST), LB_GETCURSEL, 0, 0);
+					sprintf(buf, "%.8X", SearchResults[i]);
+
+					if (OpenClipboard(gApp.hWnd)) {
+						HGLOBAL hglbCopy = GlobalAlloc(GHND, 256);
+						char *p;
+
+						if (hglbCopy != NULL) {
+							p = (char *)GlobalLock(hglbCopy);
+							strcpy(p, buf);
+							GlobalUnlock(p);
+
+							EmptyClipboard();
+							SetClipboardData(CF_TEXT, (HANDLE)hglbCopy);
+						}
+
+						CloseClipboard();
+					}
+					break;
+
+				case IDC_SEARCH:
+					current_search = SendMessage(GetDlgItem(hW, IDC_SEARCHFOR), CB_GETCURSEL, 0, 0);
+					current_searchtype = SendMessage(GetDlgItem(hW, IDC_DATATYPE), CB_GETCURSEL, 0, 0);
+					current_searchbase = SendMessage(GetDlgItem(hW, IDC_DATABASE), CB_GETCURSEL, 0, 0);
+					current_valuefrom = 0;
+					current_valueto = 0;
+
+					if (current_searchbase == SEARCHBASE_DEC) {
+						GetWindowText(GetDlgItem(hW, IDC_VALUEFROM), (LPTSTR)buf, 255);
+						sscanf(buf, "%u", &current_valuefrom);
+						GetWindowText(GetDlgItem(hW, IDC_VALUETO), (LPTSTR)buf, 255);
+						sscanf(buf, "%u", &current_valueto);
+					}
+					else {
+						GetWindowText(GetDlgItem(hW, IDC_VALUEFROM), (LPTSTR)buf, 255);
+						sscanf(buf, "%x", &current_valuefrom);
+						GetWindowText(GetDlgItem(hW, IDC_VALUETO), (LPTSTR)buf, 255);
+						sscanf(buf, "%x", &current_valueto);
+					}
+
+					switch (current_searchtype) {
+						case SEARCHTYPE_8BIT:
+							if (current_valuefrom > (u32)0xFF) {
+								current_valuefrom = 0xFF;
+							}
+							if (current_valueto > (u32)0xFF) {
+								current_valueto = 0xFF;
+							}
+							break;
+
+						case SEARCHTYPE_16BIT:
+							if (current_valuefrom > (u32)0xFFFF) {
+								current_valuefrom = 0xFFFF;
+							}
+							if (current_valueto > (u32)0xFFFF) {
+								current_valueto = 0xFFFF;
+							}
+						break;
+					}
+
+					if (current_search == SEARCH_RANGE && current_valuefrom > current_valueto) {
+						u32 t = current_valuefrom;
+						current_valuefrom = current_valueto;
+						current_valueto = t;
+					}
+
+					switch (current_search) {
+						case SEARCH_EQUALVAL:
+							switch (current_searchtype) {
+								case SEARCHTYPE_8BIT:
+									CheatSearchEqual8((u8)current_valuefrom);
+									break;
+
+								case SEARCHTYPE_16BIT:
+									CheatSearchEqual16((u16)current_valuefrom);
+									break;
+
+								case SEARCHTYPE_32BIT:
+									CheatSearchEqual32((u32)current_valuefrom);
+									break;
+							}
+							break;
+
+						case SEARCH_NOTEQUALVAL:
+							switch (current_searchtype) {
+								case SEARCHTYPE_8BIT:
+									CheatSearchNotEqual8((u8)current_valuefrom);
+									break;
+
+								case SEARCHTYPE_16BIT:
+									CheatSearchNotEqual16((u16)current_valuefrom);
+									break;
+
+								case SEARCHTYPE_32BIT:
+									CheatSearchNotEqual32((u32)current_valuefrom);
+									break;
+							}
+							break;
+
+						case SEARCH_RANGE:
+							switch (current_searchtype) {
+								case SEARCHTYPE_8BIT:
+									CheatSearchRange8((u8)current_valuefrom, (u8)current_valueto);
+									break;
+
+								case SEARCHTYPE_16BIT:
+									CheatSearchRange16((u16)current_valuefrom, (u16)current_valueto);
+									break;
+
+								case SEARCHTYPE_32BIT:
+									CheatSearchRange32((u32)current_valuefrom, (u32)current_valueto);
+									break;
+							}
+							break;
+
+						case SEARCH_INCBY:
+							switch (current_searchtype) {
+								case SEARCHTYPE_8BIT:
+									CheatSearchIncreasedBy8((u8)current_valuefrom);
+									break;
+
+								case SEARCHTYPE_16BIT:
+									CheatSearchIncreasedBy16((u16)current_valuefrom);
+									break;
+
+								case SEARCHTYPE_32BIT:
+									CheatSearchIncreasedBy32((u32)current_valuefrom);
+									break;
+							}
+							break;
+
+						case SEARCH_DECBY:
+							switch (current_searchtype) {
+								case SEARCHTYPE_8BIT:
+									CheatSearchDecreasedBy8((u8)current_valuefrom);
+									break;
+
+								case SEARCHTYPE_16BIT:
+									CheatSearchDecreasedBy16((u16)current_valuefrom);
+									break;
+
+								case SEARCHTYPE_32BIT:
+									CheatSearchDecreasedBy32((u32)current_valuefrom);
+									break;
+							}
+							break;
+
+						case SEARCH_INC:
+							switch (current_searchtype) {
+								case SEARCHTYPE_8BIT:
+									CheatSearchIncreased8();
+									break;
+
+								case SEARCHTYPE_16BIT:
+									CheatSearchIncreased16();
+									break;
+
+								case SEARCHTYPE_32BIT:
+									CheatSearchIncreased32();
+									break;
+							}
+							break;
+
+						case SEARCH_DEC:
+							switch (current_searchtype) {
+								case SEARCHTYPE_8BIT:
+									CheatSearchDecreased8();
+									break;
+
+								case SEARCHTYPE_16BIT:
+									CheatSearchDecreased16();
+									break;
+
+								case SEARCHTYPE_32BIT:
+									CheatSearchDecreased32();
+									break;
+							}
+							break;
+
+						case SEARCH_DIFFERENT:
+							switch (current_searchtype) {
+								case SEARCHTYPE_8BIT:
+									CheatSearchDifferent8();
+									break;
+
+								case SEARCHTYPE_16BIT:
+									CheatSearchDifferent16();
+									break;
+
+								case SEARCHTYPE_32BIT:
+									CheatSearchDifferent32();
+									break;
+							}
+							break;
+
+						case SEARCH_NOCHANGE:
+							switch (current_searchtype) {
+								case SEARCHTYPE_8BIT:
+									CheatSearchNoChange8();
+									break;
+
+								case SEARCHTYPE_16BIT:
+									CheatSearchNoChange16();
+									break;
+
+								case SEARCHTYPE_32BIT:
+									CheatSearchNoChange32();
+									break;
+							}
+							break;
+
+						default:
+							assert(FALSE); // not possible
+							break;
+					}
+
+					UpdateCheatSearchDlg(hW);
+					break;
+
+				case IDC_NEWSEARCH:
+					FreeCheatSearchMem();
+					FreeCheatSearchResults();
+
+					current_search = SEARCH_EQUALVAL;
+					current_searchtype = SEARCHTYPE_8BIT;
+					current_searchbase = SEARCHBASE_DEC;
+					current_valuefrom = 0;
+					current_valueto = 0;
+
+					UpdateCheatSearchDlg(hW);
+					EnableWindow(GetDlgItem(hW, IDC_VALUEFROM), TRUE);
+					break;
+
+				case IDC_SEARCHFOR:
+					EnableWindow(GetDlgItem(hW, IDC_VALUEFROM), TRUE);
+
+					if (SendMessage(GetDlgItem(hW, IDC_SEARCHFOR), CB_GETCURSEL, 0, 0) == SEARCH_RANGE) {
+						ShowWindow(GetDlgItem(hW, IDC_LABEL_TO), SW_SHOW);
+						ShowWindow(GetDlgItem(hW, IDC_VALUETO), SW_SHOW);
+					}
+					else {
+						ShowWindow(GetDlgItem(hW, IDC_LABEL_TO), SW_HIDE);
+						ShowWindow(GetDlgItem(hW, IDC_VALUETO), SW_HIDE);
+
+						if (SendMessage(GetDlgItem(hW, IDC_SEARCHFOR), CB_GETCURSEL, 0, 0) >= SEARCH_INC) {
+							EnableWindow(GetDlgItem(hW, IDC_VALUEFROM), FALSE);
+						}
+					}
+					break;
+
+				case IDC_DATABASE:
+					if (SendMessage(GetDlgItem(hW, IDC_DATABASE), CB_GETCURSEL, 0, 0) == SEARCHBASE_DEC) {
+						if (current_searchbase == SEARCHBASE_HEX) {
+							GetWindowText(GetDlgItem(hW, IDC_VALUEFROM), (LPTSTR)buf, 255);
+							sscanf(buf, "%x", &i);
+							sprintf(buf, "%u", i);
+							SetWindowText(GetDlgItem(hW, IDC_VALUEFROM), (LPCTSTR)buf);
+
+							GetWindowText(GetDlgItem(hW, IDC_VALUETO), (LPTSTR)buf, 255);
+							sscanf(buf, "%x", &i);
+							sprintf(buf, "%u", i);
+							SetWindowText(GetDlgItem(hW, IDC_VALUETO), (LPCTSTR)buf);
+						}
+					}
+					else if (current_searchbase == SEARCHBASE_DEC){
+						GetWindowText(GetDlgItem(hW, IDC_VALUEFROM), (LPTSTR)buf, 255);
+						sscanf(buf, "%u", &i);
+						sprintf(buf, "%X", i);
+						SetWindowText(GetDlgItem(hW, IDC_VALUEFROM), (LPCTSTR)buf);
+
+						GetWindowText(GetDlgItem(hW, IDC_VALUETO), (LPTSTR)buf, 255);
+						sscanf(buf, "%u", &i);
+						sprintf(buf, "%X", i);
+						SetWindowText(GetDlgItem(hW, IDC_VALUETO), (LPCTSTR)buf);
+					}
+					current_searchbase = SendMessage(GetDlgItem(hW, IDC_DATABASE), CB_GETCURSEL, 0, 0);
+					break;
+
+				case IDC_RESLIST:
+					switch (HIWORD(wParam)) {
+						case LBN_SELCHANGE:
+							Button_Enable(GetDlgItem(hW, IDC_FREEZE), TRUE);
+							Button_Enable(GetDlgItem(hW, IDC_MODIFY), TRUE);
+							Button_Enable(GetDlgItem(hW, IDC_COPY), TRUE);
+							break;
+
+						case LBN_SELCANCEL:
+							Button_Enable(GetDlgItem(hW, IDC_FREEZE), FALSE);
+							Button_Enable(GetDlgItem(hW, IDC_MODIFY), FALSE);
+							Button_Enable(GetDlgItem(hW, IDC_COPY), FALSE);
+							break;
+					}
+					break;
+			}
+			break;
+
+		case WM_CLOSE:
+			EndDialog(hW, FALSE);
+			return TRUE;
+	}
+
+	return FALSE;
+}

pcsxr-1.9.92.tar.bz2/win32/gui/ConfigurePlugins.c -> pcsxr-1.9.93.tar.bz2/win32/gui/ConfigurePlugins.c Changed

@@ -1,649 +1,705 @@
-/* Pcsx - Pc Psx Emulator
- * Copyright (C) 1999-2003 Pcsx Team
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
- */
-
-#include <windows.h>
-#include <windowsx.h>
-#include <stdio.h>
-#include "psxcommon.h"
-#include "plugin.h"
-#include "plugins.h"
-#include "resource.h"
-#include "Win32.h"
-
-#define QueryKeyV(name, var) \
-	size = sizeof(DWORD); \
-	if (RegQueryValueEx(myKey, name, 0, &type, (LPBYTE)&tmp, &size) != 0) { if (err) { RegCloseKey(myKey); return -1; } } \
-	var = tmp;
-
-#define QueryKey(s, name, var) \
-	size = s; \
-	if (RegQueryValueEx(myKey, name, 0, &type, (LPBYTE)var, &size) != 0) { if (err) { RegCloseKey(myKey); return -1; } }
-
-#define SetKeyV(name, var) \
-	tmp = var; \
-	RegSetValueEx(myKey, name, 0, REG_DWORD, (LPBYTE)&tmp, sizeof(DWORD));
-
-#define SetKey(name, var, s, t) \
-	RegSetValueEx(myKey, name, 0, t, (LPBYTE)var, s);
-
-int LoadConfig() {
-	HKEY myKey;
-	DWORD type, size, tmp;
-	PcsxConfig *Conf = &Config;
-	int err;
-#ifdef ENABLE_NLS
-	char text[256];
-#endif
-
-	if (RegOpenKeyEx(HKEY_CURRENT_USER,cfgfile,0,KEY_ALL_ACCESS,&myKey)!=ERROR_SUCCESS) return -1;
-
-	err = 1;
-	QueryKey(256, "Bios", Conf->Bios);
-	QueryKey(256, "Gpu", Conf->Gpu);
-	QueryKey(256, "Spu", Conf->Spu);
-	QueryKey(256, "Cdr", Conf->Cdr);
-	QueryKey(256, "Pad1", Conf->Pad1);
-	QueryKey(256, "Pad2", Conf->Pad2);
-	QueryKey(256, "Mcd1", Conf->Mcd1);
-	QueryKey(256, "Mcd2", Conf->Mcd2);
-	QueryKey(256, "PluginsDir", Conf->PluginsDir);
-	QueryKey(256, "BiosDir", Conf->BiosDir);
-	err = 0;
-	QueryKey(256, "Net", Conf->Net);
-	QueryKey(256, "Lang", Conf->Lang);
-
-	QueryKeyV("Xa", Conf->Xa);
-	QueryKeyV("Sio", Conf->Sio);
-	QueryKeyV("Mdec", Conf->Mdec);
-	QueryKeyV("PsxAuto", Conf->PsxAuto);
-	QueryKeyV("Cdda", Conf->Cdda);
-	QueryKeyV("Debug", Conf->Debug);
-	QueryKeyV("PsxOut", Conf->PsxOut);
-	QueryKeyV("SpuIrq", Conf->SpuIrq);
-	QueryKeyV("RCntFix", Conf->RCntFix);
-	QueryKeyV("VSyncWA", Conf->VSyncWA);
-
-	QueryKeyV("Cpu", Conf->Cpu);
-	QueryKeyV("PsxType", Conf->PsxType);
-
-	if (Config.Cpu == CPU_DYNAREC) {
-		Config.Debug = 0; // don't enable debugger if using dynarec core
-	}
-
-	RegCloseKey(myKey);
-
-#ifdef ENABLE_NLS
-	sprintf(text, "LANGUAGE=%s", Conf->Lang);
-	gettext_putenv(text);
-#endif
-
-	return 0;
-}
-
-/////////////////////////////////////////////////////////
-
-void SaveConfig() {
-	HKEY myKey;
-	DWORD myDisp, tmp;
-	PcsxConfig *Conf = &Config;
-
-	RegCreateKeyEx(HKEY_CURRENT_USER, cfgfile, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &myKey, &myDisp);
-
-	SetKey("Bios", Conf->Bios, strlen(Conf->Bios), REG_SZ);
-	SetKey("Gpu", Conf->Gpu, strlen(Conf->Gpu), REG_SZ);
-	SetKey("Spu", Conf->Spu, strlen(Conf->Spu), REG_SZ);
-	SetKey("Cdr", Conf->Cdr, strlen(Conf->Cdr), REG_SZ);
-	SetKey("Pad1", Conf->Pad1, strlen(Conf->Pad1), REG_SZ);
-	SetKey("Pad2", Conf->Pad2, strlen(Conf->Pad2), REG_SZ);
-	SetKey("Net", Conf->Net, strlen(Conf->Net), REG_SZ);
-	SetKey("Mcd1", Conf->Mcd1, strlen(Conf->Mcd1), REG_SZ);
-	SetKey("Mcd2", Conf->Mcd2, strlen(Conf->Mcd2), REG_SZ);
-	SetKey("Lang", Conf->Lang, strlen(Conf->Lang), REG_SZ);
-	SetKey("PluginsDir", Conf->PluginsDir, strlen(Conf->PluginsDir), REG_SZ);
-	SetKey("BiosDir", Conf->BiosDir, strlen(Conf->BiosDir), REG_SZ);
-
-	SetKeyV("Xa", Conf->Xa);
-	SetKeyV("Sio", Conf->Sio);
-	SetKeyV("Mdec", Conf->Mdec);
-	SetKeyV("PsxAuto", Conf->PsxAuto);
-	SetKeyV("Cdda", Conf->Cdda);
-	SetKeyV("Debug", Conf->Debug);
-	SetKeyV("PsxOut", Conf->PsxOut);
-	SetKeyV("SpuIrq", Conf->SpuIrq);
-	SetKeyV("RCntFix", Conf->RCntFix);
-	SetKeyV("VSyncWA", Conf->VSyncWA);
-
-	SetKeyV("Cpu", Conf->Cpu);
-	SetKeyV("PsxType", Conf->PsxType);
-
-	RegCloseKey(myKey);
-}
-
-/////////////////////////////////////////////////////////
-
-#define ComboAddPlugin(hw, str) { \
-	lp = (char *)malloc(strlen(FindData.cFileName)+8); \
-	sprintf(lp, "%s", FindData.cFileName); \
-	i = ComboBox_AddString(hw, tmpStr); \
-	ComboBox_SetItemData(hw, i, lp); \
-	if (stricmp(str, lp)==0) \
-		ComboBox_SetCurSel(hw, i); \
-}
-
-BOOL OnConfigurePluginsDialog(HWND hW) {
-	WIN32_FIND_DATA FindData;
-	HANDLE Find;
-	HANDLE Lib;
-	PSEgetLibType PSE_GetLibType;
-	PSEgetLibName PSE_GetLibName;
-	PSEgetLibVersion PSE_GetLibVersion;
-	HWND hWC_GPU=GetDlgItem(hW,IDC_LISTGPU);
-	HWND hWC_SPU=GetDlgItem(hW,IDC_LISTSPU);
-	HWND hWC_CDR=GetDlgItem(hW,IDC_LISTCDR);
-	HWND hWC_PAD1=GetDlgItem(hW,IDC_LISTPAD1);
-	HWND hWC_PAD2=GetDlgItem(hW,IDC_LISTPAD2);
-	HWND hWC_BIOS=GetDlgItem(hW,IDC_LISTBIOS);
-	char tmpStr[256];
-	char *lp;
-	int i;
-
-	strcpy(tmpStr, Config.PluginsDir);
-	strcat(tmpStr, "*.dll");
-	Find = FindFirstFile(tmpStr, &FindData);
-
-	do {
-		if (Find == INVALID_HANDLE_VALUE) break;
-		sprintf(tmpStr,"%s%s", Config.PluginsDir, FindData.cFileName);
-		Lib = LoadLibrary(tmpStr);
-		if (Lib != NULL) {
-			PSE_GetLibType = (PSEgetLibType) GetProcAddress((HMODULE)Lib,"PSEgetLibType");
-			PSE_GetLibName = (PSEgetLibName) GetProcAddress((HMODULE)Lib,"PSEgetLibName");
-			PSE_GetLibVersion = (PSEgetLibVersion) GetProcAddress((HMODULE)Lib,"PSEgetLibVersion");
-
-			if (PSE_GetLibType != NULL && PSE_GetLibName != NULL && PSE_GetLibVersion != NULL) {
-				unsigned long version = PSE_GetLibVersion();
-				long type;
-
-				sprintf(tmpStr, "%s %d.%d", PSE_GetLibName(), (int)(version>>8)&0xff, (int)version&0xff);
-				type = PSE_GetLibType();
-				if (type & PSE_LT_CDR) {
-					ComboAddPlugin(hWC_CDR, Config.Cdr);
-				}
-
-				if (type & PSE_LT_SPU) {
-					ComboAddPlugin(hWC_SPU, Config.Spu);
-				}
-
-				if (type & PSE_LT_GPU) {
-					ComboAddPlugin(hWC_GPU, Config.Gpu);
-				}
-
-				if (type & PSE_LT_PAD) {
-					PADquery query;
-
-					query = (PADquery)GetProcAddress((HMODULE)Lib, "PADquery");
-					if (query != NULL) {
-						if (query() & 0x1)
-							ComboAddPlugin(hWC_PAD1, Config.Pad1);
-						if (query() & 0x2)
-							ComboAddPlugin(hWC_PAD2, Config.Pad2);
-					} else { // just a guess
-						ComboAddPlugin(hWC_PAD1, Config.Pad1);
-					}
-				}
-			}
-		}
-	} while (FindNextFile(Find,&FindData));
-
-	if (Find != INVALID_HANDLE_VALUE) FindClose(Find);
-
-// BIOS
-
-	lp = (char *)malloc(strlen("HLE") + 1);
-	sprintf(lp, "HLE");
-	i = ComboBox_AddString(hWC_BIOS, _("Simulate Psx Bios"));
-	ComboBox_SetItemData(hWC_BIOS, i, lp);
-	if (stricmp(Config.Bios, lp)==0)
-		ComboBox_SetCurSel(hWC_BIOS, i);
-
-	strcpy(tmpStr, Config.BiosDir);
-	strcat(tmpStr, "*");
-	Find=FindFirstFile(tmpStr, &FindData);
-
-	do {
-		if (Find==INVALID_HANDLE_VALUE) break;
-		if (!strcmp(FindData.cFileName, ".")) continue;
-		if (!strcmp(FindData.cFileName, "..")) continue;
-		if (FindData.nFileSizeLow != 1024 * 512) continue;
-		lp = (char *)malloc(strlen(FindData.cFileName)+8);
-		sprintf(lp, "%s", (char *)FindData.cFileName);
-		i = ComboBox_AddString(hWC_BIOS, FindData.cFileName);
-		ComboBox_SetItemData(hWC_BIOS, i, lp);
-		if (Config.Bios[0]=='\0') {
-			ComboBox_SetCurSel(hWC_BIOS, i);
-			strcpy(Config.Bios, FindData.cFileName);
-		} else if (stricmp(Config.Bios, FindData.cFileName)==0)
-			ComboBox_SetCurSel(hWC_BIOS, i);
-	} while (FindNextFile(Find,&FindData));
-
-	if (Find!=INVALID_HANDLE_VALUE) FindClose(Find);
-
-	if (ComboBox_GetCurSel(hWC_CDR ) == -1)
-		ComboBox_SetCurSel(hWC_CDR, 0);
-	if (ComboBox_GetCurSel(hWC_GPU ) == -1)
-		ComboBox_SetCurSel(hWC_GPU, 0);
-	if (ComboBox_GetCurSel(hWC_SPU ) == -1)
-		ComboBox_SetCurSel(hWC_SPU, 0);
-	if (ComboBox_GetCurSel(hWC_PAD1) == -1)
-		ComboBox_SetCurSel(hWC_PAD1, 0);
-	if (ComboBox_GetCurSel(hWC_PAD2) == -1)
-		ComboBox_SetCurSel(hWC_PAD2, 0);
-	if (ComboBox_GetCurSel(hWC_BIOS) == -1)
-		ComboBox_SetCurSel(hWC_BIOS, 0);
-
-	return TRUE;
-}
-	
-#define CleanCombo(item) \
-	hWC = GetDlgItem(hW, item); \
-	iCnt = ComboBox_GetCount(hWC); \
-	for (i=0; i<iCnt; i++) { \
-		lp = (char *)ComboBox_GetItemData(hWC, i); \
-		if (lp) free(lp); \
-	} \
-	ComboBox_ResetContent(hWC);
-
-void CleanUpCombos(HWND hW) {
-	int i,iCnt;HWND hWC;char * lp;
-
-	CleanCombo(IDC_LISTGPU);
-	CleanCombo(IDC_LISTSPU);
-	CleanCombo(IDC_LISTCDR);
-	CleanCombo(IDC_LISTPAD1);
-	CleanCombo(IDC_LISTPAD2);
-	CleanCombo(IDC_LISTBIOS);
-}
-
-void OnCancel(HWND hW) {
-	CleanUpCombos(hW);
-	EndDialog(hW,FALSE);
-}
-
-char *GetSelDLL(HWND hW,int id) {
-	HWND hWC = GetDlgItem(hW,id);
-	int iSel;
-	iSel = ComboBox_GetCurSel(hWC);
-	if (iSel<0) return NULL;
-	return (char *)ComboBox_GetItemData(hWC, iSel);
-}
-
-void OnOK(HWND hW) {
-	char *gpuDLL=GetSelDLL(hW,IDC_LISTGPU);
-	char *spuDLL=GetSelDLL(hW,IDC_LISTSPU);
-	char *cdrDLL=GetSelDLL(hW,IDC_LISTCDR);
-	char *pad1DLL=GetSelDLL(hW,IDC_LISTPAD1);
-	char *pad2DLL=GetSelDLL(hW,IDC_LISTPAD2);
-	char *biosFILE=GetSelDLL(hW,IDC_LISTBIOS);
-
- if (gpuDLL == NULL || spuDLL == NULL || cdrDLL == NULL || pad1DLL == NULL ||
-		pad2DLL == NULL || biosFILE == NULL) {
-		MessageBox(hW, _("Configuration not OK!"), _("Error"), MB_OK | MB_ICONERROR);
-		return;
-	}
-
-	strcpy(Config.Bios, biosFILE);
-	strcpy(Config.Gpu, gpuDLL);
-	strcpy(Config.Spu, spuDLL);
-	strcpy(Config.Cdr, cdrDLL);
-	strcpy(Config.Pad1, pad1DLL);
-	strcpy(Config.Pad2, pad2DLL);
-
-	SaveConfig();
-
-	CleanUpCombos(hW);
-
-	if (!ConfPlug) {
-		LoadPlugins();
-	}
-	EndDialog(hW,TRUE);
-}
-
-
-#define ConfPlugin(src, confs, name) \
-	void *drv; \
-	src conf; \
-	char * pDLL = GetSelDLL(hW, confs); \
-	char file[256]; \
-	if(pDLL==NULL) return; \
-	strcpy(file, Config.PluginsDir); \
-	strcat(file, pDLL); \
-	drv = SysLoadLibrary(file); \
-	if (drv == NULL) return; \
-	conf = (src) SysLoadSym(drv, name); \
-	if (SysLibError() == NULL) conf(); \
-	SysCloseLibrary(drv);
-
-void ConfigureGPU(HWND hW) {
-	ConfPlugin(GPUconfigure, IDC_LISTGPU, "GPUconfigure");
-}
-
-void ConfigureSPU(HWND hW) {
-	ConfPlugin(SPUconfigure, IDC_LISTSPU, "SPUconfigure");
-}
-
-void ConfigureCDR(HWND hW) {
-	ConfPlugin(CDRconfigure, IDC_LISTCDR, "CDRconfigure");
-}
-
-void ConfigureNET(HWND hW) {
-	ConfPlugin(NETconfigure, IDC_LISTNET, "NETconfigure");
-}
-
-void ConfigurePAD1(HWND hW) {
-	ConfPlugin(PADconfigure, IDC_LISTPAD1, "PADconfigure");
-}
-
-void ConfigurePAD2(HWND hW) {
-	ConfPlugin(PADconfigure, IDC_LISTPAD2, "PADconfigure");
-}
-
-
-void AboutGPU(HWND hW) {
-	ConfPlugin(GPUabout, IDC_LISTGPU, "GPUabout");
-}
-
-void AboutSPU(HWND hW) {
-	ConfPlugin(SPUabout, IDC_LISTSPU, "SPUabout");
-}
-
-void AboutCDR(HWND hW) {
-	ConfPlugin(CDRabout, IDC_LISTCDR, "CDRabout");
-}
-
-void AboutNET(HWND hW) {
-	ConfPlugin(NETabout, IDC_LISTNET, "NETabout");
-}
-
-void AboutPAD1(HWND hW) {
-	ConfPlugin(PADabout, IDC_LISTPAD1, "PADabout");
-}
-
-void AboutPAD2(HWND hW) {
-	ConfPlugin(PADabout, IDC_LISTPAD2, "PADabout");
-}
-
-
-#define TestPlugin(src, confs, name) \
-	void *drv; \
-	src conf; \
-	int ret = 0; \
-	char * pDLL = GetSelDLL(hW, confs); \
-	char file[256]; \
-	if (pDLL== NULL) return; \
-	strcpy(file, Config.PluginsDir); \
-	strcat(file, pDLL); \
-	drv = SysLoadLibrary(file); \
-	if (drv == NULL) return; \
-	conf = (src) SysLoadSym(drv, name); \
-	if (SysLibError() == NULL) { \
-		ret = conf(); \
-		if (ret == 0) \
-			 SysMessage(_("This plugin reports that should work correctly")); \
-		else SysMessage(_("This plugin reports that should not work correctly")); \
-	} \
-	SysCloseLibrary(drv);
-
-void TestGPU(HWND hW) {
-	TestPlugin(GPUtest, IDC_LISTGPU, "GPUtest");
-}
-
-void TestSPU(HWND hW) {
-	TestPlugin(SPUtest, IDC_LISTSPU, "SPUtest");
-}
-
-void TestCDR(HWND hW) {
-	TestPlugin(CDRtest, IDC_LISTCDR, "CDRtest");
-}
-
-void TestNET(HWND hW) {
-	TestPlugin(NETtest, IDC_LISTNET, "NETtest");
-}
-
-void TestPAD1(HWND hW) {
-	TestPlugin(PADtest, IDC_LISTPAD1, "PADtest");
-}
-
-void TestPAD2(HWND hW) {
-	TestPlugin(PADtest, IDC_LISTPAD2, "PADtest");
-}
-
-#include <shlobj.h>
-
-int SelectPath(HWND hW, char *Title, char *Path) {
-	LPITEMIDLIST pidl;
-	BROWSEINFO bi;
-	char Buffer[256];
-
-	bi.hwndOwner = hW;
-	bi.pidlRoot = NULL;
-	bi.pszDisplayName = Buffer;
-	bi.lpszTitle = Title;
-	bi.ulFlags = BIF_RETURNFSANCESTORS | BIF_RETURNONLYFSDIRS;
-	bi.lpfn = NULL;
-	bi.lParam = 0;
-	if ((pidl = SHBrowseForFolder(&bi)) != NULL) {
-		if (SHGetPathFromIDList(pidl, Path)) {
-			int len = strlen(Path);
-
-			if (Path[len - 1] != '\\') { strcat(Path,"\\"); }
-			return 0;
-		}
-	}
-	return -1;
-}
-
-void SetPluginsDir(HWND hW) {
-	char Path[256];
-
-	if (SelectPath(hW, _("Select Plugins Directory"), Path) == -1) return;
-	strcpy(Config.PluginsDir, Path);
-	CleanUpCombos(hW);
-	OnConfigurePluginsDialog(hW);
-}
-
-void SetBiosDir(HWND hW) {
-	char Path[256];
-
-	if (SelectPath(hW, _("Select Bios Directory"), Path) == -1) return;
-	strcpy(Config.BiosDir, Path);
-	CleanUpCombos(hW);
-	OnConfigurePluginsDialog(hW);
-}
-
-BOOL CALLBACK ConfigurePluginsDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) {
-	switch(uMsg) {
-		case WM_INITDIALOG:
-			SetWindowText(hW, _("Configuration"));
-
-			Button_SetText(GetDlgItem(hW, IDOK), _("OK"));
-			Button_SetText(GetDlgItem(hW, IDCANCEL), _("Cancel"));
-			Static_SetText(GetDlgItem(hW, IDC_GRAPHICS), _("Graphics"));
-			Static_SetText(GetDlgItem(hW, IDC_FIRSTCONTROLLER), _("First Controller"));
-			Static_SetText(GetDlgItem(hW, IDC_SECONDCONTROLLER), _("Second Controller"));
-			Static_SetText(GetDlgItem(hW, IDC_SOUND), _("Sound"));
-			Static_SetText(GetDlgItem(hW, IDC_CDROM), _("Cdrom"));
-			Static_SetText(GetDlgItem(hW, IDC_BIOS), _("Bios"));
-			Button_SetText(GetDlgItem(hW, IDC_BIOSDIR), _("Set Bios Directory"));
-			Button_SetText(GetDlgItem(hW, IDC_PLUGINSDIR), _("Set Plugins Directory"));
-			Button_SetText(GetDlgItem(hW, IDC_CONFIGGPU), _("Configure..."));
-			Button_SetText(GetDlgItem(hW, IDC_TESTGPU), _("Test..."));
-			Button_SetText(GetDlgItem(hW, IDC_ABOUTGPU), _("About..."));
-			Button_SetText(GetDlgItem(hW, IDC_CONFIGSPU), _("Configure..."));
-			Button_SetText(GetDlgItem(hW, IDC_TESTSPU), _("Test..."));
-			Button_SetText(GetDlgItem(hW, IDC_ABOUTSPU), _("About..."));
-			Button_SetText(GetDlgItem(hW, IDC_CONFIGCDR), _("Configure..."));
-			Button_SetText(GetDlgItem(hW, IDC_TESTCDR), _("Test..."));
-			Button_SetText(GetDlgItem(hW, IDC_ABOUTCDR), _("About..."));
-			Button_SetText(GetDlgItem(hW, IDC_CONFIGPAD1), _("Configure..."));
-			Button_SetText(GetDlgItem(hW, IDC_TESTPAD1), _("Test..."));
-			Button_SetText(GetDlgItem(hW, IDC_ABOUTPAD1), _("About..."));
-			Button_SetText(GetDlgItem(hW, IDC_CONFIGPAD2), _("Configure..."));
-			Button_SetText(GetDlgItem(hW, IDC_TESTPAD2), _("Test..."));
-			Button_SetText(GetDlgItem(hW, IDC_ABOUTPAD2), _("About..."));
-
-			return OnConfigurePluginsDialog(hW);
-
-		case WM_COMMAND:
-			switch(LOWORD(wParam)) {
-				case IDC_CONFIGGPU: ConfigureGPU(hW); return TRUE;
- 			case IDC_CONFIGSPU: ConfigureSPU(hW); return TRUE;
- 			case IDC_CONFIGCDR: ConfigureCDR(hW); return TRUE;
- 			case IDC_CONFIGPAD1: ConfigurePAD1(hW); return TRUE;
- 			case IDC_CONFIGPAD2: ConfigurePAD2(hW); return TRUE;
-
-				case IDC_TESTGPU: TestGPU(hW); return TRUE;
-				case IDC_TESTSPU: TestSPU(hW); return TRUE;
-				case IDC_TESTCDR: TestCDR(hW); return TRUE;
-				case IDC_TESTPAD1: TestPAD1(hW); return TRUE;
-				case IDC_TESTPAD2: TestPAD2(hW); return TRUE;
-
-				case IDC_ABOUTGPU: AboutGPU(hW); return TRUE;
-				case IDC_ABOUTSPU: AboutSPU(hW); return TRUE;
- case IDC_ABOUTCDR: AboutCDR(hW); return TRUE;
- 	 case IDC_ABOUTPAD1: AboutPAD1(hW); return TRUE;
- 		 case IDC_ABOUTPAD2: AboutPAD2(hW); return TRUE;
-
-				case IDC_PLUGINSDIR: SetPluginsDir(hW); return TRUE;
-				case IDC_BIOSDIR:	 SetBiosDir(hW);	return TRUE;
-
-				case IDCANCEL: 
-					OnCancel(hW); 
-					if (CancelQuit) {
-						SysClose(); exit(1);
-					}
-					return TRUE;
-				case IDOK: 
-					OnOK(hW); 
-					return TRUE;
-			}
-	}
-	return FALSE;
-}
-
-
-void ConfigurePlugins(HWND hWnd) {
- DialogBox(gApp.hInstance,
- MAKEINTRESOURCE(IDD_CONFIG),
- hWnd, 
- (DLGPROC)ConfigurePluginsDlgProc);
-}
-
-// NetPlay Config Dialog
-
-BOOL OnConfigureNetPlayDialog(HWND hW) {
-	WIN32_FIND_DATA FindData;
-	HANDLE Find;
-	HANDLE Lib;
-	PSEgetLibType PSE_GetLibType;
-	PSEgetLibName PSE_GetLibName;
-	PSEgetLibVersion PSE_GetLibVersion;
-	HWND hWC_NET=GetDlgItem(hW,IDC_LISTNET);
-	char tmpStr[256];
-	char *lp;
-	int i;
-
-	strcpy(tmpStr, Config.PluginsDir);
-	strcat(tmpStr, "*.dll");
-	Find = FindFirstFile(tmpStr, &FindData);
-
-	lp = (char *)malloc(strlen("Disabled")+8);
-	sprintf(lp, "Disabled");
-	i = ComboBox_AddString(hWC_NET, "Disabled");
-	ComboBox_SetItemData(hWC_NET, i, lp);
-	ComboBox_SetCurSel(hWC_NET, 0);
-
-	do {
-		if (Find==INVALID_HANDLE_VALUE) break;
-		sprintf(tmpStr,"%s%s", Config.PluginsDir, FindData.cFileName);
-		Lib = LoadLibrary(tmpStr);
-		if (Lib!=NULL) {
-			PSE_GetLibType = (PSEgetLibType) GetProcAddress((HMODULE)Lib,"PSEgetLibType");
-			PSE_GetLibName = (PSEgetLibName) GetProcAddress((HMODULE)Lib,"PSEgetLibName");
-			PSE_GetLibVersion = (PSEgetLibVersion) GetProcAddress((HMODULE)Lib,"PSEgetLibVersion");
-
-			if (PSE_GetLibType != NULL && PSE_GetLibName != NULL && PSE_GetLibVersion != NULL) {
-				unsigned long version = PSE_GetLibVersion();
-				long type;
-
-				sprintf(tmpStr, "%s %d.%d", PSE_GetLibName(), (int)(version>>8)&0xff, (int)version&0xff);
-				type = PSE_GetLibType();
-				if (type & PSE_LT_NET && ((version >> 16) == 2)) {
-					ComboAddPlugin(hWC_NET, Config.Net);
-				}
-			}
-		}
-	} while (FindNextFile(Find,&FindData));
-
-	if (Find!=INVALID_HANDLE_VALUE) FindClose(Find);
-
-	return TRUE;
-}
-
-BOOL CALLBACK ConfigureNetPlayDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) {
-	int i,iCnt;HWND hWC;char * lp;
-
-	switch(uMsg) {
-		case WM_INITDIALOG:
-			SetWindowText(hW, _("NetPlay Configuration"));
-
-			Button_SetText(GetDlgItem(hW, IDOK), _("OK"));
-			Button_SetText(GetDlgItem(hW, IDCANCEL), _("Cancel"));
-			Static_SetText(GetDlgItem(hW, IDC_NETPLAY), _("NetPlay"));
-			Button_SetText(GetDlgItem(hW, IDC_CONFIGNET), _("Configure..."));
-			Button_SetText(GetDlgItem(hW, IDC_TESTNET), _("Test..."));
-			Button_SetText(GetDlgItem(hW, IDC_ABOUTNET), _("About..."));
-			Static_SetText(GetDlgItem(hW, IDC_NETPLAYNOTE), _("Note: The NetPlay Plugin Directory should be the same as the other Plugins."));
-
-			OnConfigureNetPlayDialog(hW);
-			return TRUE;
-
-		case WM_COMMAND: {
- 		switch (LOWORD(wParam)) {
-				case IDC_CONFIGNET: ConfigureNET(hW); return TRUE;
-				case IDC_TESTNET: TestNET(hW); return TRUE;
-				case IDC_ABOUTNET: AboutNET(hW); return TRUE;
-
-				case IDCANCEL: 
-					CleanCombo(IDC_LISTNET);
-					EndDialog(hW,FALSE); 
-					return TRUE;
-
-				case IDOK:
-					strcpy(Config.Net, GetSelDLL(hW, IDC_LISTNET));
-					SaveConfig();
-					CleanUpCombos(hW);
-					LoadPlugins();
-					CleanCombo(IDC_LISTNET);
-					EndDialog(hW,TRUE);
-					return TRUE;
-			}
-		}
-	}
-
-	return FALSE;
-}
+/* Pcsx - Pc Psx Emulator
+ * Copyright (C) 1999-2003 Pcsx Team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <windows.h>
+#include <windowsx.h>
+#include <stdio.h>
+#include "psxcommon.h"
+#include "plugin.h"
+#include "plugins.h"
+#include "resource.h"
+#include "Win32.h"
+
+#define QueryKeyV(name, var) \
+	size = sizeof(DWORD); \
+	if (RegQueryValueEx(myKey, name, 0, &type, (LPBYTE)&tmp, &size) != 0) { if (err) { RegCloseKey(myKey); return -1; } } \
+	var = tmp;
+
+#define QueryKey(s, name, var) \
+	size = s; \
+	if (RegQueryValueEx(myKey, name, 0, &type, (LPBYTE)var, &size) != 0) { if (err) { RegCloseKey(myKey); return -1; } }
+
+#define SetKeyV(name, var) \
+	tmp = var; \
+	RegSetValueEx(myKey, name, 0, REG_DWORD, (LPBYTE)&tmp, sizeof(DWORD));
+
+#define SetKey(name, var, s, t) \
+	RegSetValueEx(myKey, name, 0, t, (LPBYTE)var, s);
+
+int LoadConfig() {
+	HKEY myKey;
+	DWORD type, size, tmp;
+	PcsxConfig *Conf = &Config;
+	int err;
+#ifdef ENABLE_NLS
+	char text[256];
+#endif
+
+	if (RegOpenKeyEx(HKEY_CURRENT_USER,cfgfile,0,KEY_ALL_ACCESS,&myKey)!=ERROR_SUCCESS) return -1;
+
+	err = 1;
+	QueryKey(256, "Bios", Conf->Bios);
+	QueryKey(256, "Gpu", Conf->Gpu);
+	QueryKey(256, "Spu", Conf->Spu);
+	QueryKey(256, "Cdr", Conf->Cdr);
+	QueryKey(256, "Pad1", Conf->Pad1);
+	QueryKey(256, "Pad2", Conf->Pad2);
+#ifdef ENABLE_SIO1API
+	QueryKey(256, "Sio1", Conf->Sio1);
+#endif
+	QueryKey(256, "Mcd1", Conf->Mcd1);
+	QueryKey(256, "Mcd2", Conf->Mcd2);
+	QueryKey(256, "PluginsDir", Conf->PluginsDir);
+	QueryKey(256, "BiosDir", Conf->BiosDir);
+	err = 0;
+	QueryKey(256, "Net", Conf->Net);
+	QueryKey(256, "Lang", Conf->Lang);
+
+	QueryKeyV("Xa", Conf->Xa);
+	QueryKeyV("SioIrq", Conf->SioIrq);
+	QueryKeyV("Mdec", Conf->Mdec);
+	QueryKeyV("PsxAuto", Conf->PsxAuto);
+	QueryKeyV("Cdda", Conf->Cdda);
+	QueryKeyV("SlowBoot", Conf->SlowBoot);
+	QueryKeyV("Debug", Conf->Debug);
+	QueryKeyV("PsxOut", Conf->PsxOut);
+	QueryKeyV("SpuIrq", Conf->SpuIrq);
+	QueryKeyV("RCntFix", Conf->RCntFix);
+	QueryKeyV("VSyncWA", Conf->VSyncWA);
+	QueryKeyV("Widescreen", Conf->Widescreen);
+	QueryKeyV("HideCursor", Conf->HideCursor);
+
+	QueryKeyV("Cpu", Conf->Cpu);
+	QueryKeyV("PsxType", Conf->PsxType);
+
+	if (Config.Cpu == CPU_DYNAREC) {
+		Config.Debug = 0; // don't enable debugger if using dynarec core
+	}
+
+	RegCloseKey(myKey);
+
+#ifdef ENABLE_NLS
+	sprintf(text, "LANGUAGE=%s", Conf->Lang);
+	gettext_putenv(text);
+#endif
+
+	return 0;
+}
+
+/////////////////////////////////////////////////////////
+
+void SaveConfig() {
+	HKEY myKey;
+	DWORD myDisp, tmp;
+	PcsxConfig *Conf = &Config;
+
+	RegCreateKeyEx(HKEY_CURRENT_USER, cfgfile, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &myKey, &myDisp);
+
+	SetKey("Bios", Conf->Bios, strlen(Conf->Bios), REG_SZ);
+	SetKey("Gpu", Conf->Gpu, strlen(Conf->Gpu), REG_SZ);
+	SetKey("Spu", Conf->Spu, strlen(Conf->Spu), REG_SZ);
+	SetKey("Cdr", Conf->Cdr, strlen(Conf->Cdr), REG_SZ);
+	SetKey("Pad1", Conf->Pad1, strlen(Conf->Pad1), REG_SZ);
+	SetKey("Pad2", Conf->Pad2, strlen(Conf->Pad2), REG_SZ);
+	SetKey("Sio1", Conf->Sio1, strlen(Conf->Sio1), REG_SZ);
+	SetKey("Net", Conf->Net, strlen(Conf->Net), REG_SZ);
+	SetKey("Mcd1", Conf->Mcd1, strlen(Conf->Mcd1), REG_SZ);
+	SetKey("Mcd2", Conf->Mcd2, strlen(Conf->Mcd2), REG_SZ);
+	SetKey("Lang", Conf->Lang, strlen(Conf->Lang), REG_SZ);
+	SetKey("PluginsDir", Conf->PluginsDir, strlen(Conf->PluginsDir), REG_SZ);
+	SetKey("BiosDir", Conf->BiosDir, strlen(Conf->BiosDir), REG_SZ);
+
+	SetKeyV("Xa", Conf->Xa);
+	SetKeyV("SioIrq", Conf->SioIrq);
+	SetKeyV("Mdec", Conf->Mdec);
+	SetKeyV("PsxAuto", Conf->PsxAuto);
+	SetKeyV("Cdda", Conf->Cdda);
+	SetKeyV("SlowBoot",Conf->SlowBoot);
+	SetKeyV("Debug", Conf->Debug);
+	SetKeyV("PsxOut", Conf->PsxOut);
+	SetKeyV("SpuIrq", Conf->SpuIrq);
+	SetKeyV("RCntFix", Conf->RCntFix);
+	SetKeyV("VSyncWA", Conf->VSyncWA);
+	SetKeyV("Widescreen", Conf->Widescreen);
+	SetKeyV("HideCursor", Conf->HideCursor);
+
+	SetKeyV("Cpu", Conf->Cpu);
+	SetKeyV("PsxType", Conf->PsxType);
+
+	RegCloseKey(myKey);
+}
+
+/////////////////////////////////////////////////////////
+
+#define ComboAddPlugin(hw, str) { \
+	lp = (char *)malloc(strlen(FindData.cFileName)+8); \
+	sprintf(lp, "%s", FindData.cFileName); \
+	i = ComboBox_AddString(hw, tmpStr); \
+	ComboBox_SetItemData(hw, i, lp); \
+	if (stricmp(str, lp)==0) \
+		ComboBox_SetCurSel(hw, i); \
+}
+
+BOOL OnConfigurePluginsDialog(HWND hW) {
+	WIN32_FIND_DATA FindData;
+	HANDLE Find;
+	HANDLE Lib;
+	PSEgetLibType PSE_GetLibType;
+	PSEgetLibName PSE_GetLibName;
+	PSEgetLibVersion PSE_GetLibVersion;
+	HWND hWC_GPU=GetDlgItem(hW,IDC_LISTGPU);
+	HWND hWC_SPU=GetDlgItem(hW,IDC_LISTSPU);
+	HWND hWC_CDR=GetDlgItem(hW,IDC_LISTCDR);
+	HWND hWC_PAD1=GetDlgItem(hW,IDC_LISTPAD1);
+	HWND hWC_PAD2=GetDlgItem(hW,IDC_LISTPAD2);
+	HWND hWC_SIO1=GetDlgItem(hW,IDC_LISTSIO1);
+	HWND hWC_BIOS=GetDlgItem(hW,IDC_LISTBIOS);
+	char tmpStr[256];
+	char *lp;
+	int i;
+
+	strcpy(tmpStr, Config.PluginsDir);
+	strcat(tmpStr, "*.dll");
+	Find = FindFirstFile(tmpStr, &FindData);
+
+	if (Find != INVALID_HANDLE_VALUE) {
+		do {
+			sprintf(tmpStr,"%s%s", Config.PluginsDir, FindData.cFileName);
+			Lib = LoadLibrary(tmpStr);
+			if (Lib != NULL) {
+				PSE_GetLibType = (PSEgetLibType) GetProcAddress((HMODULE)Lib,"PSEgetLibType");
+				PSE_GetLibName = (PSEgetLibName) GetProcAddress((HMODULE)Lib,"PSEgetLibName");
+				PSE_GetLibVersion = (PSEgetLibVersion) GetProcAddress((HMODULE)Lib,"PSEgetLibVersion");
+
+				if (PSE_GetLibType != NULL && PSE_GetLibName != NULL && PSE_GetLibVersion != NULL) {
+					unsigned long version = PSE_GetLibVersion();
+					long type;
+
+					sprintf(tmpStr, "%s %d.%d", PSE_GetLibName(), (int)(version>>8)&0xff, (int)version&0xff);
+					type = PSE_GetLibType();
+					if (type & PSE_LT_CDR) {
+						ComboAddPlugin(hWC_CDR, Config.Cdr);
+					}
+
+					if (type & PSE_LT_SPU) {
+						ComboAddPlugin(hWC_SPU, Config.Spu);
+					}
+
+					if (type & PSE_LT_GPU) {
+						ComboAddPlugin(hWC_GPU, Config.Gpu);
+					}
+
+					if (type & PSE_LT_PAD) {
+						PADquery query;
+
+						query = (PADquery)GetProcAddress((HMODULE)Lib, "PADquery");
+						if (query != NULL) {
+							if (query() & 0x1)
+								ComboAddPlugin(hWC_PAD1, Config.Pad1);
+							if (query() & 0x2)
+								ComboAddPlugin(hWC_PAD2, Config.Pad2);
+						} else { // just a guess
+							ComboAddPlugin(hWC_PAD1, Config.Pad1);
+						}
+					}
+
+					if (type & PSE_LT_SIO1) {
+						ComboAddPlugin(hWC_SIO1, Config.Sio1);
+					}
+				}
+			}
+		} while (FindNextFile(Find,&FindData));
+		FindClose(Find);
+	}
+
+// BIOS
+
+	lp = (char *)malloc(strlen("HLE") + 1);
+	sprintf(lp, "HLE");
+	i = ComboBox_AddString(hWC_BIOS, _("Simulate Psx Bios"));
+	ComboBox_SetItemData(hWC_BIOS, i, lp);
+	if (stricmp(Config.Bios, lp)==0)
+		ComboBox_SetCurSel(hWC_BIOS, i);
+
+	strcpy(tmpStr, Config.BiosDir);
+	strcat(tmpStr, "*");
+	Find=FindFirstFile(tmpStr, &FindData);
+
+	if (Find != INVALID_HANDLE_VALUE) {
+		do {
+			if (!strcmp(FindData.cFileName, ".")) continue;
+			if (!strcmp(FindData.cFileName, "..")) continue;
+			if (FindData.nFileSizeLow != 1024 * 512) continue;
+			lp = (char *)malloc(strlen(FindData.cFileName)+8);
+			sprintf(lp, "%s", (char *)FindData.cFileName);
+			i = ComboBox_AddString(hWC_BIOS, FindData.cFileName);
+			ComboBox_SetItemData(hWC_BIOS, i, lp);
+			if (Config.Bios[0]=='\0') {
+				ComboBox_SetCurSel(hWC_BIOS, i);
+				strcpy(Config.Bios, FindData.cFileName);
+			} else if (stricmp(Config.Bios, FindData.cFileName)==0)
+				ComboBox_SetCurSel(hWC_BIOS, i);
+		} while (FindNextFile(Find,&FindData));
+		FindClose(Find);
+	}
+
+	if (ComboBox_GetCurSel(hWC_CDR ) == -1)
+		ComboBox_SetCurSel(hWC_CDR, 0);
+	if (ComboBox_GetCurSel(hWC_GPU ) == -1)
+		ComboBox_SetCurSel(hWC_GPU, 0);
+	if (ComboBox_GetCurSel(hWC_SPU ) == -1)
+		ComboBox_SetCurSel(hWC_SPU, 0);
+	if (ComboBox_GetCurSel(hWC_PAD1) == -1)
+		ComboBox_SetCurSel(hWC_PAD1, 0);
+	if (ComboBox_GetCurSel(hWC_PAD2) == -1)
+		ComboBox_SetCurSel(hWC_PAD2, 0);
+	if (ComboBox_GetCurSel(hWC_SIO1 ) == -1)
+		ComboBox_SetCurSel(hWC_SIO1, 0);
+	if (ComboBox_GetCurSel(hWC_BIOS) == -1)
+		ComboBox_SetCurSel(hWC_BIOS, 0);
+
+	return TRUE;
+}
+	
+#define CleanCombo(item) \
+	hWC = GetDlgItem(hW, item); \
+	iCnt = ComboBox_GetCount(hWC); \
+	for (i=0; i<iCnt; i++) { \
+		lp = (char *)ComboBox_GetItemData(hWC, i); \
+		if (lp) free(lp); \
+	} \
+	ComboBox_ResetContent(hWC);
+
+void CleanUpCombos(HWND hW) {
+	int i,iCnt;HWND hWC;char * lp;
+
+	CleanCombo(IDC_LISTGPU);
+	CleanCombo(IDC_LISTSPU);
+	CleanCombo(IDC_LISTCDR);
+	CleanCombo(IDC_LISTPAD1);
+	CleanCombo(IDC_LISTPAD2);
+	CleanCombo(IDC_LISTSIO1);
+	CleanCombo(IDC_LISTBIOS);
+}
+
+void OnCancel(HWND hW) {
+	CleanUpCombos(hW);
+	EndDialog(hW,FALSE);
+}
+
+char *GetSelDLL(HWND hW,int id) {
+	HWND hWC = GetDlgItem(hW,id);
+	int iSel;
+	iSel = ComboBox_GetCurSel(hWC);
+	if (iSel<0) return NULL;
+	return (char *)ComboBox_GetItemData(hWC, iSel);
+}
+
+void OnOK(HWND hW) {
+	char *gpuDLL=GetSelDLL(hW,IDC_LISTGPU);
+	char *spuDLL=GetSelDLL(hW,IDC_LISTSPU);
+	char *cdrDLL=GetSelDLL(hW,IDC_LISTCDR);
+	char *pad1DLL=GetSelDLL(hW,IDC_LISTPAD1);
+	char *pad2DLL=GetSelDLL(hW,IDC_LISTPAD2);
+#ifdef ENABLE_SIO1API
+	char *sio1DLL=GetSelDLL(hW,IDC_LISTSIO1);
+#endif
+	char *biosFILE=GetSelDLL(hW,IDC_LISTBIOS);
+
+ if (gpuDLL == NULL || spuDLL == NULL || /*cdrDLL == NULL ||*/ pad1DLL == NULL ||
+		pad2DLL == NULL || biosFILE == NULL
+#ifdef ENABLE_SIO1API
+		|| sio1DLL == NULL
+#endif
+		) {
+		MessageBox(hW, _("Configuration not OK!"), _("Error"), MB_OK | MB_ICONERROR);
+		return;
+	}
+
+	strcpy(Config.Bios, biosFILE);
+	strcpy(Config.Gpu, gpuDLL);
+	strcpy(Config.Spu, spuDLL);
+	if (cdrDLL != NULL)
+		strcpy(Config.Cdr, cdrDLL);
+	else
+		Config.Cdr[0] = '\0';
+	strcpy(Config.Pad1, pad1DLL);
+	strcpy(Config.Pad2, pad2DLL);
+#ifdef ENABLE_SIO1API
+	strcpy(Config.Sio1, sio1DLL);
+#endif
+
+	SaveConfig();
+
+	CleanUpCombos(hW);
+
+	if (!ConfPlug) {
+		LoadPlugins();
+	}
+	EndDialog(hW,TRUE);
+}
+
+
+#define ConfPlugin(src, confs, name) \
+	void *drv; \
+	src conf; \
+	char * pDLL = GetSelDLL(hW, confs); \
+	char file[256]; \
+	if(pDLL==NULL) return; \
+	strcpy(file, Config.PluginsDir); \
+	strcat(file, pDLL); \
+	drv = SysLoadLibrary(file); \
+	if (drv == NULL) return; \
+	conf = (src) SysLoadSym(drv, name); \
+	if (SysLibError() == NULL) conf(); \
+	SysCloseLibrary(drv);
+
+void ConfigureGPU(HWND hW) {
+	ConfPlugin(GPUconfigure, IDC_LISTGPU, "GPUconfigure");
+}
+
+void ConfigureSPU(HWND hW) {
+	ConfPlugin(SPUconfigure, IDC_LISTSPU, "SPUconfigure");
+}
+
+void ConfigureCDR(HWND hW) {
+	ConfPlugin(CDRconfigure, IDC_LISTCDR, "CDRconfigure");
+}
+
+void ConfigureNET(HWND hW) {
+	ConfPlugin(NETconfigure, IDC_LISTNET, "NETconfigure");
+}
+
+void ConfigurePAD1(HWND hW) {
+	ConfPlugin(PADconfigure, IDC_LISTPAD1, "PADconfigure");
+}
+
+void ConfigurePAD2(HWND hW) {
+	ConfPlugin(PADconfigure, IDC_LISTPAD2, "PADconfigure");
+}
+
+void ConfigureSIO1(HWND hW) {
+#ifdef ENABLE_SIO1API
+	ConfPlugin(SIO1configure, IDC_LISTSIO1, "SIO1configure");
+#endif
+}
+
+void AboutGPU(HWND hW) {
+	ConfPlugin(GPUabout, IDC_LISTGPU, "GPUabout");
+}
+
+void AboutSPU(HWND hW) {
+	ConfPlugin(SPUabout, IDC_LISTSPU, "SPUabout");
+}
+
+void AboutCDR(HWND hW) {
+	ConfPlugin(CDRabout, IDC_LISTCDR, "CDRabout");
+}
+
+void AboutNET(HWND hW) {
+	ConfPlugin(NETabout, IDC_LISTNET, "NETabout");
+}
+
+void AboutPAD1(HWND hW) {
+	ConfPlugin(PADabout, IDC_LISTPAD1, "PADabout");
+}
+
+void AboutPAD2(HWND hW) {
+	ConfPlugin(PADabout, IDC_LISTPAD2, "PADabout");
+}
+
+void AboutSIO1(HWND hW) {
+#ifdef ENABLE_SIO1API
+	ConfPlugin(SIO1about, IDC_LISTSIO1, "SIO1about");
+#endif
+}
+
+
+#define TestPlugin(src, confs, name) \
+	void *drv; \
+	src conf; \
+	int ret = 0; \
+	char * pDLL = GetSelDLL(hW, confs); \
+	char file[256]; \
+	if (pDLL== NULL) return; \
+	strcpy(file, Config.PluginsDir); \
+	strcat(file, pDLL); \
+	drv = SysLoadLibrary(file); \
+	if (drv == NULL) return; \
+	conf = (src) SysLoadSym(drv, name); \
+	if (SysLibError() == NULL) { \
+		ret = conf(); \
+		if (ret == 0) \
+			 SysMessage(_("This plugin reports that should work correctly")); \
+		else SysMessage(_("This plugin reports that should not work correctly")); \
+	} \
+	SysCloseLibrary(drv);
+
+void TestGPU(HWND hW) {
+	TestPlugin(GPUtest, IDC_LISTGPU, "GPUtest");
+}
+
+void TestSPU(HWND hW) {
+	TestPlugin(SPUtest, IDC_LISTSPU, "SPUtest");
+}
+
+void TestCDR(HWND hW) {
+	TestPlugin(CDRtest, IDC_LISTCDR, "CDRtest");
+}
+
+void TestNET(HWND hW) {
+	TestPlugin(NETtest, IDC_LISTNET, "NETtest");
+}
+
+void TestPAD1(HWND hW) {
+	TestPlugin(PADtest, IDC_LISTPAD1, "PADtest");
+}
+
+void TestPAD2(HWND hW) {
+	TestPlugin(PADtest, IDC_LISTPAD2, "PADtest");
+}
+
+void TestSIO1(HWND hW) {
+#ifdef ENABLE_SIO1API
+	TestPlugin(SIO1test, IDC_LISTSIO1, "SIO1test");
+#endif
+}
+
+
+#include <shlobj.h>
+
+int SelectPath(HWND hW, char *Title, char *Path) {
+	LPITEMIDLIST pidl;
+	BROWSEINFO bi;
+	char Buffer[256];
+
+	bi.hwndOwner = hW;
+	bi.pidlRoot = NULL;
+	bi.pszDisplayName = Buffer;
+	bi.lpszTitle = Title;
+	bi.ulFlags = BIF_RETURNFSANCESTORS | BIF_RETURNONLYFSDIRS;
+	bi.lpfn = NULL;
+	bi.lParam = 0;
+	if ((pidl = SHBrowseForFolder(&bi)) != NULL) {
+		if (SHGetPathFromIDList(pidl, Path)) {
+			int len = strlen(Path);
+
+			if (Path[len - 1] != '\\') { strcat(Path,"\\"); }
+			return 0;
+		}
+	}
+	return -1;
+}
+
+void SetPluginsDir(HWND hW) {
+	char Path[256];
+
+	if (SelectPath(hW, _("Select Plugins Directory"), Path) == -1) return;
+	strcpy(Config.PluginsDir, Path);
+	CleanUpCombos(hW);
+	OnConfigurePluginsDialog(hW);
+}
+
+void SetBiosDir(HWND hW) {
+	char Path[256];
+
+	if (SelectPath(hW, _("Select Bios Directory"), Path) == -1) return;
+	strcpy(Config.BiosDir, Path);
+	CleanUpCombos(hW);
+	OnConfigurePluginsDialog(hW);
+}
+
+BOOL CALLBACK ConfigurePluginsDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) {
+	switch(uMsg) {
+		case WM_INITDIALOG:
+			SetWindowText(hW, _("Configuration"));
+
+			Button_SetText(GetDlgItem(hW, IDOK), _("OK"));
+			Button_SetText(GetDlgItem(hW, IDCANCEL), _("Cancel"));
+			Static_SetText(GetDlgItem(hW, IDC_GRAPHICS), _("Graphics"));
+			Static_SetText(GetDlgItem(hW, IDC_FIRSTCONTROLLER), _("First Controller"));
+			Static_SetText(GetDlgItem(hW, IDC_SECONDCONTROLLER), _("Second Controller"));
+			Static_SetText(GetDlgItem(hW, IDC_SOUND), _("Sound"));
+			Static_SetText(GetDlgItem(hW, IDC_CDROM), _("Cdrom"));
+			Static_SetText(GetDlgItem(hW, IDC_LINKCABLE), _("Link cable"));
+			Static_SetText(GetDlgItem(hW, IDC_BIOS), _("Bios"));
+			Button_SetText(GetDlgItem(hW, IDC_BIOSDIR), _("Set Bios Directory"));
+			Button_SetText(GetDlgItem(hW, IDC_PLUGINSDIR), _("Set Plugins Directory"));
+			Button_SetText(GetDlgItem(hW, IDC_CONFIGGPU), _("Configure..."));
+			Button_SetText(GetDlgItem(hW, IDC_TESTGPU), _("Test..."));
+			Button_SetText(GetDlgItem(hW, IDC_ABOUTGPU), _("About..."));
+			Button_SetText(GetDlgItem(hW, IDC_CONFIGSPU), _("Configure..."));
+			Button_SetText(GetDlgItem(hW, IDC_TESTSPU), _("Test..."));
+			Button_SetText(GetDlgItem(hW, IDC_ABOUTSPU), _("About..."));
+			Button_SetText(GetDlgItem(hW, IDC_CONFIGCDR), _("Configure..."));
+			Button_SetText(GetDlgItem(hW, IDC_TESTCDR), _("Test..."));
+			Button_SetText(GetDlgItem(hW, IDC_ABOUTCDR), _("About..."));
+			Button_SetText(GetDlgItem(hW, IDC_CONFIGPAD1), _("Configure..."));
+			Button_SetText(GetDlgItem(hW, IDC_TESTPAD1), _("Test..."));
+			Button_SetText(GetDlgItem(hW, IDC_ABOUTPAD1), _("About..."));
+			Button_SetText(GetDlgItem(hW, IDC_CONFIGPAD2), _("Configure..."));
+			Button_SetText(GetDlgItem(hW, IDC_TESTPAD2), _("Test..."));
+			Button_SetText(GetDlgItem(hW, IDC_ABOUTPAD2), _("About..."));
+			Button_SetText(GetDlgItem(hW, IDC_CONFIGSIO1), _("Configure..."));
+			Button_SetText(GetDlgItem(hW, IDC_TESTSIO1), _("Test..."));
+			Button_SetText(GetDlgItem(hW, IDC_ABOUTSIO1), _("About..."));
+
+			return OnConfigurePluginsDialog(hW);
+
+		case WM_COMMAND:
+			switch(LOWORD(wParam)) {
+				case IDC_CONFIGGPU: ConfigureGPU(hW); return TRUE;
+ 			case IDC_CONFIGSPU: ConfigureSPU(hW); return TRUE;
+ 			case IDC_CONFIGCDR: ConfigureCDR(hW); return TRUE;
+ 			case IDC_CONFIGPAD1: ConfigurePAD1(hW); return TRUE;
+ 			case IDC_CONFIGPAD2: ConfigurePAD2(hW); return TRUE;
+				case IDC_CONFIGSIO1: ConfigureSIO1(hW); return TRUE;
+
+				case IDC_TESTGPU: TestGPU(hW); return TRUE;
+				case IDC_TESTSPU: TestSPU(hW); return TRUE;
+				case IDC_TESTCDR: TestCDR(hW); return TRUE;
+				case IDC_TESTPAD1: TestPAD1(hW); return TRUE;
+				case IDC_TESTPAD2: TestPAD2(hW); return TRUE;
+				case IDC_TESTSIO1: TestSIO1(hW); return TRUE;
+
+				case IDC_ABOUTGPU: AboutGPU(hW); return TRUE;
+				case IDC_ABOUTSPU: AboutSPU(hW); return TRUE;
+ case IDC_ABOUTCDR: AboutCDR(hW); return TRUE;
+ 	 case IDC_ABOUTPAD1: AboutPAD1(hW); return TRUE;
+ 		 case IDC_ABOUTPAD2: AboutPAD2(hW); return TRUE;
+				case IDC_ABOUTSIO1: AboutSIO1(hW); return TRUE;
+
+				case IDC_PLUGINSDIR: SetPluginsDir(hW); return TRUE;
+				case IDC_BIOSDIR:	 SetBiosDir(hW);	return TRUE;
+
+				case IDCANCEL: 
+					OnCancel(hW); 
+					if (CancelQuit) {
+						SysClose(); exit(1);
+					}
+					return TRUE;
+				case IDOK: 
+					OnOK(hW); 
+					return TRUE;
+			}
+	}
+	return FALSE;
+}
+
+
+void ConfigurePlugins(HWND hWnd) {
+ DialogBox(gApp.hInstance,
+ MAKEINTRESOURCE(IDD_CONFIG),
+ hWnd, 
+ (DLGPROC)ConfigurePluginsDlgProc);
+}
+
+// NetPlay Config Dialog
+
+BOOL OnConfigureNetPlayDialog(HWND hW) {
+	WIN32_FIND_DATA FindData;
+	HANDLE Find;
+	HANDLE Lib;
+	PSEgetLibType PSE_GetLibType;
+	PSEgetLibName PSE_GetLibName;
+	PSEgetLibVersion PSE_GetLibVersion;
+	HWND hWC_NET=GetDlgItem(hW,IDC_LISTNET);
+	char tmpStr[256];
+	char *lp;
+	int i;
+
+	strcpy(tmpStr, Config.PluginsDir);
+	strcat(tmpStr, "*.dll");
+	Find = FindFirstFile(tmpStr, &FindData);
+
+	lp = (char *)malloc(strlen("Disabled")+8);
+	sprintf(lp, "Disabled");
+	i = ComboBox_AddString(hWC_NET, "Disabled");
+	ComboBox_SetItemData(hWC_NET, i, lp);
+	ComboBox_SetCurSel(hWC_NET, 0);
+
+	if (Find != INVALID_HANDLE_VALUE) {
+		do {
+			sprintf(tmpStr,"%s%s", Config.PluginsDir, FindData.cFileName);
+			Lib = LoadLibrary(tmpStr);
+			if (Lib!=NULL) {
+				PSE_GetLibType = (PSEgetLibType) GetProcAddress((HMODULE)Lib,"PSEgetLibType");
+				PSE_GetLibName = (PSEgetLibName) GetProcAddress((HMODULE)Lib,"PSEgetLibName");
+				PSE_GetLibVersion = (PSEgetLibVersion) GetProcAddress((HMODULE)Lib,"PSEgetLibVersion");
+
+				if (PSE_GetLibType != NULL && PSE_GetLibName != NULL && PSE_GetLibVersion != NULL) {
+					unsigned long version = PSE_GetLibVersion();
+					long type;
+
+					sprintf(tmpStr, "%s %d.%d", PSE_GetLibName(), (int)(version>>8)&0xff, (int)version&0xff);
+					type = PSE_GetLibType();
+					if (type & PSE_LT_NET && ((version >> 16) == 2)) {
+						ComboAddPlugin(hWC_NET, Config.Net);
+					}
+				}
+			}
+		} while (FindNextFile(Find,&FindData));
+		FindClose(Find);
+	}
+	
+	return TRUE;
+}
+
+BOOL CALLBACK ConfigureNetPlayDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) {
+	int i,iCnt;HWND hWC;char * lp;
+
+	switch(uMsg) {
+		case WM_INITDIALOG:
+			SetWindowText(hW, _("NetPlay Configuration"));
+
+			Button_SetText(GetDlgItem(hW, IDOK), _("OK"));
+			Button_SetText(GetDlgItem(hW, IDCANCEL), _("Cancel"));
+			Static_SetText(GetDlgItem(hW, IDC_NETPLAY), _("NetPlay"));
+			Button_SetText(GetDlgItem(hW, IDC_CONFIGNET), _("Configure..."));
+			Button_SetText(GetDlgItem(hW, IDC_TESTNET), _("Test..."));
+			Button_SetText(GetDlgItem(hW, IDC_ABOUTNET), _("About..."));
+			Static_SetText(GetDlgItem(hW, IDC_NETPLAYNOTE), _("Note: The NetPlay Plugin Directory should be the same as the other Plugins."));
+
+			OnConfigureNetPlayDialog(hW);
+			return TRUE;
+
+		case WM_COMMAND: {
+ 		switch (LOWORD(wParam)) {
+				case IDC_CONFIGNET: ConfigureNET(hW); return TRUE;
+				case IDC_TESTNET: TestNET(hW); return TRUE;
+				case IDC_ABOUTNET: AboutNET(hW); return TRUE;
+
+				case IDCANCEL: 
+					CleanCombo(IDC_LISTNET);
+					EndDialog(hW,FALSE); 
+					return TRUE;
+
+				case IDOK:
+					strcpy(Config.Net, GetSelDLL(hW, IDC_LISTNET));
+					SaveConfig();
+					CleanUpCombos(hW);
+					LoadPlugins();
+					CleanCombo(IDC_LISTNET);
+					EndDialog(hW,TRUE);
+					return TRUE;
+			}
+		}
+	}
+
+	return FALSE;
+}

pcsxr-1.9.92.tar.bz2/win32/gui/Win32.h -> pcsxr-1.9.93.tar.bz2/win32/gui/Win32.h Changed

@@ -1,69 +1,70 @@
-/*  Pcsx - Pc Psx Emulator
- *  Copyright (C) 1999-2003  Pcsx Team
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
- */
-
-#ifndef __WIN32_H__
-#define __WIN32_H__
-
-typedef struct {
-	HWND hWnd;           // Main window handle
-	HINSTANCE hInstance; // Application instance
-	HMENU hMenu;         // Main window menu
-} AppData;
-
-AppData gApp;
-HANDLE hConsole;
-
-extern int StatesC;
-extern int AccBreak;
-extern int ConfPlug;
-extern int CancelQuit;
-extern char cfgfile[256];
-extern int Running;
-extern char PcsxDir[256];
-
-void strcatz(char *dst, char *src);
-
-LRESULT WINAPI MainWndProc(HWND, UINT, WPARAM, LPARAM);
-BOOL CALLBACK ConfigureMcdsDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam);
-BOOL CALLBACK ConfigureCpuDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam);
-BOOL CALLBACK ConfigureNetPlayDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam);
-
-LRESULT WINAPI CheatDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam);
-LRESULT WINAPI CheatSearchDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam);
-
-void ConfigurePlugins(HWND hWnd);
-
-int  Open_File_Proc(char *file);
-int  Open_Iso_Proc(char *file);
-void Open_Mcd_Proc(HWND hW, int MCDID);
-void CreateMainWindow(int nCmdShow);
-void RunGui();
-void PADhandleKey(int key);
-
-int  LoadConfig();
-void SaveConfig();
-
-void UpdateMenuSlots();
-void ResetMenuSlots();
-
-void InitLanguages();
-char *GetLanguageNext();
-void CloseLanguages();
-void ChangeLanguage(char *lang);
-
-#endif /* __WIN32_H__ */
+/*  Pcsx - Pc Psx Emulator
+ *  Copyright (C) 1999-2003  Pcsx Team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef __WIN32_H__
+#define __WIN32_H__
+
+typedef struct {
+	HWND hWnd;           // Main window handle
+	HINSTANCE hInstance; // Application instance
+	HMENU hMenu;         // Main window menu
+} AppData;
+
+AppData gApp;
+HANDLE hConsole;
+
+extern int StatesC;
+extern int AccBreak;
+extern int ConfPlug;
+extern int CancelQuit;
+extern char cfgfile[256];
+extern int Running;
+extern boolean UseGui;
+extern char PcsxrDir[256];
+
+void strcatz(char *dst, char *src);
+
+LRESULT WINAPI MainWndProc(HWND, UINT, WPARAM, LPARAM);
+BOOL CALLBACK ConfigureMcdsDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam);
+BOOL CALLBACK ConfigureCpuDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam);
+BOOL CALLBACK ConfigureNetPlayDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam);
+
+LRESULT WINAPI CheatDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam);
+LRESULT WINAPI CheatSearchDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam);
+
+void ConfigurePlugins(HWND hWnd);
+
+int  Open_File_Proc(char *file);
+int  Open_Iso_Proc(char *file);
+void Open_Mcd_Proc(HWND hW, int MCDID);
+void CreateMainWindow(int nCmdShow);
+void RunGui();
+void PADhandleKey(int key);
+
+int  LoadConfig();
+void SaveConfig();
+
+void ResetMenuSlots();
+void UpdateMenuItems();
+
+void InitLanguages();
+char *GetLanguageNext();
+void CloseLanguages();
+void ChangeLanguage(char *lang);
+
+#endif /* __WIN32_H__ */

pcsxr-1.9.92.tar.bz2/win32/gui/WndMain.c -> pcsxr-1.9.93.tar.bz2/win32/gui/WndMain.c Changed

@@ -1,1802 +1,1963 @@
-/* Pcsx - Pc Psx Emulator
- * Copyright (C) 1999-2003 Pcsx Team
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
- */
-
-#include <windows.h>
-#include <windowsx.h>
-#include <commctrl.h>
-#include <time.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-
-#include "resource.h"
-#include "AboutDlg.h"
-
-#include "psxcommon.h"
-#include "plugin.h"
-#include "debug.h"
-#include "Win32.h"
-#include "sio.h"
-#include "misc.h"
-#include "cheat.h"
-
-#ifdef __MINGW32__
-#ifndef LVM_GETSELECTIONMARK
-#define LVM_GETSELECTIONMARK (LVM_FIRST+66)
-#endif
-#ifndef ListView_GetSelectionMark
-#define ListView_GetSelectionMark(w) (INT)SNDMSG((w),LVM_GETSELECTIONMARK,0,0)
-#endif
-#endif
-
-int AccBreak = 0;
-int ConfPlug = 0;
-int StatesC = 0;
-int CancelQuit = 0;
-char cfgfile[256];
-int Running = 0;
-char PcsxDir[256];
-
-static HDC hDC;
-static HDC hdcmem;
-static HBITMAP hBm;
-static BITMAP bm;
-
-#ifdef ENABLE_NLS
-
-unsigned int langsMax;
-
-typedef struct {
-	char lang[256];
-} _langs;
-_langs *langs = NULL;
-
-typedef struct {
-	char			id[8];
-	char			name[64];
-	LANGID			langid;
-} LangDef;
-
-LangDef sLangs[] = {
-	{ "ar",		N_("Arabic"),				0x0401 },
-	{ "ca",		N_("Catalan"),				0x0403 },
-	{ "de",		N_("German"),				0x0407 },
-	{ "el",		N_("Greek"),				0x0408 },
-	{ "en",		N_("English"),				0x0409 },
-	{ "es",		N_("Spanish"),				0x040a },
-	{ "fr_FR",	N_("French"),				0x040c },
-	{ "it",		N_("Italian"),				0x0410 },
-	{ "pt",		N_("Portuguese"),			0x0816 },
-	{ "pt_BR",	N_("Portuguese (Brazilian)"),		0x0416 },
-	{ "ro",		N_("Romanian"),				0x0418 },
-	{ "ru_RU",	N_("Russian"),				0x0419 },
-	{ "zh_CN",	N_("Simplified Chinese"),	0x0804 },
-	{ "zh_TW",	N_("Traditional Chinese"),	0x0404 },
-	{ "ja",		N_("Japanese"),				0x0411 },
-	{ "ko",		N_("Korean"),				0x0412 },
-	{ "", "", 0xFFFF },
-};
-
-char *ParseLang(char *id) {
-	int i=0;
-
-	while (sLangs[i].id[0] != '\0') {
-		if (!strcmp(id, sLangs[i].id))
-			return _(sLangs[i].name);
-		i++;
-	}
-
-	return id;
-}
-
-static void SetDefaultLang(void) {
-	LANGID langid;
-	int i;
-
-	langid = GetSystemDefaultLangID();
-
-	i = 0;
-	while (sLangs[i].id[0] != '\0') {
-		if (langid == sLangs[i].langid) {
-			strcpy(Config.Lang, sLangs[i].id);
-			return;
-		}
-		i++;
-	}
-
-	strcpy(Config.Lang, "English");
-}
-
-#endif
-
-void strcatz(char *dst, char *src) {
-	int len = strlen(dst) + 1;
-	strcpy(dst + len, src);
-}
-
-int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) {
-	strcpy(cfgfile, "Software\\Pcsx");
-
-	gApp.hInstance = hInstance;
-
-#ifdef ENABLE_NLS
-	bindtextdomain(PACKAGE, "Langs\\");
-	textdomain(PACKAGE);
-#endif
-
-	Running = 0;
-
-	GetCurrentDirectory(256, PcsxDir);
-
-	memset(&Config, 0, sizeof(PcsxConfig));
-	strcpy(Config.Net, "Disabled");
-	if (LoadConfig() == -1) {
-		Config.PsxAuto = 1;
-		strcpy(Config.PluginsDir, "Plugins\\");
-		strcpy(Config.BiosDir, "Bios\\");
-
-		strcpy(Config.Mcd1, "memcards\\Mcd001.mcr");
-		strcpy(Config.Mcd2, "memcards\\Mcd002.mcr");
-
-		ConfPlug = 1;
-
-#ifdef ENABLE_NLS
-		{
-			char text[256];
-			SetDefaultLang();
-			sprintf(text, "LANGUAGE=%s", Config.Lang);
-			gettext_putenv(text);
-		}
-#endif
-
-		ConfigurePlugins(gApp.hWnd);
-
-		if (LoadConfig() == -1) {
-			return 0;
-		}
-	}
-
-	strcpy(Config.PatchesDir, "Patches\\");
-
-#ifdef ENABLE_NLS
-	if (Config.Lang[0] == 0) {
-		SetDefaultLang();
-		SaveConfig();
-		LoadConfig();
-	}
-#endif
-
-	if (SysInit() == -1) return 1;
-
-	CreateMainWindow(nCmdShow);
-
-	RunGui();
-
-	return 0;
-}
-
-void RunGui() {
-	MSG msg;
-
-	for (;;) {
-		if(PeekMessage(&msg, NULL, 0U, 0U, PM_REMOVE)) {
-			TranslateMessage(&msg);
-			DispatchMessage(&msg);
-		}
-	}
-}
-
-void RestoreWindow() {
-	AccBreak = 1;
-	DestroyWindow(gApp.hWnd);
-	CreateMainWindow(SW_SHOWNORMAL);
-	ShowCursor(TRUE);
-	SetCursor(LoadCursor(gApp.hInstance, IDC_ARROW));
-	ShowCursor(TRUE);
-}
-
-int Slots[5] = { -1, -1, -1, -1, -1 };
-
-void ResetMenuSlots() {
-	int i;
-
-	for (i = 0; i < 5; i++) {
-		if (Slots[i] == -1)
-			EnableMenuItem(GetSubMenu(gApp.hMenu, 0), ID_FILE_STATES_LOAD_SLOT1+i, MF_GRAYED);
-		else 
-			EnableMenuItem(GetSubMenu(gApp.hMenu, 0), ID_FILE_STATES_LOAD_SLOT1+i, MF_ENABLED);
-	}
-}
-
-void UpdateMenuSlots() {
-	char str[256];
-	int i;
-
-	for (i = 0; i < 5; i++) {
-		GetStateFilename(str, i);
-		Slots[i] = CheckState(str);
-	}
-}
-
-void OpenConsole() {
-	if (hConsole) return;
-	AllocConsole();
-	SetConsoleTitle("Psx Output");
-	hConsole = GetStdHandle(STD_OUTPUT_HANDLE);
-}
-
-void CloseConsole() {
-	FreeConsole();
-	hConsole = NULL;
-}
-
-void States_Load(int num) {
-	char Text[256];
-	int ret;
-
-	SetMenu(gApp.hWnd, NULL);
-	OpenPlugins(gApp.hWnd);
-
-	GetStateFilename(Text, num);
-
-	ret = LoadState(Text);
-	if (ret == 0)
-		 sprintf(Text, _("*PCSX*: Loaded State %d"), num+1);
-	else sprintf(Text, _("*PCSX*: Error Loading State %d"), num+1);
-	GPU_displayText(Text);
-
-	Running = 1;
-	CheatSearchBackupMemory();
-	psxCpu->Execute();
-}
-
-void States_Save(int num) {
-	char Text[256];
-	int ret;
-
-	SetMenu(gApp.hWnd, NULL);
-	OpenPlugins(gApp.hWnd);
-
-	GPU_updateLace();
-
-	GetStateFilename(Text, num);
-	GPU_freeze(2, (GPUFreeze_t *)&num);
-	ret = SaveState(Text);
-	if (ret == 0)
-		 sprintf(Text, _("*PCSX*: Saved State %d"), num+1);
-	else sprintf(Text, _("*PCSX*: Error Saving State %d"), num+1);
-	GPU_displayText(Text);
-
-	Running = 1;
-	CheatSearchBackupMemory();
-	psxCpu->Execute();
-}
-
-void OnStates_LoadOther() {
-	OPENFILENAME ofn;
-	char szFileName[MAXPATHLEN];
-	char szFileTitle[MAXPATHLEN];
-	char szFilter[256];
-
-	memset(&szFileName, 0, sizeof(szFileName));
-	memset(&szFileTitle, 0, sizeof(szFileTitle));
-	memset(&szFilter, 0, sizeof(szFilter));
-
-	strcpy(szFilter, _("PCSX State Format"));
-	strcatz(szFilter, "*.*");
-
-	ofn.lStructSize			= sizeof(OPENFILENAME);
-	ofn.hwndOwner			= gApp.hWnd;
-	ofn.lpstrFilter			= szFilter;
-	ofn.lpstrCustomFilter		= NULL;
-	ofn.nMaxCustFilter		= 0;
-	ofn.nFilterIndex		= 1;
-	ofn.lpstrFile			= szFileName;
-	ofn.nMaxFile			= MAXPATHLEN;
-	ofn.lpstrInitialDir		= NULL;
-	ofn.lpstrFileTitle		= szFileTitle;
-	ofn.nMaxFileTitle		= MAXPATHLEN;
-	ofn.lpstrTitle			= NULL;
-	ofn.lpstrDefExt			= NULL;
-	ofn.Flags			= OFN_HIDEREADONLY | OFN_NOCHANGEDIR;
-
-	if (GetOpenFileName ((LPOPENFILENAME)&ofn)) {
-		char Text[256];
-		int ret;
-
-		SetMenu(gApp.hWnd, NULL);
-		OpenPlugins(gApp.hWnd);
-
-		ret = LoadState(szFileName);
-		if (ret == 0)
-			 sprintf(Text, _("*PCSX*: Loaded State %s"), szFileName);
-		else sprintf(Text, _("*PCSX*: Error Loading State %s"), szFileName);
-		GPU_displayText(Text);
-
-		Running = 1;
-		psxCpu->Execute();
-	}
-} 
-
-void OnStates_Save1() { States_Save(0); } 
-void OnStates_Save2() { States_Save(1); } 
-void OnStates_Save3() { States_Save(2); } 
-void OnStates_Save4() { States_Save(3); } 
-void OnStates_Save5() { States_Save(4); } 
-
-void OnStates_SaveOther() {
-	OPENFILENAME ofn;
-	char szFileName[MAXPATHLEN];
-	char szFileTitle[MAXPATHLEN];
-	char szFilter[256];
-
-	memset(&szFileName, 0, sizeof(szFileName));
-	memset(&szFileTitle, 0, sizeof(szFileTitle));
-	memset(&szFilter, 0, sizeof(szFilter));
-
-	strcpy(szFilter, _("PCSX State Format"));
-	strcatz(szFilter, "*.*");
-
-	ofn.lStructSize			= sizeof(OPENFILENAME);
-	ofn.hwndOwner			= gApp.hWnd;
-	ofn.lpstrFilter			= szFilter;
-	ofn.lpstrCustomFilter	= NULL;
-	ofn.nMaxCustFilter		= 0;
-	ofn.nFilterIndex		= 1;
-	ofn.lpstrFile			= szFileName;
-	ofn.nMaxFile			= MAXPATHLEN;
-	ofn.lpstrInitialDir		= NULL;
-	ofn.lpstrFileTitle		= szFileTitle;
-	ofn.nMaxFileTitle		= MAXPATHLEN;
-	ofn.lpstrTitle			= NULL;
-	ofn.lpstrDefExt			= NULL;
-	ofn.Flags				= OFN_HIDEREADONLY | OFN_NOCHANGEDIR;
-
-	if (GetOpenFileName ((LPOPENFILENAME)&ofn)) {
-		char Text[256];
-		int ret;
-
-		SetMenu(gApp.hWnd, NULL);
-		OpenPlugins(gApp.hWnd);
-
-		ret = SaveState(szFileName);
-		if (ret == 0)
-			 sprintf(Text, _("*PCSX*: Saved State %s"), szFileName);
-		else sprintf(Text, _("*PCSX*: Error Saving State %s"), szFileName);
-		GPU_displayText(Text);
-
-		Running = 1;
-		psxCpu->Execute();
-	}
-} 
-
-LRESULT WINAPI MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) {
-	char File[256];
-	PAINTSTRUCT ps;
-
-	switch (msg) {
-		case WM_CREATE:
-			hBm = LoadBitmap(gApp.hInstance, MAKEINTRESOURCE(MAIN_LOGO));
-			GetObject(hBm, sizeof(BITMAP), (LPVOID)&bm);
-			hDC = GetDC(hWnd);
-			hdcmem = CreateCompatibleDC(hDC);
-			ReleaseDC(hWnd, hDC);
-			break;
-
-		case WM_PAINT:
-			hDC = BeginPaint(hWnd, &ps);
-			SelectObject(hdcmem, hBm);
-			if (!Running) BitBlt(hDC, 0, 0, bm.bmWidth, bm.bmHeight, hdcmem, 0, 0, SRCCOPY);
-			EndPaint(hWnd, &ps);
-			break;
-
-		case WM_COMMAND:
-			switch (LOWORD(wParam)) {
-				case ID_FILE_EXIT:
-					SysClose();
-					PostQuitMessage(0);
-					exit(0);
-					return TRUE;
-
-				case ID_FILE_RUN_CD:
-					SetIsoFile(NULL);
-					SetMenu(hWnd, NULL);
-					LoadPlugins();
-					if (OpenPlugins(hWnd) == -1) {
-						ClosePlugins();
-						RestoreWindow();
-						return TRUE;
-					}
-					SysReset();
-					if (CheckCdrom() == -1) {
-						ClosePlugins();
-						RestoreWindow();
-						SysMessage(_("The CD does not appear to be a valid Playstation CD"));
-						return TRUE;
-					}
-					if (LoadCdrom() == -1) {
-						ClosePlugins();
-						RestoreWindow();
-						SysMessage(_("Could not load CD-ROM!"));
-						return TRUE;
-					}
-					ShowCursor(FALSE);
-					Running = 1;
-					psxCpu->Execute();
-					return TRUE;
-
-				case ID_FILE_RUNBIOS:
-					if (strcmp(Config.Bios, "HLE") == 0) {
-						SysMessage(_("Running BIOS is not supported with Internal HLE Bios."));
-						return TRUE;
-					}
-					SetIsoFile(NULL);
-					SetMenu(hWnd, NULL);
-					LoadPlugins();
-					if (OpenPlugins(hWnd) == -1) {
-						ClosePlugins();
-						RestoreWindow();
-						return TRUE;
-					}
-					ShowCursor(FALSE);
-					SysReset();
-					CdromId[0] = '\0';
-					CdromLabel[0] = '\0';
-					Running = 1;
-					psxCpu->Execute();
-					return TRUE;
-
-				case ID_FILE_RUN_ISO:
-					if (!Open_Iso_Proc(File)) return TRUE;
-					SetIsoFile(File);
-					SetMenu(hWnd, NULL);
-					LoadPlugins();
-					if (OpenPlugins(hWnd) == -1) {
-						ClosePlugins();
-						RestoreWindow();
-						return TRUE;
-					}
-					SysReset();
-					if (CheckCdrom() == -1) {
-						ClosePlugins();
-						RestoreWindow();
-						SysMessage(_("The CD does not appear to be a valid Playstation CD"));
-						return TRUE;
-					}
-					if (LoadCdrom() == -1) {
-						ClosePlugins();
-						RestoreWindow();
-						SysMessage(_("Could not load CD-ROM!"));
-						return TRUE;
-					}
-					ShowCursor(FALSE);
-					Running = 1;
-					psxCpu->Execute();
-					return TRUE;
-
-				case ID_FILE_RUN_EXE:
-					if (!Open_File_Proc(File)) return TRUE;
-					SetIsoFile(NULL);
-					SetMenu(hWnd, NULL);
-					LoadPlugins();
-					if (OpenPlugins(hWnd) == -1) {
-						ClosePlugins();
-						RestoreWindow();
-						return TRUE;
-					}
-					SysReset();
-					CheckCdrom();
-					Load(File);
-					Running = 1;
-					psxCpu->Execute();
-					return TRUE;
-
-				case ID_FILE_STATES_LOAD_SLOT1: States_Load(0); return TRUE;
-				case ID_FILE_STATES_LOAD_SLOT2: States_Load(1); return TRUE;
-				case ID_FILE_STATES_LOAD_SLOT3: States_Load(2); return TRUE;
-				case ID_FILE_STATES_LOAD_SLOT4: States_Load(3); return TRUE;
-				case ID_FILE_STATES_LOAD_SLOT5: States_Load(4); return TRUE;
-				case ID_FILE_STATES_LOAD_OTHER: OnStates_LoadOther(); return TRUE;
-
-				case ID_FILE_STATES_SAVE_SLOT1: States_Save(0); return TRUE;
-				case ID_FILE_STATES_SAVE_SLOT2: States_Save(1); return TRUE;
-				case ID_FILE_STATES_SAVE_SLOT3: States_Save(2); return TRUE;
-				case ID_FILE_STATES_SAVE_SLOT4: States_Save(3); return TRUE;
-				case ID_FILE_STATES_SAVE_SLOT5: States_Save(4); return TRUE;
-				case ID_FILE_STATES_SAVE_OTHER: OnStates_SaveOther(); return TRUE;
-
-				case ID_EMULATOR_RUN:
-					SetMenu(hWnd, NULL);
-					OpenPlugins(hWnd);
-					ShowCursor(FALSE);
-					Running = 1;
-					CheatSearchBackupMemory();
-					psxCpu->Execute();
-					return TRUE;
-
-				case ID_EMULATOR_RESET:
-					SetMenu(hWnd, NULL);
-					OpenPlugins(hWnd);
-					SysReset();
-					CheckCdrom();
-					LoadCdrom();
-					ShowCursor(FALSE);
-					Running = 1;
-					psxCpu->Execute();
-					return TRUE;
-
-				case ID_EMULATOR_SWITCH_ISO:
-					if (!Open_Iso_Proc(File)) return TRUE;
-					SetIsoFile(File);
-					SetMenu(hWnd, NULL);
-					if (OpenPlugins(hWnd) == -1) {
-						ClosePlugins();
-						RestoreWindow();
-						return TRUE;
-					}
-					ShowCursor(FALSE);
-					Running = 1;
-					SetCdOpenCaseTime(time(NULL) + 2);
-					CheatSearchBackupMemory();
-					psxCpu->Execute();
-					return TRUE;
-
-				case ID_CONFIGURATION_GRAPHICS:
-					if (GPU_configure) GPU_configure();
-					return TRUE;
-
-				case ID_CONFIGURATION_SOUND:
-					if (SPU_configure) SPU_configure();
-					return TRUE;
-
-				case ID_CONFIGURATION_CONTROLLERS:
-					if (PAD1_configure) PAD1_configure();
-					if (strcmp(Config.Pad1, Config.Pad2)) if (PAD2_configure) PAD2_configure();
-					return TRUE;
-
-				case ID_CONFIGURATION_CDROM:
-				 if (CDR_configure) CDR_configure();
-					return TRUE;
-
-				case ID_CONFIGURATION_NETPLAY:
-					DialogBox(gApp.hInstance, MAKEINTRESOURCE(IDD_NETPLAY), hWnd, (DLGPROC)ConfigureNetPlayDlgProc);
-					return TRUE;
-
-				case ID_CONFIGURATION_MEMORYCARDMANAGER:
-					DialogBox(gApp.hInstance, MAKEINTRESOURCE(IDD_MCDCONF), hWnd, (DLGPROC)ConfigureMcdsDlgProc);
-					return TRUE;
-
-				case ID_CONFIGURATION_CPU:
-					DialogBox(gApp.hInstance, MAKEINTRESOURCE(IDD_CPUCONF), hWnd, (DLGPROC)ConfigureCpuDlgProc);
-					return TRUE;
-
-				case ID_CONFIGURATION:
-					ConfigurePlugins(hWnd);
-					return TRUE;
-
-				case ID_CONFIGURATION_CHEATLIST:
-					DialogBox(gApp.hInstance, MAKEINTRESOURCE(IDD_CHEATLIST), hWnd, (DLGPROC)CheatDlgProc);
-					break;
-
-				case ID_CONFIGURATION_CHEATSEARCH:
-					DialogBox(gApp.hInstance, MAKEINTRESOURCE(IDD_CHEATSEARCH), hWnd, (DLGPROC)CheatSearchDlgProc);
-					break;
-
-				case ID_HELP_ABOUT:
-					DialogBox(gApp.hInstance, MAKEINTRESOURCE(ABOUT_DIALOG), hWnd, (DLGPROC)AboutDlgProc);
-					return TRUE;
-
-				default:
-#ifdef ENABLE_NLS
-					if (LOWORD(wParam) >= ID_LANGS && LOWORD(wParam) <= (ID_LANGS + langsMax)) {
-						AccBreak = 1;
-						DestroyWindow(gApp.hWnd);
-						ChangeLanguage(langs[LOWORD(wParam) - ID_LANGS].lang);
-						CreateMainWindow(SW_NORMAL);
-						return TRUE;
-					}
-#endif
-					break;
-			}
-			break;
-
-		case WM_SYSKEYDOWN:
-			if (wParam != VK_F10)
-				return DefWindowProc(hWnd, msg, wParam, lParam);
-		case WM_KEYDOWN:
-			PADhandleKey(wParam);
-			return TRUE;
-
-		case WM_DESTROY:
-			if (!AccBreak) {
-				if (Running) ClosePlugins();
-				SysClose();
-				PostQuitMessage(0);
-				exit(0);
-			}
-			else AccBreak = 0;
-
-			DeleteObject(hBm);
-			DeleteDC(hdcmem);
-			return TRUE;
-
-		case WM_QUIT:
-			exit(0);
-			break;
-
-		default:
-			return DefWindowProc(hWnd, msg, wParam, lParam);
-	}
-
-	return FALSE;
-}
-
-HWND mcdDlg;
-McdBlock Blocks[2][15];
-int IconC[2][15];
-HIMAGELIST Iiml[2];
-HICON eICON;
-
-void CreateListView(int idc) {
-	HWND List;
-	LV_COLUMN col;
-
-	List = GetDlgItem(mcdDlg, idc);
-
-	col.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM;
-	col.fmt = LVCFMT_LEFT;
-
-	col.pszText = _("Title");
-	col.cx = 170;
-	col.iSubItem = 0;
-
-	ListView_InsertColumn(List, 0, &col);
-
-	col.pszText = _("Status");
-	col.cx = 50;
-	col.iSubItem = 1;
-
-	ListView_InsertColumn(List, 1, &col);
-
-	col.pszText = _("Game ID");
-	col.cx = 90;
-	col.iSubItem = 2;
-
-	ListView_InsertColumn(List, 2, &col);
-
-	col.pszText = _("Game");
-	col.cx = 80;
-	col.iSubItem = 3;
-
-	ListView_InsertColumn(List, 3, &col);
-}
-
-int GetRGB() {
- HDC scrDC, memDC;
- HBITMAP oldBmp = NULL; 
- HBITMAP curBmp = NULL;
- COLORREF oldColor;
- COLORREF curColor = RGB(255,255,255);
- int i, R, G, B;
-
- R = G = B = 1;
- 
- scrDC = CreateDC("DISPLAY", NULL, NULL, NULL);
- memDC = CreateCompatibleDC(NULL); 
- curBmp = CreateCompatibleBitmap(scrDC, 1, 1); 
- oldBmp = (HBITMAP)SelectObject(memDC, curBmp);
- 
- for (i = 255; i >= 0; --i) {
- oldColor = curColor;
- curColor = SetPixel(memDC, 0, 0, RGB(i, i, i));
- 
- if (GetRValue(curColor) < GetRValue(oldColor)) ++R; 
- if (GetGValue(curColor) < GetGValue(oldColor)) ++G;
- if (GetBValue(curColor) < GetBValue(oldColor)) ++B;
- }
- 
- DeleteObject(oldBmp);
- DeleteObject(curBmp);
- DeleteDC(scrDC);
- DeleteDC(memDC);
- 
- return (R * G * B);
-}
- 
-HICON GetIcon(short *icon) {
- ICONINFO iInfo;
- HDC hDC;
- char mask[16*16];
- int x, y, c, Depth;
- 
- hDC = CreateIC("DISPLAY",NULL,NULL,NULL);
- Depth=GetDeviceCaps(hDC, BITSPIXEL);
- DeleteDC(hDC);
- 
- if (Depth == 16) {
- if (GetRGB() == (32 * 32 * 32)) 
- Depth = 15;
- }
-
- for (y=0; y<16; y++) {
- for (x=0; x<16; x++) {
- c = icon[y*16+x];
- if (Depth == 15 || Depth == 32)
-				c = ((c&0x001f) << 10) | 
-					((c&0x7c00) >> 10) | 
-					((c&0x03e0) );
-			else
- c = ((c&0x001f) << 11) |
-					((c&0x7c00) >> 9) |
-					((c&0x03e0) << 1);
-
- icon[y*16+x] = c;
- }
- } 
-
- iInfo.fIcon = TRUE;
- memset(mask, 0, 16*16);
- iInfo.hbmMask = CreateBitmap(16, 16, 1, 1, mask);
- iInfo.hbmColor = CreateBitmap(16, 16, 1, 16, icon); 
- 
- return CreateIconIndirect(&iInfo);
-}
-
-HICON hICON[2][3][15];
-int aIover[2]; 
-int ani[2];
- 
-void LoadMcdItems(int mcd, int idc) {
- HWND List = GetDlgItem(mcdDlg, idc);
- LV_ITEM item;
- HIMAGELIST iml = Iiml[mcd-1];
- int i, j;
- HICON hIcon;
- McdBlock *Info;
- 
- aIover[mcd-1]=0;
- ani[mcd-1]=0;
- 
- ListView_DeleteAllItems(List);
-
- for (i=0; i<15; i++) {
- 
- item.mask = LVIF_TEXT | LVIF_IMAGE;
- item.iItem = i;
- item.iImage = i;
- item.pszText = LPSTR_TEXTCALLBACK;
- item.iSubItem = 0;
- 
- IconC[mcd-1][i] = 0;
- Info = &Blocks[mcd-1][i];
- 
- if ((Info->Flags & 0xF) == 1 && Info->IconCount != 0) {
- hIcon = GetIcon(Info->Icon); 
- 
- if (Info->IconCount > 1) {
- for(j = 0; j < 3; j++)
- hICON[mcd-1][j][i]=hIcon;
- }
- } else {
- hIcon = eICON; 
- }
- 
- ImageList_ReplaceIcon(iml, -1, hIcon);
- ListView_InsertItem(List, &item);
- } 
-}
-
-void UpdateMcdItems(int mcd, int idc) {
- HWND List = GetDlgItem(mcdDlg, idc);
- LV_ITEM item;
- HIMAGELIST iml = Iiml[mcd-1];
- int i, j;
- McdBlock *Info;
- HICON hIcon;
- 
- aIover[mcd-1]=0;
- ani[mcd-1]=0;
- 
- for (i=0; i<15; i++) { 
- 
- item.mask = LVIF_TEXT | LVIF_IMAGE;
- item.iItem = i;
- item.iImage = i;
- item.pszText = LPSTR_TEXTCALLBACK;
- item.iSubItem = 0;
- 
- IconC[mcd-1][i] = 0; 
- Info = &Blocks[mcd-1][i];
- 
- if ((Info->Flags & 0xF) == 1 && Info->IconCount != 0) {
- hIcon = GetIcon(Info->Icon); 
- 
- if (Info->IconCount > 1) { 
- for(j = 0; j < 3; j++)
- hICON[mcd-1][j][i]=hIcon;
- }
- } else { 
- hIcon = eICON; 
- }
- 
- ImageList_ReplaceIcon(iml, i, hIcon);
- ListView_SetItem(List, &item);
- } 
- ListView_Update(List, -1);
-}
- 
-void McdListGetDispInfo(int mcd, int idc, LPNMHDR pnmh) {
-	LV_DISPINFO *lpdi = (LV_DISPINFO *)pnmh;
-	McdBlock *Info;
+/* Pcsx - Pc Psx Emulator
+ * Copyright (C) 1999-2003 Pcsx Team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <windows.h>
+#include <windowsx.h>
+#include <commctrl.h>
+#include <time.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdarg.h>
+
+#include "resource.h"
+#include "AboutDlg.h"
+
+#include "psxcommon.h"
+#include "plugin.h"
+#include "debug.h"
+#include "Win32.h"
+#include "sio.h"
+#include "misc.h"
+#include "cheat.h"
+
+#ifdef __MINGW32__
+#ifndef LVM_GETSELECTIONMARK
+#define LVM_GETSELECTIONMARK (LVM_FIRST+66)
+#endif
+#ifndef ListView_GetSelectionMark
+#define ListView_GetSelectionMark(w) (INT)SNDMSG((w),LVM_GETSELECTIONMARK,0,0)
+#endif
+#endif
+
+int AccBreak = 0;
+int ConfPlug = 0;
+int StatesC = 0;
+int CancelQuit = 0;
+char cfgfile[256];
+int Running = 0;
+boolean UseGui = TRUE;
+char PcsxrDir[256];
+
+static HDC hDC;
+static HDC hdcmem;
+static HBITMAP hBm;
+static BITMAP bm;
+
+#ifdef ENABLE_NLS
+
+unsigned int langsMax;
+
+typedef struct {
+	char lang[256];
+} _langs;
+_langs *langs = NULL;
+
+typedef struct {
+	char			id[8];
+	char			name[64];
+	LANGID			langid;
+} LangDef;
+
+LangDef sLangs[] = {
+	{ "ar",		N_("Arabic"),				0x0401 },
+	{ "ca",		N_("Catalan"),				0x0403 },
+	{ "de",		N_("German"),				0x0407 },
+	{ "el",		N_("Greek"),				0x0408 },
+	{ "en",		N_("English"),				0x0409 },
+	{ "es",		N_("Spanish"),				0x040a },
+	{ "fr_FR",	N_("French"),				0x040c },
+	{ "it",		N_("Italian"),				0x0410 },
+	{ "pt",		N_("Portuguese"),			0x0816 },
+	{ "pt_BR",	N_("Portuguese (Brazilian)"),		0x0416 },
+	{ "ro",		N_("Romanian"),				0x0418 },
+	{ "ru_RU",	N_("Russian"),				0x0419 },
+	{ "zh_CN",	N_("Simplified Chinese"),	0x0804 },
+	{ "zh_TW",	N_("Traditional Chinese"),	0x0404 },
+	{ "ja",		N_("Japanese"),				0x0411 },
+	{ "ko",		N_("Korean"),				0x0412 },
+	{ "", "", 0xFFFF },
+};
+
+char *ParseLang(char *id) {
+	int i=0;
+
+	while (sLangs[i].id[0] != '\0') {
+		if (!strcmp(id, sLangs[i].id))
+			return _(sLangs[i].name);
+		i++;
+	}
+
+	return id;
+}
+
+static void SetDefaultLang(void) {
+	LANGID langid;
+	int i;
+
+	langid = GetSystemDefaultLangID();
+
+	i = 0;
+	while (sLangs[i].id[0] != '\0') {
+		if (langid == sLangs[i].langid) {
+			strcpy(Config.Lang, sLangs[i].id);
+			return;
+		}
+		i++;
+	}
+
+	strcpy(Config.Lang, "English");
+}
+
+#endif
+
+void strcatz(char *dst, char *src) {
+	int len = strlen(dst) + 1;
+	strcpy(dst + len, src);
+}
+
+int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) {
+	char *arg = NULL;
+	char cdfile[MAXPATHLEN] = "", buf[4096];
+	int loadstatenum = -1;
+
+	strcpy(cfgfile, "Software\\Pcsxr");
+
+	gApp.hInstance = hInstance;
+
+#ifdef ENABLE_NLS
+	bindtextdomain(PACKAGE, "Langs\\");
+	textdomain(PACKAGE);
+#endif
+
+	Running = 0;
+
+	GetCurrentDirectory(256, PcsxrDir);
+
+	memset(&Config, 0, sizeof(PcsxConfig));
+	strcpy(Config.Net, "Disabled");
+	if (LoadConfig() == -1) {
+		Config.PsxAuto = 1;
+		strcpy(Config.PluginsDir, "Plugins\\");
+		strcpy(Config.BiosDir, "Bios\\");
+
+		strcpy(Config.Mcd1, "memcards\\Mcd001.mcr");
+		strcpy(Config.Mcd2, "memcards\\Mcd002.mcr");
+
+		ConfPlug = 1;
+
+#ifdef ENABLE_NLS
+		{
+			char text[256];
+			SetDefaultLang();
+			sprintf(text, "LANGUAGE=%s", Config.Lang);
+			gettext_putenv(text);
+		}
+#endif
+
+		ConfigurePlugins(gApp.hWnd);
+
+		if (LoadConfig() == -1) {
+			return 0;
+		}
+	}
+
+	strcpy(Config.PatchesDir, "Patches\\");
+
+#ifdef ENABLE_NLS
+	if (Config.Lang[0] == 0) {
+		SetDefaultLang();
+		SaveConfig();
+		LoadConfig();
+	}
+#endif
+
+	// Parse command-line
+	strncpy(buf, lpCmdLine, 4096);
+
+	for (arg = strtok(buf, " "); arg != NULL; arg = strtok(NULL, " ")) {
+		if (strcmp(arg, "-nogui") == 0) {
+			UseGui = FALSE;
+		} else if (strcmp(arg, "-runcd") == 0) {
+			cdfile[0] = '\0';
+		} else if (strcmp(arg, "-cdfile") == 0) {
+			arg = strtok(NULL, " ");
+			if (arg != NULL) {
+				if (arg[0] == '"') {
+					strncpy(buf, lpCmdLine + (arg - buf), 4096);
+					arg = strtok(buf, "\"");
+					if (arg != NULL) strcpy(cdfile, arg);
+				} else {
+					strcpy(cdfile, arg);
+				}
+				UseGui = FALSE;
+			}
+		} else if (strcmp(arg, "-psxout") == 0) {
+			Config.PsxOut = TRUE;
+		} else if (strcmp(arg, "-slowboot") == 0) {
+			Config.SlowBoot = TRUE;
+		} else if (strcmp(arg, "-help") == 0) {
+			MessageBox(gApp.hWnd, _(
+				"Usage: pcsxr [options]\n"
+				"\toptions:\n"
+				"\t-nogui\t\tDon't open the GUI\n"
+				"\t-psxout\t\tEnable PSX output\n"
+				"\t-slowboot\tEnable BIOS logo\n"
+				"\t-runcd\t\tRuns CD-ROM (requires -nogui)\n"
+				"\t-cdfile FILE\tRuns a CD image file (requires -nogui)\n"
+				"\t-help\t\tDisplay this message"),
+				"PCSXR", 0);
+
+			return 0;
+		}
+	}
+
+	if (SysInit() == -1) return 1;
+
+	CreateMainWindow(nCmdShow);
+
+	if (!UseGui) {
+		SetIsoFile(cdfile);
+		PostMessage(gApp.hWnd, WM_COMMAND, ID_FILE_RUN_NOGUI, 0);
+	}
+
+	RunGui();
+
+	return 0;
+}
+
+void RunGui() {
+	MSG msg;
+
+	for (;;) {
+		if (PeekMessage(&msg, NULL, 0U, 0U, PM_REMOVE)) {
+			TranslateMessage(&msg);
+			DispatchMessage(&msg);
+		}
+		else
+		{
+			// Avoid 100% cpu usage.
+			Sleep(10);
+		}
+	}
+}
+
+void RestoreWindow() {
+	AccBreak = 1;
+	DestroyWindow(gApp.hWnd);
+	CreateMainWindow(SW_SHOWNORMAL);
+	
+	if(Config.HideCursor)
+		ShowCursor(TRUE);
+	
+	//SetCursor(LoadCursor(gApp.hInstance, IDC_ARROW));
+	//ShowCursor(TRUE);
+
+	if (!UseGui) PostMessage(gApp.hWnd, WM_COMMAND, ID_FILE_EXIT, 0);
+}
+
+void ResetMenuSlots() {
+	char str[256];
+	int i;
+
+	for (i = 0; i < 9; i++) {
+		GetStateFilename(str, i);
+		if (CheckState(str) == -1)
+			EnableMenuItem(gApp.hMenu, ID_FILE_STATES_LOAD_SLOT1+i, MF_GRAYED);
+		else 
+			EnableMenuItem(gApp.hMenu, ID_FILE_STATES_LOAD_SLOT1+i, MF_ENABLED);
+	}
+}
+
+void OpenConsole() {
+	if (hConsole) return;
+	AllocConsole();
+	SetConsoleTitle("Psx Output");
+	hConsole = GetStdHandle(STD_OUTPUT_HANDLE);
+}
+
+void CloseConsole() {
+	FreeConsole();
+	hConsole = NULL;
+}
+
+void States_Load(int num) {
+	char Text[256];
+	int ret;
+
+	SetMenu(gApp.hWnd, NULL);
+	OpenPlugins(gApp.hWnd);
+
+	GetStateFilename(Text, num);
+
+	ret = LoadState(Text);
+	if (ret == 0)
+		 sprintf(Text, _("*PCSXR*: Loaded State %d"), num+1);
+	else sprintf(Text, _("*PCSXR*: Error Loading State %d"), num+1);
+	GPU_displayText(Text);
+
+	Running = 1;
+	CheatSearchBackupMemory();
+	psxCpu->Execute();
+}
+
+void States_Save(int num) {
+	char Text[256];
+	int ret;
+
+	SetMenu(gApp.hWnd, NULL);
+	OpenPlugins(gApp.hWnd);
+
+	GPU_updateLace();
+
+	GetStateFilename(Text, num);
+	GPU_freeze(2, (GPUFreeze_t *)&num);
+	ret = SaveState(Text);
+	if (ret == 0)
+		 sprintf(Text, _("*PCSXR*: Saved State %d"), num+1);
+	else sprintf(Text, _("*PCSXR*: Error Saving State %d"), num+1);
+	GPU_displayText(Text);
+
+	Running = 1;
+	CheatSearchBackupMemory();
+	psxCpu->Execute();
+}
+
+void OnStates_LoadOther() {
+	OPENFILENAME ofn;
+	char szFileName[MAXPATHLEN];
+	char szFileTitle[MAXPATHLEN];
+	char szFilter[256];
+
+	memset(&szFileName, 0, sizeof(szFileName));
+	memset(&szFileTitle, 0, sizeof(szFileTitle));
+	memset(&szFilter, 0, sizeof(szFilter));
+
+	strcpy(szFilter, _("PCSXR State Format"));
+	strcatz(szFilter, "*.*");
+
+	ofn.lStructSize			= sizeof(OPENFILENAME);
+	ofn.hwndOwner			= gApp.hWnd;
+	ofn.lpstrFilter			= szFilter;
+	ofn.lpstrCustomFilter		= NULL;
+	ofn.nMaxCustFilter		= 0;
+	ofn.nFilterIndex		= 1;
+	ofn.lpstrFile			= szFileName;
+	ofn.nMaxFile			= MAXPATHLEN;
+	ofn.lpstrInitialDir		= NULL;
+	ofn.lpstrFileTitle		= szFileTitle;
+	ofn.nMaxFileTitle		= MAXPATHLEN;
+	ofn.lpstrTitle			= NULL;
+	ofn.lpstrDefExt			= NULL;
+	ofn.Flags			= OFN_HIDEREADONLY | OFN_NOCHANGEDIR;
+
+	if (GetOpenFileName ((LPOPENFILENAME)&ofn)) {
+		char Text[256];
+		int ret;
+
+		SetMenu(gApp.hWnd, NULL);
+		OpenPlugins(gApp.hWnd);
+
+		ret = LoadState(szFileName);
+		if (ret == 0)
+			 sprintf(Text, _("*PCSXR*: Loaded State %s"), szFileName);
+		else sprintf(Text, _("*PCSXR*: Error Loading State %s"), szFileName);
+		GPU_displayText(Text);
+
+		Running = 1;
+		psxCpu->Execute();
+	}
+} 
+
+void OnStates_SaveOther() {
+	OPENFILENAME ofn;
+	char szFileName[MAXPATHLEN];
+	char szFileTitle[MAXPATHLEN];
+	char szFilter[256];
+
+	memset(&szFileName, 0, sizeof(szFileName));
+	memset(&szFileTitle, 0, sizeof(szFileTitle));
+	memset(&szFilter, 0, sizeof(szFilter));
+
+	strcpy(szFilter, _("PCSXR State Format"));
+	strcatz(szFilter, "*.*");
+
+	ofn.lStructSize			= sizeof(OPENFILENAME);
+	ofn.hwndOwner			= gApp.hWnd;
+	ofn.lpstrFilter			= szFilter;
+	ofn.lpstrCustomFilter	= NULL;
+	ofn.nMaxCustFilter		= 0;
+	ofn.nFilterIndex		= 1;
+	ofn.lpstrFile			= szFileName;
+	ofn.nMaxFile			= MAXPATHLEN;
+	ofn.lpstrInitialDir		= NULL;
+	ofn.lpstrFileTitle		= szFileTitle;
+	ofn.nMaxFileTitle		= MAXPATHLEN;
+	ofn.lpstrTitle			= NULL;
+	ofn.lpstrDefExt			= NULL;
+	ofn.Flags				= OFN_HIDEREADONLY | OFN_NOCHANGEDIR;
+
+	if (GetOpenFileName ((LPOPENFILENAME)&ofn)) {
+		char Text[256];
+		int ret;
+
+		SetMenu(gApp.hWnd, NULL);
+		OpenPlugins(gApp.hWnd);
+
+		ret = SaveState(szFileName);
+		if (ret == 0)
+			 sprintf(Text, _("*PCSXR*: Saved State %s"), szFileName);
+		else sprintf(Text, _("*PCSXR*: Error Saving State %s"), szFileName);
+		GPU_displayText(Text);
+
+		Running = 1;
+		psxCpu->Execute();
+	}
+} 
+
+LRESULT WINAPI MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) {
+	char File[256];
+	PAINTSTRUCT ps;
+
+	switch (msg) {
+		case WM_CREATE:
+			hBm = LoadBitmap(gApp.hInstance, MAKEINTRESOURCE(MAIN_LOGO));
+			GetObject(hBm, sizeof(BITMAP), (LPVOID)&bm);
+			hDC = GetDC(hWnd);
+			hdcmem = CreateCompatibleDC(hDC);
+			ReleaseDC(hWnd, hDC);
+			break;
+
+		case WM_PAINT:
+			hDC = BeginPaint(hWnd, &ps);
+			SelectObject(hdcmem, hBm);
+			if (!Running) BitBlt(hDC, 0, 0, bm.bmWidth, bm.bmHeight, hdcmem, 0, 0, SRCCOPY);
+			EndPaint(hWnd, &ps);
+			break;
+
+		case WM_COMMAND:
+			switch (LOWORD(wParam)) {
+				case ID_FILE_EXIT:
+					SysClose();
+					PostQuitMessage(0);
+					exit(0);
+					return TRUE;
+
+				case ID_FILE_RUN_CD:
+					SetIsoFile(NULL);
+					SetMenu(hWnd, NULL);
+					LoadPlugins();
+					if (OpenPlugins(hWnd) == -1) {
+						ClosePlugins();
+						RestoreWindow();
+						return TRUE;
+					}
+					if (CheckCdrom() == -1) {
+						ClosePlugins();
+						RestoreWindow();
+						SysMessage(_("The CD does not appear to be a valid Playstation CD"));
+						return TRUE;
+					}
+					
+					// Auto-detect: region first, then rcnt reset
+					SysReset();
+
+					if (LoadCdrom() == -1) {
+						ClosePlugins();
+						RestoreWindow();
+						SysMessage(_("Could not load CD-ROM!"));
+						return TRUE;
+					}
+					if(Config.HideCursor)
+						ShowCursor(FALSE);
+					Running = 1;
+					psxCpu->Execute();
+					return TRUE;
+
+				case ID_FILE_RUNBIOS:
+					if (strcmp(Config.Bios, "HLE") == 0) {
+						SysMessage(_("Running BIOS is not supported with Internal HLE Bios."));
+						return TRUE;
+					}
+					SetIsoFile(NULL);
+					SetMenu(hWnd, NULL);
+					LoadPlugins();
+					if (OpenPlugins(hWnd) == -1) {
+						ClosePlugins();
+						RestoreWindow();
+						return TRUE;
+					}
+					if(Config.HideCursor)
+						ShowCursor(FALSE);
+					SysReset();
+					CdromId[0] = '\0';
+					CdromLabel[0] = '\0';
+					Running = 1;
+					psxCpu->Execute();
+					return TRUE;
+
+				case ID_FILE_RUN_ISO:
+					if (!Open_Iso_Proc(File)) return TRUE;
+					SetIsoFile(File);
+					SetMenu(hWnd, NULL);
+					LoadPlugins();
+					if (OpenPlugins(hWnd) == -1) {
+						ClosePlugins();
+						RestoreWindow();
+						return TRUE;
+					}
+					if (CheckCdrom() == -1) {
+						ClosePlugins();
+						RestoreWindow();
+						SysMessage(_("The CD does not appear to be a valid Playstation CD"));
+						return TRUE;
+					}
+
+					// Auto-detect: region first, then rcnt reset
+					SysReset();
+					
+					if (LoadCdrom() == -1) {
+						ClosePlugins();
+						RestoreWindow();
+						SysMessage(_("Could not load CD-ROM!"));
+						return TRUE;
+					}
+					if(Config.HideCursor)
+						ShowCursor(FALSE);
+					Running = 1;
+					psxCpu->Execute();
+					return TRUE;
+
+				case ID_FILE_RUN_EXE:
+					if (!Open_File_Proc(File)) return TRUE;
+					SetIsoFile(NULL);
+					SetMenu(hWnd, NULL);
+					LoadPlugins();
+					if (OpenPlugins(hWnd) == -1) {
+						ClosePlugins();
+						RestoreWindow();
+						return TRUE;
+					}
+					CheckCdrom();
+
+					// Auto-detect: region first, then rcnt reset
+					SysReset();
+					
+					Load(File);
+					Running = 1;
+					psxCpu->Execute();
+					return TRUE;
+
+				case ID_FILE_STATES_LOAD_SLOT1: States_Load(0); return TRUE;
+				case ID_FILE_STATES_LOAD_SLOT2: States_Load(1); return TRUE;
+				case ID_FILE_STATES_LOAD_SLOT3: States_Load(2); return TRUE;
+				case ID_FILE_STATES_LOAD_SLOT4: States_Load(3); return TRUE;
+				case ID_FILE_STATES_LOAD_SLOT5: States_Load(4); return TRUE;
+				case ID_FILE_STATES_LOAD_SLOT6: States_Load(5); return TRUE;
+				case ID_FILE_STATES_LOAD_SLOT7: States_Load(6); return TRUE;
+				case ID_FILE_STATES_LOAD_SLOT8: States_Load(7); return TRUE;
+				case ID_FILE_STATES_LOAD_SLOT9: States_Load(8); return TRUE;
+				case ID_FILE_STATES_LOAD_OTHER: OnStates_LoadOther(); return TRUE;
+
+				case ID_FILE_STATES_SAVE_SLOT1: States_Save(0); return TRUE;
+				case ID_FILE_STATES_SAVE_SLOT2: States_Save(1); return TRUE;
+				case ID_FILE_STATES_SAVE_SLOT3: States_Save(2); return TRUE;
+				case ID_FILE_STATES_SAVE_SLOT4: States_Save(3); return TRUE;
+				case ID_FILE_STATES_SAVE_SLOT5: States_Save(4); return TRUE;
+				case ID_FILE_STATES_SAVE_SLOT6: States_Save(5); return TRUE;
+				case ID_FILE_STATES_SAVE_SLOT7: States_Save(6); return TRUE;
+				case ID_FILE_STATES_SAVE_SLOT8: States_Save(7); return TRUE;
+				case ID_FILE_STATES_SAVE_SLOT9: States_Save(8); return TRUE;
+				case ID_FILE_STATES_SAVE_OTHER: OnStates_SaveOther(); return TRUE;
+
+				case ID_FILE_RUN_NOGUI:
+					SetMenu(hWnd, NULL);
+					LoadPlugins();
+					if (OpenPlugins(hWnd) == -1) {
+						ClosePlugins();
+						RestoreWindow();
+						return TRUE;
+					}
+					if (CheckCdrom() == -1) {
+						fprintf(stderr, _("The CD does not appear to be a valid Playstation CD"));
+						ClosePlugins();
+						RestoreWindow();
+						return TRUE;
+					}
+
+					// Auto-detect: region first, then rcnt reset
+					SysReset();
+					
+					if (LoadCdrom() == -1) {
+						fprintf(stderr, _("Could not load CD-ROM!"));
+						ClosePlugins();
+						RestoreWindow();
+						return TRUE;
+					}
+					if(Config.HideCursor)
+						ShowCursor(FALSE);
+					Running = 1;
+					psxCpu->Execute();
+					return TRUE;
+
+				case ID_EMULATOR_RUN:
+					SetMenu(hWnd, NULL);
+					OpenPlugins(hWnd);
+					if(Config.HideCursor)
+						ShowCursor(FALSE);
+					Running = 1;
+					CheatSearchBackupMemory();
+					psxCpu->Execute();
+					return TRUE;
+
+				case ID_EMULATOR_RESET:
+					SetMenu(hWnd, NULL);
+					OpenPlugins(hWnd);
+					CheckCdrom();
+
+					// Auto-detect: region first, then rcnt reset
+					SysReset();
+					
+					LoadCdrom();
+					if(Config.HideCursor)
+						ShowCursor(FALSE);
+					Running = 1;
+					psxCpu->Execute();
+					return TRUE;
+
+				case ID_EMULATOR_SHUTDOWN:
+					ReleasePlugins();
+					SetIsoFile(NULL);
+					CdromId[0] = '\0';
+					CdromLabel[0] = '\0';
+					UpdateMenuItems();
+					ShowCursor(TRUE); // we want GUI to have cursor always
+					return TRUE;
+
+				case ID_EMULATOR_SWITCH_ISO:
+					if (!Open_Iso_Proc(File)) return TRUE;
+					SetIsoFile(File);
+					SetMenu(hWnd, NULL);
+					if (OpenPlugins(hWnd) == -1) {
+						ClosePlugins();
+						RestoreWindow();
+						return TRUE;
+					}
+					if(Config.HideCursor)
+						ShowCursor(FALSE);
+					Running = 1;
+					SetCdOpenCaseTime(time(NULL) + 2);
+					CheatSearchBackupMemory();
+					psxCpu->Execute();
+					return TRUE;
+
+				case ID_CONFIGURATION_GRAPHICS:
+					if (GPU_configure) GPU_configure();
+					return TRUE;
+
+				case ID_CONFIGURATION_SOUND:
+					if (SPU_configure) SPU_configure();
+					return TRUE;
+
+				case ID_CONFIGURATION_CONTROLLERS:
+					if (PAD1_configure) PAD1_configure();
+					if (strcmp(Config.Pad1, Config.Pad2)) if (PAD2_configure) PAD2_configure();
+					return TRUE;
+
+				case ID_CONFIGURATION_CDROM:
+				 if (CDR_configure) CDR_configure();
+					return TRUE;
+
+				case ID_CONFIGURATION_LINKCABLE:
+#ifdef ENABLE_SIO1API
+					if (SIO1_configure) SIO1_configure();
+#endif
+					return TRUE;
+
+				case ID_CONFIGURATION_NETPLAY:
+					DialogBox(gApp.hInstance, MAKEINTRESOURCE(IDD_NETPLAY), hWnd, (DLGPROC)ConfigureNetPlayDlgProc);
+					return TRUE;
+
+				case ID_CONFIGURATION_MEMORYCARDMANAGER:
+					DialogBox(gApp.hInstance, MAKEINTRESOURCE(IDD_MCDCONF), hWnd, (DLGPROC)ConfigureMcdsDlgProc);
+					return TRUE;
+
+				case ID_CONFIGURATION_CPU:
+					DialogBox(gApp.hInstance, MAKEINTRESOURCE(IDD_CPUCONF), hWnd, (DLGPROC)ConfigureCpuDlgProc);
+					return TRUE;
+
+				case ID_CONFIGURATION:
+					ConfigurePlugins(hWnd);
+					return TRUE;
+
+				case ID_CONFIGURATION_CHEATLIST:
+					DialogBox(gApp.hInstance, MAKEINTRESOURCE(IDD_CHEATLIST), hWnd, (DLGPROC)CheatDlgProc);
+					break;
+
+				case ID_CONFIGURATION_CHEATSEARCH:
+					DialogBox(gApp.hInstance, MAKEINTRESOURCE(IDD_CHEATSEARCH), hWnd, (DLGPROC)CheatSearchDlgProc);
+					break;
+
+				case ID_HELP_ABOUT:
+					DialogBox(gApp.hInstance, MAKEINTRESOURCE(ABOUT_DIALOG), hWnd, (DLGPROC)AboutDlgProc);
+					return TRUE;
+
+				default:
+#ifdef ENABLE_NLS
+					if (LOWORD(wParam) >= ID_LANGS && LOWORD(wParam) <= (ID_LANGS + langsMax)) {
+						AccBreak = 1;
+						DestroyWindow(gApp.hWnd);
+						ChangeLanguage(langs[LOWORD(wParam) - ID_LANGS].lang);
+						CreateMainWindow(SW_NORMAL);
+						return TRUE;
+					}
+#endif
+					break;
+			}
+			break;
+
+		case WM_SYSKEYDOWN:
+			if (wParam != VK_F10)
+				return DefWindowProc(hWnd, msg, wParam, lParam);
+		case WM_KEYDOWN:
+			PADhandleKey(wParam);
+			return TRUE;
+
+		case WM_DESTROY:
+			if (!AccBreak) {
+				if (Running) ClosePlugins();
+				SysClose();
+				PostQuitMessage(0);
+				exit(0);
+			}
+			else AccBreak = 0;
+
+			DeleteObject(hBm);
+			DeleteDC(hdcmem);
+			return TRUE;
+
+		case WM_QUIT:
+			exit(0);
+			break;
+
+		default:
+			return DefWindowProc(hWnd, msg, wParam, lParam);
+	}
+
+	return FALSE;
+}
+
+HWND mcdDlg;
+McdBlock Blocks[2][15];
+int IconC[2][15];
+HIMAGELIST Iiml[2];
+HICON eICON;
+
+void CreateListView(int idc) {
+	HWND List;
+	LV_COLUMN col;
+
+	List = GetDlgItem(mcdDlg, idc);
+
+	col.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM;
+	col.fmt = LVCFMT_LEFT;
+
+	col.pszText = _("Title");
+	col.cx = 170;
+	col.iSubItem = 0;
+
+	ListView_InsertColumn(List, 0, &col);
+
+	col.pszText = _("Status");
+	col.cx = 50;
+	col.iSubItem = 1;
+
+	ListView_InsertColumn(List, 1, &col);
+
+	col.pszText = _("Game ID");
+	col.cx = 90;
+	col.iSubItem = 2;
+
+	ListView_InsertColumn(List, 2, &col);
+
+	col.pszText = _("Game");
+	col.cx = 80;
+	col.iSubItem = 3;
+
+	ListView_InsertColumn(List, 3, &col);
+}
+
+int GetRGB() {
+ HDC scrDC, memDC;
+ HBITMAP oldBmp = NULL; 
+ HBITMAP curBmp = NULL;
+ COLORREF oldColor;
+ COLORREF curColor = RGB(255,255,255);
+ int i, R, G, B;
+
+ R = G = B = 1;
+ 
+ scrDC = CreateDC("DISPLAY", NULL, NULL, NULL);
+ memDC = CreateCompatibleDC(NULL); 
+ curBmp = CreateCompatibleBitmap(scrDC, 1, 1); 
+ oldBmp = (HBITMAP)SelectObject(memDC, curBmp);
+ 
+ for (i = 255; i >= 0; --i) {
+ oldColor = curColor;
+ curColor = SetPixel(memDC, 0, 0, RGB(i, i, i));
+ 
+ if (GetRValue(curColor) < GetRValue(oldColor)) ++R; 
+ if (GetGValue(curColor) < GetGValue(oldColor)) ++G;
+ if (GetBValue(curColor) < GetBValue(oldColor)) ++B;
+ }
+ 
+ DeleteObject(oldBmp);
+ DeleteObject(curBmp);
+ DeleteDC(scrDC);
+ DeleteDC(memDC);
+ 
+ return (R * G * B);
+}
+ 
+HICON GetIcon(short *icon) {
+ ICONINFO iInfo;
+ HDC hDC;
+ char mask[16*16];
+ int x, y, c, Depth;
+ 
+ hDC = CreateIC("DISPLAY",NULL,NULL,NULL);
+ Depth=GetDeviceCaps(hDC, BITSPIXEL);
+ DeleteDC(hDC);
+ 
+ if (Depth == 16) {
+ if (GetRGB() == (32 * 32 * 32)) 
+ Depth = 15;
+ }
+
+ for (y=0; y<16; y++) {
+ for (x=0; x<16; x++) {
+ c = icon[y*16+x];
+ if (Depth == 15 || Depth == 32)
+				c = ((c&0x001f) << 10) | 
+					((c&0x7c00) >> 10) | 
+					((c&0x03e0) );
+			else
+ c = ((c&0x001f) << 11) |
+					((c&0x7c00) >> 9) |
+					((c&0x03e0) << 1);
+
+ icon[y*16+x] = c;
+ }
+ } 
+
+ iInfo.fIcon = TRUE;
+ memset(mask, 0, 16*16);
+ iInfo.hbmMask = CreateBitmap(16, 16, 1, 1, mask);
+ iInfo.hbmColor = CreateBitmap(16, 16, 1, 16, icon); 
+ 
+ return CreateIconIndirect(&iInfo);
+}
+
+HICON hICON[2][3][15];
+int aIover[2]; 
+int ani[2];
+ 
+void LoadMcdItems(int mcd, int idc) {
+ HWND List = GetDlgItem(mcdDlg, idc);
+ LV_ITEM item;
+ HIMAGELIST iml = Iiml[mcd-1];
+ int i, j;
+ HICON hIcon;
+ McdBlock *Info;
+ 
+ aIover[mcd-1]=0;
+ ani[mcd-1]=0;
+ 
+ ListView_DeleteAllItems(List);
+
+ for (i=0; i<15; i++) {
+ 
+ item.mask = LVIF_TEXT | LVIF_IMAGE;
+ item.iItem = i;
+ item.iImage = i;
+ item.pszText = LPSTR_TEXTCALLBACK;
+ item.iSubItem = 0;
+ 
+ IconC[mcd-1][i] = 0;
+ Info = &Blocks[mcd-1][i];
+ 
+ if ((Info->Flags & 0xF) == 1 && Info->IconCount != 0) {
+ hIcon = GetIcon(Info->Icon); 
+ 
+ if (Info->IconCount > 1) {
+ for(j = 0; j < 3; j++)
+ hICON[mcd-1][j][i]=hIcon;
+ }
+ } else {
+ hIcon = eICON; 
+ }
+ 
+ ImageList_ReplaceIcon(iml, -1, hIcon);
+ ListView_InsertItem(List, &item);
+ } 
+}
+
+void UpdateMcdItems(int mcd, int idc) {
+ HWND List = GetDlgItem(mcdDlg, idc);
+ LV_ITEM item;
+ HIMAGELIST iml = Iiml[mcd-1];
+ int i, j;
+ McdBlock *Info;
+ HICON hIcon;
+ 
+ aIover[mcd-1]=0;
+ ani[mcd-1]=0;
+ 
+ for (i=0; i<15; i++) { 
+ 
+ item.mask = LVIF_TEXT | LVIF_IMAGE;
+ item.iItem = i;
+ item.iImage = i;
+ item.pszText = LPSTR_TEXTCALLBACK;
+ item.iSubItem = 0;
+ 
+ IconC[mcd-1][i] = 0; 
+ Info = &Blocks[mcd-1][i];
+ 
+ if ((Info->Flags & 0xF) == 1 && Info->IconCount != 0) {
+ hIcon = GetIcon(Info->Icon); 
+ 
+ if (Info->IconCount > 1) { 
+ for(j = 0; j < 3; j++)
+ hICON[mcd-1][j][i]=hIcon;
+ }
+ } else { 
+ hIcon = eICON; 
+ }
+ 
+ ImageList_ReplaceIcon(iml, i, hIcon);
+ ListView_SetItem(List, &item);
+ } 
+ ListView_Update(List, -1);
+}
+ 
+void McdListGetDispInfo(int mcd, int idc, LPNMHDR pnmh) {
+	LV_DISPINFO *lpdi = (LV_DISPINFO *)pnmh;
+	McdBlock *Info;
 	char buf[256];
-	static char buftitle[256];
-
-	Info = &Blocks[mcd - 1][lpdi->item.iItem];
-
-	switch (lpdi->item.iSubItem) {
-		case 0:
-			switch (Info->Flags & 0xF) {
-				case 1:
-					if (MultiByteToWideChar(932, 0, (LPCSTR)Info->sTitle, -1, (LPWSTR)buf, sizeof(buf)) == 0) {
-						lpdi->item.pszText = Info->Title;
-					} else if (WideCharToMultiByte(CP_ACP, 0, (LPCWSTR)buf, -1, (LPSTR)buftitle, sizeof(buftitle), NULL, NULL) == 0) {
-						lpdi->item.pszText = Info->Title;
-					} else {
-						lpdi->item.pszText = buftitle;
-					}
-					break;
-				case 2:
-					lpdi->item.pszText = _("mid link block");
-					break;
-				case 3:
-					lpdi->item.pszText = _("terminiting link block");
-					break;
-			}
-			break;
-		case 1:
-			if ((Info->Flags & 0xF0) == 0xA0) {
-				if ((Info->Flags & 0xF) >= 1 &&
-					(Info->Flags & 0xF) <= 3) {
-					lpdi->item.pszText = _("Deleted");
-				} else lpdi->item.pszText = _("Free");
-			} else if ((Info->Flags & 0xF0) == 0x50)
-				lpdi->item.pszText = _("Used");
-			else { lpdi->item.pszText = _("Free"); }
-			break;
-		case 2:
-			if((Info->Flags & 0xF)==1)
-				lpdi->item.pszText = Info->ID;
-			break;
-		case 3:
-			if((Info->Flags & 0xF)==1)
-				lpdi->item.pszText = Info->Name;
-			break;
-	}
-}
-
-void McdListNotify(int mcd, int idc, LPNMHDR pnmh) {
-	switch (pnmh->code) {
-		case LVN_GETDISPINFO: McdListGetDispInfo(mcd, idc, pnmh); break;
-	}
-}
-
-void UpdateMcdDlg() {
-	int i;
-
-	for (i=1; i<16; i++) GetMcdBlockInfo(1, i, &Blocks[0][i-1]);
-	for (i=1; i<16; i++) GetMcdBlockInfo(2, i, &Blocks[1][i-1]);
-	UpdateMcdItems(1, IDC_LIST1);
-	UpdateMcdItems(2, IDC_LIST2);
-}
-
-void LoadMcdDlg() {
-	int i;
-
-	for (i=1; i<16; i++) GetMcdBlockInfo(1, i, &Blocks[0][i-1]);
-	for (i=1; i<16; i++) GetMcdBlockInfo(2, i, &Blocks[1][i-1]);
-	LoadMcdItems(1, IDC_LIST1);
-	LoadMcdItems(2, IDC_LIST2);
-}
-
-void UpdateMcdIcon(int mcd, int idc) {
- HWND List = GetDlgItem(mcdDlg, idc);
- HIMAGELIST iml = Iiml[mcd-1];
- int i;
- McdBlock *Info;
- int *count; 
- 
- if(!aIover[mcd-1]) {
- ani[mcd-1]++; 
- 
- for (i=0; i<15; i++) {
- Info = &Blocks[mcd-1][i];
- count = &IconC[mcd-1][i];
- 
- if ((Info->Flags & 0xF) != 1) continue;
- if (Info->IconCount <= 1) continue;
- 
- if (*count < Info->IconCount) {
- (*count)++;
- aIover[mcd-1]=0;
- 
- if(ani[mcd-1] <= (Info->IconCount-1)) // last frame and below...
- hICON[mcd-1][ani[mcd-1]][i] = GetIcon(&Info->Icon[(*count)*16*16]);
- } else {
- aIover[mcd-1]=1;
- }
- }
-
- } else { 
- 
- if (ani[mcd-1] > 1) ani[mcd-1] = 0; // 1st frame
- else ani[mcd-1]++; // 2nd, 3rd frame
- 
- for(i=0;i<15;i++) {
- Info = &Blocks[mcd-1][i];
- 
- if (((Info->Flags & 0xF) == 1) && (Info->IconCount > 1))
- ImageList_ReplaceIcon(iml, i, hICON[mcd-1][ani[mcd-1]][i]);
- }
- InvalidateRect(List, NULL, FALSE);
- }
-}
-
-static int copy = 0, copymcd = 0;
-//static int listsel = 0;
-
-BOOL CALLBACK ConfigureMcdsDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) {
-	char str[256];
-	LPBYTE lpAND, lpXOR;
-	LPBYTE lpA, lpX;
-	int i, j;
-
-	switch(uMsg) {
-		case WM_INITDIALOG:
-			mcdDlg = hW;
-
-			SetWindowText(hW, _("Memcard Manager"));
-
-			Button_SetText(GetDlgItem(hW, IDOK), _("OK"));
-			Button_SetText(GetDlgItem(hW, IDCANCEL), _("Cancel"));
-			Button_SetText(GetDlgItem(hW, IDC_MCDSEL1), _("Select Mcd"));
-			Button_SetText(GetDlgItem(hW, IDC_FORMAT1), _("Format Mcd"));
-			Button_SetText(GetDlgItem(hW, IDC_RELOAD1), _("Reload Mcd"));
-			Button_SetText(GetDlgItem(hW, IDC_MCDSEL2), _("Select Mcd"));
-			Button_SetText(GetDlgItem(hW, IDC_FORMAT2), _("Format Mcd"));
-			Button_SetText(GetDlgItem(hW, IDC_RELOAD2), _("Reload Mcd"));
-			Button_SetText(GetDlgItem(hW, IDC_COPYTO2), _("-> Copy ->"));
-			Button_SetText(GetDlgItem(hW, IDC_COPYTO1), _("<- Copy <-"));
-			Button_SetText(GetDlgItem(hW, IDC_PASTE), _("Paste"));
-			Button_SetText(GetDlgItem(hW, IDC_DELETE1), _("<- Un/Delete"));
-			Button_SetText(GetDlgItem(hW, IDC_DELETE2), _("Un/Delete ->"));
- 
-			Static_SetText(GetDlgItem(hW, IDC_FRAMEMCD1), _("Memory Card 1"));
-			Static_SetText(GetDlgItem(hW, IDC_FRAMEMCD2), _("Memory Card 2"));
-
-			lpA=lpAND=(LPBYTE)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,(16*16));
-			lpX=lpXOR=(LPBYTE)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,(16*16));
-
-			for(i=0;i<16;i++)
-			{
-				for(j=0;j<16;j++)
-				{
-					*lpA++=0xff;
-					*lpX++=0;
-				}
-			}
-			eICON=CreateIcon(gApp.hInstance,16,16,1,1,lpAND,lpXOR);
-
-			HeapFree(GetProcessHeap(),0,lpAND);
-			HeapFree(GetProcessHeap(),0,lpXOR);
-
-			if (!strlen(Config.Mcd1)) strcpy(Config.Mcd1, "memcards\\Mcd001.mcr");
-			if (!strlen(Config.Mcd2)) strcpy(Config.Mcd2, "memcards\\Mcd002.mcr");
-			Edit_SetText(GetDlgItem(hW,IDC_MCD1), Config.Mcd1);
-			Edit_SetText(GetDlgItem(hW,IDC_MCD2), Config.Mcd2);
-
-			CreateListView(IDC_LIST1);
-			CreateListView(IDC_LIST2);
- 
- Iiml[0] = ImageList_Create(16, 16, ILC_COLOR16, 0, 0);
- Iiml[1] = ImageList_Create(16, 16, ILC_COLOR16, 0, 0);
- 
- ListView_SetImageList(GetDlgItem(mcdDlg, IDC_LIST1), Iiml[0], LVSIL_SMALL);
- ListView_SetImageList(GetDlgItem(mcdDlg, IDC_LIST2), Iiml[1], LVSIL_SMALL);
-
-			Button_Enable(GetDlgItem(hW, IDC_PASTE), FALSE);
-
-			LoadMcdDlg();
-
-			SetTimer(hW, 1, 250, NULL);
-
-			return TRUE;
-
-		case WM_COMMAND:
-			switch (LOWORD(wParam)) {
-				case IDC_COPYTO1:
-					copy = ListView_GetSelectionMark(GetDlgItem(mcdDlg, IDC_LIST2));
-					copymcd = 1;
-
-					Button_Enable(GetDlgItem(hW, IDC_PASTE), TRUE);
-					return TRUE;
-				case IDC_COPYTO2:
-					copy = ListView_GetSelectionMark(GetDlgItem(mcdDlg, IDC_LIST1));
-					copymcd = 2;
-
-					Button_Enable(GetDlgItem(hW, IDC_PASTE), TRUE);
-					return TRUE;
-				case IDC_PASTE:
-					if (MessageBox(hW, _("Are you sure you want to paste this selection?"), _("Confirmation"), MB_YESNO) == IDNO) return TRUE;
-
-					if (copymcd == 1) {
-						Edit_GetText(GetDlgItem(hW,IDC_MCD1), str, 256);
-						i = ListView_GetSelectionMark(GetDlgItem(mcdDlg, IDC_LIST1));
-
-						// save dir data + save data
-						memcpy(Mcd1Data + (i+1) * 128, Mcd2Data + (copy+1) * 128, 128);
-						SaveMcd(str, Mcd1Data, (i+1) * 128, 128);
-						memcpy(Mcd1Data + (i+1) * 1024 * 8, Mcd2Data + (copy+1) * 1024 * 8, 1024 * 8);
-						SaveMcd(str, Mcd1Data, (i+1) * 1024 * 8, 1024 * 8);
-					} else { // 2
-						Edit_GetText(GetDlgItem(hW,IDC_MCD2), str, 256);
-						i = ListView_GetSelectionMark(GetDlgItem(mcdDlg, IDC_LIST2));
-
-						// save dir data + save data
-						memcpy(Mcd2Data + (i+1) * 128, Mcd1Data + (copy+1) * 128, 128);
-						SaveMcd(str, Mcd2Data, (i+1) * 128, 128);
-						memcpy(Mcd2Data + (i+1) * 1024 * 8, Mcd1Data + (copy+1) * 1024 * 8, 1024 * 8);
-						SaveMcd(str, Mcd2Data, (i+1) * 1024 * 8, 1024 * 8);
-					}
-
-					UpdateMcdDlg();
-
-					return TRUE;
-				case IDC_DELETE1:
-				{
-					McdBlock *Info;
-					int mcd = 1;
-					int i, xor = 0, j;
-					unsigned char *data, *ptr;
-
-					Edit_GetText(GetDlgItem(hW,IDC_MCD1), str, 256);
-					i = ListView_GetSelectionMark(GetDlgItem(mcdDlg, IDC_LIST1));
-					data = Mcd1Data;
-
-					i++;
-
-					ptr = data + i * 128;
-
-					Info = &Blocks[mcd-1][i-1];
-
-					if ((Info->Flags & 0xF0) == 0xA0) {
-						if ((Info->Flags & 0xF) >= 1 &&
-							(Info->Flags & 0xF) <= 3) { // deleted
-							*ptr = 0x50 | (Info->Flags & 0xF);
-						} else return TRUE;
-					} else if ((Info->Flags & 0xF0) == 0x50) { // used
-						*ptr = 0xA0 | (Info->Flags & 0xF);
-					} else { return TRUE; }
-
-					for (j=0; j<127; j++) xor^=*ptr++;
-					*ptr = xor;
-
-					SaveMcd(str, data, i * 128, 128);
-					UpdateMcdDlg();
-				}
-
-					return TRUE;
-				case IDC_DELETE2:
-				{
-					McdBlock *Info;
-					int mcd = 2;
-					int i, xor = 0, j;
-					unsigned char *data, *ptr;
-
-					Edit_GetText(GetDlgItem(hW,IDC_MCD2), str, 256);
-					i = ListView_GetSelectionMark(GetDlgItem(mcdDlg, IDC_LIST2));
-					data = Mcd2Data;
-
-					i++;
-
-					ptr = data + i * 128;
-
-					Info = &Blocks[mcd-1][i-1];
-
-					if ((Info->Flags & 0xF0) == 0xA0) {
-						if ((Info->Flags & 0xF) >= 1 &&
-							(Info->Flags & 0xF) <= 3) { // deleted
-							*ptr = 0x50 | (Info->Flags & 0xF);
-						} else return TRUE;
-					} else if ((Info->Flags & 0xF0) == 0x50) { // used
-						*ptr = 0xA0 | (Info->Flags & 0xF);
-					} else { return TRUE; }
-
-					for (j=0; j<127; j++) xor^=*ptr++;
-					*ptr = xor;
-
-					SaveMcd(str, data, i * 128, 128);
-					UpdateMcdDlg();
-				}
-
-					return TRUE;
-
-				case IDC_MCDSEL1: 
-					Open_Mcd_Proc(hW, 1); 
-					return TRUE;
-				case IDC_MCDSEL2: 
-					Open_Mcd_Proc(hW, 2); 
-					return TRUE;
-				case IDC_RELOAD1: 
-					Edit_GetText(GetDlgItem(hW,IDC_MCD1), str, 256);
-					LoadMcd(1, str);
-					UpdateMcdDlg();
-					return TRUE;
-				case IDC_RELOAD2: 
-					Edit_GetText(GetDlgItem(hW,IDC_MCD2), str, 256);
-					LoadMcd(2, str);
-					UpdateMcdDlg();
-					return TRUE;
-				case IDC_FORMAT1:
-					if (MessageBox(hW, _("Are you sure you want to format this Memory Card?"), _("Confirmation"), MB_YESNO) == IDNO) return TRUE;
-					Edit_GetText(GetDlgItem(hW,IDC_MCD1), str, 256);
-					CreateMcd(str);
-					LoadMcd(1, str);
-					UpdateMcdDlg();
-					return TRUE;
-				case IDC_FORMAT2:
-					if (MessageBox(hW, _("Are you sure you want to format this Memory Card?"), _("Confirmation"), MB_YESNO) == IDNO) return TRUE;
-					Edit_GetText(GetDlgItem(hW,IDC_MCD2), str, 256);
-					CreateMcd(str);
-					LoadMcd(2, str);
-					UpdateMcdDlg();
-					return TRUE;
- 			case IDCANCEL:
-					LoadMcds(Config.Mcd1, Config.Mcd2);
-
-					EndDialog(hW,FALSE);
-
-					return TRUE;
- 			case IDOK:
-					Edit_GetText(GetDlgItem(hW,IDC_MCD1), Config.Mcd1, 256);
-					Edit_GetText(GetDlgItem(hW,IDC_MCD2), Config.Mcd2, 256);
-
-					LoadMcds(Config.Mcd1, Config.Mcd2);
-					SaveConfig();
-
-					EndDialog(hW,TRUE);
-
-					return TRUE;
-			}
-		case WM_NOTIFY:
-			switch (wParam) {
-				case IDC_LIST1: McdListNotify(1, IDC_LIST1, (LPNMHDR)lParam); break;
-				case IDC_LIST2: McdListNotify(2, IDC_LIST2, (LPNMHDR)lParam); break;
-			}
-			return TRUE;
-		case WM_TIMER:
-			UpdateMcdIcon(1, IDC_LIST1);
-			UpdateMcdIcon(2, IDC_LIST2);
-			return TRUE;
-		case WM_DESTROY:
-			DestroyIcon(eICON);
-			//KillTimer(hW, 1);
-			return TRUE;
-	}
-	return FALSE;
-}
-
-BOOL CALLBACK ConfigureCpuDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) {
-	long tmp;
-
-	switch(uMsg) {
-		case WM_INITDIALOG:
-			SetWindowText(hW, _("Cpu Config"));
-
-			Button_SetText(GetDlgItem(hW,IDOK), _("OK"));
-			Button_SetText(GetDlgItem(hW,IDCANCEL), _("Cancel"));
-
-			Button_SetText(GetDlgItem(hW,IDC_XA), _("Disable Xa Decoding"));
-			Button_SetText(GetDlgItem(hW,IDC_SIO), _("Sio Irq Always Enabled"));
-			Button_SetText(GetDlgItem(hW,IDC_MDEC), _("Black && White Movies"));
-			Button_SetText(GetDlgItem(hW,IDC_CDDA), _("Disable Cd audio"));
-			Button_SetText(GetDlgItem(hW,IDC_PSXAUTO), _("Autodetect"));
-			Button_SetText(GetDlgItem(hW,IDC_CPU), _("Enable Interpreter Cpu"));
-			Button_SetText(GetDlgItem(hW,IDC_PSXOUT), _("Enable Console Output"));
-			Button_SetText(GetDlgItem(hW,IDC_DEBUG), _("Enable Debugger"));
-			Button_SetText(GetDlgItem(hW,IDC_SPUIRQ), _("Spu Irq Always Enabled"));
-			Button_SetText(GetDlgItem(hW,IDC_RCNTFIX), _("Parasite Eve 2, Vandal Hearts 1/2 Fix"));
-			Button_SetText(GetDlgItem(hW,IDC_VSYNCWA), _("InuYasha Sengoku Battle Fix"));
-
-			Static_SetText(GetDlgItem(hW,IDC_MISCOPT), _("Options"));
-			Static_SetText(GetDlgItem(hW,IDC_SELPSX), _("Psx System Type"));
-
-			Button_SetCheck(GetDlgItem(hW,IDC_XA), Config.Xa);
-			Button_SetCheck(GetDlgItem(hW,IDC_SIO), Config.Sio);
-			Button_SetCheck(GetDlgItem(hW,IDC_MDEC), Config.Mdec);
-			Button_SetCheck(GetDlgItem(hW,IDC_CDDA), Config.Cdda);
-	 		Button_SetCheck(GetDlgItem(hW,IDC_PSXAUTO), Config.PsxAuto);
-	 		Button_SetCheck(GetDlgItem(hW,IDC_CPU), (Config.Cpu == CPU_INTERPRETER));
-	 		Button_SetCheck(GetDlgItem(hW,IDC_PSXOUT), Config.PsxOut);
-			Button_SetCheck(GetDlgItem(hW,IDC_DEBUG), Config.Debug);
-	 		Button_SetCheck(GetDlgItem(hW,IDC_SPUIRQ), Config.SpuIrq);
-	 		Button_SetCheck(GetDlgItem(hW,IDC_RCNTFIX), Config.RCntFix);
-	 		Button_SetCheck(GetDlgItem(hW,IDC_VSYNCWA), Config.VSyncWA);
-	 		ComboBox_AddString(GetDlgItem(hW,IDC_PSXTYPES), "NTSC");
-	 		ComboBox_AddString(GetDlgItem(hW,IDC_PSXTYPES), "PAL");
-	 		ComboBox_SetCurSel(GetDlgItem(hW,IDC_PSXTYPES),Config.PsxType);
-
-			if (Config.Cpu == CPU_DYNAREC) {
-				Config.Debug = 0;
-				Button_SetCheck(GetDlgItem(hW, IDC_DEBUG), FALSE);
-				EnableWindow(GetDlgItem(hW, IDC_DEBUG), FALSE);
-			}
-
-			EnableWindow(GetDlgItem(hW,IDC_PSXTYPES), !Config.PsxAuto);
-			break;
-
-		case WM_COMMAND: {
-			switch (LOWORD(wParam)) {
- 			case IDCANCEL: EndDialog(hW, FALSE); return TRUE;
- 		case IDOK:
-					tmp = ComboBox_GetCurSel(GetDlgItem(hW,IDC_PSXTYPES));
-					if (tmp == 0) Config.PsxType = 0;
-					else Config.PsxType = 1;
-
-					Config.Xa = Button_GetCheck(GetDlgItem(hW,IDC_XA));
-					Config.Sio = Button_GetCheck(GetDlgItem(hW,IDC_SIO));
-					Config.Mdec = Button_GetCheck(GetDlgItem(hW,IDC_MDEC));
-					Config.Cdda = Button_GetCheck(GetDlgItem(hW,IDC_CDDA));
-					Config.PsxAuto = Button_GetCheck(GetDlgItem(hW,IDC_PSXAUTO));
-					tmp = Config.Cpu;
-					Config.Cpu = (Button_GetCheck(GetDlgItem(hW,IDC_CPU)) ? CPU_INTERPRETER : CPU_DYNAREC);
-					if (tmp != Config.Cpu) {
-						psxCpu->Shutdown();
-						if (Config.Cpu == CPU_INTERPRETER) psxCpu = &psxInt;
-						else psxCpu = &psxRec;
-						if (psxCpu->Init() == -1) {
-							SysClose();
-							exit(1);
-						}
-						psxCpu->Reset();
-					}
-					Config.PsxOut = Button_GetCheck(GetDlgItem(hW,IDC_PSXOUT));
-					Config.SpuIrq = Button_GetCheck(GetDlgItem(hW,IDC_SPUIRQ));
-					Config.RCntFix = Button_GetCheck(GetDlgItem(hW,IDC_RCNTFIX));
-					Config.VSyncWA = Button_GetCheck(GetDlgItem(hW,IDC_VSYNCWA));
-					tmp = Config.Debug;
-					Config.Debug = Button_GetCheck(GetDlgItem(hW,IDC_DEBUG));
-					if (tmp != Config.Debug) {
-						if (Config.Debug) StartDebugger();
-						else StopDebugger();
-					}
-
-					SaveConfig();
-
-					EndDialog(hW,TRUE);
-
-					if (Config.PsxOut) OpenConsole();
-					else CloseConsole();
-
-					return TRUE;
-
-				case IDC_CPU:
-					if (Button_GetCheck(GetDlgItem(hW,IDC_CPU))) {
-						EnableWindow(GetDlgItem(hW,IDC_DEBUG), TRUE);
-					} else {
-						Button_SetCheck(GetDlgItem(hW,IDC_DEBUG), FALSE);
-						EnableWindow(GetDlgItem(hW,IDC_DEBUG), FALSE);
-					}
-					break;
-
-				case IDC_PSXAUTO:
-					if (Button_GetCheck(GetDlgItem(hW,IDC_PSXAUTO))) {
-						EnableWindow(GetDlgItem(hW,IDC_PSXTYPES), FALSE);
-					} else {
-						EnableWindow(GetDlgItem(hW,IDC_PSXTYPES), TRUE);
-					}
-					break;
-			}
-		}
-	}
-	return FALSE;
-}
-
-void Open_Mcd_Proc(HWND hW, int mcd) {
-	OPENFILENAME ofn;
-	char szFileName[MAXPATHLEN];
-	char szFileTitle[MAXPATHLEN];
-	char szFilter[1024];
-	char *str;
-
-	memset(&szFileName, 0, sizeof(szFileName));
-	memset(&szFileTitle, 0, sizeof(szFileTitle));
-	memset(&szFilter, 0, sizeof(szFilter));
-
-	strcpy(szFilter, _("Psx Mcd Format (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"));
-	str = szFilter + strlen(szFilter) + 1; 
-	strcpy(str, "*.mcr;*.mcd;*.mem;*.gme;*.mc;*.ddf");
-
-	str+= strlen(str) + 1;
-	strcpy(str, _("Psx Memory Card (*.mcr;*.mc)"));
-	str+= strlen(str) + 1;
-	strcpy(str, "*.mcr;0*.mc");
-
-	str+= strlen(str) + 1;
-	strcpy(str, _("CVGS Memory Card (*.mem;*.vgs)"));
-	str+= strlen(str) + 1;
-	strcpy(str, "*.mem;*.vgs");
-
-	str+= strlen(str) + 1;
-	strcpy(str, _("Bleem Memory Card (*.mcd)"));
-	str+= strlen(str) + 1;
-	strcpy(str, "*.mcd");
-
-	str+= strlen(str) + 1;
-	strcpy(str, _("DexDrive Memory Card (*.gme)"));
-	str+= strlen(str) + 1;
-	strcpy(str, "*.gme");
-
-	str+= strlen(str) + 1;
-	strcpy(str, _("DataDeck Memory Card (*.ddf)"));
-	str+= strlen(str) + 1;
-	strcpy(str, "*.ddf");
-
-	str+= strlen(str) + 1;
-	strcpy(str, _("All Files"));
-	str+= strlen(str) + 1;
-	strcpy(str, "*.*");
-
- ofn.lStructSize			= sizeof(OPENFILENAME);
- ofn.hwndOwner			= hW;
- ofn.lpstrFilter			= szFilter;
-	ofn.lpstrCustomFilter	= NULL;
- ofn.nMaxCustFilter		= 0;
- ofn.nFilterIndex		= 1;
- ofn.lpstrFile			= szFileName;
- ofn.nMaxFile			= MAXPATHLEN;
- ofn.lpstrInitialDir		= "memcards";
- ofn.lpstrFileTitle		= szFileTitle;
- ofn.nMaxFileTitle		= MAXPATHLEN;
- ofn.lpstrTitle			= NULL;
- ofn.lpstrDefExt			= "MCR";
- ofn.Flags				= OFN_HIDEREADONLY | OFN_NOCHANGEDIR;
-
-	if (GetOpenFileName ((LPOPENFILENAME)&ofn)) {
-		Edit_SetText(GetDlgItem(hW,mcd == 1 ? IDC_MCD1 : IDC_MCD2), szFileName);
-		LoadMcd(mcd, szFileName);
-		UpdateMcdDlg();
-	}
-}
-
-int Open_File_Proc(char *file) {
-	OPENFILENAME ofn;
-	char szFileName[MAXPATHLEN];
-	char szFileTitle[MAXPATHLEN];
-	char szFilter[256];
-
-	memset(&szFileName, 0, sizeof(szFileName));
-	memset(&szFileTitle, 0, sizeof(szFileTitle));
-	memset(&szFilter, 0, sizeof(szFilter));
-
- ofn.lStructSize			= sizeof(OPENFILENAME);
- ofn.hwndOwner			= gApp.hWnd;
-
-	strcpy(szFilter, _("Psx Exe Format"));
-	strcatz(szFilter, "*.*");
-
- ofn.lpstrFilter			= szFilter;
-	ofn.lpstrCustomFilter	= NULL;
- ofn.nMaxCustFilter		= 0;
- ofn.nFilterIndex		= 1;
- ofn.lpstrFile			= szFileName;
- ofn.nMaxFile			= MAXPATHLEN;
- ofn.lpstrInitialDir		= NULL;
- ofn.lpstrFileTitle		= szFileTitle;
- ofn.nMaxFileTitle		= MAXPATHLEN;
- ofn.lpstrTitle			= NULL;
- ofn.lpstrDefExt			= "EXE";
- ofn.Flags				= OFN_HIDEREADONLY | OFN_NOCHANGEDIR;
-
-	if (GetOpenFileName ((LPOPENFILENAME)&ofn)) {
-		strcpy(file, szFileName);
-		return 1;
-	} else
-		return 0;
-}
-
-int Open_Iso_Proc(char *file) {
-	OPENFILENAME ofn;
-	char szFileName[MAXPATHLEN];
-	char szFileTitle[MAXPATHLEN];
-	char szFilter[256];
-	char *str;
-
-	memset(&szFileName, 0, sizeof(szFileName));
-	memset(&szFileTitle, 0, sizeof(szFileTitle));
-	memset(&szFilter, 0, sizeof(szFilter));
-
- ofn.lStructSize			= sizeof(OPENFILENAME);
- ofn.hwndOwner			= gApp.hWnd;
-
-	strcpy(szFilter, _("Psx Isos (*.iso;*.mdf;*.img;*.bin)"));
-	str = szFilter + strlen(szFilter) + 1; 
-	strcpy(str, "*.iso;*.mdf;*.img;*.bin");
-
-	str += strlen(str) + 1;
-	strcpy(str, _("All Files"));
-	str += strlen(str) + 1;
-	strcpy(str, "*.*");
-
- ofn.lpstrFilter			= szFilter;
-	ofn.lpstrCustomFilter	= NULL;
- ofn.nMaxCustFilter		= 0;
- ofn.nFilterIndex		= 1;
- ofn.lpstrFile			= szFileName;
- ofn.nMaxFile			= MAXPATHLEN;
- ofn.lpstrInitialDir		= NULL;
- ofn.lpstrFileTitle		= szFileTitle;
- ofn.nMaxFileTitle		= MAXPATHLEN;
- ofn.lpstrTitle			= NULL;
- ofn.lpstrDefExt			= "ISO";
- ofn.Flags				= OFN_HIDEREADONLY | OFN_NOCHANGEDIR;
-
-	if (GetOpenFileName ((LPOPENFILENAME)&ofn)) {
-		strcpy(file, szFileName);
-		return 1;
-	} else
-		return 0;
-}
-
-#define _ADDSUBMENU(menu, menun, string) \
-	submenu[menun] = CreatePopupMenu(); \
-	AppendMenu(menu, MF_STRING | MF_POPUP, (UINT)submenu[menun], string);
-
-#define ADDSUBMENU(menun, string) \
-	_ADDSUBMENU(gApp.hMenu, menun, string);
-
-#define ADDSUBMENUS(submn, menun, string) \
-	submenu[menun] = CreatePopupMenu(); \
-	InsertMenu(submenu[submn], 0, MF_BYPOSITION | MF_STRING | MF_POPUP, (UINT)submenu[menun], string);
-
-#define ADDMENUITEM(menun, string, id) \
-	item.fType = MFT_STRING; \
-	item.fMask = MIIM_STATE | MIIM_TYPE | MIIM_ID; \
-	item.fState = MFS_ENABLED; \
-	item.wID = id; \
-	sprintf(buf, string); \
-	InsertMenuItem(submenu[menun], 0, TRUE, &item);
-
-#define ADDMENUITEMC(menun, string, id) \
-	item.fType = MFT_STRING; \
-	item.fMask = MIIM_STATE | MIIM_TYPE | MIIM_ID; \
-	item.fState = MFS_ENABLED | MFS_CHECKED; \
-	item.wID = id; \
-	sprintf(buf, string); \
-	InsertMenuItem(submenu[menun], 0, TRUE, &item);
-
-#define ADDSEPARATOR(menun) \
-	item.fMask = MIIM_TYPE; \
-	item.fType = MFT_SEPARATOR; \
-	InsertMenuItem(submenu[menun], 0, TRUE, &item);
-
-void CreateMainMenu() {
-	MENUITEMINFO item;
-	HMENU submenu[256];
-	char buf[256];
-#ifdef ENABLE_NLS
-	char *lang;
-	int i;
-#endif
-
-	item.cbSize = sizeof(MENUITEMINFO);
-	item.dwTypeData = buf;
-	item.cch = 256;
-
-	gApp.hMenu = CreateMenu();
-
-	ADDSUBMENU(0, _("&File"));
-	ADDMENUITEM(0, _("E&xit"), ID_FILE_EXIT);
-	ADDSEPARATOR(0);
-	ADDMENUITEM(0, _("Run &EXE..."), ID_FILE_RUN_EXE);
-	ADDMENUITEM(0, _("Run &BIOS"), ID_FILE_RUNBIOS);
-	ADDMENUITEM(0, _("Run &ISO..."), ID_FILE_RUN_ISO);
-	ADDMENUITEM(0, _("Run &CD"), ID_FILE_RUN_CD);
-
-	ADDSUBMENU(0, _("&Emulator"));
-	ADDSUBMENUS(0, 1, _("&States"));
-	ADDSEPARATOR(0);
-	ADDMENUITEM(0, _("S&witch ISO..."), ID_EMULATOR_SWITCH_ISO);
-	ADDSEPARATOR(0);
-	ADDMENUITEM(0, _("Re&set"), ID_EMULATOR_RESET);
-	ADDMENUITEM(0, _("&Run"), ID_EMULATOR_RUN);
-	ADDSUBMENUS(1, 3, _("&Save"));
-	ADDSUBMENUS(1, 2, _("&Load"));
-	ADDMENUITEM(2, _("&Other..."), ID_FILE_STATES_LOAD_OTHER);
-	ADDMENUITEM(2, _("Slot &5"), ID_FILE_STATES_LOAD_SLOT5);
-	ADDMENUITEM(2, _("Slot &4"), ID_FILE_STATES_LOAD_SLOT4);
-	ADDMENUITEM(2, _("Slot &3"), ID_FILE_STATES_LOAD_SLOT3);
-	ADDMENUITEM(2, _("Slot &2"), ID_FILE_STATES_LOAD_SLOT2);
-	ADDMENUITEM(2, _("Slot &1"), ID_FILE_STATES_LOAD_SLOT1);
-	ADDMENUITEM(3, _("&Other..."), ID_FILE_STATES_SAVE_OTHER);
-	ADDMENUITEM(3, _("Slot &5"), ID_FILE_STATES_SAVE_SLOT5);
-	ADDMENUITEM(3, _("Slot &4"), ID_FILE_STATES_SAVE_SLOT4);
-	ADDMENUITEM(3, _("Slot &3"), ID_FILE_STATES_SAVE_SLOT3);
-	ADDMENUITEM(3, _("Slot &2"), ID_FILE_STATES_SAVE_SLOT2);
-	ADDMENUITEM(3, _("Slot &1"), ID_FILE_STATES_SAVE_SLOT1);
-
-	ADDSUBMENU(0, _("&Configuration"));
-	ADDMENUITEM(0, _("Cheat &Search..."), ID_CONFIGURATION_CHEATSEARCH);
-	ADDMENUITEM(0, _("Ch&eat Code..."), ID_CONFIGURATION_CHEATLIST);
-	ADDSEPARATOR(0);
-#ifdef ENABLE_NLS
-	ADDSUBMENUS(0, 1, _("&Language"));
-
-	if (langs != langs) free(langs);
-	langs = (_langs*)malloc(sizeof(_langs));
-	strcpy(langs[0].lang, "English");
-	InitLanguages(); i=1;
-	while ((lang = GetLanguageNext()) != NULL) {
-		langs = (_langs*)realloc(langs, sizeof(_langs)*(i+1));
-		strcpy(langs[i].lang, lang);
-		if (!strcmp(Config.Lang, lang)) {
-			ADDMENUITEMC(1, ParseLang(langs[i].lang), ID_LANGS + i);
-		} else {
-			ADDMENUITEM(1, ParseLang(langs[i].lang), ID_LANGS + i);
-		}
-		i++;
-	}
-	CloseLanguages();
-	langsMax = i;
-	if (!strcmp(Config.Lang, "English")) {
-		ADDMENUITEMC(1, _("English"), ID_LANGS);
-	} else {
-		ADDMENUITEM(1, _("English"), ID_LANGS);
-	}
-	ADDSEPARATOR(0);
-#endif
-	ADDMENUITEM(0, _("&Memory cards..."), ID_CONFIGURATION_MEMORYCARDMANAGER);
-	ADDMENUITEM(0, _("C&PU..."), ID_CONFIGURATION_CPU);
-	ADDSEPARATOR(0);
-	ADDMENUITEM(0, _("&NetPlay..."), ID_CONFIGURATION_NETPLAY);
-	ADDSEPARATOR(0);
-	ADDMENUITEM(0, _("&Controllers..."), ID_CONFIGURATION_CONTROLLERS);
-	ADDMENUITEM(0, _("CD-&ROM..."), ID_CONFIGURATION_CDROM);
-	ADDMENUITEM(0, _("&Sound..."), ID_CONFIGURATION_SOUND);
-	ADDMENUITEM(0, _("&Graphics..."), ID_CONFIGURATION_GRAPHICS);
-	ADDSEPARATOR(0);
-	ADDMENUITEM(0, _("&Plugins && Bios..."), ID_CONFIGURATION);
-
-	ADDSUBMENU(0, _("&Help"));
-	ADDMENUITEM(0, _("&About..."), ID_HELP_ABOUT);
-
-	if (CdromId[0] != '\0') {
-		EnableMenuItem(gApp.hMenu, ID_CONFIGURATION_NETPLAY, MF_BYCOMMAND | MF_GRAYED);
-		EnableMenuItem(gApp.hMenu, ID_CONFIGURATION_CONTROLLERS, MF_BYCOMMAND | MF_GRAYED);
-		EnableMenuItem(gApp.hMenu, ID_CONFIGURATION_CDROM, MF_BYCOMMAND | MF_GRAYED);
-		EnableMenuItem(gApp.hMenu, ID_CONFIGURATION_SOUND, MF_BYCOMMAND | MF_GRAYED);
-		EnableMenuItem(gApp.hMenu, ID_CONFIGURATION_GRAPHICS, MF_BYCOMMAND | MF_GRAYED);
-		EnableMenuItem(gApp.hMenu, ID_CONFIGURATION, MF_BYCOMMAND | MF_GRAYED);
-		if (!UsingIso()) {
-			EnableMenuItem(gApp.hMenu, ID_EMULATOR_SWITCH_ISO, MF_BYCOMMAND | MF_GRAYED);
-		}
-	} else {
-		EnableMenuItem(gApp.hMenu, ID_EMULATOR_RESET, MF_BYCOMMAND | MF_GRAYED);
-		EnableMenuItem(gApp.hMenu, ID_EMULATOR_RUN, MF_BYCOMMAND | MF_GRAYED);
-		EnableMenuItem(gApp.hMenu, ID_EMULATOR_SWITCH_ISO, MF_BYCOMMAND | MF_GRAYED);
-		EnableMenuItem(gApp.hMenu, ID_FILE_STATES_LOAD_SLOT1, MF_BYCOMMAND | MF_GRAYED);
-		EnableMenuItem(gApp.hMenu, ID_FILE_STATES_LOAD_SLOT2, MF_BYCOMMAND | MF_GRAYED);
-		EnableMenuItem(gApp.hMenu, ID_FILE_STATES_LOAD_SLOT3, MF_BYCOMMAND | MF_GRAYED);
-		EnableMenuItem(gApp.hMenu, ID_FILE_STATES_LOAD_SLOT4, MF_BYCOMMAND | MF_GRAYED);
-		EnableMenuItem(gApp.hMenu, ID_FILE_STATES_LOAD_SLOT5, MF_BYCOMMAND | MF_GRAYED);
-		EnableMenuItem(gApp.hMenu, ID_FILE_STATES_LOAD_OTHER, MF_BYCOMMAND | MF_GRAYED);
-		EnableMenuItem(gApp.hMenu, ID_FILE_STATES_SAVE_SLOT1, MF_BYCOMMAND | MF_GRAYED);
-		EnableMenuItem(gApp.hMenu, ID_FILE_STATES_SAVE_SLOT2, MF_BYCOMMAND | MF_GRAYED);
-		EnableMenuItem(gApp.hMenu, ID_FILE_STATES_SAVE_SLOT3, MF_BYCOMMAND | MF_GRAYED);
-		EnableMenuItem(gApp.hMenu, ID_FILE_STATES_SAVE_SLOT4, MF_BYCOMMAND | MF_GRAYED);
-		EnableMenuItem(gApp.hMenu, ID_FILE_STATES_SAVE_SLOT5, MF_BYCOMMAND | MF_GRAYED);
-		EnableMenuItem(gApp.hMenu, ID_FILE_STATES_SAVE_OTHER, MF_BYCOMMAND | MF_GRAYED);
-		EnableMenuItem(gApp.hMenu, ID_CONFIGURATION_CHEATSEARCH, MF_BYCOMMAND | MF_GRAYED);
-	}
-}
-
-void CreateMainWindow(int nCmdShow) {
-	WNDCLASS wc;
-	HWND hWnd;
-
-	wc.lpszClassName = "PCSX Main";
-	wc.lpfnWndProc = MainWndProc;
-	wc.style = 0;
-	wc.hInstance = gApp.hInstance;
-	wc.hIcon = LoadIcon(gApp.hInstance, MAKEINTRESOURCE(IDI_APP_ICON));
-	wc.hCursor = NULL;
-	wc.hbrBackground = (HBRUSH)(COLOR_MENUTEXT);
-	wc.lpszMenuName = 0;
-	wc.cbClsExtra = 0;
-	wc.cbWndExtra = 0;
-
-	RegisterClass(&wc);
-
-	hWnd = CreateWindow("PCSX Main",
-						"PCSX",
-						WS_CAPTION | WS_POPUPWINDOW | WS_MINIMIZEBOX,
-						CW_USEDEFAULT,
-						0,
-						350,
-						220,
-						NULL,
-						NULL,
-						gApp.hInstance,
-						NULL);
-
-	gApp.hWnd = hWnd;
-	ResetMenuSlots();
-
-	CreateMainMenu();
-	SetMenu(gApp.hWnd, gApp.hMenu);
-
-	ShowWindow(hWnd, nCmdShow);
-}
-
-#ifdef ENABLE_NLS
-
-WIN32_FIND_DATA lFindData;
-HANDLE lFind;
-int lFirst;
-
-void InitLanguages() {
-	lFind = FindFirstFile("Langs\\*", &lFindData);
-	lFirst = 1;
-}
-
-char *GetLanguageNext() {
-	for (;;) {
-		if (!strcmp(lFindData.cFileName, ".")) {
-			if (FindNextFile(lFind, &lFindData) == FALSE)
-				return NULL;
-			continue;
-		}
-		if (!strcmp(lFindData.cFileName, "..")) {
-			if (FindNextFile(lFind, &lFindData) == FALSE)
-				return NULL;
-			continue;
-		}
-		break;
-	}
-	if (lFirst == 0) {
-		if (FindNextFile(lFind, &lFindData) == FALSE)
-			return NULL;
-	} else lFirst = 0;
-	if (lFind==INVALID_HANDLE_VALUE) return NULL;
-
-	return lFindData.cFileName;
-}
-
-void CloseLanguages() {
-	if (lFind != INVALID_HANDLE_VALUE) FindClose(lFind);
-}
-
-void ChangeLanguage(char *lang) {
-	strcpy(Config.Lang, lang);
-	SaveConfig();
-	LoadConfig();
-}
-
-#endif
-
-int SysInit() {
-	if (Config.PsxOut) OpenConsole();
-
-	if (EmuInit() == -1) return -1;
-
-#ifdef EMU_LOG
-	emuLog = fopen("emuLog.txt","w");
-	setvbuf(emuLog, NULL, _IONBF, 0);
-#endif
-
-	while (LoadPlugins(0) == -1) {
-		CancelQuit = 1;
-		ConfigurePlugins(gApp.hWnd);
-		CancelQuit = 0;
-	}
-	LoadMcds(Config.Mcd1, Config.Mcd2);
-
-	if (Config.Debug) StartDebugger();
-
-	return 0;
-}
-
-void SysReset() {
-	EmuReset();
-}
-
-void SysClose() {
-	EmuShutdown();
-	ReleasePlugins();
-
-	StopDebugger();
-
-	if (Config.PsxOut) CloseConsole();
-
-	if (emuLog != NULL) fclose(emuLog);
-}
-
-void SysPrintf(const char *fmt, ...) {
-	va_list list;
-	char msg[512];
-	DWORD tmp;
-
-	if (!hConsole) return;
-
-	va_start(list,fmt);
-	vsprintf(msg,fmt,list);
-	va_end(list);
-
-	WriteConsole(hConsole, msg, (DWORD)strlen(msg), &tmp, 0);
-#ifdef EMU_LOG
-#ifndef LOG_STDOUT
-	if (emuLog != NULL) fprintf(emuLog, "%s", msg);
-#endif
-#endif
-}
-
-void SysMessage(const char *fmt, ...) {
-	va_list list;
-	char tmp[512];
-
-	va_start(list,fmt);
-	vsprintf(tmp,fmt,list);
-	va_end(list);
-	MessageBox(0, tmp, _("Pcsx Msg"), 0);
-}
-
-static char *err = N_("Error Loading Symbol");
-static int errval;
-
-void *SysLoadLibrary(const char *lib) {
-	return LoadLibrary(lib);
-}
-
-void *SysLoadSym(void *lib, const char *sym) {
-	void *tmp = GetProcAddress((HINSTANCE)lib, sym);
-	if (tmp == NULL) errval = 1;
-	else errval = 0;
-	return tmp;
-}
-
-const char *SysLibError() {
-	if (errval) { errval = 0; return err; }
-	return NULL;
-}
-
-void SysCloseLibrary(void *lib) {
-	FreeLibrary((HINSTANCE)lib);
-}
-
-void SysUpdate() {
-	MSG msg;
-
-	while (PeekMessage(&msg, NULL, 0U, 0U, PM_REMOVE)) {
-		TranslateMessage(&msg);
-		DispatchMessage(&msg);
-	}
-}
-
-void SysRunGui() {
-	RestoreWindow();
-	RunGui();
-}
+	static char buftitle[256];
+
+	Info = &Blocks[mcd - 1][lpdi->item.iItem];
+
+	switch (lpdi->item.iSubItem) {
+		case 0:
+			switch (Info->Flags & 0xF) {
+				case 1:
+					if (MultiByteToWideChar(932, 0, (LPCSTR)Info->sTitle, -1, (LPWSTR)buf, sizeof(buf)) == 0) {
+						lpdi->item.pszText = Info->Title;
+					} else if (WideCharToMultiByte(CP_ACP, 0, (LPCWSTR)buf, -1, (LPSTR)buftitle, sizeof(buftitle), NULL, NULL) == 0) {
+						lpdi->item.pszText = Info->Title;
+					} else {
+						lpdi->item.pszText = buftitle;
+					}
+					break;
+				case 2:
+					lpdi->item.pszText = _("mid link block");
+					break;
+				case 3:
+					lpdi->item.pszText = _("terminiting link block");
+					break;
+			}
+			break;
+		case 1:
+			if ((Info->Flags & 0xF0) == 0xA0) {
+				if ((Info->Flags & 0xF) >= 1 &&
+					(Info->Flags & 0xF) <= 3) {
+					lpdi->item.pszText = _("Deleted");
+				} else lpdi->item.pszText = _("Free");
+			} else if ((Info->Flags & 0xF0) == 0x50)
+				lpdi->item.pszText = _("Used");
+			else { lpdi->item.pszText = _("Free"); }
+			break;
+		case 2:
+			if((Info->Flags & 0xF)==1)
+				lpdi->item.pszText = Info->ID;
+			break;
+		case 3:
+			if((Info->Flags & 0xF)==1)
+				lpdi->item.pszText = Info->Name;
+			break;
+	}
+}
+
+void McdListNotify(int mcd, int idc, LPNMHDR pnmh) {
+	switch (pnmh->code) {
+		case LVN_GETDISPINFO: McdListGetDispInfo(mcd, idc, pnmh); break;
+	}
+}
+
+void UpdateMcdDlg() {
+	int i;
+
+	for (i=1; i<16; i++) GetMcdBlockInfo(1, i, &Blocks[0][i-1]);
+	for (i=1; i<16; i++) GetMcdBlockInfo(2, i, &Blocks[1][i-1]);
+	UpdateMcdItems(1, IDC_LIST1);
+	UpdateMcdItems(2, IDC_LIST2);
+}
+
+void LoadMcdDlg() {
+	int i;
+
+	for (i=1; i<16; i++) GetMcdBlockInfo(1, i, &Blocks[0][i-1]);
+	for (i=1; i<16; i++) GetMcdBlockInfo(2, i, &Blocks[1][i-1]);
+	LoadMcdItems(1, IDC_LIST1);
+	LoadMcdItems(2, IDC_LIST2);
+}
+
+void UpdateMcdIcon(int mcd, int idc) {
+ HWND List = GetDlgItem(mcdDlg, idc);
+ HIMAGELIST iml = Iiml[mcd-1];
+ int i;
+ McdBlock *Info;
+ int *count; 
+ 
+ if(!aIover[mcd-1]) {
+ ani[mcd-1]++; 
+ 
+ for (i=0; i<15; i++) {
+ Info = &Blocks[mcd-1][i];
+ count = &IconC[mcd-1][i];
+ 
+ if ((Info->Flags & 0xF) != 1) continue;
+ if (Info->IconCount <= 1) continue;
+ 
+ if (*count < Info->IconCount) {
+ (*count)++;
+ aIover[mcd-1]=0;
+ 
+ if(ani[mcd-1] <= (Info->IconCount-1)) // last frame and below...
+ hICON[mcd-1][ani[mcd-1]][i] = GetIcon(&Info->Icon[(*count)*16*16]);
+ } else {
+ aIover[mcd-1]=1;
+ }
+ }
+
+ } else { 
+ 
+ if (ani[mcd-1] > 1) ani[mcd-1] = 0; // 1st frame
+ else ani[mcd-1]++; // 2nd, 3rd frame
+ 
+ for(i=0;i<15;i++) {
+ Info = &Blocks[mcd-1][i];
+ 
+ if (((Info->Flags & 0xF) == 1) && (Info->IconCount > 1))
+ ImageList_ReplaceIcon(iml, i, hICON[mcd-1][ani[mcd-1]][i]);
+ }
+ InvalidateRect(List, NULL, FALSE);
+ }
+}
+
+static int copy = 0, copymcd = 0;
+//static int listsel = 0;
+
+BOOL CALLBACK ConfigureMcdsDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) {
+	char str[256];
+	LPBYTE lpAND, lpXOR;
+	LPBYTE lpA, lpX;
+	int i, j;
+
+	switch(uMsg) {
+		case WM_INITDIALOG:
+			mcdDlg = hW;
+
+			SetWindowText(hW, _("Memcard Manager"));
+
+			Button_SetText(GetDlgItem(hW, IDOK), _("OK"));
+			Button_SetText(GetDlgItem(hW, IDCANCEL), _("Cancel"));
+			Button_SetText(GetDlgItem(hW, IDC_MCDSEL1), _("Select Mcd"));
+			Button_SetText(GetDlgItem(hW, IDC_FORMAT1), _("Format Mcd"));
+			Button_SetText(GetDlgItem(hW, IDC_RELOAD1), _("Reload Mcd"));
+			Button_SetText(GetDlgItem(hW, IDC_MCDSEL2), _("Select Mcd"));
+			Button_SetText(GetDlgItem(hW, IDC_FORMAT2), _("Format Mcd"));
+			Button_SetText(GetDlgItem(hW, IDC_RELOAD2), _("Reload Mcd"));
+			Button_SetText(GetDlgItem(hW, IDC_COPYTO2), _("-> Copy ->"));
+			Button_SetText(GetDlgItem(hW, IDC_COPYTO1), _("<- Copy <-"));
+			Button_SetText(GetDlgItem(hW, IDC_PASTE), _("Paste"));
+			Button_SetText(GetDlgItem(hW, IDC_DELETE1), _("<- Un/Delete"));
+			Button_SetText(GetDlgItem(hW, IDC_DELETE2), _("Un/Delete ->"));
+ 
+			Static_SetText(GetDlgItem(hW, IDC_FRAMEMCD1), _("Memory Card 1"));
+			Static_SetText(GetDlgItem(hW, IDC_FRAMEMCD2), _("Memory Card 2"));
+
+			lpA=lpAND=(LPBYTE)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,(16*16));
+			lpX=lpXOR=(LPBYTE)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,(16*16));
+
+			for(i=0;i<16;i++)
+			{
+				for(j=0;j<16;j++)
+				{
+					*lpA++=0xff;
+					*lpX++=0;
+				}
+			}
+			eICON=CreateIcon(gApp.hInstance,16,16,1,1,lpAND,lpXOR);
+
+			HeapFree(GetProcessHeap(),0,lpAND);
+			HeapFree(GetProcessHeap(),0,lpXOR);
+
+			if (!strlen(Config.Mcd1)) strcpy(Config.Mcd1, "memcards\\Mcd001.mcr");
+			if (!strlen(Config.Mcd2)) strcpy(Config.Mcd2, "memcards\\Mcd002.mcr");
+			Edit_SetText(GetDlgItem(hW,IDC_MCD1), Config.Mcd1);
+			Edit_SetText(GetDlgItem(hW,IDC_MCD2), Config.Mcd2);
+
+			CreateListView(IDC_LIST1);
+			CreateListView(IDC_LIST2);
+ 
+ Iiml[0] = ImageList_Create(16, 16, ILC_COLOR16, 0, 0);
+ Iiml[1] = ImageList_Create(16, 16, ILC_COLOR16, 0, 0);
+ 
+ ListView_SetImageList(GetDlgItem(mcdDlg, IDC_LIST1), Iiml[0], LVSIL_SMALL);
+ ListView_SetImageList(GetDlgItem(mcdDlg, IDC_LIST2), Iiml[1], LVSIL_SMALL);
+
+			Button_Enable(GetDlgItem(hW, IDC_PASTE), FALSE);
+
+			LoadMcdDlg();
+
+			SetTimer(hW, 1, 250, NULL);
+
+			return TRUE;
+
+		case WM_COMMAND:
+			switch (LOWORD(wParam)) {
+				case IDC_COPYTO1:
+					copy = ListView_GetSelectionMark(GetDlgItem(mcdDlg, IDC_LIST2));
+					copymcd = 1;
+
+					Button_Enable(GetDlgItem(hW, IDC_PASTE), TRUE);
+					return TRUE;
+				case IDC_COPYTO2:
+					copy = ListView_GetSelectionMark(GetDlgItem(mcdDlg, IDC_LIST1));
+					copymcd = 2;
+
+					Button_Enable(GetDlgItem(hW, IDC_PASTE), TRUE);
+					return TRUE;
+				case IDC_PASTE:
+					if (MessageBox(hW, _("Are you sure you want to paste this selection?"), _("Confirmation"), MB_YESNO) == IDNO) return TRUE;
+
+					if (copymcd == 1) {
+						Edit_GetText(GetDlgItem(hW,IDC_MCD1), str, 256);
+						i = ListView_GetSelectionMark(GetDlgItem(mcdDlg, IDC_LIST1));
+
+						// save dir data + save data
+						memcpy(Mcd1Data + (i+1) * 128, Mcd2Data + (copy+1) * 128, 128);
+						SaveMcd(str, Mcd1Data, (i+1) * 128, 128);
+						memcpy(Mcd1Data + (i+1) * 1024 * 8, Mcd2Data + (copy+1) * 1024 * 8, 1024 * 8);
+						SaveMcd(str, Mcd1Data, (i+1) * 1024 * 8, 1024 * 8);
+					} else { // 2
+						Edit_GetText(GetDlgItem(hW,IDC_MCD2), str, 256);
+						i = ListView_GetSelectionMark(GetDlgItem(mcdDlg, IDC_LIST2));
+
+						// save dir data + save data
+						memcpy(Mcd2Data + (i+1) * 128, Mcd1Data + (copy+1) * 128, 128);
+						SaveMcd(str, Mcd2Data, (i+1) * 128, 128);
+						memcpy(Mcd2Data + (i+1) * 1024 * 8, Mcd1Data + (copy+1) * 1024 * 8, 1024 * 8);
+						SaveMcd(str, Mcd2Data, (i+1) * 1024 * 8, 1024 * 8);
+					}
+
+					UpdateMcdDlg();
+
+					return TRUE;
+				case IDC_DELETE1:
+				{
+					McdBlock *Info;
+					int mcd = 1;
+					int i, xor = 0, j;
+					unsigned char *data, *ptr;
+
+					Edit_GetText(GetDlgItem(hW,IDC_MCD1), str, 256);
+					i = ListView_GetSelectionMark(GetDlgItem(mcdDlg, IDC_LIST1));
+					data = Mcd1Data;
+
+					i++;
+
+					ptr = data + i * 128;
+
+					Info = &Blocks[mcd-1][i-1];
+
+					if ((Info->Flags & 0xF0) == 0xA0) {
+						if ((Info->Flags & 0xF) >= 1 &&
+							(Info->Flags & 0xF) <= 3) { // deleted
+							*ptr = 0x50 | (Info->Flags & 0xF);
+						} else return TRUE;
+					} else if ((Info->Flags & 0xF0) == 0x50) { // used
+						*ptr = 0xA0 | (Info->Flags & 0xF);
+					} else { return TRUE; }
+
+					for (j=0; j<127; j++) xor^=*ptr++;
+					*ptr = xor;
+
+					SaveMcd(str, data, i * 128, 128);
+					UpdateMcdDlg();
+				}
+
+					return TRUE;
+				case IDC_DELETE2:
+				{
+					McdBlock *Info;
+					int mcd = 2;
+					int i, xor = 0, j;
+					unsigned char *data, *ptr;
+
+					Edit_GetText(GetDlgItem(hW,IDC_MCD2), str, 256);
+					i = ListView_GetSelectionMark(GetDlgItem(mcdDlg, IDC_LIST2));
+					data = Mcd2Data;
+
+					i++;
+
+					ptr = data + i * 128;
+
+					Info = &Blocks[mcd-1][i-1];
+
+					if ((Info->Flags & 0xF0) == 0xA0) {
+						if ((Info->Flags & 0xF) >= 1 &&
+							(Info->Flags & 0xF) <= 3) { // deleted
+							*ptr = 0x50 | (Info->Flags & 0xF);
+						} else return TRUE;
+					} else if ((Info->Flags & 0xF0) == 0x50) { // used
+						*ptr = 0xA0 | (Info->Flags & 0xF);
+					} else { return TRUE; }
+
+					for (j=0; j<127; j++) xor^=*ptr++;
+					*ptr = xor;
+
+					SaveMcd(str, data, i * 128, 128);
+					UpdateMcdDlg();
+				}
+
+					return TRUE;
+
+				case IDC_MCDSEL1: 
+					Open_Mcd_Proc(hW, 1); 
+					return TRUE;
+				case IDC_MCDSEL2: 
+					Open_Mcd_Proc(hW, 2); 
+					return TRUE;
+				case IDC_RELOAD1: 
+					Edit_GetText(GetDlgItem(hW,IDC_MCD1), str, 256);
+					LoadMcd(1, str);
+					UpdateMcdDlg();
+					return TRUE;
+				case IDC_RELOAD2: 
+					Edit_GetText(GetDlgItem(hW,IDC_MCD2), str, 256);
+					LoadMcd(2, str);
+					UpdateMcdDlg();
+					return TRUE;
+				case IDC_FORMAT1:
+					if (MessageBox(hW, _("Are you sure you want to format this Memory Card?"), _("Confirmation"), MB_YESNO) == IDNO) return TRUE;
+					Edit_GetText(GetDlgItem(hW,IDC_MCD1), str, 256);
+					CreateMcd(str);
+					LoadMcd(1, str);
+					UpdateMcdDlg();
+					return TRUE;
+				case IDC_FORMAT2:
+					if (MessageBox(hW, _("Are you sure you want to format this Memory Card?"), _("Confirmation"), MB_YESNO) == IDNO) return TRUE;
+					Edit_GetText(GetDlgItem(hW,IDC_MCD2), str, 256);
+					CreateMcd(str);
+					LoadMcd(2, str);
+					UpdateMcdDlg();
+					return TRUE;
+ 			case IDCANCEL:
+					LoadMcds(Config.Mcd1, Config.Mcd2);
+
+					EndDialog(hW,FALSE);
+
+					return TRUE;
+ 			case IDOK:
+					Edit_GetText(GetDlgItem(hW,IDC_MCD1), Config.Mcd1, 256);
+					Edit_GetText(GetDlgItem(hW,IDC_MCD2), Config.Mcd2, 256);
+
+					LoadMcds(Config.Mcd1, Config.Mcd2);
+					SaveConfig();
+
+					EndDialog(hW,TRUE);
+
+					return TRUE;
+			}
+		case WM_NOTIFY:
+			switch (wParam) {
+				case IDC_LIST1: McdListNotify(1, IDC_LIST1, (LPNMHDR)lParam); break;
+				case IDC_LIST2: McdListNotify(2, IDC_LIST2, (LPNMHDR)lParam); break;
+			}
+			return TRUE;
+		case WM_TIMER:
+			UpdateMcdIcon(1, IDC_LIST1);
+			UpdateMcdIcon(2, IDC_LIST2);
+			return TRUE;
+		case WM_DESTROY:
+			DestroyIcon(eICON);
+			//KillTimer(hW, 1);
+			return TRUE;
+	}
+	return FALSE;
+}
+
+BOOL CALLBACK ConfigureCpuDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) {
+	long tmp;
+
+	switch(uMsg) {
+		case WM_INITDIALOG:
+			SetWindowText(hW, _("Cpu Config"));
+
+			Button_SetText(GetDlgItem(hW,IDOK), _("OK"));
+			Button_SetText(GetDlgItem(hW,IDCANCEL), _("Cancel"));
+
+			Button_SetText(GetDlgItem(hW,IDC_XA), _("Disable Xa Decoding"));
+			Button_SetText(GetDlgItem(hW,IDC_SIO), _("Sio Irq Always Enabled"));
+			Button_SetText(GetDlgItem(hW,IDC_MDEC), _("Black && White Movies"));
+			Button_SetText(GetDlgItem(hW,IDC_CDDA), _("Disable Cd audio"));
+			Button_SetText(GetDlgItem(hW,IDC_SLOWBOOT),_("Slow Boot"));
+			Button_SetText(GetDlgItem(hW,IDC_PSXAUTO), _("Autodetect"));
+			Button_SetText(GetDlgItem(hW,IDC_CPU), _("Enable Interpreter Cpu"));
+			Button_SetText(GetDlgItem(hW,IDC_PSXOUT), _("Enable Console Output"));
+			Button_SetText(GetDlgItem(hW,IDC_DEBUG), _("Enable Debugger"));
+			Button_SetText(GetDlgItem(hW,IDC_SPUIRQ), _("Spu Irq Always Enabled"));
+			Button_SetText(GetDlgItem(hW,IDC_RCNTFIX), _("Parasite Eve 2, Vandal Hearts 1/2 Fix"));
+			Button_SetText(GetDlgItem(hW,IDC_VSYNCWA), _("InuYasha Sengoku Battle Fix"));
+			Button_SetText(GetDlgItem(hW,IDC_WIDESCREEN), _("Widescreen (GTE Hack)"));
+			Button_SetText(GetDlgItem(hW,IDC_HIDECURSOR), _("Hide cursor"));
+
+			Static_SetText(GetDlgItem(hW,IDC_MISCOPT), _("Options"));
+			Static_SetText(GetDlgItem(hW,IDC_SELPSX), _("Psx System Type"));
+
+			Button_SetCheck(GetDlgItem(hW,IDC_XA), Config.Xa);
+			Button_SetCheck(GetDlgItem(hW,IDC_SIO), Config.SioIrq);
+			Button_SetCheck(GetDlgItem(hW,IDC_MDEC), Config.Mdec);
+			Button_SetCheck(GetDlgItem(hW,IDC_CDDA), Config.Cdda);
+			Button_SetCheck(GetDlgItem(hW,IDC_SLOWBOOT),Config.SlowBoot);
+	 		Button_SetCheck(GetDlgItem(hW,IDC_PSXAUTO), Config.PsxAuto);
+	 		Button_SetCheck(GetDlgItem(hW,IDC_CPU), (Config.Cpu == CPU_INTERPRETER));
+	 		Button_SetCheck(GetDlgItem(hW,IDC_PSXOUT), Config.PsxOut);
+			Button_SetCheck(GetDlgItem(hW,IDC_DEBUG), Config.Debug);
+	 		Button_SetCheck(GetDlgItem(hW,IDC_SPUIRQ), Config.SpuIrq);
+	 		Button_SetCheck(GetDlgItem(hW,IDC_RCNTFIX), Config.RCntFix);
+	 		Button_SetCheck(GetDlgItem(hW,IDC_VSYNCWA), Config.VSyncWA);
+			Button_SetCheck(GetDlgItem(hW,IDC_WIDESCREEN), Config.Widescreen);
+			Button_SetCheck(GetDlgItem(hW,IDC_HIDECURSOR), Config.HideCursor);
+	 		ComboBox_AddString(GetDlgItem(hW,IDC_PSXTYPES), "NTSC");
+	 		ComboBox_AddString(GetDlgItem(hW,IDC_PSXTYPES), "PAL");
+	 		ComboBox_SetCurSel(GetDlgItem(hW,IDC_PSXTYPES),Config.PsxType);
+
+			if (Config.Cpu == CPU_DYNAREC) {
+				Config.Debug = 0;
+				Button_SetCheck(GetDlgItem(hW, IDC_DEBUG), FALSE);
+				EnableWindow(GetDlgItem(hW, IDC_DEBUG), FALSE);
+			}
+
+			EnableWindow(GetDlgItem(hW,IDC_PSXTYPES), !Config.PsxAuto);
+			break;
+
+		case WM_COMMAND: {
+			switch (LOWORD(wParam)) {
+ 			case IDCANCEL: EndDialog(hW, FALSE); return TRUE;
+ 		case IDOK:
+					tmp = ComboBox_GetCurSel(GetDlgItem(hW,IDC_PSXTYPES));
+					if (tmp == 0) Config.PsxType = 0;
+					else Config.PsxType = 1;
+
+					Config.Xa = Button_GetCheck(GetDlgItem(hW,IDC_XA));
+					Config.SioIrq = Button_GetCheck(GetDlgItem(hW,IDC_SIO));
+					Config.Mdec = Button_GetCheck(GetDlgItem(hW,IDC_MDEC));
+					Config.Cdda = Button_GetCheck(GetDlgItem(hW,IDC_CDDA));
+					Config.SlowBoot= Button_GetCheck(GetDlgItem(hW,IDC_SLOWBOOT));
+					Config.PsxAuto = Button_GetCheck(GetDlgItem(hW,IDC_PSXAUTO));
+					tmp = Config.Cpu;
+					Config.Cpu = (Button_GetCheck(GetDlgItem(hW,IDC_CPU)) ? CPU_INTERPRETER : CPU_DYNAREC);
+					if (tmp != Config.Cpu) {
+						psxCpu->Shutdown();
+						if (Config.Cpu == CPU_INTERPRETER) psxCpu = &psxInt;
+						else psxCpu = &psxRec;
+						if (psxCpu->Init() == -1) {
+							SysClose();
+							exit(1);
+						}
+						psxCpu->Reset();
+					}
+					Config.PsxOut = Button_GetCheck(GetDlgItem(hW,IDC_PSXOUT));
+					Config.SpuIrq = Button_GetCheck(GetDlgItem(hW,IDC_SPUIRQ));
+					Config.RCntFix = Button_GetCheck(GetDlgItem(hW,IDC_RCNTFIX));
+					Config.VSyncWA = Button_GetCheck(GetDlgItem(hW,IDC_VSYNCWA));
+					Config.Widescreen = Button_GetCheck(GetDlgItem(hW,IDC_WIDESCREEN));
+					Config.HideCursor = Button_GetCheck(GetDlgItem(hW,IDC_HIDECURSOR));
+					tmp = Config.Debug;
+					Config.Debug = Button_GetCheck(GetDlgItem(hW,IDC_DEBUG));
+					if (tmp != Config.Debug) {
+						if (Config.Debug) StartDebugger();
+						else StopDebugger();
+					}
+
+					SaveConfig();
+
+					EndDialog(hW,TRUE);
+
+					if (Config.PsxOut) OpenConsole();
+					else CloseConsole();
+
+					return TRUE;
+
+				case IDC_CPU:
+					if (Button_GetCheck(GetDlgItem(hW,IDC_CPU))) {
+						EnableWindow(GetDlgItem(hW,IDC_DEBUG), TRUE);
+					} else {
+						Button_SetCheck(GetDlgItem(hW,IDC_DEBUG), FALSE);
+						EnableWindow(GetDlgItem(hW,IDC_DEBUG), FALSE);
+					}
+					break;
+
+				case IDC_PSXAUTO:
+					if (Button_GetCheck(GetDlgItem(hW,IDC_PSXAUTO))) {
+						EnableWindow(GetDlgItem(hW,IDC_PSXTYPES), FALSE);
+					} else {
+						EnableWindow(GetDlgItem(hW,IDC_PSXTYPES), TRUE);
+					}
+					break;
+			}
+		}
+	}
+	return FALSE;
+}
+
+void Open_Mcd_Proc(HWND hW, int mcd) {
+	OPENFILENAME ofn;
+	char szFileName[MAXPATHLEN];
+	char szFileTitle[MAXPATHLEN];
+	char szFilter[1024];
+	char *str;
+
+	memset(&szFileName, 0, sizeof(szFileName));
+	memset(&szFileTitle, 0, sizeof(szFileTitle));
+	memset(&szFilter, 0, sizeof(szFilter));
+
+	strcpy(szFilter, _("Psx Mcd Format (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"));
+	str = szFilter + strlen(szFilter) + 1; 
+	strcpy(str, "*.mcr;*.mcd;*.mem;*.gme;*.mc;*.ddf");
+
+	str+= strlen(str) + 1;
+	strcpy(str, _("Psx Memory Card (*.mcr;*.mc)"));
+	str+= strlen(str) + 1;
+	strcpy(str, "*.mcr;0*.mc");
+
+	str+= strlen(str) + 1;
+	strcpy(str, _("CVGS Memory Card (*.mem;*.vgs)"));
+	str+= strlen(str) + 1;
+	strcpy(str, "*.mem;*.vgs");
+
+	str+= strlen(str) + 1;
+	strcpy(str, _("Bleem Memory Card (*.mcd)"));
+	str+= strlen(str) + 1;
+	strcpy(str, "*.mcd");
+
+	str+= strlen(str) + 1;
+	strcpy(str, _("DexDrive Memory Card (*.gme)"));
+	str+= strlen(str) + 1;
+	strcpy(str, "*.gme");
+
+	str+= strlen(str) + 1;
+	strcpy(str, _("DataDeck Memory Card (*.ddf)"));
+	str+= strlen(str) + 1;
+	strcpy(str, "*.ddf");
+
+	str+= strlen(str) + 1;
+	strcpy(str, _("All Files"));
+	str+= strlen(str) + 1;
+	strcpy(str, "*.*");
+
+ ofn.lStructSize			= sizeof(OPENFILENAME);
+ ofn.hwndOwner			= hW;
+ ofn.lpstrFilter			= szFilter;
+	ofn.lpstrCustomFilter	= NULL;
+ ofn.nMaxCustFilter		= 0;
+ ofn.nFilterIndex		= 1;
+ ofn.lpstrFile			= szFileName;
+ ofn.nMaxFile			= MAXPATHLEN;
+ ofn.lpstrInitialDir		= "memcards";
+ ofn.lpstrFileTitle		= szFileTitle;
+ ofn.nMaxFileTitle		= MAXPATHLEN;
+ ofn.lpstrTitle			= NULL;
+ ofn.lpstrDefExt			= "MCR";
+ ofn.Flags				= OFN_HIDEREADONLY | OFN_NOCHANGEDIR;
+
+	if (GetOpenFileName ((LPOPENFILENAME)&ofn)) {
+		Edit_SetText(GetDlgItem(hW,mcd == 1 ? IDC_MCD1 : IDC_MCD2), szFileName);
+		LoadMcd(mcd, szFileName);
+		UpdateMcdDlg();
+	}
+}
+
+int Open_File_Proc(char *file) {
+	OPENFILENAME ofn;
+	char szFileName[MAXPATHLEN];
+	char szFileTitle[MAXPATHLEN];
+	char szFilter[256];
+
+	memset(&szFileName, 0, sizeof(szFileName));
+	memset(&szFileTitle, 0, sizeof(szFileTitle));
+	memset(&szFilter, 0, sizeof(szFilter));
+
+ ofn.lStructSize			= sizeof(OPENFILENAME);
+ ofn.hwndOwner			= gApp.hWnd;
+
+	strcpy(szFilter, _("Psx Exe Format"));
+	strcatz(szFilter, "*.*");
+
+ ofn.lpstrFilter			= szFilter;
+	ofn.lpstrCustomFilter	= NULL;
+ ofn.nMaxCustFilter		= 0;
+ ofn.nFilterIndex		= 1;
+ ofn.lpstrFile			= szFileName;
+ ofn.nMaxFile			= MAXPATHLEN;
+ ofn.lpstrInitialDir		= NULL;
+ ofn.lpstrFileTitle		= szFileTitle;
+ ofn.nMaxFileTitle		= MAXPATHLEN;
+ ofn.lpstrTitle			= NULL;
+ ofn.lpstrDefExt			= "EXE";
+ ofn.Flags				= OFN_HIDEREADONLY | OFN_NOCHANGEDIR;
+
+	if (GetOpenFileName ((LPOPENFILENAME)&ofn)) {
+		strcpy(file, szFileName);
+		return 1;
+	} else
+		return 0;
+}
+
+int Open_Iso_Proc(char *file) {
+	OPENFILENAME ofn;
+	char szFileName[MAXPATHLEN];
+	char szFileTitle[MAXPATHLEN];
+	char szFilter[256];
+	char *str;
+
+	memset(&szFileName, 0, sizeof(szFileName));
+	memset(&szFileTitle, 0, sizeof(szFileTitle));
+	memset(&szFilter, 0, sizeof(szFilter));
+
+ ofn.lStructSize			= sizeof(OPENFILENAME);
+ ofn.hwndOwner			= gApp.hWnd;
+
+	strcpy(szFilter, _("Psx Isos (*.iso;*.mdf;*.img;*.bin;*.cue;*.pbp;*.cbn)"));
+	str = szFilter + strlen(szFilter) + 1; 
+	strcpy(str, "*.iso;*.mdf;*.img;*.bin;*.cue;*.pbp;*.cbn");
+
+	str += strlen(str) + 1;
+	strcpy(str, _("All Files"));
+	str += strlen(str) + 1;
+	strcpy(str, "*.*");
+
+ ofn.lpstrFilter			= szFilter;
+	ofn.lpstrCustomFilter	= NULL;
+ ofn.nMaxCustFilter		= 0;
+ ofn.nFilterIndex		= 1;
+ ofn.lpstrFile			= szFileName;
+ ofn.nMaxFile			= MAXPATHLEN;
+ ofn.lpstrInitialDir		= NULL;
+ ofn.lpstrFileTitle		= szFileTitle;
+ ofn.nMaxFileTitle		= MAXPATHLEN;
+ ofn.lpstrTitle			= NULL;
+ ofn.lpstrDefExt			= "ISO";
+ ofn.Flags				= OFN_HIDEREADONLY | OFN_NOCHANGEDIR;
+
+	if (GetOpenFileName ((LPOPENFILENAME)&ofn)) {
+		strcpy(file, szFileName);
+		return 1;
+	} else
+		return 0;
+}
+
+#define _ADDSUBMENU(menu, menun, string) \
+	submenu[menun] = CreatePopupMenu(); \
+	AppendMenu(menu, MF_STRING | MF_POPUP, (UINT)submenu[menun], string);
+
+#define ADDSUBMENU(menun, string) \
+	_ADDSUBMENU(gApp.hMenu, menun, string);
+
+#define ADDSUBMENUS(submn, menun, string) \
+	submenu[menun] = CreatePopupMenu(); \
+	InsertMenu(submenu[submn], 0, MF_BYPOSITION | MF_STRING | MF_POPUP, (UINT)submenu[menun], string);
+
+#define ADDMENUITEM(menun, string, id) \
+	item.fType = MFT_STRING; \
+	item.fMask = MIIM_STATE | MIIM_TYPE | MIIM_ID; \
+	item.fState = MFS_ENABLED; \
+	item.wID = id; \
+	sprintf(buf, string); \
+	InsertMenuItem(submenu[menun], 0, TRUE, &item);
+
+#define ADDMENUITEMC(menun, string, id) \
+	item.fType = MFT_STRING; \
+	item.fMask = MIIM_STATE | MIIM_TYPE | MIIM_ID; \
+	item.fState = MFS_ENABLED | MFS_CHECKED; \
+	item.wID = id; \
+	sprintf(buf, string); \
+	InsertMenuItem(submenu[menun], 0, TRUE, &item);
+
+#define ADDSEPARATOR(menun) \
+	item.fMask = MIIM_TYPE; \
+	item.fType = MFT_SEPARATOR; \
+	InsertMenuItem(submenu[menun], 0, TRUE, &item);
+
+void CreateMainMenu() {
+	MENUITEMINFO item;
+	HMENU submenu[256];
+	char buf[256];
+#ifdef ENABLE_NLS
+	char *lang;
+	int i;
+#endif
+
+	item.cbSize = sizeof(MENUITEMINFO);
+	item.dwTypeData = buf;
+	item.cch = 256;
+
+	gApp.hMenu = CreateMenu();
+
+	ADDSUBMENU(0, _("&File"));
+	ADDMENUITEM(0, _("E&xit"), ID_FILE_EXIT);
+	ADDSEPARATOR(0);
+	ADDMENUITEM(0, _("Run &EXE..."), ID_FILE_RUN_EXE);
+	ADDMENUITEM(0, _("Run &BIOS"), ID_FILE_RUNBIOS);
+	ADDMENUITEM(0, _("Run &ISO..."), ID_FILE_RUN_ISO);
+	ADDMENUITEM(0, _("Run &CD"), ID_FILE_RUN_CD);
+
+	ADDSUBMENU(0, _("&Emulator"));
+	ADDSUBMENUS(0, 1, _("&States"));
+	ADDSEPARATOR(0);
+	ADDMENUITEM(0, _("S&witch ISO..."), ID_EMULATOR_SWITCH_ISO);
+	ADDSEPARATOR(0);
+	ADDMENUITEM(0, _("S&hutdown"), ID_EMULATOR_SHUTDOWN);
+	ADDMENUITEM(0, _("Re&set"), ID_EMULATOR_RESET);
+	ADDMENUITEM(0, _("&Run"), ID_EMULATOR_RUN);
+	ADDSUBMENUS(1, 3, _("&Save"));
+	ADDSUBMENUS(1, 2, _("&Load"));
+	ADDMENUITEM(2, _("&Other..."), ID_FILE_STATES_LOAD_OTHER);
+	ADDMENUITEM(2, _("Slot &9"), ID_FILE_STATES_LOAD_SLOT9);
+	ADDMENUITEM(2, _("Slot &8"), ID_FILE_STATES_LOAD_SLOT8);
+	ADDMENUITEM(2, _("Slot &7"), ID_FILE_STATES_LOAD_SLOT7);
+	ADDMENUITEM(2, _("Slot &6"), ID_FILE_STATES_LOAD_SLOT6);
+	ADDMENUITEM(2, _("Slot &5"), ID_FILE_STATES_LOAD_SLOT5);
+	ADDMENUITEM(2, _("Slot &4"), ID_FILE_STATES_LOAD_SLOT4);
+	ADDMENUITEM(2, _("Slot &3"), ID_FILE_STATES_LOAD_SLOT3);
+	ADDMENUITEM(2, _("Slot &2"), ID_FILE_STATES_LOAD_SLOT2);
+	ADDMENUITEM(2, _("Slot &1"), ID_FILE_STATES_LOAD_SLOT1);
+	ADDMENUITEM(3, _("&Other..."), ID_FILE_STATES_SAVE_OTHER);
+	ADDMENUITEM(3, _("Slot &9"), ID_FILE_STATES_SAVE_SLOT9);
+	ADDMENUITEM(3, _("Slot &8"), ID_FILE_STATES_SAVE_SLOT8);
+	ADDMENUITEM(3, _("Slot &7"), ID_FILE_STATES_SAVE_SLOT7);
+	ADDMENUITEM(3, _("Slot &6"), ID_FILE_STATES_SAVE_SLOT6);
+	ADDMENUITEM(3, _("Slot &5"), ID_FILE_STATES_SAVE_SLOT5);
+	ADDMENUITEM(3, _("Slot &4"), ID_FILE_STATES_SAVE_SLOT4);
+	ADDMENUITEM(3, _("Slot &3"), ID_FILE_STATES_SAVE_SLOT3);
+	ADDMENUITEM(3, _("Slot &2"), ID_FILE_STATES_SAVE_SLOT2);
+	ADDMENUITEM(3, _("Slot &1"), ID_FILE_STATES_SAVE_SLOT1);
+
+	ADDSUBMENU(0, _("&Configuration"));
+	ADDMENUITEM(0, _("Cheat &Search..."), ID_CONFIGURATION_CHEATSEARCH);
+	ADDMENUITEM(0, _("Ch&eat Code..."), ID_CONFIGURATION_CHEATLIST);
+	ADDSEPARATOR(0);
+#ifdef ENABLE_NLS
+	ADDSUBMENUS(0, 1, _("&Language"));
+
+	// wtf?
+	if (langs != langs) free(langs);
+	langs = (_langs*)malloc(sizeof(_langs));
+	strcpy(langs[0].lang, "English");
+	InitLanguages(); i=1;
+	while ((lang = GetLanguageNext()) != NULL) {
+		langs = (_langs*)realloc(langs, sizeof(_langs)*(i+1));
+		strcpy(langs[i].lang, lang);
+		if (!strcmp(Config.Lang, lang)) {
+			ADDMENUITEMC(1, ParseLang(langs[i].lang), ID_LANGS + i);
+		} else {
+			ADDMENUITEM(1, ParseLang(langs[i].lang), ID_LANGS + i);
+		}
+		i++;
+	}
+	CloseLanguages();
+	langsMax = i;
+	if (!strcmp(Config.Lang, "English")) {
+		ADDMENUITEMC(1, _("English"), ID_LANGS);
+	} else {
+		ADDMENUITEM(1, _("English"), ID_LANGS);
+	}
+	ADDSEPARATOR(0);
+#endif
+	ADDMENUITEM(0, _("&Memory cards..."), ID_CONFIGURATION_MEMORYCARDMANAGER);
+	ADDMENUITEM(0, _("C&PU..."), ID_CONFIGURATION_CPU);
+	ADDSEPARATOR(0);
+	ADDMENUITEM(0, _("&NetPlay..."), ID_CONFIGURATION_NETPLAY);
+	ADDSEPARATOR(0);
+	ADDMENUITEM(0, _("&Link cable..."), ID_CONFIGURATION_LINKCABLE);
+	ADDMENUITEM(0, _("&Controllers..."), ID_CONFIGURATION_CONTROLLERS);
+	ADDMENUITEM(0, _("CD-&ROM..."), ID_CONFIGURATION_CDROM);
+	ADDMENUITEM(0, _("&Sound..."), ID_CONFIGURATION_SOUND);
+	ADDMENUITEM(0, _("&Graphics..."), ID_CONFIGURATION_GRAPHICS);
+	ADDSEPARATOR(0);
+	ADDMENUITEM(0, _("&Plugins && Bios..."), ID_CONFIGURATION);
+
+	ADDSUBMENU(0, _("&Help"));
+	ADDMENUITEM(0, _("&About..."), ID_HELP_ABOUT);
+
+	UpdateMenuItems();
+}
+
+void CreateMainWindow(int nCmdShow) {
+	WNDCLASS wc;
+	HWND hWnd;
+
+	wc.lpszClassName = "PCSXR Main";
+	wc.lpfnWndProc = MainWndProc;
+	wc.style = 0;
+	wc.hInstance = gApp.hInstance;
+	wc.hIcon = LoadIcon(gApp.hInstance, MAKEINTRESOURCE(IDI_APP_ICON));
+	wc.hCursor = NULL;
+	wc.hbrBackground = (HBRUSH)(COLOR_MENUTEXT);
+	wc.lpszMenuName = 0;
+	wc.cbClsExtra = 0;
+	wc.cbWndExtra = 0;
+
+	RegisterClass(&wc);
+
+	hWnd = CreateWindow("PCSXR Main",
+						"PCSXR",
+						WS_CAPTION | WS_POPUPWINDOW | WS_MINIMIZEBOX,
+						CW_USEDEFAULT,
+						0,
+						356,
+						252,
+						NULL,
+						NULL,
+						gApp.hInstance,
+						NULL);
+
+	gApp.hWnd = hWnd;
+
+	CreateMainMenu();
+	SetMenu(gApp.hWnd, gApp.hMenu);
+
+	ShowWindow(hWnd, nCmdShow);
+}
+
+#ifdef ENABLE_NLS
+
+WIN32_FIND_DATA lFindData;
+HANDLE lFind;
+int lFirst;
+
+void InitLanguages() {
+	lFind = FindFirstFile("Langs\\*", &lFindData);
+	lFirst = 1;
+}
+
+char *GetLanguageNext() {
+	for (;;) {
+		if (!strcmp(lFindData.cFileName, ".")) {
+			if (FindNextFile(lFind, &lFindData) == FALSE)
+				return NULL;
+			continue;
+		}
+		if (!strcmp(lFindData.cFileName, "..")) {
+			if (FindNextFile(lFind, &lFindData) == FALSE)
+				return NULL;
+			continue;
+		}
+		break;
+	}
+	if (lFirst == 0) {
+		if (FindNextFile(lFind, &lFindData) == FALSE)
+			return NULL;
+	} else lFirst = 0;
+	if (lFind==INVALID_HANDLE_VALUE) return NULL;
+
+	return lFindData.cFileName;
+}
+
+void CloseLanguages() {
+	if (lFind != INVALID_HANDLE_VALUE) FindClose(lFind);
+}
+
+void ChangeLanguage(char *lang) {
+	strcpy(Config.Lang, lang);
+	SaveConfig();
+	LoadConfig();
+}
+
+#endif
+
+int SysInit() {
+	if (Config.PsxOut) OpenConsole();
+
+	if (EmuInit() == -1) return -1;
+
+#ifdef EMU_LOG
+	emuLog = fopen("emuLog.txt","w");
+	setvbuf(emuLog, NULL, _IONBF, 0);
+#endif
+
+	while (LoadPlugins(0) == -1) {
+		CancelQuit = 1;
+		ConfigurePlugins(gApp.hWnd);
+		CancelQuit = 0;
+	}
+	LoadMcds(Config.Mcd1, Config.Mcd2);
+
+	if (Config.Debug) StartDebugger();
+
+	return 0;
+}
+
+void SysReset() {
+	EmuReset();
+}
+
+void SysClose() {
+	EmuShutdown();
+	ReleasePlugins();
+
+	StopDebugger();
+
+	if (Config.PsxOut) CloseConsole();
+
+	if (emuLog != NULL) fclose(emuLog);
+}
+
+void SysPrintf(const char *fmt, ...) {
+	va_list list;
+	char msg[512];
+	DWORD tmp;
+
+	if (!hConsole) return;
+
+	va_start(list,fmt);
+	vsprintf(msg,fmt,list);
+	va_end(list);
+
+	WriteConsole(hConsole, msg, (DWORD)strlen(msg), &tmp, 0);
+#ifdef EMU_LOG
+#ifndef LOG_STDOUT
+	if (emuLog != NULL) fprintf(emuLog, "%s", msg);
+#endif
+#endif
+}
+
+void SysMessage(const char *fmt, ...) {
+	va_list list;
+	char tmp[512];
+
+	va_start(list,fmt);
+	vsprintf(tmp,fmt,list);
+	va_end(list);
+	MessageBox(0, tmp, _("Pcsxr Msg"), 0);
+}
+
+static char *err = N_("Error Loading Symbol");
+static int errval;
+
+void *SysLoadLibrary(const char *lib) {
+	return LoadLibrary(lib);
+}
+
+void *SysLoadSym(void *lib, const char *sym) {
+	void *tmp = GetProcAddress((HINSTANCE)lib, sym);
+	if (tmp == NULL) errval = 1;
+	else errval = 0;
+	return tmp;
+}
+
+const char *SysLibError() {
+	if (errval) { errval = 0; return err; }
+	return NULL;
+}
+
+void SysCloseLibrary(void *lib) {
+	FreeLibrary((HINSTANCE)lib);
+}
+
+void SysUpdate() {
+	MSG msg;
+
+	while (PeekMessage(&msg, NULL, 0U, 0U, PM_REMOVE)) {
+		TranslateMessage(&msg);
+		DispatchMessage(&msg);
+	}
+}
+
+void SysRunGui() {
+	RestoreWindow();
+	RunGui();
+}
+
+void UpdateMenuItems() {
+	if (CdromId[0] != '\0') { // Emulating...
+		EnableMenuItem(gApp.hMenu, ID_CONFIGURATION_NETPLAY, MF_BYCOMMAND | MF_GRAYED);
+		EnableMenuItem(gApp.hMenu, ID_CONFIGURATION_LINKCABLE, MF_BYCOMMAND | MF_GRAYED);
+		EnableMenuItem(gApp.hMenu, ID_CONFIGURATION_CONTROLLERS, MF_BYCOMMAND | MF_GRAYED);
+		EnableMenuItem(gApp.hMenu, ID_CONFIGURATION_CDROM, MF_BYCOMMAND | MF_GRAYED);
+		EnableMenuItem(gApp.hMenu, ID_CONFIGURATION_SOUND, MF_BYCOMMAND | MF_GRAYED);
+		EnableMenuItem(gApp.hMenu, ID_CONFIGURATION_GRAPHICS, MF_BYCOMMAND | MF_GRAYED);
+		EnableMenuItem(gApp.hMenu, ID_CONFIGURATION, MF_BYCOMMAND | MF_GRAYED);
+		if (!UsingIso()) {
+			EnableMenuItem(gApp.hMenu, ID_EMULATOR_SWITCH_ISO, MF_BYCOMMAND | MF_GRAYED);
+		}
+
+		ResetMenuSlots();
+	} else { // GUI...
+		EnableMenuItem(gApp.hMenu, ID_EMULATOR_RESET, MF_BYCOMMAND | MF_GRAYED);
+		EnableMenuItem(gApp.hMenu, ID_EMULATOR_RUN, MF_BYCOMMAND | MF_GRAYED);
+		EnableMenuItem(gApp.hMenu, ID_EMULATOR_SHUTDOWN, MF_BYCOMMAND | MF_GRAYED);
+		EnableMenuItem(gApp.hMenu, ID_EMULATOR_SWITCH_ISO, MF_BYCOMMAND | MF_GRAYED);
+		EnableMenuItem(gApp.hMenu, ID_FILE_STATES_LOAD_SLOT1, MF_BYCOMMAND | MF_GRAYED);
+		EnableMenuItem(gApp.hMenu, ID_FILE_STATES_LOAD_SLOT2, MF_BYCOMMAND | MF_GRAYED);
+		EnableMenuItem(gApp.hMenu, ID_FILE_STATES_LOAD_SLOT3, MF_BYCOMMAND | MF_GRAYED);
+		EnableMenuItem(gApp.hMenu, ID_FILE_STATES_LOAD_SLOT4, MF_BYCOMMAND | MF_GRAYED);
+		EnableMenuItem(gApp.hMenu, ID_FILE_STATES_LOAD_SLOT5, MF_BYCOMMAND | MF_GRAYED);
+		EnableMenuItem(gApp.hMenu, ID_FILE_STATES_LOAD_SLOT6, MF_BYCOMMAND | MF_GRAYED);
+		EnableMenuItem(gApp.hMenu, ID_FILE_STATES_LOAD_SLOT7, MF_BYCOMMAND | MF_GRAYED);
+		EnableMenuItem(gApp.hMenu, ID_FILE_STATES_LOAD_SLOT8, MF_BYCOMMAND | MF_GRAYED);
+		EnableMenuItem(gApp.hMenu, ID_FILE_STATES_LOAD_SLOT9, MF_BYCOMMAND | MF_GRAYED);
+		EnableMenuItem(gApp.hMenu, ID_FILE_STATES_LOAD_OTHER, MF_BYCOMMAND | MF_GRAYED);
+		EnableMenuItem(gApp.hMenu, ID_FILE_STATES_SAVE_SLOT1, MF_BYCOMMAND | MF_GRAYED);
+		EnableMenuItem(gApp.hMenu, ID_FILE_STATES_SAVE_SLOT2, MF_BYCOMMAND | MF_GRAYED);
+		EnableMenuItem(gApp.hMenu, ID_FILE_STATES_SAVE_SLOT3, MF_BYCOMMAND | MF_GRAYED);
+		EnableMenuItem(gApp.hMenu, ID_FILE_STATES_SAVE_SLOT4, MF_BYCOMMAND | MF_GRAYED);
+		EnableMenuItem(gApp.hMenu, ID_FILE_STATES_SAVE_SLOT5, MF_BYCOMMAND | MF_GRAYED);
+		EnableMenuItem(gApp.hMenu, ID_FILE_STATES_SAVE_SLOT6, MF_BYCOMMAND | MF_GRAYED);
+		EnableMenuItem(gApp.hMenu, ID_FILE_STATES_SAVE_SLOT7, MF_BYCOMMAND | MF_GRAYED);
+		EnableMenuItem(gApp.hMenu, ID_FILE_STATES_SAVE_SLOT8, MF_BYCOMMAND | MF_GRAYED);
+		EnableMenuItem(gApp.hMenu, ID_FILE_STATES_SAVE_SLOT9, MF_BYCOMMAND | MF_GRAYED);
+		EnableMenuItem(gApp.hMenu, ID_FILE_STATES_SAVE_OTHER, MF_BYCOMMAND | MF_GRAYED);
+		EnableMenuItem(gApp.hMenu, ID_CONFIGURATION_CHEATSEARCH, MF_BYCOMMAND | MF_GRAYED);
+		EnableMenuItem(gApp.hMenu, ID_CONFIGURATION_NETPLAY, MF_BYCOMMAND | MF_ENABLED);
+		EnableMenuItem(gApp.hMenu, ID_CONFIGURATION_LINKCABLE, MF_BYCOMMAND | MF_ENABLED);
+		EnableMenuItem(gApp.hMenu, ID_CONFIGURATION_CONTROLLERS, MF_BYCOMMAND | MF_ENABLED);
+		EnableMenuItem(gApp.hMenu, ID_CONFIGURATION_CDROM, MF_BYCOMMAND | ( Config.Cdr[0] != '\0' ? MF_ENABLED : MF_GRAYED ));
+		EnableMenuItem(gApp.hMenu, ID_CONFIGURATION_SOUND, MF_BYCOMMAND | MF_ENABLED);
+		EnableMenuItem(gApp.hMenu, ID_CONFIGURATION_GRAPHICS, MF_BYCOMMAND | MF_ENABLED);
+		EnableMenuItem(gApp.hMenu, ID_CONFIGURATION, MF_BYCOMMAND | MF_ENABLED);
+	}
+
+#ifndef ENABLE_SIO1API
+	EnableMenuItem(gApp.hMenu, ID_CONFIGURATION_LINKCABLE, MF_BYCOMMAND | MF_GRAYED);
+#endif
+}

pcsxr-1.9.93.tar.bz2/win32/gui/pcsxr.bmp Added

pcsxr-1.9.93.tar.bz2/win32/gui/pcsxr.exe.manifest Added

pcsxr-1.9.93.tar.bz2/win32/gui/pcsxr.ico Added

pcsxr-1.9.92.tar.bz2/win32/gui/plugin.c -> pcsxr-1.9.93.tar.bz2/win32/gui/plugin.c Changed

@@ -1,351 +1,377 @@
-/* Pcsx - Pc Psx Emulator
- * Copyright (C) 1999-2003 Pcsx Team
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA
- */
-
-#include <windows.h>
-#include <windowsx.h>
-#include <stdio.h>
-#include "plugin.h"
-#include "plugins.h"
-#include "resource.h"
-#include <time.h>
-#include <stdio.h>
-
-#include "r3000a.h"
-#include "Win32.h"
-#include "NoPic.h"
-#include "misc.h"
-#include "sio.h"
-
-int ShowPic = 0;
-
-void gpuShowPic() {
-	char Text[255];
-	gzFile f;
-
-	if (!ShowPic) {
-		unsigned char *pMem;
-
-		pMem = (unsigned char *) malloc(128*96*3);
-		if (pMem == NULL) return;
-		GetStateFilename(Text, StatesC);
-
-		GPU_freeze(2, (GPUFreeze_t *)&StatesC);
-
-		f = gzopen(Text, "rb");
-		if (f != NULL) {
-			gzseek(f, 32, SEEK_SET); // skip header
-			gzread(f, pMem, 128*96*3);
-			gzclose(f);
-		} else {
-			memcpy(pMem, NoPic_Image.pixel_data, 128*96*3);
-			DrawNumBorPic(pMem, StatesC+1);
-		}
-		GPU_showScreenPic(pMem);
-
-		free(pMem);
-		ShowPic = 1;
-	} else { GPU_showScreenPic(NULL); ShowPic = 0; }
-}
-
-void GetStateFilename(char *out, int i) {
-	char trimlabel[33];
-	int j;
-
-	strncpy(trimlabel, CdromLabel, 32);
-	trimlabel[32] = 0;
-	for (j=31; j>=0; j--)
-		if (trimlabel[j] == ' ')
-			trimlabel[j] = '\0';
-
-	sprintf(out, "sstates\\%.32s-%.9s.%3.3d", trimlabel, CdromId, i);
-}
-
-void PADhandleKey(int key) {
-	char Text[255];
-	int ret;
-
-	if (Running == 0) return;
-	switch (key) {
-		case 0: break;
-		case VK_F1:
-			GetStateFilename(Text, StatesC);
-			GPU_freeze(2, (GPUFreeze_t *)&StatesC);
-			ret = SaveState(Text);
-			if (ret == 0)
-				 sprintf(Text, _("*PCSX*: Saved State %d"), StatesC+1);
-			else sprintf(Text, _("*PCSX*: Error Saving State %d"), StatesC+1);
-			GPU_displayText(Text);
-			if (ShowPic) { ShowPic = 0; gpuShowPic(); }
-			break;
-
-		case VK_F2:
-			if (StatesC < 4) StatesC++;
-			else StatesC = 0;
-			GPU_freeze(2, (GPUFreeze_t *)&StatesC);
-			if (ShowPic) { ShowPic = 0; gpuShowPic(); }
-			break;
-
-		case VK_F3:
-			GetStateFilename(Text, StatesC);
-			ret = LoadState(Text);
-			if (ret == 0)
-				 sprintf(Text, _("*PCSX*: Loaded State %d"), StatesC+1);
-			else sprintf(Text, _("*PCSX*: Error Loading State %d"), StatesC+1);
-			GPU_displayText(Text);
-			break;
-
-		case VK_F4:
-			gpuShowPic();
-			break;
-
-		case VK_F5:
-			Config.Sio ^= 0x1;
-			if (Config.Sio)
-				 sprintf(Text, _("*PCSX*: Sio Irq Always Enabled"));
-			else sprintf(Text, _("*PCSX*: Sio Irq Not Always Enabled"));
-			GPU_displayText(Text);
-			break;
-
-		case VK_F6:
-			Config.Mdec ^= 0x1;
-			if (Config.Mdec)
-				 sprintf(Text, _("*PCSX*: Black&White Mdecs Only Enabled"));
-			else sprintf(Text, _("*PCSX*: Black&White Mdecs Only Disabled"));
-			GPU_displayText(Text);
-			break;
-
-		case VK_F7:
-			Config.Xa ^= 0x1;
-			if (Config.Xa == 0)
-				 sprintf (Text, _("*PCSX*: Xa Enabled"));
-			else sprintf (Text, _("*PCSX*: Xa Disabled"));
-			GPU_displayText(Text);
-			break;
-
-		case VK_F8:
-			GPU_makeSnapshot();
-			return;
-
-		case VK_F9:
-			GPU_displayText(_("*PCSX*: CdRom Case Opened"));
-			SetCdOpenCaseTime(-1);
-			break;
-
-		case VK_F10:
-			GPU_displayText(_("*PCSX*: CdRom Case Closed"));
-			SetCdOpenCaseTime(0);
-			break;
-
-		case VK_F12:
-			SysPrintf("*PCSX*: CpuReset\n");
-			psxCpu->Reset();
-			break;
-
-		case VK_ESCAPE:
-			Running = 0;
-			ClosePlugins();
-			SysRunGui();
-			break;
-	}
-}
-
-void CALLBACK SPUirq(void);
-
-char charsTable[4] = { "|/-\\" };
-
-BOOL CALLBACK ConnectDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) {
-	char str[256];
-	static int waitState;
-
-	switch(uMsg) {
-		case WM_INITDIALOG:
-			SetWindowText(hW, _("Connecting..."));
-
-			sprintf(str, _("Please wait while connecting... %c\n"), charsTable[waitState]);
-			Static_SetText(GetDlgItem(hW, IDC_CONNECTSTR), str);
-			SetTimer(hW, 0, 100, NULL);
-			return TRUE;
-
-		case WM_TIMER:
-			if (++waitState == 4) waitState = 0;
-			sprintf(str, _("Please wait while connecting... %c\n"), charsTable[waitState]);
-			Static_SetText(GetDlgItem(hW, IDC_CONNECTSTR), str);
-			return TRUE;
-
-/*		case WM_COMMAND:
-			switch (LOWORD(wParam)) {
- 			case IDCANCEL:
-					WaitCancel = 1;
-					return TRUE;
-			}*/
-	}
-
-	return FALSE;
-}
-
-#define PARSEPATH(dst, src) \
-	ptr = src + strlen(src); \
-	while (*ptr != '\\' && ptr != src) ptr--; \
-	if (ptr != src) { \
-		strcpy(dst, ptr+1); \
-	}
-
-int _OpenPlugins(HWND hWnd) {
-	int ret;
-
-	GPU_clearDynarec(clearDynarec);
-
-	ret = CDR_open();
-	if (ret < 0) { SysMessage (_("Error Opening CDR Plugin")); return -1; }
-
-	SetCurrentDirectory(PcsxDir);
-	if (Config.UseNet && !NetOpened) {
-		netInfo info;
-		char path[256];
-
-		strcpy(info.EmuName, "PCSX " PACKAGE_VERSION);
-		strncpy(info.CdromID, CdromId, 9);
-		strncpy(info.CdromLabel, CdromLabel, 9);
-		info.psxMem = psxM;
-		info.GPU_showScreenPic = GPU_showScreenPic;
-		info.GPU_displayText = GPU_displayText;
-		info.GPU_showScreenPic = GPU_showScreenPic;
-		info.PAD_setSensitive = PAD1_setSensitive;
-		sprintf(path, "%s%s", Config.BiosDir, Config.Bios);
-		strcpy(info.BIOSpath, path);
-		strcpy(info.MCD1path, Config.Mcd1);
-		strcpy(info.MCD2path, Config.Mcd2);
-		sprintf(path, "%s%s", Config.PluginsDir, Config.Gpu);
-		strcpy(info.GPUpath, path);
-		sprintf(path, "%s%s", Config.PluginsDir, Config.Spu);
-		strcpy(info.SPUpath, path);
-		sprintf(path, "%s%s", Config.PluginsDir, Config.Cdr);
-		strcpy(info.CDRpath, path);
-		NET_setInfo(&info);
-
-		ret = NET_open(hWnd);
-		if (ret < 0) {
-			if (ret == -2) {
-				// -2 is returned when something in the info
-				// changed and needs to be synced
-				char *ptr;
-
-				PARSEPATH(Config.Bios, info.BIOSpath);
-				PARSEPATH(Config.Gpu, info.GPUpath);
-				PARSEPATH(Config.Spu, info.SPUpath);
-				PARSEPATH(Config.Cdr, info.CDRpath);
-
-				strcpy(Config.Mcd1, info.MCD1path);
-				strcpy(Config.Mcd2, info.MCD2path);
-				return -2;
-			} else {
-				Config.UseNet = FALSE;
-			}
-		} else {
-			HWND hW = CreateDialog(gApp.hInstance, MAKEINTRESOURCE(IDD_CONNECT), gApp.hWnd, ConnectDlgProc);
-			ShowWindow(hW, SW_SHOW);
-
-			if (NET_queryPlayer() == 1) {
-				if (SendPcsxInfo() == -1) Config.UseNet = FALSE;
-			} else {
-				if (RecvPcsxInfo() == -1) Config.UseNet = FALSE;
-			}
-
-			DestroyWindow(hW);
-		}
-		NetOpened = TRUE;
-	} else if (Config.UseNet) {
-		NET_resume();
-	}
-
-	ret = GPU_open(hWnd);
-	if (ret < 0) { SysMessage (_("Error Opening GPU Plugin (%d)"), ret); return -1; }
-	ret = SPU_open(hWnd);
-	if (ret < 0) { SysMessage (_("Error Opening SPU Plugin (%d)"), ret); return -1; }
-	SPU_registerCallback(SPUirq);
-	ret = PAD1_open(hWnd);
-	if (ret < 0) { SysMessage (_("Error Opening PAD1 Plugin (%d)"), ret); return -1; }
-	ret = PAD2_open(hWnd);
-	if (ret < 0) { SysMessage (_("Error Opening PAD2 Plugin (%d)"), ret); return -1; }
-
-	SetCurrentDirectory(PcsxDir);
-	ShowCursor(FALSE);
-	return 0;
-}
-
-int OpenPlugins(HWND hWnd, int internaliso) {
-	int ret;
-
-	while ((ret = _OpenPlugins(hWnd)) == -2) {
-		ReleasePlugins();
-		LoadMcds(Config.Mcd1, Config.Mcd2);
-		if (LoadPlugins() == -1) return -1;
-	}
-	return ret;	
-}
-
-void ClosePlugins() {
-	int ret;
-
-	// PAD plugins have to be closed first, otherwise some plugins like
-	// LilyPad will mess up the window handle and cause crash.
-	// Also don't check return value here, as LilyPad uses void.
-	PAD1_close();
-	PAD2_close();
-
-	UpdateMenuSlots();
-
-	ret = CDR_close();
-	if (ret < 0) { SysMessage (_("Error Closing CDR Plugin")); return; }
-	ret = GPU_close();
-	if (ret < 0) { SysMessage (_("Error Closing GPU Plugin")); return; }
-	ret = SPU_close();
-	if (ret < 0) { SysMessage (_("Error Closing SPU Plugin")); return; }
-
-	if (Config.UseNet) {
-		NET_pause();
-	}
-}
-
-void ResetPlugins() {
-	int ret;
-
-	CDR_shutdown();
-	GPU_shutdown();
-	SPU_shutdown();
-	PAD1_shutdown();
-	PAD2_shutdown();
-	if (Config.UseNet) NET_shutdown(); 
-
-	ret = CDR_init();
-	if (ret != 0) { SysMessage (_("CDRinit error: %d"), ret); return; }
-	ret = GPU_init();
-	if (ret != 0) { SysMessage (_("GPUinit error: %d"), ret); return; }
-	ret = SPU_init();
-	if (ret != 0) { SysMessage (_("SPUinit error: %d"), ret); return; }
-	ret = PAD1_init(1);
-	if (ret != 0) { SysMessage (_("PAD1init error: %d"), ret); return; }
-	ret = PAD2_init(2);
-	if (ret != 0) { SysMessage (_("PAD2init error: %d"), ret); return; }
-	if (Config.UseNet) {
-		ret = NET_init();
-		if (ret < 0) { SysMessage (_("NETinit error: %d"), ret); return; }
-	}
-
-	NetOpened = FALSE;
-}
+/* Pcsx - Pc Psx Emulator
+ * Copyright (C) 1999-2003 Pcsx Team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <windows.h>
+#include <windowsx.h>
+#include <stdio.h>
+#include "plugin.h"
+#include "plugins.h"
+#include "resource.h"
+#include <time.h>
+#include <stdio.h>
+
+#include "r3000a.h"
+#include "Win32.h"
+#include "NoPic.h"
+#include "misc.h"
+#include "sio.h"
+
+int ShowPic = 0;
+
+extern void LidInterrupt();
+
+void gpuShowPic() {
+	char Text[255];
+	gzFile f;
+
+	if (!ShowPic) {
+		unsigned char *pMem;
+
+		pMem = (unsigned char *) malloc(128*96*3);
+		if (pMem == NULL) return;
+		GetStateFilename(Text, StatesC);
+
+		GPU_freeze(2, (GPUFreeze_t *)&StatesC);
+
+		f = gzopen(Text, "rb");
+		if (f != NULL) {
+			gzseek(f, 32, SEEK_SET); // skip header
+ gzseek(f, sizeof(u32), SEEK_CUR);
+ gzseek(f, sizeof(boolean), SEEK_CUR);
+			gzread(f, pMem, 128*96*3);
+			gzclose(f);
+		} else {
+			memcpy(pMem, NoPic_Image.pixel_data, 128*96*3);
+			DrawNumBorPic(pMem, StatesC+1);
+		}
+		GPU_showScreenPic(pMem);
+
+		free(pMem);
+		ShowPic = 1;
+	} else { GPU_showScreenPic(NULL); ShowPic = 0; }
+}
+
+void GetStateFilename(char *out, int i) {
+	char trimlabel[33];
+	int j;
+
+	strncpy(trimlabel, CdromLabel, 32);
+	trimlabel[32] = 0;
+	for (j=31; j>=0; j--)
+		if (trimlabel[j] == ' ')
+			trimlabel[j] = '\0';
+
+	sprintf(out, "sstates\\%.32s-%.9s.%3.3d", trimlabel, CdromId, i);
+}
+
+void PADhandleKey(int key) {
+	char Text[255];
+	int ret;
+
+	if (Running == 0) return;
+	switch (key) {
+		case 0: break;
+		case VK_F1:
+			GetStateFilename(Text, StatesC);
+			GPU_freeze(2, (GPUFreeze_t *)&StatesC);
+			ret = SaveState(Text);
+			if (ret == 0)
+				 sprintf(Text, _("*PCSXR*: Saved State %d"), StatesC+1);
+			else sprintf(Text, _("*PCSXR*: Error Saving State %d"), StatesC+1);
+			GPU_displayText(Text);
+			if (ShowPic) { ShowPic = 0; gpuShowPic(); }
+			break;
+
+		case VK_F2:
+			if (StatesC < 8) StatesC++;
+			else StatesC = 0;
+			GPU_freeze(2, (GPUFreeze_t *)&StatesC);
+			if (ShowPic) { ShowPic = 0; gpuShowPic(); }
+			break;
+
+		case VK_F3:
+			GetStateFilename(Text, StatesC);
+			ret = LoadState(Text);
+			if (ret == 0)
+				 sprintf(Text, _("*PCSXR*: Loaded State %d"), StatesC+1);
+			else sprintf(Text, _("*PCSXR*: Error Loading State %d"), StatesC+1);
+			GPU_displayText(Text);
+			break;
+
+		case VK_F4:
+			gpuShowPic();
+			break;
+
+		case VK_F5:
+			Config.SioIrq ^= 0x1;
+			if (Config.SioIrq)
+				 sprintf(Text, _("*PCSXR*: Sio Irq Always Enabled"));
+			else sprintf(Text, _("*PCSXR*: Sio Irq Not Always Enabled"));
+			GPU_displayText(Text);
+			break;
+
+		case VK_F6:
+			Config.Mdec ^= 0x1;
+			if (Config.Mdec)
+				 sprintf(Text, _("*PCSXR*: Black&White Mdecs Only Enabled"));
+			else sprintf(Text, _("*PCSXR*: Black&White Mdecs Only Disabled"));
+			GPU_displayText(Text);
+			break;
+
+		case VK_F7:
+			Config.Xa ^= 0x1;
+			if (Config.Xa == 0)
+				 sprintf (Text, _("*PCSXR*: Xa Enabled"));
+			else sprintf (Text, _("*PCSXR*: Xa Disabled"));
+			GPU_displayText(Text);
+			break;
+
+		case VK_F8:
+			GPU_makeSnapshot();
+			return;
+
+		case VK_F9:
+			GPU_displayText(_("*PCSXR*: CdRom Case Opened"));
+			SetCdOpenCaseTime(-1);
+			LidInterrupt();
+			break;
+
+		case VK_F10:
+			GPU_displayText(_("*PCSXR*: CdRom Case Closed"));
+			SetCdOpenCaseTime(0);
+			LidInterrupt();
+			break;
+
+		case VK_F12:
+			SysPrintf("*PCSXR*: CpuReset\n");
+			psxReset();
+			break;
+
+		case VK_ESCAPE:
+			ShowCursor(TRUE); // we want GUI to have cursor always
+			Running = 0;
+			ClosePlugins();
+			SysRunGui();
+			break;
+	}
+}
+
+char charsTable[4] = { "|/-\\" };
+
+BOOL CALLBACK ConnectDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) {
+	char str[256];
+	static int waitState;
+
+	switch(uMsg) {
+		case WM_INITDIALOG:
+			SetWindowText(hW, _("Connecting..."));
+
+			sprintf(str, _("Please wait while connecting... %c\n"), charsTable[waitState]);
+			Static_SetText(GetDlgItem(hW, IDC_CONNECTSTR), str);
+			SetTimer(hW, 0, 100, NULL);
+			return TRUE;
+
+		case WM_TIMER:
+			if (++waitState == 4) waitState = 0;
+			sprintf(str, _("Please wait while connecting... %c\n"), charsTable[waitState]);
+			Static_SetText(GetDlgItem(hW, IDC_CONNECTSTR), str);
+			return TRUE;
+
+/*		case WM_COMMAND:
+			switch (LOWORD(wParam)) {
+ 			case IDCANCEL:
+					WaitCancel = 1;
+					return TRUE;
+			}*/
+	}
+
+	return FALSE;
+}
+
+#define PARSEPATH(dst, src) \
+	ptr = src + strlen(src); \
+	while (*ptr != '\\' && ptr != src) ptr--; \
+	if (ptr != src) { \
+		strcpy(dst, ptr+1); \
+	}
+
+int _OpenPlugins(HWND hWnd) {
+	int ret;
+
+	GPU_clearDynarec(clearDynarec);
+
+	ret = CDR_open();
+	//if (ret < 0) { SysMessage (_("Error Opening CDR Plugin")); return -1; }
+
+	SetCurrentDirectory(PcsxrDir);
+	if (Config.UseNet && !NetOpened) {
+		netInfo info;
+		char path[256];
+
+		strcpy(info.EmuName, "PCSXR " PACKAGE_VERSION);
+		strncpy(info.CdromID, CdromId, 9);
+		strncpy(info.CdromLabel, CdromLabel, 9);
+		info.psxMem = psxM;
+		info.GPU_showScreenPic = GPU_showScreenPic;
+		info.GPU_displayText = GPU_displayText;
+		info.GPU_showScreenPic = GPU_showScreenPic;
+		info.PAD_setSensitive = PAD1_setSensitive;
+		sprintf(path, "%s%s", Config.BiosDir, Config.Bios);
+		strcpy(info.BIOSpath, path);
+		strcpy(info.MCD1path, Config.Mcd1);
+		strcpy(info.MCD2path, Config.Mcd2);
+		sprintf(path, "%s%s", Config.PluginsDir, Config.Gpu);
+		strcpy(info.GPUpath, path);
+		sprintf(path, "%s%s", Config.PluginsDir, Config.Spu);
+		strcpy(info.SPUpath, path);
+		sprintf(path, "%s%s", Config.PluginsDir, Config.Cdr);
+		strcpy(info.CDRpath, path);
+		NET_setInfo(&info);
+
+		ret = NET_open(hWnd);
+		if (ret < 0) {
+			if (ret == -2) {
+				// -2 is returned when something in the info
+				// changed and needs to be synced
+				char *ptr;
+
+				PARSEPATH(Config.Bios, info.BIOSpath);
+				PARSEPATH(Config.Gpu, info.GPUpath);
+				PARSEPATH(Config.Spu, info.SPUpath);
+				PARSEPATH(Config.Cdr, info.CDRpath);
+
+				strcpy(Config.Mcd1, info.MCD1path);
+				strcpy(Config.Mcd2, info.MCD2path);
+				return -2;
+			} else {
+				Config.UseNet = FALSE;
+			}
+		} else {
+			HWND hW = CreateDialog(gApp.hInstance, MAKEINTRESOURCE(IDD_CONNECT), gApp.hWnd, ConnectDlgProc);
+			ShowWindow(hW, SW_SHOW);
+
+			if (NET_queryPlayer() == 1) {
+				if (SendPcsxInfo() == -1) Config.UseNet = FALSE;
+			} else {
+				if (RecvPcsxInfo() == -1) Config.UseNet = FALSE;
+			}
+
+			DestroyWindow(hW);
+		}
+		NetOpened = TRUE;
+	} else if (Config.UseNet) {
+		NET_resume();
+	}
+
+	ret = GPU_open(hWnd);
+	if (ret < 0) { SysMessage (_("Error Opening GPU Plugin (%d)"), ret); return -1; }
+	ret = SPU_open(hWnd);
+	if (ret < 0) { SysMessage (_("Error Opening SPU Plugin (%d)"), ret); return -1; }
+	SPU_registerCallback(SPUirq);
+	ret = PAD1_open(hWnd);
+	if (ret < 0) { SysMessage (_("Error Opening PAD1 Plugin (%d)"), ret); return -1; }
+	PAD1_registerVibration(GPU_visualVibration);
+	PAD1_registerCursor(GPU_cursor);
+	ret = PAD2_open(hWnd);
+	if (ret < 0) { SysMessage (_("Error Opening PAD2 Plugin (%d)"), ret); return -1; }
+	PAD2_registerVibration(GPU_visualVibration);
+	PAD2_registerCursor(GPU_cursor);
+#ifdef ENABLE_SIO1API
+	ret = SIO1_open(hWnd);
+	if (ret < 0) { SysMessage (_("Error Opening SIO1 plugin (%d)"), ret); return -1; }
+	SIO1_registerCallback(SIO1irq);
+#endif
+	
+	SetCurrentDirectory(PcsxrDir);
+	
+	if(Config.HideCursor)
+		ShowCursor(FALSE);
+	return 0;
+}
+
+int OpenPlugins(HWND hWnd, int internaliso) {
+	int ret;
+
+	while ((ret = _OpenPlugins(hWnd)) == -2) {
+		ReleasePlugins();
+		LoadMcds(Config.Mcd1, Config.Mcd2);
+		if (LoadPlugins() == -1) return -1;
+	}
+	return ret;
+}
+
+void ClosePlugins() {
+	int ret;
+
+	// PAD plugins have to be closed first, otherwise some plugins like
+	// LilyPad will mess up the window handle and cause crash.
+	// Also don't check return value here, as LilyPad uses void.
+	PAD1_close();
+	PAD2_close();
+
+	ret = CDR_close();
+	if (ret < 0) { SysMessage (_("Error Closing CDR Plugin")); return; }
+	ret = GPU_close();
+	if (ret < 0) { SysMessage (_("Error Closing GPU Plugin")); return; }
+	ret = SPU_close();
+	if (ret < 0) { SysMessage (_("Error Closing SPU Plugin")); return; }
+#ifdef ENABLE_SIO1API
+	ret = SIO1_close();
+	if (ret < 0) { SysMessage (_("Error Closing SIO1 plugin")); return; }
+#endif
+
+	if (Config.UseNet) {
+		NET_pause();
+	}
+}
+
+void ResetPlugins() {
+	int ret;
+
+	CDR_shutdown();
+	GPU_shutdown();
+	SPU_shutdown();
+	PAD1_shutdown();
+	PAD2_shutdown();
+#ifdef ENABLE_SIO1API
+	SIO1_shutdown();
+#endif
+	if (Config.UseNet) NET_shutdown();
+
+	ret = CDR_init();
+	if (ret != 0) { SysMessage (_("CDRinit error: %d"), ret); return; }
+	ret = GPU_init();
+	if (ret != 0) { SysMessage (_("GPUinit error: %d"), ret); return; }
+	ret = SPU_init();
+	if (ret != 0) { SysMessage (_("SPUinit error: %d"), ret); return; }
+	ret = PAD1_init(1);
+	if (ret != 0) { SysMessage (_("PAD1init error: %d"), ret); return; }
+	ret = PAD2_init(2);
+	if (ret != 0) { SysMessage (_("PAD2init error: %d"), ret); return; }
+#ifdef ENABLE_SIO1API
+	ret = SIO1_init();
+	if (ret != 0) { SysMessage (_("SIO1init error: %d"), ret); return; }
+#endif
+
+	if (Config.UseNet) {
+		ret = NET_init();
+		if (ret < 0) { SysMessage (_("NETinit error: %d"), ret); return; }
+	}
+
+	NetOpened = FALSE;
+}

pcsxr-1.9.92.tar.bz2/win32/gui/plugin.h -> pcsxr-1.9.93.tar.bz2/win32/gui/plugin.h Changed

pcsxr-1.9.92.tar.bz2/win32/intl/bindtextdom.c -> pcsxr-1.9.93.tar.bz2/win32/intl/bindtextdom.c Changed

pcsxr-1.9.92.tar.bz2/win32/intl/dcgettext.c -> pcsxr-1.9.93.tar.bz2/win32/intl/dcgettext.c Changed

pcsxr-1.9.92.tar.bz2/win32/intl/dgettext.c -> pcsxr-1.9.93.tar.bz2/win32/intl/dgettext.c Changed

pcsxr-1.9.92.tar.bz2/win32/intl/explodename.c -> pcsxr-1.9.93.tar.bz2/win32/intl/explodename.c Changed

pcsxr-1.9.92.tar.bz2/win32/intl/finddomain.c -> pcsxr-1.9.93.tar.bz2/win32/intl/finddomain.c Changed

pcsxr-1.9.92.tar.bz2/win32/intl/gettext.c -> pcsxr-1.9.93.tar.bz2/win32/intl/gettext.c Changed

pcsxr-1.9.92.tar.bz2/win32/intl/gettext.h -> pcsxr-1.9.93.tar.bz2/win32/intl/gettext.h Changed

pcsxr-1.9.92.tar.bz2/win32/intl/gettextP.h -> pcsxr-1.9.93.tar.bz2/win32/intl/gettextP.h Changed

pcsxr-1.9.92.tar.bz2/win32/intl/hash-string.h -> pcsxr-1.9.93.tar.bz2/win32/intl/hash-string.h Changed

pcsxr-1.9.92.tar.bz2/win32/intl/intl-compat.c -> pcsxr-1.9.93.tar.bz2/win32/intl/intl-compat.c Changed

pcsxr-1.9.92.tar.bz2/win32/intl/intlconfig.h -> pcsxr-1.9.93.tar.bz2/win32/intl/intlconfig.h Changed

@@ -1,248 +1,248 @@
-/* config.h. Generated automatically by configure. */
-/* config.h.in. Generated automatically from configure.in by autoheader. */
-/* Special definitions, processed by autoheader.
- Copyright (C) 1995, 1996, 1997 Free Software Foundation.
- Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. */
-
-/* Default value for alignment of strings in .mo file. */
-#define DEFAULT_OUTPUT_ALIGNMENT 1
-
-#ifndef PARAMS
-# if __STDC__
-# define PARAMS(args) args
-# else
-# define PARAMS(args) ()
-# endif
-#endif
-
-
-/* Define if using alloca.c. */
-/* #undef C_ALLOCA */
-
-/* Define to empty if the keyword does not work. */
-/* #undef const */
-
-/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
- This function is required for alloca.c support on those systems. */
-/* #undef CRAY_STACKSEG_END */
-
-/* Define if you have alloca, as a function or macro. */
-/* #define HAVE_ALLOCA 1 */
-
-/* Define if you have <alloca.h> and it should be used (not on Ultrix). */
-/* #undef HAVE_ALLOCA_H */
-
-/* Define if you don't have vprintf but do have _doprnt. */
-/* #undef HAVE_DOPRNT */
-
-/* Define if you have a working `mmap' system call. */
-/* #undef HAVE_MMAP */
-
-/* Define if you have the vprintf function. */
-#define HAVE_VPRINTF 1
-
-/* Define as __inline if that's what the C compiler calls it. */
-/* #undef inline */
-
-/* Define to `long' if <sys/types.h> doesn't define. */
-/* #undef off_t */
-
-/* Define if you need to in order for stat and other things to work. */
-/* #undef _POSIX_SOURCE */
-
-/* Define to `unsigned' if <sys/types.h> doesn't define. */
-/* #undef size_t */
-
-/* If using the C implementation of alloca, define if you know the
- direction of stack growth for your system; otherwise it will be
- automatically deduced at run-time.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown
- */
-/* #undef STACK_DIRECTION */
-
-/* Define if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define to the name of the distribution. */
-/* #define PACKAGE "gettext" */
-
-/* Define to the version of the distribution. */
-/* #define VERSION "0.10.35" */
-
-/* Define if <stddef.h> defines ptrdiff_t. */
-#define HAVE_PTRDIFF_T 1
-
-/* Define if your locale.h file contains LC_MESSAGES. */
-/* #undef HAVE_LC_MESSAGES */
-
-/* Define if you have the parse_printf_format function. */
-/* #undef HAVE_PARSE_PRINTF_FORMAT */
-
-/* Define to 1 if NLS is requested. */
-/* #undef ENABLE_NLS */
-
-/* Define as 1 if you have catgets and don't want to use GNU gettext. */
-/* #undef HAVE_CATGETS */
-
-/* Define as 1 if you have gettext and don't want to use GNU gettext. */
-/* #undef HAVE_GETTEXT */
-
-/* Define as 1 if you have the stpcpy function. */
-/* #undef HAVE_STPCPY */
-
-/* Define if you have the __argz_count function. */
-/* #undef HAVE___ARGZ_COUNT */
-
-/* Define if you have the __argz_next function. */
-/* #undef HAVE___ARGZ_NEXT */
-
-/* Define if you have the __argz_stringify function. */
-/* #undef HAVE___ARGZ_STRINGIFY */
-
-/* Define if you have the dcgettext function. */
-/* #undef HAVE_DCGETTEXT */
-
-/* Define if you have the getcwd function. */
-#define HAVE_GETCWD 1
-
-/* Define if you have the getdelim function. */
-/* #undef HAVE_GETDELIM */
-
-/* Define if you have the getline function. */
-/* #undef HAVE_GETLINE */
-
-/* Define if you have the getpagesize function. */
-#define HAVE_GETPAGESIZE 1
-
-/* Define if you have the mblen function. */
-#define HAVE_MBLEN 1
-
-/* Define if you have the memcpy function. */
-#define HAVE_MEMCPY 1
-
-/* Define if you have the memmove function. */
-#define HAVE_MEMMOVE 1
-
-/* Define if you have the memset function. */
-#define HAVE_MEMSET 1
-
-/* Define if you have the munmap function. */
-/* #undef HAVE_MUNMAP */
-
-/* Define if you have the putenv function. */
-#define HAVE_PUTENV 1
-
-/* Define if you have the setenv function. */
-/* #undef HAVE_SETENV */
-
-/* Define if you have the setlocale function. */
-#define HAVE_SETLOCALE 1
-
-/* Define if you have the stpcpy function. */
-/* #undef HAVE_STPCPY */
-
-/* Define if you have the stpncpy function. */
-/* #undef HAVE_STPNCPY */
-
-/* Define if you have the strcasecmp function. */
-/* #define HAVE_STRCASECMP 1 */
-
-/* Define if you have the strchr function. */
-#define HAVE_STRCHR 1
-
-/* Define if you have the strcspn function. */
-#define HAVE_STRCSPN 1
-
-/* Define if you have the strdup function. */
-#define HAVE_STRDUP 1
-
-/* Define if you have the strerror function. */
-#define HAVE_STRERROR 1
-
-/* Define if you have the strncasecmp function. */
-#define HAVE_STRNCASECMP 1
-
-/* Define if you have the strstr function. */
-#define HAVE_STRSTR 1
-
-/* Define if you have the strtoul function. */
-#define HAVE_STRTOUL 1
-
-/* Define if you have the uname function. */
-/* #undef HAVE_UNAME */
-
-/* Define if you have the vasprintf function. */
-/* #undef HAVE_VASPRINTF */
-
-/* Define if you have the <argz.h> header file. */
-/* #undef HAVE_ARGZ_H */
-
-/* Define if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
-/* Define if you have the <locale.h> header file. */
-#define HAVE_LOCALE_H 1
-
-/* Define if you have the <malloc.h> header file. */
-#define HAVE_MALLOC_H 1
-
-/* Define if you have the <nl_types.h> header file. */
-/* #undef HAVE_NL_TYPES_H */
-
-/* Define if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define if you have the <sys/param.h> header file. */
-/* #undef HAVE_SYS_PARAM_H */
-
-/* Define if you have the <unistd.h> header file. */
-/* #define HAVE_UNISTD_H 1 */
-
-/* Define if you have the <values.h> header file. */
-#define HAVE_VALUES_H 1
-
-/* Define if you have the i library (-li). */
-/* #undef HAVE_LIBI */
-
-/* We don't test for the basename function but still want to use the
- version in the libc when compiling for a system using glibc. */
-#ifdef __GNU_LIBRARY__
-# define HAVE_BASENAME	1
-#endif
-
-/* On GNU systems we want to use the extensions. */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE	1
-#endif
-
-
-/* A file name cannot consist of any character possible. INVALID_PATH_CHAR
- contains the characters not allowed. */
-#ifndef MSDOS
-# define	INVALID_PATH_CHAR "\1\2\3\4\5\6\7\10\11\12\13\14\15\16\17\20\21\22\23\24\25\26\27\30\31\32\33\34\35\36\37 \177/"
-#else
-/* Something like this for MSDOG. */
-# define	INVALID_PATH_CHAR "\1\2\3\4\5\6\7\10\11\12\13\14\15\16\17\20\21\22\23\24\25\26\27\30\31\32\33\34\35\36\37 \177\\:."
-#endif
-
-/* Length from which starting on warnings about too long strings are given.
- Several systems have limits for strings itself, more have problems with
- strings in their tools (important here: gencat). 1024 bytes is a
- conservative limit. Because many translation let the message size grow
- (German translations are always bigger) choose a length < 1024. */
-#define WARN_ID_LEN 900
-
-/* This is the page width for the message_print function. It should
- not be set to more than 79 characters (Emacs users will appreciate
- it). It is used to wrap the msgid and msgstr strings, and also to
- wrap the file position (#:) comments. */
-#define PAGE_WIDTH 79
-
-#define GNULOCALEDIR "./Langs"
-#define LOCALE_ALIAS_PATH GNULOCALEDIR
-
-#ifdef _MSC_VER
-#pragma warning (disable:4996)
-#endif
+/* config.h. Generated automatically by configure. */
+/* config.h.in. Generated automatically from configure.in by autoheader. */
+/* Special definitions, processed by autoheader.
+ Copyright (C) 1995, 1996, 1997 Free Software Foundation.
+ Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. */
+
+/* Default value for alignment of strings in .mo file. */
+#define DEFAULT_OUTPUT_ALIGNMENT 1
+
+#ifndef PARAMS
+# if __STDC__
+# define PARAMS(args) args
+# else
+# define PARAMS(args) ()
+# endif
+#endif
+
+
+/* Define if using alloca.c. */
+/* #undef C_ALLOCA */
+
+/* Define to empty if the keyword does not work. */
+/* #undef const */
+
+/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
+ This function is required for alloca.c support on those systems. */
+/* #undef CRAY_STACKSEG_END */
+
+/* Define if you have alloca, as a function or macro. */
+/* #define HAVE_ALLOCA 1 */
+
+/* Define if you have <alloca.h> and it should be used (not on Ultrix). */
+/* #undef HAVE_ALLOCA_H */
+
+/* Define if you don't have vprintf but do have _doprnt. */
+/* #undef HAVE_DOPRNT */
+
+/* Define if you have a working `mmap' system call. */
+/* #undef HAVE_MMAP */
+
+/* Define if you have the vprintf function. */
+#define HAVE_VPRINTF 1
+
+/* Define as __inline if that's what the C compiler calls it. */
+/* #undef inline */
+
+/* Define to `long' if <sys/types.h> doesn't define. */
+/* #undef off_t */
+
+/* Define if you need to in order for stat and other things to work. */
+/* #undef _POSIX_SOURCE */
+
+/* Define to `unsigned' if <sys/types.h> doesn't define. */
+/* #undef size_t */
+
+/* If using the C implementation of alloca, define if you know the
+ direction of stack growth for your system; otherwise it will be
+ automatically deduced at run-time.
+ STACK_DIRECTION > 0 => grows toward higher addresses
+ STACK_DIRECTION < 0 => grows toward lower addresses
+ STACK_DIRECTION = 0 => direction of growth unknown
+ */
+/* #undef STACK_DIRECTION */
+
+/* Define if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define to the name of the distribution. */
+/* #define PACKAGE "gettext" */
+
+/* Define to the version of the distribution. */
+/* #define VERSION "0.10.35" */
+
+/* Define if <stddef.h> defines ptrdiff_t. */
+#define HAVE_PTRDIFF_T 1
+
+/* Define if your locale.h file contains LC_MESSAGES. */
+/* #undef HAVE_LC_MESSAGES */
+
+/* Define if you have the parse_printf_format function. */
+/* #undef HAVE_PARSE_PRINTF_FORMAT */
+
+/* Define to 1 if NLS is requested. */
+/* #undef ENABLE_NLS */
+
+/* Define as 1 if you have catgets and don't want to use GNU gettext. */
+/* #undef HAVE_CATGETS */
+
+/* Define as 1 if you have gettext and don't want to use GNU gettext. */
+/* #undef HAVE_GETTEXT */
+
+/* Define as 1 if you have the stpcpy function. */
+/* #undef HAVE_STPCPY */
+
+/* Define if you have the __argz_count function. */
+/* #undef HAVE___ARGZ_COUNT */
+
+/* Define if you have the __argz_next function. */
+/* #undef HAVE___ARGZ_NEXT */
+
+/* Define if you have the __argz_stringify function. */
+/* #undef HAVE___ARGZ_STRINGIFY */
+
+/* Define if you have the dcgettext function. */
+/* #undef HAVE_DCGETTEXT */
+
+/* Define if you have the getcwd function. */
+#define HAVE_GETCWD 1
+
+/* Define if you have the getdelim function. */
+/* #undef HAVE_GETDELIM */
+
+/* Define if you have the getline function. */
+/* #undef HAVE_GETLINE */
+
+/* Define if you have the getpagesize function. */
+#define HAVE_GETPAGESIZE 1
+
+/* Define if you have the mblen function. */
+#define HAVE_MBLEN 1
+
+/* Define if you have the memcpy function. */
+#define HAVE_MEMCPY 1
+
+/* Define if you have the memmove function. */
+#define HAVE_MEMMOVE 1
+
+/* Define if you have the memset function. */
+#define HAVE_MEMSET 1
+
+/* Define if you have the munmap function. */
+/* #undef HAVE_MUNMAP */
+
+/* Define if you have the putenv function. */
+#define HAVE_PUTENV 1
+
+/* Define if you have the setenv function. */
+/* #undef HAVE_SETENV */
+
+/* Define if you have the setlocale function. */
+#define HAVE_SETLOCALE 1
+
+/* Define if you have the stpcpy function. */
+/* #undef HAVE_STPCPY */
+
+/* Define if you have the stpncpy function. */
+/* #undef HAVE_STPNCPY */
+
+/* Define if you have the strcasecmp function. */
+/* #define HAVE_STRCASECMP 1 */
+
+/* Define if you have the strchr function. */
+#define HAVE_STRCHR 1
+
+/* Define if you have the strcspn function. */
+#define HAVE_STRCSPN 1
+
+/* Define if you have the strdup function. */
+#define HAVE_STRDUP 1
+
+/* Define if you have the strerror function. */
+#define HAVE_STRERROR 1
+
+/* Define if you have the strncasecmp function. */
+#define HAVE_STRNCASECMP 1
+
+/* Define if you have the strstr function. */
+#define HAVE_STRSTR 1
+
+/* Define if you have the strtoul function. */
+#define HAVE_STRTOUL 1
+
+/* Define if you have the uname function. */
+/* #undef HAVE_UNAME */
+
+/* Define if you have the vasprintf function. */
+/* #undef HAVE_VASPRINTF */
+
+/* Define if you have the <argz.h> header file. */
+/* #undef HAVE_ARGZ_H */
+
+/* Define if you have the <limits.h> header file. */
+#define HAVE_LIMITS_H 1
+
+/* Define if you have the <locale.h> header file. */
+#define HAVE_LOCALE_H 1
+
+/* Define if you have the <malloc.h> header file. */
+#define HAVE_MALLOC_H 1
+
+/* Define if you have the <nl_types.h> header file. */
+/* #undef HAVE_NL_TYPES_H */
+
+/* Define if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define if you have the <sys/param.h> header file. */
+/* #undef HAVE_SYS_PARAM_H */
+
+/* Define if you have the <unistd.h> header file. */
+/* #define HAVE_UNISTD_H 1 */
+
+/* Define if you have the <values.h> header file. */
+#define HAVE_VALUES_H 1
+
+/* Define if you have the i library (-li). */
+/* #undef HAVE_LIBI */
+
+/* We don't test for the basename function but still want to use the
+ version in the libc when compiling for a system using glibc. */
+#ifdef __GNU_LIBRARY__
+# define HAVE_BASENAME	1
+#endif
+
+/* On GNU systems we want to use the extensions. */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE	1
+#endif
+
+
+/* A file name cannot consist of any character possible. INVALID_PATH_CHAR
+ contains the characters not allowed. */
+#ifndef MSDOS
+# define	INVALID_PATH_CHAR "\1\2\3\4\5\6\7\10\11\12\13\14\15\16\17\20\21\22\23\24\25\26\27\30\31\32\33\34\35\36\37 \177/"
+#else
+/* Something like this for MSDOG. */
+# define	INVALID_PATH_CHAR "\1\2\3\4\5\6\7\10\11\12\13\14\15\16\17\20\21\22\23\24\25\26\27\30\31\32\33\34\35\36\37 \177\\:."
+#endif
+
+/* Length from which starting on warnings about too long strings are given.
+ Several systems have limits for strings itself, more have problems with
+ strings in their tools (important here: gencat). 1024 bytes is a
+ conservative limit. Because many translation let the message size grow
+ (German translations are always bigger) choose a length < 1024. */
+#define WARN_ID_LEN 900
+
+/* This is the page width for the message_print function. It should
+ not be set to more than 79 characters (Emacs users will appreciate
+ it). It is used to wrap the msgid and msgstr strings, and also to
+ wrap the file position (#:) comments. */
+#define PAGE_WIDTH 79
+
+#define GNULOCALEDIR "./Langs"
+#define LOCALE_ALIAS_PATH GNULOCALEDIR
+
+#ifdef _MSC_VER
+#pragma warning (disable:4996)
+#endif

pcsxr-1.9.92.tar.bz2/win32/intl/l10nflist.c -> pcsxr-1.9.93.tar.bz2/win32/intl/l10nflist.c Changed

pcsxr-1.9.92.tar.bz2/win32/intl/libgettext.h -> pcsxr-1.9.93.tar.bz2/win32/intl/libgettext.h Changed

pcsxr-1.9.92.tar.bz2/win32/intl/libintl.h -> pcsxr-1.9.93.tar.bz2/win32/intl/libintl.h Changed

@@ -1,112 +1,112 @@
-/* This file is part of a Windows32 DLL Interface to:
- GNU gettext - internationalization aids
- Copyright (C) 1996, 1998 Free Software Foundation, Inc.
-
- This file was written by Franco Bez <franco.bez@gmx.de>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. */
-
-/* REPLACEMENT FOR ORIGINAL LIBINTL.H for use with Windows32 */
-
-#if !defined(__LIBINTL_H_INCLUDED)
-#define __LIBINTL_H_INCLUDED
-
-#if defined(__cplusplus)
-extern "C" { 
-#endif
-
-/* See if we allready know what we want static or dll linkage or none at all*/
-#if defined DONT_USE_GETTEXT || ( defined USE_SAFE_GETTEXT_DLL && defined USE_GETTEXT_STATIC ) || ( defined USE_GETTEXT_DLL && defined USE_SAFE_GETTEXT_DLL ) || ( defined USE_GETTEXT_DLL && defined USE_GETTEXT_STATIC ) 
-/* TWO IS HARDLY POSSIBLE */
-#undef USE_GETTEXT_DLL
-#undef USE_GETTEXT_STATIC
-#undef USE_SAFE_GETTEXT_DLL
-#endif /* MORE THAN ONE - OR NONE AT ALL */
-
-#if !defined USE_GETTEXT_DLL && !defined USE_SAFE_GETTEXT_DLL && !defined USE_GETTEXT_STATIC && !defined DONT_USE_GETTEXT
-/* not explicitly defined so try to guess it - 
- if GNUC is used - we use static linkage by default
- because at the moment this is the only plattform
-	 for which a static lib is available
- else we use the DLL built with GNUC */ 
-# define USE_GETTEXT_STATIC
-#endif /* NONE */
-
-/* NOW ONLY ONE OF
- DONT_USE_GETTEXT , USE_GETTEXT_DLL , USE_SAFE_GETTEXT_DLL , USE_GETTEXT_STATIC 
- IS DEFINED */
-
-#if defined USE_GETTEXT_DLL
-/* exported functions in DLL gnu_gettext.dll 
- you should link with import library 
- -lgnu_gettext (for mingw32) OR gnu_gettext.lib (MSVC) */
-__declspec(dllimport) char *gettext(const char *__msgid);
-__declspec(dllimport) char *dgettext(const char *__domainname,const char *__msgid);
-__declspec(dllimport) char *dcgettext(const char *__domainname,const char *__msgid, int __category);
-__declspec(dllimport) char *textdomain(const char *__domainname);
-__declspec(dllimport) char *bindtextdomain(const char *__domainname,const char *__dirname);
-/* calling _putenv from within the DLL */
-__declspec(dllexport) int gettext_putenv(const char *envstring);
-#endif /* DLL */
-
-#if defined USE_SAFE_GETTEXT_DLL
-/* Uses DLL gnu_gettext.dll ONLY if present, otherwise NO translation will take place
- you should link with "safe_gettext_dll.o -lstdc++" see README for safe_gettext_dll for Details */
-/* The safe gettext functions */
-extern char *gettext(const char *szMsgId);
-extern char *dgettext(const char *szDomain,const char *szMsgId);
-extern char *dcgettext(const char *szDomain,const char *szMsgId,int iCategory);
-extern char *textdomain(const char *szDomain);
-extern char *bindtextdomain(const char *szDomain,const char *szDirectory);
-/* calling _putenv from within the DLL */
-extern int gettext_putenv(const char *envstring);
-#endif /* SAFE DLL */
-
-#if defined USE_GETTEXT_STATIC
-/* exported functions in static library libintl.a 
- and supporting macros
- you should link with -lintl (mingw32) */
-extern char *gettext__(const char *__msgid);
-extern char *dgettext__(const char *__domainname,const char *__msgid);
-extern char *dcgettext__(const char *__domainname,const char *__msgid, int __category);
-extern char *textdomain__(const char *__domainname);
-extern char *bindtextdomain__(const char *__domainname,const char *__dirname);
-#define gettext(szMsgId) gettext__(szMsgId)
-#define dgettext(szDomain,szMsgId) dgettext__(szDomain,szMsgId)
-#define dcgettext(szDomain,szMsgId,iCategory) dcgettext__(szDomain,szMsgId,iCategory)
-#define textdomain(szDomain) textdomain__(szDomain)
-#define bindtextdomain(szDomain,szDirectory) bindtextdomain__(szDomain,szDirectory)
-// dummy - for static linkage - calling _putenv from within the DLL
-#define gettext_putenv(a) _putenv(a)
-#endif /* STATIC */
-
-#if defined DONT_USE_GETTEXT
-/* DON'T USE GETTEXT AT ALL
- MAKROS TO MAKE CODE COMPILE WELL, BUT GETTEXT WILL NOT BE USESD
-*/
-# define gettext(Msgid) (Msgid)
-# define dgettext(Domainname, Msgid) (Msgid)
-# define dcgettext(Domainname, Msgid, Category) (Msgid)
-# define textdomain(Domainname) ((char *) Domainname)
-# define bindtextdomain(Domainname, Dirname) ((char *) Dirname)
-// dummy - for static linkage - calling _putenv from within the DLL
-# define gettext_putenv(a) _putenv(a)
-#endif /* DON'T USE AT ALL */
-
-#if defined(__cplusplus)
-} /* extern "C" */
-#endif
-
-#endif /*!defined(__LIBINTL_H_INCLUDED)*/
+/* This file is part of a Windows32 DLL Interface to:
+ GNU gettext - internationalization aids
+ Copyright (C) 1996, 1998 Free Software Foundation, Inc.
+
+ This file was written by Franco Bez <franco.bez@gmx.de>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
+
+/* REPLACEMENT FOR ORIGINAL LIBINTL.H for use with Windows32 */
+
+#if !defined(__LIBINTL_H_INCLUDED)
+#define __LIBINTL_H_INCLUDED
+
+#if defined(__cplusplus)
+extern "C" { 
+#endif
+
+/* See if we allready know what we want static or dll linkage or none at all*/
+#if defined DONT_USE_GETTEXT || ( defined USE_SAFE_GETTEXT_DLL && defined USE_GETTEXT_STATIC ) || ( defined USE_GETTEXT_DLL && defined USE_SAFE_GETTEXT_DLL ) || ( defined USE_GETTEXT_DLL && defined USE_GETTEXT_STATIC ) 
+/* TWO IS HARDLY POSSIBLE */
+#undef USE_GETTEXT_DLL
+#undef USE_GETTEXT_STATIC
+#undef USE_SAFE_GETTEXT_DLL
+#endif /* MORE THAN ONE - OR NONE AT ALL */
+
+#if !defined USE_GETTEXT_DLL && !defined USE_SAFE_GETTEXT_DLL && !defined USE_GETTEXT_STATIC && !defined DONT_USE_GETTEXT
+/* not explicitly defined so try to guess it - 
+ if GNUC is used - we use static linkage by default
+ because at the moment this is the only plattform
+	 for which a static lib is available
+ else we use the DLL built with GNUC */ 
+# define USE_GETTEXT_STATIC
+#endif /* NONE */
+
+/* NOW ONLY ONE OF
+ DONT_USE_GETTEXT , USE_GETTEXT_DLL , USE_SAFE_GETTEXT_DLL , USE_GETTEXT_STATIC 
+ IS DEFINED */
+
+#if defined USE_GETTEXT_DLL
+/* exported functions in DLL gnu_gettext.dll 
+ you should link with import library 
+ -lgnu_gettext (for mingw32) OR gnu_gettext.lib (MSVC) */
+__declspec(dllimport) char *gettext(const char *__msgid);
+__declspec(dllimport) char *dgettext(const char *__domainname,const char *__msgid);
+__declspec(dllimport) char *dcgettext(const char *__domainname,const char *__msgid, int __category);
+__declspec(dllimport) char *textdomain(const char *__domainname);
+__declspec(dllimport) char *bindtextdomain(const char *__domainname,const char *__dirname);
+/* calling _putenv from within the DLL */
+__declspec(dllexport) int gettext_putenv(const char *envstring);
+#endif /* DLL */
+
+#if defined USE_SAFE_GETTEXT_DLL
+/* Uses DLL gnu_gettext.dll ONLY if present, otherwise NO translation will take place
+ you should link with "safe_gettext_dll.o -lstdc++" see README for safe_gettext_dll for Details */
+/* The safe gettext functions */
+extern char *gettext(const char *szMsgId);
+extern char *dgettext(const char *szDomain,const char *szMsgId);
+extern char *dcgettext(const char *szDomain,const char *szMsgId,int iCategory);
+extern char *textdomain(const char *szDomain);
+extern char *bindtextdomain(const char *szDomain,const char *szDirectory);
+/* calling _putenv from within the DLL */
+extern int gettext_putenv(const char *envstring);
+#endif /* SAFE DLL */
+
+#if defined USE_GETTEXT_STATIC
+/* exported functions in static library libintl.a 
+ and supporting macros
+ you should link with -lintl (mingw32) */
+extern char *gettext__(const char *__msgid);
+extern char *dgettext__(const char *__domainname,const char *__msgid);
+extern char *dcgettext__(const char *__domainname,const char *__msgid, int __category);
+extern char *textdomain__(const char *__domainname);
+extern char *bindtextdomain__(const char *__domainname,const char *__dirname);
+#define gettext(szMsgId) gettext__(szMsgId)
+#define dgettext(szDomain,szMsgId) dgettext__(szDomain,szMsgId)
+#define dcgettext(szDomain,szMsgId,iCategory) dcgettext__(szDomain,szMsgId,iCategory)
+#define textdomain(szDomain) textdomain__(szDomain)
+#define bindtextdomain(szDomain,szDirectory) bindtextdomain__(szDomain,szDirectory)
+// dummy - for static linkage - calling _putenv from within the DLL
+#define gettext_putenv(a) _putenv(a)
+#endif /* STATIC */
+
+#if defined DONT_USE_GETTEXT
+/* DON'T USE GETTEXT AT ALL
+ MAKROS TO MAKE CODE COMPILE WELL, BUT GETTEXT WILL NOT BE USESD
+*/
+# define gettext(Msgid) (Msgid)
+# define dgettext(Domainname, Msgid) (Msgid)
+# define dcgettext(Domainname, Msgid, Category) (Msgid)
+# define textdomain(Domainname) ((char *) Domainname)
+# define bindtextdomain(Domainname, Dirname) ((char *) Dirname)
+// dummy - for static linkage - calling _putenv from within the DLL
+# define gettext_putenv(a) _putenv(a)
+#endif /* DON'T USE AT ALL */
+
+#if defined(__cplusplus)
+} /* extern "C" */
+#endif
+
+#endif /*!defined(__LIBINTL_H_INCLUDED)*/

pcsxr-1.9.92.tar.bz2/win32/intl/loadinfo.h -> pcsxr-1.9.93.tar.bz2/win32/intl/loadinfo.h Changed

pcsxr-1.9.92.tar.bz2/win32/intl/loadmsgcat.c -> pcsxr-1.9.93.tar.bz2/win32/intl/loadmsgcat.c Changed

@@ -1,227 +1,227 @@
-/* Load needed message catalogs.
- Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. */
-
-#include "intlconfig.h"
-
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#endif
-
-#if defined HAVE_UNISTD_H || defined _LIBC
-# include <unistd.h>
-#endif
-
-#if (defined HAVE_MMAP && defined HAVE_MUNMAP) || defined _LIBC
-# include <sys/mman.h>
-#endif
-
-#ifdef _WIN32
-#include <io.h>
-#ifdef _MSC_VER
-#pragma warning (disable:4018)
-#endif
-#endif
-
-#include "gettext.h"
-#include "gettextP.h"
-
-/* @@ end of prolog @@ */
-
-#ifdef _LIBC
-/* Rename the non ISO C functions. This is required by the standard
- because some ISO C functions will require linking with this object
- file and the name space must not be polluted. */
-# define open __open
-# define close __close
-# define read __read
-# define mmap __mmap
-# define munmap __munmap
-#endif
-
-/* We need a sign, whether a new catalog was loaded, which can be associated
- with all translations. This is important if the translations are
- cached by one of GCC's features. */
-int _nl_msg_cat_cntr = 0;
-
-
-/* Load the message catalogs specified by FILENAME. If it is no valid
- message catalog do nothing. */
-void
-internal_function
-_nl_load_domain (domain_file)
- struct loaded_l10nfile *domain_file;
-{
- int fd;
- size_t size;
- struct stat st;
- struct mo_file_header *data = (struct mo_file_header *) -1;
-#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
- || defined _LIBC
- int use_mmap = 0;
-#endif
- struct loaded_domain *domain;
-
- domain_file->decided = 1;
- domain_file->data = NULL;
-
- /* If the record does not represent a valid locale the FILENAME
- might be NULL. This can happen when according to the given
- specification the locale file name is different for XPG and CEN
- syntax. */
- if (domain_file->filename == NULL)
- return;
-
- /* Try to open the addressed file. */
- fd = open (domain_file->filename, O_RDONLY | O_BINARY); /*FRANCO - binary*/
- if (fd == -1)
- return;
-
- /* We must know about the size of the file. */
- if (fstat (fd, &st) != 0
- || (size = (size_t) st.st_size) != st.st_size
- || size < sizeof (struct mo_file_header))
- {
- /* Something went wrong. */
- close (fd);
- return;
- }
-
-#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
- || defined _LIBC
- /* Now we are ready to load the file. If mmap() is available we try
- this first. If not available or it failed we try to load it. */
- data = (struct mo_file_header *) mmap (NULL, size, PROT_READ,
-					 MAP_PRIVATE, fd, 0);
-
- if (data != (struct mo_file_header *) -1)
- {
- /* mmap() call was successful. */
- close (fd);
- use_mmap = 1;
- }
-#endif
-
- /* If the data is not yet available (i.e. mmap'ed) we try to load
- it manually. */
- if (data == (struct mo_file_header *) -1)
- {
- size_t to_read;
- char *read_ptr;
-
- data = (struct mo_file_header *) malloc (size);
- if (data == NULL)
-	return;
-
- to_read = size;
- read_ptr = (char *) data;
- do
-	{
-	 long int nb = (long int) read (fd, read_ptr, to_read);
-	 if (nb == -1)
-	 {
-	 close (fd);
-	 return;
-	 }
-
-	 read_ptr += nb;
-	 to_read -= nb;
-	}
- while (to_read > 0);
-
- close (fd);
- }
-
- /* Using the magic number we can test whether it really is a message
- catalog file. */
- if (data->magic != _MAGIC && data->magic != _MAGIC_SWAPPED)
- {
- /* The magic number is wrong: not a message catalog file. */
-#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
- || defined _LIBC
- if (use_mmap)
-	munmap ((caddr_t) data, size);
- else
-#endif
-	free (data);
- return;
- }
-
- domain_file->data
- = (struct loaded_domain *) malloc (sizeof (struct loaded_domain));
- if (domain_file->data == NULL)
- return;
-
- domain = (struct loaded_domain *) domain_file->data;
- domain->data = (char *) data;
-#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
- || defined _LIBC
- domain->use_mmap = use_mmap;
-#endif
- domain->mmap_size = size;
- domain->must_swap = data->magic != _MAGIC;
-
- /* Fill in the information about the available tables. */
- switch (W (domain->must_swap, data->revision))
- {
- case 0:
- domain->nstrings = W (domain->must_swap, data->nstrings);
- domain->orig_tab = (struct string_desc *)
-	((char *) data + W (domain->must_swap, data->orig_tab_offset));
- domain->trans_tab = (struct string_desc *)
-	((char *) data + W (domain->must_swap, data->trans_tab_offset));
- domain->hash_size = W (domain->must_swap, data->hash_tab_size);
- domain->hash_tab = (nls_uint32 *)
-	((char *) data + W (domain->must_swap, data->hash_tab_offset));
- break;
- default:
- /* This is an illegal revision. */
-#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
- || defined _LIBC
- if (use_mmap)
-	munmap ((caddr_t) data, size);
- else
-#endif
-	free (data);
- free (domain);
- domain_file->data = NULL;
- return;
- }
-
- /* Show that one domain is changed. This might make some cached
- translations invalid. */
- ++_nl_msg_cat_cntr;
-}
-
-
-#ifdef _LIBC
-void
-internal_function
-_nl_unload_domain (domain)
- struct loaded_domain *domain;
-{
- if (domain->use_mmap)
- munmap ((caddr_t) domain->data, domain->mmap_size);
- else
- free ((void *) domain->data);
-
- free (domain);
-}
-#endif
+/* Load needed message catalogs.
+ Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
+
+#include "intlconfig.h"
+
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#if defined STDC_HEADERS || defined _LIBC
+# include <stdlib.h>
+#endif
+
+#if defined HAVE_UNISTD_H || defined _LIBC
+# include <unistd.h>
+#endif
+
+#if (defined HAVE_MMAP && defined HAVE_MUNMAP) || defined _LIBC
+# include <sys/mman.h>
+#endif
+
+#ifdef _WIN32
+#include <io.h>
+#ifdef _MSC_VER
+#pragma warning (disable:4018)
+#endif
+#endif
+
+#include "gettext.h"
+#include "gettextP.h"
+
+/* @@ end of prolog @@ */
+
+#ifdef _LIBC
+/* Rename the non ISO C functions. This is required by the standard
+ because some ISO C functions will require linking with this object
+ file and the name space must not be polluted. */
+# define open __open
+# define close __close
+# define read __read
+# define mmap __mmap
+# define munmap __munmap
+#endif
+
+/* We need a sign, whether a new catalog was loaded, which can be associated
+ with all translations. This is important if the translations are
+ cached by one of GCC's features. */
+int _nl_msg_cat_cntr = 0;
+
+
+/* Load the message catalogs specified by FILENAME. If it is no valid
+ message catalog do nothing. */
+void
+internal_function
+_nl_load_domain (domain_file)
+ struct loaded_l10nfile *domain_file;
+{
+ int fd;
+ size_t size;
+ struct stat st;
+ struct mo_file_header *data = (struct mo_file_header *) -1;
+#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
+ || defined _LIBC
+ int use_mmap = 0;
+#endif
+ struct loaded_domain *domain;
+
+ domain_file->decided = 1;
+ domain_file->data = NULL;
+
+ /* If the record does not represent a valid locale the FILENAME
+ might be NULL. This can happen when according to the given
+ specification the locale file name is different for XPG and CEN
+ syntax. */
+ if (domain_file->filename == NULL)
+ return;
+
+ /* Try to open the addressed file. */
+ fd = open (domain_file->filename, O_RDONLY | O_BINARY); /*FRANCO - binary*/
+ if (fd == -1)
+ return;
+
+ /* We must know about the size of the file. */
+ if (fstat (fd, &st) != 0
+ || (size = (size_t) st.st_size) != st.st_size
+ || size < sizeof (struct mo_file_header))
+ {
+ /* Something went wrong. */
+ close (fd);
+ return;
+ }
+
+#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
+ || defined _LIBC
+ /* Now we are ready to load the file. If mmap() is available we try
+ this first. If not available or it failed we try to load it. */
+ data = (struct mo_file_header *) mmap (NULL, size, PROT_READ,
+					 MAP_PRIVATE, fd, 0);
+
+ if (data != (struct mo_file_header *) -1)
+ {
+ /* mmap() call was successful. */
+ close (fd);
+ use_mmap = 1;
+ }
+#endif
+
+ /* If the data is not yet available (i.e. mmap'ed) we try to load
+ it manually. */
+ if (data == (struct mo_file_header *) -1)
+ {
+ size_t to_read;
+ char *read_ptr;
+
+ data = (struct mo_file_header *) malloc (size);
+ if (data == NULL)
+	return;
+
+ to_read = size;
+ read_ptr = (char *) data;
+ do
+	{
+	 long int nb = (long int) read (fd, read_ptr, to_read);
+	 if (nb == -1)
+	 {
+	 close (fd);
+	 return;
+	 }
+
+	 read_ptr += nb;
+	 to_read -= nb;
+	}
+ while (to_read > 0);
+
+ close (fd);
+ }
+
+ /* Using the magic number we can test whether it really is a message
+ catalog file. */
+ if (data->magic != _MAGIC && data->magic != _MAGIC_SWAPPED)
+ {
+ /* The magic number is wrong: not a message catalog file. */
+#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
+ || defined _LIBC
+ if (use_mmap)
+	munmap ((caddr_t) data, size);
+ else
+#endif
+	free (data);
+ return;
+ }
+
+ domain_file->data
+ = (struct loaded_domain *) malloc (sizeof (struct loaded_domain));
+ if (domain_file->data == NULL)
+ return;
+
+ domain = (struct loaded_domain *) domain_file->data;
+ domain->data = (char *) data;
+#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
+ || defined _LIBC
+ domain->use_mmap = use_mmap;
+#endif
+ domain->mmap_size = size;
+ domain->must_swap = data->magic != _MAGIC;
+
+ /* Fill in the information about the available tables. */
+ switch (W (domain->must_swap, data->revision))
+ {
+ case 0:
+ domain->nstrings = W (domain->must_swap, data->nstrings);
+ domain->orig_tab = (struct string_desc *)
+	((char *) data + W (domain->must_swap, data->orig_tab_offset));
+ domain->trans_tab = (struct string_desc *)
+	((char *) data + W (domain->must_swap, data->trans_tab_offset));
+ domain->hash_size = W (domain->must_swap, data->hash_tab_size);
+ domain->hash_tab = (nls_uint32 *)
+	((char *) data + W (domain->must_swap, data->hash_tab_offset));
+ break;
+ default:
+ /* This is an illegal revision. */
+#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
+ || defined _LIBC
+ if (use_mmap)
+	munmap ((caddr_t) data, size);
+ else
+#endif
+	free (data);
+ free (domain);
+ domain_file->data = NULL;
+ return;
+ }
+
+ /* Show that one domain is changed. This might make some cached
+ translations invalid. */
+ ++_nl_msg_cat_cntr;
+}
+
+
+#ifdef _LIBC
+void
+internal_function
+_nl_unload_domain (domain)
+ struct loaded_domain *domain;
+{
+ if (domain->use_mmap)
+ munmap ((caddr_t) domain->data, domain->mmap_size);
+ else
+ free ((void *) domain->data);
+
+ free (domain);
+}
+#endif

pcsxr-1.9.92.tar.bz2/win32/intl/localealias.c -> pcsxr-1.9.93.tar.bz2/win32/intl/localealias.c Changed

@@ -1,426 +1,426 @@
-/* Handle aliases for locale names.
- Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
- Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. */
-
-#include "intlconfig.h"
-
-#include <ctype.h>
-#include <stdio.h>
-#include <sys/types.h>
-
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-# define HAVE_ALLOCA 1
-#else
-# if defined HAVE_ALLOCA_H || defined _LIBC
-# include <alloca.h>
-# else
-# ifdef _AIX
- #pragma alloca
-# else
-# ifndef alloca
-char *alloca ();
-# endif
-# endif
-# endif
-#endif
-
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#else
-char *getenv ();
-# ifdef HAVE_MALLOC_H
-# include <malloc.h>
-# else
-void free ();
-# endif
-#endif
-
-#if defined HAVE_STRING_H || defined _LIBC
-# ifndef _GNU_SOURCE
-# define _GNU_SOURCE	1
-# endif
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef memcpy
-# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
-# endif
-#endif
-#if !HAVE_STRCHR && !defined _LIBC
-# ifndef strchr
-# define strchr index
-# endif
-#endif
-
-#include "gettext.h"
-#include "gettextP.h"
-
-#ifdef _MSC_VER
-#pragma warning (disable:4113)
-#endif
-
-/* @@ end of prolog @@ */
-
-#ifdef _LIBC
-/* Rename the non ANSI C functions. This is required by the standard
- because some ANSI C functions will require linking with this object
- file and the name space must not be polluted. */
-# define strcasecmp __strcasecmp
-
-# define mempcpy __mempcpy
-# define HAVE_MEMPCPY	1
-
-/* We need locking here since we can be called from different places. */
-# include <bits/libc-lock.h>
-
-__libc_lock_define_initialized (static, lock);
-#endif
-
-
-/* For those loosing systems which don't have `alloca' we have to add
- some additional code emulating it. */
-#ifdef HAVE_ALLOCA
-/* Nothing has to be done. */
-# define ADD_BLOCK(list, address) /* nothing */
-# define FREE_BLOCKS(list) /* nothing */
-#else
-struct block_list
-{
- void *address;
- struct block_list *next;
-};
-# define ADD_BLOCK(list, addr)						 \
- do {									 \
- struct block_list *newp = (struct block_list *) malloc (sizeof (*newp)); \
- /* If we cannot get a free block we cannot add the new element to	 \
- the list. */							 \
- if (newp != NULL) {							 \
- newp->address = (addr);						 \
- newp->next = (list);						 \
- (list) = newp;							 \
- }									 \
- } while (0)
-# define FREE_BLOCKS(list)						 \
- do {									 \
- while (list != NULL) {						 \
- struct block_list *old = list;					 \
- list = list->next;						 \
- free (old);							 \
- }									 \
- } while (0)
-# undef alloca
-# define alloca(size) (malloc (size))
-#endif	/* have alloca */
-
-
-struct alias_map
-{
- const char *alias;
- const char *value;
-};
-
-
-static char *string_space = NULL;
-static size_t string_space_act = 0;
-static size_t string_space_max = 0;
-static struct alias_map *map;
-static size_t nmap = 0;
-static size_t maxmap = 0;
-
-
-/* Prototypes for local functions. */
-static size_t read_alias_file PARAMS ((const char *fname, int fname_len))
- internal_function;
-static void extend_alias_table PARAMS ((void));
-static int alias_compare PARAMS ((const struct alias_map *map1,
-				 const struct alias_map *map2));
-
-
-const char *
-_nl_expand_alias (name)
- const char *name;
-{
- static const char *locale_alias_path = LOCALE_ALIAS_PATH;
- struct alias_map *retval;
- const char *result = NULL;
- size_t added;
-
-#ifdef _LIBC
- __libc_lock_lock (lock);
-#endif
-
- do
- {
- struct alias_map item;
-
- item.alias = name;
-
- if (nmap > 0)
-	retval = (struct alias_map *) bsearch (&item, map, nmap,
-					 sizeof (struct alias_map),
-					 (int (*) PARAMS ((const void *,
-								 const void *))
-						) alias_compare);
- else
-	retval = NULL;
-
- /* We really found an alias. Return the value. */
- if (retval != NULL)
-	{
-	 result = retval->value;
-	 break;
-	}
-
- /* Perhaps we can find another alias file. */
- added = 0;
- while (added == 0 && locale_alias_path[0] != '\0')
-	{
-	 const char *start;
-
-	 while (locale_alias_path[0] == ';')/*FRANCO changed : to ; for win32*/
-	 ++locale_alias_path;
-	 start = locale_alias_path;
-
-	 while (locale_alias_path[0] != '\0' && locale_alias_path[0] != ';')/*FRANCO changed : to ; for win32*/
-	 ++locale_alias_path;
-
-	 if (start < locale_alias_path)
-	 added = read_alias_file (start, locale_alias_path - start);
-	}
- }
- while (added != 0);
-
-#ifdef _LIBC
- __libc_lock_unlock (lock);
-#endif
-
- return result;
-}
-
-
-static size_t
-internal_function
-read_alias_file (fname, fname_len)
- const char *fname;
- int fname_len;
-{
-#ifndef HAVE_ALLOCA
- struct block_list *block_list = NULL;
-#endif
- FILE *fp;
- char *full_fname;
- size_t added;
- static const char aliasfile[] = "/locale.alias";
-
- full_fname = (char *) alloca (fname_len + sizeof aliasfile);
- ADD_BLOCK (block_list, full_fname);
-#ifdef HAVE_MEMPCPY
- mempcpy (mempcpy (full_fname, fname, fname_len),
-	 aliasfile, sizeof aliasfile);
-#else
- memcpy (full_fname, fname, fname_len);
- memcpy (&full_fname[fname_len], aliasfile, sizeof aliasfile);
-#endif
-
- fp = fopen (full_fname, "r");
- if (fp == NULL)
- {
- FREE_BLOCKS (block_list);
- return 0;
- }
-
- added = 0;
- while (!feof (fp))
- {
- /* It is a reasonable approach to use a fix buffer here because
-	 a) we are only interested in the first two fields
-	 b) these fields must be usable as file names and so must not
-	 be that long
- */
- unsigned char buf[BUFSIZ];
- unsigned char *alias;
- unsigned char *value;
- unsigned char *cp;
-
- if (fgets (buf, sizeof buf, fp) == NULL)
-	/* EOF reached. */
-	break;
-
- /* Possibly not the whole line fits into the buffer. Ignore
-	 the rest of the line. */
- if (strchr (buf, '\n') == NULL)
-	{
-	 char altbuf[BUFSIZ];
-	 do
-	 if (fgets (altbuf, sizeof altbuf, fp) == NULL)
-	 /* Make sure the inner loop will be left. The outer loop
-		 will exit at the `feof' test. */
-	 break;
-	 while (strchr (altbuf, '\n') == NULL);
-	}
-
- cp = buf;
- /* Ignore leading white space. */
- while (isspace (cp[0]))
-	++cp;
-
- /* A leading '#' signals a comment line. */
- if (cp[0] != '\0' && cp[0] != '#')
-	{
-	 alias = cp++;
-	 while (cp[0] != '\0' && !isspace (cp[0]))
-	 ++cp;
-	 /* Terminate alias name. */
-	 if (cp[0] != '\0')
-	 *cp++ = '\0';
-
-	 /* Now look for the beginning of the value. */
-	 while (isspace (cp[0]))
-	 ++cp;
-
-	 if (cp[0] != '\0')
-	 {
-	 size_t alias_len;
-	 size_t value_len;
-
-	 value = cp++;
-	 while (cp[0] != '\0' && !isspace (cp[0]))
-		++cp;
-	 /* Terminate value. */
-	 if (cp[0] == '\n')
-		{
-		 /* This has to be done to make the following test
-		 for the end of line possible. We are looking for
-		 the terminating '\n' which do not overwrite here. */
-		 *cp++ = '\0';
-		 *cp = '\n';
-		}
-	 else if (cp[0] != '\0')
-		*cp++ = '\0';
-
-	 if (nmap >= maxmap)
-		extend_alias_table ();
-
-	 alias_len = strlen (alias) + 1;
-	 value_len = strlen (value) + 1;
-
-	 if (string_space_act + alias_len + value_len > string_space_max)
-		{
-		 /* Increase size of memory pool. */
-		 size_t new_size = (string_space_max
-				 + (alias_len + value_len > 1024
-					? alias_len + value_len : 1024));
-		 char *new_pool = (char *) realloc (string_space, new_size);
-		 if (new_pool == NULL)
-		 {
-		 FREE_BLOCKS (block_list);
-		 return added;
-		 }
-		 string_space = new_pool;
-		 string_space_max = new_size;
-		}
-
-	 map[nmap].alias = memcpy (&string_space[string_space_act],
-					alias, alias_len);
-	 string_space_act += alias_len;
-
-	 map[nmap].value = memcpy (&string_space[string_space_act],
-					value, value_len);
-	 string_space_act += value_len;
-
-	 ++nmap;
-	 ++added;
-	 }
-	}
- }
-
- /* Should we test for ferror()? I think we have to silently ignore
- errors. --drepper */
- fclose (fp);
-
- if (added > 0)
- qsort (map, nmap, sizeof (struct alias_map),
-	 (int (*) PARAMS ((const void *, const void *))) alias_compare);
-
- FREE_BLOCKS (block_list);
- return added;
-}
-
-
-static void
-extend_alias_table ()
-{
- size_t new_size;
- struct alias_map *new_map;
-
- new_size = maxmap == 0 ? 100 : 2 * maxmap;
- new_map = (struct alias_map *) realloc (map, (new_size
-						* sizeof (struct alias_map)));
- if (new_map == NULL)
- /* Simply don't extend: we don't have any more core. */
- return;
-
- map = new_map;
- maxmap = new_size;
-}
-
-
-#ifdef _LIBC
-static void __attribute__ ((unused))
-free_mem (void)
-{
- if (string_space != NULL)
- free (string_space);
- if (map != NULL)
- free (map);
-}
-text_set_element (__libc_subfreeres, free_mem);
-#endif
-
-
-static int
-alias_compare (map1, map2)
- const struct alias_map *map1;
- const struct alias_map *map2;
-{
-#if defined _LIBC || defined HAVE_STRCASECMP
- return strcasecmp (map1->alias, map2->alias);
-#else
- const unsigned char *p1 = (const unsigned char *) map1->alias;
- const unsigned char *p2 = (const unsigned char *) map2->alias;
- unsigned char c1, c2;
-
- if (p1 == p2)
- return 0;
-
- do
- {
- /* I know this seems to be odd but the tolower() function in
-	 some systems libc cannot handle nonalpha characters. */
- c1 = isupper (*p1) ? tolower (*p1) : *p1;
- c2 = isupper (*p2) ? tolower (*p2) : *p2;
- if (c1 == '\0')
-	break;
- ++p1;
- ++p2;
- }
- while (c1 == c2);
-
- return c1 - c2;
-#endif
-}
+/* Handle aliases for locale names.
+ Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+ Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
+
+#include "intlconfig.h"
+
+#include <ctype.h>
+#include <stdio.h>
+#include <sys/types.h>
+
+#ifdef __GNUC__
+# define alloca __builtin_alloca
+# define HAVE_ALLOCA 1
+#else
+# if defined HAVE_ALLOCA_H || defined _LIBC
+# include <alloca.h>
+# else
+# ifdef _AIX
+ #pragma alloca
+# else
+# ifndef alloca
+char *alloca ();
+# endif
+# endif
+# endif
+#endif
+
+#if defined STDC_HEADERS || defined _LIBC
+# include <stdlib.h>
+#else
+char *getenv ();
+# ifdef HAVE_MALLOC_H
+# include <malloc.h>
+# else
+void free ();
+# endif
+#endif
+
+#if defined HAVE_STRING_H || defined _LIBC
+# ifndef _GNU_SOURCE
+# define _GNU_SOURCE	1
+# endif
+# include <string.h>
+#else
+# include <strings.h>
+# ifndef memcpy
+# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
+# endif
+#endif
+#if !HAVE_STRCHR && !defined _LIBC
+# ifndef strchr
+# define strchr index
+# endif
+#endif
+
+#include "gettext.h"
+#include "gettextP.h"
+
+#ifdef _MSC_VER
+#pragma warning (disable:4113)
+#endif
+
+/* @@ end of prolog @@ */
+
+#ifdef _LIBC
+/* Rename the non ANSI C functions. This is required by the standard
+ because some ANSI C functions will require linking with this object
+ file and the name space must not be polluted. */
+# define strcasecmp __strcasecmp
+
+# define mempcpy __mempcpy
+# define HAVE_MEMPCPY	1
+
+/* We need locking here since we can be called from different places. */
+# include <bits/libc-lock.h>
+
+__libc_lock_define_initialized (static, lock);
+#endif
+
+
+/* For those loosing systems which don't have `alloca' we have to add
+ some additional code emulating it. */
+#ifdef HAVE_ALLOCA
+/* Nothing has to be done. */
+# define ADD_BLOCK(list, address) /* nothing */
+# define FREE_BLOCKS(list) /* nothing */
+#else
+struct block_list
+{
+ void *address;
+ struct block_list *next;
+};
+# define ADD_BLOCK(list, addr)						 \
+ do {									 \
+ struct block_list *newp = (struct block_list *) malloc (sizeof (*newp)); \
+ /* If we cannot get a free block we cannot add the new element to	 \
+ the list. */							 \
+ if (newp != NULL) {							 \
+ newp->address = (addr);						 \
+ newp->next = (list);						 \
+ (list) = newp;							 \
+ }									 \
+ } while (0)
+# define FREE_BLOCKS(list)						 \
+ do {									 \
+ while (list != NULL) {						 \
+ struct block_list *old = list;					 \
+ list = list->next;						 \
+ free (old);							 \
+ }									 \
+ } while (0)
+# undef alloca
+# define alloca(size) (malloc (size))
+#endif	/* have alloca */
+
+
+struct alias_map
+{
+ const char *alias;
+ const char *value;
+};
+
+
+static char *string_space = NULL;
+static size_t string_space_act = 0;
+static size_t string_space_max = 0;
+static struct alias_map *map;
+static size_t nmap = 0;
+static size_t maxmap = 0;
+
+
+/* Prototypes for local functions. */
+static size_t read_alias_file PARAMS ((const char *fname, int fname_len))
+ internal_function;
+static void extend_alias_table PARAMS ((void));
+static int alias_compare PARAMS ((const struct alias_map *map1,
+				 const struct alias_map *map2));
+
+
+const char *
+_nl_expand_alias (name)
+ const char *name;
+{
+ static const char *locale_alias_path = LOCALE_ALIAS_PATH;
+ struct alias_map *retval;
+ const char *result = NULL;
+ size_t added;
+
+#ifdef _LIBC
+ __libc_lock_lock (lock);
+#endif
+
+ do
+ {
+ struct alias_map item;
+
+ item.alias = name;
+
+ if (nmap > 0)
+	retval = (struct alias_map *) bsearch (&item, map, nmap,
+					 sizeof (struct alias_map),
+					 (int (*) PARAMS ((const void *,
+								 const void *))
+						) alias_compare);
+ else
+	retval = NULL;
+
+ /* We really found an alias. Return the value. */
+ if (retval != NULL)
+	{
+	 result = retval->value;
+	 break;
+	}
+
+ /* Perhaps we can find another alias file. */
+ added = 0;
+ while (added == 0 && locale_alias_path[0] != '\0')
+	{
+	 const char *start;
+
+	 while (locale_alias_path[0] == ';')/*FRANCO changed : to ; for win32*/
+	 ++locale_alias_path;
+	 start = locale_alias_path;
+
+	 while (locale_alias_path[0] != '\0' && locale_alias_path[0] != ';')/*FRANCO changed : to ; for win32*/
+	 ++locale_alias_path;
+
+	 if (start < locale_alias_path)
+	 added = read_alias_file (start, locale_alias_path - start);
+	}
+ }
+ while (added != 0);
+
+#ifdef _LIBC
+ __libc_lock_unlock (lock);
+#endif
+
+ return result;
+}
+
+
+static size_t
+internal_function
+read_alias_file (fname, fname_len)
+ const char *fname;
+ int fname_len;
+{
+#ifndef HAVE_ALLOCA
+ struct block_list *block_list = NULL;
+#endif
+ FILE *fp;
+ char *full_fname;
+ size_t added;
+ static const char aliasfile[] = "/locale.alias";
+
+ full_fname = (char *) alloca (fname_len + sizeof aliasfile);
+ ADD_BLOCK (block_list, full_fname);
+#ifdef HAVE_MEMPCPY
+ mempcpy (mempcpy (full_fname, fname, fname_len),
+	 aliasfile, sizeof aliasfile);
+#else
+ memcpy (full_fname, fname, fname_len);
+ memcpy (&full_fname[fname_len], aliasfile, sizeof aliasfile);
+#endif
+
+ fp = fopen (full_fname, "r");
+ if (fp == NULL)
+ {
+ FREE_BLOCKS (block_list);
+ return 0;
+ }
+
+ added = 0;
+ while (!feof (fp))
+ {
+ /* It is a reasonable approach to use a fix buffer here because
+	 a) we are only interested in the first two fields
+	 b) these fields must be usable as file names and so must not
+	 be that long
+ */
+ unsigned char buf[BUFSIZ];
+ unsigned char *alias;
+ unsigned char *value;
+ unsigned char *cp;
+
+ if (fgets (buf, sizeof buf, fp) == NULL)
+	/* EOF reached. */
+	break;
+
+ /* Possibly not the whole line fits into the buffer. Ignore
+	 the rest of the line. */
+ if (strchr (buf, '\n') == NULL)
+	{
+	 char altbuf[BUFSIZ];
+	 do
+	 if (fgets (altbuf, sizeof altbuf, fp) == NULL)
+	 /* Make sure the inner loop will be left. The outer loop
+		 will exit at the `feof' test. */
+	 break;
+	 while (strchr (altbuf, '\n') == NULL);
+	}
+
+ cp = buf;
+ /* Ignore leading white space. */
+ while (isspace (cp[0]))
+	++cp;
+
+ /* A leading '#' signals a comment line. */
+ if (cp[0] != '\0' && cp[0] != '#')
+	{
+	 alias = cp++;
+	 while (cp[0] != '\0' && !isspace (cp[0]))
+	 ++cp;
+	 /* Terminate alias name. */
+	 if (cp[0] != '\0')
+	 *cp++ = '\0';
+
+	 /* Now look for the beginning of the value. */
+	 while (isspace (cp[0]))
+	 ++cp;
+
+	 if (cp[0] != '\0')
+	 {
+	 size_t alias_len;
+	 size_t value_len;
+
+	 value = cp++;
+	 while (cp[0] != '\0' && !isspace (cp[0]))
+		++cp;
+	 /* Terminate value. */
+	 if (cp[0] == '\n')
+		{
+		 /* This has to be done to make the following test
+		 for the end of line possible. We are looking for
+		 the terminating '\n' which do not overwrite here. */
+		 *cp++ = '\0';
+		 *cp = '\n';
+		}
+	 else if (cp[0] != '\0')
+		*cp++ = '\0';
+
+	 if (nmap >= maxmap)
+		extend_alias_table ();
+
+	 alias_len = strlen (alias) + 1;
+	 value_len = strlen (value) + 1;
+
+	 if (string_space_act + alias_len + value_len > string_space_max)
+		{
+		 /* Increase size of memory pool. */
+		 size_t new_size = (string_space_max
+				 + (alias_len + value_len > 1024
+					? alias_len + value_len : 1024));
+		 char *new_pool = (char *) realloc (string_space, new_size);
+		 if (new_pool == NULL)
+		 {
+		 FREE_BLOCKS (block_list);
+		 return added;
+		 }
+		 string_space = new_pool;
+		 string_space_max = new_size;
+		}
+
+	 map[nmap].alias = memcpy (&string_space[string_space_act],
+					alias, alias_len);
+	 string_space_act += alias_len;
+
+	 map[nmap].value = memcpy (&string_space[string_space_act],
+					value, value_len);
+	 string_space_act += value_len;
+
+	 ++nmap;
+	 ++added;
+	 }
+	}
+ }
+
+ /* Should we test for ferror()? I think we have to silently ignore
+ errors. --drepper */
+ fclose (fp);
+
+ if (added > 0)
+ qsort (map, nmap, sizeof (struct alias_map),
+	 (int (*) PARAMS ((const void *, const void *))) alias_compare);
+
+ FREE_BLOCKS (block_list);
+ return added;
+}
+
+
+static void
+extend_alias_table ()
+{
+ size_t new_size;
+ struct alias_map *new_map;
+
+ new_size = maxmap == 0 ? 100 : 2 * maxmap;
+ new_map = (struct alias_map *) realloc (map, (new_size
+						* sizeof (struct alias_map)));
+ if (new_map == NULL)
+ /* Simply don't extend: we don't have any more core. */
+ return;
+
+ map = new_map;
+ maxmap = new_size;
+}
+
+
+#ifdef _LIBC
+static void __attribute__ ((unused))
+free_mem (void)
+{
+ if (string_space != NULL)
+ free (string_space);
+ if (map != NULL)
+ free (map);
+}
+text_set_element (__libc_subfreeres, free_mem);
+#endif
+
+
+static int
+alias_compare (map1, map2)
+ const struct alias_map *map1;
+ const struct alias_map *map2;
+{
+#if defined _LIBC || defined HAVE_STRCASECMP
+ return strcasecmp (map1->alias, map2->alias);
+#else
+ const unsigned char *p1 = (const unsigned char *) map1->alias;
+ const unsigned char *p2 = (const unsigned char *) map2->alias;
+ unsigned char c1, c2;
+
+ if (p1 == p2)
+ return 0;
+
+ do
+ {
+ /* I know this seems to be odd but the tolower() function in
+	 some systems libc cannot handle nonalpha characters. */
+ c1 = isupper (*p1) ? tolower (*p1) : *p1;
+ c2 = isupper (*p2) ? tolower (*p2) : *p2;
+ if (c1 == '\0')
+	break;
+ ++p1;
+ ++p2;
+ }
+ while (c1 == c2);
+
+ return c1 - c2;
+#endif
+}

pcsxr-1.9.92.tar.bz2/win32/intl/textdomain.c -> pcsxr-1.9.93.tar.bz2/win32/intl/textdomain.c Changed

pcsxr-1.9.93.tar.bz2/win32/pcsxr.dev Added

@@ -0,0 +1,1209 @@
+[Project]
+FileName=pcsxr.dev
+Name=pcsxr
+Ver=1
+IsCpp=1
+Type=0
+Compiler=-D__GNUWIN32__ -march=pentiumpro -D_M_IX86=600 -W -finline-functions -fomit-frame-pointer -DWIN32 -DNDEBUG -D_WINDOWS -D_MBCS -D__WIN32__ -DPCSXR_VERSION=\"1.5\" -D__i386__ -DENABLE_NLS -DPACKAGE=\"pcsxr\"  -Dinline=__inline___@@_
+CppCompiler=-D__GNUWIN32__ -march=pentiumpro -D_M_IX86=600 -W -finline-functions -DWIN32 -DNDEBUG -D_WINDOWS -D_MBCS -D__WIN32__ -D_MSC_VER_ -DPCSXR_VERSION=\"1.5\" -D__i386__ -DENABLE_NLS -DPACKAGE=\"pcsxr\"_@@_
+Includes=.;./zlib;../libpcsxcore;./glue;./gui;./intl
+Linker=-lkernel32 -luser32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -luuid -lodbc32 -lodbccp32 -lcomctl32 -lwsock32_@@_
+Libs=
+UnitCount=116
+Folders=glue,glue/sys,gui,intl,libpcsxcore,libpcsxcore/ix86,zlib
+ObjFiles=
+PrivateResource=pcsxr_private.rc
+ResourceIncludes=
+MakeIncludes=
+Icon=
+ExeOutput=
+ObjectOutput=
+OverrideOutput=0
+OverrideOutputName=pcsxr.exe
+HostApplication=
+CommandLine=
+UseCustomMakefile=0
+CustomMakefile=
+IncludeVersionInfo=0
+SupportXPThemes=0
+CompilerSet=0
+CompilerSettings=0010000001001000000100
+
+[Unit1]
+FileName=..\libpcsxcore\ix86\iGte.h
+Folder=libpcsxcore/ix86
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit2]
+FileName=..\libpcsxcore\ix86\iR3000A.c
+Folder=libpcsxcore/ix86
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit3]
+FileName=..\libpcsxcore\ix86\ix86.c
+Folder=libpcsxcore/ix86
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit4]
+FileName=..\libpcsxcore\ix86\ix86.h
+Folder=libpcsxcore/ix86
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit5]
+FileName=..\libpcsxcore\cdrom.c
+Folder=libpcsxcore
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit6]
+FileName=..\libpcsxcore\cdrom.h
+Folder=libpcsxcore
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit7]
+FileName=..\libpcsxcore\coff.h
+Folder=libpcsxcore
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit8]
+FileName=..\libpcsxcore\debug.h
+Folder=libpcsxcore
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit9]
+FileName=..\libpcsxcore\decode_xa.c
+Folder=libpcsxcore
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit10]
+FileName=..\libpcsxcore\decode_xa.h
+Folder=libpcsxcore
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit11]
+FileName=..\libpcsxcore\disr3000a.c
+Folder=libpcsxcore
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit12]
+FileName=..\libpcsxcore\gte.c
+Folder=libpcsxcore
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit13]
+FileName=..\libpcsxcore\gte.h
+Folder=libpcsxcore
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit14]
+FileName=..\libpcsxcore\mdec.c
+Folder=libpcsxcore
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit15]
+FileName=..\libpcsxcore\mdec.h
+Folder=libpcsxcore
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit16]
+FileName=..\libpcsxcore\misc.c
+Folder=libpcsxcore
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit17]
+FileName=..\libpcsxcore\misc.h
+Folder=libpcsxcore
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit18]
+FileName=..\libpcsxcore\plugins.c
+Folder=libpcsxcore
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit19]
+FileName=..\libpcsxcore\plugins.h
+Folder=libpcsxcore
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit20]
+FileName=..\libpcsxcore\psemu_plugin_defs.h
+Folder=libpcsxcore
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit21]
+FileName=..\libpcsxcore\psxbios.c
+Folder=libpcsxcore
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit22]
+FileName=..\libpcsxcore\psxbios.h
+Folder=libpcsxcore
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit23]
+FileName=..\libpcsxcore\psxcommon.h
+Folder=libpcsxcore
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit24]
+FileName=..\libpcsxcore\psxcounters.c
+Folder=libpcsxcore
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit25]
+FileName=..\libpcsxcore\psxcounters.h
+Folder=libpcsxcore
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit26]
+FileName=..\libpcsxcore\psxdma.c
+Folder=libpcsxcore
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit27]
+FileName=..\libpcsxcore\psxdma.h
+Folder=libpcsxcore
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit28]
+FileName=..\libpcsxcore\psxhle.c
+Folder=libpcsxcore
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit29]
+FileName=..\libpcsxcore\psxhle.h
+Folder=libpcsxcore
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit30]
+FileName=..\libpcsxcore\psxhw.c
+Folder=libpcsxcore
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit31]
+FileName=..\libpcsxcore\psxhw.h
+Folder=libpcsxcore
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit32]
+FileName=..\libpcsxcore\psxinterpreter.c
+Folder=libpcsxcore
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit33]
+FileName=..\libpcsxcore\psxmem.c
+Folder=libpcsxcore
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit34]
+FileName=..\libpcsxcore\psxmem.h
+Folder=libpcsxcore
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit35]
+FileName=..\libpcsxcore\r3000a.c
+Folder=libpcsxcore
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit36]
+FileName=..\libpcsxcore\r3000a.h
+Folder=libpcsxcore
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit37]
+FileName=..\libpcsxcore\sio.c
+Folder=libpcsxcore
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit38]
+FileName=..\libpcsxcore\sio.h
+Folder=libpcsxcore
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit39]
+FileName=..\libpcsxcore\spu.c
+Folder=libpcsxcore
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit40]
+FileName=..\libpcsxcore\spu.h
+Folder=libpcsxcore
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit41]
+FileName=..\libpcsxcore\system.h
+Folder=libpcsxcore
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit42]
+FileName=gui\about.bmp
+Folder=gui
+Compile=0
+CompileCpp=0
+Link=0
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit43]
+FileName=gui\AboutDlg.c
+Folder=gui
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit44]
+FileName=gui\AboutDlg.h
+Folder=gui
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit45]
+FileName=gui\pcsxr.ico
+Folder=gui
+Compile=0
+CompileCpp=0
+Link=0
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit46]
+FileName=gui\ConfigurePlugins.c
+Folder=gui
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit47]
+FileName=gui\NoPic.h
+Folder=gui
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit48]
+FileName=gui\pcsxr.bmp
+Folder=gui
+Compile=0
+CompileCpp=0
+Link=0
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit49]
+FileName=gui\pcsxr.exe.manifest
+Folder=gui
+Compile=0
+CompileCpp=0
+Link=0
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit51]
+FileName=gui\plugin.h
+Folder=gui
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit52]
+FileName=gui\Win32.h
+Folder=gui
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit53]
+FileName=gui\WndMain.c
+Folder=gui
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit54]
+FileName=zlib\adler32.c
+Folder=zlib
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit55]
+FileName=zlib\compress.c
+Folder=zlib
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit56]
+FileName=zlib\crc32.c
+Folder=zlib
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit57]
+FileName=zlib\deflate.c
+Folder=zlib
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit58]
+FileName=zlib\deflate.h
+Folder=zlib
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit59]
+FileName=zlib\gzio.c
+Folder=zlib
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit60]
+FileName=zlib\infblock.c
+Folder=zlib
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit61]
+FileName=zlib\infblock.h
+Folder=zlib
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit62]
+FileName=zlib\infcodes.c
+Folder=zlib
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit63]
+FileName=zlib\infcodes.h
+Folder=zlib
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit64]
+FileName=zlib\inffast.c
+Folder=zlib
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit65]
+FileName=zlib\inffast.h
+Folder=zlib
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit66]
+FileName=zlib\inffixed.h
+Folder=zlib
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit67]
+FileName=zlib\inflate.c
+Folder=zlib
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit68]
+FileName=zlib\inftrees.c
+Folder=zlib
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit69]
+FileName=zlib\inftrees.h
+Folder=zlib
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit70]
+FileName=zlib\infutil.c
+Folder=zlib
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit71]
+FileName=zlib\infutil.h
+Folder=zlib
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit72]
+FileName=zlib\trees.c
+Folder=zlib
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit73]
+FileName=zlib\trees.h
+Folder=zlib
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit74]
+FileName=zlib\uncompr.c
+Folder=zlib
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit75]
+FileName=zlib\zconf.h
+Folder=zlib
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit76]
+FileName=zlib\zlib.h
+Folder=zlib
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit77]
+FileName=zlib\zutil.c
+Folder=zlib
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit78]
+FileName=zlib\zutil.h
+Folder=zlib
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit79]
+FileName=glue\sys\mman.h
+Folder=glue/sys
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit80]
+FileName=glue\stdint.h
+Folder=glue
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit81]
+FileName=intl\bindtextdom.c
+Folder=intl
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit82]
+FileName=intl\intlconfig.h
+Folder=intl
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit83]
+FileName=intl\dcgettext.c
+Folder=intl
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit84]
+FileName=intl\dgettext.c
+Folder=intl
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit85]
+FileName=intl\explodename.c
+Folder=intl
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit86]
+FileName=intl\finddomain.c
+Folder=intl
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit87]
+FileName=intl\gettext.c
+Folder=intl
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit88]
+FileName=intl\gettext.h
+Folder=intl
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit89]
+FileName=intl\gettextP.h
+Folder=intl
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit90]
+FileName=intl\l10nflist.c
+Folder=intl
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit91]
+FileName=intl\libgettext.h
+Folder=intl
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit92]
+FileName=intl\libintl.h
+Folder=intl
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit93]
+FileName=intl\loadinfo.h
+Folder=intl
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit94]
+FileName=intl\loadmsgcat.c
+Folder=intl
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit95]
+FileName=intl\localealias.c
+Folder=intl
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit96]
+FileName=intl\textdomain.c
+Folder=intl
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit97]
+FileName=config.h
+Folder=
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit98]
+FileName=intl\intl-compat.c
+Folder=intl
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=$(CC) -c intl-compat.c -o intl-compat.o $(CFLAGS)
+
+[Unit99]
+FileName=intl\hash-string.h
+Folder=intl
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[VersionInfo]
+Major=0
+Minor=1
+Release=1
+Build=1
+LanguageID=1033
+CharsetID=1252
+CompanyName=
+FileVersion=0.1
+FileDescription=Developed using the Dev-C++ IDE
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=pcsxr.exe
+ProductName=pcsxr
+ProductVersion=0.1
+AutoIncBuildNr=0
+
+[Unit50]
+FileName=gui\plugin.c
+CompileCpp=0
+Folder=gui
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit102]
+FileName=..\libpcsxcore\cdriso.h
+Folder=libpcsxcore
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+CompileCpp=1
+
+[Unit101]
+FileName=pcsxr.rc
+CompileCpp=1
+Folder=pcsxr
+Compile=1
+Link=0
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit100]
+FileName=resource.h
+CompileCpp=1
+Folder=pcsxr
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit103]
+FileName=..\libpcsxcore\cdriso.c
+CompileCpp=0
+Folder=libpcsxcore
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=$(CC) -c cdriso.c -o cdriso.o $(CFLAGS)
+
+[Unit104]
+FileName=..\libpcsxcore\cheat.h
+CompileCpp=1
+Folder=libpcsxcore
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit105]
+FileName=..\libpcsxcore\cheat.c
+CompileCpp=0
+Folder=libpcsxcore
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=$(CC) -c cheat.c -o cheat.o $(CFLAGS)
+
+[Unit106]
+FileName=gui\CheatDlg.c
+CompileCpp=0
+Folder=gui
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=$(CC) -c CheatDlg.c -o CheatDlg.o $(CFLAGS)
+
+[Unit107]
+FileName=..\libpcsxcore\socket.h
+CompileCpp=1
+Folder=libpcsxcore
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit108]
+FileName=..\libpcsxcore\debug.c
+CompileCpp=0
+Folder=libpcsxcore
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=$(CC) -c debug.c -o debug.o $(CFLAGS)
+
+[Unit109]
+FileName=..\libpcsxcore\socket.c
+CompileCpp=0
+Folder=libpcsxcore
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=$(CC) -c socket.c -o socket.o $(CFLAGS)
+
+[Unit110]
+FileName=..\libpcsxcore\ppf.h
+CompileCpp=1
+Folder=libpcsxcore
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit111]
+FileName=..\libpcsxcore\ppf.c
+CompileCpp=0
+Folder=libpcsxcore
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=$(CC) -c ppf.c -o ppf.o $(CFLAGS)
+
+[Unit112]
+FileName=..\libpcsxcore\psxcommon.c
+CompileCpp=0
+Folder=libpcsxcore
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=$(CC) -c psxcommon.c -o psxcommon.o $(CFLAGS)
+
+[Unit113]
+FileName=..\libpcsxcore\gte_divider.h
+CompileCpp=1
+Folder=libpcsxcore
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit114]
+FileName=..\libpcsxcore\sjisfont.h
+CompileCpp=1
+Folder=libpcsxcore
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit115]
+FileName=..\libpcsxcore\gpu.c
+CompileCpp=0
+Folder=libpcsxcore
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=$(CC) -c gpu.c -o gpu.o $(CFLAGS)
+
+[Unit116]
+FileName=..\libpcsxcore\gpu.h
+CompileCpp=1
+Folder=libpcsxcore
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+

pcsxr-1.9.93.tar.bz2/win32/pcsxr.rc Added

@@ -0,0 +1,408 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+// Use MFC if available
+//
+#if defined(_MFC_VER)
+#include "afxres.h"
+#else
+#include "WinResrc.h"
+#include <winres.h>
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (United States) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,0,0,1
+ PRODUCTVERSION 1,0,0,1
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "080404b0"
+ BEGIN
+ VALUE "CompanyName", "http://pcsxr.codeplex.com/"
+ VALUE "FileDescription", "Playstation Emulator based on PCSX-df"
+ VALUE "FileVersion", "1, 9, 93, 0"
+ VALUE "InternalName", "pcsxr"
+ VALUE "LegalCopyright", "Copyright (c) 2010"
+ VALUE "OriginalFilename", "pcsxr.exe"
+ VALUE "ProductName", "PCSX-Reloaded"
+ VALUE "ProductVersion", "1, 9, 93, 0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x804, 1200
+ END
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_MCDCONF DIALOG 0, 0, 407, 197
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Memcard Manager"
+FONT 8, "MS Sans Serif"
+BEGIN
+ DEFPUSHBUTTON "OK",IDOK,285,175,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,345,175,50,14
+ EDITTEXT IDC_MCD1,10,155,160,14,ES_AUTOHSCROLL
+ EDITTEXT IDC_MCD2,235,155,160,14,ES_AUTOHSCROLL
+ PUSHBUTTON "Select Mcd",IDC_MCDSEL1,10,135,50,14
+ PUSHBUTTON "Select Mcd",IDC_MCDSEL2,235,135,50,14
+ GROUPBOX "Memory Card 2",IDC_FRAMEMCD2,230,5,170,125
+ PUSHBUTTON "Format Mcd",IDC_FORMAT1,65,135,50,14
+ GROUPBOX "Memory Card 1",IDC_FRAMEMCD1,5,5,170,125
+ PUSHBUTTON "Format Mcd",IDC_FORMAT2,290,135,50,14
+ CONTROL "List3",IDC_LIST1,"SysListView32",LVS_REPORT | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,10,15,160,110
+ CONTROL "List3",IDC_LIST2,"SysListView32",LVS_REPORT | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,235,15,160,110
+ PUSHBUTTON "Reload Mcd",IDC_RELOAD1,120,135,50,14
+ PUSHBUTTON "Reload Mcd",IDC_RELOAD2,345,135,50,14
+ PUSHBUTTON "-> Copy ->",IDC_COPYTO2,180,30,45,14
+ PUSHBUTTON "<- Copy <-",IDC_COPYTO1,180,50,45,14
+ PUSHBUTTON "Paste",IDC_PASTE,180,70,45,14
+ PUSHBUTTON "<- Un/Delete",IDC_DELETE1,180,90,45,14
+ PUSHBUTTON "Un/Delete ->",IDC_DELETE2,180,110,45,14
+END
+
+ABOUT_DIALOG DIALOGEX 0, 0, 332, 209
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "About"
+FONT 8, "MS Sans Serif", 0, 0, 0x1
+BEGIN
+ DEFPUSHBUTTON "OK",IDOK,134,187,50,14
+ CTEXT "PCSXR EMU\nVersion x.x",IDC_PCSXR_ABOUT_TEXT,22,10,112,15,0,WS_EX_TRANSPARENT
+ CTEXT "PCSXR a psx emulator...",IDC_PCSXR_ABOUT_AUTHORS,10,35,135,63,0,WS_EX_TRANSPARENT
+ CTEXT "Greets to...",IDC_PCSXR_ABOUT_GREETS,45,110,232,65
+ CONTROL 113,IDC_STATIC,"Static",SS_BITMAP | WS_BORDER,155,10,171,101
+ GROUPBOX "",IDC_STATIC,5,25,145,77
+ GROUPBOX "",IDC_STATIC,43,100,234,79
+END
+
+IDD_CPUCONF DIALOGEX 0, 0, 232, 281
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Cpu Config"
+FONT 8, "MS Sans Serif", 0, 0, 0x0
+BEGIN
+ DEFPUSHBUTTON "OK",IDOK,51,258,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,120,258,50,14
+ GROUPBOX "Misc Options",IDC_MISCOPT,5,5,220,206
+ CONTROL "Disable Xa Decoding",IDC_XA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,15,205,10
+ CONTROL "Sio Irq Always Enabled",IDC_SIO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,30,205,10
+ CONTROL "Spu Irq Always Enabled",IDC_SPUIRQ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,45,205,10
+ CONTROL "Black && White Movies",IDC_MDEC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,60,205,10
+ CONTROL "Disable Cd Audio",IDC_CDDA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,75,205,10
+ CONTROL "Slow Boot",IDC_SLOWBOOT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,90,205,10
+ CONTROL "Enable Console Output",IDC_PSXOUT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,105,205,10
+ CONTROL "Enable Interpreter Cpu",IDC_CPU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,120,205,10
+ CONTROL "Enable Debugger",IDC_DEBUG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,135,205,10
+ CONTROL "Parasite Eve 2, Vandal Hearts 1/2 Fix",IDC_RCNTFIX,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,150,205,10
+ CONTROL "InuYasha Sengoku Battle Fix",IDC_VSYNCWA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,165,205,10
+ CONTROL "Widescreen (GTE Hack)",IDC_WIDESCREEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,180,205,10
+ GROUPBOX "Select Psx System Type",IDC_SELPSX,5,216,220,35
+ CONTROL "Autodetect",IDC_PSXAUTO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,230,80,10
+ COMBOBOX IDC_PSXTYPES,105,230,53,50,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+ CONTROL "Hide cursor",IDC_HIDECURSOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,195,205,10
+END
+
+IDD_NETPLAY DIALOG 0, 0, 165, 95
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "NetPlay Configuration"
+FONT 8, "MS Sans Serif"
+BEGIN
+ DEFPUSHBUTTON "OK",IDOK,55,75,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,110,75,50,14
+ COMBOBOX IDC_LISTNET,10,15,145,74,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ PUSHBUTTON "Configure...",IDC_CONFIGNET,10,35,45,12
+ PUSHBUTTON "Test...",IDC_TESTNET,60,35,45,12
+ PUSHBUTTON "About...",IDC_ABOUTNET,110,35,45,12
+ RTEXT "NetPlay",IDC_NETPLAY,50,5,41,10,SS_CENTERIMAGE
+ CTEXT "Note: The NetPlay Plugin Directory should be the same as the other Plugins.",IDC_NETPLAYNOTE,10,50,145,19
+END
+
+IDD_CONNECT DIALOG 0, 0, 112, 31
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Connecting..."
+FONT 8, "MS Sans Serif"
+BEGIN
+ LTEXT "Please wait while connecting... /",IDC_CONNECTSTR,5,10,104,8
+END
+
+IDD_CONFIG DIALOGEX 0, 0, 322, 187
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Configuration"
+FONT 8, "MS Sans Serif", 0, 0, 0x1
+BEGIN
+ COMBOBOX IDC_LISTGPU,10,10,145,74,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ PUSHBUTTON "Configure...",IDC_CONFIGGPU,10,30,45,12
+ PUSHBUTTON "Test...",IDC_TESTGPU,60,30,45,12
+ PUSHBUTTON "About...",IDC_ABOUTGPU,110,30,45,12
+ COMBOBOX IDC_LISTSPU,165,10,145,74,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ PUSHBUTTON "Configure...",IDC_CONFIGSPU,165,30,45,12
+ PUSHBUTTON "Test...",IDC_TESTSPU,215,30,45,12
+ PUSHBUTTON "About...",IDC_ABOUTSPU,265,30,43,12
+ COMBOBOX IDC_LISTCDR,10,100,145,74,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ PUSHBUTTON "Configure...",IDC_CONFIGCDR,10,120,43,12
+ PUSHBUTTON "Test...",IDC_TESTCDR,60,120,45,12
+ PUSHBUTTON "About...",IDC_ABOUTCDR,110,120,45,12
+ COMBOBOX IDC_LISTBIOS,10,147,145,74,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "OK",IDOK,205,166,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,260,166,50,14
+ CTEXT "Graphics",IDC_GRAPHICS,10,0,145,10,SS_CENTERIMAGE
+ CTEXT "Sound",IDC_SOUND,165,0,144,10,SS_CENTERIMAGE
+ CTEXT "Cdrom",IDC_CDROM,10,90,144,10,SS_CENTERIMAGE
+ CTEXT "Bios",IDC_BIOS,11,136,146,10,SS_CENTERIMAGE
+ COMBOBOX IDC_LISTPAD1,10,55,145,74,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ PUSHBUTTON "Configure...",IDC_CONFIGPAD1,10,75,45,12
+ PUSHBUTTON "Test...",IDC_TESTPAD1,60,75,45,12
+ PUSHBUTTON "About...",IDC_ABOUTPAD1,110,75,45,12
+ CTEXT "Second Controller",IDC_SECONDCONTROLLER,164,45,144,10,SS_CENTERIMAGE
+ COMBOBOX IDC_LISTPAD2,165,55,145,74,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ PUSHBUTTON "Configure...",IDC_CONFIGPAD2,165,75,45,12
+ PUSHBUTTON "Test...",IDC_TESTPAD2,215,75,45,12
+ PUSHBUTTON "About...",IDC_ABOUTPAD2,265,75,45,12
+ CTEXT "First Controller",IDC_FIRSTCONTROLLER,11,45,138,10,SS_CENTERIMAGE
+ PUSHBUTTON "Set Bios Directory",IDC_BIOSDIR,102,166,89,14
+ PUSHBUTTON "Set Plugins Directory",IDC_PLUGINSDIR,10,166,89,14
+ COMBOBOX IDC_LISTSIO1,165,100,145,74,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ PUSHBUTTON "Configure...",IDC_CONFIGSIO1,165,119,43,12
+ PUSHBUTTON "Test...",IDC_TESTSIO1,215,119,45,12
+ PUSHBUTTON "About...",IDC_ABOUTSIO1,265,119,45,12
+ CTEXT "Link cable",IDC_LINKCABLE,165,89,144,10,SS_CENTERIMAGE
+END
+
+IDD_CHEATLIST DIALOGEX 0, 0, 392, 201
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Edit Cheat Codes"
+FONT 8, "MS Sans Serif", 0, 0, 0x1
+BEGIN
+ PUSHBUTTON "&Close",IDCANCEL,324,180,61,14
+ CONTROL "List2",IDC_CODELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,7,312,187
+ PUSHBUTTON "&Enable/Disable",IDC_TOGGLECODE,324,7,61,14
+ PUSHBUTTON "&Add Code",IDC_ADDCODE,324,32,61,14
+ PUSHBUTTON "&Edit Code",IDC_EDITCODE,324,50,61,14
+ PUSHBUTTON "&Remove Code",IDC_REMOVECODE,324,68,61,14
+ PUSHBUTTON "&Load...",IDC_LOADCODE,324,96,61,14
+ PUSHBUTTON "&Save As...",IDC_SAVECODE,324,114,61,14
+END
+
+IDD_CHEATSEARCH DIALOGEX 0, 0, 280, 214
+STYLE DS_SETFONT | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_CAPTION
+CAPTION "Cheat Search"
+FONT 8, "MS Sans Serif", 0, 0, 0x1
+BEGIN
+ LTEXT "Search For:",IDC_LABEL_SEARCHFOR,7,9,51,8,0,WS_EX_TRANSPARENT
+ COMBOBOX IDC_SEARCHFOR,60,7,80,224,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ LTEXT "Data Type:",IDC_LABEL_DATATYPE,7,26,51,8,0,WS_EX_TRANSPARENT
+ COMBOBOX IDC_DATATYPE,60,24,80,224,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ LTEXT "Data Base:",IDC_LABEL_DATABASE,147,26,44,8,0,WS_EX_TRANSPARENT
+ COMBOBOX IDC_DATABASE,194,24,81,224,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ LTEXT "Value:",IDC_LABEL_VALUE,7,43,50,8,0,WS_EX_TRANSPARENT
+ EDITTEXT IDC_VALUEFROM,60,41,80,12,ES_AUTOHSCROLL
+ RTEXT "To",IDC_LABEL_TO,144,43,45,8,0,WS_EX_TRANSPARENT
+ EDITTEXT IDC_VALUETO,194,41,80,12,ES_AUTOHSCROLL
+ LTEXT "Addresses Found : 0",IDC_LABEL_RESULTSFOUND,7,180,263,8,0,WS_EX_TRANSPARENT
+ LISTBOX IDC_RESLIST,6,62,199,112,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
+ PUSHBUTTON "&Freeze",IDC_FREEZE,213,63,62,17,WS_DISABLED
+ PUSHBUTTON "&Modify",IDC_MODIFY,213,86,62,17,WS_DISABLED
+ PUSHBUTTON "&Copy",IDC_COPY,213,109,62,17,WS_DISABLED
+ DEFPUSHBUTTON "&Search",IDC_SEARCH,8,194,86,14
+ PUSHBUTTON "&New Search",IDC_NEWSEARCH,98,194,86,14
+ PUSHBUTTON "C&lose",IDCANCEL,188,194,86,14
+ EDITTEXT 10000,0,1000,10,10,ES_AUTOHSCROLL | NOT WS_BORDER | NOT WS_TABSTOP
+END
+
+IDD_CHEATEDIT DIALOGEX 0, 0, 242, 161
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Edit Cheat Code"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+ DEFPUSHBUTTON "OK",IDOK,126,143,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,185,143,50,14
+ LTEXT "Description:",IDC_LABEL_DESCR,7,6,39,8
+ LTEXT "Cheat Code:",IDC_LABEL_CODE,6,40,42,8
+ EDITTEXT IDC_DESCR,6,17,232,14,ES_AUTOHSCROLL
+ EDITTEXT IDC_CODE,6,52,231,84,ES_MULTILINE | ES_UPPERCASE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN
+END
+
+IDD_CHEATVALEDIT DIALOGEX 0, 0, 162, 57
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Enter New Value"
+FONT 8, "MS Sans Serif", 0, 0, 0x1
+BEGIN
+ DEFPUSHBUTTON "OK",IDOK,25,40,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,87,40,50,14
+ LTEXT "Address:",IDC_LABEL_ADDRESS,7,7,30,8
+ LTEXT "Value:",IDC_LABEL_VALUE,8,24,30,8
+ EDITTEXT IDC_ADDRESS,41,4,113,12,ES_AUTOHSCROLL | WS_DISABLED
+ EDITTEXT IDC_VALUE,41,22,113,12,ES_AUTOHSCROLL
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO
+BEGIN
+ IDD_MCDCONF, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 400
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 190
+ END
+
+ ABOUT_DIALOG, DIALOG
+ BEGIN
+ RIGHTMARGIN, 310
+ BOTTOMMARGIN, 201
+ END
+
+ IDD_CPUCONF, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 225
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 272
+ END
+
+ IDD_NETPLAY, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 158
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 88
+ END
+
+ IDD_CONNECT, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 105
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 24
+ END
+
+ IDD_CONFIG, DIALOG
+ BEGIN
+ BOTTOMMARGIN, 173
+ END
+
+ IDD_CHEATLIST, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 385
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 194
+ END
+END
+#endif // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_APP_ICON ICON "gui\\pcsxr.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Bitmap
+//
+
+SPLASH_LOGO BITMAP "gui\\about.bmp"
+MAIN_LOGO BITMAP "gui\\pcsxr.bmp"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// RT_MANIFEST
+//
+
+1 RT_MANIFEST "gui\\pcsxr.exe.manifest"
+#endif // English (United States) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Greek (Greece) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ELL)
+LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
+#pragma code_page(1253)
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+ "resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+ "#include ""afxres.h""\r\n"
+ "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+ "\r\n"
+ "\0"
+END
+
+#endif // APSTUDIO_INVOKED
+
+#endif // Greek (Greece) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif // not APSTUDIO_INVOKED
+

pcsxr-1.9.93.tar.bz2/win32/pcsxr.sln Added

@@ -0,0 +1,50 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DFSound", "plugins\dfsound\DFSound.vcxproj", "{DB25BF63-9B9E-4A40-A45E-BBBA49AD6F22}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DFXVideo", "plugins\dfxvideo\DFXVideo.vcxproj", "{30F06328-DD64-4030-AF7A-19FBC74CF298}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SSSPSXpad", "plugins\PadSSSPSX\PadSSSPSX.vcxproj", "{0639CDF3-8C1F-47F4-A760-F5568194A083}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gpuPeopsOpenGL", "plugins\peopsxgl\gpuPeopsOpenGL.vcxproj", "{726BDE88-F2AD-4666-A4BC-5858F973976E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcsxr", "pcsxr.vcxproj", "{9EEA62F5-46DC-4C07-AFE1-F72F9D6B9E3E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bladesio1", "plugins\bladesio1\bladesio1.vcxproj", "{F57B00CD-8399-4683-901E-11FA09727AE5}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{DB25BF63-9B9E-4A40-A45E-BBBA49AD6F22}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DB25BF63-9B9E-4A40-A45E-BBBA49AD6F22}.Debug|Win32.Build.0 = Debug|Win32
+		{DB25BF63-9B9E-4A40-A45E-BBBA49AD6F22}.Release|Win32.ActiveCfg = Release|Win32
+		{DB25BF63-9B9E-4A40-A45E-BBBA49AD6F22}.Release|Win32.Build.0 = Release|Win32
+		{30F06328-DD64-4030-AF7A-19FBC74CF298}.Debug|Win32.ActiveCfg = Debug|Win32
+		{30F06328-DD64-4030-AF7A-19FBC74CF298}.Debug|Win32.Build.0 = Debug|Win32
+		{30F06328-DD64-4030-AF7A-19FBC74CF298}.Release|Win32.ActiveCfg = Release|Win32
+		{30F06328-DD64-4030-AF7A-19FBC74CF298}.Release|Win32.Build.0 = Release|Win32
+		{0639CDF3-8C1F-47F4-A760-F5568194A083}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0639CDF3-8C1F-47F4-A760-F5568194A083}.Debug|Win32.Build.0 = Debug|Win32
+		{0639CDF3-8C1F-47F4-A760-F5568194A083}.Release|Win32.ActiveCfg = Release|Win32
+		{0639CDF3-8C1F-47F4-A760-F5568194A083}.Release|Win32.Build.0 = Release|Win32
+		{726BDE88-F2AD-4666-A4BC-5858F973976E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{726BDE88-F2AD-4666-A4BC-5858F973976E}.Debug|Win32.Build.0 = Debug|Win32
+		{726BDE88-F2AD-4666-A4BC-5858F973976E}.Release|Win32.ActiveCfg = Release|Win32
+		{726BDE88-F2AD-4666-A4BC-5858F973976E}.Release|Win32.Build.0 = Release|Win32
+		{9EEA62F5-46DC-4C07-AFE1-F72F9D6B9E3E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9EEA62F5-46DC-4C07-AFE1-F72F9D6B9E3E}.Debug|Win32.Build.0 = Debug|Win32
+		{9EEA62F5-46DC-4C07-AFE1-F72F9D6B9E3E}.Release|Win32.ActiveCfg = Release|Win32
+		{9EEA62F5-46DC-4C07-AFE1-F72F9D6B9E3E}.Release|Win32.Build.0 = Release|Win32
+		{F57B00CD-8399-4683-901E-11FA09727AE5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F57B00CD-8399-4683-901E-11FA09727AE5}.Debug|Win32.Build.0 = Debug|Win32
+		{F57B00CD-8399-4683-901E-11FA09727AE5}.Release|Win32.ActiveCfg = Release|Win32
+		{F57B00CD-8399-4683-901E-11FA09727AE5}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

pcsxr-1.9.93.tar.bz2/win32/pcsxr.vcxproj Added

@@ -0,0 +1,551 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{9EEA62F5-46DC-4C07-AFE1-F72F9D6B9E3E}</ProjectGuid>
+ <RootNamespace>pcsxr</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+ <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</EmbedManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\Debug/pcsxr.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>../;./zlib;../libpcsxcore;./glue;./;./gui;./intl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;__WIN32__;__i386__;PCSXR_VERSION="1.5";ENABLE_NLS;PACKAGE="pcsxr";inline=;ENABLE_SIO1API=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>.\Debug/pcsxr.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
+ <ObjectFileName>.\Debug/</ObjectFileName>
+ <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0408</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;comctl32.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(SolutionDir)$(Configuration)\pcsxr.exe</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>.\Debug/pcsxr.pdb</ProgramDatabaseFile>
+ <SubSystem>Windows</SubSystem>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\Debug/pcsxr.bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\Release/pcsxr.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../;./zlib;../libpcsxcore;./glue;./;./gui;./intl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;__WIN32__;_MSC_VER_;PCSXR_VERSION="1.5";__i386__;ENABLE_NLS;PACKAGE="pcsxr";inline=__forceinline;ENABLE_SIO1API=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <StructMemberAlignment>16Bytes</StructMemberAlignment>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>.\Release/pcsxr.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
+ <ObjectFileName>.\Release/</ObjectFileName>
+ <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0408</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;comctl32.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>.\Release/pcsxr.exe</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <SubSystem>Windows</SubSystem>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\Release/pcsxr.bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\libpcsxcore\cdriso.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\cdrom.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\cheat.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\debug.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\decode_xa.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\disr3000a.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\gpu.c" />
+ <ClCompile Include="..\libpcsxcore\gte.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\mdec.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\misc.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\plugins.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\ppf.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\psxbios.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\psxcommon.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\psxcounters.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\psxdma.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\psxhle.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\psxhw.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\psxinterpreter.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\psxmem.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\r3000a.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\sio.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\socket.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\spu.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\ix86\iR3000A.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\ix86\ix86.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="gui\AboutDlg.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="gui\CheatDlg.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="gui\ConfigurePlugins.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="gui\plugin.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="gui\WndMain.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="zlib\adler32.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="zlib\compress.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="zlib\crc32.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="zlib\deflate.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="zlib\gzio.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="zlib\infblock.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="zlib\infcodes.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="zlib\inffast.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="zlib\inflate.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="zlib\inftrees.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="zlib\infutil.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="zlib\trees.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="zlib\uncompr.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="zlib\zutil.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="intl\bindtextdom.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="intl\dcgettext.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="intl\dgettext.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="intl\explodename.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="intl\finddomain.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="intl\gettext.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="intl\intl-compat.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="intl\l10nflist.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="intl\loadmsgcat.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="intl\localealias.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="intl\textdomain.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\libpcsxcore\cdriso.h" />
+ <ClInclude Include="..\libpcsxcore\cdrom.h" />
+ <ClInclude Include="..\libpcsxcore\cheat.h" />
+ <ClInclude Include="..\libpcsxcore\coff.h" />
+ <ClInclude Include="..\libpcsxcore\debug.h" />
+ <ClInclude Include="..\libpcsxcore\decode_xa.h" />
+ <ClInclude Include="..\libpcsxcore\gpu.h" />
+ <ClInclude Include="..\libpcsxcore\gte.h" />
+ <ClInclude Include="..\libpcsxcore\gte_divider.h" />
+ <ClInclude Include="..\libpcsxcore\mdec.h" />
+ <ClInclude Include="..\libpcsxcore\misc.h" />
+ <ClInclude Include="..\libpcsxcore\plugins.h" />
+ <ClInclude Include="..\libpcsxcore\ppf.h" />
+ <ClInclude Include="..\libpcsxcore\psemu_plugin_defs.h" />
+ <ClInclude Include="..\libpcsxcore\psxbios.h" />
+ <ClInclude Include="..\libpcsxcore\psxcommon.h" />
+ <ClInclude Include="..\libpcsxcore\psxcounters.h" />
+ <ClInclude Include="..\libpcsxcore\psxdma.h" />
+ <ClInclude Include="..\libpcsxcore\psxhle.h" />
+ <ClInclude Include="..\libpcsxcore\psxhw.h" />
+ <ClInclude Include="..\libpcsxcore\psxmem.h" />
+ <ClInclude Include="..\libpcsxcore\r3000a.h" />
+ <ClInclude Include="..\libpcsxcore\sio.h" />
+ <ClInclude Include="..\libpcsxcore\sjisfont.h" />
+ <ClInclude Include="..\libpcsxcore\socket.h" />
+ <ClInclude Include="..\libpcsxcore\spu.h" />
+ <ClInclude Include="..\libpcsxcore\system.h" />
+ <ClInclude Include="..\libpcsxcore\ix86\iGte.h" />
+ <ClInclude Include="..\libpcsxcore\ix86\ix86.h" />
+ <ClInclude Include="gui\AboutDlg.h" />
+ <ClInclude Include="gui\NoPic.h" />
+ <ClInclude Include="gui\plugin.h" />
+ <ClInclude Include="gui\Win32.h" />
+ <ClInclude Include="zlib\deflate.h" />
+ <ClInclude Include="zlib\infblock.h" />
+ <ClInclude Include="zlib\infcodes.h" />
+ <ClInclude Include="zlib\inffast.h" />
+ <ClInclude Include="zlib\inffixed.h" />
+ <ClInclude Include="zlib\inftrees.h" />
+ <ClInclude Include="zlib\infutil.h" />
+ <ClInclude Include="zlib\trees.h" />
+ <ClInclude Include="zlib\zconf.h" />
+ <ClInclude Include="zlib\zlib.h" />
+ <ClInclude Include="zlib\zutil.h" />
+ <ClInclude Include="glue\stdint.h" />
+ <ClInclude Include="glue\sys\mman.h" />
+ <ClInclude Include="intl\gettext.h" />
+ <ClInclude Include="intl\gettextP.h" />
+ <ClInclude Include="intl\hash-string.h" />
+ <ClInclude Include="intl\intlconfig.h" />
+ <ClInclude Include="intl\libgettext.h" />
+ <ClInclude Include="intl\libintl.h" />
+ <ClInclude Include="intl\loadinfo.h" />
+ <ClInclude Include="config.h" />
+ <ClInclude Include="resource.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="gui\about.bmp" />
+ <None Include="gui\pcsxr.ico" />
+ <None Include="gui\pcsxr.bmp" />
+ </ItemGroup>
+ <ItemGroup>
+ <Manifest Include="gui\pcsxr.exe.manifest" />
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="pcsxr.rc">
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

pcsxr-1.9.93.tar.bz2/win32/pcsxr.vcxproj.filters Added

@@ -0,0 +1,378 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="libpcsxcore">
+ <UniqueIdentifier>{ec95fe4a-9af2-4149-9084-07a8af1455ed}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="libpcsxcore\ix86">
+ <UniqueIdentifier>{fbc09cea-5b71-484b-94da-16bb339e13be}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="gui">
+ <UniqueIdentifier>{86fc40af-6bfa-43ae-8648-bac5191a5ce1}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="zlib">
+ <UniqueIdentifier>{014c7814-ebe0-443e-bdf1-0e07fe0508f6}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="glue">
+ <UniqueIdentifier>{d3639188-eb44-4961-9d3c-fd2189b4c22f}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="glue\sys">
+ <UniqueIdentifier>{b78acda2-160b-446b-be41-2048d552068d}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="intl">
+ <UniqueIdentifier>{2fc9bc1d-cd0d-4c0e-a6ff-d26d53d52434}</UniqueIdentifier>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\libpcsxcore\cdriso.c">
+ <Filter>libpcsxcore</Filter>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\cdrom.c">
+ <Filter>libpcsxcore</Filter>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\cheat.c">
+ <Filter>libpcsxcore</Filter>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\debug.c">
+ <Filter>libpcsxcore</Filter>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\decode_xa.c">
+ <Filter>libpcsxcore</Filter>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\disr3000a.c">
+ <Filter>libpcsxcore</Filter>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\gpu.c">
+ <Filter>libpcsxcore</Filter>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\gte.c">
+ <Filter>libpcsxcore</Filter>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\mdec.c">
+ <Filter>libpcsxcore</Filter>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\misc.c">
+ <Filter>libpcsxcore</Filter>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\plugins.c">
+ <Filter>libpcsxcore</Filter>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\ppf.c">
+ <Filter>libpcsxcore</Filter>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\psxbios.c">
+ <Filter>libpcsxcore</Filter>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\psxcommon.c">
+ <Filter>libpcsxcore</Filter>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\psxcounters.c">
+ <Filter>libpcsxcore</Filter>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\psxdma.c">
+ <Filter>libpcsxcore</Filter>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\psxhle.c">
+ <Filter>libpcsxcore</Filter>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\psxhw.c">
+ <Filter>libpcsxcore</Filter>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\psxinterpreter.c">
+ <Filter>libpcsxcore</Filter>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\psxmem.c">
+ <Filter>libpcsxcore</Filter>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\r3000a.c">
+ <Filter>libpcsxcore</Filter>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\sio.c">
+ <Filter>libpcsxcore</Filter>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\socket.c">
+ <Filter>libpcsxcore</Filter>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\spu.c">
+ <Filter>libpcsxcore</Filter>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\ix86\iR3000A.c">
+ <Filter>libpcsxcore\ix86</Filter>
+ </ClCompile>
+ <ClCompile Include="..\libpcsxcore\ix86\ix86.c">
+ <Filter>libpcsxcore\ix86</Filter>
+ </ClCompile>
+ <ClCompile Include="gui\AboutDlg.c">
+ <Filter>gui</Filter>
+ </ClCompile>
+ <ClCompile Include="gui\CheatDlg.c">
+ <Filter>gui</Filter>
+ </ClCompile>
+ <ClCompile Include="gui\ConfigurePlugins.c">
+ <Filter>gui</Filter>
+ </ClCompile>
+ <ClCompile Include="gui\plugin.c">
+ <Filter>gui</Filter>
+ </ClCompile>
+ <ClCompile Include="gui\WndMain.c">
+ <Filter>gui</Filter>
+ </ClCompile>
+ <ClCompile Include="zlib\adler32.c">
+ <Filter>zlib</Filter>
+ </ClCompile>
+ <ClCompile Include="zlib\compress.c">
+ <Filter>zlib</Filter>
+ </ClCompile>
+ <ClCompile Include="zlib\crc32.c">
+ <Filter>zlib</Filter>
+ </ClCompile>
+ <ClCompile Include="zlib\deflate.c">
+ <Filter>zlib</Filter>
+ </ClCompile>
+ <ClCompile Include="zlib\gzio.c">
+ <Filter>zlib</Filter>
+ </ClCompile>
+ <ClCompile Include="zlib\infblock.c">
+ <Filter>zlib</Filter>
+ </ClCompile>
+ <ClCompile Include="zlib\infcodes.c">
+ <Filter>zlib</Filter>
+ </ClCompile>
+ <ClCompile Include="zlib\inffast.c">
+ <Filter>zlib</Filter>
+ </ClCompile>
+ <ClCompile Include="zlib\inflate.c">
+ <Filter>zlib</Filter>
+ </ClCompile>
+ <ClCompile Include="zlib\inftrees.c">
+ <Filter>zlib</Filter>
+ </ClCompile>
+ <ClCompile Include="zlib\infutil.c">
+ <Filter>zlib</Filter>
+ </ClCompile>
+ <ClCompile Include="zlib\trees.c">
+ <Filter>zlib</Filter>
+ </ClCompile>
+ <ClCompile Include="zlib\uncompr.c">
+ <Filter>zlib</Filter>
+ </ClCompile>
+ <ClCompile Include="zlib\zutil.c">
+ <Filter>zlib</Filter>
+ </ClCompile>
+ <ClCompile Include="intl\bindtextdom.c">
+ <Filter>intl</Filter>
+ </ClCompile>
+ <ClCompile Include="intl\dcgettext.c">
+ <Filter>intl</Filter>
+ </ClCompile>
+ <ClCompile Include="intl\dgettext.c">
+ <Filter>intl</Filter>
+ </ClCompile>
+ <ClCompile Include="intl\explodename.c">
+ <Filter>intl</Filter>
+ </ClCompile>
+ <ClCompile Include="intl\finddomain.c">
+ <Filter>intl</Filter>
+ </ClCompile>
+ <ClCompile Include="intl\gettext.c">
+ <Filter>intl</Filter>
+ </ClCompile>
+ <ClCompile Include="intl\intl-compat.c">
+ <Filter>intl</Filter>
+ </ClCompile>
+ <ClCompile Include="intl\l10nflist.c">
+ <Filter>intl</Filter>
+ </ClCompile>
+ <ClCompile Include="intl\loadmsgcat.c">
+ <Filter>intl</Filter>
+ </ClCompile>
+ <ClCompile Include="intl\localealias.c">
+ <Filter>intl</Filter>
+ </ClCompile>
+ <ClCompile Include="intl\textdomain.c">
+ <Filter>intl</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\libpcsxcore\cdriso.h">
+ <Filter>libpcsxcore</Filter>
+ </ClInclude>
+ <ClInclude Include="..\libpcsxcore\cdrom.h">
+ <Filter>libpcsxcore</Filter>
+ </ClInclude>
+ <ClInclude Include="..\libpcsxcore\cheat.h">
+ <Filter>libpcsxcore</Filter>
+ </ClInclude>
+ <ClInclude Include="..\libpcsxcore\coff.h">
+ <Filter>libpcsxcore</Filter>
+ </ClInclude>
+ <ClInclude Include="..\libpcsxcore\debug.h">
+ <Filter>libpcsxcore</Filter>
+ </ClInclude>
+ <ClInclude Include="..\libpcsxcore\decode_xa.h">
+ <Filter>libpcsxcore</Filter>
+ </ClInclude>
+ <ClInclude Include="..\libpcsxcore\gpu.h">
+ <Filter>libpcsxcore</Filter>
+ </ClInclude>
+ <ClInclude Include="..\libpcsxcore\gte.h">
+ <Filter>libpcsxcore</Filter>
+ </ClInclude>
+ <ClInclude Include="..\libpcsxcore\gte_divider.h">
+ <Filter>libpcsxcore</Filter>
+ </ClInclude>
+ <ClInclude Include="..\libpcsxcore\mdec.h">
+ <Filter>libpcsxcore</Filter>
+ </ClInclude>
+ <ClInclude Include="..\libpcsxcore\misc.h">
+ <Filter>libpcsxcore</Filter>
+ </ClInclude>
+ <ClInclude Include="..\libpcsxcore\plugins.h">
+ <Filter>libpcsxcore</Filter>
+ </ClInclude>
+ <ClInclude Include="..\libpcsxcore\ppf.h">
+ <Filter>libpcsxcore</Filter>
+ </ClInclude>
+ <ClInclude Include="..\libpcsxcore\psemu_plugin_defs.h">
+ <Filter>libpcsxcore</Filter>
+ </ClInclude>
+ <ClInclude Include="..\libpcsxcore\psxbios.h">
+ <Filter>libpcsxcore</Filter>
+ </ClInclude>
+ <ClInclude Include="..\libpcsxcore\psxcommon.h">
+ <Filter>libpcsxcore</Filter>
+ </ClInclude>
+ <ClInclude Include="..\libpcsxcore\psxcounters.h">
+ <Filter>libpcsxcore</Filter>
+ </ClInclude>
+ <ClInclude Include="..\libpcsxcore\psxdma.h">
+ <Filter>libpcsxcore</Filter>
+ </ClInclude>
+ <ClInclude Include="..\libpcsxcore\psxhle.h">
+ <Filter>libpcsxcore</Filter>
+ </ClInclude>
+ <ClInclude Include="..\libpcsxcore\psxhw.h">
+ <Filter>libpcsxcore</Filter>
+ </ClInclude>
+ <ClInclude Include="..\libpcsxcore\psxmem.h">
+ <Filter>libpcsxcore</Filter>
+ </ClInclude>
+ <ClInclude Include="..\libpcsxcore\r3000a.h">
+ <Filter>libpcsxcore</Filter>
+ </ClInclude>
+ <ClInclude Include="..\libpcsxcore\sio.h">
+ <Filter>libpcsxcore</Filter>
+ </ClInclude>
+ <ClInclude Include="..\libpcsxcore\sjisfont.h">
+ <Filter>libpcsxcore</Filter>
+ </ClInclude>
+ <ClInclude Include="..\libpcsxcore\socket.h">
+ <Filter>libpcsxcore</Filter>
+ </ClInclude>
+ <ClInclude Include="..\libpcsxcore\spu.h">
+ <Filter>libpcsxcore</Filter>
+ </ClInclude>
+ <ClInclude Include="..\libpcsxcore\system.h">
+ <Filter>libpcsxcore</Filter>
+ </ClInclude>
+ <ClInclude Include="..\libpcsxcore\ix86\iGte.h">
+ <Filter>libpcsxcore\ix86</Filter>
+ </ClInclude>
+ <ClInclude Include="..\libpcsxcore\ix86\ix86.h">
+ <Filter>libpcsxcore\ix86</Filter>
+ </ClInclude>
+ <ClInclude Include="gui\AboutDlg.h">
+ <Filter>gui</Filter>
+ </ClInclude>
+ <ClInclude Include="gui\NoPic.h">
+ <Filter>gui</Filter>
+ </ClInclude>
+ <ClInclude Include="gui\plugin.h">
+ <Filter>gui</Filter>
+ </ClInclude>
+ <ClInclude Include="gui\Win32.h">
+ <Filter>gui</Filter>
+ </ClInclude>
+ <ClInclude Include="zlib\deflate.h">
+ <Filter>zlib</Filter>
+ </ClInclude>
+ <ClInclude Include="zlib\infblock.h">
+ <Filter>zlib</Filter>
+ </ClInclude>
+ <ClInclude Include="zlib\infcodes.h">
+ <Filter>zlib</Filter>
+ </ClInclude>
+ <ClInclude Include="zlib\inffast.h">
+ <Filter>zlib</Filter>
+ </ClInclude>
+ <ClInclude Include="zlib\inffixed.h">
+ <Filter>zlib</Filter>
+ </ClInclude>
+ <ClInclude Include="zlib\inftrees.h">
+ <Filter>zlib</Filter>
+ </ClInclude>
+ <ClInclude Include="zlib\infutil.h">
+ <Filter>zlib</Filter>
+ </ClInclude>
+ <ClInclude Include="zlib\trees.h">
+ <Filter>zlib</Filter>
+ </ClInclude>
+ <ClInclude Include="zlib\zconf.h">
+ <Filter>zlib</Filter>
+ </ClInclude>
+ <ClInclude Include="zlib\zlib.h">
+ <Filter>zlib</Filter>
+ </ClInclude>
+ <ClInclude Include="zlib\zutil.h">
+ <Filter>zlib</Filter>
+ </ClInclude>
+ <ClInclude Include="glue\stdint.h">
+ <Filter>glue</Filter>
+ </ClInclude>
+ <ClInclude Include="glue\sys\mman.h">
+ <Filter>glue\sys</Filter>
+ </ClInclude>
+ <ClInclude Include="intl\gettext.h">
+ <Filter>intl</Filter>
+ </ClInclude>
+ <ClInclude Include="intl\gettextP.h">
+ <Filter>intl</Filter>
+ </ClInclude>
+ <ClInclude Include="intl\hash-string.h">
+ <Filter>intl</Filter>
+ </ClInclude>
+ <ClInclude Include="intl\intlconfig.h">
+ <Filter>intl</Filter>
+ </ClInclude>
+ <ClInclude Include="intl\libgettext.h">
+ <Filter>intl</Filter>
+ </ClInclude>
+ <ClInclude Include="intl\libintl.h">
+ <Filter>intl</Filter>
+ </ClInclude>
+ <ClInclude Include="intl\loadinfo.h">
+ <Filter>intl</Filter>
+ </ClInclude>
+ <ClInclude Include="config.h" />
+ <ClInclude Include="resource.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="gui\about.bmp">
+ <Filter>gui</Filter>
+ </None>
+ <None Include="gui\pcsxr.ico">
+ <Filter>gui</Filter>
+ </None>
+ <None Include="gui\pcsxr.bmp">
+ <Filter>gui</Filter>
+ </None>
+ </ItemGroup>
+ <ItemGroup>
+ <Manifest Include="gui\pcsxr.exe.manifest">
+ <Filter>gui</Filter>
+ </Manifest>
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="pcsxr.rc" />
+ </ItemGroup>
+</Project>
\ No newline at end of file

pcsxr-1.9.93.tar.bz2/win32/pcsxr.vcxproj.user Added

pcsxr-1.9.93.tar.bz2/win32/plugins Added

pcsxr-1.9.93.tar.bz2/win32/plugins/PadSSSPSX Added

pcsxr-1.9.93.tar.bz2/win32/plugins/PadSSSPSX/PadSSSPSX.cpp Added

@@ -0,0 +1,1144 @@
+#define WINVER 0x0500
+#define _WIN32_WINNT WINVER
+#define DIRECTINPUT_VERSION 0x0800
+
+// Modified by Wei Mingzhi <whistler_wmz@users.sf.net> at 10/2/2009
+// Added default keys, use registry instead of configuration file
+
+// Modified by Wei Mingzhi <whistler_wmz@users.sf.net> at 12/3/2009
+// Quick hack fix for FF8 "reverting" problem in menus
+// Added configuration for enabling/disabling DualShock
+
+#include <windows.h>
+#include <windowsx.h>
+#include <commctrl.h>
+#include <dinput.h>
+
+#include "PadSSSPSX.h"
+
+static const char* LibraryName		= "SSSPSX PAD Plugin Pressure Mod";
+static const unsigned char version	= 0x0002;
+static const unsigned char revision	= 1;
+static const unsigned char build	= 6;
+
+HMODULE hInstance;
+HWND hTargetWnd;
+
+static void (CALLBACK *gpuVisualVibration)(unsigned long, unsigned long) = NULL;
+
+static struct
+{
+	Config config;
+	int devcnt;
+	LPDIRECTINPUT8 pDInput;
+	LPDIRECTINPUTDEVICE8 pDKeyboard;
+	LPDIRECTINPUTDEVICE8 pDDevice[4];
+	LPDIRECTINPUTEFFECT pDEffect[4][2]; /* for Small & Big Motor */
+	DIJOYSTATE JoyState[4];
+	u16 padStat[2];
+	int padID[2];
+	int padMode1[2];
+	int padMode2[2];
+	int padModeE[2];
+	int padModeC[2];
+	int padModeF[2];
+	int padVib0[2];
+	int padVib1[2];
+	int padVibF[2][4];
+	int padVibC[2];
+	DWORD padPress[2][16];
+	int curPad;
+	int curByte;
+	int curCmd;
+	int cmdLen;
+} global;
+
+static BOOL CALLBACK EnumAxesCallback (LPCDIDEVICEOBJECTINSTANCE lpddoi, LPVOID pvRef)
+{
+	LPDIRECTINPUTDEVICE8 pDDevice = (LPDIRECTINPUTDEVICE8)pvRef;
+	DIPROPRANGE diprg;
+	diprg.diph.dwSize = sizeof (diprg);
+	diprg.diph.dwHeaderSize	= sizeof (diprg.diph);
+	diprg.diph.dwObj = lpddoi->dwType;
+	diprg.diph.dwHow = DIPH_BYID;
+	diprg.lMin = -128;
+	diprg.lMax = 127;
+	pDDevice->SetProperty (DIPROP_RANGE, &diprg.diph);
+	return DIENUM_CONTINUE;
+}
+
+static BOOL CALLBACK EnumJoysticksCallback (const DIDEVICEINSTANCE* instance, VOID* pContext)
+{
+	const int devno = global.devcnt;
+	if (devno >= 4)
+		return DIENUM_STOP;
+	HRESULT result = global.pDInput->CreateDevice (instance->guidInstance, &global.pDDevice[devno], NULL);
+	if (FAILED (result))
+		return DIENUM_CONTINUE;
+	global.devcnt++;
+	return DIENUM_CONTINUE;
+}
+
+static bool ReleaseDirectInput (void)
+{
+	int index = 4;
+	while (index--)
+	{
+		if (global.pDEffect[index][0])
+		{
+			global.pDEffect[index][0]->Unload();
+			global.pDEffect[index][0]->Release();
+			global.pDEffect[index][0] = NULL;
+		}
+		if (global.pDEffect[index][1])
+		{
+			global.pDEffect[index][1]->Unload();
+			global.pDEffect[index][1]->Release();
+			global.pDEffect[index][1] = NULL;
+		}
+		if (global.pDDevice[index])
+		{
+			global.pDDevice[index]->Unacquire();
+			global.pDDevice[index]->Release();
+			global.pDDevice[index] = NULL;
+		}
+	}
+	if (global.pDKeyboard)
+	{
+		global.pDKeyboard->Unacquire();
+		global.pDKeyboard->Release();
+		global.pDKeyboard = NULL;
+	}
+	if (global.pDInput)
+	{
+		global.pDInput->Release();
+		global.pDInput = NULL;
+	}
+	global.devcnt = 0;
+	return FALSE;
+}
+
+static bool InitDirectInput (void)
+{
+	if (global.pDInput)
+		return TRUE;
+	HRESULT result = DirectInput8Create (hInstance, DIRECTINPUT_VERSION, IID_IDirectInput8, (void**)&global.pDInput, NULL);
+	if (FAILED (result))
+		return ReleaseDirectInput();
+	result = global.pDInput->CreateDevice (GUID_SysKeyboard, &global.pDKeyboard, NULL);
+	if (FAILED (result))
+		return ReleaseDirectInput();
+	result = global.pDInput->EnumDevices (DI8DEVCLASS_GAMECTRL, EnumJoysticksCallback, NULL, DIEDFL_ATTACHEDONLY);
+	if (FAILED (result))
+		return ReleaseDirectInput();
+	result = global.pDKeyboard->SetDataFormat (&c_dfDIKeyboard);
+	if (FAILED (result))
+		return ReleaseDirectInput();
+	if (hTargetWnd)
+	{
+		global.pDKeyboard->Unacquire();
+		result = global.pDKeyboard->SetCooperativeLevel (hTargetWnd, DISCL_FOREGROUND | DISCL_NONEXCLUSIVE);
+		if (FAILED (result))
+			return ReleaseDirectInput();
+	}
+	int index = global.devcnt;
+	while (index--)
+	{
+		const LPDIRECTINPUTDEVICE8 pDDevice = global.pDDevice[index];
+		result = pDDevice->SetDataFormat (&c_dfDIJoystick);
+		if (FAILED (result))
+			return ReleaseDirectInput();
+		if (hTargetWnd)
+		{
+			pDDevice->Unacquire();
+			result = pDDevice->SetCooperativeLevel (hTargetWnd, DISCL_FOREGROUND | DISCL_EXCLUSIVE);
+			if (FAILED (result))
+				return ReleaseDirectInput();
+		}
+		struct
+		{
+			DIPROPDWORD dipdw;
+			DWORD rgdwAxes[2];
+			LONG rglDirection[2];
+			DIPERIODIC per;
+			DICONSTANTFORCE cf;
+			DIEFFECT eff;
+		} local;
+		memset (&local, 0, sizeof (local));
+		local.dipdw.diph.dwSize = sizeof (DIPROPDWORD);
+		local.dipdw.diph.dwHeaderSize = sizeof (DIPROPHEADER);
+		local.dipdw.diph.dwHow = DIPH_DEVICE;
+		local.dipdw.dwData = DIPROPAUTOCENTER_OFF;
+		pDDevice->SetProperty (DIPROP_AUTOCENTER, &local.dipdw.diph);
+		result = pDDevice->EnumObjects (EnumAxesCallback, pDDevice, DIDFT_AXIS);
+		if (FAILED (result))
+			return ReleaseDirectInput();
+
+		local.rgdwAxes[0] = DIJOFS_X;
+		local.rgdwAxes[1] = DIJOFS_Y;
+		local.eff.dwSize = sizeof (DIEFFECT);
+		local.eff.dwFlags = DIEFF_CARTESIAN | DIEFF_OBJECTOFFSETS;
+		local.eff.dwDuration = INFINITE;
+		local.eff.dwGain = DI_FFNOMINALMAX;
+		local.eff.dwTriggerButton = DIEB_NOTRIGGER;
+		local.eff.cAxes = 2;
+		local.eff.rgdwAxes = local.rgdwAxes;
+		local.eff.rglDirection = local.rglDirection;
+
+		/* Small Motor */
+		local.eff.cbTypeSpecificParams = sizeof (DIPERIODIC);
+		local.eff.lpvTypeSpecificParams = &local.per;
+		result = pDDevice->CreateEffect (GUID_Square , &local.eff, &global.pDEffect[index][0], NULL);
+		if (FAILED (result))
+			global.pDEffect[index][0] = NULL;
+
+		/* Big Motor */
+		local.eff.cbTypeSpecificParams = sizeof (DICONSTANTFORCE);
+		local.eff.lpvTypeSpecificParams = &local.cf;
+		result = pDDevice->CreateEffect (GUID_ConstantForce , &local.eff, &global.pDEffect[index][1], NULL);
+		if (FAILED (result))
+			global.pDEffect[index][1] = NULL;
+ 	}
+	return TRUE;
+}
+
+static bool AcquireDevice (LPDIRECTINPUTDEVICE8 lpDirectInputDevice)
+{
+	if (FAILED (lpDirectInputDevice->Acquire()))
+	{
+		HRESULT result = lpDirectInputDevice->Acquire();
+		if (result == DIERR_OTHERAPPHASPRIO)
+			return FALSE;
+		if (FAILED (result))
+			return ReleaseDirectInput();
+	}
+	return TRUE;
+}
+
+/* Small Motor */
+static bool SetDeviceForceS (int pad, DWORD force)
+{
+	InitDirectInput();
+	if (global.pDEffect[pad][0])
+	{
+		if ( force == 0) {
+			if (FAILED (global.pDEffect[pad][0]->Stop())) {
+				AcquireDevice (global.pDDevice[pad]);
+				if (FAILED (global.pDEffect[pad][0]->Stop()))
+					return ReleaseDirectInput();
+			}
+			return TRUE;
+		}
+		LONG rglDirection[2] = { 0, 0 };
+		DIPERIODIC per;
+		rglDirection[0] = force;
+		rglDirection[1] = force;
+		per.dwMagnitude = force;
+		per.dwPeriod = (DWORD) (0.01 * DI_SECONDS);
+		per.lOffset = 0;
+		per.dwPhase = 0;
+		DIEFFECT eff;
+		eff.dwSize = sizeof (DIEFFECT);
+		eff.dwFlags = DIEFF_CARTESIAN | DIEFF_OBJECTOFFSETS;
+		eff.cAxes = 2;
+		eff.rglDirection = rglDirection;
+		eff.lpEnvelope = 0;
+		eff.cbTypeSpecificParams = sizeof (DIPERIODIC);
+		eff.lpvTypeSpecificParams = &per;
+		if (FAILED (global.pDEffect[pad][0]->SetParameters (&eff, DIEP_DIRECTION | DIEP_TYPESPECIFICPARAMS | DIEP_START)))
+			return ReleaseDirectInput();
+		if (FAILED (global.pDEffect[pad][0]->Start (1, 0)))
+		{
+			AcquireDevice (global.pDDevice[pad]);
+			if (FAILED (global.pDEffect[pad][0]->Start (1, 0)))
+				return ReleaseDirectInput();
+		}
+	}
+	return TRUE;
+}
+
+/* Big Motor */
+static bool SetDeviceForceB (int pad, DWORD force)
+{
+	InitDirectInput();
+	if (global.pDEffect[pad][1])
+	{
+		if ( force == 0) {
+			if (FAILED (global.pDEffect[pad][1]->Stop())) {
+				AcquireDevice (global.pDDevice[pad]);
+				if (FAILED (global.pDEffect[pad][1]->Stop()))
+					return ReleaseDirectInput();
+			}
+			return TRUE;
+		}
+		LONG rglDirection[2] = { 0, 0 };
+		DICONSTANTFORCE cf;
+		rglDirection[0] = force;
+		rglDirection[1] = force;
+		cf.lMagnitude = force;
+		DIEFFECT eff;
+		eff.dwSize = sizeof (DIEFFECT);
+		eff.dwFlags = DIEFF_CARTESIAN | DIEFF_OBJECTOFFSETS;
+		eff.cAxes = 2;
+		eff.rglDirection = rglDirection;
+		eff.lpEnvelope = 0;
+		eff.cbTypeSpecificParams = sizeof (DICONSTANTFORCE);
+		eff.lpvTypeSpecificParams = &cf;
+		if (FAILED (global.pDEffect[pad][1]->SetParameters (&eff, DIEP_DIRECTION | DIEP_TYPESPECIFICPARAMS | DIEP_START)))
+			return ReleaseDirectInput();
+		if (FAILED (global.pDEffect[pad][1]->Start (1, 0)))
+		{
+			AcquireDevice (global.pDDevice[pad]);
+			if (FAILED (global.pDEffect[pad][1]->Start (1, 0)))
+				return ReleaseDirectInput();
+		}
+	}
+	return TRUE;
+}
+
+static bool GetJoyState (const int devno)
+{
+	InitDirectInput();
+	if (global.pDDevice[devno] == NULL)
+		return FALSE;
+	global.pDDevice[devno]->Poll();
+	if (FAILED (global.pDDevice[devno]->GetDeviceState (sizeof (DIJOYSTATE), &global.JoyState[devno])))
+	{
+		AcquireDevice (global.pDDevice[devno]);
+		return FALSE;
+	}
+	return TRUE;
+}
+
+static bool GetKeyState (u8* keyboard)
+{
+	InitDirectInput();
+	if (global.pDKeyboard == NULL)
+		return FALSE;
+	global.pDKeyboard->Poll();
+	if (FAILED (global.pDKeyboard->GetDeviceState (256, keyboard)))
+	{
+		AcquireDevice (global.pDKeyboard);
+		return FALSE;
+	}
+	return TRUE;
+}
+
+static void SetDefaultConfig (void)
+{
+	memset (&global.config, 0, sizeof(global.config));
+
+	global.config.keys[0][0] = 0x2E;
+	global.config.keys[0][3] = 0x2F;
+	global.config.keys[0][4] = 0xC8;
+	global.config.keys[0][5] = 0xCD;
+	global.config.keys[0][6] = 0xD0;
+	global.config.keys[0][7] = 0xCB;
+	global.config.keys[0][8] = 0x12;
+	global.config.keys[0][9] = 0x14;
+	global.config.keys[0][10] = 0x11;
+	global.config.keys[0][11] = 0x13;
+	global.config.keys[0][12] = 0x20;
+	global.config.keys[0][13] = 0x2D;
+	global.config.keys[0][14] = 0x2C;
+	global.config.keys[0][15] = 0x1F;
+
+	global.config.dualshock = FALSE;
+}
+
+static void SaveConfig (void)
+{
+	HKEY myKey;
+	DWORD myDisp;
+
+	RegCreateKeyEx(HKEY_CURRENT_USER, "Software\\Vision Thing\\PSEmu Pro\\PAD\\PadSSSPSX", 0, NULL,
+		REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &myKey, &myDisp);
+
+	RegSetValueEx(myKey, "cfg", 0, REG_BINARY, (CONST BYTE *)&global.config, sizeof(global.config));
+
+	RegCloseKey(myKey);
+}
+
+static void LoadConfig (void)
+{
+	HKEY myKey;
+	DWORD type, size;
+
+	SetDefaultConfig ();
+
+	if (RegOpenKeyEx (HKEY_CURRENT_USER, "Software\\Vision Thing\\PSEmu Pro\\PAD\\PadSSSPSX", 0,
+		KEY_ALL_ACCESS, &myKey) == ERROR_SUCCESS)
+	{
+		size = sizeof(global.config);
+		RegQueryValueEx (myKey, "cfg", NULL, &type, (LPBYTE)&global.config, &size);
+		RegCloseKey (myKey);
+	}
+
+	global.padVibC[0] = global.padVibC[1] = -1;
+	for (int cnt = 21; cnt--; )
+	{
+		const int key0 = global.config.keys[0][cnt];
+		if (key0 >= 0x1000)
+			global.padVibC[0] = (key0 & 0xfff) / 0x100;
+		const int key1 = global.config.keys[1][cnt];
+		if (key1 >= 0x1000)
+			global.padVibC[1] = (key1 & 0xfff) / 0x100;
+	}
+}
+
+static void PADsetMode (const int pad, const int mode)
+{
+	static const u8 padID[] = { 0x41, 0x73, 0x41, 0x79 };
+	global.padMode1[pad] = mode;
+	global.padVib0[pad] = 0;
+	global.padVib1[pad] = 0;
+	global.padVibF[pad][0] = 0;
+	global.padVibF[pad][1] = 0;
+	global.padID[pad] = padID[global.padMode2[pad] * 2 + mode];
+}
+
+static void KeyPress (const int pad, const int index, const bool press)
+{
+	if (index < 16)
+	{
+		if (press)
+		{
+			global.padStat[pad] &= ~(1 << index);
+			if (global.padPress[pad][index] == 0)
+				global.padPress[pad][index] = GetTickCount();
+		}
+		else
+		{
+			global.padStat[pad] |= 1 << index;
+			global.padPress[pad][index] = 0;
+		}
+	}
+	else if (global.config.dualshock)
+	{
+		static bool prev[2] = { FALSE, FALSE };
+		if ((prev[pad] != press) && (global.padModeF[pad] == 0))
+		{
+			prev[pad] = press;
+			if (press) PADsetMode (pad, !global.padMode1[pad]);
+		}
+	}
+}
+
+static void UpdateState (const int pad)
+{
+	static int flag_keyboard;
+	static int flag_joypad[4];
+	if (pad == 0)
+	{
+		flag_keyboard = 0;
+		flag_joypad[0] = 0;
+		flag_joypad[1] = 0;
+		flag_joypad[2] = 0;
+		flag_joypad[3] = 0;
+	}
+	static u8 keystate[256];
+	for (int index = 17; index--; )
+	{
+		const int key = global.config.keys[pad][index];
+		if (key == 0)
+			continue;
+		else if (key < 0x100)
+		{
+			if (flag_keyboard == FALSE)
+			{
+				flag_keyboard = TRUE;
+				if (GetKeyState (keystate) == FALSE)
+					return;
+			}
+			KeyPress (pad, index, keystate[key] & 0x80);
+		}
+		else
+		{
+			const int joypad = ((key & 0xfff) / 100);
+			if (flag_joypad[joypad] == FALSE)
+			{
+				flag_joypad[joypad] = TRUE;
+				if (GetJoyState (joypad) == FALSE)
+					return;
+			}
+			if (key < 0x2000)
+			{
+				KeyPress (pad, index, global.JoyState[joypad].rgbButtons[key & 0xff]);
+			}
+			else if (key < 0x3000)
+			{
+				const int state = ((int*)&global.JoyState[joypad].lX)[(key & 0xff) /2];
+				switch (key & 1)
+				{
+				case 0: KeyPress (pad, index, state < -64); break;
+				case 1: KeyPress (pad, index, state >= 64); break;
+				}
+			}
+			else
+			{
+				const u32 state = global.JoyState[joypad].rgdwPOV[(key & 0xff) /4];
+				switch (key & 3)
+				{
+				case 0: KeyPress (pad, index, (state >= 0 && state <= 4500) || (state >= 31500 && state <= 36000)); break;
+				case 1: KeyPress (pad, index, state >= 4500 && state <= 13500); break;
+				case 2: KeyPress (pad, index, state >= 13500 && state <= 22500); break;
+				case 3: KeyPress (pad, index, state >= 22500 && state <= 31500); break;
+				}
+			}
+		}
+	}
+
+	/* Small Motor */
+	const int vib0 = global.padVibF[pad][0] ? 10000 : 0;
+	if ((global.padVibF[pad][2] != vib0) && (global.padVibC[pad] >= 0))
+	{
+		global.padVibF[pad][2] = vib0;
+		SetDeviceForceS (global.padVibC[pad], vib0);
+	}
+	/* Big Motor */
+	const int vib1 = global.padVibF[pad][1] ? 500 + 37*global.padVibF[pad][1] : 0;
+	if ((global.padVibF[pad][3] != vib1) && (global.padVibC[pad] >= 0))
+	{
+		global.padVibF[pad][3] = vib1;
+		SetDeviceForceB (global.padVibC[pad], vib1);
+	}
+}
+
+static void set_label (const HWND hWnd, const int pad, const int index)
+{
+	const int key = global.config.keys[pad][index];
+	char buff[64];
+	if (key < 0x100)
+	{
+		if (key == 0)
+			strcpy (buff, "NONE");
+		else if (GetKeyNameText (key << 16, buff, sizeof (buff)) == 0)
+			wsprintf (buff, "Keyboard 0x%02X", key);
+	}
+	else if (key >= 0x1000 && key < 0x2000)
+	{
+		wsprintf (buff, "J%d_%d", (key & 0xfff) / 0x100, (key & 0xff) + 1);
+	}
+	else if (key >= 0x2000 && key < 0x3000)
+	{
+		static const char name[][4] = { "MIN", "MAX" };
+		const int axis = (key & 0xff);
+		wsprintf (buff, "J%d_AXIS%d_%s", (key & 0xfff) / 0x100, axis / 2, name[axis % 2]);
+		if (index >= 17 && index <= 20)
+			buff[strlen (buff) -4] = '\0';
+	}
+	else if (key >= 0x3000 && key < 0x4000)
+	{
+		static const char name[][7] = { "FOWARD", "RIGHT", "BACK", "LEFT" };
+		const int pov = (key & 0xff);
+		wsprintf (buff, "J%d_POV%d_%s", (key & 0xfff) / 0x100, pov /4, name[pov % 4]);
+	}
+	Button_SetText (GetDlgItem (hWnd, IDC_ESELECT + index), buff);
+}
+
+static BOOL CALLBACK ConfigureDlgProc (const HWND hWnd, const UINT msg, const WPARAM wParam, const LPARAM lParam)
+{
+	static BYTE keymaps[2][256];
+	static DWORD countdown;
+	static int disabled;
+	static HWND hTabWnd;
+	static int pad;
+	int cnt1;
+	int cnt2;
+	int key;
+	switch (msg)
+	{
+	case WM_INITDIALOG:
+		hTargetWnd = hWnd;
+		pad = disabled = 0;
+		LoadConfig();
+		for (cnt1 = 21; cnt1--; )
+			set_label (hWnd, pad, cnt1);
+		hTabWnd = GetDlgItem (hWnd, IDC_TABC);
+		TCITEM tcI;
+		tcI.mask = TCIF_TEXT;
+		tcI.pszText = "PAD1";
+		TabCtrl_InsertItem (hTabWnd, 0, &tcI);
+		tcI.mask = TCIF_TEXT;
+		tcI.pszText = "PAD2";
+		TabCtrl_InsertItem (hTabWnd, 1, &tcI);
+		CheckDlgButton(hWnd, IDC_DS2, global.config.dualshock);
+		CheckDlgButton(hWnd, IDC_VV3, global.config.visualvibration[0]);
+		EnableWindow(GetDlgItem(hWnd, IDC_BMODE), global.config.dualshock);
+		EnableWindow(GetDlgItem(hWnd, IDC_BLAX), global.config.dualshock);
+		EnableWindow(GetDlgItem(hWnd, IDC_BLAY), global.config.dualshock);
+		EnableWindow(GetDlgItem(hWnd, IDC_BRAX), global.config.dualshock);
+		EnableWindow(GetDlgItem(hWnd, IDC_BRAY), global.config.dualshock);
+		EnableWindow(GetDlgItem(hWnd, IDC_BL3), global.config.dualshock);
+		EnableWindow(GetDlgItem(hWnd, IDC_BR3), global.config.dualshock);
+		EnableWindow(GetDlgItem(hWnd, IDC_EMODE), global.config.dualshock);
+		EnableWindow(GetDlgItem(hWnd, IDC_ELAX), global.config.dualshock);
+		EnableWindow(GetDlgItem(hWnd, IDC_ELAY), global.config.dualshock);
+		EnableWindow(GetDlgItem(hWnd, IDC_ERAX), global.config.dualshock);
+		EnableWindow(GetDlgItem(hWnd, IDC_ERAY), global.config.dualshock);
+		EnableWindow(GetDlgItem(hWnd, IDC_EL3), global.config.dualshock);
+		EnableWindow(GetDlgItem(hWnd, IDC_ER3), global.config.dualshock);
+		SetTimer (hWnd, 0x80, 50, NULL);
+		return TRUE;
+	case WM_DESTROY:
+		break;
+	case WM_NOTIFY:
+		if (wParam == IDC_TABC)
+		{
+			if (disabled)
+				EnableWindow (GetDlgItem (hWnd, disabled), TRUE);
+			disabled = 0;
+			pad = TabCtrl_GetCurSel (hTabWnd);
+			for (cnt1 = 21; cnt1--; )
+				set_label (hWnd, pad, cnt1);
+			CheckDlgButton(hWnd, IDC_VV3, global.config.visualvibration[pad]);
+		}
+		break;
+	case WM_COMMAND:
+		for (cnt1 = 21; cnt1--; )
+		{
+			if (LOWORD (wParam) == IDC_BSELECT + cnt1)
+			{
+				if (disabled)
+					EnableWindow (GetDlgItem (hWnd, disabled), TRUE);
+				EnableWindow (GetDlgItem (hWnd, disabled = wParam), FALSE);
+				EnableWindow (GetDlgItem (hWnd, IDC_DS2), FALSE);
+				countdown = GetTickCount();
+				GetKeyState (keymaps[0]);
+				return TRUE;
+			}
+		}
+		if (LOWORD (wParam) == IDOK)
+			EndDialog (hWnd, IDOK);
+		else if (LOWORD (wParam) == IDCANCEL)
+			EndDialog (hWnd, IDCANCEL);
+		else if (LOWORD (wParam) == IDC_DS2)
+		{
+			global.config.dualshock = IsDlgButtonChecked(hWnd, IDC_DS2);
+
+			EnableWindow(GetDlgItem(hWnd, IDC_BMODE), global.config.dualshock);
+			EnableWindow(GetDlgItem(hWnd, IDC_BLAX), global.config.dualshock);
+			EnableWindow(GetDlgItem(hWnd, IDC_BLAY), global.config.dualshock);
+			EnableWindow(GetDlgItem(hWnd, IDC_BRAX), global.config.dualshock);
+			EnableWindow(GetDlgItem(hWnd, IDC_BRAY), global.config.dualshock);
+			EnableWindow(GetDlgItem(hWnd, IDC_BL3), global.config.dualshock);
+			EnableWindow(GetDlgItem(hWnd, IDC_BR3), global.config.dualshock);
+			EnableWindow(GetDlgItem(hWnd, IDC_EMODE), global.config.dualshock);
+			EnableWindow(GetDlgItem(hWnd, IDC_ELAX), global.config.dualshock);
+			EnableWindow(GetDlgItem(hWnd, IDC_ELAY), global.config.dualshock);
+			EnableWindow(GetDlgItem(hWnd, IDC_ERAX), global.config.dualshock);
+			EnableWindow(GetDlgItem(hWnd, IDC_ERAY), global.config.dualshock);
+			EnableWindow(GetDlgItem(hWnd, IDC_EL3), global.config.dualshock);
+			EnableWindow(GetDlgItem(hWnd, IDC_ER3), global.config.dualshock);
+		}
+		else if (LOWORD (wParam) == IDC_VV3)
+		{
+			global.config.visualvibration[pad] ^= 1;
+		}
+		break;
+	case WM_TIMER:
+		if (disabled)
+		{
+			const int index = disabled - IDC_BSELECT;
+			int analog = FALSE;
+			if ((GetTickCount() - countdown) / 1000 != 10)
+			{
+				char buff[64];
+				wsprintf (buff, "Timeout: %d", 10 - (GetTickCount() - countdown) / 1000);
+				SetWindowText (GetDlgItem (hWnd, IDC_ESELECT + index), buff);
+			}
+			else
+			{
+				global.config.keys[pad][index] = 0;
+				set_label (hWnd, pad, index);
+				EnableWindow (GetDlgItem (hWnd, disabled), TRUE);
+				EnableWindow (GetDlgItem (hWnd, IDC_DS2), TRUE);
+				disabled = 0;
+				break;
+			}
+			if (GetKeyState (keymaps[1]) == FALSE)
+				break;
+			for (key = 0x100; key--; )
+			{
+				if (~keymaps[0][key] & keymaps[1][key] & 0x80)
+					break;
+			}
+			for (cnt1 = global.devcnt; cnt1--;)
+			{
+				if (GetJoyState (cnt1) == FALSE)
+					break;
+
+				for (cnt2 = 32; cnt2--; )
+				{
+					if (global.JoyState[cnt1].rgbButtons[cnt2])
+						key = 0x1000 + 0x100 * cnt1 + cnt2;
+				}
+				for (cnt2 = 8; cnt2--; )
+				{
+					const int now = ((u32*)&global.JoyState[cnt1].lX)[cnt2];
+					if (now < -64)
+					{
+						key = 0x2000 + 0x100 * cnt1 + cnt2 * 2 +0;
+						analog = TRUE;
+					}
+					else if (now >= 64)
+					{
+						key = 0x2000 + 0x100 * cnt1 + cnt2 * 2 +1;
+						analog = TRUE;
+					}
+				}
+				for (cnt2 = 4; cnt2--; )
+				{
+					const u32 now = global.JoyState[cnt1].rgdwPOV[cnt2];
+					if ((now >= 0 && now < 4500) || (now >= 31500 && now < 36000))
+						key = 0x3000 + 0x100 * cnt1 + cnt2 * 4 +0;
+					if (now >= 4500 && now < 13500)
+						key = 0x3000 + 0x100 * cnt1 + cnt2 * 4 +1;
+					if (now >= 13500 && now < 22500)
+						key = 0x3000 + 0x100 * cnt1 + cnt2 * 4 +2;
+					if (now >= 22500 && now < 31500)
+						key = 0x3000 + 0x100 * cnt1 + cnt2 * 4 +3;
+				}
+			}
+			if (index >= 17 && index <= 20 && analog == 0)
+				key = 0;
+			else if (key > 0)
+			{
+				if (key != 1)
+					global.config.keys[pad][index] = key;
+				set_label (hWnd, pad, index);
+				EnableWindow (GetDlgItem (hWnd, disabled), TRUE);
+				EnableWindow (GetDlgItem (hWnd, IDC_DS2), TRUE);
+				disabled = 0;
+			}
+		}
+	}
+	return FALSE;
+}
+
+u32 CALLBACK PS2EgetLibType (void)
+{
+	return 0x02;
+}
+
+const char* CALLBACK PS2EgetLibName (void)
+{
+	return LibraryName;
+}
+
+u32 CALLBACK PS2EgetLibVersion2 (u32 type)
+{
+	return (version << 16) | (revision << 8) | build;
+}
+
+u32 CALLBACK PSEgetLibType (void)
+{
+	return 8;
+}
+
+const char* CALLBACK PSEgetLibName (void)
+{
+	return LibraryName;
+}
+
+u32 CALLBACK PSEgetLibVersion (void)
+{
+	return (version << 16) | (revision << 8) | build;
+}
+
+s32 CALLBACK PADinit (u32 flags)
+{
+	return 0;
+}
+
+void CALLBACK PADshutdown (void)
+{
+}
+
+static int n_open = 0;
+s32 CALLBACK PADopen (HWND hWnd)
+{
+	if (!IsWindow (hWnd) && !IsBadReadPtr ((u32*)hWnd, 4))
+		hWnd = *(HWND*)hWnd;
+	if (!IsWindow (hWnd))
+		hWnd = NULL;
+	else
+	{
+		while (GetWindowLong (hWnd, GWL_STYLE) & WS_CHILD)
+			hWnd = GetParent (hWnd);
+	}
+	hTargetWnd = hWnd;
+	if (n_open++ == FALSE)
+	{
+		memset (&global, 0, sizeof (global));
+		global.padStat[0] = 0xffff;
+		global.padStat[1] = 0xffff;
+		LoadConfig();
+		PADsetMode (0, 0);
+		PADsetMode (1, 0);
+	}
+	return 0;
+}
+
+void CALLBACK PADclose (void)
+{
+	if (--n_open == 0)
+		ReleaseDirectInput();
+}
+
+u32 CALLBACK PADquery (void)
+{
+	return 3;
+}
+
+u8 CALLBACK PADstartPoll (int pad)
+{
+	global.curPad = pad -1;
+	global.curByte = 0;
+	return 0xff;
+}
+
+static const u8 cmd40[8] =
+{
+	0xff, 0x5a, 0x00, 0x00, 0x02, 0x00, 0x00, 0x5a
+};
+static const u8 cmd41[8] =
+{
+	0xff, 0x5a, 0xff, 0xff, 0x03, 0x00, 0x00, 0x5a,
+};
+static const u8 cmd44[8] =
+{
+	0xff, 0x5a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+static const u8 cmd45[8] =
+{
+	0xff, 0x5a, 0x03, 0x02, 0x01, 0x02, 0x01, 0x00,
+};
+static const u8 cmd46[8] =
+{
+	0xff, 0x5a, 0x00, 0x00, 0x01, 0x02, 0x00, 0x0a,
+};
+static const u8 cmd47[8] =
+{
+	0xff, 0x5a, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00,
+};
+static const u8 cmd4c[8] =
+{
+	0xff, 0x5a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+static const u8 cmd4d[8] =
+{
+	0xff, 0x5a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+};
+static const u8 cmd4f[8] =
+{
+	0xff, 0x5a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5a,
+};
+
+static u8 get_analog (const int key)
+{
+	const int pad = ((key & 0xf00) / 0x100);
+	const int pos = ((key & 0x0ff) /2);
+//	return (u8)(((int*)&global.JoyState[pad].lX)[pos] + 128);
+	u8 r = (u8)(((int*)&global.JoyState[pad].lX)[pos] + 128);
+	if (r == 128) r = 127; // FIXME: ???
+	return r;
+}
+
+static u8 get_pressure (const DWORD now, const DWORD press)
+{
+	/*if (press == 0)
+		return 0;
+	return (u8)((now - press > 2550) ? 255 : (now - press) / 10);*/
+	return 255;
+}
+
+u8 CALLBACK PADpoll (u8 value)
+{
+	const int pad = global.curPad;
+	const int cur = global.curByte;
+	static u8 buf[20];
+
+	if (!global.config.dualshock)
+	{
+		value = 0x42;
+	}
+
+	if (cur == 0)
+	{
+		global.curByte++;
+		global.curCmd = value;
+		switch (value)
+		{
+		case 0x40:
+			global.cmdLen = sizeof (cmd40);
+			memcpy (buf, cmd40, sizeof (cmd40));
+			return 0xf3;
+		case 0x41:
+			global.cmdLen = sizeof (cmd41);
+			memcpy (buf, cmd41, sizeof (cmd41));
+			return 0xf3;
+		case 0x42:
+		case 0x43:
+			if (value == 0x42) UpdateState (pad);
+			global.cmdLen = 2 + 2 * (global.padID[pad] & 0x0f);
+			buf[1] = global.padModeC[pad] ? 0x00 : 0x5a;
+			*(u16*)&buf[2] = global.padStat[pad];
+			if (value == 0x43 && global.padModeE[pad])
+			{
+				buf[4] = 0;
+				buf[5] = 0;
+				buf[6] = 0;
+				buf[7] = 0;
+				return 0xf3;
+			}
+			else
+			{
+				buf[ 4] = get_analog (global.config.keys[pad][19]);
+				buf[ 5] = get_analog (global.config.keys[pad][20]);
+				buf[ 6] = get_analog (global.config.keys[pad][17]);
+				buf[ 7] = get_analog (global.config.keys[pad][18]);
+
+				if (global.padID[pad] == 0x79)
+				{
+					const DWORD now = GetTickCount();
+					buf[ 8] = get_pressure (now, global.padPress[pad][2]);
+					buf[ 9] = get_pressure (now, global.padPress[pad][0]);
+					buf[10] = get_pressure (now, global.padPress[pad][3]);
+					buf[11] = get_pressure (now, global.padPress[pad][1]);
+					buf[12] = get_pressure (now, global.padPress[pad][11]);
+					buf[13] = get_pressure (now, global.padPress[pad][10]);
+					buf[14] = get_pressure (now, global.padPress[pad][9]);
+					buf[15] = get_pressure (now, global.padPress[pad][8]);
+					buf[16] = get_pressure (now, global.padPress[pad][13]);
+					buf[17] = get_pressure (now, global.padPress[pad][12]);
+					buf[18] = get_pressure (now, global.padPress[pad][15]);
+					buf[19] = get_pressure (now, global.padPress[pad][14]);
+				}
+				return (u8)global.padID[pad];
+			}
+			break;
+		case 0x44:
+			global.cmdLen = sizeof (cmd44);
+			memcpy (buf, cmd44, sizeof (cmd44));
+			return 0xf3;
+		case 0x45:
+			global.cmdLen = sizeof (cmd45);
+			memcpy (buf, cmd45, sizeof (cmd45));
+			buf[4] = (u8)global.padMode1[pad];
+			return 0xf3;
+		case 0x46:
+			global.cmdLen = sizeof (cmd46);
+			memcpy (buf, cmd46, sizeof (cmd46));
+			return 0xf3;
+		case 0x47:
+			global.cmdLen = sizeof (cmd47);
+			memcpy (buf, cmd47, sizeof (cmd47));
+			return 0xf3;
+		case 0x4c:
+			global.cmdLen = sizeof (cmd4c);
+			memcpy (buf, cmd4c, sizeof (cmd4c));
+			return 0xf3;
+		case 0x4d:
+			global.cmdLen = sizeof (cmd4d);
+			memcpy (buf, cmd4d, sizeof (cmd4d));
+			return 0xf3;
+		case 0x4f:
+			global.padID[pad] = 0x79;
+			global.padMode2[pad] = 1;
+			global.cmdLen = sizeof (cmd4f);
+			memcpy (buf, cmd4f, sizeof (cmd4f));
+			return 0xf3;
+		}
+	}
+	switch (global.curCmd)
+	{
+	case 0x42:
+		if (global.config.dualshock)
+		{
+			if (cur == global.padVib0[pad])
+			{
+				global.padVibF[pad][0] = value;
+
+				if (gpuVisualVibration != NULL && (global.padVibF[pad][0] || global.padVibF[pad][1]) &&
+					global.config.visualvibration[pad])
+					gpuVisualVibration(global.padVibF[pad][0], global.padVibF[pad][1]);
+			}
+
+			if (cur == global.padVib1[pad])
+			{
+				global.padVibF[pad][1] = value;
+
+				if (gpuVisualVibration != NULL && (global.padVibF[pad][0] || global.padVibF[pad][1]) &&
+					global.config.visualvibration[pad])
+					gpuVisualVibration(global.padVibF[pad][0], global.padVibF[pad][1]);
+			}
+		}
+		break;
+	case 0x43:
+		if (cur == 2)
+		{
+			global.padModeE[pad] = value;
+			global.padModeC[pad] = 0;
+		}
+		break;
+	case 0x44:
+		if (cur == 2)
+			PADsetMode (pad, value);
+		if (cur == 3)
+			global.padModeF[pad] = (value == 3);
+		break;
+	case 0x46:
+		if (cur == 2)
+		{
+			switch(value)
+			{
+			case 0:
+				buf[5] = 0x02;
+				buf[6] = 0x00;
+				buf[7] = 0x0A;
+				break;
+			case 1:
+				buf[5] = 0x01;
+				buf[6] = 0x01;
+				buf[7] = 0x14;
+				break;
+			}
+		}
+		break;
+	case 0x4c:
+		if (cur == 2)
+		{
+			static const u8 buf5[] = { 0x04, 0x07, 0x02, 0x05 };
+			buf[5] = buf5[value & 3];
+		}
+		break;
+	case 0x4d:
+		if (cur >= 2)
+		{
+			if (cur == global.padVib0[pad])
+				buf[cur] = 0x00;
+			if (cur == global.padVib1[pad])
+				buf[cur] = 0x01;
+			if (value == 0x00)
+			{
+				global.padVib0[pad] = cur;
+				if ((global.padID[pad] & 0x0f) < (cur - 1) / 2)
+					 global.padID[pad] = (global.padID[pad] & 0xf0) + (cur - 1) / 2;
+			}
+			else if (value == 0x01)
+			{
+				global.padVib1[pad] = cur;
+				if ((global.padID[pad] & 0x0f) < (cur - 1) / 2)
+					 global.padID[pad] = (global.padID[pad] & 0xf0) + (cur - 1) / 2;
+			}
+		}
+		break;
+	}
+	if (cur >= global.cmdLen)
+		return 0;
+	return buf[global.curByte++];
+}
+
+typedef struct
+{
+	unsigned char controllerType;
+	unsigned short buttonStatus;
+	unsigned char rightJoyX, rightJoyY, leftJoyX, leftJoyY;
+	unsigned char moveX, moveY;
+	unsigned char reserved[91];
+} PadDataS;
+
+long PADreadPort1 (PadDataS* pads)
+{
+	memset (pads, 0, sizeof (PadDataS));
+	if ((global.padID[0] & 0xf0) == 0x40)
+		pads->controllerType = 4;
+	else
+		pads->controllerType = 7;
+	pads->buttonStatus = global.padStat[0];
+	pads->leftJoyX = get_analog (global.config.keys[0][17]);
+	pads->leftJoyY = get_analog (global.config.keys[0][18]);
+	pads->rightJoyX = get_analog (global.config.keys[0][19]);
+	pads->rightJoyY = get_analog (global.config.keys[0][20]);
+	pads->moveX = 0;
+	pads->moveY = 0;
+	return 0;
+}
+
+long PADreadPort2 (PadDataS* pads)
+{
+	memset (pads, 0, sizeof (PadDataS));
+	if ((global.padID[1] & 0xf0) == 0x40)
+		pads->controllerType = 4;
+	else
+		pads->controllerType = 7;
+	pads->buttonStatus = global.padStat[1];
+	pads->leftJoyX = get_analog (global.config.keys[1][17]);
+	pads->leftJoyY = get_analog (global.config.keys[1][18]);
+	pads->rightJoyX = get_analog (global.config.keys[1][19]);
+	pads->rightJoyY = get_analog (global.config.keys[1][20]);
+	pads->moveX = 0;
+	pads->moveY = 0;
+	return 0;
+}
+
+keyEvent* CALLBACK PADkeyEvent (void)
+{
+	static keyEvent ev;
+	static u8 state[2][256];
+	if (n_open)
+	{
+		memcpy (state[0], state[1], sizeof (state[0]));
+		GetKeyState (state[1]);
+		for (int cnt = 0; cnt < 256; cnt++)
+		{
+			if (~state[0][cnt] & state[1][cnt] & 0x80)
+			{
+				ev.event = (state[1][cnt] & 0x80) ? 1 : 2;
+				ev.key = MapVirtualKey (cnt, 1);
+				return &ev;
+			}
+		}
+	}
+	return NULL;
+}
+
+void CALLBACK PADconfigure (void)
+{
+	if (n_open == 0)
+	{
+		memset (&global, 0, sizeof (global));
+		if (DialogBox (hInstance, MAKEINTRESOURCE (IDD_DIALOG1), GetActiveWindow(), (DLGPROC)ConfigureDlgProc) == IDOK)
+			SaveConfig();
+		ReleaseDirectInput();
+	}
+}
+
+void CALLBACK PADabout (void)
+{
+	MessageBox (0, "Copyright (C) 2004-2005 Nagisa", "SSSPSX PAD plugin", 0);
+}
+
+s32 CALLBACK PADtest (void)
+{
+	return 0;
+}
+
+void CALLBACK PADregisterVibration(void (CALLBACK *callback)(unsigned long, unsigned long)) {
+	gpuVisualVibration = callback;
+}
+
+//#ifdef _WIN64
+BOOL APIENTRY DllMain(HMODULE hInst, DWORD dwReason, LPVOID lpReserved)
+{
+	hInstance = hInst;
+	return TRUE;
+}
+//#else
+BOOL APIENTRY EntryPoint (HMODULE hInst, DWORD dwReason, LPVOID lpReserved)
+{
+	hInstance = hInst;
+	return TRUE;
+}
+//#endif

pcsxr-1.9.93.tar.bz2/win32/plugins/PadSSSPSX/PadSSSPSX.def Added

pcsxr-1.9.93.tar.bz2/win32/plugins/PadSSSPSX/PadSSSPSX.h Added

@@ -0,0 +1,47 @@
+/*	PADwin
+ *	Copyright (C) 2002-2004  PADwin Team
+ *
+ *	This program is free software; you can redistribute it and/or modify
+ *	it under the terms of the GNU General Public License as published by
+ *	the Free Software Foundation; either version 2 of the License, or
+ *	(at your option) any later version.
+ *
+ *	This program is distributed in the hope that it will be useful,
+ *	but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *	GNU General Public License for more details.
+ *
+ *	You should have received a copy of the GNU General Public License
+ *	along with this program; if not, write to the Free Software
+ *	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef __PAD_H__
+#define __PAD_H__
+
+#include "PadSSSPSXres.h"
+
+typedef signed char	s8;
+typedef signed short s16;
+typedef signed int s32;
+typedef __int64 s64;
+
+typedef unsigned char  u8;
+typedef unsigned short u16;
+typedef unsigned int u32;
+typedef unsigned __int64 u64;
+
+typedef struct
+{
+	u32 key;
+	u32 event;
+} keyEvent;
+
+typedef struct
+{
+	u32 keys[2][21];
+	u32 dualshock;
+	u32 visualvibration[2];
+} Config;
+
+#endif

pcsxr-1.9.93.tar.bz2/win32/plugins/PadSSSPSX/PadSSSPSX.rc Added

@@ -0,0 +1,128 @@
+#include "PadSSSPSXres.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+
+///////////////////////////////////////////////////////////////////////////////
+// Use MFC if available
+//
+#if defined(_MFC_VER)
+#include "afxres.h"
+#else
+#include "WinResrc.h"
+#include <winres.h>
+#endif
+
+#undef APSTUDIO_READONLY_SYMBOLS
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_JPN)
+#ifdef _WIN32
+//LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
+//#pragma code_page(932)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+
+1 TEXTINCLUDE 
+BEGIN
+ "PadSSSPSXres.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+ "#include ""afxres.h""\r\n"
+ "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+ "\r\n"
+ "\0"
+END
+
+#endif
+
+IDD_DIALOG1 DIALOGEX 0, 0, 442, 239
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
+CAPTION "PAD Settings"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+ CONTROL "",IDC_TABC,"SysTabControl32",0x0,6,6,432,210
+ PUSHBUTTON "L2",IDC_BL2,54,24,72,12,NOT WS_TABSTOP
+ EDITTEXT IDC_EL2,54,36,72,12,ES_READONLY | NOT WS_TABSTOP
+ PUSHBUTTON "L1",IDC_BL1,54,48,72,12,NOT WS_TABSTOP
+ EDITTEXT IDC_EL1,54,60,72,12,ES_READONLY | NOT WS_TABSTOP
+ PUSHBUTTON "Up",IDC_BUP,54,78,72,12,NOT WS_TABSTOP
+ EDITTEXT IDC_EUP,54,90,72,12,ES_READONLY | NOT WS_TABSTOP
+ PUSHBUTTON "Left",IDC_BLEFT,12,102,72,12,NOT WS_TABSTOP
+ EDITTEXT IDC_ELEFT,12,114,72,12,ES_READONLY | NOT WS_TABSTOP
+ PUSHBUTTON "Right",IDC_BRIGHT,96,102,72,12,NOT WS_TABSTOP
+ EDITTEXT IDC_ERIGHT,96,114,72,12,ES_READONLY | NOT WS_TABSTOP
+ PUSHBUTTON "Down",IDC_BDOWN,54,126,72,12,NOT WS_TABSTOP
+ EDITTEXT IDC_EDOWN,54,138,72,12,ES_READONLY | NOT WS_TABSTOP
+ PUSHBUTTON "Select",IDC_BSELECT,144,36,72,12,NOT WS_TABSTOP,
+ WS_EX_TRANSPARENT
+ EDITTEXT IDC_ESELECT,144,48,72,12,ES_READONLY | NOT WS_TABSTOP,
+ WS_EX_TRANSPARENT
+ PUSHBUTTON "Start",IDC_BSTART,228,36,72,12,NOT WS_TABSTOP,
+ WS_EX_TRANSPARENT
+ EDITTEXT IDC_ESTART,228,48,72,12,ES_READONLY | NOT WS_TABSTOP,
+ WS_EX_TRANSPARENT
+ PUSHBUTTON "Analog",IDC_BMODE,186,66,72,12,NOT WS_TABSTOP,
+ WS_EX_TRANSPARENT
+ EDITTEXT IDC_EMODE,186,78,72,12,ES_READONLY | NOT WS_TABSTOP,
+ WS_EX_TRANSPARENT
+ PUSHBUTTON "R2",IDC_BR2,318,24,72,12,NOT WS_TABSTOP
+ EDITTEXT IDC_ER2,318,36,72,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
+ WS_TABSTOP
+ PUSHBUTTON "R1",IDC_BR1,318,48,72,12,NOT WS_TABSTOP
+ EDITTEXT IDC_ER1,318,60,72,12,ES_AUTOHSCROLL | ES_READONLY | NOT 
+ WS_TABSTOP
+ PUSHBUTTON "Triangle",IDC_BTRIANGLE,318,78,72,12,NOT WS_TABSTOP
+ EDITTEXT IDC_ETRIANGLE,318,90,72,12,ES_AUTOHSCROLL | ES_READONLY | 
+ NOT WS_TABSTOP
+ PUSHBUTTON "Square",IDC_BSQUARE,276,102,72,12,NOT WS_TABSTOP
+ EDITTEXT IDC_ESQUARE,276,114,72,12,ES_AUTOHSCROLL | ES_READONLY | 
+ NOT WS_TABSTOP
+ PUSHBUTTON "Circle",IDC_BCIRCLE,360,102,72,12,NOT WS_TABSTOP
+ EDITTEXT IDC_ECIRCLE,360,114,72,12,ES_AUTOHSCROLL | ES_READONLY | 
+ NOT WS_TABSTOP
+ PUSHBUTTON "Cross",IDC_BCROSS,318,126,72,12,NOT WS_TABSTOP
+ EDITTEXT IDC_ECROSS,318,138,72,12,ES_AUTOHSCROLL | ES_READONLY | 
+ NOT WS_TABSTOP
+ PUSHBUTTON "L3",IDC_BL3,144,132,72,12,NOT WS_TABSTOP
+ EDITTEXT IDC_EL3,144,144,72,12,ES_READONLY | NOT WS_TABSTOP
+ PUSHBUTTON "LX",IDC_BLAX,144,162,72,12,NOT WS_TABSTOP
+ EDITTEXT IDC_ELAX,144,174,72,12,ES_READONLY | NOT WS_TABSTOP
+ PUSHBUTTON "LY",IDC_BLAY,144,186,72,12,NOT WS_TABSTOP
+ EDITTEXT IDC_ELAY,144,198,72,12,ES_READONLY | NOT WS_TABSTOP
+ PUSHBUTTON "R3",IDC_BR3,228,132,72,12,NOT WS_TABSTOP
+ EDITTEXT IDC_ER3,228,144,72,12,ES_READONLY | NOT WS_TABSTOP
+ PUSHBUTTON "RX",IDC_BRAX,228,162,72,12,NOT WS_TABSTOP
+ EDITTEXT IDC_ERAX,228,174,72,12,ES_READONLY | NOT WS_TABSTOP
+ PUSHBUTTON "RY",IDC_BRAY,228,186,72,12,NOT WS_TABSTOP
+ EDITTEXT IDC_ERAY,228,198,72,12,ES_READONLY | NOT WS_TABSTOP
+ PUSHBUTTON "OK",IDOK,330,222,48,12,NOT WS_TABSTOP
+ PUSHBUTTON "Cancel",IDCANCEL,390,222,48,12,NOT WS_TABSTOP
+ CTEXT "",IDC_STATIC,318,174,108,30,0,WS_EX_STATICEDGE
+ CONTROL "DUALSHOCK2 INSIDE",IDC_DS2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,331,179,84,8
+ CONTROL "VISUAL VIBRATION",IDC_VV3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,331,191,84,8
+END
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO 
+BEGIN
+ IDD_DIALOG1, DIALOG
+ BEGIN
+ RIGHTMARGIN, 432
+ BOTTOMMARGIN, 233
+ END
+END
+#endif
+
+#endif
+
+
+#ifndef APSTUDIO_INVOKED
+
+#endif
+

pcsxr-1.9.93.tar.bz2/win32/plugins/PadSSSPSX/PadSSSPSX.vcxproj Added

@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectName>SSSPSXpad</ProjectName>
+ <ProjectGuid>{0639CDF3-8C1F-47F4-A760-F5568194A083}</ProjectGuid>
+ <RootNamespace>SSSPSXpad</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\Debug/PadSSSPSX.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SSSPSXPAD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>.\Debug/PadSSSPSX.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
+ <ObjectFileName>.\Debug/</ObjectFileName>
+ <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0804</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;dinput8.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(SolutionDir)$(Configuration)\PadSSSPSX.dll</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>.\PadSSSPSX.def</ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>.\Debug/PadSSSPSX.pdb</ProgramDatabaseFile>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <ImportLibrary>.\Debug/PadSSSPSX.lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\Debug/PadSSSPSX.bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\Release/PadSSSPSX.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SSSPSXPAD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>.\Release/PadSSSPSX.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
+ <ObjectFileName>.\Release/</ObjectFileName>
+ <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0804</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;dinput8.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>.\Release/PadSSSPSX.dll</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>.\PadSSSPSX.def</ModuleDefinitionFile>
+ <ProgramDatabaseFile>.\Release/PadSSSPSX.pdb</ProgramDatabaseFile>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <ImportLibrary>.\Release/PadSSSPSX.lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\Release/PadSSSPSX.bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="PadSSSPSX.cpp">
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="PadSSSPSX.def" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="PadSSSPSX.h" />
+ <ClInclude Include="PadSSSPSXres.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="PadSSSPSX.rc">
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

pcsxr-1.9.93.tar.bz2/win32/plugins/PadSSSPSX/PadSSSPSX.vcxproj.filters Added

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{9e0fae11-21d1-4f55-a39a-a2a7ee79e32a}</UniqueIdentifier>
+ <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{688f1b67-5186-4503-bdd3-f85e67193506}</UniqueIdentifier>
+ <Extensions>h;hpp;hxx;hm;inl</Extensions>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{727a8f19-4c32-4d61-834d-c870f6ab38b6}</UniqueIdentifier>
+ <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="PadSSSPSX.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="PadSSSPSX.def">
+ <Filter>Source Files</Filter>
+ </None>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="PadSSSPSX.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="PadSSSPSXres.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="PadSSSPSX.rc">
+ <Filter>Resource Files</Filter>
+ </ResourceCompile>
+ </ItemGroup>
+</Project>
\ No newline at end of file

pcsxr-1.9.93.tar.bz2/win32/plugins/PadSSSPSX/PadSSSPSX.vcxproj.user Added

pcsxr-1.9.93.tar.bz2/win32/plugins/PadSSSPSX/PadSSSPSXres.h Added

@@ -0,0 +1,61 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by PadSSSPSX.rc
+//
+#define IDD_DIALOG1                     100
+#define IDC_BSELECT                     1000
+#define IDC_BL3                         1001
+#define IDC_BR3                         1002
+#define IDC_BSTART                      1003
+#define IDC_BUP                         1004
+#define IDC_BRIGHT                      1005
+#define IDC_BDOWN                       1006
+#define IDC_BLEFT                       1007
+#define IDC_BL2                         1008
+#define IDC_BR2                         1009
+#define IDC_BL1                         1010
+#define IDC_BR1                         1011
+#define IDC_BTRIANGLE                   1012
+#define IDC_BCIRCLE                     1013
+#define IDC_BCROSS                      1014
+#define IDC_BSQUARE                     1015
+#define IDC_BMODE                       1016
+#define IDC_BLAX                        1017
+#define IDC_BLAY                        1018
+#define IDC_BRAX                        1019
+#define IDC_BRAY                        1020
+#define IDC_ESELECT                     1030
+#define IDC_EL3                         1031
+#define IDC_ER3                         1032
+#define IDC_ESTART                      1033
+#define IDC_EUP                         1034
+#define IDC_ERIGHT                      1035
+#define IDC_EDOWN                       1036
+#define IDC_ELEFT                       1037
+#define IDC_EL2                         1038
+#define IDC_ER2                         1039
+#define IDC_EL1                         1040
+#define IDC_ER1                         1041
+#define IDC_ETRIANGLE                   1042
+#define IDC_ECIRCLE                     1043
+#define IDC_ECROSS                      1044
+#define IDC_ESQUARE                     1045
+#define IDC_EMODE                       1046
+#define IDC_ELAX                        1047
+#define IDC_ELAY                        1048
+#define IDC_ERAX                        1049
+#define IDC_ERAY                        1050
+#define IDC_TABC                        1060
+#define IDC_DS2                         1070
+#define IDC_VV3                         1071
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        101
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1061
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif

pcsxr-1.9.93.tar.bz2/win32/plugins/PadSSSPSX/readmewip.txt Added

@@ -0,0 +1,48 @@
+SSSPSX Pad - An Open Source Pad plugin for PSX and PS2 emulators
+Author: Nagisa
+Homepage: http://www.asahi-net.or.jp/~bz7t-skmt/
+
+Overview:
+-Small executable program
+-Source code under 1000 step,20kb binary
+-Open Source,under the GPL Licence
+
+
+Features:
+
+For PS1 emulators
+- Force feedback support (PCSX only)
+  Delete the following PCSX sorce code.
+  File: sio.c Line: 138
+@---------------------
+@if (buf[parp] == 0x41) {
+@@switch (value) {
+@@@case 0x43:
+@@@@buf[1] = 0x43;
+@@@@break;
+@@@case 0x45:
+@@@@buf[1] = 0xf3;
+@@@@break;
+@@}
+@}
+@---------------------
+
+For PCSX2
+-Force feedback support (maybe)
+-PADKeyEvent API support
+-Using DirectInput 9 (game controller and keyboard)
+
+Thanks to:
+http://www.hm5.aitai.ne.jp/~takuya/index.html#ds2_analisys for the valuable info
+PCSX2 team for the PadWinKeyb source code
+bositman for some report
+
+Version History:
+v1.0: -Initial Release
+v1.1: -Changed to DirectInput 9
+v1.2: -PADKeyEvent API support added
+v1.3: -DirectInput collision problem fixed
+v1.4: -Added timeout on settings dialog.If the countdown ends, the key will be set to "NONE".
+      -Changed "ESC" key action on settings dialog.If you press the "ESC" key, the setting will keep the previous one.
+      -Fixed silly bug. (dont ask me about it).
+v1.5: -Fixed 0x4D packet.

pcsxr-1.9.93.tar.bz2/win32/plugins/bladesio1 Added

pcsxr-1.9.93.tar.bz2/win32/plugins/bladesio1/bladesio1.def Added

pcsxr-1.9.93.tar.bz2/win32/plugins/bladesio1/bladesio1.rc Added

@@ -0,0 +1,199 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+// Use MFC if available
+//
+#if defined(_MFC_VER)
+#include "afxres.h"
+#else
+#include "WinResrc.h"
+#include <winres.h>
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// Polish (Poland) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_PLK)
+LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
+#pragma code_page(1250)
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+ "resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+ "#include ""afxres.h""\r\n"
+ "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+ "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
+ "#define _AFX_NO_OLE_RESOURCES\r\n"
+ "#define _AFX_NO_TRACKER_RESOURCES\r\n"
+ "#define _AFX_NO_PROPERTY_RESOURCES\r\n"
+ "\r\n"
+ "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"
+ "#ifdef _WIN32\r\n"
+ "LANGUAGE 9, 1\r\n"
+ "#pragma code_page(1252)\r\n"
+ "#endif\r\n"
+ "#endif\0"
+END
+
+#endif // APSTUDIO_INVOKED
+
+#endif // Polish (Poland) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Neutral resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+#pragma code_page(1251)
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_ABOUT DIALOGEX 0, 0, 177, 52
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "About"
+FONT 8, "MS Sans Serif", 0, 0, 0x1
+BEGIN
+ DEFPUSHBUTTON "OK",IDOK,63,30,44,14
+ LTEXT "Version :",IDC_STATIC,5,5,37,9
+ LTEXT "Coded by :",IDC_STATIC,5,16,42,9
+ LTEXT "1.0",IDC_STATIC,52,6,25,9
+ LTEXT "edgbla",IDC_STATIC,53,16,26,9
+ LTEXT "<edgbla@yandex.ru>",IDC_STATIC,91,16,76,9
+END
+
+IDD_CFGDLG DIALOGEX 0, 0, 253, 163
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Link Cable Configuration"
+FONT 8, "MS Sans Serif", 0, 0, 0x0
+BEGIN
+ DEFPUSHBUTTON "OK",IDOK,151,142,45,14
+ PUSHBUTTON "Cancel",IDCANCEL,201,142,45,14
+ GROUPBOX "General settings",IDC_STATIC,7,2,239,135
+ CONTROL "Disabled",IDC_DISABLED,"Button",BS_AUTORADIOBUTTON,14,75,87,10
+ CONTROL "Server (Player 1)",IDC_SERVER,"Button",BS_AUTORADIOBUTTON,14,88,89,10
+ CONTROL "Client (Player 2)",IDC_CLIENT,"Button",BS_AUTORADIOBUTTON,14,102,89,10
+ LTEXT "Port number:",IDC_STATIC,15,120,63,8
+ EDITTEXT IDC_IP,106,100,101,14,ES_AUTOHSCROLL
+ EDITTEXT IDC_PORT,106,118,40,14,ES_AUTOHSCROLL
+ LTEXT "Select here if you'll be Server (Player1) or Client (Player2).",IDC_STATIC,15,15,223,8
+ LTEXT "If you select Server you must Copy your IP address",IDC_STATIC,15,26,223,8
+ LTEXT "to the Clipboard and paste if (Ctrl+V) wherever the Client can see it.",IDC_STATIC,15,37,222,8
+ LTEXT "If you selected Client please enter the IP address the Server",IDC_STATIC,15,48,223,8
+ LTEXT "gave to you in the IP Address Control.",IDC_STATIC,15,59,221,8
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO
+BEGIN
+ IDD_ABOUT, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 170
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 45
+ END
+
+ IDD_CFGDLG, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 246
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 156
+ END
+END
+#endif // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,0,1,0
+ PRODUCTVERSION 1,0,1,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904b0"
+ BEGIN
+ VALUE "FileDescription", "bladesio1"
+ VALUE "FileVersion", "1.0.1.0"
+ VALUE "InternalName", "bladesio1"
+ VALUE "OriginalFilename", "bladesio1.dll"
+ VALUE "ProductName", "bladesio1"
+ VALUE "ProductVersion", "1.0.1.0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
+
+#endif // Neutral resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+#define _AFX_NO_SPLITTER_RESOURCES
+#define _AFX_NO_OLE_RESOURCES
+#define _AFX_NO_TRACKER_RESOURCES
+#define _AFX_NO_PROPERTY_RESOURCES
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE 9, 1
+#pragma code_page(1252)
+#endif
+#endif
+/////////////////////////////////////////////////////////////////////////////
+#endif // not APSTUDIO_INVOKED
+

pcsxr-1.9.93.tar.bz2/win32/plugins/bladesio1/bladesio1.sln Added

pcsxr-1.9.93.tar.bz2/win32/plugins/bladesio1/bladesio1.vcxproj Added

@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{F57B00CD-8399-4683-901E-11FA09727AE5}</ProjectGuid>
+ <RootNamespace>bladesio1</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\Release/bladesio1.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>.\;.\winsrc;..\..\..\plugins\bladesio1;..\..\..\libpcsxcore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>.\Release/bladesio1.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
+ <ObjectFileName>.\Release/</ObjectFileName>
+ <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0407</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>winmm.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>.\Release/bladesio1.dll</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>.\bladesio1.def</ModuleDefinitionFile>
+ <ProgramDatabaseFile>.\Release/bladesio1.pdb</ProgramDatabaseFile>
+ <SubSystem>Windows</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <ImportLibrary>.\Release/bladesio1.lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\Release/bladesio1.bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\Debug/bladesio1.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>.\;.\winsrc;..\..\..\plugins\bladesio1;..\..\..\libpcsxcore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>.\Debug/bladesio1.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
+ <ObjectFileName>.\Debug/</ObjectFileName>
+ <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0407</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>winmm.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(SolutionDir)$(Configuration)\bladesio1.dll</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>.\bladesio1.def</ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>.\Debug/bladesio1.pdb</ProgramDatabaseFile>
+ <SubSystem>Windows</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <ImportLibrary>.\Debug/bladesio1.lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\Debug/bladesio1.bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\..\plugins\bladesio1\connection.c" />
+ <ClCompile Include="..\..\..\plugins\bladesio1\fifo.c" />
+ <ClCompile Include="..\..\..\plugins\bladesio1\sio1.c" />
+ <ClCompile Include="winsrc\cfg-winapi.c" />
+ <ClCompile Include="winsrc\winmain.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\plugins\bladesio1\connection.h" />
+ <ClInclude Include="..\..\..\plugins\bladesio1\fifo.h" />
+ <ClInclude Include="..\..\..\plugins\bladesio1\sio1.h" />
+ <ClInclude Include="..\..\..\plugins\bladesio1\typedefs.h" />
+ <ClInclude Include="resource.h" />
+ <ClInclude Include="winsrc\cfg-winapi.h" />
+ <ClInclude Include="winsrc\stdafx.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="bladesio1.def" />
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="bladesio1.rc">
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

pcsxr-1.9.93.tar.bz2/win32/plugins/bladesio1/bladesio1.vcxproj.filters Added

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="winsrc">
+ <UniqueIdentifier>{b54538cc-5b42-4480-adf8-44c08f01d6c6}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="bladesio1">
+ <UniqueIdentifier>{394ea6fd-453d-4665-ac08-c0c5d867918b}</UniqueIdentifier>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="winsrc\winmain.c">
+ <Filter>winsrc</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\plugins\bladesio1\connection.c">
+ <Filter>bladesio1</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\plugins\bladesio1\fifo.c">
+ <Filter>bladesio1</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\plugins\bladesio1\sio1.c">
+ <Filter>bladesio1</Filter>
+ </ClCompile>
+ <ClCompile Include="winsrc\cfg-winapi.c">
+ <Filter>winsrc</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="resource.h" />
+ <ClInclude Include="..\..\..\plugins\bladesio1\fifo.h">
+ <Filter>bladesio1</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\plugins\bladesio1\sio1.h">
+ <Filter>bladesio1</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\plugins\bladesio1\connection.h">
+ <Filter>bladesio1</Filter>
+ </ClInclude>
+ <ClInclude Include="winsrc\stdafx.h">
+ <Filter>winsrc</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\plugins\bladesio1\typedefs.h">
+ <Filter>bladesio1</Filter>
+ </ClInclude>
+ <ClInclude Include="winsrc\cfg-winapi.h">
+ <Filter>winsrc</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="bladesio1.def" />
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="bladesio1.rc" />
+ </ItemGroup>
+</Project>
\ No newline at end of file

pcsxr-1.9.93.tar.bz2/win32/plugins/bladesio1/bladesio1.vcxproj.user Added

pcsxr-1.9.93.tar.bz2/win32/plugins/bladesio1/resource.h Added

@@ -0,0 +1,57 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by bladesio1.rc
+//
+#define IDC_SETS1                       3
+#define IDC_SETS2                       4
+#define IDOK2                           5
+#define IDD_DIALOG1                     130
+#define IDD_ABOUT                       130
+#define IDD_CFGDLG                      131
+#define IDC_XAVOLUME                    1004
+#define IDC_ENABXA                      1005
+#define IDC_XAPITCH                     1006
+#define IDC_XABLOCK                     1007
+#define IDC_USETIMER                    1007
+#define IDC_CMIXRATE                    1008
+#define IDC_USEIRQ                      1008
+#define IDC_USEREVERB                   1008
+#define IDC_CMODE                       1009
+#define IDC_VOLUME                      1009
+#define IDC_CFILTER                     1010
+#define IDC_IRQWAIT                     1010
+#define IDC_CQUALITY                    1011
+#define IDC_DEBUGMODE                   1011
+#define IDC_CDSOUND                     1012
+#define IDC_INTERPOL                    1012
+#define IDC_PLAYALWAYS                  1013
+#define IDC_RECORDMODE                  1013
+#define IDC_IGNOREPITCH                 1014
+#define IDC_DISSTEREO                   1014
+#define IDC_AMPLIF                      1015
+#define IDC_IRQDECODE                   1015
+#define IDC_VENVELOPE                   1016
+#define IDC_VOL1                        1016
+#define IDC_REVERB                      1017
+#define IDC_VOL2                        1017
+#define IDC_VOL3                        1018
+#define IDC_VOL4                        1019
+#define IDC_XA                          1133
+#define IDC_FREQRESPONSE                1136
+#define IDC_DISABLED                    1137
+#define IDC_SERVER                      1138
+#define IDC_CLIENT                      1139
+#define IDC_IP                          1141
+#define IDC_EDIT2                       1145
+#define IDC_PORT                        1145
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        144
+#define _APS_NEXT_COMMAND_VALUE         32771
+#define _APS_NEXT_CONTROL_VALUE         1146
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif

pcsxr-1.9.93.tar.bz2/win32/plugins/bladesio1/winsrc Added

pcsxr-1.9.93.tar.bz2/win32/plugins/bladesio1/winsrc/cfg-winapi.c Added

@@ -0,0 +1,138 @@
+/***************************************************************************
+ * Copyright (C) 2013 by Blade_Arma <edgbla@yandex.ru> *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
+ ***************************************************************************/
+
+#include "stdafx.h"
+#include "typedefs.h"
+#include "cfg-winapi.h"
+#include "sio1.h"
+
+/***************************************************************************/
+
+void settingsRead() {
+	HKEY myKey;
+	DWORD temp;
+	DWORD type;
+	DWORD size;
+
+	settings.player = PLAYER_DISABLED;
+	strcpy(settings.ip, "127.0.0.1");
+	settings.port = 33307;
+
+	if(RegOpenKeyEx(HKEY_CURRENT_USER,"Software\\Vision Thing\\PSEmu Pro\\SIO1\\bladesio1",0,KEY_ALL_ACCESS,&myKey) == ERROR_SUCCESS) {
+	 size = 4;
+	 if(RegQueryValueEx(myKey, "player", 0, &type, (LPBYTE)&temp, &size) == ERROR_SUCCESS)
+		 settings.player = (int)temp;
+	 size = sizeof(settings.ip);
+	 RegQueryValueEx(myKey, "ip", 0, &type, (LPBYTE)settings.ip, &size);
+	 size = 4;
+	 if(RegQueryValueEx(myKey, "port", 0, &type, (LPBYTE)&temp, &size) == ERROR_SUCCESS)
+		 settings.port = (int)temp;
+
+	 RegCloseKey(myKey);
+	}
+}
+
+void settingsWrite() {
+	HKEY myKey;
+	DWORD myDisp;
+	DWORD temp;
+
+	RegCreateKeyEx(HKEY_CURRENT_USER, "Software\\Vision Thing\\PSEmu Pro\\SIO1\\bladesio1", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &myKey, &myDisp);
+	temp = settings.player;
+	RegSetValueEx(myKey, "player", 0, REG_DWORD, (LPBYTE)&temp, sizeof(temp));
+	RegCreateKeyEx(HKEY_CURRENT_USER,"Software\\Vision Thing\\PSEmu Pro\\SIO1\\bladesio1", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &myKey, &myDisp);
+	RegSetValueEx(myKey, "ip", 0, REG_SZ, (BYTE*)settings.ip, strlen(settings.ip));
+	RegCreateKeyEx(HKEY_CURRENT_USER,"Software\\Vision Thing\\PSEmu Pro\\SIO1\\bladesio1", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &myKey, &myDisp);
+	temp = settings.port;
+	RegSetValueEx(myKey, "port", 0, REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+
+	RegCloseKey(myKey);
+}
+
+/***************************************************************************/
+
+BOOL OnInitSio1Dialog(HWND hW) {
+	char str[32];
+
+	settingsRead();
+
+	CheckRadioButton(hW, IDC_DISABLED, IDC_CLIENT, IDC_DISABLED + settings.player);
+	SetDlgItemText(hW, IDC_IP, settings.ip);
+	sprintf(str, "%i", settings.port);
+	SetDlgItemText(hW, IDC_PORT, str);
+
+	return TRUE;
+}
+
+void OnSio1OK(HWND hW) {
+	char str[32];
+
+	if(IsDlgButtonChecked(hW,IDC_DISABLED))
+		settings.player = 0;
+	if(IsDlgButtonChecked(hW,IDC_SERVER))
+		settings.player = 1;
+	if(IsDlgButtonChecked(hW,IDC_CLIENT))
+		settings.player = 2;
+	GetDlgItemText(hW,IDC_IP, settings.ip, sizeof(settings.ip));
+	GetDlgItemText(hW,IDC_PORT, str, sizeof(str));
+	settings.port = atoi(str);
+
+	settingsWrite();
+
+	EndDialog(hW,TRUE);
+}
+
+void OnSio1Cancel(HWND hW) {
+	EndDialog(hW,FALSE);
+}
+
+BOOL CALLBACK Sio1DlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) {
+	switch(uMsg) {
+		case WM_INITDIALOG:
+			return OnInitSio1Dialog(hW);
+		case WM_COMMAND: {
+			switch(LOWORD(wParam)) {
+				case IDCANCEL: 
+					OnSio1Cancel(hW);
+					return TRUE;
+				case IDOK:
+					OnSio1OK(hW);
+					return TRUE;
+			}
+		}
+	}
+
+	return FALSE;
+}
+
+BOOL CALLBACK AboutDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) {
+	switch(uMsg) {
+		case WM_COMMAND: {
+			switch(LOWORD(wParam)) {
+				case IDOK:
+					EndDialog(hW,TRUE);
+					return TRUE;
+			}
+		}
+	}
+
+	return FALSE;
+}
+
+/***************************************************************************/

pcsxr-1.9.93.tar.bz2/win32/plugins/bladesio1/winsrc/cfg-winapi.h Added

@@ -0,0 +1,32 @@
+/***************************************************************************
+ * Copyright (C) 2013 by Blade_Arma <edgbla@yandex.ru> *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
+ ***************************************************************************/
+
+#ifndef _CFG_H_
+#define _CFG_H_
+
+#include <windows.h>
+
+/***************************************************************************/
+
+extern BOOL CALLBACK Sio1DlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam);
+extern BOOL CALLBACK AboutDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam);
+
+/***************************************************************************/
+
+#endif // _CFG_H_

pcsxr-1.9.93.tar.bz2/win32/plugins/bladesio1/winsrc/stdafx.h Added

@@ -0,0 +1,32 @@
+/***************************************************************************
+ * Copyright (C) 2013 by Blade_Arma <edgbla@yandex.ru> *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
+ ***************************************************************************/
+
+#ifndef _STDAFX_H_
+#define _STDAFX_H_
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+
+#include <windows.h>
+#include "resource.h"
+
+extern HINSTANCE hInst;
+
+#endif // _STDAFX_H_

pcsxr-1.9.93.tar.bz2/win32/plugins/bladesio1/winsrc/winmain.c Added

@@ -0,0 +1,27 @@
+/***************************************************************************
+ * Copyright (C) 2013 by Blade_Arma <edgbla@yandex.ru> *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
+ ***************************************************************************/
+
+#include <stdafx.h>
+
+HINSTANCE hInst = NULL;
+
+BOOL APIENTRY DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) {
+	hInst = (HINSTANCE)hModule;
+	return TRUE;
+}

pcsxr-1.9.93.tar.bz2/win32/plugins/dfsound Added

pcsxr-1.9.93.tar.bz2/win32/plugins/dfsound/DFSound.def Added

pcsxr-1.9.93.tar.bz2/win32/plugins/dfsound/DFSound.dev Added

@@ -0,0 +1,369 @@
+[Project]
+FileName=DFSound.dev
+Name=DFSound
+Ver=1
+IsCpp=1
+Type=3
+Compiler=-W -DWIN32 -DNDEBUG -D_WINDOWS_@@_
+CppCompiler=-W -DWIN32 -DNDEBUG -D_WINDOWS_@@_
+Includes=.\\;.\winsrc;..\..\..\plugins\dfsound;..\..\glue;..\..\..\libpcsxcore
+Linker=--enable-stdcall-fixup -ldsound -lwinmm -luser32 -lgdi32 -ladvapi32 -def DFSound.def_@@_
+Libs=
+UnitCount=31
+Folders=dfsound,winsrc
+ObjFiles=
+PrivateResource=DFSound_private.rc
+ResourceIncludes=
+MakeIncludes=
+Icon=
+ExeOutput=
+ObjectOutput=
+OverrideOutput=0
+OverrideOutputName=DFSound.exe
+HostApplication=
+CommandLine=
+UseCustomMakefile=0
+CustomMakefile=
+IncludeVersionInfo=0
+SupportXPThemes=0
+CompilerSet=0
+CompilerSettings=0010000001001000010100
+
+[Unit1]
+FileName=winsrc\cfg.c
+Folder=winsrc
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit2]
+FileName=winsrc\debug.c
+Folder=winsrc
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit3]
+FileName=winsrc\debug.h
+Folder=winsrc
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit4]
+FileName=winsrc\dsound.c
+Folder=winsrc
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit5]
+FileName=winsrc\dsound.h
+Folder=winsrc
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit6]
+FileName=winsrc\psemu.c
+Folder=winsrc
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit7]
+FileName=winsrc\record.c
+Folder=winsrc
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit8]
+FileName=winsrc\record.h
+Folder=winsrc
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit9]
+FileName=winsrc\winmain.c
+Folder=winsrc
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit10]
+FileName=..\..\..\plugins\dfsound\adsr.c
+Folder=dfsound
+Compile=0
+CompileCpp=0
+Link=0
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=$(CC) -c adsr.c -o adsr.o $(CFLAGS)
+
+[Unit11]
+FileName=..\..\..\plugins\dfsound\adsr.h
+Folder=dfsound
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit12]
+FileName=..\..\..\plugins\dfsound\dma.c
+Folder=dfsound
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit13]
+FileName=..\..\..\plugins\dfsound\dma.h
+Folder=dfsound
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit14]
+FileName=..\..\..\plugins\dfsound\dsoundoss.h
+Folder=dfsound
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit15]
+FileName=..\..\..\plugins\dfsound\externals.h
+Folder=dfsound
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit16]
+FileName=..\..\..\plugins\dfsound\externals.c
+Folder=dfsound
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit17]
+FileName=..\..\..\plugins\dfsound\freeze.c
+Folder=dfsound
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit18]
+FileName=..\..\..\plugins\dfsound\gauss_i.h
+Folder=dfsound
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit19]
+FileName=..\..\..\plugins\dfsound\psemuxa.h
+Folder=dfsound
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit20]
+FileName=..\..\..\plugins\dfsound\registers.c
+Folder=dfsound
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit21]
+FileName=..\..\..\plugins\dfsound\registers.h
+Folder=dfsound
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit22]
+FileName=..\..\..\plugins\dfsound\regs.h
+Folder=dfsound
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit23]
+FileName=..\..\..\plugins\dfsound\reverb.c
+Folder=dfsound
+Compile=0
+CompileCpp=0
+Link=0
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=$(CC) -c reverb.c -o reverb.o $(CFLAGS)
+
+[Unit24]
+FileName=..\..\..\plugins\dfsound\reverb.h
+Folder=dfsound
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit25]
+FileName=..\..\..\plugins\dfsound\spu.c
+Folder=dfsound
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit26]
+FileName=..\..\..\plugins\dfsound\spu.h
+Folder=dfsound
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit27]
+FileName=..\..\..\plugins\dfsound\stdafx.h
+Folder=dfsound
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit28]
+FileName=..\..\..\plugins\dfsound\xa.c
+Folder=dfsound
+Compile=0
+CompileCpp=0
+Link=0
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=$(CC) -c xa.c -o xa.o $(CFLAGS)
+
+[Unit29]
+FileName=..\..\..\plugins\dfsound\xa.h
+Folder=dfsound
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit30]
+FileName=DFSound.def
+Folder=
+Compile=0
+CompileCpp=0
+Link=0
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit31]
+FileName=DFSound.rc
+Folder=Resources
+Compile=1
+CompileCpp=1
+Link=0
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit32]
+FileName=resource.h
+Folder=
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[VersionInfo]
+Major=0
+Minor=1
+Release=1
+Build=1
+LanguageID=1033
+CharsetID=1252
+CompanyName=
+FileVersion=0.1
+FileDescription=Developed using the Dev-C++ IDE
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=DFSound.exe
+ProductName=DFSound
+ProductVersion=0.1
+AutoIncBuildNr=0
+

pcsxr-1.9.93.tar.bz2/win32/plugins/dfsound/DFSound.rc Added

@@ -0,0 +1,417 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+// Use MFC if available
+//
+#if defined(_MFC_VER)
+#include "afxres.h"
+#else
+#include "WinResrc.h"
+#include <winres.h>
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// Neutral resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
+#ifdef _WIN32
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+#pragma code_page(936)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_ABOUT DIALOGEX 0, 0, 239, 175
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "About"
+FONT 8, "MS Sans Serif", 0, 0, 0x1
+BEGIN
+ DEFPUSHBUTTON "OK",IDOK,98,155,44,14
+ RTEXT "Version :",IDC_STATIC,5,5,74,9
+ RTEXT "Based on :",IDC_STATIC,5,16,74,9
+ RTEXT "Coded by :",IDC_STATIC,5,27,74,9
+ RTEXT "Pete's EMail :",IDC_STATIC,5,40,74,9
+ RTEXT "Pete's homepage :",IDC_STATIC,5,51,74,9
+ LTEXT "1.0",IDC_STATIC,82,5,154,9
+ LTEXT "P.E.Op.S DSound PSX SPU Audio Driver",IDC_STATIC,81,16,154,9
+ LTEXT "Pete Bernert and the P.E.Op.S. team",IDC_STATIC,81,27,154,9
+ LTEXT "BlackDove@addcom.de",IDC_STATIC,81,40,154,9
+ LTEXT "http://www.pbernert.com",IDC_STATIC,81,51,154,9
+ CONTROL "",IDC_STATIC,"Static",SS_ETCHEDFRAME,9,107,218,41,WS_EX_DLGMODALFRAME
+ RTEXT "Greetings to:",IDC_STATIC,16,116,45,9
+ LTEXT "_Demo_, Null2, Iori, Andy, Ben, Bilgerat, linuzappz and everybody else who is trying to create nice psx emu sounds :)",IDC_STATIC,65,116,153,27
+ RTEXT "P.E.Op.S. homepage :",IDC_STATIC,5,91,74,9
+ LTEXT "https://sourceforge.net/projects/peops/",IDC_STATIC,81,91,154,9
+ RTEXT "linuzappz :",IDC_STATIC,10,63,69,10
+ LTEXT "http://www.pcsx.net",IDC_STATIC,81,63,142,10
+ RTEXT "kode54 :",IDC_STATIC,10,75,69,10
+ LTEXT "http://home.earthlink.net/~kode54/",IDC_STATIC,81,75,142,10
+END
+
+IDD_CFGDLG DIALOGEX 0, 0, 253, 217
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Configure the P.E.Op.S. DSound PSX SPU Audio Driver..."
+FONT 8, "MS Sans Serif", 0, 0, 0x0
+BEGIN
+ COMBOBOX IDC_USETIMER,54,14,186,44,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX IDC_VOLUME,54,30,186,62,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX IDC_USEREVERB,54,46,186,44,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX IDC_INTERPOL,54,62,186,62,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ CONTROL "Change XA speed, if it is played too fast (more cpu power needed)",IDC_XAPITCH,
+ "Button",BS_AUTOCHECKBOX | BS_LEFT | BS_VCENTER | WS_TABSTOP,13,97,225,10
+ CONTROL "SPU IRQ - wait for CPU action (Valkyrie Profile && MGS + SPUasync)",IDC_IRQWAIT,
+ "Button",BS_AUTOCHECKBOX | BS_LEFT | BS_VCENTER | WS_TABSTOP,13,128,231,10
+ CONTROL "Mono sound mode (for slower PCs/sound cards)",IDC_DISSTEREO,
+ "Button",BS_AUTOCHECKBOX | BS_LEFT | BS_VCENTER | WS_TABSTOP,13,140,229,10
+ CONTROL "Enable developer debug mode",IDC_DEBUGMODE,"Button",BS_AUTOCHECKBOX | BS_LEFT | BS_VCENTER | WS_TABSTOP,13,164,229,10
+ CONTROL "Enable sound recording window",IDC_RECORDMODE,"Button",BS_AUTOCHECKBOX | BS_LEFT | BS_VCENTER | WS_TABSTOP,13,177,229,10
+ DEFPUSHBUTTON "OK",IDOK,51,196,45,14
+ PUSHBUTTON "Cancel",IDCANCEL,157,196,45,14
+ RTEXT "Volume:",IDC_STATIC,22,32,29,10,SS_CENTERIMAGE
+ GROUPBOX "General settings",IDC_STATIC,4,2,245,81
+ GROUPBOX "XA music",IDC_STATIC,4,85,245,27
+ GROUPBOX "Misc",IDC_STATIC,4,115,245,77
+ RTEXT "Reverb:",IDC_STATIC,22,48,29,10,SS_CENTERIMAGE
+ RTEXT "Mode:",IDC_STATIC,20,16,29,10,SS_CENTERIMAGE
+ RTEXT "Interpolation:",IDC_STATIC,8,64,43,10,SS_CENTERIMAGE
+ CONTROL "Enable frequency response - output filter",IDC_FREQRESPONSE,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,152,224,10
+END
+
+IDD_DEBUG DIALOG 0, 0, 397, 314
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Sound debug screen"
+FONT 8, "MS Sans Serif"
+BEGIN
+ GROUPBOX "XA",IDC_STATIC,201,249,92,61
+ LTEXT "",IDC_SAREA,4,12,150,288,WS_BORDER
+ CONTROL "",IDC_MUTE1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,158,14,9,9
+ CONTROL "1",IDC_CHAN1,"Button",BS_AUTORADIOBUTTON,168,14,22,9
+ CONTROL "",IDC_MUTE2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,158,26,9,9
+ CONTROL "2",IDC_CHAN2,"Button",BS_AUTORADIOBUTTON,168,26,22,9
+ CONTROL "",IDC_MUTE3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,158,38,9,9
+ CONTROL "3",IDC_CHAN3,"Button",BS_AUTORADIOBUTTON,168,38,22,9
+ CONTROL "",IDC_MUTE4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,158,50,9,9
+ CONTROL "4",IDC_CHAN4,"Button",BS_AUTORADIOBUTTON,168,50,22,9
+ CONTROL "",IDC_MUTE5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,158,62,9,9
+ CONTROL "5",IDC_CHAN5,"Button",BS_AUTORADIOBUTTON,168,62,22,9
+ CONTROL "",IDC_MUTE6,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,158,74,9,9
+ CONTROL "6",IDC_CHAN6,"Button",BS_AUTORADIOBUTTON,168,74,22,9
+ CONTROL "",IDC_MUTE7,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,158,86,9,9
+ CONTROL "7",IDC_CHAN7,"Button",BS_AUTORADIOBUTTON,168,86,22,9
+ CONTROL "",IDC_MUTE8,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,158,98,9,9
+ CONTROL "8",IDC_CHAN8,"Button",BS_AUTORADIOBUTTON,168,98,22,9
+ CONTROL "",IDC_MUTE9,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,158,110,9,9
+ CONTROL "9",IDC_CHAN9,"Button",BS_AUTORADIOBUTTON,168,110,22,9
+ CONTROL "",IDC_MUTE10,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,158,122,9,9
+ CONTROL "10",IDC_CHAN10,"Button",BS_AUTORADIOBUTTON,168,122,22,9
+ CONTROL "",IDC_MUTE11,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,158,134,9,9
+ CONTROL "11",IDC_CHAN11,"Button",BS_AUTORADIOBUTTON,168,134,22,9
+ CONTROL "",IDC_MUTE12,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,158,146,9,9
+ CONTROL "12",IDC_CHAN12,"Button",BS_AUTORADIOBUTTON,168,146,22,9
+ CONTROL "",IDC_MUTE13,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,158,158,9,9
+ CONTROL "13",IDC_CHAN13,"Button",BS_AUTORADIOBUTTON,168,158,22,9
+ CONTROL "",IDC_MUTE14,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,158,170,9,9
+ CONTROL "14",IDC_CHAN14,"Button",BS_AUTORADIOBUTTON,168,170,22,9
+ CONTROL "",IDC_MUTE15,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,158,182,9,9
+ CONTROL "15",IDC_CHAN15,"Button",BS_AUTORADIOBUTTON,168,182,22,9
+ CONTROL "",IDC_MUTE16,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,158,194,9,9
+ CONTROL "16",IDC_CHAN16,"Button",BS_AUTORADIOBUTTON,168,194,22,9
+ CONTROL "",IDC_MUTE17,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,158,206,9,9
+ CONTROL "17",IDC_CHAN17,"Button",BS_AUTORADIOBUTTON,168,206,22,9
+ CONTROL "",IDC_MUTE18,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,158,218,9,9
+ CONTROL "18",IDC_CHAN18,"Button",BS_AUTORADIOBUTTON,168,218,22,9
+ CONTROL "",IDC_MUTE19,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,158,230,9,9
+ CONTROL "19",IDC_CHAN19,"Button",BS_AUTORADIOBUTTON,168,230,22,9
+ CONTROL "",IDC_MUTE20,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,158,242,9,9
+ CONTROL "20",IDC_CHAN20,"Button",BS_AUTORADIOBUTTON,168,242,22,9
+ CONTROL "",IDC_MUTE21,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,158,254,9,9
+ CONTROL "21",IDC_CHAN21,"Button",BS_AUTORADIOBUTTON,168,254,22,9
+ CONTROL "",IDC_MUTE22,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,158,266,9,9
+ CONTROL "22",IDC_CHAN22,"Button",BS_AUTORADIOBUTTON,168,266,22,9
+ CONTROL "",IDC_MUTE23,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,158,278,9,9
+ CONTROL "23",IDC_CHAN23,"Button",BS_AUTORADIOBUTTON,168,278,22,9
+ CONTROL "",IDC_MUTE24,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,158,290,9,9
+ CONTROL "24",IDC_CHAN24,"Button",BS_AUTORADIOBUTTON,168,290,22,9
+ LTEXT "Streams",IDC_STATIC,6,2,55,8
+ CTEXT "Mute/Select",IDC_STATIC,144,2,55,8
+ LTEXT "",IDC_ADSR,208,25,176,55,WS_BORDER
+ RTEXT "Attack:",IDC_STATIC,221,84,30,9
+ RTEXT "Decay:",IDC_STATIC,221,95,30,9
+ RTEXT "Sustain:",IDC_STATIC,221,106,30,9
+ RTEXT "Release:",IDC_STATIC,221,117,30,9
+ LTEXT "---",IDC_SADSR1,254,84,44,9
+ LTEXT "---",IDC_SADSR2,254,95,44,9
+ LTEXT "---",IDC_SADSR3,254,106,44,9
+ LTEXT "---",IDC_SADSR4,254,117,42,9
+ RTEXT "Sustain level:",IDC_STATIC,302,84,44,9
+ LTEXT "---",IDC_SADSR5,349,84,38,9
+ RTEXT "Sustain inc.:",IDC_STATIC,302,95,44,9
+ LTEXT "---",IDC_SADSR6,349,95,38,9
+ RTEXT "Channel:",IDC_STATIC,204,2,30,8
+ GROUPBOX "ADSR channel info",IDC_STATIC,201,14,190,119
+ LTEXT "1",IDC_CHANNUM,238,2,33,8
+ CONTROL 136,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_REALSIZEIMAGE,208,83,11,10
+ CONTROL 137,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_REALSIZEIMAGE,208,94,11,10
+ CONTROL 138,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_REALSIZEIMAGE,208,105,11,10
+ CONTROL 139,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_REALSIZEIMAGE,208,116,11,10
+ CONTROL 140,IDC_STATIC,"Static",SS_BITMAP | SS_REALSIZEIMAGE,4,302,150,8
+ PUSHBUTTON "M0",IDC_MUTEOFF,157,300,15,10
+ PUSHBUTTON "M1",IDC_MUTEON,174,300,15,10
+ GROUPBOX "Generic channel info",IDC_STATIC,201,134,190,114
+ RTEXT "On:",IDC_STATIC,210,146,41,9
+ RTEXT "Stop:",IDC_STATIC,210,157,41,9
+ RTEXT "Reverb:",IDC_STATIC,210,190,41,9
+ RTEXT "Start pos:",IDC_STATIC,301,146,35,9
+ RTEXT "Curr pos:",IDC_STATIC,301,157,35,9
+ RTEXT "Loop pos:",IDC_STATIC,301,168,35,9
+ RTEXT "Act freq:",IDC_STATIC,300,223,35,9
+ RTEXT "Used freq:",IDC_STATIC,300,234,35,9
+ RTEXT "Right vol:",IDC_STATIC,300,190,35,9
+ RTEXT "Left vol:",IDC_STATIC,300,201,35,9
+ RTEXT "Rvb active:",IDC_STATIC,210,201,41,9
+ RTEXT "Rvb offset:",IDC_STATIC,210,223,41,9
+ RTEXT "Rvb repeat:",IDC_STATIC,210,234,41,9
+ RTEXT "Noise:",IDC_STATIC,210,168,41,9
+ RTEXT "FMod:",IDC_STATIC,210,179,41,9
+ RTEXT "Rvb number:",IDC_STATIC,210,212,41,9
+ RTEXT "Irq addr.:",IDC_STATIC,300,262,35,9
+ RTEXT "Curr adsr vol.:",IDC_STATIC,302,106,44,9
+ LTEXT "---",IDC_SADSR7,349,106,38,9
+ LTEXT "---",IDC_CI1,254,146,39,9
+ LTEXT "---",IDC_CI2,254,157,39,9
+ LTEXT "---",IDC_CI3,254,168,39,9
+ LTEXT "---",IDC_CI4,254,179,39,9
+ LTEXT "---",IDC_CI5,254,190,39,9
+ LTEXT "---",IDC_CI6,254,201,39,9
+ LTEXT "---",IDC_CI7,254,212,39,9
+ LTEXT "---",IDC_CI8,254,223,39,9
+ LTEXT "---",IDC_CI9,254,234,39,9
+ LTEXT "---",IDC_CI10,339,146,46,9
+ GROUPBOX "Spu states",IDC_STATIC,297,249,94,61
+ LTEXT "---",IDC_CI11,339,157,46,9
+ LTEXT "---",IDC_CI12,339,168,46,9
+ LTEXT "---",IDC_CI13,339,190,23,9
+ LTEXT "---",IDC_CI14,339,201,22,9
+ LTEXT "---",IDC_CI15,339,223,46,9
+ LTEXT "---",IDC_CI16,339,234,46,9
+ LTEXT "---",IDC_STA1,339,262,46,9
+ RTEXT "Raw envelope:",IDC_STATIC,296,117,50,9
+ LTEXT "---",IDC_SADSR8,349,117,38,9
+ RTEXT "Ctrl:",IDC_STATIC,300,273,35,9
+ LTEXT "---",IDC_STA2,340,273,46,9
+ RTEXT "Stat:",IDC_STATIC,300,284,35,9
+ LTEXT "---",IDC_STA3,340,284,46,9
+ RTEXT "Spu mem:",IDC_STATIC,300,295,35,9
+ LTEXT "---",IDC_STA4,340,295,46,9
+ RTEXT "Freq:",IDC_STATIC,204,258,31,9
+ RTEXT "Stereo:",IDC_STATIC,204,268,31,9
+ RTEXT "Samples:",IDC_STATIC,204,278,31,9
+ RTEXT "Buffered:",IDC_STATIC,204,288,31,9
+ LTEXT "---",IDC_XA1,239,258,46,9
+ LTEXT "---",IDC_XA2,239,268,17,9
+ LTEXT "---",IDC_XA3,239,278,46,9
+ LTEXT "---",IDC_XA4,239,288,46,9
+ LTEXT "---",IDC_CI17,367,190,18,9
+ LTEXT "---",IDC_CI18,367,201,18,9
+ LTEXT "---",IDC_XA5,239,298,22,9
+ LTEXT "---",IDC_XA6,266,298,22,9
+ RTEXT "Volume:",IDC_STATIC,204,298,31,9
+END
+
+IDD_RECORD DIALOG 0, 0, 248, 18
+STYLE DS_SETFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "P.E.Op.S. sound recording"
+FONT 8, "MS Sans Serif"
+BEGIN
+ RTEXT "Filename:",IDC_STATIC,3,5,33,9
+ EDITTEXT IDC_WAVFILE,41,3,134,12,ES_AUTOHSCROLL
+ PUSHBUTTON "Start recording",IDC_RECORD,180,3,61,12
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO 
+BEGIN
+ IDD_ABOUT, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 232
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 168
+ END
+
+ IDD_CFGDLG, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 246
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 210
+ END
+
+ IDD_DEBUG, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 390
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 307
+ END
+
+ IDD_RECORD, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 241
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 11
+ END
+END
+#endif // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,0,9,0
+ PRODUCTVERSION 1,0,9,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904b0"
+ BEGIN
+ VALUE "Comments", "Based on P.E.Op.S. DSound PSX SPU Audio driver by Pete Bernert and the P.E.Op.S. team"
+ VALUE "FileDescription", "DFSound"
+ VALUE "FileVersion", "1, 0, 9, 0"
+ VALUE "InternalName", "DFSound"
+ VALUE "OriginalFilename", "DFSound.DLL"
+ VALUE "ProductName", "DFSound"
+ VALUE "ProductVersion", "1, 0, 9, 0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
+
+#endif // Neutral resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Polish resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_PLK)
+#ifdef _WIN32
+LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
+#pragma code_page(1250)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+ "resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+ "#include ""afxres.h""\r\n"
+ "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+ "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
+ "#define _AFX_NO_OLE_RESOURCES\r\n"
+ "#define _AFX_NO_TRACKER_RESOURCES\r\n"
+ "#define _AFX_NO_PROPERTY_RESOURCES\r\n"
+ "\r\n"
+ "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"
+ "#ifdef _WIN32\r\n"
+ "LANGUAGE 9, 1\r\n"
+ "#pragma code_page(1252)\r\n"
+ "#endif\r\n"
+ "#endif\0"
+END
+
+#endif // APSTUDIO_INVOKED
+
+#endif // Polish resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
+// German (Germany) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU)
+#ifdef _WIN32
+LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Bitmap
+//
+
+IDB_BITMAP1 BITMAP "res\\bitmap1.bmp"
+IDB_BITMAP2 BITMAP "res\\bitmap2.bmp"
+IDB_BITMAP3 BITMAP "res\\bitmap3.bmp"
+IDB_BITMAP4 BITMAP "res\\bitmap4.bmp"
+IDB_BITMAP5 BITMAP "res\\bitmap5.bmp"
+#endif // German (Germany) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+#define _AFX_NO_SPLITTER_RESOURCES
+#define _AFX_NO_OLE_RESOURCES
+#define _AFX_NO_TRACKER_RESOURCES
+#define _AFX_NO_PROPERTY_RESOURCES
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE 9, 1
+#pragma code_page(1252)
+#endif
+#endif
+/////////////////////////////////////////////////////////////////////////////
+#endif // not APSTUDIO_INVOKED
+

pcsxr-1.9.93.tar.bz2/win32/plugins/dfsound/DFSound.vcxproj Added

@@ -0,0 +1,263 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{DB25BF63-9B9E-4A40-A45E-BBBA49AD6F22}</ProjectGuid>
+ <RootNamespace>DFSound</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\Release/DFSound.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>.\;.\winsrc;..\..\..\plugins\dfsound;..\..\glue;..\..\..\libpcsxcore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>.\Release/DFSound.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
+ <ObjectFileName>.\Release/</ObjectFileName>
+ <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0407</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>dsound.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>.\Release/DFSound.dll</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>.\DFSound.def</ModuleDefinitionFile>
+ <ProgramDatabaseFile>.\Release/DFSound.pdb</ProgramDatabaseFile>
+ <SubSystem>Windows</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <ImportLibrary>.\Release/DFSound.lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\Release/DFSound.bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\Debug/DFSound.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>.\;.\winsrc;..\..\..\plugins\dfsound;..\..\glue;..\..\..\libpcsxcore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>.\Debug/DFSound.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
+ <ObjectFileName>.\Debug/</ObjectFileName>
+ <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0407</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>dsound.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(SolutionDir)$(Configuration)\DFSound.dll</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>.\DFSound.def</ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>.\Debug/DFSound.pdb</ProgramDatabaseFile>
+ <SubSystem>Windows</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <ImportLibrary>.\Debug/DFSound.lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\Debug/DFSound.bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="winsrc\cfg.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="winsrc\debug.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="winsrc\dsound.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="winsrc\psemu.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="winsrc\record.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="winsrc\winmain.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\..\plugins\dfsound\adsr.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\..\plugins\dfsound\dma.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\..\plugins\dfsound\externals.c" />
+ <ClCompile Include="..\..\..\plugins\dfsound\freeze.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\..\plugins\dfsound\registers.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\..\plugins\dfsound\reverb.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\..\plugins\dfsound\spu.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\..\plugins\dfsound\xa.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="winsrc\debug.h" />
+ <ClInclude Include="winsrc\dsound.h" />
+ <ClInclude Include="winsrc\record.h" />
+ <ClInclude Include="..\..\..\plugins\dfsound\adsr.h" />
+ <ClInclude Include="..\..\..\plugins\dfsound\dma.h" />
+ <ClInclude Include="..\..\..\plugins\dfsound\dsoundoss.h" />
+ <ClInclude Include="..\..\..\plugins\dfsound\externals.h" />
+ <ClInclude Include="..\..\..\plugins\dfsound\gauss_i.h" />
+ <ClInclude Include="..\..\..\plugins\dfsound\psemuxa.h" />
+ <ClInclude Include="..\..\..\plugins\dfsound\registers.h" />
+ <ClInclude Include="..\..\..\plugins\dfsound\regs.h" />
+ <ClInclude Include="..\..\..\plugins\dfsound\reverb.h" />
+ <ClInclude Include="..\..\..\plugins\dfsound\spu.h" />
+ <ClInclude Include="..\..\..\plugins\dfsound\stdafx.h" />
+ <ClInclude Include="..\..\..\plugins\dfsound\xa.h" />
+ <ClInclude Include="resource.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="DFSound.def" />
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="DFSound.rc">
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

pcsxr-1.9.93.tar.bz2/win32/plugins/dfsound/DFSound.vcxproj.filters Added

@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="winsrc">
+ <UniqueIdentifier>{7f60c61a-63bd-4623-97da-50b7c5934d07}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="dfsound">
+ <UniqueIdentifier>{de115a9f-f76e-4f24-a883-2ad4be594713}</UniqueIdentifier>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="winsrc\cfg.c">
+ <Filter>winsrc</Filter>
+ </ClCompile>
+ <ClCompile Include="winsrc\debug.c">
+ <Filter>winsrc</Filter>
+ </ClCompile>
+ <ClCompile Include="winsrc\dsound.c">
+ <Filter>winsrc</Filter>
+ </ClCompile>
+ <ClCompile Include="winsrc\psemu.c">
+ <Filter>winsrc</Filter>
+ </ClCompile>
+ <ClCompile Include="winsrc\record.c">
+ <Filter>winsrc</Filter>
+ </ClCompile>
+ <ClCompile Include="winsrc\winmain.c">
+ <Filter>winsrc</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\plugins\dfsound\adsr.c">
+ <Filter>dfsound</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\plugins\dfsound\dma.c">
+ <Filter>dfsound</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\plugins\dfsound\externals.c">
+ <Filter>dfsound</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\plugins\dfsound\freeze.c">
+ <Filter>dfsound</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\plugins\dfsound\registers.c">
+ <Filter>dfsound</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\plugins\dfsound\reverb.c">
+ <Filter>dfsound</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\plugins\dfsound\spu.c">
+ <Filter>dfsound</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\plugins\dfsound\xa.c">
+ <Filter>dfsound</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="winsrc\debug.h">
+ <Filter>winsrc</Filter>
+ </ClInclude>
+ <ClInclude Include="winsrc\dsound.h">
+ <Filter>winsrc</Filter>
+ </ClInclude>
+ <ClInclude Include="winsrc\record.h">
+ <Filter>winsrc</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\plugins\dfsound\adsr.h">
+ <Filter>dfsound</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\plugins\dfsound\dma.h">
+ <Filter>dfsound</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\plugins\dfsound\dsoundoss.h">
+ <Filter>dfsound</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\plugins\dfsound\externals.h">
+ <Filter>dfsound</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\plugins\dfsound\gauss_i.h">
+ <Filter>dfsound</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\plugins\dfsound\psemuxa.h">
+ <Filter>dfsound</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\plugins\dfsound\registers.h">
+ <Filter>dfsound</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\plugins\dfsound\regs.h">
+ <Filter>dfsound</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\plugins\dfsound\reverb.h">
+ <Filter>dfsound</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\plugins\dfsound\spu.h">
+ <Filter>dfsound</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\plugins\dfsound\stdafx.h">
+ <Filter>dfsound</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\plugins\dfsound\xa.h">
+ <Filter>dfsound</Filter>
+ </ClInclude>
+ <ClInclude Include="resource.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="DFSound.def" />
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="DFSound.rc" />
+ </ItemGroup>
+</Project>
\ No newline at end of file

pcsxr-1.9.93.tar.bz2/win32/plugins/dfsound/DFSound.vcxproj.user Added

pcsxr-1.9.93.tar.bz2/win32/plugins/dfsound/res Added

pcsxr-1.9.93.tar.bz2/win32/plugins/dfsound/res/bitmap1.bmp Added

pcsxr-1.9.93.tar.bz2/win32/plugins/dfsound/res/bitmap2.bmp Added

pcsxr-1.9.93.tar.bz2/win32/plugins/dfsound/res/bitmap3.bmp Added

pcsxr-1.9.93.tar.bz2/win32/plugins/dfsound/res/bitmap4.bmp Added

pcsxr-1.9.93.tar.bz2/win32/plugins/dfsound/res/bitmap5.bmp Added

pcsxr-1.9.93.tar.bz2/win32/plugins/dfsound/resource.h Added

@@ -0,0 +1,149 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by DFSound.rc
+//
+#define IDC_SETS1                       3
+#define IDC_SETS2                       4
+#define IDOK2                           5
+#define IDD_DIALOG1                     130
+#define IDD_ABOUT                       130
+#define IDD_CFGDLG                      131
+#define IDD_DEBUG                       135
+#define IDB_BITMAP1                     136
+#define IDB_BITMAP2                     137
+#define IDB_BITMAP3                     138
+#define IDB_BITMAP4                     139
+#define IDB_BITMAP5                     140
+#define IDD_RECORD                      141
+#define IDC_XAVOLUME                    1004
+#define IDC_ENABXA                      1005
+#define IDC_XAPITCH                     1006
+#define IDC_XABLOCK                     1007
+#define IDC_USETIMER                    1007
+#define IDC_CMIXRATE                    1008
+#define IDC_USEIRQ                      1008
+#define IDC_USEREVERB                   1008
+#define IDC_CMODE                       1009
+#define IDC_VOLUME                      1009
+#define IDC_CFILTER                     1010
+#define IDC_IRQWAIT                     1010
+#define IDC_CQUALITY                    1011
+#define IDC_DEBUGMODE                   1011
+#define IDC_CDSOUND                     1012
+#define IDC_INTERPOL                    1012
+#define IDC_PLAYALWAYS                  1013
+#define IDC_RECORDMODE                  1013
+#define IDC_IGNOREPITCH                 1014
+#define IDC_DISSTEREO                   1014
+#define IDC_AMPLIF                      1015
+#define IDC_IRQDECODE                   1015
+#define IDC_VENVELOPE                   1016
+#define IDC_VOL1                        1016
+#define IDC_REVERB                      1017
+#define IDC_VOL2                        1017
+#define IDC_VOL3                        1018
+#define IDC_VOL4                        1019
+#define IDC_SAREA                       1022
+#define IDC_ADSR                        1023
+#define IDC_MUTE1                       1047
+#define IDC_MUTE2                       1048
+#define IDC_MUTE3                       1049
+#define IDC_MUTE4                       1050
+#define IDC_MUTE5                       1051
+#define IDC_MUTE6                       1052
+#define IDC_MUTE7                       1053
+#define IDC_MUTE8                       1054
+#define IDC_MUTE9                       1055
+#define IDC_MUTE10                      1056
+#define IDC_MUTE11                      1057
+#define IDC_MUTE12                      1058
+#define IDC_MUTE13                      1059
+#define IDC_MUTE14                      1060
+#define IDC_MUTE15                      1061
+#define IDC_MUTE16                      1062
+#define IDC_MUTE17                      1063
+#define IDC_MUTE18                      1064
+#define IDC_MUTE19                      1065
+#define IDC_MUTE20                      1066
+#define IDC_MUTE21                      1067
+#define IDC_MUTE22                      1068
+#define IDC_MUTE23                      1069
+#define IDC_MUTE24                      1070
+#define IDC_CHAN1                       1071
+#define IDC_CHAN2                       1072
+#define IDC_CHAN3                       1073
+#define IDC_CHAN4                       1074
+#define IDC_CHAN5                       1075
+#define IDC_CHAN6                       1076
+#define IDC_CHAN7                       1077
+#define IDC_CHAN8                       1078
+#define IDC_CHAN9                       1079
+#define IDC_CHAN10                      1080
+#define IDC_CHAN11                      1081
+#define IDC_CHAN12                      1082
+#define IDC_CHAN13                      1083
+#define IDC_CHAN14                      1084
+#define IDC_CHAN15                      1085
+#define IDC_CHAN16                      1086
+#define IDC_CHAN17                      1087
+#define IDC_CHAN18                      1088
+#define IDC_CHAN19                      1089
+#define IDC_CHAN20                      1090
+#define IDC_CHAN21                      1091
+#define IDC_CHAN22                      1092
+#define IDC_CHAN23                      1093
+#define IDC_CHAN24                      1094
+#define IDC_SADSR1                      1096
+#define IDC_SADSR2                      1097
+#define IDC_SADSR3                      1098
+#define IDC_SADSR4                      1099
+#define IDC_SADSR5                      1100
+#define IDC_SADSR6                      1101
+#define IDC_CHANNUM                     1102
+#define IDC_MUTEOFF                     1103
+#define IDC_MUTEON                      1104
+#define IDC_SADSR7                      1105
+#define IDC_CI1                         1106
+#define IDC_CI2                         1107
+#define IDC_CI3                         1108
+#define IDC_CI4                         1109
+#define IDC_CI5                         1110
+#define IDC_CI6                         1111
+#define IDC_CI7                         1112
+#define IDC_CI8                         1113
+#define IDC_CI9                         1114
+#define IDC_CI10                        1115
+#define IDC_CI11                        1116
+#define IDC_CI12                        1117
+#define IDC_CI13                        1118
+#define IDC_CI14                        1119
+#define IDC_CI15                        1120
+#define IDC_CI16                        1121
+#define IDC_STA1                        1122
+#define IDC_SADSR8                      1123
+#define IDC_STA2                        1124
+#define IDC_STA3                        1125
+#define IDC_STA4                        1126
+#define IDC_XA1                         1127
+#define IDC_XA2                         1128
+#define IDC_XA3                         1129
+#define IDC_XA4                         1130
+#define IDC_CI17                        1131
+#define IDC_CI18                        1132
+#define IDC_XA                          1133
+#define IDC_WAVFILE                     1134
+#define IDC_XA5                         1135
+#define IDC_RECORD                      1135
+#define IDC_XA6                         1136
+#define IDC_FREQRESPONSE                1136
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        144
+#define _APS_NEXT_COMMAND_VALUE         32771
+#define _APS_NEXT_CONTROL_VALUE         1137
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif

pcsxr-1.9.93.tar.bz2/win32/plugins/dfsound/winsrc Added

pcsxr-1.9.93.tar.bz2/win32/plugins/dfsound/winsrc/cfg.c Added

@@ -0,0 +1,267 @@
+/***************************************************************************
+ cfg.c - description
+ -------------------
+ begin : Wed May 15 2002
+ copyright : (C) 2002 by Pete Bernert
+ email : BlackDove@addcom.de
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+#include "stdafx.h"
+
+#define _IN_CFG
+
+#include "externals.h"
+
+////////////////////////////////////////////////////////////////////////
+// WINDOWS CONFIG/ABOUT HANDLING
+////////////////////////////////////////////////////////////////////////
+
+#include "resource.h"
+
+////////////////////////////////////////////////////////////////////////
+// simple about dlg handler
+////////////////////////////////////////////////////////////////////////
+
+BOOL CALLBACK AboutDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+ switch(uMsg)
+ {
+ case WM_COMMAND:
+ {
+ switch(LOWORD(wParam))
+ {case IDOK: EndDialog(hW,TRUE);return TRUE;}
+ }
+ }
+ return FALSE;
+}
+
+////////////////////////////////////////////////////////////////////////
+// READ CONFIG: from win registry
+////////////////////////////////////////////////////////////////////////
+
+void ReadConfig(void)
+{
+ HKEY myKey;
+ DWORD temp;
+ DWORD type;
+ DWORD size;
+
+ iVolume=1; // init vars
+ iXAPitch=1;
+ iUseTimer=2;
+ iSPUIRQWait=1;
+ iDebugMode=0;
+ iRecordMode=0;
+ iUseReverb=2;
+ iUseInterpolation=2;
+ iDisStereo=0;
+ iFreqResponse=0;
+
+ if (RegOpenKeyEx(HKEY_CURRENT_USER,"Software\\Vision Thing\\PSEmu Pro\\SPU\\DFSound",0,KEY_ALL_ACCESS,&myKey)==ERROR_SUCCESS)
+ {
+ size = 4;
+ if(RegQueryValueEx(myKey,"Volume",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iVolume=(int)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"XAPitch",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iXAPitch=(int)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"UseTimer",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iUseTimer=(int)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"SPUIRQWait",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iSPUIRQWait=(int)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"FreqResponse",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iFreqResponse=(int)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"DebugMode",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iDebugMode=(int)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"RecordMode",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iRecordMode=(int)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"UseReverb",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iUseReverb=(int)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"UseInterpolation",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iUseInterpolation=(int)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"DisStereo",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iDisStereo=(int)temp;
+
+ RegCloseKey(myKey);
+ }
+
+ if(iUseTimer>2) iUseTimer=2; // some checks
+ if(iVolume<1) iVolume=1;
+ if(iVolume>5) iVolume=5;
+}
+
+////////////////////////////////////////////////////////////////////////
+// WRITE CONFIG: in win registry
+////////////////////////////////////////////////////////////////////////
+
+void WriteConfig(void)
+{
+ HKEY myKey;
+ DWORD myDisp;
+ DWORD temp;
+
+ RegCreateKeyEx(HKEY_CURRENT_USER,"Software\\Vision Thing\\PSEmu Pro\\SPU\\DFSound",0,NULL,REG_OPTION_NON_VOLATILE,KEY_ALL_ACCESS,NULL,&myKey,&myDisp);
+ temp=iVolume;
+ RegSetValueEx(myKey,"Volume",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=iXAPitch;
+ RegSetValueEx(myKey,"XAPitch",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=iUseTimer;
+ RegSetValueEx(myKey,"UseTimer",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=iSPUIRQWait;
+ RegSetValueEx(myKey,"SPUIRQWait",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=iFreqResponse;
+ RegSetValueEx(myKey,"FreqResponse",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=iDebugMode;
+ RegSetValueEx(myKey,"DebugMode",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=iRecordMode;
+ RegSetValueEx(myKey,"RecordMode",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=iUseReverb;
+ RegSetValueEx(myKey,"UseReverb",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=iUseInterpolation;
+ RegSetValueEx(myKey,"UseInterpolation",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=iDisStereo;
+ RegSetValueEx(myKey,"DisStereo",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+
+ RegCloseKey(myKey);
+}
+
+////////////////////////////////////////////////////////////////////////
+// INIT WIN CFG DIALOG
+////////////////////////////////////////////////////////////////////////
+
+BOOL OnInitDSoundDialog(HWND hW) 
+{
+ HWND hWC;
+
+ ReadConfig();
+ 
+ if(iXAPitch) CheckDlgButton(hW,IDC_XAPITCH,TRUE);
+
+ hWC=GetDlgItem(hW,IDC_VOLUME);
+ ComboBox_AddString(hWC, "None");
+ ComboBox_AddString(hWC, "Low");
+ ComboBox_AddString(hWC, "Medium");
+ ComboBox_AddString(hWC, "Loud");
+ ComboBox_AddString(hWC, "Loudest");
+ ComboBox_SetCurSel(hWC,5-iVolume);
+
+ if(iSPUIRQWait) CheckDlgButton(hW,IDC_IRQWAIT,TRUE);
+ if(iDebugMode) CheckDlgButton(hW,IDC_DEBUGMODE,TRUE);
+ if(iRecordMode) CheckDlgButton(hW,IDC_RECORDMODE,TRUE);
+ if(iDisStereo) CheckDlgButton(hW,IDC_DISSTEREO,TRUE);
+ if(iFreqResponse) CheckDlgButton(hW,IDC_FREQRESPONSE,TRUE);
+
+ hWC=GetDlgItem(hW,IDC_USETIMER);
+ ComboBox_AddString(hWC, "Fast mode (thread, less compatible spu timing)");
+ ComboBox_AddString(hWC, "High compatibility mode (timer event, slower)");
+ ComboBox_AddString(hWC, "Use SPUasync (must be supported by the emu)");
+ ComboBox_SetCurSel(hWC,iUseTimer);
+
+ hWC=GetDlgItem(hW,IDC_USEREVERB);
+ ComboBox_AddString(hWC, "No reverb (fastest)");
+ ComboBox_AddString(hWC, "Simple reverb (fakes the most common effects)");
+ ComboBox_AddString(hWC, "PSX reverb (best quality)");
+ ComboBox_SetCurSel(hWC,iUseReverb);
+
+ hWC=GetDlgItem(hW,IDC_INTERPOL);
+ ComboBox_AddString(hWC, "None (fastest)");
+ ComboBox_AddString(hWC, "Simple interpolation");
+ ComboBox_AddString(hWC, "Gaussian interpolation (good quality)");
+ ComboBox_AddString(hWC, "Cubic interpolation (better treble)");
+ ComboBox_SetCurSel(hWC,iUseInterpolation);
+
+ return TRUE;
+}
+
+////////////////////////////////////////////////////////////////////////
+// WIN CFG DLG OK
+////////////////////////////////////////////////////////////////////////
+
+void OnDSoundOK(HWND hW) 
+{
+ HWND hWC;
+
+ if(IsDlgButtonChecked(hW,IDC_XAPITCH))
+ iXAPitch=1; else iXAPitch=0;
+
+ hWC=GetDlgItem(hW,IDC_VOLUME);
+ iVolume=5-ComboBox_GetCurSel(hWC);
+
+ hWC=GetDlgItem(hW,IDC_USETIMER);
+ iUseTimer=ComboBox_GetCurSel(hWC);
+
+ hWC=GetDlgItem(hW,IDC_USEREVERB);
+ iUseReverb=ComboBox_GetCurSel(hWC);
+
+ hWC=GetDlgItem(hW,IDC_INTERPOL);
+ iUseInterpolation=ComboBox_GetCurSel(hWC);
+
+ if(IsDlgButtonChecked(hW,IDC_IRQWAIT))
+ iSPUIRQWait=1; else iSPUIRQWait=0;
+
+ if(IsDlgButtonChecked(hW,IDC_DEBUGMODE))
+ iDebugMode=1; else iDebugMode=0;
+
+ if(IsDlgButtonChecked(hW,IDC_RECORDMODE))
+ iRecordMode=1; else iRecordMode=0;
+
+ if(IsDlgButtonChecked(hW,IDC_DISSTEREO))
+ iDisStereo=1; else iDisStereo=0;
+
+ if(IsDlgButtonChecked(hW,IDC_FREQRESPONSE))
+ iFreqResponse=1; else iFreqResponse=0;
+
+ WriteConfig(); // write registry
+
+ EndDialog(hW,TRUE);
+}
+
+////////////////////////////////////////////////////////////////////////
+// WIN CFG DLG CANCEL
+////////////////////////////////////////////////////////////////////////
+
+void OnDSoundCancel(HWND hW) 
+{
+ EndDialog(hW,FALSE);
+}
+
+////////////////////////////////////////////////////////////////////////
+// WIN CFG PROC
+////////////////////////////////////////////////////////////////////////
+
+BOOL CALLBACK DSoundDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+ switch(uMsg)
+ {
+ case WM_INITDIALOG:
+ return OnInitDSoundDialog(hW);
+
+ case WM_COMMAND:
+ {
+ switch(LOWORD(wParam))
+ {
+ case IDCANCEL: OnDSoundCancel(hW);return TRUE;
+ case IDOK: OnDSoundOK(hW); return TRUE;
+ }
+ }
+ }
+ return FALSE;
+}

pcsxr-1.9.93.tar.bz2/win32/plugins/dfsound/winsrc/debug.c Added

@@ -0,0 +1,372 @@
+/***************************************************************************
+ debug.c - description
+ -------------------
+ begin : Wed May 15 2002
+ copyright : (C) 2002 by Pete Bernert
+ email : BlackDove@addcom.de
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+//*************************************************************************//
+// History of changes:
+//
+// 2004/09/18 - Pete
+// - corrected ADSRX value display
+//
+// 2003/01/06 - Pete
+// - added Neil's ADSR timings
+//
+// 2002/05/15 - Pete
+// - generic cleanup for the Peops release
+//
+//*************************************************************************//
+
+#include "stdafx.h"
+
+#define _IN_DEBUG
+
+#include "externals.h"
+
+////////////////////////////////////////////////////////////////////////
+// WINDOWS DEBUG DIALOG HANDLING
+////////////////////////////////////////////////////////////////////////
+
+#ifdef _WINDOWS
+
+#include "resource.h"
+
+//#define SMALLDEBUG
+//#include <dbgout.h>
+
+////////////////////////////////////////////////////////////////////////
+// display debug infos
+
+const COLORREF crStreamCol[]={
+ RGB( 0, 0, 0),
+ RGB(255,255,255),
+ RGB(128, 0,128),
+ RGB( 0,128, 0),
+ RGB( 0, 0,255),
+ RGB(255, 0, 0)
+ };
+
+const COLORREF crAdsrCol[] ={
+ RGB( 0, 0, 0),
+ RGB(255, 0, 0),
+ RGB( 0,255, 0),
+ RGB(255, 0,255),
+ RGB( 0, 0,255),
+ RGB( 0, 0, 0),
+ };
+
+HBRUSH hBStream[6]; // brushes for stream lines
+HPEN hPAdsr[6]; // pens for adsr lines
+int iSelChannel=0; // user selected channel
+
+////////////////////////////////////////////////////////////////////////
+// display the sound data waves: no subclassing used, so the
+// area will not be redrawn... but faster that way, and good enuff
+// for debugging purposes 
+
+void DisplayStreamInfos(HWND hW)
+{
+ HWND hWS=GetDlgItem(hW,IDC_SAREA);
+ HDC hdc;RECT r;HBRUSH hBO;int ch,dy,i,j,id;
+
+ //----------------------------------------------------//
+ 
+ GetClientRect(hWS,&r); // get size of stream display
+ hdc=GetDC(hWS); // device context
+ r.right--; // leave the right border intact
+ ScrollDC(hdc,-1,0,&r,&r,NULL,NULL); // scroll one pixel to the left
+
+ //----------------------------------------------------//
+
+ hBO=SelectObject(hdc,hBStream[0]); // clean the right border
+ PatBlt(hdc,r.right-1,0,1,r.bottom,PATCOPY);
+
+ //----------------------------------------------------//
+
+ dy=r.bottom/MAXCHAN; // size of one channel area
+
+ for(ch=0;ch<MAXCHAN;ch++) // loop the channels
+ {
+ if(s_chan[ch].bOn) // channel is on?
+ {
+ if(s_chan[ch].iIrqDone)
+ {
+ s_chan[ch].iIrqDone=0;
+ PatBlt(hdc,r.right-1,ch*r.bottom/MAXCHAN,
+ 1,dy,BLACKNESS);
+ continue;
+ }
+
+ j=s_chan[ch].sval;if(j<0) j=-j; // -> get one channel data (-32k ... 32k)
+ j=(dy*j)/32768; if(j==0) j=1; // -> adjust to display coords
+ i=(dy/2)+(ch*r.bottom/MAXCHAN)-j/2; // -> position where to paint it
+
+
+
+ if (s_chan[ch].iMute) id=1; // -> get color id
+ else if(s_chan[ch].bNoise) id=2;
+ else if(s_chan[ch].bFMod==2) id=3;
+ else if(s_chan[ch].bFMod==1) id=4;
+ else id=5;
+
+ SelectObject(hdc,hBStream[id]); // -> select the brush
+ PatBlt(hdc,r.right-1,i,1,j,PATCOPY); // -> paint the value line
+ }
+
+ if(ch) SetPixel(hdc,r.right-1, // -> not first line?
+ ch*r.bottom/MAXCHAN,RGB(0,0,0)); // --> draw the line (one dot scrolled to the left)
+ }
+
+ //----------------------------------------------------//
+
+ SelectObject(hdc,hBO); // repair brush
+
+ ReleaseDC(hWS,hdc); // release context
+}
+
+////////////////////////////////////////////////////////////////////////
+// display adsr lines: also no subclassing for repainting used
+
+void DisplayADSRInfos(HWND hW)
+{
+ HWND hWS=GetDlgItem(hW,IDC_ADSR);
+ HDC hdc;RECT r;HBRUSH hBO;char szB[16];
+ int ch=iSelChannel,dx,dy,dm,dn,ia,id,is,ir;
+
+ //----------------------------------------------------// get display size
+
+ GetClientRect(hWS,&r);
+ hdc=GetDC(hWS);
+
+ //----------------------------------------------------// clean the area
+
+ hBO=SelectObject(hdc,hBStream[0]);
+ PatBlt(hdc,0,0,r.right,r.bottom,PATCOPY);
+ r.left++;r.right-=2;r.top++;r.bottom-=2; // shrink the display rect for better optics
+
+ //----------------------------------------------------// 
+
+ ia=min(s_chan[ch].ADSR.AttackTime,10000); // get adsr, but limit it for drawing 
+ id=min(s_chan[ch].ADSR.DecayTime,10000);
+ is=min(s_chan[ch].ADSR.SustainTime,10000);
+ ir=min(s_chan[ch].ADSR.ReleaseTime,10000);
+
+ dx=ia+id+is+ir; // get the dx in (limited) adsr units
+
+ // set the real values to the info statics
+ SetDlgItemInt(hW,IDC_SADSR1,s_chan[ch].ADSRX.AttackRate^0x7f,FALSE);
+ SetDlgItemInt(hW,IDC_SADSR2,(s_chan[ch].ADSRX.DecayRate^0x1f)/4,FALSE);
+ SetDlgItemInt(hW,IDC_SADSR3,s_chan[ch].ADSRX.SustainRate^0x7f,FALSE);
+ SetDlgItemInt(hW,IDC_SADSR4,(s_chan[ch].ADSRX.ReleaseRate^0x1f)/4,FALSE);
+ SetDlgItemInt(hW,IDC_SADSR5,s_chan[ch].ADSRX.SustainLevel>>27,FALSE);
+
+ SetDlgItemInt(hW,IDC_SADSR6,s_chan[ch].ADSRX.SustainIncrease,TRUE);
+ SetDlgItemInt(hW,IDC_SADSR7,s_chan[ch].ADSRX.lVolume,TRUE);
+ wsprintf(szB,"%08lx",s_chan[ch].ADSRX.EnvelopeVol);
+ SetDlgItemText(hW,IDC_SADSR8,szB);
+
+ if(dx) // something to draw?
+ {
+ HPEN hPO=SelectObject(hdc,hPAdsr[1]); // sel A pen
+ dn=r.left;
+ MoveToEx(hdc,dn,r.bottom,NULL); // move to bottom left corner
+
+ dn+=(ia*r.right)/dx; // calc A x line pos
+ LineTo(hdc,dn,r.top); // line to AxPos,top
+
+ SelectObject(hdc,hPAdsr[2]); // sel D pen
+ dn+=(id*r.right)/dx; // calc D x line pos
+ dy=r.top+((1024-s_chan[ch].ADSR.SustainLevel)* // calc the D y pos
+ r.bottom)/1024; // (our S level is ranged from 0 to 1024)
+ LineTo(hdc,dn,dy); // line to DxPos,SLevel
+
+ SelectObject(hdc,hPAdsr[3]); // sel S pen
+ if(s_chan[ch].ADSR.SustainTime>10000) dm=1; // we have to fake the S values... S will
+ else // inc/decrease until channel stop...
+ if(s_chan[ch].ADSR.SustainTime==0) dm=0; // we dunno here when this will happen,
+ else dm=21-(((s_chan[ch].ADSR.SustainTime/500))); // so we do some more ore less angled line,
+ dy=dy-(s_chan[ch].ADSR.SustainModeDec*dm); // roughly depending on the S Time
+ if(dy>r.bottom) dy=r.bottom; 
+ if(dy<r.top) dy=r.top;
+ dn+=(is*r.right)/dx;
+ LineTo(hdc,dn,dy); // line to SxPos, fake end volume level
+
+ SelectObject(hdc,hPAdsr[4]); // sel R pen
+ dn+=(ir*r.right)/dx; // calc R x line pos
+ LineTo(hdc,dn,r.bottom); // line to RxPos, bottom right y
+
+ SelectObject(hdc,hPO); // repair pen
+ }
+
+ SelectObject(hdc,hBO); // repair brush
+ ReleaseDC(hWS,hdc); // release context
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void DisplayChannelInfos(HWND hW)
+{
+ int ch=iSelChannel;char szB[16];
+
+ // channel infos
+ SetDlgItemInt(hW,IDC_CI1,s_chan[ch].bOn,TRUE);
+ SetDlgItemInt(hW,IDC_CI2,s_chan[ch].bStop,TRUE);
+ SetDlgItemInt(hW,IDC_CI3,s_chan[ch].bNoise,TRUE);
+ SetDlgItemInt(hW,IDC_CI4,s_chan[ch].bFMod,TRUE);
+ SetDlgItemInt(hW,IDC_CI5,s_chan[ch].bReverb,TRUE);
+ SetDlgItemInt(hW,IDC_CI6,s_chan[ch].bRVBActive,TRUE);
+ SetDlgItemInt(hW,IDC_CI7,s_chan[ch].iRVBNum,TRUE);
+ SetDlgItemInt(hW,IDC_CI8,s_chan[ch].iRVBOffset,TRUE);
+ SetDlgItemInt(hW,IDC_CI9,s_chan[ch].iRVBRepeat,TRUE);
+ SetDlgItemInt(hW,IDC_CI10,(unsigned long)s_chan[ch].pStart-(unsigned long)spuMemC,FALSE);
+ SetDlgItemInt(hW,IDC_CI11,(unsigned long)s_chan[ch].pCurr-(unsigned long)spuMemC,FALSE);
+ SetDlgItemInt(hW,IDC_CI12,(unsigned long)s_chan[ch].pLoop-(unsigned long)spuMemC,FALSE);
+ SetDlgItemInt(hW,IDC_CI13,s_chan[ch].iRightVolume,TRUE);
+ SetDlgItemInt(hW,IDC_CI14,s_chan[ch].iLeftVolume,TRUE);
+ SetDlgItemInt(hW,IDC_CI15,s_chan[ch].iActFreq,TRUE);
+ SetDlgItemInt(hW,IDC_CI16,s_chan[ch].iUsedFreq,TRUE);
+
+ wsprintf(szB,"%04x",s_chan[ch].iRightVolRaw);
+ SetDlgItemText(hW,IDC_CI17,szB);
+ wsprintf(szB,"%04x",s_chan[ch].iLeftVolRaw);
+ SetDlgItemText(hW,IDC_CI18,szB);
+
+ // generic infos
+ if(pSpuIrq==0) 
+ SetDlgItemInt(hW,IDC_STA1,-1,TRUE);
+ else SetDlgItemInt(hW,IDC_STA1,(unsigned long)pSpuIrq-(unsigned long)spuMemC,FALSE);
+ wsprintf(szB,"%04x",spuCtrl);
+ SetDlgItemText(hW,IDC_STA2,szB);
+ wsprintf(szB,"%04x",spuStat);
+ SetDlgItemText(hW,IDC_STA3,szB);
+ SetDlgItemInt(hW,IDC_STA4,spuAddr,TRUE);
+
+ // xa infos
+ if(XAPlay<=XAFeed) ch=XAFeed-XAPlay;
+ else ch=(XAFeed-XAStart)+(XAEnd-XAPlay);
+ SetDlgItemInt(hW,IDC_XA4,ch,FALSE);
+ SetDlgItemInt(hW,IDC_XA5,iLeftXAVol,TRUE);
+ SetDlgItemInt(hW,IDC_XA6,iRightXAVol,TRUE);
+ if(!xapGlobal) return;
+ SetDlgItemInt(hW,IDC_XA1,xapGlobal->freq,TRUE);
+ SetDlgItemInt(hW,IDC_XA2,xapGlobal->stereo,TRUE);
+ SetDlgItemInt(hW,IDC_XA3,xapGlobal->nsamples,TRUE);
+}
+ 
+////////////////////////////////////////////////////////////////////////
+// display everything (called in dialog timer for value refreshing)
+
+void DisplayDebugInfos(HWND hW)
+{
+ DisplayStreamInfos(hW);
+ DisplayADSRInfos(hW);
+ DisplayChannelInfos(hW);
+}
+
+////////////////////////////////////////////////////////////////////////
+// main debug dlg handler
+
+BOOL CALLBACK DebugDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+ switch(uMsg)
+ {
+ //--------------------------------------------------// init
+ case WM_INITDIALOG:
+ {
+ int i;
+ ShowCursor(TRUE); // mmm... who is hiding it? main emu? tsts
+ iSelChannel=0; // sel first channel
+ CheckRadioButton(hW,IDC_CHAN1,IDC_CHAN24,IDC_CHAN1);
+ // create brushes/pens
+ hBStream[0]=CreateSolidBrush(GetSysColor(COLOR_3DFACE));
+ hPAdsr[0]=CreatePen(PS_SOLID,0,GetSysColor(COLOR_3DFACE));
+ for(i=1;i<6;i++) 
+ {
+ hBStream[i]=CreateSolidBrush(crStreamCol[i]);
+ hPAdsr[i]=CreatePen(PS_SOLID,0,crAdsrCol[i]);
+ }
+ SetTimer(hW,999,50,NULL); // now create update timer
+ return TRUE;
+ }
+ //--------------------------------------------------// destroy
+ case WM_DESTROY:
+ {
+ int i;
+ KillTimer(hW,999); // first kill timer
+ for(i=0;i<6;i++) // then kill brushes/pens
+ {
+ DeleteObject(hBStream[i]);
+ DeleteObject(hPAdsr[i]);
+ }
+ }break;
+ //--------------------------------------------------// timer
+ case WM_TIMER:
+ {
+ if(wParam==999) DisplayDebugInfos(hW); // update all values
+ }break;
+ //--------------------------------------------------// command
+ case WM_COMMAND:
+ {
+ if(wParam==IDCANCEL) iDebugMode=2; // cancel? raise flag for destroying the dialog
+
+ if(wParam>=IDC_MUTE1 && wParam<=IDC_MUTE24) // mute clicked?
+ {
+ if(IsDlgButtonChecked(hW,wParam)) // -> mute/unmute it
+ s_chan[wParam-IDC_MUTE1].iMute=1;
+ else s_chan[wParam-IDC_MUTE1].iMute=0;
+ }
+ // all mute/unmute
+ if(wParam==IDC_MUTEOFF) SendMessage(hW,WM_MUTE,0,0); 
+ if(wParam==IDC_MUTEON) SendMessage(hW,WM_MUTE,1,0);
+
+ if(wParam>=IDC_CHAN1 && wParam<=IDC_CHAN24) // sel channel
+ {
+ if(IsDlgButtonChecked(hW,wParam)) 
+ {
+ iSelChannel=wParam-IDC_CHAN1;
+ SetDlgItemInt(hW,IDC_CHANNUM,iSelChannel+1,FALSE);
+ }
+ }
+ }break;
+ //--------------------------------------------------// mute
+ case WM_MUTE:
+ { // will be called by the mute/unmute all button and on savestate load
+ int i;
+ for(i=IDC_MUTE1;i<=IDC_MUTE24;i++)
+ {
+ CheckDlgButton(hW,i,wParam);
+ if(wParam) s_chan[i-IDC_MUTE1].iMute=1;
+ else s_chan[i-IDC_MUTE1].iMute=0;
+ }
+ }break;
+ //--------------------------------------------------// size
+ case WM_SIZE:
+ if(wParam==SIZE_MINIMIZED) SetFocus(hWMain); // if we get minimized, set the foxus to the main window
+ break;
+ //--------------------------------------------------// setcursor
+ case WM_SETCURSOR:
+ {
+ SetCursor(LoadCursor(NULL,IDC_ARROW)); // force the arrow 
+ return TRUE;
+ }
+ //--------------------------------------------------//
+ }
+ return FALSE;
+}
+
+////////////////////////////////////////////////////////////////////////
+
+#endif
\ No newline at end of file

pcsxr-1.9.93.tar.bz2/win32/plugins/dfsound/winsrc/debug.h Added

@@ -0,0 +1,29 @@
+/***************************************************************************
+                           debug.h  -  description
+                             -------------------
+    begin                : Wed May 15 2002
+    copyright            : (C) 2002 by Pete Bernert
+    email                : BlackDove@addcom.de
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+//*************************************************************************//
+// History of changes:
+//
+// 2002/05/15 - Pete
+// - generic cleanup for the Peops release
+//
+//*************************************************************************//
+
+#ifdef _WINDOWS
+BOOL CALLBACK DebugDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam);
+#endif

pcsxr-1.9.93.tar.bz2/win32/plugins/dfsound/winsrc/dsound.c Added

@@ -0,0 +1,280 @@
+/***************************************************************************
+ dsound.c - description
+ -------------------
+ begin : Wed May 15 2002
+ copyright : (C) 2002 by Pete Bernert
+ email : BlackDove@addcom.de
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+//*************************************************************************//
+// History of changes:
+//
+// 2003/01/12 - Pete
+// - added recording funcs
+//
+// 2002/05/15 - Pete
+// - generic cleanup for the Peops release
+//
+//*************************************************************************//
+
+#include "stdafx.h"
+
+#define _IN_DSOUND
+
+#include "externals.h"
+
+#ifdef _WINDOWS
+
+#include <dsound.h>
+
+#include "record.h"
+
+////////////////////////////////////////////////////////////////////////
+// dsound globals
+////////////////////////////////////////////////////////////////////////
+
+LPDIRECTSOUND lpDS;
+LPDIRECTSOUNDBUFFER lpDSBP = NULL;
+LPDIRECTSOUNDBUFFER lpDSB = NULL;
+DSBUFFERDESC dsbd;
+DSBUFFERDESC dsbdesc;
+DSCAPS dscaps;
+DSBCAPS dsbcaps;
+
+unsigned long LastWrite=0xffffffff;
+unsigned long LastPlay=0;
+
+////////////////////////////////////////////////////////////////////////
+// SETUP SOUND
+////////////////////////////////////////////////////////////////////////
+
+void SetupSound(void)
+{
+ HRESULT dsval;WAVEFORMATEX pcmwf;
+
+ dsval = DirectSoundCreate(NULL,&lpDS,NULL);
+ if(dsval!=DS_OK) 
+ {
+ MessageBox(hWMain,"DirectSoundCreate!","Error",MB_OK);
+ return;
+ }
+
+ if(DS_OK!=IDirectSound_SetCooperativeLevel(lpDS,hWMain, DSSCL_PRIORITY))
+ {
+ if(DS_OK!=IDirectSound_SetCooperativeLevel(lpDS,hWMain, DSSCL_NORMAL))
+ {
+ MessageBox(hWMain,"SetCooperativeLevel!","Error",MB_OK);
+ return;
+ }
+ }
+
+ memset(&dsbd,0,sizeof(DSBUFFERDESC));
+ dsbd.dwSize = 20; // NT4 hack! sizeof(dsbd);
+ dsbd.dwFlags = DSBCAPS_PRIMARYBUFFER; 
+ dsbd.dwBufferBytes = 0; 
+ dsbd.lpwfxFormat = NULL;
+
+ dsval=IDirectSound_CreateSoundBuffer(lpDS,&dsbd,&lpDSBP,NULL);
+ if(dsval!=DS_OK) 
+ {
+ MessageBox(hWMain, "CreateSoundBuffer (Primary)", "Error",MB_OK);
+ return;
+ }
+
+ memset(&pcmwf, 0, sizeof(WAVEFORMATEX));
+ pcmwf.wFormatTag = WAVE_FORMAT_PCM;
+
+ if(iDisStereo) {pcmwf.nChannels = 1; pcmwf.nBlockAlign = 2;}
+ else {pcmwf.nChannels = 2; pcmwf.nBlockAlign = 4;}
+
+ pcmwf.nSamplesPerSec = 44100;
+ 
+ pcmwf.nAvgBytesPerSec = pcmwf.nSamplesPerSec * pcmwf.nBlockAlign;
+ pcmwf.wBitsPerSample = 16;
+
+ dsval=IDirectSoundBuffer_SetFormat(lpDSBP,&pcmwf);
+ if(dsval!=DS_OK) 
+ {
+ MessageBox(hWMain, "SetFormat!", "Error",MB_OK);
+ return;
+ }
+
+ dscaps.dwSize = sizeof(DSCAPS);
+ dsbcaps.dwSize = sizeof(DSBCAPS);
+ IDirectSound_GetCaps(lpDS,&dscaps);
+ IDirectSoundBuffer_GetCaps(lpDSBP,&dsbcaps);
+
+ memset(&dsbdesc, 0, sizeof(DSBUFFERDESC));
+ dsbdesc.dwSize = 20; // NT4 hack! sizeof(DSBUFFERDESC);
+ dsbdesc.dwFlags = DSBCAPS_LOCSOFTWARE | DSBCAPS_STICKYFOCUS | DSBCAPS_GETCURRENTPOSITION2;
+ dsbdesc.dwBufferBytes = SOUNDSIZE;
+ dsbdesc.lpwfxFormat = (LPWAVEFORMATEX)&pcmwf;
+
+ dsval=IDirectSound_CreateSoundBuffer(lpDS,&dsbdesc,&lpDSB,NULL);
+ if(dsval!=DS_OK) 
+ {
+ MessageBox(hWMain,"CreateSoundBuffer (Secondary)", "Error",MB_OK);
+ return;
+ }
+
+ dsval=IDirectSoundBuffer_Play(lpDSBP,0,0,DSBPLAY_LOOPING);
+ if(dsval!=DS_OK) 
+ {
+ MessageBox(hWMain,"Play (Primary)","Error",MB_OK);
+ return;
+ }
+
+ dsval=IDirectSoundBuffer_Play(lpDSB,0,0,DSBPLAY_LOOPING);
+ if(dsval!=DS_OK) 
+ {
+ MessageBox(hWMain,"Play (Secondary)","Error",MB_OK);
+ return;
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+// REMOVE SOUND
+////////////////////////////////////////////////////////////////////////
+
+void RemoveSound(void)
+{ 
+ int iRes;
+
+ if(iDoRecord) RecordStop();
+
+ if(lpDSB!=NULL) 
+ {
+ IDirectSoundBuffer_Stop(lpDSB);
+ iRes=IDirectSoundBuffer_Release(lpDSB);
+ // FF says such a loop is bad... Demo says it's good... Pete doesn't care
+ while(iRes!=0) iRes=IDirectSoundBuffer_Release(lpDSB);
+ lpDSB=NULL;
+ } 
+
+ if(lpDSBP!=NULL) 
+ {
+ IDirectSoundBuffer_Stop(lpDSBP);
+ iRes=IDirectSoundBuffer_Release(lpDSBP);
+ // FF says such a loop is bad... Demo says it's good... Pete doesn't care
+ while(iRes!=0) iRes=IDirectSoundBuffer_Release(lpDSBP);
+ lpDSBP=NULL;
+ }
+
+ if(lpDS!=NULL) 
+ {
+ iRes=IDirectSound_Release(lpDS);
+ // FF says such a loop is bad... Demo says it's good... Pete doesn't care
+ while(iRes!=0) iRes=IDirectSound_Release(lpDS);
+ lpDS=NULL;
+ }
+
+}
+
+////////////////////////////////////////////////////////////////////////
+// GET BYTES BUFFERED
+////////////////////////////////////////////////////////////////////////
+
+unsigned long SoundGetBytesBuffered(void)
+{
+ unsigned long cplay,cwrite;
+
+ if(LastWrite==0xffffffff) return 0;
+
+ IDirectSoundBuffer_GetCurrentPosition(lpDSB,&cplay,&cwrite);
+
+ if(cplay>SOUNDSIZE) return SOUNDSIZE;
+
+ if(cplay<LastWrite) return LastWrite-cplay;
+ return (SOUNDSIZE-cplay)+LastWrite;
+}
+
+////////////////////////////////////////////////////////////////////////
+// FEED SOUND DATA
+////////////////////////////////////////////////////////////////////////
+
+void SoundFeedStreamData(unsigned char* pSound,long lBytes)
+{
+ LPVOID lpvPtr1, lpvPtr2;
+ unsigned long dwBytes1,dwBytes2; 
+ unsigned long *lpSS, *lpSD;
+ unsigned long dw,cplay,cwrite;
+ HRESULT hr;
+ unsigned long status;
+
+ if (lpDSB == NULL)
+	 return;
+
+ if(iDoRecord) RecordBuffer(pSound,lBytes);
+
+ IDirectSoundBuffer_GetStatus(lpDSB,&status);
+ if(status&DSBSTATUS_BUFFERLOST)
+ {
+ if(IDirectSoundBuffer_Restore(lpDSB)!=DS_OK) return;
+ IDirectSoundBuffer_Play(lpDSB,0,0,DSBPLAY_LOOPING);
+ }
+
+ IDirectSoundBuffer_GetCurrentPosition(lpDSB,&cplay,&cwrite);
+
+ if(LastWrite==0xffffffff) LastWrite=cwrite;
+
+/*
+// mmm... security... not needed, I think
+ if(LastWrite<cplay)
+ {
+ if((cplay-LastWrite)<=(unsigned long)lBytes)
+ {
+ LastWrite=0xffffffff;
+ return;
+ }
+ }
+ else
+ {
+ if(LastWrite<cwrite)
+ {
+ LastWrite=0xffffffff;
+ return;
+ }
+ }
+*/
+
+ hr=IDirectSoundBuffer_Lock(lpDSB,LastWrite,lBytes,
+ &lpvPtr1, &dwBytes1, 
+ &lpvPtr2, &dwBytes2,
+ 0);
+
+ if(hr!=DS_OK) {LastWrite=0xffffffff;return;}
+
+ lpSD=(unsigned long *)lpvPtr1;
+ dw=dwBytes1>>2;
+
+ lpSS=(unsigned long *)pSound;
+ while(dw) {*lpSD++=*lpSS++;dw--;}
+
+ if(lpvPtr2)
+ {
+ lpSD=(unsigned long *)lpvPtr2;
+ dw=dwBytes2>>2;
+ while(dw) {*lpSD++=*lpSS++;dw--;}
+ }
+
+ IDirectSoundBuffer_Unlock(lpDSB,lpvPtr1,dwBytes1,lpvPtr2,dwBytes2);
+
+ LastWrite+=lBytes;
+ if(LastWrite>=SOUNDSIZE) LastWrite-=SOUNDSIZE;
+ LastPlay=cplay;
+}
+
+#endif
+
+
+

pcsxr-1.9.93.tar.bz2/win32/plugins/dfsound/winsrc/dsound.h Added

@@ -0,0 +1,1211 @@
+/*
+ * Copyright (C) the Wine project
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef __WINE_DSOUND_H
+#define __WINE_DSOUND_H
+
+#ifndef DIRECTSOUND_VERSION
+#define DIRECTSOUND_VERSION 0x0900
+#endif
+
+#define COM_NO_WINDOWS_H
+#include <objbase.h>
+#include <float.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* defined(__cplusplus) */
+
+#ifndef WINELIB_NAME_AW
+#ifdef UNICODE
+#define WINELIB_NAME_AW(func) func##W
+#else
+#define WINELIB_NAME_AW(func) func##A
+#endif
+#endif
+
+#ifndef DECL_WINELIB_TYPE_AW
+#define DECL_WINELIB_TYPE_AW(type) typedef WINELIB_NAME_AW(type) type;
+#endif
+
+#ifndef DWORD_PTR
+#define DWORD_PTR unsigned long
+#endif
+
+#ifndef DX_SHARED_DEFINES
+
+typedef float D3DVALUE, *LPD3DVALUE;
+
+#ifndef D3DCOLOR_DEFINED
+typedef DWORD D3DCOLOR, *LPD3DCOLOR;
+#define D3DCOLOR_DEFINED
+#endif
+
+#ifndef D3DVECTOR_DEFINED
+typedef struct _D3DVECTOR {
+ float x;
+ float y;
+ float z;
+} D3DVECTOR;
+#define D3DVECTOR_DEFINED
+#endif
+
+#ifndef LPD3DVECTOR_DEFINED
+typedef D3DVECTOR *LPD3DVECTOR;
+#define LPD3DVECTOR_DEFINED
+#endif
+
+#define DX_SHARED_DEFINES
+#endif /* DX_SHARED_DEFINES */
+
+/*****************************************************************************
+ * Predeclare the interfaces
+ */
+DEFINE_GUID(CLSID_DirectSound,		0x47d4d946, 0x62e8, 0x11cf, 0x93, 0xbc, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00);
+DEFINE_GUID(CLSID_DirectSound8,		0x3901cc3f, 0x84b5, 0x4fa4, 0xba, 0x35, 0xaa, 0x81, 0x72, 0xb8, 0xa0, 0x9b);
+DEFINE_GUID(CLSID_DirectSoundCapture,	0xb0210780, 0x89cd, 0x11d0, 0xaf, 0x08, 0x00, 0xa0, 0xc9, 0x25, 0xcd, 0x16);
+DEFINE_GUID(CLSID_DirectSoundCapture8,	0xe4bcac13, 0x7f99, 0x4908, 0x9a, 0x8e, 0x74, 0xe3, 0xbf, 0x24, 0xb6, 0xe1);
+DEFINE_GUID(CLSID_DirectSoundFullDuplex,0xfea4300c, 0x7959, 0x4147, 0xb2, 0x6a, 0x23, 0x77, 0xb9, 0xe7, 0xa9, 0x1d);
+
+DEFINE_GUID(IID_IDirectSound,		0x279AFA83,0x4981,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60);
+typedef struct IDirectSound *LPDIRECTSOUND,**LPLPDIRECTSOUND;
+
+DEFINE_GUID(IID_IDirectSound8,		0xC50A7E93,0xF395,0x4834,0x9E,0xF6,0x7F,0xA9,0x9D,0xE5,0x09,0x66);
+typedef struct IDirectSound8 *LPDIRECTSOUND8,**LPLPDIRECTSOUND8;
+
+DEFINE_GUID(IID_IDirectSoundBuffer,	0x279AFA85,0x4981,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60);
+typedef struct IDirectSoundBuffer *LPDIRECTSOUNDBUFFER,**LPLPDIRECTSOUNDBUFFER;
+
+DEFINE_GUID(IID_IDirectSoundBuffer8,	0x6825A449,0x7524,0x4D82,0x92,0x0F,0x50,0xE3,0x6A,0xB3,0xAB,0x1E);
+typedef struct IDirectSoundBuffer8 *LPDIRECTSOUNDBUFFER8,**LPLPDIRECTSOUNDBUFFER8;
+
+DEFINE_GUID(IID_IDirectSoundNotify,	0xB0210783,0x89cd,0x11d0,0xAF,0x08,0x00,0xA0,0xC9,0x25,0xCD,0x16);
+typedef struct IDirectSoundNotify *LPDIRECTSOUNDNOTIFY,**LPLPDIRECTSOUNDNOTIFY;
+#define	IID_IDirectSoundNotify8		IID_IDirectSoundNotify
+
+DEFINE_GUID(IID_IDirectSound3DListener,	0x279AFA84,0x4981,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60);
+typedef struct IDirectSound3DListener *LPDIRECTSOUND3DLISTENER,**LPLPDIRECTSOUND3DLISTENER;
+
+DEFINE_GUID(IID_IDirectSound3DBuffer,	0x279AFA86,0x4981,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60);
+typedef struct IDirectSound3DBuffer *LPDIRECTSOUND3DBUFFER,**LPLPDIRECTSOUND3DBUFFER;
+
+DEFINE_GUID(IID_IDirectSoundCapture,	0xB0210781,0x89CD,0x11D0,0xAF,0x08,0x00,0xA0,0xC9,0x25,0xCD,0x16);
+typedef struct IDirectSoundCapture *LPDIRECTSOUNDCAPTURE,**LPLPDIRECTSOUNDCAPTURE;
+#define	IID_IDirectSoundCapture8	IID_IDirectSoundCapture
+typedef struct IDirectSoundCapture IDirectSoundCapture8,*LPDIRECTSOUNDCAPTURE8,**LPLPDIRECTSOUNDCAPTURE8;
+
+DEFINE_GUID(IID_IDirectSoundCaptureBuffer,0xB0210782,0x89CD,0x11D0,0xAF,0x08,0x00,0xA0,0xC9,0x25,0xCD,0x16);
+typedef struct IDirectSoundCaptureBuffer *LPDIRECTSOUNDCAPTUREBUFFER,**LPLPDIRECTSOUNDCAPTUREBUFFER;
+
+DEFINE_GUID(IID_IDirectSoundCaptureBuffer8,0x00990DF4,0x0DBB,0x4872,0x83,0x3E,0x6D,0x30,0x3E,0x80,0xAE,0xB6);
+typedef struct IDirectSoundCaptureBuffer8 *LPDIRECTSOUNDCAPTUREBUFFER8,**LPLPDIRECTSOUNDCAPTUREBUFFER8;
+
+DEFINE_GUID(IID_IDirectSoundFullDuplex,	0xEDCB4C7A,0xDAAB,0x4216,0xA4,0x2E,0x6C,0x50,0x59,0x6D,0xDC,0x1D);
+typedef struct IDirectSoundFullDuplex *LPDIRECTSOUNDFULLDUPLEX,**LPLPDIRECTSOUNDFULLDUPLEX;
+#define	IID_IDirectSoundFullDuplex8	IID_IDirectSoundFullDuplex
+
+DEFINE_GUID(DSDEVID_DefaultPlayback, 0xDEF00000,0x9C6D,0x47Ed,0xAA,0xF1,0x4D,0xDA,0x8F,0x2B,0x5C,0x03);
+DEFINE_GUID(DSDEVID_DefaultCapture, 0xDEF00001,0x9C6D,0x47Ed,0xAA,0xF1,0x4D,0xDA,0x8F,0x2B,0x5C,0x03);
+DEFINE_GUID(DSDEVID_DefaultVoicePlayback,0xDEF00002,0x9C6D,0x47Ed,0xAA,0xF1,0x4D,0xDA,0x8F,0x2B,0x5C,0x03);
+DEFINE_GUID(DSDEVID_DefaultVoiceCapture, 0xDEF00003,0x9C6D,0x47ED,0xAA,0xF1,0x4D,0xDA,0x8F,0x2B,0x5C,0x03);
+
+DEFINE_GUID(DSDEVID_WinePlayback, 0x40316A1D,0x605B,0xD611,0x87,0xC6,0x00,0x80,0xAD,0x00,0x02,0xFE);
+
+#define	_FACDS		0x878
+#define	MAKE_DSHRESULT(code)		MAKE_HRESULT(1,_FACDS,code)
+
+#define DS_OK				0
+#define DS_NO_VIRTUALIZATION MAKE_HRESULT(0, _FACDS, 10)
+#define DS_INCOMPLETE MAKE_HRESULT(0, _FACDS, 20)
+#define DSERR_ALLOCATED			MAKE_DSHRESULT(10)
+#define DSERR_CONTROLUNAVAIL		MAKE_DSHRESULT(30)
+#define DSERR_INVALIDPARAM		E_INVALIDARG
+#define DSERR_INVALIDCALL		MAKE_DSHRESULT(50)
+#define DSERR_GENERIC			E_FAIL
+#define DSERR_PRIOLEVELNEEDED		MAKE_DSHRESULT(70)
+#define DSERR_OUTOFMEMORY		E_OUTOFMEMORY
+#define DSERR_BADFORMAT			MAKE_DSHRESULT(100)
+#define DSERR_UNSUPPORTED		E_NOTIMPL
+#define DSERR_NODRIVER			MAKE_DSHRESULT(120)
+#define DSERR_ALREADYINITIALIZED	MAKE_DSHRESULT(130)
+#define DSERR_NOAGGREGATION		CLASS_E_NOAGGREGATION
+#define DSERR_BUFFERLOST		MAKE_DSHRESULT(150)
+#define DSERR_OTHERAPPHASPRIO		MAKE_DSHRESULT(160)
+#define DSERR_UNINITIALIZED		MAKE_DSHRESULT(170)
+#define DSERR_NOINTERFACE E_NOINTERFACE
+#define DSERR_ACCESSDENIED E_ACCESSDENIED
+#define DSERR_BUFFERTOOSMALL MAKE_DSHRESULT(180)
+#define DSERR_DS8_REQUIRED MAKE_DSHRESULT(190)
+#define DSERR_SENDLOOP MAKE_DSHRESULT(200)
+#define DSERR_BADSENDBUFFERGUID MAKE_DSHRESULT(210)
+#define DSERR_FXUNAVAILABLE MAKE_DSHRESULT(220)
+#define DSERR_OBJECTNOTFOUND MAKE_DSHRESULT(4449)
+
+#define DSCAPS_PRIMARYMONO 0x00000001
+#define DSCAPS_PRIMARYSTEREO 0x00000002
+#define DSCAPS_PRIMARY8BIT 0x00000004
+#define DSCAPS_PRIMARY16BIT 0x00000008
+#define DSCAPS_CONTINUOUSRATE 0x00000010
+#define DSCAPS_EMULDRIVER 0x00000020
+#define DSCAPS_CERTIFIED 0x00000040
+#define DSCAPS_SECONDARYMONO 0x00000100
+#define DSCAPS_SECONDARYSTEREO 0x00000200
+#define DSCAPS_SECONDARY8BIT 0x00000400
+#define DSCAPS_SECONDARY16BIT 0x00000800
+
+#define	DSSCL_NORMAL		1
+#define	DSSCL_PRIORITY		2
+#define	DSSCL_EXCLUSIVE		3
+#define	DSSCL_WRITEPRIMARY	4
+
+typedef struct _DSCAPS
+{
+ DWORD	dwSize;
+ DWORD	dwFlags;
+ DWORD	dwMinSecondarySampleRate;
+ DWORD	dwMaxSecondarySampleRate;
+ DWORD	dwPrimaryBuffers;
+ DWORD	dwMaxHwMixingAllBuffers;
+ DWORD	dwMaxHwMixingStaticBuffers;
+ DWORD	dwMaxHwMixingStreamingBuffers;
+ DWORD	dwFreeHwMixingAllBuffers;
+ DWORD	dwFreeHwMixingStaticBuffers;
+ DWORD	dwFreeHwMixingStreamingBuffers;
+ DWORD	dwMaxHw3DAllBuffers;
+ DWORD	dwMaxHw3DStaticBuffers;
+ DWORD	dwMaxHw3DStreamingBuffers;
+ DWORD	dwFreeHw3DAllBuffers;
+ DWORD	dwFreeHw3DStaticBuffers;
+ DWORD	dwFreeHw3DStreamingBuffers;
+ DWORD	dwTotalHwMemBytes;
+ DWORD	dwFreeHwMemBytes;
+ DWORD	dwMaxContigFreeHwMemBytes;
+ DWORD	dwUnlockTransferRateHwBuffers;
+ DWORD	dwPlayCpuOverheadSwBuffers;
+ DWORD	dwReserved1;
+ DWORD	dwReserved2;
+} DSCAPS,*LPDSCAPS;
+typedef const DSCAPS *LPCDSCAPS;
+
+#define DSBPLAY_LOOPING 0x00000001
+#define DSBPLAY_LOCHARDWARE 0x00000002
+#define DSBPLAY_LOCSOFTWARE 0x00000004
+#define DSBPLAY_TERMINATEBY_TIME 0x00000008
+#define DSBPLAY_TERMINATEBY_DISTANCE 0x000000010
+#define DSBPLAY_TERMINATEBY_PRIORITY 0x000000020
+
+#define DSBSTATUS_PLAYING 0x00000001
+#define DSBSTATUS_BUFFERLOST 0x00000002
+#define DSBSTATUS_LOOPING 0x00000004
+#define DSBSTATUS_LOCHARDWARE 0x00000008
+#define DSBSTATUS_LOCSOFTWARE 0x00000010
+#define DSBSTATUS_TERMINATED 0x00000020
+
+#define DSBLOCK_FROMWRITECURSOR 0x00000001
+#define DSBLOCK_ENTIREBUFFER 0x00000002
+
+#define DSBCAPS_PRIMARYBUFFER 0x00000001
+#define DSBCAPS_STATIC 0x00000002
+#define DSBCAPS_LOCHARDWARE 0x00000004
+#define DSBCAPS_LOCSOFTWARE 0x00000008
+#define DSBCAPS_CTRL3D 0x00000010
+#define DSBCAPS_CTRLFREQUENCY 0x00000020
+#define DSBCAPS_CTRLPAN 0x00000040
+#define DSBCAPS_CTRLVOLUME 0x00000080
+#define DSBCAPS_CTRLDEFAULT 0x000000E0 /* Pan + volume + frequency. */
+#define DSBCAPS_CTRLPOSITIONNOTIFY 0x00000100
+#define DSBCAPS_CTRLFX 0x00000200
+#define DSBCAPS_CTRLALL 0x000001F0 /* All control capabilities */
+#define DSBCAPS_STICKYFOCUS 0x00004000
+#define DSBCAPS_GLOBALFOCUS 0x00008000
+#define DSBCAPS_GETCURRENTPOSITION2 0x00010000 /* More accurate play cursor under emulation*/
+#define DSBCAPS_MUTE3DATMAXDISTANCE 0x00020000
+#define DSBCAPS_LOCDEFER 0x00040000
+
+#define DSBSIZE_MIN 4
+#define DSBSIZE_MAX 0xFFFFFFF
+#define DSBPAN_LEFT -10000
+#define DSBPAN_CENTER 0
+#define DSBPAN_RIGHT 10000
+#define DSBVOLUME_MAX 0
+#define DSBVOLUME_MIN -10000
+#define DSBFREQUENCY_MIN 100
+#define DSBFREQUENCY_MAX 200000
+#define DSBFREQUENCY_ORIGINAL 0
+
+typedef struct _DSBCAPS
+{
+ DWORD	dwSize;
+ DWORD	dwFlags;
+ DWORD	dwBufferBytes;
+ DWORD	dwUnlockTransferRate;
+ DWORD	dwPlayCpuOverhead;
+} DSBCAPS,*LPDSBCAPS;
+typedef const DSBCAPS *LPCDSBCAPS;
+
+#define DSSCL_NORMAL 1
+#define DSSCL_PRIORITY 2
+#define DSSCL_EXCLUSIVE 3
+#define DSSCL_WRITEPRIMARY 4
+
+typedef struct _DSEFFECTDESC
+{
+ DWORD	dwSize;
+ DWORD	dwFlags;
+ GUID	guidDSFXClass;
+ DWORD_PTR	dwReserved1;
+ DWORD_PTR	dwReserved2;
+} DSEFFECTDESC,*LPDSEFFECTDESC;
+typedef const DSEFFECTDESC *LPCDSEFFECTDESC;
+
+#define DSFX_LOCHARDWARE 0x00000001
+#define DSFX_LOCSOFTWARE 0x00000002
+
+enum
+{
+ DSFXR_PRESENT,
+ DSFXR_LOCHARDWARE,
+ DSFXR_LOCSOFTWARE,
+ DSFXR_UNALLOCATED,
+ DSFXR_FAILED,
+ DSFXR_UNKNOWN,
+ DSFXR_SENDLOOP
+};
+
+typedef struct _DSBUFFERDESC1
+{
+ DWORD		dwSize;
+ DWORD		dwFlags;
+ DWORD		dwBufferBytes;
+ DWORD		dwReserved;
+ LPWAVEFORMATEX	lpwfxFormat;
+} DSBUFFERDESC1,*LPDSBUFFERDESC1;
+typedef const DSBUFFERDESC1 *LPCDSBUFFERDESC1;
+
+typedef struct _DSBUFFERDESC
+{
+ DWORD		dwSize;
+ DWORD		dwFlags;
+ DWORD		dwBufferBytes;
+ DWORD		dwReserved;
+ LPWAVEFORMATEX	lpwfxFormat;
+ GUID		guid3DAlgorithm;
+} DSBUFFERDESC,*LPDSBUFFERDESC;
+typedef const DSBUFFERDESC *LPCDSBUFFERDESC;
+
+typedef struct _DSBPOSITIONNOTIFY
+{
+ DWORD	dwOffset;
+ HANDLE	hEventNotify;
+} DSBPOSITIONNOTIFY,*LPDSBPOSITIONNOTIFY;
+typedef const DSBPOSITIONNOTIFY *LPCDSBPOSITIONNOTIFY;
+
+#define DSSPEAKER_HEADPHONE 1
+#define DSSPEAKER_MONO 2
+#define DSSPEAKER_QUAD 3
+#define DSSPEAKER_STEREO 4
+#define DSSPEAKER_SURROUND 5
+#define DSSPEAKER_5POINT1 6
+#define DSSPEAKER_7POINT1 7
+
+#define DSSPEAKER_GEOMETRY_MIN 0x00000005 /* 5 degrees */
+#define DSSPEAKER_GEOMETRY_NARROW 0x0000000A /* 10 degrees */
+#define DSSPEAKER_GEOMETRY_WIDE 0x00000014 /* 20 degrees */
+#define DSSPEAKER_GEOMETRY_MAX 0x000000B4 /* 180 degrees */
+
+#define DSSPEAKER_COMBINED(c, g) ((DWORD)(((BYTE)(c)) | ((DWORD)((BYTE)(g))) << 16))
+#define DSSPEAKER_CONFIG(a) ((BYTE)(a))
+#define DSSPEAKER_GEOMETRY(a) ((BYTE)(((DWORD)(a) >> 16) & 0x00FF))
+
+#define DS_CERTIFIED 0x00000000
+#define DS_UNCERTIFIED 0x00000001
+
+typedef struct _DSCEFFECTDESC
+{
+ DWORD dwSize;
+ DWORD dwFlags;
+ GUID guidDSCFXClass;
+ GUID guidDSCFXInstance;
+ DWORD dwReserved1;
+ DWORD dwReserved2;
+} DSCEFFECTDESC, *LPDSCEFFECTDESC;
+typedef const DSCEFFECTDESC *LPCDSCEFFECTDESC;
+
+#define DSCFX_LOCHARDWARE 0x00000001
+#define DSCFX_LOCSOFTWARE 0x00000002
+
+#define DSCFXR_LOCHARDWARE 0x00000010
+#define DSCFXR_LOCSOFTWARE 0x00000020
+
+typedef struct _DSCBUFFERDESC1
+{
+ DWORD dwSize;
+ DWORD dwFlags;
+ DWORD dwBufferBytes;
+ DWORD dwReserved;
+ LPWAVEFORMATEX lpwfxFormat;
+} DSCBUFFERDESC1, *LPDSCBUFFERDESC1;
+
+typedef struct _DSCBUFFERDESC
+{
+ DWORD dwSize;
+ DWORD dwFlags;
+ DWORD dwBufferBytes;
+ DWORD dwReserved;
+ LPWAVEFORMATEX lpwfxFormat;
+ DWORD dwFXCount;
+ LPDSCEFFECTDESC lpDSCFXDesc;
+} DSCBUFFERDESC, *LPDSCBUFFERDESC;
+typedef const DSCBUFFERDESC *LPCDSCBUFFERDESC;
+
+typedef struct _DSCCAPS
+{
+ DWORD dwSize;
+ DWORD dwFlags;
+ DWORD dwFormats;
+ DWORD dwChannels;
+} DSCCAPS, *LPDSCCAPS;
+typedef const DSCCAPS *LPCDSCCAPS;
+
+typedef struct _DSCBCAPS
+{
+ DWORD dwSize;
+ DWORD dwFlags;
+ DWORD dwBufferBytes;
+ DWORD dwReserved;
+} DSCBCAPS, *LPDSCBCAPS;
+typedef const DSCBCAPS *LPCDSCBCAPS;
+
+#define DSCCAPS_EMULDRIVER DSCAPS_EMULDRIVER
+#define DSCCAPS_CERTIFIED DSCAPS_CERTIFIED
+#define DSCCAPS_MULTIPLECAPTURE 0x00000001
+
+#define DSCBCAPS_WAVEMAPPED 0x80000000
+#define DSCBCAPS_CTRLFX 0x00000200
+
+#define DSCBLOCK_ENTIREBUFFER 0x00000001
+#define DSCBSTART_LOOPING 0x00000001
+#define DSCBPN_OFFSET_STOP 0xffffffff
+
+#define DSCBSTATUS_CAPTURING 0x00000001
+#define DSCBSTATUS_LOOPING 0x00000002
+
+#ifndef __LPCGUID_DEFINED__
+#define __LPCGUID_DEFINED__
+typedef const GUID *LPCGUID;
+#endif
+
+typedef BOOL (CALLBACK *LPDSENUMCALLBACKW)(LPGUID,LPCWSTR,LPCWSTR,LPVOID);
+typedef BOOL (CALLBACK *LPDSENUMCALLBACKA)(LPGUID,LPCSTR,LPCSTR,LPVOID);
+DECL_WINELIB_TYPE_AW(LPDSENUMCALLBACK)
+
+extern HRESULT WINAPI DirectSoundCreate(LPCGUID lpGUID,LPDIRECTSOUND *ppDS,LPUNKNOWN pUnkOuter);
+extern HRESULT WINAPI DirectSoundEnumerateA(LPDSENUMCALLBACKA, LPVOID);
+extern HRESULT WINAPI DirectSoundEnumerateW(LPDSENUMCALLBACKW, LPVOID);
+#define DirectSoundEnumerate WINELIB_NAME_AW(DirectSoundEnumerate)
+extern HRESULT WINAPI DirectSoundCaptureCreate(LPCGUID lpGUID, LPDIRECTSOUNDCAPTURE *ppDSC, LPUNKNOWN pUnkOuter);
+extern HRESULT WINAPI DirectSoundCaptureEnumerateA(LPDSENUMCALLBACKA, LPVOID);
+extern HRESULT WINAPI DirectSoundCaptureEnumerateW(LPDSENUMCALLBACKW, LPVOID);
+#define DirectSoundCaptureEnumerate WINELIB_NAME_AW(DirectSoundCaptureEnumerate)
+
+extern HRESULT WINAPI DirectSoundCreate8(LPCGUID lpGUID,LPDIRECTSOUND8 *ppDS8,LPUNKNOWN pUnkOuter);
+extern HRESULT WINAPI DirectSoundCaptureCreate8(LPCGUID lpGUID, LPDIRECTSOUNDCAPTURE8 *ppDSC8, LPUNKNOWN pUnkOuter);
+extern HRESULT WINAPI DirectSoundFullDuplexCreate(LPCGUID pcGuidCaptureDevice, LPCGUID pcGuidRenderDevice,
+ LPCDSCBUFFERDESC pcDSCBufferDesc, LPCDSBUFFERDESC pcDSBufferDesc, HWND hWnd, DWORD dwLevel,
+ LPDIRECTSOUNDFULLDUPLEX *ppDSFD, LPDIRECTSOUNDCAPTUREBUFFER8 *ppDSCBuffer8, LPDIRECTSOUNDBUFFER8 *ppDSBuffer8, LPUNKNOWN pUnkOuter);
+#define DirectSoundFullDuplexCreate8 DirectSoundFullDuplexCreate
+extern HRESULT WINAPI GetDeviceID(LPCGUID lpGuidSrc, LPGUID lpGuidDest);
+
+
+/*****************************************************************************
+ * IDirectSound interface
+ */
+#define INTERFACE IDirectSound
+DECLARE_INTERFACE_(IDirectSound,IUnknown)
+{
+ /*** IUnknown methods ***/
+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** IDirectSound methods ***/
+ STDMETHOD(CreateSoundBuffer)(THIS_ LPCDSBUFFERDESC lpcDSBufferDesc, LPLPDIRECTSOUNDBUFFER lplpDirectSoundBuffer, IUnknown *pUnkOuter) PURE;
+ STDMETHOD(GetCaps)(THIS_ LPDSCAPS lpDSCaps) PURE;
+ STDMETHOD(DuplicateSoundBuffer)(THIS_ LPDIRECTSOUNDBUFFER lpDsbOriginal, LPLPDIRECTSOUNDBUFFER lplpDsbDuplicate) PURE;
+ STDMETHOD(SetCooperativeLevel)(THIS_ HWND hwnd, DWORD dwLevel) PURE;
+ STDMETHOD(Compact)(THIS) PURE;
+ STDMETHOD(GetSpeakerConfig)(THIS_ LPDWORD lpdwSpeakerConfig) PURE;
+ STDMETHOD(SetSpeakerConfig)(THIS_ DWORD dwSpeakerConfig) PURE;
+ STDMETHOD(Initialize)(THIS_ LPCGUID lpcGuid) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDirectSound_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirectSound_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirectSound_Release(p) (p)->lpVtbl->Release(p)
+/*** IDirectSound methods ***/
+#define IDirectSound_CreateSoundBuffer(p,a,b,c) (p)->lpVtbl->CreateSoundBuffer(p,a,b,c)
+#define IDirectSound_GetCaps(p,a) (p)->lpVtbl->GetCaps(p,a)
+#define IDirectSound_DuplicateSoundBuffer(p,a,b) (p)->lpVtbl->DuplicateSoundBuffer(p,a,b)
+#define IDirectSound_SetCooperativeLevel(p,a,b) (p)->lpVtbl->SetCooperativeLevel(p,a,b)
+#define IDirectSound_Compact(p) (p)->lpVtbl->Compact(p)
+#define IDirectSound_GetSpeakerConfig(p,a) (p)->lpVtbl->GetSpeakerConfig(p,a)
+#define IDirectSound_SetSpeakerConfig(p,a) (p)->lpVtbl->SetSpeakerConfig(p,a)
+#define IDirectSound_Initialize(p,a) (p)->lpVtbl->Initialize(p,a)
+#else
+/*** IUnknown methods ***/
+#define IDirectSound_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
+#define IDirectSound_AddRef(p) (p)->AddRef()
+#define IDirectSound_Release(p) (p)->Release()
+/*** IDirectSound methods ***/
+#define IDirectSound_CreateSoundBuffer(p,a,b,c) (p)->CreateSoundBuffer(a,b,c)
+#define IDirectSound_GetCaps(p,a) (p)->GetCaps(a)
+#define IDirectSound_DuplicateSoundBuffer(p,a,b) (p)->DuplicateSoundBuffer(a,b)
+#define IDirectSound_SetCooperativeLevel(p,a,b) (p)->SetCooperativeLevel(a,b)
+#define IDirectSound_Compact(p) (p)->Compact()
+#define IDirectSound_GetSpeakerConfig(p,a) (p)->GetSpeakerConfig(a)
+#define IDirectSound_SetSpeakerConfig(p,a) (p)->SetSpeakerConfig(a)
+#define IDirectSound_Initialize(p,a) (p)->Initialize(a)
+#endif
+
+
+/*****************************************************************************
+ * IDirectSound8 interface
+ */
+#define INTERFACE IDirectSound8
+DECLARE_INTERFACE_(IDirectSound8,IUnknown)
+{
+ /*** IUnknown methods ***/
+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** IDirectSound8 methods ***/
+ STDMETHOD(CreateSoundBuffer)(THIS_ LPCDSBUFFERDESC lpcDSBufferDesc, LPLPDIRECTSOUNDBUFFER lplpDirectSoundBuffer, IUnknown *pUnkOuter) PURE;
+ STDMETHOD(GetCaps)(THIS_ LPDSCAPS lpDSCaps) PURE;
+ STDMETHOD(DuplicateSoundBuffer)(THIS_ LPDIRECTSOUNDBUFFER lpDsbOriginal, LPLPDIRECTSOUNDBUFFER lplpDsbDuplicate) PURE;
+ STDMETHOD(SetCooperativeLevel)(THIS_ HWND hwnd, DWORD dwLevel) PURE;
+ STDMETHOD(Compact)(THIS) PURE;
+ STDMETHOD(GetSpeakerConfig)(THIS_ LPDWORD lpdwSpeakerConfig) PURE;
+ STDMETHOD(SetSpeakerConfig)(THIS_ DWORD dwSpeakerConfig) PURE;
+ STDMETHOD(Initialize)(THIS_ LPCGUID lpcGuid) PURE;
+ STDMETHOD(VerifyCertification)(THIS_ LPDWORD pdwCertified) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDirectSound8_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirectSound8_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirectSound8_Release(p) (p)->lpVtbl->Release(p)
+/*** IDirectSound methods ***/
+#define IDirectSound8_CreateSoundBuffer(p,a,b,c) (p)->lpVtbl->CreateSoundBuffer(p,a,b,c)
+#define IDirectSound8_GetCaps(p,a) (p)->lpVtbl->GetCaps(p,a)
+#define IDirectSound8_DuplicateSoundBuffer(p,a,b) (p)->lpVtbl->DuplicateSoundBuffer(p,a,b)
+#define IDirectSound8_SetCooperativeLevel(p,a,b) (p)->lpVtbl->SetCooperativeLevel(p,a,b)
+#define IDirectSound8_Compact(p) (p)->lpVtbl->Compact(p)
+#define IDirectSound8_GetSpeakerConfig(p,a) (p)->lpVtbl->GetSpeakerConfig(p,a)
+#define IDirectSound8_SetSpeakerConfig(p,a) (p)->lpVtbl->SetSpeakerConfig(p,a)
+#define IDirectSound8_Initialize(p,a) (p)->lpVtbl->Initialize(p,a)
+/*** IDirectSound8 methods ***/
+#define IDirectSound8_VerifyCertification(p,a) (p)->lpVtbl->VerifyCertification(p,a)
+#else
+/*** IUnknown methods ***/
+#define IDirectSound8_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
+#define IDirectSound8_AddRef(p) (p)->AddRef()
+#define IDirectSound8_Release(p) (p)->Release()
+/*** IDirectSound methods ***/
+#define IDirectSound8_CreateSoundBuffer(p,a,b,c) (p)->CreateSoundBuffer(a,b,c)
+#define IDirectSound8_GetCaps(p,a) (p)->GetCaps(a)
+#define IDirectSound8_DuplicateSoundBuffer(p,a,b) (p)->DuplicateSoundBuffer(a,b)
+#define IDirectSound8_SetCooperativeLevel(p,a,b) (p)->SetCooperativeLevel(a,b)
+#define IDirectSound8_Compact(p) (p)->Compact()
+#define IDirectSound8_GetSpeakerConfig(p,a) (p)->GetSpeakerConfig(a)
+#define IDirectSound8_SetSpeakerConfig(p,a) (p)->SetSpeakerConfig(a)
+#define IDirectSound8_Initialize(p,a) (p)->Initialize(a)
+/*** IDirectSound8 methods ***/
+#define IDirectSound8_VerifyCertification(p,a) (p)->VerifyCertification(a)
+#endif
+
+
+/*****************************************************************************
+ * IDirectSoundBuffer interface
+ */
+#define INTERFACE IDirectSoundBuffer
+DECLARE_INTERFACE_(IDirectSoundBuffer,IUnknown)
+{
+ /*** IUnknown methods ***/
+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** IDirectSoundBuffer methods ***/
+ STDMETHOD(GetCaps)(THIS_ LPDSBCAPS lpDSBufferCaps) PURE;
+ STDMETHOD(GetCurrentPosition)(THIS_ LPDWORD lpdwCurrentPlayCursor, LPDWORD lpdwCurrentWriteCursor) PURE;
+ STDMETHOD(GetFormat)(THIS_ LPWAVEFORMATEX lpwfxFormat, DWORD dwSizeAllocated, LPDWORD lpdwSizeWritten) PURE;
+ STDMETHOD(GetVolume)(THIS_ LPLONG lplVolume) PURE;
+ STDMETHOD(GetPan)(THIS_ LPLONG lplpan) PURE;
+ STDMETHOD(GetFrequency)(THIS_ LPDWORD lpdwFrequency) PURE;
+ STDMETHOD(GetStatus)(THIS_ LPDWORD lpdwStatus) PURE;
+ STDMETHOD(Initialize)(THIS_ LPDIRECTSOUND lpDirectSound, LPCDSBUFFERDESC lpcDSBufferDesc) PURE;
+ STDMETHOD(Lock)(THIS_ DWORD dwOffset, DWORD dwBytes, LPVOID *ppvAudioPtr1, LPDWORD pdwAudioBytes1, LPVOID *ppvAudioPtr2, LPDWORD pdwAudioBytes2, DWORD dwFlags) PURE;
+ STDMETHOD(Play)(THIS_ DWORD dwReserved1, DWORD dwReserved2, DWORD dwFlags) PURE;
+ STDMETHOD(SetCurrentPosition)(THIS_ DWORD dwNewPosition) PURE;
+ STDMETHOD(SetFormat)(THIS_ LPCWAVEFORMATEX lpcfxFormat) PURE;
+ STDMETHOD(SetVolume)(THIS_ LONG lVolume) PURE;
+ STDMETHOD(SetPan)(THIS_ LONG lPan) PURE;
+ STDMETHOD(SetFrequency)(THIS_ DWORD dwFrequency) PURE;
+ STDMETHOD(Stop)(THIS) PURE;
+ STDMETHOD(Unlock)(THIS_ LPVOID pvAudioPtr1, DWORD dwAudioBytes1, LPVOID pvAudioPtr2, DWORD dwAudioPtr2) PURE;
+ STDMETHOD(Restore)(THIS) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDirectSoundBuffer_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirectSoundBuffer_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirectSoundBuffer_Release(p) (p)->lpVtbl->Release(p)
+/*** IDirectSoundBuffer methods ***/
+#define IDirectSoundBuffer_GetCaps(p,a) (p)->lpVtbl->GetCaps(p,a)
+#define IDirectSoundBuffer_GetCurrentPosition(p,a,b) (p)->lpVtbl->GetCurrentPosition(p,a,b)
+#define IDirectSoundBuffer_GetFormat(p,a,b,c) (p)->lpVtbl->GetFormat(p,a,b,c)
+#define IDirectSoundBuffer_GetVolume(p,a) (p)->lpVtbl->GetVolume(p,a)
+#define IDirectSoundBuffer_GetPan(p,a) (p)->lpVtbl->GetPan(p,a)
+#define IDirectSoundBuffer_GetFrequency(p,a) (p)->lpVtbl->GetFrequency(p,a)
+#define IDirectSoundBuffer_GetStatus(p,a) (p)->lpVtbl->GetStatus(p,a)
+#define IDirectSoundBuffer_Initialize(p,a,b) (p)->lpVtbl->Initialize(p,a,b)
+#define IDirectSoundBuffer_Lock(p,a,b,c,d,e,f,g) (p)->lpVtbl->Lock(p,a,b,c,d,e,f,g)
+#define IDirectSoundBuffer_Play(p,a,b,c) (p)->lpVtbl->Play(p,a,b,c)
+#define IDirectSoundBuffer_SetCurrentPosition(p,a) (p)->lpVtbl->SetCurrentPosition(p,a)
+#define IDirectSoundBuffer_SetFormat(p,a) (p)->lpVtbl->SetFormat(p,a)
+#define IDirectSoundBuffer_SetVolume(p,a) (p)->lpVtbl->SetVolume(p,a)
+#define IDirectSoundBuffer_SetPan(p,a) (p)->lpVtbl->SetPan(p,a)
+#define IDirectSoundBuffer_SetFrequency(p,a) (p)->lpVtbl->SetFrequency(p,a)
+#define IDirectSoundBuffer_Stop(p) (p)->lpVtbl->Stop(p)
+#define IDirectSoundBuffer_Unlock(p,a,b,c,d) (p)->lpVtbl->Unlock(p,a,b,c,d)
+#define IDirectSoundBuffer_Restore(p) (p)->lpVtbl->Restore(p)
+#else
+/*** IUnknown methods ***/
+#define IDirectSoundBuffer_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
+#define IDirectSoundBuffer_AddRef(p) (p)->AddRef()
+#define IDirectSoundBuffer_Release(p) (p)->Release()
+/*** IDirectSoundBuffer methods ***/
+#define IDirectSoundBuffer_GetCaps(p,a) (p)->GetCaps(a)
+#define IDirectSoundBuffer_GetCurrentPosition(p,a,b) (p)->GetCurrentPosition(a,b)
+#define IDirectSoundBuffer_GetFormat(p,a,b,c) (p)->GetFormat(a,b,c)
+#define IDirectSoundBuffer_GetVolume(p,a) (p)->GetVolume(a)
+#define IDirectSoundBuffer_GetPan(p,a) (p)->GetPan(a)
+#define IDirectSoundBuffer_GetFrequency(p,a) (p)->GetFrequency(a)
+#define IDirectSoundBuffer_GetStatus(p,a) (p)->GetStatus(a)
+#define IDirectSoundBuffer_Initialize(p,a,b) (p)->Initialize(a,b)
+#define IDirectSoundBuffer_Lock(p,a,b,c,d,e,f,g) (p)->Lock(a,b,c,d,e,f,g)
+#define IDirectSoundBuffer_Play(p,a,b,c) (p)->Play(a,b,c)
+#define IDirectSoundBuffer_SetCurrentPosition(p,a) (p)->SetCurrentPosition(a)
+#define IDirectSoundBuffer_SetFormat(p,a) (p)->SetFormat(a)
+#define IDirectSoundBuffer_SetVolume(p,a) (p)->SetVolume(a)
+#define IDirectSoundBuffer_SetPan(p,a) (p)->SetPan(a)
+#define IDirectSoundBuffer_SetFrequency(p,a) (p)->SetFrequency(a)
+#define IDirectSoundBuffer_Stop(p) (p)->Stop()
+#define IDirectSoundBuffer_Unlock(p,a,b,c,d) (p)->Unlock(a,b,c,d)
+#define IDirectSoundBuffer_Restore(p) (p)->Restore()
+#endif
+
+
+/*****************************************************************************
+ * IDirectSoundBuffer8 interface
+ */
+#define INTERFACE IDirectSoundBuffer8
+DECLARE_INTERFACE_(IDirectSoundBuffer8,IUnknown)
+{
+ /*** IUnknown methods ***/
+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** IDirectSoundBuffer8 methods ***/
+ STDMETHOD(GetCaps)(THIS_ LPDSBCAPS lpDSBufferCaps) PURE;
+ STDMETHOD(GetCurrentPosition)(THIS_ LPDWORD lpdwCurrentPlayCursor, LPDWORD lpdwCurrentWriteCursor) PURE;
+ STDMETHOD(GetFormat)(THIS_ LPWAVEFORMATEX lpwfxFormat, DWORD dwSizeAllocated, LPDWORD lpdwSizeWritten) PURE;
+ STDMETHOD(GetVolume)(THIS_ LPLONG lplVolume) PURE;
+ STDMETHOD(GetPan)(THIS_ LPLONG lplpan) PURE;
+ STDMETHOD(GetFrequency)(THIS_ LPDWORD lpdwFrequency) PURE;
+ STDMETHOD(GetStatus)(THIS_ LPDWORD lpdwStatus) PURE;
+ STDMETHOD(Initialize)(THIS_ LPDIRECTSOUND lpDirectSound, LPCDSBUFFERDESC lpcDSBufferDesc) PURE;
+ STDMETHOD(Lock)(THIS_ DWORD dwOffset, DWORD dwBytes, LPVOID *ppvAudioPtr1, LPDWORD pdwAudioBytes1, LPVOID *ppvAudioPtr2, LPDWORD pdwAudioBytes2, DWORD dwFlags) PURE;
+ STDMETHOD(Play)(THIS_ DWORD dwReserved1, DWORD dwReserved2, DWORD dwFlags) PURE;
+ STDMETHOD(SetCurrentPosition)(THIS_ DWORD dwNewPosition) PURE;
+ STDMETHOD(SetFormat)(THIS_ LPCWAVEFORMATEX lpcfxFormat) PURE;
+ STDMETHOD(SetVolume)(THIS_ LONG lVolume) PURE;
+ STDMETHOD(SetPan)(THIS_ LONG lPan) PURE;
+ STDMETHOD(SetFrequency)(THIS_ DWORD dwFrequency) PURE;
+ STDMETHOD(Stop)(THIS) PURE;
+ STDMETHOD(Unlock)(THIS_ LPVOID pvAudioPtr1, DWORD dwAudioBytes1, LPVOID pvAudioPtr2, DWORD dwAudioPtr2) PURE;
+ STDMETHOD(Restore)(THIS) PURE;
+ STDMETHOD(SetFX)(THIS_ DWORD dwEffectsCount, LPDSEFFECTDESC pDSFXDesc, LPDWORD pdwResultCodes) PURE;
+ STDMETHOD(AcquireResources)(THIS_ DWORD dwFlags, DWORD dwEffectsCount, LPDWORD pdwResultCodes) PURE;
+ STDMETHOD(GetObjectInPath)(THIS_ REFGUID rguidObject, DWORD dwIndex, REFGUID rguidInterface, LPVOID *ppObject) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDirectSoundBuffer8_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirectSoundBuffer8_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirectSoundBuffer8_Release(p) (p)->lpVtbl->Release(p)
+/*** IDirectSoundBuffer methods ***/
+#define IDirectSoundBuffer8_GetCaps(p,a) (p)->lpVtbl->GetCaps(p,a)
+#define IDirectSoundBuffer8_GetCurrentPosition(p,a,b) (p)->lpVtbl->GetCurrentPosition(p,a,b)
+#define IDirectSoundBuffer8_GetFormat(p,a,b,c) (p)->lpVtbl->GetFormat(p,a,b,c)
+#define IDirectSoundBuffer8_GetVolume(p,a) (p)->lpVtbl->GetVolume(p,a)
+#define IDirectSoundBuffer8_GetPan(p,a) (p)->lpVtbl->GetPan(p,a)
+#define IDirectSoundBuffer8_GetFrequency(p,a) (p)->lpVtbl->GetFrequency(p,a)
+#define IDirectSoundBuffer8_GetStatus(p,a) (p)->lpVtbl->GetStatus(p,a)
+#define IDirectSoundBuffer8_Initialize(p,a,b) (p)->lpVtbl->Initialize(p,a,b)
+#define IDirectSoundBuffer8_Lock(p,a,b,c,d,e,f,g) (p)->lpVtbl->Lock(p,a,b,c,d,e,f,g)
+#define IDirectSoundBuffer8_Play(p,a,b,c) (p)->lpVtbl->Play(p,a,b,c)
+#define IDirectSoundBuffer8_SetCurrentPosition(p,a) (p)->lpVtbl->SetCurrentPosition(p,a)
+#define IDirectSoundBuffer8_SetFormat(p,a) (p)->lpVtbl->SetFormat(p,a)
+#define IDirectSoundBuffer8_SetVolume(p,a) (p)->lpVtbl->SetVolume(p,a)
+#define IDirectSoundBuffer8_SetPan(p,a) (p)->lpVtbl->SetPan(p,a)
+#define IDirectSoundBuffer8_SetFrequency(p,a) (p)->lpVtbl->SetFrequency(p,a)
+#define IDirectSoundBuffer8_Stop(p) (p)->lpVtbl->Stop(p)
+#define IDirectSoundBuffer8_Unlock(p,a,b,c,d) (p)->lpVtbl->Unlock(p,a,b,c,d)
+#define IDirectSoundBuffer8_Restore(p) (p)->lpVtbl->Restore(p)
+/*** IDirectSoundBuffer8 methods ***/
+#define IDirectSoundBuffer8_SetFX(p,a,b,c) (p)->lpVtbl->SetFX(p,a,b,c)
+#define IDirectSoundBuffer8_AcquireResources(p,a,b,c) (p)->lpVtbl->AcquireResources(p,a,b,c)
+#define IDirectSoundBuffer8_GetObjectInPath(p,a,b,c,d) (p)->lpVtbl->GetObjectInPath(p,a,b,c,d)
+#else
+/*** IUnknown methods ***/
+#define IDirectSoundBuffer8_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
+#define IDirectSoundBuffer8_AddRef(p) (p)->AddRef()
+#define IDirectSoundBuffer8_Release(p) (p)->Release()
+/*** IDirectSoundBuffer methods ***/
+#define IDirectSoundBuffer8_GetCaps(p,a) (p)->GetCaps(a)
+#define IDirectSoundBuffer8_GetCurrentPosition(p,a,b) (p)->GetCurrentPosition(a,b)
+#define IDirectSoundBuffer8_GetFormat(p,a,b,c) (p)->GetFormat(a,b,c)
+#define IDirectSoundBuffer8_GetVolume(p,a) (p)->GetVolume(a)
+#define IDirectSoundBuffer8_GetPan(p,a) (p)->GetPan(a)
+#define IDirectSoundBuffer8_GetFrequency(p,a) (p)->GetFrequency(a)
+#define IDirectSoundBuffer8_GetStatus(p,a) (p)->GetStatus(a)
+#define IDirectSoundBuffer8_Initialize(p,a,b) (p)->Initialize(a,b)
+#define IDirectSoundBuffer8_Lock(p,a,b,c,d,e,f,g) (p)->Lock(a,b,c,d,e,f,g)
+#define IDirectSoundBuffer8_Play(p,a,b,c) (p)->Play(a,b,c)
+#define IDirectSoundBuffer8_SetCurrentPosition(p,a) (p)->SetCurrentPosition(a)
+#define IDirectSoundBuffer8_SetFormat(p,a) (p)->SetFormat(a)
+#define IDirectSoundBuffer8_SetVolume(p,a) (p)->SetVolume(a)
+#define IDirectSoundBuffer8_SetPan(p,a) (p)->SetPan(a)
+#define IDirectSoundBuffer8_SetFrequency(p,a) (p)->SetFrequency(a)
+#define IDirectSoundBuffer8_Stop(p) (p)->Stop()
+#define IDirectSoundBuffer8_Unlock(p,a,b,c,d) (p)->Unlock(a,b,c,d)
+#define IDirectSoundBuffer8_Restore(p) (p)->Restore()
+/*** IDirectSoundBuffer8 methods ***/
+#define IDirectSoundBuffer8_SetFX(p,a,b,c) (p)->SetFX(a,b,c)
+#define IDirectSoundBuffer8_AcquireResources(p,a,b,c) (p)->AcquireResources(a,b,c)
+#define IDirectSoundBuffer8_GetObjectInPath(p,a,b,c,d) (p)->GetObjectInPath(a,b,c,d)
+#endif
+
+
+/*****************************************************************************
+ * IDirectSoundCapture interface
+ */
+#define INTERFACE IDirectSoundCapture
+DECLARE_INTERFACE_(IDirectSoundCapture,IUnknown)
+{
+ /*** IUnknown methods ***/
+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** IDirectSoundCapture methods ***/
+ STDMETHOD(CreateCaptureBuffer)(THIS_ LPCDSCBUFFERDESC lpcDSCBufferDesc,LPDIRECTSOUNDCAPTUREBUFFER *lplpDSCaptureBuffer, LPUNKNOWN pUnk) PURE;
+ STDMETHOD(GetCaps)(THIS_ LPDSCCAPS lpDSCCaps) PURE;
+ STDMETHOD(Initialize)(THIS_ LPCGUID lpcGUID) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDirectSoundCapture_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirectSoundCapture_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirectSoundCapture_Release(p) (p)->lpVtbl->Release(p)
+/*** IDirectSoundCapture methods ***/
+#define IDirectSoundCapture_CreateCaptureBuffer(p,a,b,c) (p)->lpVtbl->CreateCaptureBuffer(p,a,b,c)
+#define IDirectSoundCapture_GetCaps(p,a) (p)->lpVtbl->GetCaps(p,a)
+#define IDirectSoundCapture_Initialize(p,a) (p)->lpVtbl->Initialize(p,a)
+#else
+/*** IUnknown methods ***/
+#define IDirectSoundCapture_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
+#define IDirectSoundCapture_AddRef(p) (p)->AddRef()
+#define IDirectSoundCapture_Release(p) (p)->Release()
+/*** IDirectSoundCapture methods ***/
+#define IDirectSoundCapture_CreateCaptureBuffer(p,a,b,c) (p)->CreateCaptureBuffer(a,b,c)
+#define IDirectSoundCapture_GetCaps(p,a) (p)->GetCaps(a)
+#define IDirectSoundCapture_Initialize(p,a) (p)->Initialize(a)
+#endif
+
+/*****************************************************************************
+ * IDirectSoundCaptureBuffer interface
+ */
+#define INTERFACE IDirectSoundCaptureBuffer
+DECLARE_INTERFACE_(IDirectSoundCaptureBuffer,IUnknown)
+{
+ /*** IUnknown methods ***/
+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** IDirectSoundCaptureBuffer methods ***/
+ STDMETHOD(GetCaps)(THIS_ LPDSCBCAPS lpDSCBCaps) PURE;
+ STDMETHOD(GetCurrentPosition)(THIS_ LPDWORD lpdwCapturePosition,LPDWORD lpdwReadPosition) PURE;
+ STDMETHOD(GetFormat)(THIS_ LPWAVEFORMATEX lpwfxFormat, DWORD dwSizeAllocated, LPDWORD lpdwSizeWritten) PURE;
+ STDMETHOD(GetStatus)(THIS_ LPDWORD lpdwStatus) PURE;
+ STDMETHOD(Initialize)(THIS_ LPDIRECTSOUNDCAPTURE lpDSC, LPCDSCBUFFERDESC lpcDSCBDesc) PURE;
+ STDMETHOD(Lock)(THIS_ DWORD dwReadCusor, DWORD dwReadBytes, LPVOID *lplpvAudioPtr1, LPDWORD lpdwAudioBytes1, LPVOID *lplpvAudioPtr2, LPDWORD lpdwAudioBytes2, DWORD dwFlags) PURE;
+ STDMETHOD(Start)(THIS_ DWORD dwFlags) PURE;
+ STDMETHOD(Stop)(THIS) PURE;
+ STDMETHOD(Unlock)(THIS_ LPVOID lpvAudioPtr1, DWORD dwAudioBytes1, LPVOID lpvAudioPtr2, DWORD dwAudioBytes2) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDirectSoundCaptureBuffer_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirectSoundCaptureBuffer_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirectSoundCaptureBuffer_Release(p) (p)->lpVtbl->Release(p)
+/*** IDirectSoundCaptureBuffer methods ***/
+#define IDirectSoundCaptureBuffer_GetCaps(p,a) (p)->lpVtbl->GetCaps(p,a)
+#define IDirectSoundCaptureBuffer_GetCurrentPosition(p,a,b) (p)->lpVtbl->GetCurrentPosition(p,a,b)
+#define IDirectSoundCaptureBuffer_GetFormat(p,a,b,c) (p)->lpVtbl->GetFormat(p,a,b,c)
+#define IDirectSoundCaptureBuffer_GetStatus(p,a) (p)->lpVtbl->GetStatus(p,a)
+#define IDirectSoundCaptureBuffer_Initialize(p,a,b) (p)->lpVtbl->Initialize(p,a,b)
+#define IDirectSoundCaptureBuffer_Lock(p,a,b,c,d,e,f,g) (p)->lpVtbl->Lock(p,a,b,c,d,e,f,g)
+#define IDirectSoundCaptureBuffer_Start(p,a) (p)->lpVtbl->Start(p,a)
+#define IDirectSoundCaptureBuffer_Stop(p) (p)->lpVtbl->Stop(p)
+#define IDirectSoundCaptureBuffer_Unlock(p,a,b,c,d) (p)->lpVtbl->Unlock(p,a,b,c,d)
+#else
+/*** IUnknown methods ***/
+#define IDirectSoundCaptureBuffer_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
+#define IDirectSoundCaptureBuffer_AddRef(p) (p)->AddRef()
+#define IDirectSoundCaptureBuffer_Release(p) (p)->Release()
+/*** IDirectSoundCaptureBuffer methods ***/
+#define IDirectSoundCaptureBuffer_GetCaps(p,a) (p)->GetCaps(a)
+#define IDirectSoundCaptureBuffer_GetCurrentPosition(p,a,b) (p)->GetCurrentPosition(a,b)
+#define IDirectSoundCaptureBuffer_GetFormat(p,a,b,c) (p)->GetFormat(a,b,c)
+#define IDirectSoundCaptureBuffer_GetStatus(p,a) (p)->GetStatus(a)
+#define IDirectSoundCaptureBuffer_Initialize(p,a,b) (p)->Initialize(a,b)
+#define IDirectSoundCaptureBuffer_Lock(p,a,b,c,d,e,f,g) (p)->Lock(a,b,c,d,e,f,g)
+#define IDirectSoundCaptureBuffer_Start(p,a) (p)->Start(a)
+#define IDirectSoundCaptureBuffer_Stop(p) (p)->Stop()
+#define IDirectSoundCaptureBuffer_Unlock(p,a,b,c,d) (p)->Unlock(a,b,c,d)
+#endif
+
+/*****************************************************************************
+ * IDirectSoundCaptureBuffer8 interface
+ */
+#define INTERFACE IDirectSoundCaptureBuffer8
+DECLARE_INTERFACE_(IDirectSoundCaptureBuffer8,IDirectSoundCaptureBuffer)
+{
+ /*** IUnknown methods ***/
+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** IDirectSoundCaptureBuffer methods ***/
+ STDMETHOD(GetCaps)(THIS_ LPDSCBCAPS lpDSCBCaps) PURE;
+ STDMETHOD(GetCurrentPosition)(THIS_ LPDWORD lpdwCapturePosition,LPDWORD lpdwReadPosition) PURE;
+ STDMETHOD(GetFormat)(THIS_ LPWAVEFORMATEX lpwfxFormat, DWORD dwSizeAllocated, LPDWORD lpdwSizeWritten) PURE;
+ STDMETHOD(GetStatus)(THIS_ LPDWORD lpdwStatus) PURE;
+ STDMETHOD(Initialize)(THIS_ LPDIRECTSOUNDCAPTURE lpDSC, LPCDSCBUFFERDESC lpcDSCBDesc) PURE;
+ STDMETHOD(Lock)(THIS_ DWORD dwReadCusor, DWORD dwReadBytes, LPVOID *lplpvAudioPtr1, LPDWORD lpdwAudioBytes1, LPVOID *lplpvAudioPtr2, LPDWORD lpdwAudioBytes2, DWORD dwFlags) PURE;
+ STDMETHOD(Start)(THIS_ DWORD dwFlags) PURE;
+ STDMETHOD(Stop)(THIS) PURE;
+ STDMETHOD(Unlock)(THIS_ LPVOID lpvAudioPtr1, DWORD dwAudioBytes1, LPVOID lpvAudioPtr2, DWORD dwAudioBytes2) PURE;
+ /*** IDirectSoundCaptureBuffer8 methods ***/
+ STDMETHOD(GetObjectInPath)(THIS_ REFGUID rguidObject, DWORD dwIndex, REFGUID rguidInterface, LPVOID *ppObject) PURE;
+ STDMETHOD(GetFXStatus)(THIS_ DWORD dwFXCount, LPDWORD pdwFXStatus) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDirectSoundCaptureBuffer8_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirectSoundCaptureBuffer8_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirectSoundCaptureBuffer8_Release(p) (p)->lpVtbl->Release(p)
+/*** IDirectSoundCaptureBuffer methods ***/
+#define IDirectSoundCaptureBuffer8_GetCaps(p,a) (p)->lpVtbl->GetCaps(p,a)
+#define IDirectSoundCaptureBuffer8_GetCurrentPosition(p,a,b) (p)->lpVtbl->GetCurrentPosition(p,a,b)
+#define IDirectSoundCaptureBuffer8_GetFormat(p,a,b,c) (p)->lpVtbl->GetFormat(p,a,b,c)
+#define IDirectSoundCaptureBuffer8_GetStatus(p,a) (p)->lpVtbl->GetStatus(p,a)
+#define IDirectSoundCaptureBuffer8_Initialize(p,a,b) (p)->lpVtbl->Initialize(p,a,b)
+#define IDirectSoundCaptureBuffer8_Lock(p,a,b,c,d,e,f,g) (p)->lpVtbl->Lock(p,a,b,c,d,e,f,g)
+#define IDirectSoundCaptureBuffer8_Start(p,a) (p)->lpVtbl->Start(p,a)
+#define IDirectSoundCaptureBuffer8_Stop(p) (p)->lpVtbl->Stop(p)
+#define IDirectSoundCaptureBuffer8_Unlock(p,a,b,c,d) (p)->lpVtbl->Unlock(p,a,b,c,d)
+/*** IDirectSoundCaptureBuffer8 methods ***/
+#define IDirectSoundCaptureBuffer8_GetObjectInPath(p,a,b,c,d) (p)->lpVtbl->GetObjectInPath(p,a,b,c,d)
+#define IDirectSoundCaptureBuffer8_GetFXStatus(p,a,b) (p)->lpVtbl->GetFXStatus(p,a,b)
+#else
+/*** IUnknown methods ***/
+#define IDirectSoundCaptureBuffer8_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
+#define IDirectSoundCaptureBuffer8_AddRef(p) (p)->AddRef()
+#define IDirectSoundCaptureBuffer8_Release(p) (p)->Release()
+/*** IDirectSoundCaptureBuffer methods ***/
+#define IDirectSoundCaptureBuffer8_GetCaps(p,a) (p)->GetCaps(a)
+#define IDirectSoundCaptureBuffer8_GetCurrentPosition(p,a,b) (p)->GetCurrentPosition(a,b)
+#define IDirectSoundCaptureBuffer8_GetFormat(p,a,b,c) (p)->GetFormat(a,b,c)
+#define IDirectSoundCaptureBuffer8_GetStatus(p,a) (p)->GetStatus(a)
+#define IDirectSoundCaptureBuffer8_Initialize(p,a,b) (p)->Initialize(a,b)
+#define IDirectSoundCaptureBuffer8_Lock(p,a,b,c,d,e,f,g) (p)->Lock(a,b,c,d,e,f,g)
+#define IDirectSoundCaptureBuffer8_Start(p,a) (p)->Start(a)
+#define IDirectSoundCaptureBuffer8_Stop(p) (p)->Stop()
+#define IDirectSoundCaptureBuffer8_Unlock(p,a,b,c,d) (p)->Unlock(a,b,c,d)
+/*** IDirectSoundCaptureBuffer8 methods ***/
+#define IDirectSoundCaptureBuffer8_GetObjectInPath(p,a,b,c,d) (p)->GetObjectInPath(a,b,c,d)
+#define IDirectSoundCaptureBuffer8_GetFXStatus(p,a,b) (p)->GetFXStatus(a,b)
+#endif
+
+/*****************************************************************************
+ * IDirectSoundNotify interface
+ */
+#define WINE_NOBUFFER 0x80000000
+
+#define DSBPN_OFFSETSTOP		-1
+
+#define INTERFACE IDirectSoundNotify
+DECLARE_INTERFACE_(IDirectSoundNotify,IUnknown)
+{
+ /*** IUnknown methods ***/
+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** IDirectSoundNotify methods ***/
+ STDMETHOD(SetNotificationPositions)(THIS_ DWORD cPositionNotifies, LPCDSBPOSITIONNOTIFY lpcPositionNotifies) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDirectSoundNotify_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirectSoundNotify_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirectSoundNotify_Release(p) (p)->lpVtbl->Release(p)
+/*** IDirectSoundNotify methods ***/
+#define IDirectSoundNotify_SetNotificationPositions(p,a,b) (p)->lpVtbl->SetNotificationPositions(p,a,b)
+#else
+/*** IUnknown methods ***/
+#define IDirectSoundNotify_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
+#define IDirectSoundNotify_AddRef(p) (p)->AddRef()
+#define IDirectSoundNotify_Release(p) (p)->Release()
+/*** IDirectSoundNotify methods ***/
+#define IDirectSoundNotify_SetNotificationPositions(p,a,b) (p)->SetNotificationPositions(a,b)
+#endif
+
+
+/*****************************************************************************
+ * IDirectSound3DListener interface
+ */
+#define DS3DMODE_NORMAL 0x00000000
+#define DS3DMODE_HEADRELATIVE 0x00000001
+#define DS3DMODE_DISABLE 0x00000002
+
+#define DS3D_IMMEDIATE 0x00000000
+#define DS3D_DEFERRED 0x00000001
+
+#define DS3D_MINDISTANCEFACTOR FLT_MIN
+#define DS3D_MAXDISTANCEFACTOR FLT_MAX
+#define DS3D_DEFAULTDISTANCEFACTOR 1.0f
+
+#define DS3D_MINROLLOFFFACTOR 0.0f
+#define DS3D_MAXROLLOFFFACTOR 10.0f
+#define DS3D_DEFAULTROLLOFFFACTOR 1.0f
+
+#define DS3D_MINDOPPLERFACTOR 0.0f
+#define DS3D_MAXDOPPLERFACTOR 10.0f
+#define DS3D_DEFAULTDOPPLERFACTOR 1.0f
+
+#define DS3D_DEFAULTMINDISTANCE 1.0f
+#define DS3D_DEFAULTMAXDISTANCE 1000000000.0f
+
+#define DS3D_MINCONEANGLE 0
+#define DS3D_MAXCONEANGLE 360
+#define DS3D_DEFAULTCONEANGLE 360
+
+#define DS3D_DEFAULTCONEOUTSIDEVOLUME DSBVOLUME_MAX
+
+typedef struct _DS3DLISTENER {
+	DWORD				dwSize;
+	D3DVECTOR			vPosition;
+	D3DVECTOR			vVelocity;
+	D3DVECTOR			vOrientFront;
+	D3DVECTOR			vOrientTop;
+	D3DVALUE			flDistanceFactor;
+	D3DVALUE			flRolloffFactor;
+	D3DVALUE			flDopplerFactor;
+} DS3DLISTENER, *LPDS3DLISTENER;
+
+typedef const DS3DLISTENER *LPCDS3DLISTENER;
+
+#define INTERFACE IDirectSound3DListener
+DECLARE_INTERFACE_(IDirectSound3DListener,IUnknown)
+{
+ /*** IUnknown methods ***/
+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** IDirectSound3DListener methods ***/
+ STDMETHOD(GetAllParameters)(THIS_ LPDS3DLISTENER lpListener) PURE;
+ STDMETHOD(GetDistanceFactor)(THIS_ LPD3DVALUE lpflDistanceFactor) PURE;
+ STDMETHOD(GetDopplerFactor)(THIS_ LPD3DVALUE lpflDopplerFactor) PURE;
+ STDMETHOD(GetOrientation)(THIS_ LPD3DVECTOR lpvOrientFront, LPD3DVECTOR lpvOrientTop) PURE;
+ STDMETHOD(GetPosition)(THIS_ LPD3DVECTOR lpvPosition) PURE;
+ STDMETHOD(GetRolloffFactor)(THIS_ LPD3DVALUE lpflRolloffFactor) PURE;
+ STDMETHOD(GetVelocity)(THIS_ LPD3DVECTOR lpvVelocity) PURE;
+ STDMETHOD(SetAllParameters)(THIS_ LPCDS3DLISTENER lpcListener, DWORD dwApply) PURE;
+ STDMETHOD(SetDistanceFactor)(THIS_ D3DVALUE flDistanceFactor, DWORD dwApply) PURE;
+ STDMETHOD(SetDopplerFactor)(THIS_ D3DVALUE flDopplerFactor, DWORD dwApply) PURE;
+ STDMETHOD(SetOrientation)(THIS_ D3DVALUE xFront, D3DVALUE yFront, D3DVALUE zFront, D3DVALUE xTop, D3DVALUE yTop, D3DVALUE zTop, DWORD dwApply) PURE;
+ STDMETHOD(SetPosition)(THIS_ D3DVALUE x, D3DVALUE y, D3DVALUE z, DWORD dwApply) PURE;
+ STDMETHOD(SetRolloffFactor)(THIS_ D3DVALUE flRolloffFactor, DWORD dwApply) PURE;
+ STDMETHOD(SetVelocity)(THIS_ D3DVALUE x, D3DVALUE y, D3DVALUE z, DWORD dwApply) PURE;
+ STDMETHOD(CommitDeferredSettings)(THIS) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDirectSound3DListener_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirectSound3DListener_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirectSound3DListener_Release(p) (p)->lpVtbl->Release(p)
+/*** IDirectSound3DListener methods ***/
+#define IDirectSound3DListener_GetAllParameters(p,a) (p)->lpVtbl->GetAllParameters(p,a)
+#define IDirectSound3DListener_GetDistanceFactor(p,a) (p)->lpVtbl->GetDistanceFactor(p,a)
+#define IDirectSound3DListener_GetDopplerFactor(p,a) (p)->lpVtbl->GetDopplerFactor(p,a)
+#define IDirectSound3DListener_GetOrientation(p,a,b) (p)->lpVtbl->GetOrientation(p,a,b)
+#define IDirectSound3DListener_GetPosition(p,a) (p)->lpVtbl->GetPosition(p,a)
+#define IDirectSound3DListener_GetRolloffFactor(p,a) (p)->lpVtbl->GetRolloffFactor(p,a)
+#define IDirectSound3DListener_GetVelocity(p,a) (p)->lpVtbl->GetVelocity(p,a)
+#define IDirectSound3DListener_SetAllParameters(p,a,b) (p)->lpVtbl->SetAllParameters(p,a,b)
+#define IDirectSound3DListener_SetDistanceFactor(p,a,b) (p)->lpVtbl->SetDistanceFactor(p,a,b)
+#define IDirectSound3DListener_SetDopplerFactor(p,a,b) (p)->lpVtbl->SetDopplerFactor(p,a,b)
+#define IDirectSound3DListener_SetOrientation(p,a,b,c,d,e,f,g) (p)->lpVtbl->SetOrientation(p,a,b,c,d,e,f,g)
+#define IDirectSound3DListener_SetPosition(p,a,b,c,d) (p)->lpVtbl->SetPosition(p,a,b,c,d)
+#define IDirectSound3DListener_SetRolloffFactor(p,a,b) (p)->lpVtbl->SetRolloffFactor(p,a,b)
+#define IDirectSound3DListener_SetVelocity(p,a,b,c,d) (p)->lpVtbl->SetVelocity(p,a,b,c,d)
+#define IDirectSound3DListener_CommitDeferredSettings(p) (p)->lpVtbl->CommitDeferredSettings(p)
+#else
+/*** IUnknown methods ***/
+#define IDirectSound3DListener_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
+#define IDirectSound3DListener_AddRef(p) (p)->AddRef()
+#define IDirectSound3DListener_Release(p) (p)->Release()
+/*** IDirectSound3DListener methods ***/
+#define IDirectSound3DListener_GetAllParameters(p,a) (p)->GetAllParameters(a)
+#define IDirectSound3DListener_GetDistanceFactor(p,a) (p)->GetDistanceFactor(a)
+#define IDirectSound3DListener_GetDopplerFactor(p,a) (p)->GetDopplerFactor(a)
+#define IDirectSound3DListener_GetOrientation(p,a,b) (p)->GetOrientation(a,b)
+#define IDirectSound3DListener_GetPosition(p,a) (p)->GetPosition(a)
+#define IDirectSound3DListener_GetRolloffFactor(p,a) (p)->GetRolloffFactor(a)
+#define IDirectSound3DListener_GetVelocity(p,a) (p)->GetVelocity(a)
+#define IDirectSound3DListener_SetAllParameters(p,a,b) (p)->SetAllParameters(a,b)
+#define IDirectSound3DListener_SetDistanceFactor(p,a,b) (p)->SetDistanceFactor(a,b)
+#define IDirectSound3DListener_SetDopplerFactor(p,a,b) (p)->SetDopplerFactor(a,b)
+#define IDirectSound3DListener_SetOrientation(p,a,b,c,d,e,f,g) (p)->SetOrientation(a,b,c,d,e,f,g)
+#define IDirectSound3DListener_SetPosition(p,a,b,c,d) (p)->SetPosition(a,b,c,d)
+#define IDirectSound3DListener_SetRolloffFactor(p,a,b) (p)->SetRolloffFactor(a,b)
+#define IDirectSound3DListener_SetVelocity(p,a,b,c,d) (p)->SetVelocity(a,b,c,d)
+#define IDirectSound3DListener_CommitDeferredSettings(p) (p)->CommitDeferredSettings()
+#endif
+
+
+/*****************************************************************************
+ * IDirectSound3DBuffer interface
+ */
+typedef struct _DS3DBUFFER {
+	DWORD				dwSize;
+	D3DVECTOR			vPosition;
+	D3DVECTOR			vVelocity;
+	DWORD				dwInsideConeAngle;
+	DWORD				dwOutsideConeAngle;
+	D3DVECTOR			vConeOrientation;
+	LONG				lConeOutsideVolume;
+	D3DVALUE			flMinDistance;
+	D3DVALUE			flMaxDistance;
+	DWORD				dwMode;
+} DS3DBUFFER, *LPDS3DBUFFER;
+
+typedef const DS3DBUFFER *LPCDS3DBUFFER;
+
+#define INTERFACE IDirectSound3DBuffer
+DECLARE_INTERFACE_(IDirectSound3DBuffer,IUnknown)
+{
+ /*** IUnknown methods ***/
+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** IDirectSound3DBuffer methods ***/
+ STDMETHOD(GetAllParameters)(THIS_ LPDS3DBUFFER lpDs3dBuffer) PURE;
+ STDMETHOD(GetConeAngles)(THIS_ LPDWORD lpdwInsideConeAngle, LPDWORD lpdwOutsideConeAngle) PURE;
+ STDMETHOD(GetConeOrientation)(THIS_ LPD3DVECTOR lpvOrientation) PURE;
+ STDMETHOD(GetConeOutsideVolume)(THIS_ LPLONG lplConeOutsideVolume) PURE;
+ STDMETHOD(GetMaxDistance)(THIS_ LPD3DVALUE lpflMaxDistance) PURE;
+ STDMETHOD(GetMinDistance)(THIS_ LPD3DVALUE lpflMinDistance) PURE;
+ STDMETHOD(GetMode)(THIS_ LPDWORD lpwdMode) PURE;
+ STDMETHOD(GetPosition)(THIS_ LPD3DVECTOR lpvPosition) PURE;
+ STDMETHOD(GetVelocity)(THIS_ LPD3DVECTOR lpvVelocity) PURE;
+ STDMETHOD(SetAllParameters)(THIS_ LPCDS3DBUFFER lpcDs3dBuffer, DWORD dwApply) PURE;
+ STDMETHOD(SetConeAngles)(THIS_ DWORD dwInsideConeAngle, DWORD dwOutsideConeAngle, DWORD dwApply) PURE;
+ STDMETHOD(SetConeOrientation)(THIS_ D3DVALUE x, D3DVALUE y, D3DVALUE z, DWORD dwApply) PURE;
+ STDMETHOD(SetConeOutsideVolume)(THIS_ LONG lConeOutsideVolume, DWORD dwApply) PURE;
+ STDMETHOD(SetMaxDistance)(THIS_ D3DVALUE flMaxDistance, DWORD dwApply) PURE;
+ STDMETHOD(SetMinDistance)(THIS_ D3DVALUE flMinDistance, DWORD dwApply) PURE;
+ STDMETHOD(SetMode)(THIS_ DWORD dwMode, DWORD dwApply) PURE;
+ STDMETHOD(SetPosition)(THIS_ D3DVALUE x, D3DVALUE y, D3DVALUE z, DWORD dwApply) PURE;
+ STDMETHOD(SetVelocity)(THIS_ D3DVALUE x, D3DVALUE y, D3DVALUE z, DWORD dwApply) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDirectSound3DBuffer_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirectSound3DBuffer_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirectSound3DBuffer_Release(p) (p)->lpVtbl->Release(p)
+/*** IDirectSound3DBuffer methods ***/
+#define IDirectSound3DBuffer_GetAllParameters(p,a) (p)->lpVtbl->GetAllParameters(p,a)
+#define IDirectSound3DBuffer_GetConeAngles(p,a,b) (p)->lpVtbl->GetConeAngles(p,a,b)
+#define IDirectSound3DBuffer_GetConeOrientation(p,a) (p)->lpVtbl->GetConeOrientation(p,a)
+#define IDirectSound3DBuffer_GetConeOutsideVolume(p,a) (p)->lpVtbl->GetConeOutsideVolume(p,a)
+#define IDirectSound3DBuffer_GetMaxDistance(p,a) (p)->lpVtbl->GetMaxDistance(p,a)
+#define IDirectSound3DBuffer_GetMinDistance(p,a) (p)->lpVtbl->GetMinDistance(p,a)
+#define IDirectSound3DBuffer_GetMode(p,a) (p)->lpVtbl->GetMode(p,a)
+#define IDirectSound3DBuffer_GetPosition(p,a) (p)->lpVtbl->GetPosition(p,a)
+#define IDirectSound3DBuffer_GetVelocity(p,a) (p)->lpVtbl->GetVelocity(p,a)
+#define IDirectSound3DBuffer_SetAllParameters(p,a,b) (p)->lpVtbl->SetAllParameters(p,a,b)
+#define IDirectSound3DBuffer_SetConeAngles(p,a,b,c) (p)->lpVtbl->SetConeAngles(p,a,b,c)
+#define IDirectSound3DBuffer_SetConeOrientation(p,a,b,c,d) (p)->lpVtbl->SetConeOrientation(p,a,b,c,d)
+#define IDirectSound3DBuffer_SetConeOutsideVolume(p,a,b) (p)->lpVtbl->SetConeOutsideVolume(p,a,b)
+#define IDirectSound3DBuffer_SetMaxDistance(p,a,b) (p)->lpVtbl->SetMaxDistance(p,a,b)
+#define IDirectSound3DBuffer_SetMinDistance(p,a,b) (p)->lpVtbl->SetMinDistance(p,a,b)
+#define IDirectSound3DBuffer_SetMode(p,a,b) (p)->lpVtbl->SetMode(p,a,b)
+#define IDirectSound3DBuffer_SetPosition(p,a,b,c,d) (p)->lpVtbl->SetPosition(p,a,b,c,d)
+#define IDirectSound3DBuffer_SetVelocity(p,a,b,c,d) (p)->lpVtbl->SetVelocity(p,a,b,c,d)
+#else
+/*** IUnknown methods ***/
+#define IDirectSound3DBuffer_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
+#define IDirectSound3DBuffer_AddRef(p) (p)->AddRef()
+#define IDirectSound3DBuffer_Release(p) (p)->Release()
+/*** IDirectSound3DBuffer methods ***/
+#define IDirectSound3DBuffer_GetAllParameters(p,a) (p)->GetAllParameters(a)
+#define IDirectSound3DBuffer_GetConeAngles(p,a,b) (p)->GetConeAngles(a,b)
+#define IDirectSound3DBuffer_GetConeOrientation(p,a) (p)->GetConeOrientation(a)
+#define IDirectSound3DBuffer_GetConeOutsideVolume(p,a) (p)->GetConeOutsideVolume(a)
+#define IDirectSound3DBuffer_GetMaxDistance(p,a) (p)->GetMaxDistance(a)
+#define IDirectSound3DBuffer_GetMinDistance(p,a) (p)->GetMinDistance(a)
+#define IDirectSound3DBuffer_GetMode(p,a) (p)->GetMode(a)
+#define IDirectSound3DBuffer_GetPosition(p,a) (p)->GetPosition(a)
+#define IDirectSound3DBuffer_GetVelocity(p,a) (p)->GetVelocity(a)
+#define IDirectSound3DBuffer_SetAllParameters(p,a,b) (p)->SetAllParameters(a,b)
+#define IDirectSound3DBuffer_SetConeAngles(p,a,b,c) (p)->SetConeAngles(a,b,c)
+#define IDirectSound3DBuffer_SetConeOrientation(p,a,b,c,d) (p)->SetConeOrientation(a,b,c,d)
+#define IDirectSound3DBuffer_SetConeOutsideVolume(p,a,b) (p)->SetConeOutsideVolume(a,b)
+#define IDirectSound3DBuffer_SetMaxDistance(p,a,b) (p)->SetMaxDistance(a,b)
+#define IDirectSound3DBuffer_SetMinDistance(p,a,b) (p)->SetMinDistance(a,b)
+#define IDirectSound3DBuffer_SetMode(p,a,b) (p)->SetMode(a,b)
+#define IDirectSound3DBuffer_SetPosition(p,a,b,c,d) (p)->SetPosition(a,b,c,d)
+#define IDirectSound3DBuffer_SetVelocity(p,a,b,c,d) (p)->SetVelocity(a,b,c,d)
+#endif
+
+/*****************************************************************************
+ * IKsPropertySet interface
+ */
+#ifndef _IKsPropertySet_
+#define _IKsPropertySet_
+
+typedef struct IKsPropertySet *LPKSPROPERTYSET;
+
+DEFINE_GUID(IID_IKsPropertySet,0x31EFAC30,0x515C,0x11D0,0xA9,0xAA,0x00,0xAA,0x00,0x61,0xBE,0x93);
+
+#define KSPROPERTY_SUPPORT_GET	1
+#define KSPROPERTY_SUPPORT_SET	2
+
+#define INTERFACE IKsPropertySet
+DECLARE_INTERFACE_(IKsPropertySet,IUnknown)
+{
+ /*** IUnknown methods ***/
+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** IKsPropertySet methods ***/
+ STDMETHOD(Get)(THIS_ REFGUID rgid,ULONG x1,LPVOID p1,ULONG x2,LPVOID p2,ULONG x3,ULONG *px4) PURE;
+ STDMETHOD(Set)(THIS_ REFGUID rgid,ULONG x1,LPVOID p1,ULONG x2,LPVOID p2,ULONG x3) PURE;
+ STDMETHOD(QuerySupport)(THIS_ REFGUID rgid,ULONG x1,ULONG *px2) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IKsPropertySet_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IKsPropertySet_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IKsPropertySet_Release(p) (p)->lpVtbl->Release(p)
+/*** IKsPropertySet methods ***/
+#define IKsPropertySet_Get(p,a,b,c,d,e,f,g) (p)->lpVtbl->Get(p,a,b,c,d,e,f,g)
+#define IKsPropertySet_Set(p,a,b,c,d,e,f) (p)->lpVtbl->Set(p,a,b,c,d,e,f)
+#define IKsPropertySet_QuerySupport(p,a,b,c) (p)->lpVtbl->QuerySupport(p,a,b,c)
+#else
+/*** IUnknown methods ***/
+#define IKsPropertySet_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
+#define IKsPropertySet_AddRef(p) (p)->AddRef()
+#define IKsPropertySet_Release(p) (p)->Release()
+/*** IKsPropertySet methods ***/
+#define IKsPropertySet_Get(p,a,b,c,d,e,f,g) (p)->Get(a,b,c,d,e,f,g)
+#define IKsPropertySet_Set(p,a,b,c,d,e,f) (p)->Set(a,b,c,d,e,f)
+#define IKsPropertySet_QuerySupport(p,a,b,c) (p)->QuerySupport(a,b,c)
+#endif
+
+#endif /* _IKsPropertySet_ */
+
+/*****************************************************************************
+ * IDirectSoundFullDuplex interface
+ */
+#define INTERFACE IDirectSoundFullDuplex
+DECLARE_INTERFACE_(IDirectSoundFullDuplex,IUnknown)
+{
+ /*** IUnknown methods ***/
+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** IDirectSoundFullDuplex methods ***/
+ STDMETHOD(Initialize)(THIS_ LPCGUID pCaptureGuid,LPCGUID pRendererGuid,LPCDSCBUFFERDESC lpDscBufferDesc,LPCDSBUFFERDESC lpDsBufferDesc,HWND hWnd,DWORD dwLevel,LPLPDIRECTSOUNDCAPTUREBUFFER8 lplpDirectSoundCaptureBuffer8,LPLPDIRECTSOUNDBUFFER8 lplpDirectSoundBuffer8) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDirectSoundFullDuplex_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirectSoundFullDuplex_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirectSoundFullDuplex_Release(p) (p)->lpVtbl->Release(p)
+/*** IDirectSoundFullDuplex methods ***/
+#define IDirectSoundFullDuplex_Initialize(p,a,b,c,d,e,f,g,h) (p)->lpVtbl->Initialize(p,a,b,c,d,e,f,g,h)
+#else
+/*** IUnknown methods ***/
+#define IDirectSoundFullDuplex_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
+#define IDirectSoundFullDuplex_AddRef(p) (p)->AddRef()
+#define IDirectSoundFullDuplex_Release(p) (p)->Release()
+/*** IDirectSoundFullDuplex methods ***/
+#define IDirectSoundFullDuplex_Initialize(p,a,b,c,d,e,f,g,h) (p)->Initialize(a,b,c,d,e,f,g,h)
+#endif
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* defined(__cplusplus) */
+
+#endif /* __WINE_DSOUND_H */

pcsxr-1.9.93.tar.bz2/win32/plugins/dfsound/winsrc/psemu.c Added

@@ -0,0 +1,101 @@
+/***************************************************************************
+ psemu.c - description
+ -------------------
+ begin : Wed May 15 2002
+ copyright : (C) 2002 by Pete Bernert
+ email : BlackDove@addcom.de
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+// These ancient stuff are still necessary for epsxe, so keep these but only for
+// Windows port -Whistler
+
+#include "stdafx.h"
+
+#define _IN_PSEMU
+
+#include "externals.h"
+#include "regs.h"
+#include "dma.h"
+
+////////////////////////////////////////////////////////////////////////
+// OLD, SOMEWHAT (BUT NOT MUCH) SUPPORTED PSEMUPRO FUNCS
+////////////////////////////////////////////////////////////////////////
+
+unsigned short CALLBACK SPUgetOne(unsigned long val)
+{
+ if(spuAddr!=0xffffffff)
+ {
+ return SPUreadDMA();
+ }
+ if(val>=512*1024) val=512*1024-1;
+ return spuMem[val>>1];
+}
+
+void CALLBACK SPUputOne(unsigned long val,unsigned short data)
+{
+ if(spuAddr!=0xffffffff)
+ {
+ SPUwriteDMA(data);
+ return;
+ }
+ if(val>=512*1024) val=512*1024-1;
+ spuMem[val>>1] = data;
+}
+
+void CALLBACK SPUplaySample(unsigned char ch)
+{
+}
+
+void CALLBACK SPUsetAddr(unsigned char ch, unsigned short waddr)
+{
+ s_chan[ch].pStart=spuMemC+((unsigned long) waddr<<3);
+}
+
+void CALLBACK SPUsetPitch(unsigned char ch, unsigned short pitch)
+{
+ SetPitch(ch,pitch);
+}
+
+void CALLBACK SPUsetVolumeL(unsigned char ch, short vol)
+{
+ SetVolumeR(ch,vol);
+}
+
+void CALLBACK SPUsetVolumeR(unsigned char ch, short vol)
+{
+ SetVolumeL(ch,vol);
+} 
+
+void CALLBACK SPUstartChannels1(unsigned short channels)
+{
+ SoundOn(0,16,channels);
+}
+
+void CALLBACK SPUstartChannels2(unsigned short channels)
+{
+ SoundOn(16,24,channels);
+}
+
+void CALLBACK SPUstopChannels1(unsigned short channels)
+{
+ SoundOff(0,16,channels);
+}
+
+void CALLBACK SPUstopChannels2(unsigned short channels)
+{
+ SoundOff(16,24,channels);
+}
+
+void CALLBACK SPUplaySector(unsigned long mode, unsigned char * p)
+{
+}

pcsxr-1.9.93.tar.bz2/win32/plugins/dfsound/winsrc/record.c Added

@@ -0,0 +1,188 @@
+/***************************************************************************
+ spu.c - description
+ -------------------
+ begin : Sun Jan 12 2003
+ copyright : (C) 2003 by Pete Bernert
+ email : BlackDove@addcom.de
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+ 
+//*************************************************************************//
+// History of changes:
+//
+// 2003/03/01 - Pete
+// - added mono mode
+//
+// 2003/01/12 - Pete
+// - added recording funcs (win version only)
+//
+//*************************************************************************//
+
+#include "stdafx.h"
+
+#ifdef _WINDOWS
+
+#include <mmsystem.h>
+#include "resource.h"
+#include "externals.h"
+
+#define _IN_RECORD
+
+#include "record.h"
+
+////////////////////////////////////////////////////////////////////////
+
+int iDoRecord=0;
+HMMIO hWaveFile=NULL;
+MMCKINFO mmckMain;
+MMCKINFO mmckData;
+char szFileName[256];
+
+////////////////////////////////////////////////////////////////////////
+
+void RecordStart()
+{
+ WAVEFORMATEX pcmwf;
+
+ // setup header in the same format as our directsound stream
+ memset(&pcmwf,0,sizeof(WAVEFORMATEX));
+ pcmwf.wFormatTag = WAVE_FORMAT_PCM;
+
+ if(iDisStereo)
+ {
+ pcmwf.nChannels = 1;
+ pcmwf.nBlockAlign = 2;
+ }
+ else
+ {
+ pcmwf.nChannels = 2;
+ pcmwf.nBlockAlign = 4;
+ }
+
+ pcmwf.nSamplesPerSec = 44100;
+ pcmwf.nAvgBytesPerSec = pcmwf.nSamplesPerSec * pcmwf.nBlockAlign;
+ pcmwf.wBitsPerSample = 16;
+
+ // create file
+ hWaveFile=mmioOpen(szFileName,NULL,MMIO_CREATE|MMIO_WRITE|MMIO_EXCLUSIVE | MMIO_ALLOCBUF);
+ if(!hWaveFile) return;
+ 
+ // setup WAVE, fmt and data chunks
+ memset(&mmckMain,0,sizeof(MMCKINFO));
+ mmckMain.fccType = mmioFOURCC('W','A','V','E');
+
+ mmioCreateChunk(hWaveFile,&mmckMain,MMIO_CREATERIFF);
+
+ memset(&mmckData,0,sizeof(MMCKINFO));
+ mmckData.ckid = mmioFOURCC('f','m','t',' ');
+ mmckData.cksize = sizeof(WAVEFORMATEX);
+
+ mmioCreateChunk(hWaveFile,&mmckData,0);
+ mmioWrite(hWaveFile,(char*)&pcmwf,sizeof(WAVEFORMATEX)); 
+ mmioAscend(hWaveFile,&mmckData,0);
+
+ mmckData.ckid = mmioFOURCC('d','a','t','a');
+ mmioCreateChunk(hWaveFile,&mmckData,0);
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void RecordStop()
+{
+ // first some check, if recording is running
+ iDoRecord=0;
+ if(!hWaveFile) return;
+
+ // now finish writing & close the wave file
+ mmioAscend(hWaveFile,&mmckData,0);
+ mmioAscend(hWaveFile,&mmckMain,0);
+ mmioClose(hWaveFile,0);
+
+ // init var
+ hWaveFile=NULL;
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void RecordBuffer(unsigned char* pSound,long lBytes)
+{
+ // write the samples
+ if(hWaveFile) mmioWrite(hWaveFile,pSound,lBytes);
+}
+
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+
+BOOL CALLBACK RecordDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+ switch(uMsg)
+ {
+ //--------------------------------------------------// init
+ case WM_INITDIALOG:
+ {
+ SetDlgItemText(hW,IDC_WAVFILE,"C:\\PEOPS.WAV"); // init filename edit
+ ShowCursor(TRUE); // mmm... who is hiding it? main emu? tsts
+ return TRUE;
+ }
+ //--------------------------------------------------// destroy
+ case WM_DESTROY:
+ {
+ RecordStop();
+ }break;
+ //--------------------------------------------------// command
+ case WM_COMMAND:
+ {
+ if(wParam==IDCANCEL) iRecordMode=2; // cancel? raise flag for destroying the dialog
+
+ if(wParam==IDC_RECORD) // record start/stop?
+ {
+ if(IsWindowEnabled(GetDlgItem(hW,IDC_WAVFILE))) // not started yet (edit is not disabled):
+ {
+ GetDlgItemText(hW,IDC_WAVFILE,szFileName,255);// get filename
+
+ RecordStart(); // start recording
+
+ if(hWaveFile) // start was ok?
+ { // -> disable filename edit, change text, raise flag
+ EnableWindow(GetDlgItem(hW,IDC_WAVFILE),FALSE);
+ SetDlgItemText(hW,IDC_RECORD,"Stop recording");
+ iDoRecord=1;
+ }
+ else MessageBeep(0xFFFFFFFF); // error starting recording? BEEP
+ }
+ else // stop recording?
+ {
+ RecordStop(); // -> just do it
+ EnableWindow(GetDlgItem(hW,IDC_WAVFILE),TRUE);// -> enable filename edit again
+ SetDlgItemText(hW,IDC_RECORD,"Start recording");
+ }
+ SetFocus(hWMain);
+ }
+ }break;
+ //--------------------------------------------------// size
+ case WM_SIZE:
+ if(wParam==SIZE_MINIMIZED) SetFocus(hWMain); // if we get minimized, set the foxus to the main window
+ break;
+ //--------------------------------------------------// setcursor
+ case WM_SETCURSOR:
+ {
+ SetCursor(LoadCursor(NULL,IDC_ARROW)); // force the arrow 
+ return TRUE;
+ }
+ //--------------------------------------------------//
+ }
+ return FALSE;
+}
+
+////////////////////////////////////////////////////////////////////////
+#endif

pcsxr-1.9.93.tar.bz2/win32/plugins/dfsound/winsrc/record.h Added

pcsxr-1.9.93.tar.bz2/win32/plugins/dfsound/winsrc/winmain.c Added

@@ -0,0 +1,34 @@
+/***************************************************************************
+                         spuPeopsSound.c  -  description
+                             -------------------
+    begin                : Wed May 15 2002
+    copyright            : (C) 2002 by Pete Bernert
+    email                : BlackDove@addcom.de
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+// winmain.c : Defines the entry point for the DLL application.
+//
+
+#include "stdafx.h"
+
+HINSTANCE hInst = NULL;
+
+BOOL APIENTRY DllMain( HANDLE hModule, 
+                       DWORD  ul_reason_for_call, 
+                       LPVOID lpReserved
+					 )
+{
+ hInst=(HINSTANCE)hModule;
+ return TRUE;
+}
+

pcsxr-1.9.93.tar.bz2/win32/plugins/dfxvideo Added

pcsxr-1.9.93.tar.bz2/win32/plugins/dfxvideo/DFXVideo.def Added

@@ -0,0 +1,58 @@
+; gpuPeopsSoft.def : Declares the module parameters for the DLL.
+
+LIBRARY      "DFXVideo"
+
+EXPORTS
+    ; Explicit exports can go here
+	PSEgetLibType		@2
+	PSEgetLibName		@3
+	PSEgetLibVersion	@4
+	GPUinit				@5
+	GPUshutdown			@6
+	GPUopen				@7
+	GPUclose			@8
+	GPUconfigure		@9
+	GPUabout			@10
+	GPUtest				@11
+	GPUwriteData		@12
+	GPUwriteStatus		@13
+	GPUreadData			@14
+	GPUreadStatus		@15
+	GPUdmaChain			@16
+	GPUgetMode			@17
+	GPUsetMode			@18
+	GPUupdateLace		@19
+	GPUmakeSnapshot     @20
+    GPUwriteDataMem     @21
+    GPUreadDataMem      @22
+    GPUdisplayText      @23
+    GPUdisplayFlags     @24
+	GPUfreeze			@25
+    GPUshowScreenPic	@26
+    GPUgetScreenPic		@27
+
+    GPUcursor        	@28
+    GPUsetfix      		@29
+
+    ZN_GPUdisplayFlags	@30
+    ZN_GPUmakeSnapshot	@31
+    ZN_GPUinit			@32
+    ZN_GPUopen			@33
+    ZN_GPUclose			@34
+    ZN_GPUshutdown		@35
+    ZN_GPUupdateLace	@36
+    ZN_GPUreadStatus	@37
+    ZN_GPUwriteStatus	@38
+    ZN_GPUdmaSliceOut	@39
+    ZN_GPUreadData		@40
+    ZN_GPUsetMode		@41
+    ZN_GPUgetMode		@42
+    ZN_GPUdmaSliceIn	@43
+    ZN_GPUwriteData		@44
+    ZN_GPUdmaChain		@45
+    ZN_GPUtest			@46
+    ZN_GPUfreeze		@47
+    ZN_GPUgetScreenPic	@48
+    ZN_GPUshowScreenPic	@49
+
+    GPUvisualVibration	@50

pcsxr-1.9.93.tar.bz2/win32/plugins/dfxvideo/DFXVideo.dev Added

@@ -0,0 +1,379 @@
+[Project]
+FileName=DFXVideo.dev
+Name=DFXVideo
+Ver=1
+IsCpp=1
+Type=3
+Compiler=-W -DWIN32 -DNDEBUG -D_WINDOWS -D__i386___@@_
+CppCompiler=-W -DWIN32 -DNDEBUG -D_WINDOWS -D__i386___@@_
+Includes=.\\;.\winsrc;..\..;..\..\glue;..\..\..\plugins\dfxvideo;..\..\..\libpcsxcore
+Linker=-luser32 -lgdi32 -lwinmm -ladvapi32 -lvfw32 -def DFXVideo.def --enable-stdcall-fixup_@@_
+Libs=
+UnitCount=33
+Folders=dfxvideo,winsrc,winsrc/directx
+ObjFiles=
+PrivateResource=DFXVideo_private.rc
+ResourceIncludes=
+MakeIncludes=
+Icon=
+ExeOutput=
+ObjectOutput=
+OverrideOutput=0
+OverrideOutputName=DFXVideo.exe
+HostApplication=
+CommandLine=
+UseCustomMakefile=0
+CustomMakefile=
+IncludeVersionInfo=0
+SupportXPThemes=0
+CompilerSet=0
+CompilerSettings=0010000001001000000100
+
+[Unit1]
+FileName=winsrc\d3d.h
+Folder=winsrc/directx
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit2]
+FileName=winsrc\d3dcaps.h
+Folder=winsrc/directx
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit3]
+FileName=winsrc\d3dtypes.h
+Folder=winsrc/directx
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit4]
+FileName=winsrc\ddraw.h
+Folder=winsrc/directx
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit5]
+FileName=winsrc\dxguid.c
+Folder=winsrc/directx
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit6]
+FileName=winsrc\cfg.c
+Folder=winsrc
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit7]
+FileName=winsrc\draw.c
+Folder=winsrc
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit8]
+FileName=winsrc\fps.c
+Folder=winsrc
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit9]
+FileName=winsrc\key.c
+Folder=winsrc
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit10]
+FileName=winsrc\record.c
+Folder=winsrc
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit11]
+FileName=winsrc\record.h
+Folder=winsrc
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit12]
+FileName=winsrc\winmain.c
+Folder=winsrc
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit13]
+FileName=..\..\..\plugins\dfxvideo\cfg.h
+Folder=dfxvideo
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit14]
+FileName=..\..\..\plugins\dfxvideo\draw.h
+Folder=dfxvideo
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit15]
+FileName=..\..\..\plugins\dfxvideo\externals.h
+Folder=dfxvideo
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit16]
+FileName=..\..\..\plugins\dfxvideo\fps.h
+Folder=dfxvideo
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit17]
+FileName=..\..\..\plugins\dfxvideo\gpu.c
+Folder=dfxvideo
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit18]
+FileName=..\..\..\plugins\dfxvideo\gpu.h
+Folder=dfxvideo
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit19]
+FileName=..\..\..\plugins\dfxvideo\hq2x.h
+Folder=dfxvideo
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit20]
+FileName=..\..\..\plugins\dfxvideo\hq3x.h
+Folder=dfxvideo
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit21]
+FileName=..\..\..\plugins\dfxvideo\interp.h
+Folder=dfxvideo
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit22]
+FileName=..\..\..\plugins\dfxvideo\key.h
+Folder=dfxvideo
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit23]
+FileName=..\..\..\plugins\dfxvideo\menu.c
+Folder=dfxvideo
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit24]
+FileName=..\..\..\plugins\dfxvideo\menu.h
+Folder=dfxvideo
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit25]
+FileName=..\..\..\plugins\dfxvideo\prim.c
+Folder=dfxvideo
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit26]
+FileName=..\..\..\plugins\dfxvideo\prim.h
+Folder=dfxvideo
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit27]
+FileName=..\..\..\plugins\dfxvideo\soft.c
+Folder=dfxvideo
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit28]
+FileName=..\..\..\plugins\dfxvideo\soft.h
+Folder=dfxvideo
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit29]
+FileName=..\..\..\plugins\dfxvideo\swap.h
+Folder=dfxvideo
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit30]
+FileName=..\..\..\plugins\dfxvideo\zn.c
+Folder=dfxvideo
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit31]
+FileName=DFXVideo.def
+Folder=
+Compile=0
+CompileCpp=0
+Link=0
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit32]
+FileName=DFXVideo.rc
+Folder=Resources
+Compile=1
+CompileCpp=1
+Link=0
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit33]
+FileName=resource.h
+Folder=
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[VersionInfo]
+Major=0
+Minor=1
+Release=1
+Build=1
+LanguageID=1033
+CharsetID=1252
+CompanyName=
+FileVersion=0.1
+FileDescription=Developed using the Dev-C++ IDE
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=DFXVideo.exe
+ProductName=DFXVideo
+ProductVersion=0.1
+AutoIncBuildNr=0
+

pcsxr-1.9.93.tar.bz2/win32/plugins/dfxvideo/DFXVideo.rc Added

@@ -0,0 +1,569 @@
+//Microsoft Developer Studio generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+// Use MFC if available
+//
+#if defined(_MFC_VER)
+#include "afxres.h"
+#else
+#include "WinResrc.h"
+#include <winres.h>
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// Neutral resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
+#ifdef _WIN32
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+#pragma code_page(936)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Bitmap
+//
+
+IDB_GPU BITMAP DISCARDABLE "res\\gpu.bmp"
+#endif // Neutral resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE DISCARDABLE 
+BEGIN
+ "resource.h\0"
+END
+
+2 TEXTINCLUDE DISCARDABLE 
+BEGIN
+ "#include ""afxres.h""\r\n"
+ "\0"
+END
+
+3 TEXTINCLUDE DISCARDABLE 
+BEGIN
+ "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
+ "#define _AFX_NO_OLE_RESOURCES\r\n"
+ "#define _AFX_NO_TRACKER_RESOURCES\r\n"
+ "#define _AFX_NO_PROPERTY_RESOURCES\r\n"
+ "\r\n"
+ "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"
+ "#ifdef _WIN32\r\n"
+ "LANGUAGE 9, 1\r\n"
+ "#pragma code_page(1252)\r\n"
+ "#endif\r\n"
+ "#endif\0"
+END
+
+#endif // APSTUDIO_INVOKED
+
+
+#ifndef _MAC
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,17,0,0
+ PRODUCTVERSION 1,17,0,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904b0"
+ BEGIN
+ VALUE "Comments", "\0"
+ VALUE "CompanyName", "\0"
+ VALUE "FileDescription", "Based on P.E.Op.S. gpu soft plugin\0"
+ VALUE "FileVersion", "1, 17, 0, 0\0"
+ VALUE "InternalName", "DFXVideo\0"
+ VALUE "LegalCopyright", "GPL\0"
+ VALUE "LegalTrademarks", "\0"
+ VALUE "OriginalFilename", "DFXVideo.DLL\0"
+ VALUE "PrivateBuild", "\0"
+ VALUE "ProductName", "DFXVideo\0"
+ VALUE "ProductVersion", "1, 17, 0, 0\0"
+ VALUE "SpecialBuild", "\0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
+
+#endif // !_MAC
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_CFGSOFT DIALOGEX 0, 0, 291, 292
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Configure the DirectDraw Renderer..."
+FONT 8, "MS Sans Serif", 0, 0, 0x1
+BEGIN
+ PUSHBUTTON "Select device...",IDC_SELDEV,7,3,60,12
+ CONTROL "Fullscreen mode",IDC_DISPMODE1,"Button",
+ BS_AUTORADIOBUTTON,10,28,67,10
+ CONTROL "Window mode",IDC_DISPMODE2,"Button",BS_AUTORADIOBUTTON,
+ 10,43,63,10
+ COMBOBOX IDC_RESOLUTION,78,27,102,64,CBS_DROPDOWNLIST | CBS_SORT | 
+ WS_VSCROLL | WS_TABSTOP
+ COMBOBOX IDC_COLDEPTH,225,27,52,64,CBS_DROPDOWNLIST | WS_VSCROLL | 
+ WS_TABSTOP
+ EDITTEXT IDC_WINX,103,43,36,12,ES_AUTOHSCROLL
+ EDITTEXT IDC_WINY,151,43,36,12,ES_AUTOHSCROLL
+ COMBOBOX IDC_NOSTRETCH,78,61,199,100,CBS_DROPDOWNLIST | 
+ WS_VSCROLL | WS_TABSTOP
+ COMBOBOX IDC_DITHER,78,77,199,100,CBS_DROPDOWNLIST | WS_VSCROLL | 
+ WS_TABSTOP
+ CONTROL "Transparent FPS display",IDC_TRANSPARENT,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,13,107,93,10
+ CONTROL "Show FPS display on startup",IDC_SHOWFPS,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,13,118,104,10
+ PUSHBUTTON "...",IDC_KEYCONFIG,216,111,11,10,0,WS_EX_STATICEDGE
+ CONTROL "Use FPS limit",IDC_USELIMIT,"Button",BS_AUTOCHECKBOX | 
+ WS_TABSTOP,24,130,61,10
+ CONTROL "Use Frame skipping",IDC_USESKIPPING,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,24,141,81,10
+ CONTROL "Auto-detect FPS/Frame skipping limit",IDC_FRAMEAUTO,
+ "Button",BS_AUTORADIOBUTTON | WS_GROUP,143,129,135,11
+ CONTROL "FPS limit (10-200) :",IDC_FRAMEMANUELL,"Button",
+ BS_AUTORADIOBUTTON,143,140,72,11
+ EDITTEXT IDC_FRAMELIM,218,140,28,12,ES_AUTOHSCROLL
+ COMBOBOX IDC_SCANLINES,78,167,199,64,CBS_DROPDOWNLIST | 
+ WS_VSCROLL | WS_TABSTOP
+ CONTROL "Use system memory - slower with most cards, disables auto-screen-filtering",
+ IDC_SYSMEMORY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,
+ 184,260,10
+ CONTROL "Wait for VSYNC - synchronize screen update with monitor refresh rate",
+ IDC_VSYNC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,195,
+ 256,10
+ CONTROL "Stop screen saver - disables screen savers/power-saving (n.a. in W95/NT4!)",
+ IDC_STOPSAVER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,
+ 206,263,10
+ CONTROL "Debug mode - enables some debugging features (n.a. with all cards)",
+ IDC_DEBUGMODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,
+ 217,263,10
+ CONTROL "Activate special game fixes",IDC_GAMEFIX,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,13,228,101,10
+ PUSHBUTTON "...",IDC_SELFIX,121,228,11,10,0,WS_EX_STATICEDGE
+ PUSHBUTTON "...",IDC_RECORDING,121,241,11,10,0,WS_EX_STATICEDGE
+ PUSHBUTTON "Fast",IDC_DEF1,10,267,35,14
+ PUSHBUTTON "Nice",IDC_DEF2,49,267,35,14
+ DEFPUSHBUTTON "OK",IDOK,97,267,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,153,267,50,14
+ PUSHBUTTON "Copy settings\n to clipboard",IDC_CLIPBOARD,210,261,77,
+ 26,BS_MULTILINE,WS_EX_STATICEDGE
+ LTEXT "Primary",IDC_DEVICETXT,72,5,211,10
+ GROUPBOX "Resolution && Colors",IDC_STATIC,4,17,283,78
+ RTEXT "Color depth:",IDC_STATIC,182,28,39,10,SS_CENTERIMAGE
+ RTEXT "Size:",IDC_STATIC,74,44,26,9
+ RTEXT "Stretching:",IDC_STATIC,26,63,48,9
+ RTEXT "Scanline mode:",IDC_STATIC,9,169,61,8
+ RTEXT "Recording options:",IDC_STATIC,55,241,61,10,
+ SS_CENTERIMAGE
+ CTEXT "x",IDC_STATIC,141,44,8,9
+ GROUPBOX "Framerate",IDC_STATIC,4,96,283,60
+ LTEXT "FPS",IDC_STATIC,250,142,20,9
+ GROUPBOX "Options",IDC_STATIC,4,157,283,99
+ GROUPBOX "Default settings",IDC_STATIC,4,257,87,30
+ RTEXT "Key configuration:",IDC_STATIC,152,111,59,10,
+ SS_CENTERIMAGE
+ EDITTEXT IDC_CLPEDIT,204,278,6,8,ES_MULTILINE | ES_AUTOVSCROLL | 
+ ES_AUTOHSCROLL | NOT WS_VISIBLE
+ RTEXT "Dithering:",IDC_STATIC,26,79,48,9
+END
+
+IDD_DEVICE DIALOG DISCARDABLE 0, 0, 186, 82
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION
+CAPTION "Select device..."
+FONT 8, "MS Sans Serif"
+BEGIN
+ DEFPUSHBUTTON "OK",IDOK,24,63,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,112,63,50,14
+ COMBOBOX IDC_DEVICE,7,7,167,64,CBS_DROPDOWNLIST | WS_VSCROLL | 
+ WS_TABSTOP
+ CONTROL "Adjust gamma (fullscreen modes only)",IDC_USEGAMMA,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,28,156,9
+ SCROLLBAR IDC_GAMMA,55,42,68,10
+ RTEXT "Dark",IDC_STATIC,30,43,21,8
+ LTEXT "Bright",IDC_STATIC,127,43,28,8
+END
+
+IDD_ABOUT DIALOG DISCARDABLE 0, 0, 258, 194
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION
+CAPTION "About the P.E.Op.S. PSX DirectDraw Soft Renderer..."
+FONT 8, "MS Sans Serif"
+BEGIN
+ DEFPUSHBUTTON "OK",IDOK,103,176,50,14
+ RTEXT "Version:",IDC_STATIC,17,6,49,10
+ RTEXT "Coded by:",IDC_STATIC,17,29,49,10
+ RTEXT "Pete's EMail:",IDC_STATIC,17,41,49,10
+ LTEXT "1.17",IDC_STATIC,69,6,159,10
+ LTEXT "Pete Bernert and the P.E.Op.S. team",IDC_STATIC,69,29,
+ 159,10
+ LTEXT "BlackDove@addcom.de",IDC_STATIC,69,41,159,10
+ LTEXT "http://www.pbernert.com",IDC_STATIC,82,95,142,10
+ RTEXT "Release date:",IDC_STATIC,17,17,49,10
+ LTEXT "12.06.2005",IDC_STATIC,69,17,159,10
+ LTEXT "The P.E.Op.S. SoftGPU team:",IDC_STATIC,9,82,103,10
+ CONTROL "",IDC_STATIC,"Static",SS_ETCHEDFRAME | SS_SUNKEN,4,76,
+ 249,94
+ RTEXT "P.E.Op.S. page:",IDC_STATIC,9,56,57,10
+ LTEXT "https://sourceforge.net/projects/peops",IDC_STATIC,69,
+ 56,159,10
+ LTEXT "- Pete Bernert",IDC_STATIC,13,95,69,10
+ LTEXT "- Lewpy",IDC_STATIC,13,106,69,10
+ LTEXT "- lu_zero",IDC_STATIC,13,117,69,10
+ LTEXT "- linuzappz",IDC_STATIC,13,128,69,10
+ LTEXT "- Darko Matesic",IDC_STATIC,13,139,69,10
+ LTEXT "http://mrdario.tripod.com",IDC_STATIC,82,139,142,10
+ LTEXT "http://www.pcsx.net",IDC_STATIC,82,128,142,10
+ LTEXT "http://lewpy.psxemu.com/",IDC_STATIC,82,106,142,10
+ LTEXT "http://brsk.virtualave.net/lu_zero/",IDC_STATIC,82,117,
+ 142,10
+ LTEXT "- syo",IDC_STATIC,13,150,69,10
+ LTEXT "http://www.geocities.co.jp/SiliconValley-Bay/2072/",
+ IDC_STATIC,82,150,167,10
+END
+
+IDD_FIXES DIALOG DISCARDABLE 0, 0, 285, 218
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION
+CAPTION "Special game fixes..."
+FONT 8, "MS Sans Serif"
+BEGIN
+ CONTROL "Odd/even bit hack",IDC_FIX1,"Button",BS_AUTOCHECKBOX | 
+ WS_TABSTOP,34,30,100,10
+ CONTROL "Expand screen width",IDC_FIX2,"Button",BS_AUTOCHECKBOX | 
+ WS_TABSTOP,34,45,91,10
+ CONTROL "Ignore black brightness color",IDC_FIX3,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,34,60,106,10
+ CONTROL "Disable coord check",IDC_FIX4,"Button",BS_AUTOCHECKBOX | 
+ WS_TABSTOP,34,75,85,10
+ CONTROL "Use low-res fps timer",IDC_FIX5,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,34,90,101,10
+ CONTROL "Use PC fps calculation",IDC_FIX6,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,34,105,91,10
+ CONTROL "Lazy screen updates",IDC_FIX7,"Button",BS_AUTOCHECKBOX | 
+ WS_TABSTOP,34,120,91,10
+ CONTROL "Use old frame skipping",IDC_FIX8,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,34,135,91,10
+ CONTROL "Repeated flat tex triangles",IDC_FIX9,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,34,150,97,10
+ CONTROL "Draw tex-quads as triangles",IDC_FIX10,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,34,165,100,10
+ DEFPUSHBUTTON "OK",IDOK,66,199,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,169,199,50,14
+ LTEXT "Activate the following options only if you want to play one of the listed games (or if your game is showing similar glitches)!",
+ IDC_STATIC,8,4,245,22
+ LTEXT "Needed with epsxe 1.5.2 and older",IDC_STATIC,145,30,
+ 135,9,SS_CENTERIMAGE
+ LTEXT "Shows the full area in Capcom 2D fighters",IDC_STATIC,
+ 145,45,136,9,SS_CENTERIMAGE
+ LTEXT "Fixes black screens in Lunar",IDC_STATIC,145,60,134,9,
+ SS_CENTERIMAGE
+ LTEXT "Old compatibility mode",IDC_STATIC,145,75,135,9,
+ SS_CENTERIMAGE
+ LTEXT "For buggy motherboard chipsets",IDC_STATIC,145,90,133,9,
+ SS_CENTERIMAGE
+ LTEXT "Better fps limitation with some games",IDC_STATIC,145,
+ 105,129,9,SS_CENTERIMAGE
+ LTEXT "Maybe faster, needed for Pandemonium2",IDC_STATIC,145,
+ 120,139,9,SS_CENTERIMAGE
+ RTEXT "0x0001:",IDC_STATIC,1,30,28,9,SS_CENTERIMAGE
+ RTEXT "0x0002:",IDC_STATIC,1,45,28,9,SS_CENTERIMAGE
+ RTEXT "0x0004:",IDC_STATIC,1,60,28,9,SS_CENTERIMAGE
+ RTEXT "0x0008:",IDC_STATIC,1,75,28,9,SS_CENTERIMAGE
+ RTEXT "0x0010:",IDC_STATIC,1,90,28,9,SS_CENTERIMAGE
+ RTEXT "0x0020:",IDC_STATIC,1,105,28,9,SS_CENTERIMAGE
+ RTEXT "0x0040:",IDC_STATIC,1,120,28,9,SS_CENTERIMAGE
+ LTEXT "Skips only every second frame",IDC_STATIC,145,135,139,9,
+ SS_CENTERIMAGE
+ RTEXT "0x0080:",IDC_STATIC,1,135,28,9,SS_CENTERIMAGE
+ LTEXT "Needed by Dark Forces",IDC_STATIC,145,150,139,9,
+ SS_CENTERIMAGE
+ RTEXT "0x0100:",IDC_STATIC,1,150,28,9,SS_CENTERIMAGE
+ LTEXT "Slightly distorted textures can happen",IDC_STATIC,145,
+ 165,139,9,SS_CENTERIMAGE
+ RTEXT "0x0200:",IDC_STATIC,1,165,28,9,SS_CENTERIMAGE
+ CONTROL "Fake 'gpu busy' states",IDC_FIX11,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,34,180,100,10
+ LTEXT "Toggles busy flags after drawing",IDC_STATIC,145,180,
+ 139,9,SS_CENTERIMAGE
+ RTEXT "0x0400:",IDC_STATIC,1,180,28,9,SS_CENTERIMAGE
+END
+
+IDD_KEYS DIALOG DISCARDABLE 0, 0, 186, 220
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION
+CAPTION "GPU key configuration"
+FONT 8, "MS Sans Serif"
+BEGIN
+ PUSHBUTTON "Default keys",IDC_DEFAULT,107,6,61,13
+ COMBOBOX IDC_KEY1,108,25,61,62,CBS_DROPDOWNLIST | WS_VSCROLL | 
+ WS_TABSTOP
+ COMBOBOX IDC_KEY2,108,41,61,62,CBS_DROPDOWNLIST | WS_VSCROLL | 
+ WS_TABSTOP
+ COMBOBOX IDC_KEY3,108,57,61,62,CBS_DROPDOWNLIST | WS_VSCROLL | 
+ WS_TABSTOP
+ COMBOBOX IDC_KEY4,108,73,61,62,CBS_DROPDOWNLIST | WS_VSCROLL | 
+ WS_TABSTOP
+ COMBOBOX IDC_KEY5,108,89,61,62,CBS_DROPDOWNLIST | WS_VSCROLL | 
+ WS_TABSTOP
+ COMBOBOX IDC_KEY6,108,105,61,62,CBS_DROPDOWNLIST | WS_VSCROLL | 
+ WS_TABSTOP
+ COMBOBOX IDC_KEY7,108,121,61,62,CBS_DROPDOWNLIST | WS_VSCROLL | 
+ WS_TABSTOP
+ COMBOBOX IDC_KEY8,108,137,61,62,CBS_DROPDOWNLIST | WS_VSCROLL | 
+ WS_TABSTOP
+ COMBOBOX IDC_KEY9,108,153,61,62,CBS_DROPDOWNLIST | WS_VSCROLL | 
+ WS_TABSTOP
+ COMBOBOX IDC_KEY10,108,169,61,62,CBS_DROPDOWNLIST | WS_VSCROLL | 
+ WS_TABSTOP
+ DEFPUSHBUTTON "OK",IDOK,20,197,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,115,197,50,14
+ RTEXT "Show/hide gpu menu:",IDC_STATIC,4,26,100,9,
+ SS_CENTERIMAGE
+ RTEXT "Show/hide gpu infos:",IDC_STATIC,4,42,100,9,
+ SS_CENTERIMAGE
+ RTEXT "Toggle selected option up:",IDC_STATIC,4,58,100,9,
+ SS_CENTERIMAGE
+ RTEXT "Toggle selected option down:",IDC_STATIC,4,74,100,9,
+ SS_CENTERIMAGE
+ RTEXT "Select previous option:",IDC_STATIC,4,90,100,9,
+ SS_CENTERIMAGE
+ RTEXT "Select next option:",IDC_STATIC,4,106,100,9,
+ SS_CENTERIMAGE
+ RTEXT "Start/stop recording:",IDC_STATIC,4,122,100,9,
+ SS_CENTERIMAGE
+ RTEXT "Toggle wait VSYNC:",IDC_STATIC,4,138,100,9,
+ SS_CENTERIMAGE
+ RTEXT "Fast forward frame skipping:",IDC_STATIC,4,154,100,9,
+ SS_CENTERIMAGE
+ RTEXT "Debug mode: toggle vram view:",IDC_STATIC,4,170,100,9,
+ SS_CENTERIMAGE
+END
+
+IDD_RECORDING DIALOG DISCARDABLE 0, 0, 215, 158
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Recording Options"
+FONT 8, "MS Sans Serif"
+BEGIN
+ CONTROL "Standard Video Size",IDC_REC_MODE1,"Button",
+ BS_AUTORADIOBUTTON | WS_GROUP,25,36,80,12
+ COMBOBOX IDC_VIDEO_SIZE,115,37,65,60,CBS_DROPDOWNLIST | 
+ WS_VSCROLL | WS_TABSTOP
+ CONTROL "Custom Video Size",IDC_REC_MODE2,"Button",
+ BS_AUTORADIOBUTTON,25,51,80,12
+ EDITTEXT IDC_REC_WIDTH,115,51,25,12,ES_AUTOHSCROLL
+ CTEXT "x",IDC_STATIC,141,51,12,12,SS_CENTERIMAGE
+ EDITTEXT IDC_REC_HEIGHT,155,51,25,12,ES_AUTOHSCROLL
+ RTEXT "Frame Rate Scale:",IDC_STATIC,45,69,60,12,
+ SS_CENTERIMAGE | NOT WS_GROUP
+ COMBOBOX IDC_FRAME_RATE,115,69,30,60,CBS_DROPDOWNLIST | 
+ WS_VSCROLL | WS_TABSTOP
+ CONTROL "16 bit Compression:",IDC_COMPRESSION1,"Button",
+ BS_AUTORADIOBUTTON | WS_GROUP,21,86,165,12
+ CONTROL "24 bit Compression:",IDC_COMPRESSION2,"Button",
+ BS_AUTORADIOBUTTON,21,101,165,12
+ PUSHBUTTON "Configure",IDC_RECCFG,77,116,50,12
+ DEFPUSHBUTTON "OK",IDOK,24,137,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,133,137,50,14
+ LTEXT "You can start/stop the video recording using the 'recording' key (see key configuration)!\nThe video will be stored in the 'Demo' sub-directory.",
+ IDC_STATIC,5,3,203,27
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO DISCARDABLE 
+BEGIN
+ IDD_CFGSOFT, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 284
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 280
+ END
+
+ IDD_DEVICE, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 179
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 75
+ END
+
+ IDD_ABOUT, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 189
+ END
+
+ IDD_FIXES, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 278
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 200
+ END
+
+ IDD_KEYS, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 179
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 190
+ END
+
+ IDD_RECORDING, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 208
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 151
+ END
+END
+#endif // APSTUDIO_INVOKED
+
+#ifdef _MSC_VER
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog Info
+//
+
+IDD_CFGSOFT DLGINIT
+BEGIN
+ IDC_RESOLUTION, 0x403, 1, 0
+"\000" 
+ IDC_NOSTRETCH, 0x403, 10, 0
+0x3436, 0x2030, 0x2078, 0x3834, 0x0030, 
+ IDC_NOSTRETCH, 0x403, 10, 0
+0x3038, 0x2030, 0x2078, 0x3036, 0x0030, 
+ IDC_NOSTRETCH, 0x403, 11, 0
+0x3031, 0x3432, 0x7820, 0x3720, 0x3836, "\000" 
+ IDC_NOSTRETCH, 0x403, 11, 0
+0x3131, 0x3235, 0x7820, 0x3820, 0x3436, "\000" 
+ IDC_NOSTRETCH, 0x403, 12, 0
+0x3231, 0x3038, 0x7820, 0x3120, 0x3230, 0x0034, 
+ IDC_NOSTRETCH, 0x403, 12, 0
+0x3631, 0x3030, 0x7820, 0x3120, 0x3032, 0x0030, 
+ IDC_DITHER, 0x403, 10, 0
+0x3436, 0x2030, 0x2078, 0x3834, 0x0030, 
+ IDC_DITHER, 0x403, 10, 0
+0x3038, 0x2030, 0x2078, 0x3036, 0x0030, 
+ IDC_DITHER, 0x403, 11, 0
+0x3031, 0x3432, 0x7820, 0x3720, 0x3836, "\000" 
+ IDC_DITHER, 0x403, 11, 0
+0x3131, 0x3235, 0x7820, 0x3820, 0x3436, "\000" 
+ IDC_DITHER, 0x403, 12, 0
+0x3231, 0x3038, 0x7820, 0x3120, 0x3230, 0x0034, 
+ IDC_DITHER, 0x403, 12, 0
+0x3631, 0x3030, 0x7820, 0x3120, 0x3032, 0x0030, 
+ IDC_SCANLINES, 0x403, 10, 0
+0x3436, 0x2030, 0x2078, 0x3834, 0x0030, 
+ IDC_SCANLINES, 0x403, 10, 0
+0x3038, 0x2030, 0x2078, 0x3036, 0x0030, 
+ IDC_SCANLINES, 0x403, 11, 0
+0x3031, 0x3432, 0x7820, 0x3720, 0x3836, "\000" 
+ IDC_SCANLINES, 0x403, 11, 0
+0x3131, 0x3235, 0x7820, 0x3820, 0x3436, "\000" 
+ IDC_SCANLINES, 0x403, 12, 0
+0x3231, 0x3038, 0x7820, 0x3120, 0x3230, 0x0034, 
+ IDC_SCANLINES, 0x403, 12, 0
+0x3631, 0x3030, 0x7820, 0x3120, 0x3032, 0x0030, 
+ 0
+END
+
+IDD_DEVICE DLGINIT
+BEGIN
+ IDC_DEVICE, 0x403, 11, 0
+0x6f64, 0x276e, 0x2074, 0x6163, 0x6572, "\000" 
+ IDC_DEVICE, 0x403, 12, 0
+0x3452, 0x4720, 0x2034, 0x3442, 0x4120, 0x0034, 
+ IDC_DEVICE, 0x403, 12, 0
+0x3552, 0x4720, 0x2035, 0x3542, 0x4120, 0x0031, 
+ IDC_DEVICE, 0x403, 12, 0
+0x3852, 0x4720, 0x2038, 0x3842, 0x4120, 0x0038, 
+ 0
+END
+
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+ IDS_INFO0 "FL - Frame limitation:\n[Off] - Speed as fast as possible\n[On-1] - Limits speed to manual value\n[On-2] - Limits speed to auto-detected value."
+ IDS_INFO1 "FS - Frame skipping:\n[Off] - No frames get skipped\n[On] - Tries to speed up the game by skipping frames. Can cause glitches!"
+ IDS_INFO2 "GF - Special game fixes:\n[Off] - Turn off all fixes\n[On] - Turn on all activated fixes. You have to select the fixes you want to use in the gpu config."
+END
+
+#endif // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+#define _AFX_NO_SPLITTER_RESOURCES
+#define _AFX_NO_OLE_RESOURCES
+#define _AFX_NO_TRACKER_RESOURCES
+#define _AFX_NO_PROPERTY_RESOURCES
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE 9, 1
+#pragma code_page(1252)
+#endif
+#endif
+/////////////////////////////////////////////////////////////////////////////
+#endif // not APSTUDIO_INVOKED
+

pcsxr-1.9.93.tar.bz2/win32/plugins/dfxvideo/DFXVideo.vcxproj Added

@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{30F06328-DD64-4030-AF7A-19FBC74CF298}</ProjectGuid>
+ <RootNamespace>DFXVideo</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\Release/DFXVideo.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>.\;.\winsrc;..\..;..\..\glue;..\..\..\plugins\dfxvideo;..\..\..\libpcsxcore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;__i386__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>.\Release/DFXVideo.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
+ <ObjectFileName>.\Release/</ObjectFileName>
+ <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0407</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>winmm.lib;vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>.\Release/DFXVideo.dll</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>.\DFXVideo.def</ModuleDefinitionFile>
+ <ProgramDatabaseFile>.\Release/DFXVideo.pdb</ProgramDatabaseFile>
+ <SubSystem>Windows</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <ImportLibrary>.\Release/DFXVideo.lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\Release/DFXVideo.bsc</OutputFile>
+ </Bscmake>
+ <PostBuildEvent>
+ <Command>rem copy release\DFXVideo.dll d:\emus\epsxe\plugins
+rem copy release\DFXVideo.dll d:\emus\zinc\renderer.znc
+</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\Debug/DFXVideo.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>.\;.\winsrc;..\..\glue;..\..\..\plugins\dfxvideo;..\..\..\libpcsxcore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>.\Debug/DFXVideo.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
+ <ObjectFileName>.\Debug/</ObjectFileName>
+ <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0407</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>winmm.lib;vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(SolutionDir)$(Configuration)\DFXVideo.dll</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>.\DFXVideo.def</ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>.\Debug/DFXVideo.pdb</ProgramDatabaseFile>
+ <SubSystem>Windows</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <ImportLibrary>.\Debug/DFXVideo.lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\Debug/DFXVideo.bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="winsrc\cfg.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="winsrc\draw.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="winsrc\fps.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="winsrc\key.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="winsrc\record.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="winsrc\winmain.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="winsrc\dxguid.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\..\plugins\dfxvideo\gpu.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\..\plugins\dfxvideo\menu.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\..\plugins\dfxvideo\prim.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\..\plugins\dfxvideo\soft.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\..\plugins\dfxvideo\zn.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="winsrc\record.h" />
+ <ClInclude Include="winsrc\d3d.h" />
+ <ClInclude Include="winsrc\d3dcaps.h" />
+ <ClInclude Include="winsrc\d3dtypes.h" />
+ <ClInclude Include="winsrc\ddraw.h" />
+ <ClInclude Include="..\..\..\plugins\dfxvideo\cfg.h" />
+ <ClInclude Include="..\..\..\plugins\dfxvideo\draw.h" />
+ <ClInclude Include="..\..\..\plugins\dfxvideo\externals.h" />
+ <ClInclude Include="..\..\..\plugins\dfxvideo\fps.h" />
+ <ClInclude Include="..\..\..\plugins\dfxvideo\gpu.h" />
+ <ClInclude Include="..\..\..\plugins\dfxvideo\hq2x.h" />
+ <ClInclude Include="..\..\..\plugins\dfxvideo\hq3x.h" />
+ <ClInclude Include="..\..\..\plugins\dfxvideo\interp.h" />
+ <ClInclude Include="..\..\..\plugins\dfxvideo\key.h" />
+ <ClInclude Include="..\..\..\plugins\dfxvideo\menu.h" />
+ <ClInclude Include="..\..\..\plugins\dfxvideo\prim.h" />
+ <ClInclude Include="..\..\..\plugins\dfxvideo\soft.h" />
+ <ClInclude Include="..\..\..\plugins\dfxvideo\swap.h" />
+ <ClInclude Include="resource.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="DFXVideo.def" />
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="DFXVideo.rc">
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

pcsxr-1.9.93.tar.bz2/win32/plugins/dfxvideo/DFXVideo.vcxproj.filters Added

@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="winsrc">
+ <UniqueIdentifier>{afc9ce0e-17fa-434b-8647-6f5a06a36ed6}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="winsrc\directx">
+ <UniqueIdentifier>{cc13db17-9136-4f07-8ddb-981412cb060b}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="dfxvideo">
+ <UniqueIdentifier>{435c6684-c400-40cc-a3b8-29f69899e0e6}</UniqueIdentifier>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="winsrc\cfg.c">
+ <Filter>winsrc</Filter>
+ </ClCompile>
+ <ClCompile Include="winsrc\draw.c">
+ <Filter>winsrc</Filter>
+ </ClCompile>
+ <ClCompile Include="winsrc\fps.c">
+ <Filter>winsrc</Filter>
+ </ClCompile>
+ <ClCompile Include="winsrc\key.c">
+ <Filter>winsrc</Filter>
+ </ClCompile>
+ <ClCompile Include="winsrc\record.c">
+ <Filter>winsrc</Filter>
+ </ClCompile>
+ <ClCompile Include="winsrc\winmain.c">
+ <Filter>winsrc</Filter>
+ </ClCompile>
+ <ClCompile Include="winsrc\dxguid.c">
+ <Filter>winsrc\directx</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\plugins\dfxvideo\gpu.c">
+ <Filter>dfxvideo</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\plugins\dfxvideo\menu.c">
+ <Filter>dfxvideo</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\plugins\dfxvideo\prim.c">
+ <Filter>dfxvideo</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\plugins\dfxvideo\soft.c">
+ <Filter>dfxvideo</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\plugins\dfxvideo\zn.c">
+ <Filter>dfxvideo</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="winsrc\record.h">
+ <Filter>winsrc</Filter>
+ </ClInclude>
+ <ClInclude Include="winsrc\d3d.h">
+ <Filter>winsrc\directx</Filter>
+ </ClInclude>
+ <ClInclude Include="winsrc\d3dcaps.h">
+ <Filter>winsrc\directx</Filter>
+ </ClInclude>
+ <ClInclude Include="winsrc\d3dtypes.h">
+ <Filter>winsrc\directx</Filter>
+ </ClInclude>
+ <ClInclude Include="winsrc\ddraw.h">
+ <Filter>winsrc\directx</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\plugins\dfxvideo\cfg.h">
+ <Filter>dfxvideo</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\plugins\dfxvideo\draw.h">
+ <Filter>dfxvideo</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\plugins\dfxvideo\externals.h">
+ <Filter>dfxvideo</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\plugins\dfxvideo\fps.h">
+ <Filter>dfxvideo</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\plugins\dfxvideo\gpu.h">
+ <Filter>dfxvideo</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\plugins\dfxvideo\hq2x.h">
+ <Filter>dfxvideo</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\plugins\dfxvideo\hq3x.h">
+ <Filter>dfxvideo</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\plugins\dfxvideo\interp.h">
+ <Filter>dfxvideo</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\plugins\dfxvideo\key.h">
+ <Filter>dfxvideo</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\plugins\dfxvideo\menu.h">
+ <Filter>dfxvideo</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\plugins\dfxvideo\prim.h">
+ <Filter>dfxvideo</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\plugins\dfxvideo\soft.h">
+ <Filter>dfxvideo</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\plugins\dfxvideo\swap.h">
+ <Filter>dfxvideo</Filter>
+ </ClInclude>
+ <ClInclude Include="resource.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="DFXVideo.def" />
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="DFXVideo.rc" />
+ </ItemGroup>
+</Project>
\ No newline at end of file

pcsxr-1.9.93.tar.bz2/win32/plugins/dfxvideo/DFXVideo.vcxproj.user Added

pcsxr-1.9.93.tar.bz2/win32/plugins/dfxvideo/res Added

pcsxr-1.9.93.tar.bz2/win32/plugins/dfxvideo/res/gpu.bmp Added

pcsxr-1.9.93.tar.bz2/win32/plugins/dfxvideo/resource.h Added

@@ -0,0 +1,143 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Developer Studio generated include file.
+// Used by DFXVideo.rc
+//
+#define IDS_INFO0                       1
+#define IDS_INFO1                       2
+#define IDS_INFO2                       3
+#define IDC_DEFAULT                     3
+#define IDC_DEF1                        127
+#define IDC_DEF2                        128
+#define IDD_DEVICE                      133
+#define IDD_ABOUT                       135
+#define IDD_FIXES                       136
+#define IDB_GPU                         137
+#define IDD_KEYS                        138
+#define IDD_RECORDING                   139
+#define IDC_CURSOR1                     142
+#define IDD_CFGDLG                      500
+#define IDD_CFGSOFT                     501
+#define IDC_KEY1                        1030
+#define IDC_KEY2                        1031
+#define IDC_KEY3                        1032
+#define IDC_KEY4                        1033
+#define IDC_KEY5                        1034
+#define IDC_KEY6                        1035
+#define IDC_KEY7                        1036
+#define IDC_KEY8                        1037
+#define IDC_KEY9                        1038
+#define IDC_KEY10                       1039
+#define IDC_CLIPBOARD                   1040
+#define IDC_CLPEDIT                     1041
+#define IDC_TEXWINDOWS                  2001
+#define IDC_TEXFIX                      2002
+#define IDC_TEXLINEAR                   2003
+#define IDC_RESOLUTION                  2004
+#define IDC_DRAWDITHER                  2005
+#define IDC_SCANLINES                   2005
+#define IDC_CACHESIZE                   2006
+#define IDC_COLDEPTH                    2006
+#define IDC_CACHETXT                    2007
+#define IDC_NOSTRETCH                   2007
+#define IDC_USELINES                    2008
+#define IDC_USEMASK                     2008
+#define IDC_DITHER                      2008
+#define IDC_COLORDEPTH                  2009
+#define IDC_CHANGEDESK                  2010
+#define IDC_GAMEFIX                     2010
+#define IDC_USELIMIT                    2011
+#define IDC_FRAMELIMIT                  2012
+#define IDC_USESKIPPING                 2012
+#define IDC_FRAMEAUTO                   2013
+#define IDC_FRAMEMANUELL                2014
+#define IDC_ADVBLEND                    2015
+#define IDC_DELAYEDFB                   2015
+#define IDC_SHOWFPS                     2015
+#define IDC_OFFSCREEN                   2016
+#define IDC_SYSMEMORY                   2016
+#define IDC_OPAQUE                      2017
+#define IDC_STOPSAVER                   2017
+#define IDC_TEXQUALITY                  2018
+#define IDC_QUALTXT                     2019
+#define IDC_USESKIP                     2020
+#define IDC_QUALTXT2                    2020
+#define IDC_DEVICE                      2020
+#define IDC_DISPMODE1                   2021
+#define IDC_DISPMODE2                   2022
+#define IDC_SUBCACHE                    2023
+#define IDC_WINDOWFREE                  2024
+#define IDC_EXTCOLCHECK                 2024
+#define IDC_TEXUSE                      2024
+#define IDC_WINDOWAUTO                  2025
+#define IDC_USETEXPRIO                  2025
+#define IDC_WINX                        2026
+#define IDC_WINY                        2027
+#define IDC_SELDEV                      2028
+#define IDC_DEVICETXT                   2029
+#define IDC_DB1                         2030
+#define IDC_FILTERTYPE                  2030
+#define IDC_DB2                         2031
+#define IDC_QUALTXT3                    2031
+#define IDC_DB3                         2032
+#define IDC_EXTCOL                      2033
+#define IDC_FRAMELIM                    2034
+#define IDC_SELFIX                      2037
+#define IDC_USEGAMMA                    2037
+#define IDC_FIX1                        2038
+#define IDC_KEYCONFIG                   2038
+#define IDC_FIX2                        2039
+#define IDC_RECORDING                   2039
+#define IDC_FIX3                        2040
+#define IDC_FIX4                        2041
+#define IDC_FIX5                        2042
+#define IDC_FIX6                        2043
+#define IDC_FIX7                        2044
+#define IDC_FIX8                        2045
+#define IDC_FIX9                        2046
+#define IDC_FIX10                       2047
+#define IDC_FIX11                       2048
+#define IDC_FIX12                       2049
+#define IDC_FIX13                       2050
+#define IDC_FIX14                       2051
+#define IDC_FIX15                       2052
+#define IDC_FIX16                       2053
+#define IDC_FIX17                       2054
+#define IDC_FIX18                       2055
+#define IDC_FIX19                       2056
+#define IDC_FIX20                       2057
+#define IDC_FIX21                       2058
+#define IDC_FIX22                       2059
+#define IDC_FIX23                       2060
+#define IDC_FIX24                       2061
+#define IDC_FIX25                       2062
+#define IDC_FIX26                       2063
+#define IDC_FIX27                       2064
+#define IDC_FIX28                       2065
+#define IDC_FIX29                       2066
+#define IDC_FIX30                       2067
+#define IDC_FIX31                       2068
+#define IDC_FIX32                       2069
+#define IDC_GAMMA                       2070
+#define IDC_REC_MODE1                   2071
+#define IDC_REC_MODE2                   2072
+#define IDC_VIDEO_SIZE                  2073
+#define IDC_REC_WIDTH                   2074
+#define IDC_REC_HEIGHT                  2075
+#define IDC_FRAME_RATE                  2076
+#define IDC_COMPRESSION1                2077
+#define IDC_COMPRESSION2                2078
+#define IDC_RECCFG                      2079
+#define IDC_VSYNC                       2080
+#define IDC_TRANSPARENT                 2081
+#define IDC_DEBUGMODE                   2082
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        143
+#define _APS_NEXT_COMMAND_VALUE         32771
+#define _APS_NEXT_CONTROL_VALUE         2083
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif

pcsxr-1.9.93.tar.bz2/win32/plugins/dfxvideo/winsrc Added

pcsxr-1.9.93.tar.bz2/win32/plugins/dfxvideo/winsrc/cfg.c Added

@@ -0,0 +1,1296 @@
+/***************************************************************************
+ cfg.c - description
+ -------------------
+ begin : Sun Oct 28 2001
+ copyright : (C) 2001 by Pete Bernert
+ email : BlackDove@addcom.de
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+#define _IN_CFG
+
+#include "externals.h"
+#include "cfg.h"
+#include "gpu.h"
+#include "record.h"
+
+/////////////////////////////////////////////////////////////////////////////
+// globals
+
+char szKeyDefaults[11]={VK_DELETE,VK_INSERT,VK_HOME,VK_END,VK_PRIOR,VK_NEXT,VK_MULTIPLY,VK_SUBTRACT,VK_ADD,VK_F12,0x00};
+char szDevName[128];
+
+////////////////////////////////////////////////////////////////////////
+// prototypes
+
+BOOL OnInitCfgDialog(HWND hW); 
+void OnCfgOK(HWND hW); 
+BOOL OnInitSoftDialog(HWND hW);
+void OnSoftOK(HWND hW); 
+void OnCfgCancel(HWND hW); 
+void OnCfgDef1(HWND hW);
+void OnCfgDef2(HWND hW);
+void OnBugFixes(HWND hW);
+
+void OnRecording(HWND hW);
+
+void SelectDev(HWND hW);
+BOOL bTestModes(void);
+void OnKeyConfig(HWND hW);
+void GetSettings(HWND hW);
+void OnClipboard(HWND hW);
+void DoDevEnum(HWND hW);
+char * pGetConfigInfos(int iCfg);
+
+////////////////////////////////////////////////////////////////////////
+// funcs
+
+BOOL CALLBACK SoftDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+ switch(uMsg)
+ {
+ case WM_INITDIALOG:
+ return OnInitSoftDialog(hW);
+
+ case WM_COMMAND:
+ {
+ switch(LOWORD(wParam))
+ {
+ case IDC_DISPMODE1: 
+ {
+ CheckDlgButton(hW,IDC_DISPMODE2,FALSE);
+ return TRUE;
+ }
+ case IDC_DISPMODE2: 
+ {
+ CheckDlgButton(hW,IDC_DISPMODE1,FALSE);
+ return TRUE;
+ }
+ case IDC_DEF1: OnCfgDef1(hW); return TRUE;
+ case IDC_DEF2: OnCfgDef2(hW); return TRUE;
+ case IDC_SELFIX: OnBugFixes(hW); return TRUE;
+ case IDC_KEYCONFIG: OnKeyConfig(hW); return TRUE;
+ case IDC_SELDEV: SelectDev(hW); return TRUE;
+ case IDCANCEL: OnCfgCancel(hW); return TRUE;
+ case IDOK: OnSoftOK(hW); return TRUE;
+ case IDC_CLIPBOARD: OnClipboard(hW); return TRUE;
+
+ case IDC_RECORDING: OnRecording(hW); return TRUE;
+ }
+ }
+ }
+ return FALSE;
+}
+
+////////////////////////////////////////////////////////////////////////
+// init dlg
+////////////////////////////////////////////////////////////////////////
+
+void ComboBoxAddRes(HWND hWC,char * cs)
+{
+ int i=ComboBox_FindString(hWC,-1,cs);
+ if(i!=CB_ERR) return;
+ ComboBox_AddString(hWC,cs);
+}
+
+BOOL OnInitSoftDialog(HWND hW) 
+{
+ HWND hWC;char cs[256];int i;DEVMODE dv;
+
+ ReadConfig(); // read registry stuff
+
+ if(szDevName[0])
+ SetDlgItemText(hW,IDC_DEVICETXT,szDevName);
+
+ hWC=GetDlgItem(hW,IDC_RESOLUTION);
+
+ memset(&dv,0,sizeof(DEVMODE));
+ dv.dmSize=sizeof(DEVMODE);
+ i=0;
+
+ while(EnumDisplaySettings(NULL,i,&dv))
+ {
+ wsprintf(cs,"%4d x %4d - default",dv.dmPelsWidth,dv.dmPelsHeight);
+ ComboBoxAddRes(hWC,cs);
+ if(dv.dmDisplayFrequency > 40 && dv.dmDisplayFrequency < 200 )
+ {
+	 wsprintf(cs,"%4d x %4d , %4d Hz",dv.dmPelsWidth,dv.dmPelsHeight,dv.dmDisplayFrequency);
+ ComboBoxAddRes(hWC,cs);
+ }
+ i++;
+ }
+
+ ComboBoxAddRes(hWC," 320 x 200 - default");
+ ComboBoxAddRes(hWC," 320 x 240 - default");
+ ComboBoxAddRes(hWC," 400 x 300 - default");
+ ComboBoxAddRes(hWC," 512 x 384 - default");
+ ComboBoxAddRes(hWC," 640 x 480 - default");
+ ComboBoxAddRes(hWC," 800 x 600 - default");
+ ComboBoxAddRes(hWC,"1024 x 768 - default");
+ ComboBoxAddRes(hWC,"1152 x 864 - default");
+ ComboBoxAddRes(hWC,"1280 x 1024 - default");
+ ComboBoxAddRes(hWC,"1600 x 1200 - default");
+
+ if(iRefreshRate)
+ wsprintf(cs,"%4d x %4d , %4d Hz",iResX,iResY,iRefreshRate);
+ else wsprintf(cs,"%4d x %4d - default",iResX,iResY);
+
+ i=ComboBox_FindString(hWC,-1,cs);
+ if(i==CB_ERR) i=0;
+ ComboBox_SetCurSel(hWC,i);
+
+ hWC=GetDlgItem(hW,IDC_COLDEPTH);
+ ComboBox_AddString(hWC,"16 Bit");
+ ComboBox_AddString(hWC,"32 Bit");
+ wsprintf(cs,"%d Bit",iColDepth); // resolution
+ i=ComboBox_FindString(hWC,-1,cs);
+ if(i==CB_ERR) i=0;
+ ComboBox_SetCurSel(hWC,i);
+
+ hWC=GetDlgItem(hW,IDC_SCANLINES);
+ ComboBox_AddString(hWC,"Scanlines disabled");
+ ComboBox_AddString(hWC,"Scanlines enabled (standard)");
+ ComboBox_AddString(hWC,"Scanlines enabled (double blitting - nVidia fix)");
+ ComboBox_SetCurSel(hWC,iUseScanLines);
+
+ SetDlgItemInt(hW,IDC_WINX,LOWORD(iWinSize),FALSE); // window size
+ SetDlgItemInt(hW,IDC_WINY,HIWORD(iWinSize),FALSE);
+
+ if(UseFrameLimit) CheckDlgButton(hW,IDC_USELIMIT,TRUE);
+ if(UseFrameSkip) CheckDlgButton(hW,IDC_USESKIPPING,TRUE);
+ if(iWindowMode) CheckRadioButton(hW,IDC_DISPMODE1,IDC_DISPMODE2,IDC_DISPMODE2);
+ else 	 CheckRadioButton(hW,IDC_DISPMODE1,IDC_DISPMODE2,IDC_DISPMODE1);
+ if(iSysMemory) CheckDlgButton(hW,IDC_SYSMEMORY,TRUE);
+ if(iStopSaver) CheckDlgButton(hW,IDC_STOPSAVER,TRUE);
+ if(iUseFixes) CheckDlgButton(hW,IDC_GAMEFIX,TRUE);
+ if(iShowFPS) CheckDlgButton(hW,IDC_SHOWFPS,TRUE);
+ if(bVsync) CheckDlgButton(hW,IDC_VSYNC,TRUE);
+ if(bTransparent)	 CheckDlgButton(hW,IDC_TRANSPARENT,TRUE);
+ if(iDebugMode)	 CheckDlgButton(hW,IDC_DEBUGMODE,TRUE);
+
+ hWC=GetDlgItem(hW,IDC_NOSTRETCH); // streching
+ ComboBox_AddString(hWC,"Stretch to full window size");
+ ComboBox_AddString(hWC,"1:1 (faster with some cards)");
+ ComboBox_AddString(hWC,"Scale to window size, keep aspect ratio");
+ ComboBox_AddString(hWC,"2xSaI stretching (needs a fast cpu)");
+ ComboBox_AddString(hWC,"2xSaI unstretched (needs a fast cpu)");
+ ComboBox_AddString(hWC,"Super2xSaI stretching (needs a very fast cpu)");
+ ComboBox_AddString(hWC,"Super2xSaI unstretched (needs a very fast cpu)");
+ ComboBox_AddString(hWC,"SuperEagle stretching (needs a fast cpu)");
+ ComboBox_AddString(hWC,"SuperEagle unstretched (needs a fast cpu)");
+ ComboBox_AddString(hWC,"Scale2x stretching (needs a fast cpu)");
+ ComboBox_AddString(hWC,"Scale2x unstretched (needs a fast cpu)");
+ ComboBox_AddString(hWC,"HQ2X unstretched (needs a fast cpu)");
+ ComboBox_AddString(hWC,"HQ2X streched (needs a fast cpu)");
+ ComboBox_AddString(hWC,"Scale3x stretching (needs a fast cpu)");
+ ComboBox_AddString(hWC,"Scale3x unstretched (needs a fast cpu)");
+ ComboBox_AddString(hWC,"HQ3X unstretched (needs a fast cpu)");
+ ComboBox_SetCurSel(hWC,iUseNoStretchBlt);
+
+ hWC=GetDlgItem(hW,IDC_DITHER); // dithering
+ ComboBox_AddString(hWC,"No dithering (fastest)");
+ ComboBox_AddString(hWC,"Game dependend dithering (slow)");
+ ComboBox_AddString(hWC,"Always dither g-shaded polygons (slowest)");
+ ComboBox_SetCurSel(hWC,iUseDither);
+
+ if(iFrameLimit==2) // frame limit wrapper
+ CheckDlgButton(hW,IDC_FRAMEAUTO,TRUE);
+ else CheckDlgButton(hW,IDC_FRAMEMANUELL,TRUE);
+
+ sprintf(cs,"%.1f",fFrameRate);
+ SetDlgItemText(hW,IDC_FRAMELIM,cs); // set frame rate
+
+ return TRUE;
+}
+ 
+////////////////////////////////////////////////////////////////////////
+// on ok: take vals
+////////////////////////////////////////////////////////////////////////
+
+void GetSettings(HWND hW) 
+{
+ HWND hWC;char cs[256];int i,j;char * p;
+
+ hWC=GetDlgItem(hW,IDC_RESOLUTION); // get resolution
+ i=ComboBox_GetCurSel(hWC);
+ ComboBox_GetLBText(hWC,i,cs);
+ iResX=atol(cs);
+ p=strchr(cs,'x');
+ iResY=atol(p+1);
+ p=strchr(cs,',');									 // added by syo
+ if(p) iRefreshRate=atol(p+1);						 // get refreshrate
+ else iRefreshRate=0;
+
+ hWC=GetDlgItem(hW,IDC_COLDEPTH); // get color depth
+ i=ComboBox_GetCurSel(hWC);
+ ComboBox_GetLBText(hWC,i,cs);
+ iColDepth=atol(cs);
+
+ hWC=GetDlgItem(hW,IDC_SCANLINES); // scanlines
+ iUseScanLines=ComboBox_GetCurSel(hWC);
+
+ i=GetDlgItemInt(hW,IDC_WINX,NULL,FALSE); // get win size
+ if(i<50) i=50; if(i>20000) i=20000;
+ j=GetDlgItemInt(hW,IDC_WINY,NULL,FALSE);
+ if(j<50) j=50; if(j>20000) j=20000;
+ iWinSize=MAKELONG(i,j);
+
+ if(IsDlgButtonChecked(hW,IDC_DISPMODE2)) // win mode
+ iWindowMode=1; else iWindowMode=0;
+
+ if(IsDlgButtonChecked(hW,IDC_USELIMIT)) // fps limit
+ UseFrameLimit=1; else UseFrameLimit=0;
+
+ if(IsDlgButtonChecked(hW,IDC_USESKIPPING)) // fps skip
+ UseFrameSkip=1; else UseFrameSkip=0;
+
+ if(IsDlgButtonChecked(hW,IDC_GAMEFIX)) // game fix
+ iUseFixes=1; else iUseFixes=0;
+
+ if(IsDlgButtonChecked(hW,IDC_SYSMEMORY)) // use system memory
+ iSysMemory=1; else iSysMemory=0;
+
+ if(IsDlgButtonChecked(hW,IDC_STOPSAVER)) // stop screen saver
+ iStopSaver=1; else iStopSaver=0;
+
+ if(IsDlgButtonChecked(hW,IDC_VSYNC)) // wait VSYNC
+ bVsync=bVsync_Key=TRUE; else bVsync=bVsync_Key=FALSE;
+
+ if(IsDlgButtonChecked(hW,IDC_TRANSPARENT)) // transparent menu
+ bTransparent=TRUE; else bTransparent=FALSE;
+
+ if(IsDlgButtonChecked(hW,IDC_SHOWFPS)) // show fps
+ iShowFPS=1; else iShowFPS=0;
+
+ if(IsDlgButtonChecked(hW,IDC_DEBUGMODE)) // debug mode
+ iDebugMode=1; else iDebugMode=0;
+
+ hWC=GetDlgItem(hW,IDC_NOSTRETCH);
+ iUseNoStretchBlt=ComboBox_GetCurSel(hWC);
+
+ hWC=GetDlgItem(hW,IDC_DITHER);
+ iUseDither=ComboBox_GetCurSel(hWC);
+
+ if(IsDlgButtonChecked(hW,IDC_FRAMEAUTO)) // frame rate
+ iFrameLimit=2;
+ else iFrameLimit=1;
+
+ GetDlgItemText(hW,IDC_FRAMELIM,cs,255);
+ fFrameRate=(float)atof(cs);
+ if(fFrameRate<10.0f) fFrameRate=10.0f;
+ if(fFrameRate>200.0f) fFrameRate=200.0f;
+}
+
+void OnSoftOK(HWND hW) 
+{
+ GetSettings(hW);
+
+ if(!iWindowMode && !bTestModes()) // check fullscreen sets
+ {
+ MessageBox(hW,"Resolution/color depth not supported!","Error",MB_ICONERROR|MB_OK);
+ return;
+ }
+
+ WriteConfig(); // write registry
+
+ EndDialog(hW,TRUE);
+}
+
+////////////////////////////////////////////////////////////////////////
+// on clipboard button
+////////////////////////////////////////////////////////////////////////
+
+void OnClipboard(HWND hW)
+{
+ HWND hWE=GetDlgItem(hW,IDC_CLPEDIT);
+ char * pB;
+ GetSettings(hW);
+ pB=pGetConfigInfos(1);
+
+ if(pB)
+ {
+ SetDlgItemText(hW,IDC_CLPEDIT,pB);
+ SendMessage(hWE,EM_SETSEL,0,-1);
+ SendMessage(hWE,WM_COPY,0,0);
+ free(pB);
+ MessageBox(hW,"Configuration info successfully copied to the clipboard\nJust use the PASTE function in another program to retrieve the data!","Copy Info",MB_ICONINFORMATION|MB_OK);
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+// Cancel
+////////////////////////////////////////////////////////////////////////
+
+void OnCfgCancel(HWND hW) 
+{
+ EndDialog(hW,FALSE);
+}
+
+////////////////////////////////////////////////////////////////////////
+// Bug fixes
+////////////////////////////////////////////////////////////////////////
+
+BOOL CALLBACK BugFixesDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+ switch(uMsg)
+ {
+ case WM_INITDIALOG:
+ {
+ int i;
+
+ for(i=0;i<32;i++)
+ {
+ if(dwCfgFixes&(1<<i))
+ CheckDlgButton(hW,IDC_FIX1+i,TRUE);
+ }
+ }
+
+ case WM_COMMAND:
+ {
+ switch(LOWORD(wParam))
+ {
+ case IDCANCEL: EndDialog(hW,FALSE);return TRUE;
+
+ case IDOK: 
+ {
+ int i;
+ dwCfgFixes=0;
+ for(i=0;i<32;i++)
+ {
+ if(IsDlgButtonChecked(hW,IDC_FIX1+i))
+ dwCfgFixes|=(1<<i);
+ }
+ EndDialog(hW,TRUE);
+ return TRUE;
+ }
+ }
+ }
+ }
+ return FALSE;
+}
+
+void OnBugFixes(HWND hW)
+{
+ DialogBox(hInst,MAKEINTRESOURCE(IDD_FIXES),
+ hW,(DLGPROC)BugFixesDlgProc);
+}
+
+////////////////////////////////////////////////////////////////////////
+// Recording options
+////////////////////////////////////////////////////////////////////////
+
+void RefreshCodec(HWND hW)
+{
+char buffer[255];
+union {
+	char chFCC[5];
+	DWORD dwFCC;
+	} fcc;
+ICINFO icinfo;
+memset(&icinfo,0,sizeof(icinfo));
+icinfo.dwSize = sizeof(icinfo);
+strcpy(fcc.chFCC,"VIDC");
+RECORD_COMPRESSION1.hic = ICOpen(fcc.dwFCC,RECORD_COMPRESSION1.fccHandler,ICMODE_QUERY);
+if(RECORD_COMPRESSION1.hic)
+	{
+	ICGetInfo(RECORD_COMPRESSION1.hic,&icinfo,sizeof(icinfo));
+	ICClose(RECORD_COMPRESSION1.hic);
+	wsprintf(buffer,"16 bit Compression: %ws",icinfo.szDescription);
+	}
+else
+	wsprintf(buffer,"16 bit Compression: Full Frames (Uncompressed)");
+SetDlgItemText(hW,IDC_COMPRESSION1,buffer);
+
+memset(&icinfo,0,sizeof(icinfo));
+icinfo.dwSize = sizeof(icinfo);
+RECORD_COMPRESSION2.hic = ICOpen(fcc.dwFCC,RECORD_COMPRESSION2.fccHandler,ICMODE_QUERY);
+if(RECORD_COMPRESSION2.hic)
+	{
+	ICGetInfo(RECORD_COMPRESSION2.hic,&icinfo,sizeof(icinfo));
+	ICClose(RECORD_COMPRESSION2.hic);
+	wsprintf(buffer,"24 bit Compression: %ws",icinfo.szDescription);
+	}
+else
+	wsprintf(buffer,"24 bit Compression: Full Frames (Uncompressed)");
+SetDlgItemText(hW,IDC_COMPRESSION2,buffer);
+}
+
+
+BOOL CALLBACK RecordingDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+ switch(uMsg)
+ {
+ case WM_INITDIALOG:
+ {
+	 HWND hWC;
+ CheckDlgButton(hW,IDC_REC_MODE1,RECORD_RECORDING_MODE==0);
+ CheckDlgButton(hW,IDC_REC_MODE2,RECORD_RECORDING_MODE==1);
+ hWC = GetDlgItem(hW,IDC_VIDEO_SIZE);
+ ComboBox_ResetContent(hWC);
+ ComboBox_AddString(hWC,"Full");
+ ComboBox_AddString(hWC,"Half");
+ ComboBox_AddString(hWC,"Quarter");
+ ComboBox_SetCurSel(hWC,RECORD_VIDEO_SIZE);
+
+ SetDlgItemInt(hW,IDC_REC_WIDTH,RECORD_RECORDING_WIDTH,FALSE);
+ SetDlgItemInt(hW,IDC_REC_HEIGHT,RECORD_RECORDING_HEIGHT,FALSE);
+
+ hWC = GetDlgItem(hW,IDC_FRAME_RATE);
+ ComboBox_ResetContent(hWC);
+ ComboBox_AddString(hWC,"1");
+ ComboBox_AddString(hWC,"2");
+ ComboBox_AddString(hWC,"3");
+ ComboBox_AddString(hWC,"4");
+ ComboBox_AddString(hWC,"5");
+ ComboBox_AddString(hWC,"6");
+ ComboBox_AddString(hWC,"7");
+ ComboBox_AddString(hWC,"8");
+ ComboBox_SetCurSel(hWC,RECORD_FRAME_RATE_SCALE);
+ CheckDlgButton(hW,IDC_COMPRESSION1,RECORD_COMPRESSION_MODE==0);
+ CheckDlgButton(hW,IDC_COMPRESSION2,RECORD_COMPRESSION_MODE==1);
+ RefreshCodec(hW);
+ }
+
+ case WM_COMMAND:
+ {
+ switch(LOWORD(wParam))
+ {
+ case IDC_RECCFG:
+	 {
+		if(IsDlgButtonChecked(hW,IDC_COMPRESSION1))
+			{
+			BITMAPINFOHEADER bitmap = {40,640,480,1,16,0,640*480*2,2048,2048,0,0};
+			if(!ICCompressorChoose(hW,ICMF_CHOOSE_DATARATE|ICMF_CHOOSE_KEYFRAME,&bitmap,NULL,&RECORD_COMPRESSION1,"16 bit Compression")) return TRUE;
+			if(RECORD_COMPRESSION1.cbState>sizeof(RECORD_COMPRESSION_STATE1))
+				{
+				memset(&RECORD_COMPRESSION1,0,sizeof(RECORD_COMPRESSION1));
+				memset(&RECORD_COMPRESSION_STATE1,0,sizeof(RECORD_COMPRESSION_STATE1));
+				RECORD_COMPRESSION1.cbSize	= sizeof(RECORD_COMPRESSION1);
+				}
+			else
+				{
+				if(RECORD_COMPRESSION1.lpState!=RECORD_COMPRESSION_STATE1)
+					memcpy(RECORD_COMPRESSION_STATE1,RECORD_COMPRESSION1.lpState,RECORD_COMPRESSION1.cbState);
+				}
+			RECORD_COMPRESSION1.lpState = RECORD_COMPRESSION_STATE1;
+			}
+		else
+			{
+			BITMAPINFOHEADER bitmap = {40,640,480,1,24,0,640*480*3,2048,2048,0,0};
+			if(!ICCompressorChoose(hW,ICMF_CHOOSE_DATARATE|ICMF_CHOOSE_KEYFRAME,&bitmap,NULL,&RECORD_COMPRESSION2,"24 bit Compression")) return TRUE;
+			if(RECORD_COMPRESSION2.cbState>sizeof(RECORD_COMPRESSION_STATE2))
+				{
+				memset(&RECORD_COMPRESSION2,0,sizeof(RECORD_COMPRESSION2));
+				memset(&RECORD_COMPRESSION_STATE2,0,sizeof(RECORD_COMPRESSION_STATE2));
+				RECORD_COMPRESSION2.cbSize	= sizeof(RECORD_COMPRESSION2);
+				}
+			else
+				{
+				if(RECORD_COMPRESSION2.lpState!=RECORD_COMPRESSION_STATE2)
+					memcpy(RECORD_COMPRESSION_STATE2,RECORD_COMPRESSION2.lpState,RECORD_COMPRESSION2.cbState);
+				}
+			RECORD_COMPRESSION2.lpState = RECORD_COMPRESSION_STATE2;
+			}
+		RefreshCodec(hW);
+		return TRUE;
+		}
+ case IDCANCEL: EndDialog(hW,FALSE);return TRUE;
+
+ case IDOK: 
+ {
+		HWND hWC;
+		if(IsDlgButtonChecked(hW,IDC_REC_MODE1))	RECORD_RECORDING_MODE = 0;
+		else										RECORD_RECORDING_MODE = 1;
+		hWC = GetDlgItem(hW,IDC_VIDEO_SIZE);
+		RECORD_VIDEO_SIZE = ComboBox_GetCurSel(hWC);
+		RECORD_RECORDING_WIDTH = GetDlgItemInt(hW,IDC_REC_WIDTH,NULL,FALSE);
+		RECORD_RECORDING_HEIGHT = GetDlgItemInt(hW,IDC_REC_HEIGHT,NULL,FALSE);
+		hWC = GetDlgItem(hW,IDC_FRAME_RATE);
+		RECORD_FRAME_RATE_SCALE = ComboBox_GetCurSel(hWC);
+		if(IsDlgButtonChecked(hW,IDC_COMPRESSION1))	RECORD_COMPRESSION_MODE = 0;
+		else										RECORD_COMPRESSION_MODE = 1;
+ EndDialog(hW,TRUE);
+ return TRUE;
+ }
+ }
+ }
+ }
+ return FALSE;
+}
+
+void OnRecording(HWND hW)
+{
+ DialogBox(hInst,MAKEINTRESOURCE(IDD_RECORDING),
+ hW,(DLGPROC)RecordingDlgProc);
+
+}
+
+
+////////////////////////////////////////////////////////////////////////
+// default 1: fast
+////////////////////////////////////////////////////////////////////////
+
+void OnCfgDef1(HWND hW) 
+{
+ HWND hWC;
+ 
+ hWC=GetDlgItem(hW,IDC_RESOLUTION);
+ ComboBox_SetCurSel(hWC,1);
+ hWC=GetDlgItem(hW,IDC_COLDEPTH);
+ ComboBox_SetCurSel(hWC,0);
+ hWC=GetDlgItem(hW,IDC_SCANLINES);
+ ComboBox_SetCurSel(hWC,0);
+ CheckDlgButton(hW,IDC_USELIMIT,FALSE);
+ CheckDlgButton(hW,IDC_USESKIPPING,TRUE);
+ CheckRadioButton(hW,IDC_DISPMODE1,IDC_DISPMODE2,IDC_DISPMODE1);
+ CheckDlgButton(hW,IDC_FRAMEAUTO,FALSE);
+ CheckDlgButton(hW,IDC_FRAMEMANUELL,TRUE);
+ CheckDlgButton(hW,IDC_SHOWFPS,FALSE);
+ hWC=GetDlgItem(hW,IDC_NOSTRETCH);
+ ComboBox_SetCurSel(hWC,1);
+ hWC=GetDlgItem(hW,IDC_DITHER);
+ ComboBox_SetCurSel(hWC,0);
+ SetDlgItemInt(hW,IDC_FRAMELIM,200,FALSE);
+ SetDlgItemInt(hW,IDC_WINX,320,FALSE);
+ SetDlgItemInt(hW,IDC_WINY,240,FALSE);
+ CheckDlgButton(hW,IDC_VSYNC,FALSE);
+ CheckDlgButton(hW,IDC_TRANSPARENT,TRUE);
+ CheckDlgButton(hW,IDC_DEBUGMODE,FALSE);
+} 
+
+////////////////////////////////////////////////////////////////////////
+// default 2: nice
+////////////////////////////////////////////////////////////////////////
+ 
+void OnCfgDef2(HWND hW) 
+{
+ HWND hWC;
+ 
+ hWC=GetDlgItem(hW,IDC_RESOLUTION);
+ ComboBox_SetCurSel(hWC,2);
+ hWC=GetDlgItem(hW,IDC_COLDEPTH);
+ ComboBox_SetCurSel(hWC,0);
+ hWC=GetDlgItem(hW,IDC_SCANLINES);
+ ComboBox_SetCurSel(hWC,0);
+ CheckDlgButton(hW,IDC_USELIMIT,TRUE);
+ CheckDlgButton(hW,IDC_USESKIPPING,FALSE);
+ CheckRadioButton(hW,IDC_DISPMODE1,IDC_DISPMODE2,IDC_DISPMODE1);
+ CheckDlgButton(hW,IDC_FRAMEAUTO,TRUE);
+ CheckDlgButton(hW,IDC_FRAMEMANUELL,FALSE);
+ CheckDlgButton(hW,IDC_SHOWFPS,FALSE);
+ CheckDlgButton(hW,IDC_VSYNC,FALSE);
+ CheckDlgButton(hW,IDC_TRANSPARENT,TRUE);
+ CheckDlgButton(hW,IDC_DEBUGMODE,FALSE);
+ hWC=GetDlgItem(hW,IDC_NOSTRETCH);
+ ComboBox_SetCurSel(hWC,0);
+ hWC=GetDlgItem(hW,IDC_DITHER);
+ ComboBox_SetCurSel(hWC,2);
+
+ SetDlgItemInt(hW,IDC_FRAMELIM,200,FALSE);
+ SetDlgItemInt(hW,IDC_WINX,640,FALSE);
+ SetDlgItemInt(hW,IDC_WINY,480,FALSE);
+}
+ 
+////////////////////////////////////////////////////////////////////////
+// read registry
+////////////////////////////////////////////////////////////////////////
+
+void ReadConfig(void)
+{
+ HKEY myKey;
+ DWORD temp;
+ DWORD type; 
+ DWORD size;
+
+ // predefines
+ iResX=640;iResY=480;
+ iColDepth=16;
+ iWindowMode=0;
+ UseFrameLimit=1;
+ UseFrameSkip=0;
+ iFrameLimit=2;
+ fFrameRate=200.0f;
+ iWinSize=MAKELONG(640,480);
+ dwCfgFixes=0;
+ iUseFixes=0;
+ iUseGammaVal=2048;
+ iUseScanLines=0;
+ iUseNoStretchBlt=0;
+ iUseDither=0;
+ iShowFPS=0;
+ iSysMemory=0;
+ iStopSaver=1;
+ bVsync=FALSE;
+ bTransparent=FALSE;
+ iRefreshRate=0;
+ iDebugMode=0;
+ lstrcpy(szGPUKeys,szKeyDefaults);
+
+ memset(szDevName,0,128);
+ memset(&guiDev,0,sizeof(GUID));
+
+ // standard Windows psx config (registry)
+ if(RegOpenKeyEx(HKEY_CURRENT_USER,"Software\\Vision Thing\\PSEmu Pro\\GPU\\DFXVideo",0,KEY_ALL_ACCESS,&myKey)==ERROR_SUCCESS)
+ {
+ size = 4;
+ if(RegQueryValueEx(myKey,"ResX",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iResX=(int)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"ResY",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iResY=(int)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"RefreshRate",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iRefreshRate=(int)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"WinSize",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iWinSize=(int)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"WindowMode",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iWindowMode=(int)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"ColDepth",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iColDepth=(int)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"UseFrameLimit",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ UseFrameLimit=(int)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"UseFrameSkip",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ UseFrameSkip=(int)temp;
+ size = 4; 
+ if(RegQueryValueEx(myKey,"FrameLimit",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iFrameLimit=(int)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"CfgFixes",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ dwCfgFixes=(int)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"UseFixes",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iUseFixes=(int)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"UseScanLines",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iUseScanLines=(int)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"ShowFPS",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iShowFPS=(int)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"UseNoStrechBlt",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iUseNoStretchBlt=(int)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"UseDither",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iUseDither=(int)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"UseGamma",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iUseGammaVal=(int)temp;
+ if(!iFrameLimit) {UseFrameLimit=0;UseFrameSkip=0;iFrameLimit=2;}
+
+ // try to get the float framerate... if none: take int framerate
+ fFrameRate=0.0f;
+ size = 4;
+ if(RegQueryValueEx(myKey,"FrameRateFloat",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ fFrameRate=*((float *)(&temp));
+ if(fFrameRate==0.0f)
+ {
+ fFrameRate=200.0f;
+ size = 4;
+ if(RegQueryValueEx(myKey,"FrameRate",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ fFrameRate=(float)temp;
+ }
+
+ size = 4;
+ if(RegQueryValueEx(myKey,"UseSysMemory",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iSysMemory=(int)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"StopSaver",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iStopSaver=(int)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"WaitVSYNC",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ bVsync=bVsync_Key=(BOOL)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"Transparent",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ bTransparent=(BOOL)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"DebugMode",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iDebugMode=(BOOL)temp;
+ size=11;
+ RegQueryValueEx(myKey,"GPUKeys",0,&type,(LPBYTE)&szGPUKeys,&size);
+ size=128;
+ RegQueryValueEx(myKey,"DeviceName",0,&type,(LPBYTE)szDevName,&size);
+ size=sizeof(GUID);
+ RegQueryValueEx(myKey,"GuiDev",0,&type,(LPBYTE)&guiDev,&size);
+
+//
+// Recording options
+//
+#define GetDWORD(xa,xb) size=4;if(RegQueryValueEx(myKey,xa,0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS) xb=(unsigned long)temp;
+#define GetBINARY(xa,xb) size=sizeof(xb);RegQueryValueEx(myKey,xa,0,&type,(LPBYTE)&xb,&size);
+	
+ GetDWORD("RecordingMode",				 RECORD_RECORDING_MODE);
+ GetDWORD("RecordingVideoSize",			 RECORD_VIDEO_SIZE);
+ GetDWORD("RecordingWidth",				 RECORD_RECORDING_WIDTH);
+ GetDWORD("RecordingHeight",				RECORD_RECORDING_HEIGHT);
+ GetDWORD("RecordingFrameRateScale",		RECORD_FRAME_RATE_SCALE);
+ GetDWORD("RecordingCompressionMode",	 RECORD_COMPRESSION_MODE);
+ GetBINARY("RecordingCompression1",		 RECORD_COMPRESSION1);
+ GetBINARY("RecordingCompressionState1",	RECORD_COMPRESSION_STATE1);
+ GetBINARY("RecordingCompression2",		 RECORD_COMPRESSION2);
+ GetBINARY("RecordingCompressionState2",	RECORD_COMPRESSION_STATE2);
+
+ if(RECORD_RECORDING_WIDTH>1024) RECORD_RECORDING_WIDTH = 1024;
+ if(RECORD_RECORDING_HEIGHT>768) RECORD_RECORDING_HEIGHT = 768;
+ if(RECORD_VIDEO_SIZE>2) RECORD_VIDEO_SIZE = 2;
+ if(RECORD_FRAME_RATE_SCALE>7) RECORD_FRAME_RATE_SCALE = 7;
+ if(RECORD_COMPRESSION1.cbSize != sizeof(RECORD_COMPRESSION1))
+ {
+ memset(&RECORD_COMPRESSION1,0,sizeof(RECORD_COMPRESSION1));
+ RECORD_COMPRESSION1.cbSize = sizeof(RECORD_COMPRESSION1);
+ }
+ RECORD_COMPRESSION1.lpState = RECORD_COMPRESSION_STATE1;
+ if(RECORD_COMPRESSION2.cbSize != sizeof(RECORD_COMPRESSION2))
+ {
+ memset(&RECORD_COMPRESSION2,0,sizeof(RECORD_COMPRESSION2));
+ RECORD_COMPRESSION2.cbSize = sizeof(RECORD_COMPRESSION2);
+ }
+ RECORD_COMPRESSION2.lpState = RECORD_COMPRESSION_STATE2;
+
+//
+// end of recording options
+//
+
+ RegCloseKey(myKey);
+ }
+
+ if(!iColDepth) iColDepth=32;
+ if(iUseFixes) dwActFixes=dwCfgFixes;
+ SetFixes();
+
+ if(iUseGammaVal<0 || iUseGammaVal>1536) iUseGammaVal=2048;
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void ReadWinSizeConfig(void)
+{
+ HKEY myKey;
+ DWORD temp;
+ DWORD type; 
+ DWORD size;
+
+ iResX=640;iResY=480;
+ iWinSize=MAKELONG(320,240);
+
+ if (RegOpenKeyEx(HKEY_CURRENT_USER,"Software\\Vision Thing\\PSEmu Pro\\GPU\\DFXVideo",0,KEY_ALL_ACCESS,&myKey)==ERROR_SUCCESS)
+ {
+ size = 4;
+ if(RegQueryValueEx(myKey,"ResX",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iResX=(int)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"ResY",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iResY=(int)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"WinSize",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iWinSize=(int)temp;
+
+ RegCloseKey(myKey);
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+// write registry
+////////////////////////////////////////////////////////////////////////
+
+void WriteConfig(void)
+{
+ HKEY myKey;
+ DWORD myDisp;
+ DWORD temp;
+ 
+ RegCreateKeyEx(HKEY_CURRENT_USER,"Software\\Vision Thing\\PSEmu Pro\\GPU\\DFXVideo",0,NULL,REG_OPTION_NON_VOLATILE,KEY_ALL_ACCESS,NULL,&myKey,&myDisp);
+ temp=iResX;
+ RegSetValueEx(myKey,"ResX",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=iResY;
+ RegSetValueEx(myKey,"ResY",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=iRefreshRate;
+ RegSetValueEx(myKey,"RefreshRate",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=iWinSize;
+ RegSetValueEx(myKey,"WinSize",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=iWindowMode;
+ RegSetValueEx(myKey,"WindowMode",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=iColDepth;
+ RegSetValueEx(myKey,"ColDepth",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=UseFrameLimit;
+ RegSetValueEx(myKey,"UseFrameLimit",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=UseFrameSkip;
+ RegSetValueEx(myKey,"UseFrameSkip",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=dwCfgFixes;
+ RegSetValueEx(myKey,"CfgFixes",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=iUseFixes;
+ RegSetValueEx(myKey,"UseFixes",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=iUseScanLines;
+ RegSetValueEx(myKey,"UseScanLines",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=iShowFPS;
+ RegSetValueEx(myKey,"ShowFPS",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=iUseNoStretchBlt;
+ RegSetValueEx(myKey,"UseNoStrechBlt",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=iUseDither;
+ RegSetValueEx(myKey,"UseDither",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=iFrameLimit;
+ RegSetValueEx(myKey,"FrameLimit",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=iUseGammaVal;
+ RegSetValueEx(myKey,"UseGamma",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=(DWORD)fFrameRate;
+ RegSetValueEx(myKey,"FrameRate",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=*((DWORD *)&fFrameRate);
+ RegSetValueEx(myKey,"FrameRateFloat",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=bVsync;
+ RegSetValueEx(myKey,"WaitVSYNC",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=bTransparent;
+ RegSetValueEx(myKey,"Transparent",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=iSysMemory;
+ RegSetValueEx(myKey,"UseSysMemory",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=iStopSaver;
+ RegSetValueEx(myKey,"StopSaver",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=iDebugMode;
+ RegSetValueEx(myKey,"DebugMode",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ RegSetValueEx(myKey,"GPUKeys",0,REG_BINARY,(LPBYTE)szGPUKeys,11);
+ RegSetValueEx(myKey,"DeviceName",0,REG_BINARY,(LPBYTE)szDevName,128); 
+ RegSetValueEx(myKey,"GuiDev",0,REG_BINARY,(LPBYTE)&guiDev,sizeof(GUID));
+
+//
+// Recording options
+//
+if(RECORD_COMPRESSION1.cbState>sizeof(RECORD_COMPRESSION_STATE1) || RECORD_COMPRESSION1.lpState!=RECORD_COMPRESSION_STATE1)
+	{
+	memset(&RECORD_COMPRESSION1,0,sizeof(RECORD_COMPRESSION1));
+	memset(&RECORD_COMPRESSION_STATE1,0,sizeof(RECORD_COMPRESSION_STATE1));
+	RECORD_COMPRESSION1.cbSize	= sizeof(RECORD_COMPRESSION1);
+	RECORD_COMPRESSION1.lpState = RECORD_COMPRESSION_STATE1;
+	}
+if(RECORD_COMPRESSION2.cbState>sizeof(RECORD_COMPRESSION_STATE2) || RECORD_COMPRESSION2.lpState!=RECORD_COMPRESSION_STATE2)
+	{
+	memset(&RECORD_COMPRESSION2,0,sizeof(RECORD_COMPRESSION2));
+	memset(&RECORD_COMPRESSION_STATE2,0,sizeof(RECORD_COMPRESSION_STATE2));
+	RECORD_COMPRESSION2.cbSize	= sizeof(RECORD_COMPRESSION2);
+	RECORD_COMPRESSION2.lpState = RECORD_COMPRESSION_STATE2;
+	}
+
+#define SetDWORD(xa,xb) RegSetValueEx(myKey,xa,0,REG_DWORD,(LPBYTE)&xb,sizeof(xb));
+#define SetBINARY(xa,xb) RegSetValueEx(myKey,xa,0,REG_BINARY,(LPBYTE)&xb,sizeof(xb));
+
+SetDWORD("RecordingMode",				RECORD_RECORDING_MODE);
+SetDWORD("RecordingVideoSize",			RECORD_VIDEO_SIZE);
+SetDWORD("RecordingWidth",				RECORD_RECORDING_WIDTH);
+SetDWORD("RecordingHeight",				RECORD_RECORDING_HEIGHT);
+SetDWORD("RecordingFrameRateScale",		RECORD_FRAME_RATE_SCALE);
+SetDWORD("RecordingCompressionMode",	RECORD_COMPRESSION_MODE);
+SetBINARY("RecordingCompression1",		RECORD_COMPRESSION1);
+SetBINARY("RecordingCompressionState1",	RECORD_COMPRESSION_STATE1);
+SetBINARY("RecordingCompression2",		RECORD_COMPRESSION2);
+SetBINARY("RecordingCompressionState2",	RECORD_COMPRESSION_STATE2);
+//
+//
+//
+ RegCloseKey(myKey);
+}
+
+////////////////////////////////////////////////////////////////////////
+
+HWND gHWND;
+
+static HRESULT WINAPI Enum3DDevicesCallback( GUID* pGUID, LPSTR strDesc,
+ LPSTR strName, LPD3DDEVICEDESC pHALDesc, 
+ LPD3DDEVICEDESC pHELDesc, LPVOID pvContext )
+{
+ BOOL IsHardware;
+
+ // Check params
+ if( NULL==pGUID || NULL==pHALDesc || NULL==pHELDesc)
+ return D3DENUMRET_CANCEL;
+
+ // Handle specific device GUIDs. NullDevice renders nothing
+ if( IsEqualGUID( pGUID, &IID_IDirect3DNullDevice ) )
+ return D3DENUMRET_OK;
+
+ IsHardware = ( 0 != pHALDesc->dwFlags );
+ if(!IsHardware) return D3DENUMRET_OK;
+ 
+ bDeviceOK=TRUE;
+
+ return D3DENUMRET_OK;
+}
+
+static BOOL WINAPI DirectDrawEnumCallbackEx( GUID FAR* pGUID, LPSTR strDesc,
+ LPSTR strName, VOID* pV,
+ HMONITOR hMonitor )
+{
+ // Use the GUID to create the DirectDraw object, so that information
+ // can be extracted from it.
+
+ LPDIRECTDRAW pDD;
+ LPDIRECTDRAW4 g_pDD;
+ LPDIRECT3D3 pD3D;
+ HRESULT (WINAPI *pDDrawCreateFn)(GUID *,LPDIRECTDRAW *,IUnknown *);
+
+ pDDrawCreateFn = (LPVOID)GetProcAddress( hDDrawDLL, "DirectDrawCreate" );
+
+ if( pDDrawCreateFn == NULL || FAILED( pDDrawCreateFn( pGUID, &pDD, 0L ) ) )
+ {
+ return D3DENUMRET_OK;
+ }
+
+ // Query the DirectDraw driver for access to Direct3D.
+ if( FAILED(IDirectDraw_QueryInterface(pDD, &IID_IDirectDraw4, (VOID**)&g_pDD)))
+ {
+ IDirectDraw_Release(pDD);
+ return D3DENUMRET_OK;
+ }
+ IDirectDraw_Release(pDD);
+
+ // Query the DirectDraw driver for access to Direct3D.
+
+ if( FAILED( IDirectDraw4_QueryInterface(g_pDD,&IID_IDirect3D3, (VOID**)&pD3D)))
+ {
+ IDirectDraw4_Release(g_pDD);
+ return D3DENUMRET_OK;
+ }
+
+ bDeviceOK=FALSE;
+
+ // Now, enumerate all the 3D devices
+ IDirect3D3_EnumDevices(pD3D,Enum3DDevicesCallback,NULL);
+
+ if(bDeviceOK)
+ {
+ HWND hWC=GetDlgItem(gHWND,IDC_DEVICE);
+ int i=ComboBox_AddString(hWC,strDesc);
+ GUID * g=(GUID *)malloc(sizeof(GUID));
+ if(NULL != pGUID) *g=*pGUID;
+ else memset(g,0,sizeof(GUID));
+ ComboBox_SetItemData(hWC,i,g);
+ }
+
+ IDirect3D3_Release(pD3D);
+ IDirectDraw4_Release(g_pDD);
+ return DDENUMRET_OK;
+}
+
+//-----------------------------------------------------------------------------
+
+static BOOL WINAPI DirectDrawEnumCallback( GUID FAR* pGUID, LPSTR strDesc,
+ LPSTR strName, VOID* pV)
+{
+ return DirectDrawEnumCallbackEx( pGUID, strDesc, strName, NULL, NULL );
+}
+
+//-----------------------------------------------------------------------------
+
+void DoDevEnum(HWND hW)
+{
+ LPDIRECTDRAWENUMERATEEX pDDrawEnumFn;
+
+ gHWND=hW;
+
+ pDDrawEnumFn = (LPVOID)GetProcAddress(hDDrawDLL, "DirectDrawEnumerateExA");
+
+ if (pDDrawEnumFn != NULL)
+ pDDrawEnumFn( DirectDrawEnumCallbackEx, NULL,
+ DDENUM_ATTACHEDSECONDARYDEVICES |
+ DDENUM_DETACHEDSECONDARYDEVICES |
+ DDENUM_NONDISPLAYDEVICES );
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void FreeGui(HWND hW)
+{
+ int i,iCnt;
+ HWND hWC=GetDlgItem(hW,IDC_DEVICE);
+ iCnt=ComboBox_GetCount(hWC);
+ for(i=0;i<iCnt;i++)
+ {
+ free((GUID *)ComboBox_GetItemData(hWC,i));
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+BOOL CALLBACK DeviceDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+ switch(uMsg)
+ {
+ case WM_INITDIALOG:
+ {
+ HWND hWC;int i;
+ DoDevEnum(hW);
+ hWC=GetDlgItem(hW,IDC_DEVICE);
+ i=ComboBox_FindStringExact(hWC,-1,szDevName);
+ if(i==CB_ERR) i=0;
+ ComboBox_SetCurSel(hWC,i);
+ hWC=GetDlgItem(hW,IDC_GAMMA);
+ ScrollBar_SetRange(hWC,0,1024,FALSE);
+ if(iUseGammaVal==2048) ScrollBar_SetPos(hWC,512,FALSE);
+ else
+ {
+ ScrollBar_SetPos(hWC,iUseGammaVal,FALSE);
+ CheckDlgButton(hW,IDC_USEGAMMA,TRUE);
+ }
+ }
+
+ case WM_HSCROLL:
+ {
+ HWND hWC=GetDlgItem(hW,IDC_GAMMA);
+ int pos=ScrollBar_GetPos(hWC);
+ switch(LOWORD(wParam))
+ {
+ case SB_THUMBPOSITION: 
+ pos=HIWORD(wParam);break; 
+ case SB_LEFT:
+ pos=0;break;
+ case SB_RIGHT: 
+ pos=1024;break;
+ case SB_LINELEFT:
+ pos-=16;break;
+ case SB_LINERIGHT:
+ pos+=16;break;
+ case SB_PAGELEFT: 
+ pos-=128;break;
+ case SB_PAGERIGHT: 
+ pos+=128;break;
+
+ }
+ ScrollBar_SetPos(hWC,pos,TRUE);
+ return TRUE;
+ }
+
+ case WM_COMMAND:
+ {
+ switch(LOWORD(wParam))
+ {
+ case IDCANCEL: FreeGui(hW);
+ EndDialog(hW,FALSE);return TRUE;
+ case IDOK: 
+ {
+ HWND hWC=GetDlgItem(hW,IDC_DEVICE);
+ int i=ComboBox_GetCurSel(hWC);
+ if(i==CB_ERR) return TRUE;
+ guiDev=*((GUID *)ComboBox_GetItemData(hWC,i));
+ ComboBox_GetLBText(hWC,i,szDevName);
+ FreeGui(hW);
+
+ if(!IsDlgButtonChecked(hW,IDC_USEGAMMA))
+ iUseGammaVal=2048;
+ else
+ iUseGammaVal=ScrollBar_GetPos(GetDlgItem(hW,IDC_GAMMA));
+
+ EndDialog(hW,TRUE);
+ return TRUE;
+ }
+ }
+ }
+ }
+ return FALSE;
+} 
+
+////////////////////////////////////////////////////////////////////////
+
+void SelectDev(HWND hW)
+{
+ if(DialogBox(hInst,MAKEINTRESOURCE(IDD_DEVICE),
+ hW,(DLGPROC)DeviceDlgProc)==IDOK)
+ {
+ SetDlgItemText(hW,IDC_DEVICETXT,szDevName);
+ }
+}
+
+
+////////////////////////////////////////////////////////////////////////
+
+static HRESULT WINAPI EnumDisplayModesCallback( DDSURFACEDESC2* pddsd,
+ VOID* pvContext )
+{
+ if(NULL==pddsd) return DDENUMRET_CANCEL;
+
+ if(pddsd->ddpfPixelFormat.dwRGBBitCount==(unsigned int)iColDepth &&
+ pddsd->dwWidth==(unsigned int)iResX &&
+ pddsd->dwHeight==(unsigned int)iResY)
+ {
+ bDeviceOK=TRUE;
+ return DDENUMRET_CANCEL;
+ }
+
+ return DDENUMRET_OK;
+}
+
+////////////////////////////////////////////////////////////////////////
+
+BOOL bTestModes(void)
+{
+ LPDIRECTDRAW pDD;
+ LPDIRECTDRAW4 g_pDD;
+ HRESULT (WINAPI *pDDrawCreateFn)(GUID *,LPDIRECTDRAW *,IUnknown *);
+
+ GUID FAR * guid=0;
+ int i;unsigned char * c=(unsigned char *)&guiDev;
+ for(i=0;i<sizeof(GUID);i++,c++)
+ {if(*c) {guid=&guiDev;break;}}
+
+ bDeviceOK=FALSE;
+
+ pDDrawCreateFn = (LPVOID)GetProcAddress(hDDrawDLL, "DirectDrawCreate");
+
+ if( pDDrawCreateFn == NULL || FAILED( pDDrawCreateFn(guid, &pDD, 0L ) ) )
+ {
+ return FALSE;
+ }
+
+ if(FAILED(IDirectDraw_QueryInterface(pDD, &IID_IDirectDraw4, (VOID**)&g_pDD)))
+ {
+ IDirectDraw_Release(pDD);
+ return FALSE;
+ }
+ IDirectDraw_Release(pDD);
+
+ IDirectDraw4_EnumDisplayModes(g_pDD,0,NULL,NULL,EnumDisplayModesCallback);
+
+ IDirectDraw4_Release(g_pDD);
+
+ return bDeviceOK;
+}
+
+////////////////////////////////////////////////////////////////////////
+// define key dialog
+////////////////////////////////////////////////////////////////////////
+
+typedef struct KEYSETSTAG
+{
+ char szName[10];
+ char cCode;
+}
+KEYSETS;
+
+KEYSETS tMKeys[]=
+{
+ {"SPACE", 0x20},
+ {"PRIOR", 0x21},
+ {"NEXT", 0x22},
+ {"END", 0x23},
+ {"HOME", 0x24},
+ {"LEFT", 0x25},
+ {"UP", 0x26},
+ {"RIGHT", 0x27},
+ {"DOWN", 0x28},
+ {"SELECT", 0x29},
+ {"PRINT", 0x2A},
+ {"EXECUTE", 0x2B},
+ {"SNAPSHOT", 0x2C},
+ {"INSERT", 0x2D},
+ {"DELETE", 0x2E},
+ {"HELP", 0x2F},
+ {"NUMPAD0", 0x60},
+ {"NUMPAD1", 0x61},
+ {"NUMPAD2", 0x62},
+ {"NUMPAD3", 0x63},
+ {"NUMPAD4", 0x64},
+ {"NUMPAD5", 0x65},
+ {"NUMPAD6", 0x66},
+ {"NUMPAD7", 0x67},
+ {"NUMPAD8", 0x68},
+ {"NUMPAD9", 0x69},
+ {"MULTIPLY", 0x6A},
+ {"ADD", 0x6B},
+ {"SEPARATOR", 0x6C},
+ {"SUBTRACT", 0x6D},
+ {"DECIMAL", 0x6E},
+ {"DIVIDE", 0x6F},
+ {"F9", VK_F9},
+ {"F10", VK_F10},
+ {"F11", VK_F11},
+ {"F12", VK_F12},
+ {"", 0x00}
+};
+
+void SetGPUKey(HWND hWC,char szKey)
+{
+ int i,iCnt=ComboBox_GetCount(hWC);
+ for(i=0;i<iCnt;i++)
+ {
+ if(ComboBox_GetItemData(hWC,i)==szKey) break;
+ }
+ if(i!=iCnt) ComboBox_SetCurSel(hWC,i);
+} 
+
+BOOL CALLBACK KeyDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+ switch(uMsg)
+ {
+ case WM_INITDIALOG:
+ {
+ int i,j,k;char szB[2];HWND hWC;
+ for(i=IDC_KEY1;i<=IDC_KEY10;i++)
+ {
+ hWC=GetDlgItem(hW,i);
+
+ for(j=0;tMKeys[j].cCode!=0;j++)
+ {
+ k=ComboBox_AddString(hWC,tMKeys[j].szName);
+ ComboBox_SetItemData(hWC,k,tMKeys[j].cCode);
+ }
+ for(j=0x30;j<=0x39;j++)
+ {
+ wsprintf(szB,"%c",j);
+ k=ComboBox_AddString(hWC,szB);
+ ComboBox_SetItemData(hWC,k,j);
+ }
+ for(j=0x41;j<=0x5a;j++)
+ {
+ wsprintf(szB,"%c",j);
+ k=ComboBox_AddString(hWC,szB);
+ ComboBox_SetItemData(hWC,k,j);
+ } 
+ SetGPUKey(GetDlgItem(hW,i),szGPUKeys[i-IDC_KEY1]);
+ }
+ }return TRUE;
+
+ case WM_COMMAND:
+ {
+ switch(LOWORD(wParam))
+ {
+ case IDC_DEFAULT: 
+ {
+ int i;
+ for(i=IDC_KEY1;i<=IDC_KEY10;i++)
+ SetGPUKey(GetDlgItem(hW,i),szKeyDefaults[i-IDC_KEY1]);
+ }break;
+
+ case IDCANCEL: EndDialog(hW,FALSE); return TRUE;
+ case IDOK:
+ {
+ HWND hWC;int i;
+ for(i=IDC_KEY1;i<=IDC_KEY10;i++)
+ {
+ hWC=GetDlgItem(hW,i);
+ szGPUKeys[i-IDC_KEY1]=(char)ComboBox_GetItemData(hWC,ComboBox_GetCurSel(hWC));
+ if(szGPUKeys[i-IDC_KEY1]<0x20) szGPUKeys[i-IDC_KEY1]=0x20;
+ }
+ EndDialog(hW,TRUE); 
+ return TRUE;
+ }
+ }
+ }
+ }
+ return FALSE;
+}
+
+void OnKeyConfig(HWND hW) 
+{
+ DialogBox(hInst,MAKEINTRESOURCE(IDD_KEYS),
+ hW,(DLGPROC)KeyDlgProc);
+}
+

pcsxr-1.9.93.tar.bz2/win32/plugins/dfxvideo/winsrc/d3d.h Added

@@ -0,0 +1,1530 @@
+/*
+ * Copyright (C) the Wine project
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef __WINE_D3D_H
+#define __WINE_D3D_H
+
+#include <stdlib.h>
+
+#define COM_NO_WINDOWS_H
+#include <objbase.h>
+#include <d3dtypes.h> /* must precede d3dcaps.h */
+#include <d3dcaps.h>
+
+/*****************************************************************************
+ * Predeclare the interfaces
+ */
+DEFINE_GUID(IID_IDirect3D, 0x3BBA0080,0x2421,0x11CF,0xA3,0x1A,0x00,0xAA,0x00,0xB9,0x33,0x56);
+DEFINE_GUID(IID_IDirect3D2, 0x6aae1ec1,0x662a,0x11d0,0x88,0x9d,0x00,0xaa,0x00,0xbb,0xb7,0x6a);
+DEFINE_GUID(IID_IDirect3D3, 0xbb223240,0xe72b,0x11d0,0xa9,0xb4,0x00,0xaa,0x00,0xc0,0x99,0x3e);
+DEFINE_GUID(IID_IDirect3D7, 0xf5049e77,0x4861,0x11d2,0xa4,0x07,0x00,0xa0,0xc9,0x06,0x29,0xa8);
+
+DEFINE_GUID(IID_IDirect3DRampDevice,	0xF2086B20,0x259F,0x11CF,0xA3,0x1A,0x00,0xAA,0x00,0xB9,0x33,0x56);
+DEFINE_GUID(IID_IDirect3DRGBDevice,	0xA4665C60,0x2673,0x11CF,0xA3,0x1A,0x00,0xAA,0x00,0xB9,0x33,0x56);
+DEFINE_GUID(IID_IDirect3DHALDevice,	0x84E63dE0,0x46AA,0x11CF,0x81,0x6F,0x00,0x00,0xC0,0x20,0x15,0x6E);
+DEFINE_GUID(IID_IDirect3DMMXDevice,	0x881949a1,0xd6f3,0x11d0,0x89,0xab,0x00,0xa0,0xc9,0x05,0x41,0x29);
+DEFINE_GUID(IID_IDirect3DRefDevice, 0x50936643,0x13e9,0x11d1,0x89,0xaa,0x00,0xa0,0xc9,0x05,0x41,0x29);
+DEFINE_GUID(IID_IDirect3DTnLHalDevice, 0xf5049e78,0x4861,0x11d2,0xa4,0x07,0x00,0xa0,0xc9,0x06,0x29,0xa8);
+DEFINE_GUID(IID_IDirect3DNullDevice, 0x8767df22,0xbacc,0x11d1,0x89,0x69,0x00,0xa0,0xc9,0x06,0x29,0xa8);
+
+DEFINE_GUID(IID_IDirect3DDevice,	0x64108800,0x957d,0x11D0,0x89,0xAB,0x00,0xA0,0xC9,0x05,0x41,0x29);
+DEFINE_GUID(IID_IDirect3DDevice2,	0x93281501,0x8CF8,0x11D0,0x89,0xAB,0x00,0xA0,0xC9,0x05,0x41,0x29);
+DEFINE_GUID(IID_IDirect3DDevice3, 0xb0ab3b60,0x33d7,0x11d1,0xa9,0x81,0x00,0xc0,0x4f,0xd7,0xb1,0x74);
+DEFINE_GUID(IID_IDirect3DDevice7, 0xf5049e79,0x4861,0x11d2,0xa4,0x07,0x00,0xa0,0xc9,0x06,0x29,0xa8);
+
+DEFINE_GUID(IID_IDirect3DTexture,	0x2CDCD9E0,0x25A0,0x11CF,0xA3,0x1A,0x00,0xAA,0x00,0xB9,0x33,0x56);
+DEFINE_GUID(IID_IDirect3DTexture2,	0x93281502,0x8CF8,0x11D0,0x89,0xAB,0x00,0xA0,0xC9,0x05,0x41,0x29);
+
+DEFINE_GUID(IID_IDirect3DLight,		0x4417C142,0x33AD,0x11CF,0x81,0x6F,0x00,0x00,0xC0,0x20,0x15,0x6E);
+
+DEFINE_GUID(IID_IDirect3DMaterial,	0x4417C144,0x33AD,0x11CF,0x81,0x6F,0x00,0x00,0xC0,0x20,0x15,0x6E);
+DEFINE_GUID(IID_IDirect3DMaterial2,	0x93281503,0x8CF8,0x11D0,0x89,0xAB,0x00,0xA0,0xC9,0x05,0x41,0x29);
+DEFINE_GUID(IID_IDirect3DMaterial3, 0xca9c46f4,0xd3c5,0x11d1,0xb7,0x5a,0x00,0x60,0x08,0x52,0xb3,0x12);
+
+DEFINE_GUID(IID_IDirect3DExecuteBuffer,	0x4417C145,0x33AD,0x11CF,0x81,0x6F,0x00,0x00,0xC0,0x20,0x15,0x6E);
+
+DEFINE_GUID(IID_IDirect3DViewport,	0x4417C146,0x33AD,0x11CF,0x81,0x6F,0x00,0x00,0xC0,0x20,0x15,0x6E);
+DEFINE_GUID(IID_IDirect3DViewport2,	0x93281500,0x8CF8,0x11D0,0x89,0xAB,0x00,0xA0,0xC9,0x05,0x41,0x29);
+DEFINE_GUID(IID_IDirect3DViewport3, 0xb0ab3b61,0x33d7,0x11d1,0xa9,0x81,0x00,0xc0,0x4f,0xd7,0xb1,0x74);
+
+DEFINE_GUID(IID_IDirect3DVertexBuffer, 0x7a503555,0x4a83,0x11d1,0xa5,0xdb,0x00,0xa0,0xc9,0x03,0x67,0xf8);
+DEFINE_GUID(IID_IDirect3DVertexBuffer7, 0xf5049e7d,0x4861,0x11d2,0xa4,0x07,0x00,0xa0,0xc9,0x06,0x29,0xa8);
+
+
+typedef struct IDirect3D *LPDIRECT3D;
+typedef struct IDirect3D2 *LPDIRECT3D2;
+typedef struct IDirect3D3 *LPDIRECT3D3;
+typedef struct IDirect3D7 *LPDIRECT3D7;
+
+typedef struct IDirect3DLight *LPDIRECT3DLIGHT;
+
+typedef struct IDirect3DDevice *LPDIRECT3DDEVICE;
+typedef struct IDirect3DDevice2 *LPDIRECT3DDEVICE2;
+typedef struct IDirect3DDevice3 *LPDIRECT3DDEVICE3;
+typedef struct IDirect3DDevice7 *LPDIRECT3DDEVICE7;
+
+typedef struct IDirect3DViewport *LPDIRECT3DVIEWPORT;
+typedef struct IDirect3DViewport2 *LPDIRECT3DVIEWPORT2;
+typedef struct IDirect3DViewport3 *LPDIRECT3DVIEWPORT3;
+
+typedef struct IDirect3DMaterial *LPDIRECT3DMATERIAL;
+typedef struct IDirect3DMaterial2 *LPDIRECT3DMATERIAL2;
+typedef struct IDirect3DMaterial3 *LPDIRECT3DMATERIAL3;
+
+typedef struct IDirect3DTexture *LPDIRECT3DTEXTURE;
+typedef struct IDirect3DTexture2 *LPDIRECT3DTEXTURE2;
+
+typedef struct IDirect3DExecuteBuffer *LPDIRECT3DEXECUTEBUFFER;
+
+typedef struct IDirect3DVertexBuffer *LPDIRECT3DVERTEXBUFFER;
+typedef struct IDirect3DVertexBuffer7 *LPDIRECT3DVERTEXBUFFER7;
+
+/* ********************************************************************
+ Error Codes
+ ******************************************************************** */
+#define D3D_OK DD_OK
+#define D3DERR_BADMAJORVERSION MAKE_DDHRESULT(700)
+#define D3DERR_BADMINORVERSION MAKE_DDHRESULT(701)
+#define D3DERR_INVALID_DEVICE MAKE_DDHRESULT(705)
+#define D3DERR_INITFAILED MAKE_DDHRESULT(706)
+#define D3DERR_DEVICEAGGREGATED MAKE_DDHRESULT(707)
+#define D3DERR_EXECUTE_CREATE_FAILED MAKE_DDHRESULT(710)
+#define D3DERR_EXECUTE_DESTROY_FAILED MAKE_DDHRESULT(711)
+#define D3DERR_EXECUTE_LOCK_FAILED MAKE_DDHRESULT(712)
+#define D3DERR_EXECUTE_UNLOCK_FAILED MAKE_DDHRESULT(713)
+#define D3DERR_EXECUTE_LOCKED MAKE_DDHRESULT(714)
+#define D3DERR_EXECUTE_NOT_LOCKED MAKE_DDHRESULT(715)
+#define D3DERR_EXECUTE_FAILED MAKE_DDHRESULT(716)
+#define D3DERR_EXECUTE_CLIPPED_FAILED MAKE_DDHRESULT(717)
+#define D3DERR_TEXTURE_NO_SUPPORT MAKE_DDHRESULT(720)
+#define D3DERR_TEXTURE_CREATE_FAILED MAKE_DDHRESULT(721)
+#define D3DERR_TEXTURE_DESTROY_FAILED MAKE_DDHRESULT(722)
+#define D3DERR_TEXTURE_LOCK_FAILED MAKE_DDHRESULT(723)
+#define D3DERR_TEXTURE_UNLOCK_FAILED MAKE_DDHRESULT(724)
+#define D3DERR_TEXTURE_LOAD_FAILED MAKE_DDHRESULT(725)
+#define D3DERR_TEXTURE_SWAP_FAILED MAKE_DDHRESULT(726)
+#define D3DERR_TEXTURE_LOCKED MAKE_DDHRESULT(727)
+#define D3DERR_TEXTURE_NOT_LOCKED MAKE_DDHRESULT(728)
+#define D3DERR_TEXTURE_GETSURF_FAILED MAKE_DDHRESULT(729)
+#define D3DERR_MATRIX_CREATE_FAILED MAKE_DDHRESULT(730)
+#define D3DERR_MATRIX_DESTROY_FAILED MAKE_DDHRESULT(731)
+#define D3DERR_MATRIX_SETDATA_FAILED MAKE_DDHRESULT(732)
+#define D3DERR_MATRIX_GETDATA_FAILED MAKE_DDHRESULT(733)
+#define D3DERR_SETVIEWPORTDATA_FAILED MAKE_DDHRESULT(734)
+#define D3DERR_INVALIDCURRENTVIEWPORT MAKE_DDHRESULT(735)
+#define D3DERR_INVALIDPRIMITIVETYPE MAKE_DDHRESULT(736)
+#define D3DERR_INVALIDVERTEXTYPE MAKE_DDHRESULT(737)
+#define D3DERR_TEXTURE_BADSIZE MAKE_DDHRESULT(738)
+#define D3DERR_INVALIDRAMPTEXTURE MAKE_DDHRESULT(739)
+#define D3DERR_MATERIAL_CREATE_FAILED MAKE_DDHRESULT(740)
+#define D3DERR_MATERIAL_DESTROY_FAILED MAKE_DDHRESULT(741)
+#define D3DERR_MATERIAL_SETDATA_FAILED MAKE_DDHRESULT(742)
+#define D3DERR_MATERIAL_GETDATA_FAILED MAKE_DDHRESULT(743)
+#define D3DERR_INVALIDPALETTE MAKE_DDHRESULT(744)
+#define D3DERR_ZBUFF_NEEDS_SYSTEMMEMORY MAKE_DDHRESULT(745)
+#define D3DERR_ZBUFF_NEEDS_VIDEOMEMORY MAKE_DDHRESULT(746)
+#define D3DERR_SURFACENOTINVIDMEM MAKE_DDHRESULT(747)
+#define D3DERR_LIGHT_SET_FAILED MAKE_DDHRESULT(750)
+#define D3DERR_LIGHTHASVIEWPORT MAKE_DDHRESULT(751)
+#define D3DERR_LIGHTNOTINTHISVIEWPORT MAKE_DDHRESULT(752)
+#define D3DERR_SCENE_IN_SCENE MAKE_DDHRESULT(760)
+#define D3DERR_SCENE_NOT_IN_SCENE MAKE_DDHRESULT(761)
+#define D3DERR_SCENE_BEGIN_FAILED MAKE_DDHRESULT(762)
+#define D3DERR_SCENE_END_FAILED MAKE_DDHRESULT(763)
+#define D3DERR_INBEGIN MAKE_DDHRESULT(770)
+#define D3DERR_NOTINBEGIN MAKE_DDHRESULT(771)
+#define D3DERR_NOVIEWPORTS MAKE_DDHRESULT(772)
+#define D3DERR_VIEWPORTDATANOTSET MAKE_DDHRESULT(773)
+#define D3DERR_VIEWPORTHASNODEVICE MAKE_DDHRESULT(774)
+#define D3DERR_NOCURRENTVIEWPORT MAKE_DDHRESULT(775)
+#define D3DERR_INVALIDVERTEXFORMAT	MAKE_DDHRESULT(2048)
+#define D3DERR_COLORKEYATTACHED MAKE_DDHRESULT(2050)
+#define D3DERR_VERTEXBUFFEROPTIMIZED	MAKE_DDHRESULT(2060)
+#define D3DERR_VBUF_CREATE_FAILED	MAKE_DDHRESULT(2061)
+#define D3DERR_VERTEXBUFFERLOCKED	MAKE_DDHRESULT(2062)
+#define D3DERR_VERTEXBUFFERUNLOCKFAILED	MAKE_DDHRESULT(2063)
+#define D3DERR_ZBUFFER_NOTPRESENT	MAKE_DDHRESULT(2070)
+#define D3DERR_STENCILBUFFER_NOTPRESENT	MAKE_DDHRESULT(2071)
+
+#define D3DERR_WRONGTEXTUREFORMAT		MAKE_DDHRESULT(2072)
+#define D3DERR_UNSUPPORTEDCOLOROPERATION	MAKE_DDHRESULT(2073)
+#define D3DERR_UNSUPPORTEDCOLORARG		MAKE_DDHRESULT(2074)
+#define D3DERR_UNSUPPORTEDALPHAOPERATION	MAKE_DDHRESULT(2075)
+#define D3DERR_UNSUPPORTEDALPHAARG		MAKE_DDHRESULT(2076)
+#define D3DERR_TOOMANYOPERATIONS		MAKE_DDHRESULT(2077)
+#define D3DERR_CONFLICTINGTEXTUREFILTER		MAKE_DDHRESULT(2078)
+#define D3DERR_UNSUPPORTEDFACTORVALUE		MAKE_DDHRESULT(2079)
+#define D3DERR_CONFLICTINGRENDERSTATE		MAKE_DDHRESULT(2081)
+#define D3DERR_UNSUPPORTEDTEXTUREFILTER		MAKE_DDHRESULT(2082)
+#define D3DERR_TOOMANYPRIMITIVES		MAKE_DDHRESULT(2083)
+#define D3DERR_INVALIDMATRIX			MAKE_DDHRESULT(2084)
+#define D3DERR_TOOMANYVERTICES			MAKE_DDHRESULT(2085)
+#define D3DERR_CONFLICTINGTEXTUREPALETTE	MAKE_DDHRESULT(2086)
+
+#define D3DERR_INVALIDSTATEBLOCK	MAKE_DDHRESULT(2100)
+#define D3DERR_INBEGINSTATEBLOCK	MAKE_DDHRESULT(2101)
+#define D3DERR_NOTINBEGINSTATEBLOCK	MAKE_DDHRESULT(2102)
+
+/* ********************************************************************
+ Enums
+ ******************************************************************** */
+#define D3DNEXT_NEXT 0x01l
+#define D3DNEXT_HEAD 0x02l
+#define D3DNEXT_TAIL 0x04l
+
+#define D3DDP_WAIT 0x00000001l
+#define D3DDP_OUTOFORDER 0x00000002l
+#define D3DDP_DONOTCLIP 0x00000004l
+#define D3DDP_DONOTUPDATEEXTENTS 0x00000008l
+#define D3DDP_DONOTLIGHT 0x00000010l
+
+/* ********************************************************************
+ Types and structures
+ ******************************************************************** */
+typedef DWORD D3DVIEWPORTHANDLE, *LPD3DVIEWPORTHANDLE;
+
+
+/*****************************************************************************
+ * IDirect3D interface
+ */
+#define INTERFACE IDirect3D
+DECLARE_INTERFACE_(IDirect3D,IUnknown)
+{
+ /*** IUnknown methods ***/
+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** IDirect3D methods ***/
+ STDMETHOD(Initialize)(THIS_ REFIID riid) PURE;
+ STDMETHOD(EnumDevices)(THIS_ LPD3DENUMDEVICESCALLBACK lpEnumDevicesCallback, LPVOID lpUserArg) PURE;
+ STDMETHOD(CreateLight)(THIS_ LPDIRECT3DLIGHT *lplpDirect3DLight, IUnknown *pUnkOuter) PURE;
+ STDMETHOD(CreateMaterial)(THIS_ LPDIRECT3DMATERIAL *lplpDirect3DMaterial, IUnknown *pUnkOuter) PURE;
+ STDMETHOD(CreateViewport)(THIS_ LPDIRECT3DVIEWPORT *lplpD3DViewport, IUnknown *pUnkOuter) PURE;
+ STDMETHOD(FindDevice)(THIS_ LPD3DFINDDEVICESEARCH lpD3DDFS, LPD3DFINDDEVICERESULT lplpD3DDevice) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDirect3D_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirect3D_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirect3D_Release(p) (p)->lpVtbl->Release(p)
+/*** IDirect3D methods ***/
+#define IDirect3D_Initialize(p,a) (p)->lpVtbl->Initialize(p,a)
+#define IDirect3D_EnumDevices(p,a,b) (p)->lpVtbl->EnumDevices(p,a,b)
+#define IDirect3D_CreateLight(p,a,b) (p)->lpVtbl->CreateLight(p,a,b)
+#define IDirect3D_CreateMaterial(p,a,b) (p)->lpVtbl->CreateMaterial(p,a,b)
+#define IDirect3D_CreateViewport(p,a,b) (p)->lpVtbl->CreateViewport(p,a,b)
+#define IDirect3D_FindDevice(p,a,b) (p)->lpVtbl->FindDevice(p,a,b)
+#else
+/*** IUnknown methods ***/
+#define IDirect3D_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
+#define IDirect3D_AddRef(p) (p)->AddRef()
+#define IDirect3D_Release(p) (p)->Release()
+/*** IDirect3D methods ***/
+#define IDirect3D_Initialize(p,a) (p)->Initialize(a)
+#define IDirect3D_EnumDevices(p,a,b) (p)->EnumDevices(a,b)
+#define IDirect3D_CreateLight(p,a,b) (p)->CreateLight(a,b)
+#define IDirect3D_CreateMaterial(p,a,b) (p)->CreateMaterial(a,b)
+#define IDirect3D_CreateViewport(p,a,b) (p)->CreateViewport(a,b)
+#define IDirect3D_FindDevice(p,a,b) (p)->FindDevice(a,b)
+#endif
+
+
+/*****************************************************************************
+ * IDirect3D2 interface
+ */
+#define INTERFACE IDirect3D2
+DECLARE_INTERFACE_(IDirect3D2,IUnknown)
+{
+ /*** IUnknown methods ***/
+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** IDirect3D2 methods ***/
+ STDMETHOD(EnumDevices)(THIS_ LPD3DENUMDEVICESCALLBACK lpEnumDevicesCallback, LPVOID lpUserArg) PURE;
+ STDMETHOD(CreateLight)(THIS_ LPDIRECT3DLIGHT *lplpDirect3DLight, IUnknown *pUnkOuter) PURE;
+ STDMETHOD(CreateMaterial)(THIS_ LPDIRECT3DMATERIAL2 *lplpDirect3DMaterial2, IUnknown *pUnkOuter) PURE;
+ STDMETHOD(CreateViewport)(THIS_ LPDIRECT3DVIEWPORT2 *lplpD3DViewport2, IUnknown *pUnkOuter) PURE;
+ STDMETHOD(FindDevice)(THIS_ LPD3DFINDDEVICESEARCH lpD3DDFS, LPD3DFINDDEVICERESULT lpD3DFDR) PURE;
+ STDMETHOD(CreateDevice)(THIS_ REFCLSID rclsid, LPDIRECTDRAWSURFACE lpDDS, LPDIRECT3DDEVICE2 *lplpD3DDevice2) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDirect3D2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirect3D2_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirect3D2_Release(p) (p)->lpVtbl->Release(p)
+/*** IDirect3D2 methods ***/
+#define IDirect3D2_EnumDevices(p,a,b) (p)->lpVtbl->EnumDevices(p,a,b)
+#define IDirect3D2_CreateLight(p,a,b) (p)->lpVtbl->CreateLight(p,a,b)
+#define IDirect3D2_CreateMaterial(p,a,b) (p)->lpVtbl->CreateMaterial(p,a,b)
+#define IDirect3D2_CreateViewport(p,a,b) (p)->lpVtbl->CreateViewport(p,a,b)
+#define IDirect3D2_FindDevice(p,a,b) (p)->lpVtbl->FindDevice(p,a,b)
+#define IDirect3D2_CreateDevice(p,a,b,c) (p)->lpVtbl->CreateDevice(p,a,b,c)
+#else
+/*** IUnknown methods ***/
+#define IDirect3D2_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
+#define IDirect3D2_AddRef(p) (p)->AddRef()
+#define IDirect3D2_Release(p) (p)->Release()
+/*** IDirect3D2 methods ***/
+#define IDirect3D2_EnumDevices(p,a,b) (p)->EnumDevices(a,b)
+#define IDirect3D2_CreateLight(p,a,b) (p)->CreateLight(a,b)
+#define IDirect3D2_CreateMaterial(p,a,b) (p)->CreateMaterial(a,b)
+#define IDirect3D2_CreateViewport(p,a,b) (p)->CreateViewport(a,b)
+#define IDirect3D2_FindDevice(p,a,b) (p)->FindDevice(a,b)
+#define IDirect3D2_CreateDevice(p,a,b,c) (p)->CreateDevice(a,b,c)
+#endif
+
+
+/*****************************************************************************
+ * IDirect3D3 interface
+ */
+#define INTERFACE IDirect3D3
+DECLARE_INTERFACE_(IDirect3D3,IUnknown)
+{
+ /*** IUnknown methods ***/
+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** IDirect3D3 methods ***/
+ STDMETHOD(EnumDevices)(THIS_ LPD3DENUMDEVICESCALLBACK lpEnumDevicesCallback, LPVOID lpUserArg) PURE;
+ STDMETHOD(CreateLight)(THIS_ LPDIRECT3DLIGHT *lplpDirect3DLight, IUnknown *pUnkOuter) PURE;
+ STDMETHOD(CreateMaterial)(THIS_ LPDIRECT3DMATERIAL3 *lplpDirect3DMaterial3, IUnknown *pUnkOuter) PURE;
+ STDMETHOD(CreateViewport)(THIS_ LPDIRECT3DVIEWPORT3 *lplpD3DViewport3, IUnknown *pUnkOuter) PURE;
+ STDMETHOD(FindDevice)(THIS_ LPD3DFINDDEVICESEARCH lpD3DDFS, LPD3DFINDDEVICERESULT lpD3DFDR) PURE;
+ STDMETHOD(CreateDevice)(THIS_ REFCLSID rclsid,LPDIRECTDRAWSURFACE4 lpDDS, LPDIRECT3DDEVICE3 *lplpD3DDevice3,LPUNKNOWN lpUnk) PURE;
+ STDMETHOD(CreateVertexBuffer)(THIS_ LPD3DVERTEXBUFFERDESC lpD3DVertBufDesc,LPDIRECT3DVERTEXBUFFER *lplpD3DVertBuf,DWORD dwFlags,LPUNKNOWN lpUnk) PURE;
+ STDMETHOD(EnumZBufferFormats)(THIS_ REFCLSID riidDevice,LPD3DENUMPIXELFORMATSCALLBACK lpEnumCallback,LPVOID lpContext) PURE;
+ STDMETHOD(EvictManagedTextures)(THIS) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDirect3D3_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirect3D3_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirect3D3_Release(p) (p)->lpVtbl->Release(p)
+/*** IDirect3D3 methods ***/
+#define IDirect3D3_EnumDevices(p,a,b) (p)->lpVtbl->EnumDevices(p,a,b)
+#define IDirect3D3_CreateLight(p,a,b) (p)->lpVtbl->CreateLight(p,a,b)
+#define IDirect3D3_CreateMaterial(p,a,b) (p)->lpVtbl->CreateMaterial(p,a,b)
+#define IDirect3D3_CreateViewport(p,a,b) (p)->lpVtbl->CreateViewport(p,a,b)
+#define IDirect3D3_FindDevice(p,a,b) (p)->lpVtbl->FindDevice(p,a,b)
+#define IDirect3D3_CreateDevice(p,a,b,c,d) (p)->lpVtbl->CreateDevice(p,a,b,c,d)
+#define IDirect3D3_CreateVertexBuffer(p,a,b,c,d) (p)->lpVtbl->CreateVertexBuffer(p,a,b,c,d)
+#define IDirect3D3_EnumZBufferFormats(p,a,b,c) (p)->lpVtbl->EnumZBufferFormats(p,a,b,c)
+#define IDirect3D3_EvictManagedTextures(p) (p)->lpVtbl->EvictManagedTextures(p)
+#else
+/*** IUnknown methods ***/
+#define IDirect3D3_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
+#define IDirect3D3_AddRef(p) (p)->AddRef()
+#define IDirect3D3_Release(p) (p)->Release()
+/*** IDirect3D3 methods ***/
+#define IDirect3D3_EnumDevices(p,a,b) (p)->EnumDevices(a,b)
+#define IDirect3D3_CreateLight(p,a,b) (p)->CreateLight(a,b)
+#define IDirect3D3_CreateMaterial(p,a,b) (p)->CreateMaterial(a,b)
+#define IDirect3D3_CreateViewport(p,a,b) (p)->CreateViewport(a,b)
+#define IDirect3D3_FindDevice(p,a,b) (p)->FindDevice(a,b)
+#define IDirect3D3_CreateDevice(p,a,b,c,d) (p)->CreateDevice(a,b,c,d)
+#define IDirect3D3_CreateVertexBuffer(p,a,b,c,d) (p)->CreateVertexBuffer(a,b,c,d)
+#define IDirect3D3_EnumZBufferFormats(p,a,b,c) (p)->EnumZBufferFormats(a,b,c)
+#define IDirect3D3_EvictManagedTextures(p) (p)->EvictManagedTextures()
+#endif
+
+/*****************************************************************************
+ * IDirect3D7 interface
+ */
+#define INTERFACE IDirect3D7
+DECLARE_INTERFACE_(IDirect3D7,IUnknown)
+{
+ /*** IUnknown methods ***/
+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** IDirect3D7 methods ***/
+ STDMETHOD(EnumDevices)(THIS_ LPD3DENUMDEVICESCALLBACK7 lpEnumDevicesCallback, LPVOID lpUserArg) PURE;
+ STDMETHOD(CreateDevice)(THIS_ REFCLSID rclsid,LPDIRECTDRAWSURFACE7 lpDDS, LPDIRECT3DDEVICE7 *lplpD3DDevice) PURE;
+ STDMETHOD(CreateVertexBuffer)(THIS_ LPD3DVERTEXBUFFERDESC lpD3DVertBufDesc,LPDIRECT3DVERTEXBUFFER7 *lplpD3DVertBuf,DWORD dwFlags) PURE;
+ STDMETHOD(EnumZBufferFormats)(THIS_ REFCLSID riidDevice,LPD3DENUMPIXELFORMATSCALLBACK lpEnumCallback,LPVOID lpContext) PURE;
+ STDMETHOD(EvictManagedTextures)(THIS) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDirect3D7_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirect3D7_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirect3D7_Release(p) (p)->lpVtbl->Release(p)
+/*** IDirect3D3 methods ***/
+#define IDirect3D7_EnumDevices(p,a,b) (p)->lpVtbl->EnumDevices(p,a,b)
+#define IDirect3D7_CreateDevice(p,a,b,c) (p)->lpVtbl->CreateDevice(p,a,b,c)
+#define IDirect3D7_CreateVertexBuffer(p,a,b,c) (p)->lpVtbl->CreateVertexBuffer(p,a,b,c)
+#define IDirect3D7_EnumZBufferFormats(p,a,b,c) (p)->lpVtbl->EnumZBufferFormats(p,a,b,c)
+#define IDirect3D7_EvictManagedTextures(p) (p)->lpVtbl->EvictManagedTextures(p)
+#else
+/*** IUnknown methods ***/
+#define IDirect3D7_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
+#define IDirect3D7_AddRef(p) (p)->AddRef()
+#define IDirect3D7_Release(p) (p)->Release()
+/*** IDirect3D3 methods ***/
+#define IDirect3D7_EnumDevices(p,a,b) (p)->EnumDevices(a,b)
+#define IDirect3D7_CreateDevice(p,a,b,c) (p)->CreateDevice(a,b,c)
+#define IDirect3D7_CreateVertexBuffer(p,a,b,c) (p)->CreateVertexBuffer(a,b,c)
+#define IDirect3D7_EnumZBufferFormats(p,a,b,c) (p)->EnumZBufferFormats(a,b,c)
+#define IDirect3D7_EvictManagedTextures(p) (p)->EvictManagedTextures()
+#endif
+
+
+/*****************************************************************************
+ * IDirect3DLight interface
+ */
+#define INTERFACE IDirect3DLight
+DECLARE_INTERFACE_(IDirect3DLight,IUnknown)
+{
+ /*** IUnknown methods ***/
+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** IDirect3DLight methods ***/
+ STDMETHOD(Initialize)(THIS_ LPDIRECT3D lpDirect3D) PURE;
+ STDMETHOD(SetLight)(THIS_ LPD3DLIGHT lpLight) PURE;
+ STDMETHOD(GetLight)(THIS_ LPD3DLIGHT lpLight) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDirect3DLight_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirect3DLight_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirect3DLight_Release(p) (p)->lpVtbl->Release(p)
+/*** IDirect3DLight methods ***/
+#define IDirect3DLight_Initialize(p,a) (p)->lpVtbl->Initialize(p,a)
+#define IDirect3DLight_SetLight(p,a) (p)->lpVtbl->SetLight(p,a)
+#define IDirect3DLight_GetLight(p,a) (p)->lpVtbl->GetLight(p,a)
+#else
+/*** IUnknown methods ***/
+#define IDirect3DLight_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
+#define IDirect3DLight_AddRef(p) (p)->AddRef()
+#define IDirect3DLight_Release(p) (p)->Release()
+/*** IDirect3DLight methods ***/
+#define IDirect3DLight_Initialize(p,a) (p)->Initialize(a)
+#define IDirect3DLight_SetLight(p,a) (p)->SetLight(a)
+#define IDirect3DLight_GetLight(p,a) (p)->GetLight(a)
+#endif
+
+
+/*****************************************************************************
+ * IDirect3DMaterial interface
+ */
+#define INTERFACE IDirect3DMaterial
+DECLARE_INTERFACE_(IDirect3DMaterial,IUnknown)
+{
+ /*** IUnknown methods ***/
+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** IDirect3DMaterial methods ***/
+ STDMETHOD(Initialize)(THIS_ LPDIRECT3D lpDirect3D) PURE;
+ STDMETHOD(SetMaterial)(THIS_ LPD3DMATERIAL lpMat) PURE;
+ STDMETHOD(GetMaterial)(THIS_ LPD3DMATERIAL lpMat) PURE;
+ STDMETHOD(GetHandle)(THIS_ LPDIRECT3DDEVICE lpDirect3DDevice, LPD3DMATERIALHANDLE lpHandle) PURE;
+ STDMETHOD(Reserve)(THIS) PURE;
+ STDMETHOD(Unreserve)(THIS) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDirect3DMaterial_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirect3DMaterial_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirect3DMaterial_Release(p) (p)->lpVtbl->Release(p)
+/*** IDirect3DMaterial methods ***/
+#define IDirect3DMaterial_Initialize(p,a) (p)->lpVtbl->Initialize(p,a)
+#define IDirect3DMaterial_SetMaterial(p,a) (p)->lpVtbl->SetMaterial(p,a)
+#define IDirect3DMaterial_GetMaterial(p,a) (p)->lpVtbl->GetMaterial(p,a)
+#define IDirect3DMaterial_GetHandle(p,a,b) (p)->lpVtbl->GetHandle(p,a,b)
+#define IDirect3DMaterial_Reserve(p) (p)->lpVtbl->Reserve(p)
+#define IDirect3DMaterial_Unreserve(p) (p)->lpVtbl->Unreserve(p)
+#else
+/*** IUnknown methods ***/
+#define IDirect3DMaterial_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
+#define IDirect3DMaterial_AddRef(p) (p)->AddRef()
+#define IDirect3DMaterial_Release(p) (p)->Release()
+/*** IDirect3DMaterial methods ***/
+#define IDirect3DMaterial_Initialize(p,a) (p)->Initialize(a)
+#define IDirect3DMaterial_SetMaterial(p,a) (p)->SetMaterial(a)
+#define IDirect3DMaterial_GetMaterial(p,a) (p)->GetMaterial(a)
+#define IDirect3DMaterial_GetHandle(p,a,b) (p)->GetHandle(a,b)
+#define IDirect3DMaterial_Reserve(p) (p)->Reserve()
+#define IDirect3DMaterial_Unreserve(p) (p)->Unreserve()
+#endif
+
+
+/*****************************************************************************
+ * IDirect3DMaterial2 interface
+ */
+#define INTERFACE IDirect3DMaterial2
+DECLARE_INTERFACE_(IDirect3DMaterial2,IUnknown)
+{
+ /*** IUnknown methods ***/
+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** IDirect3DMaterial2 methods ***/
+ STDMETHOD(SetMaterial)(THIS_ LPD3DMATERIAL lpMat) PURE;
+ STDMETHOD(GetMaterial)(THIS_ LPD3DMATERIAL lpMat) PURE;
+ STDMETHOD(GetHandle)(THIS_ LPDIRECT3DDEVICE2 lpDirect3DDevice2, LPD3DMATERIALHANDLE lpHandle) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDirect3DMaterial2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirect3DMaterial2_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirect3DMaterial2_Release(p) (p)->lpVtbl->Release(p)
+/*** IDirect3DMaterial2 methods ***/
+#define IDirect3DMaterial2_SetMaterial(p,a) (p)->lpVtbl->SetMaterial(p,a)
+#define IDirect3DMaterial2_GetMaterial(p,a) (p)->lpVtbl->GetMaterial(p,a)
+#define IDirect3DMaterial2_GetHandle(p,a,b) (p)->lpVtbl->GetHandle(p,a,b)
+#else
+/*** IUnknown methods ***/
+#define IDirect3DMaterial2_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
+#define IDirect3DMaterial2_AddRef(p) (p)->AddRef()
+#define IDirect3DMaterial2_Release(p) (p)->Release()
+/*** IDirect3DMaterial2 methods ***/
+#define IDirect3DMaterial2_SetMaterial(p,a) (p)->SetMaterial(a)
+#define IDirect3DMaterial2_GetMaterial(p,a) (p)->GetMaterial(a)
+#define IDirect3DMaterial2_GetHandle(p,a,b) (p)->GetHandle(a,b)
+#endif
+
+
+/*****************************************************************************
+ * IDirect3DMaterial3 interface
+ */
+#define INTERFACE IDirect3DMaterial3
+DECLARE_INTERFACE_(IDirect3DMaterial3,IUnknown)
+{
+ /*** IUnknown methods ***/
+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** IDirect3DMaterial3 methods ***/
+ STDMETHOD(SetMaterial)(THIS_ LPD3DMATERIAL lpMat) PURE;
+ STDMETHOD(GetMaterial)(THIS_ LPD3DMATERIAL lpMat) PURE;
+ STDMETHOD(GetHandle)(THIS_ LPDIRECT3DDEVICE3 lpDirect3DDevice3, LPD3DMATERIALHANDLE lpHandle) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDirect3DMaterial3_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirect3DMaterial3_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirect3DMaterial3_Release(p) (p)->lpVtbl->Release(p)
+/*** IDirect3DMaterial3 methods ***/
+#define IDirect3DMaterial3_SetMaterial(p,a) (p)->lpVtbl->SetMaterial(p,a)
+#define IDirect3DMaterial3_GetMaterial(p,a) (p)->lpVtbl->GetMaterial(p,a)
+#define IDirect3DMaterial3_GetHandle(p,a,b) (p)->lpVtbl->GetHandle(p,a,b)
+#else
+/*** IUnknown methods ***/
+#define IDirect3DMaterial3_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
+#define IDirect3DMaterial3_AddRef(p) (p)->AddRef()
+#define IDirect3DMaterial3_Release(p) (p)->Release()
+/*** IDirect3DMaterial3 methods ***/
+#define IDirect3DMaterial3_SetMaterial(p,a) (p)->SetMaterial(a)
+#define IDirect3DMaterial3_GetMaterial(p,a) (p)->GetMaterial(a)
+#define IDirect3DMaterial3_GetHandle(p,a,b) (p)->GetHandle(a,b)
+#endif
+
+
+/*****************************************************************************
+ * IDirect3DTexture interface
+ */
+#define INTERFACE IDirect3DTexture
+DECLARE_INTERFACE_(IDirect3DTexture,IUnknown)
+{
+ /*** IUnknown methods ***/
+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** IDirect3DTexture methods ***/
+ STDMETHOD(Initialize)(THIS_ LPDIRECT3DDEVICE lpDirect3DDevice, LPDIRECTDRAWSURFACE lpDDSurface) PURE;
+ STDMETHOD(GetHandle)(THIS_ LPDIRECT3DDEVICE lpDirect3DDevice, LPD3DTEXTUREHANDLE lpHandle) PURE;
+ STDMETHOD(PaletteChanged)(THIS_ DWORD dwStart, DWORD dwCount) PURE;
+ STDMETHOD(Load)(THIS_ LPDIRECT3DTEXTURE lpD3DTexture) PURE;
+ STDMETHOD(Unload)(THIS) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDirect3DTexture_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirect3DTexture_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirect3DTexture_Release(p) (p)->lpVtbl->Release(p)
+/*** IDirect3DTexture methods ***/
+#define IDirect3DTexture_Initialize(p,a,b) (p)->lpVtbl->Initialize(p,a,b)
+#define IDirect3DTexture_GetHandle(p,a,b) (p)->lpVtbl->GetHandle(p,a,b)
+#define IDirect3DTexture_PaletteChanged(p,a,b) (p)->lpVtbl->PaletteChanged(p,a,b)
+#define IDirect3DTexture_Load(p,a) (p)->lpVtbl->Load(p,a)
+#define IDirect3DTexture_Unload(p) (p)->lpVtbl->Unload(p)
+#else
+/*** IUnknown methods ***/
+#define IDirect3DTexture_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
+#define IDirect3DTexture_AddRef(p) (p)->AddRef()
+#define IDirect3DTexture_Release(p) (p)->Release()
+/*** IDirect3DTexture methods ***/
+#define IDirect3DTexture_Initialize(p,a,b) (p)->Initialize(a,b)
+#define IDirect3DTexture_GetHandle(p,a,b) (p)->GetHandle(a,b)
+#define IDirect3DTexture_PaletteChanged(p,a,b) (p)->PaletteChanged(a,b)
+#define IDirect3DTexture_Load(p,a) (p)->Load(a)
+#define IDirect3DTexture_Unload(p) (p)->Unload()
+#endif
+
+
+/*****************************************************************************
+ * IDirect3DTexture2 interface
+ */
+#define INTERFACE IDirect3DTexture2
+DECLARE_INTERFACE_(IDirect3DTexture2,IUnknown)
+{
+ /*** IUnknown methods ***/
+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** IDirect3DTexture2 methods ***/
+ STDMETHOD(GetHandle)(THIS_ LPDIRECT3DDEVICE2 lpDirect3DDevice2, LPD3DTEXTUREHANDLE lpHandle) PURE;
+ STDMETHOD(PaletteChanged)(THIS_ DWORD dwStart, DWORD dwCount) PURE;
+ STDMETHOD(Load)(THIS_ LPDIRECT3DTEXTURE2 lpD3DTexture2) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDirect3DTexture2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirect3DTexture2_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirect3DTexture2_Release(p) (p)->lpVtbl->Release(p)
+/*** IDirect3DTexture2 methods ***/
+#define IDirect3DTexture2_GetHandle(p,a,b) (p)->lpVtbl->GetHandle(p,a,b)
+#define IDirect3DTexture2_PaletteChanged(p,a,b) (p)->lpVtbl->PaletteChanged(p,a,b)
+#define IDirect3DTexture2_Load(p,a) (p)->lpVtbl->Load(p,a)
+#else
+/*** IUnknown methods ***/
+#define IDirect3DTexture2_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
+#define IDirect3DTexture2_AddRef(p) (p)->AddRef()
+#define IDirect3DTexture2_Release(p) (p)->Release()
+/*** IDirect3DTexture2 methods ***/
+#define IDirect3DTexture2_GetHandle(p,a,b) (p)->GetHandle(a,b)
+#define IDirect3DTexture2_PaletteChanged(p,a,b) (p)->PaletteChanged(a,b)
+#define IDirect3DTexture2_Load(p,a) (p)->Load(a)
+#endif
+
+
+/*****************************************************************************
+ * IDirect3DViewport interface
+ */
+#define INTERFACE IDirect3DViewport
+DECLARE_INTERFACE_(IDirect3DViewport,IUnknown)
+{
+ /*** IUnknown methods ***/
+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** IDirect3DViewport methods ***/
+ STDMETHOD(Initialize)(THIS_ LPDIRECT3D lpDirect3D) PURE;
+ STDMETHOD(GetViewport)(THIS_ LPD3DVIEWPORT lpData) PURE;
+ STDMETHOD(SetViewport)(THIS_ LPD3DVIEWPORT lpData) PURE;
+ STDMETHOD(TransformVertices)(THIS_ DWORD dwVertexCount, LPD3DTRANSFORMDATA lpData, DWORD dwFlags, LPDWORD lpOffScreen) PURE;
+ STDMETHOD(LightElements)(THIS_ DWORD dwElementCount, LPD3DLIGHTDATA lpData) PURE;
+ STDMETHOD(SetBackground)(THIS_ D3DMATERIALHANDLE hMat) PURE;
+ STDMETHOD(GetBackground)(THIS_ LPD3DMATERIALHANDLE lphMat, LPBOOL lpValid) PURE;
+ STDMETHOD(SetBackgroundDepth)(THIS_ LPDIRECTDRAWSURFACE lpDDSurface) PURE;
+ STDMETHOD(GetBackgroundDepth)(THIS_ LPDIRECTDRAWSURFACE *lplpDDSurface, LPBOOL lpValid) PURE;
+ STDMETHOD(Clear)(THIS_ DWORD dwCount, LPD3DRECT lpRects, DWORD dwFlags) PURE;
+ STDMETHOD(AddLight)(THIS_ LPDIRECT3DLIGHT lpDirect3DLight) PURE;
+ STDMETHOD(DeleteLight)(THIS_ LPDIRECT3DLIGHT lpDirect3DLight) PURE;
+ STDMETHOD(NextLight)(THIS_ LPDIRECT3DLIGHT lpDirect3DLight, LPDIRECT3DLIGHT *lplpDirect3DLight, DWORD dwFlags) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDirect3DViewport_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirect3DViewport_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirect3DViewport_Release(p) (p)->lpVtbl->Release(p)
+/*** IDirect3DViewport methods ***/
+#define IDirect3DViewport_Initialize(p,a) (p)->lpVtbl->Initialize(p,a)
+#define IDirect3DViewport_GetViewport(p,a) (p)->lpVtbl->GetViewport(p,a)
+#define IDirect3DViewport_SetViewport(p,a) (p)->lpVtbl->SetViewport(p,a)
+#define IDirect3DViewport_TransformVertices(p,a,b,c,d) (p)->lpVtbl->TransformVertices(p,a,b,c,d)
+#define IDirect3DViewport_LightElements(p,a,b) (p)->lpVtbl->LightElements(p,a,b)
+#define IDirect3DViewport_SetBackground(p,a) (p)->lpVtbl->SetBackground(p,a)
+#define IDirect3DViewport_GetBackground(p,a,b) (p)->lpVtbl->GetBackground(p,a,b)
+#define IDirect3DViewport_SetBackgroundDepth(p,a) (p)->lpVtbl->SetBackgroundDepth(p,a)
+#define IDirect3DViewport_GetBackgroundDepth(p,a,b) (p)->lpVtbl->GetBackgroundDepth(p,a,b)
+#define IDirect3DViewport_Clear(p,a,b,c) (p)->lpVtbl->Clear(p,a,b,c)
+#define IDirect3DViewport_AddLight(p,a) (p)->lpVtbl->AddLight(p,a)
+#define IDirect3DViewport_DeleteLight(p,a) (p)->lpVtbl->DeleteLight(p,a)
+#define IDirect3DViewport_NextLight(p,a,b,c) (p)->lpVtbl->NextLight(p,a,b,c)
+#else
+/*** IUnknown methods ***/
+#define IDirect3DViewport_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
+#define IDirect3DViewport_AddRef(p) (p)->AddRef()
+#define IDirect3DViewport_Release(p) (p)->Release()
+/*** IDirect3DViewport methods ***/
+#define IDirect3DViewport_Initialize(p,a) (p)->Initialize(a)
+#define IDirect3DViewport_GetViewport(p,a) (p)->GetViewport(a)
+#define IDirect3DViewport_SetViewport(p,a) (p)->SetViewport(a)
+#define IDirect3DViewport_TransformVertices(p,a,b,c,d) (p)->TransformVertices(a,b,c,d)
+#define IDirect3DViewport_LightElements(p,a,b) (p)->LightElements(a,b)
+#define IDirect3DViewport_SetBackground(p,a) (p)->SetBackground(a)
+#define IDirect3DViewport_GetBackground(p,a,b) (p)->GetBackground(a,b)
+#define IDirect3DViewport_SetBackgroundDepth(p,a) (p)->SetBackgroundDepth(a)
+#define IDirect3DViewport_GetBackgroundDepth(p,a,b) (p)->GetBackgroundDepth(a,b)
+#define IDirect3DViewport_Clear(p,a,b,c) (p)->Clear(a,b,c)
+#define IDirect3DViewport_AddLight(p,a) (p)->AddLight(a)
+#define IDirect3DViewport_DeleteLight(p,a) (p)->DeleteLight(a)
+#define IDirect3DViewport_NextLight(p,a,b,c) (p)->NextLight(a,b,c)
+#endif
+
+
+/*****************************************************************************
+ * IDirect3DViewport2 interface
+ */
+#define INTERFACE IDirect3DViewport2
+DECLARE_INTERFACE_(IDirect3DViewport2,IDirect3DViewport)
+{
+ /*** IUnknown methods ***/
+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** IDirect3DViewport methods ***/
+ STDMETHOD(Initialize)(THIS_ LPDIRECT3D lpDirect3D) PURE;
+ STDMETHOD(GetViewport)(THIS_ LPD3DVIEWPORT lpData) PURE;
+ STDMETHOD(SetViewport)(THIS_ LPD3DVIEWPORT lpData) PURE;
+ STDMETHOD(TransformVertices)(THIS_ DWORD dwVertexCount, LPD3DTRANSFORMDATA lpData, DWORD dwFlags, LPDWORD lpOffScreen) PURE;
+ STDMETHOD(LightElements)(THIS_ DWORD dwElementCount, LPD3DLIGHTDATA lpData) PURE;
+ STDMETHOD(SetBackground)(THIS_ D3DMATERIALHANDLE hMat) PURE;
+ STDMETHOD(GetBackground)(THIS_ LPD3DMATERIALHANDLE lphMat, LPBOOL lpValid) PURE;
+ STDMETHOD(SetBackgroundDepth)(THIS_ LPDIRECTDRAWSURFACE lpDDSurface) PURE;
+ STDMETHOD(GetBackgroundDepth)(THIS_ LPDIRECTDRAWSURFACE *lplpDDSurface, LPBOOL lpValid) PURE;
+ STDMETHOD(Clear)(THIS_ DWORD dwCount, LPD3DRECT lpRects, DWORD dwFlags) PURE;
+ STDMETHOD(AddLight)(THIS_ LPDIRECT3DLIGHT lpDirect3DLight) PURE;
+ STDMETHOD(DeleteLight)(THIS_ LPDIRECT3DLIGHT lpDirect3DLight) PURE;
+ STDMETHOD(NextLight)(THIS_ LPDIRECT3DLIGHT lpDirect3DLight, LPDIRECT3DLIGHT *lplpDirect3DLight, DWORD dwFlags) PURE;
+ /*** IDirect3DViewport2 methods ***/
+ STDMETHOD(GetViewport2)(THIS_ LPD3DVIEWPORT2 lpData) PURE;
+ STDMETHOD(SetViewport2)(THIS_ LPD3DVIEWPORT2 lpData) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDirect3DViewport2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirect3DViewport2_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirect3DViewport2_Release(p) (p)->lpVtbl->Release(p)
+/*** IDirect3Viewport methods ***/
+#define IDirect3DViewport2_Initialize(p,a) (p)->lpVtbl->Initialize(p,a)
+#define IDirect3DViewport2_GetViewport(p,a) (p)->lpVtbl->GetViewport(p,a)
+#define IDirect3DViewport2_SetViewport(p,a) (p)->lpVtbl->SetViewport(p,a)
+#define IDirect3DViewport2_TransformVertices(p,a,b,c,d) (p)->lpVtbl->TransformVertices(p,a,b,c,d)
+#define IDirect3DViewport2_LightElements(p,a,b) (p)->lpVtbl->LightElements(p,a,b)
+#define IDirect3DViewport2_SetBackground(p,a) (p)->lpVtbl->SetBackground(p,a)
+#define IDirect3DViewport2_GetBackground(p,a,b) (p)->lpVtbl->GetBackground(p,a,b)
+#define IDirect3DViewport2_SetBackgroundDepth(p,a) (p)->lpVtbl->SetBackgroundDepth(p,a)
+#define IDirect3DViewport2_GetBackgroundDepth(p,a,b) (p)->lpVtbl->GetBackgroundDepth(p,a,b)
+#define IDirect3DViewport2_Clear(p,a,b,c) (p)->lpVtbl->Clear(p,a,b,c)
+#define IDirect3DViewport2_AddLight(p,a) (p)->lpVtbl->AddLight(p,a)
+#define IDirect3DViewport2_DeleteLight(p,a) (p)->lpVtbl->DeleteLight(p,a)
+#define IDirect3DViewport2_NextLight(p,a,b,c) (p)->lpVtbl->NextLight(p,a,b,c)
+/*** IDirect3DViewport2 methods ***/
+#define IDirect3DViewport2_GetViewport2(p,a) (p)->lpVtbl->GetViewport2(p,a)
+#define IDirect3DViewport2_SetViewport2(p,a) (p)->lpVtbl->SetViewport2(p,a)
+#else
+/*** IUnknown methods ***/
+#define IDirect3DViewport2_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
+#define IDirect3DViewport2_AddRef(p) (p)->AddRef()
+#define IDirect3DViewport2_Release(p) (p)->Release()
+/*** IDirect3Viewport methods ***/
+#define IDirect3DViewport2_Initialize(p,a) (p)->Initialize(a)
+#define IDirect3DViewport2_GetViewport(p,a) (p)->GetViewport(a)
+#define IDirect3DViewport2_SetViewport(p,a) (p)->SetViewport(a)
+#define IDirect3DViewport2_TransformVertices(p,a,b,c,d) (p)->TransformVertices(a,b,c,d)
+#define IDirect3DViewport2_LightElements(p,a,b) (p)->LightElements(a,b)
+#define IDirect3DViewport2_SetBackground(p,a) (p)->SetBackground(a)
+#define IDirect3DViewport2_GetBackground(p,a,b) (p)->GetBackground(a,b)
+#define IDirect3DViewport2_SetBackgroundDepth(p,a) (p)->SetBackgroundDepth(a)
+#define IDirect3DViewport2_GetBackgroundDepth(p,a,b) (p)->GetBackgroundDepth(a,b)
+#define IDirect3DViewport2_Clear(p,a,b,c) (p)->Clear(a,b,c)
+#define IDirect3DViewport2_AddLight(p,a) (p)->AddLight(a)
+#define IDirect3DViewport2_DeleteLight(p,a) (p)->DeleteLight(a)
+#define IDirect3DViewport2_NextLight(p,a,b,c) (p)->NextLight(a,b,c)
+/*** IDirect3DViewport2 methods ***/
+#define IDirect3DViewport2_GetViewport2(p,a) (p)->GetViewport2(a)
+#define IDirect3DViewport2_SetViewport2(p,a) (p)->SetViewport2(a)
+#endif
+
+/*****************************************************************************
+ * IDirect3DViewport3 interface
+ */
+#define INTERFACE IDirect3DViewport3
+DECLARE_INTERFACE_(IDirect3DViewport3,IDirect3DViewport2)
+{
+ /*** IUnknown methods ***/
+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** IDirect3DViewport methods ***/
+ STDMETHOD(Initialize)(THIS_ LPDIRECT3D lpDirect3D) PURE;
+ STDMETHOD(GetViewport)(THIS_ LPD3DVIEWPORT lpData) PURE;
+ STDMETHOD(SetViewport)(THIS_ LPD3DVIEWPORT lpData) PURE;
+ STDMETHOD(TransformVertices)(THIS_ DWORD dwVertexCount, LPD3DTRANSFORMDATA lpData, DWORD dwFlags, LPDWORD lpOffScreen) PURE;
+ STDMETHOD(LightElements)(THIS_ DWORD dwElementCount, LPD3DLIGHTDATA lpData) PURE;
+ STDMETHOD(SetBackground)(THIS_ D3DMATERIALHANDLE hMat) PURE;
+ STDMETHOD(GetBackground)(THIS_ LPD3DMATERIALHANDLE lphMat, LPBOOL lpValid) PURE;
+ STDMETHOD(SetBackgroundDepth)(THIS_ LPDIRECTDRAWSURFACE lpDDSurface) PURE;
+ STDMETHOD(GetBackgroundDepth)(THIS_ LPDIRECTDRAWSURFACE *lplpDDSurface, LPBOOL lpValid) PURE;
+ STDMETHOD(Clear)(THIS_ DWORD dwCount, LPD3DRECT lpRects, DWORD dwFlags) PURE;
+ STDMETHOD(AddLight)(THIS_ LPDIRECT3DLIGHT lpDirect3DLight) PURE;
+ STDMETHOD(DeleteLight)(THIS_ LPDIRECT3DLIGHT lpDirect3DLight) PURE;
+ STDMETHOD(NextLight)(THIS_ LPDIRECT3DLIGHT lpDirect3DLight, LPDIRECT3DLIGHT *lplpDirect3DLight, DWORD dwFlags) PURE;
+ /*** IDirect3DViewport2 methods ***/
+ STDMETHOD(GetViewport2)(THIS_ LPD3DVIEWPORT2 lpData) PURE;
+ STDMETHOD(SetViewport2)(THIS_ LPD3DVIEWPORT2 lpData) PURE;
+ /*** IDirect3DViewport3 methods ***/
+ STDMETHOD(SetBackgroundDepth2)(THIS_ LPDIRECTDRAWSURFACE4 lpDDS) PURE;
+ STDMETHOD(GetBackgroundDepth2)(THIS_ LPDIRECTDRAWSURFACE4 *lplpDDS,LPBOOL lpValid) PURE;
+ STDMETHOD(Clear2)(THIS_ DWORD dwCount,LPD3DRECT lpRects,DWORD dwFlags,DWORD dwColor,D3DVALUE dvZ,DWORD dwStencil) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDirect3DViewport3_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirect3DViewport3_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirect3DViewport3_Release(p) (p)->lpVtbl->Release(p)
+/*** IDirect3Viewport methods ***/
+#define IDirect3DViewport3_Initialize(p,a) (p)->lpVtbl->Initialize(p,a)
+#define IDirect3DViewport3_GetViewport(p,a) (p)->lpVtbl->GetViewport(p,a)
+#define IDirect3DViewport3_SetViewport(p,a) (p)->lpVtbl->SetViewport(p,a)
+#define IDirect3DViewport3_TransformVertices(p,a,b,c,d) (p)->lpVtbl->TransformVertices(p,a,b,c,d)
+#define IDirect3DViewport3_LightElements(p,a,b) (p)->lpVtbl->LightElements(p,a,b)
+#define IDirect3DViewport3_SetBackground(p,a) (p)->lpVtbl->SetBackground(p,a)
+#define IDirect3DViewport3_GetBackground(p,a,b) (p)->lpVtbl->GetBackground(p,a,b)
+#define IDirect3DViewport3_SetBackgroundDepth(p,a) (p)->lpVtbl->SetBackgroundDepth(p,a)
+#define IDirect3DViewport3_GetBackgroundDepth(p,a,b) (p)->lpVtbl->GetBackgroundDepth(p,a,b)
+#define IDirect3DViewport3_Clear(p,a,b,c) (p)->lpVtbl->Clear(p,a,b,c)
+#define IDirect3DViewport3_AddLight(p,a) (p)->lpVtbl->AddLight(p,a)
+#define IDirect3DViewport3_DeleteLight(p,a) (p)->lpVtbl->DeleteLight(p,a)
+#define IDirect3DViewport3_NextLight(p,a,b,c) (p)->lpVtbl->NextLight(p,a,b,c)
+/*** IDirect3DViewport2 methods ***/
+#define IDirect3DViewport3_GetViewport2(p,a) (p)->lpVtbl->GetViewport2(p,a)
+#define IDirect3DViewport3_SetViewport2(p,a) (p)->lpVtbl->SetViewport2(p,a)
+/*** IDirect3DViewport3 methods ***/
+#define IDirect3DViewport3_SetBackgroundDepth2(p,a) (p)->lpVtbl->SetBackgroundDepth2(p,a)
+#define IDirect3DViewport3_GetBackgroundDepth2(p,a,b) (p)->lpVtbl->GetBackgroundDepth2(p,a,b)
+#define IDirect3DViewport3_Clear2(p,a,b,c,d,e,f) (p)->lpVtbl->Clear2(p,a,b,c,d,e,f)
+#else
+/*** IUnknown methods ***/
+#define IDirect3DViewport3_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
+#define IDirect3DViewport3_AddRef(p) (p)->AddRef()
+#define IDirect3DViewport3_Release(p) (p)->Release()
+/*** IDirect3Viewport methods ***/
+#define IDirect3DViewport3_Initialize(p,a) (p)->Initialize(a)
+#define IDirect3DViewport3_GetViewport(p,a) (p)->GetViewport(a)
+#define IDirect3DViewport3_SetViewport(p,a) (p)->SetViewport(a)
+#define IDirect3DViewport3_TransformVertices(p,a,b,c,d) (p)->TransformVertices(a,b,c,d)
+#define IDirect3DViewport3_LightElements(p,a,b) (p)->LightElements(a,b)
+#define IDirect3DViewport3_SetBackground(p,a) (p)->SetBackground(a)
+#define IDirect3DViewport3_GetBackground(p,a,b) (p)->GetBackground(a,b)
+#define IDirect3DViewport3_SetBackgroundDepth(p,a) (p)->SetBackgroundDepth(a)
+#define IDirect3DViewport3_GetBackgroundDepth(p,a,b) (p)->GetBackgroundDepth(a,b)
+#define IDirect3DViewport3_Clear(p,a,b,c) (p)->Clear(a,b,c)
+#define IDirect3DViewport3_AddLight(p,a) (p)->AddLight(a)
+#define IDirect3DViewport3_DeleteLight(p,a) (p)->DeleteLight(a)
+#define IDirect3DViewport3_NextLight(p,a,b,c) (p)->NextLight(a,b,c)
+/*** IDirect3DViewport2 methods ***/
+#define IDirect3DViewport3_GetViewport2(p,a) (p)->GetViewport2(a)
+#define IDirect3DViewport3_SetViewport2(p,a) (p)->SetViewport2(a)
+/*** IDirect3DViewport3 methods ***/
+#define IDirect3DViewport3_SetBackgroundDepth2(p,a) (p)->SetBackgroundDepth2(a)
+#define IDirect3DViewport3_GetBackgroundDepth2(p,a,b) (p)->GetBackgroundDepth2(a,b)
+#define IDirect3DViewport3_Clear2(p,a,b,c,d,e,f) (p)->Clear2(a,b,c,d,e,f)
+#endif
+
+
+
+/*****************************************************************************
+ * IDirect3DExecuteBuffer interface
+ */
+#define INTERFACE IDirect3DExecuteBuffer
+DECLARE_INTERFACE_(IDirect3DExecuteBuffer,IUnknown)
+{
+ /*** IUnknown methods ***/
+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** IDirect3DExecuteBuffer methods ***/
+ STDMETHOD(Initialize)(THIS_ LPDIRECT3DDEVICE lpDirect3DDevice, LPD3DEXECUTEBUFFERDESC lpDesc) PURE;
+ STDMETHOD(Lock)(THIS_ LPD3DEXECUTEBUFFERDESC lpDesc) PURE;
+ STDMETHOD(Unlock)(THIS) PURE;
+ STDMETHOD(SetExecuteData)(THIS_ LPD3DEXECUTEDATA lpData) PURE;
+ STDMETHOD(GetExecuteData)(THIS_ LPD3DEXECUTEDATA lpData) PURE;
+ STDMETHOD(Validate)(THIS_ LPDWORD lpdwOffset, LPD3DVALIDATECALLBACK lpFunc, LPVOID lpUserArg, DWORD dwReserved) PURE;
+ STDMETHOD(Optimize)(THIS_ DWORD dwDummy) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDirect3DExecuteBuffer_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirect3DExecuteBuffer_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirect3DExecuteBuffer_Release(p) (p)->lpVtbl->Release(p)
+/*** IDirect3DExecuteBuffer methods ***/
+#define IDirect3DExecuteBuffer_Initialize(p,a,b) (p)->lpVtbl->Initialize(p,a,b)
+#define IDirect3DExecuteBuffer_Lock(p,a) (p)->lpVtbl->Lock(p,a)
+#define IDirect3DExecuteBuffer_Unlock(p) (p)->lpVtbl->Unlock(p)
+#define IDirect3DExecuteBuffer_SetExecuteData(p,a) (p)->lpVtbl->SetExecuteData(p,a)
+#define IDirect3DExecuteBuffer_GetExecuteData(p,a) (p)->lpVtbl->GetExecuteData(p,a)
+#define IDirect3DExecuteBuffer_Validate(p,a,b,c,d) (p)->lpVtbl->Validate(p,a,b,c,d)
+#define IDirect3DExecuteBuffer_Optimize(p,a) (p)->lpVtbl->Optimize(p,a)
+#else
+/*** IUnknown methods ***/
+#define IDirect3DExecuteBuffer_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
+#define IDirect3DExecuteBuffer_AddRef(p) (p)->AddRef()
+#define IDirect3DExecuteBuffer_Release(p) (p)->Release()
+/*** IDirect3DExecuteBuffer methods ***/
+#define IDirect3DExecuteBuffer_Initialize(p,a,b) (p)->Initialize(a,b)
+#define IDirect3DExecuteBuffer_Lock(p,a) (p)->Lock(a)
+#define IDirect3DExecuteBuffer_Unlock(p) (p)->Unlock()
+#define IDirect3DExecuteBuffer_SetExecuteData(p,a) (p)->SetExecuteData(a)
+#define IDirect3DExecuteBuffer_GetExecuteData(p,a) (p)->GetExecuteData(a)
+#define IDirect3DExecuteBuffer_Validate(p,a,b,c,d) (p)->Validate(a,b,c,d)
+#define IDirect3DExecuteBuffer_Optimize(p,a) (p)->Optimize(a)
+#endif
+
+
+/*****************************************************************************
+ * IDirect3DDevice interface
+ */
+#define INTERFACE IDirect3DDevice
+DECLARE_INTERFACE_(IDirect3DDevice,IUnknown)
+{
+ /*** IUnknown methods ***/
+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** IDirect3DDevice methods ***/
+ STDMETHOD(Initialize)(THIS_ LPDIRECT3D lpDirect3D, LPGUID lpGUID, LPD3DDEVICEDESC lpD3DDVDesc) PURE;
+ STDMETHOD(GetCaps)(THIS_ LPD3DDEVICEDESC lpD3DHWDevDesc, LPD3DDEVICEDESC lpD3DHELDevDesc) PURE;
+ STDMETHOD(SwapTextureHandles)(THIS_ LPDIRECT3DTEXTURE lpD3Dtex1, LPDIRECT3DTEXTURE lpD3DTex2) PURE;
+ STDMETHOD(CreateExecuteBuffer)(THIS_ LPD3DEXECUTEBUFFERDESC lpDesc, LPDIRECT3DEXECUTEBUFFER *lplpDirect3DExecuteBuffer, IUnknown *pUnkOuter) PURE;
+ STDMETHOD(GetStats)(THIS_ LPD3DSTATS lpD3DStats) PURE;
+ STDMETHOD(Execute)(THIS_ LPDIRECT3DEXECUTEBUFFER lpDirect3DExecuteBuffer, LPDIRECT3DVIEWPORT lpDirect3DViewport, DWORD dwFlags) PURE;
+ STDMETHOD(AddViewport)(THIS_ LPDIRECT3DVIEWPORT lpDirect3DViewport) PURE;
+ STDMETHOD(DeleteViewport)(THIS_ LPDIRECT3DVIEWPORT lpDirect3DViewport) PURE;
+ STDMETHOD(NextViewport)(THIS_ LPDIRECT3DVIEWPORT lpDirect3DViewport, LPDIRECT3DVIEWPORT *lplpDirect3DViewport, DWORD dwFlags) PURE;
+ STDMETHOD(Pick)(THIS_ LPDIRECT3DEXECUTEBUFFER lpDirect3DExecuteBuffer, LPDIRECT3DVIEWPORT lpDirect3DViewport, DWORD dwFlags, LPD3DRECT lpRect) PURE;
+ STDMETHOD(GetPickRecords)(THIS_ LPDWORD lpCount, LPD3DPICKRECORD lpD3DPickRec) PURE;
+ STDMETHOD(EnumTextureFormats)(THIS_ LPD3DENUMTEXTUREFORMATSCALLBACK lpD3DEnumTextureProc, LPVOID lpArg) PURE;
+ STDMETHOD(CreateMatrix)(THIS_ LPD3DMATRIXHANDLE lpD3DMatHandle) PURE;
+ STDMETHOD(SetMatrix)(THIS_ D3DMATRIXHANDLE D3DMatHandle, LPD3DMATRIX lpD3DMatrix) PURE;
+ STDMETHOD(GetMatrix)(THIS_ D3DMATRIXHANDLE D3DMatHandle, LPD3DMATRIX lpD3DMatrix) PURE;
+ STDMETHOD(DeleteMatrix)(THIS_ D3DMATRIXHANDLE D3DMatHandle) PURE;
+ STDMETHOD(BeginScene)(THIS) PURE;
+ STDMETHOD(EndScene)(THIS) PURE;
+ STDMETHOD(GetDirect3D)(THIS_ LPDIRECT3D *lplpDirect3D) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDirect3DDevice_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirect3DDevice_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirect3DDevice_Release(p) (p)->lpVtbl->Release(p)
+/*** IDirect3DDevice methods ***/
+#define IDirect3DDevice_Initialize(p,a,b,c) (p)->lpVtbl->Initialize(p,a,b,c)
+#define IDirect3DDevice_GetCaps(p,a,b) (p)->lpVtbl->GetCaps(p,a,b)
+#define IDirect3DDevice_SwapTextureHandles(p,a,b) (p)->lpVtbl->SwapTextureHandles(p,a,b)
+#define IDirect3DDevice_CreateExecuteBuffer(p,a,b,c) (p)->lpVtbl->CreateExecuteBuffer(p,a,b,c)
+#define IDirect3DDevice_GetStats(p,a) (p)->lpVtbl->GetStats(p,a)
+#define IDirect3DDevice_Execute(p,a,b,c) (p)->lpVtbl->Execute(p,a,b,c)
+#define IDirect3DDevice_AddViewport(p,a) (p)->lpVtbl->AddViewport(p,a)
+#define IDirect3DDevice_DeleteViewport(p,a) (p)->lpVtbl->DeleteViewport(p,a)
+#define IDirect3DDevice_NextViewport(p,a,b,c) (p)->lpVtbl->NextViewport(p,a,b,c)
+#define IDirect3DDevice_Pick(p,a,b,c,d) (p)->lpVtbl->Pick(p,a,b,c,d)
+#define IDirect3DDevice_GetPickRecords(p,a,b) (p)->lpVtbl->GetPickRecords(p,a,b)
+#define IDirect3DDevice_EnumTextureFormats(p,a,b) (p)->lpVtbl->EnumTextureFormats(p,a,b)
+#define IDirect3DDevice_CreateMatrix(p,a) (p)->lpVtbl->CreateMatrix(p,a)
+#define IDirect3DDevice_SetMatrix(p,a,b) (p)->lpVtbl->SetMatrix(p,a,b)
+#define IDirect3DDevice_GetMatrix(p,a,b) (p)->lpVtbl->GetMatrix(p,a,b)
+#define IDirect3DDevice_DeleteMatrix(p,a) (p)->lpVtbl->DeleteMatrix(p,a)
+#define IDirect3DDevice_BeginScene(p) (p)->lpVtbl->BeginScene(p)
+#define IDirect3DDevice_EndScene(p) (p)->lpVtbl->EndScene(p)
+#define IDirect3DDevice_GetDirect3D(p,a) (p)->lpVtbl->GetDirect3D(p,a)
+#else
+/*** IUnknown methods ***/
+#define IDirect3DDevice_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
+#define IDirect3DDevice_AddRef(p) (p)->AddRef()
+#define IDirect3DDevice_Release(p) (p)->Release()
+/*** IDirect3DDevice methods ***/
+#define IDirect3DDevice_Initialize(p,a,b,c) (p)->Initialize(a,b,c)
+#define IDirect3DDevice_GetCaps(p,a,b) (p)->GetCaps(a,b)
+#define IDirect3DDevice_SwapTextureHandles(p,a,b) (p)->SwapTextureHandles(a,b)
+#define IDirect3DDevice_CreateExecuteBuffer(p,a,b,c) (p)->CreateExecuteBuffer(a,b,c)
+#define IDirect3DDevice_GetStats(p,a) (p)->GetStats(a)
+#define IDirect3DDevice_Execute(p,a,b,c) (p)->Execute(a,b,c)
+#define IDirect3DDevice_AddViewport(p,a) (p)->AddViewport(a)
+#define IDirect3DDevice_DeleteViewport(p,a) (p)->DeleteViewport(a)
+#define IDirect3DDevice_NextViewport(p,a,b,c) (p)->NextViewport(a,b,c)
+#define IDirect3DDevice_Pick(p,a,b,c,d) (p)->Pick(a,b,c,d)
+#define IDirect3DDevice_GetPickRecords(p,a,b) (p)->GetPickRecords(a,b)
+#define IDirect3DDevice_EnumTextureFormats(p,a,b) (p)->EnumTextureFormats(a,b)
+#define IDirect3DDevice_CreateMatrix(p,a) (p)->CreateMatrix(a)
+#define IDirect3DDevice_SetMatrix(p,a,b) (p)->SetMatrix(a,b)
+#define IDirect3DDevice_GetMatrix(p,a,b) (p)->GetMatrix(a,b)
+#define IDirect3DDevice_DeleteMatrix(p,a) (p)->DeleteMatrix(a)
+#define IDirect3DDevice_BeginScene(p) (p)->BeginScene()
+#define IDirect3DDevice_EndScene(p) (p)->EndScene()
+#define IDirect3DDevice_GetDirect3D(p,a) (p)->GetDirect3D(a)
+#endif
+
+
+/*****************************************************************************
+ * IDirect3DDevice2 interface
+ */
+#define INTERFACE IDirect3DDevice2
+DECLARE_INTERFACE_(IDirect3DDevice2,IUnknown)
+{
+ /*** IUnknown methods ***/
+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** IDirect3DDevice2 methods ***/
+ STDMETHOD(GetCaps)(THIS_ LPD3DDEVICEDESC lpD3DHWDevDesc, LPD3DDEVICEDESC lpD3DHELDevDesc) PURE;
+ STDMETHOD(SwapTextureHandles)(THIS_ LPDIRECT3DTEXTURE2 lpD3DTex1, LPDIRECT3DTEXTURE2 lpD3DTex2) PURE;
+ STDMETHOD(GetStats)(THIS_ LPD3DSTATS lpD3DStats) PURE;
+ STDMETHOD(AddViewport)(THIS_ LPDIRECT3DVIEWPORT2 lpDirect3DViewport2) PURE;
+ STDMETHOD(DeleteViewport)(THIS_ LPDIRECT3DVIEWPORT2 lpDirect3DViewport2) PURE;
+ STDMETHOD(NextViewport)(THIS_ LPDIRECT3DVIEWPORT2 lpDirect3DViewport2, LPDIRECT3DVIEWPORT2 *lplpDirect3DViewport2, DWORD dwFlags) PURE;
+ STDMETHOD(EnumTextureFormats)(THIS_ LPD3DENUMTEXTUREFORMATSCALLBACK lpD3DEnumTextureProc, LPVOID lpArg) PURE;
+ STDMETHOD(BeginScene)(THIS) PURE;
+ STDMETHOD(EndScene)(THIS) PURE;
+ STDMETHOD(GetDirect3D)(THIS_ LPDIRECT3D2 *lplpDirect3D2) PURE;
+ /*** DrawPrimitive API ***/
+ STDMETHOD(SetCurrentViewport)(THIS_ LPDIRECT3DVIEWPORT2 lpDirect3DViewport2) PURE;
+ STDMETHOD(GetCurrentViewport)(THIS_ LPDIRECT3DVIEWPORT2 *lplpDirect3DViewport2) PURE;
+ STDMETHOD(SetRenderTarget)(THIS_ LPDIRECTDRAWSURFACE lpNewRenderTarget, DWORD dwFlags) PURE;
+ STDMETHOD(GetRenderTarget)(THIS_ LPDIRECTDRAWSURFACE *lplpRenderTarget) PURE;
+ STDMETHOD(Begin)(THIS_ D3DPRIMITIVETYPE d3dpt,D3DVERTEXTYPE dwVertexTypeDesc,DWORD dwFlags) PURE;
+ STDMETHOD(BeginIndexed)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType, D3DVERTEXTYPE d3dvtVertexType, LPVOID lpvVertices, DWORD dwNumVertices, DWORD dwFlags) PURE;
+ STDMETHOD(Vertex)(THIS_ LPVOID lpVertexType) PURE;
+ STDMETHOD(Index)(THIS_ WORD wVertexIndex) PURE;
+ STDMETHOD(End)(THIS_ DWORD dwFlags) PURE;
+ STDMETHOD(GetRenderState)(THIS_ D3DRENDERSTATETYPE dwRenderStateType, LPDWORD lpdwRenderState) PURE;
+ STDMETHOD(SetRenderState)(THIS_ D3DRENDERSTATETYPE dwRenderStateType, DWORD dwRenderState) PURE;
+ STDMETHOD(GetLightState)(THIS_ D3DLIGHTSTATETYPE dwLightStateType, LPDWORD lpdwLightState) PURE;
+ STDMETHOD(SetLightState)(THIS_ D3DLIGHTSTATETYPE dwLightStateType, DWORD dwLightState) PURE;
+ STDMETHOD(SetTransform)(THIS_ D3DTRANSFORMSTATETYPE dtstTransformStateType, LPD3DMATRIX lpD3DMatrix) PURE;
+ STDMETHOD(GetTransform)(THIS_ D3DTRANSFORMSTATETYPE dtstTransformStateType, LPD3DMATRIX lpD3DMatrix) PURE;
+ STDMETHOD(MultiplyTransform)(THIS_ D3DTRANSFORMSTATETYPE dtstTransformStateType, LPD3DMATRIX lpD3DMatrix) PURE;
+ STDMETHOD(DrawPrimitive)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType, D3DVERTEXTYPE d3dvtVertexType, LPVOID lpvVertices, DWORD dwVertexCount, DWORD dwFlags) PURE;
+ STDMETHOD(DrawIndexedPrimitive)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType, D3DVERTEXTYPE d3dvtVertexType, LPVOID lpvVertices, DWORD dwVertexCount, LPWORD dwIndices, DWORD dwIndexCount, DWORD dwFlags) PURE;
+ STDMETHOD(SetClipStatus)(THIS_ LPD3DCLIPSTATUS lpD3DClipStatus) PURE;
+ STDMETHOD(GetClipStatus)(THIS_ LPD3DCLIPSTATUS lpD3DClipStatus) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDirect3DDevice2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirect3DDevice2_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirect3DDevice2_Release(p) (p)->lpVtbl->Release(p)
+/*** IDirect3DDevice2 methods ***/
+#define IDirect3DDevice2_GetCaps(p,a,b) (p)->lpVtbl->GetCaps(p,a,b)
+#define IDirect3DDevice2_SwapTextureHandles(p,a,b) (p)->lpVtbl->SwapTextureHandles(p,a,b)
+#define IDirect3DDevice2_GetStats(p,a) (p)->lpVtbl->GetStats(p,a)
+#define IDirect3DDevice2_AddViewport(p,a) (p)->lpVtbl->AddViewport(p,a)
+#define IDirect3DDevice2_DeleteViewport(p,a) (p)->lpVtbl->DeleteViewport(p,a)
+#define IDirect3DDevice2_NextViewport(p,a,b,c) (p)->lpVtbl->NextViewport(p,a,b,c)
+#define IDirect3DDevice2_EnumTextureFormats(p,a,b) (p)->lpVtbl->EnumTextureFormats(p,a,b)
+#define IDirect3DDevice2_BeginScene(p) (p)->lpVtbl->BeginScene(p)
+#define IDirect3DDevice2_EndScene(p) (p)->lpVtbl->EndScene(p)
+#define IDirect3DDevice2_GetDirect3D(p,a) (p)->lpVtbl->GetDirect3D(p,a)
+#define IDirect3DDevice2_SetCurrentViewport(p,a) (p)->lpVtbl->SetCurrentViewport(p,a)
+#define IDirect3DDevice2_GetCurrentViewport(p,a) (p)->lpVtbl->GetCurrentViewport(p,a)
+#define IDirect3DDevice2_SetRenderTarget(p,a,b) (p)->lpVtbl->SetRenderTarget(p,a,b)
+#define IDirect3DDevice2_GetRenderTarget(p,a) (p)->lpVtbl->GetRenderTarget(p,a)
+#define IDirect3DDevice2_Begin(p,a,b,c) (p)->lpVtbl->Begin(p,a,b,c)
+#define IDirect3DDevice2_BeginIndexed(p,a,b,c,d,e) (p)->lpVtbl->BeginIndexed(p,a,b,c,d,e)
+#define IDirect3DDevice2_Vertex(p,a) (p)->lpVtbl->Vertex(p,a)
+#define IDirect3DDevice2_Index(p,a) (p)->lpVtbl->Index(p,a)
+#define IDirect3DDevice2_End(p,a) (p)->lpVtbl->End(p,a)
+#define IDirect3DDevice2_GetRenderState(p,a,b) (p)->lpVtbl->GetRenderState(p,a,b)
+#define IDirect3DDevice2_SetRenderState(p,a,b) (p)->lpVtbl->SetRenderState(p,a,b)
+#define IDirect3DDevice2_GetLightState(p,a,b) (p)->lpVtbl->GetLightState(p,a,b)
+#define IDirect3DDevice2_SetLightState(p,a,b) (p)->lpVtbl->SetLightState(p,a,b)
+#define IDirect3DDevice2_SetTransform(p,a,b) (p)->lpVtbl->SetTransform(p,a,b)
+#define IDirect3DDevice2_GetTransform(p,a,b) (p)->lpVtbl->GetTransform(p,a,b)
+#define IDirect3DDevice2_MultiplyTransform(p,a,b) (p)->lpVtbl->MultiplyTransform(p,a,b)
+#define IDirect3DDevice2_DrawPrimitive(p,a,b,c,d,e) (p)->lpVtbl->DrawPrimitive(p,a,b,c,d,e)
+#define IDirect3DDevice2_DrawIndexedPrimitive(p,a,b,c,d,e,f,g) (p)->lpVtbl->DrawIndexedPrimitive(p,a,b,c,d,e,f,g)
+#define IDirect3DDevice2_SetClipStatus(p,a) (p)->lpVtbl->SetClipStatus(p,a)
+#define IDirect3DDevice2_GetClipStatus(p,a) (p)->lpVtbl->GetClipStatus(p,a)
+#else
+/*** IUnknown methods ***/
+#define IDirect3DDevice2_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
+#define IDirect3DDevice2_AddRef(p) (p)->AddRef()
+#define IDirect3DDevice2_Release(p) (p)->Release()
+/*** IDirect3DDevice2 methods ***/
+#define IDirect3DDevice2_GetCaps(p,a,b) (p)->GetCaps(a,b)
+#define IDirect3DDevice2_SwapTextureHandles(p,a,b) (p)->SwapTextureHandles(a,b)
+#define IDirect3DDevice2_GetStats(p,a) (p)->GetStats(a)
+#define IDirect3DDevice2_AddViewport(p,a) (p)->AddViewport(a)
+#define IDirect3DDevice2_DeleteViewport(p,a) (p)->DeleteViewport(a)
+#define IDirect3DDevice2_NextViewport(p,a,b,c) (p)->NextViewport(a,b,c)
+#define IDirect3DDevice2_EnumTextureFormats(p,a,b) (p)->EnumTextureFormats(a,b)
+#define IDirect3DDevice2_BeginScene(p) (p)->BeginScene()
+#define IDirect3DDevice2_EndScene(p) (p)->EndScene()
+#define IDirect3DDevice2_GetDirect3D(p,a) (p)->GetDirect3D(a)
+#define IDirect3DDevice2_SetCurrentViewport(p,a) (p)->SetCurrentViewport(a)
+#define IDirect3DDevice2_GetCurrentViewport(p,a) (p)->GetCurrentViewport(a)
+#define IDirect3DDevice2_SetRenderTarget(p,a,b) (p)->SetRenderTarget(a,b)
+#define IDirect3DDevice2_GetRenderTarget(p,a) (p)->GetRenderTarget(a)
+#define IDirect3DDevice2_Begin(p,a,b,c) (p)->Begin(a,b,c)
+#define IDirect3DDevice2_BeginIndexed(p,a,b,c,d,e) (p)->BeginIndexed(a,b,c,d,e)
+#define IDirect3DDevice2_Vertex(p,a) (p)->Vertex(a)
+#define IDirect3DDevice2_Index(p,a) (p)->Index(a)
+#define IDirect3DDevice2_End(p,a) (p)->End(a)
+#define IDirect3DDevice2_GetRenderState(p,a,b) (p)->GetRenderState(a,b)
+#define IDirect3DDevice2_SetRenderState(p,a,b) (p)->SetRenderState(a,b)
+#define IDirect3DDevice2_GetLightState(p,a,b) (p)->GetLightState(a,b)
+#define IDirect3DDevice2_SetLightState(p,a,b) (p)->SetLightState(a,b)
+#define IDirect3DDevice2_SetTransform(p,a,b) (p)->SetTransform(a,b)
+#define IDirect3DDevice2_GetTransform(p,a,b) (p)->GetTransform(a,b)
+#define IDirect3DDevice2_MultiplyTransform(p,a,b) (p)->MultiplyTransform(a,b)
+#define IDirect3DDevice2_DrawPrimitive(p,a,b,c,d,e) (p)->DrawPrimitive(a,b,c,d,e)
+#define IDirect3DDevice2_DrawIndexedPrimitive(p,a,b,c,d,e,f,g) (p)->DrawIndexedPrimitive(a,b,c,d,e,f,g)
+#define IDirect3DDevice2_SetClipStatus(p,a) (p)->SetClipStatus(a)
+#define IDirect3DDevice2_GetClipStatus(p,a) (p)->GetClipStatus(a)
+#endif
+
+/*****************************************************************************
+ * IDirect3DDevice3 interface
+ */
+#define INTERFACE IDirect3DDevice3
+DECLARE_INTERFACE_(IDirect3DDevice3,IUnknown)
+{
+ /*** IUnknown methods ***/
+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** IDirect3DDevice3 methods ***/
+ STDMETHOD(GetCaps)(THIS_ LPD3DDEVICEDESC lpD3DHWDevDesc, LPD3DDEVICEDESC lpD3DHELDevDesc) PURE;
+ STDMETHOD(GetStats)(THIS_ LPD3DSTATS lpD3DStats) PURE;
+ STDMETHOD(AddViewport)(THIS_ LPDIRECT3DVIEWPORT3 lpDirect3DViewport3) PURE;
+ STDMETHOD(DeleteViewport)(THIS_ LPDIRECT3DVIEWPORT3 lpDirect3DViewport3) PURE;
+ STDMETHOD(NextViewport)(THIS_ LPDIRECT3DVIEWPORT3 lpDirect3DViewport3, LPDIRECT3DVIEWPORT3 *lplpDirect3DViewport3, DWORD dwFlags) PURE;
+ STDMETHOD(EnumTextureFormats)(THIS_ LPD3DENUMPIXELFORMATSCALLBACK lpD3DEnumPixelProc, LPVOID lpArg) PURE;
+ STDMETHOD(BeginScene)(THIS) PURE;
+ STDMETHOD(EndScene)(THIS) PURE;
+ STDMETHOD(GetDirect3D)(THIS_ LPDIRECT3D3 *lplpDirect3D3) PURE;
+ /*** DrawPrimitive API ***/
+ STDMETHOD(SetCurrentViewport)(THIS_ LPDIRECT3DVIEWPORT3 lpDirect3DViewport3) PURE;
+ STDMETHOD(GetCurrentViewport)(THIS_ LPDIRECT3DVIEWPORT3 *lplpDirect3DViewport3) PURE;
+ STDMETHOD(SetRenderTarget)(THIS_ LPDIRECTDRAWSURFACE4 lpNewRenderTarget, DWORD dwFlags) PURE;
+ STDMETHOD(GetRenderTarget)(THIS_ LPDIRECTDRAWSURFACE4 *lplpRenderTarget) PURE;
+ STDMETHOD(Begin)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,DWORD dwVertexTypeDesc, DWORD dwFlags) PURE;
+ STDMETHOD(BeginIndexed)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,DWORD d3dvtVertexType, LPVOID lpvVertices, DWORD dwNumVertices, DWORD dwFlags) PURE;
+ STDMETHOD(Vertex)(THIS_ LPVOID lpVertexType) PURE;
+ STDMETHOD(Index)(THIS_ WORD wVertexIndex) PURE;
+ STDMETHOD(End)(THIS_ DWORD dwFlags) PURE;
+ STDMETHOD(GetRenderState)(THIS_ D3DRENDERSTATETYPE dwRenderStateType, LPDWORD lpdwRenderState) PURE;
+ STDMETHOD(SetRenderState)(THIS_ D3DRENDERSTATETYPE dwRenderStateType, DWORD dwRenderState) PURE;
+ STDMETHOD(GetLightState)(THIS_ D3DLIGHTSTATETYPE dwLightStateType, LPDWORD lpdwLightState) PURE;
+ STDMETHOD(SetLightState)(THIS_ D3DLIGHTSTATETYPE dwLightStateType, DWORD dwLightState) PURE;
+ STDMETHOD(SetTransform)(THIS_ D3DTRANSFORMSTATETYPE dtstTransformStateType, LPD3DMATRIX lpD3DMatrix) PURE;
+ STDMETHOD(GetTransform)(THIS_ D3DTRANSFORMSTATETYPE dtstTransformStateType, LPD3DMATRIX lpD3DMatrix) PURE;
+ STDMETHOD(MultiplyTransform)(THIS_ D3DTRANSFORMSTATETYPE dtstTransformStateType, LPD3DMATRIX lpD3DMatrix) PURE;
+ STDMETHOD(DrawPrimitive)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType, DWORD d3dvtVertexType, LPVOID lpvVertices, DWORD dwVertexCount, DWORD dwFlags) PURE;
+ STDMETHOD(DrawIndexedPrimitive)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType, DWORD d3dvtVertexType, LPVOID lpvVertices, DWORD dwVertexCount, LPWORD dwIndices, DWORD dwIndexCount, DWORD dwFlags) PURE;
+ STDMETHOD(SetClipStatus)(THIS_ LPD3DCLIPSTATUS lpD3DClipStatus) PURE;
+ STDMETHOD(GetClipStatus)(THIS_ LPD3DCLIPSTATUS lpD3DClipStatus) PURE;
+ STDMETHOD(DrawPrimitiveStrided)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,DWORD dwVertexType,LPD3DDRAWPRIMITIVESTRIDEDDATA lpD3DDrawPrimStrideData,DWORD dwVertexCount,DWORD dwFlags) PURE;
+ STDMETHOD(DrawIndexedPrimitiveStrided)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,DWORD dwVertexType,LPD3DDRAWPRIMITIVESTRIDEDDATA lpD3DDrawPrimStrideData,DWORD dwVertexCount,LPWORD lpIndex,DWORD dwIndexCount,DWORD dwFlags) PURE;
+ STDMETHOD(DrawPrimitiveVB)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,LPDIRECT3DVERTEXBUFFER lpD3DVertexBuf,DWORD dwStartVertex,DWORD dwNumVertices,DWORD dwFlags) PURE;
+ STDMETHOD(DrawIndexedPrimitiveVB)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,LPDIRECT3DVERTEXBUFFER lpD3DVertexBuf,LPWORD lpwIndices,DWORD dwIndexCount,DWORD dwFlags) PURE;
+ STDMETHOD(ComputeSphereVisibility)(THIS_ LPD3DVECTOR lpCenters,LPD3DVALUE lpRadii,DWORD dwNumSpheres,DWORD dwFlags,LPDWORD lpdwReturnValues) PURE;
+ STDMETHOD(GetTexture)(THIS_ DWORD dwStage,LPDIRECT3DTEXTURE2 *lplpTexture2) PURE;
+ STDMETHOD(SetTexture)(THIS_ DWORD dwStage,LPDIRECT3DTEXTURE2 lpTexture2) PURE;
+ STDMETHOD(GetTextureStageState)(THIS_ DWORD dwStage,D3DTEXTURESTAGESTATETYPE d3dTexStageStateType,LPDWORD lpdwState) PURE;
+ STDMETHOD(SetTextureStageState)(THIS_ DWORD dwStage,D3DTEXTURESTAGESTATETYPE d3dTexStageStateType,DWORD dwState) PURE;
+ STDMETHOD(ValidateDevice)(THIS_ LPDWORD lpdwPasses) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDirect3DDevice3_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirect3DDevice3_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirect3DDevice3_Release(p) (p)->lpVtbl->Release(p)
+/*** IDirect3DDevice3 methods ***/
+#define IDirect3DDevice3_GetCaps(p,a,b) (p)->lpVtbl->GetCaps(p,a,b)
+#define IDirect3DDevice3_GetStats(p,a) (p)->lpVtbl->GetStats(p,a)
+#define IDirect3DDevice3_AddViewport(p,a) (p)->lpVtbl->AddViewport(p,a)
+#define IDirect3DDevice3_DeleteViewport(p,a) (p)->lpVtbl->DeleteViewport(p,a)
+#define IDirect3DDevice3_NextViewport(p,a,b,c) (p)->lpVtbl->NextViewport(p,a,b,c)
+#define IDirect3DDevice3_EnumTextureFormats(p,a,b) (p)->lpVtbl->EnumTextureFormats(p,a,b)
+#define IDirect3DDevice3_BeginScene(p) (p)->lpVtbl->BeginScene(p)
+#define IDirect3DDevice3_EndScene(p) (p)->lpVtbl->EndScene(p)
+#define IDirect3DDevice3_GetDirect3D(p,a) (p)->lpVtbl->GetDirect3D(p,a)
+#define IDirect3DDevice3_SetCurrentViewport(p,a) (p)->lpVtbl->SetCurrentViewport(p,a)
+#define IDirect3DDevice3_GetCurrentViewport(p,a) (p)->lpVtbl->GetCurrentViewport(p,a)
+#define IDirect3DDevice3_SetRenderTarget(p,a,b) (p)->lpVtbl->SetRenderTarget(p,a,b)
+#define IDirect3DDevice3_GetRenderTarget(p,a) (p)->lpVtbl->GetRenderTarget(p,a)
+#define IDirect3DDevice3_Begin(p,a,b,c) (p)->lpVtbl->Begin(p,a,b,c)
+#define IDirect3DDevice3_BeginIndexed(p,a,b,c,d,e) (p)->lpVtbl->BeginIndexed(p,a,b,c,d,e)
+#define IDirect3DDevice3_Vertex(p,a) (p)->lpVtbl->Vertex(p,a)
+#define IDirect3DDevice3_Index(p,a) (p)->lpVtbl->Index(p,a)
+#define IDirect3DDevice3_End(p,a) (p)->lpVtbl->End(p,a)
+#define IDirect3DDevice3_GetRenderState(p,a,b) (p)->lpVtbl->GetRenderState(p,a,b)
+#define IDirect3DDevice3_SetRenderState(p,a,b) (p)->lpVtbl->SetRenderState(p,a,b)
+#define IDirect3DDevice3_GetLightState(p,a,b) (p)->lpVtbl->GetLightState(p,a,b)
+#define IDirect3DDevice3_SetLightState(p,a,b) (p)->lpVtbl->SetLightState(p,a,b)
+#define IDirect3DDevice3_SetTransform(p,a,b) (p)->lpVtbl->SetTransform(p,a,b)
+#define IDirect3DDevice3_GetTransform(p,a,b) (p)->lpVtbl->GetTransform(p,a,b)
+#define IDirect3DDevice3_MultiplyTransform(p,a,b) (p)->lpVtbl->MultiplyTransform(p,a,b)
+#define IDirect3DDevice3_DrawPrimitive(p,a,b,c,d,e) (p)->lpVtbl->DrawPrimitive(p,a,b,c,d,e)
+#define IDirect3DDevice3_DrawIndexedPrimitive(p,a,b,c,d,e,f,g) (p)->lpVtbl->DrawIndexedPrimitive(p,a,b,c,d,e,f,g)
+#define IDirect3DDevice3_SetClipStatus(p,a) (p)->lpVtbl->SetClipStatus(p,a)
+#define IDirect3DDevice3_GetClipStatus(p,a) (p)->lpVtbl->GetClipStatus(p,a)
+#define IDirect3DDevice3_DrawPrimitiveStrided(p,a,b,c,d,e) (p)->lpVtbl->DrawPrimitiveStrided(p,a,b,c,d,e)
+#define IDirect3DDevice3_DrawIndexedPrimitiveStrided(p,a,b,c,d,e,f,g) (p)->lpVtbl->DrawIndexedPrimitiveStrided(p,a,b,c,d,e,f,g)
+#define IDirect3DDevice3_DrawPrimitiveVB(p,a,b,c,d,e) (p)->lpVtbl->DrawPrimitiveVB(p,a,b,c,d,e)
+#define IDirect3DDevice3_DrawIndexedPrimitiveVB(p,a,b,c,d,e) (p)->lpVtbl->DrawIndexedPrimitiveVB(p,a,b,c,d,e)
+#define IDirect3DDevice3_ComputeSphereVisibility(p,a,b,c,d,e) (p)->lpVtbl->ComputeSphereVisibility(p,a,b,c,d,e)
+#define IDirect3DDevice3_GetTexture(p,a,b) (p)->lpVtbl->GetTexture(p,a,b)
+#define IDirect3DDevice3_SetTexture(p,a,b) (p)->lpVtbl->SetTexture(p,a,b)
+#define IDirect3DDevice3_GetTextureStageState(p,a,b,c) (p)->lpVtbl->GetTextureStageState(p,a,b,c)
+#define IDirect3DDevice3_SetTextureStageState(p,a,b,c) (p)->lpVtbl->SetTextureStageState(p,a,b,c)
+#define IDirect3DDevice3_ValidateDevice(p,a) (p)->lpVtbl->ValidateDevice(p,a)
+#else
+/*** IUnknown methods ***/
+#define IDirect3DDevice3_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
+#define IDirect3DDevice3_AddRef(p) (p)->AddRef()
+#define IDirect3DDevice3_Release(p) (p)->Release()
+/*** IDirect3DDevice3 methods ***/
+#define IDirect3DDevice3_GetCaps(p,a,b) (p)->GetCaps(a,b)
+#define IDirect3DDevice3_GetStats(p,a) (p)->GetStats(a)
+#define IDirect3DDevice3_AddViewport(p,a) (p)->AddViewport(a)
+#define IDirect3DDevice3_DeleteViewport(p,a) (p)->DeleteViewport(a)
+#define IDirect3DDevice3_NextViewport(p,a,b,c) (p)->NextViewport(a,b,c)
+#define IDirect3DDevice3_EnumTextureFormats(p,a,b) (p)->EnumTextureFormats(a,b)
+#define IDirect3DDevice3_BeginScene(p) (p)->BeginScene()
+#define IDirect3DDevice3_EndScene(p) (p)->EndScene()
+#define IDirect3DDevice3_GetDirect3D(p,a) (p)->GetDirect3D(a)
+#define IDirect3DDevice3_SetCurrentViewport(p,a) (p)->SetCurrentViewport(a)
+#define IDirect3DDevice3_GetCurrentViewport(p,a) (p)->GetCurrentViewport(a)
+#define IDirect3DDevice3_SetRenderTarget(p,a,b) (p)->SetRenderTarget(a,b)
+#define IDirect3DDevice3_GetRenderTarget(p,a) (p)->GetRenderTarget(a)
+#define IDirect3DDevice3_Begin(p,a,b,c) (p)->Begin(a,b,c)
+#define IDirect3DDevice3_BeginIndexed(p,a,b,c,d,e) (p)->BeginIndexed(a,b,c,d,e)
+#define IDirect3DDevice3_Vertex(p,a) (p)->Vertex(a)
+#define IDirect3DDevice3_Index(p,a) (p)->Index(a)
+#define IDirect3DDevice3_End(p,a) (p)->End(a)
+#define IDirect3DDevice3_GetRenderState(p,a,b) (p)->GetRenderState(a,b)
+#define IDirect3DDevice3_SetRenderState(p,a,b) (p)->SetRenderState(a,b)
+#define IDirect3DDevice3_GetLightState(p,a,b) (p)->GetLightState(a,b)
+#define IDirect3DDevice3_SetLightState(p,a,b) (p)->SetLightState(a,b)
+#define IDirect3DDevice3_SetTransform(p,a,b) (p)->SetTransform(a,b)
+#define IDirect3DDevice3_GetTransform(p,a,b) (p)->GetTransform(a,b)
+#define IDirect3DDevice3_MultiplyTransform(p,a,b) (p)->MultiplyTransform(a,b)
+#define IDirect3DDevice3_DrawPrimitive(p,a,b,c,d,e) (p)->DrawPrimitive(a,b,c,d,e)
+#define IDirect3DDevice3_DrawIndexedPrimitive(p,a,b,c,d,e,f,g) (p)->DrawIndexedPrimitive(a,b,c,d,e,f,g)
+#define IDirect3DDevice3_SetClipStatus(p,a) (p)->SetClipStatus(a)
+#define IDirect3DDevice3_GetClipStatus(p,a) (p)->GetClipStatus(a)
+#define IDirect3DDevice3_DrawPrimitiveStrided(p,a,b,c,d,e) (p)->DrawPrimitiveStrided(a,b,c,d,e)
+#define IDirect3DDevice3_DrawIndexedPrimitiveStrided(p,a,b,c,d,e,f,g) (p)->DrawIndexedPrimitiveStrided(a,b,c,d,e,f,g)
+#define IDirect3DDevice3_DrawPrimitiveVB(p,a,b,c,d,e) (p)->DrawPrimitiveVB(a,b,c,d,e)
+#define IDirect3DDevice3_DrawIndexedPrimitiveVB(p,a,b,c,d,e) (p)->DrawIndexedPrimitiveVB(a,b,c,d,e)
+#define IDirect3DDevice3_ComputeSphereVisibility(p,a,b,c,d,e) (p)->ComputeSphereVisibility(a,b,c,d,e)
+#define IDirect3DDevice3_GetTexture(p,a,b) (p)->GetTexture(a,b)
+#define IDirect3DDevice3_SetTexture(p,a,b) (p)->SetTexture(a,b)
+#define IDirect3DDevice3_GetTextureStageState(p,a,b,c) (p)->GetTextureStageState(a,b,c)
+#define IDirect3DDevice3_SetTextureStageState(p,a,b,c) (p)->SetTextureStageState(a,b,c)
+#define IDirect3DDevice3_ValidateDevice(p,a) (p)->ValidateDevice(a)
+#endif
+
+/*****************************************************************************
+ * IDirect3DDevice7 interface
+ */
+#define INTERFACE IDirect3DDevice7
+DECLARE_INTERFACE_(IDirect3DDevice7,IUnknown)
+{
+ /*** IUnknown methods ***/
+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** IDirect3DDevice7 methods ***/
+ STDMETHOD(GetCaps)(THIS_ LPD3DDEVICEDESC7 lpD3DHELDevDesc) PURE;
+ STDMETHOD(EnumTextureFormats)(THIS_ LPD3DENUMPIXELFORMATSCALLBACK lpD3DEnumPixelProc, LPVOID lpArg) PURE;
+ STDMETHOD(BeginScene)(THIS) PURE;
+ STDMETHOD(EndScene)(THIS) PURE;
+ STDMETHOD(GetDirect3D)(THIS_ LPDIRECT3D7 *lplpDirect3D3) PURE;
+ STDMETHOD(SetRenderTarget)(THIS_ LPDIRECTDRAWSURFACE7 lpNewRenderTarget,DWORD dwFlags) PURE;
+ STDMETHOD(GetRenderTarget)(THIS_ LPDIRECTDRAWSURFACE7 *lplpRenderTarget) PURE;
+ STDMETHOD(Clear)(THIS_ DWORD dwCount,LPD3DRECT lpRects,DWORD dwFlags,D3DCOLOR dwColor,D3DVALUE dvZ,DWORD dwStencil) PURE;
+ STDMETHOD(SetTransform)(THIS_ D3DTRANSFORMSTATETYPE dtstTransformStateType, LPD3DMATRIX lpD3DMatrix) PURE;
+ STDMETHOD(GetTransform)(THIS_ D3DTRANSFORMSTATETYPE dtstTransformStateType, LPD3DMATRIX lpD3DMatrix) PURE;
+ STDMETHOD(SetViewport)(THIS_ LPD3DVIEWPORT7 lpData) PURE;
+ STDMETHOD(MultiplyTransform)(THIS_ D3DTRANSFORMSTATETYPE dtstTransformStateType,LPD3DMATRIX lpD3DMatrix) PURE;
+ STDMETHOD(GetViewport)(THIS_ LPD3DVIEWPORT7 lpData) PURE;
+ STDMETHOD(SetMaterial)(THIS_ LPD3DMATERIAL7 lpMat) PURE;
+ STDMETHOD(GetMaterial)(THIS_ LPD3DMATERIAL7 lpMat) PURE;
+ STDMETHOD(SetLight)(THIS_ DWORD dwLightIndex,LPD3DLIGHT7 lpLight) PURE;
+ STDMETHOD(GetLight)(THIS_ DWORD dwLightIndex,LPD3DLIGHT7 lpLight) PURE;
+ STDMETHOD(SetRenderState)(THIS_ D3DRENDERSTATETYPE dwRenderStateType, DWORD dwRenderState) PURE;
+ STDMETHOD(GetRenderState)(THIS_ D3DRENDERSTATETYPE dwRenderStateType, LPDWORD lpdwRenderState) PURE;
+ STDMETHOD(BeginStateBlock)(THIS) PURE;
+ STDMETHOD(EndStateBlock)(THIS_ LPDWORD lpdwBlockHandle) PURE;
+ STDMETHOD(PreLoad)(THIS_ LPDIRECTDRAWSURFACE7 lpddsTexture) PURE;
+ STDMETHOD(DrawPrimitive)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType, DWORD d3dvtVertexType, LPVOID lpvVertices, DWORD dwVertexCount, DWORD dwFlags) PURE;
+ STDMETHOD(DrawIndexedPrimitive)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType, DWORD d3dvtVertexType, LPVOID lpvVertices, DWORD dwVertexCount, LPWORD dwIndices, DWORD dwIndexCount, DWORD dwFlags) PURE;
+ STDMETHOD(SetClipStatus)(THIS_ LPD3DCLIPSTATUS lpD3DClipStatus) PURE;
+ STDMETHOD(GetClipStatus)(THIS_ LPD3DCLIPSTATUS lpD3DClipStatus) PURE;
+ STDMETHOD(DrawPrimitiveStrided)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,DWORD dwVertexType,LPD3DDRAWPRIMITIVESTRIDEDDATA lpD3DDrawPrimStrideData,DWORD dwVertexCount,DWORD dwFlags) PURE;
+ STDMETHOD(DrawIndexedPrimitiveStrided)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,DWORD dwVertexType,LPD3DDRAWPRIMITIVESTRIDEDDATA lpD3DDrawPrimStrideData,DWORD dwVertexCount,LPWORD lpIndex,DWORD dwIndexCount,DWORD dwFlags) PURE;
+ STDMETHOD(DrawPrimitiveVB)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,LPDIRECT3DVERTEXBUFFER7 lpD3DVertexBuf,DWORD dwStartVertex,DWORD dwNumVertices,DWORD dwFlags) PURE;
+ STDMETHOD(DrawIndexedPrimitiveVB)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,LPDIRECT3DVERTEXBUFFER7 lpD3DVertexBuf,DWORD dwStartVertex,DWORD dwNumVertices,LPWORD lpwIndices,DWORD dwIndexCount,DWORD dwFlags) PURE;
+ STDMETHOD(ComputeSphereVisibility)(THIS_ LPD3DVECTOR lpCenters,LPD3DVALUE lpRadii,DWORD dwNumSpheres,DWORD dwFlags,LPDWORD lpdwReturnValues) PURE;
+ STDMETHOD(GetTexture)(THIS_ DWORD dwStage,LPDIRECTDRAWSURFACE7 *lpTexture) PURE;
+ STDMETHOD(SetTexture)(THIS_ DWORD dwStage,LPDIRECTDRAWSURFACE7 lpTexture) PURE;
+ STDMETHOD(GetTextureStageState)(THIS_ DWORD dwStage,D3DTEXTURESTAGESTATETYPE d3dTexStageStateType,LPDWORD lpdwState) PURE;
+ STDMETHOD(SetTextureStageState)(THIS_ DWORD dwStage,D3DTEXTURESTAGESTATETYPE d3dTexStageStateType,DWORD dwState) PURE;
+ STDMETHOD(ValidateDevice)(THIS_ LPDWORD lpdwPasses) PURE;
+ STDMETHOD(ApplyStateBlock)(THIS_ DWORD dwBlockHandle) PURE;
+ STDMETHOD(CaptureStateBlock)(THIS_ DWORD dwBlockHandle) PURE;
+ STDMETHOD(DeleteStateBlock)(THIS_ DWORD dwBlockHandle) PURE;
+ STDMETHOD(CreateStateBlock)(THIS_ D3DSTATEBLOCKTYPE d3dsbType,LPDWORD lpdwBlockHandle) PURE;
+ STDMETHOD(Load)(THIS_ LPDIRECTDRAWSURFACE7 lpDestTex,LPPOINT lpDestPoint,LPDIRECTDRAWSURFACE7 lpSrcTex,LPRECT lprcSrcRect,DWORD dwFlags) PURE;
+ STDMETHOD(LightEnable)(THIS_ DWORD dwLightIndex,BOOL bEnable) PURE;
+ STDMETHOD(GetLightEnable)(THIS_ DWORD dwLightIndex,BOOL *pbEnable) PURE;
+ STDMETHOD(SetClipPlane)(THIS_ DWORD dwIndex,D3DVALUE *pPlaneEquation) PURE;
+ STDMETHOD(GetClipPlane)(THIS_ DWORD dwIndex,D3DVALUE *pPlaneEquation) PURE;
+ STDMETHOD(GetInfo)(THIS_ DWORD dwDevInfoID,LPVOID pDevInfoStruct,DWORD dwSize) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDirect3DDevice7_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirect3DDevice7_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirect3DDevice7_Release(p) (p)->lpVtbl->Release(p)
+/*** IDirect3DDevice7 methods ***/
+#define IDirect3DDevice7_GetCaps(p,a) (p)->lpVtbl->GetCaps(p,a)
+#define IDirect3DDevice7_EnumTextureFormats(p,a,b) (p)->lpVtbl->EnumTextureFormats(p,a,b)
+#define IDirect3DDevice7_BeginScene(p) (p)->lpVtbl->BeginScene(p)
+#define IDirect3DDevice7_EndScene(p) (p)->lpVtbl->EndScene(p)
+#define IDirect3DDevice7_GetDirect3D(p,a) (p)->lpVtbl->GetDirect3D(p,a)
+#define IDirect3DDevice7_SetRenderTarget(p,a,b) (p)->lpVtbl->SetRenderTarget(p,a,b)
+#define IDirect3DDevice7_GetRenderTarget(p,a) (p)->lpVtbl->GetRenderTarget(p,a)
+#define IDirect3DDevice7_Clear(p,a,b,c,d,e,f) (p)->lpVtbl->Clear(p,a,b,c,d,e,f)
+#define IDirect3DDevice7_SetTransform(p,a,b) (p)->lpVtbl->SetTransform(p,a,b)
+#define IDirect3DDevice7_GetTransform(p,a,b) (p)->lpVtbl->GetTransform(p,a,b)
+#define IDirect3DDevice7_SetViewport(p,a) (p)->lpVtbl->SetViewport(p,a)
+#define IDirect3DDevice7_MultiplyTransform(p,a,b) (p)->lpVtbl->MultiplyTransform(p,a,b)
+#define IDirect3DDevice7_GetViewport(p,a) (p)->lpVtbl->GetViewport(p,a)
+#define IDirect3DDevice7_SetMaterial(p,a) (p)->lpVtbl->SetMaterial(p,a)
+#define IDirect3DDevice7_GetMaterial(p,a) (p)->lpVtbl->GetMaterial(p,a)
+#define IDirect3DDevice7_SetLight(p,a,b) (p)->lpVtbl->SetLight(p,a,b)
+#define IDirect3DDevice7_GetLight(p,a,b) (p)->lpVtbl->GetLight(p,a,b)
+#define IDirect3DDevice7_SetRenderState(p,a,b) (p)->lpVtbl->SetRenderState(p,a,b)
+#define IDirect3DDevice7_GetRenderState(p,a,b) (p)->lpVtbl->GetRenderState(p,a,b)
+#define IDirect3DDevice7_BeginStateBlock(p) (p)->lpVtbl->BeginStateBlock(p)
+#define IDirect3DDevice7_EndStateBlock(p,a) (p)->lpVtbl->EndStateBlock(p,a)
+#define IDirect3DDevice7_PreLoad(p,a) (p)->lpVtbl->PreLoad(p,a)
+#define IDirect3DDevice7_DrawPrimitive(p,a,b,c,d,e) (p)->lpVtbl->DrawPrimitive(p,a,b,c,d,e)
+#define IDirect3DDevice7_DrawIndexedPrimitive(p,a,b,c,d,e,f,g) (p)->lpVtbl->DrawIndexedPrimitive(p,a,b,c,d,e,f,g)
+#define IDirect3DDevice7_SetClipStatus(p,a) (p)->lpVtbl->SetClipStatus(p,a)
+#define IDirect3DDevice7_GetClipStatus(p,a) (p)->lpVtbl->GetClipStatus(p,a)
+#define IDirect3DDevice7_DrawPrimitiveStrided(p,a,b,c,d,e) (p)->lpVtbl->DrawPrimitiveStrided(p,a,b,c,d,e)
+#define IDirect3DDevice7_DrawIndexedPrimitiveStrided(p,a,b,c,d,e,f,g) (p)->lpVtbl->DrawIndexedPrimitiveStrided(p,a,b,c,d,e,f,g)
+#define IDirect3DDevice7_DrawPrimitiveVB(p,a,b,c,d,e) (p)->lpVtbl->DrawPrimitiveVB(p,a,b,c,d,e)
+#define IDirect3DDevice7_DrawIndexedPrimitiveVB(p,a,b,c,d,e,f,g) (p)->lpVtbl->DrawIndexedPrimitiveVB(p,a,b,c,d,e,f,g)
+#define IDirect3DDevice7_ComputeSphereVisibility(p,a,b,c,d,e) (p)->lpVtbl->ComputeSphereVisibility(p,a,b,c,d,e)
+#define IDirect3DDevice7_GetTexture(p,a,b) (p)->lpVtbl->GetTexture(p,a,b)
+#define IDirect3DDevice7_SetTexture(p,a,b) (p)->lpVtbl->SetTexture(p,a,b)
+#define IDirect3DDevice7_GetTextureStageState(p,a,b,c) (p)->lpVtbl->GetTextureStageState(p,a,b,c)
+#define IDirect3DDevice7_SetTextureStageState(p,a,b,c) (p)->lpVtbl->SetTextureStageState(p,a,b,c)
+#define IDirect3DDevice7_ValidateDevice(p,a) (p)->lpVtbl->ValidateDevice(p,a)
+#define IDirect3DDevice7_ApplyStateBlock(p,a) (p)->lpVtbl->ApplyStateBlock(p,a)
+#define IDirect3DDevice7_CaptureStateBlock(p,a) (p)->lpVtbl->CaptureStateBlock(p,a)
+#define IDirect3DDevice7_DeleteStateBlock(p,a) (p)->lpVtbl->DeleteStateBlock(p,a)
+#define IDirect3DDevice7_CreateStateBlock(p,a,b) (p)->lpVtbl->CreateStateBlock(p,a,b)
+#define IDirect3DDevice7_Load(p,a,b,c,d,e) (p)->lpVtbl->Load(p,a,b,c,d,e)
+#define IDirect3DDevice7_LightEnable(p,a,b) (p)->lpVtbl->LightEnable(p,a,b)
+#define IDirect3DDevice7_GetLightEnable(p,a,b) (p)->lpVtbl->GetLightEnable(p,a,b)
+#define IDirect3DDevice7_SetClipPlane(p,a,b) (p)->lpVtbl->SetClipPlane(p,a,b)
+#define IDirect3DDevice7_GetClipPlane(p,a,b) (p)->lpVtbl->GetClipPlane(p,a,b)
+#define IDirect3DDevice7_GetInfo(p,a,b,c) (p)->lpVtbl->GetInfo(p,a,b,c)
+#else
+/*** IUnknown methods ***/
+#define IDirect3DDevice7_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
+#define IDirect3DDevice7_AddRef(p) (p)->AddRef()
+#define IDirect3DDevice7_Release(p) (p)->Release()
+/*** IDirect3DDevice7 methods ***/
+#define IDirect3DDevice7_GetCaps(p,a) (p)->GetCaps(a)
+#define IDirect3DDevice7_EnumTextureFormats(p,a,b) (p)->EnumTextureFormats(a,b)
+#define IDirect3DDevice7_BeginScene(p) (p)->BeginScene()
+#define IDirect3DDevice7_EndScene(p) (p)->EndScene()
+#define IDirect3DDevice7_GetDirect3D(p,a) (p)->GetDirect3D(a)
+#define IDirect3DDevice7_SetRenderTarget(p,a,b) (p)->SetRenderTarget(a,b)
+#define IDirect3DDevice7_GetRenderTarget(p,a) (p)->GetRenderTarget(a)
+#define IDirect3DDevice7_Clear(p,a,b,c,d,e,f) (p)->Clear(a,b,c,d,e,f)
+#define IDirect3DDevice7_SetTransform(p,a,b) (p)->SetTransform(a,b)
+#define IDirect3DDevice7_GetTransform(p,a,b) (p)->GetTransform(a,b)
+#define IDirect3DDevice7_SetViewport(p,a) (p)->SetViewport(a)
+#define IDirect3DDevice7_MultiplyTransform(p,a,b) (p)->MultiplyTransform(a,b)
+#define IDirect3DDevice7_GetViewport(p,a) (p)->GetViewport(a)
+#define IDirect3DDevice7_SetMaterial(p,a) (p)->SetMaterial(a)
+#define IDirect3DDevice7_GetMaterial(p,a) (p)->GetMaterial(a)
+#define IDirect3DDevice7_SetLight(p,a,b) (p)->SetLight(a,b)
+#define IDirect3DDevice7_GetLight(p,a,b) (p)->GetLight(a,b)
+#define IDirect3DDevice7_SetRenderState(p,a,b) (p)->SetRenderState(a,b)
+#define IDirect3DDevice7_GetRenderState(p,a,b) (p)->GetRenderState(a,b)
+#define IDirect3DDevice7_BeginStateBlock(p) (p)->BeginStateBlock()
+#define IDirect3DDevice7_EndStateBlock(p,a) (p)->EndStateBlock(a)
+#define IDirect3DDevice7_PreLoad(p,a) (p)->PreLoad(a)
+#define IDirect3DDevice7_DrawPrimitive(p,a,b,c,d,e) (p)->DrawPrimitive(a,b,c,d,e)
+#define IDirect3DDevice7_DrawIndexedPrimitive(p,a,b,c,d,e,f,g) (p)->DrawIndexedPrimitive(a,b,c,d,e,f,g)
+#define IDirect3DDevice7_SetClipStatus(p,a) (p)->SetClipStatus(a)
+#define IDirect3DDevice7_GetClipStatus(p,a) (p)->GetClipStatus(a)
+#define IDirect3DDevice7_DrawPrimitiveStrided(p,a,b,c,d,e) (p)->DrawPrimitiveStrided(a,b,c,d,e)
+#define IDirect3DDevice7_DrawIndexedPrimitiveStrided(p,a,b,c,d,e,f,g) (p)->DrawIndexedPrimitiveStrided(a,b,c,d,e,f,g)
+#define IDirect3DDevice7_DrawPrimitiveVB(p,a,b,c,d,e) (p)->DrawPrimitiveVB(a,b,c,d,e)
+#define IDirect3DDevice7_DrawIndexedPrimitiveVB(p,a,b,c,d,e,f,g) (p)->DrawIndexedPrimitiveVB(a,b,c,d,e,f,g)
+#define IDirect3DDevice7_ComputeSphereVisibility(p,a,b,c,d,e) (p)->ComputeSphereVisibility(a,b,c,d,e)
+#define IDirect3DDevice7_GetTexture(p,a,b) (p)->GetTexture(a,b)
+#define IDirect3DDevice7_SetTexture(p,a,b) (p)->SetTexture(a,b)
+#define IDirect3DDevice7_GetTextureStageState(p,a,b,c) (p)->GetTextureStageState(a,b,c)
+#define IDirect3DDevice7_SetTextureStageState(p,a,b,c) (p)->SetTextureStageState(a,b,c)
+#define IDirect3DDevice7_ValidateDevice(p,a) (p)->ValidateDevice(a)
+#define IDirect3DDevice7_ApplyStateBlock(p,a) (p)->ApplyStateBlock(a)
+#define IDirect3DDevice7_CaptureStateBlock(p,a) (p)->CaptureStateBlock(a)
+#define IDirect3DDevice7_DeleteStateBlock(p,a) (p)->DeleteStateBlock(a)
+#define IDirect3DDevice7_CreateStateBlock(p,a,b) (p)->CreateStateBlock(a,b)
+#define IDirect3DDevice7_Load(p,a,b,c,d,e) (p)->Load(a,b,c,d,e)
+#define IDirect3DDevice7_LightEnable(p,a,b) (p)->LightEnable(a,b)
+#define IDirect3DDevice7_GetLightEnable(p,a,b) (p)->GetLightEnable(a,b)
+#define IDirect3DDevice7_SetClipPlane(p,a,b) (p)->SetClipPlane(a,b)
+#define IDirect3DDevice7_GetClipPlane(p,a,b) (p)->GetClipPlane(a,b)
+#define IDirect3DDevice7_GetInfo(p,a,b,c) (p)->GetInfo(a,b,c)
+#endif
+
+
+
+/*****************************************************************************
+ * IDirect3DVertexBuffer interface
+ */
+#define INTERFACE IDirect3DVertexBuffer
+DECLARE_INTERFACE_(IDirect3DVertexBuffer,IUnknown)
+{
+ /*** IUnknown methods ***/
+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** IDirect3DVertexBuffer methods ***/
+ STDMETHOD(Lock)(THIS_ DWORD dwFlags,LPVOID *lplpData,LPDWORD lpdwSize) PURE;
+ STDMETHOD(Unlock)(THIS) PURE;
+ STDMETHOD(ProcessVertices)(THIS_ DWORD dwVertexOp,DWORD dwDestIndex,DWORD dwCount,LPDIRECT3DVERTEXBUFFER lpSrcBuffer,DWORD dwSrcIndex,LPDIRECT3DDEVICE3 lpD3DDevice,DWORD dwFlags) PURE;
+ STDMETHOD(GetVertexBufferDesc)(THIS_ LPD3DVERTEXBUFFERDESC lpD3DVertexBufferDesc) PURE;
+ STDMETHOD(Optimize)(THIS_ LPDIRECT3DDEVICE3 lpD3DDevice,DWORD dwFlags) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDirect3DVertexBuffer_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirect3DVertexBuffer_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirect3DVertexBuffer_Release(p) (p)->lpVtbl->Release(p)
+/*** IDirect3DVertexBuffer methods ***/
+#define IDirect3DVertexBuffer_Lock(p,a,b,c) (p)->lpVtbl->Lock(p,a,b,c)
+#define IDirect3DVertexBuffer_Unlock(p) (p)->lpVtbl->Unlock(p)
+#define IDirect3DVertexBuffer_ProcessVertices(p,a,b,c,d,e,f,g) (p)->lpVtbl->ProcessVertices(p,a,b,c,d,e,f,g)
+#define IDirect3DVertexBuffer_GetVertexBufferDesc(p,a) (p)->lpVtbl->GetVertexBufferDesc(p,a)
+#define IDirect3DVertexBuffer_Optimize(p,a,b) (p)->lpVtbl->Optimize(p,a,b)
+#else
+/*** IUnknown methods ***/
+#define IDirect3DVertexBuffer_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
+#define IDirect3DVertexBuffer_AddRef(p) (p)->AddRef()
+#define IDirect3DVertexBuffer_Release(p) (p)->Release()
+/*** IDirect3DVertexBuffer methods ***/
+#define IDirect3DVertexBuffer_Lock(p,a,b,c) (p)->Lock(a,b,c)
+#define IDirect3DVertexBuffer_Unlock(p) (p)->Unlock()
+#define IDirect3DVertexBuffer_ProcessVertices(p,a,b,c,d,e,f,g) (p)->ProcessVertices(a,b,c,d,e,f,g)
+#define IDirect3DVertexBuffer_GetVertexBufferDesc(p,a) (p)->GetVertexBufferDesc(a)
+#define IDirect3DVertexBuffer_Optimize(p,a,b) (p)->Optimize(a,b)
+#endif
+
+/*****************************************************************************
+ * IDirect3DVertexBuffer7 interface
+ */
+#define INTERFACE IDirect3DVertexBuffer7
+DECLARE_INTERFACE_(IDirect3DVertexBuffer7,IUnknown)
+{
+ /*** IUnknown methods ***/
+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** IDirect3DVertexBuffer7 methods ***/
+ STDMETHOD(Lock)(THIS_ DWORD dwFlags,LPVOID *lplpData,LPDWORD lpdwSize) PURE;
+ STDMETHOD(Unlock)(THIS) PURE;
+ STDMETHOD(ProcessVertices)(THIS_ DWORD dwVertexOp,DWORD dwDestIndex,DWORD dwCount,LPDIRECT3DVERTEXBUFFER7 lpSrcBuffer,DWORD dwSrcIndex,LPDIRECT3DDEVICE7 lpD3DDevice,DWORD dwFlags) PURE;
+ STDMETHOD(GetVertexBufferDesc)(THIS_ LPD3DVERTEXBUFFERDESC lpD3DVertexBufferDesc) PURE;
+ STDMETHOD(Optimize)(THIS_ LPDIRECT3DDEVICE7 lpD3DDevice,DWORD dwFlags) PURE;
+ STDMETHOD(ProcessVerticesStrided)(THIS_ DWORD dwVertexOp,DWORD dwDestIndex,DWORD dwCount,LPD3DDRAWPRIMITIVESTRIDEDDATA lpStrideData,DWORD dwVertexTypeDesc,LPDIRECT3DDEVICE7 lpD3DDevice,DWORD dwFlags) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDirect3DVertexBuffer7_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirect3DVertexBuffer7_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirect3DVertexBuffer7_Release(p) (p)->lpVtbl->Release(p)
+/*** IDirect3DVertexBuffer7 methods ***/
+#define IDirect3DVertexBuffer7_Lock(p,a,b,c) (p)->lpVtbl->Lock(p,a,b,c)
+#define IDirect3DVertexBuffer7_Unlock(p) (p)->lpVtbl->Unlock(p)
+#define IDirect3DVertexBuffer7_ProcessVertices(p,a,b,c,d,e,f,g) (p)->lpVtbl->ProcessVertices(p,a,b,c,d,e,f,g)
+#define IDirect3DVertexBuffer7_GetVertexBufferDesc(p,a) (p)->lpVtbl->GetVertexBufferDesc(p,a)
+#define IDirect3DVertexBuffer7_Optimize(p,a,b) (p)->lpVtbl->Optimize(p,a,b)
+#define IDirect3DVertexBuffer7_ProcessVerticesStrided(p,a,b,c,d,e,f,g) (p)->lpVtbl->ProcessVerticesStrided(p,a,b,c,d,e,f,g)
+#else
+/*** IUnknown methods ***/
+#define IDirect3DVertexBuffer7_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
+#define IDirect3DVertexBuffer7_AddRef(p) (p)->AddRef()
+#define IDirect3DVertexBuffer7_Release(p) (p)->Release()
+/*** IDirect3DVertexBuffer7 methods ***/
+#define IDirect3DVertexBuffer7_Lock(p,a,b,c) (p)->Lock(a,b,c)
+#define IDirect3DVertexBuffer7_Unlock(p) (p)->Unlock()
+#define IDirect3DVertexBuffer7_ProcessVertices(p,a,b,c,d,e,f,g) (p)->ProcessVertices(a,b,c,d,e,f,g)
+#define IDirect3DVertexBuffer7_GetVertexBufferDesc(p,a) (p)->GetVertexBufferDesc(a)
+#define IDirect3DVertexBuffer7_Optimize(p,a,b) (p)->Optimize(a,b)
+#define IDirect3DVertexBuffer7_ProcessVerticesStrided(p,a,b,c,d,e,f,g) (p)->ProcessVerticesStrided(a,b,c,d,e,f,g)
+#endif
+
+#endif /* __WINE_D3D_H */

pcsxr-1.9.93.tar.bz2/win32/plugins/dfxvideo/winsrc/d3dcaps.h Added

@@ -0,0 +1,432 @@
+/*
+ * Copyright (C) 2000 Peter Hunnisett
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef __WINE_D3DCAPS_H
+#define __WINE_D3DCAPS_H
+
+#include <ddraw.h>
+
+typedef struct _D3DTRANSFORMCAPS {
+	DWORD dwSize;
+	DWORD dwCaps;
+} D3DTRANSFORMCAPS, *LPD3DTRANSFORMCAPS;
+
+#define D3DTRANSFORMCAPS_CLIP 0x00000001L
+
+typedef struct _D3DLIGHTINGCAPS {
+	DWORD dwSize;
+	DWORD dwCaps;
+	DWORD dwLightingModel;
+	DWORD dwNumLights;
+} D3DLIGHTINGCAPS, *LPD3DLIGHTINGCAPS;
+
+#define D3DLIGHTINGMODEL_RGB 0x00000001
+#define D3DLIGHTINGMODEL_MONO 0x00000002
+
+#define D3DLIGHTCAPS_POINT 0x00000001
+#define D3DLIGHTCAPS_SPOT 0x00000002
+#define D3DLIGHTCAPS_DIRECTIONAL 0x00000004
+#define D3DLIGHTCAPS_PARALLELPOINT 0x00000008
+#define D3DLIGHTCAPS_GLSPOT 0x00000010
+
+typedef struct _D3dPrimCaps {
+ DWORD dwSize;
+ DWORD dwMiscCaps;
+ DWORD dwRasterCaps;
+ DWORD dwZCmpCaps;
+ DWORD dwSrcBlendCaps;
+ DWORD dwDestBlendCaps;
+ DWORD dwAlphaCmpCaps;
+ DWORD dwShadeCaps;
+ DWORD dwTextureCaps;
+ DWORD dwTextureFilterCaps;
+ DWORD dwTextureBlendCaps;
+ DWORD dwTextureAddressCaps;
+ DWORD dwStippleWidth;
+ DWORD dwStippleHeight;
+} D3DPRIMCAPS, *LPD3DPRIMCAPS;
+
+#define D3DPMISCCAPS_MASKPLANES 0x00000001
+#define D3DPMISCCAPS_MASKZ 0x00000002
+#define D3DPMISCCAPS_LINEPATTERNREP 0x00000004
+#define D3DPMISCCAPS_CONFORMANT 0x00000008
+#define D3DPMISCCAPS_CULLNONE 0x00000010
+#define D3DPMISCCAPS_CULLCW 0x00000020
+#define D3DPMISCCAPS_CULLCCW 0x00000040
+
+#define D3DPRASTERCAPS_DITHER 0x00000001
+#define D3DPRASTERCAPS_ROP2 0x00000002
+#define D3DPRASTERCAPS_XOR 0x00000004
+#define D3DPRASTERCAPS_PAT 0x00000008
+#define D3DPRASTERCAPS_ZTEST 0x00000010
+#define D3DPRASTERCAPS_SUBPIXEL 0x00000020
+#define D3DPRASTERCAPS_SUBPIXELX 0x00000040
+#define D3DPRASTERCAPS_FOGVERTEX 0x00000080
+#define D3DPRASTERCAPS_FOGTABLE 0x00000100
+#define D3DPRASTERCAPS_STIPPLE 0x00000200
+#define D3DPRASTERCAPS_ANTIALIASSORTDEPENDENT 0x00000400
+#define D3DPRASTERCAPS_ANTIALIASSORTINDEPENDENT 0x00000800
+#define D3DPRASTERCAPS_ANTIALIASEDGES 0x00001000
+#define D3DPRASTERCAPS_MIPMAPLODBIAS 0x00002000
+#define D3DPRASTERCAPS_ZBIAS 0x00004000
+#define D3DPRASTERCAPS_ZBUFFERLESSHSR 0x00008000
+#define D3DPRASTERCAPS_FOGRANGE 0x00010000
+#define D3DPRASTERCAPS_ANISOTROPY 0x00020000
+#define D3DPRASTERCAPS_WBUFFER 0x00040000
+#define D3DPRASTERCAPS_TRANSLUCENTSORTINDEPENDENT 0x00080000
+#define D3DPRASTERCAPS_WFOG 0x00100000
+#define D3DPRASTERCAPS_ZFOG 0x00200000
+
+#define D3DPCMPCAPS_NEVER 0x00000001
+#define D3DPCMPCAPS_LESS 0x00000002
+#define D3DPCMPCAPS_EQUAL 0x00000004
+#define D3DPCMPCAPS_LESSEQUAL 0x00000008
+#define D3DPCMPCAPS_GREATER 0x00000010
+#define D3DPCMPCAPS_NOTEQUAL 0x00000020
+#define D3DPCMPCAPS_GREATEREQUAL 0x00000040
+#define D3DPCMPCAPS_ALWAYS 0x00000080
+
+#define D3DPBLENDCAPS_ZERO 0x00000001
+#define D3DPBLENDCAPS_ONE 0x00000002
+#define D3DPBLENDCAPS_SRCCOLOR 0x00000004
+#define D3DPBLENDCAPS_INVSRCCOLOR 0x00000008
+#define D3DPBLENDCAPS_SRCALPHA 0x00000010
+#define D3DPBLENDCAPS_INVSRCALPHA 0x00000020
+#define D3DPBLENDCAPS_DESTALPHA 0x00000040
+#define D3DPBLENDCAPS_INVDESTALPHA 0x00000080
+#define D3DPBLENDCAPS_DESTCOLOR 0x00000100
+#define D3DPBLENDCAPS_INVDESTCOLOR 0x00000200
+#define D3DPBLENDCAPS_SRCALPHASAT 0x00000400
+#define D3DPBLENDCAPS_BOTHSRCALPHA 0x00000800
+#define D3DPBLENDCAPS_BOTHINVSRCALPHA 0x00001000
+
+#define D3DPSHADECAPS_COLORFLATMONO 0x00000001
+#define D3DPSHADECAPS_COLORFLATRGB 0x00000002
+#define D3DPSHADECAPS_COLORGOURAUDMONO 0x00000004
+#define D3DPSHADECAPS_COLORGOURAUDRGB 0x00000008
+#define D3DPSHADECAPS_COLORPHONGMONO 0x00000010
+#define D3DPSHADECAPS_COLORPHONGRGB 0x00000020
+
+#define D3DPSHADECAPS_SPECULARFLATMONO 0x00000040
+#define D3DPSHADECAPS_SPECULARFLATRGB 0x00000080
+#define D3DPSHADECAPS_SPECULARGOURAUDMONO 0x00000100
+#define D3DPSHADECAPS_SPECULARGOURAUDRGB 0x00000200
+#define D3DPSHADECAPS_SPECULARPHONGMONO 0x00000400
+#define D3DPSHADECAPS_SPECULARPHONGRGB 0x00000800
+
+#define D3DPSHADECAPS_ALPHAFLATBLEND 0x00001000
+#define D3DPSHADECAPS_ALPHAFLATSTIPPLED 0x00002000
+#define D3DPSHADECAPS_ALPHAGOURAUDBLEND 0x00004000
+#define D3DPSHADECAPS_ALPHAGOURAUDSTIPPLED 0x00008000
+#define D3DPSHADECAPS_ALPHAPHONGBLEND 0x00010000
+#define D3DPSHADECAPS_ALPHAPHONGSTIPPLED 0x00020000
+
+#define D3DPSHADECAPS_FOGFLAT 0x00040000
+#define D3DPSHADECAPS_FOGGOURAUD 0x00080000
+#define D3DPSHADECAPS_FOGPHONG 0x00100000
+
+#define D3DPTEXTURECAPS_PERSPECTIVE 0x00000001
+#define D3DPTEXTURECAPS_POW2 0x00000002
+#define D3DPTEXTURECAPS_ALPHA 0x00000004
+#define D3DPTEXTURECAPS_TRANSPARENCY 0x00000008
+#define D3DPTEXTURECAPS_BORDER 0x00000010
+#define D3DPTEXTURECAPS_SQUAREONLY 0x00000020
+#define D3DPTEXTURECAPS_TEXREPEATNOTSCALEDBYSIZE 0x00000040
+#define D3DPTEXTURECAPS_ALPHAPALETTE 0x00000080
+#define D3DPTEXTURECAPS_NONPOW2CONDITIONAL 0x00000100L
+/* yes actually 0x00000200 is unused - or at least unreleased */
+#define D3DPTEXTURECAPS_PROJECTED 0x00000400
+#define D3DPTEXTURECAPS_CUBEMAP 0x00000800
+#define D3DPTEXTURECAPS_COLORKEYBLEND 0x00001000
+
+#define D3DPTFILTERCAPS_NEAREST 0x00000001
+#define D3DPTFILTERCAPS_LINEAR 0x00000002
+#define D3DPTFILTERCAPS_MIPNEAREST 0x00000004
+#define D3DPTFILTERCAPS_MIPLINEAR 0x00000008
+#define D3DPTFILTERCAPS_LINEARMIPNEAREST 0x00000010
+#define D3DPTFILTERCAPS_LINEARMIPLINEAR 0x00000020
+/* yes - missing numbers */
+#define D3DPTFILTERCAPS_MINFPOINT 0x00000100
+#define D3DPTFILTERCAPS_MINFLINEAR 0x00000200
+#define D3DPTFILTERCAPS_MINFANISOTROPIC 0x00000400
+/* yes - missing numbers */
+#define D3DPTFILTERCAPS_MIPFPOINT 0x00010000
+#define D3DPTFILTERCAPS_MIPFLINEAR 0x00020000
+/* yes - missing numbers */
+#define D3DPTFILTERCAPS_MAGFPOINT 0x01000000
+#define D3DPTFILTERCAPS_MAGFLINEAR 0x02000000
+#define D3DPTFILTERCAPS_MAGFANISOTROPIC 0x04000000
+#define D3DPTFILTERCAPS_MAGFAFLATCUBIC 0x08000000
+#define D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC 0x10000000
+
+#define D3DPTBLENDCAPS_DECAL 0x00000001
+#define D3DPTBLENDCAPS_MODULATE 0x00000002
+#define D3DPTBLENDCAPS_DECALALPHA 0x00000004
+#define D3DPTBLENDCAPS_MODULATEALPHA 0x00000008
+#define D3DPTBLENDCAPS_DECALMASK 0x00000010
+#define D3DPTBLENDCAPS_MODULATEMASK 0x00000020
+#define D3DPTBLENDCAPS_COPY 0x00000040
+#define D3DPTBLENDCAPS_ADD 0x00000080
+
+#define D3DPTADDRESSCAPS_WRAP 0x00000001
+#define D3DPTADDRESSCAPS_MIRROR 0x00000002
+#define D3DPTADDRESSCAPS_CLAMP 0x00000004
+#define D3DPTADDRESSCAPS_BORDER 0x00000008
+#define D3DPTADDRESSCAPS_INDEPENDENTUV 0x00000010
+
+
+typedef struct _D3DDeviceDesc {
+ DWORD dwSize;
+ DWORD dwFlags;
+ D3DCOLORMODEL dcmColorModel;
+ DWORD dwDevCaps;
+ D3DTRANSFORMCAPS dtcTransformCaps;
+ BOOL bClipping;
+ D3DLIGHTINGCAPS dlcLightingCaps;
+ D3DPRIMCAPS dpcLineCaps;
+ D3DPRIMCAPS dpcTriCaps;
+ DWORD dwDeviceRenderBitDepth;
+ DWORD dwDeviceZBufferBitDepth;
+ DWORD dwMaxBufferSize;
+ DWORD dwMaxVertexCount;
+
+ DWORD dwMinTextureWidth,dwMinTextureHeight;
+ DWORD dwMaxTextureWidth,dwMaxTextureHeight;
+ DWORD dwMinStippleWidth,dwMaxStippleWidth;
+ DWORD dwMinStippleHeight,dwMaxStippleHeight;
+
+ DWORD dwMaxTextureRepeat;
+ DWORD dwMaxTextureAspectRatio;
+ DWORD dwMaxAnisotropy;
+
+ D3DVALUE dvGuardBandLeft;
+ D3DVALUE dvGuardBandTop;
+ D3DVALUE dvGuardBandRight;
+ D3DVALUE dvGuardBandBottom;
+
+ D3DVALUE dvExtentsAdjust;
+ DWORD dwStencilCaps;
+
+ DWORD dwFVFCaps;
+ DWORD dwTextureOpCaps;
+ WORD wMaxTextureBlendStages;
+ WORD wMaxSimultaneousTextures;
+} D3DDEVICEDESC,*LPD3DDEVICEDESC;
+#define D3DDEVICEDESCSIZE (sizeof(D3DDEVICEDESC))
+
+typedef struct _D3DDeviceDesc7 {
+ DWORD dwDevCaps;
+ D3DPRIMCAPS dpcLineCaps;
+ D3DPRIMCAPS dpcTriCaps;
+ DWORD dwDeviceRenderBitDepth;
+ DWORD dwDeviceZBufferBitDepth;
+
+ DWORD dwMinTextureWidth, dwMinTextureHeight;
+ DWORD dwMaxTextureWidth, dwMaxTextureHeight;
+
+ DWORD dwMaxTextureRepeat;
+ DWORD dwMaxTextureAspectRatio;
+ DWORD dwMaxAnisotropy;
+
+ D3DVALUE dvGuardBandLeft;
+ D3DVALUE dvGuardBandTop;
+ D3DVALUE dvGuardBandRight;
+ D3DVALUE dvGuardBandBottom;
+
+ D3DVALUE dvExtentsAdjust;
+ DWORD dwStencilCaps;
+ DWORD dwFVFCaps;
+ DWORD dwTextureOpCaps;
+ WORD wMaxTextureBlendStages;
+ WORD wMaxSimultaneousTextures;
+
+ DWORD dwMaxActiveLights;
+ D3DVALUE dvMaxVertexW;
+ GUID deviceGUID;
+
+ WORD wMaxUserClipPlanes;
+ WORD wMaxVertexBlendMatrices;
+
+ DWORD dwVertexProcessingCaps;
+
+ DWORD dwReserved1;
+ DWORD dwReserved2;
+ DWORD dwReserved3;
+ DWORD dwReserved4;
+} D3DDEVICEDESC7, *LPD3DDEVICEDESC7;
+#define D3DDEVICEDESC7SIZE (sizeof(D3DDEVICEDESC7))
+
+#define D3DDD_COLORMODEL 0x00000001
+#define D3DDD_DEVCAPS 0x00000002
+#define D3DDD_TRANSFORMCAPS 0x00000004
+#define D3DDD_LIGHTINGCAPS 0x00000008
+#define D3DDD_BCLIPPING 0x00000010
+#define D3DDD_LINECAPS 0x00000020
+#define D3DDD_TRICAPS 0x00000040
+#define D3DDD_DEVICERENDERBITDEPTH 0x00000080
+#define D3DDD_DEVICEZBUFFERBITDEPTH 0x00000100
+#define D3DDD_MAXBUFFERSIZE 0x00000200
+#define D3DDD_MAXVERTEXCOUNT 0x00000400
+
+#define D3DDEVCAPS_FLOATTLVERTEX 0x00000001
+#define D3DDEVCAPS_SORTINCREASINGZ 0x00000002
+#define D3DDEVCAPS_SORTDECREASINGZ 0X00000004
+#define D3DDEVCAPS_SORTEXACT 0x00000008
+#define D3DDEVCAPS_EXECUTESYSTEMMEMORY 0x00000010
+#define D3DDEVCAPS_EXECUTEVIDEOMEMORY 0x00000020
+#define D3DDEVCAPS_TLVERTEXSYSTEMMEMORY 0x00000040
+#define D3DDEVCAPS_TLVERTEXVIDEOMEMORY 0x00000080
+#define D3DDEVCAPS_TEXTURESYSTEMMEMORY 0x00000100
+#define D3DDEVCAPS_TEXTUREVIDEOMEMORY 0x00000200
+#define D3DDEVCAPS_DRAWPRIMTLVERTEX 0x00000400
+#define D3DDEVCAPS_CANRENDERAFTERFLIP 0x00000800
+#define D3DDEVCAPS_TEXTURENONLOCALVIDMEM 0x00001000
+#define D3DDEVCAPS_DRAWPRIMITIVES2 0x00002000
+#define D3DDEVCAPS_SEPARATETEXTUREMEMORIES 0x00004000
+#define D3DDEVCAPS_DRAWPRIMITIVES2EX 0x00008000
+#define D3DDEVCAPS_HWTRANSFORMANDLIGHT 0x00010000
+#define D3DDEVCAPS_CANBLTSYSTONONLOCAL 0x00020000
+#define D3DDEVCAPS_HWRASTERIZATION 0x00080000
+
+#define D3DSTENCILCAPS_KEEP 0x00000001
+#define D3DSTENCILCAPS_ZERO 0x00000002
+#define D3DSTENCILCAPS_REPLACE 0x00000004
+#define D3DSTENCILCAPS_INCRSAT 0x00000008
+#define D3DSTENCILCAPS_DECRSAT 0x00000010
+#define D3DSTENCILCAPS_INVERT 0x00000020
+#define D3DSTENCILCAPS_INCR 0x00000040
+#define D3DSTENCILCAPS_DECR 0x00000080
+
+#define D3DTEXOPCAPS_DISABLE 0x00000001
+#define D3DTEXOPCAPS_SELECTARG1 0x00000002
+#define D3DTEXOPCAPS_SELECTARG2 0x00000004
+#define D3DTEXOPCAPS_MODULATE 0x00000008
+#define D3DTEXOPCAPS_MODULATE2X 0x00000010
+#define D3DTEXOPCAPS_MODULATE4X 0x00000020
+#define D3DTEXOPCAPS_ADD 0x00000040
+#define D3DTEXOPCAPS_ADDSIGNED 0x00000080
+#define D3DTEXOPCAPS_ADDSIGNED2X 0x00000100
+#define D3DTEXOPCAPS_SUBTRACT 0x00000200
+#define D3DTEXOPCAPS_ADDSMOOTH 0x00000400
+#define D3DTEXOPCAPS_BLENDDIFFUSEALPHA 0x00000800
+#define D3DTEXOPCAPS_BLENDTEXTUREALPHA 0x00001000
+#define D3DTEXOPCAPS_BLENDFACTORALPHA 0x00002000
+#define D3DTEXOPCAPS_BLENDTEXTUREALPHAPM 0x00004000
+#define D3DTEXOPCAPS_BLENDCURRENTALPHA 0x00008000
+#define D3DTEXOPCAPS_PREMODULATE 0x00010000
+#define D3DTEXOPCAPS_MODULATEALPHA_ADDCOLOR 0x00020000
+#define D3DTEXOPCAPS_MODULATECOLOR_ADDALPHA 0x00040000
+#define D3DTEXOPCAPS_MODULATEINVALPHA_ADDCOLOR 0x00080000
+#define D3DTEXOPCAPS_MODULATEINVCOLOR_ADDALPHA 0x00100000
+#define D3DTEXOPCAPS_BUMPENVMAP 0x00200000
+#define D3DTEXOPCAPS_BUMPENVMAPLUMINANCE 0x00400000
+#define D3DTEXOPCAPS_DOTPRODUCT3 0x00800000
+
+#define D3DFVFCAPS_TEXCOORDCOUNTMASK 0x0000FFFF
+#define D3DFVFCAPS_DONOTSTRIPELEMENTS 0x00080000
+
+#define D3DVTXPCAPS_TEXGEN 0x00000001
+#define D3DVTXPCAPS_MATERIALSOURCE7 0x00000002
+#define D3DVTXPCAPS_VERTEXFOG 0x00000004
+#define D3DVTXPCAPS_DIRECTIONALLIGHTS 0x00000008
+#define D3DVTXPCAPS_POSITIONALLIGHTS 0x00000010
+#define D3DVTXPCAPS_LOCALVIEWER 0x00000020
+
+typedef HRESULT (CALLBACK *LPD3DENUMDEVICESCALLBACK)(LPGUID lpGuid,LPSTR lpDeviceDescription,LPSTR lpDeviceName,LPD3DDEVICEDESC,LPD3DDEVICEDESC,LPVOID);
+typedef HRESULT (CALLBACK *LPD3DENUMDEVICESCALLBACK7)(LPSTR lpDeviceDescription, LPSTR lpDeviceName, LPD3DDEVICEDESC7, LPVOID);
+
+#define D3DFDS_COLORMODEL 0x00000001
+#define D3DFDS_GUID 0x00000002
+#define D3DFDS_HARDWARE 0x00000004
+#define D3DFDS_TRIANGLES 0x00000008
+#define D3DFDS_LINES 0x00000010
+#define D3DFDS_MISCCAPS 0x00000020
+#define D3DFDS_RASTERCAPS 0x00000040
+#define D3DFDS_ZCMPCAPS 0x00000080
+#define D3DFDS_ALPHACMPCAPS 0x00000100
+#define D3DFDS_SRCBLENDCAPS 0x00000200
+#define D3DFDS_DSTBLENDCAPS 0x00000400
+#define D3DFDS_SHADECAPS 0x00000800
+#define D3DFDS_TEXTURECAPS 0x00001000
+#define D3DFDS_TEXTUREFILTERCAPS 0x00002000
+#define D3DFDS_TEXTUREBLENDCAPS 0x00004000
+#define D3DFDS_TEXTUREADDRESSCAPS 0x00008000
+
+typedef struct _D3DFINDDEVICESEARCH {
+ DWORD dwSize;
+ DWORD dwFlags;
+ BOOL bHardware;
+ D3DCOLORMODEL dcmColorModel;
+ GUID guid;
+ DWORD dwCaps;
+ D3DPRIMCAPS dpcPrimCaps;
+} D3DFINDDEVICESEARCH,*LPD3DFINDDEVICESEARCH;
+
+typedef struct _D3DFINDDEVICERESULT {
+ DWORD dwSize;
+ GUID guid;
+ D3DDEVICEDESC ddHwDesc;
+ D3DDEVICEDESC ddSwDesc;
+} D3DFINDDEVICERESULT,*LPD3DFINDDEVICERESULT;
+
+typedef struct _D3DExecuteBufferDesc {
+ DWORD dwSize;
+ DWORD dwFlags;
+ DWORD dwCaps;
+ DWORD dwBufferSize;
+ LPVOID lpData;
+} D3DEXECUTEBUFFERDESC, *LPD3DEXECUTEBUFFERDESC;
+
+#define D3DDEB_BUFSIZE 0x00000001
+#define D3DDEB_CAPS 0x00000002
+#define D3DDEB_LPDATA 0x00000004
+
+#define D3DDEBCAPS_SYSTEMMEMORY 0x00000001
+#define D3DDEBCAPS_VIDEOMEMORY 0x00000002
+#define D3DDEBCAPS_MEM (D3DDEBCAPS_SYSTEMMEMORY|D3DDEBCAPS_VIDEOMEMORY) /* = 0x3 */
+
+typedef struct _D3DDEVINFO_TEXTUREMANAGER {
+	BOOL bThrashing;
+	DWORD dwApproxBytesDownloaded;
+	DWORD dwNumEvicts;
+	DWORD dwNumVidCreates;
+	DWORD dwNumTexturesUsed;
+	DWORD dwNumUsedTexInVid;
+	DWORD dwWorkingSet;
+	DWORD dwWorkingSetBytes;
+	DWORD dwTotalManaged;
+	DWORD dwTotalBytes;
+	DWORD dwLastPri;
+} D3DDEVINFO_TEXTUREMANAGER, *LPD3DDEVINFO_TEXTUREMANAGER;
+
+typedef struct _D3DDEVINFO_TEXTURING {
+	DWORD dwNumLoads;
+	DWORD dwApproxBytesLoaded;
+	DWORD dwNumPreLoads;
+	DWORD dwNumSet;
+	DWORD dwNumCreates;
+	DWORD dwNumDestroys;
+	DWORD dwNumSetPriorities;
+	DWORD dwNumSetLODs;
+	DWORD dwNumLocks;
+	DWORD dwNumGetDCs;
+} D3DDEVINFO_TEXTURING, *LPD3DDEVINFO_TEXTURING;
+
+
+
+#endif

pcsxr-1.9.93.tar.bz2/win32/plugins/dfxvideo/winsrc/d3dtypes.h Added

@@ -0,0 +1,1361 @@
+/*
+ * Copyright (C) 2000 Peter Hunnisett
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/* FIXME: Need to add C++ code for certain structs for headers - this is going to be a problem
+ if WINE continues to only use C code - I suppose that we could always inline in
+ the header file to get around that little problem... */
+/* FIXME: We need to implement versioning on everything directx 5 and up if these headers
+ are going to be generically useful for directx stuff */
+
+#ifndef __WINE_D3DTYPES_H
+#define __WINE_D3DTYPES_H
+
+#ifndef __WINESRC__
+# include <windows.h>
+#endif
+
+#include <float.h>
+#include <ddraw.h>
+
+#define D3DVALP(val, prec) ((float)(val))
+#define D3DVAL(val) ((float)(val))
+#define D3DDivide(a, b) (float)((double) (a) / (double) (b))
+#define D3DMultiply(a, b) ((a) * (b))
+
+typedef LONG D3DFIXED;
+
+
+#ifndef RGB_MAKE
+#define CI_GETALPHA(ci) ((ci) >> 24)
+#define CI_GETINDEX(ci) (((ci) >> 8) & 0xffff)
+#define CI_GETFRACTION(ci) ((ci) & 0xff)
+#define CI_ROUNDINDEX(ci) CI_GETINDEX((ci) + 0x80)
+#define CI_MASKALPHA(ci) ((ci) & 0xffffff)
+#define CI_MAKE(a, i, f) (((a) << 24) | ((i) << 8) | (f))
+
+#define RGBA_GETALPHA(rgb) ((rgb) >> 24)
+#define RGBA_GETRED(rgb) (((rgb) >> 16) & 0xff)
+#define RGBA_GETGREEN(rgb) (((rgb) >> 8) & 0xff)
+#define RGBA_GETBLUE(rgb) ((rgb) & 0xff)
+#define RGBA_MAKE(r, g, b, a) ((D3DCOLOR) (((a) << 24) | ((r) << 16) | ((g) << 8) | (b)))
+
+#define D3DRGB(r, g, b) \
+ (0xff000000 | ( ((LONG)((r) * 255)) << 16) | (((LONG)((g) * 255)) << 8) | (LONG)((b) * 255))
+#define D3DRGBA(r, g, b, a) \
+ ( (((LONG)((a) * 255)) << 24) | (((LONG)((r) * 255)) << 16) \
+ | (((LONG)((g) * 255)) << 8) | (LONG)((b) * 255) \
+ )
+
+#define RGB_GETRED(rgb) (((rgb) >> 16) & 0xff)
+#define RGB_GETGREEN(rgb) (((rgb) >> 8) & 0xff)
+#define RGB_GETBLUE(rgb) ((rgb) & 0xff)
+#define RGBA_SETALPHA(rgba, x) (((x) << 24) | ((rgba) & 0x00ffffff))
+#define RGB_MAKE(r, g, b) ((D3DCOLOR) (((r) << 16) | ((g) << 8) | (b)))
+#define RGBA_TORGB(rgba) ((D3DCOLOR) ((rgba) & 0xffffff))
+#define RGB_TORGBA(rgb) ((D3DCOLOR) ((rgb) | 0xff000000))
+
+#endif
+
+#define D3DENUMRET_CANCEL DDENUMRET_CANCEL
+#define D3DENUMRET_OK DDENUMRET_OK
+
+typedef HRESULT (CALLBACK *LPD3DVALIDATECALLBACK)(LPVOID lpUserArg, DWORD dwOffset);
+typedef HRESULT (CALLBACK *LPD3DENUMTEXTUREFORMATSCALLBACK)(LPDDSURFACEDESC lpDdsd, LPVOID lpContext);
+typedef HRESULT (CALLBACK *LPD3DENUMPIXELFORMATSCALLBACK)(LPDDPIXELFORMAT lpDDPixFmt, LPVOID lpContext);
+
+#ifndef DX_SHARED_DEFINES
+
+typedef float D3DVALUE,*LPD3DVALUE;
+
+#ifndef D3DCOLOR_DEFINED
+typedef DWORD D3DCOLOR, *LPD3DCOLOR;
+#define D3DCOLOR_DEFINED
+#endif
+
+#ifndef D3DVECTOR_DEFINED
+typedef struct _D3DVECTOR {
+ union {
+ D3DVALUE x;
+ D3DVALUE dvX;
+ } DUMMYUNIONNAME1;
+ union {
+ D3DVALUE y;
+ D3DVALUE dvY;
+ } DUMMYUNIONNAME2;
+ union {
+ D3DVALUE z;
+ D3DVALUE dvZ;
+ } DUMMYUNIONNAME3;
+#if defined(__cplusplus) && defined(D3D_OVERLOADS)
+ /* the definitions for these methods are in d3dvec.inl */
+public:
+ /*** constructors ***/
+ _D3DVECTOR() {}
+ _D3DVECTOR(D3DVALUE f);
+ _D3DVECTOR(D3DVALUE _x, D3DVALUE _y, D3DVALUE _z);
+ _D3DVECTOR(const D3DVALUE f[3]);
+
+ /*** assignment operators ***/
+ _D3DVECTOR& operator += (const _D3DVECTOR& v);
+ _D3DVECTOR& operator -= (const _D3DVECTOR& v);
+ _D3DVECTOR& operator *= (const _D3DVECTOR& v);
+ _D3DVECTOR& operator /= (const _D3DVECTOR& v);
+ _D3DVECTOR& operator *= (D3DVALUE s);
+ _D3DVECTOR& operator /= (D3DVALUE s);
+
+ /*** unary operators ***/
+ friend _D3DVECTOR operator + (const _D3DVECTOR& v);
+ friend _D3DVECTOR operator - (const _D3DVECTOR& v);
+
+ /*** binary operators ***/
+ friend _D3DVECTOR operator + (const _D3DVECTOR& v1, const _D3DVECTOR& v2);
+ friend _D3DVECTOR operator - (const _D3DVECTOR& v1, const _D3DVECTOR& v2);
+
+ friend _D3DVECTOR operator * (const _D3DVECTOR& v, D3DVALUE s);
+ friend _D3DVECTOR operator * (D3DVALUE s, const _D3DVECTOR& v);
+ friend _D3DVECTOR operator / (const _D3DVECTOR& v, D3DVALUE s);
+
+ friend D3DVALUE SquareMagnitude(const _D3DVECTOR& v);
+ friend D3DVALUE Magnitude(const _D3DVECTOR& v);
+
+ friend _D3DVECTOR Normalize(const _D3DVECTOR& v);
+
+ friend D3DVALUE DotProduct(const _D3DVECTOR& v1, const _D3DVECTOR& v2);
+ friend _D3DVECTOR CrossProduct(const _D3DVECTOR& v1, const _D3DVECTOR& v2);
+#endif
+} D3DVECTOR,*LPD3DVECTOR;
+#define D3DVECTOR_DEFINED
+#endif
+
+#define DX_SHARED_DEFINES
+#endif /* DX_SHARED_DEFINES */
+
+typedef DWORD D3DMATERIALHANDLE, *LPD3DMATERIALHANDLE;
+typedef DWORD D3DTEXTUREHANDLE, *LPD3DTEXTUREHANDLE;
+typedef DWORD D3DMATRIXHANDLE, *LPD3DMATRIXHANDLE;
+
+typedef struct _D3DCOLORVALUE {
+ union {
+ D3DVALUE r;
+ D3DVALUE dvR;
+ } DUMMYUNIONNAME1;
+ union {
+ D3DVALUE g;
+ D3DVALUE dvG;
+ } DUMMYUNIONNAME2;
+ union {
+ D3DVALUE b;
+ D3DVALUE dvB;
+ } DUMMYUNIONNAME3;
+ union {
+ D3DVALUE a;
+ D3DVALUE dvA;
+ } DUMMYUNIONNAME4;
+} D3DCOLORVALUE,*LPD3DCOLORVALUE;
+
+typedef struct _D3DRECT {
+ union {
+ LONG x1;
+ LONG lX1;
+ } DUMMYUNIONNAME1;
+ union {
+ LONG y1;
+ LONG lY1;
+ } DUMMYUNIONNAME2;
+ union {
+ LONG x2;
+ LONG lX2;
+ } DUMMYUNIONNAME3;
+ union {
+ LONG y2;
+ LONG lY2;
+ } DUMMYUNIONNAME4;
+} D3DRECT, *LPD3DRECT;
+
+typedef struct _D3DHVERTEX {
+ DWORD dwFlags;
+ union {
+ D3DVALUE hx;
+ D3DVALUE dvHX;
+ } DUMMYUNIONNAME1;
+ union {
+ D3DVALUE hy;
+ D3DVALUE dvHY;
+ } DUMMYUNIONNAME2;
+ union {
+ D3DVALUE hz;
+ D3DVALUE dvHZ;
+ } DUMMYUNIONNAME3;
+} D3DHVERTEX, *LPD3DHVERTEX;
+
+/*
+ * Transformed/lit vertices
+ */
+typedef struct _D3DTLVERTEX {
+ union {
+ D3DVALUE sx;
+ D3DVALUE dvSX;
+ } DUMMYUNIONNAME1;
+ union {
+ D3DVALUE sy;
+ D3DVALUE dvSY;
+ } DUMMYUNIONNAME2;
+ union {
+ D3DVALUE sz;
+ D3DVALUE dvSZ;
+ } DUMMYUNIONNAME3;
+ union {
+ D3DVALUE rhw;
+ D3DVALUE dvRHW;
+ } DUMMYUNIONNAME4;
+ union {
+ D3DCOLOR color;
+ D3DCOLOR dcColor;
+ } DUMMYUNIONNAME5;
+ union {
+ D3DCOLOR specular;
+ D3DCOLOR dcSpecular;
+ } DUMMYUNIONNAME6;
+ union {
+ D3DVALUE tu;
+ D3DVALUE dvTU;
+ } DUMMYUNIONNAME7;
+ union {
+ D3DVALUE tv;
+ D3DVALUE dvTV;
+ } DUMMYUNIONNAME8;
+#if defined(__cplusplus) && defined(D3D_OVERLOADS)
+public:
+ _D3DTLVERTEX() {}
+ _D3DTLVERTEX(const D3DVECTOR& v, float _rhw, D3DCOLOR _color, D3DCOLOR _specular, float _tu, float _tv) {
+ sx = v.x; sy = v.y; sz = v.z; rhw = _rhw;
+ color = _color; specular = _specular;
+ tu = _tu; tv = _tv;
+ }
+#endif
+} D3DTLVERTEX, *LPD3DTLVERTEX;
+
+typedef struct _D3DLVERTEX {
+ union {
+ D3DVALUE x;
+ D3DVALUE dvX;
+ } DUMMYUNIONNAME1;
+ union {
+ D3DVALUE y;
+ D3DVALUE dvY;
+ } DUMMYUNIONNAME2;
+ union {
+ D3DVALUE z;
+ D3DVALUE dvZ;
+ } DUMMYUNIONNAME3;
+ DWORD dwReserved;
+ union {
+ D3DCOLOR color;
+ D3DCOLOR dcColor;
+ } DUMMYUNIONNAME4;
+ union {
+ D3DCOLOR specular;
+ D3DCOLOR dcSpecular;
+ } DUMMYUNIONNAME5;
+ union {
+ D3DVALUE tu;
+ D3DVALUE dvTU;
+ } DUMMYUNIONNAME6;
+ union {
+ D3DVALUE tv;
+ D3DVALUE dvTV;
+ } DUMMYUNIONNAME7;
+} D3DLVERTEX, *LPD3DLVERTEX;
+
+typedef struct _D3DVERTEX {
+ union {
+ D3DVALUE x;
+ D3DVALUE dvX;
+ } DUMMYUNIONNAME1;
+ union {
+ D3DVALUE y;
+ D3DVALUE dvY;
+ } DUMMYUNIONNAME2;
+ union {
+ D3DVALUE z;
+ D3DVALUE dvZ;
+ } DUMMYUNIONNAME3;
+ union {
+ D3DVALUE nx;
+ D3DVALUE dvNX;
+ } DUMMYUNIONNAME4;
+ union {
+ D3DVALUE ny;
+ D3DVALUE dvNY;
+ } DUMMYUNIONNAME5;
+ union {
+ D3DVALUE nz;
+ D3DVALUE dvNZ;
+ } DUMMYUNIONNAME6;
+ union {
+ D3DVALUE tu;
+ D3DVALUE dvTU;
+ } DUMMYUNIONNAME7;
+ union {
+ D3DVALUE tv;
+ D3DVALUE dvTV;
+ } DUMMYUNIONNAME8;
+#if defined(__cplusplus) && defined(D3D_OVERLOADS)
+public:
+ _D3DVERTEX() {}
+ _D3DVERTEX(const D3DVECTOR& v, const D3DVECTOR& n, float _tu, float _tv) {
+ x = v.x; y = v.y; z = v.z;
+ nx = n.x; ny = n.y; nz = n.z;
+ tu = _tu; tv = _tv;
+ }
+#endif
+} D3DVERTEX, *LPD3DVERTEX;
+
+typedef struct _D3DMATRIX {
+ D3DVALUE _11, _12, _13, _14;
+ D3DVALUE _21, _22, _23, _24;
+ D3DVALUE _31, _32, _33, _34;
+ D3DVALUE _41, _42, _43, _44;
+#if defined(__cplusplus) && defined(D3D_OVERLOADS)
+ _D3DMATRIX() { }
+
+ /* This is different from MS, but avoids anonymous structs. */
+ D3DVALUE &operator () (int r, int c)
+	{ return ((D3DVALUE [4][4])&_11)[r][c]; }
+ const D3DVALUE &operator() (int r, int c) const
+	{ return ((const D3DVALUE [4][4])&_11)[r][c]; }
+#endif
+} D3DMATRIX, *LPD3DMATRIX;
+
+#if defined(__cplusplus) && defined(D3D_OVERLOADS)
+#include <d3dvec.inl>
+#endif
+
+typedef struct _D3DVIEWPORT {
+ DWORD dwSize;
+ DWORD dwX;
+ DWORD dwY;
+ DWORD dwWidth;
+ DWORD dwHeight;
+ D3DVALUE dvScaleX;
+ D3DVALUE dvScaleY;
+ D3DVALUE dvMaxX;
+ D3DVALUE dvMaxY;
+ D3DVALUE dvMinZ;
+ D3DVALUE dvMaxZ;
+} D3DVIEWPORT, *LPD3DVIEWPORT;
+
+typedef struct _D3DVIEWPORT2 {
+ DWORD dwSize;
+ DWORD dwX;
+ DWORD dwY;
+ DWORD dwWidth;
+ DWORD dwHeight;
+ D3DVALUE dvClipX;
+ D3DVALUE dvClipY;
+ D3DVALUE dvClipWidth;
+ D3DVALUE dvClipHeight;
+ D3DVALUE dvMinZ;
+ D3DVALUE dvMaxZ;
+} D3DVIEWPORT2, *LPD3DVIEWPORT2;
+
+typedef struct _D3DVIEWPORT7 {
+ DWORD dwX;
+ DWORD dwY;
+ DWORD dwWidth;
+ DWORD dwHeight;
+ D3DVALUE dvMinZ;
+ D3DVALUE dvMaxZ;
+} D3DVIEWPORT7, *LPD3DVIEWPORT7;
+
+#define D3DMAXUSERCLIPPLANES 32
+
+#define D3DCLIPPLANE0 (1 << 0)
+#define D3DCLIPPLANE1 (1 << 1)
+#define D3DCLIPPLANE2 (1 << 2)
+#define D3DCLIPPLANE3 (1 << 3)
+#define D3DCLIPPLANE4 (1 << 4)
+#define D3DCLIPPLANE5 (1 << 5)
+
+#define D3DCLIP_LEFT 0x00000001
+#define D3DCLIP_RIGHT 0x00000002
+#define D3DCLIP_TOP 0x00000004
+#define D3DCLIP_BOTTOM 0x00000008
+#define D3DCLIP_FRONT 0x00000010
+#define D3DCLIP_BACK 0x00000020
+#define D3DCLIP_GEN0 0x00000040
+#define D3DCLIP_GEN1 0x00000080
+#define D3DCLIP_GEN2 0x00000100
+#define D3DCLIP_GEN3 0x00000200
+#define D3DCLIP_GEN4 0x00000400
+#define D3DCLIP_GEN5 0x00000800
+
+#define D3DSTATUS_CLIPUNIONLEFT D3DCLIP_LEFT
+#define D3DSTATUS_CLIPUNIONRIGHT D3DCLIP_RIGHT
+#define D3DSTATUS_CLIPUNIONTOP D3DCLIP_TOP
+#define D3DSTATUS_CLIPUNIONBOTTOM D3DCLIP_BOTTOM
+#define D3DSTATUS_CLIPUNIONFRONT D3DCLIP_FRONT
+#define D3DSTATUS_CLIPUNIONBACK D3DCLIP_BACK
+#define D3DSTATUS_CLIPUNIONGEN0 D3DCLIP_GEN0
+#define D3DSTATUS_CLIPUNIONGEN1 D3DCLIP_GEN1
+#define D3DSTATUS_CLIPUNIONGEN2 D3DCLIP_GEN2
+#define D3DSTATUS_CLIPUNIONGEN3 D3DCLIP_GEN3
+#define D3DSTATUS_CLIPUNIONGEN4 D3DCLIP_GEN4
+#define D3DSTATUS_CLIPUNIONGEN5 D3DCLIP_GEN5
+
+#define D3DSTATUS_CLIPINTERSECTIONLEFT 0x00001000
+#define D3DSTATUS_CLIPINTERSECTIONRIGHT 0x00002000
+#define D3DSTATUS_CLIPINTERSECTIONTOP 0x00004000
+#define D3DSTATUS_CLIPINTERSECTIONBOTTOM 0x00008000
+#define D3DSTATUS_CLIPINTERSECTIONFRONT 0x00010000
+#define D3DSTATUS_CLIPINTERSECTIONBACK 0x00020000
+#define D3DSTATUS_CLIPINTERSECTIONGEN0 0x00040000
+#define D3DSTATUS_CLIPINTERSECTIONGEN1 0x00080000
+#define D3DSTATUS_CLIPINTERSECTIONGEN2 0x00100000
+#define D3DSTATUS_CLIPINTERSECTIONGEN3 0x00200000
+#define D3DSTATUS_CLIPINTERSECTIONGEN4 0x00400000
+#define D3DSTATUS_CLIPINTERSECTIONGEN5 0x00800000
+#define D3DSTATUS_ZNOTVISIBLE 0x01000000
+
+#define D3DSTATUS_CLIPUNIONALL ( \
+ D3DSTATUS_CLIPUNIONLEFT | \
+ D3DSTATUS_CLIPUNIONRIGHT | \
+ D3DSTATUS_CLIPUNIONTOP | \
+ D3DSTATUS_CLIPUNIONBOTTOM | \
+ D3DSTATUS_CLIPUNIONFRONT | \
+ D3DSTATUS_CLIPUNIONBACK | \
+ D3DSTATUS_CLIPUNIONGEN0 | \
+ D3DSTATUS_CLIPUNIONGEN1 | \
+ D3DSTATUS_CLIPUNIONGEN2 | \
+ D3DSTATUS_CLIPUNIONGEN3 | \
+ D3DSTATUS_CLIPUNIONGEN4 | \
+ D3DSTATUS_CLIPUNIONGEN5 \
+ )
+
+#define D3DSTATUS_CLIPINTERSECTIONALL ( \
+ D3DSTATUS_CLIPINTERSECTIONLEFT | \
+ D3DSTATUS_CLIPINTERSECTIONRIGHT | \
+ D3DSTATUS_CLIPINTERSECTIONTOP | \
+ D3DSTATUS_CLIPINTERSECTIONBOTTOM | \
+ D3DSTATUS_CLIPINTERSECTIONFRONT | \
+ D3DSTATUS_CLIPINTERSECTIONBACK | \
+ D3DSTATUS_CLIPINTERSECTIONGEN0 | \
+ D3DSTATUS_CLIPINTERSECTIONGEN1 | \
+ D3DSTATUS_CLIPINTERSECTIONGEN2 | \
+ D3DSTATUS_CLIPINTERSECTIONGEN3 | \
+ D3DSTATUS_CLIPINTERSECTIONGEN4 | \
+ D3DSTATUS_CLIPINTERSECTIONGEN5 \
+ )
+
+#define D3DSTATUS_DEFAULT ( \
+ D3DSTATUS_CLIPINTERSECTIONALL | \
+ D3DSTATUS_ZNOTVISIBLE)
+
+#define D3DTRANSFORM_CLIPPED 0x00000001
+#define D3DTRANSFORM_UNCLIPPED 0x00000002
+
+typedef struct _D3DTRANSFORMDATA {
+ DWORD dwSize;
+ LPVOID lpIn;
+ DWORD dwInSize;
+ LPVOID lpOut;
+ DWORD dwOutSize;
+ LPD3DHVERTEX lpHOut;
+ DWORD dwClip;
+ DWORD dwClipIntersection;
+ DWORD dwClipUnion;
+ D3DRECT drExtent;
+} D3DTRANSFORMDATA, *LPD3DTRANSFORMDATA;
+
+typedef struct _D3DLIGHTINGELEMENT {
+ D3DVECTOR dvPosition;
+ D3DVECTOR dvNormal;
+} D3DLIGHTINGELEMENT, *LPD3DLIGHTINGELEMENT;
+
+typedef struct _D3DMATERIAL {
+ DWORD dwSize;
+ union {
+ D3DCOLORVALUE diffuse;
+ D3DCOLORVALUE dcvDiffuse;
+ } DUMMYUNIONNAME;
+ union {
+ D3DCOLORVALUE ambient;
+ D3DCOLORVALUE dcvAmbient;
+ } DUMMYUNIONNAME1;
+ union {
+ D3DCOLORVALUE specular;
+ D3DCOLORVALUE dcvSpecular;
+ } DUMMYUNIONNAME2;
+ union {
+ D3DCOLORVALUE emissive;
+ D3DCOLORVALUE dcvEmissive;
+ } DUMMYUNIONNAME3;
+ union {
+ D3DVALUE power;
+ D3DVALUE dvPower;
+ } DUMMYUNIONNAME4;
+ D3DTEXTUREHANDLE hTexture;
+ DWORD dwRampSize;
+} D3DMATERIAL, *LPD3DMATERIAL;
+
+typedef struct _D3DMATERIAL7 {
+ union {
+ D3DCOLORVALUE diffuse;
+ D3DCOLORVALUE dcvDiffuse;
+ } DUMMYUNIONNAME;
+ union {
+ D3DCOLORVALUE ambient;
+ D3DCOLORVALUE dcvAmbient;
+ } DUMMYUNIONNAME1;
+ union {
+ D3DCOLORVALUE specular;
+ D3DCOLORVALUE dcvSpecular;
+ } DUMMYUNIONNAME2;
+ union {
+ D3DCOLORVALUE emissive;
+ D3DCOLORVALUE dcvEmissive;
+ } DUMMYUNIONNAME3;
+ union {
+ D3DVALUE power;
+ D3DVALUE dvPower;
+ } DUMMYUNIONNAME4;
+} D3DMATERIAL7, *LPD3DMATERIAL7;
+
+typedef enum {
+ D3DLIGHT_POINT = 1,
+ D3DLIGHT_SPOT = 2,
+ D3DLIGHT_DIRECTIONAL = 3,
+ D3DLIGHT_PARALLELPOINT = 4,
+ D3DLIGHT_GLSPOT = 5,
+ D3DLIGHT_FORCE_DWORD = 0x7fffffff
+} D3DLIGHTTYPE;
+
+typedef struct _D3DLIGHT {
+ DWORD dwSize;
+ D3DLIGHTTYPE dltType;
+ D3DCOLORVALUE dcvColor;
+ D3DVECTOR dvPosition;
+ D3DVECTOR dvDirection;
+ D3DVALUE dvRange;
+ D3DVALUE dvFalloff;
+ D3DVALUE dvAttenuation0;
+ D3DVALUE dvAttenuation1;
+ D3DVALUE dvAttenuation2;
+ D3DVALUE dvTheta;
+ D3DVALUE dvPhi;
+} D3DLIGHT,*LPD3DLIGHT;
+
+typedef struct _D3DLIGHT7 {
+ D3DLIGHTTYPE dltType;
+ D3DCOLORVALUE dcvDiffuse;
+ D3DCOLORVALUE dcvSpecular;
+ D3DCOLORVALUE dcvAmbient;
+ D3DVECTOR dvPosition;
+ D3DVECTOR dvDirection;
+ D3DVALUE dvRange;
+ D3DVALUE dvFalloff;
+ D3DVALUE dvAttenuation0;
+ D3DVALUE dvAttenuation1;
+ D3DVALUE dvAttenuation2;
+ D3DVALUE dvTheta;
+ D3DVALUE dvPhi;
+} D3DLIGHT7, *LPD3DLIGHT7;
+
+#define D3DLIGHT_ACTIVE 0x00000001
+#define D3DLIGHT_NO_SPECULAR 0x00000002
+#define D3DLIGHT_ALL (D3DLIGHT_ACTIVE | D3DLIGHT_NO_SPECULAR) /* 0x3 */
+
+#define D3DLIGHT_RANGE_MAX ((float)sqrt(FLT_MAX))
+
+typedef struct _D3DLIGHT2 {
+ DWORD dwSize;
+ D3DLIGHTTYPE dltType;
+ D3DCOLORVALUE dcvColor;
+ D3DVECTOR dvPosition;
+ D3DVECTOR dvDirection;
+ D3DVALUE dvRange;
+ D3DVALUE dvFalloff;
+ D3DVALUE dvAttenuation0;
+ D3DVALUE dvAttenuation1;
+ D3DVALUE dvAttenuation2;
+ D3DVALUE dvTheta;
+ D3DVALUE dvPhi;
+ DWORD dwFlags;
+} D3DLIGHT2, *LPD3DLIGHT2;
+
+typedef struct _D3DLIGHTDATA {
+ DWORD dwSize;
+ LPD3DLIGHTINGELEMENT lpIn;
+ DWORD dwInSize;
+ LPD3DTLVERTEX lpOut;
+ DWORD dwOutSize;
+} D3DLIGHTDATA, *LPD3DLIGHTDATA;
+
+#define D3DCOLOR_MONO 1
+#define D3DCOLOR_RGB 2
+
+typedef DWORD D3DCOLORMODEL;
+
+
+#define D3DCLEAR_TARGET 0x00000001
+#define D3DCLEAR_ZBUFFER 0x00000002
+#define D3DCLEAR_STENCIL 0x00000004
+
+typedef enum _D3DOPCODE {
+ D3DOP_POINT = 1,
+ D3DOP_LINE = 2,
+ D3DOP_TRIANGLE = 3,
+ D3DOP_MATRIXLOAD = 4,
+ D3DOP_MATRIXMULTIPLY = 5,
+ D3DOP_STATETRANSFORM = 6,
+ D3DOP_STATELIGHT = 7,
+ D3DOP_STATERENDER = 8,
+ D3DOP_PROCESSVERTICES = 9,
+ D3DOP_TEXTURELOAD = 10,
+ D3DOP_EXIT = 11,
+ D3DOP_BRANCHFORWARD = 12,
+ D3DOP_SPAN = 13,
+ D3DOP_SETSTATUS = 14,
+
+ D3DOP_FORCE_DWORD = 0x7fffffff
+} D3DOPCODE;
+
+typedef struct _D3DINSTRUCTION {
+ BYTE bOpcode;
+ BYTE bSize;
+ WORD wCount;
+} D3DINSTRUCTION, *LPD3DINSTRUCTION;
+
+typedef struct _D3DTEXTURELOAD {
+ D3DTEXTUREHANDLE hDestTexture;
+ D3DTEXTUREHANDLE hSrcTexture;
+} D3DTEXTURELOAD, *LPD3DTEXTURELOAD;
+
+typedef struct _D3DPICKRECORD {
+ BYTE bOpcode;
+ BYTE bPad;
+ DWORD dwOffset;
+ D3DVALUE dvZ;
+} D3DPICKRECORD, *LPD3DPICKRECORD;
+
+typedef enum {
+ D3DSHADE_FLAT = 1,
+ D3DSHADE_GOURAUD = 2,
+ D3DSHADE_PHONG = 3,
+ D3DSHADE_FORCE_DWORD = 0x7fffffff
+} D3DSHADEMODE;
+
+typedef enum {
+ D3DFILL_POINT = 1,
+ D3DFILL_WIREFRAME = 2,
+ D3DFILL_SOLID = 3,
+ D3DFILL_FORCE_DWORD = 0x7fffffff
+} D3DFILLMODE;
+
+typedef struct _D3DLINEPATTERN {
+ WORD wRepeatFactor;
+ WORD wLinePattern;
+} D3DLINEPATTERN;
+
+typedef enum {
+ D3DFILTER_NEAREST = 1,
+ D3DFILTER_LINEAR = 2,
+ D3DFILTER_MIPNEAREST = 3,
+ D3DFILTER_MIPLINEAR = 4,
+ D3DFILTER_LINEARMIPNEAREST = 5,
+ D3DFILTER_LINEARMIPLINEAR = 6,
+ D3DFILTER_FORCE_DWORD = 0x7fffffff
+} D3DTEXTUREFILTER;
+
+typedef enum {
+ D3DBLEND_ZERO = 1,
+ D3DBLEND_ONE = 2,
+ D3DBLEND_SRCCOLOR = 3,
+ D3DBLEND_INVSRCCOLOR = 4,
+ D3DBLEND_SRCALPHA = 5,
+ D3DBLEND_INVSRCALPHA = 6,
+ D3DBLEND_DESTALPHA = 7,
+ D3DBLEND_INVDESTALPHA = 8,
+ D3DBLEND_DESTCOLOR = 9,
+ D3DBLEND_INVDESTCOLOR = 10,
+ D3DBLEND_SRCALPHASAT = 11,
+ D3DBLEND_BOTHSRCALPHA = 12,
+ D3DBLEND_BOTHINVSRCALPHA = 13,
+ D3DBLEND_FORCE_DWORD = 0x7fffffff
+} D3DBLEND;
+
+typedef enum {
+ D3DTBLEND_DECAL = 1,
+ D3DTBLEND_MODULATE = 2,
+ D3DTBLEND_DECALALPHA = 3,
+ D3DTBLEND_MODULATEALPHA = 4,
+ D3DTBLEND_DECALMASK = 5,
+ D3DTBLEND_MODULATEMASK = 6,
+ D3DTBLEND_COPY = 7,
+ D3DTBLEND_ADD = 8,
+ D3DTBLEND_FORCE_DWORD = 0x7fffffff
+} D3DTEXTUREBLEND;
+
+typedef enum _D3DTEXTUREADDRESS {
+ D3DTADDRESS_WRAP = 1,
+ D3DTADDRESS_MIRROR = 2,
+ D3DTADDRESS_CLAMP = 3,
+ D3DTADDRESS_BORDER = 4,
+ D3DTADDRESS_FORCE_DWORD = 0x7fffffff
+} D3DTEXTUREADDRESS;
+
+typedef enum {
+ D3DCULL_NONE = 1,
+ D3DCULL_CW = 2,
+ D3DCULL_CCW = 3,
+ D3DCULL_FORCE_DWORD = 0x7fffffff
+} D3DCULL;
+
+typedef enum {
+ D3DCMP_NEVER = 1,
+ D3DCMP_LESS = 2,
+ D3DCMP_EQUAL = 3,
+ D3DCMP_LESSEQUAL = 4,
+ D3DCMP_GREATER = 5,
+ D3DCMP_NOTEQUAL = 6,
+ D3DCMP_GREATEREQUAL = 7,
+ D3DCMP_ALWAYS = 8,
+ D3DCMP_FORCE_DWORD = 0x7fffffff
+} D3DCMPFUNC;
+
+typedef enum _D3DSTENCILOP {
+ D3DSTENCILOP_KEEP = 1,
+ D3DSTENCILOP_ZERO = 2,
+ D3DSTENCILOP_REPLACE = 3,
+ D3DSTENCILOP_INCRSAT = 4,
+ D3DSTENCILOP_DECRSAT = 5,
+ D3DSTENCILOP_INVERT = 6,
+ D3DSTENCILOP_INCR = 7,
+ D3DSTENCILOP_DECR = 8,
+ D3DSTENCILOP_FORCE_DWORD = 0x7fffffff
+} D3DSTENCILOP;
+
+typedef enum _D3DFOGMODE {
+ D3DFOG_NONE = 0,
+ D3DFOG_EXP = 1,
+ D3DFOG_EXP2 = 2,
+ D3DFOG_LINEAR = 3,
+ D3DFOG_FORCE_DWORD = 0x7fffffff
+} D3DFOGMODE;
+
+typedef enum _D3DZBUFFERTYPE {
+ D3DZB_FALSE = 0,
+ D3DZB_TRUE = 1,
+ D3DZB_USEW = 2,
+ D3DZB_FORCE_DWORD = 0x7fffffff
+} D3DZBUFFERTYPE;
+
+typedef enum _D3DANTIALIASMODE {
+ D3DANTIALIAS_NONE = 0,
+ D3DANTIALIAS_SORTDEPENDENT = 1,
+ D3DANTIALIAS_SORTINDEPENDENT = 2,
+ D3DANTIALIAS_FORCE_DWORD = 0x7fffffff
+} D3DANTIALIASMODE;
+
+typedef enum {
+ D3DVT_VERTEX = 1,
+ D3DVT_LVERTEX = 2,
+ D3DVT_TLVERTEX = 3,
+ D3DVT_FORCE_DWORD = 0x7fffffff
+} D3DVERTEXTYPE;
+
+typedef enum {
+ D3DPT_POINTLIST = 1,
+ D3DPT_LINELIST = 2,
+ D3DPT_LINESTRIP = 3,
+ D3DPT_TRIANGLELIST = 4,
+ D3DPT_TRIANGLESTRIP = 5,
+ D3DPT_TRIANGLEFAN = 6,
+ D3DPT_FORCE_DWORD = 0x7fffffff
+} D3DPRIMITIVETYPE;
+
+#define D3DSTATE_OVERRIDE_BIAS 256
+
+#define D3DSTATE_OVERRIDE(type) (D3DRENDERSTATETYPE)(((DWORD) (type) + D3DSTATE_OVERRIDE_BIAS))
+
+typedef enum _D3DTRANSFORMSTATETYPE {
+ D3DTRANSFORMSTATE_WORLD = 1,
+ D3DTRANSFORMSTATE_VIEW = 2,
+ D3DTRANSFORMSTATE_PROJECTION = 3,
+ D3DTRANSFORMSTATE_WORLD1 = 4,
+ D3DTRANSFORMSTATE_WORLD2 = 5,
+ D3DTRANSFORMSTATE_WORLD3 = 6,
+ D3DTRANSFORMSTATE_TEXTURE0 = 16,
+ D3DTRANSFORMSTATE_TEXTURE1 = 17,
+ D3DTRANSFORMSTATE_TEXTURE2 = 18,
+ D3DTRANSFORMSTATE_TEXTURE3 = 19,
+ D3DTRANSFORMSTATE_TEXTURE4 = 20,
+ D3DTRANSFORMSTATE_TEXTURE5 = 21,
+ D3DTRANSFORMSTATE_TEXTURE6 = 22,
+ D3DTRANSFORMSTATE_TEXTURE7 = 23,
+ D3DTRANSFORMSTATE_FORCE_DWORD = 0x7fffffff
+} D3DTRANSFORMSTATETYPE;
+
+typedef enum {
+ D3DLIGHTSTATE_MATERIAL = 1,
+ D3DLIGHTSTATE_AMBIENT = 2,
+ D3DLIGHTSTATE_COLORMODEL = 3,
+ D3DLIGHTSTATE_FOGMODE = 4,
+ D3DLIGHTSTATE_FOGSTART = 5,
+ D3DLIGHTSTATE_FOGEND = 6,
+ D3DLIGHTSTATE_FOGDENSITY = 7,
+ D3DLIGHTSTATE_COLORVERTEX = 8,
+ D3DLIGHTSTATE_FORCE_DWORD = 0x7fffffff
+} D3DLIGHTSTATETYPE;
+
+typedef enum {
+ D3DRENDERSTATE_TEXTUREHANDLE = 1,
+ D3DRENDERSTATE_ANTIALIAS = 2,
+ D3DRENDERSTATE_TEXTUREADDRESS = 3,
+ D3DRENDERSTATE_TEXTUREPERSPECTIVE = 4,
+ D3DRENDERSTATE_WRAPU = 5,
+ D3DRENDERSTATE_WRAPV = 6,
+ D3DRENDERSTATE_ZENABLE = 7,
+ D3DRENDERSTATE_FILLMODE = 8,
+ D3DRENDERSTATE_SHADEMODE = 9,
+ D3DRENDERSTATE_LINEPATTERN = 10,
+ D3DRENDERSTATE_MONOENABLE = 11,
+ D3DRENDERSTATE_ROP2 = 12,
+ D3DRENDERSTATE_PLANEMASK = 13,
+ D3DRENDERSTATE_ZWRITEENABLE = 14,
+ D3DRENDERSTATE_ALPHATESTENABLE = 15,
+ D3DRENDERSTATE_LASTPIXEL = 16,
+ D3DRENDERSTATE_TEXTUREMAG = 17,
+ D3DRENDERSTATE_TEXTUREMIN = 18,
+ D3DRENDERSTATE_SRCBLEND = 19,
+ D3DRENDERSTATE_DESTBLEND = 20,
+ D3DRENDERSTATE_TEXTUREMAPBLEND = 21,
+ D3DRENDERSTATE_CULLMODE = 22,
+ D3DRENDERSTATE_ZFUNC = 23,
+ D3DRENDERSTATE_ALPHAREF = 24,
+ D3DRENDERSTATE_ALPHAFUNC = 25,
+ D3DRENDERSTATE_DITHERENABLE = 26,
+ D3DRENDERSTATE_ALPHABLENDENABLE = 27,
+ D3DRENDERSTATE_FOGENABLE = 28,
+ D3DRENDERSTATE_SPECULARENABLE = 29,
+ D3DRENDERSTATE_ZVISIBLE = 30,
+ D3DRENDERSTATE_SUBPIXEL = 31,
+ D3DRENDERSTATE_SUBPIXELX = 32,
+ D3DRENDERSTATE_STIPPLEDALPHA = 33,
+ D3DRENDERSTATE_FOGCOLOR = 34,
+ D3DRENDERSTATE_FOGTABLEMODE = 35,
+ D3DRENDERSTATE_FOGTABLESTART = 36,
+ D3DRENDERSTATE_FOGTABLEEND = 37,
+ D3DRENDERSTATE_FOGTABLEDENSITY = 38,
+ D3DRENDERSTATE_FOGSTART = 36,
+ D3DRENDERSTATE_FOGEND = 37,
+ D3DRENDERSTATE_FOGDENSITY = 38,
+ D3DRENDERSTATE_STIPPLEENABLE = 39,
+ D3DRENDERSTATE_EDGEANTIALIAS = 40,
+ D3DRENDERSTATE_COLORKEYENABLE = 41,
+ D3DRENDERSTATE_BORDERCOLOR = 43,
+ D3DRENDERSTATE_TEXTUREADDRESSU = 44,
+ D3DRENDERSTATE_TEXTUREADDRESSV = 45,
+ D3DRENDERSTATE_MIPMAPLODBIAS = 46,
+ D3DRENDERSTATE_ZBIAS = 47,
+ D3DRENDERSTATE_RANGEFOGENABLE = 48,
+ D3DRENDERSTATE_ANISOTROPY = 49,
+ D3DRENDERSTATE_FLUSHBATCH = 50,
+ D3DRENDERSTATE_TRANSLUCENTSORTINDEPENDENT = 51,
+
+ D3DRENDERSTATE_STENCILENABLE = 52,
+ D3DRENDERSTATE_STENCILFAIL = 53,
+ D3DRENDERSTATE_STENCILZFAIL = 54,
+ D3DRENDERSTATE_STENCILPASS = 55,
+ D3DRENDERSTATE_STENCILFUNC = 56,
+ D3DRENDERSTATE_STENCILREF = 57,
+ D3DRENDERSTATE_STENCILMASK = 58,
+ D3DRENDERSTATE_STENCILWRITEMASK = 59,
+ D3DRENDERSTATE_TEXTUREFACTOR = 60,
+
+ D3DRENDERSTATE_STIPPLEPATTERN00 = 64,
+ D3DRENDERSTATE_STIPPLEPATTERN01 = 65,
+ D3DRENDERSTATE_STIPPLEPATTERN02 = 66,
+ D3DRENDERSTATE_STIPPLEPATTERN03 = 67,
+ D3DRENDERSTATE_STIPPLEPATTERN04 = 68,
+ D3DRENDERSTATE_STIPPLEPATTERN05 = 69,
+ D3DRENDERSTATE_STIPPLEPATTERN06 = 70,
+ D3DRENDERSTATE_STIPPLEPATTERN07 = 71,
+ D3DRENDERSTATE_STIPPLEPATTERN08 = 72,
+ D3DRENDERSTATE_STIPPLEPATTERN09 = 73,
+ D3DRENDERSTATE_STIPPLEPATTERN10 = 74,
+ D3DRENDERSTATE_STIPPLEPATTERN11 = 75,
+ D3DRENDERSTATE_STIPPLEPATTERN12 = 76,
+ D3DRENDERSTATE_STIPPLEPATTERN13 = 77,
+ D3DRENDERSTATE_STIPPLEPATTERN14 = 78,
+ D3DRENDERSTATE_STIPPLEPATTERN15 = 79,
+ D3DRENDERSTATE_STIPPLEPATTERN16 = 80,
+ D3DRENDERSTATE_STIPPLEPATTERN17 = 81,
+ D3DRENDERSTATE_STIPPLEPATTERN18 = 82,
+ D3DRENDERSTATE_STIPPLEPATTERN19 = 83,
+ D3DRENDERSTATE_STIPPLEPATTERN20 = 84,
+ D3DRENDERSTATE_STIPPLEPATTERN21 = 85,
+ D3DRENDERSTATE_STIPPLEPATTERN22 = 86,
+ D3DRENDERSTATE_STIPPLEPATTERN23 = 87,
+ D3DRENDERSTATE_STIPPLEPATTERN24 = 88,
+ D3DRENDERSTATE_STIPPLEPATTERN25 = 89,
+ D3DRENDERSTATE_STIPPLEPATTERN26 = 90,
+ D3DRENDERSTATE_STIPPLEPATTERN27 = 91,
+ D3DRENDERSTATE_STIPPLEPATTERN28 = 92,
+ D3DRENDERSTATE_STIPPLEPATTERN29 = 93,
+ D3DRENDERSTATE_STIPPLEPATTERN30 = 94,
+ D3DRENDERSTATE_STIPPLEPATTERN31 = 95,
+
+ D3DRENDERSTATE_WRAP0 = 128,
+ D3DRENDERSTATE_WRAP1 = 129,
+ D3DRENDERSTATE_WRAP2 = 130,
+ D3DRENDERSTATE_WRAP3 = 131,
+ D3DRENDERSTATE_WRAP4 = 132,
+ D3DRENDERSTATE_WRAP5 = 133,
+ D3DRENDERSTATE_WRAP6 = 134,
+ D3DRENDERSTATE_WRAP7 = 135,
+ D3DRENDERSTATE_CLIPPING = 136,
+ D3DRENDERSTATE_LIGHTING = 137,
+ D3DRENDERSTATE_EXTENTS = 138,
+ D3DRENDERSTATE_AMBIENT = 139,
+ D3DRENDERSTATE_FOGVERTEXMODE = 140,
+ D3DRENDERSTATE_COLORVERTEX = 141,
+ D3DRENDERSTATE_LOCALVIEWER = 142,
+ D3DRENDERSTATE_NORMALIZENORMALS = 143,
+ D3DRENDERSTATE_COLORKEYBLENDENABLE = 144,
+ D3DRENDERSTATE_DIFFUSEMATERIALSOURCE = 145,
+ D3DRENDERSTATE_SPECULARMATERIALSOURCE = 146,
+ D3DRENDERSTATE_AMBIENTMATERIALSOURCE = 147,
+ D3DRENDERSTATE_EMISSIVEMATERIALSOURCE = 148,
+ D3DRENDERSTATE_VERTEXBLEND = 151,
+ D3DRENDERSTATE_CLIPPLANEENABLE = 152,
+
+ D3DRENDERSTATE_FORCE_DWORD = 0x7fffffff
+
+ /* FIXME: We have some retired values that are being reused for DirectX 7 */
+} D3DRENDERSTATETYPE;
+
+typedef enum _D3DMATERIALCOLORSOURCE
+{
+ D3DMCS_MATERIAL = 0,
+ D3DMCS_COLOR1 = 1,
+ D3DMCS_COLOR2 = 2,
+ D3DMCS_FORCE_DWORD = 0x7fffffff
+} D3DMATERIALCOLORSOURCE;
+
+#define D3DRENDERSTATE_BLENDENABLE D3DRENDERSTATE_ALPHABLENDENABLE
+#define D3DRENDERSTATE_WRAPBIAS 128UL
+#define D3DWRAP_U 0x00000001L
+#define D3DWRAP_V 0x00000002L
+
+#define D3DWRAPCOORD_0 0x00000001L
+#define D3DWRAPCOORD_1 0x00000002L
+#define D3DWRAPCOORD_2 0x00000004L
+#define D3DWRAPCOORD_3 0x00000008L
+
+#define D3DRENDERSTATE_STIPPLEPATTERN(y) (D3DRENDERSTATE_STIPPLEPATTERN00 + (y))
+
+typedef struct _D3DSTATE {
+ union {
+ D3DTRANSFORMSTATETYPE dtstTransformStateType;
+ D3DLIGHTSTATETYPE dlstLightStateType;
+ D3DRENDERSTATETYPE drstRenderStateType;
+ } DUMMYUNIONNAME1;
+ union {
+ DWORD dwArg[1];
+ D3DVALUE dvArg[1];
+ } DUMMYUNIONNAME2;
+} D3DSTATE, *LPD3DSTATE;
+
+typedef struct _D3DMATRIXLOAD {
+ D3DMATRIXHANDLE hDestMatrix;
+ D3DMATRIXHANDLE hSrcMatrix;
+} D3DMATRIXLOAD, *LPD3DMATRIXLOAD;
+
+typedef struct _D3DMATRIXMULTIPLY {
+ D3DMATRIXHANDLE hDestMatrix;
+ D3DMATRIXHANDLE hSrcMatrix1;
+ D3DMATRIXHANDLE hSrcMatrix2;
+} D3DMATRIXMULTIPLY, *LPD3DMATRIXMULTIPLY;
+
+typedef struct _D3DPROCESSVERTICES {
+ DWORD dwFlags;
+ WORD wStart;
+ WORD wDest;
+ DWORD dwCount;
+ DWORD dwReserved;
+} D3DPROCESSVERTICES, *LPD3DPROCESSVERTICES;
+
+#define D3DPROCESSVERTICES_TRANSFORMLIGHT 0x00000000L
+#define D3DPROCESSVERTICES_TRANSFORM 0x00000001L
+#define D3DPROCESSVERTICES_COPY 0x00000002L
+#define D3DPROCESSVERTICES_OPMASK 0x00000007L
+
+#define D3DPROCESSVERTICES_UPDATEEXTENTS 0x00000008L
+#define D3DPROCESSVERTICES_NOCOLOR 0x00000010L
+
+typedef enum _D3DTEXTURESTAGESTATETYPE
+{
+ D3DTSS_COLOROP = 1,
+ D3DTSS_COLORARG1 = 2,
+ D3DTSS_COLORARG2 = 3,
+ D3DTSS_ALPHAOP = 4,
+ D3DTSS_ALPHAARG1 = 5,
+ D3DTSS_ALPHAARG2 = 6,
+ D3DTSS_BUMPENVMAT00 = 7,
+ D3DTSS_BUMPENVMAT01 = 8,
+ D3DTSS_BUMPENVMAT10 = 9,
+ D3DTSS_BUMPENVMAT11 = 10,
+ D3DTSS_TEXCOORDINDEX = 11,
+ D3DTSS_ADDRESS = 12,
+ D3DTSS_ADDRESSU = 13,
+ D3DTSS_ADDRESSV = 14,
+ D3DTSS_BORDERCOLOR = 15,
+ D3DTSS_MAGFILTER = 16,
+ D3DTSS_MINFILTER = 17,
+ D3DTSS_MIPFILTER = 18,
+ D3DTSS_MIPMAPLODBIAS = 19,
+ D3DTSS_MAXMIPLEVEL = 20,
+ D3DTSS_MAXANISOTROPY = 21,
+ D3DTSS_BUMPENVLSCALE = 22,
+ D3DTSS_BUMPENVLOFFSET = 23,
+ D3DTSS_TEXTURETRANSFORMFLAGS = 24,
+ D3DTSS_FORCE_DWORD = 0x7fffffff
+} D3DTEXTURESTAGESTATETYPE;
+
+#define D3DTSS_TCI_PASSTHRU 0x00000000
+#define D3DTSS_TCI_CAMERASPACENORMAL 0x00010000
+#define D3DTSS_TCI_CAMERASPACEPOSITION 0x00020000
+#define D3DTSS_TCI_CAMERASPACEREFLECTIONVECTOR 0x00030000
+
+typedef enum _D3DTEXTUREOP
+{
+ D3DTOP_DISABLE = 1,
+ D3DTOP_SELECTARG1 = 2,
+ D3DTOP_SELECTARG2 = 3,
+
+ D3DTOP_MODULATE = 4,
+ D3DTOP_MODULATE2X = 5,
+ D3DTOP_MODULATE4X = 6,
+
+ D3DTOP_ADD = 7,
+ D3DTOP_ADDSIGNED = 8,
+ D3DTOP_ADDSIGNED2X = 9,
+ D3DTOP_SUBTRACT = 10,
+ D3DTOP_ADDSMOOTH = 11,
+
+ D3DTOP_BLENDDIFFUSEALPHA = 12,
+ D3DTOP_BLENDTEXTUREALPHA = 13,
+ D3DTOP_BLENDFACTORALPHA = 14,
+ D3DTOP_BLENDTEXTUREALPHAPM = 15,
+ D3DTOP_BLENDCURRENTALPHA = 16,
+
+ D3DTOP_PREMODULATE = 17,
+ D3DTOP_MODULATEALPHA_ADDCOLOR = 18,
+ D3DTOP_MODULATECOLOR_ADDALPHA = 19,
+ D3DTOP_MODULATEINVALPHA_ADDCOLOR = 20,
+ D3DTOP_MODULATEINVCOLOR_ADDALPHA = 21,
+
+ D3DTOP_BUMPENVMAP = 22,
+ D3DTOP_BUMPENVMAPLUMINANCE = 23,
+ D3DTOP_DOTPRODUCT3 = 24,
+
+ D3DTOP_FORCE_DWORD = 0x7fffffff
+} D3DTEXTUREOP;
+
+#define D3DTA_SELECTMASK 0x0000000f
+#define D3DTA_DIFFUSE 0x00000000
+#define D3DTA_CURRENT 0x00000001
+#define D3DTA_TEXTURE 0x00000002
+#define D3DTA_TFACTOR 0x00000003
+#define D3DTA_SPECULAR 0x00000004
+#define D3DTA_COMPLEMENT 0x00000010
+#define D3DTA_ALPHAREPLICATE 0x00000020
+
+typedef enum _D3DTEXTUREMAGFILTER
+{
+ D3DTFG_POINT = 1,
+ D3DTFG_LINEAR = 2,
+ D3DTFG_FLATCUBIC = 3,
+ D3DTFG_GAUSSIANCUBIC = 4,
+ D3DTFG_ANISOTROPIC = 5,
+ D3DTFG_FORCE_DWORD = 0x7fffffff
+} D3DTEXTUREMAGFILTER;
+
+typedef enum _D3DTEXTUREMINFILTER
+{
+ D3DTFN_POINT = 1,
+ D3DTFN_LINEAR = 2,
+ D3DTFN_ANISOTROPIC = 3,
+ D3DTFN_FORCE_DWORD = 0x7fffffff
+} D3DTEXTUREMINFILTER;
+
+typedef enum _D3DTEXTUREMIPFILTER
+{
+ D3DTFP_NONE = 1,
+ D3DTFP_POINT = 2,
+ D3DTFP_LINEAR = 3,
+ D3DTFP_FORCE_DWORD = 0x7fffffff
+} D3DTEXTUREMIPFILTER;
+
+#define D3DTRIFLAG_START 0x00000000L
+#define D3DTRIFLAG_STARTFLAT(len) (len)
+#define D3DTRIFLAG_ODD 0x0000001eL
+#define D3DTRIFLAG_EVEN 0x0000001fL
+
+#define D3DTRIFLAG_EDGEENABLE1 0x00000100L
+#define D3DTRIFLAG_EDGEENABLE2 0x00000200L
+#define D3DTRIFLAG_EDGEENABLE3 0x00000400L
+#define D3DTRIFLAG_EDGEENABLETRIANGLE \
+ (D3DTRIFLAG_EDGEENABLE1 | D3DTRIFLAG_EDGEENABLE2 | D3DTRIFLAG_EDGEENABLE3)
+
+typedef struct _D3DTRIANGLE {
+ union {
+ WORD v1;
+ WORD wV1;
+ } DUMMYUNIONNAME1;
+ union {
+ WORD v2;
+ WORD wV2;
+ } DUMMYUNIONNAME2;
+ union {
+ WORD v3;
+ WORD wV3;
+ } DUMMYUNIONNAME3;
+ WORD wFlags;
+} D3DTRIANGLE, *LPD3DTRIANGLE;
+
+typedef struct _D3DLINE {
+ union {
+ WORD v1;
+ WORD wV1;
+ } DUMMYUNIONNAME1;
+ union {
+ WORD v2;
+ WORD wV2;
+ } DUMMYUNIONNAME2;
+} D3DLINE, *LPD3DLINE;
+
+typedef struct _D3DSPAN {
+ WORD wCount;
+ WORD wFirst;
+} D3DSPAN, *LPD3DSPAN;
+
+typedef struct _D3DPOINT {
+ WORD wCount;
+ WORD wFirst;
+} D3DPOINT, *LPD3DPOINT;
+
+typedef struct _D3DBRANCH {
+ DWORD dwMask;
+ DWORD dwValue;
+ BOOL bNegate;
+ DWORD dwOffset;
+} D3DBRANCH, *LPD3DBRANCH;
+
+typedef struct _D3DSTATUS {
+ DWORD dwFlags;
+ DWORD dwStatus;
+ D3DRECT drExtent;
+} D3DSTATUS, *LPD3DSTATUS;
+
+#define D3DSETSTATUS_STATUS 0x00000001L
+#define D3DSETSTATUS_EXTENTS 0x00000002L
+#define D3DSETSTATUS_ALL (D3DSETSTATUS_STATUS | D3DSETSTATUS_EXTENTS)
+
+typedef struct _D3DCLIPSTATUS {
+ DWORD dwFlags;
+ DWORD dwStatus;
+ float minx, maxx;
+ float miny, maxy;
+ float minz, maxz;
+} D3DCLIPSTATUS, *LPD3DCLIPSTATUS;
+
+#define D3DCLIPSTATUS_STATUS 0x00000001L
+#define D3DCLIPSTATUS_EXTENTS2 0x00000002L
+#define D3DCLIPSTATUS_EXTENTS3 0x00000004L
+
+typedef struct {
+ DWORD dwSize;
+ DWORD dwTrianglesDrawn;
+ DWORD dwLinesDrawn;
+ DWORD dwPointsDrawn;
+ DWORD dwSpansDrawn;
+ DWORD dwVerticesProcessed;
+} D3DSTATS, *LPD3DSTATS;
+
+#define D3DEXECUTE_CLIPPED 0x00000001l
+#define D3DEXECUTE_UNCLIPPED 0x00000002l
+
+typedef struct _D3DEXECUTEDATA {
+ DWORD dwSize;
+ DWORD dwVertexOffset;
+ DWORD dwVertexCount;
+ DWORD dwInstructionOffset;
+ DWORD dwInstructionLength;
+ DWORD dwHVertexOffset;
+ D3DSTATUS dsStatus;
+} D3DEXECUTEDATA, *LPD3DEXECUTEDATA;
+
+#define D3DPAL_FREE 0x00
+#define D3DPAL_READONLY 0x40
+#define D3DPAL_RESERVED 0x80
+
+typedef struct _D3DVERTEXBUFFERDESC {
+ DWORD dwSize;
+ DWORD dwCaps;
+ DWORD dwFVF;
+ DWORD dwNumVertices;
+} D3DVERTEXBUFFERDESC, *LPD3DVERTEXBUFFERDESC;
+
+#define D3DVBCAPS_SYSTEMMEMORY 0x00000800l
+#define D3DVBCAPS_WRITEONLY 0x00010000l
+#define D3DVBCAPS_OPTIMIZED 0x80000000l
+#define D3DVBCAPS_DONOTCLIP 0x00000001l
+
+#define D3DVOP_LIGHT (1 << 10)
+#define D3DVOP_TRANSFORM (1 << 0)
+#define D3DVOP_CLIP (1 << 2)
+#define D3DVOP_EXTENTS (1 << 3)
+
+#define D3DMAXNUMVERTICES ((1<<16) - 1)
+
+#define D3DMAXNUMPRIMITIVES ((1<<16) - 1)
+
+#define D3DPV_DONOTCOPYDATA (1 << 0)
+
+#define D3DFVF_RESERVED0 0x001
+#define D3DFVF_POSITION_MASK 0x00E
+#define D3DFVF_XYZ 0x002
+#define D3DFVF_XYZRHW 0x004
+#define D3DFVF_XYZB1 0x006
+#define D3DFVF_XYZB2 0x008
+#define D3DFVF_XYZB3 0x00a
+#define D3DFVF_XYZB4 0x00c
+#define D3DFVF_XYZB5 0x00e
+
+#define D3DFVF_NORMAL 0x010
+#define D3DFVF_RESERVED1 0x020
+#define D3DFVF_DIFFUSE 0x040
+#define D3DFVF_SPECULAR 0x080
+#define D3DFVF_TEXCOUNT_MASK 0xf00
+#define D3DFVF_TEXCOUNT_SHIFT 8
+#define D3DFVF_TEX0 0x000
+#define D3DFVF_TEX1 0x100
+#define D3DFVF_TEX2 0x200
+#define D3DFVF_TEX3 0x300
+#define D3DFVF_TEX4 0x400
+#define D3DFVF_TEX5 0x500
+#define D3DFVF_TEX6 0x600
+#define D3DFVF_TEX7 0x700
+#define D3DFVF_TEX8 0x800
+
+#define D3DFVF_RESERVED2 0xf000
+
+#define D3DFVF_VERTEX ( D3DFVF_XYZ | D3DFVF_NORMAL | D3DFVF_TEX1 )
+#define D3DFVF_LVERTEX ( D3DFVF_XYZ | D3DFVF_RESERVED1 | D3DFVF_DIFFUSE | \
+ D3DFVF_SPECULAR | D3DFVF_TEX1 )
+#define D3DFVF_TLVERTEX ( D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_SPECULAR | \
+ D3DFVF_TEX1 )
+
+typedef struct _D3DDP_PTRSTRIDE {
+ LPVOID lpvData;
+ DWORD dwStride;
+} D3DDP_PTRSTRIDE;
+
+#define D3DDP_MAXTEXCOORD 8
+
+typedef struct _D3DDRAWPRIMITIVESTRIDEDDATA {
+ D3DDP_PTRSTRIDE position;
+ D3DDP_PTRSTRIDE normal;
+ D3DDP_PTRSTRIDE diffuse;
+ D3DDP_PTRSTRIDE specular;
+ D3DDP_PTRSTRIDE textureCoords[D3DDP_MAXTEXCOORD];
+} D3DDRAWPRIMITIVESTRIDEDDATA ,*LPD3DDRAWPRIMITIVESTRIDEDDATA;
+
+#define D3DVIS_INSIDE_FRUSTUM 0
+#define D3DVIS_INTERSECT_FRUSTUM 1
+#define D3DVIS_OUTSIDE_FRUSTUM 2
+#define D3DVIS_INSIDE_LEFT 0
+#define D3DVIS_INTERSECT_LEFT (1 << 2)
+#define D3DVIS_OUTSIDE_LEFT (2 << 2)
+#define D3DVIS_INSIDE_RIGHT 0
+#define D3DVIS_INTERSECT_RIGHT (1 << 4)
+#define D3DVIS_OUTSIDE_RIGHT (2 << 4)
+#define D3DVIS_INSIDE_TOP 0
+#define D3DVIS_INTERSECT_TOP (1 << 6)
+#define D3DVIS_OUTSIDE_TOP (2 << 6)
+#define D3DVIS_INSIDE_BOTTOM 0
+#define D3DVIS_INTERSECT_BOTTOM (1 << 8)
+#define D3DVIS_OUTSIDE_BOTTOM (2 << 8)
+#define D3DVIS_INSIDE_NEAR 0
+#define D3DVIS_INTERSECT_NEAR (1 << 10)
+#define D3DVIS_OUTSIDE_NEAR (2 << 10)
+#define D3DVIS_INSIDE_FAR 0
+#define D3DVIS_INTERSECT_FAR (1 << 12)
+#define D3DVIS_OUTSIDE_FAR (2 << 12)
+
+#define D3DVIS_MASK_FRUSTUM (3 << 0)
+#define D3DVIS_MASK_LEFT (3 << 2)
+#define D3DVIS_MASK_RIGHT (3 << 4)
+#define D3DVIS_MASK_TOP (3 << 6)
+#define D3DVIS_MASK_BOTTOM (3 << 8)
+#define D3DVIS_MASK_NEAR (3 << 10)
+#define D3DVIS_MASK_FAR (3 << 12)
+
+#define D3DDEVINFOID_TEXTUREMANAGER 1
+#define D3DDEVINFOID_D3DTEXTUREMANAGER 2
+#define D3DDEVINFOID_TEXTURING 3
+
+typedef enum _D3DSTATEBLOCKTYPE
+{
+ D3DSBT_ALL = 1,
+ D3DSBT_PIXELSTATE = 2,
+ D3DSBT_VERTEXSTATE = 3,
+ D3DSBT_FORCE_DWORD = 0xffffffff
+} D3DSTATEBLOCKTYPE;
+
+typedef enum _D3DVERTEXBLENDFLAGS
+{
+ D3DVBLEND_DISABLE = 0,
+ D3DVBLEND_1WEIGHT = 1,
+ D3DVBLEND_2WEIGHTS = 2,
+ D3DVBLEND_3WEIGHTS = 3,
+} D3DVERTEXBLENDFLAGS;
+
+typedef enum _D3DTEXTURETRANSFORMFLAGS {
+ D3DTTFF_DISABLE = 0,
+ D3DTTFF_COUNT1 = 1,
+ D3DTTFF_COUNT2 = 2,
+ D3DTTFF_COUNT3 = 3,
+ D3DTTFF_COUNT4 = 4,
+ D3DTTFF_PROJECTED = 256,
+ D3DTTFF_FORCE_DWORD = 0x7fffffff
+} D3DTEXTURETRANSFORMFLAGS;
+
+#define D3DFVF_TEXTUREFORMAT2 0
+#define D3DFVF_TEXTUREFORMAT1 3
+#define D3DFVF_TEXTUREFORMAT3 1
+#define D3DFVF_TEXTUREFORMAT4 2
+
+#define D3DFVF_TEXCOORDSIZE3(CoordIndex) (D3DFVF_TEXTUREFORMAT3 << (CoordIndex*2 + 16))
+#define D3DFVF_TEXCOORDSIZE2(CoordIndex) (D3DFVF_TEXTUREFORMAT2)
+#define D3DFVF_TEXCOORDSIZE4(CoordIndex) (D3DFVF_TEXTUREFORMAT4 << (CoordIndex*2 + 16))
+#define D3DFVF_TEXCOORDSIZE1(CoordIndex) (D3DFVF_TEXTUREFORMAT1 << (CoordIndex*2 + 16))
+
+#endif

pcsxr-1.9.93.tar.bz2/win32/plugins/dfxvideo/winsrc/ddraw.h Added

@@ -0,0 +1,2697 @@
+/*
+ * Copyright (C) the Wine project
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef __WINE_DDRAW_H
+#define __WINE_DDRAW_H
+
+#define COM_NO_WINDOWS_H
+#include <objbase.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* defined(__cplusplus) */
+
+#ifndef	DIRECTDRAW_VERSION
+#define	DIRECTDRAW_VERSION	0x0700
+#endif /* DIRECTDRAW_VERSION */
+
+#ifndef WINELIB_NAME_AW
+#ifdef UNICODE
+#define WINELIB_NAME_AW(func) func##W
+#else
+#define WINELIB_NAME_AW(func) func##A
+#endif
+#endif
+
+#ifndef DECL_WINELIB_TYPE_AW
+#define DECL_WINELIB_TYPE_AW(type) typedef WINELIB_NAME_AW(type) type;
+#endif
+
+#ifndef DWORD_PTR
+#define DWORD_PTR unsigned long
+#endif
+
+/*****************************************************************************
+ * Predeclare the interfaces
+ */
+#ifndef __DDRAW_GUID_DEFINED__
+DEFINE_GUID( CLSID_DirectDraw,		0xD7B70EE0,0x4340,0x11CF,0xB0,0x63,0x00,0x20,0xAF,0xC2,0xCD,0x35 );
+DEFINE_GUID( CLSID_DirectDraw7, 0x3C305196,0x50DB,0x11D3,0x9C,0xFE,0x00,0xC0,0x4F,0xD9,0x30,0xC5 );
+DEFINE_GUID( CLSID_DirectDrawClipper,	0x593817A0,0x7DB3,0x11CF,0xA2,0xDE,0x00,0xAA,0x00,0xb9,0x33,0x56 );
+DEFINE_GUID( IID_IDirectDraw,		0x6C14DB80,0xA733,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60 );
+DEFINE_GUID( IID_IDirectDraw2,		0xB3A6F3E0,0x2B43,0x11CF,0xA2,0xDE,0x00,0xAA,0x00,0xB9,0x33,0x56 );
+DEFINE_GUID( IID_IDirectDraw3,		0x618f8ad4,0x8b7a,0x11d0,0x8f,0xcc,0x0,0xc0,0x4f,0xd9,0x18,0x9d );
+DEFINE_GUID( IID_IDirectDraw4, 0x9c59509a,0x39bd,0x11d1,0x8c,0x4a,0x00,0xc0,0x4f,0xd9,0x30,0xc5 );
+DEFINE_GUID( IID_IDirectDraw7, 0x15e65ec0,0x3b9c,0x11d2,0xb9,0x2f,0x00,0x60,0x97,0x97,0xea,0x5b );
+DEFINE_GUID( IID_IDirectDrawSurface,	0x6C14DB81,0xA733,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60 );
+DEFINE_GUID( IID_IDirectDrawSurface2,	0x57805885,0x6eec,0x11cf,0x94,0x41,0xa8,0x23,0x03,0xc1,0x0e,0x27 );
+DEFINE_GUID( IID_IDirectDrawSurface3,	0xDA044E00,0x69B2,0x11D0,0xA1,0xD5,0x00,0xAA,0x00,0xB8,0xDF,0xBB );
+DEFINE_GUID( IID_IDirectDrawSurface4, 0x0B2B8630,0xAD35,0x11D0,0x8E,0xA6,0x00,0x60,0x97,0x97,0xEA,0x5B );
+DEFINE_GUID( IID_IDirectDrawSurface7, 0x06675a80,0x3b9b,0x11d2,0xb9,0x2f,0x00,0x60,0x97,0x97,0xea,0x5b );
+DEFINE_GUID( IID_IDirectDrawPalette,	0x6C14DB84,0xA733,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60 );
+DEFINE_GUID( IID_IDirectDrawClipper,	0x6C14DB85,0xA733,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60 );
+DEFINE_GUID( IID_IDirectDrawColorControl,0x4B9F0EE0,0x0D7E,0x11D0,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8 );
+DEFINE_GUID( IID_IDirectDrawGammaControl,0x69C11C3E,0xB46B,0x11D1,0xAD,0x7A,0x00,0xC0,0x4F,0xC2,0x9B,0x4E );
+#endif
+
+typedef struct IDirectDraw *LPDIRECTDRAW;
+typedef struct IDirectDraw2 *LPDIRECTDRAW2;
+typedef struct IDirectDraw3 *LPDIRECTDRAW3;
+typedef struct IDirectDraw4 *LPDIRECTDRAW4;
+typedef struct IDirectDraw7 *LPDIRECTDRAW7;
+typedef struct IDirectDrawClipper *LPDIRECTDRAWCLIPPER;
+typedef struct IDirectDrawPalette *LPDIRECTDRAWPALETTE;
+typedef struct IDirectDrawSurface *LPDIRECTDRAWSURFACE;
+typedef struct IDirectDrawSurface2 *LPDIRECTDRAWSURFACE2;
+typedef struct IDirectDrawSurface3 *LPDIRECTDRAWSURFACE3;
+typedef struct IDirectDrawSurface4 *LPDIRECTDRAWSURFACE4;
+typedef struct IDirectDrawSurface7 *LPDIRECTDRAWSURFACE7;
+typedef struct IDirectDrawColorControl *LPDIRECTDRAWCOLORCONTROL;
+typedef struct IDirectDrawGammaControl *LPDIRECTDRAWGAMMACONTROL;
+
+
+#define DDENUMRET_CANCEL	0
+#define DDENUMRET_OK		1
+
+#define DD_OK			S_OK
+#define DD_FALSE		S_FALSE
+
+
+#define _FACDD		0x876
+#define MAKE_DDHRESULT( code ) MAKE_HRESULT( 1, _FACDD, code )
+
+#define DDERR_ALREADYINITIALIZED		MAKE_DDHRESULT( 5 )
+#define DDERR_CANNOTATTACHSURFACE		MAKE_DDHRESULT( 10 )
+#define DDERR_CANNOTDETACHSURFACE		MAKE_DDHRESULT( 20 )
+#define DDERR_CURRENTLYNOTAVAIL			MAKE_DDHRESULT( 40 )
+#define DDERR_EXCEPTION				MAKE_DDHRESULT( 55 )
+#define DDERR_GENERIC				E_FAIL
+#define DDERR_HEIGHTALIGN			MAKE_DDHRESULT( 90 )
+#define DDERR_INCOMPATIBLEPRIMARY		MAKE_DDHRESULT( 95 )
+#define DDERR_INVALIDCAPS			MAKE_DDHRESULT( 100 )
+#define DDERR_INVALIDCLIPLIST			MAKE_DDHRESULT( 110 )
+#define DDERR_INVALIDMODE			MAKE_DDHRESULT( 120 )
+#define DDERR_INVALIDOBJECT			MAKE_DDHRESULT( 130 )
+#define DDERR_INVALIDPARAMS			E_INVALIDARG
+#define DDERR_INVALIDPIXELFORMAT		MAKE_DDHRESULT( 145 )
+#define DDERR_INVALIDRECT			MAKE_DDHRESULT( 150 )
+#define DDERR_LOCKEDSURFACES			MAKE_DDHRESULT( 160 )
+#define DDERR_NO3D				MAKE_DDHRESULT( 170 )
+#define DDERR_NOALPHAHW				MAKE_DDHRESULT( 180 )
+#define DDERR_NOSTEREOHARDWARE 	MAKE_DDHRESULT( 181 )
+#define DDERR_NOSURFACELEFT MAKE_DDHRESULT( 182 )
+#define DDERR_NOCLIPLIST			MAKE_DDHRESULT( 205 )
+#define DDERR_NOCOLORCONVHW			MAKE_DDHRESULT( 210 )
+#define DDERR_NOCOOPERATIVELEVELSET		MAKE_DDHRESULT( 212 )
+#define DDERR_NOCOLORKEY			MAKE_DDHRESULT( 215 )
+#define DDERR_NOCOLORKEYHW			MAKE_DDHRESULT( 220 )
+#define DDERR_NODIRECTDRAWSUPPORT		MAKE_DDHRESULT( 222 )
+#define DDERR_NOEXCLUSIVEMODE			MAKE_DDHRESULT( 225 )
+#define DDERR_NOFLIPHW				MAKE_DDHRESULT( 230 )
+#define DDERR_NOGDI				MAKE_DDHRESULT( 240 )
+#define DDERR_NOMIRRORHW			MAKE_DDHRESULT( 250 )
+#define DDERR_NOTFOUND				MAKE_DDHRESULT( 255 )
+#define DDERR_NOOVERLAYHW			MAKE_DDHRESULT( 260 )
+#define DDERR_OVERLAPPINGRECTS MAKE_DDHRESULT( 270 )
+#define DDERR_NORASTEROPHW			MAKE_DDHRESULT( 280 )
+#define DDERR_NOROTATIONHW			MAKE_DDHRESULT( 290 )
+#define DDERR_NOSTRETCHHW			MAKE_DDHRESULT( 310 )
+#define DDERR_NOT4BITCOLOR			MAKE_DDHRESULT( 316 )
+#define DDERR_NOT4BITCOLORINDEX			MAKE_DDHRESULT( 317 )
+#define DDERR_NOT8BITCOLOR			MAKE_DDHRESULT( 320 )
+#define DDERR_NOTEXTUREHW			MAKE_DDHRESULT( 330 )
+#define DDERR_NOVSYNCHW				MAKE_DDHRESULT( 335 )
+#define DDERR_NOZBUFFERHW			MAKE_DDHRESULT( 340 )
+#define DDERR_NOZOVERLAYHW			MAKE_DDHRESULT( 350 )
+#define DDERR_OUTOFCAPS				MAKE_DDHRESULT( 360 )
+#define DDERR_OUTOFMEMORY			E_OUTOFMEMORY
+#define DDERR_OUTOFVIDEOMEMORY			MAKE_DDHRESULT( 380 )
+#define DDERR_OVERLAYCANTCLIP			MAKE_DDHRESULT( 382 )
+#define DDERR_OVERLAYCOLORKEYONLYONEACTIVE	MAKE_DDHRESULT( 384 )
+#define DDERR_PALETTEBUSY			MAKE_DDHRESULT( 387 )
+#define DDERR_COLORKEYNOTSET			MAKE_DDHRESULT( 400 )
+#define DDERR_SURFACEALREADYATTACHED		MAKE_DDHRESULT( 410 )
+#define DDERR_SURFACEALREADYDEPENDENT		MAKE_DDHRESULT( 420 )
+#define DDERR_SURFACEBUSY			MAKE_DDHRESULT( 430 )
+#define DDERR_CANTLOCKSURFACE			MAKE_DDHRESULT( 435 )
+#define DDERR_SURFACEISOBSCURED			MAKE_DDHRESULT( 440 )
+#define DDERR_SURFACELOST			MAKE_DDHRESULT( 450 )
+#define DDERR_SURFACENOTATTACHED		MAKE_DDHRESULT( 460 )
+#define DDERR_TOOBIGHEIGHT			MAKE_DDHRESULT( 470 )
+#define DDERR_TOOBIGSIZE			MAKE_DDHRESULT( 480 )
+#define DDERR_TOOBIGWIDTH			MAKE_DDHRESULT( 490 )
+#define DDERR_UNSUPPORTED			E_NOTIMPL
+#define DDERR_UNSUPPORTEDFORMAT			MAKE_DDHRESULT( 510 )
+#define DDERR_UNSUPPORTEDMASK			MAKE_DDHRESULT( 520 )
+#define DDERR_INVALIDSTREAM MAKE_DDHRESULT( 521 )
+#define DDERR_VERTICALBLANKINPROGRESS		MAKE_DDHRESULT( 537 )
+#define DDERR_WASSTILLDRAWING			MAKE_DDHRESULT( 540 )
+#define DDERR_DDSCAPSCOMPLEXREQUIRED MAKE_DDHRESULT( 542 )
+#define DDERR_XALIGN				MAKE_DDHRESULT( 560 )
+#define DDERR_INVALIDDIRECTDRAWGUID		MAKE_DDHRESULT( 561 )
+#define DDERR_DIRECTDRAWALREADYCREATED		MAKE_DDHRESULT( 562 )
+#define DDERR_NODIRECTDRAWHW			MAKE_DDHRESULT( 563 )
+#define DDERR_PRIMARYSURFACEALREADYEXISTS	MAKE_DDHRESULT( 564 )
+#define DDERR_NOEMULATION			MAKE_DDHRESULT( 565 )
+#define DDERR_REGIONTOOSMALL			MAKE_DDHRESULT( 566 )
+#define DDERR_CLIPPERISUSINGHWND		MAKE_DDHRESULT( 567 )
+#define DDERR_NOCLIPPERATTACHED			MAKE_DDHRESULT( 568 )
+#define DDERR_NOHWND				MAKE_DDHRESULT( 569 )
+#define DDERR_HWNDSUBCLASSED			MAKE_DDHRESULT( 570 )
+#define DDERR_HWNDALREADYSET			MAKE_DDHRESULT( 571 )
+#define DDERR_NOPALETTEATTACHED			MAKE_DDHRESULT( 572 )
+#define DDERR_NOPALETTEHW			MAKE_DDHRESULT( 573 )
+#define DDERR_BLTFASTCANTCLIP			MAKE_DDHRESULT( 574 )
+#define DDERR_NOBLTHW				MAKE_DDHRESULT( 575 )
+#define DDERR_NODDROPSHW			MAKE_DDHRESULT( 576 )
+#define DDERR_OVERLAYNOTVISIBLE			MAKE_DDHRESULT( 577 )
+#define DDERR_NOOVERLAYDEST			MAKE_DDHRESULT( 578 )
+#define DDERR_INVALIDPOSITION			MAKE_DDHRESULT( 579 )
+#define DDERR_NOTAOVERLAYSURFACE		MAKE_DDHRESULT( 580 )
+#define DDERR_EXCLUSIVEMODEALREADYSET		MAKE_DDHRESULT( 581 )
+#define DDERR_NOTFLIPPABLE			MAKE_DDHRESULT( 582 )
+#define DDERR_CANTDUPLICATE			MAKE_DDHRESULT( 583 )
+#define DDERR_NOTLOCKED				MAKE_DDHRESULT( 584 )
+#define DDERR_CANTCREATEDC			MAKE_DDHRESULT( 585 )
+#define DDERR_NODC				MAKE_DDHRESULT( 586 )
+#define DDERR_WRONGMODE				MAKE_DDHRESULT( 587 )
+#define DDERR_IMPLICITLYCREATED			MAKE_DDHRESULT( 588 )
+#define DDERR_NOTPALETTIZED			MAKE_DDHRESULT( 589 )
+#define DDERR_UNSUPPORTEDMODE			MAKE_DDHRESULT( 590 )
+#define DDERR_NOMIPMAPHW			MAKE_DDHRESULT( 591 )
+#define DDERR_INVALIDSURFACETYPE		MAKE_DDHRESULT( 592 )
+#define DDERR_NOOPTIMIZEHW			MAKE_DDHRESULT( 600 )
+#define DDERR_NOTLOADED				MAKE_DDHRESULT( 601 )
+#define DDERR_NOFOCUSWINDOW			MAKE_DDHRESULT( 602 )
+#define DDERR_NOTONMIPMAPSUBLEVEL MAKE_DDHRESULT( 603 )
+#define DDERR_DCALREADYCREATED			MAKE_DDHRESULT( 620 )
+#define DDERR_NONONLOCALVIDMEM			MAKE_DDHRESULT( 630 )
+#define DDERR_CANTPAGELOCK			MAKE_DDHRESULT( 640 )
+#define DDERR_CANTPAGEUNLOCK			MAKE_DDHRESULT( 660 )
+#define DDERR_NOTPAGELOCKED			MAKE_DDHRESULT( 680 )
+#define DDERR_MOREDATA				MAKE_DDHRESULT( 690 )
+#define DDERR_EXPIRED MAKE_DDHRESULT( 691 )
+#define DDERR_TESTFINISHED MAKE_DDHRESULT( 692 )
+#define DDERR_NEWMODE MAKE_DDHRESULT( 693 )
+#define DDERR_D3DNOTINITIALIZED MAKE_DDHRESULT( 694 )
+#define DDERR_VIDEONOTACTIVE			MAKE_DDHRESULT( 695 )
+#define DDERR_NOMONITORINFORMATION MAKE_DDHRESULT( 696 )
+#define DDERR_NODRIVERSUPPORT MAKE_DDHRESULT( 697 )
+#define DDERR_DEVICEDOESNTOWNSURFACE		MAKE_DDHRESULT( 699 )
+#define DDERR_NOTINITIALIZED			CO_E_NOTINITIALIZED
+
+/* dwFlags for Blt* */
+#define DDBLT_ALPHADEST				0x00000001
+#define DDBLT_ALPHADESTCONSTOVERRIDE		0x00000002
+#define DDBLT_ALPHADESTNEG			0x00000004
+#define DDBLT_ALPHADESTSURFACEOVERRIDE		0x00000008
+#define DDBLT_ALPHAEDGEBLEND			0x00000010
+#define DDBLT_ALPHASRC				0x00000020
+#define DDBLT_ALPHASRCCONSTOVERRIDE		0x00000040
+#define DDBLT_ALPHASRCNEG			0x00000080
+#define DDBLT_ALPHASRCSURFACEOVERRIDE		0x00000100
+#define DDBLT_ASYNC				0x00000200
+#define DDBLT_COLORFILL				0x00000400
+#define DDBLT_DDFX				0x00000800
+#define DDBLT_DDROPS				0x00001000
+#define DDBLT_KEYDEST				0x00002000
+#define DDBLT_KEYDESTOVERRIDE			0x00004000
+#define DDBLT_KEYSRC				0x00008000
+#define DDBLT_KEYSRCOVERRIDE			0x00010000
+#define DDBLT_ROP				0x00020000
+#define DDBLT_ROTATIONANGLE			0x00040000
+#define DDBLT_ZBUFFER				0x00080000
+#define DDBLT_ZBUFFERDESTCONSTOVERRIDE		0x00100000
+#define DDBLT_ZBUFFERDESTOVERRIDE		0x00200000
+#define DDBLT_ZBUFFERSRCCONSTOVERRIDE		0x00400000
+#define DDBLT_ZBUFFERSRCOVERRIDE		0x00800000
+#define DDBLT_WAIT				0x01000000
+#define DDBLT_DEPTHFILL				0x02000000
+#define DDBLT_DONOTWAIT 0x08000000
+
+/* dwTrans for BltFast */
+#define DDBLTFAST_NOCOLORKEY			0x00000000
+#define DDBLTFAST_SRCCOLORKEY			0x00000001
+#define DDBLTFAST_DESTCOLORKEY			0x00000002
+#define DDBLTFAST_WAIT				0x00000010
+#define DDBLTFAST_DONOTWAIT 0x00000020
+
+/* dwFlags for Flip */
+#define DDFLIP_WAIT		0x00000001
+#define DDFLIP_EVEN		0x00000002 /* only valid for overlay */
+#define DDFLIP_ODD		0x00000004 /* only valid for overlay */
+#define DDFLIP_NOVSYNC		0x00000008
+#define DDFLIP_STEREO		0x00000010
+#define DDFLIP_DONOTWAIT	0x00000020
+#define DDFLIP_INTERVAL2	0x02000000
+#define DDFLIP_INTERVAL3	0x03000000
+#define DDFLIP_INTERVAL4	0x04000000
+
+
+/* dwFlags for GetBltStatus */
+#define DDGBS_CANBLT				0x00000001
+#define DDGBS_ISBLTDONE				0x00000002
+
+/* dwFlags for IDirectDrawSurface7::GetFlipStatus */
+#define DDGFS_CANFLIP		1L
+#define DDGFS_ISFLIPDONE	2L
+
+/* dwFlags for IDirectDrawSurface7::SetPrivateData */
+#define DDSPD_IUNKNOWNPOINTER	1L
+#define DDSPD_VOLATILE		2L
+
+/* DDSCAPS.dwCaps */
+/* reserved1, was 3d capable */
+#define DDSCAPS_RESERVED1		0x00000001
+/* surface contains alpha information */
+#define DDSCAPS_ALPHA			0x00000002
+/* this surface is a backbuffer */
+#define DDSCAPS_BACKBUFFER		0x00000004
+/* complex surface structure */
+#define DDSCAPS_COMPLEX			0x00000008
+/* part of surface flipping structure */
+#define DDSCAPS_FLIP			0x00000010
+/* this surface is the frontbuffer surface */
+#define DDSCAPS_FRONTBUFFER		0x00000020
+/* this is a plain offscreen surface */
+#define DDSCAPS_OFFSCREENPLAIN		0x00000040
+/* overlay */
+#define DDSCAPS_OVERLAY			0x00000080
+/* palette objects can be created and attached to us */
+#define DDSCAPS_PALETTE			0x00000100
+/* primary surface (the one the user looks at currently)(right eye)*/
+#define DDSCAPS_PRIMARYSURFACE		0x00000200
+/* primary surface for left eye */
+#define DDSCAPS_PRIMARYSURFACELEFT	0x00000400
+/* surface exists in systemmemory */
+#define DDSCAPS_SYSTEMMEMORY		0x00000800
+/* surface can be used as a texture */
+#define DDSCAPS_TEXTURE		 0x00001000
+/* surface may be destination for 3d rendering */
+#define DDSCAPS_3DDEVICE		0x00002000
+/* surface exists in videomemory */
+#define DDSCAPS_VIDEOMEMORY		0x00004000
+/* surface changes immediately visible */
+#define DDSCAPS_VISIBLE			0x00008000
+/* write only surface */
+#define DDSCAPS_WRITEONLY		0x00010000
+/* zbuffer surface */
+#define DDSCAPS_ZBUFFER			0x00020000
+/* has its own DC */
+#define DDSCAPS_OWNDC			0x00040000
+/* surface should be able to receive live video */
+#define DDSCAPS_LIVEVIDEO		0x00080000
+/* should be able to have a hw codec decompress stuff into it */
+#define DDSCAPS_HWCODEC			0x00100000
+/* mode X (320x200 or 320x240) surface */
+#define DDSCAPS_MODEX			0x00200000
+/* one mipmap surface (1 level) */
+#define DDSCAPS_MIPMAP			0x00400000
+#define DDSCAPS_RESERVED2		0x00800000
+/* memory allocation delayed until Load() */
+#define DDSCAPS_ALLOCONLOAD		0x04000000
+/* Indicates that the surface will receive data from a video port */
+#define DDSCAPS_VIDEOPORT		0x08000000
+/* surface is in local videomemory */
+#define DDSCAPS_LOCALVIDMEM		0x10000000
+/* surface is in nonlocal videomemory */
+#define DDSCAPS_NONLOCALVIDMEM		0x20000000
+/* surface is a standard VGA mode surface (NOT ModeX) */
+#define DDSCAPS_STANDARDVGAMODE		0x40000000
+/* optimized? surface */
+#define DDSCAPS_OPTIMIZED		0x80000000
+
+typedef struct _DDSCAPS {
+	DWORD	dwCaps;	/* capabilities of surface wanted */
+} DDSCAPS,*LPDDSCAPS;
+
+/* DDSCAPS2.dwCaps2 */
+/* indicates the surface will receive data from a video port using
+ deinterlacing hardware. */
+#define DDSCAPS2_HARDWAREDEINTERLACE	0x00000002
+/* indicates the surface will be locked very frequently. */
+#define DDSCAPS2_HINTDYNAMIC		0x00000004
+/* indicates surface can be re-ordered or retiled on load() */
+#define DDSCAPS2_HINTSTATIC 0x00000008
+/* indicates surface to be managed by directdraw/direct3D */
+#define DDSCAPS2_TEXTUREMANAGE 0x00000010
+/* reserved bits */
+#define DDSCAPS2_RESERVED1 0x00000020
+#define DDSCAPS2_RESERVED2 0x00000040
+/* indicates surface will never be locked again */
+#define DDSCAPS2_OPAQUE 0x00000080
+/* set at CreateSurface() time to indicate antialiasing will be used */
+#define DDSCAPS2_HINTANTIALIASING 0x00000100
+/* set at CreateSurface() time to indicate cubic environment map */
+#define DDSCAPS2_CUBEMAP 0x00000200
+/* face flags for cube maps */
+#define DDSCAPS2_CUBEMAP_POSITIVEX 0x00000400
+#define DDSCAPS2_CUBEMAP_NEGATIVEX 0x00000800
+#define DDSCAPS2_CUBEMAP_POSITIVEY 0x00001000
+#define DDSCAPS2_CUBEMAP_NEGATIVEY 0x00002000
+#define DDSCAPS2_CUBEMAP_POSITIVEZ 0x00004000
+#define DDSCAPS2_CUBEMAP_NEGATIVEZ 0x00008000
+/* specifies all faces of a cube for CreateSurface() */
+#define DDSCAPS2_CUBEMAP_ALLFACES ( DDSCAPS2_CUBEMAP_POSITIVEX |\
+ DDSCAPS2_CUBEMAP_NEGATIVEX |\
+ DDSCAPS2_CUBEMAP_POSITIVEY |\
+ DDSCAPS2_CUBEMAP_NEGATIVEY |\
+ DDSCAPS2_CUBEMAP_POSITIVEZ |\
+ DDSCAPS2_CUBEMAP_NEGATIVEZ )
+/* set for mipmap sublevels on DirectX7 and later. ignored by CreateSurface() */
+#define DDSCAPS2_MIPMAPSUBLEVEL 0x00010000
+/* indicates texture surface to be managed by Direct3D *only* */
+#define DDSCAPS2_D3DTEXTUREMANAGE 0x00020000
+/* indicates managed surface that can safely be lost */
+#define DDSCAPS2_DONOTPERSIST 0x00040000
+/* indicates surface is part of a stereo flipping chain */
+#define DDSCAPS2_STEREOSURFACELEFT 0x00080000
+
+typedef struct _DDSCAPS2 {
+	DWORD	dwCaps;	/* capabilities of surface wanted */
+	DWORD dwCaps2; /* additional capabilities */
+	DWORD dwCaps3; /* reserved capabilities */
+	DWORD dwCaps4; /* more reserved capabilities */
+} DDSCAPS2,*LPDDSCAPS2;
+
+#define	DD_ROP_SPACE	(256/32)	/* space required to store ROP array */
+
+typedef struct _DDCAPS_DX7		/* DirectX 7 version of caps struct */
+{
+ DWORD	dwSize; /* size of the DDDRIVERCAPS structure */
+ DWORD	dwCaps; /* driver specific capabilities */
+ DWORD	dwCaps2; /* more driver specific capabilities */
+ DWORD	dwCKeyCaps; /* color key capabilities of the surface */
+ DWORD	dwFXCaps; /* driver specific stretching and effects capabilities */
+ DWORD	dwFXAlphaCaps; /* alpha driver specific capabilities */
+ DWORD	dwPalCaps; /* palette capabilities */
+ DWORD	dwSVCaps; /* stereo vision capabilities */
+ DWORD	dwAlphaBltConstBitDepths; /* DDBD_2,4,8 */
+ DWORD	dwAlphaBltPixelBitDepths; /* DDBD_1,2,4,8 */
+ DWORD	dwAlphaBltSurfaceBitDepths; /* DDBD_1,2,4,8 */
+ DWORD	dwAlphaOverlayConstBitDepths; /* DDBD_2,4,8 */
+ DWORD	dwAlphaOverlayPixelBitDepths; /* DDBD_1,2,4,8 */
+ DWORD	dwAlphaOverlaySurfaceBitDepths; /* DDBD_1,2,4,8 */
+ DWORD	dwZBufferBitDepths; /* DDBD_8,16,24,32 */
+ DWORD	dwVidMemTotal; /* total amount of video memory */
+ DWORD	dwVidMemFree; /* amount of free video memory */
+ DWORD	dwMaxVisibleOverlays; /* maximum number of visible overlays */
+ DWORD	dwCurrVisibleOverlays; /* current number of visible overlays */
+ DWORD	dwNumFourCCCodes; /* number of four cc codes */
+ DWORD	dwAlignBoundarySrc; /* source rectangle alignment */
+ DWORD	dwAlignSizeSrc; /* source rectangle byte size */
+ DWORD	dwAlignBoundaryDest; /* dest rectangle alignment */
+ DWORD	dwAlignSizeDest; /* dest rectangle byte size */
+ DWORD	dwAlignStrideAlign; /* stride alignment */
+ DWORD	dwRops[DD_ROP_SPACE]; /* ROPs supported */
+ DDSCAPS	ddsOldCaps; /* old DDSCAPS - superseded for DirectX6+ */
+ DWORD	dwMinOverlayStretch; /* minimum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+ DWORD	dwMaxOverlayStretch; /* maximum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+ DWORD	dwMinLiveVideoStretch; /* minimum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+ DWORD	dwMaxLiveVideoStretch; /* maximum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+ DWORD	dwMinHwCodecStretch; /* minimum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+ DWORD	dwMaxHwCodecStretch; /* maximum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+ DWORD	dwReserved1;
+ DWORD	dwReserved2;
+ DWORD	dwReserved3;
+ DWORD	dwSVBCaps; /* driver specific capabilities for System->Vmem blts */
+ DWORD	dwSVBCKeyCaps; /* driver color key capabilities for System->Vmem blts */
+ DWORD	dwSVBFXCaps; /* driver FX capabilities for System->Vmem blts */
+ DWORD	dwSVBRops[DD_ROP_SPACE];/* ROPs supported for System->Vmem blts */
+ DWORD	dwVSBCaps; /* driver specific capabilities for Vmem->System blts */
+ DWORD	dwVSBCKeyCaps; /* driver color key capabilities for Vmem->System blts */
+ DWORD	dwVSBFXCaps; /* driver FX capabilities for Vmem->System blts */
+ DWORD	dwVSBRops[DD_ROP_SPACE];/* ROPs supported for Vmem->System blts */
+ DWORD	dwSSBCaps; /* driver specific capabilities for System->System blts */
+ DWORD	dwSSBCKeyCaps; /* driver color key capabilities for System->System blts */
+ DWORD	dwSSBFXCaps; /* driver FX capabilities for System->System blts */
+ DWORD	dwSSBRops[DD_ROP_SPACE];/* ROPs supported for System->System blts */
+ DWORD dwMaxVideoPorts; /* maximum number of usable video ports */
+ DWORD 	dwCurrVideoPorts; /* current number of video ports used */
+ DWORD 	dwSVBCaps2; /* more driver specific capabilities for System->Vmem blts */
+ DWORD 	dwNLVBCaps; /* driver specific capabilities for non-local->local vidmem blts */
+ DWORD 	dwNLVBCaps2; /* more driver specific capabilities non-local->local vidmem blts */
+ DWORD 	dwNLVBCKeyCaps; /* driver color key capabilities for non-local->local vidmem blts */
+ DWORD 	dwNLVBFXCaps; /* driver FX capabilities for non-local->local blts */
+ DWORD 	dwNLVBRops[DD_ROP_SPACE]; /* ROPs supported for non-local->local blts */
+ DDSCAPS2 ddsCaps;		/* surface capabilities */
+} DDCAPS_DX7,*LPDDCAPS_DX7;
+
+typedef struct _DDCAPS_DX6		/* DirectX 6 version of caps struct */
+{
+ DWORD	dwSize; /* size of the DDDRIVERCAPS structure */
+ DWORD	dwCaps; /* driver specific capabilities */
+ DWORD	dwCaps2; /* more driver specific capabilities */
+ DWORD	dwCKeyCaps; /* color key capabilities of the surface */
+ DWORD	dwFXCaps; /* driver specific stretching and effects capabilities */
+ DWORD	dwFXAlphaCaps; /* alpha driver specific capabilities */
+ DWORD	dwPalCaps; /* palette capabilities */
+ DWORD	dwSVCaps; /* stereo vision capabilities */
+ DWORD	dwAlphaBltConstBitDepths; /* DDBD_2,4,8 */
+ DWORD	dwAlphaBltPixelBitDepths; /* DDBD_1,2,4,8 */
+ DWORD	dwAlphaBltSurfaceBitDepths; /* DDBD_1,2,4,8 */
+ DWORD	dwAlphaOverlayConstBitDepths; /* DDBD_2,4,8 */
+ DWORD	dwAlphaOverlayPixelBitDepths; /* DDBD_1,2,4,8 */
+ DWORD	dwAlphaOverlaySurfaceBitDepths; /* DDBD_1,2,4,8 */
+ DWORD	dwZBufferBitDepths; /* DDBD_8,16,24,32 */
+ DWORD	dwVidMemTotal; /* total amount of video memory */
+ DWORD	dwVidMemFree; /* amount of free video memory */
+ DWORD	dwMaxVisibleOverlays; /* maximum number of visible overlays */
+ DWORD	dwCurrVisibleOverlays; /* current number of visible overlays */
+ DWORD	dwNumFourCCCodes; /* number of four cc codes */
+ DWORD	dwAlignBoundarySrc; /* source rectangle alignment */
+ DWORD	dwAlignSizeSrc; /* source rectangle byte size */
+ DWORD	dwAlignBoundaryDest; /* dest rectangle alignment */
+ DWORD	dwAlignSizeDest; /* dest rectangle byte size */
+ DWORD	dwAlignStrideAlign; /* stride alignment */
+ DWORD	dwRops[DD_ROP_SPACE]; /* ROPs supported */
+ DDSCAPS	ddsOldCaps; /* old DDSCAPS - superseded for DirectX6+ */
+ DWORD	dwMinOverlayStretch; /* minimum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+ DWORD	dwMaxOverlayStretch; /* maximum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+ DWORD	dwMinLiveVideoStretch; /* minimum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+ DWORD	dwMaxLiveVideoStretch; /* maximum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+ DWORD	dwMinHwCodecStretch; /* minimum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+ DWORD	dwMaxHwCodecStretch; /* maximum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+ DWORD	dwReserved1;
+ DWORD	dwReserved2;
+ DWORD	dwReserved3;
+ DWORD	dwSVBCaps; /* driver specific capabilities for System->Vmem blts */
+ DWORD	dwSVBCKeyCaps; /* driver color key capabilities for System->Vmem blts */
+ DWORD	dwSVBFXCaps; /* driver FX capabilities for System->Vmem blts */
+ DWORD	dwSVBRops[DD_ROP_SPACE];/* ROPs supported for System->Vmem blts */
+ DWORD	dwVSBCaps; /* driver specific capabilities for Vmem->System blts */
+ DWORD	dwVSBCKeyCaps; /* driver color key capabilities for Vmem->System blts */
+ DWORD	dwVSBFXCaps; /* driver FX capabilities for Vmem->System blts */
+ DWORD	dwVSBRops[DD_ROP_SPACE];/* ROPs supported for Vmem->System blts */
+ DWORD	dwSSBCaps; /* driver specific capabilities for System->System blts */
+ DWORD	dwSSBCKeyCaps; /* driver color key capabilities for System->System blts */
+ DWORD	dwSSBFXCaps; /* driver FX capabilities for System->System blts */
+ DWORD	dwSSBRops[DD_ROP_SPACE];/* ROPs supported for System->System blts */
+ DWORD dwMaxVideoPorts; /* maximum number of usable video ports */
+ DWORD 	dwCurrVideoPorts; /* current number of video ports used */
+ DWORD 	dwSVBCaps2; /* more driver specific capabilities for System->Vmem blts */
+ DWORD 	dwNLVBCaps; /* driver specific capabilities for non-local->local vidmem blts */
+ DWORD 	dwNLVBCaps2; /* more driver specific capabilities non-local->local vidmem blts */
+ DWORD 	dwNLVBCKeyCaps; /* driver color key capabilities for non-local->local vidmem blts */
+ DWORD 	dwNLVBFXCaps; /* driver FX capabilities for non-local->local blts */
+ DWORD 	dwNLVBRops[DD_ROP_SPACE]; /* ROPs supported for non-local->local blts */
+ /* and one new member for DirectX 6 */
+ DDSCAPS2 ddsCaps;		/* surface capabilities */
+} DDCAPS_DX6,*LPDDCAPS_DX6;
+
+typedef struct _DDCAPS_DX5		/* DirectX5 version of caps struct */
+{
+ DWORD	dwSize; /* size of the DDDRIVERCAPS structure */
+ DWORD	dwCaps; /* driver specific capabilities */
+ DWORD	dwCaps2; /* more driver specific capabilities */
+ DWORD	dwCKeyCaps; /* color key capabilities of the surface */
+ DWORD	dwFXCaps; /* driver specific stretching and effects capabilities */
+ DWORD	dwFXAlphaCaps; /* alpha driver specific capabilities */
+ DWORD	dwPalCaps; /* palette capabilities */
+ DWORD	dwSVCaps; /* stereo vision capabilities */
+ DWORD	dwAlphaBltConstBitDepths; /* DDBD_2,4,8 */
+ DWORD	dwAlphaBltPixelBitDepths; /* DDBD_1,2,4,8 */
+ DWORD	dwAlphaBltSurfaceBitDepths; /* DDBD_1,2,4,8 */
+ DWORD	dwAlphaOverlayConstBitDepths; /* DDBD_2,4,8 */
+ DWORD	dwAlphaOverlayPixelBitDepths; /* DDBD_1,2,4,8 */
+ DWORD	dwAlphaOverlaySurfaceBitDepths; /* DDBD_1,2,4,8 */
+ DWORD	dwZBufferBitDepths; /* DDBD_8,16,24,32 */
+ DWORD	dwVidMemTotal; /* total amount of video memory */
+ DWORD	dwVidMemFree; /* amount of free video memory */
+ DWORD	dwMaxVisibleOverlays; /* maximum number of visible overlays */
+ DWORD	dwCurrVisibleOverlays; /* current number of visible overlays */
+ DWORD	dwNumFourCCCodes; /* number of four cc codes */
+ DWORD	dwAlignBoundarySrc; /* source rectangle alignment */
+ DWORD	dwAlignSizeSrc; /* source rectangle byte size */
+ DWORD	dwAlignBoundaryDest; /* dest rectangle alignment */
+ DWORD	dwAlignSizeDest; /* dest rectangle byte size */
+ DWORD	dwAlignStrideAlign; /* stride alignment */
+ DWORD	dwRops[DD_ROP_SPACE]; /* ROPs supported */
+ DDSCAPS	ddsCaps; /* DDSCAPS structure has all the general capabilities */
+ DWORD	dwMinOverlayStretch; /* minimum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+ DWORD	dwMaxOverlayStretch; /* maximum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+ DWORD	dwMinLiveVideoStretch; /* minimum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+ DWORD	dwMaxLiveVideoStretch; /* maximum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+ DWORD	dwMinHwCodecStretch; /* minimum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+ DWORD	dwMaxHwCodecStretch; /* maximum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+ DWORD	dwReserved1;
+ DWORD	dwReserved2;
+ DWORD	dwReserved3;
+ DWORD	dwSVBCaps; /* driver specific capabilities for System->Vmem blts */
+ DWORD	dwSVBCKeyCaps; /* driver color key capabilities for System->Vmem blts */
+ DWORD	dwSVBFXCaps; /* driver FX capabilities for System->Vmem blts */
+ DWORD	dwSVBRops[DD_ROP_SPACE];/* ROPs supported for System->Vmem blts */
+ DWORD	dwVSBCaps; /* driver specific capabilities for Vmem->System blts */
+ DWORD	dwVSBCKeyCaps; /* driver color key capabilities for Vmem->System blts */
+ DWORD	dwVSBFXCaps; /* driver FX capabilities for Vmem->System blts */
+ DWORD	dwVSBRops[DD_ROP_SPACE];/* ROPs supported for Vmem->System blts */
+ DWORD	dwSSBCaps; /* driver specific capabilities for System->System blts */
+ DWORD	dwSSBCKeyCaps; /* driver color key capabilities for System->System blts */
+ DWORD	dwSSBFXCaps; /* driver FX capabilities for System->System blts */
+ DWORD	dwSSBRops[DD_ROP_SPACE];/* ROPs supported for System->System blts */
+ /* the following are the new DirectX 5 members */
+ DWORD dwMaxVideoPorts; /* maximum number of usable video ports */
+ DWORD 	dwCurrVideoPorts; /* current number of video ports used */
+ DWORD 	dwSVBCaps2; /* more driver specific capabilities for System->Vmem blts */
+ DWORD 	dwNLVBCaps; /* driver specific capabilities for non-local->local vidmem blts */
+ DWORD 	dwNLVBCaps2; /* more driver specific capabilities non-local->local vidmem blts */
+ DWORD 	dwNLVBCKeyCaps; /* driver color key capabilities for non-local->local vidmem blts */
+ DWORD 	dwNLVBFXCaps; /* driver FX capabilities for non-local->local blts */
+ DWORD 	dwNLVBRops[DD_ROP_SPACE]; /* ROPs supported for non-local->local blts */
+} DDCAPS_DX5,*LPDDCAPS_DX5;
+
+typedef struct _DDCAPS_DX3		/* DirectX3 version of caps struct */
+{
+ DWORD	dwSize; /* size of the DDDRIVERCAPS structure */
+ DWORD	dwCaps; /* driver specific capabilities */
+ DWORD	dwCaps2; /* more driver specific capabilities */
+ DWORD	dwCKeyCaps; /* color key capabilities of the surface */
+ DWORD	dwFXCaps; /* driver specific stretching and effects capabilities */
+ DWORD	dwFXAlphaCaps; /* alpha driver specific capabilities */
+ DWORD	dwPalCaps; /* palette capabilities */
+ DWORD	dwSVCaps; /* stereo vision capabilities */
+ DWORD	dwAlphaBltConstBitDepths; /* DDBD_2,4,8 */
+ DWORD	dwAlphaBltPixelBitDepths; /* DDBD_1,2,4,8 */
+ DWORD	dwAlphaBltSurfaceBitDepths; /* DDBD_1,2,4,8 */
+ DWORD	dwAlphaOverlayConstBitDepths; /* DDBD_2,4,8 */
+ DWORD	dwAlphaOverlayPixelBitDepths; /* DDBD_1,2,4,8 */
+ DWORD	dwAlphaOverlaySurfaceBitDepths; /* DDBD_1,2,4,8 */
+ DWORD	dwZBufferBitDepths; /* DDBD_8,16,24,32 */
+ DWORD	dwVidMemTotal; /* total amount of video memory */
+ DWORD	dwVidMemFree; /* amount of free video memory */
+ DWORD	dwMaxVisibleOverlays; /* maximum number of visible overlays */
+ DWORD	dwCurrVisibleOverlays; /* current number of visible overlays */
+ DWORD	dwNumFourCCCodes; /* number of four cc codes */
+ DWORD	dwAlignBoundarySrc; /* source rectangle alignment */
+ DWORD	dwAlignSizeSrc; /* source rectangle byte size */
+ DWORD	dwAlignBoundaryDest; /* dest rectangle alignment */
+ DWORD	dwAlignSizeDest; /* dest rectangle byte size */
+ DWORD	dwAlignStrideAlign; /* stride alignment */
+ DWORD	dwRops[DD_ROP_SPACE]; /* ROPs supported */
+ DDSCAPS	ddsCaps; /* DDSCAPS structure has all the general capabilities */
+ DWORD	dwMinOverlayStretch; /* minimum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+ DWORD	dwMaxOverlayStretch; /* maximum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+ DWORD	dwMinLiveVideoStretch; /* minimum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+ DWORD	dwMaxLiveVideoStretch; /* maximum live video stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+ DWORD	dwMinHwCodecStretch; /* minimum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+ DWORD	dwMaxHwCodecStretch; /* maximum hardware codec stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
+ DWORD	dwReserved1;
+ DWORD	dwReserved2;
+ DWORD	dwReserved3;
+ DWORD	dwSVBCaps; /* driver specific capabilities for System->Vmem blts */
+ DWORD	dwSVBCKeyCaps; /* driver color key capabilities for System->Vmem blts */
+ DWORD	dwSVBFXCaps; /* driver FX capabilities for System->Vmem blts */
+ DWORD	dwSVBRops[DD_ROP_SPACE];/* ROPs supported for System->Vmem blts */
+ DWORD	dwVSBCaps; /* driver specific capabilities for Vmem->System blts */
+ DWORD	dwVSBCKeyCaps; /* driver color key capabilities for Vmem->System blts */
+ DWORD	dwVSBFXCaps; /* driver FX capabilities for Vmem->System blts */
+ DWORD	dwVSBRops[DD_ROP_SPACE];/* ROPs supported for Vmem->System blts */
+ DWORD	dwSSBCaps; /* driver specific capabilities for System->System blts */
+ DWORD	dwSSBCKeyCaps; /* driver color key capabilities for System->System blts */
+ DWORD	dwSSBFXCaps; /* driver FX capabilities for System->System blts */
+ DWORD	dwSSBRops[DD_ROP_SPACE];/* ROPs supported for System->System blts */
+ DWORD	dwReserved4;
+ DWORD	dwReserved5;
+ DWORD	dwReserved6;
+} DDCAPS_DX3,*LPDDCAPS_DX3;
+
+/* set caps struct according to DIRECTDRAW_VERSION */
+
+#if DIRECTDRAW_VERSION <= 0x300
+typedef DDCAPS_DX3 DDCAPS;
+#elif DIRECTDRAW_VERSION <= 0x500
+typedef DDCAPS_DX5 DDCAPS;
+#elif DIRECTDRAW_VERSION <= 0x600
+typedef DDCAPS_DX6 DDCAPS;
+#else
+typedef DDCAPS_DX7 DDCAPS;
+#endif
+
+typedef DDCAPS *LPDDCAPS;
+
+/* DDCAPS.dwCaps */
+#define DDCAPS_3D			0x00000001
+#define DDCAPS_ALIGNBOUNDARYDEST	0x00000002
+#define DDCAPS_ALIGNSIZEDEST		0x00000004
+#define DDCAPS_ALIGNBOUNDARYSRC		0x00000008
+#define DDCAPS_ALIGNSIZESRC		0x00000010
+#define DDCAPS_ALIGNSTRIDE		0x00000020
+#define DDCAPS_BLT			0x00000040
+#define DDCAPS_BLTQUEUE			0x00000080
+#define DDCAPS_BLTFOURCC		0x00000100
+#define DDCAPS_BLTSTRETCH		0x00000200
+#define DDCAPS_GDI			0x00000400
+#define DDCAPS_OVERLAY			0x00000800
+#define DDCAPS_OVERLAYCANTCLIP		0x00001000
+#define DDCAPS_OVERLAYFOURCC		0x00002000
+#define DDCAPS_OVERLAYSTRETCH		0x00004000
+#define DDCAPS_PALETTE			0x00008000
+#define DDCAPS_PALETTEVSYNC		0x00010000
+#define DDCAPS_READSCANLINE		0x00020000
+#define DDCAPS_STEREOVIEW		0x00040000
+#define DDCAPS_VBI			0x00080000
+#define DDCAPS_ZBLTS			0x00100000
+#define DDCAPS_ZOVERLAYS		0x00200000
+#define DDCAPS_COLORKEY			0x00400000
+#define DDCAPS_ALPHA			0x00800000
+#define DDCAPS_COLORKEYHWASSIST		0x01000000
+#define DDCAPS_NOHARDWARE		0x02000000
+#define DDCAPS_BLTCOLORFILL		0x04000000
+#define DDCAPS_BANKSWITCHED		0x08000000
+#define DDCAPS_BLTDEPTHFILL		0x10000000
+#define DDCAPS_CANCLIP			0x20000000
+#define DDCAPS_CANCLIPSTRETCHED		0x40000000
+#define DDCAPS_CANBLTSYSMEM		0x80000000
+
+/* DDCAPS.dwCaps2 */
+#define DDCAPS2_CERTIFIED		0x00000001
+#define DDCAPS2_NO2DDURING3DSCENE 0x00000002
+#define DDCAPS2_VIDEOPORT		0x00000004
+#define DDCAPS2_AUTOFLIPOVERLAY		0x00000008
+#define DDCAPS2_CANBOBINTERLEAVED	0x00000010
+#define DDCAPS2_CANBOBNONINTERLEAVED	0x00000020
+#define DDCAPS2_COLORCONTROLOVERLAY	0x00000040
+#define DDCAPS2_COLORCONTROLPRIMARY	0x00000080
+#define DDCAPS2_CANDROPZ16BIT		0x00000100
+#define DDCAPS2_NONLOCALVIDMEM		0x00000200
+#define DDCAPS2_NONLOCALVIDMEMCAPS	0x00000400
+#define DDCAPS2_NOPAGELOCKREQUIRED	0x00000800
+#define DDCAPS2_WIDESURFACES		0x00001000
+#define DDCAPS2_CANFLIPODDEVEN		0x00002000
+#define DDCAPS2_CANBOBHARDWARE		0x00004000
+#define DDCAPS2_COPYFOURCC 0x00008000
+#define DDCAPS2_PRIMARYGAMMA 0x00020000
+#define DDCAPS2_CANRENDERWINDOWED 0x00080000
+#define DDCAPS2_CANCALIBRATEGAMMA 0x00100000
+#define DDCAPS2_FLIPINTERVAL 0x00200000
+#define DDCAPS2_FLIPNOVSYNC 0x00400000
+#define DDCAPS2_CANMANAGETEXTURE 0x00800000
+#define DDCAPS2_TEXMANINNONLOCALVIDMEM 0x01000000
+#define DDCAPS2_STEREO 0x02000000
+#define DDCAPS2_SYSTONONLOCAL_AS_SYSTOLOCAL 0x04000000
+
+
+/* Set/Get Colour Key Flags */
+#define DDCKEY_COLORSPACE 0x00000001 /* Struct is single colour space */
+#define DDCKEY_DESTBLT 0x00000002 /* To be used as dest for blt */
+#define DDCKEY_DESTOVERLAY 0x00000004 /* To be used as dest for CK overlays */
+#define DDCKEY_SRCBLT 0x00000008 /* To be used as src for blt */
+#define DDCKEY_SRCOVERLAY 0x00000010 /* To be used as src for CK overlays */
+
+typedef struct _DDCOLORKEY
+{
+	DWORD	dwColorSpaceLowValue;/* low boundary of color space that is to
+ * be treated as Color Key, inclusive
+				 */
+	DWORD	dwColorSpaceHighValue;/* high boundary of color space that is
+ * to be treated as Color Key, inclusive
+				 */
+} DDCOLORKEY,*LPDDCOLORKEY;
+
+/* ddCKEYCAPS bits */
+#define DDCKEYCAPS_DESTBLT			0x00000001
+#define DDCKEYCAPS_DESTBLTCLRSPACE		0x00000002
+#define DDCKEYCAPS_DESTBLTCLRSPACEYUV		0x00000004
+#define DDCKEYCAPS_DESTBLTYUV			0x00000008
+#define DDCKEYCAPS_DESTOVERLAY			0x00000010
+#define DDCKEYCAPS_DESTOVERLAYCLRSPACE		0x00000020
+#define DDCKEYCAPS_DESTOVERLAYCLRSPACEYUV	0x00000040
+#define DDCKEYCAPS_DESTOVERLAYONEACTIVE		0x00000080
+#define DDCKEYCAPS_DESTOVERLAYYUV		0x00000100
+#define DDCKEYCAPS_SRCBLT			0x00000200
+#define DDCKEYCAPS_SRCBLTCLRSPACE		0x00000400
+#define DDCKEYCAPS_SRCBLTCLRSPACEYUV		0x00000800
+#define DDCKEYCAPS_SRCBLTYUV			0x00001000
+#define DDCKEYCAPS_SRCOVERLAY			0x00002000
+#define DDCKEYCAPS_SRCOVERLAYCLRSPACE		0x00004000
+#define DDCKEYCAPS_SRCOVERLAYCLRSPACEYUV	0x00008000
+#define DDCKEYCAPS_SRCOVERLAYONEACTIVE		0x00010000
+#define DDCKEYCAPS_SRCOVERLAYYUV		0x00020000
+#define DDCKEYCAPS_NOCOSTOVERLAY		0x00040000
+
+typedef struct _DDPIXELFORMAT {
+ DWORD	dwSize; /* 0: size of structure */
+ DWORD	dwFlags; /* 4: pixel format flags */
+ DWORD	dwFourCC; /* 8: (FOURCC code) */
+ union {
+	DWORD	dwRGBBitCount; /* C: how many bits per pixel */
+	DWORD	dwYUVBitCount; /* C: how many bits per pixel */
+	DWORD	dwZBufferBitDepth; /* C: how many bits for z buffers */
+	DWORD	dwAlphaBitDepth; /* C: how many bits for alpha channels*/
+	DWORD	dwLuminanceBitCount;
+	DWORD	dwBumpBitCount;
+ };
+ union {
+	DWORD	dwRBitMask; /* 10: mask for red bit*/
+	DWORD	dwYBitMask; /* 10: mask for Y bits*/
+	DWORD	dwStencilBitDepth;
+	DWORD	dwLuminanceBitMask;
+	DWORD	dwBumpDuBitMask;
+ };
+ union {
+	DWORD	dwGBitMask; /* 14: mask for green bits*/
+	DWORD	dwUBitMask; /* 14: mask for U bits*/
+	DWORD	dwZBitMask;
+	DWORD	dwBumpDvBitMask;
+ };
+ union {
+	DWORD dwBBitMask; /* 18: mask for blue bits*/
+	DWORD dwVBitMask; /* 18: mask for V bits*/
+	DWORD	dwStencilBitMask;
+	DWORD	dwBumpLuminanceBitMask;
+ };
+ union {
+ 	DWORD	dwRGBAlphaBitMask;	/* 1C: mask for alpha channel */
+ 	DWORD	dwYUVAlphaBitMask;	/* 1C: mask for alpha channel */
+	DWORD	dwLuminanceAlphaBitMask;
+	DWORD	dwRGBZBitMask;		/* 1C: mask for Z channel */
+	DWORD	dwYUVZBitMask;		/* 1C: mask for Z channel */
+ };
+ 					/* 20: next structure */
+} DDPIXELFORMAT,*LPDDPIXELFORMAT;
+
+#define MAKEFOURCC(ch0, ch1, ch2, ch3) \
+ ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \
+ ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24 ))
+
+/* DDCAPS.dwFXCaps */
+#define DDFXCAPS_BLTALPHA 0x00000001
+#define DDFXCAPS_OVERLAYALPHA 0x00000004
+#define DDFXCAPS_BLTARITHSTRETCHYN	0x00000010
+#define DDFXCAPS_BLTARITHSTRETCHY	0x00000020
+#define DDFXCAPS_BLTMIRRORLEFTRIGHT	0x00000040
+#define DDFXCAPS_BLTMIRRORUPDOWN	0x00000080
+#define DDFXCAPS_BLTROTATION		0x00000100
+#define DDFXCAPS_BLTROTATION90		0x00000200
+#define DDFXCAPS_BLTSHRINKX		0x00000400
+#define DDFXCAPS_BLTSHRINKXN		0x00000800
+#define DDFXCAPS_BLTSHRINKY		0x00001000
+#define DDFXCAPS_BLTSHRINKYN		0x00002000
+#define DDFXCAPS_BLTSTRETCHX		0x00004000
+#define DDFXCAPS_BLTSTRETCHXN		0x00008000
+#define DDFXCAPS_BLTSTRETCHY		0x00010000
+#define DDFXCAPS_BLTSTRETCHYN		0x00020000
+#define DDFXCAPS_OVERLAYARITHSTRETCHY	0x00040000
+#define DDFXCAPS_OVERLAYARITHSTRETCHYN	0x00000008
+#define DDFXCAPS_OVERLAYSHRINKX		0x00080000
+#define DDFXCAPS_OVERLAYSHRINKXN	0x00100000
+#define DDFXCAPS_OVERLAYSHRINKY		0x00200000
+#define DDFXCAPS_OVERLAYSHRINKYN	0x00400000
+#define DDFXCAPS_OVERLAYSTRETCHX	0x00800000
+#define DDFXCAPS_OVERLAYSTRETCHXN	0x01000000
+#define DDFXCAPS_OVERLAYSTRETCHY	0x02000000
+#define DDFXCAPS_OVERLAYSTRETCHYN	0x04000000
+#define DDFXCAPS_OVERLAYMIRRORLEFTRIGHT	0x08000000
+#define DDFXCAPS_OVERLAYMIRRORUPDOWN	0x10000000
+
+#define DDFXCAPS_OVERLAYFILTER DDFXCAPS_OVERLAYARITHSTRETCHY
+
+/* DDCAPS.dwFXAlphaCaps */
+#define DDFXALPHACAPS_BLTALPHAEDGEBLEND		0x00000001
+#define DDFXALPHACAPS_BLTALPHAPIXELS		0x00000002
+#define DDFXALPHACAPS_BLTALPHAPIXELSNEG		0x00000004
+#define DDFXALPHACAPS_BLTALPHASURFACES		0x00000008
+#define DDFXALPHACAPS_BLTALPHASURFACESNEG	0x00000010
+#define DDFXALPHACAPS_OVERLAYALPHAEDGEBLEND	0x00000020
+#define DDFXALPHACAPS_OVERLAYALPHAPIXELS	0x00000040
+#define DDFXALPHACAPS_OVERLAYALPHAPIXELSNEG	0x00000080
+#define DDFXALPHACAPS_OVERLAYALPHASURFACES	0x00000100
+#define DDFXALPHACAPS_OVERLAYALPHASURFACESNEG	0x00000200
+
+/* DDCAPS.dwPalCaps */
+#define DDPCAPS_4BIT			0x00000001
+#define DDPCAPS_8BITENTRIES		0x00000002
+#define DDPCAPS_8BIT			0x00000004
+#define DDPCAPS_INITIALIZE		0x00000008
+#define DDPCAPS_PRIMARYSURFACE		0x00000010
+#define DDPCAPS_PRIMARYSURFACELEFT	0x00000020
+#define DDPCAPS_ALLOW256		0x00000040
+#define DDPCAPS_VSYNC			0x00000080
+#define DDPCAPS_1BIT			0x00000100
+#define DDPCAPS_2BIT			0x00000200
+#define DDPCAPS_ALPHA 0x00000400
+
+/* DDCAPS.dwSVCaps */
+/* the first 4 of these are now obsolete */
+#if DIRECTDRAW_VERSION >= 0x700	/* FIXME: I'm not sure when this switch occurred */
+#define DDSVCAPS_RESERVED1		0x00000001
+#define DDSVCAPS_RESERVED2		0x00000002
+#define DDSVCAPS_RESERVED3		0x00000004
+#define DDSVCAPS_RESERVED4		0x00000008
+#else
+#define DDSVCAPS_ENIGMA			0x00000001
+#define DDSVCAPS_FLICKER		0x00000002
+#define DDSVCAPS_REDBLUE		0x00000004
+#define DDSVCAPS_SPLIT			0x00000008
+#endif
+#define DDSVCAPS_STEREOSEQUENTIAL 0x00000010
+
+/* BitDepths */
+#define DDBD_1				0x00004000
+#define DDBD_2				0x00002000
+#define DDBD_4				0x00001000
+#define DDBD_8				0x00000800
+#define DDBD_16				0x00000400
+#define DDBD_24				0x00000200
+#define DDBD_32				0x00000100
+
+/* DDOVERLAYFX.dwDDFX */
+#define DDOVERFX_ARITHSTRETCHY		0x00000001
+#define DDOVERFX_MIRRORLEFTRIGHT	0x00000002
+#define DDOVERFX_MIRRORUPDOWN		0x00000004
+
+/* UpdateOverlay flags */
+#define DDOVER_ALPHADEST 0x00000001
+#define DDOVER_ALPHADESTCONSTOVERRIDE 0x00000002
+#define DDOVER_ALPHADESTNEG 0x00000004
+#define DDOVER_ALPHADESTSURFACEOVERRIDE 0x00000008
+#define DDOVER_ALPHAEDGEBLEND 0x00000010
+#define DDOVER_ALPHASRC 0x00000020
+#define DDOVER_ALPHASRCCONSTOVERRIDE 0x00000040
+#define DDOVER_ALPHASRCNEG 0x00000080
+#define DDOVER_ALPHASRCSURFACEOVERRIDE 0x00000100
+#define DDOVER_HIDE 0x00000200
+#define DDOVER_KEYDEST 0x00000400
+#define DDOVER_KEYDESTOVERRIDE 0x00000800
+#define DDOVER_KEYSRC 0x00001000
+#define DDOVER_KEYSRCOVERRIDE 0x00002000
+#define DDOVER_SHOW 0x00004000
+#define DDOVER_ADDDIRTYRECT 0x00008000
+#define DDOVER_REFRESHDIRTYRECTS 0x00010000
+#define DDOVER_REFRESHALL 0x00020000
+#define DDOVER_DDFX 0x00080000
+#define DDOVER_AUTOFLIP 0x00100000
+#define DDOVER_BOB 0x00200000
+#define DDOVER_OVERRIDEBOBWEAVE 0x00400000
+#define DDOVER_INTERLEAVED 0x00800000
+
+/* DDCOLORKEY.dwFlags */
+#define DDPF_ALPHAPIXELS		0x00000001
+#define DDPF_ALPHA			0x00000002
+#define DDPF_FOURCC			0x00000004
+#define DDPF_PALETTEINDEXED4		0x00000008
+#define DDPF_PALETTEINDEXEDTO8		0x00000010
+#define DDPF_PALETTEINDEXED8		0x00000020
+#define DDPF_RGB			0x00000040
+#define DDPF_COMPRESSED			0x00000080
+#define DDPF_RGBTOYUV			0x00000100
+#define DDPF_YUV			0x00000200
+#define DDPF_ZBUFFER			0x00000400
+#define DDPF_PALETTEINDEXED1		0x00000800
+#define DDPF_PALETTEINDEXED2		0x00001000
+#define DDPF_ZPIXELS			0x00002000
+#define DDPF_STENCILBUFFER 0x00004000
+#define DDPF_ALPHAPREMULT 0x00008000
+#define DDPF_LUMINANCE 0x00020000
+#define DDPF_BUMPLUMINANCE 0x00040000
+#define DDPF_BUMPDUDV 0x00080000
+
+/* SetCooperativeLevel dwFlags */
+#define DDSCL_FULLSCREEN		0x00000001
+#define DDSCL_ALLOWREBOOT		0x00000002
+#define DDSCL_NOWINDOWCHANGES		0x00000004
+#define DDSCL_NORMAL			0x00000008
+#define DDSCL_EXCLUSIVE			0x00000010
+#define DDSCL_ALLOWMODEX		0x00000040
+#define DDSCL_SETFOCUSWINDOW		0x00000080
+#define DDSCL_SETDEVICEWINDOW		0x00000100
+#define DDSCL_CREATEDEVICEWINDOW	0x00000200
+#define DDSCL_MULTITHREADED 0x00000400
+#define DDSCL_FPUSETUP 0x00000800
+#define DDSCL_FPUPRESERVE 0x00001000
+
+
+/* DDSURFACEDESC.dwFlags */
+#define	DDSD_CAPS		0x00000001
+#define	DDSD_HEIGHT		0x00000002
+#define	DDSD_WIDTH		0x00000004
+#define	DDSD_PITCH		0x00000008
+#define	DDSD_BACKBUFFERCOUNT	0x00000020
+#define	DDSD_ZBUFFERBITDEPTH	0x00000040
+#define	DDSD_ALPHABITDEPTH	0x00000080
+#define	DDSD_LPSURFACE		0x00000800
+#define	DDSD_PIXELFORMAT	0x00001000
+#define	DDSD_CKDESTOVERLAY	0x00002000
+#define	DDSD_CKDESTBLT		0x00004000
+#define	DDSD_CKSRCOVERLAY	0x00008000
+#define	DDSD_CKSRCBLT		0x00010000
+#define	DDSD_MIPMAPCOUNT	0x00020000
+#define	DDSD_REFRESHRATE	0x00040000
+#define	DDSD_LINEARSIZE		0x00080000
+#define DDSD_TEXTURESTAGE 0x00100000
+#define DDSD_FVF 0x00200000
+#define DDSD_SRCVBHANDLE 0x00400000
+#define DDSD_DEPTH 0x00800000
+#define DDSD_ALL 0x00fff9ee
+
+/* EnumSurfaces flags */
+#define DDENUMSURFACES_ALL 0x00000001
+#define DDENUMSURFACES_MATCH 0x00000002
+#define DDENUMSURFACES_NOMATCH 0x00000004
+#define DDENUMSURFACES_CANBECREATED 0x00000008
+#define DDENUMSURFACES_DOESEXIST 0x00000010
+
+/* SetDisplayMode flags */
+#define DDSDM_STANDARDVGAMODE	0x00000001
+
+/* EnumDisplayModes flags */
+#define DDEDM_REFRESHRATES	0x00000001
+#define DDEDM_STANDARDVGAMODES	0x00000002
+
+/* WaitForVerticalDisplay flags */
+
+#define DDWAITVB_BLOCKBEGIN		0x00000001
+#define DDWAITVB_BLOCKBEGINEVENT	0x00000002
+#define DDWAITVB_BLOCKEND		0x00000004
+
+typedef struct _DDSURFACEDESC
+{
+	DWORD	dwSize;		/* 0: size of the DDSURFACEDESC structure*/
+	DWORD	dwFlags;	/* 4: determines what fields are valid*/
+	DWORD	dwHeight;	/* 8: height of surface to be created*/
+	DWORD	dwWidth;	/* C: width of input surface*/
+	union {
+		LONG	lPitch;	/* 10: distance to start of next line (return value only)*/
+		DWORD	dwLinearSize;
+	};
+	DWORD	dwBackBufferCount;/* 14: number of back buffers requested*/
+	union {
+		DWORD	dwMipMapCount;/* 18:number of mip-map levels requested*/
+		DWORD	dwZBufferBitDepth;/*18: depth of Z buffer requested*/
+		DWORD	dwRefreshRate;/* 18:refresh rate (used when display mode is described)*/
+	};
+	DWORD	dwAlphaBitDepth;/* 1C:depth of alpha buffer requested*/
+	DWORD	dwReserved;	/* 20:reserved*/
+	LPVOID	lpSurface;	/* 24:pointer to the associated surface memory*/
+	DDCOLORKEY	ddckCKDestOverlay;/* 28: CK for dest overlay use*/
+	DDCOLORKEY	ddckCKDestBlt;	/* 30: CK for destination blt use*/
+	DDCOLORKEY	ddckCKSrcOverlay;/* 38: CK for source overlay use*/
+	DDCOLORKEY	ddckCKSrcBlt;	/* 40: CK for source blt use*/
+	DDPIXELFORMAT	ddpfPixelFormat;/* 48: pixel format description of the surface*/
+	DDSCAPS		ddsCaps;	/* 68: direct draw surface caps */
+} DDSURFACEDESC,*LPDDSURFACEDESC;
+
+typedef struct _DDSURFACEDESC2
+{
+	DWORD	dwSize;		/* 0: size of the DDSURFACEDESC2 structure*/
+	DWORD	dwFlags;	/* 4: determines what fields are valid*/
+	DWORD	dwHeight;	/* 8: height of surface to be created*/
+	DWORD	dwWidth;	/* C: width of input surface*/
+	union {
+		LONG	lPitch;	 /*10: distance to start of next line (return value only)*/
+		DWORD dwLinearSize; /*10: formless late-allocated optimized surface size */
+	};
+	DWORD	dwBackBufferCount;/* 14: number of back buffers requested*/
+	union {
+		DWORD	dwMipMapCount;/* 18:number of mip-map levels requested*/
+		DWORD	dwRefreshRate;/* 18:refresh rate (used when display mode is described)*/
+		DWORD dwSrcVBHandle;/* 18:source used in VB::Optimize */
+	};
+	DWORD	dwAlphaBitDepth;/* 1C:depth of alpha buffer requested*/
+	DWORD	dwReserved;	/* 20:reserved*/
+	LPVOID	lpSurface;	/* 24:pointer to the associated surface memory*/
+	union {
+		DDCOLORKEY	ddckCKDestOverlay; /* 28: CK for dest overlay use*/
+		DWORD 		dwEmptyFaceColor; /* 28: color for empty cubemap faces */
+	};
+	DDCOLORKEY	ddckCKDestBlt;	/* 30: CK for destination blt use*/
+	DDCOLORKEY	ddckCKSrcOverlay;/* 38: CK for source overlay use*/
+	DDCOLORKEY	ddckCKSrcBlt;	/* 40: CK for source blt use*/
+
+	union {
+		DDPIXELFORMAT	ddpfPixelFormat;/* 48: pixel format description of the surface*/
+		DWORD 		dwFVF;	/* 48: vertex format description of vertex buffers */
+	};
+	DDSCAPS2	ddsCaps; /* 68: DDraw surface caps */
+	DWORD		dwTextureStage; /* 78: stage in multitexture cascade */
+} DDSURFACEDESC2,*LPDDSURFACEDESC2;
+
+/* DDCOLORCONTROL.dwFlags */
+#define DDCOLOR_BRIGHTNESS	0x00000001
+#define DDCOLOR_CONTRAST	0x00000002
+#define DDCOLOR_HUE		0x00000004
+#define DDCOLOR_SATURATION	0x00000008
+#define DDCOLOR_SHARPNESS	0x00000010
+#define DDCOLOR_GAMMA		0x00000020
+#define DDCOLOR_COLORENABLE	0x00000040
+
+typedef struct {
+	DWORD	dwSize;
+	DWORD	dwFlags;
+	LONG	lBrightness;
+	LONG	lContrast;
+	LONG	lHue;
+	LONG	lSaturation;
+	LONG	lSharpness;
+	LONG	lGamma;
+	LONG	lColorEnable;
+	DWORD	dwReserved1;
+} DDCOLORCONTROL,*LPDDCOLORCONTROL;
+
+typedef struct {
+	WORD	red[256];
+	WORD	green[256];
+	WORD	blue[256];
+} DDGAMMARAMP,*LPDDGAMMARAMP;
+
+typedef BOOL (CALLBACK *LPDDENUMCALLBACKA)(GUID *, LPSTR, LPSTR, LPVOID);
+typedef BOOL (CALLBACK *LPDDENUMCALLBACKW)(GUID *, LPWSTR, LPWSTR, LPVOID);
+DECL_WINELIB_TYPE_AW(LPDDENUMCALLBACK)
+
+typedef HRESULT (CALLBACK *LPDDENUMMODESCALLBACK)(LPDDSURFACEDESC, LPVOID);
+typedef HRESULT (CALLBACK *LPDDENUMMODESCALLBACK2)(LPDDSURFACEDESC2, LPVOID);
+typedef HRESULT (CALLBACK *LPDDENUMSURFACESCALLBACK)(LPDIRECTDRAWSURFACE, LPDDSURFACEDESC, LPVOID);
+typedef HRESULT (CALLBACK *LPDDENUMSURFACESCALLBACK2)(LPDIRECTDRAWSURFACE4, LPDDSURFACEDESC2, LPVOID);
+typedef HRESULT (CALLBACK *LPDDENUMSURFACESCALLBACK7)(LPDIRECTDRAWSURFACE7, LPDDSURFACEDESC2, LPVOID);
+
+typedef BOOL (CALLBACK *LPDDENUMCALLBACKEXA)(GUID *, LPSTR, LPSTR, LPVOID, HMONITOR);
+typedef BOOL (CALLBACK *LPDDENUMCALLBACKEXW)(GUID *, LPWSTR, LPWSTR, LPVOID, HMONITOR);
+DECL_WINELIB_TYPE_AW(LPDDENUMCALLBACKEX)
+
+HRESULT WINAPI DirectDrawEnumerateA(LPDDENUMCALLBACKA,LPVOID);
+HRESULT WINAPI DirectDrawEnumerateW(LPDDENUMCALLBACKW,LPVOID);
+#define DirectDrawEnumerate WINELIB_NAME_AW(DirectDrawEnumerate)
+
+HRESULT WINAPI DirectDrawEnumerateExA( LPDDENUMCALLBACKEXA lpCallback, LPVOID lpContext, DWORD dwFlags);
+HRESULT WINAPI DirectDrawEnumerateExW( LPDDENUMCALLBACKEXW lpCallback, LPVOID lpContext, DWORD dwFlags);
+#define DirectDrawEnumerateEx WINELIB_NAME_AW(DirectDrawEnumerateEx)
+
+typedef HRESULT (WINAPI * LPDIRECTDRAWENUMERATEEXA)( LPDDENUMCALLBACKEXA lpCallback, LPVOID lpContext, DWORD dwFlags);
+typedef HRESULT (WINAPI * LPDIRECTDRAWENUMERATEEXW)( LPDDENUMCALLBACKEXW lpCallback, LPVOID lpContext, DWORD dwFlags);
+DECL_WINELIB_TYPE_AW(LPDIRECTDRAWENUMERATEEX)
+
+/* flags for DirectDrawEnumerateEx */
+#define DDENUM_ATTACHEDSECONDARYDEVICES	0x00000001
+#define DDENUM_DETACHEDSECONDARYDEVICES	0x00000002
+#define DDENUM_NONDISPLAYDEVICES	0x00000004
+
+/* flags for DirectDrawCreate or IDirectDraw::Initialize */
+#define DDCREATE_HARDWAREONLY	1L
+#define DDCREATE_EMULATIONONLY	2L
+
+typedef struct _DDBLTFX
+{
+ DWORD dwSize; /* size of structure */
+ DWORD dwDDFX; /* FX operations */
+ DWORD dwROP; /* Win32 raster operations */
+ DWORD dwDDROP; /* Raster operations new for DirectDraw */
+ DWORD dwRotationAngle; /* Rotation angle for blt */
+ DWORD dwZBufferOpCode; /* ZBuffer compares */
+ DWORD dwZBufferLow; /* Low limit of Z buffer */
+ DWORD dwZBufferHigh; /* High limit of Z buffer */
+ DWORD dwZBufferBaseDest; /* Destination base value */
+ DWORD dwZDestConstBitDepth; /* Bit depth used to specify Z constant for destination */
+ union
+ {
+ DWORD dwZDestConst; /* Constant to use as Z buffer for dest */
+ LPDIRECTDRAWSURFACE lpDDSZBufferDest; /* Surface to use as Z buffer for dest */
+ };
+ DWORD dwZSrcConstBitDepth; /* Bit depth used to specify Z constant for source */
+ union
+ {
+ DWORD dwZSrcConst; /* Constant to use as Z buffer for src */
+ LPDIRECTDRAWSURFACE lpDDSZBufferSrc; /* Surface to use as Z buffer for src */
+ };
+ DWORD dwAlphaEdgeBlendBitDepth; /* Bit depth used to specify constant for alpha edge blend */
+ DWORD dwAlphaEdgeBlend; /* Alpha for edge blending */
+ DWORD dwReserved;
+ DWORD dwAlphaDestConstBitDepth; /* Bit depth used to specify alpha constant for destination */
+ union
+ {
+ DWORD dwAlphaDestConst; /* Constant to use as Alpha Channel */
+ LPDIRECTDRAWSURFACE lpDDSAlphaDest; /* Surface to use as Alpha Channel */
+ };
+ DWORD dwAlphaSrcConstBitDepth; /* Bit depth used to specify alpha constant for source */
+ union
+ {
+ DWORD dwAlphaSrcConst; /* Constant to use as Alpha Channel */
+ LPDIRECTDRAWSURFACE lpDDSAlphaSrc; /* Surface to use as Alpha Channel */
+ };
+ union
+ {
+ DWORD dwFillColor; /* color in RGB or Palettized */
+ DWORD dwFillDepth; /* depth value for z-buffer */
+	DWORD dwFillPixel;			/* pixel val for RGBA or RGBZ */
+ LPDIRECTDRAWSURFACE lpDDSPattern; /* Surface to use as pattern */
+ };
+ DDCOLORKEY ddckDestColorkey; /* DestColorkey override */
+ DDCOLORKEY ddckSrcColorkey; /* SrcColorkey override */
+} DDBLTFX,*LPDDBLTFX;
+
+/* dwDDFX */
+/* arithmetic stretching along y axis */
+#define DDBLTFX_ARITHSTRETCHY			0x00000001
+/* mirror on y axis */
+#define DDBLTFX_MIRRORLEFTRIGHT			0x00000002
+/* mirror on x axis */
+#define DDBLTFX_MIRRORUPDOWN			0x00000004
+/* do not tear */
+#define DDBLTFX_NOTEARING			0x00000008
+/* 180 degrees clockwise rotation */
+#define DDBLTFX_ROTATE180			0x00000010
+/* 270 degrees clockwise rotation */
+#define DDBLTFX_ROTATE270			0x00000020
+/* 90 degrees clockwise rotation */
+#define DDBLTFX_ROTATE90			0x00000040
+/* dwZBufferLow and dwZBufferHigh specify limits to the copied Z values */
+#define DDBLTFX_ZBUFFERRANGE			0x00000080
+/* add dwZBufferBaseDest to every source z value before compare */
+#define DDBLTFX_ZBUFFERBASEDEST			0x00000100
+
+typedef struct _DDOVERLAYFX
+{
+ DWORD dwSize; /* size of structure */
+ DWORD dwAlphaEdgeBlendBitDepth; /* Bit depth used to specify constant for alpha edge blend */
+ DWORD dwAlphaEdgeBlend; /* Constant to use as alpha for edge blend */
+ DWORD dwReserved;
+ DWORD dwAlphaDestConstBitDepth; /* Bit depth used to specify alpha constant for destination */
+ union
+ {
+ DWORD dwAlphaDestConst; /* Constant to use as alpha channel for dest */
+ LPDIRECTDRAWSURFACE lpDDSAlphaDest; /* Surface to use as alpha channel for dest */
+ };
+ DWORD dwAlphaSrcConstBitDepth; /* Bit depth used to specify alpha constant for source */
+ union
+ {
+ DWORD dwAlphaSrcConst; /* Constant to use as alpha channel for src */
+ LPDIRECTDRAWSURFACE lpDDSAlphaSrc; /* Surface to use as alpha channel for src */
+ };
+ DDCOLORKEY dckDestColorkey; /* DestColorkey override */
+ DDCOLORKEY dckSrcColorkey; /* DestColorkey override */
+ DWORD dwDDFX; /* Overlay FX */
+ DWORD dwFlags; /* flags */
+} DDOVERLAYFX,*LPDDOVERLAYFX;
+
+typedef struct _DDBLTBATCH
+{
+ LPRECT		lprDest;
+ LPDIRECTDRAWSURFACE	lpDDSSrc;
+ LPRECT		lprSrc;
+ DWORD		dwFlags;
+ LPDDBLTFX		lpDDBltFx;
+} DDBLTBATCH,*LPDDBLTBATCH;
+
+#define MAX_DDDEVICEID_STRING 512
+
+#define DDGDI_GETHOSTIDENTIFIER 1
+
+typedef struct tagDDDEVICEIDENTIFIER {
+ char szDriver[MAX_DDDEVICEID_STRING];
+ char szDescription[MAX_DDDEVICEID_STRING];
+ LARGE_INTEGER liDriverVersion;
+ DWORD dwVendorId;
+ DWORD dwDeviceId;
+ DWORD dwSubSysId;
+ DWORD dwRevision;
+ GUID guidDeviceIdentifier;
+} DDDEVICEIDENTIFIER, * LPDDDEVICEIDENTIFIER;
+
+typedef struct tagDDDEVICEIDENTIFIER2 {
+ char szDriver[MAX_DDDEVICEID_STRING];	/* user readable driver name */
+ char szDescription[MAX_DDDEVICEID_STRING]; /* user readable description */
+ LARGE_INTEGER liDriverVersion;		/* driver version */
+ DWORD dwVendorId;				/* vendor ID, zero if unknown */
+ DWORD dwDeviceId;				/* chipset ID, zero if unknown */
+ DWORD dwSubSysId;				/* board ID, zero if unknown */
+ DWORD dwRevision;				/* chipset version, zero if unknown */
+ GUID guidDeviceIdentifier;			/* unique ID for this driver/chipset combination */
+ DWORD dwWHQLLevel;				/* Windows Hardware Quality Lab certification level */
+} DDDEVICEIDENTIFIER2, * LPDDDEVICEIDENTIFIER2;
+
+/*****************************************************************************
+ * IDirectDrawPalette interface
+ */
+#undef INTERFACE
+#define INTERFACE IDirectDrawPalette
+DECLARE_INTERFACE_(IDirectDrawPalette,IUnknown)
+{
+ /*** IUnknown methods ***/
+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** IDirectDrawPalette methods ***/
+ STDMETHOD(GetCaps)(THIS_ LPDWORD lpdwCaps) PURE;
+ STDMETHOD(GetEntries)(THIS_ DWORD dwFlags, DWORD dwBase, DWORD dwNumEntries, LPPALETTEENTRY lpEntries) PURE;
+ STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW lpDD, DWORD dwFlags, LPPALETTEENTRY lpDDColorTable) PURE;
+ STDMETHOD(SetEntries)(THIS_ DWORD dwFlags, DWORD dwStartingEntry, DWORD dwCount, LPPALETTEENTRY lpEntries) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDirectDrawPalette_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirectDrawPalette_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirectDrawPalette_Release(p) (p)->lpVtbl->Release(p)
+/*** IDirectDrawPalette methods ***/
+#define IDirectDrawPalette_GetCaps(p,a) (p)->lpVtbl->GetCaps(p,a)
+#define IDirectDrawPalette_GetEntries(p,a,b,c,d) (p)->lpVtbl->GetEntries(p,a,b,c,d)
+#define IDirectDrawPalette_Initialize(p,a,b,c) (p)->lpVtbl->Initialize(p,a,b,c)
+#define IDirectDrawPalette_SetEntries(p,a,b,c,d) (p)->lpVtbl->SetEntries(p,a,b,c,d)
+#else
+/*** IUnknown methods ***/
+#define IDirectDrawPalette_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
+#define IDirectDrawPalette_AddRef(p) (p)->AddRef()
+#define IDirectDrawPalette_Release(p) (p)->Release()
+/*** IDirectDrawPalette methods ***/
+#define IDirectDrawPalette_GetCaps(p,a) (p)->GetCaps(a)
+#define IDirectDrawPalette_GetEntries(p,a,b,c,d) (p)->GetEntries(a,b,c,d)
+#define IDirectDrawPalette_Initialize(p,a,b,c) (p)->Initialize(a,b,c)
+#define IDirectDrawPalette_SetEntries(p,a,b,c,d) (p)->SetEntries(a,b,c,d)
+#endif
+
+
+/*****************************************************************************
+ * IDirectDrawClipper interface
+ */
+#define INTERFACE IDirectDrawClipper
+DECLARE_INTERFACE_(IDirectDrawClipper,IUnknown)
+{
+ /*** IUnknown methods ***/
+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** IDirectDrawClipper methods ***/
+ STDMETHOD(GetClipList)(THIS_ LPRECT lpRect, LPRGNDATA lpClipList, LPDWORD lpdwSize) PURE;
+ STDMETHOD(GetHWnd)(THIS_ HWND *lphWnd) PURE;
+ STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW lpDD, DWORD dwFlags) PURE;
+ STDMETHOD(IsClipListChanged)(THIS_ BOOL *lpbChanged) PURE;
+ STDMETHOD(SetClipList)(THIS_ LPRGNDATA lpClipList, DWORD dwFlags) PURE;
+ STDMETHOD(SetHWnd)(THIS_ DWORD dwFlags, HWND hWnd) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDirectDrawClipper_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirectDrawClipper_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirectDrawClipper_Release(p) (p)->lpVtbl->Release(p)
+/*** IDirectDrawClipper methods ***/
+#define IDirectDrawClipper_GetClipList(p,a,b,c) (p)->lpVtbl->GetClipList(p,a,b,c)
+#define IDirectDrawClipper_GetHWnd(p,a) (p)->lpVtbl->GetHWnd(p,a)
+#define IDirectDrawClipper_Initialize(p,a,b) (p)->lpVtbl->Initialize(p,a,b)
+#define IDirectDrawClipper_IsClipListChanged(p,a) (p)->lpVtbl->IsClipListChanged(p,a)
+#define IDirectDrawClipper_SetClipList(p,a,b) (p)->lpVtbl->SetClipList(p,a,b)
+#define IDirectDrawClipper_SetHWnd(p,a,b) (p)->lpVtbl->SetHWnd(p,a,b)
+#else
+/*** IUnknown methods ***/
+#define IDirectDrawClipper_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
+#define IDirectDrawClipper_AddRef(p) (p)->AddRef()
+#define IDirectDrawClipper_Release(p) (p)->Release()
+/*** IDirectDrawClipper methods ***/
+#define IDirectDrawClipper_GetClipList(p,a,b,c) (p)->GetClipList(a,b,c)
+#define IDirectDrawClipper_GetHWnd(p,a) (p)->GetHWnd(a)
+#define IDirectDrawClipper_Initialize(p,a,b) (p)->Initialize(a,b)
+#define IDirectDrawClipper_IsClipListChanged(p,a) (p)->IsClipListChanged(a)
+#define IDirectDrawClipper_SetClipList(p,a,b) (p)->SetClipList(a,b)
+#define IDirectDrawClipper_SetHWnd(p,a,b) (p)->SetHWnd(a,b)
+#endif
+
+
+/*****************************************************************************
+ * IDirectDraw interface
+ */
+#define INTERFACE IDirectDraw
+DECLARE_INTERFACE_(IDirectDraw,IUnknown)
+{
+ /*** IUnknown methods ***/
+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** IDirectDraw methods ***/
+ STDMETHOD(Compact)(THIS) PURE;
+ STDMETHOD(CreateClipper)(THIS_ DWORD dwFlags, LPDIRECTDRAWCLIPPER *lplpDDClipper, IUnknown *pUnkOuter) PURE;
+ STDMETHOD(CreatePalette)(THIS_ DWORD dwFlags, LPPALETTEENTRY lpColorTable, LPDIRECTDRAWPALETTE *lplpDDPalette, IUnknown *pUnkOuter) PURE;
+ STDMETHOD(CreateSurface)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc, LPDIRECTDRAWSURFACE *lplpDDSurface, IUnknown *pUnkOuter) PURE;
+ STDMETHOD(DuplicateSurface)(THIS_ LPDIRECTDRAWSURFACE lpDDSurface, LPDIRECTDRAWSURFACE *lplpDupDDSurface) PURE;
+ STDMETHOD(EnumDisplayModes)(THIS_ DWORD dwFlags, LPDDSURFACEDESC lpDDSurfaceDesc, LPVOID lpContext, LPDDENUMMODESCALLBACK lpEnumModesCallback) PURE;
+ STDMETHOD(EnumSurfaces)(THIS_ DWORD dwFlags, LPDDSURFACEDESC lpDDSD, LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpEnumSurfacesCallback) PURE;
+ STDMETHOD(FlipToGDISurface)(THIS) PURE;
+ STDMETHOD(GetCaps)(THIS_ LPDDCAPS lpDDDriverCaps, LPDDCAPS lpDDHELCaps) PURE;
+ STDMETHOD(GetDisplayMode)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE;
+ STDMETHOD(GetFourCCCodes)(THIS_ LPDWORD lpNumCodes, LPDWORD lpCodes) PURE;
+ STDMETHOD(GetGDISurface)(THIS_ LPDIRECTDRAWSURFACE *lplpGDIDDSurface) PURE;
+ STDMETHOD(GetMonitorFrequency)(THIS_ LPDWORD lpdwFrequency) PURE;
+ STDMETHOD(GetScanLine)(THIS_ LPDWORD lpdwScanLine) PURE;
+ STDMETHOD(GetVerticalBlankStatus)(THIS_ BOOL *lpbIsInVB) PURE;
+ STDMETHOD(Initialize)(THIS_ GUID *lpGUID) PURE;
+ STDMETHOD(RestoreDisplayMode)(THIS) PURE;
+ STDMETHOD(SetCooperativeLevel)(THIS_ HWND hWnd, DWORD dwFlags) PURE;
+ STDMETHOD(SetDisplayMode)(THIS_ DWORD dwWidth, DWORD dwHeight, DWORD dwBPP) PURE;
+ STDMETHOD(WaitForVerticalBlank)(THIS_ DWORD dwFlags, HANDLE hEvent) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDirectDraw_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirectDraw_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirectDraw_Release(p) (p)->lpVtbl->Release(p)
+/*** IDirectDraw methods ***/
+#define IDirectDraw_Compact(p) (p)->lpVtbl->Compact(p)
+#define IDirectDraw_CreateClipper(p,a,b,c) (p)->lpVtbl->CreateClipper(p,a,b,c)
+#define IDirectDraw_CreatePalette(p,a,b,c,d) (p)->lpVtbl->CreatePalette(p,a,b,c,d)
+#define IDirectDraw_CreateSurface(p,a,b,c) (p)->lpVtbl->CreateSurface(p,a,b,c)
+#define IDirectDraw_DuplicateSurface(p,a,b) (p)->lpVtbl->DuplicateSurface(p,a,b)
+#define IDirectDraw_EnumDisplayModes(p,a,b,c,d) (p)->lpVtbl->EnumDisplayModes(p,a,b,c,d)
+#define IDirectDraw_EnumSurfaces(p,a,b,c,d) (p)->lpVtbl->EnumSurfaces(p,a,b,c,d)
+#define IDirectDraw_FlipToGDISurface(p) (p)->lpVtbl->FlipToGDISurface(p)
+#define IDirectDraw_GetCaps(p,a,b) (p)->lpVtbl->GetCaps(p,a,b)
+#define IDirectDraw_GetDisplayMode(p,a) (p)->lpVtbl->GetDisplayMode(p,a)
+#define IDirectDraw_GetFourCCCodes(p,a,b) (p)->lpVtbl->GetFourCCCodes(p,a,b)
+#define IDirectDraw_GetGDISurface(p,a) (p)->lpVtbl->GetGDISurface(p,a)
+#define IDirectDraw_GetMonitorFrequency(p,a) (p)->lpVtbl->GetMonitorFrequency(p,a)
+#define IDirectDraw_GetScanLine(p,a) (p)->lpVtbl->GetScanLine(p,a)
+#define IDirectDraw_GetVerticalBlankStatus(p,a) (p)->lpVtbl->GetVerticalBlankStatus(p,a)
+#define IDirectDraw_Initialize(p,a) (p)->lpVtbl->Initialize(p,a)
+#define IDirectDraw_RestoreDisplayMode(p) (p)->lpVtbl->RestoreDisplayMode(p)
+#define IDirectDraw_SetCooperativeLevel(p,a,b) (p)->lpVtbl->SetCooperativeLevel(p,a,b)
+#define IDirectDraw_SetDisplayMode(p,a,b,c) (p)->lpVtbl->SetDisplayMode(p,a,b,c)
+#define IDirectDraw_WaitForVerticalBlank(p,a,b) (p)->lpVtbl->WaitForVerticalBlank(p,a,b)
+#else
+/*** IUnknown methods ***/
+#define IDirectDraw_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
+#define IDirectDraw_AddRef(p) (p)->AddRef()
+#define IDirectDraw_Release(p) (p)->Release()
+/*** IDirectDraw methods ***/
+#define IDirectDraw_Compact(p) (p)->Compact()
+#define IDirectDraw_CreateClipper(p,a,b,c) (p)->CreateClipper(a,b,c)
+#define IDirectDraw_CreatePalette(p,a,b,c,d) (p)->CreatePalette(a,b,c,d)
+#define IDirectDraw_CreateSurface(p,a,b,c) (p)->CreateSurface(a,b,c)
+#define IDirectDraw_DuplicateSurface(p,a,b) (p)->DuplicateSurface(a,b)
+#define IDirectDraw_EnumDisplayModes(p,a,b,c,d) (p)->EnumDisplayModes(a,b,c,d)
+#define IDirectDraw_EnumSurfaces(p,a,b,c,d) (p)->EnumSurfaces(a,b,c,d)
+#define IDirectDraw_FlipToGDISurface(p) (p)->FlipToGDISurface()
+#define IDirectDraw_GetCaps(p,a,b) (p)->GetCaps(a,b)
+#define IDirectDraw_GetDisplayMode(p,a) (p)->GetDisplayMode(a)
+#define IDirectDraw_GetFourCCCodes(p,a,b) (p)->GetFourCCCodes(a,b)
+#define IDirectDraw_GetGDISurface(p,a) (p)->GetGDISurface(a)
+#define IDirectDraw_GetMonitorFrequency(p,a) (p)->GetMonitorFrequency(a)
+#define IDirectDraw_GetScanLine(p,a) (p)->GetScanLine(a)
+#define IDirectDraw_GetVerticalBlankStatus(p,a) (p)->GetVerticalBlankStatus(a)
+#define IDirectDraw_Initialize(p,a) (p)->Initialize(a)
+#define IDirectDraw_RestoreDisplayMode(p) (p)->RestoreDisplayMode()
+#define IDirectDraw_SetCooperativeLevel(p,a,b) (p)->SetCooperativeLevel(a,b)
+#define IDirectDraw_SetDisplayMode(p,a,b,c) (p)->SetDisplayMode(a,b,c)
+#define IDirectDraw_WaitForVerticalBlank(p,a,b) (p)->WaitForVerticalBlank(a,b)
+#endif
+
+
+/* flags for Lock() */
+#define DDLOCK_SURFACEMEMORYPTR	0x00000000
+#define DDLOCK_WAIT		0x00000001
+#define DDLOCK_EVENT		0x00000002
+#define DDLOCK_READONLY		0x00000010
+#define DDLOCK_WRITEONLY	0x00000020
+#define DDLOCK_NOSYSLOCK	0x00000800
+#define DDLOCK_NOOVERWRITE 0x00001000
+#define DDLOCK_DISCARDCONTENTS 0x00002000
+
+
+/*****************************************************************************
+ * IDirectDraw2 interface
+ */
+/* Note: IDirectDraw2 cannot derive from IDirectDraw because the number of
+ * arguments of SetDisplayMode has changed !
+ */
+#define INTERFACE IDirectDraw2
+DECLARE_INTERFACE_(IDirectDraw2,IUnknown)
+{
+ /*** IUnknown methods ***/
+/*00*/ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+/*04*/ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+/*08*/ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** IDirectDraw2 methods ***/
+/*0c*/ STDMETHOD(Compact)(THIS) PURE;
+/*10*/ STDMETHOD(CreateClipper)(THIS_ DWORD dwFlags, LPDIRECTDRAWCLIPPER *lplpDDClipper, IUnknown *pUnkOuter) PURE;
+/*14*/ STDMETHOD(CreatePalette)(THIS_ DWORD dwFlags, LPPALETTEENTRY lpColorTable, LPDIRECTDRAWPALETTE *lplpDDPalette, IUnknown *pUnkOuter) PURE;
+/*18*/ STDMETHOD(CreateSurface)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc, LPDIRECTDRAWSURFACE *lplpDDSurface, IUnknown *pUnkOuter) PURE;
+/*1c*/ STDMETHOD(DuplicateSurface)(THIS_ LPDIRECTDRAWSURFACE lpDDSurface, LPDIRECTDRAWSURFACE *lplpDupDDSurface) PURE;
+/*20*/ STDMETHOD(EnumDisplayModes)(THIS_ DWORD dwFlags, LPDDSURFACEDESC lpDDSurfaceDesc, LPVOID lpContext, LPDDENUMMODESCALLBACK lpEnumModesCallback) PURE;
+/*24*/ STDMETHOD(EnumSurfaces)(THIS_ DWORD dwFlags, LPDDSURFACEDESC lpDDSD, LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpEnumSurfacesCallback) PURE;
+/*28*/ STDMETHOD(FlipToGDISurface)(THIS) PURE;
+/*2c*/ STDMETHOD(GetCaps)(THIS_ LPDDCAPS lpDDDriverCaps, LPDDCAPS lpDDHELCaps) PURE;
+/*30*/ STDMETHOD(GetDisplayMode)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE;
+/*34*/ STDMETHOD(GetFourCCCodes)(THIS_ LPDWORD lpNumCodes, LPDWORD lpCodes) PURE;
+/*38*/ STDMETHOD(GetGDISurface)(THIS_ LPDIRECTDRAWSURFACE *lplpGDIDDSurface) PURE;
+/*3c*/ STDMETHOD(GetMonitorFrequency)(THIS_ LPDWORD lpdwFrequency) PURE;
+/*40*/ STDMETHOD(GetScanLine)(THIS_ LPDWORD lpdwScanLine) PURE;
+/*44*/ STDMETHOD(GetVerticalBlankStatus)(THIS_ BOOL *lpbIsInVB) PURE;
+/*48*/ STDMETHOD(Initialize)(THIS_ GUID *lpGUID) PURE;
+/*4c*/ STDMETHOD(RestoreDisplayMode)(THIS) PURE;
+/*50*/ STDMETHOD(SetCooperativeLevel)(THIS_ HWND hWnd, DWORD dwFlags) PURE;
+/*54*/ STDMETHOD(SetDisplayMode)(THIS_ DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) PURE;
+/*58*/ STDMETHOD(WaitForVerticalBlank)(THIS_ DWORD dwFlags, HANDLE hEvent) PURE;
+ /* added in v2 */
+/*5c*/ STDMETHOD(GetAvailableVidMem)(THIS_ LPDDSCAPS lpDDCaps, LPDWORD lpdwTotal, LPDWORD lpdwFree) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDirectDraw2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirectDraw2_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirectDraw2_Release(p) (p)->lpVtbl->Release(p)
+/*** IDirectDraw methods ***/
+#define IDirectDraw2_Compact(p) (p)->lpVtbl->Compact(p)
+#define IDirectDraw2_CreateClipper(p,a,b,c) (p)->lpVtbl->CreateClipper(p,a,b,c)
+#define IDirectDraw2_CreatePalette(p,a,b,c,d) (p)->lpVtbl->CreatePalette(p,a,b,c,d)
+#define IDirectDraw2_CreateSurface(p,a,b,c) (p)->lpVtbl->CreateSurface(p,a,b,c)
+#define IDirectDraw2_DuplicateSurface(p,a,b) (p)->lpVtbl->DuplicateSurface(p,a,b)
+#define IDirectDraw2_EnumDisplayModes(p,a,b,c,d) (p)->lpVtbl->EnumDisplayModes(p,a,b,c,d)
+#define IDirectDraw2_EnumSurfaces(p,a,b,c,d) (p)->lpVtbl->EnumSurfaces(p,a,b,c,d)
+#define IDirectDraw2_FlipToGDISurface(p) (p)->lpVtbl->FlipToGDISurface(p)
+#define IDirectDraw2_GetCaps(p,a,b) (p)->lpVtbl->GetCaps(p,a,b)
+#define IDirectDraw2_GetDisplayMode(p,a) (p)->lpVtbl->GetDisplayMode(p,a)
+#define IDirectDraw2_GetFourCCCodes(p,a,b) (p)->lpVtbl->GetFourCCCodes(p,a,b)
+#define IDirectDraw2_GetGDISurface(p,a) (p)->lpVtbl->GetGDISurface(p,a)
+#define IDirectDraw2_GetMonitorFrequency(p,a) (p)->lpVtbl->GetMonitorFrequency(p,a)
+#define IDirectDraw2_GetScanLine(p,a) (p)->lpVtbl->GetScanLine(p,a)
+#define IDirectDraw2_GetVerticalBlankStatus(p,a) (p)->lpVtbl->GetVerticalBlankStatus(p,a)
+#define IDirectDraw2_Initialize(p,a) (p)->lpVtbl->Initialize(p,a)
+#define IDirectDraw2_RestoreDisplayMode(p) (p)->lpVtbl->RestoreDisplayMode(p)
+#define IDirectDraw2_SetCooperativeLevel(p,a,b) (p)->lpVtbl->SetCooperativeLevel(p,a,b)
+#define IDirectDraw2_SetDisplayMode(p,a,b,c,d,e) (p)->lpVtbl->SetDisplayMode(p,a,b,c,d,e)
+#define IDirectDraw2_WaitForVerticalBlank(p,a,b) (p)->lpVtbl->WaitForVerticalBlank(p,a,b)
+/*** IDirectDraw2 methods ***/
+#define IDirectDraw2_GetAvailableVidMem(p,a,b,c) (p)->lpVtbl->GetAvailableVidMem(p,a,b,c)
+#else
+/*** IUnknown methods ***/
+#define IDirectDraw2_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
+#define IDirectDraw2_AddRef(p) (p)->AddRef()
+#define IDirectDraw2_Release(p) (p)->Release()
+/*** IDirectDraw methods ***/
+#define IDirectDraw2_Compact(p) (p)->Compact()
+#define IDirectDraw2_CreateClipper(p,a,b,c) (p)->CreateClipper(a,b,c)
+#define IDirectDraw2_CreatePalette(p,a,b,c,d) (p)->CreatePalette(a,b,c,d)
+#define IDirectDraw2_CreateSurface(p,a,b,c) (p)->CreateSurface(a,b,c)
+#define IDirectDraw2_DuplicateSurface(p,a,b) (p)->DuplicateSurface(a,b)
+#define IDirectDraw2_EnumDisplayModes(p,a,b,c,d) (p)->EnumDisplayModes(a,b,c,d)
+#define IDirectDraw2_EnumSurfaces(p,a,b,c,d) (p)->EnumSurfaces(a,b,c,d)
+#define IDirectDraw2_FlipToGDISurface(p) (p)->FlipToGDISurface()
+#define IDirectDraw2_GetCaps(p,a,b) (p)->GetCaps(a,b)
+#define IDirectDraw2_GetDisplayMode(p,a) (p)->GetDisplayMode(a)
+#define IDirectDraw2_GetFourCCCodes(p,a,b) (p)->GetFourCCCodes(a,b)
+#define IDirectDraw2_GetGDISurface(p,a) (p)->GetGDISurface(a)
+#define IDirectDraw2_GetMonitorFrequency(p,a) (p)->GetMonitorFrequency(a)
+#define IDirectDraw2_GetScanLine(p,a) (p)->GetScanLine(a)
+#define IDirectDraw2_GetVerticalBlankStatus(p,a) (p)->GetVerticalBlankStatus(a)
+#define IDirectDraw2_Initialize(p,a) (p)->Initialize(a)
+#define IDirectDraw2_RestoreDisplayMode(p) (p)->RestoreDisplayMode()
+#define IDirectDraw2_SetCooperativeLevel(p,a,b) (p)->SetCooperativeLevel(a,b)
+#define IDirectDraw2_SetDisplayMode(p,a,b,c,d,e) (p)->SetDisplayMode(a,b,c,d,e)
+#define IDirectDraw2_WaitForVerticalBlank(p,a,b) (p)->WaitForVerticalBlank(a,b)
+/*** IDirectDraw2 methods ***/
+#define IDirectDraw2_GetAvailableVidMem(p,a,b,c) (p)->GetAvailableVidMem(a,b,c)
+#endif
+
+
+/*****************************************************************************
+ * IDirectDraw3 interface
+ */
+#define INTERFACE IDirectDraw3
+DECLARE_INTERFACE_(IDirectDraw3,IUnknown)
+{
+ /*** IUnknown methods ***/
+/*00*/ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+/*04*/ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+/*08*/ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** IDirectDraw2 methods ***/
+/*0c*/ STDMETHOD(Compact)(THIS) PURE;
+/*10*/ STDMETHOD(CreateClipper)(THIS_ DWORD dwFlags, LPDIRECTDRAWCLIPPER *lplpDDClipper, IUnknown *pUnkOuter) PURE;
+/*14*/ STDMETHOD(CreatePalette)(THIS_ DWORD dwFlags, LPPALETTEENTRY lpColorTable, LPDIRECTDRAWPALETTE *lplpDDPalette, IUnknown *pUnkOuter) PURE;
+/*18*/ STDMETHOD(CreateSurface)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc, LPDIRECTDRAWSURFACE *lplpDDSurface, IUnknown *pUnkOuter) PURE;
+/*1c*/ STDMETHOD(DuplicateSurface)(THIS_ LPDIRECTDRAWSURFACE lpDDSurface, LPDIRECTDRAWSURFACE *lplpDupDDSurface) PURE;
+/*20*/ STDMETHOD(EnumDisplayModes)(THIS_ DWORD dwFlags, LPDDSURFACEDESC lpDDSurfaceDesc, LPVOID lpContext, LPDDENUMMODESCALLBACK lpEnumModesCallback) PURE;
+/*24*/ STDMETHOD(EnumSurfaces)(THIS_ DWORD dwFlags, LPDDSURFACEDESC lpDDSD, LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpEnumSurfacesCallback) PURE;
+/*28*/ STDMETHOD(FlipToGDISurface)(THIS) PURE;
+/*2c*/ STDMETHOD(GetCaps)(THIS_ LPDDCAPS lpDDDriverCaps, LPDDCAPS lpDDHELCaps) PURE;
+/*30*/ STDMETHOD(GetDisplayMode)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE;
+/*34*/ STDMETHOD(GetFourCCCodes)(THIS_ LPDWORD lpNumCodes, LPDWORD lpCodes) PURE;
+/*38*/ STDMETHOD(GetGDISurface)(THIS_ LPDIRECTDRAWSURFACE *lplpGDIDDSurface) PURE;
+/*3c*/ STDMETHOD(GetMonitorFrequency)(THIS_ LPDWORD lpdwFrequency) PURE;
+/*40*/ STDMETHOD(GetScanLine)(THIS_ LPDWORD lpdwScanLine) PURE;
+/*44*/ STDMETHOD(GetVerticalBlankStatus)(THIS_ BOOL *lpbIsInVB) PURE;
+/*48*/ STDMETHOD(Initialize)(THIS_ GUID *lpGUID) PURE;
+/*4c*/ STDMETHOD(RestoreDisplayMode)(THIS) PURE;
+/*50*/ STDMETHOD(SetCooperativeLevel)(THIS_ HWND hWnd, DWORD dwFlags) PURE;
+/*54*/ STDMETHOD(SetDisplayMode)(THIS_ DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) PURE;
+/*58*/ STDMETHOD(WaitForVerticalBlank)(THIS_ DWORD dwFlags, HANDLE hEvent) PURE;
+ /* added in v2 */
+/*5c*/ STDMETHOD(GetAvailableVidMem)(THIS_ LPDDSCAPS lpDDCaps, LPDWORD lpdwTotal, LPDWORD lpdwFree) PURE;
+ /* added in v3 */
+/*60*/ STDMETHOD(GetSurfaceFromDC)(THIS_ HDC hdc, LPDIRECTDRAWSURFACE *pSurf) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDirectDraw3_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirectDraw3_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirectDraw3_Release(p) (p)->lpVtbl->Release(p)
+/*** IDirectDraw methods ***/
+#define IDirectDraw3_Compact(p) (p)->lpVtbl->Compact(p)
+#define IDirectDraw3_CreateClipper(p,a,b,c) (p)->lpVtbl->CreateClipper(p,a,b,c)
+#define IDirectDraw3_CreatePalette(p,a,b,c,d) (p)->lpVtbl->CreatePalette(p,a,b,c,d)
+#define IDirectDraw3_CreateSurface(p,a,b,c) (p)->lpVtbl->CreateSurface(p,a,b,c)
+#define IDirectDraw3_DuplicateSurface(p,a,b) (p)->lpVtbl->DuplicateSurface(p,a,b)
+#define IDirectDraw3_EnumDisplayModes(p,a,b,c,d) (p)->lpVtbl->EnumDisplayModes(p,a,b,c,d)
+#define IDirectDraw3_EnumSurfaces(p,a,b,c,d) (p)->lpVtbl->EnumSurfaces(p,a,b,c,d)
+#define IDirectDraw3_FlipToGDISurface(p) (p)->lpVtbl->FlipToGDISurface(p)
+#define IDirectDraw3_GetCaps(p,a,b) (p)->lpVtbl->GetCaps(p,a,b)
+#define IDirectDraw3_GetDisplayMode(p,a) (p)->lpVtbl->GetDisplayMode(p,a)
+#define IDirectDraw3_GetFourCCCodes(p,a,b) (p)->lpVtbl->GetFourCCCodes(p,a,b)
+#define IDirectDraw3_GetGDISurface(p,a) (p)->lpVtbl->GetGDISurface(p,a)
+#define IDirectDraw3_GetMonitorFrequency(p,a) (p)->lpVtbl->GetMonitorFrequency(p,a)
+#define IDirectDraw3_GetScanLine(p,a) (p)->lpVtbl->GetScanLine(p,a)
+#define IDirectDraw3_GetVerticalBlankStatus(p,a) (p)->lpVtbl->GetVerticalBlankStatus(p,a)
+#define IDirectDraw3_Initialize(p,a) (p)->lpVtbl->Initialize(p,a)
+#define IDirectDraw3_RestoreDisplayMode(p) (p)->lpVtbl->RestoreDisplayMode(p)
+#define IDirectDraw3_SetCooperativeLevel(p,a,b) (p)->lpVtbl->SetCooperativeLevel(p,a,b)
+#define IDirectDraw3_SetDisplayMode(p,a,b,c,d,e) (p)->lpVtbl->SetDisplayMode(p,a,b,c,d,e)
+#define IDirectDraw3_WaitForVerticalBlank(p,a,b) (p)->lpVtbl->WaitForVerticalBlank(p,a,b)
+/*** IDirectDraw2 methods ***/
+#define IDirectDraw3_GetAvailableVidMem(p,a,b,c) (p)->lpVtbl->GetAvailableVidMem(p,a,b,c)
+/*** IDirectDraw3 methods ***/
+#define IDirectDraw3_GetSurfaceFromDC(p,a,b) (p)->lpVtbl->GetSurfaceFromDC(p,a,b)
+#else
+/*** IUnknown methods ***/
+#define IDirectDraw3_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
+#define IDirectDraw3_AddRef(p) (p)->AddRef()
+#define IDirectDraw3_Release(p) (p)->Release()
+/*** IDirectDraw methods ***/
+#define IDirectDraw3_Compact(p) (p)->Compact()
+#define IDirectDraw3_CreateClipper(p,a,b,c) (p)->CreateClipper(a,b,c)
+#define IDirectDraw3_CreatePalette(p,a,b,c,d) (p)->CreatePalette(a,b,c,d)
+#define IDirectDraw3_CreateSurface(p,a,b,c) (p)->CreateSurface(a,b,c)
+#define IDirectDraw3_DuplicateSurface(p,a,b) (p)->DuplicateSurface(a,b)
+#define IDirectDraw3_EnumDisplayModes(p,a,b,c,d) (p)->EnumDisplayModes(a,b,c,d)
+#define IDirectDraw3_EnumSurfaces(p,a,b,c,d) (p)->EnumSurfaces(a,b,c,d)
+#define IDirectDraw3_FlipToGDISurface(p) (p)->FlipToGDISurface()
+#define IDirectDraw3_GetCaps(p,a,b) (p)->GetCaps(a,b)
+#define IDirectDraw3_GetDisplayMode(p,a) (p)->GetDisplayMode(a)
+#define IDirectDraw3_GetFourCCCodes(p,a,b) (p)->GetFourCCCodes(a,b)
+#define IDirectDraw3_GetGDISurface(p,a) (p)->GetGDISurface(a)
+#define IDirectDraw3_GetMonitorFrequency(p,a) (p)->GetMonitorFrequency(a)
+#define IDirectDraw3_GetScanLine(p,a) (p)->GetScanLine(a)
+#define IDirectDraw3_GetVerticalBlankStatus(p,a) (p)->GetVerticalBlankStatus(a)
+#define IDirectDraw3_Initialize(p,a) (p)->Initialize(a)
+#define IDirectDraw3_RestoreDisplayMode(p) (p)->RestoreDisplayMode()
+#define IDirectDraw3_SetCooperativeLevel(p,a,b) (p)->SetCooperativeLevel(a,b)
+#define IDirectDraw3_SetDisplayMode(p,a,b,c,d,e) (p)->SetDisplayMode(a,b,c,d,e)
+#define IDirectDraw3_WaitForVerticalBlank(p,a,b) (p)->WaitForVerticalBlank(a,b)
+/*** IDirectDraw2 methods ***/
+#define IDirectDraw3_GetAvailableVidMem(p,a,b,c) (p)->GetAvailableVidMem(a,b,c)
+/*** IDirectDraw3 methods ***/
+#define IDirectDraw3_GetSurfaceFromDC(p,a,b) (p)->GetSurfaceFromDC(a,b)
+#endif
+
+
+/*****************************************************************************
+ * IDirectDraw4 interface
+ */
+#define INTERFACE IDirectDraw4
+DECLARE_INTERFACE_(IDirectDraw4,IUnknown)
+{
+ /*** IUnknown methods ***/
+/*00*/ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+/*04*/ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+/*08*/ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** IDirectDraw4 methods ***/
+/*0c*/ STDMETHOD(Compact)(THIS) PURE;
+/*10*/ STDMETHOD(CreateClipper)(THIS_ DWORD dwFlags, LPDIRECTDRAWCLIPPER *lplpDDClipper, IUnknown *pUnkOuter) PURE;
+/*14*/ STDMETHOD(CreatePalette)(THIS_ DWORD dwFlags, LPPALETTEENTRY lpColorTable, LPDIRECTDRAWPALETTE *lplpDDPalette, IUnknown *pUnkOuter) PURE;
+/*18*/ STDMETHOD(CreateSurface)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc, LPDIRECTDRAWSURFACE4 *lplpDDSurface, IUnknown *pUnkOuter) PURE;
+/*1c*/ STDMETHOD(DuplicateSurface)(THIS_ LPDIRECTDRAWSURFACE4 lpDDSurface, LPDIRECTDRAWSURFACE4 *lplpDupDDSurface) PURE;
+/*20*/ STDMETHOD(EnumDisplayModes)(THIS_ DWORD dwFlags, LPDDSURFACEDESC2 lpDDSurfaceDesc, LPVOID lpContext, LPDDENUMMODESCALLBACK2 lpEnumModesCallback) PURE;
+/*24*/ STDMETHOD(EnumSurfaces)(THIS_ DWORD dwFlags, LPDDSURFACEDESC2 lpDDSD, LPVOID lpContext, LPDDENUMSURFACESCALLBACK2 lpEnumSurfacesCallback) PURE;
+/*28*/ STDMETHOD(FlipToGDISurface)(THIS) PURE;
+/*2c*/ STDMETHOD(GetCaps)(THIS_ LPDDCAPS lpDDDriverCaps, LPDDCAPS lpDDHELCaps) PURE;
+/*30*/ STDMETHOD(GetDisplayMode)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE;
+/*34*/ STDMETHOD(GetFourCCCodes)(THIS_ LPDWORD lpNumCodes, LPDWORD lpCodes) PURE;
+/*38*/ STDMETHOD(GetGDISurface)(THIS_ LPDIRECTDRAWSURFACE4 *lplpGDIDDSurface) PURE;
+/*3c*/ STDMETHOD(GetMonitorFrequency)(THIS_ LPDWORD lpdwFrequency) PURE;
+/*40*/ STDMETHOD(GetScanLine)(THIS_ LPDWORD lpdwScanLine) PURE;
+/*44*/ STDMETHOD(GetVerticalBlankStatus)(THIS_ BOOL *lpbIsInVB) PURE;
+/*48*/ STDMETHOD(Initialize)(THIS_ GUID *lpGUID) PURE;
+/*4c*/ STDMETHOD(RestoreDisplayMode)(THIS) PURE;
+/*50*/ STDMETHOD(SetCooperativeLevel)(THIS_ HWND hWnd, DWORD dwFlags) PURE;
+/*54*/ STDMETHOD(SetDisplayMode)(THIS_ DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) PURE;
+/*58*/ STDMETHOD(WaitForVerticalBlank)(THIS_ DWORD dwFlags, HANDLE hEvent) PURE;
+ /* added in v2 */
+/*5c*/ STDMETHOD(GetAvailableVidMem)(THIS_ LPDDSCAPS2 lpDDCaps, LPDWORD lpdwTotal, LPDWORD lpdwFree) PURE;
+ /* added in v4 */
+/*60*/ STDMETHOD(GetSurfaceFromDC)(THIS_ HDC hdc, LPDIRECTDRAWSURFACE4 *pSurf) PURE;
+/*64*/ STDMETHOD(RestoreAllSurfaces)(THIS) PURE;
+/*68*/ STDMETHOD(TestCooperativeLevel)(THIS) PURE;
+/*6c*/ STDMETHOD(GetDeviceIdentifier)(THIS_ LPDDDEVICEIDENTIFIER pDDDI, DWORD dwFlags) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDirectDraw4_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirectDraw4_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirectDraw4_Release(p) (p)->lpVtbl->Release(p)
+/*** IDirectDraw methods ***/
+#define IDirectDraw4_Compact(p) (p)->lpVtbl->Compact(p)
+#define IDirectDraw4_CreateClipper(p,a,b,c) (p)->lpVtbl->CreateClipper(p,a,b,c)
+#define IDirectDraw4_CreatePalette(p,a,b,c,d) (p)->lpVtbl->CreatePalette(p,a,b,c,d)
+#define IDirectDraw4_CreateSurface(p,a,b,c) (p)->lpVtbl->CreateSurface(p,a,b,c)
+#define IDirectDraw4_DuplicateSurface(p,a,b) (p)->lpVtbl->DuplicateSurface(p,a,b)
+#define IDirectDraw4_EnumDisplayModes(p,a,b,c,d) (p)->lpVtbl->EnumDisplayModes(p,a,b,c,d)
+#define IDirectDraw4_EnumSurfaces(p,a,b,c,d) (p)->lpVtbl->EnumSurfaces(p,a,b,c,d)
+#define IDirectDraw4_FlipToGDISurface(p) (p)->lpVtbl->FlipToGDISurface(p)
+#define IDirectDraw4_GetCaps(p,a,b) (p)->lpVtbl->GetCaps(p,a,b)
+#define IDirectDraw4_GetDisplayMode(p,a) (p)->lpVtbl->GetDisplayMode(p,a)
+#define IDirectDraw4_GetFourCCCodes(p,a,b) (p)->lpVtbl->GetFourCCCodes(p,a,b)
+#define IDirectDraw4_GetGDISurface(p,a) (p)->lpVtbl->GetGDISurface(p,a)
+#define IDirectDraw4_GetMonitorFrequency(p,a) (p)->lpVtbl->GetMonitorFrequency(p,a)
+#define IDirectDraw4_GetScanLine(p,a) (p)->lpVtbl->GetScanLine(p,a)
+#define IDirectDraw4_GetVerticalBlankStatus(p,a) (p)->lpVtbl->GetVerticalBlankStatus(p,a)
+#define IDirectDraw4_Initialize(p,a) (p)->lpVtbl->Initialize(p,a)
+#define IDirectDraw4_RestoreDisplayMode(p) (p)->lpVtbl->RestoreDisplayMode(p)
+#define IDirectDraw4_SetCooperativeLevel(p,a,b) (p)->lpVtbl->SetCooperativeLevel(p,a,b)
+#define IDirectDraw4_SetDisplayMode(p,a,b,c,d,e) (p)->lpVtbl->SetDisplayMode(p,a,b,c,d,e)
+#define IDirectDraw4_WaitForVerticalBlank(p,a,b) (p)->lpVtbl->WaitForVerticalBlank(p,a,b)
+/*** IDirectDraw2 methods ***/
+#define IDirectDraw4_GetAvailableVidMem(p,a,b,c) (p)->lpVtbl->GetAvailableVidMem(p,a,b,c)
+/*** IDirectDraw4 methods ***/
+#define IDirectDraw4_GetSurfaceFromDC(p,a,b) (p)->lpVtbl->GetSurfaceFromDC(p,a,b)
+#define IDirectDraw4_RestoreAllSurfaces(p) (p)->lpVtbl->RestoreAllSurfaces(p)
+#define IDirectDraw4_TestCooperativeLevel(p) (p)->lpVtbl->TestCooperativeLevel(p)
+#define IDirectDraw4_GetDeviceIdentifier(p,a,b) (p)->lpVtbl->GetDeviceIdentifier(p,a,b)
+#else
+/*** IUnknown methods ***/
+#define IDirectDraw4_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
+#define IDirectDraw4_AddRef(p) (p)->AddRef()
+#define IDirectDraw4_Release(p) (p)->Release()
+/*** IDirectDraw methods ***/
+#define IDirectDraw4_Compact(p) (p)->Compact()
+#define IDirectDraw4_CreateClipper(p,a,b,c) (p)->CreateClipper(a,b,c)
+#define IDirectDraw4_CreatePalette(p,a,b,c,d) (p)->CreatePalette(a,b,c,d)
+#define IDirectDraw4_CreateSurface(p,a,b,c) (p)->CreateSurface(a,b,c)
+#define IDirectDraw4_DuplicateSurface(p,a,b) (p)->DuplicateSurface(a,b)
+#define IDirectDraw4_EnumDisplayModes(p,a,b,c,d) (p)->EnumDisplayModes(a,b,c,d)
+#define IDirectDraw4_EnumSurfaces(p,a,b,c,d) (p)->EnumSurfaces(a,b,c,d)
+#define IDirectDraw4_FlipToGDISurface(p) (p)->FlipToGDISurface()
+#define IDirectDraw4_GetCaps(p,a,b) (p)->GetCaps(a,b)
+#define IDirectDraw4_GetDisplayMode(p,a) (p)->GetDisplayMode(a)
+#define IDirectDraw4_GetFourCCCodes(p,a,b) (p)->GetFourCCCodes(a,b)
+#define IDirectDraw4_GetGDISurface(p,a) (p)->GetGDISurface(a)
+#define IDirectDraw4_GetMonitorFrequency(p,a) (p)->GetMonitorFrequency(a)
+#define IDirectDraw4_GetScanLine(p,a) (p)->GetScanLine(a)
+#define IDirectDraw4_GetVerticalBlankStatus(p,a) (p)->GetVerticalBlankStatus(a)
+#define IDirectDraw4_Initialize(p,a) (p)->Initialize(a)
+#define IDirectDraw4_RestoreDisplayMode(p) (p)->RestoreDisplayMode()
+#define IDirectDraw4_SetCooperativeLevel(p,a,b) (p)->SetCooperativeLevel(a,b)
+#define IDirectDraw4_SetDisplayMode(p,a,b,c,d,e) (p)->SetDisplayMode(a,b,c,d,e)
+#define IDirectDraw4_WaitForVerticalBlank(p,a,b) (p)->WaitForVerticalBlank(a,b)
+/*** IDirectDraw2 methods ***/
+#define IDirectDraw4_GetAvailableVidMem(p,a,b,c) (p)->GetAvailableVidMem(a,b,c)
+/*** IDirectDraw4 methods ***/
+#define IDirectDraw4_GetSurfaceFromDC(p,a,b) (p)->GetSurfaceFromDC(a,b)
+#define IDirectDraw4_RestoreAllSurfaces(pc) (p)->RestoreAllSurfaces()
+#define IDirectDraw4_TestCooperativeLevel(p) (p)->TestCooperativeLevel()
+#define IDirectDraw4_GetDeviceIdentifier(p,a,b) (p)->GetDeviceIdentifier(a,b)
+#endif
+
+
+/*****************************************************************************
+ * IDirectDraw7 interface
+ */
+/* Note: IDirectDraw7 cannot derive from IDirectDraw4; it is even documented
+ * as not interchangeable with earlier DirectDraw interfaces.
+ */
+#define INTERFACE IDirectDraw7
+DECLARE_INTERFACE_(IDirectDraw7,IUnknown)
+{
+ /*** IUnknown methods ***/
+/*00*/ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+/*04*/ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+/*08*/ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** IDirectDraw7 methods ***/
+/*0c*/ STDMETHOD(Compact)(THIS) PURE;
+/*10*/ STDMETHOD(CreateClipper)(THIS_ DWORD dwFlags, LPDIRECTDRAWCLIPPER *lplpDDClipper, IUnknown *pUnkOuter) PURE;
+/*14*/ STDMETHOD(CreatePalette)(THIS_ DWORD dwFlags, LPPALETTEENTRY lpColorTable, LPDIRECTDRAWPALETTE *lplpDDPalette, IUnknown *pUnkOuter) PURE;
+/*18*/ STDMETHOD(CreateSurface)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc, LPDIRECTDRAWSURFACE7 *lplpDDSurface, IUnknown *pUnkOuter) PURE;
+/*1c*/ STDMETHOD(DuplicateSurface)(THIS_ LPDIRECTDRAWSURFACE7 lpDDSurface, LPDIRECTDRAWSURFACE7 *lplpDupDDSurface) PURE;
+/*20*/ STDMETHOD(EnumDisplayModes)(THIS_ DWORD dwFlags, LPDDSURFACEDESC2 lpDDSurfaceDesc, LPVOID lpContext, LPDDENUMMODESCALLBACK2 lpEnumModesCallback) PURE;
+/*24*/ STDMETHOD(EnumSurfaces)(THIS_ DWORD dwFlags, LPDDSURFACEDESC2 lpDDSD, LPVOID lpContext, LPDDENUMSURFACESCALLBACK7 lpEnumSurfacesCallback) PURE;
+/*28*/ STDMETHOD(FlipToGDISurface)(THIS) PURE;
+/*2c*/ STDMETHOD(GetCaps)(THIS_ LPDDCAPS lpDDDriverCaps, LPDDCAPS lpDDHELCaps) PURE;
+/*30*/ STDMETHOD(GetDisplayMode)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE;
+/*34*/ STDMETHOD(GetFourCCCodes)(THIS_ LPDWORD lpNumCodes, LPDWORD lpCodes) PURE;
+/*38*/ STDMETHOD(GetGDISurface)(THIS_ LPDIRECTDRAWSURFACE7 *lplpGDIDDSurface) PURE;
+/*3c*/ STDMETHOD(GetMonitorFrequency)(THIS_ LPDWORD lpdwFrequency) PURE;
+/*40*/ STDMETHOD(GetScanLine)(THIS_ LPDWORD lpdwScanLine) PURE;
+/*44*/ STDMETHOD(GetVerticalBlankStatus)(THIS_ BOOL *lpbIsInVB) PURE;
+/*48*/ STDMETHOD(Initialize)(THIS_ GUID *lpGUID) PURE;
+/*4c*/ STDMETHOD(RestoreDisplayMode)(THIS) PURE;
+/*50*/ STDMETHOD(SetCooperativeLevel)(THIS_ HWND hWnd, DWORD dwFlags) PURE;
+/*54*/ STDMETHOD(SetDisplayMode)(THIS_ DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) PURE;
+/*58*/ STDMETHOD(WaitForVerticalBlank)(THIS_ DWORD dwFlags, HANDLE hEvent) PURE;
+ /* added in v2 */
+/*5c*/ STDMETHOD(GetAvailableVidMem)(THIS_ LPDDSCAPS2 lpDDCaps, LPDWORD lpdwTotal, LPDWORD lpdwFree) PURE;
+ /* added in v4 */
+/*60*/ STDMETHOD(GetSurfaceFromDC)(THIS_ HDC hdc, LPDIRECTDRAWSURFACE7 *pSurf) PURE;
+/*64*/ STDMETHOD(RestoreAllSurfaces)(THIS) PURE;
+/*68*/ STDMETHOD(TestCooperativeLevel)(THIS) PURE;
+/*6c*/ STDMETHOD(GetDeviceIdentifier)(THIS_ LPDDDEVICEIDENTIFIER2 pDDDI, DWORD dwFlags) PURE;
+ /* added in v7 */
+/*70*/ STDMETHOD(StartModeTest)(THIS_ LPSIZE pModes, DWORD dwNumModes, DWORD dwFlags) PURE;
+/*74*/ STDMETHOD(EvaluateMode)(THIS_ DWORD dwFlags, DWORD *pTimeout) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDirectDraw7_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirectDraw7_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirectDraw7_Release(p) (p)->lpVtbl->Release(p)
+/*** IDirectDraw methods ***/
+#define IDirectDraw7_Compact(p) (p)->lpVtbl->Compact(p)
+#define IDirectDraw7_CreateClipper(p,a,b,c) (p)->lpVtbl->CreateClipper(p,a,b,c)
+#define IDirectDraw7_CreatePalette(p,a,b,c,d) (p)->lpVtbl->CreatePalette(p,a,b,c,d)
+#define IDirectDraw7_CreateSurface(p,a,b,c) (p)->lpVtbl->CreateSurface(p,a,b,c)
+#define IDirectDraw7_DuplicateSurface(p,a,b) (p)->lpVtbl->DuplicateSurface(p,a,b)
+#define IDirectDraw7_EnumDisplayModes(p,a,b,c,d) (p)->lpVtbl->EnumDisplayModes(p,a,b,c,d)
+#define IDirectDraw7_EnumSurfaces(p,a,b,c,d) (p)->lpVtbl->EnumSurfaces(p,a,b,c,d)
+#define IDirectDraw7_FlipToGDISurface(p) (p)->lpVtbl->FlipToGDISurface(p)
+#define IDirectDraw7_GetCaps(p,a,b) (p)->lpVtbl->GetCaps(p,a,b)
+#define IDirectDraw7_GetDisplayMode(p,a) (p)->lpVtbl->GetDisplayMode(p,a)
+#define IDirectDraw7_GetFourCCCodes(p,a,b) (p)->lpVtbl->GetFourCCCodes(p,a,b)
+#define IDirectDraw7_GetGDISurface(p,a) (p)->lpVtbl->GetGDISurface(p,a)
+#define IDirectDraw7_GetMonitorFrequency(p,a) (p)->lpVtbl->GetMonitorFrequency(p,a)
+#define IDirectDraw7_GetScanLine(p,a) (p)->lpVtbl->GetScanLine(p,a)
+#define IDirectDraw7_GetVerticalBlankStatus(p,a) (p)->lpVtbl->GetVerticalBlankStatus(p,a)
+#define IDirectDraw7_Initialize(p,a) (p)->lpVtbl->Initialize(p,a)
+#define IDirectDraw7_RestoreDisplayMode(p) (p)->lpVtbl->RestoreDisplayMode(p)
+#define IDirectDraw7_SetCooperativeLevel(p,a,b) (p)->lpVtbl->SetCooperativeLevel(p,a,b)
+#define IDirectDraw7_SetDisplayMode(p,a,b,c,d,e) (p)->lpVtbl->SetDisplayMode(p,a,b,c,d,e)
+#define IDirectDraw7_WaitForVerticalBlank(p,a,b) (p)->lpVtbl->WaitForVerticalBlank(p,a,b)
+/*** added in IDirectDraw2 ***/
+#define IDirectDraw7_GetAvailableVidMem(p,a,b,c) (p)->lpVtbl->GetAvailableVidMem(p,a,b,c)
+/*** added in IDirectDraw4 ***/
+#define IDirectDraw7_GetSurfaceFromDC(p,a,b) (p)->lpVtbl->GetSurfaceFromDC(p,a,b)
+#define IDirectDraw7_RestoreAllSurfaces(p) (p)->lpVtbl->RestoreAllSurfaces(p)
+#define IDirectDraw7_TestCooperativeLevel(p) (p)->lpVtbl->TestCooperativeLevel(p)
+#define IDirectDraw7_GetDeviceIdentifier(p,a,b) (p)->lpVtbl->GetDeviceIdentifier(p,a,b)
+/*** added in IDirectDraw 7 ***/
+#define IDirectDraw7_StartModeTest(p,a,b,c) (p)->lpVtbl->StartModeTest(p,a,b,c)
+#define IDirectDraw7_EvaluateMode(p,a,b) (p)->lpVtbl->EvaluateMode(p,a,b)
+#else
+/*** IUnknown methods ***/
+#define IDirectDraw7_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
+#define IDirectDraw7_AddRef(p) (p)->AddRef()
+#define IDirectDraw7_Release(p) (p)->Release()
+/*** IDirectDraw methods ***/
+#define IDirectDraw7_Compact(p) (p)->Compact()
+#define IDirectDraw7_CreateClipper(p,a,b,c) (p)->CreateClipper(a,b,c)
+#define IDirectDraw7_CreatePalette(p,a,b,c,d) (p)->CreatePalette(a,b,c,d)
+#define IDirectDraw7_CreateSurface(p,a,b,c) (p)->CreateSurface(a,b,c)
+#define IDirectDraw7_DuplicateSurface(p,a,b) (p)->DuplicateSurface(a,b)
+#define IDirectDraw7_EnumDisplayModes(p,a,b,c,d) (p)->EnumDisplayModes(a,b,c,d)
+#define IDirectDraw7_EnumSurfaces(p,a,b,c,d) (p)->EnumSurfaces(a,b,c,d)
+#define IDirectDraw7_FlipToGDISurface(p) (p)->FlipToGDISurface()
+#define IDirectDraw7_GetCaps(p,a,b) (p)->GetCaps(a,b)
+#define IDirectDraw7_GetDisplayMode(p,a) (p)->GetDisplayMode(a)
+#define IDirectDraw7_GetFourCCCodes(p,a,b) (p)->GetFourCCCodes(a,b)
+#define IDirectDraw7_GetGDISurface(p,a) (p)->GetGDISurface(a)
+#define IDirectDraw7_GetMonitorFrequency(p,a) (p)->GetMonitorFrequency(a)
+#define IDirectDraw7_GetScanLine(p,a) (p)->GetScanLine(a)
+#define IDirectDraw7_GetVerticalBlankStatus(p,a) (p)->GetVerticalBlankStatus(a)
+#define IDirectDraw7_Initialize(p,a) (p)->Initialize(a)
+#define IDirectDraw7_RestoreDisplayMode(p) (p)->RestoreDisplayMode()
+#define IDirectDraw7_SetCooperativeLevel(p,a,b) (p)->SetCooperativeLevel(a,b)
+#define IDirectDraw7_SetDisplayMode(p,a,b,c,d,e) (p)->SetDisplayMode(a,b,c,d,e)
+#define IDirectDraw7_WaitForVerticalBlank(p,a,b) (p)->WaitForVerticalBlank(a,b)
+/*** added in IDirectDraw2 ***/
+#define IDirectDraw7_GetAvailableVidMem(p,a,b,c) (p)->GetAvailableVidMem(a,b,c)
+/*** added in IDirectDraw4 ***/
+#define IDirectDraw7_GetSurfaceFromDC(p,a,b) (p)->GetSurfaceFromDC(a,b)
+#define IDirectDraw7_RestoreAllSurfaces(p) (p)->RestoreAllSurfaces()
+#define IDirectDraw7_TestCooperativeLevel(p) (p)->TestCooperativeLevel()
+#define IDirectDraw7_GetDeviceIdentifier(p,a,b) (p)->GetDeviceIdentifier(a,b)
+/*** added in IDirectDraw 7 ***/
+#define IDirectDraw7_StartModeTest(p,a,b,c) (p)->StartModeTest(a,b,c)
+#define IDirectDraw7_EvaluateMode(p,a,b) (p)->EvaluateMode(a,b)
+#endif
+
+
+/*****************************************************************************
+ * IDirectDrawSurface interface
+ */
+#define INTERFACE IDirectDrawSurface
+DECLARE_INTERFACE_(IDirectDrawSurface,IUnknown)
+{
+ /*** IUnknown methods ***/
+/*00*/ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+/*04*/ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+/*08*/ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** IDirectDrawSurface methods ***/
+/*0c*/ STDMETHOD(AddAttachedSurface)(THIS_ LPDIRECTDRAWSURFACE lpDDSAttachedSurface) PURE;
+/*10*/ STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT lpRect) PURE;
+/*14*/ STDMETHOD(Blt)(THIS_ LPRECT lpDestRect, LPDIRECTDRAWSURFACE lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwFlags, LPDDBLTFX lpDDBltFx) PURE;
+/*18*/ STDMETHOD(BltBatch)(THIS_ LPDDBLTBATCH lpDDBltBatch, DWORD dwCount, DWORD dwFlags) PURE;
+/*1c*/ STDMETHOD(BltFast)(THIS_ DWORD dwX, DWORD dwY, LPDIRECTDRAWSURFACE lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwTrans) PURE;
+/*20*/ STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE lpDDSAttachedSurface) PURE;
+/*24*/ STDMETHOD(EnumAttachedSurfaces)(THIS_ LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpEnumSurfacesCallback) PURE;
+/*28*/ STDMETHOD(EnumOverlayZOrders)(THIS_ DWORD dwFlags, LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpfnCallback) PURE;
+/*2c*/ STDMETHOD(Flip)(THIS_ LPDIRECTDRAWSURFACE lpDDSurfaceTargetOverride, DWORD dwFlags) PURE;
+/*30*/ STDMETHOD(GetAttachedSurface)(THIS_ LPDDSCAPS lpDDSCaps, LPDIRECTDRAWSURFACE *lplpDDAttachedSurface) PURE;
+/*34*/ STDMETHOD(GetBltStatus)(THIS_ DWORD dwFlags) PURE;
+/*38*/ STDMETHOD(GetCaps)(THIS_ LPDDSCAPS lpDDSCaps) PURE;
+/*3c*/ STDMETHOD(GetClipper)(THIS_ LPDIRECTDRAWCLIPPER *lplpDDClipper) PURE;
+/*40*/ STDMETHOD(GetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE;
+/*44*/ STDMETHOD(GetDC)(THIS_ HDC *lphDC) PURE;
+/*48*/ STDMETHOD(GetFlipStatus)(THIS_ DWORD dwFlags) PURE;
+/*4c*/ STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE;
+/*50*/ STDMETHOD(GetPalette)(THIS_ LPDIRECTDRAWPALETTE *lplpDDPalette) PURE;
+/*54*/ STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE;
+/*58*/ STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE;
+/*5c*/ STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW lpDD, LPDDSURFACEDESC lpDDSurfaceDesc) PURE;
+/*60*/ STDMETHOD(IsLost)(THIS) PURE;
+/*64*/ STDMETHOD(Lock)(THIS_ LPRECT lpDestRect, LPDDSURFACEDESC lpDDSurfaceDesc, DWORD dwFlags, HANDLE hEvent) PURE;
+/*68*/ STDMETHOD(ReleaseDC)(THIS_ HDC hDC) PURE;
+/*6c*/ STDMETHOD(Restore)(THIS) PURE;
+/*70*/ STDMETHOD(SetClipper)(THIS_ LPDIRECTDRAWCLIPPER lpDDClipper) PURE;
+/*74*/ STDMETHOD(SetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE;
+/*78*/ STDMETHOD(SetOverlayPosition)(THIS_ LONG lX, LONG lY) PURE;
+/*7c*/ STDMETHOD(SetPalette)(THIS_ LPDIRECTDRAWPALETTE lpDDPalette) PURE;
+/*80*/ STDMETHOD(Unlock)(THIS_ LPVOID lpSurfaceData) PURE;
+/*84*/ STDMETHOD(UpdateOverlay)(THIS_ LPRECT lpSrcRect, LPDIRECTDRAWSURFACE lpDDDestSurface, LPRECT lpDestRect, DWORD dwFlags, LPDDOVERLAYFX lpDDOverlayFx) PURE;
+/*88*/ STDMETHOD(UpdateOverlayDisplay)(THIS_ DWORD dwFlags) PURE;
+/*8c*/ STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE lpDDSReference) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDirectDrawSurface_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirectDrawSurface_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirectDrawSurface_Release(p) (p)->lpVtbl->Release(p)
+/*** IDirectDrawSurface methods ***/
+#define IDirectDrawSurface_AddAttachedSurface(p,a) (p)->lpVtbl->AddAttachedSurface(p,a)
+#define IDirectDrawSurface_AddOverlayDirtyRect(p,a) (p)->lpVtbl->AddOverlayDirtyRect(p,a)
+#define IDirectDrawSurface_Blt(p,a,b,c,d,e) (p)->lpVtbl->Blt(p,a,b,c,d,e)
+#define IDirectDrawSurface_BltBatch(p,a,b,c) (p)->lpVtbl->BltBatch(p,a,b,c)
+#define IDirectDrawSurface_BltFast(p,a,b,c,d,e) (p)->lpVtbl->BltFast(p,a,b,c,d,e)
+#define IDirectDrawSurface_DeleteAttachedSurface(p,a,b) (p)->lpVtbl->DeleteAttachedSurface(p,a,b)
+#define IDirectDrawSurface_EnumAttachedSurfaces(p,a,b) (p)->lpVtbl->EnumAttachedSurfaces(p,a,b)
+#define IDirectDrawSurface_EnumOverlayZOrders(p,a,b,c) (p)->lpVtbl->EnumOverlayZOrders(p,a,b,c)
+#define IDirectDrawSurface_Flip(p,a,b) (p)->lpVtbl->Flip(p,a,b)
+#define IDirectDrawSurface_GetAttachedSurface(p,a,b) (p)->lpVtbl->GetAttachedSurface(p,a,b)
+#define IDirectDrawSurface_GetBltStatus(p,a) (p)->lpVtbl->GetBltStatus(p,a)
+#define IDirectDrawSurface_GetCaps(p,a) (p)->lpVtbl->GetCaps(p,a)
+#define IDirectDrawSurface_GetClipper(p,a) (p)->lpVtbl->GetClipper(p,a)
+#define IDirectDrawSurface_GetColorKey(p,a,b) (p)->lpVtbl->GetColorKey(p,a,b)
+#define IDirectDrawSurface_GetDC(p,a) (p)->lpVtbl->GetDC(p,a)
+#define IDirectDrawSurface_GetFlipStatus(p,a) (p)->lpVtbl->GetFlipStatus(p,a)
+#define IDirectDrawSurface_GetOverlayPosition(p,a,b) (p)->lpVtbl->GetOverlayPosition(p,a,b)
+#define IDirectDrawSurface_GetPalette(p,a) (p)->lpVtbl->GetPalette(p,a)
+#define IDirectDrawSurface_GetPixelFormat(p,a) (p)->lpVtbl->GetPixelFormat(p,a)
+#define IDirectDrawSurface_GetSurfaceDesc(p,a) (p)->lpVtbl->GetSurfaceDesc(p,a)
+#define IDirectDrawSurface_Initialize(p,a,b) (p)->lpVtbl->Initialize(p,a,b)
+#define IDirectDrawSurface_IsLost(p) (p)->lpVtbl->IsLost(p)
+#define IDirectDrawSurface_Lock(p,a,b,c,d) (p)->lpVtbl->Lock(p,a,b,c,d)
+#define IDirectDrawSurface_ReleaseDC(p,a) (p)->lpVtbl->ReleaseDC(p,a)
+#define IDirectDrawSurface_Restore(p) (p)->lpVtbl->Restore(p)
+#define IDirectDrawSurface_SetClipper(p,a) (p)->lpVtbl->SetClipper(p,a)
+#define IDirectDrawSurface_SetColorKey(p,a,b) (p)->lpVtbl->SetColorKey(p,a,b)
+#define IDirectDrawSurface_SetOverlayPosition(p,a,b) (p)->lpVtbl->SetOverlayPosition(p,a,b)
+#define IDirectDrawSurface_SetPalette(p,a) (p)->lpVtbl->SetPalette(p,a)
+#define IDirectDrawSurface_Unlock(p,a) (p)->lpVtbl->Unlock(p,a)
+#define IDirectDrawSurface_UpdateOverlay(p,a,b,c,d,e) (p)->lpVtbl->UpdateOverlay(p,a,b,c,d,e)
+#define IDirectDrawSurface_UpdateOverlayDisplay(p,a) (p)->lpVtbl->UpdateOverlayDisplay(p,a)
+#define IDirectDrawSurface_UpdateOverlayZOrder(p,a,b) (p)->lpVtbl->UpdateOverlayZOrder(p,a,b)
+#else
+/*** IUnknown methods ***/
+#define IDirectDrawSurface_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
+#define IDirectDrawSurface_AddRef(p) (p)->AddRef()
+#define IDirectDrawSurface_Release(p) (p)->Release()
+/*** IDirectDrawSurface methods ***/
+#define IDirectDrawSurface_AddAttachedSurface(p,a) (p)->AddAttachedSurface(a)
+#define IDirectDrawSurface_AddOverlayDirtyRect(p,a) (p)->AddOverlayDirtyRect(a)
+#define IDirectDrawSurface_Blt(p,a,b,c,d,e) (p)->Blt(a,b,c,d,e)
+#define IDirectDrawSurface_BltBatch(p,a,b,c) (p)->BltBatch(a,b,c)
+#define IDirectDrawSurface_BltFast(p,a,b,c,d,e) (p)->BltFast(a,b,c,d,e)
+#define IDirectDrawSurface_DeleteAttachedSurface(p,a,b) (p)->DeleteAttachedSurface(a,b)
+#define IDirectDrawSurface_EnumAttachedSurfaces(p,a,b) (p)->EnumAttachedSurfaces(a,b)
+#define IDirectDrawSurface_EnumOverlayZOrders(p,a,b,c) (p)->EnumOverlayZOrders(a,b,c)
+#define IDirectDrawSurface_Flip(p,a,b) (p)->Flip(a,b)
+#define IDirectDrawSurface_GetAttachedSurface(p,a,b) (p)->GetAttachedSurface(a,b)
+#define IDirectDrawSurface_GetBltStatus(p,a) (p)->GetBltStatus(a)
+#define IDirectDrawSurface_GetCaps(p,a) (p)->GetCaps(a)
+#define IDirectDrawSurface_GetClipper(p,a) (p)->GetClipper(a)
+#define IDirectDrawSurface_GetColorKey(p,a,b) (p)->GetColorKey(a,b)
+#define IDirectDrawSurface_GetDC(p,a) (p)->GetDC(a)
+#define IDirectDrawSurface_GetFlipStatus(p,a) (p)->GetFlipStatus(a)
+#define IDirectDrawSurface_GetOverlayPosition(p,a,b) (p)->GetOverlayPosition(a,b)
+#define IDirectDrawSurface_GetPalette(p,a) (p)->GetPalette(a)
+#define IDirectDrawSurface_GetPixelFormat(p,a) (p)->GetPixelFormat(a)
+#define IDirectDrawSurface_GetSurfaceDesc(p,a) (p)->GetSurfaceDesc(a)
+#define IDirectDrawSurface_Initialize(p,a,b) (p)->Initialize(a,b)
+#define IDirectDrawSurface_IsLost(p) (p)->IsLost()
+#define IDirectDrawSurface_Lock(p,a,b,c,d) (p)->Lock(a,b,c,d)
+#define IDirectDrawSurface_ReleaseDC(p,a) (p)->ReleaseDC(a)
+#define IDirectDrawSurface_Restore(p) (p)->Restore()
+#define IDirectDrawSurface_SetClipper(p,a) (p)->SetClipper(a)
+#define IDirectDrawSurface_SetColorKey(p,a,b) (p)->SetColorKey(a,b)
+#define IDirectDrawSurface_SetOverlayPosition(p,a,b) (p)->SetOverlayPosition(a,b)
+#define IDirectDrawSurface_SetPalette(p,a) (p)->SetPalette(a)
+#define IDirectDrawSurface_Unlock(p,a) (p)->Unlock(a)
+#define IDirectDrawSurface_UpdateOverlay(p,a,b,c,d,e) (p)->UpdateOverlay(a,b,c,d,e)
+#define IDirectDrawSurface_UpdateOverlayDisplay(p,a) (p)->UpdateOverlayDisplay(a)
+#define IDirectDrawSurface_UpdateOverlayZOrder(p,a,b) (p)->UpdateOverlayZOrder(a,b)
+#endif
+
+
+/*****************************************************************************
+ * IDirectDrawSurface2 interface
+ */
+/* Cannot inherit from IDirectDrawSurface because the LPDIRECTDRAWSURFACE parameters
+ * have been converted to LPDIRECTDRAWSURFACE2.
+ */
+#define INTERFACE IDirectDrawSurface2
+DECLARE_INTERFACE_(IDirectDrawSurface2,IUnknown)
+{
+ /*** IUnknown methods ***/
+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** IDirectDrawSurface2 methods ***/
+ STDMETHOD(AddAttachedSurface)(THIS_ LPDIRECTDRAWSURFACE2 lpDDSAttachedSurface) PURE;
+ STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT lpRect) PURE;
+ STDMETHOD(Blt)(THIS_ LPRECT lpDestRect, LPDIRECTDRAWSURFACE2 lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwFlags, LPDDBLTFX lpDDBltFx) PURE;
+ STDMETHOD(BltBatch)(THIS_ LPDDBLTBATCH lpDDBltBatch, DWORD dwCount, DWORD dwFlags) PURE;
+ STDMETHOD(BltFast)(THIS_ DWORD dwX, DWORD dwY, LPDIRECTDRAWSURFACE2 lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwTrans) PURE;
+ STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE2 lpDDSAttachedSurface) PURE;
+ STDMETHOD(EnumAttachedSurfaces)(THIS_ LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpEnumSurfacesCallback) PURE;
+ STDMETHOD(EnumOverlayZOrders)(THIS_ DWORD dwFlags, LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpfnCallback) PURE;
+ STDMETHOD(Flip)(THIS_ LPDIRECTDRAWSURFACE2 lpDDSurfaceTargetOverride, DWORD dwFlags) PURE;
+ STDMETHOD(GetAttachedSurface)(THIS_ LPDDSCAPS lpDDSCaps, LPDIRECTDRAWSURFACE2 *lplpDDAttachedSurface) PURE;
+ STDMETHOD(GetBltStatus)(THIS_ DWORD dwFlags) PURE;
+ STDMETHOD(GetCaps)(THIS_ LPDDSCAPS lpDDSCaps) PURE;
+ STDMETHOD(GetClipper)(THIS_ LPDIRECTDRAWCLIPPER *lplpDDClipper) PURE;
+ STDMETHOD(GetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE;
+ STDMETHOD(GetDC)(THIS_ HDC *lphDC) PURE;
+ STDMETHOD(GetFlipStatus)(THIS_ DWORD dwFlags) PURE;
+ STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE;
+ STDMETHOD(GetPalette)(THIS_ LPDIRECTDRAWPALETTE *lplpDDPalette) PURE;
+ STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE;
+ STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE;
+ STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW lpDD, LPDDSURFACEDESC lpDDSurfaceDesc) PURE;
+ STDMETHOD(IsLost)(THIS) PURE;
+ STDMETHOD(Lock)(THIS_ LPRECT lpDestRect, LPDDSURFACEDESC lpDDSurfaceDesc, DWORD dwFlags, HANDLE hEvent) PURE;
+ STDMETHOD(ReleaseDC)(THIS_ HDC hDC) PURE;
+ STDMETHOD(Restore)(THIS) PURE;
+ STDMETHOD(SetClipper)(THIS_ LPDIRECTDRAWCLIPPER lpDDClipper) PURE;
+ STDMETHOD(SetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE;
+ STDMETHOD(SetOverlayPosition)(THIS_ LONG lX, LONG lY) PURE;
+ STDMETHOD(SetPalette)(THIS_ LPDIRECTDRAWPALETTE lpDDPalette) PURE;
+ STDMETHOD(Unlock)(THIS_ LPVOID lpSurfaceData) PURE;
+ STDMETHOD(UpdateOverlay)(THIS_ LPRECT lpSrcRect, LPDIRECTDRAWSURFACE2 lpDDDestSurface, LPRECT lpDestRect, DWORD dwFlags, LPDDOVERLAYFX lpDDOverlayFx) PURE;
+ STDMETHOD(UpdateOverlayDisplay)(THIS_ DWORD dwFlags) PURE;
+ STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE2 lpDDSReference) PURE;
+ /* added in v2 */
+ STDMETHOD(GetDDInterface)(THIS_ LPVOID *lplpDD) PURE;
+ STDMETHOD(PageLock)(THIS_ DWORD dwFlags) PURE;
+ STDMETHOD(PageUnlock)(THIS_ DWORD dwFlags) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDirectDrawSurface2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirectDrawSurface2_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirectDrawSurface2_Release(p) (p)->lpVtbl->Release(p)
+/*** IDirectDrawSurface methods (almost) ***/
+#define IDirectDrawSurface2_AddAttachedSurface(p,a) (p)->lpVtbl->AddAttachedSurface(p,a)
+#define IDirectDrawSurface2_AddOverlayDirtyRect(p,a) (p)->lpVtbl->AddOverlayDirtyRect(p,a)
+#define IDirectDrawSurface2_Blt(p,a,b,c,d,e) (p)->lpVtbl->Blt(p,a,b,c,d,e)
+#define IDirectDrawSurface2_BltBatch(p,a,b,c) (p)->lpVtbl->BltBatch(p,a,b,c)
+#define IDirectDrawSurface2_BltFast(p,a,b,c,d,e) (p)->lpVtbl->BltFast(p,a,b,c,d,e)
+#define IDirectDrawSurface2_DeleteAttachedSurface(p,a,b) (p)->lpVtbl->DeleteAttachedSurface(p,a,b)
+#define IDirectDrawSurface2_EnumAttachedSurfaces(p,a,b) (p)->lpVtbl->EnumAttachedSurfaces(p,a,b)
+#define IDirectDrawSurface2_EnumOverlayZOrders(p,a,b,c) (p)->lpVtbl->EnumOverlayZOrders(p,a,b,c)
+#define IDirectDrawSurface2_Flip(p,a,b) (p)->lpVtbl->Flip(p,a,b)
+#define IDirectDrawSurface2_GetAttachedSurface(p,a,b) (p)->lpVtbl->GetAttachedSurface(p,a,b)
+#define IDirectDrawSurface2_GetBltStatus(p,a) (p)->lpVtbl->GetBltStatus(p,a)
+#define IDirectDrawSurface2_GetCaps(p,a) (p)->lpVtbl->GetCaps(p,a)
+#define IDirectDrawSurface2_GetClipper(p,a) (p)->lpVtbl->GetClipper(p,a)
+#define IDirectDrawSurface2_GetColorKey(p,a,b) (p)->lpVtbl->GetColorKey(p,a,b)
+#define IDirectDrawSurface2_GetDC(p,a) (p)->lpVtbl->GetDC(p,a)
+#define IDirectDrawSurface2_GetFlipStatus(p,a) (p)->lpVtbl->GetFlipStatus(p,a)
+#define IDirectDrawSurface2_GetOverlayPosition(p,a,b) (p)->lpVtbl->GetOverlayPosition(p,a,b)
+#define IDirectDrawSurface2_GetPalette(p,a) (p)->lpVtbl->GetPalette(p,a)
+#define IDirectDrawSurface2_GetPixelFormat(p,a) (p)->lpVtbl->GetPixelFormat(p,a)
+#define IDirectDrawSurface2_GetSurfaceDesc(p,a) (p)->lpVtbl->GetSurfaceDesc(p,a)
+#define IDirectDrawSurface2_Initialize(p,a,b) (p)->lpVtbl->Initialize(p,a,b)
+#define IDirectDrawSurface2_IsLost(p) (p)->lpVtbl->IsLost(p)
+#define IDirectDrawSurface2_Lock(p,a,b,c,d) (p)->lpVtbl->Lock(p,a,b,c,d)
+#define IDirectDrawSurface2_ReleaseDC(p,a) (p)->lpVtbl->ReleaseDC(p,a)
+#define IDirectDrawSurface2_Restore(p) (p)->lpVtbl->Restore(p)
+#define IDirectDrawSurface2_SetClipper(p,a) (p)->lpVtbl->SetClipper(p,a)
+#define IDirectDrawSurface2_SetColorKey(p,a,b) (p)->lpVtbl->SetColorKey(p,a,b)
+#define IDirectDrawSurface2_SetOverlayPosition(p,a,b) (p)->lpVtbl->SetOverlayPosition(p,a,b)
+#define IDirectDrawSurface2_SetPalette(p,a) (p)->lpVtbl->SetPalette(p,a)
+#define IDirectDrawSurface2_Unlock(p,a) (p)->lpVtbl->Unlock(p,a)
+#define IDirectDrawSurface2_UpdateOverlay(p,a,b,c,d,e) (p)->lpVtbl->UpdateOverlay(p,a,b,c,d,e)
+#define IDirectDrawSurface2_UpdateOverlayDisplay(p,a) (p)->lpVtbl->UpdateOverlayDisplay(p,a)
+#define IDirectDrawSurface2_UpdateOverlayZOrder(p,a,b) (p)->lpVtbl->UpdateOverlayZOrder(p,a,b)
+/*** IDirectDrawSurface2 methods ***/
+#define IDirectDrawSurface2_GetDDInterface(p,a) (p)->lpVtbl->GetDDInterface(p,a)
+#define IDirectDrawSurface2_PageLock(p,a) (p)->lpVtbl->PageLock(p,a)
+#define IDirectDrawSurface2_PageUnlock(p,a) (p)->lpVtbl->PageUnlock(p,a)
+#else
+/*** IUnknown methods ***/
+#define IDirectDrawSurface2_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
+#define IDirectDrawSurface2_AddRef(p) (p)->AddRef()
+#define IDirectDrawSurface2_Release(p) (p)->Release()
+/*** IDirectDrawSurface methods (almost) ***/
+#define IDirectDrawSurface2_AddAttachedSurface(p,a) (p)->AddAttachedSurface(a)
+#define IDirectDrawSurface2_AddOverlayDirtyRect(p,a) (p)->AddOverlayDirtyRect(a)
+#define IDirectDrawSurface2_Blt(p,a,b,c,d,e) (p)->Blt(a,b,c,d,e)
+#define IDirectDrawSurface2_BltBatch(p,a,b,c) (p)->BltBatch(a,b,c)
+#define IDirectDrawSurface2_BltFast(p,a,b,c,d,e) (p)->BltFast(a,b,c,d,e)
+#define IDirectDrawSurface2_DeleteAttachedSurface(p,a,b) (p)->DeleteAttachedSurface(a,b)
+#define IDirectDrawSurface2_EnumAttachedSurfaces(p,a,b) (p)->EnumAttachedSurfaces(a,b)
+#define IDirectDrawSurface2_EnumOverlayZOrders(p,a,b,c) (p)->EnumOverlayZOrders(a,b,c)
+#define IDirectDrawSurface2_Flip(p,a,b) (p)->Flip(a,b)
+#define IDirectDrawSurface2_GetAttachedSurface(p,a,b) (p)->GetAttachedSurface(a,b)
+#define IDirectDrawSurface2_GetBltStatus(p,a) (p)->GetBltStatus(a)
+#define IDirectDrawSurface2_GetCaps(p,a) (p)->GetCaps(a)
+#define IDirectDrawSurface2_GetClipper(p,a) (p)->GetClipper(a)
+#define IDirectDrawSurface2_GetColorKey(p,a,b) (p)->GetColorKey(a,b)
+#define IDirectDrawSurface2_GetDC(p,a) (p)->GetDC(a)
+#define IDirectDrawSurface2_GetFlipStatus(p,a) (p)->GetFlipStatus(a)
+#define IDirectDrawSurface2_GetOverlayPosition(p,a,b) (p)->GetOverlayPosition(a,b)
+#define IDirectDrawSurface2_GetPalette(p,a) (p)->GetPalette(a)
+#define IDirectDrawSurface2_GetPixelFormat(p,a) (p)->GetPixelFormat(a)
+#define IDirectDrawSurface2_GetSurfaceDesc(p,a) (p)->GetSurfaceDesc(a)
+#define IDirectDrawSurface2_Initialize(p,a,b) (p)->Initialize(a,b)
+#define IDirectDrawSurface2_IsLost(p) (p)->IsLost()
+#define IDirectDrawSurface2_Lock(p,a,b,c,d) (p)->Lock(a,b,c,d)
+#define IDirectDrawSurface2_ReleaseDC(p,a) (p)->ReleaseDC(a)
+#define IDirectDrawSurface2_Restore(p) (p)->Restore()
+#define IDirectDrawSurface2_SetClipper(p,a) (p)->SetClipper(a)
+#define IDirectDrawSurface2_SetColorKey(p,a,b) (p)->SetColorKey(a,b)
+#define IDirectDrawSurface2_SetOverlayPosition(p,a,b) (p)->SetOverlayPosition(a,b)
+#define IDirectDrawSurface2_SetPalette(p,a) (p)->SetPalette(a)
+#define IDirectDrawSurface2_Unlock(p,a) (p)->Unlock(a)
+#define IDirectDrawSurface2_UpdateOverlay(p,a,b,c,d,e) (p)->UpdateOverlay(a,b,c,d,e)
+#define IDirectDrawSurface2_UpdateOverlayDisplay(p,a) (p)->UpdateOverlayDisplay(a)
+#define IDirectDrawSurface2_UpdateOverlayZOrder(p,a,b) (p)->UpdateOverlayZOrder(a,b)
+/*** IDirectDrawSurface2 methods ***/
+#define IDirectDrawSurface2_GetDDInterface(p,a) (p)->GetDDInterface(a)
+#define IDirectDrawSurface2_PageLock(p,a) (p)->PageLock(a)
+#define IDirectDrawSurface2_PageUnlock(p,a) (p)->PageUnlock(a)
+#endif
+
+
+/*****************************************************************************
+ * IDirectDrawSurface3 interface
+ */
+/* Cannot inherit from IDirectDrawSurface2 because the LPDIRECTDRAWSURFACE2 parameters
+ * have been converted to LPDIRECTDRAWSURFACE3.
+ */
+#define INTERFACE IDirectDrawSurface3
+DECLARE_INTERFACE_(IDirectDrawSurface3,IUnknown)
+{
+ /*** IUnknown methods ***/
+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** IDirectDrawSurface3 methods ***/
+ STDMETHOD(AddAttachedSurface)(THIS_ LPDIRECTDRAWSURFACE3 lpDDSAttachedSurface) PURE;
+ STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT lpRect) PURE;
+ STDMETHOD(Blt)(THIS_ LPRECT lpDestRect, LPDIRECTDRAWSURFACE3 lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwFlags, LPDDBLTFX lpDDBltFx) PURE;
+ STDMETHOD(BltBatch)(THIS_ LPDDBLTBATCH lpDDBltBatch, DWORD dwCount, DWORD dwFlags) PURE;
+ STDMETHOD(BltFast)(THIS_ DWORD dwX, DWORD dwY, LPDIRECTDRAWSURFACE3 lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwTrans) PURE;
+ STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE3 lpDDSAttachedSurface) PURE;
+ STDMETHOD(EnumAttachedSurfaces)(THIS_ LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpEnumSurfacesCallback) PURE;
+ STDMETHOD(EnumOverlayZOrders)(THIS_ DWORD dwFlags, LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpfnCallback) PURE;
+ STDMETHOD(Flip)(THIS_ LPDIRECTDRAWSURFACE3 lpDDSurfaceTargetOverride, DWORD dwFlags) PURE;
+ STDMETHOD(GetAttachedSurface)(THIS_ LPDDSCAPS lpDDSCaps, LPDIRECTDRAWSURFACE3 *lplpDDAttachedSurface) PURE;
+ STDMETHOD(GetBltStatus)(THIS_ DWORD dwFlags) PURE;
+ STDMETHOD(GetCaps)(THIS_ LPDDSCAPS lpDDSCaps) PURE;
+ STDMETHOD(GetClipper)(THIS_ LPDIRECTDRAWCLIPPER *lplpDDClipper) PURE;
+ STDMETHOD(GetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE;
+ STDMETHOD(GetDC)(THIS_ HDC *lphDC) PURE;
+ STDMETHOD(GetFlipStatus)(THIS_ DWORD dwFlags) PURE;
+ STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE;
+ STDMETHOD(GetPalette)(THIS_ LPDIRECTDRAWPALETTE *lplpDDPalette) PURE;
+ STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE;
+ STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE;
+ STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW lpDD, LPDDSURFACEDESC lpDDSurfaceDesc) PURE;
+ STDMETHOD(IsLost)(THIS) PURE;
+ STDMETHOD(Lock)(THIS_ LPRECT lpDestRect, LPDDSURFACEDESC lpDDSurfaceDesc, DWORD dwFlags, HANDLE hEvent) PURE;
+ STDMETHOD(ReleaseDC)(THIS_ HDC hDC) PURE;
+ STDMETHOD(Restore)(THIS) PURE;
+ STDMETHOD(SetClipper)(THIS_ LPDIRECTDRAWCLIPPER lpDDClipper) PURE;
+ STDMETHOD(SetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE;
+ STDMETHOD(SetOverlayPosition)(THIS_ LONG lX, LONG lY) PURE;
+ STDMETHOD(SetPalette)(THIS_ LPDIRECTDRAWPALETTE lpDDPalette) PURE;
+ STDMETHOD(Unlock)(THIS_ LPVOID lpSurfaceData) PURE;
+ STDMETHOD(UpdateOverlay)(THIS_ LPRECT lpSrcRect, LPDIRECTDRAWSURFACE3 lpDDDestSurface, LPRECT lpDestRect, DWORD dwFlags, LPDDOVERLAYFX lpDDOverlayFx) PURE;
+ STDMETHOD(UpdateOverlayDisplay)(THIS_ DWORD dwFlags) PURE;
+ STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE3 lpDDSReference) PURE;
+ /* added in v2 */
+ STDMETHOD(GetDDInterface)(THIS_ LPVOID *lplpDD) PURE;
+ STDMETHOD(PageLock)(THIS_ DWORD dwFlags) PURE;
+ STDMETHOD(PageUnlock)(THIS_ DWORD dwFlags) PURE;
+ /* added in v3 */
+ STDMETHOD(SetSurfaceDesc)(THIS_ LPDDSURFACEDESC lpDDSD, DWORD dwFlags) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDirectDrawSurface3_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirectDrawSurface3_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirectDrawSurface3_Release(p) (p)->lpVtbl->Release(p)
+/*** IDirectDrawSurface methods (almost) ***/
+#define IDirectDrawSurface3_AddAttachedSurface(p,a) (p)->lpVtbl->AddAttachedSurface(p,a)
+#define IDirectDrawSurface3_AddOverlayDirtyRect(p,a) (p)->lpVtbl->AddOverlayDirtyRect(p,a)
+#define IDirectDrawSurface3_Blt(p,a,b,c,d,e) (p)->lpVtbl->Blt(p,a,b,c,d,e)
+#define IDirectDrawSurface3_BltBatch(p,a,b,c) (p)->lpVtbl->BltBatch(p,a,b,c)
+#define IDirectDrawSurface3_BltFast(p,a,b,c,d,e) (p)->lpVtbl->BltFast(p,a,b,c,d,e)
+#define IDirectDrawSurface3_DeleteAttachedSurface(p,a,b) (p)->lpVtbl->DeleteAttachedSurface(p,a,b)
+#define IDirectDrawSurface3_EnumAttachedSurfaces(p,a,b) (p)->lpVtbl->EnumAttachedSurfaces(p,a,b)
+#define IDirectDrawSurface3_EnumOverlayZOrders(p,a,b,c) (p)->lpVtbl->EnumOverlayZOrders(p,a,b,c)
+#define IDirectDrawSurface3_Flip(p,a,b) (p)->lpVtbl->Flip(p,a,b)
+#define IDirectDrawSurface3_GetAttachedSurface(p,a,b) (p)->lpVtbl->GetAttachedSurface(p,a,b)
+#define IDirectDrawSurface3_GetBltStatus(p,a) (p)->lpVtbl->GetBltStatus(p,a)
+#define IDirectDrawSurface3_GetCaps(p,a) (p)->lpVtbl->GetCaps(p,a)
+#define IDirectDrawSurface3_GetClipper(p,a) (p)->lpVtbl->GetClipper(p,a)
+#define IDirectDrawSurface3_GetColorKey(p,a,b) (p)->lpVtbl->GetColorKey(p,a,b)
+#define IDirectDrawSurface3_GetDC(p,a) (p)->lpVtbl->GetDC(p,a)
+#define IDirectDrawSurface3_GetFlipStatus(p,a) (p)->lpVtbl->GetFlipStatus(p,a)
+#define IDirectDrawSurface3_GetOverlayPosition(p,a,b) (p)->lpVtbl->GetOverlayPosition(p,a,b)
+#define IDirectDrawSurface3_GetPalette(p,a) (p)->lpVtbl->GetPalette(p,a)
+#define IDirectDrawSurface3_GetPixelFormat(p,a) (p)->lpVtbl->GetPixelFormat(p,a)
+#define IDirectDrawSurface3_GetSurfaceDesc(p,a) (p)->lpVtbl->GetSurfaceDesc(p,a)
+#define IDirectDrawSurface3_Initialize(p,a,b) (p)->lpVtbl->Initialize(p,a,b)
+#define IDirectDrawSurface3_IsLost(p) (p)->lpVtbl->IsLost(p)
+#define IDirectDrawSurface3_Lock(p,a,b,c,d) (p)->lpVtbl->Lock(p,a,b,c,d)
+#define IDirectDrawSurface3_ReleaseDC(p,a) (p)->lpVtbl->ReleaseDC(p,a)
+#define IDirectDrawSurface3_Restore(p) (p)->lpVtbl->Restore(p)
+#define IDirectDrawSurface3_SetClipper(p,a) (p)->lpVtbl->SetClipper(p,a)
+#define IDirectDrawSurface3_SetColorKey(p,a,b) (p)->lpVtbl->SetColorKey(p,a,b)
+#define IDirectDrawSurface3_SetOverlayPosition(p,a,b) (p)->lpVtbl->SetOverlayPosition(p,a,b)
+#define IDirectDrawSurface3_SetPalette(p,a) (p)->lpVtbl->SetPalette(p,a)
+#define IDirectDrawSurface3_Unlock(p,a) (p)->lpVtbl->Unlock(p,a)
+#define IDirectDrawSurface3_UpdateOverlay(p,a,b,c,d,e) (p)->lpVtbl->UpdateOverlay(p,a,b,c,d,e)
+#define IDirectDrawSurface3_UpdateOverlayDisplay(p,a) (p)->lpVtbl->UpdateOverlayDisplay(p,a)
+#define IDirectDrawSurface3_UpdateOverlayZOrder(p,a,b) (p)->lpVtbl->UpdateOverlayZOrder(p,a,b)
+/*** IDirectDrawSurface2 methods ***/
+#define IDirectDrawSurface3_GetDDInterface(p,a) (p)->lpVtbl->GetDDInterface(p,a)
+#define IDirectDrawSurface3_PageLock(p,a) (p)->lpVtbl->PageLock(p,a)
+#define IDirectDrawSurface3_PageUnlock(p,a) (p)->lpVtbl->PageUnlock(p,a)
+/*** IDirectDrawSurface3 methods ***/
+#define IDirectDrawSurface3_SetSurfaceDesc(p,a,b) (p)->lpVtbl->SetSurfaceDesc(p,a,b)
+#else
+/*** IUnknown methods ***/
+#define IDirectDrawSurface3_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
+#define IDirectDrawSurface3_AddRef(p) (p)->AddRef()
+#define IDirectDrawSurface3_Release(p) (p)->Release()
+/*** IDirectDrawSurface methods (almost) ***/
+#define IDirectDrawSurface3_AddAttachedSurface(p,a) (p)->AddAttachedSurface(a)
+#define IDirectDrawSurface3_AddOverlayDirtyRect(p,a) (p)->AddOverlayDirtyRect(a)
+#define IDirectDrawSurface3_Blt(p,a,b,c,d,e) (p)->Blt(a,b,c,d,e)
+#define IDirectDrawSurface3_BltBatch(p,a,b,c) (p)->BltBatch(a,b,c)
+#define IDirectDrawSurface3_BltFast(p,a,b,c,d,e) (p)->BltFast(a,b,c,d,e)
+#define IDirectDrawSurface3_DeleteAttachedSurface(p,a,b) (p)->DeleteAttachedSurface(a,b)
+#define IDirectDrawSurface3_EnumAttachedSurfaces(p,a,b) (p)->EnumAttachedSurfaces(a,b)
+#define IDirectDrawSurface3_EnumOverlayZOrders(p,a,b,c) (p)->EnumOverlayZOrders(a,b,c)
+#define IDirectDrawSurface3_Flip(p,a,b) (p)->Flip(a,b)
+#define IDirectDrawSurface3_GetAttachedSurface(p,a,b) (p)->GetAttachedSurface(a,b)
+#define IDirectDrawSurface3_GetBltStatus(p,a) (p)->GetBltStatus(a)
+#define IDirectDrawSurface3_GetCaps(p,a) (p)->GetCaps(a)
+#define IDirectDrawSurface3_GetClipper(p,a) (p)->GetClipper(a)
+#define IDirectDrawSurface3_GetColorKey(p,a,b) (p)->GetColorKey(a,b)
+#define IDirectDrawSurface3_GetDC(p,a) (p)->GetDC(a)
+#define IDirectDrawSurface3_GetFlipStatus(p,a) (p)->GetFlipStatus(a)
+#define IDirectDrawSurface3_GetOverlayPosition(p,a,b) (p)->GetOverlayPosition(a,b)
+#define IDirectDrawSurface3_GetPalette(p,a) (p)->GetPalette(a)
+#define IDirectDrawSurface3_GetPixelFormat(p,a) (p)->GetPixelFormat(a)
+#define IDirectDrawSurface3_GetSurfaceDesc(p,a) (p)->GetSurfaceDesc(a)
+#define IDirectDrawSurface3_Initialize(p,a,b) (p)->Initialize(a,b)
+#define IDirectDrawSurface3_IsLost(p) (p)->IsLost()
+#define IDirectDrawSurface3_Lock(p,a,b,c,d) (p)->Lock(a,b,c,d)
+#define IDirectDrawSurface3_ReleaseDC(p,a) (p)->ReleaseDC(a)
+#define IDirectDrawSurface3_Restore(p) (p)->Restore()
+#define IDirectDrawSurface3_SetClipper(p,a) (p)->SetClipper(a)
+#define IDirectDrawSurface3_SetColorKey(p,a,b) (p)->SetColorKey(a,b)
+#define IDirectDrawSurface3_SetOverlayPosition(p,a,b) (p)->SetOverlayPosition(a,b)
+#define IDirectDrawSurface3_SetPalette(p,a) (p)->SetPalette(a)
+#define IDirectDrawSurface3_Unlock(p,a) (p)->Unlock(a)
+#define IDirectDrawSurface3_UpdateOverlay(p,a,b,c,d,e) (p)->UpdateOverlay(a,b,c,d,e)
+#define IDirectDrawSurface3_UpdateOverlayDisplay(p,a) (p)->UpdateOverlayDisplay(a)
+#define IDirectDrawSurface3_UpdateOverlayZOrder(p,a,b) (p)->UpdateOverlayZOrder(a,b)
+/*** IDirectDrawSurface2 methods ***/
+#define IDirectDrawSurface3_GetDDInterface(p,a) (p)->GetDDInterface(a)
+#define IDirectDrawSurface3_PageLock(p,a) (p)->PageLock(a)
+#define IDirectDrawSurface3_PageUnlock(p,a) (p)->PageUnlock(a)
+/*** IDirectDrawSurface3 methods ***/
+#define IDirectDrawSurface3_SetSurfaceDesc(p,a,b) (p)->SetSurfaceDesc(a,b)
+#endif
+
+
+/*****************************************************************************
+ * IDirectDrawSurface4 interface
+ */
+/* Cannot inherit from IDirectDrawSurface2 because DDSCAPS changed to DDSCAPS2.
+ */
+#define INTERFACE IDirectDrawSurface4
+DECLARE_INTERFACE_(IDirectDrawSurface4,IUnknown)
+{
+ /*** IUnknown methods ***/
+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** IDirectDrawSurface4 methods ***/
+ STDMETHOD(AddAttachedSurface)(THIS_ LPDIRECTDRAWSURFACE4 lpDDSAttachedSurface) PURE;
+ STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT lpRect) PURE;
+ STDMETHOD(Blt)(THIS_ LPRECT lpDestRect, LPDIRECTDRAWSURFACE4 lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwFlags, LPDDBLTFX lpDDBltFx) PURE;
+ STDMETHOD(BltBatch)(THIS_ LPDDBLTBATCH lpDDBltBatch, DWORD dwCount, DWORD dwFlags) PURE;
+ STDMETHOD(BltFast)(THIS_ DWORD dwX, DWORD dwY, LPDIRECTDRAWSURFACE4 lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwTrans) PURE;
+ STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE4 lpDDSAttachedSurface) PURE;
+ STDMETHOD(EnumAttachedSurfaces)(THIS_ LPVOID lpContext, LPDDENUMSURFACESCALLBACK2 lpEnumSurfacesCallback) PURE;
+ STDMETHOD(EnumOverlayZOrders)(THIS_ DWORD dwFlags, LPVOID lpContext, LPDDENUMSURFACESCALLBACK2 lpfnCallback) PURE;
+ STDMETHOD(Flip)(THIS_ LPDIRECTDRAWSURFACE4 lpDDSurfaceTargetOverride, DWORD dwFlags) PURE;
+ STDMETHOD(GetAttachedSurface)(THIS_ LPDDSCAPS2 lpDDSCaps, LPDIRECTDRAWSURFACE4 *lplpDDAttachedSurface) PURE;
+ STDMETHOD(GetBltStatus)(THIS_ DWORD dwFlags) PURE;
+ STDMETHOD(GetCaps)(THIS_ LPDDSCAPS2 lpDDSCaps) PURE;
+ STDMETHOD(GetClipper)(THIS_ LPDIRECTDRAWCLIPPER *lplpDDClipper) PURE;
+ STDMETHOD(GetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE;
+ STDMETHOD(GetDC)(THIS_ HDC *lphDC) PURE;
+ STDMETHOD(GetFlipStatus)(THIS_ DWORD dwFlags) PURE;
+ STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE;
+ STDMETHOD(GetPalette)(THIS_ LPDIRECTDRAWPALETTE *lplpDDPalette) PURE;
+ STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE;
+ STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE;
+ STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW lpDD, LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE;
+ STDMETHOD(IsLost)(THIS) PURE;
+ STDMETHOD(Lock)(THIS_ LPRECT lpDestRect, LPDDSURFACEDESC2 lpDDSurfaceDesc, DWORD dwFlags, HANDLE hEvent) PURE;
+ STDMETHOD(ReleaseDC)(THIS_ HDC hDC) PURE;
+ STDMETHOD(Restore)(THIS) PURE;
+ STDMETHOD(SetClipper)(THIS_ LPDIRECTDRAWCLIPPER lpDDClipper) PURE;
+ STDMETHOD(SetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE;
+ STDMETHOD(SetOverlayPosition)(THIS_ LONG lX, LONG lY) PURE;
+ STDMETHOD(SetPalette)(THIS_ LPDIRECTDRAWPALETTE lpDDPalette) PURE;
+ STDMETHOD(Unlock)(THIS_ LPRECT lpSurfaceData) PURE;
+ STDMETHOD(UpdateOverlay)(THIS_ LPRECT lpSrcRect, LPDIRECTDRAWSURFACE4 lpDDDestSurface, LPRECT lpDestRect, DWORD dwFlags, LPDDOVERLAYFX lpDDOverlayFx) PURE;
+ STDMETHOD(UpdateOverlayDisplay)(THIS_ DWORD dwFlags) PURE;
+ STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE4 lpDDSReference) PURE;
+ /* added in v2 */
+ STDMETHOD(GetDDInterface)(THIS_ LPVOID *lplpDD) PURE;
+ STDMETHOD(PageLock)(THIS_ DWORD dwFlags) PURE;
+ STDMETHOD(PageUnlock)(THIS_ DWORD dwFlags) PURE;
+ /* added in v3 */
+ STDMETHOD(SetSurfaceDesc)(THIS_ LPDDSURFACEDESC2 lpDDSD, DWORD dwFlags) PURE;
+ /* added in v4 */
+ STDMETHOD(SetPrivateData)(THIS_ REFGUID tag, LPVOID pData, DWORD cbSize, DWORD dwFlags) PURE;
+ STDMETHOD(GetPrivateData)(THIS_ REFGUID tag, LPVOID pBuffer, LPDWORD pcbBufferSize) PURE;
+ STDMETHOD(FreePrivateData)(THIS_ REFGUID tag) PURE;
+ STDMETHOD(GetUniquenessValue)(THIS_ LPDWORD pValue) PURE;
+ STDMETHOD(ChangeUniquenessValue)(THIS) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDirectDrawSurface4_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirectDrawSurface4_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirectDrawSurface4_Release(p) (p)->lpVtbl->Release(p)
+/*** IDirectDrawSurface (almost) methods ***/
+#define IDirectDrawSurface4_AddAttachedSurface(p,a) (p)->lpVtbl->AddAttachedSurface(p,a)
+#define IDirectDrawSurface4_AddOverlayDirtyRect(p,a) (p)->lpVtbl->AddOverlayDirtyRect(p,a)
+#define IDirectDrawSurface4_Blt(p,a,b,c,d,e) (p)->lpVtbl->Blt(p,a,b,c,d,e)
+#define IDirectDrawSurface4_BltBatch(p,a,b,c) (p)->lpVtbl->BltBatch(p,a,b,c)
+#define IDirectDrawSurface4_BltFast(p,a,b,c,d,e) (p)->lpVtbl->BltFast(p,a,b,c,d,e)
+#define IDirectDrawSurface4_DeleteAttachedSurface(p,a,b) (p)->lpVtbl->DeleteAttachedSurface(p,a,b)
+#define IDirectDrawSurface4_EnumAttachedSurfaces(p,a,b) (p)->lpVtbl->EnumAttachedSurfaces(p,a,b)
+#define IDirectDrawSurface4_EnumOverlayZOrders(p,a,b,c) (p)->lpVtbl->EnumOverlayZOrders(p,a,b,c)
+#define IDirectDrawSurface4_Flip(p,a,b) (p)->lpVtbl->Flip(p,a,b)
+#define IDirectDrawSurface4_GetAttachedSurface(p,a,b) (p)->lpVtbl->GetAttachedSurface(p,a,b)
+#define IDirectDrawSurface4_GetBltStatus(p,a) (p)->lpVtbl->GetBltStatus(p,a)
+#define IDirectDrawSurface4_GetCaps(p,a) (p)->lpVtbl->GetCaps(p,a)
+#define IDirectDrawSurface4_GetClipper(p,a) (p)->lpVtbl->GetClipper(p,a)
+#define IDirectDrawSurface4_GetColorKey(p,a,b) (p)->lpVtbl->GetColorKey(p,a,b)
+#define IDirectDrawSurface4_GetDC(p,a) (p)->lpVtbl->GetDC(p,a)
+#define IDirectDrawSurface4_GetFlipStatus(p,a) (p)->lpVtbl->GetFlipStatus(p,a)
+#define IDirectDrawSurface4_GetOverlayPosition(p,a,b) (p)->lpVtbl->GetOverlayPosition(p,a,b)
+#define IDirectDrawSurface4_GetPalette(p,a) (p)->lpVtbl->GetPalette(p,a)
+#define IDirectDrawSurface4_GetPixelFormat(p,a) (p)->lpVtbl->GetPixelFormat(p,a)
+#define IDirectDrawSurface4_GetSurfaceDesc(p,a) (p)->lpVtbl->GetSurfaceDesc(p,a)
+#define IDirectDrawSurface4_Initialize(p,a,b) (p)->lpVtbl->Initialize(p,a,b)
+#define IDirectDrawSurface4_IsLost(p) (p)->lpVtbl->IsLost(p)
+#define IDirectDrawSurface4_Lock(p,a,b,c,d) (p)->lpVtbl->Lock(p,a,b,c,d)
+#define IDirectDrawSurface4_ReleaseDC(p,a) (p)->lpVtbl->ReleaseDC(p,a)
+#define IDirectDrawSurface4_Restore(p) (p)->lpVtbl->Restore(p)
+#define IDirectDrawSurface4_SetClipper(p,a) (p)->lpVtbl->SetClipper(p,a)
+#define IDirectDrawSurface4_SetColorKey(p,a,b) (p)->lpVtbl->SetColorKey(p,a,b)
+#define IDirectDrawSurface4_SetOverlayPosition(p,a,b) (p)->lpVtbl->SetOverlayPosition(p,a,b)
+#define IDirectDrawSurface4_SetPalette(p,a) (p)->lpVtbl->SetPalette(p,a)
+#define IDirectDrawSurface4_Unlock(p,a) (p)->lpVtbl->Unlock(p,a)
+#define IDirectDrawSurface4_UpdateOverlay(p,a,b,c,d,e) (p)->lpVtbl->UpdateOverlay(p,a,b,c,d,e)
+#define IDirectDrawSurface4_UpdateOverlayDisplay(p,a) (p)->lpVtbl->UpdateOverlayDisplay(p,a)
+#define IDirectDrawSurface4_UpdateOverlayZOrder(p,a,b) (p)->lpVtbl->UpdateOverlayZOrder(p,a,b)
+/*** IDirectDrawSurface2 methods ***/
+#define IDirectDrawSurface4_GetDDInterface(p,a) (p)->lpVtbl->GetDDInterface(p,a)
+#define IDirectDrawSurface4_PageLock(p,a) (p)->lpVtbl->PageLock(p,a)
+#define IDirectDrawSurface4_PageUnlock(p,a) (p)->lpVtbl->PageUnlock(p,a)
+/*** IDirectDrawSurface3 methods ***/
+#define IDirectDrawSurface4_SetSurfaceDesc(p,a,b) (p)->lpVtbl->SetSurfaceDesc(p,a,b)
+/*** IDirectDrawSurface4 methods ***/
+#define IDirectDrawSurface4_SetPrivateData(p,a,b,c,d) (p)->lpVtbl->SetPrivateData(p,a,b,c,d)
+#define IDirectDrawSurface4_GetPrivateData(p,a,b,c) (p)->lpVtbl->GetPrivateData(p,a,b,c)
+#define IDirectDrawSurface4_FreePrivateData(p,a) (p)->lpVtbl->FreePrivateData(p,a)
+#define IDirectDrawSurface4_GetUniquenessValue(p,a) (p)->lpVtbl->GetUniquenessValue(p,a)
+#define IDirectDrawSurface4_ChangeUniquenessValue(p) (p)->lpVtbl->ChangeUniquenessValue(p)
+#else
+/*** IUnknown methods ***/
+#define IDirectDrawSurface4_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
+#define IDirectDrawSurface4_AddRef(p) (p)->AddRef()
+#define IDirectDrawSurface4_Release(p) (p)->Release()
+/*** IDirectDrawSurface (almost) methods ***/
+#define IDirectDrawSurface4_AddAttachedSurface(p,a) (p)->AddAttachedSurface(a)
+#define IDirectDrawSurface4_AddOverlayDirtyRect(p,a) (p)->AddOverlayDirtyRect(a)
+#define IDirectDrawSurface4_Blt(p,a,b,c,d,e) (p)->Blt(a,b,c,d,e)
+#define IDirectDrawSurface4_BltBatch(p,a,b,c) (p)->BltBatch(a,b,c)
+#define IDirectDrawSurface4_BltFast(p,a,b,c,d,e) (p)->BltFast(a,b,c,d,e)
+#define IDirectDrawSurface4_DeleteAttachedSurface(p,a,b) (p)->DeleteAttachedSurface(a,b)
+#define IDirectDrawSurface4_EnumAttachedSurfaces(p,a,b) (p)->EnumAttachedSurfaces(a,b)
+#define IDirectDrawSurface4_EnumOverlayZOrders(p,a,b,c) (p)->EnumOverlayZOrders(a,b,c)
+#define IDirectDrawSurface4_Flip(p,a,b) (p)->Flip(a,b)
+#define IDirectDrawSurface4_GetAttachedSurface(p,a,b) (p)->GetAttachedSurface(a,b)
+#define IDirectDrawSurface4_GetBltStatus(p,a) (p)->GetBltStatus(a)
+#define IDirectDrawSurface4_GetCaps(p,a) (p)->GetCaps(a)
+#define IDirectDrawSurface4_GetClipper(p,a) (p)->GetClipper(a)
+#define IDirectDrawSurface4_GetColorKey(p,a,b) (p)->GetColorKey(a,b)
+#define IDirectDrawSurface4_GetDC(p,a) (p)->GetDC(a)
+#define IDirectDrawSurface4_GetFlipStatus(p,a) (p)->GetFlipStatus(a)
+#define IDirectDrawSurface4_GetOverlayPosition(p,a,b) (p)->GetOverlayPosition(a,b)
+#define IDirectDrawSurface4_GetPalette(p,a) (p)->GetPalette(a)
+#define IDirectDrawSurface4_GetPixelFormat(p,a) (p)->GetPixelFormat(a)
+#define IDirectDrawSurface4_GetSurfaceDesc(p,a) (p)->GetSurfaceDesc(a)
+#define IDirectDrawSurface4_Initialize(p,a,b) (p)->Initialize(a,b)
+#define IDirectDrawSurface4_IsLost(p) (p)->IsLost()
+#define IDirectDrawSurface4_Lock(p,a,b,c,d) (p)->Lock(a,b,c,d)
+#define IDirectDrawSurface4_ReleaseDC(p,a) (p)->ReleaseDC(a)
+#define IDirectDrawSurface4_Restore(p) (p)->Restore()
+#define IDirectDrawSurface4_SetClipper(p,a) (p)->SetClipper(a)
+#define IDirectDrawSurface4_SetColorKey(p,a,b) (p)->SetColorKey(a,b)
+#define IDirectDrawSurface4_SetOverlayPosition(p,a,b) (p)->SetOverlayPosition(a,b)
+#define IDirectDrawSurface4_SetPalette(p,a) (p)->SetPalette(a)
+#define IDirectDrawSurface4_Unlock(p,a) (p)->Unlock(a)
+#define IDirectDrawSurface4_UpdateOverlay(p,a,b,c,d,e) (p)->UpdateOverlay(a,b,c,d,e)
+#define IDirectDrawSurface4_UpdateOverlayDisplay(p,a) (p)->UpdateOverlayDisplay(a)
+#define IDirectDrawSurface4_UpdateOverlayZOrder(p,a,b) (p)->UpdateOverlayZOrder(a,b)
+/*** IDirectDrawSurface2 methods ***/
+#define IDirectDrawSurface4_GetDDInterface(p,a) (p)->GetDDInterface(a)
+#define IDirectDrawSurface4_PageLock(p,a) (p)->PageLock(a)
+#define IDirectDrawSurface4_PageUnlock(p,a) (p)->PageUnlock(a)
+/*** IDirectDrawSurface3 methods ***/
+#define IDirectDrawSurface4_SetSurfaceDesc(p,a,b) (p)->SetSurfaceDesc(a,b)
+/*** IDirectDrawSurface4 methods ***/
+#define IDirectDrawSurface4_SetPrivateData(p,a,b,c,d) (p)->SetPrivateData(a,b,c,d)
+#define IDirectDrawSurface4_GetPrivateData(p,a,b,c) (p)->GetPrivateData(a,b,c)
+#define IDirectDrawSurface4_FreePrivateData(p,a) (p)->FreePrivateData(a)
+#define IDirectDrawSurface4_GetUniquenessValue(p,a) (p)->GetUniquenessValue(a)
+#define IDirectDrawSurface4_ChangeUniquenessValue(p) (p)->ChangeUniquenessValue()
+#endif
+
+
+/*****************************************************************************
+ * IDirectDrawSurface7 interface
+ */
+#define INTERFACE IDirectDrawSurface7
+DECLARE_INTERFACE_(IDirectDrawSurface7,IUnknown)
+{
+ /*** IUnknown methods ***/
+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** IDirectDrawSurface7 methods ***/
+ STDMETHOD(AddAttachedSurface)(THIS_ LPDIRECTDRAWSURFACE7 lpDDSAttachedSurface) PURE;
+ STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT lpRect) PURE;
+ STDMETHOD(Blt)(THIS_ LPRECT lpDestRect, LPDIRECTDRAWSURFACE7 lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwFlags, LPDDBLTFX lpDDBltFx) PURE;
+ STDMETHOD(BltBatch)(THIS_ LPDDBLTBATCH lpDDBltBatch, DWORD dwCount, DWORD dwFlags) PURE;
+ STDMETHOD(BltFast)(THIS_ DWORD dwX, DWORD dwY, LPDIRECTDRAWSURFACE7 lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwTrans) PURE;
+ STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE7 lpDDSAttachedSurface) PURE;
+ STDMETHOD(EnumAttachedSurfaces)(THIS_ LPVOID lpContext, LPDDENUMSURFACESCALLBACK7 lpEnumSurfacesCallback) PURE;
+ STDMETHOD(EnumOverlayZOrders)(THIS_ DWORD dwFlags, LPVOID lpContext, LPDDENUMSURFACESCALLBACK7 lpfnCallback) PURE;
+ STDMETHOD(Flip)(THIS_ LPDIRECTDRAWSURFACE7 lpDDSurfaceTargetOverride, DWORD dwFlags) PURE;
+ STDMETHOD(GetAttachedSurface)(THIS_ LPDDSCAPS2 lpDDSCaps, LPDIRECTDRAWSURFACE7 *lplpDDAttachedSurface) PURE;
+ STDMETHOD(GetBltStatus)(THIS_ DWORD dwFlags) PURE;
+ STDMETHOD(GetCaps)(THIS_ LPDDSCAPS2 lpDDSCaps) PURE;
+ STDMETHOD(GetClipper)(THIS_ LPDIRECTDRAWCLIPPER *lplpDDClipper) PURE;
+ STDMETHOD(GetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE;
+ STDMETHOD(GetDC)(THIS_ HDC *lphDC) PURE;
+ STDMETHOD(GetFlipStatus)(THIS_ DWORD dwFlags) PURE;
+ STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE;
+ STDMETHOD(GetPalette)(THIS_ LPDIRECTDRAWPALETTE *lplpDDPalette) PURE;
+ STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE;
+ STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE;
+ STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW lpDD, LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE;
+ STDMETHOD(IsLost)(THIS) PURE;
+ STDMETHOD(Lock)(THIS_ LPRECT lpDestRect, LPDDSURFACEDESC2 lpDDSurfaceDesc, DWORD dwFlags, HANDLE hEvent) PURE;
+ STDMETHOD(ReleaseDC)(THIS_ HDC hDC) PURE;
+ STDMETHOD(Restore)(THIS) PURE;
+ STDMETHOD(SetClipper)(THIS_ LPDIRECTDRAWCLIPPER lpDDClipper) PURE;
+ STDMETHOD(SetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE;
+ STDMETHOD(SetOverlayPosition)(THIS_ LONG lX, LONG lY) PURE;
+ STDMETHOD(SetPalette)(THIS_ LPDIRECTDRAWPALETTE lpDDPalette) PURE;
+ STDMETHOD(Unlock)(THIS_ LPRECT lpSurfaceData) PURE;
+ STDMETHOD(UpdateOverlay)(THIS_ LPRECT lpSrcRect, LPDIRECTDRAWSURFACE7 lpDDDestSurface, LPRECT lpDestRect, DWORD dwFlags, LPDDOVERLAYFX lpDDOverlayFx) PURE;
+ STDMETHOD(UpdateOverlayDisplay)(THIS_ DWORD dwFlags) PURE;
+ STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE7 lpDDSReference) PURE;
+ /* added in v2 */
+ STDMETHOD(GetDDInterface)(THIS_ LPVOID *lplpDD) PURE;
+ STDMETHOD(PageLock)(THIS_ DWORD dwFlags) PURE;
+ STDMETHOD(PageUnlock)(THIS_ DWORD dwFlags) PURE;
+ /* added in v3 */
+ STDMETHOD(SetSurfaceDesc)(THIS_ LPDDSURFACEDESC2 lpDDSD, DWORD dwFlags) PURE;
+ /* added in v4 */
+ STDMETHOD(SetPrivateData)(THIS_ REFGUID tag, LPVOID pData, DWORD cbSize, DWORD dwFlags) PURE;
+ STDMETHOD(GetPrivateData)(THIS_ REFGUID tag, LPVOID pBuffer, LPDWORD pcbBufferSize) PURE;
+ STDMETHOD(FreePrivateData)(THIS_ REFGUID tag) PURE;
+ STDMETHOD(GetUniquenessValue)(THIS_ LPDWORD pValue) PURE;
+ STDMETHOD(ChangeUniquenessValue)(THIS) PURE;
+ /* added in v7 */
+ STDMETHOD(SetPriority)(THIS_ DWORD prio) PURE;
+ STDMETHOD(GetPriority)(THIS_ LPDWORD prio) PURE;
+ STDMETHOD(SetLOD)(THIS_ DWORD lod) PURE;
+ STDMETHOD(GetLOD)(THIS_ LPDWORD lod) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDirectDrawSurface7_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirectDrawSurface7_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirectDrawSurface7_Release(p) (p)->lpVtbl->Release(p)
+/*** IDirectDrawSurface (almost) methods ***/
+#define IDirectDrawSurface7_AddAttachedSurface(p,a) (p)->lpVtbl->AddAttachedSurface(p,a)
+#define IDirectDrawSurface7_AddOverlayDirtyRect(p,a) (p)->lpVtbl->AddOverlayDirtyRect(p,a)
+#define IDirectDrawSurface7_Blt(p,a,b,c,d,e) (p)->lpVtbl->Blt(p,a,b,c,d,e)
+#define IDirectDrawSurface7_BltBatch(p,a,b,c) (p)->lpVtbl->BltBatch(p,a,b,c)
+#define IDirectDrawSurface7_BltFast(p,a,b,c,d,e) (p)->lpVtbl->BltFast(p,a,b,c,d,e)
+#define IDirectDrawSurface7_DeleteAttachedSurface(p,a,b) (p)->lpVtbl->DeleteAttachedSurface(p,a,b)
+#define IDirectDrawSurface7_EnumAttachedSurfaces(p,a,b) (p)->lpVtbl->EnumAttachedSurfaces(p,a,b)
+#define IDirectDrawSurface7_EnumOverlayZOrders(p,a,b,c) (p)->lpVtbl->EnumOverlayZOrders(p,a,b,c)
+#define IDirectDrawSurface7_Flip(p,a,b) (p)->lpVtbl->Flip(p,a,b)
+#define IDirectDrawSurface7_GetAttachedSurface(p,a,b) (p)->lpVtbl->GetAttachedSurface(p,a,b)
+#define IDirectDrawSurface7_GetBltStatus(p,a) (p)->lpVtbl->GetBltStatus(p,a)
+#define IDirectDrawSurface7_GetCaps(p,a) (p)->lpVtbl->GetCaps(p,a)
+#define IDirectDrawSurface7_GetClipper(p,a) (p)->lpVtbl->GetClipper(p,a)
+#define IDirectDrawSurface7_GetColorKey(p,a,b) (p)->lpVtbl->GetColorKey(p,a,b)
+#define IDirectDrawSurface7_GetDC(p,a) (p)->lpVtbl->GetDC(p,a)
+#define IDirectDrawSurface7_GetFlipStatus(p,a) (p)->lpVtbl->GetFlipStatus(p,a)
+#define IDirectDrawSurface7_GetOverlayPosition(p,a,b) (p)->lpVtbl->GetOverlayPosition(p,a,b)
+#define IDirectDrawSurface7_GetPalette(p,a) (p)->lpVtbl->GetPalette(p,a)
+#define IDirectDrawSurface7_GetPixelFormat(p,a) (p)->lpVtbl->GetPixelFormat(p,a)
+#define IDirectDrawSurface7_GetSurfaceDesc(p,a) (p)->lpVtbl->GetSurfaceDesc(p,a)
+#define IDirectDrawSurface7_Initialize(p,a,b) (p)->lpVtbl->Initialize(p,a,b)
+#define IDirectDrawSurface7_IsLost(p) (p)->lpVtbl->IsLost(p)
+#define IDirectDrawSurface7_Lock(p,a,b,c,d) (p)->lpVtbl->Lock(p,a,b,c,d)
+#define IDirectDrawSurface7_ReleaseDC(p,a) (p)->lpVtbl->ReleaseDC(p,a)
+#define IDirectDrawSurface7_Restore(p) (p)->lpVtbl->Restore(p)
+#define IDirectDrawSurface7_SetClipper(p,a) (p)->lpVtbl->SetClipper(p,a)
+#define IDirectDrawSurface7_SetColorKey(p,a,b) (p)->lpVtbl->SetColorKey(p,a,b)
+#define IDirectDrawSurface7_SetOverlayPosition(p,a,b) (p)->lpVtbl->SetOverlayPosition(p,a,b)
+#define IDirectDrawSurface7_SetPalette(p,a) (p)->lpVtbl->SetPalette(p,a)
+#define IDirectDrawSurface7_Unlock(p,a) (p)->lpVtbl->Unlock(p,a)
+#define IDirectDrawSurface7_UpdateOverlay(p,a,b,c,d,e) (p)->lpVtbl->UpdateOverlay(p,a,b,c,d,e)
+#define IDirectDrawSurface7_UpdateOverlayDisplay(p,a) (p)->lpVtbl->UpdateOverlayDisplay(p,a)
+#define IDirectDrawSurface7_UpdateOverlayZOrder(p,a,b) (p)->lpVtbl->UpdateOverlayZOrder(p,a,b)
+/*** IDirectDrawSurface2 methods ***/
+#define IDirectDrawSurface7_GetDDInterface(p,a) (p)->lpVtbl->GetDDInterface(p,a)
+#define IDirectDrawSurface7_PageLock(p,a) (p)->lpVtbl->PageLock(p,a)
+#define IDirectDrawSurface7_PageUnlock(p,a) (p)->lpVtbl->PageUnlock(p,a)
+/*** IDirectDrawSurface3 methods ***/
+#define IDirectDrawSurface7_SetSurfaceDesc(p,a,b) (p)->lpVtbl->SetSurfaceDesc(p,a,b)
+/*** IDirectDrawSurface4 methods ***/
+#define IDirectDrawSurface7_SetPrivateData(p,a,b,c,d) (p)->lpVtbl->SetPrivateData(p,a,b,c,d)
+#define IDirectDrawSurface7_GetPrivateData(p,a,b,c) (p)->lpVtbl->GetPrivateData(p,a,b,c)
+#define IDirectDrawSurface7_FreePrivateData(p,a) (p)->lpVtbl->FreePrivateData(p,a)
+#define IDirectDrawSurface7_GetUniquenessValue(p,a) (p)->lpVtbl->GetUniquenessValue(p,a)
+#define IDirectDrawSurface7_ChangeUniquenessValue(p) (p)->lpVtbl->ChangeUniquenessValue(p)
+/*** IDirectDrawSurface7 methods ***/
+#define IDirectDrawSurface7_SetPriority(p,a) (p)->lpVtbl->SetPriority(p,a)
+#define IDirectDrawSurface7_GetPriority(p,a) (p)->lpVtbl->GetPriority(p,a)
+#define IDirectDrawSurface7_SetLOD(p,a) (p)->lpVtbl->SetLOD(p,a)
+#define IDirectDrawSurface7_GetLOD(p,a) (p)->lpVtbl->GetLOD(p,a)
+#else
+/*** IUnknown methods ***/
+#define IDirectDrawSurface7_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
+#define IDirectDrawSurface7_AddRef(p) (p)->AddRef()
+#define IDirectDrawSurface7_Release(p) (p)->Release()
+/*** IDirectDrawSurface (almost) methods ***/
+#define IDirectDrawSurface7_AddAttachedSurface(p,a) (p)->AddAttachedSurface(a)
+#define IDirectDrawSurface7_AddOverlayDirtyRect(p,a) (p)->AddOverlayDirtyRect(a)
+#define IDirectDrawSurface7_Blt(p,a,b,c,d,e) (p)->Blt(a,b,c,d,e)
+#define IDirectDrawSurface7_BltBatch(p,a,b,c) (p)->BltBatch(a,b,c)
+#define IDirectDrawSurface7_BltFast(p,a,b,c,d,e) (p)->BltFast(a,b,c,d,e)
+#define IDirectDrawSurface7_DeleteAttachedSurface(p,a,b) (p)->DeleteAttachedSurface(a,b)
+#define IDirectDrawSurface7_EnumAttachedSurfaces(p,a,b) (p)->EnumAttachedSurfaces(a,b)
+#define IDirectDrawSurface7_EnumOverlayZOrders(p,a,b,c) (p)->EnumOverlayZOrders(a,b,c)
+#define IDirectDrawSurface7_Flip(p,a,b) (p)->Flip(a,b)
+#define IDirectDrawSurface7_GetAttachedSurface(p,a,b) (p)->GetAttachedSurface(a,b)
+#define IDirectDrawSurface7_GetBltStatus(p,a) (p)->GetBltStatus(a)
+#define IDirectDrawSurface7_GetCaps(p,a) (p)->GetCaps(a)
+#define IDirectDrawSurface7_GetClipper(p,a) (p)->GetClipper(a)
+#define IDirectDrawSurface7_GetColorKey(p,a,b) (p)->GetColorKey(a,b)
+#define IDirectDrawSurface7_GetDC(p,a) (p)->GetDC(a)
+#define IDirectDrawSurface7_GetFlipStatus(p,a) (p)->GetFlipStatus(a)
+#define IDirectDrawSurface7_GetOverlayPosition(p,a,b) (p)->GetOverlayPosition(a,b)
+#define IDirectDrawSurface7_GetPalette(p,a) (p)->GetPalette(a)
+#define IDirectDrawSurface7_GetPixelFormat(p,a) (p)->GetPixelFormat(a)
+#define IDirectDrawSurface7_GetSurfaceDesc(p,a) (p)->GetSurfaceDesc(a)
+#define IDirectDrawSurface7_Initialize(p,a,b) (p)->Initialize(a,b)
+#define IDirectDrawSurface7_IsLost(p) (p)->IsLost()
+#define IDirectDrawSurface7_Lock(p,a,b,c,d) (p)->Lock(a,b,c,d)
+#define IDirectDrawSurface7_ReleaseDC(p,a) (p)->ReleaseDC(a)
+#define IDirectDrawSurface7_Restore(p) (p)->Restore()
+#define IDirectDrawSurface7_SetClipper(p,a) (p)->SetClipper(a)
+#define IDirectDrawSurface7_SetColorKey(p,a,b) (p)->SetColorKey(a,b)
+#define IDirectDrawSurface7_SetOverlayPosition(p,a,b) (p)->SetOverlayPosition(a,b)
+#define IDirectDrawSurface7_SetPalette(p,a) (p)->SetPalette(a)
+#define IDirectDrawSurface7_Unlock(p,a) (p)->Unlock(a)
+#define IDirectDrawSurface7_UpdateOverlay(p,a,b,c,d,e) (p)->UpdateOverlay(a,b,c,d,e)
+#define IDirectDrawSurface7_UpdateOverlayDisplay(p,a) (p)->UpdateOverlayDisplay(a)
+#define IDirectDrawSurface7_UpdateOverlayZOrder(p,a,b) (p)->UpdateOverlayZOrder(a,b)
+/*** IDirectDrawSurface2 methods ***/
+#define IDirectDrawSurface7_GetDDInterface(p,a) (p)->GetDDInterface(a)
+#define IDirectDrawSurface7_PageLock(p,a) (p)->PageLock(a)
+#define IDirectDrawSurface7_PageUnlock(p,a) (p)->PageUnlock(a)
+/*** IDirectDrawSurface3 methods ***/
+#define IDirectDrawSurface7_SetSurfaceDesc(p,a,b) (p)->SetSurfaceDesc(a,b)
+/*** IDirectDrawSurface4 methods ***/
+#define IDirectDrawSurface7_SetPrivateData(p,a,b,c,d) (p)->SetPrivateData(a,b,c,d)
+#define IDirectDrawSurface7_GetPrivateData(p,a,b,c) (p)->GetPrivateData(a,b,c)
+#define IDirectDrawSurface7_FreePrivateData(p,a) (p)->FreePrivateData(a)
+#define IDirectDrawSurface7_GetUniquenessValue(p,a) (p)->GetUniquenessValue(a)
+#define IDirectDrawSurface7_ChangeUniquenessValue(p) (p)->ChangeUniquenessValue()
+/*** IDirectDrawSurface7 methods ***/
+#define IDirectDrawSurface7_SetPriority(p,a) (p)->SetPriority(a)
+#define IDirectDrawSurface7_GetPriority(p,a) (p)->GetPriority(a)
+#define IDirectDrawSurface7_SetLOD(p,a) (p)->SetLOD(a)
+#define IDirectDrawSurface7_GetLOD(p,a) (p)->GetLOD(a)
+#endif
+
+/*****************************************************************************
+ * IDirectDrawColorControl interface
+ */
+#define INTERFACE IDirectDrawColorControl
+DECLARE_INTERFACE_(IDirectDrawColorControl,IUnknown)
+{
+ /*** IUnknown methods ***/
+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** IDirectDrawColorControl methods ***/
+ STDMETHOD(GetColorControls)(THIS_ LPDDCOLORCONTROL lpColorControl) PURE;
+ STDMETHOD(SetColorControls)(THIS_ LPDDCOLORCONTROL lpColorControl) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDirectDrawColorControl_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirectDrawColorControl_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirectDrawColorControl_Release(p) (p)->lpVtbl->Release(p)
+/*** IDirectDrawColorControl methods ***/
+#define IDirectDrawColorControl_GetColorControls(p,a) (p)->lpVtbl->GetColorControls(p,a)
+#define IDirectDrawColorControl_SetColorControls(p,a) (p)->lpVtbl->SetColorControls(p,a)
+#else
+/*** IUnknown methods ***/
+#define IDirectDrawColorControl_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
+#define IDirectDrawColorControl_AddRef(p) (p)->AddRef()
+#define IDirectDrawColorControl_Release(p) (p)->Release()
+/*** IDirectDrawColorControl methods ***/
+#define IDirectDrawColorControl_GetColorControls(p,a) (p)->GetColorControls(a)
+#define IDirectDrawColorControl_SetColorControls(p,a) (p)->SetColorControls(a)
+#endif
+
+/*****************************************************************************
+ * IDirectDrawGammaControl interface
+ */
+#define INTERFACE IDirectDrawGammaControl
+DECLARE_INTERFACE_(IDirectDrawGammaControl,IUnknown)
+{
+ /*** IUnknown methods ***/
+ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;
+ STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+ STDMETHOD_(ULONG,Release)(THIS) PURE;
+ /*** IDirectDrawGammaControl methods ***/
+ STDMETHOD(GetGammaRamp)(THIS_ DWORD dwFlags, LPDDGAMMARAMP lpGammaRamp) PURE;
+ STDMETHOD(SetGammaRamp)(THIS_ DWORD dwFlags, LPDDGAMMARAMP lpGammaRamp) PURE;
+};
+#undef INTERFACE
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDirectDrawGammaControl_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IDirectDrawGammaControl_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDirectDrawGammaControl_Release(p) (p)->lpVtbl->Release(p)
+/*** IDirectDrawGammaControl methods ***/
+#define IDirectDrawGammaControl_GetGammaRamp(p,a,b) (p)->lpVtbl->GetGammaRamp(p,a,b)
+#define IDirectDrawGammaControl_SetGammaRamp(p,a,b) (p)->lpVtbl->SetGammaRamp(p,a,b)
+#else
+/*** IUnknown methods ***/
+#define IDirectDrawGammaControl_QueryInterface(p,a,b) (p)->QueryInterface(a,b)
+#define IDirectDrawGammaControl_AddRef(p) (p)->AddRef()
+#define IDirectDrawGammaControl_Release(p) (p)->Release()
+/*** IDirectDrawGammaControl methods ***/
+#define IDirectDrawGammaControl_GetGammaRamp(p,a,b) (p)->GetGammaRamp(a,b)
+#define IDirectDrawGammaControl_SetGammaRamp(p,a,b) (p)->SetGammaRamp(a,b)
+#endif
+
+
+HRESULT WINAPI DirectDrawCreate(GUID*,LPDIRECTDRAW*,IUnknown*);
+HRESULT WINAPI DirectDrawCreateEx(GUID*,LPVOID*,REFIID,IUnknown*);
+HRESULT WINAPI DirectDrawCreateClipper(DWORD,LPDIRECTDRAWCLIPPER*,IUnknown*);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* defined(__cplusplus) */
+
+#endif /* __WINE_DDRAW_H */

pcsxr-1.9.93.tar.bz2/win32/plugins/dfxvideo/winsrc/draw.c Added

@@ -0,0 +1,4929 @@
+/***************************************************************************
+ draw.c - description
+ -------------------
+ begin : Sun Oct 28 2001
+ copyright : (C) 2001 by Pete Bernert
+ email : BlackDove@addcom.de
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+#define _IN_DRAW
+
+#include "externals.h"
+#include "gpu.h"
+#include "draw.h"
+#include "prim.h"
+#include "menu.h"
+#include "interp.h"
+
+////////////////////////////////////////////////////////////////////////////////////
+// misc globals
+////////////////////////////////////////////////////////////////////////////////////
+
+int iResX;
+int iResY;
+long lLowerpart;
+BOOL bIsFirstFrame = TRUE;
+BOOL bCheckMask=FALSE;
+unsigned short sSetMask=0;
+unsigned long lSetMask=0;
+int iDesktopCol=16;
+int iShowFPS=0;
+int iWinSize; 
+int iUseScanLines=0;
+int iUseNoStretchBlt=0;
+int iFastFwd=0;
+int iDebugMode=0;
+int iFVDisplay=0;
+PSXPoint_t ptCursorPoint[8];
+unsigned short usCursorActive=0;
+
+unsigned int LUT16to32[65536];
+unsigned int RGBtoYUV[65536];
+
+// prototypes
+void hq2x_32( unsigned char * srcPtr, DWORD srcPitch, unsigned char * dstPtr, int width, int height);
+void hq2x( unsigned char * srcPtr, DWORD srcPitch, unsigned char * dstPtr, int width, int height);
+void hq3x_16( unsigned char * srcPtr, DWORD srcPitch, unsigned char * dstPtr, int width, int height);
+void hq3x_32( unsigned char * srcPtr, DWORD srcPitch, unsigned char * dstPtr, int width, int height);
+
+////////////////////////////////////////////////////////////////////////
+// generic 2xSaI helpers
+////////////////////////////////////////////////////////////////////////
+
+void * pSaISmallBuff=NULL;
+void * pSaIBigBuff=NULL;
+
+#define GET_RESULT(A, B, C, D) ((A != C || A != D) - (B != C || B != D))
+
+static __inline int GetResult1(DWORD A, DWORD B, DWORD C, DWORD D, DWORD E)
+{
+ int x = 0;
+ int y = 0;
+ int r = 0;
+ if (A == C) x+=1; else if (B == C) y+=1;
+ if (A == D) x+=1; else if (B == D) y+=1;
+ if (x <= 1) r+=1; 
+ if (y <= 1) r-=1;
+ return r;
+}
+
+static __inline int GetResult2(DWORD A, DWORD B, DWORD C, DWORD D, DWORD E) 
+{
+ int x = 0; 
+ int y = 0;
+ int r = 0;
+ if (A == C) x+=1; else if (B == C) y+=1;
+ if (A == D) x+=1; else if (B == D) y+=1;
+ if (x <= 1) r-=1; 
+ if (y <= 1) r+=1;
+ return r;
+}
+
+#define colorMask8 0x00FEFEFE
+#define lowPixelMask8 0x00010101
+#define qcolorMask8 0x00FCFCFC
+#define qlowpixelMask8 0x00030303
+
+#define INTERPOLATE8(A, B) ((((A & colorMask8) >> 1) + ((B & colorMask8) >> 1) + (A & B & lowPixelMask8)))
+#define Q_INTERPOLATE8(A, B, C, D) (((((A & qcolorMask8) >> 2) + ((B & qcolorMask8) >> 2) + ((C & qcolorMask8) >> 2) + ((D & qcolorMask8) >> 2) \
+	+ ((((A & qlowpixelMask8) + (B & qlowpixelMask8) + (C & qlowpixelMask8) + (D & qlowpixelMask8)) >> 2) & qlowpixelMask8))))
+
+
+void Super2xSaI_ex8(unsigned char *srcPtr, DWORD srcPitch,
+	 unsigned char *dstBitmap, int width, int height)
+{
+ DWORD dstPitch = srcPitch<<1;
+ DWORD srcPitchHalf = srcPitch>>1;
+ int finWidth = srcPitch>>2;
+ DWORD line;
+ DWORD *dP;
+ DWORD *bP;
+ int iXA,iXB,iXC,iYA,iYB,iYC,finish;
+ DWORD color4, color5, color6;
+ DWORD color1, color2, color3;
+ DWORD colorA0, colorA1, colorA2, colorA3,
+ colorB0, colorB1, colorB2, colorB3,
+ colorS1, colorS2;
+ DWORD product1a, product1b,
+ product2a, product2b;
+
+ line = 0;
+
+ {
+ for (; height; height-=1)
+	{
+ bP = (DWORD *)srcPtr;
+	 dP = (DWORD *)(dstBitmap + line*dstPitch);
+ for (finish = width; finish; finish -= 1 )
+ {
+//--------------------------------------- B1 B2
+// 4 5 6 S2
+// 1 2 3 S1
+// A1 A2
+ if(finish==finWidth) iXA=0;
+ else iXA=1;
+ if(finish>4) {iXB=1;iXC=2;}
+ else
+ if(finish>3) {iXB=1;iXC=1;}
+ else {iXB=0;iXC=0;}
+ if(line==0) {iYA=0;}
+ else {iYA=finWidth;}
+ if(height>4) {iYB=finWidth;iYC=srcPitchHalf;}
+ else
+ if(height>3) {iYB=finWidth;iYC=finWidth;}
+ else {iYB=0;iYC=0;}
+
+ colorB0 = *(bP- iYA - iXA);
+ colorB1 = *(bP- iYA);
+ colorB2 = *(bP- iYA + iXB);
+ colorB3 = *(bP- iYA + iXC);
+
+ color4 = *(bP - iXA);
+ color5 = *(bP);
+ color6 = *(bP + iXB);
+ colorS2 = *(bP + iXC);
+
+ color1 = *(bP + iYB - iXA);
+ color2 = *(bP + iYB);
+ color3 = *(bP + iYB + iXB);
+ colorS1= *(bP + iYB + iXC);
+
+ colorA0 = *(bP + iYC - iXA);
+ colorA1 = *(bP + iYC);
+ colorA2 = *(bP + iYC + iXB);
+ colorA3 = *(bP + iYC + iXC);
+
+ if (color2 == color6 && color5 != color3)
+ {
+ product2b = product1b = color2;
+ }
+ else
+ if (color5 == color3 && color2 != color6)
+ {
+ product2b = product1b = color5;
+ }
+ else
+ if (color5 == color3 && color2 == color6)
+ {
+ register int r = 0;
+
+ r += GET_RESULT ((color6&0x00ffffff), (color5&0x00ffffff), (color1&0x00ffffff), (colorA1&0x00ffffff));
+ r += GET_RESULT ((color6&0x00ffffff), (color5&0x00ffffff), (color4&0x00ffffff), (colorB1&0x00ffffff));
+ r += GET_RESULT ((color6&0x00ffffff), (color5&0x00ffffff), (colorA2&0x00ffffff), (colorS1&0x00ffffff));
+ r += GET_RESULT ((color6&0x00ffffff), (color5&0x00ffffff), (colorB2&0x00ffffff), (colorS2&0x00ffffff));
+
+ if (r > 0)
+ product2b = product1b = color6;
+ else
+ if (r < 0)
+ product2b = product1b = color5;
+ else
+ {
+ product2b = product1b = INTERPOLATE8(color5, color6);
+ }
+ }
+ else
+ {
+ if (color6 == color3 && color3 == colorA1 && color2 != colorA2 && color3 != colorA0)
+ product2b = Q_INTERPOLATE8 (color3, color3, color3, color2);
+ else
+ if (color5 == color2 && color2 == colorA2 && colorA1 != color3 && color2 != colorA3)
+ product2b = Q_INTERPOLATE8 (color2, color2, color2, color3);
+ else
+ product2b = INTERPOLATE8 (color2, color3);
+
+ if (color6 == color3 && color6 == colorB1 && color5 != colorB2 && color6 != colorB0)
+ product1b = Q_INTERPOLATE8 (color6, color6, color6, color5);
+ else
+ if (color5 == color2 && color5 == colorB2 && colorB1 != color6 && color5 != colorB3)
+ product1b = Q_INTERPOLATE8 (color6, color5, color5, color5);
+ else
+ product1b = INTERPOLATE8 (color5, color6);
+ }
+
+ if (color5 == color3 && color2 != color6 && color4 == color5 && color5 != colorA2)
+ product2a = INTERPOLATE8(color2, color5);
+ else
+ if (color5 == color1 && color6 == color5 && color4 != color2 && color5 != colorA0)
+ product2a = INTERPOLATE8(color2, color5);
+ else
+ product2a = color2;
+
+ if (color2 == color6 && color5 != color3 && color1 == color2 && color2 != colorB2)
+ product1a = INTERPOLATE8(color2, color5);
+ else
+ if (color4 == color2 && color3 == color2 && color1 != color5 && color2 != colorB0)
+ product1a = INTERPOLATE8(color2, color5);
+ else
+ product1a = color5;
+
+ *dP=product1a;
+ *(dP+1)=product1b;
+ *(dP+(srcPitchHalf))=product2a;
+ *(dP+1+(srcPitchHalf))=product2b;
+
+ bP += 1;
+ dP += 2;
+ }//end of for ( finish= width etc..)
+
+ line += 2;
+ srcPtr += srcPitch;
+	}; //endof: for (; height; height--)
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void Std2xSaI_ex8(unsigned char *srcPtr, DWORD srcPitch,
+ unsigned char *dstBitmap, int width, int height)
+{
+ DWORD dstPitch = srcPitch<<1;
+ DWORD srcPitchHalf = srcPitch>>1;
+ int finWidth = srcPitch>>2;
+ DWORD line;
+ DWORD *dP;
+ DWORD *bP;
+ int iXA,iXB,iXC,iYA,iYB,iYC,finish;
+
+ DWORD colorA, colorB;
+ DWORD colorC, colorD,
+ colorE, colorF, colorG, colorH,
+ colorI, colorJ, colorK, colorL,
+ colorM, colorN, colorO, colorP;
+ DWORD product, product1, product2;
+
+ line = 0;
+
+ {
+ for (; height; height-=1)
+	{
+ bP = (DWORD *)srcPtr;
+	 dP = (DWORD *)(dstBitmap + line*dstPitch);
+ for (finish = width; finish; finish -= 1 )
+ {
+//---------------------------------------
+// Map of the pixels: I|E F|J
+// G|A B|K
+// H|C D|L
+// M|N O|P
+ if(finish==finWidth) iXA=0;
+ else iXA=1;
+ if(finish>4) {iXB=1;iXC=2;}
+ else
+ if(finish>3) {iXB=1;iXC=1;}
+ else {iXB=0;iXC=0;}
+ if(line==0) {iYA=0;}
+ else {iYA=finWidth;}
+ if(height>4) {iYB=finWidth;iYC=srcPitchHalf;}
+ else
+ if(height>3) {iYB=finWidth;iYC=finWidth;}
+ else {iYB=0;iYC=0;}
+
+ colorI = *(bP- iYA - iXA);
+ colorE = *(bP- iYA);
+ colorF = *(bP- iYA + iXB);
+ colorJ = *(bP- iYA + iXC);
+
+ colorG = *(bP - iXA);
+ colorA = *(bP);
+ colorB = *(bP + iXB);
+ colorK = *(bP + iXC);
+
+ colorH = *(bP + iYB - iXA);
+ colorC = *(bP + iYB);
+ colorD = *(bP + iYB + iXB);
+ colorL = *(bP + iYB + iXC);
+
+ colorM = *(bP + iYC - iXA);
+ colorN = *(bP + iYC);
+ colorO = *(bP + iYC + iXB);
+ colorP = *(bP + iYC + iXC);
+
+
+ if((colorA == colorD) && (colorB != colorC))
+ {
+ if(((colorA == colorE) && (colorB == colorL)) ||
+ ((colorA == colorC) && (colorA == colorF) && 
+ (colorB != colorE) && (colorB == colorJ)))
+ {
+ product = colorA;
+ }
+ else
+ {
+ product = INTERPOLATE8(colorA, colorB);
+ }
+
+ if(((colorA == colorG) && (colorC == colorO)) ||
+ ((colorA == colorB) && (colorA == colorH) && 
+ (colorG != colorC) && (colorC == colorM)))
+ {
+ product1 = colorA;
+ }
+ else
+ {
+ product1 = INTERPOLATE8(colorA, colorC);
+ }
+ product2 = colorA;
+ }
+ else
+ if((colorB == colorC) && (colorA != colorD))
+ {
+ if(((colorB == colorF) && (colorA == colorH)) ||
+ ((colorB == colorE) && (colorB == colorD) && 
+ (colorA != colorF) && (colorA == colorI)))
+ {
+ product = colorB;
+ }
+ else
+ {
+ product = INTERPOLATE8(colorA, colorB);
+ }
+
+ if(((colorC == colorH) && (colorA == colorF)) ||
+ ((colorC == colorG) && (colorC == colorD) && 
+ (colorA != colorH) && (colorA == colorI)))
+ {
+ product1 = colorC;
+ }
+ else
+ {
+ product1=INTERPOLATE8(colorA, colorC);
+ }
+ product2 = colorB;
+ }
+ else
+ if((colorA == colorD) && (colorB == colorC))
+ {
+ if (colorA == colorB)
+ {
+ product = colorA;
+ product1 = colorA;
+ product2 = colorA;
+ }
+ else
+ {
+ register int r = 0;
+ product1 = INTERPOLATE8(colorA, colorC);
+ product = INTERPOLATE8(colorA, colorB);
+
+ r += GetResult1 (colorA&0x00FFFFFF, colorB&0x00FFFFFF, colorG&0x00FFFFFF, colorE&0x00FFFFFF, colorI&0x00FFFFFF);
+ r += GetResult2 (colorB&0x00FFFFFF, colorA&0x00FFFFFF, colorK&0x00FFFFFF, colorF&0x00FFFFFF, colorJ&0x00FFFFFF);
+ r += GetResult2 (colorB&0x00FFFFFF, colorA&0x00FFFFFF, colorH&0x00FFFFFF, colorN&0x00FFFFFF, colorM&0x00FFFFFF);
+ r += GetResult1 (colorA&0x00FFFFFF, colorB&0x00FFFFFF, colorL&0x00FFFFFF, colorO&0x00FFFFFF, colorP&0x00FFFFFF);
+
+ if (r > 0)
+ product2 = colorA;
+ else
+ if (r < 0)
+ product2 = colorB;
+ else
+ {
+ product2 = Q_INTERPOLATE8(colorA, colorB, colorC, colorD);
+ }
+ }
+ }
+ else
+ {
+ product2 = Q_INTERPOLATE8(colorA, colorB, colorC, colorD);
+
+ if ((colorA == colorC) && (colorA == colorF) && 
+ (colorB != colorE) && (colorB == colorJ))
+ {
+ product = colorA;
+ }
+ else
+ if ((colorB == colorE) && (colorB == colorD) && (colorA != colorF) && (colorA == colorI))
+ {
+ product = colorB;
+ }
+ else
+ {
+ product = INTERPOLATE8(colorA, colorB);
+ }
+
+ if ((colorA == colorB) && (colorA == colorH) && 
+ (colorG != colorC) && (colorC == colorM))
+ {
+ product1 = colorA;
+ }
+ else
+ if ((colorC == colorG) && (colorC == colorD) && 
+ (colorA != colorH) && (colorA == colorI))
+ {
+ product1 = colorC;
+ }
+ else
+ {
+ product1 = INTERPOLATE8(colorA, colorC);
+ }
+ }
+
+//////////////////////////
+
+ *dP=colorA;
+ *(dP+1)=product;
+ *(dP+(srcPitchHalf))=product1;
+ *(dP+1+(srcPitchHalf))=product2;
+
+ bP += 1;
+ dP += 2;
+ }//end of for ( finish= width etc..)
+
+ line += 2;
+ srcPtr += srcPitch;
+	}; //endof: for (; height; height--)
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void SuperEagle_ex8(unsigned char *srcPtr, DWORD srcPitch,
+	 unsigned char *dstBitmap, int width, int height)
+{
+ DWORD dstPitch = srcPitch<<1;
+ DWORD srcPitchHalf = srcPitch>>1;
+ int finWidth = srcPitch>>2;
+ DWORD line;
+ DWORD *dP;
+ DWORD *bP;
+ int iXA,iXB,iXC,iYA,iYB,iYC,finish;
+ DWORD color4, color5, color6;
+ DWORD color1, color2, color3;
+ DWORD colorA1, colorA2, 
+ colorB1, colorB2,
+ colorS1, colorS2;
+ DWORD product1a, product1b,
+ product2a, product2b;
+
+ line = 0;
+
+ {
+ for (; height; height-=1)
+	{
+ bP = (DWORD *)srcPtr;
+	 dP = (DWORD *)(dstBitmap + line*dstPitch);
+ for (finish = width; finish; finish -= 1 )
+ {
+ if(finish==finWidth) iXA=0;
+ else iXA=1;
+ if(finish>4) {iXB=1;iXC=2;}
+ else
+ if(finish>3) {iXB=1;iXC=1;}
+ else {iXB=0;iXC=0;}
+ if(line==0) {iYA=0;}
+ else {iYA=finWidth;}
+ if(height>4) {iYB=finWidth;iYC=srcPitchHalf;}
+ else
+ if(height>3) {iYB=finWidth;iYC=finWidth;}
+ else {iYB=0;iYC=0;}
+
+ colorB1 = *(bP- iYA);
+ colorB2 = *(bP- iYA + iXB);
+
+ color4 = *(bP - iXA);
+ color5 = *(bP);
+ color6 = *(bP + iXB);
+ colorS2 = *(bP + iXC);
+
+ color1 = *(bP + iYB - iXA);
+ color2 = *(bP + iYB);
+ color3 = *(bP + iYB + iXB);
+ colorS1= *(bP + iYB + iXC);
+
+ colorA1 = *(bP + iYC);
+ colorA2 = *(bP + iYC + iXB);
+
+ if(color2 == color6 && color5 != color3)
+ {
+ product1b = product2a = color2;
+ if((color1 == color2) ||
+ (color6 == colorB2))
+ {
+ product1a = INTERPOLATE8(color2, color5);
+ product1a = INTERPOLATE8(color2, product1a);
+ }
+ else
+ {
+ product1a = INTERPOLATE8(color5, color6);
+ }
+ 
+ if((color6 == colorS2) ||
+ (color2 == colorA1))
+ {
+ product2b = INTERPOLATE8(color2, color3);
+ product2b = INTERPOLATE8(color2, product2b);
+ }
+ else
+ {
+ product2b = INTERPOLATE8(color2, color3);
+ }
+ }
+ else
+ if (color5 == color3 && color2 != color6)
+ {
+ product2b = product1a = color5;
+
+ if ((colorB1 == color5) ||
+ (color3 == colorS1))
+ {
+ product1b = INTERPOLATE8(color5, color6);
+ product1b = INTERPOLATE8(color5, product1b);
+ }
+ else
+ {
+ product1b = INTERPOLATE8(color5, color6);
+ }
+
+ if ((color3 == colorA2) ||
+ (color4 == color5))
+ {
+ product2a = INTERPOLATE8(color5, color2);
+ product2a = INTERPOLATE8(color5, product2a);
+ }
+ else
+ {
+ product2a = INTERPOLATE8(color2, color3);
+ }
+ }
+ else
+ if (color5 == color3 && color2 == color6)
+ {
+ register int r = 0;
+
+ r += GET_RESULT ((color6&0x00ffffff), (color5&0x00ffffff), (color1&0x00ffffff), (colorA1&0x00ffffff));
+ r += GET_RESULT ((color6&0x00ffffff), (color5&0x00ffffff), (color4&0x00ffffff), (colorB1&0x00ffffff));
+ r += GET_RESULT ((color6&0x00ffffff), (color5&0x00ffffff), (colorA2&0x00ffffff), (colorS1&0x00ffffff));
+ r += GET_RESULT ((color6&0x00ffffff), (color5&0x00ffffff), (colorB2&0x00ffffff), (colorS2&0x00ffffff));
+
+ if (r > 0)
+ {
+ product1b = product2a = color2;
+ product1a = product2b = INTERPOLATE8(color5, color6);
+ }
+ else
+ if (r < 0)
+ {
+ product2b = product1a = color5;
+ product1b = product2a = INTERPOLATE8(color5, color6);
+ }
+ else
+ {
+ product2b = product1a = color5;
+ product1b = product2a = color2;
+ }
+ }
+ else
+ {
+ product2b = product1a = INTERPOLATE8(color2, color6);
+ product2b = Q_INTERPOLATE8(color3, color3, color3, product2b);
+ product1a = Q_INTERPOLATE8(color5, color5, color5, product1a);
+
+ product2a = product1b = INTERPOLATE8(color5, color3);
+ product2a = Q_INTERPOLATE8(color2, color2, color2, product2a);
+ product1b = Q_INTERPOLATE8(color6, color6, color6, product1b);
+ }
+
+////////////////////////////////
+
+ *dP=product1a;
+ *(dP+1)=product1b;
+ *(dP+(srcPitchHalf))=product2a;
+ *(dP+1+(srcPitchHalf))=product2b;
+
+ bP += 1;
+ dP += 2;
+ }//end of for ( finish= width etc..)
+
+ line += 2;
+ srcPtr += srcPitch;
+	}; //endof: for (; height; height--)
+ }
+}
+
+/////////////////////////
+
+static __inline void scale2x_32_def_whole(unsigned long* dst0, unsigned long* dst1, const unsigned long* src0, const unsigned long* src1, const unsigned long* src2, unsigned count)
+{
+	// first pixel
+	if (src0[0] != src2[0] && src1[0] != src1[1]) {
+		dst0[0] = src1[0] == src0[0] ? src0[0] : src1[0];
+		dst0[1] = src1[1] == src0[0] ? src0[0] : src1[0];
+		dst1[0] = src1[0] == src2[0] ? src2[0] : src1[0];
+		dst1[1] = src1[1] == src2[0] ? src2[0] : src1[0];
+	} else {
+		dst0[0] = src1[0];
+		dst0[1] = src1[0];
+		dst1[0] = src1[0];
+		dst1[1] = src1[0];
+	}
+	++src0;
+	++src1;
+	++src2;
+	dst0 += 2;
+	dst1 += 2;
+
+	// central pixels
+	count -= 2;
+	while (count) {
+		if (src0[0] != src2[0] && src1[-1] != src1[1]) {
+			dst0[0] = src1[-1] == src0[0] ? src0[0] : src1[0];
+			dst0[1] = src1[1] == src0[0] ? src0[0] : src1[0];
+			dst1[0] = src1[-1] == src2[0] ? src2[0] : src1[0];
+			dst1[1] = src1[1] == src2[0] ? src2[0] : src1[0];
+		} else {
+			dst0[0] = src1[0];
+			dst0[1] = src1[0];
+			dst1[0] = src1[0];
+			dst1[1] = src1[0];
+		}
+
+		++src0;
+		++src1;
+		++src2;
+		dst0 += 2;
+		dst1 += 2;
+		--count;
+	}
+
+	// last pixel
+	if (src0[0] != src2[0] && src1[-1] != src1[0]) {
+		dst0[0] = src1[-1] == src0[0] ? src0[0] : src1[0];
+		dst0[1] = src1[0] == src0[0] ? src0[0] : src1[0];
+		dst1[0] = src1[-1] == src2[0] ? src2[0] : src1[0];
+		dst1[1] = src1[0] == src2[0] ? src2[0] : src1[0];
+	} else {
+		dst0[0] = src1[0];
+		dst0[1] = src1[0];
+		dst1[0] = src1[0];
+		dst1[1] = src1[0];
+	}
+}
+
+void Scale2x_ex8(unsigned char *srcPtr, DWORD srcPitch,
+				 unsigned char *dstPtr, int width, int height)
+{
+	const int dstPitch = srcPitch<<1;
+
+	int count = height;
+
+	unsigned long *dst0 = (unsigned long *)dstPtr;
+	unsigned long *dst1 = dst0 + (dstPitch >> 2);
+
+	unsigned long *src0 = (unsigned long *)srcPtr;
+	unsigned long *src1 = src0 + (srcPitch >> 2);
+	unsigned long *src2 = src1 + (srcPitch >> 2);
+	scale2x_32_def_whole(dst0, dst1, src0, src0, src1, width);
+
+	count -= 2;
+	while(count) {
+		dst0 += dstPitch >> 1;
+		dst1 += dstPitch >> 1;
+		scale2x_32_def_whole(dst0, dst1, src0, src0, src1, width);
+		src0 = src1;
+		src1 = src2;
+		src2 += srcPitch >> 2;
+		--count;
+	}
+	dst0 += dstPitch >> 1;
+	dst1 += dstPitch >> 1;
+	scale2x_32_def_whole(dst0, dst1, src0, src1, src1, width);
+
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static __inline void scale3x_32_def_whole(unsigned long* dst0, unsigned long* dst1, unsigned long* dst2, const unsigned long* src0, const unsigned long* src1, const unsigned long* src2, unsigned count)
+{
+	//first pixel
+	if (src0[0] != src2[0] && src1[0] != src1[1]) {
+		dst0[0] = src1[0];
+		dst0[1] = (src1[0] == src0[0] && src1[0] != src0[1]) || (src1[1] == src0[0] && src1[0] != src0[0]) ? src0[0] : src1[0];
+		dst0[2] = src1[1] == src0[0] ? src1[1] : src1[0];
+		dst1[0] = (src1[0] == src0[0] && src1[0] != src2[0]) || (src1[0] == src2[0] && src1[0] != src0[0]) ? src1[0] : src1[0];
+		dst1[1] = src1[0];
+		dst1[2] = (src1[1] == src0[0] && src1[0] != src2[1]) || (src1[1] == src2[0] && src1[0] != src0[1]) ? src1[1] : src1[0];
+		dst2[0] = src1[0];
+		dst2[1] = (src1[0] == src2[0] && src1[0] != src2[1]) || (src1[1] == src2[0] && src1[0] != src2[0]) ? src2[0] : src1[0];
+		dst2[2] = src1[1] == src2[0] ? src1[1] : src1[0];
+	} else {
+		dst0[0] = src1[0];
+		dst0[1] = src1[0];
+		dst0[2] = src1[0];
+		dst1[0] = src1[0];
+		dst1[1] = src1[0];
+		dst1[2] = src1[0];
+		dst2[0] = src1[0];
+		dst2[1] = src1[0];
+		dst2[2] = src1[0];
+	}
+	++src0;
+	++src1;
+	++src2;
+	dst0 += 3;
+	dst1 += 3;
+	dst2 += 3;
+
+	//central pixels
+	count -= 2;
+	while (count) {
+		if (src0[0] != src2[0] && src1[-1] != src1[1]) {
+			dst0[0] = src1[-1] == src0[0] ? src1[-1] : src1[0];
+			dst0[1] = (src1[-1] == src0[0] && src1[0] != src0[1]) || (src1[1] == src0[0] && src1[0] != src0[-1]) ? src0[0] : src1[0];
+			dst0[2] = src1[1] == src0[0] ? src1[1] : src1[0];
+			dst1[0] = (src1[-1] == src0[0] && src1[0] != src2[-1]) || (src1[-1] == src2[0] && src1[0] != src0[-1]) ? src1[-1] : src1[0];
+			dst1[1] = src1[0];
+			dst1[2] = (src1[1] == src0[0] && src1[0] != src2[1]) || (src1[1] == src2[0] && src1[0] != src0[1]) ? src1[1] : src1[0];
+			dst2[0] = src1[-1] == src2[0] ? src1[-1] : src1[0];
+			dst2[1] = (src1[-1] == src2[0] && src1[0] != src2[1]) || (src1[1] == src2[0] && src1[0] != src2[-1]) ? src2[0] : src1[0];
+			dst2[2] = src1[1] == src2[0] ? src1[1] : src1[0];
+		} else {
+			dst0[0] = src1[0];
+			dst0[1] = src1[0];
+			dst0[2] = src1[0];
+			dst1[0] = src1[0];
+			dst1[1] = src1[0];
+			dst1[2] = src1[0];
+			dst2[0] = src1[0];
+			dst2[1] = src1[0];
+			dst2[2] = src1[0];
+		}
+
+		++src0;
+		++src1;
+		++src2;
+		dst0 += 3;
+		dst1 += 3;
+		dst2 += 3;
+		--count;
+	}
+
+	// last pixel
+	if (src0[0] != src2[0] && src1[-1] != src1[0]) {
+		dst0[0] = src1[-1] == src0[0] ? src1[-1] : src1[0];
+		dst0[1] = (src1[-1] == src0[0] && src1[0] != src0[0]) || (src1[0] == src0[0] && src1[0] != src0[-1]) ? src0[0] : src1[0];
+		dst0[2] = src1[0];
+		dst1[0] = (src1[-1] == src0[0] && src1[0] != src2[-1]) || (src1[-1] == src2[0] && src1[0] != src0[-1]) ? src1[-1] : src1[0];
+		dst1[1] = src1[0];
+		dst1[2] = (src1[0] == src0[0] && src1[0] != src2[0]) || (src1[0] == src2[0] && src1[0] != src0[0]) ? src1[0] : src1[0];
+		dst2[0] = src1[-1] == src2[0] ? src1[-1] : src1[0];
+		dst2[1] = (src1[-1] == src2[0] && src1[0] != src2[0]) || (src1[0] == src2[0] && src1[0] != src2[-1]) ? src2[0] : src1[0];
+		dst2[2] = src1[0];
+	} else {
+		dst0[0] = src1[0];
+		dst0[1] = src1[0];
+		dst0[2] = src1[0];
+		dst1[0] = src1[0];
+		dst1[1] = src1[0];
+		dst1[2] = src1[0];
+		dst2[0] = src1[0];
+		dst2[1] = src1[0];
+		dst2[2] = src1[0];
+	}
+}
+
+
+void Scale3x_ex8(unsigned char *srcPtr, DWORD srcPitch,
+				 unsigned char *dstPtr, int width, int height)
+{
+	int count = height;
+
+	int dstPitch = srcPitch >> 1;
+
+
+	unsigned long *dst0 = (unsigned long *)dstPtr;
+	unsigned long *dst1 = dst0 + dstPitch;
+	unsigned long *dst2 = dst1 + dstPitch;
+
+	unsigned long *src0 = (unsigned long *)srcPtr;
+	unsigned long *src1 = src0 + (srcPitch >> 2);
+	unsigned long *src2 = src1 + (srcPitch >> 2);
+	scale3x_32_def_whole(dst0, dst1, dst2, src0, src0, src2, width);
+
+	count -= 2;
+	while(count) {
+		dst0 += dstPitch * 3;
+		dst1 += dstPitch * 3;
+		dst2 += dstPitch * 3;
+
+		scale3x_32_def_whole(dst0, dst1, dst2, src0, src1, src2, width);
+		src0 = src1;
+		src1 = src2;
+		src2 += srcPitch >> 2;
+		--count;
+	}
+	dst0 += dstPitch * 3;
+	dst1 += dstPitch * 3;
+	dst2 += dstPitch * 3;
+
+	scale3x_32_def_whole(dst0, dst1, dst2, src0, src1, src1, width);
+}
+
+
+////////////////////////////////////////////////////////////////////////
+
+#define colorMask6 0x0000F7DE
+#define lowPixelMask6 0x00000821
+#define qcolorMask6 0x0000E79c
+#define qlowpixelMask6 0x00001863
+
+#define INTERPOLATE6(A, B) ((((A & colorMask6) >> 1) + ((B & colorMask6) >> 1) + (A & B & lowPixelMask6)))
+#define Q_INTERPOLATE6(A, B, C, D) (((((A & qcolorMask6) >> 2) + ((B & qcolorMask6) >> 2) + ((C & qcolorMask6) >> 2) + ((D & qcolorMask6) >> 2) \
+	+ ((((A & qlowpixelMask6) + (B & qlowpixelMask6) + (C & qlowpixelMask6) + (D & qlowpixelMask6)) >> 2) & qlowpixelMask6))))
+
+void Super2xSaI_ex6(unsigned char *srcPtr, DWORD srcPitch,
+	 unsigned char *dstBitmap, int width, int height)
+{
+ DWORD dstPitch = srcPitch<<1;
+ int finWidth = srcPitch>>1;
+ DWORD line;
+ unsigned short *dP;
+ unsigned short *bP;
+ int iXA,iXB,iXC,iYA,iYB,iYC,finish;
+ DWORD color4, color5, color6;
+ DWORD color1, color2, color3;
+ DWORD colorA0, colorA1, colorA2, colorA3,
+ colorB0, colorB1, colorB2, colorB3,
+ colorS1, colorS2;
+ DWORD product1a, product1b,
+ product2a, product2b;
+
+ line = 0;
+
+ {
+ for (; height; height-=1)
+	{
+ bP = (unsigned short *)srcPtr;
+	 dP = (unsigned short *)(dstBitmap + line*dstPitch);
+ for (finish = width; finish; finish -= 1 )
+ {
+//--------------------------------------- B1 B2
+// 4 5 6 S2
+// 1 2 3 S1
+// A1 A2
+ if(finish==finWidth) iXA=0;
+ else iXA=1;
+ if(finish>4) {iXB=1;iXC=2;}
+ else
+ if(finish>3) {iXB=1;iXC=1;}
+ else {iXB=0;iXC=0;}
+ if(line==0) iYA=0;
+ else iYA=finWidth;
+ if(height>4) {iYB=finWidth;iYC=srcPitch;}
+ else
+ if(height>3) {iYB=finWidth;iYC=finWidth;}
+ else {iYB=0;iYC=0;}
+
+
+ colorB0 = *(bP- iYA - iXA);
+ colorB1 = *(bP- iYA);
+ colorB2 = *(bP- iYA + iXB);
+ colorB3 = *(bP- iYA + iXC);
+
+ color4 = *(bP - iXA);
+ color5 = *(bP);
+ color6 = *(bP + iXB);
+ colorS2 = *(bP + iXC);
+
+ color1 = *(bP + iYB - iXA);
+ color2 = *(bP + iYB);
+ color3 = *(bP + iYB + iXB);
+ colorS1= *(bP + iYB + iXC);
+
+ colorA0 = *(bP + iYC - iXA);
+ colorA1 = *(bP + iYC);
+ colorA2 = *(bP + iYC + iXB);
+ colorA3 = *(bP + iYC + iXC);
+
+//--------------------------------------
+ if (color2 == color6 && color5 != color3)
+ {
+ product2b = product1b = color2;
+ }
+ else
+ if (color5 == color3 && color2 != color6)
+ {
+ product2b = product1b = color5;
+ }
+ else
+ if (color5 == color3 && color2 == color6)
+ {
+ register int r = 0;
+
+ r += GET_RESULT ((color6), (color5), (color1), (colorA1));
+ r += GET_RESULT ((color6), (color5), (color4), (colorB1));
+ r += GET_RESULT ((color6), (color5), (colorA2), (colorS1));
+ r += GET_RESULT ((color6), (color5), (colorB2), (colorS2));
+
+ if (r > 0)
+ product2b = product1b = color6;
+ else
+ if (r < 0)
+ product2b = product1b = color5;
+ else
+ {
+ product2b = product1b = INTERPOLATE6 (color5, color6);
+ }
+ }
+ else
+ {
+ if (color6 == color3 && color3 == colorA1 && color2 != colorA2 && color3 != colorA0)
+ product2b = Q_INTERPOLATE6 (color3, color3, color3, color2);
+ else
+ if (color5 == color2 && color2 == colorA2 && colorA1 != color3 && color2 != colorA3)
+ product2b = Q_INTERPOLATE6 (color2, color2, color2, color3);
+ else
+ product2b = INTERPOLATE6 (color2, color3);
+
+ if (color6 == color3 && color6 == colorB1 && color5 != colorB2 && color6 != colorB0)
+ product1b = Q_INTERPOLATE6 (color6, color6, color6, color5);
+ else
+ if (color5 == color2 && color5 == colorB2 && colorB1 != color6 && color5 != colorB3)
+ product1b = Q_INTERPOLATE6 (color6, color5, color5, color5);
+ else
+ product1b = INTERPOLATE6 (color5, color6);
+ }
+
+ if (color5 == color3 && color2 != color6 && color4 == color5 && color5 != colorA2)
+ product2a = INTERPOLATE6 (color2, color5);
+ else
+ if (color5 == color1 && color6 == color5 && color4 != color2 && color5 != colorA0)
+ product2a = INTERPOLATE6(color2, color5);
+ else
+ product2a = color2;
+
+ if (color2 == color6 && color5 != color3 && color1 == color2 && color2 != colorB2)
+ product1a = INTERPOLATE6(color2, color5);
+ else
+ if (color4 == color2 && color3 == color2 && color1 != color5 && color2 != colorB0)
+ product1a = INTERPOLATE6(color2, color5);
+ else
+ product1a = color5;
+
+ *dP=(unsigned short)product1a;
+ *(dP+1)=(unsigned short)product1b;
+ *(dP+(srcPitch))=(unsigned short)product2a;
+ *(dP+1+(srcPitch))=(unsigned short)product2b;
+
+ bP += 1;
+ dP += 2;
+ }//end of for ( finish= width etc..)
+
+ line += 2;
+ srcPtr += srcPitch;
+	}; //endof: for (; height; height--)
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void Std2xSaI_ex6(unsigned char *srcPtr, DWORD srcPitch,
+	 unsigned char *dstBitmap, int width, int height)
+{
+ DWORD dstPitch = srcPitch<<1;
+ int finWidth = srcPitch>>1;
+ DWORD line;
+ unsigned short *dP;
+ unsigned short *bP;
+ int iXA,iXB,iXC,iYA,iYB,iYC,finish;
+
+ DWORD colorA, colorB;
+ DWORD colorC, colorD,
+ colorE, colorF, colorG, colorH,
+ colorI, colorJ, colorK, colorL,
+ colorM, colorN, colorO, colorP;
+ DWORD product, product1, product2;
+
+ line = 0;
+
+ {
+ for (; height; height-=1)
+	{
+ bP = (unsigned short *)srcPtr;
+	 dP = (unsigned short *)(dstBitmap + line*dstPitch);
+ for (finish = width; finish; finish -= 1 )
+ {
+//---------------------------------------
+// Map of the pixels: I|E F|J
+// G|A B|K
+// H|C D|L
+// M|N O|P
+ if(finish==finWidth) iXA=0;
+ else iXA=1;
+ if(finish>4) {iXB=1;iXC=2;}
+ else
+ if(finish>3) {iXB=1;iXC=1;}
+ else {iXB=0;iXC=0;}
+ if(line==0) iYA=0;
+ else iYA=finWidth;
+ if(height>4) {iYB=finWidth;iYC=srcPitch;}
+ else
+ if(height>3) {iYB=finWidth;iYC=finWidth;}
+ else {iYB=0;iYC=0;}
+
+ colorI = *(bP- iYA - iXA);
+ colorE = *(bP- iYA);
+ colorF = *(bP- iYA + iXB);
+ colorJ = *(bP- iYA + iXC);
+
+ colorG = *(bP - iXA);
+ colorA = *(bP);
+ colorB = *(bP + iXB);
+ colorK = *(bP + iXC);
+
+ colorH = *(bP + iYB - iXA);
+ colorC = *(bP + iYB);
+ colorD = *(bP + iYB + iXB);
+ colorL = *(bP + iYB + iXC);
+
+ colorM = *(bP + iYC - iXA);
+ colorN = *(bP + iYC);
+ colorO = *(bP + iYC + iXB);
+ colorP = *(bP + iYC + iXC);
+
+ if((colorA == colorD) && (colorB != colorC))
+ {
+ if(((colorA == colorE) && (colorB == colorL)) ||
+ ((colorA == colorC) && (colorA == colorF) && 
+ (colorB != colorE) && (colorB == colorJ)))
+ {
+ product = colorA;
+ }
+ else
+ {
+ product = INTERPOLATE6(colorA, colorB);
+ }
+
+ if(((colorA == colorG) && (colorC == colorO)) ||
+ ((colorA == colorB) && (colorA == colorH) && 
+ (colorG != colorC) && (colorC == colorM)))
+ {
+ product1 = colorA;
+ }
+ else
+ {
+ product1 = INTERPOLATE6(colorA, colorC);
+ }
+ product2 = colorA;
+ }
+ else
+ if((colorB == colorC) && (colorA != colorD))
+ {
+ if(((colorB == colorF) && (colorA == colorH)) ||
+ ((colorB == colorE) && (colorB == colorD) && 
+ (colorA != colorF) && (colorA == colorI)))
+ {
+ product = colorB;
+ }
+ else
+ {
+ product = INTERPOLATE6(colorA, colorB);
+ }
+
+ if(((colorC == colorH) && (colorA == colorF)) ||
+ ((colorC == colorG) && (colorC == colorD) && 
+ (colorA != colorH) && (colorA == colorI)))
+ {
+ product1 = colorC;
+ }
+ else
+ {
+ product1=INTERPOLATE6(colorA, colorC);
+ }
+ product2 = colorB;
+ }
+ else
+ if((colorA == colorD) && (colorB == colorC))
+ {
+ if (colorA == colorB)
+ {
+ product = colorA;
+ product1 = colorA;
+ product2 = colorA;
+ }
+ else
+ {
+ register int r = 0;
+ product1 = INTERPOLATE6(colorA, colorC);
+ product = INTERPOLATE6(colorA, colorB);
+
+ r += GetResult1 (colorA, colorB, colorG, colorE, colorI);
+ r += GetResult2 (colorB, colorA, colorK, colorF, colorJ);
+ r += GetResult2 (colorB, colorA, colorH, colorN, colorM);
+ r += GetResult1 (colorA, colorB, colorL, colorO, colorP);
+
+ if (r > 0)
+ product2 = colorA;
+ else
+ if (r < 0)
+ product2 = colorB;
+ else
+ {
+ product2 = Q_INTERPOLATE6(colorA, colorB, colorC, colorD);
+ }
+ }
+ }
+ else
+ {
+ product2 = Q_INTERPOLATE6(colorA, colorB, colorC, colorD);
+
+ if ((colorA == colorC) && (colorA == colorF) && 
+ (colorB != colorE) && (colorB == colorJ))
+ {
+ product = colorA;
+ }
+ else
+ if ((colorB == colorE) && (colorB == colorD) && (colorA != colorF) && (colorA == colorI))
+ {
+ product = colorB;
+ }
+ else
+ {
+ product = INTERPOLATE6(colorA, colorB);
+ }
+
+ if ((colorA == colorB) && (colorA == colorH) && 
+ (colorG != colorC) && (colorC == colorM))
+ {
+ product1 = colorA;
+ }
+ else
+ if ((colorC == colorG) && (colorC == colorD) && 
+ (colorA != colorH) && (colorA == colorI))
+ {
+ product1 = colorC;
+ }
+ else
+ {
+ product1 = INTERPOLATE6(colorA, colorC);
+ }
+ }
+
+ *dP=(unsigned short)colorA;
+ *(dP+1)=(unsigned short)product;
+ *(dP+(srcPitch))=(unsigned short)product1;
+ *(dP+1+(srcPitch))=(unsigned short)product2;
+
+ bP += 1;
+ dP += 2;
+ }//end of for ( finish= width etc..)
+
+ line += 2;
+ srcPtr += srcPitch;
+	}; //endof: for (; height; height--)
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void SuperEagle_ex6(unsigned char *srcPtr, DWORD srcPitch,
+	 unsigned char *dstBitmap, int width, int height)
+{
+ DWORD dstPitch = srcPitch<<1;
+ int finWidth = srcPitch>>1;
+ DWORD line;
+ unsigned short *dP;
+ unsigned short *bP;
+ int iXA,iXB,iXC,iYA,iYB,iYC,finish;
+ DWORD color4, color5, color6;
+ DWORD color1, color2, color3;
+ DWORD colorA1, colorA2, 
+ colorB1, colorB2,
+ colorS1, colorS2;
+ DWORD product1a, product1b,
+ product2a, product2b;
+
+ line = 0;
+
+ {
+ for (; height; height-=1)
+	{
+ bP = (unsigned short *)srcPtr;
+	 dP = (unsigned short *)(dstBitmap + line*dstPitch);
+ for (finish = width; finish; finish -= 1 )
+ {
+ if(finish==finWidth) iXA=0;
+ else iXA=1;
+ if(finish>4) {iXB=1;iXC=2;}
+ else
+ if(finish>3) {iXB=1;iXC=1;}
+ else {iXB=0;iXC=0;}
+ if(line==0) iYA=0;
+ else iYA=finWidth;
+ if(height>4) {iYB=finWidth;iYC=srcPitch;}
+ else
+ if(height>3) {iYB=finWidth;iYC=finWidth;}
+ else {iYB=0;iYC=0;}
+
+ colorB1 = *(bP- iYA);
+ colorB2 = *(bP- iYA + iXB);
+
+ color4 = *(bP - iXA);
+ color5 = *(bP);
+ color6 = *(bP + iXB);
+ colorS2 = *(bP + iXC);
+
+ color1 = *(bP + iYB - iXA);
+ color2 = *(bP + iYB);
+ color3 = *(bP + iYB + iXB);
+ colorS1= *(bP + iYB + iXC);
+
+ colorA1 = *(bP + iYC);
+ colorA2 = *(bP + iYC + iXB);
+
+ if(color2 == color6 && color5 != color3)
+ {
+ product1b = product2a = color2;
+ if((color1 == color2) ||
+ (color6 == colorB2))
+ {
+ product1a = INTERPOLATE6(color2, color5);
+ product1a = INTERPOLATE6(color2, product1a);
+ }
+ else
+ {
+ product1a = INTERPOLATE6(color5, color6);
+ }
+ 
+ if((color6 == colorS2) ||
+ (color2 == colorA1))
+ {
+ product2b = INTERPOLATE6(color2, color3);
+ product2b = INTERPOLATE6(color2, product2b);
+ }
+ else
+ {
+ product2b = INTERPOLATE6(color2, color3);
+ }
+ }
+ else
+ if (color5 == color3 && color2 != color6)
+ {
+ product2b = product1a = color5;
+
+ if ((colorB1 == color5) ||
+ (color3 == colorS1))
+ {
+ product1b = INTERPOLATE6(color5, color6);
+ product1b = INTERPOLATE6(color5, product1b);
+ }
+ else
+ {
+ product1b = INTERPOLATE6(color5, color6);
+ }
+
+ if ((color3 == colorA2) ||
+ (color4 == color5))
+ {
+ product2a = INTERPOLATE6(color5, color2);
+ product2a = INTERPOLATE6(color5, product2a);
+ }
+ else
+ {
+ product2a = INTERPOLATE6(color2, color3);
+ }
+ }
+ else
+ if (color5 == color3 && color2 == color6)
+ {
+ register int r = 0;
+
+ r += GET_RESULT ((color6), (color5), (color1), (colorA1));
+ r += GET_RESULT ((color6), (color5), (color4), (colorB1));
+ r += GET_RESULT ((color6), (color5), (colorA2), (colorS1));
+ r += GET_RESULT ((color6), (color5), (colorB2), (colorS2));
+
+ if (r > 0)
+ {
+ product1b = product2a = color2;
+ product1a = product2b = INTERPOLATE6(color5, color6);
+ }
+ else
+ if (r < 0)
+ {
+ product2b = product1a = color5;
+ product1b = product2a = INTERPOLATE6(color5, color6);
+ }
+ else
+ {
+ product2b = product1a = color5;
+ product1b = product2a = color2;
+ }
+ }
+ else
+ {
+ product2b = product1a = INTERPOLATE6(color2, color6);
+ product2b = Q_INTERPOLATE6(color3, color3, color3, product2b);
+ product1a = Q_INTERPOLATE6(color5, color5, color5, product1a);
+
+ product2a = product1b = INTERPOLATE6(color5, color3);
+ product2a = Q_INTERPOLATE6(color2, color2, color2, product2a);
+ product1b = Q_INTERPOLATE6(color6, color6, color6, product1b);
+ }
+
+ *dP=(unsigned short)product1a;
+ *(dP+1)=(unsigned short)product1b;
+ *(dP+(srcPitch))=(unsigned short)product2a;
+ *(dP+1+(srcPitch))=(unsigned short)product2b;
+
+ bP += 1;
+ dP += 2;
+ }//end of for ( finish= width etc..)
+
+ line += 2;
+ srcPtr += srcPitch;
+	}; //endof: for (; height; height--)
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+#ifndef MAX
+#define MAX(a,b) (((a) > (b)) ? (a) : (b))
+#define MIN(a,b) (((a) < (b)) ? (a) : (b))
+#endif
+
+void Scale2x_ex6_5(unsigned char *srcPtr, DWORD srcPitch,
+	 unsigned char *dstBitmap, int width, int height)
+{
+ int looph, loopw;
+ 
+ unsigned char * srcpix = srcPtr;
+ unsigned char * dstpix = dstBitmap;
+
+ const int srcpitch = srcPitch;
+ const int dstpitch = srcPitch<<1;
+
+ unsigned short E0, E1, E2, E3, B, D, E, F, H;
+ for(looph = 0; looph < height; ++looph)
+ {
+ for(loopw = 0; loopw < width; ++ loopw)
+ {
+ B = *(unsigned short*)(srcpix + (MAX(0,looph-1)*srcpitch) + (2*loopw));
+ D = *(unsigned short*)(srcpix + (looph*srcpitch) + (2*MAX(0,loopw-1)));
+ E = *(unsigned short*)(srcpix + (looph*srcpitch) + (2*loopw));
+ F = *(unsigned short*)(srcpix + (looph*srcpitch) + (2*MIN(width-1,loopw+1)));
+ H = *(unsigned short*)(srcpix + (MIN(height-1,looph+1)*srcpitch) + (2*loopw));
+ 
+		 if (B != H && D != F) {
+				E0 = D == B ? D : E;
+				E1 = B == F ? F : E;
+				E2 = D == H ? D : E;
+				E3 = H == F ? F : E;
+			} else {
+				E0 = E;
+				E1 = E;
+				E2 = E;
+				E3 = E;
+			}
+
+
+ *(unsigned short*)(dstpix + looph*2*dstpitch + loopw*2*2) = E0;
+ *(unsigned short*)(dstpix + looph*2*dstpitch + (loopw*2+1)*2) = E1;
+ *(unsigned short*)(dstpix + (looph*2+1)*dstpitch + loopw*2*2) = E2;
+ *(unsigned short*)(dstpix + (looph*2+1)*dstpitch + (loopw*2+1)*2) = E3;
+ }
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+static __inline void scale3x_16_def_whole(unsigned short* dst0, unsigned short *dst1, unsigned short *dst2, const unsigned short *src0, const unsigned short *src1, const unsigned short *src2, unsigned count)
+{
+	//assert(count >= 2);
+
+	/* first pixel */
+	if (src0[0] != src2[0] && src1[0] != src1[1]) {
+		dst0[0] = src1[0];
+		dst0[1] = (src1[0] == src0[0] && src1[0] != src0[1]) || (src1[1] == src0[0] && src1[0] != src0[0]) ? src0[0] : src1[0];
+		dst0[2] = src1[1] == src0[0] ? src1[1] : src1[0];
+		dst1[0] = (src1[0] == src0[0] && src1[0] != src2[0]) || (src1[0] == src2[0] && src1[0] != src0[0]) ? src1[0] : src1[0];
+		dst1[1] = src1[0];
+		dst1[2] = (src1[1] == src0[0] && src1[0] != src2[1]) || (src1[1] == src2[0] && src1[0] != src0[1]) ? src1[1] : src1[0];
+		dst2[0] = src1[0];
+		dst2[1] = (src1[0] == src2[0] && src1[0] != src2[1]) || (src1[1] == src2[0] && src1[0] != src2[0]) ? src2[0] : src1[0];
+		dst2[2] = src1[1] == src2[0] ? src1[1] : src1[0];
+	} else {
+		dst0[0] = src1[0];
+		dst0[1] = src1[0];
+		dst0[2] = src1[0];
+		dst1[0] = src1[0];
+		dst1[1] = src1[0];
+		dst1[2] = src1[0];
+		dst2[0] = src1[0];
+		dst2[1] = src1[0];
+		dst2[2] = src1[0];
+	}
+	++src0;
+	++src1;
+	++src2;
+	dst0 += 3;
+	dst1 += 3;
+	dst2 += 3;
+
+	/* central pixels */
+	count -= 2;
+	while (count) {
+		if (src0[0] != src2[0] && src1[-1] != src1[1]) {
+			dst0[0] = src1[-1] == src0[0] ? src1[-1] : src1[0];
+			dst0[1] = (src1[-1] == src0[0] && src1[0] != src0[1]) || (src1[1] == src0[0] && src1[0] != src0[-1]) ? src0[0] : src1[0];
+			dst0[2] = src1[1] == src0[0] ? src1[1] : src1[0];
+			dst1[0] = (src1[-1] == src0[0] && src1[0] != src2[-1]) || (src1[-1] == src2[0] && src1[0] != src0[-1]) ? src1[-1] : src1[0];
+			dst1[1] = src1[0];
+			dst1[2] = (src1[1] == src0[0] && src1[0] != src2[1]) || (src1[1] == src2[0] && src1[0] != src0[1]) ? src1[1] : src1[0];
+			dst2[0] = src1[-1] == src2[0] ? src1[-1] : src1[0];
+			dst2[1] = (src1[-1] == src2[0] && src1[0] != src2[1]) || (src1[1] == src2[0] && src1[0] != src2[-1]) ? src2[0] : src1[0];
+			dst2[2] = src1[1] == src2[0] ? src1[1] : src1[0];
+		} else {
+			dst0[0] = src1[0];
+			dst0[1] = src1[0];
+			dst0[2] = src1[0];
+			dst1[0] = src1[0];
+			dst1[1] = src1[0];
+			dst1[2] = src1[0];
+			dst2[0] = src1[0];
+			dst2[1] = src1[0];
+			dst2[2] = src1[0];
+		}
+
+		++src0;
+		++src1;
+		++src2;
+		dst0 += 3;
+		dst1 += 3;
+		dst2 += 3;
+		--count;
+	}
+
+	/* last pixel */
+	if (src0[0] != src2[0] && src1[-1] != src1[0]) {
+		dst0[0] = src1[-1] == src0[0] ? src1[-1] : src1[0];
+		dst0[1] = (src1[-1] == src0[0] && src1[0] != src0[0]) || (src1[0] == src0[0] && src1[0] != src0[-1]) ? src0[0] : src1[0];
+		dst0[2] = src1[0];
+		dst1[0] = (src1[-1] == src0[0] && src1[0] != src2[-1]) || (src1[-1] == src2[0] && src1[0] != src0[-1]) ? src1[-1] : src1[0];
+		dst1[1] = src1[0];
+		dst1[2] = (src1[0] == src0[0] && src1[0] != src2[0]) || (src1[0] == src2[0] && src1[0] != src0[0]) ? src1[0] : src1[0];
+		dst2[0] = src1[-1] == src2[0] ? src1[-1] : src1[0];
+		dst2[1] = (src1[-1] == src2[0] && src1[0] != src2[0]) || (src1[0] == src2[0] && src1[0] != src2[-1]) ? src2[0] : src1[0];
+		dst2[2] = src1[0];
+	} else {
+		dst0[0] = src1[0];
+		dst0[1] = src1[0];
+		dst0[2] = src1[0];
+		dst1[0] = src1[0];
+		dst1[1] = src1[0];
+		dst1[2] = src1[0];
+		dst2[0] = src1[0];
+		dst2[1] = src1[0];
+		dst2[2] = src1[0];
+	}
+}
+
+
+
+void Scale3x_ex6_5(unsigned char *srcPtr, DWORD srcPitch,
+				 unsigned char *dstPtr, int width, int height)
+{
+	int count = height;
+	int dstPitch = srcPitch; 
+
+	unsigned short *dst0 = (unsigned short *)dstPtr;
+	unsigned short *dst1 = dst0 + dstPitch;
+	unsigned short *dst2 = dst1 + dstPitch;
+
+	unsigned short *src0 = (unsigned short *)srcPtr;
+	unsigned short *src1 = src0 + (srcPitch >> 1);
+	unsigned short *src2 = src1 + (srcPitch >> 1);
+	scale3x_16_def_whole(dst0, dst1, dst2, src0, src1, src2, count);
+
+	count -= 2;
+	while(count) {
+
+		dst0 += dstPitch * 3;
+		dst1 += dstPitch * 3;
+		dst2 += dstPitch * 3;
+
+		scale3x_16_def_whole(dst0, dst1, dst2, src0, src1, src2, width);
+		src0 = src1;
+		src1 = src2;
+		src2 += srcPitch >> 1;
+		--count;
+	}
+	dst0 += dstPitch * 3;
+	dst1 += dstPitch * 3;
+	dst2 += dstPitch * 3;
+
+	scale3x_16_def_whole(dst0, dst1, dst2, src0, src1, src1, width);
+}
+
+////////////////////////////////////////////////////////////////////////
+
+/*
+#define colorMask5 0x0000F7DE
+#define lowPixelMask5 0x00000821
+#define qcolorMask5 0x0000E79c
+#define qlowpixelMask5 0x00001863
+*/
+
+#define colorMask5 0x00007BDE
+#define lowPixelMask5 0x00000421
+#define qcolorMask5 0x0000739c
+#define qlowpixelMask5 0x00000C63
+
+#define INTERPOLATE5(A, B) ((((A & colorMask5) >> 1) + ((B & colorMask5) >> 1) + (A & B & lowPixelMask5)))
+#define Q_INTERPOLATE5(A, B, C, D) (((((A & qcolorMask5) >> 2) + ((B & qcolorMask5) >> 2) + ((C & qcolorMask5) >> 2) + ((D & qcolorMask5) >> 2) \
+	+ ((((A & qlowpixelMask5) + (B & qlowpixelMask5) + (C & qlowpixelMask5) + (D & qlowpixelMask5)) >> 2) & qlowpixelMask5))))
+
+void Super2xSaI_ex5(unsigned char *srcPtr, DWORD srcPitch,
+	 unsigned char *dstBitmap, int width, int height)
+{
+ DWORD dstPitch = srcPitch<<1;
+ int finWidth = srcPitch>>1;
+ DWORD line;
+ unsigned short *dP;
+ unsigned short *bP;
+ int iXA,iXB,iXC,iYA,iYB,iYC,finish;
+ DWORD color4, color5, color6;
+ DWORD color1, color2, color3;
+ DWORD colorA0, colorA1, colorA2, colorA3,
+ colorB0, colorB1, colorB2, colorB3,
+ colorS1, colorS2;
+ DWORD product1a, product1b,
+ product2a, product2b;
+
+ line = 0;
+
+ {
+ for (; height; height-=1)
+	{
+ bP = (unsigned short *)srcPtr;
+	 dP = (unsigned short *)(dstBitmap + line*dstPitch);
+ for (finish = width; finish; finish -= 1 )
+ {
+//--------------------------------------- B1 B2
+// 4 5 6 S2
+// 1 2 3 S1
+// A1 A2
+ if(finish==finWidth) iXA=0;
+ else iXA=1;
+ if(finish>4) {iXB=1;iXC=2;}
+ else
+ if(finish>3) {iXB=1;iXC=1;}
+ else {iXB=0;iXC=0;}
+ if(line==0) iYA=0;
+ else iYA=finWidth;
+ if(height>4) {iYB=finWidth;iYC=srcPitch;}
+ else
+ if(height>3) {iYB=finWidth;iYC=finWidth;}
+ else {iYB=0;iYC=0;}
+
+
+ colorB0 = *(bP- iYA - iXA);
+ colorB1 = *(bP- iYA);
+ colorB2 = *(bP- iYA + iXB);
+ colorB3 = *(bP- iYA + iXC);
+
+ color4 = *(bP - iXA);
+ color5 = *(bP);
+ color6 = *(bP + iXB);
+ colorS2 = *(bP + iXC);
+
+ color1 = *(bP + iYB - iXA);
+ color2 = *(bP + iYB);
+ color3 = *(bP + iYB + iXB);
+ colorS1= *(bP + iYB + iXC);
+
+ colorA0 = *(bP + iYC - iXA);
+ colorA1 = *(bP + iYC);
+ colorA2 = *(bP + iYC + iXB);
+ colorA3 = *(bP + iYC + iXC);
+
+//--------------------------------------
+ if (color2 == color6 && color5 != color3)
+ {
+ product2b = product1b = color2;
+ }
+ else
+ if (color5 == color3 && color2 != color6)
+ {
+ product2b = product1b = color5;
+ }
+ else
+ if (color5 == color3 && color2 == color6)
+ {
+ register int r = 0;
+
+ r += GET_RESULT ((color6), (color5), (color1), (colorA1));
+ r += GET_RESULT ((color6), (color5), (color4), (colorB1));
+ r += GET_RESULT ((color6), (color5), (colorA2), (colorS1));
+ r += GET_RESULT ((color6), (color5), (colorB2), (colorS2));
+
+ if (r > 0)
+ product2b = product1b = color6;
+ else
+ if (r < 0)
+ product2b = product1b = color5;
+ else
+ {
+ product2b = product1b = INTERPOLATE5 (color5, color6);
+ }
+ }
+ else
+ {
+ if (color6 == color3 && color3 == colorA1 && color2 != colorA2 && color3 != colorA0)
+ product2b = Q_INTERPOLATE5 (color3, color3, color3, color2);
+ else
+ if (color5 == color2 && color2 == colorA2 && colorA1 != color3 && color2 != colorA3)
+ product2b = Q_INTERPOLATE5 (color2, color2, color2, color3);
+ else
+ product2b = INTERPOLATE5 (color2, color3);
+
+ if (color6 == color3 && color6 == colorB1 && color5 != colorB2 && color6 != colorB0)
+ product1b = Q_INTERPOLATE5 (color6, color6, color6, color5);
+ else
+ if (color5 == color2 && color5 == colorB2 && colorB1 != color6 && color5 != colorB3)
+ product1b = Q_INTERPOLATE5 (color6, color5, color5, color5);
+ else
+ product1b = INTERPOLATE5 (color5, color6);
+ }
+
+ if (color5 == color3 && color2 != color6 && color4 == color5 && color5 != colorA2)
+ product2a = INTERPOLATE5 (color2, color5);
+ else
+ if (color5 == color1 && color6 == color5 && color4 != color2 && color5 != colorA0)
+ product2a = INTERPOLATE5(color2, color5);
+ else
+ product2a = color2;
+
+ if (color2 == color6 && color5 != color3 && color1 == color2 && color2 != colorB2)
+ product1a = INTERPOLATE5(color2, color5);
+ else
+ if (color4 == color2 && color3 == color2 && color1 != color5 && color2 != colorB0)
+ product1a = INTERPOLATE5(color2, color5);
+ else
+ product1a = color5;
+
+ *dP=(unsigned short)product1a;
+ *(dP+1)=(unsigned short)product1b;
+ *(dP+(srcPitch))=(unsigned short)product2a;
+ *(dP+1+(srcPitch))=(unsigned short)product2b;
+
+ bP += 1;
+ dP += 2;
+ }//end of for ( finish= width etc..)
+
+ line += 2;
+ srcPtr += srcPitch;
+	}; //endof: for (; height; height--)
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void Std2xSaI_ex5(unsigned char *srcPtr, DWORD srcPitch,
+	 unsigned char *dstBitmap, int width, int height)
+{
+ DWORD dstPitch = srcPitch<<1;
+ int finWidth = srcPitch>>1;
+ DWORD line;
+ unsigned short *dP;
+ unsigned short *bP;
+ int iXA,iXB,iXC,iYA,iYB,iYC,finish;
+ DWORD colorA, colorB;
+ DWORD colorC, colorD,
+ colorE, colorF, colorG, colorH,
+ colorI, colorJ, colorK, colorL,
+ colorM, colorN, colorO, colorP;
+ DWORD product, product1, product2;
+
+ line = 0;
+
+ {
+ for (; height; height-=1)
+	{
+ bP = (unsigned short *)srcPtr;
+	 dP = (unsigned short *)(dstBitmap + line*dstPitch);
+ for (finish = width; finish; finish -= 1 )
+ {
+//---------------------------------------
+// Map of the pixels: I|E F|J
+// G|A B|K
+// H|C D|L
+// M|N O|P
+ if(finish==finWidth) iXA=0;
+ else iXA=1;
+ if(finish>4) {iXB=1;iXC=2;}
+ else
+ if(finish>3) {iXB=1;iXC=1;}
+ else {iXB=0;iXC=0;}
+ if(line==0) iYA=0;
+ else iYA=finWidth;
+ if(height>4) {iYB=finWidth;iYC=srcPitch;}
+ else
+ if(height>3) {iYB=finWidth;iYC=finWidth;}
+ else {iYB=0;iYC=0;}
+
+ colorI = *(bP- iYA - iXA);
+ colorE = *(bP- iYA);
+ colorF = *(bP- iYA + iXB);
+ colorJ = *(bP- iYA + iXC);
+
+ colorG = *(bP - iXA);
+ colorA = *(bP);
+ colorB = *(bP + iXB);
+ colorK = *(bP + iXC);
+
+ colorH = *(bP + iYB - iXA);
+ colorC = *(bP + iYB);
+ colorD = *(bP + iYB + iXB);
+ colorL = *(bP + iYB + iXC);
+
+ colorM = *(bP + iYC - iXA);
+ colorN = *(bP + iYC);
+ colorO = *(bP + iYC + iXB);
+ colorP = *(bP + iYC + iXC);
+
+ if((colorA == colorD) && (colorB != colorC))
+ {
+ if(((colorA == colorE) && (colorB == colorL)) ||
+ ((colorA == colorC) && (colorA == colorF) && 
+ (colorB != colorE) && (colorB == colorJ)))
+ {
+ product = colorA;
+ }
+ else
+ {
+ product = INTERPOLATE5(colorA, colorB);
+ }
+
+ if(((colorA == colorG) && (colorC == colorO)) ||
+ ((colorA == colorB) && (colorA == colorH) && 
+ (colorG != colorC) && (colorC == colorM)))
+ {
+ product1 = colorA;
+ }
+ else
+ {
+ product1 = INTERPOLATE5(colorA, colorC);
+ }
+ product2 = colorA;
+ }
+ else
+ if((colorB == colorC) && (colorA != colorD))
+ {
+ if(((colorB == colorF) && (colorA == colorH)) ||
+ ((colorB == colorE) && (colorB == colorD) && 
+ (colorA != colorF) && (colorA == colorI)))
+ {
+ product = colorB;
+ }
+ else
+ {
+ product = INTERPOLATE5(colorA, colorB);
+ }
+
+ if(((colorC == colorH) && (colorA == colorF)) ||
+ ((colorC == colorG) && (colorC == colorD) && 
+ (colorA != colorH) && (colorA == colorI)))
+ {
+ product1 = colorC;
+ }
+ else
+ {
+ product1=INTERPOLATE5(colorA, colorC);
+ }
+ product2 = colorB;
+ }
+ else
+ if((colorA == colorD) && (colorB == colorC))
+ {
+ if (colorA == colorB)
+ {
+ product = colorA;
+ product1 = colorA;
+ product2 = colorA;
+ }
+ else
+ {
+ register int r = 0;
+ product1 = INTERPOLATE5(colorA, colorC);
+ product = INTERPOLATE5(colorA, colorB);
+
+ r += GetResult1 (colorA, colorB, colorG, colorE, colorI);
+ r += GetResult2 (colorB, colorA, colorK, colorF, colorJ);
+ r += GetResult2 (colorB, colorA, colorH, colorN, colorM);
+ r += GetResult1 (colorA, colorB, colorL, colorO, colorP);
+
+ if (r > 0)
+ product2 = colorA;
+ else
+ if (r < 0)
+ product2 = colorB;
+ else
+ {
+ product2 = Q_INTERPOLATE5(colorA, colorB, colorC, colorD);
+ }
+ }
+ }
+ else
+ {
+ product2 = Q_INTERPOLATE5(colorA, colorB, colorC, colorD);
+
+ if ((colorA == colorC) && (colorA == colorF) && 
+ (colorB != colorE) && (colorB == colorJ))
+ {
+ product = colorA;
+ }
+ else
+ if ((colorB == colorE) && (colorB == colorD) && (colorA != colorF) && (colorA == colorI))
+ {
+ product = colorB;
+ }
+ else
+ {
+ product = INTERPOLATE5(colorA, colorB);
+ }
+
+ if ((colorA == colorB) && (colorA == colorH) && 
+ (colorG != colorC) && (colorC == colorM))
+ {
+ product1 = colorA;
+ }
+ else
+ if ((colorC == colorG) && (colorC == colorD) && 
+ (colorA != colorH) && (colorA == colorI))
+ {
+ product1 = colorC;
+ }
+ else
+ {
+ product1 = INTERPOLATE5(colorA, colorC);
+ }
+ }
+
+ *dP=(unsigned short)colorA;
+ *(dP+1)=(unsigned short)product;
+ *(dP+(srcPitch))=(unsigned short)product1;
+ *(dP+1+(srcPitch))=(unsigned short)product2;
+
+ bP += 1;
+ dP += 2;
+ }//end of for ( finish= width etc..)
+
+ line += 2;
+ srcPtr += srcPitch;
+	}; //endof: for (; height; height--)
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void SuperEagle_ex5(unsigned char *srcPtr, DWORD srcPitch,
+	 unsigned char *dstBitmap, int width, int height)
+{
+ DWORD dstPitch = srcPitch<<1;
+ int finWidth = srcPitch>>1;
+ DWORD line;
+ unsigned short *dP;
+ unsigned short *bP;
+ int iXA,iXB,iXC,iYA,iYB,iYC,finish;
+ DWORD color4, color5, color6;
+ DWORD color1, color2, color3;
+ DWORD colorA1, colorA2, 
+ colorB1, colorB2,
+ colorS1, colorS2;
+ DWORD product1a, product1b,
+ product2a, product2b;
+
+ line = 0;
+
+ {
+ for (; height; height-=1)
+	{
+ bP = (unsigned short *)srcPtr;
+	 dP = (unsigned short *)(dstBitmap + line*dstPitch);
+ for (finish = width; finish; finish -= 1 )
+ {
+ if(finish==finWidth) iXA=0;
+ else iXA=1;
+ if(finish>4) {iXB=1;iXC=2;}
+ else
+ if(finish>3) {iXB=1;iXC=1;}
+ else {iXB=0;iXC=0;}
+ if(line==0) iYA=0;
+ else iYA=finWidth;
+ if(height>4) {iYB=finWidth;iYC=srcPitch;}
+ else
+ if(height>3) {iYB=finWidth;iYC=finWidth;}
+ else {iYB=0;iYC=0;}
+
+ colorB1 = *(bP- iYA);
+ colorB2 = *(bP- iYA + iXB);
+
+ color4 = *(bP - iXA);
+ color5 = *(bP);
+ color6 = *(bP + iXB);
+ colorS2 = *(bP + iXC);
+
+ color1 = *(bP + iYB - iXA);
+ color2 = *(bP + iYB);
+ color3 = *(bP + iYB + iXB);
+ colorS1= *(bP + iYB + iXC);
+
+ colorA1 = *(bP + iYC);
+ colorA2 = *(bP + iYC + iXB);
+
+ if(color2 == color6 && color5 != color3)
+ {
+ product1b = product2a = color2;
+ if((color1 == color2) ||
+ (color6 == colorB2))
+ {
+ product1a = INTERPOLATE5(color2, color5);
+ product1a = INTERPOLATE5(color2, product1a);
+ }
+ else
+ {
+ product1a = INTERPOLATE5(color5, color6);
+ }
+ 
+ if((color6 == colorS2) ||
+ (color2 == colorA1))
+ {
+ product2b = INTERPOLATE5(color2, color3);
+ product2b = INTERPOLATE5(color2, product2b);
+ }
+ else
+ {
+ product2b = INTERPOLATE5(color2, color3);
+ }
+ }
+ else
+ if (color5 == color3 && color2 != color6)
+ {
+ product2b = product1a = color5;
+
+ if ((colorB1 == color5) ||
+ (color3 == colorS1))
+ {
+ product1b = INTERPOLATE5(color5, color6);
+ product1b = INTERPOLATE5(color5, product1b);
+ }
+ else
+ {
+ product1b = INTERPOLATE5(color5, color6);
+ }
+
+ if ((color3 == colorA2) ||
+ (color4 == color5))
+ {
+ product2a = INTERPOLATE5(color5, color2);
+ product2a = INTERPOLATE5(color5, product2a);
+ }
+ else
+ {
+ product2a = INTERPOLATE5(color2, color3);
+ }
+ }
+ else
+ if (color5 == color3 && color2 == color6)
+ {
+ register int r = 0;
+
+ r += GET_RESULT ((color6), (color5), (color1), (colorA1));
+ r += GET_RESULT ((color6), (color5), (color4), (colorB1));
+ r += GET_RESULT ((color6), (color5), (colorA2), (colorS1));
+ r += GET_RESULT ((color6), (color5), (colorB2), (colorS2));
+
+ if (r > 0)
+ {
+ product1b = product2a = color2;
+ product1a = product2b = INTERPOLATE5(color5, color6);
+ }
+ else
+ if (r < 0)
+ {
+ product2b = product1a = color5;
+ product1b = product2a = INTERPOLATE5(color5, color6);
+ }
+ else
+ {
+ product2b = product1a = color5;
+ product1b = product2a = color2;
+ }
+ }
+ else
+ {
+ product2b = product1a = INTERPOLATE5(color2, color6);
+ product2b = Q_INTERPOLATE5(color3, color3, color3, product2b);
+ product1a = Q_INTERPOLATE5(color5, color5, color5, product1a);
+
+ product2a = product1b = INTERPOLATE5(color5, color3);
+ product2a = Q_INTERPOLATE5(color2, color2, color2, product2a);
+ product1b = Q_INTERPOLATE5(color6, color6, color6, product1b);
+ }
+
+ *dP=(unsigned short)product1a;
+ *(dP+1)=(unsigned short)product1b;
+ *(dP+(srcPitch))=(unsigned short)product2a;
+ *(dP+1+(srcPitch))=(unsigned short)product2b;
+
+ bP += 1;
+ dP += 2;
+ }//end of for ( finish= width etc..)
+
+ line += 2;
+ srcPtr += srcPitch;
+	}; //endof: for (; height; height--)
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+// own swap buffer func (window/fullscreen)
+////////////////////////////////////////////////////////////////////////
+
+sDX DX;
+static DDSURFACEDESC ddsd;
+GUID guiDev;
+BOOL bDeviceOK;
+HWND hWGPU;
+int			 iSysMemory=0;
+int iFPSEInterface=0;
+int			 iRefreshRate;
+BOOL		 bVsync=FALSE;
+BOOL		 bVsync_Key=FALSE;
+
+void (*BlitScreen) (unsigned char *,long,long);
+void (*pExtraBltFunc) (void);
+void (*p2XSaIFunc) (unsigned char *,DWORD,unsigned char *,int,int);
+
+////////////////////////////////////////////////////////////////////////
+
+static __inline void WaitVBlank(void)
+{
+ if(bVsync_Key)
+ {
+ IDirectDraw2_WaitForVerticalBlank(DX.DD,DDWAITVB_BLOCKBEGIN,0);
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void BlitScreen32(unsigned char * surf,long x,long y) // BLIT IN 32bit COLOR MODE
+{
+ unsigned char * pD;unsigned long lu;unsigned short s;
+ unsigned int startxy;
+ short row,column;
+ short dx=(short)PreviousPSXDisplay.Range.x1;
+ short dy=(short)PreviousPSXDisplay.DisplayMode.y;
+
+ if(iDebugMode && iFVDisplay)
+ {
+ dx=1024;
+ dy=iGPUHeight;
+ x=0;y=0;
+
+ for(column=0;column<dy;column++)
+ {
+ startxy=((1024)*(column+y))+x;
+ for(row=0;row<dx;row++)
+ {
+ s=psxVuw[startxy++];
+ *((unsigned long *)((surf)+(column*ddsd.lPitch)+row*4))=
+ ((((s<<19)&0xf80000)|((s<<6)&0xf800)|((s>>7)&0xf8))&0xffffff)|0xff000000;
+ }
+ }
+ return;
+ }
+
+
+ if(PreviousPSXDisplay.Range.y0) // centering needed?
+ {
+ surf+=PreviousPSXDisplay.Range.y0*ddsd.lPitch;
+ dy-=PreviousPSXDisplay.Range.y0;
+ }
+
+ surf+=PreviousPSXDisplay.Range.x0<<2;
+
+ if(PSXDisplay.RGB24)
+ {
+ if(iFPSEInterface)
+ {
+ for(column=0;column<dy;column++)
+ { 
+ startxy=((1024)*(column+y))+x;
+ pD=(unsigned char *)&psxVuw[startxy];
+
+ for(row=0;row<dx;row++)
+ {
+ lu=*((unsigned long *)pD);
+ *((unsigned long *)((surf)+(column*ddsd.lPitch)+row*4))=
+ 0xff000000|(BLUE(lu)<<16)|(GREEN(lu)<<8)|(RED(lu));
+ pD+=3;
+ }
+ }
+ }
+ else
+ {
+ for(column=0;column<dy;column++)
+ { 
+ startxy=((1024)*(column+y))+x;
+ pD=(unsigned char *)&psxVuw[startxy];
+
+ for(row=0;row<dx;row++)
+ {
+ lu=*((unsigned long *)pD);
+ *((unsigned long *)((surf)+(column*ddsd.lPitch)+row*4))=
+ 0xff000000|(RED(lu)<<16)|(GREEN(lu)<<8)|(BLUE(lu));
+ pD+=3;
+ }
+ }
+ }
+ }
+ else
+ {
+ for(column=0;column<dy;column++)
+ {
+ startxy=((1024)*(column+y))+x;
+ for(row=0;row<dx;row++)
+ {
+ s=psxVuw[startxy++];
+ *((unsigned long *)((surf)+(column*ddsd.lPitch)+row*4))=
+ ((((s<<19)&0xf80000)|((s<<6)&0xf800)|((s>>7)&0xf8))&0xffffff)|0xff000000;
+ }
+ }
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void BlitScreen32_2xSaI(unsigned char * surf,long x,long y) // BLIT IN 32bit COLOR MODE
+{
+ unsigned char * pD;unsigned long lu;unsigned short s;
+ unsigned int startxy,off1,off2;
+ short row,column;
+ short dx=(short)PreviousPSXDisplay.Range.x1;
+ short dy=(short)PreviousPSXDisplay.DisplayMode.y;
+ unsigned char * pS=(unsigned char *)pSaISmallBuff;
+ unsigned long * pS1, * pS2;
+
+ if(PreviousPSXDisplay.DisplayMode.x>512)
+ {BlitScreen32(surf,x,y);return;}
+
+ if(PreviousPSXDisplay.Range.y0) // centering needed?
+ {
+ pS+=PreviousPSXDisplay.Range.y0*2048;
+ dy-=PreviousPSXDisplay.Range.y0;
+ }
+
+ pS+=PreviousPSXDisplay.Range.x0<<2;
+
+ if(PSXDisplay.RGB24)
+ {
+ if(iFPSEInterface)
+ {
+ for(column=0;column<dy;column++)
+ { 
+ startxy=((1024)*(column+y))+x;
+ pD=(unsigned char *)&psxVuw[startxy];
+
+ for(row=0;row<dx;row++)
+ {
+ lu=*((unsigned long *)pD);
+ *((unsigned long *)((pS)+(column*2048)+row*4))=
+ 0xff000000|(BLUE(lu)<<16)|(GREEN(lu)<<8)|(RED(lu));
+ pD+=3;
+ }
+ }
+ }
+ else
+ {
+ for(column=0;column<dy;column++)
+ { 
+ startxy=((1024)*(column+y))+x;
+ pD=(unsigned char *)&psxVuw[startxy];
+
+ for(row=0;row<dx;row++)
+ {
+ lu=*((unsigned long *)pD);
+ *((unsigned long *)((pS)+(column*2048)+row*4))=
+ 0xff000000|(RED(lu)<<16)|(GREEN(lu)<<8)|(BLUE(lu));
+ pD+=3;
+ }
+ }
+ }
+ }
+ else
+ {
+ for(column=0;column<dy;column++)
+ {
+ startxy=((1024)*(column+y))+x;
+ for(row=0;row<dx;row++)
+ {
+ s=psxVuw[startxy++];
+ *((unsigned long *)((pS)+(column*2048)+row*4))=
+ ((((s<<19)&0xf80000)|((s<<6)&0xf800)|((s>>7)&0xf8))&0xffffff)|0xff000000;
+ }
+ }
+ }
+
+ // ok, here we have filled pSaISmallBuff with PreviousPSXDisplay.DisplayMode.x * PreviousPSXDisplay.DisplayMode.y (*4) data
+ // now do a 2xSai blit to pSaIBigBuff
+
+ p2XSaIFunc((unsigned char *)pSaISmallBuff, 2048,
+	 (unsigned char *)pSaIBigBuff,
+ PreviousPSXDisplay.DisplayMode.x,
+ PreviousPSXDisplay.DisplayMode.y);
+
+ // ok, here we have pSaIBigBuff filled with the 2xSai image...
+ // now transfer it to the surface
+
+ dx=(short)PreviousPSXDisplay.DisplayMode.x<<1;
+ dy=(short)PreviousPSXDisplay.DisplayMode.y<<1;
+ off1=(ddsd.lPitch>>2)-dx;
+ off2=1024-dx;
+
+ pS1=(unsigned long *)surf;
+ pS2=(unsigned long *)pSaIBigBuff;
+
+ for(column=0;column<dy;column++)
+ { 
+ for(row=0;row<dx;row++)
+ {
+ *(pS1++)=*(pS2++);
+ }
+ pS1+=off1;
+ pS2+=off2;
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////
+void BlitScreen32_3xSaI(unsigned char * surf,long x,long y) // BLIT IN 32bit COLOR MODE
+{
+	unsigned char * pD;unsigned long lu;unsigned short s;
+	unsigned int startxy,off1,off2;
+	short row,column;
+	short dx=(short)PreviousPSXDisplay.Range.x1;
+	short dy=(short)PreviousPSXDisplay.DisplayMode.y;
+	unsigned char * pS=(unsigned char *)pSaISmallBuff;
+	unsigned long * pS1, * pS2;
+
+	if(PreviousPSXDisplay.DisplayMode.x>512)
+	{BlitScreen32(surf,x,y);return;}
+
+	if(PreviousPSXDisplay.Range.y0) // centering needed?
+	{
+		pS+=PreviousPSXDisplay.Range.y0*2048;
+		dy-=PreviousPSXDisplay.Range.y0;
+	}
+
+	pS+=PreviousPSXDisplay.Range.x0<<2;
+
+	if(PSXDisplay.RGB24)
+	{
+		if(iFPSEInterface)
+		{
+			for(column=0;column<dy;column++)
+			{
+				startxy=((1024)*(column+y))+x;
+				pD=(unsigned char *)&psxVuw[startxy];
+
+				for(row=0;row<dx;row++)
+				{
+					lu=*((unsigned long *)pD);
+					*((unsigned long *)((pS)+(column*2048)+row*4))=
+						0xff000000|(BLUE(lu)<<16)|(GREEN(lu)<<8)|(RED(lu));
+					pD+=3;
+				}
+			}
+		}
+		else
+		{
+			for(column=0;column<dy;column++)
+			{
+				startxy=((1024)*(column+y))+x;
+				pD=(unsigned char *)&psxVuw[startxy];
+
+				for(row=0;row<dx;row++)
+				{
+					lu=*((unsigned long *)pD);
+					*((unsigned long *)((pS)+(column*2048)+row*4))=
+						0xff000000|(RED(lu)<<16)|(GREEN(lu)<<8)|(BLUE(lu));
+					pD+=3;
+				}
+			}
+		}
+	}
+	else
+	{
+		for(column=0;column<dy;column++)
+		{
+			startxy=((1024)*(column+y))+x;
+			for(row=0;row<dx;row++)
+			{
+				s=psxVuw[startxy++];
+				*((unsigned long *)((pS)+(column*2048)+row*4))=
+					((((s<<19)&0xf80000)|((s<<6)&0xf800)|((s>>7)&0xf8))&0xffffff)|0xff000000;
+			}
+		}
+	}
+
+	// ok, here we have filled pSaISmallBuff with PreviousPSXDisplay.DisplayMode.x * PreviousPSXDisplay.DisplayMode.y (*4) data
+	// now do a 2xSai blit to pSaIBigBuff
+
+	p2XSaIFunc((unsigned char *)pSaISmallBuff, 2048,
+		(unsigned char *)pSaIBigBuff,
+		PreviousPSXDisplay.DisplayMode.x,
+		PreviousPSXDisplay.DisplayMode.y);
+
+	// ok, here we have pSaIBigBuff filled with the 2xSai image...
+	// now transfer it to the surface
+	//CHANGED << 1 to * 3
+
+	dx=(short)PreviousPSXDisplay.DisplayMode.x * 3;
+	dy=(short)PreviousPSXDisplay.DisplayMode.y * 3;
+
+	off1=(ddsd.lPitch>>2)-dx;
+	off2=1024-dx;
+
+	pS1=(unsigned long *)surf;
+	pS2=(unsigned long *)pSaIBigBuff;
+
+	for(column=0;column<dy;column++)
+	{
+		for(row=0;row<dx;row++)
+		{
+			*(pS1++)=*(pS2++);
+		}
+		pS1+=off1;
+		pS2+=off2;
+	}
+}
+//////////////////////////////////////////////////////////////////////
+void BlitScreen16(unsigned char * surf,long x,long y) // BLIT IN 16bit COLOR MODE
+{
+ unsigned long lu;
+ unsigned short row,column;
+ unsigned short dx=(unsigned short)PreviousPSXDisplay.Range.x1;
+ unsigned short dy=(unsigned short)PreviousPSXDisplay.DisplayMode.y;
+
+ if(iDebugMode && iFVDisplay)
+ {
+ unsigned short LineOffset,SurfOffset;
+ unsigned long * SRCPtr;
+ unsigned long * DSTPtr;
+
+ dx=1024;
+ dy=iGPUHeight;
+ x=0;y=0;
+
+ SRCPtr = (unsigned long *)(psxVuw);
+ DSTPtr = ((unsigned long *)surf);
+
+ dx>>=1;
+
+ LineOffset = 512 - dx;
+ SurfOffset = (ddsd.lPitch>>2) - dx;
+
+ for(column=0;column<dy;column++)
+ {
+ for(row=0;row<dx;row++)
+ {
+ lu=*SRCPtr++;
+
+ *DSTPtr++=
+ ((lu<<11)&0xf800f800)|((lu<<1)&0x7c007c0)|((lu>>10)&0x1f001f);
+ }
+ SRCPtr += LineOffset;
+ DSTPtr += SurfOffset;
+ } 
+ return;
+ }
+
+ if(PreviousPSXDisplay.Range.y0) // centering needed?
+ {
+ surf+=PreviousPSXDisplay.Range.y0*ddsd.lPitch;
+ dy-=PreviousPSXDisplay.Range.y0;
+ }
+
+ if(PSXDisplay.RGB24)
+ {
+ unsigned char * pD;unsigned int startxy;
+
+ surf+=PreviousPSXDisplay.Range.x0<<1;
+
+ if(iFPSEInterface)
+ {
+ for(column=0;column<dy;column++)
+ {
+ startxy=((1024)*(column+y))+x;
+
+ pD=(unsigned char *)&psxVuw[startxy];
+
+ for(row=0;row<dx;row++)
+ {
+ lu=*((unsigned long *)pD);
+ *((unsigned short *)((surf)+(column*ddsd.lPitch)+(row<<1)))=
+ (unsigned short)(((BLUE(lu)<<8)&0xf800)|((GREEN(lu)<<3)&0x7e0)|(RED(lu)>>3));
+ pD+=3;
+ }
+ }
+ }
+ else
+ {
+ for(column=0;column<dy;column++)
+ { 
+ startxy=((1024)*(column+y))+x;
+
+ pD=(unsigned char *)&psxVuw[startxy];
+
+ for(row=0;row<dx;row++)
+ {
+ lu=*((unsigned long *)pD);
+ *((unsigned short *)((surf)+(column*ddsd.lPitch)+(row<<1)))=
+ (unsigned short)(((RED(lu)<<8)&0xf800)|((GREEN(lu)<<3)&0x7e0)|(BLUE(lu)>>3));
+ pD+=3;
+ }
+ }
+ }
+ }
+ else
+ {
+ unsigned short LineOffset,SurfOffset;
+ unsigned long * SRCPtr = (unsigned long *)(psxVuw +
+ (y<<10) + x);
+ unsigned long * DSTPtr =
+ ((unsigned long *)surf)+(PreviousPSXDisplay.Range.x0>>1);
+
+ dx>>=1;
+
+ LineOffset = 512 - dx;
+ SurfOffset = (ddsd.lPitch>>2) - dx;
+
+ for(column=0;column<dy;column++)
+ {
+ for(row=0;row<dx;row++)
+ {
+ lu=*SRCPtr++;
+
+ *DSTPtr++=
+ ((lu<<11)&0xf800f800)|((lu<<1)&0x7c007c0)|((lu>>10)&0x1f001f);
+ }
+ SRCPtr += LineOffset;
+ DSTPtr += SurfOffset;
+ } 
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void BlitScreen16_2xSaI(unsigned char * surf,long x,long y) // BLIT IN 16bit COLOR MODE
+{
+ unsigned long lu;
+ unsigned short row,column,off1,off2;
+ unsigned short dx=(unsigned short)PreviousPSXDisplay.Range.x1;
+ unsigned short dy=(unsigned short)PreviousPSXDisplay.DisplayMode.y;
+ unsigned char * pS=(unsigned char *)pSaISmallBuff;
+ unsigned long * pS1, * pS2;
+
+ if(PreviousPSXDisplay.DisplayMode.x>512)
+ {BlitScreen16(surf,x,y);return;}
+
+ if(PreviousPSXDisplay.Range.y0) // centering needed?
+ {
+ pS+=PreviousPSXDisplay.Range.y0*1024;
+ dy-=PreviousPSXDisplay.Range.y0;
+ }
+
+ if(PSXDisplay.RGB24)
+ {
+ unsigned char * pD;unsigned int startxy;
+
+ pS+=PreviousPSXDisplay.Range.x0<<1;
+
+ if(iFPSEInterface)
+ {
+ for(column=0;column<dy;column++)
+ {
+ startxy=((1024)*(column+y))+x;
+
+ pD=(unsigned char *)&psxVuw[startxy];
+
+ for(row=0;row<dx;row++)
+ {
+ lu=*((unsigned long *)pD);
+ *((unsigned short *)((pS)+(column*1024)+(row<<1)))=
+ (unsigned short)(((BLUE(lu)<<8)&0xf800)|((GREEN(lu)<<3)&0x7e0)|(RED(lu)>>3));
+ pD+=3;
+ }
+ }
+ }
+ else
+ {
+ for(column=0;column<dy;column++)
+ { 
+ startxy=((1024)*(column+y))+x;
+
+ pD=(unsigned char *)&psxVuw[startxy];
+
+ for(row=0;row<dx;row++)
+ {
+ lu=*((unsigned long *)pD);
+ *((unsigned short *)((pS)+(column*1024)+(row<<1)))=
+ (unsigned short)(((RED(lu)<<8)&0xf800)|((GREEN(lu)<<3)&0x7e0)|(BLUE(lu)>>3));
+ pD+=3;
+ }
+ }
+ }
+ }
+ else
+ {
+ unsigned short LineOffset,SurfOffset;
+ unsigned long * SRCPtr = (unsigned long *)(psxVuw +
+ (y<<10) + x);
+ unsigned long * DSTPtr =
+ ((unsigned long *)pS)+(PreviousPSXDisplay.Range.x0>>1);
+
+ dx>>=1;
+
+ LineOffset = 512 - dx;
+ SurfOffset = 256 - dx;
+
+ for(column=0;column<dy;column++)
+ {
+ for(row=0;row<dx;row++)
+ {
+ lu=*SRCPtr++;
+
+ *DSTPtr++=
+ ((lu<<11)&0xf800f800)|((lu<<1)&0x7c007c0)|((lu>>10)&0x1f001f);
+ }
+ SRCPtr += LineOffset;
+ DSTPtr += SurfOffset;
+ } 
+ }
+
+ // ok, here we have filled pSaISmallBuff with PreviousPSXDisplay.DisplayMode.x * PreviousPSXDisplay.DisplayMode.y (*4) data
+ // now do a 2xSai blit to pSaIBigBuff
+
+ p2XSaIFunc((unsigned char *)pSaISmallBuff, 1024,
+	 (unsigned char *)pSaIBigBuff,
+ PreviousPSXDisplay.DisplayMode.x,
+ PreviousPSXDisplay.DisplayMode.y);
+
+ // ok, here we have pSaIBigBuff filled with the 2xSai image...
+ // now transfer it to the surface
+
+ dx=(short)PreviousPSXDisplay.DisplayMode.x;
+ dy=(short)PreviousPSXDisplay.DisplayMode.y<<1;
+ off1=(ddsd.lPitch>>2)-dx;
+ off2=512-dx;
+
+ pS1=(unsigned long *)surf;
+ pS2=(unsigned long *)pSaIBigBuff;
+
+ for(column=0;column<dy;column++)
+ { 
+ for(row=0;row<dx;row++)
+ {
+ *(pS1++)=*(pS2++);
+ }
+ pS1+=off1;
+ pS2+=off2;
+ }
+}
+
+void BlitScreen16_3xSaI(unsigned char * surf,long x,long y) // BLIT IN 16bit COLOR MODE
+{
+	unsigned long lu;
+	unsigned short row,column,off1,off2;
+	unsigned short dx=(unsigned short)PreviousPSXDisplay.Range.x1;
+	unsigned short dy=(unsigned short)PreviousPSXDisplay.DisplayMode.y;
+	unsigned char * pS=(unsigned char *)pSaISmallBuff;
+	unsigned long * pS1, * pS2;
+
+	if(PreviousPSXDisplay.DisplayMode.x>512)
+	{BlitScreen16(surf,x,y);return;}
+
+	if(PreviousPSXDisplay.Range.y0) // centering needed?
+	{
+		pS+=PreviousPSXDisplay.Range.y0*1024;
+		dy-=PreviousPSXDisplay.Range.y0;
+	}
+
+	if(PSXDisplay.RGB24)
+	{
+		unsigned char * pD;unsigned int startxy;
+
+		pS+=PreviousPSXDisplay.Range.x0<<1;
+
+		if(iFPSEInterface)
+		{
+			for(column=0;column<dy;column++)
+			{
+				startxy=((1024)*(column+y))+x;
+
+				pD=(unsigned char *)&psxVuw[startxy];
+
+				for(row=0;row<dx;row++)
+				{
+					lu=*((unsigned long *)pD);
+					*((unsigned short *)((pS)+(column*1024)+(row<<1)))=
+						(unsigned short)(((BLUE(lu)<<8)&0xf800)|((GREEN(lu)<<3)&0x7e0)|(RED(lu)>>3));
+					pD+=3;
+				}
+			}
+		}
+		else
+		{
+			for(column=0;column<dy;column++)
+			{
+				startxy=((1024)*(column+y))+x;
+
+				pD=(unsigned char *)&psxVuw[startxy];
+
+				for(row=0;row<dx;row++)
+				{
+					lu=*((unsigned long *)pD);
+					*((unsigned short *)((pS)+(column*1024)+(row<<1)))=
+						(unsigned short)(((RED(lu)<<8)&0xf800)|((GREEN(lu)<<3)&0x7e0)|(BLUE(lu)>>3));
+					pD+=3;
+				}
+			}
+		}
+	}
+	else
+	{
+		unsigned short LineOffset,SurfOffset;
+		unsigned long * SRCPtr = (unsigned long *)(psxVuw +
+			(y<<10) + x);
+		unsigned long * DSTPtr =
+			((unsigned long *)pS)+(PreviousPSXDisplay.Range.x0>>1);
+
+		dx>>=1;
+
+		LineOffset = 512 - dx;
+		SurfOffset = 256 - dx;
+
+		for(column=0;column<dy;column++)
+		{
+			for(row=0;row<dx;row++)
+			{
+				lu=*SRCPtr++;
+
+				*DSTPtr++=
+					((lu<<11)&0xf800f800)|((lu<<1)&0x7c007c0)|((lu>>10)&0x1f001f);
+			}
+			SRCPtr += LineOffset;
+			DSTPtr += SurfOffset;
+		}
+	}
+
+	// ok, here we have filled pSaISmallBuff with PreviousPSXDisplay.DisplayMode.x * PreviousPSXDisplay.DisplayMode.y (*4) data
+	// now do a 2xSai blit to pSaIBigBuff
+
+	p2XSaIFunc((unsigned char *)pSaISmallBuff, 1024,
+		(unsigned char *)pSaIBigBuff,
+		PreviousPSXDisplay.DisplayMode.x,
+		PreviousPSXDisplay.DisplayMode.y);
+
+	// ok, here we have pSaIBigBuff filled with the 2xSai image...
+	// now transfer it to the surface
+
+	dx=(short)(PreviousPSXDisplay.DisplayMode.x * 1.5);
+	dy=(short)PreviousPSXDisplay.DisplayMode.y*3;
+	off1=(ddsd.lPitch>>2)-dx;
+	off2=512-dx;
+
+	pS1=(unsigned long *)surf;
+	pS2=(unsigned long *)pSaIBigBuff;
+
+	for(column=0;column<dy;column++)
+	{
+		for(row=0;row<dx;row++)
+		{
+			*(pS1++)=*(pS2++);
+		}
+		pS1+=off1;
+		pS2+=off2;
+	}
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void BlitScreen15(unsigned char * surf,long x,long y) // BLIT IN 16bit COLOR MODE
+{
+ unsigned long lu;
+ unsigned short row,column;
+ unsigned short dx=(unsigned short)PreviousPSXDisplay.Range.x1;
+ unsigned short dy=(unsigned short)PreviousPSXDisplay.DisplayMode.y;
+
+ if(PreviousPSXDisplay.Range.y0) // centering needed?
+ {
+ surf+=PreviousPSXDisplay.Range.y0*ddsd.lPitch;
+ dy-=PreviousPSXDisplay.Range.y0;
+ }
+
+ if(PSXDisplay.RGB24)
+ {
+ unsigned char * pD;unsigned int startxy;
+
+ surf+=PreviousPSXDisplay.Range.x0<<1;
+
+ if(iFPSEInterface)
+ {
+ for(column=0;column<dy;column++)
+ { 
+ startxy=((1024)*(column+y))+x;
+
+ pD=(unsigned char *)&psxVuw[startxy];
+
+ for(row=0;row<dx;row++)
+ {
+ lu=*((unsigned long *)pD);
+ *((unsigned short *)((surf)+(column*ddsd.lPitch)+(row<<1)))=
+ (unsigned short)
+ (((BLUE(lu)<<7)&0x7c00)|
+ ((GREEN(lu)<<2)&0x3e0)|
+ (RED(lu)>>3));
+ pD+=3;
+ }
+ }
+ } 
+ else
+ {
+ for(column=0;column<dy;column++)
+ { 
+ startxy=((1024)*(column+y))+x;
+
+ pD=(unsigned char *)&psxVuw[startxy];
+
+ for(row=0;row<dx;row++)
+ {
+ lu=*((unsigned long *)pD);
+ *((unsigned short *)((surf)+(column*ddsd.lPitch)+(row<<1)))=
+ (unsigned short)
+ (((RED(lu)<<7)&0x7c00)|
+ ((GREEN(lu)<<2)&0x3e0)|
+ (BLUE(lu)>>3));
+ pD+=3;
+ }
+ }
+ }
+ }
+ else
+ {
+ unsigned short LineOffset,SurfOffset;
+ unsigned long * SRCPtr = (unsigned long *)(psxVuw +
+ (y<<10) + x);
+ 
+ unsigned long * DSTPtr =
+ ((unsigned long *)surf)+(PreviousPSXDisplay.Range.x0>>1);
+
+ dx>>=1;
+
+ LineOffset = 512 - dx;
+ SurfOffset = (ddsd.lPitch>>2) - dx;
+
+ for(column=0;column<dy;column++)
+ {
+ for(row=0;row<dx;row++)
+ {
+ lu=*SRCPtr++;
+
+ *DSTPtr++=
+ ((lu<<10)&0x7c007c00)|
+ ((lu)&0x3e003e0)|
+ ((lu>>10)&0x1f001f);
+ }
+ SRCPtr += LineOffset;
+ DSTPtr += SurfOffset;
+ } 
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void BlitScreen15_2xSaI(unsigned char * surf,long x,long y) // BLIT IN 16bit COLOR MODE
+{
+ unsigned long lu;
+ unsigned short row,column,off1,off2;
+ unsigned short dx=(unsigned short)PreviousPSXDisplay.Range.x1;
+ unsigned short dy=(unsigned short)PreviousPSXDisplay.DisplayMode.y;
+ unsigned char * pS=(unsigned char *)pSaISmallBuff;
+ unsigned long * pS1, * pS2;
+
+ if(PreviousPSXDisplay.DisplayMode.x>512)
+ {BlitScreen15(surf,x,y);return;}
+
+ if(PreviousPSXDisplay.Range.y0) // centering needed?
+ {
+ pS+=PreviousPSXDisplay.Range.y0*1024;
+ dy-=PreviousPSXDisplay.Range.y0;
+ }
+
+ if(PSXDisplay.RGB24)
+ {
+ unsigned char * pD;unsigned int startxy;
+
+ pS+=PreviousPSXDisplay.Range.x0<<1;
+
+ if(iFPSEInterface)
+ {
+ for(column=0;column<dy;column++)
+ { 
+ startxy=((1024)*(column+y))+x;
+
+ pD=(unsigned char *)&psxVuw[startxy];
+
+ for(row=0;row<dx;row++)
+ {
+ lu=*((unsigned long *)pD);
+ *((unsigned short *)((pS)+(column*1024)+(row<<1)))=
+ (unsigned short)
+ (((BLUE(lu)<<7)&0x7c00)|
+ ((GREEN(lu)<<2)&0x3e0)|
+ (RED(lu)>>3));
+ pD+=3;
+ }
+ }
+ } 
+ else
+ {
+ for(column=0;column<dy;column++)
+ { 
+ startxy=((1024)*(column+y))+x;
+
+ pD=(unsigned char *)&psxVuw[startxy];
+
+ for(row=0;row<dx;row++)
+ {
+ lu=*((unsigned long *)pD);
+ *((unsigned short *)((pS)+(column*1024)+(row<<1)))=
+ (unsigned short)
+ (((RED(lu)<<7)&0x7c00)|
+ ((GREEN(lu)<<2)&0x3e0)|
+ (BLUE(lu)>>3));
+ pD+=3;
+ }
+ }
+ }
+ }
+ else
+ {
+ unsigned short LineOffset,SurfOffset;
+ unsigned long * SRCPtr = (unsigned long *)(psxVuw +
+ (y<<10) + x);
+ unsigned long * DSTPtr =
+ ((unsigned long *)pS)+(PreviousPSXDisplay.Range.x0>>1);
+
+ dx>>=1;
+
+ LineOffset = 512 - dx;
+ SurfOffset = 256 - dx;
+
+ for(column=0;column<dy;column++)
+ {
+ for(row=0;row<dx;row++)
+ {
+ lu=*SRCPtr++;
+
+ *DSTPtr++=
+ ((lu<<10)&0x7c007c00)|
+ ((lu)&0x3e003e0)|
+ ((lu>>10)&0x1f001f);
+ }
+ SRCPtr += LineOffset;
+ DSTPtr += SurfOffset;
+ } 
+ }
+
+ // ok, here we have filled pSaISmallBuff with PreviousPSXDisplay.DisplayMode.x * PreviousPSXDisplay.DisplayMode.y (*4) data
+ // now do a 2xSai blit to pSaIBigBuff
+
+ p2XSaIFunc((unsigned char *)pSaISmallBuff, 1024,
+	 (unsigned char *)pSaIBigBuff,
+ PreviousPSXDisplay.DisplayMode.x,
+ PreviousPSXDisplay.DisplayMode.y);
+
+ // ok, here we have pSaIBigBuff filled with the 2xSai image...
+ // now transfer it to the surface
+
+ dx=(short)PreviousPSXDisplay.DisplayMode.x;
+ dy=(short)PreviousPSXDisplay.DisplayMode.y<<1;
+ off1=(ddsd.lPitch>>2)-dx;
+ off2=512-dx;
+
+ pS1=(unsigned long *)surf;
+ pS2=(unsigned long *)pSaIBigBuff;
+
+ for(column=0;column<dy;column++)
+ { 
+ for(row=0;row<dx;row++)
+ {
+ *(pS1++)=*(pS2++);
+ }
+ pS1+=off1;
+ pS2+=off2;
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void DoClearScreenBuffer(void) // CLEAR DX BUFFER
+{
+ DDBLTFX ddbltfx;
+ 
+ ddbltfx.dwSize = sizeof(ddbltfx);
+ ddbltfx.dwFillColor = 0x00000000;
+ 
+ IDirectDrawSurface_Blt(DX.DDSRender,NULL,NULL,NULL,DDBLT_COLORFILL,&ddbltfx);
+
+ if(iUseNoStretchBlt>=3)
+ {
+ if(pSaISmallBuff) memset(pSaISmallBuff,0,512*512*4);
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void DoClearFrontBuffer(void) // CLEAR PRIMARY BUFFER
+{
+ DDBLTFX ddbltfx;
+ 
+ ddbltfx.dwSize = sizeof(ddbltfx);
+ ddbltfx.dwFillColor = 0x00000000;
+ 
+ IDirectDrawSurface_Blt(DX.DDSPrimary,NULL,NULL,NULL,DDBLT_COLORFILL,&ddbltfx);
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void NoStretchedBlit(void)
+{
+ static int iOldDX=0;
+ static int iOldDY=0;
+
+ int iDX,iDY;
+ int iX=iResX-PreviousPSXDisplay.DisplayMode.x;
+ int iY=iResY-PreviousPSXDisplay.DisplayMode.y;
+
+/*
+float fXS,fYS,fS;
+fXS=(float)iResX/(float)PreviousPSXDisplay.DisplayMode.x;
+fYS=(float)iResY/(float)PreviousPSXDisplay.DisplayMode.y;
+if(fXS<fYS) fS=fXS; else fS=fYS;
+*/
+
+ if(iX<0) {iX=0;iDX=iResX;}
+ else {iX=iX/2;iDX=PreviousPSXDisplay.DisplayMode.x;}
+
+ if(iY<0) {iY=0;iDY=iResY;}
+ else {iY=iY/2;iDY=PreviousPSXDisplay.DisplayMode.y;}
+
+ if(iOldDX!=iDX || iOldDY!=iDY)
+ {
+ DDBLTFX ddbltfx;
+ ddbltfx.dwSize = sizeof(ddbltfx);
+ ddbltfx.dwFillColor = 0x00000000;
+ IDirectDrawSurface_Blt(DX.DDSPrimary,NULL,NULL,NULL,DDBLT_COLORFILL,&ddbltfx);
+ iOldDX=iDX;iOldDY=iDY;
+ }
+
+ if(iWindowMode)
+ {
+ RECT ScreenRect,ViewportRect;
+ POINT Point={0,0};
+ ClientToScreen(DX.hWnd,&Point);
+ Point.x+=iX;Point.y+=iY;
+
+ ScreenRect.left = Point.x;
+ ScreenRect.top = Point.y;
+ ScreenRect.right = iDX+Point.x;
+ ScreenRect.bottom = iDY+Point.y;
+
+ ViewportRect.left = 0;
+ ViewportRect.top = 0;
+ ViewportRect.right = iDX;
+ ViewportRect.bottom = iDY;
+
+ WaitVBlank();
+ IDirectDrawSurface_Blt(DX.DDSPrimary,&ScreenRect,DX.DDSRender,&ViewportRect,
+ DDBLT_WAIT,NULL);
+ }
+ else
+ {
+ RECT ScreenRect,ViewportRect;
+
+ ScreenRect.left = iX;
+ ScreenRect.top = iY;
+ ScreenRect.right = iDX+iX;
+ ScreenRect.bottom = iDY+iY;
+
+ ViewportRect.left = 0;
+ ViewportRect.top = 0;
+ ViewportRect.right = iDX;
+ ViewportRect.bottom = iDY;
+
+ WaitVBlank();
+ IDirectDrawSurface_Blt(DX.DDSPrimary,&ScreenRect,DX.DDSRender,&ViewportRect,
+ DDBLT_WAIT,NULL);
+ }
+ if(DX.DDSScreenPic) DisplayPic();
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void NoStretchedBlitEx(void)
+{
+ static int iOldDX=0;
+ static int iOldDY=0;
+
+ int iDX,iDY,iX,iY;float fXS,fYS,fS;
+
+ if(!PreviousPSXDisplay.DisplayMode.x) return;
+ if(!PreviousPSXDisplay.DisplayMode.y) return;
+ 
+ fXS=(float)iResX/(float)PreviousPSXDisplay.DisplayMode.x;
+ fYS=(float)iResY/(float)PreviousPSXDisplay.DisplayMode.y;
+ if(fXS<fYS) fS=fXS; else fS=fYS;
+
+ iDX=(int)(PreviousPSXDisplay.DisplayMode.x*fS);
+ iDY=(int)(PreviousPSXDisplay.DisplayMode.y*fS);
+
+ iX=iResX-iDX;
+ iY=iResY-iDY;
+
+ if(iX<0) iX=0;
+ else iX=iX/2;
+
+ if(iY<0) iY=0;
+ else iY=iY/2;
+
+ if(iOldDX!=iDX || iOldDY!=iDY)
+ {
+ DDBLTFX ddbltfx;
+ ddbltfx.dwSize = sizeof(ddbltfx);
+ ddbltfx.dwFillColor = 0x00000000;
+ IDirectDrawSurface_Blt(DX.DDSPrimary,NULL,NULL,NULL,DDBLT_COLORFILL,&ddbltfx);
+ iOldDX=iDX;iOldDY=iDY;
+ }
+
+ if(iWindowMode)
+ {
+ RECT ScreenRect,ViewportRect;
+ POINT Point={0,0};
+ ClientToScreen(DX.hWnd,&Point);
+ Point.x+=iX;Point.y+=iY;
+
+ ScreenRect.left = Point.x;
+ ScreenRect.top = Point.y;
+ ScreenRect.right = iDX+Point.x;
+ ScreenRect.bottom = iDY+Point.y;
+
+ ViewportRect.left = 0;
+ ViewportRect.top = 0;
+ ViewportRect.right = PreviousPSXDisplay.DisplayMode.x;
+ ViewportRect.bottom = PreviousPSXDisplay.DisplayMode.y;
+
+ WaitVBlank();
+ IDirectDrawSurface_Blt(DX.DDSPrimary,&ScreenRect,DX.DDSRender,&ViewportRect,
+ DDBLT_WAIT,NULL);
+ }
+ else
+ {
+ RECT ScreenRect,ViewportRect;
+
+ ScreenRect.left = iX;
+ ScreenRect.top = iY;
+ ScreenRect.right = iDX+iX;
+ ScreenRect.bottom = iDY+iY;
+
+ ViewportRect.left = 0;
+ ViewportRect.top = 0;
+ ViewportRect.right = PreviousPSXDisplay.DisplayMode.x;
+ ViewportRect.bottom = PreviousPSXDisplay.DisplayMode.y;
+
+ WaitVBlank();
+ IDirectDrawSurface_Blt(DX.DDSPrimary,&ScreenRect,DX.DDSRender,&ViewportRect,
+ DDBLT_WAIT,NULL);
+ }
+ if(DX.DDSScreenPic) DisplayPic();
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void StretchedBlit2x(void)
+{
+ if(iWindowMode)
+ {
+ RECT ScreenRect,ViewportRect;
+ POINT Point={0,0};
+ ClientToScreen(DX.hWnd,&Point);
+
+ ScreenRect.left = Point.x;
+ ScreenRect.top = Point.y;
+ ScreenRect.right = iResX+Point.x;
+ ScreenRect.bottom = iResY+Point.y;
+
+ ViewportRect.left = 0;
+ ViewportRect.top = 0;
+ ViewportRect.right = PreviousPSXDisplay.DisplayMode.x;
+ ViewportRect.bottom = PreviousPSXDisplay.DisplayMode.y;
+
+ if(ViewportRect.right<=512)
+ {
+ ViewportRect.right+=ViewportRect.right;
+ ViewportRect.bottom+=ViewportRect.bottom;
+ }
+
+ if(iUseScanLines==2) // stupid nvidia scanline mode
+ {
+ RECT HelperRect={0,0,iResX,iResY};
+
+ WaitVBlank();
+
+ IDirectDrawSurface_Blt(DX.DDSHelper,&HelperRect,DX.DDSRender,&ViewportRect,
+ DDBLT_WAIT,NULL);
+ IDirectDrawSurface_Blt(DX.DDSPrimary,&ScreenRect,DX.DDSHelper,&HelperRect,
+ DDBLT_WAIT,NULL);
+ }
+ else 
+ {
+ WaitVBlank();
+ IDirectDrawSurface_Blt(DX.DDSPrimary,&ScreenRect,DX.DDSRender,&ViewportRect,
+ DDBLT_WAIT,NULL);
+ }
+ }
+ else 
+ {
+ RECT ScreenRect={0,0,iResX,iResY}, 
+ ViewportRect={0,0,PreviousPSXDisplay.DisplayMode.x,
+ PreviousPSXDisplay.DisplayMode.y};
+
+ if(ViewportRect.right<=512)
+ {
+ ViewportRect.right+=ViewportRect.right;
+ ViewportRect.bottom+=ViewportRect.bottom;
+ }
+
+ if(iUseScanLines==2) // stupid nvidia scanline mode
+ {
+ WaitVBlank();
+
+ IDirectDrawSurface_Blt(DX.DDSHelper,&ScreenRect,DX.DDSRender,&ViewportRect,
+ DDBLT_WAIT,NULL);
+ IDirectDrawSurface_Blt(DX.DDSPrimary,&ScreenRect,DX.DDSHelper,&ScreenRect,
+ DDBLT_WAIT,NULL);
+ }
+ else
+ {
+ WaitVBlank();
+ IDirectDrawSurface_Blt(DX.DDSPrimary,&ScreenRect,DX.DDSRender,&ViewportRect,
+ DDBLT_WAIT,NULL );
+ }
+ }
+
+ if(DX.DDSScreenPic) DisplayPic();
+
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void NoStretchedBlit2x(void)
+{
+ static int iOldDX=0;
+ static int iOldDY=0;
+
+ int iX,iY,iDX,iDY;
+ int iDX2=PreviousPSXDisplay.DisplayMode.x;
+ int iDY2=PreviousPSXDisplay.DisplayMode.y;
+ if(PreviousPSXDisplay.DisplayMode.x<=512)
+ {
+ iDX2<<=1;
+ iDY2<<=1;
+ }
+
+ iX=iResX-iDX2;
+ iY=iResY-iDY2;
+
+ if(iX<0) {iX=0;iDX=iResX;}
+ else {iX=iX/2;iDX=iDX2;}
+
+ if(iY<0) {iY=0;iDY=iResY;}
+ else {iY=iY/2;iDY=iDY2;}
+
+ if(iOldDX!=iDX || iOldDY!=iDY)
+ {
+ DDBLTFX ddbltfx;
+ ddbltfx.dwSize = sizeof(ddbltfx);
+ ddbltfx.dwFillColor = 0x00000000;
+ IDirectDrawSurface_Blt(DX.DDSPrimary,NULL,NULL,NULL,DDBLT_COLORFILL,&ddbltfx);
+ iOldDX=iDX;iOldDY=iDY;
+ }
+
+ if(iWindowMode)
+ {
+ RECT ScreenRect,ViewportRect;
+ POINT Point={0,0};
+ ClientToScreen(DX.hWnd,&Point);
+ Point.x+=iX;Point.y+=iY;
+
+ ScreenRect.left = Point.x;
+ ScreenRect.top = Point.y;
+ ScreenRect.right = iDX+Point.x;
+ ScreenRect.bottom = iDY+Point.y;
+
+ ViewportRect.left = 0;
+ ViewportRect.top = 0;
+ ViewportRect.right = iDX;
+ ViewportRect.bottom = iDY;
+
+ WaitVBlank();
+ IDirectDrawSurface_Blt(DX.DDSPrimary,&ScreenRect,DX.DDSRender,&ViewportRect,
+ DDBLT_WAIT,NULL);
+ }
+ else
+ {
+ RECT ScreenRect,ViewportRect;
+
+ ScreenRect.left = iX;
+ ScreenRect.top = iY;
+ ScreenRect.right = iDX+iX;
+ ScreenRect.bottom = iDY+iY;
+
+ ViewportRect.left = 0;
+ ViewportRect.top = 0;
+ ViewportRect.right = iDX;
+ ViewportRect.bottom = iDY;
+
+ WaitVBlank();
+ IDirectDrawSurface_Blt(DX.DDSPrimary,&ScreenRect,DX.DDSRender,&ViewportRect,
+ DDBLT_WAIT,NULL);
+ }
+ if(DX.DDSScreenPic) DisplayPic();
+}
+
+////////////////////////////////////////////////////////////////////////
+void NoStretchedBlit3x(void)
+{
+	static int iOldDX=0;
+	static int iOldDY=0;
+
+	int iX,iY,iDX,iDY;
+	int iDX2=PreviousPSXDisplay.DisplayMode.x;
+	int iDY2=PreviousPSXDisplay.DisplayMode.y;
+
+	if(PreviousPSXDisplay.DisplayMode.x<=512)
+	{
+		iDX2*=3;
+		iDY2*=3;
+	}
+
+	iX=iResX-iDX2;
+	iY=iResY-iDY2;
+
+	if(iX<0) {iX=0;iDX=iResX;}
+	else {iX=iX/2;iDX=iDX2;}
+
+	if(iY<0) {iY=0;iDY=iResY;}
+	else {iY=iY/2;iDY=iDY2;}
+
+	if(iOldDX!=iDX || iOldDY!=iDY)
+	{
+		DDBLTFX ddbltfx;
+		ddbltfx.dwSize = sizeof(ddbltfx);
+		ddbltfx.dwFillColor = 0x00000000;
+		IDirectDrawSurface_Blt(DX.DDSPrimary,NULL,NULL,NULL,DDBLT_COLORFILL,&ddbltfx);
+		iOldDX=iDX;iOldDY=iDY;
+	}
+
+	if(iWindowMode)
+	{
+		RECT ScreenRect,ViewportRect;
+		POINT Point={0,0};
+		ClientToScreen(DX.hWnd,&Point);
+		Point.x+=iX;Point.y+=iY;
+
+		ScreenRect.left = Point.x;
+		ScreenRect.top = Point.y;
+		ScreenRect.right = iDX+Point.x;
+		ScreenRect.bottom = iDY+Point.y;
+
+		ViewportRect.left = 0;
+		ViewportRect.top = 0;
+		ViewportRect.right = iDX;
+		ViewportRect.bottom = iDY;
+
+		WaitVBlank();
+		IDirectDrawSurface_Blt(DX.DDSPrimary,&ScreenRect,DX.DDSRender,&ViewportRect,
+			DDBLT_WAIT,NULL);
+	}
+	else
+	{
+		RECT ScreenRect,ViewportRect;
+
+		ScreenRect.left = iX;
+		ScreenRect.top = iY;
+		ScreenRect.right	 = iDX+iX;
+		ScreenRect.bottom = iDY+iY;
+
+		ViewportRect.left = 0;
+		ViewportRect.top = 0;
+		ViewportRect.right = iDX;
+		ViewportRect.bottom = iDY;
+
+		WaitVBlank();
+		IDirectDrawSurface_Blt(DX.DDSPrimary,&ScreenRect,DX.DDSRender,&ViewportRect,
+			DDBLT_WAIT,NULL);
+	}
+	if(DX.DDSScreenPic) DisplayPic();
+}
+
+
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+
+void ShowGunCursor(unsigned char * surf) 
+{
+ unsigned short dx=(unsigned short)PreviousPSXDisplay.Range.x1;
+ unsigned short dy=(unsigned short)PreviousPSXDisplay.DisplayMode.y;
+ int x,y,iPlayer,sx,ex,sy,ey;
+
+ if(PreviousPSXDisplay.Range.y0) // centering needed?
+ {
+ surf+=PreviousPSXDisplay.Range.y0*ddsd.lPitch;
+ dy-=PreviousPSXDisplay.Range.y0;
+ }
+
+ if(iUseNoStretchBlt>=3 &&iUseNoStretchBlt < 13) // 2xsai is twice as big, of course
+ {dx*=2;dy*=2;}
+ else if(iUseNoStretchBlt >= 13)
+ {dx*=3;dy*=3;}
+
+ if(iDesktopCol==32) // 32 bit color depth
+ {
+ const unsigned long crCursorColor32[8]={0xffff0000,0xff00ff00,0xff0000ff,0xffff00ff,0xffffff00,0xff00ffff,0xffffffff,0xff7f7f7f};
+
+ surf+=PreviousPSXDisplay.Range.x0<<2; // -> add x left border
+
+ for(iPlayer=0;iPlayer<8;iPlayer++) // -> loop all possible players
+ {
+ if(usCursorActive&(1<<iPlayer)) // -> player active?
+ {
+ const int ty=(ptCursorPoint[iPlayer].y*dy)/256; // -> calculate the cursor pos in the current display
+ const int tx=(ptCursorPoint[iPlayer].x*dx)/512;
+ sx=tx-5;if(sx<0) {if(sx&1) sx=1; else sx=0;}
+ sy=ty-5;if(sy<0) {if(sy&1) sy=1; else sy=0;}
+ ex=tx+6;if(ex>dx) ex=dx;
+ ey=ty+6;if(ey>dy) ey=dy;
+
+ for(x=tx,y=sy;y<ey;y+=2) // -> do dotted y line
+ *((unsigned long *)((surf)+(y*ddsd.lPitch)+x*4))=crCursorColor32[iPlayer];
+ for(y=ty,x=sx;x<ex;x+=2) // -> do dotted x line
+ *((unsigned long *)((surf)+(y*ddsd.lPitch)+x*4))=crCursorColor32[iPlayer];
+ }
+ }
+ }
+ else // 16 bit color depth
+ {
+ const unsigned short crCursorColor16[8]={0xf800,0x07c0,0x001f,0xf81f,0xffc0,0x07ff,0xffff,0x7bdf};
+
+ surf+=PreviousPSXDisplay.Range.x0<<1; // -> same stuff as above
+
+ for(iPlayer=0;iPlayer<8;iPlayer++)
+ {
+ if(usCursorActive&(1<<iPlayer))
+ {
+ const int ty=(ptCursorPoint[iPlayer].y*dy)/256;
+ const int tx=(ptCursorPoint[iPlayer].x*dx)/512;
+ sx=tx-5;if(sx<0) {if(sx&1) sx=1; else sx=0;}
+ sy=ty-5;if(sy<0) {if(sy&1) sy=1; else sy=0;}
+ ex=tx+6;if(ex>dx) ex=dx;
+ ey=ty+6;if(ey>dy) ey=dy;
+
+ for(x=tx,y=sy;y<ey;y+=2)
+ *((unsigned short *)((surf)+(y*ddsd.lPitch)+x*2))=crCursorColor16[iPlayer];
+ for(y=ty,x=sx;x<ex;x+=2)
+ *((unsigned short *)((surf)+(y*ddsd.lPitch)+x*2))=crCursorColor16[iPlayer];
+ }
+ }
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void DoBufferSwap(void) // SWAP BUFFERS
+{ // (we don't swap... we blit only)
+ HRESULT ddrval;long x,y;
+
+ ddrval=IDirectDrawSurface_Lock(DX.DDSRender,NULL, &ddsd, DDLOCK_WAIT|DDLOCK_WRITEONLY, NULL);
+
+ if(ddrval==DDERR_SURFACELOST)
+ {
+ IDirectDrawSurface_Restore(DX.DDSRender);
+ } 
+
+ if(ddrval!=DD_OK)
+ {
+ IDirectDrawSurface_Unlock(DX.DDSRender,&ddsd);
+ return;
+ }
+
+ //----------------------------------------------------//
+
+ x=PSXDisplay.DisplayPosition.x;
+ y=PSXDisplay.DisplayPosition.y;
+
+ //----------------------------------------------------//
+
+ BlitScreen((unsigned char *)ddsd.lpSurface,x,y); // fill DDSRender surface
+
+ if(usCursorActive) ShowGunCursor((unsigned char *)ddsd.lpSurface);
+
+ IDirectDrawSurface_Unlock(DX.DDSRender,&ddsd);
+
+ if(ulKeybits&KEY_SHOWFPS) DisplayText(); // paint menu text
+
+ if(pExtraBltFunc) {pExtraBltFunc();return;}
+
+ if(iWindowMode)
+ {
+ RECT ScreenRect,ViewportRect;
+ POINT Point={0,0};
+ ClientToScreen(DX.hWnd,&Point);
+
+ ScreenRect.left = Point.x;
+ ScreenRect.top = Point.y;
+ ScreenRect.right = iResX+Point.x;
+ ScreenRect.bottom = iResY+Point.y;
+
+ ViewportRect.left = 0;
+ ViewportRect.top = 0;
+
+ if(iDebugMode)
+ {
+ if(iFVDisplay)
+ {
+ ViewportRect.right = 1024;
+ ViewportRect.bottom = iGPUHeight;
+ }
+ else
+ {
+ ViewportRect.right = PreviousPSXDisplay.DisplayMode.x;
+ ViewportRect.bottom = PreviousPSXDisplay.DisplayMode.y;
+ }
+ }
+ else
+ {
+ ViewportRect.right = PreviousPSXDisplay.DisplayMode.x;
+ ViewportRect.bottom = PreviousPSXDisplay.DisplayMode.y;
+
+ if(iRumbleTime) 
+ {
+ ScreenRect.left+=((rand()*iRumbleVal)/RAND_MAX)-(iRumbleVal/2); 
+ ScreenRect.right+=((rand()*iRumbleVal)/RAND_MAX)-(iRumbleVal/2); 
+ ScreenRect.top+=((rand()*iRumbleVal)/RAND_MAX)-(iRumbleVal/2); 
+ ScreenRect.bottom+=((rand()*iRumbleVal)/RAND_MAX)-(iRumbleVal/2); 
+ iRumbleTime--;
+ }
+ }
+
+ if(iUseScanLines==2) // stupid nvidia scanline mode
+ {
+ RECT HelperRect={0,0,iResX,iResY};
+
+ WaitVBlank();
+
+ IDirectDrawSurface_Blt(DX.DDSHelper,&HelperRect,DX.DDSRender,&ViewportRect,
+ DDBLT_WAIT,NULL);
+ IDirectDrawSurface_Blt(DX.DDSPrimary,&ScreenRect,DX.DDSHelper,&HelperRect,
+ DDBLT_WAIT,NULL);
+ }
+ else 
+ {
+ WaitVBlank();
+ IDirectDrawSurface_Blt(DX.DDSPrimary,&ScreenRect,DX.DDSRender,&ViewportRect,
+ DDBLT_WAIT,NULL);
+ }
+ }
+ else 
+ {
+ RECT ScreenRect={0,0,iResX,iResY}, 
+ ViewportRect={0,0,PreviousPSXDisplay.DisplayMode.x,
+ PreviousPSXDisplay.DisplayMode.y};
+
+ if(iDebugMode && iFVDisplay)
+ {
+ ViewportRect.right=1024;
+ ViewportRect.bottom=iGPUHeight;
+ }
+ else
+ {
+ if(iRumbleTime) 
+ {
+ ScreenRect.left+=((rand()*iRumbleVal)/RAND_MAX)-(iRumbleVal/2); 
+ ScreenRect.right+=((rand()*iRumbleVal)/RAND_MAX)-(iRumbleVal/2); 
+ ScreenRect.top+=((rand()*iRumbleVal)/RAND_MAX)-(iRumbleVal/2); 
+ ScreenRect.bottom+=((rand()*iRumbleVal)/RAND_MAX)-(iRumbleVal/2); 
+ iRumbleTime--;
+ }
+ }
+
+ if(iUseScanLines==2) // stupid nvidia scanline mode
+ {
+ WaitVBlank();
+
+ IDirectDrawSurface_Blt(DX.DDSHelper,&ScreenRect,DX.DDSRender,&ViewportRect,
+ DDBLT_WAIT,NULL);
+ IDirectDrawSurface_Blt(DX.DDSPrimary,&ScreenRect,DX.DDSHelper,&ScreenRect,
+ DDBLT_WAIT,NULL);
+ }
+ else
+ {
+ WaitVBlank();
+ IDirectDrawSurface_Blt(DX.DDSPrimary,&ScreenRect,DX.DDSRender,&ViewportRect,
+ DDBLT_WAIT,NULL );
+ }
+ }
+
+ if(DX.DDSScreenPic) DisplayPic();
+}
+
+////////////////////////////////////////////////////////////////////////
+// GAMMA
+////////////////////////////////////////////////////////////////////////
+
+int iUseGammaVal=2048;
+
+void DXSetGamma(void)
+{
+ float g;
+ if(iUseGammaVal==2048) return;
+
+ g=(float)iUseGammaVal;
+ if(g>512) g=((g-512)*2)+512;
+ g=0.5f+((g)/1024.0f);
+
+// some cards will cheat... so we don't trust the caps here 
+// if (DD_Caps.dwCaps2 & DDCAPS2_PRIMARYGAMMA)
+ {
+ float f;DDGAMMARAMP ramp;int i;
+ LPDIRECTDRAWGAMMACONTROL DD_Gamma = NULL;
+
+ if FAILED(IDirectDrawSurface_QueryInterface(DX.DDSPrimary,&IID_IDirectDrawGammaControl,(void**)&DD_Gamma))
+ return;
+
+ for (i=0;i<256;i++)
+ {
+ f=(((float)(i*256))*g);
+ if(f>65535) f=65535;
+ ramp.red[i]=ramp.green[i]=ramp.blue[i]=(WORD)f;
+ }
+
+ IDirectDrawGammaControl_SetGammaRamp(DD_Gamma,0,&ramp);
+ IDirectDrawGammaControl_Release(DD_Gamma);
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+// SCAN LINE STUFF
+////////////////////////////////////////////////////////////////////////
+
+void SetScanLineList(LPDIRECTDRAWCLIPPER Clipper)
+{
+ LPRGNDATA lpCL;RECT * pr;int y;POINT Point={0,0};
+
+ IDirectDrawClipper_SetClipList(Clipper,NULL,0);
+
+ lpCL=(LPRGNDATA)malloc(sizeof(RGNDATAHEADER)+((iResY/2)+1)*sizeof(RECT));
+ if(iWindowMode) ClientToScreen(DX.hWnd,&Point);
+
+ lpCL->rdh.dwSize=sizeof(RGNDATAHEADER);
+ lpCL->rdh.iType=RDH_RECTANGLES;
+ lpCL->rdh.nCount=iResY/2;
+ lpCL->rdh.nRgnSize=0;
+ lpCL->rdh.rcBound.left=Point.x;
+ lpCL->rdh.rcBound.top=Point.y;
+ lpCL->rdh.rcBound.bottom=Point.y+iResY;
+ lpCL->rdh.rcBound.right=Point.x+iResX;
+ 
+ pr=(RECT *)lpCL->Buffer;
+ for(y=0;y<iResY;y+=2)
+ {
+ pr->left=Point.x;
+ pr->top=Point.y+y;
+ pr->right=Point.x+iResX;
+ pr->bottom=Point.y+y+1;
+ pr++;
+ }
+
+ IDirectDrawClipper_SetClipList(Clipper,lpCL,0);
+
+ free(lpCL);
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void MoveScanLineArea(HWND hwnd)
+{
+ LPDIRECTDRAWCLIPPER Clipper;HRESULT h;
+ DDBLTFX ddbltfx;RECT r;
+
+ if(FAILED(h=IDirectDraw_CreateClipper(DX.DD,0,&Clipper,NULL)))
+ return;
+
+ IDirectDrawSurface_SetClipper(DX.DDSPrimary,NULL);
+ 
+ ddbltfx.dwSize = sizeof(ddbltfx);
+ ddbltfx.dwFillColor = 0x00000000;
+ 
+ GetClientRect(hwnd,&r);
+ ClientToScreen(hwnd,(LPPOINT)&r.left);
+ r.right+=r.left;
+ r.bottom+=r.top;
+
+ IDirectDrawSurface_Blt(DX.DDSPrimary,&r,NULL,NULL,DDBLT_COLORFILL,&ddbltfx);
+
+ SetScanLineList(Clipper);
+
+ IDirectDrawSurface_SetClipper(DX.DDSPrimary,Clipper);
+ IDirectDrawClipper_Release(Clipper);
+}
+
+////////////////////////////////////////////////////////////////////////
+// MAIN DIRECT DRAW INIT
+////////////////////////////////////////////////////////////////////////
+
+BOOL ReStart=FALSE;
+
+int DXinitialize() 
+{
+ LPDIRECTDRAW DD;int i;
+ LPDIRECTDRAWCLIPPER Clipper;HRESULT h;
+ GUID FAR * guid=0;
+ unsigned char * c;
+ DDSCAPS ddscaps;
+ DDBLTFX ddbltfx;
+ DDPIXELFORMAT dd;
+ HRESULT (WINAPI *pDDrawCreateFn)(GUID *,LPDIRECTDRAW *,IUnknown *);
+
+ // init some DX vars
+ DX.hWnd = (HWND)hWGPU;
+ DX.DDSHelper=0;
+ DX.DDSScreenPic=0;
+
+ // make guid !
+ c=(unsigned char *)&guiDev;
+ for(i=0;i<sizeof(GUID);i++,c++)
+ {if(*c) {guid=&guiDev;break;}}
+
+ pDDrawCreateFn = (LPVOID)GetProcAddress( hDDrawDLL, "DirectDrawCreate" );
+
+ // create dd
+ if(pDDrawCreateFn == NULL || pDDrawCreateFn(guid,&DD,0)) 
+ {
+ MessageBox(NULL, "This GPU requires DirectX!", "Error", MB_OK);
+ return 0; 
+ }
+
+ DX.DD=DD;
+
+ //////////////////////////////////////////////////////// co-op level
+
+ if(iWindowMode) // win mode?
+ {
+ if(IDirectDraw_SetCooperativeLevel(DX.DD,DX.hWnd,DDSCL_NORMAL)) 
+ return 0;
+ }
+ else
+ {
+ if(ReStart)
+ {
+ if(IDirectDraw_SetCooperativeLevel(DX.DD,DX.hWnd, DDSCL_NORMAL | DDSCL_FULLSCREEN | DDSCL_FPUSETUP)) 
+ return 0;
+ }
+ else
+ {
+ if(IDirectDraw_SetCooperativeLevel(DX.DD,DX.hWnd, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN | DDSCL_FPUSETUP)) 
+ return 0;
+ }
+
+ if(iRefreshRate)
+ {
+ LPDIRECTDRAW2 DD2;
+ IDirectDraw_QueryInterface(DX.DD,&IID_IDirectDraw2,(LPVOID *)&DD2);
+ if(IDirectDraw2_SetDisplayMode(DD2,iResX,iResY,iColDepth,iRefreshRate,0))
+ return 0;
+ }
+ else
+ {
+ if(IDirectDraw_SetDisplayMode(DX.DD,iResX,iResY,iColDepth)) 
+ return 0;
+ }
+ }
+
+ //////////////////////////////////////////////////////// main surfaces
+
+ memset(&ddsd, 0, sizeof(DDSURFACEDESC));
+ memset(&ddscaps, 0, sizeof(DDSCAPS));
+ ddsd.dwSize = sizeof(DDSURFACEDESC);
+
+ ddsd.dwFlags = DDSD_CAPS; // front buffer
+
+ if(iSysMemory)
+ ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE | DDSCAPS_SYSTEMMEMORY;
+ else 
+ ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE | DDSCAPS_VIDEOMEMORY;
+
+ //ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE;//|DDSCAPS_VIDEOMEMORY;
+ if(IDirectDraw_CreateSurface(DX.DD,&ddsd, &DX.DDSPrimary, NULL)) 
+ return 0;
+
+ //----------------------------------------------------//
+ if(iSysMemory && iUseScanLines==2) iUseScanLines=1; // pete: nvidia hack not needed on system mem
+
+ if(iUseScanLines==2) // special nvidia hack
+ {
+ memset(&ddsd, 0, sizeof(DDSURFACEDESC));
+ ddsd.dwSize = sizeof(DDSURFACEDESC);
+ ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS;
+ ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN;
+ ddsd.dwWidth = iResX;
+ ddsd.dwHeight = iResY;
+
+ if(IDirectDraw_CreateSurface(DX.DD,&ddsd, &DX.DDSHelper, NULL)) 
+ return 0;
+ }
+ //----------------------------------------------------//
+
+ memset(&ddsd, 0, sizeof(DDSURFACEDESC)); // back buffer
+ ddsd.dwSize = sizeof(DDSURFACEDESC);
+ ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS;
+// ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN;//|DDSCAPS_VIDEOMEMORY;
+ if(iSysMemory)
+ ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY;
+ else 
+ ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY;
+
+ if(iDebugMode || iUseNoStretchBlt>=3)
+ ddsd.dwWidth = 1024;
+ else ddsd.dwWidth = 640;
+
+ if(iUseNoStretchBlt>=3)
+ ddsd.dwHeight = 1024;
+ else 
+ {
+ if(iDebugMode) ddsd.dwHeight = iGPUHeight;
+ else ddsd.dwHeight = 512;
+ }
+
+ if(IDirectDraw_CreateSurface(DX.DD,&ddsd, &DX.DDSRender, NULL)) 
+ return 0;
+
+ // check for desktop color depth
+ dd.dwSize=sizeof(DDPIXELFORMAT);
+ IDirectDrawSurface_GetPixelFormat(DX.DDSRender,&dd); 
+
+ if(dd.dwRBitMask==0x00007c00 &&
+ dd.dwGBitMask==0x000003e0 &&
+ dd.dwBBitMask==0x0000001f)
+ {
+ if(iUseNoStretchBlt>=3)
+ BlitScreen=BlitScreen15_2xSaI;
+ else BlitScreen=BlitScreen15;
+ iDesktopCol=15;
+ }
+ else
+ if(dd.dwRBitMask==0x0000f800 &&
+ dd.dwGBitMask==0x000007e0 &&
+ dd.dwBBitMask==0x0000001f)
+ {
+ if(iUseNoStretchBlt < 4)
+ 		BlitScreen = BlitScreen16;
+ else if(iUseNoStretchBlt < 13)
+ BlitScreen = BlitScreen16_2xSaI;
+ else
+ BlitScreen = BlitScreen16_3xSaI;
+ iDesktopCol=16;
+ }
+ else 
+ {
+ if(iUseNoStretchBlt < 4)
+	BlitScreen = BlitScreen32;
+ else if(iUseNoStretchBlt < 13)
+ BlitScreen = BlitScreen32_2xSaI;
+ else
+ BlitScreen = BlitScreen32_3xSaI;
+ iDesktopCol=32;
+ }
+
+ //////////////////////////////////////////////////////// extra blts
+
+ switch(iUseNoStretchBlt)
+ {
+ case 1:
+ pExtraBltFunc=NoStretchedBlit;
+ p2XSaIFunc=NULL;
+ break;
+ case 2:
+ pExtraBltFunc=NoStretchedBlitEx;
+ p2XSaIFunc=NULL;
+ break;
+ case 3:
+ pExtraBltFunc=StretchedBlit2x;
+ if (iDesktopCol==15) p2XSaIFunc=Std2xSaI_ex5;
+ else if(iDesktopCol==16) p2XSaIFunc=Std2xSaI_ex6;
+ else p2XSaIFunc=Std2xSaI_ex8;
+ break;
+ case 4:
+ pExtraBltFunc=NoStretchedBlit2x;
+ if (iDesktopCol==15) p2XSaIFunc=Std2xSaI_ex5;
+ else if(iDesktopCol==16) p2XSaIFunc=Std2xSaI_ex6;
+ else p2XSaIFunc=Std2xSaI_ex8;
+ break;
+ case 5:
+ pExtraBltFunc=StretchedBlit2x;
+ if (iDesktopCol==15) p2XSaIFunc=Super2xSaI_ex5;
+ else if(iDesktopCol==16) p2XSaIFunc=Super2xSaI_ex6;
+ else p2XSaIFunc=Super2xSaI_ex8;
+ break;
+ case 6:
+ pExtraBltFunc=NoStretchedBlit2x;
+ if (iDesktopCol==15) p2XSaIFunc=Super2xSaI_ex5;
+ else if(iDesktopCol==16) p2XSaIFunc=Super2xSaI_ex6;
+ else p2XSaIFunc=Super2xSaI_ex8;
+ break;
+ case 7:
+ pExtraBltFunc=StretchedBlit2x;
+ if (iDesktopCol==15) p2XSaIFunc=SuperEagle_ex5;
+ else if(iDesktopCol==16) p2XSaIFunc=SuperEagle_ex6;
+ else p2XSaIFunc=SuperEagle_ex8;
+ break;
+ case 8:
+ pExtraBltFunc=NoStretchedBlit2x;
+ if (iDesktopCol==15) p2XSaIFunc=SuperEagle_ex5;
+ else if(iDesktopCol==16) p2XSaIFunc=SuperEagle_ex6;
+ else p2XSaIFunc=SuperEagle_ex8;
+ break;
+ case 9:
+ pExtraBltFunc=StretchedBlit2x;
+ if (iDesktopCol==15) p2XSaIFunc=Scale2x_ex6_5;
+ else if(iDesktopCol==16) p2XSaIFunc=Scale2x_ex6_5;
+ else p2XSaIFunc=Scale2x_ex8;
+ break;
+ case 10:
+ pExtraBltFunc=NoStretchedBlit2x;
+ if (iDesktopCol==15) p2XSaIFunc=Scale2x_ex6_5;
+ else if(iDesktopCol==16) p2XSaIFunc=Scale2x_ex6_5;
+ else p2XSaIFunc=Scale2x_ex8;
+ break;
+ case 11:
+ pExtraBltFunc=NoStretchedBlit2x;
+	if(iDesktopCol==15) p2XSaIFunc=hq2x;
+ else if(iDesktopCol==16) p2XSaIFunc=hq2x;
+ else p2XSaIFunc=hq2x_32;
+	break;
+ case 12:
+ pExtraBltFunc=StretchedBlit2x;
+ if(iDesktopCol==15) p2XSaIFunc=hq2x;
+	else if(iDesktopCol==16) p2XSaIFunc=hq2x;
+	else p2XSaIFunc=hq2x_32;
+	break;
+ case 13:
+	pExtraBltFunc=StretchedBlit2x;
+	if(iDesktopCol==15) p2XSaIFunc=Scale3x_ex6_5;
+	else if(iDesktopCol==16) p2XSaIFunc=Scale3x_ex6_5;
+	else p2XSaIFunc=Scale3x_ex8;
+	break;
+ case 14:
+	pExtraBltFunc=NoStretchedBlit3x;
+	if(iDesktopCol==15) p2XSaIFunc=Scale3x_ex6_5;
+ else if(iDesktopCol==16) p2XSaIFunc=Scale3x_ex6_5;
+	else p2XSaIFunc=Scale3x_ex8;
+	break;
+ case 15:
+	pExtraBltFunc=NoStretchedBlit3x;
+	if (iDesktopCol==15) p2XSaIFunc=hq3x_16;
+	else if(iDesktopCol==16) p2XSaIFunc=hq3x_16;
+	else p2XSaIFunc=hq3x_32;
+	break;
+ default:
+ pExtraBltFunc=NULL;
+ p2XSaIFunc=NULL;
+ break;
+ }
+
+ //////////////////////////////////////////////////////// clipper init
+ 
+ if(FAILED(h=IDirectDraw_CreateClipper(DX.DD,0,&Clipper,NULL)))
+ return 0;
+
+ if(iUseScanLines)
+ SetScanLineList(Clipper);
+ else IDirectDrawClipper_SetHWnd(Clipper,0,DX.hWnd);
+
+ IDirectDrawSurface_SetClipper(DX.DDSPrimary,Clipper);
+ IDirectDrawClipper_Release(Clipper);
+
+ //////////////////////////////////////////////////////// small screen clean up
+
+ DXSetGamma();
+ 
+ ddbltfx.dwSize = sizeof(ddbltfx);
+ ddbltfx.dwFillColor = 0x00000000;
+ 
+ IDirectDrawSurface_Blt(DX.DDSPrimary,NULL,NULL,NULL,DDBLT_COLORFILL,&ddbltfx);
+ IDirectDrawSurface_Blt(DX.DDSRender,NULL,NULL,NULL,DDBLT_COLORFILL,&ddbltfx);
+
+ //////////////////////////////////////////////////////// finish init
+
+ if(iUseNoStretchBlt>=3)
+ {
+ pSaISmallBuff=malloc(512*512*4);
+ memset(pSaISmallBuff,0,512*512*4);
+ pSaIBigBuff=malloc(1024*1024*4);
+ memset(pSaIBigBuff,0,1024*1024*4);
+ }
+
+ bUsingTWin=FALSE; 
+
+ InitMenu(); // menu init
+
+ if(iShowFPS) // fps on startup
+ {
+ ulKeybits|=KEY_SHOWFPS;
+ szDispBuf[0]=0;
+ BuildDispMenu(0);
+ }
+
+ bIsFirstFrame = FALSE; // done
+
+ return 0;
+}
+
+////////////////////////////////////////////////////////////////////////
+// clean up DX stuff
+////////////////////////////////////////////////////////////////////////
+
+void DXcleanup() // DX CLEANUP
+{
+ CloseMenu(); // bye display lists
+
+ if(iUseNoStretchBlt>=3)
+ {
+ if(pSaISmallBuff) free(pSaISmallBuff);
+ pSaISmallBuff=NULL;
+ if(pSaIBigBuff) free(pSaIBigBuff);
+ pSaIBigBuff=NULL;
+ }
+
+ if(!bIsFirstFrame)
+ {
+ if(DX.DDSHelper) IDirectDrawSurface_Release(DX.DDSHelper);
+ DX.DDSHelper=0;
+ if(DX.DDSScreenPic) IDirectDrawSurface_Release(DX.DDSScreenPic);
+ DX.DDSScreenPic=0;
+ IDirectDrawSurface_Release(DX.DDSRender);
+ IDirectDrawSurface_Release(DX.DDSPrimary);
+ IDirectDraw_SetCooperativeLevel(DX.DD,DX.hWnd, DDSCL_NORMAL);
+ IDirectDraw_RestoreDisplayMode(DX.DD);
+ IDirectDraw_Release(DX.DD);
+
+ ReStart=TRUE;
+ bIsFirstFrame = TRUE;
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+
+DWORD dwGPUStyle=0; // vars to store some wimdows stuff
+HANDLE hGPUMenu=NULL;
+
+unsigned long ulInitDisplay(void)
+{
+ HDC hdc;RECT r;
+
+ if(iWindowMode) // win mode?
+ {
+ DWORD dw=GetWindowLong(hWGPU, GWL_STYLE); // -> adjust wnd style
+ dwGPUStyle=dw;
+ dw&=~WS_THICKFRAME;
+ dw|=WS_BORDER|WS_CAPTION;
+ SetWindowLong(hWGPU, GWL_STYLE, dw);
+
+ iResX=LOWORD(iWinSize);iResY=HIWORD(iWinSize);
+ ShowWindow(hWGPU,SW_SHOWNORMAL);
+
+ if(iUseScanLines)
+ SetWindowPos(hWGPU,HWND_TOPMOST,0,0,0,0,SWP_NOMOVE|SWP_NOSIZE);
+
+ MoveWindow(hWGPU, // -> move wnd
+ GetSystemMetrics(SM_CXFULLSCREEN)/2-iResX/2,
+ GetSystemMetrics(SM_CYFULLSCREEN)/2-iResY/2,
+ iResX+GetSystemMetrics(SM_CXFIXEDFRAME)+3,
+ iResY+GetSystemMetrics(SM_CYFIXEDFRAME)+GetSystemMetrics(SM_CYCAPTION)+3,
+ TRUE);
+ UpdateWindow(hWGPU); // -> let windows do some update
+ }
+ else // no window mode:
+ {
+ DWORD dw=GetWindowLong(hWGPU, GWL_STYLE); // -> adjust wnd style
+ dwGPUStyle=dw;
+ hGPUMenu=GetMenu(hWGPU);
+
+ dw&=~(WS_THICKFRAME|WS_BORDER|WS_CAPTION);
+ SetWindowLong(hWGPU, GWL_STYLE, dw);
+ SetMenu(hWGPU,NULL);
+
+ ShowWindow(hWGPU,SW_SHOWMAXIMIZED); // -> max mode
+ }
+
+ r.left=r.top=0;r.right=iResX;r.bottom=iResY; // init bkg with black
+ hdc = GetDC(hWGPU);
+ FillRect(hdc,&r,(HBRUSH)GetStockObject(BLACK_BRUSH));
+ ReleaseDC(hWGPU, hdc);
+
+ DXinitialize(); // init direct draw (not D3D... oh, well)
+
+ if(!iWindowMode) // fullscreen mode?
+ ShowWindow(hWGPU,SW_SHOWMAXIMIZED); // -> maximize again (fixes strange DX behavior)
+
+ return 1;
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void CloseDisplay(void)
+{
+ DXcleanup(); // cleanup dx
+
+ SetWindowLong(hWGPU, GWL_STYLE,dwGPUStyle); // repair window
+ if(hGPUMenu) SetMenu(hWGPU,(HMENU)hGPUMenu);
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void CreatePic(unsigned char * pMem)
+{
+ DDSURFACEDESC xddsd;HRESULT ddrval;
+ unsigned char * ps;int x,y;
+
+ memset(&xddsd, 0, sizeof(DDSURFACEDESC));
+ xddsd.dwSize = sizeof(DDSURFACEDESC);
+ xddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS;
+// xddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN;
+
+ if(iSysMemory)
+ xddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY;
+ else 
+ xddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY;
+
+ xddsd.dwWidth = 128;
+ xddsd.dwHeight = 96;
+
+ if(IDirectDraw_CreateSurface(DX.DD,&xddsd, &DX.DDSScreenPic, NULL)) 
+ {DX.DDSScreenPic=0;return;}
+
+ ddrval=IDirectDrawSurface_Lock(DX.DDSScreenPic,NULL, &xddsd, DDLOCK_WAIT|DDLOCK_WRITEONLY, NULL);
+
+ if(ddrval==DDERR_SURFACELOST)
+ {
+ IDirectDrawSurface_Restore(DX.DDSScreenPic);
+ } 
+
+ if(ddrval!=DD_OK)
+ {
+ IDirectDrawSurface_Unlock(DX.DDSScreenPic,&xddsd);
+ return;
+ }
+
+ ps=(unsigned char *)xddsd.lpSurface;
+
+ if(iDesktopCol==16)
+ {
+ unsigned short s;
+ for(y=0;y<96;y++)
+ {
+ for(x=0;x<128;x++)
+ {
+ s=(*(pMem+0))>>3;
+ s|=((*(pMem+1))&0xfc)<<3;
+ s|=((*(pMem+2))&0xf8)<<8;
+ pMem+=3;
+ *((unsigned short *)(ps+y*xddsd.lPitch+x*2))=s;
+ }
+ }
+ }
+ else
+ if(iDesktopCol==15)
+ {
+ unsigned short s;
+ for(y=0;y<96;y++)
+ {
+ for(x=0;x<128;x++)
+ {
+ s=(*(pMem+0))>>3;
+ s|=((*(pMem+1))&0xfc)<<2;
+ s|=((*(pMem+2))&0xf8)<<7;
+ pMem+=3;
+ *((unsigned short *)(ps+y*xddsd.lPitch+x*2))=s;
+ }
+ }
+ }
+ else
+ if(iDesktopCol==32)
+ {
+ unsigned long l;
+ for(y=0;y<96;y++)
+ {
+ for(x=0;x<128;x++)
+ {
+ l= *(pMem+0);
+ l|=(*(pMem+1))<<8;
+ l|=(*(pMem+2))<<16;
+ pMem+=3;
+ *((unsigned long *)(ps+y*xddsd.lPitch+x*4))=l;
+ }
+ }
+ }
+
+ IDirectDrawSurface_Unlock(DX.DDSScreenPic,&xddsd);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+void DestroyPic(void)
+{
+ if(DX.DDSScreenPic)
+ {
+ RECT ScreenRect={iResX-128,0,iResX,96};
+ DDBLTFX ddbltfx;
+
+ if(iWindowMode)
+ {
+ POINT Point={0,0};
+ ClientToScreen(DX.hWnd,&Point);
+ ScreenRect.left+=Point.x;
+ ScreenRect.right+=Point.x;
+ ScreenRect.top+=Point.y;
+ ScreenRect.bottom+=Point.y;
+ }
+
+ ddbltfx.dwSize = sizeof(ddbltfx);
+ ddbltfx.dwFillColor = 0x00000000;
+ IDirectDrawSurface_Blt(DX.DDSPrimary,&ScreenRect,NULL,NULL,DDBLT_COLORFILL,&ddbltfx);
+
+ IDirectDrawSurface_Release(DX.DDSScreenPic);
+ DX.DDSScreenPic=0;
+ }
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+void DisplayPic(void)
+{
+ RECT ScreenRect={iResX-128,0,iResX,96}, 
+ HelperRect={0,0,128,96};
+ if(iWindowMode)
+ {
+ POINT Point={0,0};
+ ClientToScreen(DX.hWnd,&Point);
+ ScreenRect.left+=Point.x;
+ ScreenRect.right+=Point.x;
+ ScreenRect.top+=Point.y;
+ ScreenRect.bottom+=Point.y;
+ }
+
+// ??? eh... no need to wait here!
+// WaitVBlank();
+
+ IDirectDrawSurface_Blt(DX.DDSPrimary,&ScreenRect,DX.DDSScreenPic,&HelperRect,
+ DDBLT_WAIT,NULL);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+void ShowGpuPic(void)
+{
+ HRSRC hR;HGLOBAL hG;unsigned long * pRMem;
+ unsigned char * pMem;int x,y;unsigned long * pDMem;
+
+ // turn off any screen pic, if it does already exist
+ if(DX.DDSScreenPic) {DestroyPic();return;}
+
+ if(ulKeybits&KEY_SHOWFPS) {ShowTextGpuPic();return;}
+
+ // load and lock the bitmap (lock is kinda obsolete in win32)
+ hR=FindResource(hInst,MAKEINTRESOURCE(IDB_GPU),RT_BITMAP);
+ hG=LoadResource(hInst,hR);
+ 
+ // get long ptr to bmp data
+ pRMem=((unsigned long *)LockResource(hG))+10;
+
+ // change the data upside-down
+ pMem=(unsigned char *)malloc(128*96*3);
+ 
+ for(y=0;y<96;y++)
+ {
+ pDMem=(unsigned long *)(pMem+(95-y)*128*3);
+ for(x=0;x<96;x++) *pDMem++=*pRMem++;
+ }
+
+ // show the pic
+ CreatePic(pMem);
+
+ // clean up
+ free(pMem);
+ DeleteObject(hG);
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void ShowTextGpuPic(void) // CREATE TEXT SCREEN PIC
+{ // gets an Text and paints
+ unsigned char * pMem;BITMAPINFO bmi; // it into a rgb24 bitmap
+ HDC hdc,hdcMem;HBITMAP hBmp,hBmpMem;HFONT hFontMem; // to display it in the gpu
+ HBRUSH hBrush,hBrushMem;HPEN hPen,hPenMem;
+ char szB[256];
+ RECT r={0,0,128,96}; // size of bmp... don't change that
+ COLORREF crFrame = RGB(128,255,128); // some example color inits
+ COLORREF crBkg = RGB(0,0,0);
+ COLORREF crText = RGB(0,255,0);
+
+ if(DX.DDSScreenPic) DestroyPic();
+
+ //----------------------------------------------------// creation of the dc & bitmap
+
+ hdc =GetDC(NULL); // create a dc
+ hdcMem=CreateCompatibleDC(hdc);
+ ReleaseDC(NULL,hdc);
+ 
+ memset(&bmi,0,sizeof(BITMAPINFO)); // create a 24bit dib
+ bmi.bmiHeader.biSize=sizeof(BITMAPINFOHEADER);
+ bmi.bmiHeader.biWidth=128;
+ bmi.bmiHeader.biHeight=-96;
+ bmi.bmiHeader.biPlanes=1;
+ bmi.bmiHeader.biBitCount=24;
+ bmi.bmiHeader.biCompression=BI_RGB;
+ hBmp=CreateDIBSection(hdcMem,&bmi,DIB_RGB_COLORS,
+ (void **)&pMem,NULL,0); // pMem will point to 128x96x3 bitmap data
+
+ hBmpMem = (HBITMAP)SelectObject(hdcMem,hBmp); // sel the bmp into the dc
+
+ //----------------------------------------------------// ok, the following is just a drawing example... change it...
+ // create & select an additional font... whatever you want to paint, paint it in the dc :)
+ hBrush=CreateSolidBrush(crBkg);
+ hPen=CreatePen(PS_SOLID,0,crFrame);
+
+ hBrushMem = (HBRUSH)SelectObject(hdcMem,hBrush);
+ hPenMem = (HPEN)SelectObject(hdcMem,hPen);
+ hFontMem = (HFONT)SelectObject(hdcMem,hGFont);
+
+ SetTextColor(hdcMem,crText);
+ SetBkColor(hdcMem,crBkg);
+
+ Rectangle(hdcMem,r.left,r.top,r.right,r.bottom); // our example: fill rect and paint border
+ InflateRect(&r,-3,-2); // reduce the text area
+
+ LoadString(hInst,IDS_INFO0+iMPos,szB,255);
+ DrawText(hdcMem,szB,strlen(szB),&r, // paint the text (including clipping and word break)
+ DT_LEFT|DT_WORDBREAK);
+ 
+ //----------------------------------------------------// ok, now store the pMem data, or just call the gpu func
+
+ CreatePic(pMem);
+
+ //----------------------------------------------------// finished, now we clean up... needed, or you will get resource leaks :)
+
+ SelectObject(hdcMem,hBmpMem); // sel old mem dc objects
+ SelectObject(hdcMem,hBrushMem);
+ SelectObject(hdcMem,hPenMem);
+ SelectObject(hdcMem,hFontMem);
+ DeleteDC(hdcMem); // delete mem dcs
+ DeleteObject(hBmp);
+ DeleteObject(hBrush); // delete created objects
+ DeleteObject(hPen);
+}
+
+///////////////////////////////////////////////////////////////////////
+
+static void hqx_init(unsigned bits_per_pixel)
+{
+ interp_set(bits_per_pixel);
+}
+
+static void hq2x_16_def(unsigned short* dst0, unsigned short* dst1, const unsigned short* src0, const unsigned short* src1, const unsigned short* src2, unsigned count)
+{
+	unsigned i;
+
+	for(i=0;i<count;++i) {
+		unsigned char mask;
+
+		unsigned short c[9];
+
+		c[1] = src0[0];
+		c[4] = src1[0];
+		c[7] = src2[0];
+
+		if (i>0) {
+			c[0] = src0[-1];
+			c[3] = src1[-1];
+			c[6] = src2[-1];
+		} else {
+			c[0] = c[1];
+			c[3] = c[4];
+			c[6] = c[7];
+		}
+
+		if (i<count-1) {
+			c[2] = src0[1];
+			c[5] = src1[1];
+			c[8] = src2[1];
+		} else {
+			c[2] = c[1];
+			c[5] = c[4];
+			c[8] = c[7];
+		}
+
+		mask = 0;
+
+		if (interp_16_diff(c[0], c[4]))
+			mask |= 1 << 0;
+		if (interp_16_diff(c[1], c[4]))
+			mask |= 1 << 1;
+		if (interp_16_diff(c[2], c[4]))
+			mask |= 1 << 2;
+		if (interp_16_diff(c[3], c[4]))
+			mask |= 1 << 3;
+		if (interp_16_diff(c[5], c[4]))
+			mask |= 1 << 4;
+		if (interp_16_diff(c[6], c[4]))
+			mask |= 1 << 5;
+		if (interp_16_diff(c[7], c[4]))
+			mask |= 1 << 6;
+		if (interp_16_diff(c[8], c[4]))
+			mask |= 1 << 7;
+
+#define P0 dst0[0]
+#define P1 dst0[1]
+#define P2 dst1[0]
+#define P3 dst1[1]
+#define MUR interp_16_diff(c[1], c[5])
+#define MDR interp_16_diff(c[5], c[7])
+#define MDL interp_16_diff(c[7], c[3])
+#define MUL interp_16_diff(c[3], c[1])
+#define IC(p0) c[p0]
+#define I11(p0,p1) interp_16_11(c[p0], c[p1])
+#define I211(p0,p1,p2) interp_16_211(c[p0], c[p1], c[p2])
+#define I31(p0,p1) interp_16_31(c[p0], c[p1])
+#define I332(p0,p1,p2) interp_16_332(c[p0], c[p1], c[p2])
+#define I431(p0,p1,p2) interp_16_431(c[p0], c[p1], c[p2])
+#define I521(p0,p1,p2) interp_16_521(c[p0], c[p1], c[p2])
+#define I53(p0,p1) interp_16_53(c[p0], c[p1])
+#define I611(p0,p1,p2) interp_16_611(c[p0], c[p1], c[p2])
+#define I71(p0,p1) interp_16_71(c[p0], c[p1])
+#define I772(p0,p1,p2) interp_16_772(c[p0], c[p1], c[p2])
+#define I97(p0,p1) interp_16_97(c[p0], c[p1])
+#define I1411(p0,p1,p2) interp_16_1411(c[p0], c[p1], c[p2])
+#define I151(p0,p1) interp_16_151(c[p0], c[p1])
+
+		switch (mask) {
+#include "hq2x.h"
+		}
+
+#undef P0
+#undef P1
+#undef P2
+#undef P3
+#undef MUR
+#undef MDR
+#undef MDL
+#undef MUL
+#undef IC
+#undef I11
+#undef I211
+#undef I31
+#undef I332
+#undef I431
+#undef I521
+#undef I53
+#undef I611
+#undef I71
+#undef I772
+#undef I97
+#undef I1411
+#undef I151
+
+		src0 += 1;
+		src1 += 1;
+		src2 += 1;
+		dst0 += 2;
+		dst1 += 2;
+	}
+}
+
+void hq2x( unsigned char * srcPtr, DWORD srcPitch, unsigned char * dstPtr, int width, int height)
+{
+	const int dstPitch = srcPitch;
+
+	int count = height;
+
+	unsigned short *dst0 = (unsigned short *)dstPtr;
+	unsigned short *dst1 = dst0 + dstPitch;
+
+	unsigned short *src0 = (unsigned short *)srcPtr;
+	unsigned short *src1 = src0 + (srcPitch >> 1);
+	unsigned short *src2 = src1 + (srcPitch >> 1);
+	hqx_init(16);
+	hq2x_16_def(dst0, dst1, src0, src0, src1, width);
+
+	count -= 2;
+	while(count) {
+		dst0 += dstPitch << 1;
+		dst1 += dstPitch << 1;
+		hq2x_16_def(dst0, dst1, src0, src1, src2, width);
+		src0 = src1;
+		src1 = src2;
+		src2 += srcPitch >> 1;
+		--count;
+	}
+	dst0 += dstPitch << 1;
+	dst1 += dstPitch << 1;
+	hq2x_16_def(dst0, dst1, src0, src1, src1, width);
+}
+
+///////////////////////////////////////////////////////////////////
+
+static void hq2x_32_def(unsigned long * dst0, unsigned long * dst1, const unsigned long * src0, const unsigned long * src1, const unsigned long * src2, unsigned count)
+{
+	unsigned i;
+
+	for(i=0;i<count;++i) {
+		unsigned char mask;
+
+		unsigned long c[9];
+
+		c[1] = src0[0];
+		c[4] = src1[0];
+		c[7] = src2[0];
+
+		if (i>0) {
+			c[0] = src0[-1];
+			c[3] = src1[-1];
+			c[6] = src2[-1];
+		} else {
+			c[0] = c[1];
+			c[3] = c[4];
+			c[6] = c[7];
+		}
+
+		if (i<count-1) {
+			c[2] = src0[1];
+			c[5] = src1[1];
+			c[8] = src2[1];
+		} else {
+			c[2] = c[1];
+			c[5] = c[4];
+			c[8] = c[7];
+		}
+
+		mask = 0;
+
+		if (interp_32_diff(c[0], c[4]))
+			mask |= 1 << 0;
+		if (interp_32_diff(c[1], c[4]))
+			mask |= 1 << 1;
+		if (interp_32_diff(c[2], c[4]))
+			mask |= 1 << 2;
+		if (interp_32_diff(c[3], c[4]))
+			mask |= 1 << 3;
+		if (interp_32_diff(c[5], c[4]))
+			mask |= 1 << 4;
+		if (interp_32_diff(c[6], c[4]))
+			mask |= 1 << 5;
+		if (interp_32_diff(c[7], c[4]))
+			mask |= 1 << 6;
+		if (interp_32_diff(c[8], c[4]))
+			mask |= 1 << 7;
+
+#define P0 dst0[0]
+#define P1 dst0[1]
+#define P2 dst1[0]
+#define P3 dst1[1]
+#define MUR interp_32_diff(c[1], c[5])
+#define MDR interp_32_diff(c[5], c[7])
+#define MDL interp_32_diff(c[7], c[3])
+#define MUL interp_32_diff(c[3], c[1])
+#define IC(p0) c[p0]
+#define I11(p0,p1) interp_32_11(c[p0], c[p1])
+#define I211(p0,p1,p2) interp_32_211(c[p0], c[p1], c[p2])
+#define I31(p0,p1) interp_32_31(c[p0], c[p1])
+#define I332(p0,p1,p2) interp_32_332(c[p0], c[p1], c[p2])
+#define I431(p0,p1,p2) interp_32_431(c[p0], c[p1], c[p2])
+#define I521(p0,p1,p2) interp_32_521(c[p0], c[p1], c[p2])
+#define I53(p0,p1) interp_32_53(c[p0], c[p1])
+#define I611(p0,p1,p2) interp_32_611(c[p0], c[p1], c[p2])
+#define I71(p0,p1) interp_32_71(c[p0], c[p1])
+#define I772(p0,p1,p2) interp_32_772(c[p0], c[p1], c[p2])
+#define I97(p0,p1) interp_32_97(c[p0], c[p1])
+#define I1411(p0,p1,p2) interp_32_1411(c[p0], c[p1], c[p2])
+#define I151(p0,p1) interp_32_151(c[p0], c[p1])
+
+		switch (mask) {
+#include "hq2x.h"
+		}
+
+#undef P0
+#undef P1
+#undef P2
+#undef P3
+#undef MUR
+#undef MDR
+#undef MDL
+#undef MUL
+#undef IC
+#undef I11
+#undef I211
+#undef I31
+#undef I332
+#undef I431
+#undef I521
+#undef I53
+#undef I611
+#undef I71
+#undef I772
+#undef I97
+#undef I1411
+#undef I151
+
+		src0 += 1;
+		src1 += 1;
+		src2 += 1;
+		dst0 += 2;
+		dst1 += 2;
+	}
+}
+
+
+
+void hq2x_32( unsigned char * srcPtr, DWORD srcPitch, unsigned char * dstPtr, int width, int height)
+{
+	const int dstPitch = srcPitch<<1;
+
+	int count = height;
+
+	unsigned long *dst0 = (unsigned long *)dstPtr;
+	unsigned long *dst1 = dst0 + (dstPitch >> 2);
+
+	unsigned long *src0 = (unsigned long *)srcPtr;
+	unsigned long *src1 = src0 + (srcPitch >> 2);
+	unsigned long *src2 = src1 + (srcPitch >> 2);
+	hq2x_32_def(dst0, dst1, src0, src0, src1, width);
+
+
+
+	count -= 2;
+	while(count) {
+		dst0 += dstPitch >> 1;
+		dst1 += dstPitch >> 1;
+		hq2x_32_def(dst0, dst1, src0, src1, src2, width);
+		src0 = src1;
+		src1 = src2;
+		src2 += srcPitch >> 2;
+		--count;
+	}
+	dst0 += dstPitch >> 1;
+	dst1 += dstPitch >> 1;
+	hq2x_32_def(dst0, dst1, src0, src1, src1, width);
+}
+
+static void hq3x_32_def(unsigned long* dst0, unsigned long* dst1, unsigned long* dst2, const unsigned long* src0, const unsigned long* src1, const unsigned long* src2, unsigned count)
+{
+	unsigned i;
+
+	for(i=0;i<count;++i) {
+		unsigned char mask;
+
+		unsigned long c[9];
+
+		c[1] = src0[0];
+		c[4] = src1[0];
+		c[7] = src2[0];
+
+		if (i>0) {
+			c[0] = src0[-1];
+			c[3] = src1[-1];
+			c[6] = src2[-1];
+		} else {
+			c[0] = c[1];
+			c[3] = c[4];
+			c[6] = c[7];
+		}
+
+		if (i<count-1) {
+			c[2] = src0[1];
+			c[5] = src1[1];
+			c[8] = src2[1];
+		} else {
+			c[2] = c[1];
+			c[5] = c[4];
+			c[8] = c[7];
+		}
+
+		mask = 0;
+
+		if (interp_32_diff(c[0], c[4]))
+			mask |= 1 << 0;
+		if (interp_32_diff(c[1], c[4]))
+			mask |= 1 << 1;
+		if (interp_32_diff(c[2], c[4]))
+			mask |= 1 << 2;
+		if (interp_32_diff(c[3], c[4]))
+			mask |= 1 << 3;
+		if (interp_32_diff(c[5], c[4]))
+			mask |= 1 << 4;
+		if (interp_32_diff(c[6], c[4]))
+			mask |= 1 << 5;
+		if (interp_32_diff(c[7], c[4]))
+			mask |= 1 << 6;
+		if (interp_32_diff(c[8], c[4]))
+			mask |= 1 << 7;
+
+#define P0 dst0[0]
+#define P1 dst0[1]
+#define P2 dst0[2]
+#define P3 dst1[0]
+#define P4 dst1[1]
+#define P5 dst1[2]
+#define P6 dst2[0]
+#define P7 dst2[1]
+#define P8 dst2[2]
+#define MUR interp_32_diff(c[1], c[5])
+#define MDR interp_32_diff(c[5], c[7])
+#define MDL interp_32_diff(c[7], c[3])
+#define MUL interp_32_diff(c[3], c[1])
+#define IC(p0) c[p0]
+#define I11(p0,p1) interp_32_11(c[p0], c[p1])
+#define I211(p0,p1,p2) interp_32_211(c[p0], c[p1], c[p2])
+#define I31(p0,p1) interp_32_31(c[p0], c[p1])
+#define I332(p0,p1,p2) interp_32_332(c[p0], c[p1], c[p2])
+#define I431(p0,p1,p2) interp_32_431(c[p0], c[p1], c[p2])
+#define I521(p0,p1,p2) interp_32_521(c[p0], c[p1], c[p2])
+#define I53(p0,p1) interp_32_53(c[p0], c[p1])
+#define I611(p0,p1,p2) interp_32_611(c[p0], c[p1], c[p2])
+#define I71(p0,p1) interp_32_71(c[p0], c[p1])
+#define I772(p0,p1,p2) interp_32_772(c[p0], c[p1], c[p2])
+#define I97(p0,p1) interp_32_97(c[p0], c[p1])
+#define I1411(p0,p1,p2) interp_32_1411(c[p0], c[p1], c[p2])
+#define I151(p0,p1) interp_32_151(c[p0], c[p1])
+
+		switch (mask) {
+#include "hq3x.h"
+		}
+
+#undef P0
+#undef P1
+#undef P2
+#undef P3
+#undef P4
+#undef P5
+#undef P6
+#undef P7
+#undef P8
+#undef MUR
+#undef MDR
+#undef MDL
+#undef MUL
+#undef IC
+#undef I11
+#undef I211
+#undef I31
+#undef I332
+#undef I431
+#undef I521
+#undef I53
+#undef I611
+#undef I71
+#undef I772
+#undef I97
+#undef I1411
+#undef I151
+
+		src0 += 1;
+		src1 += 1;
+		src2 += 1;
+		dst0 += 3;
+		dst1 += 3;
+		dst2 += 3;
+	}
+}
+
+void hq3x_32( unsigned char * srcPtr, DWORD srcPitch, unsigned char * dstPtr, int width, int height)
+{
+
+
+
+	int count = height;
+
+	int dstPitch = srcPitch >> 1;
+
+	unsigned long *dst0 = (unsigned long *)dstPtr;
+	unsigned long *dst1 = dst0 + dstPitch;
+	unsigned long *dst2 = dst1 + dstPitch;
+
+	unsigned long *src0 = (unsigned long *)srcPtr;
+	unsigned long *src1 = src0 + (srcPitch >> 2);
+	unsigned long *src2 = src1 + (srcPitch >> 2);
+	hq3x_32_def(dst0, dst1, dst2, src0, src0, src2, width);
+
+	count -= 2;
+	while(count) {
+
+		dst0 += dstPitch * 3;
+		dst1 += dstPitch * 3;
+		dst2 += dstPitch * 3;
+
+		hq3x_32_def(dst0, dst1, dst2, src0, src1, src2, width);
+		src0 = src1;
+		src1 = src2;
+		src2 += srcPitch >> 2;
+		--count;
+	}
+	dst0 += dstPitch * 3;
+	dst1 += dstPitch * 3;
+	dst2 += dstPitch * 3;
+
+
+	hq3x_32_def(dst0, dst1, dst2, src0, src1, src1, width);
+
+}
+
+static void hq3x_16_def(unsigned short* dst0, unsigned short* dst1, unsigned short* dst2, const unsigned short* src0, const unsigned short* src1, const unsigned short* src2, unsigned count)
+{
+	unsigned i;
+
+	for(i=0;i<count;++i) {
+		unsigned char mask;
+
+		unsigned short c[9];
+
+		c[1] = src0[0];
+		c[4] = src1[0];
+		c[7] = src2[0];
+
+		if (i>0) {
+			c[0] = src0[-1];
+			c[3] = src1[-1];
+			c[6] = src2[-1];
+		} else {
+			c[0] = c[1];
+			c[3] = c[4];
+			c[6] = c[7];
+		}
+
+		if (i<count-1) {
+			c[2] = src0[1];
+			c[5] = src1[1];
+			c[8] = src2[1];
+		} else {
+			c[2] = c[1];
+			c[5] = c[4];
+			c[8] = c[7];
+		}
+
+		mask = 0;
+
+		if (interp_16_diff(c[0], c[4]))
+			mask |= 1 << 0;
+		if (interp_16_diff(c[1], c[4]))
+			mask |= 1 << 1;
+		if (interp_16_diff(c[2], c[4]))
+			mask |= 1 << 2;
+		if (interp_16_diff(c[3], c[4]))
+			mask |= 1 << 3;
+		if (interp_16_diff(c[5], c[4]))
+			mask |= 1 << 4;
+		if (interp_16_diff(c[6], c[4]))
+			mask |= 1 << 5;
+		if (interp_16_diff(c[7], c[4]))
+			mask |= 1 << 6;
+		if (interp_16_diff(c[8], c[4]))
+			mask |= 1 << 7;
+
+#define P0 dst0[0]
+#define P1 dst0[1]
+#define P2 dst0[2]
+#define P3 dst1[0]
+#define P4 dst1[1]
+#define P5 dst1[2]
+#define P6 dst2[0]
+#define P7 dst2[1]
+#define P8 dst2[2]
+#define MUR interp_16_diff(c[1], c[5])
+#define MDR interp_16_diff(c[5], c[7])
+#define MDL interp_16_diff(c[7], c[3])
+#define MUL interp_16_diff(c[3], c[1])
+#define IC(p0) c[p0]
+#define I11(p0,p1) interp_16_11(c[p0], c[p1])
+#define I211(p0,p1,p2) interp_16_211(c[p0], c[p1], c[p2])
+#define I31(p0,p1) interp_16_31(c[p0], c[p1])
+#define I332(p0,p1,p2) interp_16_332(c[p0], c[p1], c[p2])
+#define I431(p0,p1,p2) interp_16_431(c[p0], c[p1], c[p2])
+#define I521(p0,p1,p2) interp_16_521(c[p0], c[p1], c[p2])
+#define I53(p0,p1) interp_16_53(c[p0], c[p1])
+#define I611(p0,p1,p2) interp_16_611(c[p0], c[p1], c[p2])
+#define I71(p0,p1) interp_16_71(c[p0], c[p1])
+#define I772(p0,p1,p2) interp_16_772(c[p0], c[p1], c[p2])
+#define I97(p0,p1) interp_16_97(c[p0], c[p1])
+#define I1411(p0,p1,p2) interp_16_1411(c[p0], c[p1], c[p2])
+#define I151(p0,p1) interp_16_151(c[p0], c[p1])
+
+		switch (mask) {
+#include "hq3x.h"
+		}
+
+#undef P0
+#undef P1
+#undef P2
+#undef P3
+#undef P4
+#undef P5
+#undef P6
+#undef P7
+#undef P8
+#undef MUR
+#undef MDR
+#undef MDL
+#undef MUL
+#undef IC
+#undef I11
+#undef I211
+#undef I31
+#undef I332
+#undef I431
+#undef I521
+#undef I53
+#undef I611
+#undef I71
+#undef I772
+#undef I97
+#undef I1411
+#undef I151
+
+		src0 += 1;
+		src1 += 1;
+		src2 += 1;
+		dst0 += 3;
+		dst1 += 3;
+		dst2 += 3;
+	}
+}
+ 
+void hq3x_16( unsigned char * srcPtr, DWORD srcPitch, unsigned char * dstPtr, int width, int height)
+{
+	int count = height;
+	int dstPitch = srcPitch; 
+
+	unsigned short *dst0 = (unsigned short *)dstPtr;
+	unsigned short *dst1 = dst0 + dstPitch;
+	unsigned short *dst2 = dst1 + dstPitch;
+
+	unsigned short *src0 = (unsigned short *)srcPtr;
+	unsigned short *src1 = src0 + (srcPitch >> 1);
+	unsigned short *src2 = src1 + (srcPitch >> 1);
+	hqx_init(16);
+	hq3x_16_def(dst0, dst1, dst2, src0, src0, src2, width);
+
+	count -= 2;
+	while(count) {
+
+		dst0 += dstPitch * 3;
+		dst1 += dstPitch * 3;
+		dst2 += dstPitch * 3;
+
+		hq3x_16_def(dst0, dst1, dst2, src0, src1, src2, width);
+		src0 = src1;
+		src1 = src2;
+		src2 += srcPitch >> 1;
+		--count;
+	}
+	dst0 += dstPitch * 3;
+	dst1 += dstPitch * 3;
+	dst2 += dstPitch * 3;
+
+	hq3x_16_def(dst0, dst1, dst2, src0, src1, src1, width);
+}
+

pcsxr-1.9.93.tar.bz2/win32/plugins/dfxvideo/winsrc/dxguid.c Added

@@ -0,0 +1,456 @@
+/*
+ DXGUID.C
+
+ Author: Daniel Guerrero Miralles (daguer@geocities.com)
+ Version: 1.0.0
+ Date: April 27, 1999
+
+ ABSTRACT:
+ Source code to generate a library with DirectX GUIDs. For DirectX 6.1
+ and earlier versions.
+
+ LEGAL INFORMATION:
+ This is PUBLIC DOMAIN source code. The source code in this file is
+ provided "as is", without any warranty, including but not limited to,
+ fitness for any particular purpose.
+
+ REMARKS:
+ - This file may have more GUIDs than the original one. It was made by
+ recollecting GUIDs defined in the DirectX header files.
+
+ TODO:
+ Nothing.
+*/
+
+#define INITGUID 1
+#include <basetyps.h>
+
+/////////////////////////////////////////////////////////////////////
+// File D3D.H:
+/////////////////////////////////////////////////////////////////////
+
+DEFINE_GUID(IID_IDirect3D,0x3BBA0080,0x2421,0x11CF,0xA3,0x1A,0x00,0xAA,0x00,0xB9,0x33,0x56);
+DEFINE_GUID(IID_IDirect3D2,0x6aae1ec1,0x662a,0x11d0,0x88,0x9d,0x00,0xaa,0x00,0xbb,0xb7,0x6a);
+DEFINE_GUID(IID_IDirect3D3,0xbb223240,0xe72b,0x11d0,0xa9,0xb4,0x00,0xaa,0x00,0xc0,0x99,0x3e);
+DEFINE_GUID(IID_IDirect3DRampDevice,0xF2086B20,0x259F,0x11CF,0xA3,0x1A,0x00,0xAA,0x00,0xB9,0x33,0x56);
+DEFINE_GUID(IID_IDirect3DRGBDevice,0xA4665C60,0x2673,0x11CF,0xA3,0x1A,0x00,0xAA,0x00,0xB9,0x33,0x56);
+DEFINE_GUID(IID_IDirect3DHALDevice,0x84E63dE0,0x46AA,0x11CF,0x81,0x6F,0x00,0x00,0xC0,0x20,0x15,0x6E);
+DEFINE_GUID(IID_IDirect3DMMXDevice,0x881949a1,0xd6f3,0x11d0,0x89,0xab,0x00,0xa0,0xc9,0x05,0x41,0x29);
+DEFINE_GUID(IID_IDirect3DRefDevice,0x50936643,0x13e9,0x11d1,0x89,0xaa,0x0,0xa0,0xc9,0x5,0x41,0x29);
+DEFINE_GUID(IID_IDirect3DNullDevice,0x8767df22,0xbacc,0x11d1,0x89,0x69,0x0,0xa0,0xc9,0x6,0x29,0xa8);
+DEFINE_GUID(IID_IDirect3DDevice,0x64108800,0x957d,0X11d0,0x89,0xab,0x00,0xa0,0xc9,0x05,0x41,0x29);
+DEFINE_GUID(IID_IDirect3DDevice2,0x93281501,0x8cf8,0x11d0,0x89,0xab,0x0,0xa0,0xc9,0x5,0x41,0x29);
+DEFINE_GUID(IID_IDirect3DDevice3,0xb0ab3b60,0x33d7,0x11d1,0xa9,0x81,0x0,0xc0,0x4f,0xd7,0xb1,0x74);
+DEFINE_GUID(IID_IDirect3DTexture,0x2CDCD9E0,0x25A0,0x11CF,0xA3,0x1A,0x00,0xAA,0x00,0xB9,0x33,0x56);
+DEFINE_GUID(IID_IDirect3DTexture2,0x93281502,0x8cf8,0x11d0,0x89,0xab,0x0,0xa0,0xc9,0x5,0x41,0x29);
+DEFINE_GUID(IID_IDirect3DLight,0x4417C142,0x33AD,0x11CF,0x81,0x6F,0x00,0x00,0xC0,0x20,0x15,0x6E);
+DEFINE_GUID(IID_IDirect3DMaterial,0x4417C144,0x33AD,0x11CF,0x81,0x6F,0x00,0x00,0xC0,0x20,0x15,0x6E);
+DEFINE_GUID(IID_IDirect3DMaterial2,0x93281503,0x8cf8,0x11d0,0x89,0xab,0x0,0xa0,0xc9,0x5,0x41,0x29);
+DEFINE_GUID(IID_IDirect3DMaterial3,0xca9c46f4,0xd3c5,0x11d1,0xb7,0x5a,0x0,0x60,0x8,0x52,0xb3,0x12);
+DEFINE_GUID(IID_IDirect3DExecuteBuffer,0x4417C145,0x33AD,0x11CF,0x81,0x6F,0x00,0x00,0xC0,0x20,0x15,0x6E);
+DEFINE_GUID(IID_IDirect3DViewport,0x4417C146,0x33AD,0x11CF,0x81,0x6F,0x00,0x00,0xC0,0x20,0x15,0x6E);
+DEFINE_GUID(IID_IDirect3DViewport2,0x93281500,0x8cf8,0x11d0,0x89,0xab,0x0,0xa0,0xc9,0x5,0x41,0x29);
+DEFINE_GUID(IID_IDirect3DViewport3,0xb0ab3b61,0x33d7,0x11d1,0xa9,0x81,0x0,0xc0,0x4f,0xd7,0xb1,0x74);
+DEFINE_GUID(IID_IDirect3DVertexBuffer,0x7a503555,0x4a83,0x11d1,0xa5,0xdb,0x0,0xa0,0xc9,0x3,0x67,0xf8);
+
+/////////////////////////////////////////////////////////////////////
+// File D3DRM.H:
+/////////////////////////////////////////////////////////////////////
+
+
+DEFINE_GUID(IID_IDirect3DRM,0x2bc49361,0x8327,0x11cf,0xac,0x4a,0x0,0x0,0xc0,0x38,0x25,0xa1);
+DEFINE_GUID(IID_IDirect3DRM2,0x4516ecc8,0x8f20,0x11d0,0x9b,0x6d,0x00,0x00,0xc0,0x78,0x1b,0xc3);
+DEFINE_GUID(IID_IDirect3DRM3,0x4516ec83,0x8f20,0x11d0,0x9b,0x6d,0x00,0x00,0xc0,0x78,0x1b,0xc3);
+DEFINE_GUID(CLSID_CDirect3DRM,0x4516ec41,0x8f20,0x11d0,0x9b,0x6d,0x00,0x00,0xc0,0x78,0x1b,0xc3);
+
+/////////////////////////////////////////////////////////////////////
+// File D3DRMOBJ.H:
+/////////////////////////////////////////////////////////////////////
+
+DEFINE_GUID(CLSID_CDirect3DRMDevice,0x4fa3568e,0x623f,0x11cf,0xac,0x4a,0x0,0x0,0xc0,0x38,0x25,0xa1);
+DEFINE_GUID(CLSID_CDirect3DRMViewport,0x4fa3568f,0x623f,0x11cf,0xac,0x4a,0x0,0x0,0xc0,0x38,0x25,0xa1);
+DEFINE_GUID(CLSID_CDirect3DRMFrame,0x4fa35690,0x623f,0x11cf,0xac,0x4a,0x0,0x0,0xc0,0x38,0x25,0xa1);
+DEFINE_GUID(CLSID_CDirect3DRMMesh,0x4fa35691,0x623f,0x11cf,0xac,0x4a,0x0,0x0,0xc0,0x38,0x25,0xa1);
+DEFINE_GUID(CLSID_CDirect3DRMMeshBuilder,0x4fa35692,0x623f,0x11cf,0xac,0x4a,0x0,0x0,0xc0,0x38,0x25,0xa1);
+DEFINE_GUID(CLSID_CDirect3DRMFace,0x4fa35693,0x623f,0x11cf,0xac,0x4a,0x0,0x0,0xc0,0x38,0x25,0xa1);
+DEFINE_GUID(CLSID_CDirect3DRMLight,0x4fa35694,0x623f,0x11cf,0xac,0x4a,0x0,0x0,0xc0,0x38,0x25,0xa1);
+DEFINE_GUID(CLSID_CDirect3DRMTexture,0x4fa35695,0x623f,0x11cf,0xac,0x4a,0x0,0x0,0xc0,0x38,0x25,0xa1);
+DEFINE_GUID(CLSID_CDirect3DRMWrap,0x4fa35696,0x623f,0x11cf,0xac,0x4a,0x0,0x0,0xc0,0x38,0x25,0xa1);
+DEFINE_GUID(CLSID_CDirect3DRMMaterial,0x4fa35697,0x623f,0x11cf,0xac,0x4a,0x0,0x0,0xc0,0x38,0x25,0xa1);
+DEFINE_GUID(CLSID_CDirect3DRMAnimation,0x4fa35698,0x623f,0x11cf,0xac,0x4a,0x0,0x0,0xc0,0x38,0x25,0xa1);
+DEFINE_GUID(CLSID_CDirect3DRMAnimationSet,0x4fa35699,0x623f,0x11cf,0xac,0x4a,0x0,0x0,0xc0,0x38,0x25,0xa1);
+DEFINE_GUID(CLSID_CDirect3DRMUserVisual,0x4fa3569a,0x623f,0x11cf,0xac,0x4a,0x0,0x0,0xc0,0x38,0x25,0xa1);
+DEFINE_GUID(CLSID_CDirect3DRMShadow,0x4fa3569b,0x623f,0x11cf,0xac,0x4a,0x0,0x0,0xc0,0x38,0x25,0xa1);
+DEFINE_GUID(CLSID_CDirect3DRMViewportInterpolator,0xde9eaa1,0x3b84,0x11d0,0x9b,0x6d,0x0,0x0,0xc0,0x78,0x1b,0xc3);
+DEFINE_GUID(CLSID_CDirect3DRMFrameInterpolator,0xde9eaa2,0x3b84,0x11d0,0x9b,0x6d,0x0,0x0,0xc0,0x78,0x1b,0xc3);
+DEFINE_GUID(CLSID_CDirect3DRMMeshInterpolator,0xde9eaa3,0x3b84,0x11d0,0x9b,0x6d,0x0,0x0,0xc0,0x78,0x1b,0xc3);
+DEFINE_GUID(CLSID_CDirect3DRMLightInterpolator,0xde9eaa6,0x3b84,0x11d0,0x9b,0x6d,0x0,0x0,0xc0,0x78,0x1b,0xc3);
+DEFINE_GUID(CLSID_CDirect3DRMMaterialInterpolator,0xde9eaa7,0x3b84,0x11d0,0x9b,0x6d,0x0,0x0,0xc0,0x78,0x1b,0xc3);
+DEFINE_GUID(CLSID_CDirect3DRMTextureInterpolator,0xde9eaa8,0x3b84,0x11d0,0x9b,0x6d,0x0,0x0,0xc0,0x78,0x1b,0xc3);
+DEFINE_GUID(CLSID_CDirect3DRMProgressiveMesh,0x4516ec40,0x8f20,0x11d0,0x9b,0x6d,0x00,0x00,0xc0,0x78,0x1b,0xc3);
+DEFINE_GUID(CLSID_CDirect3DRMClippedVisual,0x5434e72d,0x6d66,0x11d1,0xbb,0xb,0x0,0x0,0xf8,0x75,0x86,0x5a);
+DEFINE_GUID(IID_IDirect3DRMObject,0xeb16cb00,0xd271,0x11ce,0xac,0x48,0x0,0x0,0xc0,0x38,0x25,0xa1);
+DEFINE_GUID(IID_IDirect3DRMObject2,0x4516ec7c,0x8f20,0x11d0,0x9b,0x6d,0x00,0x00,0xc0,0x78,0x1b,0xc3);
+DEFINE_GUID(IID_IDirect3DRMDevice,0xe9e19280,0x6e05,0x11cf,0xac,0x4a,0x0,0x0,0xc0,0x38,0x25,0xa1);
+DEFINE_GUID(IID_IDirect3DRMDevice2,0x4516ec78,0x8f20,0x11d0,0x9b,0x6d,0x00,0x00,0xc0,0x78,0x1b,0xc3);
+DEFINE_GUID(IID_IDirect3DRMDevice3,0x549f498b,0xbfeb,0x11d1,0x8e,0xd8,0x0,0xa0,0xc9,0x67,0xa4,0x82);
+DEFINE_GUID(IID_IDirect3DRMViewport,0xeb16cb02,0xd271,0x11ce,0xac,0x48,0x0,0x0,0xc0,0x38,0x25,0xa1);
+DEFINE_GUID(IID_IDirect3DRMViewport2,0x4a1b1be6,0xbfed,0x11d1,0x8e,0xd8,0x0,0xa0,0xc9,0x67,0xa4,0x82);
+DEFINE_GUID(IID_IDirect3DRMFrame,0xeb16cb03,0xd271,0x11ce,0xac,0x48,0x0,0x0,0xc0,0x38,0x25,0xa1);
+DEFINE_GUID(IID_IDirect3DRMFrame2,0xc3dfbd60,0x3988,0x11d0,0x9e,0xc2,0x0,0x0,0xc0,0x29,0x1a,0xc3);
+DEFINE_GUID(IID_IDirect3DRMFrame3,0xff6b7f70,0xa40e,0x11d1,0x91,0xf9,0x0,0x0,0xf8,0x75,0x8e,0x66);
+DEFINE_GUID(IID_IDirect3DRMVisual,0xeb16cb04,0xd271,0x11ce,0xac,0x48,0x0,0x0,0xc0,0x38,0x25,0xa1);
+DEFINE_GUID(IID_IDirect3DRMMesh,0xa3a80d01,0x6e12,0x11cf,0xac,0x4a,0x0,0x0,0xc0,0x38,0x25,0xa1);
+DEFINE_GUID(IID_IDirect3DRMMeshBuilder,0xa3a80d02,0x6e12,0x11cf,0xac,0x4a,0x0,0x0,0xc0,0x38,0x25,0xa1);
+DEFINE_GUID(IID_IDirect3DRMMeshBuilder2,0x4516ec77,0x8f20,0x11d0,0x9b,0x6d,0x0,0x0,0xc0,0x78,0x1b,0xc3);
+DEFINE_GUID(IID_IDirect3DRMMeshBuilder3,0x4516ec82,0x8f20,0x11d0,0x9b,0x6d,0x00,0x00,0xc0,0x78,0x1b,0xc3);
+DEFINE_GUID(IID_IDirect3DRMFace,0xeb16cb07,0xd271,0x11ce,0xac,0x48,0x0,0x0,0xc0,0x38,0x25,0xa1);
+DEFINE_GUID(IID_IDirect3DRMFace2,0x4516ec81,0x8f20,0x11d0,0x9b,0x6d,0x00,0x00,0xc0,0x78,0x1b,0xc3);
+DEFINE_GUID(IID_IDirect3DRMLight,0xeb16cb08,0xd271,0x11ce,0xac,0x48,0x0,0x0,0xc0,0x38,0x25,0xa1);
+DEFINE_GUID(IID_IDirect3DRMTexture,0xeb16cb09,0xd271,0x11ce,0xac,0x48,0x0,0x0,0xc0,0x38,0x25,0xa1);
+DEFINE_GUID(IID_IDirect3DRMTexture2,0x120f30c0,0x1629,0x11d0,0x94,0x1c,0x0,0x80,0xc8,0xc,0xfa,0x7b);
+DEFINE_GUID(IID_IDirect3DRMTexture3,0xff6b7f73,0xa40e,0x11d1,0x91,0xf9,0x0,0x0,0xf8,0x75,0x8e,0x66);
+DEFINE_GUID(IID_IDirect3DRMWrap,0xeb16cb0a,0xd271,0x11ce,0xac,0x48,0x0,0x0,0xc0,0x38,0x25,0xa1);
+DEFINE_GUID(IID_IDirect3DRMMaterial,0xeb16cb0b,0xd271,0x11ce,0xac,0x48,0x0,0x0,0xc0,0x38,0x25,0xa1);
+DEFINE_GUID(IID_IDirect3DRMMaterial2,0xff6b7f75,0xa40e,0x11d1,0x91,0xf9,0x0,0x0,0xf8,0x75,0x8e,0x66);
+DEFINE_GUID(IID_IDirect3DRMAnimation,0xeb16cb0d,0xd271,0x11ce,0xac,0x48,0x0,0x0,0xc0,0x38,0x25,0xa1);
+DEFINE_GUID(IID_IDirect3DRMAnimation2,0xff6b7f77,0xa40e,0x11d1,0x91,0xf9,0x0,0x0,0xf8,0x75,0x8e,0x66);
+DEFINE_GUID(IID_IDirect3DRMAnimationSet,0xeb16cb0e,0xd271,0x11ce,0xac,0x48,0x0,0x0,0xc0,0x38,0x25,0xa1);
+DEFINE_GUID(IID_IDirect3DRMAnimationSet2,0xff6b7f79,0xa40e,0x11d1,0x91,0xf9,0x0,0x0,0xf8,0x75,0x8e,0x66);
+DEFINE_GUID(IID_IDirect3DRMObjectArray,0x242f6bc2,0x3849,0x11d0,0x9b,0x6d,0x0,0x0,0xc0,0x78,0x1b,0xc3);
+DEFINE_GUID(IID_IDirect3DRMDeviceArray,0xeb16cb10,0xd271,0x11ce,0xac,0x48,0x0,0x0,0xc0,0x38,0x25,0xa1);
+DEFINE_GUID(IID_IDirect3DRMViewportArray,0xeb16cb11,0xd271,0x11ce,0xac,0x48,0x0,0x0,0xc0,0x38,0x25,0xa1);
+DEFINE_GUID(IID_IDirect3DRMFrameArray,0xeb16cb12,0xd271,0x11ce,0xac,0x48,0x0,0x0,0xc0,0x38,0x25,0xa1);
+DEFINE_GUID(IID_IDirect3DRMVisualArray,0xeb16cb13,0xd271,0x11ce,0xac,0x48,0x0,0x0,0xc0,0x38,0x25,0xa1);
+DEFINE_GUID(IID_IDirect3DRMLightArray,0xeb16cb14,0xd271,0x11ce,0xac,0x48,0x0,0x0,0xc0,0x38,0x25,0xa1);
+DEFINE_GUID(IID_IDirect3DRMPickedArray,0xeb16cb16,0xd271,0x11ce,0xac,0x48,0x0,0x0,0xc0,0x38,0x25,0xa1);
+DEFINE_GUID(IID_IDirect3DRMFaceArray,0xeb16cb17,0xd271,0x11ce,0xac,0x48,0x0,0x0,0xc0,0x38,0x25,0xa1);
+DEFINE_GUID(IID_IDirect3DRMAnimationArray,0xd5f1cae0,0x4bd7,0x11d1,0xb9,0x74,0x0,0x60,0x8,0x3e,0x45,0xf3);
+DEFINE_GUID(IID_IDirect3DRMUserVisual,0x59163de0,0x6d43,0x11cf,0xac,0x4a,0x0,0x0,0xc0,0x38,0x25,0xa1);
+DEFINE_GUID(IID_IDirect3DRMShadow,0xaf359780,0x6ba3,0x11cf,0xac,0x4a,0x0,0x0,0xc0,0x38,0x25,0xa1);
+DEFINE_GUID(IID_IDirect3DRMShadow2,0x86b44e25,0x9c82,0x11d1,0xbb,0xb,0x0,0xa0,0xc9,0x81,0xa0,0xa6);
+DEFINE_GUID(IID_IDirect3DRMInterpolator,0x242f6bc1,0x3849,0x11d0,0x9b,0x6d,0x0,0x0,0xc0,0x78,0x1b,0xc3);
+DEFINE_GUID(IID_IDirect3DRMProgressiveMesh,0x4516ec79,0x8f20,0x11d0,0x9b,0x6d,0x0,0x0,0xc0,0x78,0x1b,0xc3);
+DEFINE_GUID(IID_IDirect3DRMPicked2Array,0x4516ec7b,0x8f20,0x11d0,0x9b,0x6d,0x0,0x0,0xc0,0x78,0x1b,0xc3);
+DEFINE_GUID(IID_IDirect3DRMClippedVisual,0x5434e733,0x6d66,0x11d1,0xbb,0xb,0x0,0x0,0xf8,0x75,0x86,0x5a);
+
+/////////////////////////////////////////////////////////////////////
+// File D3DRMWIN.H:
+/////////////////////////////////////////////////////////////////////
+
+DEFINE_GUID(IID_IDirect3DRMWinDevice,0xc5016cc0,0xd273,0x11ce,0xac,0x48,0x0,0x0,0xc0,0x38,0x25,0xa1);
+
+/////////////////////////////////////////////////////////////////////
+// File DDRAW.H:
+/////////////////////////////////////////////////////////////////////
+
+DEFINE_GUID(CLSID_DirectDraw,0xD7B70EE0,0x4340,0x11CF,0xB0,0x63,0x00,0x20,0xAF,0xC2,0xCD,0x35);
+DEFINE_GUID(CLSID_DirectDrawClipper,0x593817A0,0x7DB3,0x11CF,0xA2,0xDE,0x00,0xAA,0x00,0xb9,0x33,0x56);
+DEFINE_GUID(IID_IDirectDraw,0x6C14DB80,0xA733,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60);
+DEFINE_GUID(IID_IDirectDraw2,0xB3A6F3E0,0x2B43,0x11CF,0xA2,0xDE,0x00,0xAA,0x00,0xB9,0x33,0x56);
+DEFINE_GUID(IID_IDirectDraw4,0x9c59509a,0x39bd,0x11d1,0x8c,0x4a,0x00,0xc0,0x4f,0xd9,0x30,0xc5);
+DEFINE_GUID(IID_IDirectDrawSurface,0x6C14DB81,0xA733,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60);
+DEFINE_GUID(IID_IDirectDrawSurface2,0x57805885,0x6eec,0x11cf,0x94,0x41,0xa8,0x23,0x03,0xc1,0x0e,0x27);
+DEFINE_GUID(IID_IDirectDrawSurface3,0xDA044E00,0x69B2,0x11D0,0xA1,0xD5,0x00,0xAA,0x00,0xB8,0xDF,0xBB);
+DEFINE_GUID(IID_IDirectDrawSurface4,0x0B2B8630,0xAD35,0x11D0,0x8E,0xA6,0x00,0x60,0x97,0x97,0xEA,0x5B);
+DEFINE_GUID(IID_IDirectDrawPalette,0x6C14DB84,0xA733,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60);
+DEFINE_GUID(IID_IDirectDrawClipper,0x6C14DB85,0xA733,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60);
+DEFINE_GUID(IID_IDirectDrawColorControl,0x4B9F0EE0,0x0D7E,0x11D0,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8);
+DEFINE_GUID(IID_IDirectDrawGammaControl,0x69C11C3E,0xB46B,0x11D1,0xAD,0x7A,0x00,0xC0,0x4F,0xC2,0x9B,0x4E);
+
+/////////////////////////////////////////////////////////////////////
+// File DINPUT.H:
+/////////////////////////////////////////////////////////////////////
+
+DEFINE_GUID(CLSID_DirectInput,0x25E609E0,0xB259,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
+DEFINE_GUID(CLSID_DirectInputDevice,0x25E609E1,0xB259,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
+DEFINE_GUID(IID_IDirectInputA,0x89521360,0xAA8A,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
+DEFINE_GUID(IID_IDirectInputW,0x89521361,0xAA8A,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
+DEFINE_GUID(IID_IDirectInput2A,0x5944E662,0xAA8A,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
+DEFINE_GUID(IID_IDirectInput2W,0x5944E663,0xAA8A,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
+DEFINE_GUID(IID_IDirectInputDeviceA,0x5944E680,0xC92E,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
+DEFINE_GUID(IID_IDirectInputDeviceW,0x5944E681,0xC92E,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
+DEFINE_GUID(IID_IDirectInputDevice2A,0x5944E682,0xC92E,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
+DEFINE_GUID(IID_IDirectInputDevice2W,0x5944E683,0xC92E,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
+DEFINE_GUID(IID_IDirectInputEffect,0xE7E1F7C0,0x88D2,0x11D0,0x9A,0xD0,0x00,0xA0,0xC9,0xA0,0x6E,0x35);
+DEFINE_GUID(GUID_XAxis,0xA36D02E0,0xC9F3,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
+DEFINE_GUID(GUID_YAxis,0xA36D02E1,0xC9F3,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
+DEFINE_GUID(GUID_ZAxis,0xA36D02E2,0xC9F3,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
+DEFINE_GUID(GUID_RxAxis,0xA36D02F4,0xC9F3,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
+DEFINE_GUID(GUID_RyAxis,0xA36D02F5,0xC9F3,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
+DEFINE_GUID(GUID_RzAxis,0xA36D02E3,0xC9F3,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
+DEFINE_GUID(GUID_Slider,0xA36D02E4,0xC9F3,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
+DEFINE_GUID(GUID_Button,0xA36D02F0,0xC9F3,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
+DEFINE_GUID(GUID_Key,0x55728220,0xD33C,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
+DEFINE_GUID(GUID_POV,0xA36D02F2,0xC9F3,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
+DEFINE_GUID(GUID_Unknown,0xA36D02F3,0xC9F3,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
+DEFINE_GUID(GUID_SysMouse,0x6F1D2B60,0xD5A0,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
+DEFINE_GUID(GUID_SysKeyboard,0x6F1D2B61,0xD5A0,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
+DEFINE_GUID(GUID_Joystick,0x6F1D2B70,0xD5A0,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
+DEFINE_GUID(GUID_ConstantForce,0x13541C20,0x8E33,0x11D0,0x9A,0xD0,0x00,0xA0,0xC9,0xA0,0x6E,0x35);
+DEFINE_GUID(GUID_RampForce,0x13541C21,0x8E33,0x11D0,0x9A,0xD0,0x00,0xA0,0xC9,0xA0,0x6E,0x35);
+DEFINE_GUID(GUID_Square,0x13541C22,0x8E33,0x11D0,0x9A,0xD0,0x00,0xA0,0xC9,0xA0,0x6E,0x35);
+DEFINE_GUID(GUID_Sine,0x13541C23,0x8E33,0x11D0,0x9A,0xD0,0x00,0xA0,0xC9,0xA0,0x6E,0x35);
+DEFINE_GUID(GUID_Triangle,0x13541C24,0x8E33,0x11D0,0x9A,0xD0,0x00,0xA0,0xC9,0xA0,0x6E,0x35);
+DEFINE_GUID(GUID_SawtoothUp,0x13541C25,0x8E33,0x11D0,0x9A,0xD0,0x00,0xA0,0xC9,0xA0,0x6E,0x35);
+DEFINE_GUID(GUID_SawtoothDown,0x13541C26,0x8E33,0x11D0,0x9A,0xD0,0x00,0xA0,0xC9,0xA0,0x6E,0x35);
+DEFINE_GUID(GUID_Spring,0x13541C27,0x8E33,0x11D0,0x9A,0xD0,0x00,0xA0,0xC9,0xA0,0x6E,0x35);
+DEFINE_GUID(GUID_Damper,0x13541C28,0x8E33,0x11D0,0x9A,0xD0,0x00,0xA0,0xC9,0xA0,0x6E,0x35);
+DEFINE_GUID(GUID_Inertia,0x13541C29,0x8E33,0x11D0,0x9A,0xD0,0x00,0xA0,0xC9,0xA0,0x6E,0x35);
+DEFINE_GUID(GUID_Friction,0x13541C2A,0x8E33,0x11D0,0x9A,0xD0,0x00,0xA0,0xC9,0xA0,0x6E,0x35);
+DEFINE_GUID(GUID_CustomForce,0x13541C2B,0x8E33,0x11D0,0x9A,0xD0,0x00,0xA0,0xC9,0xA0,0x6E,0x35);
+
+/////////////////////////////////////////////////////////////////////
+// File DMKSCTRL.H:
+/////////////////////////////////////////////////////////////////////
+
+DEFINE_GUID(IID_IKsControl,0x28F54685,0x06FD,0x11D2,0xB2,0x7A,0x00,0xA0,0xC9,0x22,0x31,0x96);
+DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MIDI,0x1D262760L,0xE957,0x11CF,0xA5,0xD6,0x28,0xDB,0x04,0xC1,0x00,0x00);
+DEFINE_GUID(KSDATAFORMAT_SUBTYPE_DIRECTMUSIC,0x1a82f8bc,0x3f8b,0x11d2,0xb7,0x74,0x00,0x60,0x08,0x33,0x16,0xc1);
+
+/////////////////////////////////////////////////////////////////////
+// File DMUSICC.H:
+/////////////////////////////////////////////////////////////////////
+
+DEFINE_GUID(IID_IReferenceClock,0x56a86897,0x0ad4,0x11ce,0xb0,0x3a,0x00,0x20,0xaf,0x0b,0xa7,0x70);
+DEFINE_GUID(CLSID_DirectMusic,0x636b9f10,0x0c7d,0x11d1,0x95,0xb2,0x00,0x20,0xaf,0xdc,0x74,0x21);
+DEFINE_GUID(CLSID_DirectMusicCollection,0x480ff4b0,0x28b2,0x11d1,0xbe,0xf7,0x0,0xc0,0x4f,0xbf,0x8f,0xef);
+DEFINE_GUID(CLSID_DirectMusicSynth,0x58C2B4D0,0x46E7,0x11D1,0x89,0xAC,0x00,0xA0,0xC9,0x05,0x41,0x29);
+DEFINE_GUID(IID_IDirectMusic,0x6536115a,0x7b2d,0x11d2,0xba,0x18,0x00,0x00,0xf8,0x75,0xac,0x12);
+DEFINE_GUID(IID_IDirectMusicBuffer,0xd2ac2878,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(IID_IDirectMusicPort,0x08f2d8c9,0x37c2,0x11d2,0xb9,0xf9,0x00,0x00,0xf8,0x75,0xac,0x12);
+DEFINE_GUID(IID_IDirectMusicThru,0xced153e7,0x3606,0x11d2,0xb9,0xf9,0x00,0x00,0xf8,0x75,0xac,0x12);
+DEFINE_GUID(IID_IDirectMusicPortDownload,0xd2ac287a,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(IID_IDirectMusicDownload,0xd2ac287b,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(IID_IDirectMusicCollection,0xd2ac287c,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(IID_IDirectMusicInstrument,0xd2ac287d,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(IID_IDirectMusicDownloadedInstrument,0xd2ac287e,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(GUID_DMUS_PROP_GM_Hardware,0x178f2f24,0xc364,0x11d1,0xa7,0x60,0x00,0x00,0xf8,0x75,0xac,0x12);
+DEFINE_GUID(GUID_DMUS_PROP_GS_Hardware,0x178f2f25,0xc364,0x11d1,0xa7,0x60,0x00,0x00,0xf8,0x75,0xac,0x12);
+DEFINE_GUID(GUID_DMUS_PROP_XG_Hardware,0x178f2f26,0xc364,0x11d1,0xa7,0x60,0x00,0x00,0xf8,0x75,0xac,0x12);
+DEFINE_GUID(GUID_DMUS_PROP_XG_Capable,0x6496aba1,0x61b0,0x11d2,0xaf,0xa6,0x0,0xaa,0x0,0x24,0xd8,0xb6);
+DEFINE_GUID(GUID_DMUS_PROP_GS_Capable,0x6496aba2,0x61b0,0x11d2,0xaf,0xa6,0x0,0xaa,0x0,0x24,0xd8,0xb6);
+DEFINE_GUID(GUID_DMUS_PROP_DLS1,0x178f2f27,0xc364,0x11d1,0xa7,0x60,0x00,0x00,0xf8,0x75,0xac,0x12);
+DEFINE_GUID(GUID_DMUS_PROP_SynthSink_DSOUND,0xaa97844,0xc877,0x11d1,0x87,0xc,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(GUID_DMUS_PROP_SynthSink_WAVE,0xaa97845,0xc877,0x11d1,0x87,0xc,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(GUID_DMUS_PROP_WriteLatency,0x268a0fa0,0x60f2,0x11d2,0xaf,0xa6,0x0,0xaa,0x0,0x24,0xd8,0xb6);
+DEFINE_GUID(GUID_DMUS_PROP_WritePeriod,0x268a0fa1,0x60f2,0x11d2,0xaf,0xa6,0x0,0xaa,0x0,0x24,0xd8,0xb6);
+DEFINE_GUID(GUID_DMUS_PROP_MemorySize,0x178f2f28,0xc364,0x11d1,0xa7,0x60,0x00,0x00,0xf8,0x75,0xac,0x12);
+DEFINE_GUID(GUID_DMUS_PROP_WavesReverb,0x4cb5622,0x32e5,0x11d2,0xaf,0xa6,0x0,0xaa,0x0,0x24,0xd8,0xb6);
+DEFINE_GUID(GUID_DMUS_PROP_Effects,0xcda8d611,0x684a,0x11d2,0x87,0x1e,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(GUID_DMUS_PROP_LegacyCaps,0xcfa7cdc2,0x00a1,0x11d2,0xaa,0xd5,0x00,0x00,0xf8,0x75,0xac,0x12);
+DEFINE_GUID(GUID_DMUS_PROP_Volume,0xfedfae25L,0xe46e,0x11d1,0xaa,0xce,0x00,0x00,0xf8,0x75,0xac,0x12);
+
+/////////////////////////////////////////////////////////////////////
+// File DMUSICI.H:
+/////////////////////////////////////////////////////////////////////
+
+DEFINE_GUID(CLSID_DirectMusicPerformance,0xd2ac2881,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(CLSID_DirectMusicSegment,0xd2ac2882,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(CLSID_DirectMusicSegmentState,0xd2ac2883,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(CLSID_DirectMusicGraph,0xd2ac2884,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(CLSID_DirectMusicTempoTrack,0xd2ac2885,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(CLSID_DirectMusicSeqTrack,0xd2ac2886,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(CLSID_DirectMusicSysExTrack,0xd2ac2887,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(CLSID_DirectMusicTimeSigTrack,0xd2ac2888,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(CLSID_DirectMusicStyle,0xd2ac288a,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(CLSID_DirectMusicChordTrack,0xd2ac288b,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(CLSID_DirectMusicCommandTrack,0xd2ac288c,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(CLSID_DirectMusicStyleTrack,0xd2ac288d,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(CLSID_DirectMusicMotifTrack,0xd2ac288e,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(CLSID_DirectMusicChordMap,0xd2ac288f,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(CLSID_DirectMusicComposer,0xd2ac2890,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(CLSID_DirectMusicSignPostTrack,0xf17e8672,0xc3b4,0x11d1,0x87,0xb,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(CLSID_DirectMusicLoader,0xd2ac2892,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(CLSID_DirectMusicBandTrack,0xd2ac2894,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(CLSID_DirectMusicBand,0x79ba9e00,0xb6ee,0x11d1,0x86,0xbe,0x0,0xc0,0x4f,0xbf,0x8f,0xef);
+DEFINE_GUID(CLSID_DirectMusicChordMapTrack,0xd2ac2896,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(CLSID_DirectMusicMuteTrack,0xd2ac2898,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(GUID_DirectMusicAllTypes,0xd2ac2893,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(GUID_NOTIFICATION_SEGMENT,0xd2ac2899,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(GUID_NOTIFICATION_PERFORMANCE,0x81f75bc5,0x4e5d,0x11d2,0xbc,0xc7,0x0,0xa0,0xc9,0x22,0xe6,0xeb);
+DEFINE_GUID(GUID_NOTIFICATION_MEASUREANDBEAT,0xd2ac289a,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(GUID_NOTIFICATION_CHORD,0xd2ac289b,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(GUID_NOTIFICATION_COMMAND,0xd2ac289c,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(GUID_CommandParam,0xd2ac289d,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(GUID_ChordParam,0xd2ac289e,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(GUID_RhythmParam,0xd2ac289f,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(GUID_IDirectMusicStyle,0xd2ac28a1,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(GUID_TimeSignature,0xd2ac28a4,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(GUID_TempoParam,0xd2ac28a5,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(GUID_IDirectMusicBand,0xd2ac28ac,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(GUID_IDirectMusicChordMap,0xd2ac28ad,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(GUID_MuteParam,0xd2ac28af,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(GUID_Download,0xd2ac28a7,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(GUID_Unload,0xd2ac28a8,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(GUID_ConnectToDLSCollection,0x1db1ae6b,0xe92e,0x11d1,0xa8,0xc5,0x0,0xc0,0x4f,0xa3,0x72,0x6e);
+DEFINE_GUID(GUID_Enable_Auto_Download,0xd2ac28a9,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(GUID_Disable_Auto_Download,0xd2ac28aa,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(GUID_Clear_All_Bands,0xd2ac28ab,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(GUID_StandardMIDIFile,0x6621075,0xe92e,0x11d1,0xa8,0xc5,0x0,0xc0,0x4f,0xa3,0x72,0x6e);
+DEFINE_GUID(GUID_DisableTimeSig,0x45fc707b,0x1db4,0x11d2,0xbc,0xac,0x0,0xa0,0xc9,0x22,0xe6,0xeb);
+DEFINE_GUID(GUID_EnableTimeSig,0x45fc707c,0x1db4,0x11d2,0xbc,0xac,0x0,0xa0,0xc9,0x22,0xe6,0xeb);
+DEFINE_GUID(GUID_DisableTempo,0x45fc707d,0x1db4,0x11d2,0xbc,0xac,0x0,0xa0,0xc9,0x22,0xe6,0xeb);
+DEFINE_GUID(GUID_EnableTempo,0x45fc707e,0x1db4,0x11d2,0xbc,0xac,0x0,0xa0,0xc9,0x22,0xe6,0xeb);
+DEFINE_GUID(GUID_PerfMasterTempo,0xd2ac28b0,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(GUID_PerfMasterVolume,0xd2ac28b1,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(GUID_PerfMasterGrooveLevel,0xd2ac28b2,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(GUID_PerfAutoDownload,0xfb09565b,0x3631,0x11d2,0xbc,0xb8,0x0,0xa0,0xc9,0x22,0xe6,0xeb);
+DEFINE_GUID(GUID_DefaultGMCollection,0xf17e8673,0xc3b4,0x11d1,0x87,0xb,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(IID_IDirectMusicLoader,0x2ffaaca2,0x5dca,0x11d2,0xaf,0xa6,0x0,0xaa,0x0,0x24,0xd8,0xb6);
+DEFINE_GUID(IID_IDirectMusicGetLoader,0x68a04844,0xd13d,0x11d1,0xaf,0xa6,0x0,0xaa,0x0,0x24,0xd8,0xb6);
+DEFINE_GUID(IID_IDirectMusicObject,0xd2ac28b5,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(IID_IDirectMusicSegment,0xf96029a2,0x4282,0x11d2,0x87,0x17,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(IID_IDirectMusicSegmentState,0xa3afdcc7,0xd3ee,0x11d1,0xbc,0x8d,0x0,0xa0,0xc9,0x22,0xe6,0xeb);
+DEFINE_GUID(IID_IDirectMusicTrack,0xf96029a1,0x4282,0x11d2,0x87,0x17,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(IID_IDirectMusicPerformance,0x7d43d03,0x6523,0x11d2,0x87,0x1d,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(IID_IDirectMusicTool,0xd2ac28ba,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(IID_IDirectMusicGraph,0x2befc277,0x5497,0x11d2,0xbc,0xcb,0x0,0xa0,0xc9,0x22,0xe6,0xeb);
+DEFINE_GUID(IID_IDirectMusicStyle,0xd2ac28bd,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(IID_IDirectMusicChordMap,0xd2ac28be,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(IID_IDirectMusicComposer,0xd2ac28bf,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+DEFINE_GUID(IID_IDirectMusicBand,0xd2ac28c0,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
+
+/////////////////////////////////////////////////////////////////////
+// File DPLAY.H:
+/////////////////////////////////////////////////////////////////////
+
+DEFINE_GUID(IID_IDirectPlay2,0x2b74f7c0,0x9154,0x11cf,0xa9,0xcd,0x0,0xaa,0x0,0x68,0x86,0xe3);
+DEFINE_GUID(IID_IDirectPlay2A,0x9d460580,0xa822,0x11cf,0x96,0xc,0x0,0x80,0xc7,0x53,0x4e,0x82);
+DEFINE_GUID(IID_IDirectPlay3,0x133efe40,0x32dc,0x11d0,0x9c,0xfb,0x0,0xa0,0xc9,0xa,0x43,0xcb);
+DEFINE_GUID(IID_IDirectPlay3A,0x133efe41,0x32dc,0x11d0,0x9c,0xfb,0x0,0xa0,0xc9,0xa,0x43,0xcb);
+DEFINE_GUID(IID_IDirectPlay4,0xab1c530,0x4745,0x11d1,0xa7,0xa1,0x0,0x0,0xf8,0x3,0xab,0xfc);
+DEFINE_GUID(IID_IDirectPlay4A,0xab1c531,0x4745,0x11d1,0xa7,0xa1,0x0,0x0,0xf8,0x3,0xab,0xfc);
+DEFINE_GUID(CLSID_DirectPlay,0xd1eb6d20,0x8923,0x11d0,0x9d,0x97,0x0,0xa0,0xc9,0xa,0x43,0xcb);
+DEFINE_GUID(DPSPGUID_IPX,0x685bc400,0x9d2c,0x11cf,0xa9,0xcd,0x0,0xaa,0x0,0x68,0x86,0xe3);
+DEFINE_GUID(DPSPGUID_TCPIP,0x36E95EE0,0x8577,0x11cf,0x96,0xc,0x0,0x80,0xc7,0x53,0x4e,0x82);
+DEFINE_GUID(DPSPGUID_SERIAL,0xf1d6860,0x88d9,0x11cf,0x9c,0x4e,0x0,0xa0,0xc9,0x5,0x42,0x5e);
+DEFINE_GUID(DPSPGUID_MODEM,0x44eaa760,0xcb68,0x11cf,0x9c,0x4e,0x0,0xa0,0xc9,0x5,0x42,0x5e);
+DEFINE_GUID(IID_IDirectPlay,0x5454e9a0,0xdb65,0x11ce,0x92,0x1c,0x00,0xaa,0x00,0x6c,0x49,0x72);
+
+/////////////////////////////////////////////////////////////////////
+// File DPLOBBY.H:
+/////////////////////////////////////////////////////////////////////
+
+DEFINE_GUID(IID_IDirectPlayLobby,0xaf465c71,0x9588,0x11cf,0xa0,0x20,0x0,0xaa,0x0,0x61,0x57,0xac);
+DEFINE_GUID(IID_IDirectPlayLobbyA,0x26c66a70,0xb367,0x11cf,0xa0,0x24,0x0,0xaa,0x0,0x61,0x57,0xac);
+DEFINE_GUID(IID_IDirectPlayLobby2,0x194c220,0xa303,0x11d0,0x9c,0x4f,0x0,0xa0,0xc9,0x5,0x42,0x5e);
+DEFINE_GUID(IID_IDirectPlayLobby2A,0x1bb4af80,0xa303,0x11d0,0x9c,0x4f,0x0,0xa0,0xc9,0x5,0x42,0x5e);
+DEFINE_GUID(IID_IDirectPlayLobby3,0x2db72490,0x652c,0x11d1,0xa7,0xa8,0x0,0x0,0xf8,0x3,0xab,0xfc);
+DEFINE_GUID(IID_IDirectPlayLobby3A,0x2db72491,0x652c,0x11d1,0xa7,0xa8,0x0,0x0,0xf8,0x3,0xab,0xfc);
+DEFINE_GUID(CLSID_DirectPlayLobby,0x2fe8f810,0xb2a5,0x11d0,0xa7,0x87,0x0,0x0,0xf8,0x3,0xab,0xfc);
+DEFINE_GUID(DPLPROPERTY_MessagesSupported,0x762ccda1,0xd916,0x11d0,0xba,0x39,0x0,0xc0,0x4f,0xd7,0xed,0x67);
+DEFINE_GUID(DPLPROPERTY_LobbyGuid,0xf56920a0,0xd218,0x11d0,0xba,0x39,0x0,0xc0,0x4f,0xd7,0xed,0x67);
+DEFINE_GUID(DPLPROPERTY_PlayerGuid,0xb4319322,0xd20d,0x11d0,0xba,0x39,0x0,0xc0,0x4f,0xd7,0xed,0x67);
+DEFINE_GUID(DPLPROPERTY_PlayerScore,0x48784000,0xd219,0x11d0,0xba,0x39,0x0,0xc0,0x4f,0xd7,0xed,0x67);
+DEFINE_GUID(DPAID_TotalSize,0x1318f560,0x912c,0x11d0,0x9d,0xaa,0x0,0xa0,0xc9,0xa,0x43,0xcb);
+DEFINE_GUID(DPAID_ServiceProvider,0x7d916c0,0xe0af,0x11cf,0x9c,0x4e,0x0,0xa0,0xc9,0x5,0x42,0x5e);
+DEFINE_GUID(DPAID_LobbyProvider,0x59b95640,0x9667,0x11d0,0xa7,0x7d,0x0,0x0,0xf8,0x3,0xab,0xfc);
+DEFINE_GUID(DPAID_Phone,0x78ec89a0,0xe0af,0x11cf,0x9c,0x4e,0x0,0xa0,0xc9,0x5,0x42,0x5e);
+DEFINE_GUID(DPAID_PhoneW,0xba5a7a70,0x9dbf,0x11d0,0x9c,0xc1,0x0,0xa0,0xc9,0x5,0x42,0x5e);
+DEFINE_GUID(DPAID_Modem,0xf6dcc200,0xa2fe,0x11d0,0x9c,0x4f,0x0,0xa0,0xc9,0x5,0x42,0x5e);
+DEFINE_GUID(DPAID_ModemW,0x1fd92e0,0xa2ff,0x11d0,0x9c,0x4f,0x0,0xa0,0xc9,0x5,0x42,0x5e);
+DEFINE_GUID(DPAID_INet,0xc4a54da0,0xe0af,0x11cf,0x9c,0x4e,0x0,0xa0,0xc9,0x5,0x42,0x5e);
+DEFINE_GUID(DPAID_INetW,0xe63232a0,0x9dbf,0x11d0,0x9c,0xc1,0x0,0xa0,0xc9,0x5,0x42,0x5e);
+DEFINE_GUID(DPAID_INetPort,0xe4524541,0x8ea5,0x11d1,0x8a,0x96,0x0,0x60,0x97,0xb0,0x14,0x11);
+DEFINE_GUID(DPAID_ComPort,0xf2f0ce00,0xe0af,0x11cf,0x9c,0x4e,0x0,0xa0,0xc9,0x5,0x42,0x5e);
+
+/////////////////////////////////////////////////////////////////////
+// File DSOUND.H:
+/////////////////////////////////////////////////////////////////////
+
+DEFINE_GUID(CLSID_DirectSound,0x47d4d946,0x62e8,0x11cf,0x93,0xbc,0x44,0x45,0x53,0x54,0x0,0x0);
+DEFINE_GUID(CLSID_DirectSoundCapture,0xb0210780,0x89cd,0x11d0,0xaf,0x8,0x0,0xa0,0xc9,0x25,0xcd,0x16);
+DEFINE_GUID(IID_IDirectSound,0x279AFA83,0x4981,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60);
+DEFINE_GUID(IID_IDirectSoundBuffer,0x279AFA85,0x4981,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60);
+DEFINE_GUID(IID_IDirectSound3DListener,0x279AFA84,0x4981,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60);
+DEFINE_GUID(IID_IDirectSound3DBuffer,0x279AFA86,0x4981,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60);
+DEFINE_GUID(IID_IDirectSoundCapture,0xb0210781,0x89cd,0x11d0,0xaf,0x8,0x0,0xa0,0xc9,0x25,0xcd,0x16);
+DEFINE_GUID(IID_IDirectSoundCaptureBuffer,0xb0210782,0x89cd,0x11d0,0xaf,0x8,0x0,0xa0,0xc9,0x25,0xcd,0x16);
+DEFINE_GUID(IID_IDirectSoundNotify,0xb0210783,0x89cd,0x11d0,0xaf,0x8,0x0,0xa0,0xc9,0x25,0xcd,0x16);
+DEFINE_GUID(IID_IKsPropertySet,0x31efac30,0x515c,0x11d0,0xa9,0xaa,0x00,0xaa,0x00,0x61,0xbe,0x93);
+
+/////////////////////////////////////////////////////////////////////
+// File DVP.H:
+/////////////////////////////////////////////////////////////////////
+
+DEFINE_GUID(IID_IDDVideoPortContainer,0x6C142760,0xA733,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60);
+DEFINE_GUID(IID_IDirectDrawVideoPort,0xB36D93E0,0x2B43,0x11CF,0xA2,0xDE,0x00,0xAA,0x00,0xB9,0x33,0x56);
+DEFINE_GUID(DDVPTYPE_E_HREFH_VREFH,0x54F39980L,0xDA60,0x11CF,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8);
+DEFINE_GUID(DDVPTYPE_E_HREFH_VREFL,0x92783220L,0xDA60,0x11CF,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8);
+DEFINE_GUID(DDVPTYPE_E_HREFL_VREFH,0xA07A02E0L,0xDA60,0x11CF,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8);
+DEFINE_GUID(DDVPTYPE_E_HREFL_VREFL,0xE09C77E0L,0xDA60,0x11CF,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8);
+DEFINE_GUID(DDVPTYPE_CCIR656,0xFCA326A0L,0xDA60,0x11CF,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8);
+DEFINE_GUID(DDVPTYPE_BROOKTREE,0x1352A560L,0xDA61,0x11CF,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8);
+DEFINE_GUID(DDVPTYPE_PHILIPS,0x332CF160L,0xDA61,0x11CF,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8);
+
+/////////////////////////////////////////////////////////////////////
+// File DXFILE.H:
+/////////////////////////////////////////////////////////////////////
+
+DEFINE_GUID(CLSID_CDirectXFile,0x4516ec43,0x8f20,0x11d0,0x9b,0x6d,0x00,0x00,0xc0,0x78,0x1b,0xc3);
+DEFINE_GUID(IID_IDirectXFile,0x3d82ab40,0x62da,0x11cf,0xab,0x39,0x0,0x20,0xaf,0x71,0xe4,0x33);
+DEFINE_GUID(IID_IDirectXFileEnumObject,0x3d82ab41,0x62da,0x11cf,0xab,0x39,0x0,0x20,0xaf,0x71,0xe4,0x33);
+DEFINE_GUID(IID_IDirectXFileSaveObject,0x3d82ab42,0x62da,0x11cf,0xab,0x39,0x0,0x20,0xaf,0x71,0xe4,0x33);
+DEFINE_GUID(IID_IDirectXFileObject,0x3d82ab43,0x62da,0x11cf,0xab,0x39,0x0,0x20,0xaf,0x71,0xe4,0x33);
+DEFINE_GUID(IID_IDirectXFileData,0x3d82ab44,0x62da,0x11cf,0xab,0x39,0x0,0x20,0xaf,0x71,0xe4,0x33);
+DEFINE_GUID(IID_IDirectXFileDataReference,0x3d82ab45,0x62da,0x11cf,0xab,0x39,0x0,0x20,0xaf,0x71,0xe4,0x33);
+DEFINE_GUID(IID_IDirectXFileBinary,0x3d82ab46,0x62da,0x11cf,0xab,0x39,0x0,0x20,0xaf,0x71,0xe4,0x33);
+DEFINE_GUID(TID_DXFILEHeader,0x3d82ab43,0x62da,0x11cf,0xab,0x39,0x0,0x20,0xaf,0x71,0xe4,0x33);
+
+/////////////////////////////////////////////////////////////////////
+// File RMXFGUID.H:
+/////////////////////////////////////////////////////////////////////
+
+DEFINE_GUID(TID_D3DRMInfo,0x2b957100,0x9e9a,0x11cf,0xab,0x39,0x0,0x20,0xaf,0x71,0xe4,0x33);
+DEFINE_GUID(TID_D3DRMMesh,0x3d82ab44,0x62da,0x11cf,0xab,0x39,0x0,0x20,0xaf,0x71,0xe4,0x33);
+DEFINE_GUID(TID_D3DRMVector,0x3d82ab5e,0x62da,0x11cf,0xab,0x39,0x0,0x20,0xaf,0x71,0xe4,0x33);
+DEFINE_GUID(TID_D3DRMMeshFace,0x3d82ab5f,0x62da,0x11cf,0xab,0x39,0x0,0x20,0xaf,0x71,0xe4,0x33);
+DEFINE_GUID(TID_D3DRMMaterial,0x3d82ab4d,0x62da,0x11cf,0xab,0x39,0x0,0x20,0xaf,0x71,0xe4,0x33);
+DEFINE_GUID(TID_D3DRMMaterialArray,0x35ff44e1,0x6c7c,0x11cf,0x8F,0x52,0x0,0x40,0x33,0x35,0x94,0xa3);
+DEFINE_GUID(TID_D3DRMFrame,0x3d82ab46,0x62da,0x11cf,0xab,0x39,0x0,0x20,0xaf,0x71,0xe4,0x33);
+DEFINE_GUID(TID_D3DRMFrameTransformMatrix,0xf6f23f41,0x7686,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xa3);
+DEFINE_GUID(TID_D3DRMMeshMaterialList,0xf6f23f42,0x7686,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xa3);
+DEFINE_GUID(TID_D3DRMMeshTextureCoords,0xf6f23f40,0x7686,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xa3);
+DEFINE_GUID(TID_D3DRMMeshNormals,0xf6f23f43,0x7686,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xa3);
+DEFINE_GUID(TID_D3DRMCoords2d,0xf6f23f44,0x7686,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xa3);
+DEFINE_GUID(TID_D3DRMMatrix4x4,0xf6f23f45,0x7686,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xa3);
+DEFINE_GUID(TID_D3DRMAnimation,0x3d82ab4f,0x62da,0x11cf,0xab,0x39,0x0,0x20,0xaf,0x71,0xe4,0x33);
+DEFINE_GUID(TID_D3DRMAnimationSet,0x3d82ab50,0x62da,0x11cf,0xab,0x39,0x0,0x20,0xaf,0x71,0xe4,0x33);
+DEFINE_GUID(TID_D3DRMAnimationKey,0x10dd46a8,0x775b,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xA3);
+DEFINE_GUID(TID_D3DRMFloatKeys,0x10dd46a9,0x775b,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xA3);
+DEFINE_GUID(TID_D3DRMMaterialAmbientColor,0x01411840,0x7786,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xA3);
+DEFINE_GUID(TID_D3DRMMaterialDiffuseColor,0x01411841,0x7786,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xA3);
+DEFINE_GUID(TID_D3DRMMaterialSpecularColor,0x01411842,0x7786,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xA3);
+DEFINE_GUID(TID_D3DRMMaterialEmissiveColor,0xd3e16e80,0x7835,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xa3);
+DEFINE_GUID(TID_D3DRMMaterialPower,0x01411843,0x7786,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xA3);
+DEFINE_GUID(TID_D3DRMColorRGBA,0x35ff44e0,0x6c7c,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xA3);
+DEFINE_GUID(TID_D3DRMColorRGB,0xd3e16e81,0x7835,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xa3);
+DEFINE_GUID(TID_D3DRMGuid,0xa42790e0,0x7810,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xa3);
+DEFINE_GUID(TID_D3DRMTextureFilename,0xa42790e1,0x7810,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xa3);
+DEFINE_GUID(TID_D3DRMTextureReference,0xa42790e2,0x7810,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xa3);
+DEFINE_GUID(TID_D3DRMIndexedColor,0x1630b820,0x7842,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xa3);
+DEFINE_GUID(TID_D3DRMMeshVertexColors,0x1630b821,0x7842,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xa3);
+DEFINE_GUID(TID_D3DRMMaterialWrap,0x4885ae60,0x78e8,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xa3);
+DEFINE_GUID(TID_D3DRMBoolean,0x537da6a0,0xca37,0x11d0,0x94,0x1c,0x0,0x80,0xc8,0xc,0xfa,0x7b);
+DEFINE_GUID(TID_D3DRMMeshFaceWraps,0xed1ec5c0,0xc0a8,0x11d0,0x94,0x1c,0x0,0x80,0xc8,0xc,0xfa,0x7b);
+DEFINE_GUID(TID_D3DRMBoolean2d,0x4885ae63,0x78e8,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xa3);
+DEFINE_GUID(TID_D3DRMTimedFloatKeys,0xf406b180,0x7b3b,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xa3);
+DEFINE_GUID(TID_D3DRMAnimationOptions,0xe2bf56c0,0x840f,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xa3);
+DEFINE_GUID(TID_D3DRMFramePosition,0xe2bf56c1,0x840f,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xa3);
+DEFINE_GUID(TID_D3DRMFrameVelocity,0xe2bf56c2,0x840f,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xa3);
+DEFINE_GUID(TID_D3DRMFrameRotation,0xe2bf56c3,0x840f,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xa3);
+DEFINE_GUID(TID_D3DRMLight,0x3d82ab4a,0x62da,0x11cf,0xab,0x39,0x0,0x20,0xaf,0x71,0xe4,0x33);
+DEFINE_GUID(TID_D3DRMCamera,0x3d82ab51,0x62da,0x11cf,0xab,0x39,0x0,0x20,0xaf,0x71,0xe4,0x33);
+DEFINE_GUID(TID_D3DRMAppData,0xe5745280,0xb24f,0x11cf,0x9d,0xd5,0x0,0xaa,0x0,0xa7,0x1a,0x2f);
+DEFINE_GUID(TID_D3DRMLightUmbra,0xaed22740,0xb31f,0x11cf,0x9d,0xd5,0x0,0xaa,0x0,0xa7,0x1a,0x2f);
+DEFINE_GUID(TID_D3DRMLightRange,0xaed22742,0xb31f,0x11cf,0x9d,0xd5,0x0,0xaa,0x0,0xa7,0x1a,0x2f);
+DEFINE_GUID(TID_D3DRMLightPenumbra,0xaed22741,0xb31f,0x11cf,0x9d,0xd5,0x0,0xaa,0x0,0xa7,0x1a,0x2f);
+DEFINE_GUID(TID_D3DRMLightAttenuation,0xa8a98ba0,0xc5e5,0x11cf,0xb9,0x41,0x0,0x80,0xc8,0xc,0xfa,0x7b);
+DEFINE_GUID(TID_D3DRMInlineData,0x3a23eea0,0x94b1,0x11d0,0xab,0x39,0x0,0x20,0xaf,0x71,0xe4,0x33);
+DEFINE_GUID(TID_D3DRMUrl,0x3a23eea1,0x94b1,0x11d0,0xab,0x39,0x0,0x20,0xaf,0x71,0xe4,0x33);
+DEFINE_GUID(TID_D3DRMProgressiveMesh,0x8A63C360,0x997D,0x11d0,0x94,0x1C,0x0,0x80,0xC8,0x0C,0xFA,0x7B);
+DEFINE_GUID(TID_D3DRMExternalVisual,0x98116AA0,0xBDBA,0x11d1,0x82,0xC0,0x00,0xA0,0xC9,0x69,0x72,0x71);
+DEFINE_GUID(TID_D3DRMStringProperty,0x7f0f21e0,0xbfe1,0x11d1,0x82,0xc0,0x0,0xa0,0xc9,0x69,0x72,0x71);
+DEFINE_GUID(TID_D3DRMPropertyBag,0x7f0f21e1,0xbfe1,0x11d1,0x82,0xc0,0x0,0xa0,0xc9,0x69,0x72,0x71);
+DEFINE_GUID(TID_D3DRMRightHanded,0x7f5d5ea0,0xd53a,0x11d1,0x82,0xc0,0x0,0xa0,0xc9,0x69,0x72,0x71);

pcsxr-1.9.93.tar.bz2/win32/plugins/dfxvideo/winsrc/fps.c Added

@@ -0,0 +1,571 @@
+/***************************************************************************
+ fps.c - description
+ -------------------
+ begin : Sun Oct 28 2001
+ copyright : (C) 2001 by Pete Bernert
+ email : BlackDove@addcom.de
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+#define _IN_FPS
+
+#include "externals.h"
+#include "fps.h"
+#include "gpu.h"
+
+////////////////////////////////////////////////////////////////////////
+// FPS stuff
+////////////////////////////////////////////////////////////////////////
+
+LARGE_INTEGER CPUFrequency, PerformanceCounter;
+
+float fFrameRateHz=0;
+DWORD dwFrameRateTicks=16;
+float fFrameRate;
+int iFrameLimit;
+int UseFrameLimit=0;
+int UseFrameSkip=0;
+
+////////////////////////////////////////////////////////////////////////
+// FPS skipping / limit
+////////////////////////////////////////////////////////////////////////
+ 
+BOOL bInitCap = TRUE;
+float fps_skip = 0;
+float fps_cur = 0;
+
+////////////////////////////////////////////////////////////////////////
+
+#define MAXLACE 16
+
+void CheckFrameRate(void)
+{ 
+ if(UseFrameSkip) // skipping mode?
+ {
+ if(!(dwActFixes&0x80)) // not old skipping mode?
+ {
+ dwLaceCnt++; // -> store cnt of vsync between frames
+ if(dwLaceCnt>=MAXLACE && UseFrameLimit) // -> if there are many laces without screen toggling,
+ { // do std frame limitation
+ if(dwLaceCnt==MAXLACE) bInitCap=TRUE;
+ FrameCap();
+ }
+ }
+ else if(UseFrameLimit) FrameCap();
+ calcfps(); // -> calc fps display in skipping mode
+ } 
+ else // non-skipping mode:
+ {
+ if(UseFrameLimit) FrameCap(); // -> do it
+ if(ulKeybits&KEY_SHOWFPS) calcfps(); // -> and calc fps display
+ }
+} 
+
+////////////////////////////////////////////////////////////////////////
+// WIN VERSION
+////////////////////////////////////////////////////////////////////////
+
+BOOL IsPerformanceCounter = FALSE;
+
+void FrameCap (void) // frame limit func
+{
+ static DWORD curticks, lastticks, _ticks_since_last_update;
+ static DWORD TicksToWait = 0;
+ static LARGE_INTEGER CurrentTime;
+ static LARGE_INTEGER LastTime;
+ static BOOL SkipNextWait = FALSE;
+ BOOL Waiting = TRUE;
+
+//---------------------------------------------------------
+ if(bInitCap)
+ {
+ bInitCap=FALSE;
+ if (IsPerformanceCounter)
+ QueryPerformanceCounter(&LastTime);
+ lastticks = timeGetTime();
+ TicksToWait=0;
+ return;
+ }
+//---------------------------------------------------------
+
+ if (IsPerformanceCounter)
+ {
+ QueryPerformanceCounter(&CurrentTime);
+ _ticks_since_last_update = CurrentTime.LowPart - LastTime.LowPart;
+
+ //---------------------------------------------------------
+ curticks = timeGetTime();
+ if(_ticks_since_last_update>(CPUFrequency.LowPart>>1))
+ {
+ if(curticks < lastticks)
+ _ticks_since_last_update = dwFrameRateTicks+TicksToWait+1;
+ else _ticks_since_last_update = (CPUFrequency.LowPart * (curticks - lastticks))/1000;
+ }
+ //---------------------------------------------------------
+
+ if ((_ticks_since_last_update > TicksToWait) || 
+ (CurrentTime.LowPart < LastTime.LowPart))
+ {
+ LastTime.HighPart = CurrentTime.HighPart;
+ LastTime.LowPart = CurrentTime.LowPart;
+
+ lastticks=curticks;
+
+ if((_ticks_since_last_update-TicksToWait) > dwFrameRateTicks)
+ TicksToWait=0;
+ else TicksToWait=dwFrameRateTicks-(_ticks_since_last_update-TicksToWait);
+ }
+ else
+ {
+ while (Waiting)
+ {
+ QueryPerformanceCounter(&CurrentTime);
+ _ticks_since_last_update = CurrentTime.LowPart - LastTime.LowPart;
+
+ //---------------------------------------------------------
+ curticks = timeGetTime();
+ if(_ticks_since_last_update>(CPUFrequency.LowPart>>1)) 
+ {
+ if(curticks < lastticks)
+ _ticks_since_last_update = TicksToWait+1;
+ else _ticks_since_last_update = (CPUFrequency.LowPart * (curticks - lastticks))/1000;
+ }
+ //---------------------------------------------------------
+
+ if ((_ticks_since_last_update > TicksToWait) || 
+ (CurrentTime.LowPart < LastTime.LowPart))
+ {
+ Waiting = FALSE;
+
+ lastticks=curticks;
+
+ LastTime.HighPart = CurrentTime.HighPart;
+ LastTime.LowPart = CurrentTime.LowPart;
+ TicksToWait = dwFrameRateTicks;
+ }
+ }
+ }
+ }
+ else
+ {
+ curticks = timeGetTime();
+ _ticks_since_last_update = curticks - lastticks;
+
+ if ((_ticks_since_last_update > TicksToWait) || 
+ (curticks < lastticks))
+ {
+ lastticks = curticks;
+
+ if((_ticks_since_last_update-TicksToWait) > dwFrameRateTicks)
+ TicksToWait=0;
+ else TicksToWait=dwFrameRateTicks-(_ticks_since_last_update-TicksToWait);
+ }
+ else
+ {
+ while (Waiting)
+ {
+ curticks = timeGetTime();
+ _ticks_since_last_update = curticks - lastticks;
+ if ((_ticks_since_last_update > TicksToWait) || 
+ (curticks < lastticks))
+ {
+ Waiting = FALSE;
+ lastticks = curticks;
+ TicksToWait = dwFrameRateTicks;
+ }
+ }
+ }
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+#define MAXSKIP 120
+
+void FrameSkip(void)
+{
+ static int iNumSkips=0,iAdditionalSkip=0; // number of additional frames to skip
+ static DWORD dwLastLace=0; // helper var for frame limitation
+ static DWORD curticks, lastticks, _ticks_since_last_update;
+ static LARGE_INTEGER CurrentTime;
+ static LARGE_INTEGER LastTime;
+
+ if(!dwLaceCnt) return; // important: if no updatelace happened, we ignore it completely
+
+ if(iNumSkips) // we are in pure skipping mode?
+ {
+ dwLastLace+=dwLaceCnt; // -> calc frame limit helper (number of laces)
+ bSkipNextFrame = TRUE; // -> we skip next frame as well
+ iNumSkips--; // -> ok, one done
+ }
+ else // ok, no additional skipping has to be done... 
+ { // we check now, if some limitation is needed, or a new skipping has to get started
+ DWORD dwWaitTime;
+
+ if(bInitCap || bSkipNextFrame) // first time or we skipped before?
+ {
+ if(UseFrameLimit && !bInitCap) // frame limit wanted and not first time called?
+ {
+ DWORD dwT=_ticks_since_last_update; // -> that's the time of the last drawn frame
+ dwLastLace+=dwLaceCnt; // -> and that's the number of updatelace since the start of the last drawn frame
+
+ if (IsPerformanceCounter) // -> now we calc the time of the last drawn frame + the time we spent skipping
+ {
+ QueryPerformanceCounter(&CurrentTime);
+ _ticks_since_last_update= dwT+CurrentTime.LowPart - LastTime.LowPart;
+ }
+ else
+ {
+ curticks = timeGetTime();
+ _ticks_since_last_update= dwT+curticks - lastticks;
+ }
+
+ dwWaitTime=dwLastLace*dwFrameRateTicks; // -> and now we calc the time the real psx would have needed
+
+ if(_ticks_since_last_update<dwWaitTime) // -> we were too fast?
+ { 
+ if((dwWaitTime-_ticks_since_last_update)> // -> some more security, to prevent
+ (60*dwFrameRateTicks)) // wrong waiting times
+ _ticks_since_last_update=dwWaitTime;
+
+ while(_ticks_since_last_update<dwWaitTime) // -> loop until we have reached the real psx time
+ { // (that's the additional limitation, yup)
+ if (IsPerformanceCounter)
+ {
+ QueryPerformanceCounter(&CurrentTime);
+ _ticks_since_last_update = dwT+CurrentTime.LowPart - LastTime.LowPart;
+ }
+ else
+ {
+ curticks = timeGetTime();
+ _ticks_since_last_update = dwT+curticks - lastticks;
+ }
+ }
+ }
+ else // we were still too slow ?!!?
+ {
+ if(iAdditionalSkip<MAXSKIP) // -> well, somewhen we really have to stop skipping on very slow systems
+ {
+ iAdditionalSkip++; // -> inc our watchdog var
+ dwLaceCnt=0; // -> reset lace count
+ if (IsPerformanceCounter) // -> ok, start time of the next frame
+ QueryPerformanceCounter(&LastTime);
+ lastticks = timeGetTime();
+ return; // -> done, we will skip next frame to get more speed (SkipNextFrame still TRUE)
+ } 
+ }
+ }
+
+ bInitCap=FALSE; // -> ok, we have inited the frameskip func
+ iAdditionalSkip=0; // -> init additional skip
+ bSkipNextFrame=FALSE; // -> we don't skip the next frame
+ if (IsPerformanceCounter) // -> we store the start time of the next frame
+ QueryPerformanceCounter(&LastTime);
+ lastticks = timeGetTime();
+ dwLaceCnt=0; // -> and we start to count the laces 
+ dwLastLace=0; 
+ _ticks_since_last_update=0;
+ return; // -> done, the next frame will get drawn
+ }
+
+ bSkipNextFrame=FALSE; // init the frame skip signal to 'no skipping' first
+
+ if (IsPerformanceCounter) // get the current time (we are now at the end of one drawn frame)
+ {
+ QueryPerformanceCounter(&CurrentTime);
+ _ticks_since_last_update = CurrentTime.LowPart - LastTime.LowPart;
+ }
+ else
+ {
+ curticks = timeGetTime();
+ _ticks_since_last_update = curticks - lastticks;
+ }
+
+ dwLastLace=dwLaceCnt; // store curr count (frame limitation helper)
+ dwWaitTime=dwLaceCnt*dwFrameRateTicks; // calc the 'real psx lace time'
+
+ if(_ticks_since_last_update>dwWaitTime) // hey, we needed way too long for that frame...
+ {
+ if(UseFrameLimit) // if limitation, we skip just next frame,
+ { // and decide after, if we need to do more
+ iNumSkips=0;
+ }
+ else
+ {
+ iNumSkips=_ticks_since_last_update/dwWaitTime; // -> calc number of frames to skip to catch up
+ iNumSkips--; // -> since we already skip next frame, one down
+ if(iNumSkips>MAXSKIP) iNumSkips=MAXSKIP; // -> well, somewhere we have to draw a line
+ }
+ bSkipNextFrame = TRUE; // -> signal for skipping the next frame
+ }
+ else // we were faster than real psx? fine :)
+ if(UseFrameLimit) // frame limit used? so we wait til the 'real psx time' has been reached
+ {
+ if(dwLaceCnt>MAXLACE) // -> security check
+ _ticks_since_last_update=dwWaitTime;
+
+ while(_ticks_since_last_update<dwWaitTime) // just do a waiting loop...
+ {
+ if (IsPerformanceCounter)
+ {
+ QueryPerformanceCounter(&CurrentTime);
+ _ticks_since_last_update = CurrentTime.LowPart - LastTime.LowPart;
+ }
+ else
+ {
+ curticks = timeGetTime();
+ _ticks_since_last_update = curticks - lastticks;
+ }
+ }
+ }
+
+ if (IsPerformanceCounter) // ok, start time of the next frame
+ QueryPerformanceCounter(&LastTime);
+ lastticks = timeGetTime();
+ }
+
+ dwLaceCnt=0; // init lace counter
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void calcfps(void) // fps calculations
+{
+ static DWORD curticks,_ticks_since_last_update,lastticks;
+ static long fps_cnt = 0;
+ static DWORD fps_tck = 1;
+ static LARGE_INTEGER CurrentTime;
+ static LARGE_INTEGER LastTime;
+ static long fpsskip_cnt = 0;
+ static DWORD fpsskip_tck = 1;
+
+ if(IsPerformanceCounter)
+ {
+ QueryPerformanceCounter(&CurrentTime);
+ _ticks_since_last_update=CurrentTime.LowPart-LastTime.LowPart;
+
+ //--------------------------------------------------//
+ curticks = timeGetTime();
+ if(_ticks_since_last_update>(CPUFrequency.LowPart>>1)) 
+ _ticks_since_last_update = (CPUFrequency.LowPart * (curticks - lastticks))/1000;
+ lastticks=curticks;
+ //--------------------------------------------------//
+
+ if(UseFrameSkip && !UseFrameLimit && _ticks_since_last_update) 
+ fps_skip=min(fps_skip,(((float)CPUFrequency.LowPart) / ((float)_ticks_since_last_update) +1.0f));
+
+ LastTime.HighPart = CurrentTime.HighPart;
+ LastTime.LowPart = CurrentTime.LowPart;
+ }
+ else
+ {
+ curticks = timeGetTime();
+ _ticks_since_last_update=curticks-lastticks;
+
+ if(UseFrameSkip && !UseFrameLimit && _ticks_since_last_update)
+ fps_skip=min(fps_skip,((float)1000/(float)_ticks_since_last_update+1.0f));
+
+ lastticks = curticks;
+ }
+
+ if(UseFrameSkip && UseFrameLimit)
+ {
+ fpsskip_tck += _ticks_since_last_update;
+
+ if(++fpsskip_cnt==2)
+ {
+ if(IsPerformanceCounter)
+ fps_skip = ((float)CPUFrequency.LowPart) / ((float)fpsskip_tck) *2.0f;
+ else
+ fps_skip = (float)2000/(float)fpsskip_tck;
+
+ fps_skip +=6.0f;
+
+ fpsskip_cnt = 0;
+ fpsskip_tck = 1;
+ }
+ }
+
+ fps_tck += _ticks_since_last_update;
+
+ if(++fps_cnt==10)
+ {
+ if(IsPerformanceCounter)
+ fps_cur = ((float)CPUFrequency.LowPart) / ((float)fps_tck) *10.0f;
+ else
+ fps_cur = (float)10000/(float)fps_tck;
+
+ fps_cnt = 0;
+ fps_tck = 1;
+
+ if(UseFrameLimit && fps_cur>fFrameRateHz) // optical adjust ;) avoids flickering fps display
+ fps_cur=fFrameRateHz;
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+// PC FPS skipping / limit
+////////////////////////////////////////////////////////////////////////
+
+void PCFrameCap (void)
+{
+ static DWORD curticks, lastticks, _ticks_since_last_update;
+ static DWORD TicksToWait = 0;
+ static LARGE_INTEGER CurrentTime;
+ static LARGE_INTEGER LastTime;
+ BOOL Waiting = TRUE;
+
+ while (Waiting)
+ {
+ if (IsPerformanceCounter)
+ {
+ QueryPerformanceCounter(&CurrentTime);
+ _ticks_since_last_update = CurrentTime.LowPart - LastTime.LowPart;
+
+ //------------------------------------------------//
+ curticks = timeGetTime();
+ if(_ticks_since_last_update>(CPUFrequency.LowPart>>1)) 
+ {
+ if(curticks < lastticks)
+ _ticks_since_last_update = TicksToWait+1;
+ else _ticks_since_last_update = (CPUFrequency.LowPart * (curticks - lastticks))/1000;
+ }
+ //------------------------------------------------//
+
+ if ((_ticks_since_last_update > TicksToWait) ||
+ (CurrentTime.LowPart < LastTime.LowPart))
+ {
+ Waiting = FALSE;
+ lastticks=curticks;
+ LastTime.HighPart = CurrentTime.HighPart;
+ LastTime.LowPart = CurrentTime.LowPart;
+ TicksToWait = (unsigned long)(CPUFrequency.LowPart / fFrameRateHz);
+ }
+ }
+ else
+ {
+ curticks = timeGetTime();
+ _ticks_since_last_update = curticks - lastticks;
+ if ((_ticks_since_last_update > TicksToWait) || 
+ (curticks < lastticks))
+ {
+ Waiting = FALSE;
+ lastticks = curticks;
+ TicksToWait = (1000 / (DWORD)fFrameRateHz);
+ }
+ }
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void PCcalcfps(void)
+{
+ static DWORD curticks,_ticks_since_last_update,lastticks;
+ static long fps_cnt = 0;
+ static float fps_acc = 0;
+ static LARGE_INTEGER CurrentTime;
+ static LARGE_INTEGER LastTime;
+ float CurrentFPS=0; 
+ 
+ if(IsPerformanceCounter)
+ {
+ QueryPerformanceCounter(&CurrentTime);
+ _ticks_since_last_update=CurrentTime.LowPart-LastTime.LowPart;
+
+ //--------------------------------------------------//
+ curticks = timeGetTime();
+ if(_ticks_since_last_update>(CPUFrequency.LowPart>>1)) 
+ _ticks_since_last_update = (CPUFrequency.LowPart * (curticks - lastticks))/1000;
+ lastticks=curticks;
+ //--------------------------------------------------//
+
+ if(_ticks_since_last_update)
+ {
+ CurrentFPS = ((float)CPUFrequency.LowPart) / ((float)_ticks_since_last_update);
+ }
+ else CurrentFPS = 0;
+ LastTime.HighPart = CurrentTime.HighPart;
+ LastTime.LowPart = CurrentTime.LowPart;
+ }
+ else
+ {
+ curticks = timeGetTime();
+ if(_ticks_since_last_update=curticks-lastticks)
+ CurrentFPS=(float)1000/(float)_ticks_since_last_update;
+ else CurrentFPS = 0;
+ lastticks = curticks;
+ }
+
+ fps_acc += CurrentFPS;
+
+ if(++fps_cnt==10)
+ {
+ fps_cur = fps_acc / 10;
+ fps_acc = 0;
+ fps_cnt = 0;
+ }
+ 
+ fps_skip=CurrentFPS+1.0f;
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void SetAutoFrameCap(void)
+{
+ if(iFrameLimit==1)
+ {
+ fFrameRateHz = fFrameRate;
+ if(IsPerformanceCounter)
+ dwFrameRateTicks=(DWORD)(CPUFrequency.LowPart / fFrameRateHz);
+ else dwFrameRateTicks=(1000 / (DWORD)fFrameRateHz);
+ return;
+ }
+
+ if(dwActFixes&32)
+ {
+ if (PSXDisplay.Interlaced)
+ fFrameRateHz = PSXDisplay.PAL?50.0f:60.0f;
+ else fFrameRateHz = PSXDisplay.PAL?25.0f:30.0f;
+ }
+ else
+ {
+ fFrameRateHz = PSXDisplay.PAL?50.0f:59.94f;
+ if(IsPerformanceCounter)
+ dwFrameRateTicks=(DWORD)(CPUFrequency.LowPart / fFrameRateHz);
+ else dwFrameRateTicks=(1000 / (DWORD)fFrameRateHz);
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void SetFPSHandler(void)
+{
+ if (QueryPerformanceFrequency (&CPUFrequency)) // timer mode
+ IsPerformanceCounter = TRUE;
+ else IsPerformanceCounter = FALSE;
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void InitFPS(void)
+{
+ bInitCap = TRUE;
+
+ if(fFrameRateHz==0) fFrameRateHz=fFrameRate; // set user framerate
+
+ if(IsPerformanceCounter)
+ dwFrameRateTicks=(DWORD)(CPUFrequency.LowPart / fFrameRateHz);
+ else dwFrameRateTicks=(1000 / (DWORD)fFrameRateHz);
+}
+
+////////////////////////////////////////////////////////////////////////

pcsxr-1.9.93.tar.bz2/win32/plugins/dfxvideo/winsrc/key.c Added

@@ -0,0 +1,137 @@
+/***************************************************************************
+                          key.c  -  description
+                             -------------------
+    begin                : Sun Oct 28 2001
+    copyright            : (C) 2001 by Pete Bernert
+    email                : BlackDove@addcom.de
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+#define _IN_KEY
+
+#include "externals.h"
+#include "menu.h"
+#include "gpu.h"
+#include "draw.h"
+#include "key.h"
+
+#include "record.h"
+
+////////////////////////////////////////////////////////////////////////
+// KeyBoard handler stuff
+////////////////////////////////////////////////////////////////////////
+
+WNDPROC                wpOrgWndProc=0;
+unsigned long          ulKeybits=0;
+char                   szGPUKeys[11];
+
+////////////////////////////////////////////////////////////////////////
+// keyboard handler
+////////////////////////////////////////////////////////////////////////
+
+void CALLBACK GPUshowScreenPic(unsigned char * pMem);
+void CALLBACK GPUgetScreenPic(unsigned char * pMem);
+
+LRESULT CALLBACK KeyWndProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam)
+{
+ switch(message)
+  {
+   //--------------------------------------------------//
+   case WM_ACTIVATE:                                   // some scanline window mode fixing stuff
+   case WM_MOVE:
+    {
+     if(!iUseScanLines) break;
+     if(!iWindowMode)    break;
+     if(bIsFirstFrame)  break;
+     MoveScanLineArea(hwnd);
+    }break;
+   //--------------------------------------------------//
+   case WM_KEYDOWN:                                    // keydown
+    if(wParam==(WPARAM)szGPUKeys[2]) ulKeybits|=KEY_RESETTEXSTORE;
+    break;
+   //--------------------------------------------------//
+   case WM_SYSKEYUP:                                   // alt+enter
+    if(wParam==VK_RETURN) bChangeWinMode=TRUE;
+   break;
+   //--------------------------------------------------//
+   case WM_KEYUP:                                      // key up
+
+     if(iDebugMode && wParam==(WPARAM)szGPUKeys[9]) 
+      iFVDisplay=!iFVDisplay;
+
+     if(wParam==(WPARAM)szGPUKeys[0])
+      {
+       if(ulKeybits&KEY_SHOWFPS)
+        {
+         DestroyPic();
+         ulKeybits&=~KEY_SHOWFPS;
+         DoClearScreenBuffer();
+        }
+       else
+        {
+         ulKeybits|=KEY_SHOWFPS;
+         szDispBuf[0]=0;
+         BuildDispMenu(0);
+        }
+       break;
+      }
+     if(wParam==(WPARAM)szGPUKeys[1]) {ShowGpuPic();break;}
+
+     if(wParam==(WPARAM)szGPUKeys[6])
+	  {
+	   if(RECORD_RECORDING==TRUE)
+	    {RECORD_RECORDING=FALSE;RECORD_Stop();}
+	   else
+	    {RECORD_RECORDING=TRUE;RECORD_Start();}
+	   BuildDispMenu(0);
+	   break;
+	  }
+
+     if(wParam==(WPARAM)szGPUKeys[2]) {SwitchDispMenu(-1); break;}
+     if(wParam==(WPARAM)szGPUKeys[3]) {SwitchDispMenu(1);  break;}
+     if(wParam==(WPARAM)szGPUKeys[4]) {BuildDispMenu(-1);  break;}
+     if(wParam==(WPARAM)szGPUKeys[5]) {BuildDispMenu( 1);  break;}
+     if(wParam==(WPARAM)szGPUKeys[7]) {bVsync_Key = bVsync_Key==TRUE ? FALSE : TRUE;  BuildDispMenu(0);break;}
+     if(wParam==(WPARAM)szGPUKeys[8])         
+      {
+       iFastFwd = 1 - iFastFwd; 
+       bSkipNextFrame = FALSE; 
+       UseFrameSkip=iFastFwd;
+       BuildDispMenu(0);
+       break;
+      }
+    break;
+   //--------------------------------------------------//
+  }
+ return wpOrgWndProc( hwnd, message, wParam, lParam );
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void SetKeyHandler(void)
+{
+ if(!wpOrgWndProc)                                     // setup keyhandler
+  {
+   wpOrgWndProc = (WNDPROC)GetWindowLong(hWGPU, GWL_WNDPROC );
+   SetWindowLong(hWGPU, GWL_WNDPROC, (long)KeyWndProc);
+  }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void ReleaseKeyHandler(void)
+{
+ if(wpOrgWndProc)
+  SetWindowLong(hWGPU,GWL_WNDPROC,              // set old proc
+                (long)wpOrgWndProc);
+ wpOrgWndProc = 0;                                      
+}

pcsxr-1.9.93.tar.bz2/win32/plugins/dfxvideo/winsrc/record.c Added

@@ -0,0 +1,258 @@
+/***************************************************************************
+ record.c - description
+ -------------------
+ begin : Fri Nov 09 2001
+ copyright : (C) 2001 by Darko Matesic
+ email : thedarkma@ptt.yu
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+#include "externals.h"
+#include "record.h"
+#include "gpu.h"
+#include <direct.h>
+
+extern BOOL			RECORD_RECORDING = FALSE;
+BITMAPINFOHEADER	RECORD_BI = {40,0,0,1,16,0,0,2048,2048,0,0};
+unsigned char		RECORD_BUFFER[1600*1200*3];
+unsigned long		RECORD_INDEX;
+unsigned long		RECORD_RECORDING_MODE;
+unsigned long		RECORD_VIDEO_SIZE;
+unsigned long		RECORD_RECORDING_WIDTH;
+unsigned long		RECORD_RECORDING_HEIGHT;
+unsigned long		RECORD_FRAME_RATE_SCALE;
+unsigned long		RECORD_COMPRESSION_MODE;
+COMPVARS			RECORD_COMPRESSION1;
+unsigned char		RECORD_COMPRESSION_STATE1[4096];
+COMPVARS			RECORD_COMPRESSION2;
+unsigned char		RECORD_COMPRESSION_STATE2[4096];
+
+
+PCOMPVARS			pCompression = NULL;
+AVISTREAMINFO		strhdr;
+PAVIFILE			pfile = NULL;
+PAVISTREAM			ps = NULL;
+PAVISTREAM			psCompressed = NULL;
+AVICOMPRESSOPTIONS	opts;
+
+unsigned long		frame;
+unsigned long		skip;
+
+//--------------------------------------------------------------------
+
+BOOL RECORD_Start()
+{
+static FILE *data;
+static char filename[255];
+RECORD_INDEX = 0;
+if(HIWORD(VideoForWindowsVersion())<0x010a) {MessageBox(NULL,"Video for Windows version is too old !\nAbording Recording.","Error", MB_OK|MB_ICONSTOP);return FALSE;}
+mkdir("demo");
+while(TRUE)
+	{
+	sprintf(filename,"demo\\demo%04d.AVI",RECORD_INDEX++);
+	if((data=fopen(filename,"rb"))==NULL) break;
+	fclose(data);
+	if(RECORD_INDEX>9999) goto error;
+	}
+if((data=fopen(filename,"wb"))==NULL) goto error;
+if(RECORD_RECORDING_MODE==0)
+	{
+	switch(RECORD_VIDEO_SIZE)
+		{
+		case 0:
+			RECORD_BI.biWidth	= iResX;
+			RECORD_BI.biHeight	= iResY;
+			break;
+		case 1:
+			RECORD_BI.biWidth	= iResX/2;
+			RECORD_BI.biHeight	= iResY/2;
+			break;
+		default:
+			RECORD_BI.biWidth	= iResX/4;
+			RECORD_BI.biHeight	= iResY/4;
+			break;
+		}
+	}
+else
+	{
+	RECORD_BI.biWidth	= RECORD_RECORDING_WIDTH;
+	RECORD_BI.biHeight	= RECORD_RECORDING_HEIGHT;
+	}
+if(RECORD_COMPRESSION_MODE==0)
+	{
+	RECORD_BI.biBitCount = 16;
+	RECORD_BI.biSizeImage = RECORD_BI.biWidth*RECORD_BI.biHeight*2;
+	pCompression = &RECORD_COMPRESSION1;
+	}
+else
+	{
+	RECORD_BI.biBitCount = 24;
+	RECORD_BI.biSizeImage = RECORD_BI.biWidth*RECORD_BI.biHeight*3;
+	pCompression = &RECORD_COMPRESSION2;
+	}
+AVIFileInit();
+if(AVIFileOpen(&pfile,filename,OF_WRITE | OF_CREATE,NULL)!=AVIERR_OK) goto error;
+memset(&strhdr,0,sizeof(strhdr));
+strhdr.fccType = streamtypeVIDEO;
+strhdr.fccHandler = pCompression->fccHandler;
+strhdr.dwScale = RECORD_FRAME_RATE_SCALE + 1;
+strhdr.dwRate = (PSXDisplay.PAL)?50:60;// FPS
+strhdr.dwSuggestedBufferSize = RECORD_BI.biSizeImage;
+SetRect(&strhdr.rcFrame,0,0,RECORD_BI.biWidth,RECORD_BI.biHeight);
+if(AVIFileCreateStream(pfile,&ps,&strhdr)!=AVIERR_OK) goto error;
+
+opts.fccType			= pCompression->fccType;
+opts.fccHandler			= pCompression->fccHandler;
+opts.dwKeyFrameEvery	= pCompression->lKey;
+opts.dwQuality			= pCompression->lQ;
+opts.dwBytesPerSecond	= pCompression->lDataRate;
+opts.dwFlags			= AVICOMPRESSF_DATARATE|AVICOMPRESSF_KEYFRAMES|AVICOMPRESSF_VALID;
+opts.lpFormat			= &RECORD_BI;
+opts.cbFormat			= sizeof(RECORD_BI);
+opts.lpParms			= pCompression->lpState;
+opts.cbParms			= pCompression->cbState;
+opts.dwInterleaveEvery	= 0;
+
+if(AVIMakeCompressedStream(&psCompressed,ps,&opts,NULL)!=AVIERR_OK) goto error;
+
+//if(AVIStreamSetFormat(psCompressed,0,&RECORD_BI,RECORD_BI.biSizeImage)!=AVIERR_OK) goto error;
+// fixed:
+if(AVIStreamSetFormat(psCompressed,0,&RECORD_BI,sizeof(RECORD_BI))!=AVIERR_OK) goto error;
+
+frame = 0;
+skip = RECORD_FRAME_RATE_SCALE;
+return TRUE;
+error:
+RECORD_Stop();
+RECORD_RECORDING = FALSE;
+return FALSE;
+}
+
+//--------------------------------------------------------------------
+
+void RECORD_Stop()
+{
+if(ps) AVIStreamClose(ps);
+if(psCompressed) AVIStreamClose(psCompressed);
+if(pfile) AVIFileClose(pfile);
+AVIFileExit();
+}
+
+//--------------------------------------------------------------------
+
+BOOL RECORD_WriteFrame()
+{
+if(skip) {skip--;return TRUE;}
+skip=RECORD_FRAME_RATE_SCALE;
+if(!RECORD_GetFrame()) return FALSE;
+if(FAILED(AVIStreamWrite(psCompressed,frame,1,RECORD_BUFFER,RECORD_BI.biSizeImage,AVIIF_KEYFRAME,NULL,NULL)))
+	{RECORD_Stop();return FALSE;}
+frame++;
+return TRUE;
+}
+
+//--------------------------------------------------------------------
+
+BOOL RECORD_GetFrame()
+{
+static unsigned short *srcs,*src,*dests,cs;
+static unsigned char *srcc,*destc;
+static long x,y,cx,cy,ax,ay;
+static unsigned long cl;
+
+if(PSXDisplay.Disabled)
+	{
+	memset(RECORD_BUFFER,0,RECORD_BI.biSizeImage);
+	return TRUE;
+	}
+
+srcs = (unsigned short*)&psxVuw[PSXDisplay.DisplayPosition.x+(PSXDisplay.DisplayPosition.y<<10)];
+dests = (unsigned short*)RECORD_BUFFER;
+destc = (unsigned char*)RECORD_BUFFER;
+ax = (PSXDisplay.DisplayMode.x*65535L)/RECORD_BI.biWidth;
+ay = (PSXDisplay.DisplayMode.y*65535L)/RECORD_BI.biHeight;
+cy = (PSXDisplay.DisplayMode.y-1)<<16;
+if(RECORD_BI.biBitCount==16)
+	{
+	if(PSXDisplay.RGB24)
+		{
+			for(y=0;y<RECORD_BI.biHeight;y++)
+				{
+				srcc = (unsigned char*)&srcs[(cy&0xffff0000)>>6];
+				cx = 0;
+				for(x=0;x<RECORD_BI.biWidth;x++)
+					{
+					cl = *((unsigned long*)&srcc[(cx>>16)*3]);
+					*(dests++) = (unsigned short)(((cl&0xf8)<<7)|((cl&0xf800)>>6)|((cl&0xf80000)>>19));
+					cx += ax;
+					}
+				cy -= ay;if(cy<0) cy=0;
+				}
+		}
+	else
+		{
+		for(y=0;y<RECORD_BI.biHeight;y++)
+			{
+			src = &srcs[(cy&0xffff0000)>>6];
+			cx = 0;
+			for(x=0;x<RECORD_BI.biWidth;x++)
+				{
+				cs = src[cx>>16];
+				*(dests++) = ((cs&0x7c00)>>10)|(cs&0x03e0)|((cs&0x001f)<<10);
+				cx += ax;
+				}
+			cy -= ay;if(cy<0) cy=0;
+			}
+		}
+	}
+else if(RECORD_BI.biBitCount==24)
+	{
+	if(PSXDisplay.RGB24)
+		{
+			for(y=0;y<RECORD_BI.biHeight;y++)
+				{
+				srcc = (unsigned char*)&srcs[(cy&0xffff0000)>>6];
+				cx = 0;
+				for(x=0;x<RECORD_BI.biWidth;x++)
+					{
+					cl = *((unsigned long*)&srcc[(cx>>16)*3]);
+					*(destc++) = (unsigned char)((cl&0xff0000)>>16);
+					*(destc++) = (unsigned char)((cl&0xff00)>>8);
+					*(destc++) = (unsigned char)(cl&0xff);
+					cx += ax;
+					}
+				cy -= ay;if(cy<0) cy=0;
+				}
+		}
+	else
+		{
+		for(y=0;y<RECORD_BI.biHeight;y++)
+			{
+			src = &srcs[(cy&0xffff0000)>>6];
+			cx = 0;
+			for(x=0;x<RECORD_BI.biWidth;x++)
+				{
+				cs = src[cx>>16];
+				*(destc++) = (unsigned char)((cs&0x7c00)>>7);
+				*(destc++) = (unsigned char)((cs&0x03e0)>>2);
+				*(destc++) = (unsigned char)((cs&0x001f)<<3);
+				cx += ax;
+				}
+			cy -= ay;if(cy<0) cy=0;
+			}
+		}
+	}
+else
+	memset(RECORD_BUFFER,0,RECORD_BI.biSizeImage);
+
+return TRUE;
+}

pcsxr-1.9.93.tar.bz2/win32/plugins/dfxvideo/winsrc/record.h Added

@@ -0,0 +1,56 @@
+/***************************************************************************
+ record.h - description
+ -------------------
+ begin : Fri Nov 09 2001
+ copyright : (C) 2001 by Darko Matesic
+ email : thedarkma@ptt.yu
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+//*************************************************************************// 
+// History of changes:
+//
+// 2001/12/18 - Darko Matesic
+// - two types of compression (16bit & 24bit)
+// - FPSE 24bit MDEC support
+//
+// 2001/11/09 - Darko Matesic
+// - first revision
+//
+//*************************************************************************// 
+
+#ifndef _RECORD_H_
+#define _RECORD_H_
+
+#include <vfw.h>
+
+extern BOOL				RECORD_RECORDING;
+extern BITMAPINFOHEADER	RECORD_BI;
+extern unsigned char	RECORD_BUFFER[1600*1200*3];
+extern unsigned long	RECORD_INDEX;
+extern unsigned long	RECORD_RECORDING_MODE;
+extern unsigned long	RECORD_VIDEO_SIZE;
+extern unsigned long	RECORD_RECORDING_WIDTH;
+extern unsigned long	RECORD_RECORDING_HEIGHT;
+extern unsigned long	RECORD_FRAME_RATE_SCALE;
+extern unsigned long	RECORD_COMPRESSION_MODE;
+extern COMPVARS			RECORD_COMPRESSION1;
+extern unsigned char	RECORD_COMPRESSION_STATE1[4096];
+extern COMPVARS			RECORD_COMPRESSION2;
+extern unsigned char	RECORD_COMPRESSION_STATE2[4096];
+
+BOOL RECORD_Start();
+void RECORD_Stop();
+BOOL RECORD_WriteFrame();
+BOOL RECORD_GetFrame();
+
+#endif
\ No newline at end of file

pcsxr-1.9.93.tar.bz2/win32/plugins/dfxvideo/winsrc/winmain.c Added

@@ -0,0 +1,41 @@
+/***************************************************************************
+                      gpuPeopsSoft.c  -  description
+                             -------------------
+    begin                : Sun Oct 28 2001
+    copyright            : (C) 2001 by Pete Bernert
+    email                : BlackDove@addcom.de
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "externals.h"
+
+HINSTANCE    hInst = NULL;
+HMODULE      hDDrawDLL = NULL;
+
+BOOL APIENTRY DllMain(HANDLE hModule,                  // DLL INIT
+                      DWORD  dwReason, 
+                      LPVOID lpReserved)
+{
+	switch (dwReason) {
+		case DLL_PROCESS_ATTACH:
+			hInst = (HINSTANCE)hModule;
+			hDDrawDLL = LoadLibrary(TEXT("DDRAW.DLL"));
+			break;
+
+		case DLL_PROCESS_DETACH:
+			if (hDDrawDLL) FreeLibrary(hDDrawDLL);
+			break;
+	}
+
+	return TRUE;                                          // very quick :)
+}
+

pcsxr-1.9.93.tar.bz2/win32/plugins/peopsxgl Added

pcsxr-1.9.93.tar.bz2/win32/plugins/peopsxgl/gpuPeopsOpenGL.def Added

pcsxr-1.9.93.tar.bz2/win32/plugins/peopsxgl/gpuPeopsOpenGL.dev Added

@@ -0,0 +1,319 @@
+[Project]
+FileName=gpuPeopsOpenGL.dev
+Name=gpuPeopsOpenGL
+Ver=1
+IsCpp=1
+Type=3
+Compiler=-W -DWIN32 -DNDEBUG -D_WINDOWS_@@_
+CppCompiler=-W -DWIN32 -DNDEBUG -D_WINDOWS_@@_
+Includes=.\\;.\winsrc;..\..\glue;..\..\..\plugins\peopsxgl;..\..\..\libpcsxcore
+Linker=-luser32 -lgdi32 -lopengl32 -lwinmm -ladvapi32 -def gpuPeopsOpenGL.def --enable-stdcall-fixup_@@_
+Libs=
+UnitCount=27
+Folders=peopsxgl,winsrc
+ObjFiles=
+PrivateResource=gpuPeopsOpenGL_private.rc
+ResourceIncludes=
+MakeIncludes=
+Icon=
+ExeOutput=
+ObjectOutput=
+OverrideOutput=0
+OverrideOutputName=gpuPeopsOpenGL.exe
+HostApplication=
+CommandLine=
+UseCustomMakefile=0
+CustomMakefile=
+IncludeVersionInfo=0
+SupportXPThemes=0
+CompilerSet=0
+CompilerSettings=0010000001001000000000
+
+[Unit1]
+FileName=winsrc\cfg.c
+Folder=winsrc
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit2]
+FileName=winsrc\fps.c
+Folder=winsrc
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit3]
+FileName=winsrc\key.c
+Folder=winsrc
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit4]
+FileName=winsrc\ssave.c
+Folder=winsrc
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit5]
+FileName=winsrc\ssave.h
+Folder=winsrc
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit6]
+FileName=winsrc\winmain.c
+Folder=winsrc
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit7]
+FileName=..\..\..\plugins\peopsxgl\cfg.h
+Folder=peopsxgl
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit8]
+FileName=..\..\..\plugins\peopsxgl\draw.c
+Folder=peopsxgl
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit9]
+FileName=..\..\..\plugins\peopsxgl\draw.h
+Folder=peopsxgl
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit10]
+FileName=..\..\..\plugins\peopsxgl\externals.h
+Folder=peopsxgl
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit11]
+FileName=..\..\..\plugins\peopsxgl\fps.h
+Folder=peopsxgl
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit12]
+FileName=..\..\..\plugins\peopsxgl\gl_ext.h
+Folder=peopsxgl
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit13]
+FileName=..\..\..\plugins\peopsxgl\gpu.c
+Folder=peopsxgl
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit14]
+FileName=..\..\..\plugins\peopsxgl\gpu.h
+Folder=peopsxgl
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit15]
+FileName=..\..\..\plugins\peopsxgl\key.h
+Folder=peopsxgl
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit16]
+FileName=..\..\..\plugins\peopsxgl\menu.c
+Folder=peopsxgl
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit17]
+FileName=..\..\..\plugins\peopsxgl\menu.h
+Folder=peopsxgl
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit18]
+FileName=..\..\..\plugins\peopsxgl\prim.c
+Folder=peopsxgl
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit19]
+FileName=..\..\..\plugins\peopsxgl\prim.h
+Folder=peopsxgl
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit20]
+FileName=..\..\..\plugins\peopsxgl\soft.c
+Folder=peopsxgl
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit21]
+FileName=..\..\..\plugins\peopsxgl\soft.h
+Folder=peopsxgl
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit22]
+FileName=..\..\..\plugins\peopsxgl\stdafx.h
+Folder=peopsxgl
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit23]
+FileName=..\..\..\plugins\peopsxgl\texture.c
+Folder=peopsxgl
+Compile=1
+CompileCpp=0
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit24]
+FileName=..\..\..\plugins\peopsxgl\texture.h
+Folder=peopsxgl
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit25]
+FileName=gpuPeopsOpenGL.def
+Folder=
+Compile=0
+CompileCpp=0
+Link=0
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit26]
+FileName=gpuPeopsOpenGL.rc
+Folder=Resources
+Compile=1
+CompileCpp=1
+Link=0
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit27]
+FileName=resource.h
+Folder=
+Compile=1
+CompileCpp=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[VersionInfo]
+Major=0
+Minor=1
+Release=1
+Build=1
+LanguageID=1033
+CharsetID=1252
+CompanyName=
+FileVersion=0.1
+FileDescription=Developed using the Dev-C++ IDE
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=gpuPeopsOpenGL.exe
+ProductName=gpuPeopsOpenGL
+ProductVersion=0.1
+AutoIncBuildNr=0
+

pcsxr-1.9.93.tar.bz2/win32/plugins/peopsxgl/gpuPeopsOpenGL.rc Added

@@ -0,0 +1,519 @@
+//Microsoft Developer Studio generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+// Use MFC if available
+//
+#if defined(_MFC_VER)
+#include "afxres.h"
+#else
+#include "WinResrc.h"
+#include <winres.h>
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// Neutral resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
+#ifdef _WIN32
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Bitmap
+//
+
+IDB_GPU BITMAP DISCARDABLE "res\\gpu.bmp"
+#endif // Neutral resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE DISCARDABLE 
+BEGIN
+ "resource.h\0"
+END
+
+2 TEXTINCLUDE DISCARDABLE 
+BEGIN
+ "#include ""afxres.h""\r\n"
+ "\0"
+END
+
+3 TEXTINCLUDE DISCARDABLE 
+BEGIN
+ "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
+ "#define _AFX_NO_OLE_RESOURCES\r\n"
+ "#define _AFX_NO_TRACKER_RESOURCES\r\n"
+ "#define _AFX_NO_PROPERTY_RESOURCES\r\n"
+ "\r\n"
+ "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"
+ "#ifdef _WIN32\r\n"
+ "LANGUAGE 9, 1\r\n"
+ "#pragma code_page(1252)\r\n"
+ "#endif\r\n"
+ "#endif\0"
+END
+
+#endif // APSTUDIO_INVOKED
+
+
+#ifndef _MAC
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,78,0,0
+ PRODUCTVERSION 1,78,0,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904b0"
+ BEGIN
+ VALUE "Comments", "\0"
+ VALUE "CompanyName", "\0"
+ VALUE "FileDescription", "gpuPeopsOpenGL.dll\0"
+ VALUE "FileVersion", "1, 78, 0, 0\0"
+ VALUE "InternalName", "P.E.Op.S. PSX OpenGL GPU (mod)\0"
+ VALUE "LegalCopyright", "Copyright (C) 1999-2009\0"
+ VALUE "LegalTrademarks", "\0"
+ VALUE "OriginalFilename", "gpuPeopsOpenGL.dll\0"
+ VALUE "PrivateBuild", "\0"
+ VALUE "ProductName", "gpuPeopsOpenGL Dynamic Link Library\0"
+ VALUE "ProductVersion", "1, 78, 0, 0\0"
+ VALUE "SpecialBuild", "\0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
+
+#endif // !_MAC
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_DIALOG_ABOUT DIALOG DISCARDABLE 0, 0, 258, 165
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "About P.E.Op.S. PSX OpenGL Renderer ..."
+FONT 8, "MS Sans Serif"
+BEGIN
+ DEFPUSHBUTTON "OK",IDOK,98,145,50,14
+ RTEXT "Version:",IDC_STATIC,8,6,49,10
+ RTEXT "Coded by:",IDC_STATIC,8,35,49,10
+ RTEXT "Homepage:",IDC_STATIC,8,53,49,10
+ LTEXT "1.78",IDC_STATIC,60,6,159,9
+ LTEXT "Pete Bernert",IDC_STATIC,60,35,159,10
+ LTEXT "www.pbernert.com",IDC_STATIC,60,53,159,10
+ RTEXT "Release date:",IDC_STATIC,8,17,49,10
+ LTEXT "04/2009",IDC_STATIC,60,17,159,10
+ RTEXT "Thanks to:",IDC_STATIC,8,74,49,10
+ LTEXT "Lewpy - without his infos this driver wouldn't exist",
+ IDC_STATIC,60,74,159,10
+ LTEXT "Duddie && FoxPro - for their public sources",IDC_STATIC,
+ 60,86,159,10
+ LTEXT "My girlfriend Heike - 'Hey, that cloud still looks funny, ",
+ IDC_STATIC,60,112,170,10
+ LTEXT "go on and change it...'",IDC_STATIC,125,121,117,10
+ CONTROL "",IDC_STATIC,"Static",SS_ETCHEDFRAME | SS_SUNKEN,4,68,
+ 249,70
+ LTEXT "Gamma - thanks for your OpenGL book",IDC_STATIC,60,99,
+ 159,10
+END
+
+IDD_CFGDLG DIALOGEX 0, 0, 413, 306
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Configure P.E.Op.S. PSX OpenGL Renderer ..."
+FONT 8, "MS Sans Serif"
+BEGIN
+ CONTROL "Fullscreen mode",IDC_DISPMODE1,"Button",BS_AUTORADIOBUTTON,11,11,73,10
+ CONTROL "Window mode",IDC_DISPMODE2,"Button",BS_AUTORADIOBUTTON,11,25,63,10
+ COMBOBOX IDC_RESOLUTION,150,10,63,64,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX IDC_COLORDEPTH,261,10,36,64,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ EDITTEXT IDC_WINX,150,24,26,12,ES_AUTOHSCROLL
+ EDITTEXT IDC_WINY,187,24,26,12,ES_AUTOHSCROLL
+ CONTROL "Keep psx aspect ratio",IDC_ARATIO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,306,11,95,12
+ COMBOBOX IDC_TEXQUALITY,61,50,159,64,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX IDC_FILTERTYPE,61,63,159,83,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX IDC_HIRESTEX,275,50,129,64,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX IDC_VRAMSIZE,275,63,62,88,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+ CONTROL "Show FPS display on startup",IDC_SHOWFPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,94,104,10
+ PUSHBUTTON "...",IDC_KEYCONFIG,119,94,11,10,0,WS_EX_STATICEDGE
+ CONTROL "Use FPS limit",IDC_USELIMIT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,149,89,73,10
+ CONTROL "Use Frame skipping",IDC_USESKIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,149,101,78,10
+ CONTROL "Auto-detect FPS/Frame skipping limit",IDC_FRAMEAUTO,
+ "Button",BS_AUTORADIOBUTTON | WS_GROUP,258,89,131,9
+ CONTROL "FPS limit (10-200) :",IDC_FRAMEMANUELL,"Button",BS_AUTORADIOBUTTON,258,101,72,10
+ EDITTEXT IDC_FRAMELIMIT,334,99,29,12,ES_AUTOHSCROLL
+ COMBOBOX IDC_OFFSCREEN,78,123,130,64,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX IDC_FRAMETEX,78,136,130,64,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX IDC_FRAMEREAD,78,149,130,64,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ CONTROL "Alpha MultiPass",IDC_OPAQUE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,219,127,66,10
+ CONTROL "Mask bit",IDC_USEMASK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,219,138,47,10
+ CONTROL "Advanced blending",IDC_ADVBLEND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,219,149,76,10
+ CONTROL "Scanlines",IDC_USESCANLINES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,176,46,10
+ EDITTEXT IDC_SCANBLEND,375,175,29,12,ES_AUTOHSCROLL
+ CONTROL "Line mode",IDC_USELINES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,186,48,10
+ CONTROL "Unfiltered framebuffer updates",IDC_FASTMDEC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,196,113,10
+ CONTROL "Force 15 bit framebuffer updates",IDC_FASTMDEC2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,206,121,10
+ CONTROL "Color dithering",IDC_DRAWDITHER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,216,81,10
+ CONTROL "Screen smoothing",IDC_BLUR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,226,81,10
+ CONTROL "Disable screensaver",IDC_SSAVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,236,81,10
+ CONTROL "Special game fixes",IDC_GAMEFIX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,246,75,10
+ PUSHBUTTON "...",IDC_SELFIX,89,246,11,10,0,WS_EX_STATICEDGE
+ PUSHBUTTON "Fast",IDC_DEF1,10,282,34,14
+ PUSHBUTTON "Nice",IDC_DEF2,49,282,34,14
+ DEFPUSHBUTTON "OK",IDOK,113,282,84,14
+ PUSHBUTTON "Cancel",IDCANCEL,215,282,84,14
+ PUSHBUTTON "Copy settings\n to clipboard",IDC_CLIPBOARD,322,276,87,25,BS_MULTILINE,WS_EX_STATICEDGE
+ GROUPBOX "Misc",IDC_STATIC,3,166,406,104
+ GROUPBOX "Default settings",IDC_STATIC,3,272,88,30
+ GROUPBOX "Textures",IDC_STATIC,3,41,406,40
+ RTEXT "Desktop resolution:",IDC_STATIC,81,12,65,9
+ GROUPBOX "Resolution && Colors",IDC_STATIC,3,1,406,40
+ RTEXT "Color depth:",IDC_STATIC,219,12,39,9
+ GROUPBOX "Framerate",IDC_STATIC,3,81,406,33
+ LTEXT "FPS",IDC_STATIC,367,100,17,9,SS_CENTERIMAGE
+ GROUPBOX "Compatibility",IDC_STATIC,3,115,406,51
+ RTEXT "Texture quality:",IDC_QUALTXT,6,52,51,9
+ RTEXT "Window size:",IDC_STATIC,85,26,61,9
+ CTEXT "x",IDC_STATIC,177,26,8,9
+ RTEXT "Gfx card vram:",IDC_QUALTXT2,225,65,48,9
+ RTEXT "Off-Screen drawing:",IDC_STATIC,11,124,64,10,SS_CENTERIMAGE
+ RTEXT "Texture filtering:",IDC_STATIC,6,65,52,10
+ RTEXT "Framebuffer textures:",IDC_STATIC,7,137,68,10,SS_CENTERIMAGE
+ LTEXT "Some games will need certain special options to work without glitches",IDC_STATIC,135,246,242,9,SS_CENTERIMAGE
+ LTEXT "Smoother shading in 16 bit color depth",IDC_STATIC,135,216,242,9,SS_CENTERIMAGE
+ LTEXT "Small speed up with mdecs",IDC_STATIC,135,196,242,9,SS_CENTERIMAGE
+ LTEXT "Polygons will not get filled",IDC_STATIC,135,186,89,9,SS_CENTERIMAGE
+ LTEXT "TV screen alike lines",IDC_STATIC,135,176,69,9,SS_CENTERIMAGE
+ LTEXT "Accurate psx color emulation",IDC_STATIC,302,149,97,9,SS_CENTERIMAGE
+ LTEXT "Correct opaque texture areas",IDC_STATIC,302,127,97,9,SS_CENTERIMAGE
+ LTEXT "Needed by a few games",IDC_STATIC,302,138,97,9,SS_CENTERIMAGE
+ RTEXT "Scanline brightness (0...255, -1=Monitor dot matrix):",IDC_STATIC,210,176,162,9,SS_CENTERIMAGE
+ EDITTEXT IDC_CLPEDIT,314,293,6,12,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | NOT WS_VISIBLE
+ LTEXT "MBytes",IDC_QUALTXT3,340,65,27,9
+ LTEXT "The complete screen will get smoothed. Very slow on some cards, lotta vram needed",IDC_STATIC,135,226,269,9,SS_CENTERIMAGE
+ RTEXT "Framebuffer access:",IDC_STATIC,7,150,68,10,SS_CENTERIMAGE
+ LTEXT "Disable screensavers and power saving modes. Not available in Win95/WinNT",IDC_STATIC,135,236,269,9,SS_CENTERIMAGE
+ LTEXT "Speed up with mdecs in 32 bit color depth, but less colorful",IDC_T14_STATIC2,135,206,268,9,SS_CENTERIMAGE
+ RTEXT "Hi-Res textures:",IDC_QUALTXT4,223,52,50,9
+ COMBOBOX IDC_VSYNC,261,24,36,64,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ RTEXT "V-Sync:",IDC_STATIC,219,26,39,9,SS_CENTERIMAGE
+ CONTROL "Gte accuracy",IDC_GTEACCURACY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,256,59,10
+ LTEXT "Higher GTE precision that can improve vertex positioning (ie less polygon shaking)",IDC_STATIC,135,256,262,9,SS_CENTERIMAGE
+ CONTROL "Force 4:3 aspect ratio",IDC_ARATIO43,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,306,25,95,12
+END
+
+IDD_FIXES DIALOG DISCARDABLE 0, 0, 316, 322
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Special game fixes..."
+FONT 8, "MS Sans Serif"
+BEGIN
+ CONTROL "0x00001: Adjust framebuffer access",IDC_FIX1,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,11,30,133,10
+ CONTROL "0x00004: Ignore black brightness",IDC_FIX3,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,11,60,140,10
+ CONTROL "0x00008: Swap front/back detection",IDC_FIX4,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,11,75,144,10
+ CONTROL "0x00010: Disable coord check",IDC_FIX5,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,11,90,139,10
+ CONTROL "0x00020: Remove blue glitches",IDC_FIX6,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,11,105,139,10
+ CONTROL "0x00040: Mixed software FB access",IDC_FIX7,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,11,120,143,10
+ CONTROL "0x00080: Use PC fps calculation",IDC_FIX8,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,11,135,142,10
+ CONTROL "0x00100: Use old frame skipping",IDC_FIX9,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,11,150,139,10
+ CONTROL "0x00002: Direct framebuffer updates",IDC_FIX2,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,11,45,137,10
+ CONTROL "0x00200: G4 polygon cache",IDC_FIX10,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,11,165,141,10
+ CONTROL "0x00400: Fake subtractive blending",IDC_FIX11,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,11,180,143,10
+ CONTROL "0x00800: Lazy upload detection",IDC_FIX12,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,11,195,144,10
+ CONTROL "0x01000: Odd/even bit hack",IDC_FIX13,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,11,210,143,10
+ CONTROL "0x02000: Expand screen width",IDC_FIX14,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,11,225,144,10
+ DEFPUSHBUTTON "OK",IDOK,83,302,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,182,302,50,14
+ LTEXT "Activate the following options only if you want to play one of the listed games (or if your game is showing similar glitches)!",
+ IDC_STATIC,7,4,246,22
+ LTEXT "ONLY for FF7 battle cursor/battle swirl",IDC_STATIC,163,
+ 30,137,9,SS_CENTERIMAGE
+ LTEXT "Speed up in nasty frame upload situations",IDC_STATIC,
+ 163,45,137,9,SS_CENTERIMAGE
+ LTEXT "Fixes black screens in Lunar",IDC_STATIC,162,60,123,9,
+ SS_CENTERIMAGE
+ LTEXT "Speed freaks, Killer Loop",IDC_STATIC,162,75,90,9,
+ SS_CENTERIMAGE
+ LTEXT "Old coord compatibility mode",IDC_STATIC,162,89,99,9,
+ SS_CENTERIMAGE
+ LTEXT "Leg. o. Dragoon, Alpha Multipass needed",IDC_STATIC,162,
+ 105,136,9,SS_CENTERIMAGE
+ LTEXT "Faster FB access on some systems/ATI",IDC_STATIC,162,
+ 120,125,9,SS_CENTERIMAGE
+ LTEXT "Better fps limitation with some games",IDC_STATIC,162,
+ 135,117,9,SS_CENTERIMAGE
+ LTEXT "Skips only every second frame",IDC_STATIC,162,150,130,9,
+ SS_CENTERIMAGE
+ LTEXT "ONLY for FF9 battle mode... yellow rect",IDC_STATIC,162,
+ 165,132,9,SS_CENTERIMAGE
+ LTEXT "Needed by some (buggy) OpenGL ICDs",IDC_STATIC,162,180,
+ 132,9,SS_CENTERIMAGE
+ LTEXT "DW7 fix (not 100% perfect...)",IDC_STATIC,162,195,132,9,
+ SS_CENTERIMAGE
+ LTEXT "Needed with epsxe 1.5.2 and older",IDC_STATIC,162,210,
+ 138,9,SS_CENTERIMAGE
+ LTEXT "Shows the full area in Capcom 2D fighters",IDC_STATIC,
+ 162,225,138,9,SS_CENTERIMAGE
+ CONTROL "0x04000: Use old texture filtering",IDC_FIX15,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,11,240,141,10
+ LTEXT "Fixes black areas with some cards",IDC_STATIC,162,240,
+ 138,9,SS_CENTERIMAGE
+ CONTROL "0x08000: Special upload detection",IDC_FIX16,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,11,255,146,10
+ LTEXT "May show some additional splash screens",
+ IDC_F14_STATIC3,163,255,137,9,SS_CENTERIMAGE
+ CONTROL "0x10000: Use low-res fps timer",IDC_FIX17,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,11,270,147,10
+ LTEXT "For buggy motherboard chipsets",IDC_F14_STATIC4,163,270,
+ 137,9,SS_CENTERIMAGE
+ CONTROL "0x20000: Fake 'gpu busy' states",IDC_FIX18,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,11,285,147,10
+ LTEXT "Toggles busy flags after drawing",IDC_F14_STATIC5,163,
+ 285,137,9,SS_CENTERIMAGE
+END
+
+IDD_KEYS DIALOG DISCARDABLE 0, 0, 186, 162
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION
+CAPTION "GPU key configuration"
+FONT 8, "MS Sans Serif"
+BEGIN
+ PUSHBUTTON "Default keys",IDC_DEFAULT,107,6,61,13
+ COMBOBOX IDC_KEY1,108,25,61,62,CBS_DROPDOWNLIST | WS_VSCROLL | 
+ WS_TABSTOP
+ COMBOBOX IDC_KEY2,108,41,61,62,CBS_DROPDOWNLIST | WS_VSCROLL | 
+ WS_TABSTOP
+ COMBOBOX IDC_KEY3,108,57,61,62,CBS_DROPDOWNLIST | WS_VSCROLL | 
+ WS_TABSTOP
+ COMBOBOX IDC_KEY4,108,73,61,62,CBS_DROPDOWNLIST | WS_VSCROLL | 
+ WS_TABSTOP
+ COMBOBOX IDC_KEY5,108,89,61,62,CBS_DROPDOWNLIST | WS_VSCROLL | 
+ WS_TABSTOP
+ COMBOBOX IDC_KEY6,108,105,61,62,CBS_DROPDOWNLIST | WS_VSCROLL | 
+ WS_TABSTOP
+ DEFPUSHBUTTON "OK",IDOK,19,142,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,115,142,50,14
+ RTEXT "Show/hide gpu menu:",IDC_STATIC,4,26,100,9,
+ SS_CENTERIMAGE
+ RTEXT "Show/hide gpu infos:",IDC_STATIC,4,42,100,9,
+ SS_CENTERIMAGE
+ RTEXT "Toggle selected option up:",IDC_STATIC,4,58,100,9,
+ SS_CENTERIMAGE
+ RTEXT "Toggle selected option down:",IDC_STATIC,4,74,100,9,
+ SS_CENTERIMAGE
+ RTEXT "Select previous option:",IDC_STATIC,4,90,100,9,
+ SS_CENTERIMAGE
+ RTEXT "Select next option:",IDC_STATIC,4,106,100,9,
+ SS_CENTERIMAGE
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO DISCARDABLE 
+BEGIN
+ IDD_DIALOG_ABOUT, DIALOG
+ BEGIN
+ LEFTMARGIN, 2
+ RIGHTMARGIN, 253
+ TOPMARGIN, 3
+ BOTTOMMARGIN, 159
+ END
+
+ IDD_CFGDLG, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 406
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 288
+ END
+
+ IDD_FIXES, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 309
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 315
+ END
+
+ IDD_KEYS, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 179
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 155
+ END
+END
+#endif // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog Info
+//
+#ifdef _MSC_VER
+
+IDD_CFGDLG DLGINIT
+BEGIN
+ IDC_RESOLUTION, 0x403, 1, 0
+"\000" 
+ IDC_COLORDEPTH, 0x403, 7, 0
+0x3631, 0x4220, 0x7469, "\000" 
+ IDC_COLORDEPTH, 0x403, 7, 0
+0x3233, 0x4220, 0x7469, "\000" 
+ IDC_TEXQUALITY, 0x403, 11, 0
+0x6f64, 0x276e, 0x2074, 0x6163, 0x6572, "\000" 
+ IDC_TEXQUALITY, 0x403, 12, 0
+0x3452, 0x4720, 0x2034, 0x3442, 0x4120, 0x0034, 
+ IDC_TEXQUALITY, 0x403, 12, 0
+0x3552, 0x4720, 0x2035, 0x3542, 0x4120, 0x0031, 
+ IDC_TEXQUALITY, 0x403, 12, 0
+0x3852, 0x4720, 0x2038, 0x3842, 0x4120, 0x0038, 
+ IDC_FILTERTYPE, 0x403, 9, 0
+0x7453, 0x6e61, 0x6164, 0x6472, "\000" 
+ IDC_FILTERTYPE, 0x403, 9, 0
+0x7845, 0x6574, 0x646e, 0x6465, "\000" 
+ IDC_FILTERTYPE, 0x403, 22, 0
+0x7453, 0x6e61, 0x6164, 0x6472, 0x2820, 0x6f6e, 0x5320, 0x7270, 0x7469, 
+0x7365, 0x0029, 
+ IDC_FILTERTYPE, 0x403, 22, 0
+0x7845, 0x6574, 0x646e, 0x6465, 0x2820, 0x6f6e, 0x5320, 0x7270, 0x7469, 
+0x7365, 0x0029, 
+ IDC_HIRESTEX, 0x403, 11, 0
+0x6f64, 0x276e, 0x2074, 0x6163, 0x6572, "\000" 
+ IDC_HIRESTEX, 0x403, 12, 0
+0x3452, 0x4720, 0x2034, 0x3442, 0x4120, 0x0034, 
+ IDC_HIRESTEX, 0x403, 12, 0
+0x3552, 0x4720, 0x2035, 0x3542, 0x4120, 0x0031, 
+ IDC_HIRESTEX, 0x403, 12, 0
+0x3852, 0x4720, 0x2038, 0x3842, 0x4120, 0x0038, 
+ IDC_OFFSCREEN, 0x403, 11, 0
+0x6f64, 0x276e, 0x2074, 0x6163, 0x6572, "\000" 
+ IDC_OFFSCREEN, 0x403, 12, 0
+0x3452, 0x4720, 0x2034, 0x3442, 0x4120, 0x0034, 
+ IDC_OFFSCREEN, 0x403, 12, 0
+0x3552, 0x4720, 0x2035, 0x3542, 0x4120, 0x0031, 
+ IDC_OFFSCREEN, 0x403, 12, 0
+0x3852, 0x4720, 0x2038, 0x3842, 0x4120, 0x0038, 
+ IDC_FRAMETEX, 0x403, 11, 0
+0x6f64, 0x276e, 0x2074, 0x6163, 0x6572, "\000" 
+ IDC_FRAMETEX, 0x403, 12, 0
+0x3452, 0x4720, 0x2034, 0x3442, 0x4120, 0x0034, 
+ IDC_FRAMETEX, 0x403, 12, 0
+0x3552, 0x4720, 0x2035, 0x3542, 0x4120, 0x0031, 
+ IDC_FRAMETEX, 0x403, 12, 0
+0x3852, 0x4720, 0x2038, 0x3842, 0x4120, 0x0038, 
+ IDC_FRAMEREAD, 0x403, 11, 0
+0x6f64, 0x276e, 0x2074, 0x6163, 0x6572, "\000" 
+ IDC_FRAMEREAD, 0x403, 12, 0
+0x3452, 0x4720, 0x2034, 0x3442, 0x4120, 0x0034, 
+ IDC_FRAMEREAD, 0x403, 12, 0
+0x3552, 0x4720, 0x2035, 0x3542, 0x4120, 0x0031, 
+ IDC_FRAMEREAD, 0x403, 12, 0
+0x3852, 0x4720, 0x2038, 0x3842, 0x4120, 0x0038, 
+ 0
+END
+
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+ IDS_INFO0 "FL - Frame limitation:\n[Off] - Speed as fast as possible\n[On-1] - Limits speed to manual value\n[On-2] - Limits speed to auto-detected value."
+ IDS_INFO1 "FS - Frame skipping:\n[Off] - No frames get skipped\n[On] - Tries to speed up the game by skipping frames. Can cause glitches!"
+ IDS_INFO2 "OD - Offscreen drawing:\n[0-4] - The higher the mode, the more checks for uploading screen data/software drawing will be done. Setting depends on the game."
+ IDS_INFO3 "FI - Texture filtering:\n[0-6] - Filtering will cause glitches! Mode 2/4/6: black borders vanish. Mode 3/4 will not filter sprites. Mode 5/6 will smooth sprites."
+ IDS_INFO4 "DI - Dithering:\n[Off] - No dithering\n[On] - Smoother shading in 16 bit modes."
+ IDS_INFO5 "AM - Alpha multipass:\n[Off] - Faster with some games, but opaque texture areas can get transparent.\n[On] - Accurate psx emulation."
+ IDS_INFO6 "AB - Advanced blending:\n[0-1] - For accurate psx coloring use mode 1. If your gfx card can't do it in hardware, a software mode will be done automatically (slower)."
+ IDS_INFO7 "FA - Framebuffer access:\n[0-4] - Some games read back the framebuffer to create special effects. This can be very slow! In mode 4 everything is done in software."
+ IDS_INFO8 "FT - Frame buffer texture:\n[0-3] - Mode 2 is trying to do some effects (whirls, motion blur) in hardware (can be slow). Mode 1 is turning the effects off (fastest emulation)."
+ IDS_INFO9 "GF - Special game fixes:\n[Off] - Turn off all fixes\n[On] - Turn on all activated fixes. You have to select the fixes you want to use in the gpu config."
+END
+
+#endif // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+#define _AFX_NO_SPLITTER_RESOURCES
+#define _AFX_NO_OLE_RESOURCES
+#define _AFX_NO_TRACKER_RESOURCES
+#define _AFX_NO_PROPERTY_RESOURCES
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE 9, 1
+#pragma code_page(1252)
+#endif
+#endif
+/////////////////////////////////////////////////////////////////////////////
+#endif // not APSTUDIO_INVOKED
+

pcsxr-1.9.93.tar.bz2/win32/plugins/peopsxgl/gpuPeopsOpenGL.vcxproj Added

@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{726BDE88-F2AD-4666-A4BC-5858F973976E}</ProjectGuid>
+ <RootNamespace>gpuPeopsOpenGL</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\Debug/gpuPeopsOpenGL.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>.\;.\winsrc;..\..\glue;..\..\..\plugins\peopsxgl;..\..\..\libpcsxcore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <PrecompiledHeaderOutputFile>.\Debug/gpuPeopsOpenGL.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
+ <ObjectFileName>.\Debug/</ObjectFileName>
+ <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0407</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>opengl32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(SolutionDir)$(Configuration)\gpuPeopsOpenGL.dll</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>.\gpuPeopsOpenGL.def</ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>.\Debug/gpuPeopsOpenGL.pdb</ProgramDatabaseFile>
+ <SubSystem>Windows</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <ImportLibrary>.\Debug/gpuPeopsOpenGL.lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\Debug/gpuPeopsOpenGL.bsc</OutputFile>
+ </Bscmake>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>.\Release/gpuPeopsOpenGL.tlb</TypeLibraryName>
+ <HeaderFileName>
+ </HeaderFileName>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>.\;.\winsrc;..\..\glue;..\..\..\plugins\peopsxgl;..\..\..\libpcsxcore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>.\Release/gpuPeopsOpenGL.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
+ <ObjectFileName>.\Release/</ObjectFileName>
+ <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0407</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>opengl32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>.\Release/gpuPeopsOpenGL.dll</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>.\gpuPeopsOpenGL.def</ModuleDefinitionFile>
+ <ProgramDatabaseFile>.\Release/gpuPeopsOpenGL.pdb</ProgramDatabaseFile>
+ <SubSystem>Windows</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <ImportLibrary>.\Release/gpuPeopsOpenGL.lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <Bscmake>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <OutputFile>.\Release/gpuPeopsOpenGL.bsc</OutputFile>
+ </Bscmake>
+ <PostBuildEvent>
+ <Command>rem copy release\*.dll d:\emus\epsxe\plugins</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="winsrc\cfg.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="winsrc\fps.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="winsrc\key.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="winsrc\ssave.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="winsrc\winmain.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\..\plugins\peopsxgl\draw.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\..\plugins\peopsxgl\gpu.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\..\plugins\peopsxgl\gte_accuracy.c" />
+ <ClCompile Include="..\..\..\plugins\peopsxgl\menu.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\..\plugins\peopsxgl\prim.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\..\plugins\peopsxgl\soft.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\..\plugins\peopsxgl\texture.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="winsrc\ssave.h" />
+ <ClInclude Include="..\..\..\plugins\peopsxgl\cfg.h" />
+ <ClInclude Include="..\..\..\plugins\peopsxgl\draw.h" />
+ <ClInclude Include="..\..\..\plugins\peopsxgl\externals.h" />
+ <ClInclude Include="..\..\..\plugins\peopsxgl\fps.h" />
+ <ClInclude Include="..\..\..\plugins\peopsxgl\gl_ext.h" />
+ <ClInclude Include="..\..\..\plugins\peopsxgl\gpu.h" />
+ <ClInclude Include="..\..\..\plugins\peopsxgl\gte_accuracy.h" />
+ <ClInclude Include="..\..\..\plugins\peopsxgl\key.h" />
+ <ClInclude Include="..\..\..\plugins\peopsxgl\menu.h" />
+ <ClInclude Include="..\..\..\plugins\peopsxgl\prim.h" />
+ <ClInclude Include="..\..\..\plugins\peopsxgl\soft.h" />
+ <ClInclude Include="..\..\..\plugins\peopsxgl\stdafx.h" />
+ <ClInclude Include="..\..\..\plugins\peopsxgl\texture.h" />
+ <ClInclude Include="resource.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="res\gpu.bmp" />
+ <None Include="gpuPeopsOpenGL.def" />
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="gpuPeopsOpenGL.rc">
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ResourceCompile>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

pcsxr-1.9.93.tar.bz2/win32/plugins/peopsxgl/gpuPeopsOpenGL.vcxproj.filters Added

@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="winsrc">
+ <UniqueIdentifier>{f5923236-a28e-4398-a152-67b79b0782e8}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="peopsxgl">
+ <UniqueIdentifier>{2edeb7e0-6467-4735-89eb-253dcc226912}</UniqueIdentifier>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="winsrc\cfg.c">
+ <Filter>winsrc</Filter>
+ </ClCompile>
+ <ClCompile Include="winsrc\fps.c">
+ <Filter>winsrc</Filter>
+ </ClCompile>
+ <ClCompile Include="winsrc\key.c">
+ <Filter>winsrc</Filter>
+ </ClCompile>
+ <ClCompile Include="winsrc\ssave.c">
+ <Filter>winsrc</Filter>
+ </ClCompile>
+ <ClCompile Include="winsrc\winmain.c">
+ <Filter>winsrc</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\plugins\peopsxgl\draw.c">
+ <Filter>peopsxgl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\plugins\peopsxgl\gpu.c">
+ <Filter>peopsxgl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\plugins\peopsxgl\gte_accuracy.c">
+ <Filter>peopsxgl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\plugins\peopsxgl\menu.c">
+ <Filter>peopsxgl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\plugins\peopsxgl\prim.c">
+ <Filter>peopsxgl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\plugins\peopsxgl\soft.c">
+ <Filter>peopsxgl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\plugins\peopsxgl\texture.c">
+ <Filter>peopsxgl</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="winsrc\ssave.h">
+ <Filter>winsrc</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\plugins\peopsxgl\cfg.h">
+ <Filter>peopsxgl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\plugins\peopsxgl\draw.h">
+ <Filter>peopsxgl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\plugins\peopsxgl\externals.h">
+ <Filter>peopsxgl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\plugins\peopsxgl\fps.h">
+ <Filter>peopsxgl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\plugins\peopsxgl\gl_ext.h">
+ <Filter>peopsxgl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\plugins\peopsxgl\gpu.h">
+ <Filter>peopsxgl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\plugins\peopsxgl\gte_accuracy.h">
+ <Filter>peopsxgl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\plugins\peopsxgl\key.h">
+ <Filter>peopsxgl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\plugins\peopsxgl\menu.h">
+ <Filter>peopsxgl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\plugins\peopsxgl\prim.h">
+ <Filter>peopsxgl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\plugins\peopsxgl\soft.h">
+ <Filter>peopsxgl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\plugins\peopsxgl\stdafx.h">
+ <Filter>peopsxgl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\plugins\peopsxgl\texture.h">
+ <Filter>peopsxgl</Filter>
+ </ClInclude>
+ <ClInclude Include="resource.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="res\gpu.bmp" />
+ <None Include="gpuPeopsOpenGL.def" />
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="gpuPeopsOpenGL.rc" />
+ </ItemGroup>
+</Project>
\ No newline at end of file

pcsxr-1.9.93.tar.bz2/win32/plugins/peopsxgl/gpuPeopsOpenGL.vcxproj.user Added

pcsxr-1.9.93.tar.bz2/win32/plugins/peopsxgl/res Added

pcsxr-1.9.93.tar.bz2/win32/plugins/peopsxgl/res/gpu.bmp Added

pcsxr-1.9.93.tar.bz2/win32/plugins/peopsxgl/resource.h Added

@@ -0,0 +1,135 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by gpuPeopsOpenGL.rc
+//
+#define IDS_INFO0                       1
+#define IDS_INFO1                       2
+#define IDS_INFO2                       3
+#define IDC_DEFAULT                     3
+#define IDS_INFO3                       4
+#define IDS_INFO4                       5
+#define IDS_INFO5                       6
+#define IDS_INFO6                       7
+#define IDS_INFO7                       8
+#define IDS_INFO8                       9
+#define IDS_INFO9                       10
+#define IDC_DEF1                        127
+#define IDC_DEF2                        128
+#define IDD_DIALOG_ABOUT                129
+#define IDD_CFGDLG                      130
+#define IDD_FIXES                       134
+#define IDB_GPU                         135
+#define IDD_KEYS                        138
+#define IDC_TEXWINDOWS                  1001
+#define IDC_TEXFIX                      1002
+#define IDC_TEXLINEAR                   1003
+#define IDC_RESOLUTION                  1004
+#define IDC_DRAWDITHER                  1005
+#define IDC_CACHESIZE                   1006
+#define IDC_BLUR                        1007
+#define IDC_CACHETXT                    1008
+#define IDC_SSAVE                       1009
+#define IDC_USELINES                    1010
+#define IDC_COLORDEPTH                  1011
+#define IDC_CHANGEDESK                  1012
+#define IDC_VSYNC                       1012
+#define IDC_USELIMIT                    1013
+#define IDC_FRAMELIMIT                  1014
+#define IDC_FRAMEAUTO                   1015
+#define IDC_FRAMEMANUELL                1016
+#define IDC_ADVBLEND                    1017
+#define IDC_OFFSCREEN                   1018
+#define IDC_OPAQUE                      1019
+#define IDC_TEXQUALITY                  1020
+#define IDC_USESKIP                     1021
+#define IDC_DISPMODE1                   1022
+#define IDC_DISPMODE2                   1023
+#define IDC_SUBCACHE                    1024
+#define IDC_VRAMSIZE                    1025
+#define IDC_WINDOWFREE                  1026
+#define IDC_EXTCOLCHECK                 1027
+#define IDC_FRAMETEX                    1028
+#define IDC_WINDOWAUTO                  1029
+#define IDC_USETEXPRIO                  1030
+#define IDC_SHOWFPS                     1031
+#define IDC_WINX                        1032
+#define IDC_WINY                        1033
+#define IDC_FILTERTYPE                  1034
+#define IDC_USEANTIALIAS                1035
+#define IDC_SCANBLEND                   1036
+#define IDC_3DGLASSES                   1037
+#define IDC_USESCANLINES                1038
+#define IDC_KEY1                        1039
+#define IDC_KEY2                        1040
+#define IDC_KEY3                        1041
+#define IDC_KEY4                        1042
+#define IDC_KEY5                        1043
+#define IDC_KEY6                        1044
+#define IDC_USEMASK                     1045
+#define IDC_FASTMDEC                    1046
+#define IDC_FULLVRAM                    1047
+#define IDC_FRAMEREAD                   1048
+#define IDC_ARATIO                      1049
+#define IDC_CLIPBOARD                   1050
+#define IDC_CLPEDIT                     1051
+#define IDC_QUALTXT                     1052
+#define IDC_QUALTXT2                    1053
+#define IDC_QUALTXT3                    1054
+#define IDC_GARBAGE                     1055
+#define IDC_PALTEXWND                   1056
+#define IDC_HIRESTEX                    1057
+#define IDC_GAMEFIX                     1058
+#define IDC_SELFIX                      1059
+#define IDC_KEYCONFIG                   1060
+#define IDC_T14_STATIC2                 1061
+#define IDC_FASTMDEC2                   1062
+#define IDC_QUALTXT4                    1063
+#define IDC_GAMEFIX2                    1064
+#define IDC_GTEACCURACY                 1065
+#define IDC_F14_STATIC3                 1083
+#define IDC_F14_STATIC4                 1084
+#define IDC_F14_STATIC5                 1085
+#define IDC_ARATIO43                    1086
+#define IDC_FIX1                        2038
+#define IDC_FIX2                        2039
+#define IDC_FIX3                        2040
+#define IDC_FIX4                        2041
+#define IDC_FIX5                        2042
+#define IDC_FIX6                        2043
+#define IDC_FIX7                        2044
+#define IDC_FIX8                        2045
+#define IDC_FIX9                        2046
+#define IDC_FIX10                       2047
+#define IDC_FIX11                       2048
+#define IDC_FIX12                       2049
+#define IDC_FIX13                       2050
+#define IDC_FIX14                       2051
+#define IDC_FIX15                       2052
+#define IDC_FIX16                       2053
+#define IDC_FIX17                       2054
+#define IDC_FIX18                       2055
+#define IDC_FIX19                       2056
+#define IDC_FIX20                       2057
+#define IDC_FIX21                       2058
+#define IDC_FIX22                       2059
+#define IDC_FIX23                       2060
+#define IDC_FIX24                       2061
+#define IDC_FIX25                       2062
+#define IDC_FIX26                       2063
+#define IDC_FIX27                       2064
+#define IDC_FIX28                       2065
+#define IDC_FIX29                       2066
+#define IDC_FIX30                       2067
+#define IDC_FIX31                       2068
+#define IDC_FIX32                       2069
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        140
+#define _APS_NEXT_COMMAND_VALUE         32771
+#define _APS_NEXT_CONTROL_VALUE         2070
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif

pcsxr-1.9.93.tar.bz2/win32/plugins/peopsxgl/winsrc Added

pcsxr-1.9.93.tar.bz2/win32/plugins/peopsxgl/winsrc/cfg.c Added

@@ -0,0 +1,1051 @@
+/***************************************************************************
+ cfg.c - description
+ -------------------
+ begin : Sun Mar 08 2009
+ copyright : (C) 1999-2009 by Pete Bernert
+ web : www.pbernert.com 
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+#define _IN_CFG
+
+/////////////////////////////////////////////////////////////////////////////
+// Windows config handling
+
+#include "stdafx.h"
+#include "resource.h"
+#include "externals.h"
+#include "cfg.h"
+#include <stdio.h>
+
+char szKeyDefaults[7]={VK_DELETE,VK_INSERT,VK_HOME,VK_END,VK_PRIOR,VK_NEXT,0x00};
+
+/////////////////////////////////////////////////////////////////////////////
+// CCfgDlg dialog
+
+BOOL OnInitCfgDialog(HWND hW);
+void OnCfgOK(HWND hW); 
+void OnCfgCancel(HWND hW); 
+void OnCfgDef1(HWND hW);
+void OnCfgDef2(HWND hW);
+void OnBugFixes(HWND hW);
+void OnKeyConfig(HWND hW);
+void GetSettings(HWND hW);
+void OnClipboard(HWND hW);
+char * GetConfigInfos(HWND hWE);
+
+BOOL CALLBACK CfgDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+ switch(uMsg)
+ {
+ case WM_INITDIALOG:
+ return OnInitCfgDialog(hW);
+
+ case WM_COMMAND:
+ {
+ switch(LOWORD(wParam))
+ {
+ case IDC_DEF1: OnCfgDef1(hW); return TRUE;
+ case IDC_DEF2: OnCfgDef2(hW); return TRUE;
+ case IDC_SELFIX: OnBugFixes(hW); return TRUE;
+ case IDC_KEYCONFIG: OnKeyConfig(hW); return TRUE;
+ case IDCANCEL: OnCfgCancel(hW); return TRUE;
+ case IDOK: OnCfgOK(hW); return TRUE;
+ case IDC_CLIPBOARD: OnClipboard(hW); return TRUE;
+ }
+ }
+ }
+ return FALSE;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// CCfgDlg message handlers
+
+////////////////////////////////////////////////////////////////////////
+// init dlg
+////////////////////////////////////////////////////////////////////////
+
+void ComboBoxAddRes(HWND hWC,char * cs) // ADD COMBOBOX RESOURCES
+{
+ int i=ComboBox_FindString(hWC,-1,cs);
+ if(i!=CB_ERR) return;
+ ComboBox_AddString(hWC,cs);
+}
+
+
+BOOL OnInitCfgDialog(HWND hW) // INIT CONFIG DIALOG
+{
+ HWND hWC;char cs[256];int i;DEVMODE dv;
+
+ ReadConfig(); // read registry stuff
+
+ //----------------------------------------------------// fill combo with available resolutions
+
+ hWC=GetDlgItem(hW,IDC_RESOLUTION); 
+
+ memset(&dv,0,sizeof(DEVMODE));
+ dv.dmSize=sizeof(DEVMODE);
+ i=0;
+
+ while(EnumDisplaySettings(NULL,i,&dv)) // add all resolutions from the driver
+ {
+ wsprintf(cs,"%4d x %4d",dv.dmPelsWidth,dv.dmPelsHeight);
+ ComboBoxAddRes(hWC,cs);
+ i++;
+ }
+
+ ComboBoxAddRes(hWC," 640 x 480"); // and also add some common ones
+ ComboBoxAddRes(hWC," 800 x 600");
+ ComboBoxAddRes(hWC,"1024 x 768");
+ ComboBoxAddRes(hWC,"1152 x 864");
+ ComboBoxAddRes(hWC,"1280 x 1024");
+ ComboBoxAddRes(hWC,"1600 x 1200");
+ 
+ wsprintf(cs,"%4d x %4d",iResX,iResY); // search curr resolution in combo
+ i=ComboBox_FindString(hWC,-1,cs);
+ if(i==CB_ERR) i=0;
+ ComboBox_SetCurSel(hWC,i); // and select this one
+
+ //----------------------------------------------------// window size
+
+ SetDlgItemInt(hW,IDC_WINX,LOWORD(iWinSize),FALSE); 
+ SetDlgItemInt(hW,IDC_WINY,HIWORD(iWinSize),FALSE);
+
+ //----------------------------------------------------// color depth
+
+ hWC=GetDlgItem(hW,IDC_COLORDEPTH);
+ ComboBox_AddString(hWC,"16 Bit");
+ ComboBox_AddString(hWC,"32 Bit");
+ wsprintf(cs,"%d Bit",iColDepth); 
+ i=ComboBox_FindString(hWC,-1,cs);
+ if(i==CB_ERR) i=0;
+ ComboBox_SetCurSel(hWC,i);
+
+ //----------------------------------------------------// vsync
+
+ hWC=GetDlgItem(hW,IDC_VSYNC);
+ ComboBox_AddString(hWC,"Driver");
+ ComboBox_AddString(hWC,"Off");
+ ComboBox_AddString(hWC,"On");
+ ComboBox_SetCurSel(hWC,iForceVSync+1);
+
+ //----------------------------------------------------// vram size
+
+ hWC=GetDlgItem(hW,IDC_VRAMSIZE); 
+ ComboBox_AddString(hWC,"0 (Autodetect)");
+ ComboBox_AddString(hWC,"2");
+ ComboBox_AddString(hWC,"4");
+ ComboBox_AddString(hWC,"8");
+ ComboBox_AddString(hWC,"16");
+ ComboBox_AddString(hWC,"32");
+ ComboBox_AddString(hWC,"64");
+ ComboBox_AddString(hWC,"128 (or more)");
+
+ if(!iVRamSize) ComboBox_SetCurSel(hWC,0);
+ else {wsprintf(cs,"%d",iVRamSize);ComboBox_SetText(hWC,cs);}
+
+ //----------------------------------------------------// texture quality
+
+ hWC=GetDlgItem(hW,IDC_TEXQUALITY); 
+ ComboBox_AddString(hWC,"don't care - Use driver's default textures");
+ ComboBox_AddString(hWC,"R4 G4 B4 A4 - Fast, but less colorful");
+ ComboBox_AddString(hWC,"R5 G5 B5 A1 - Nice colors, bad transparency");
+ ComboBox_AddString(hWC,"R8 G8 B8 A8 - Best colors, more ram needed");
+ ComboBox_AddString(hWC,"B8 G8 R8 A8 - Slightly faster with some cards");
+ ComboBox_SetCurSel(hWC,iTexQuality); 
+
+ //----------------------------------------------------// all kind of on/off options
+
+ if(bDrawDither) CheckDlgButton(hW,IDC_DRAWDITHER,TRUE);
+ if(bUseLines) CheckDlgButton(hW,IDC_USELINES,TRUE);
+ if(bUseFrameLimit) CheckDlgButton(hW,IDC_USELIMIT,TRUE);
+ if(bUseFrameSkip) CheckDlgButton(hW,IDC_USESKIP,TRUE);
+ if(bAdvancedBlend) CheckDlgButton(hW,IDC_ADVBLEND,TRUE);
+ if(bOpaquePass) CheckDlgButton(hW,IDC_OPAQUE,TRUE);
+// if(bUseAntiAlias) CheckDlgButton(hW,IDC_USEANTIALIAS,TRUE);
+ if(bWindowMode) CheckDlgButton(hW,IDC_DISPMODE2,TRUE); 
+ else CheckDlgButton(hW,IDC_DISPMODE1,TRUE);
+ if(iUseMask) CheckDlgButton(hW,IDC_USEMASK,TRUE);
+ if(bUseFastMdec) CheckDlgButton(hW,IDC_FASTMDEC,TRUE);
+ if(bUse15bitMdec) CheckDlgButton(hW,IDC_FASTMDEC2,TRUE);
+ if(bUseFixes) CheckDlgButton(hW,IDC_GAMEFIX,TRUE);
+ if(bGteAccuracy) CheckDlgButton(hW,IDC_GTEACCURACY,TRUE);
+ if(iUseScanLines) CheckDlgButton(hW,IDC_USESCANLINES,TRUE);
+ if(iShowFPS) CheckDlgButton(hW,IDC_SHOWFPS,TRUE);
+ if(bKeepRatio) CheckDlgButton(hW,IDC_ARATIO,TRUE);
+ if(bForceRatio43) CheckDlgButton(hW,IDC_ARATIO43,TRUE);
+ if(iBlurBuffer) CheckDlgButton(hW,IDC_BLUR,TRUE);
+ if(iNoScreenSaver) CheckDlgButton(hW,IDC_SSAVE,TRUE);
+
+ //----------------------------------------------------// texture filter 
+
+ hWC=GetDlgItem(hW,IDC_FILTERTYPE); 
+ ComboBox_AddString(hWC,"0: None");
+ ComboBox_AddString(hWC,"1: Standard - Glitches will happen");
+ ComboBox_AddString(hWC,"2: Extended - Removes black borders");
+ ComboBox_AddString(hWC,"3: Standard w/o Sprites - unfiltered 2D");
+ ComboBox_AddString(hWC,"4: Extended w/o Sprites - unfiltered 2D");
+ ComboBox_AddString(hWC,"5: Standard + smoothed Sprites");
+ ComboBox_AddString(hWC,"6: Extended + smoothed Sprites");
+ ComboBox_SetCurSel(hWC,iFilterType);
+
+ //----------------------------------------------------// hires texture mode
+
+ hWC=GetDlgItem(hW,IDC_HIRESTEX); 
+ ComboBox_AddString(hWC,"0: None (standard)");
+ ComboBox_AddString(hWC,"1: 2xSaI (much vram needed)");
+ ComboBox_AddString(hWC,"2: Stretched (filtering needed)");
+ ComboBox_SetCurSel(hWC,iHiResTextures);
+
+ //----------------------------------------------------// offscreen drawing
+
+ hWC=GetDlgItem(hW,IDC_OFFSCREEN); 
+ ComboBox_AddString(hWC,"0: None - Fastest, most glitches");
+ ComboBox_AddString(hWC,"1: Minimum - Missing screens");
+ ComboBox_AddString(hWC,"2: Standard - OK for most games");
+ ComboBox_AddString(hWC,"3: Enhanced - Shows more stuff");
+ ComboBox_AddString(hWC,"4: Extended - Can cause garbage");
+ ComboBox_SetCurSel(hWC,iOffscreenDrawing);
+
+ //----------------------------------------------------// texture quality
+
+ hWC=GetDlgItem(hW,IDC_FRAMETEX); 
+ ComboBox_AddString(hWC,"0: Emulated vram - effects need FVP");
+ ComboBox_AddString(hWC,"1: Black - Fast but no special effects");
+ ComboBox_AddString(hWC,"2: Gfx card buffer - Can be slow");
+ ComboBox_AddString(hWC,"3: Gfx card buffer & software - slow");
+ ComboBox_SetCurSel(hWC,iFrameTexType);
+
+ //----------------------------------------------------// framebuffer read mode
+
+ hWC=GetDlgItem(hW,IDC_FRAMEREAD); 
+ ComboBox_AddString(hWC,"0: Emulated vram - OK for most games");
+ ComboBox_AddString(hWC,"1: Gfx card buffer reads");
+ ComboBox_AddString(hWC,"2: Gfx card buffer moves");
+ ComboBox_AddString(hWC,"3: Gfx card buffer reads & moves");
+ ComboBox_AddString(hWC,"4: Full software drawing (FVP)");
+ ComboBox_SetCurSel(hWC,iFrameReadType);
+
+ //----------------------------------------------------// framerate stuff
+
+ if(iFrameLimit==2) 
+ CheckDlgButton(hW,IDC_FRAMEAUTO,TRUE);
+ else CheckDlgButton(hW,IDC_FRAMEMANUELL,TRUE);
+
+ sprintf(cs,"%.2f",fFrameRate);
+ SetDlgItemText(hW,IDC_FRAMELIMIT,cs); 
+ SetDlgItemInt(hW,IDC_SCANBLEND,iScanBlend,TRUE);
+ 
+ return TRUE;
+}
+
+////////////////////////////////////////////////////////////////////////
+// on ok: take vals
+////////////////////////////////////////////////////////////////////////
+
+void GetSettings(HWND hW) 
+{
+ HWND hWC;char cs[256];int i,j;char * p;
+
+ hWC=GetDlgItem(hW,IDC_VRAMSIZE); // get vram size
+ ComboBox_GetText(hWC,cs,255);
+ iVRamSize=atoi(cs);
+ if(iVRamSize<0) iVRamSize=0;
+ if(iVRamSize>1024) iVRamSize=1024;
+
+ hWC=GetDlgItem(hW,IDC_RESOLUTION); // get resolution
+ i=ComboBox_GetCurSel(hWC);
+ ComboBox_GetLBText(hWC,i,cs);
+ iResX=atol(cs);
+ p=strchr(cs,'x');
+ if(p) iResY=atol(p+1);
+ else iResY=480;
+ 
+ hWC=GetDlgItem(hW,IDC_COLORDEPTH); // get color depth
+ i=ComboBox_GetCurSel(hWC);
+ ComboBox_GetLBText(hWC,i,cs);
+ iColDepth=atol(cs);
+ 
+ hWC=GetDlgItem(hW,IDC_VSYNC); // get vsync
+ iForceVSync=ComboBox_GetCurSel(hWC)-1;
+
+ i=GetDlgItemInt(hW,IDC_WINX,NULL,FALSE); // get win size
+ if(i<100) i=100; if(i>16384) i=16384;
+ j=GetDlgItemInt(hW,IDC_WINY,NULL,FALSE);
+ if(j<100) j=100; if(j>16384) j=16384;
+ iWinSize=MAKELONG(i,j);
+
+ hWC=GetDlgItem(hW,IDC_TEXQUALITY); // texture quality
+ iTexQuality=ComboBox_GetCurSel(hWC);
+
+ hWC=GetDlgItem(hW,IDC_FILTERTYPE); // all kind of options
+ iFilterType=ComboBox_GetCurSel(hWC);
+
+ if(IsDlgButtonChecked(hW,IDC_DRAWDITHER))
+ bDrawDither=TRUE; else bDrawDither=FALSE;
+
+ if(IsDlgButtonChecked(hW,IDC_USELINES))
+ bUseLines=TRUE; else bUseLines=FALSE;
+
+ if(IsDlgButtonChecked(hW,IDC_DISPMODE2))
+ bWindowMode=TRUE; else bWindowMode=FALSE;
+
+ if(IsDlgButtonChecked(hW,IDC_ADVBLEND))
+ bAdvancedBlend=TRUE; else bAdvancedBlend=FALSE;
+
+ iOffscreenDrawing=ComboBox_GetCurSel(GetDlgItem(hW,IDC_OFFSCREEN));
+
+ iFrameTexType=ComboBox_GetCurSel(GetDlgItem(hW,IDC_FRAMETEX));
+ iFrameReadType=ComboBox_GetCurSel(GetDlgItem(hW,IDC_FRAMEREAD));
+
+ if(IsDlgButtonChecked(hW,IDC_USELIMIT))
+ bUseFrameLimit=TRUE; else bUseFrameLimit=FALSE;
+
+ if(IsDlgButtonChecked(hW,IDC_USESKIP))
+ bUseFrameSkip=TRUE; else bUseFrameSkip=FALSE;
+
+ if(IsDlgButtonChecked(hW,IDC_OPAQUE))
+ bOpaquePass=TRUE; else bOpaquePass=FALSE;
+
+// if(IsDlgButtonChecked(hW,IDC_USEANTIALIAS))
+// bUseAntiAlias=TRUE; else bUseAntiAlias=FALSE;
+
+ if(IsDlgButtonChecked(hW,IDC_FASTMDEC))
+ bUseFastMdec=TRUE; else bUseFastMdec=FALSE;
+
+ if(IsDlgButtonChecked(hW,IDC_FASTMDEC2))
+ bUse15bitMdec=TRUE; else bUse15bitMdec=FALSE;
+
+ if(IsDlgButtonChecked(hW,IDC_GAMEFIX))
+ bUseFixes=TRUE; else bUseFixes=FALSE;
+
+ if(IsDlgButtonChecked(hW,IDC_GTEACCURACY))
+ bGteAccuracy=TRUE; else bGteAccuracy=FALSE;
+
+ if(IsDlgButtonChecked(hW,IDC_USESCANLINES))
+ iUseScanLines=1; else iUseScanLines=0;
+
+ if(IsDlgButtonChecked(hW,IDC_SHOWFPS))
+ iShowFPS=1; else iShowFPS=0; 
+
+ if(IsDlgButtonChecked(hW,IDC_ARATIO))
+ bKeepRatio=TRUE; else bKeepRatio=FALSE; 
+
+ if(IsDlgButtonChecked(hW,IDC_ARATIO43))
+ bForceRatio43=TRUE; else bForceRatio43=FALSE; 
+
+ if(IsDlgButtonChecked(hW,IDC_BLUR))
+ iBlurBuffer=1; else iBlurBuffer=0; 
+
+ if(IsDlgButtonChecked(hW,IDC_SSAVE))
+ iNoScreenSaver=1; else iNoScreenSaver=0; 
+
+ hWC=GetDlgItem(hW,IDC_HIRESTEX);
+ iHiResTextures=ComboBox_GetCurSel(hWC);
+
+ if(IsDlgButtonChecked(hW,IDC_USEMASK))
+ {iUseMask=1;iZBufferDepth=16;} 
+ else {iUseMask=0;iZBufferDepth=0; } 
+
+ iScanBlend=GetDlgItemInt(hW,IDC_SCANBLEND,NULL,TRUE);
+ if(iScanBlend>255) iScanBlend=0;
+ if(iScanBlend<-1) iScanBlend=-1;
+
+ if(IsDlgButtonChecked(hW,IDC_FRAMEAUTO)) // frame rate settings
+ iFrameLimit=2;
+ else iFrameLimit=1;
+
+ GetDlgItemText(hW,IDC_FRAMELIMIT,cs,255);
+ fFrameRate=(float)atof(cs);
+ if(fFrameRate<10.0f) fFrameRate=10.0f;
+ if(fFrameRate>1000.0f) fFrameRate=1000.0f;
+}
+
+////////////////////////////////////////////////////////////////////////
+// OK button
+////////////////////////////////////////////////////////////////////////
+
+void OnCfgOK(HWND hW) 
+{
+ GetSettings(hW); // get dialog settings
+
+ WriteConfig(); // write registry
+
+ EndDialog(hW,TRUE); // close dialog
+}
+
+////////////////////////////////////////////////////////////////////////
+// Clipboard button
+////////////////////////////////////////////////////////////////////////
+
+void OnClipboard(HWND hW) 
+{
+ HWND hWE=GetDlgItem(hW,IDC_CLPEDIT);
+ char * pB;
+
+ GetSettings(hW); // get dialog setings
+ pB=GetConfigInfos(hWE); // get text infos
+
+ if(pB) // some text got?
+ {
+ SetDlgItemText(hW,IDC_CLPEDIT,pB); // -> set text in invisible edit
+ SendMessage(hWE,EM_SETSEL,0,-1); // -> sel all in edit
+ SendMessage(hWE,WM_COPY,0,0); // -> copy sel to clipboard
+ free(pB); // -> free helper text buffer
+
+ MessageBox(hW,"Configuration info successfully copied to the clipboard\nJust use the PASTE function in another program to retrieve the data!","Copy Info",MB_ICONINFORMATION|MB_OK);
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+// Cancel button (just closes window)
+////////////////////////////////////////////////////////////////////////
+
+void OnCfgCancel(HWND hW) 
+{
+ EndDialog(hW,FALSE);
+}
+
+////////////////////////////////////////////////////////////////////////
+// Bug fixes
+////////////////////////////////////////////////////////////////////////
+
+BOOL CALLBACK BugFixesDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+ switch(uMsg)
+ {
+ case WM_INITDIALOG: // init dialog:
+ {
+ int i;
+ 
+ for(i=0;i<32;i++) // -> loop all 32 checkboxes
+ {
+ if(dwCfgFixes&(1<<i)) // --> if fix is active: check box
+ CheckDlgButton(hW,IDC_FIX1+i,TRUE);
+ }
+ }
+
+ case WM_COMMAND:
+ {
+ switch(LOWORD(wParam))
+ {
+ case IDCANCEL: EndDialog(hW,FALSE);return TRUE; // cancel: close window
+
+ case IDOK: // ok: take settings and close
+ {
+ int i;
+ dwCfgFixes=0;
+ for(i=0;i<32;i++)
+ {
+ if(IsDlgButtonChecked(hW,IDC_FIX1+i))
+ dwCfgFixes|=(1<<i);
+ }
+ EndDialog(hW,TRUE);
+ return TRUE;
+ }
+ }
+ }
+ }
+ return FALSE;
+}
+
+void OnBugFixes(HWND hW) // bug fix button: 
+{
+ DialogBox(hInst,MAKEINTRESOURCE(IDD_FIXES), // show fix window
+ hW,(DLGPROC)BugFixesDlgProc);
+}
+
+////////////////////////////////////////////////////////////////////////
+// default 1: fast
+////////////////////////////////////////////////////////////////////////
+
+void OnCfgDef1(HWND hW) 
+{
+ HWND hWC;
+ 
+ hWC=GetDlgItem(hW,IDC_RESOLUTION);
+ ComboBox_SetCurSel(hWC,0);
+ hWC=GetDlgItem(hW,IDC_COLORDEPTH);
+ ComboBox_SetCurSel(hWC,0);
+ hWC=GetDlgItem(hW,IDC_VSYNC);
+ ComboBox_SetCurSel(hWC,1);
+ hWC=GetDlgItem(hW,IDC_TEXQUALITY);
+ ComboBox_SetCurSel(hWC,0);
+ hWC=GetDlgItem(hW,IDC_FILTERTYPE);
+ ComboBox_SetCurSel(hWC,0);
+ hWC=GetDlgItem(hW,IDC_OFFSCREEN);
+ ComboBox_SetCurSel(hWC,1);
+ hWC=GetDlgItem(hW,IDC_VRAMSIZE);
+ ComboBox_SetCurSel(hWC,0);
+
+ CheckDlgButton(hW,IDC_TEXLINEAR,FALSE);
+ CheckDlgButton(hW,IDC_DRAWDITHER,FALSE);
+ CheckDlgButton(hW,IDC_USELINES,FALSE);
+ CheckDlgButton(hW,IDC_USELIMIT,FALSE);
+ CheckDlgButton(hW,IDC_USESKIP,FALSE);
+ CheckDlgButton(hW,IDC_ADVBLEND,FALSE);
+ CheckDlgButton(hW,IDC_OPAQUE,TRUE);
+// CheckDlgButton(hW,IDC_USEANTIALIAS,FALSE);
+ CheckDlgButton(hW,IDC_DISPMODE2,FALSE);
+ CheckDlgButton(hW,IDC_DISPMODE1,TRUE);
+ CheckDlgButton(hW,IDC_FRAMEAUTO,TRUE);
+ CheckDlgButton(hW,IDC_FRAMEMANUELL,FALSE);
+ CheckDlgButton(hW,IDC_SHOWFPS,FALSE);
+
+ ComboBox_SetCurSel(GetDlgItem(hW,IDC_SUBCACHE),2);
+ ComboBox_SetCurSel(GetDlgItem(hW,IDC_FRAMETEX),1);
+ ComboBox_SetCurSel(GetDlgItem(hW,IDC_FRAMEREAD),0);
+
+ CheckDlgButton(hW,IDC_USEMASK,FALSE);
+ CheckDlgButton(hW,IDC_FASTMDEC,TRUE);
+ CheckDlgButton(hW,IDC_FASTMDEC2,TRUE);
+ CheckDlgButton(hW,IDC_USESCANLINES,FALSE);
+
+ SetDlgItemInt(hW,IDC_FRAMELIMIT,200,FALSE);
+ SetDlgItemInt(hW,IDC_WINX,640,FALSE);
+ SetDlgItemInt(hW,IDC_WINY,480,FALSE);
+
+ CheckDlgButton(hW,IDC_ARATIO,FALSE);
+ CheckDlgButton(hW,IDC_BLUR,FALSE);
+
+ SetDlgItemInt(hW,IDC_SCANBLEND,0,TRUE);
+ ComboBox_SetCurSel(GetDlgItem(hW,IDC_HIRESTEX),0);
+ CheckDlgButton(hW,IDC_SSAVE,FALSE);
+} 
+
+////////////////////////////////////////////////////////////////////////
+// default 2: nice
+////////////////////////////////////////////////////////////////////////
+
+void OnCfgDef2(HWND hW) 
+{
+ HWND hWC;
+ 
+ hWC=GetDlgItem(hW,IDC_RESOLUTION);
+ ComboBox_SetCurSel(hWC,1);
+ hWC=GetDlgItem(hW,IDC_COLORDEPTH);
+ ComboBox_SetCurSel(hWC,1);
+ hWC=GetDlgItem(hW,IDC_VSYNC);
+ ComboBox_SetCurSel(hWC,2);
+ hWC=GetDlgItem(hW,IDC_TEXQUALITY);
+ ComboBox_SetCurSel(hWC,3);
+ hWC=GetDlgItem(hW,IDC_FILTERTYPE);
+ ComboBox_SetCurSel(hWC,0);
+ hWC=GetDlgItem(hW,IDC_OFFSCREEN);
+ ComboBox_SetCurSel(hWC,3);
+ hWC=GetDlgItem(hW,IDC_VRAMSIZE);
+ ComboBox_SetCurSel(hWC,0);
+
+ CheckDlgButton(hW,IDC_TEXLINEAR,FALSE);
+ CheckDlgButton(hW,IDC_DRAWDITHER,FALSE);
+ CheckDlgButton(hW,IDC_USELINES,FALSE);
+ CheckDlgButton(hW,IDC_USELIMIT,TRUE);
+ CheckDlgButton(hW,IDC_USESKIP,FALSE);
+ CheckDlgButton(hW,IDC_ADVBLEND,TRUE);
+ CheckDlgButton(hW,IDC_OPAQUE,TRUE);
+// CheckDlgButton(hW,IDC_USEANTIALIAS,FALSE);
+ CheckDlgButton(hW,IDC_DISPMODE2,FALSE);
+ CheckDlgButton(hW,IDC_DISPMODE1,TRUE);
+ CheckDlgButton(hW,IDC_FRAMEAUTO,TRUE);
+ CheckDlgButton(hW,IDC_FRAMEMANUELL,FALSE);
+ CheckDlgButton(hW,IDC_SHOWFPS,FALSE);
+
+ ComboBox_SetCurSel(GetDlgItem(hW,IDC_SUBCACHE),2);
+ ComboBox_SetCurSel(GetDlgItem(hW,IDC_FRAMETEX),2);
+ ComboBox_SetCurSel(GetDlgItem(hW,IDC_FRAMEREAD),0);
+
+ CheckDlgButton(hW,IDC_USEMASK,TRUE);
+ CheckDlgButton(hW,IDC_FASTMDEC,FALSE);
+ CheckDlgButton(hW,IDC_FASTMDEC2,FALSE);
+ CheckDlgButton(hW,IDC_USESCANLINES,FALSE);
+
+ SetDlgItemInt(hW,IDC_FRAMELIMIT,200,FALSE);
+ SetDlgItemInt(hW,IDC_WINX,640,FALSE);
+ SetDlgItemInt(hW,IDC_WINY,480,FALSE);
+ CheckDlgButton(hW,IDC_ARATIO,FALSE);
+ CheckDlgButton(hW,IDC_BLUR,FALSE);
+ SetDlgItemInt(hW,IDC_SCANBLEND,0,TRUE);
+ ComboBox_SetCurSel(GetDlgItem(hW,IDC_HIRESTEX),0);
+ CheckDlgButton(hW,IDC_SSAVE,FALSE);
+}
+
+////////////////////////////////////////////////////////////////////////
+// read registry
+////////////////////////////////////////////////////////////////////////
+
+void ReadConfig(void) // read all config vals
+{
+ HKEY myKey;
+ DWORD temp;
+ DWORD type;
+ DWORD size;
+
+ // pre-init all relevant globals
+
+ iResX=800;iResY=600;
+ iColDepth=32;
+ bChangeRes=FALSE;
+ bWindowMode=FALSE;
+ bFullVRam=FALSE;
+ iFilterType=0;
+ bAdvancedBlend=FALSE;
+ bDrawDither=FALSE;
+ bUseLines=FALSE;
+ bUseFrameLimit=TRUE;
+ bUseFrameSkip=FALSE;
+ iFrameLimit=2;
+ fFrameRate=200.0f;
+ iOffscreenDrawing=1;
+ bOpaquePass=TRUE;
+ bUseAntiAlias=FALSE;
+ iTexQuality=0;
+ iWinSize=MAKELONG(400,300);
+ iUseMask=0;
+ iZBufferDepth=0;
+ bUseFastMdec=FALSE;
+ bUse15bitMdec=FALSE;
+ dwCfgFixes=0;
+ bUseFixes=FALSE;
+ bGteAccuracy=FALSE;
+ iUseScanLines=0;
+ iFrameTexType=0;
+ iFrameReadType=0;
+ iShowFPS=0;
+ bKeepRatio=FALSE;
+ bForceRatio43=FALSE;
+ iScanBlend=0;
+ iVRamSize=0;
+ iTexGarbageCollection=1;
+ iBlurBuffer=0; 
+ iHiResTextures=0;
+ iNoScreenSaver=1;
+ iForceVSync=-1;
+
+ lstrcpy(szGPUKeys,szKeyDefaults);
+
+ // registry key: still "psemu pro/pete tnt" for compatibility reasons
+
+ if (RegOpenKeyEx(HKEY_CURRENT_USER,"Software\\Vision Thing\\PSEmu Pro\\GPU\\PeteTNT",0,KEY_ALL_ACCESS,&myKey)==ERROR_SUCCESS)
+ {
+ size = 4;
+ if(RegQueryValueEx(myKey,"ResX",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iResX=(int)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"ResY",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iResY=(int)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"WinSize",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iWinSize=(int)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"FilterType",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iFilterType=(int)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"DrawDither",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ bDrawDither=(BOOL)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"UseLines",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ bUseLines=(BOOL)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"WindowMode",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ bWindowMode=(BOOL)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"ColDepth",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iColDepth=(int)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"ForceVSync",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iForceVSync=(int)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"UseFrameLimit",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ bUseFrameLimit=(BOOL)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"UseFrameSkip",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ bUseFrameSkip=(BOOL)temp;
+ size = 4; 
+ if(RegQueryValueEx(myKey,"FrameLimit",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iFrameLimit=(int)temp;
+ if(!iFrameLimit) {bUseFrameLimit=TRUE;bUseFrameSkip=FALSE;iFrameLimit=2;}
+
+ // try to get the float framerate... if none: take int framerate
+ fFrameRate=0.0f;
+ size = 4;
+ if(RegQueryValueEx(myKey,"FrameRateFloat",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ fFrameRate=*((float *)(&temp));
+ if(fFrameRate==0.0f)
+ {
+ fFrameRate=200.0f;
+ size = 4;
+ if(RegQueryValueEx(myKey,"FrameRate",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ fFrameRate=(float)temp;
+ }
+
+ size = 4;
+ if(RegQueryValueEx(myKey,"UseMultiPass",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ bAdvancedBlend=(int)temp;
+ size = 4;
+ iOffscreenDrawing=-1;
+ if(RegQueryValueEx(myKey,"OffscreenDrawingEx",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iOffscreenDrawing=temp;
+ if(iOffscreenDrawing==-1 &&
+ RegQueryValueEx(myKey,"OffscreenDrawing",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iOffscreenDrawing=temp*2;
+ size = 4;
+ if(RegQueryValueEx(myKey,"OpaquePass",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ bOpaquePass=(BOOL)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"VRamSize",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iVRamSize=(int)temp;
+// size = 4;
+// if(RegQueryValueEx(myKey,"UseAntiAlias",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+// bUseAntiAlias=(BOOL)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"TexQuality",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iTexQuality=(int)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"CfgFixes",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ dwCfgFixes=(int)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"UseFixes",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ bUseFixes=(BOOL)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"GteAccuracy",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ bGteAccuracy=(BOOL)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"UseMask",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iUseMask=(int)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"FastMdec",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ bUseFastMdec=(BOOL)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"15BitMdec",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ bUse15bitMdec=(BOOL)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"UseScanLines",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iUseScanLines=(int)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"ShowFPS",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iShowFPS=(int)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"KeepRatio",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ bKeepRatio=(BOOL)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"ForceRatio43",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ bForceRatio43=(BOOL)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"ScanBlend",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iScanBlend=(int)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"FrameTexType",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iFrameTexType=(int)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"FrameReadType",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iFrameReadType=(int)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"FullscreenBlur",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iBlurBuffer=(int)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"HiResTextures",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iHiResTextures=(int)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"NoScreenSaver",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iNoScreenSaver=(int)temp;
+ 
+ size=7;
+ RegQueryValueEx(myKey,"GPUKeys",0,&type,(LPBYTE)&szGPUKeys,&size);
+
+ RegCloseKey(myKey);
+ }
+ if(!iColDepth) iColDepth=32; // adjust color info
+ if(iUseMask) iZBufferDepth=16; // set zbuffer depth 
+ else iZBufferDepth=0;
+ if(bUseFixes) dwActFixes=dwCfgFixes; // init game fix global
+ if(iFrameReadType==4) bFullVRam=TRUE; // set fullvram render flag (soft gpu)
+}
+
+////////////////////////////////////////////////////////////////////////
+// read registry: window size (called on fullscreen/window resize)
+////////////////////////////////////////////////////////////////////////
+
+void ReadWinSizeConfig(void)
+{
+ HKEY myKey;
+ DWORD temp;
+ DWORD type;
+ DWORD size;
+
+ iResX=800;iResY=600;
+ iWinSize=MAKELONG(400,300);
+ iBlurBuffer=0;
+
+ // registry key: still "psemu pro/pete tnt" for compatibility reasons
+
+ if (RegOpenKeyEx(HKEY_CURRENT_USER,"Software\\Vision Thing\\PSEmu Pro\\GPU\\PeteTNT",0,KEY_ALL_ACCESS,&myKey)==ERROR_SUCCESS)
+ {
+ size = 4;
+ if(RegQueryValueEx(myKey,"ResX",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iResX=(int)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"ResY",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iResY=(int)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"WinSize",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iWinSize=(int)temp;
+ size = 4;
+ if(RegQueryValueEx(myKey,"FullscreenBlur",0,&type,(LPBYTE)&temp,&size)==ERROR_SUCCESS)
+ iBlurBuffer=(int)temp;
+ RegCloseKey(myKey);
+ }
+}
+ 
+////////////////////////////////////////////////////////////////////////
+// write registry
+////////////////////////////////////////////////////////////////////////
+
+void WriteConfig(void)
+{
+ HKEY myKey;
+ DWORD myDisp;
+ DWORD temp;
+
+ // registry key: still "psemu pro/pete tnt" for compatibility reasons
+ 
+ RegCreateKeyEx(HKEY_CURRENT_USER,"Software\\Vision Thing\\PSEmu Pro\\GPU\\PeteTNT",0,NULL,REG_OPTION_NON_VOLATILE,KEY_ALL_ACCESS,NULL,&myKey,&myDisp);
+ temp=iResX;
+ RegSetValueEx(myKey,"ResX",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=iResY;
+ RegSetValueEx(myKey,"ResY",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=iWinSize;
+ RegSetValueEx(myKey,"WinSize",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=iFilterType;
+ RegSetValueEx(myKey,"FilterType",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=bDrawDither;
+ RegSetValueEx(myKey,"DrawDither",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=bUseLines;
+ RegSetValueEx(myKey,"UseLines",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=bWindowMode;
+ RegSetValueEx(myKey,"WindowMode",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=iColDepth;
+ RegSetValueEx(myKey,"ColDepth",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=iForceVSync;
+ RegSetValueEx(myKey,"ForceVSync",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=bUseFrameLimit;
+ RegSetValueEx(myKey,"UseFrameLimit",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=bUseFrameSkip;
+ RegSetValueEx(myKey,"UseFrameSkip",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=iFrameLimit;
+ RegSetValueEx(myKey,"FrameLimit",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=(DWORD)fFrameRate;
+ RegSetValueEx(myKey,"FrameRate",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=*((DWORD *)&fFrameRate);
+ RegSetValueEx(myKey,"FrameRateFloat",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=bAdvancedBlend;
+ RegSetValueEx(myKey,"UseMultiPass",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=iOffscreenDrawing/2;
+ RegSetValueEx(myKey,"OffscreenDrawing",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=iOffscreenDrawing;
+ RegSetValueEx(myKey,"OffscreenDrawingEx",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=bOpaquePass;
+ RegSetValueEx(myKey,"OpaquePass",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=iVRamSize;
+ RegSetValueEx(myKey,"VRamSize",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+// temp=bUseAntiAlias;
+// RegSetValueEx(myKey,"UseAntiAlias",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=iTexQuality;
+ RegSetValueEx(myKey,"TexQuality",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=dwCfgFixes;
+ RegSetValueEx(myKey,"CfgFixes",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=bUseFixes;
+ RegSetValueEx(myKey,"UseFixes",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=bGteAccuracy;
+ RegSetValueEx(myKey,"GteAccuracy",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=iUseMask;
+ RegSetValueEx(myKey,"UseMask",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=bUseFastMdec;
+ RegSetValueEx(myKey,"FastMdec",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=bUse15bitMdec;
+ RegSetValueEx(myKey,"15BitMdec",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=iUseScanLines;
+ RegSetValueEx(myKey,"UseScanLines",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=iShowFPS;
+ RegSetValueEx(myKey,"ShowFPS",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=iFrameTexType;
+ RegSetValueEx(myKey,"FrameTexType",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=iFrameReadType;
+ RegSetValueEx(myKey,"FrameReadType",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=bKeepRatio;
+ RegSetValueEx(myKey,"KeepRatio",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=bForceRatio43;
+ RegSetValueEx(myKey,"ForceRatio43",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=iBlurBuffer;
+ RegSetValueEx(myKey,"FullscreenBlur",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=iHiResTextures;
+ RegSetValueEx(myKey,"HiResTextures",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=iNoScreenSaver;
+ RegSetValueEx(myKey,"NoScreenSaver",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ temp=iScanBlend;
+ RegSetValueEx(myKey,"ScanBlend",0,REG_DWORD,(LPBYTE) &temp,sizeof(temp));
+ RegSetValueEx(myKey,"GPUKeys",0,REG_BINARY,(LPBYTE)szGPUKeys,7); 
+ 
+ RegCloseKey(myKey);
+}
+
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+// Key definition window
+
+typedef struct
+{
+ char szName[10];
+ char cCode;
+}
+KEYSETS;
+
+// sepcial keys:
+
+KEYSETS tMKeys[]=
+{
+ {"SPACE", 0x20},
+ {"PRIOR", 0x21},
+ {"NEXT", 0x22},
+ {"END", 0x23},
+ {"HOME", 0x24},
+ {"LEFT", 0x25},
+ {"UP", 0x26},
+ {"RIGHT", 0x27},
+ {"DOWN", 0x28},
+ {"SELECT", 0x29},
+ {"PRINT", 0x2A},
+ {"EXECUTE", 0x2B},
+ {"SNAPSHOT", 0x2C},
+ {"INSERT", 0x2D},
+ {"DELETE", 0x2E},
+ {"HELP", 0x2F},
+ {"NUMPAD0", 0x60},
+ {"NUMPAD1", 0x61},
+ {"NUMPAD2", 0x62},
+ {"NUMPAD3", 0x63},
+ {"NUMPAD4", 0x64},
+ {"NUMPAD5", 0x65},
+ {"NUMPAD6", 0x66},
+ {"NUMPAD7", 0x67},
+ {"NUMPAD8", 0x68},
+ {"NUMPAD9", 0x69},
+ {"MULTIPLY", 0x6A},
+ {"ADD", 0x6B},
+ {"SEPARATOR", 0x6C},
+ {"SUBTRACT", 0x6D},
+ {"DECIMAL", 0x6E},
+ {"DIVIDE", 0x6F},
+ {"", 0x00}
+};
+
+// select key entry in combo box
+
+void SetGPUKey(HWND hWC,char szKey)
+{
+ int i,iCnt=ComboBox_GetCount(hWC);
+ for(i=0;i<iCnt;i++)
+ {
+ if(ComboBox_GetItemData(hWC,i)==szKey) break;
+ }
+ if(i!=iCnt) ComboBox_SetCurSel(hWC,i);
+} 
+
+// key window proc
+
+BOOL CALLBACK KeyDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+ switch(uMsg)
+ {
+ case WM_INITDIALOG: // init dialog
+ {
+ int i,j,k;char szB[2];HWND hWC;
+ for(i=IDC_KEY1;i<=IDC_KEY6;i++)
+ {
+ hWC=GetDlgItem(hW,i);
+
+ for(j=0;tMKeys[j].cCode!=0;j++) // fill special keys in combo
+ {
+ k=ComboBox_AddString(hWC,tMKeys[j].szName);
+ ComboBox_SetItemData(hWC,k,tMKeys[j].cCode);
+ }
+ for(j=0x30;j<=0x39;j++) // fill numbers in combo
+ {
+ wsprintf(szB,"%c",j);
+ k=ComboBox_AddString(hWC,szB);
+ ComboBox_SetItemData(hWC,k,j);
+ }
+ for(j=0x41;j<=0x5a;j++) // fill alphas in combo
+ {
+ wsprintf(szB,"%c",j);
+ k=ComboBox_AddString(hWC,szB);
+ ComboBox_SetItemData(hWC,k,j);
+ } 
+ SetGPUKey(GetDlgItem(hW,i),szGPUKeys[i-IDC_KEY1]);
+ }
+ }return TRUE;
+
+ case WM_COMMAND:
+ {
+ switch(LOWORD(wParam))
+ {
+ case IDC_DEFAULT: // default button:
+ {
+ int i; // -> set defaults
+ for(i=IDC_KEY1;i<=IDC_KEY6;i++) 
+ SetGPUKey(GetDlgItem(hW,i),szKeyDefaults[i-IDC_KEY1]);
+ }break;
+
+ case IDCANCEL: // cancel: just close window
+ EndDialog(hW,FALSE); return TRUE; 
+
+ case IDOK: // ok: take key bindings
+ {
+ HWND hWC;int i;
+ for(i=IDC_KEY1;i<=IDC_KEY6;i++)
+ {
+ hWC=GetDlgItem(hW,i);
+ szGPUKeys[i-IDC_KEY1]=ComboBox_GetItemData(hWC,ComboBox_GetCurSel(hWC));
+ if(szGPUKeys[i-IDC_KEY1]<0x20) szGPUKeys[i-IDC_KEY1]=0x20;
+ }
+ EndDialog(hW,TRUE); 
+ return TRUE;
+ }
+ }
+ }
+ }
+ return FALSE;
+}
+
+void OnKeyConfig(HWND hW) // call key dialog
+{
+ DialogBox(hInst,MAKEINTRESOURCE(IDD_KEYS),
+ hW,(DLGPROC)KeyDlgProc);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// AboutDlg dialog (Windows)
+ 
+BOOL CALLBACK AboutDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+ switch(uMsg)
+ {
+ case WM_COMMAND:
+ {
+ switch(LOWORD(wParam))
+ {
+ case IDOK: EndDialog(hW,TRUE);return TRUE;
+ }
+ }
+ }
+ return FALSE;
+}

pcsxr-1.9.93.tar.bz2/win32/plugins/peopsxgl/winsrc/fps.c Added

@@ -0,0 +1,641 @@
+/***************************************************************************
+ fps.c - description
+ -------------------
+ begin : Sun Mar 08 2009
+ copyright : (C) 1999-2009 by Pete Bernert
+ web : www.pbernert.com 
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+//*************************************************************************// 
+// History of changes:
+//
+// 2009/03/08 - Pete 
+// - generic cleanup for the Peops release
+//
+//*************************************************************************// 
+
+#include "stdafx.h"
+
+#define _IN_FPS
+
+#include "externals.h"
+
+////////////////////////////////////////////////////////////////////////
+// FPS stuff
+////////////////////////////////////////////////////////////////////////
+
+BOOL bIsPerformanceCounter=FALSE;
+float fFrameRateHz=0;
+DWORD dwFrameRateTicks=16;
+float fFrameRate;
+int iFrameLimit;
+BOOL bUseFrameLimit=FALSE;
+BOOL bUseFrameSkip=0;
+DWORD dwLaceCnt=0;
+
+LARGE_INTEGER liCPUFrequency;
+
+////////////////////////////////////////////////////////////////////////
+// FPS skipping / limit
+////////////////////////////////////////////////////////////////////////
+
+BOOL bInitCap = TRUE; 
+float fps_skip = 0;
+float fps_cur = 0;
+
+void FrameCap (void)
+{
+ static DWORD curticks, lastticks, _ticks_since_last_update;
+ static DWORD TicksToWait = 0;
+ static LARGE_INTEGER CurrentTime;
+ static LARGE_INTEGER LastTime;
+ static BOOL SkipNextWait = FALSE;
+ BOOL Waiting = TRUE;
+
+ //---------------------------------------------------------
+ // init some static vars... 
+ // bInitCap is TRUE on startup and everytime the user
+ // is toggling the frame limit
+ //---------------------------------------------------------
+
+ if(bInitCap)
+ {
+ bInitCap=FALSE;
+ if (bIsPerformanceCounter)
+ QueryPerformanceCounter(&LastTime);
+ lastticks = timeGetTime();
+ TicksToWait=0;
+ return;
+ }
+
+ //---------------------------------------------------------
+
+ if(bIsPerformanceCounter)
+ {
+ QueryPerformanceCounter(&CurrentTime);
+ _ticks_since_last_update = CurrentTime.LowPart - LastTime.LowPart;
+
+ //---------------------------------------------------------
+ // check if diff > 1/2 sec, if yes: take mm timer value
+ //---------------------------------------------------------
+
+ curticks = timeGetTime();
+ if(_ticks_since_last_update>(liCPUFrequency.LowPart>>1)) 
+ {
+ if(curticks < lastticks)
+ _ticks_since_last_update = dwFrameRateTicks+TicksToWait+1;
+ else _ticks_since_last_update = (liCPUFrequency.LowPart * (curticks - lastticks))/1000;
+ }
+
+ //---------------------------------------------------------
+
+ if ((_ticks_since_last_update > TicksToWait) || 
+ (CurrentTime.LowPart < LastTime.LowPart))
+ {
+ LastTime.HighPart = CurrentTime.HighPart;
+ LastTime.LowPart = CurrentTime.LowPart;
+
+ lastticks=curticks;
+
+ if((_ticks_since_last_update-TicksToWait) > dwFrameRateTicks)
+ TicksToWait=0;
+ else TicksToWait=dwFrameRateTicks-(_ticks_since_last_update-TicksToWait);
+ }
+ else
+ {
+ while (Waiting)
+ {
+ QueryPerformanceCounter(&CurrentTime);
+ _ticks_since_last_update = CurrentTime.LowPart - LastTime.LowPart;
+
+ //---------------------------------------------------------
+ // check if diff > 1/2 sec, if yes: take mm timer value
+ //---------------------------------------------------------
+ curticks = timeGetTime();
+ if(_ticks_since_last_update>(liCPUFrequency.LowPart>>1)) 
+ {
+ if(curticks < lastticks)
+ _ticks_since_last_update = TicksToWait+1;
+ else _ticks_since_last_update = (liCPUFrequency.LowPart * (curticks - lastticks))/1000;
+ }
+ //---------------------------------------------------------
+
+ if ((_ticks_since_last_update > TicksToWait) || 
+ (CurrentTime.LowPart < LastTime.LowPart))
+ {
+ Waiting = FALSE;
+
+ lastticks=curticks;
+
+ LastTime.HighPart = CurrentTime.HighPart;
+ LastTime.LowPart = CurrentTime.LowPart;
+ TicksToWait = dwFrameRateTicks;
+ }
+ }
+ }
+ }
+ else
+ {
+ curticks = timeGetTime();
+ _ticks_since_last_update = curticks - lastticks;
+
+ if ((_ticks_since_last_update > TicksToWait) || 
+ (curticks < lastticks))
+ {
+ lastticks = curticks;
+
+ if((_ticks_since_last_update-TicksToWait) > dwFrameRateTicks)
+ TicksToWait=0;
+ else TicksToWait=dwFrameRateTicks-(_ticks_since_last_update-TicksToWait);
+ }
+ else
+ {
+ while (Waiting)
+ {
+ curticks = timeGetTime();
+ _ticks_since_last_update = curticks - lastticks;
+ if ((_ticks_since_last_update > TicksToWait) ||
+ (curticks < lastticks))
+ {
+ Waiting = FALSE;
+ lastticks = curticks;
+ TicksToWait = dwFrameRateTicks;
+ }
+ }
+ }
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+#define MAXSKIP 120
+#define MAXLACE 16
+
+void FrameSkip(void)
+{
+ static int iNumSkips=0,iAdditionalSkip=0; // number of additional frames to skip
+ static DWORD dwLastLace=0; // helper var for frame limitation
+ static DWORD curticks, lastticks, _ticks_since_last_update;
+ static LARGE_INTEGER CurrentTime;
+ static LARGE_INTEGER LastTime;
+
+ if(!dwLaceCnt) return; // important: if no updatelace happened, we ignore it completely
+
+ if(iNumSkips) // we are in skipping mode?
+ {
+ dwLastLace+=dwLaceCnt; // -> calc frame limit helper (number of laces)
+ bSkipNextFrame = TRUE; // -> we skip next frame
+ iNumSkips--; // -> ok, one done
+ }
+ else // ok, no additional skipping has to be done... 
+ { // we check now, if some limitation is needed, or a new skipping has to get started
+ DWORD dwWaitTime;
+
+ if(bInitCap || bSkipNextFrame) // first time or we skipped before?
+ {
+ if(bUseFrameLimit && !bInitCap) // frame limit wanted and not first time called?
+ {
+ DWORD dwT=_ticks_since_last_update; // -> that's the time of the last drawn frame
+ dwLastLace+=dwLaceCnt; // -> and that's the number of updatelace since the start of the last drawn frame
+
+ if(bIsPerformanceCounter) // -> now we calc the time of the last drawn frame + the time we spent skipping
+ {
+ QueryPerformanceCounter(&CurrentTime);
+ _ticks_since_last_update= dwT+CurrentTime.LowPart - LastTime.LowPart;
+ }
+ else
+ {
+ curticks = timeGetTime();
+ _ticks_since_last_update= dwT+curticks - lastticks;
+ }
+
+ dwWaitTime=dwLastLace*dwFrameRateTicks; // -> and now we calc the time the real psx would have needed
+
+ if(_ticks_since_last_update<dwWaitTime) // -> we were too fast?
+ { 
+ if((dwWaitTime-_ticks_since_last_update)> // -> some more security, to prevent
+ (60*dwFrameRateTicks)) // wrong waiting times
+ _ticks_since_last_update=dwWaitTime;
+
+ while(_ticks_since_last_update<dwWaitTime) // -> loop until we have reached the real psx time
+ { // (that's the additional limitation, yup)
+ if(bIsPerformanceCounter)
+ {
+ QueryPerformanceCounter(&CurrentTime);
+ _ticks_since_last_update = dwT+CurrentTime.LowPart - LastTime.LowPart;
+ }
+ else
+ {
+ curticks = timeGetTime();
+ _ticks_since_last_update = dwT+curticks - lastticks;
+ }
+ }
+ }
+ else // we were still too slow ?!!?
+ {
+ if(iAdditionalSkip<MAXSKIP) // -> well, somewhen we really have to stop skipping on very slow systems
+ {
+ iAdditionalSkip++; // -> inc our watchdog var
+ dwLaceCnt=0; // -> reset lace count
+ if(bIsPerformanceCounter) // -> ok, start time of the next frame
+ QueryPerformanceCounter(&LastTime);
+ lastticks = timeGetTime();
+ return; // -> done, we will skip next frame to get more speed
+ } 
+ }
+ }
+
+ bInitCap=FALSE; // -> ok, we have inited the frameskip func
+ iAdditionalSkip=0; // -> init additional skip
+ bSkipNextFrame=FALSE; // -> we don't skip the next frame
+ if(bIsPerformanceCounter) // -> we store the start time of the next frame
+ QueryPerformanceCounter(&LastTime);
+ lastticks = timeGetTime();
+ dwLaceCnt=0; // -> and we start to count the laces 
+ dwLastLace=0; 
+ _ticks_since_last_update=0;
+ return; // -> done, the next frame will get drawn
+ }
+
+ bSkipNextFrame=FALSE; // init the frame skip signal to 'no skipping' first
+
+ if(bIsPerformanceCounter) // get the current time (we are now at the end of one drawn frame)
+ {
+ QueryPerformanceCounter(&CurrentTime);
+ _ticks_since_last_update = CurrentTime.LowPart - LastTime.LowPart;
+ }
+ else
+ {
+ curticks = timeGetTime();
+ _ticks_since_last_update = curticks - lastticks;
+ }
+
+ dwLastLace=dwLaceCnt; // store curr count (frame limitation helper)
+ dwWaitTime=dwLaceCnt*dwFrameRateTicks; // calc the 'real psx lace time'
+
+ if(_ticks_since_last_update>dwWaitTime) // hey, we needed way too long for that frame...
+ {
+ if(bUseFrameLimit) // if limitation, we skip just next frame,
+ { // and decide after, if we need to do more
+ iNumSkips=0;
+ }
+ else
+ {
+ iNumSkips=_ticks_since_last_update/dwWaitTime; // -> calc number of frames to skip to catch up
+ iNumSkips--; // -> since we already skip next frame, one down
+ if(iNumSkips>MAXSKIP) iNumSkips=MAXSKIP; // -> well, somewhere we have to draw a line
+ }
+ bSkipNextFrame = TRUE; // -> signal for skipping the next frame
+ }
+ else // we were faster than real psx? fine :)
+ if(bUseFrameLimit) // frame limit used? so we wait til the 'real psx time' has been reached
+ {
+ if(dwLaceCnt>MAXLACE) // -> security check
+ _ticks_since_last_update=dwWaitTime;
+
+ while(_ticks_since_last_update<dwWaitTime) // just do a waiting loop...
+ {
+ if(bIsPerformanceCounter)
+ {
+ QueryPerformanceCounter(&CurrentTime);
+ _ticks_since_last_update = CurrentTime.LowPart - LastTime.LowPart;
+ }
+ else
+ {
+ curticks = timeGetTime();
+ _ticks_since_last_update = curticks - lastticks;
+ }
+ }
+ }
+
+ if(bIsPerformanceCounter) // ok, start time of the next frame
+ QueryPerformanceCounter(&LastTime);
+ lastticks = timeGetTime();
+ }
+
+ dwLaceCnt=0; // init lace counter
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void calcfps(void)
+{
+ static DWORD curticks,_ticks_since_last_update,lastticks;
+ static long fps_cnt = 0;
+ static DWORD fps_tck = 1;
+ static LARGE_INTEGER CurrentTime;
+ static LARGE_INTEGER LastTime;
+ static long fpsskip_cnt = 0;
+ static DWORD fpsskip_tck = 1;
+
+ if(bIsPerformanceCounter)
+ {
+ QueryPerformanceCounter(&CurrentTime);
+ _ticks_since_last_update=CurrentTime.LowPart-LastTime.LowPart;
+ 
+ //--------------------------------------------------//
+ curticks = timeGetTime();
+ if(_ticks_since_last_update>(liCPUFrequency.LowPart>>1))
+ _ticks_since_last_update = (liCPUFrequency.LowPart * (curticks - lastticks))/1000;
+ lastticks=curticks;
+ //--------------------------------------------------//
+
+ if(bUseFrameSkip && !bUseFrameLimit && _ticks_since_last_update) 
+ fps_skip=min(fps_skip,(((float)liCPUFrequency.LowPart) / ((float)_ticks_since_last_update) +1.0f));
+
+ LastTime.HighPart = CurrentTime.HighPart;
+ LastTime.LowPart = CurrentTime.LowPart;
+ }
+ else
+ {
+ curticks = timeGetTime();
+ _ticks_since_last_update=curticks-lastticks;
+
+ if(bUseFrameSkip && !bUseFrameLimit && _ticks_since_last_update)
+ fps_skip=min(fps_skip,((float)1000/(float)_ticks_since_last_update+1.0f));
+
+ lastticks = curticks;
+ }
+
+ if(bUseFrameSkip && bUseFrameLimit)
+ {
+ fpsskip_tck += _ticks_since_last_update;
+
+ if(++fpsskip_cnt==2)
+ {
+ if(bIsPerformanceCounter)
+ fps_skip = ((float)liCPUFrequency.LowPart) / ((float)fpsskip_tck) *2.0f;
+ else
+ fps_skip = (float)2000/(float)fpsskip_tck;
+
+ fps_skip +=6.0f;
+
+ fpsskip_cnt = 0;
+ fpsskip_tck = 1;
+ }
+ }
+
+ fps_tck += _ticks_since_last_update;
+
+ if(++fps_cnt==10)
+ {
+ if(bIsPerformanceCounter)
+ fps_cur = ((float)liCPUFrequency.LowPart) / ((float)fps_tck) *10.0f;
+ else
+ fps_cur = (float)10000/(float)fps_tck;
+
+ fps_cnt = 0;
+ fps_tck = 1;
+
+ if(bUseFrameLimit && fps_cur>fFrameRateHz) // optical adjust ;) avoids flickering fps display
+ fps_cur=fFrameRateHz;
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+// PC FPS skipping / limit
+////////////////////////////////////////////////////////////////////////
+
+void PCFrameCap(void)
+{
+ static DWORD curticks, lastticks, _ticks_since_last_update;
+ static DWORD TicksToWait = 0;
+ static LARGE_INTEGER CurrentTime;
+ static LARGE_INTEGER LastTime;
+ BOOL Waiting = TRUE;
+
+ while (Waiting)
+ {
+ if(bIsPerformanceCounter)
+ {
+ QueryPerformanceCounter(&CurrentTime);
+ _ticks_since_last_update = CurrentTime.LowPart - LastTime.LowPart;
+
+ //------------------------------------------------//
+ curticks = timeGetTime();
+ if(_ticks_since_last_update>(liCPUFrequency.LowPart>>1)) 
+ {
+ if(curticks < lastticks)
+ _ticks_since_last_update = TicksToWait+1;
+ else _ticks_since_last_update = (liCPUFrequency.LowPart * (curticks - lastticks))/1000;
+ }
+ //------------------------------------------------//
+
+ if ((_ticks_since_last_update > TicksToWait) ||
+ (CurrentTime.LowPart < LastTime.LowPart))
+ {
+ Waiting = FALSE;
+
+ lastticks=curticks; 
+
+ LastTime.HighPart = CurrentTime.HighPart;
+ LastTime.LowPart = CurrentTime.LowPart;
+ TicksToWait = (liCPUFrequency.LowPart / fFrameRateHz);
+ }
+ }
+ else
+ {
+ curticks = timeGetTime();
+ _ticks_since_last_update = curticks - lastticks;
+ if ((_ticks_since_last_update > TicksToWait) || 
+ (curticks < lastticks))
+ {
+ Waiting = FALSE;
+ lastticks = curticks;
+ TicksToWait = (1000 / (DWORD)fFrameRateHz);
+ }
+ }
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void PCcalcfps(void)
+{
+ static DWORD curticks,_ticks_since_last_update,lastticks;
+ static long fps_cnt = 0;
+ static float fps_acc = 0;
+ static LARGE_INTEGER CurrentTime;
+ static LARGE_INTEGER LastTime;
+ float CurrentFPS=0; 
+ 
+ if(bIsPerformanceCounter)
+ {
+ QueryPerformanceCounter(&CurrentTime);
+ _ticks_since_last_update=CurrentTime.LowPart-LastTime.LowPart;
+
+ //--------------------------------------------------//
+ curticks = timeGetTime();
+ if(_ticks_since_last_update>(liCPUFrequency.LowPart>>1)) 
+ _ticks_since_last_update = (liCPUFrequency.LowPart * (curticks - lastticks))/1000;
+ lastticks=curticks;
+ //--------------------------------------------------//
+
+ if(_ticks_since_last_update)
+ {
+ CurrentFPS = ((float)liCPUFrequency.LowPart) / ((float)_ticks_since_last_update);
+ }
+ else CurrentFPS = 0;
+ LastTime.HighPart = CurrentTime.HighPart;
+ LastTime.LowPart = CurrentTime.LowPart;
+ }
+ else
+ {
+ curticks = timeGetTime();
+ if(_ticks_since_last_update=curticks-lastticks)
+ CurrentFPS=(float)1000/(float)_ticks_since_last_update;
+ else CurrentFPS = 0;
+ lastticks = curticks;
+ }
+
+ fps_acc += CurrentFPS;
+
+ if(++fps_cnt==10)
+ {
+ fps_cur = fps_acc / 10;
+ fps_acc = 0;
+ fps_cnt = 0;
+ }
+ 
+ fps_skip=CurrentFPS+1.0f;
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void SetAutoFrameCap(void)
+{
+ if(iFrameLimit==1)
+ {
+ fFrameRateHz = fFrameRate;
+ if(bIsPerformanceCounter)
+ dwFrameRateTicks=(liCPUFrequency.LowPart / fFrameRateHz);
+ else dwFrameRateTicks=(1000 / (DWORD)fFrameRateHz);
+ return;
+ }
+
+ if(dwActFixes&128)
+ {
+ if (PSXDisplay.Interlaced)
+ fFrameRateHz = PSXDisplay.PAL?50.0f:60.0f;
+ else fFrameRateHz = PSXDisplay.PAL?25.0f:30.0f;
+ }
+ else
+ {
+ //fFrameRateHz = PSXDisplay.PAL?50.0f:59.94f;
+
+ if(PSXDisplay.PAL)
+ {
+ if (STATUSREG&GPUSTATUS_INTERLACED)
+ fFrameRateHz=33868800.0f/677343.75f; // 50.00238
+ else fFrameRateHz=33868800.0f/680595.00f; // 49.76351
+ } 
+ else
+ {
+ if (STATUSREG&GPUSTATUS_INTERLACED)
+ fFrameRateHz=33868800.0f/565031.25f; // 59.94146
+ else fFrameRateHz=33868800.0f/566107.50f; // 59.82750
+ }
+
+ if(bIsPerformanceCounter)
+ dwFrameRateTicks=(liCPUFrequency.LowPart / fFrameRateHz);
+ else dwFrameRateTicks=(1000 / (DWORD)fFrameRateHz);
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void InitFrameCap(void) // inits cpu frequency info (on gpu startup)
+{
+ if (QueryPerformanceFrequency (&liCPUFrequency))
+ bIsPerformanceCounter = TRUE;
+ else bIsPerformanceCounter = FALSE;
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void ReInitFrameCap(void)
+{
+ BOOL bOldPerformanceCounter=bIsPerformanceCounter; // store curr timer mode
+
+ if(dwActFixes&0x10000) // check game fix... high performance counters are bad on some mb chipsets
+ bIsPerformanceCounter=FALSE;
+ else 
+ {
+ if (QueryPerformanceFrequency (&liCPUFrequency))
+ bIsPerformanceCounter = TRUE;
+ else bIsPerformanceCounter = FALSE;
+ }
+ 
+ if(bOldPerformanceCounter!=bIsPerformanceCounter) // changed?
+ {
+ bInitCap = TRUE;
+ SetAutoFrameCap();
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void SetFrameRateConfig(void)
+{
+ if(fFrameRateHz==0) 
+ {
+ if(iFrameLimit==2) fFrameRateHz=59.94f; // auto framerate? set some init val (no pal/ntsc known yet)
+ else fFrameRateHz=fFrameRate; // else set user framerate
+ }
+
+ if(bIsPerformanceCounter)
+ dwFrameRateTicks=(liCPUFrequency.LowPart / fFrameRateHz);
+ else dwFrameRateTicks=(1000 / (DWORD)fFrameRateHz);
+}
+
+void CheckFrameRate(void) // called in updatelace (on every emulated psx vsync)
+{
+ if(bUseFrameSkip) 
+ {
+ if(!(dwActFixes&0x100))
+ {
+ dwLaceCnt++; // -> and store cnt of vsync between frames
+ if(dwLaceCnt>=MAXLACE && bUseFrameLimit) 
+ {
+ if(dwLaceCnt==MAXLACE) bInitCap=TRUE;
+ FrameCap();
+ }
+ }
+ else if(bUseFrameLimit) FrameCap();
+ calcfps(); // -> calc fps display in skipping mode
+ } 
+ else // -> non-skipping mode:
+ {
+ if(bUseFrameLimit) FrameCap();
+ if(ulKeybits&KEY_SHOWFPS) calcfps(); 
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void CALLBACK GPUsetframelimit(unsigned long option) // new EPSXE interface func: main emu can enable/disable fps limitation this way
+{
+ bInitCap = TRUE;
+
+ if(option==1) // emu says: limit
+ {
+ bUseFrameLimit=TRUE;bUseFrameSkip=FALSE;iFrameLimit=2;
+ SetAutoFrameCap();
+ }
+ else // emu says: no limit
+ {
+ bUseFrameLimit=FALSE;
+ }
+}
+
+////////////////////////////////////////////////////////////////////////

pcsxr-1.9.93.tar.bz2/win32/plugins/peopsxgl/winsrc/key.c Added

@@ -0,0 +1,203 @@
+/***************************************************************************
+ key.c - description
+ -------------------
+ begin : Sun Mar 08 2009
+ copyright : (C) 1999-2009 by Pete Bernert
+ web : www.pbernert.com 
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+//*************************************************************************// 
+// History of changes:
+//
+// 2009/03/08 - Pete 
+// - generic cleanup for the Peops release
+//
+//*************************************************************************// 
+
+#include "stdafx.h"
+
+#define _IN_KEY
+
+#include "externals.h"
+#include "menu.h"
+#include "texture.h"
+#include "draw.h"
+#include "fps.h"
+
+////////////////////////////////////////////////////////////////////////
+// KeyBoard handler stuff
+////////////////////////////////////////////////////////////////////////
+
+uint32_t ulKeybits;
+
+static WNDPROC pOldWinProc=0;
+char szGPUKeys[7];
+
+////////////////////////////////////////////////////////////////////////
+// keyboard handler (WINDOWS)
+////////////////////////////////////////////////////////////////////////
+
+LRESULT CALLBACK key_winproc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam)
+{
+ switch(message)
+ {
+ case WM_SYSCOMMAND: 
+ if(iNoScreenSaver && wParam==SC_SCREENSAVE) return 0L;
+ break;
+
+ case WM_KEYDOWN:
+ if(wParam==(WPARAM)szGPUKeys[1]) {ulKeybits|=KEY_RESETTEXSTORE;break;}
+ break;
+
+ case WM_SYSKEYUP:
+ if(wParam==VK_RETURN) bChangeWinMode=TRUE;
+ break;
+
+ case WM_KEYUP:
+ if(wParam==(WPARAM)szGPUKeys[0]) 
+ {
+ if(ulKeybits&KEY_SHOWFPS) 
+ {
+ ulKeybits&=~KEY_SHOWFPS;
+ HideText();
+ DestroyPic();
+ }
+ else 
+ {
+ ulKeybits|=KEY_SHOWFPS;
+ szDispBuf[0]=0;
+ BuildDispMenu(0);
+ }
+ break;
+ }
+ if(wParam==(WPARAM)szGPUKeys[1]) {ShowGpuPic();break;}
+ if(wParam==(WPARAM)szGPUKeys[2]) {SwitchDispMenu(-1); break;}
+ if(wParam==(WPARAM)szGPUKeys[3]) {SwitchDispMenu( 1); break;}
+ if(wParam==(WPARAM)szGPUKeys[4]) 
+ {
+ if(GetAsyncKeyState(VK_SHIFT)&32768)
+ {
+ if(iBlurBuffer) iBlurBuffer=0;
+ else iBlurBuffer=1;
+ }
+ BuildDispMenu(-1);
+ break;
+ }
+ if(wParam==(WPARAM)szGPUKeys[5]) {BuildDispMenu( 1); break;}
+
+ }
+ return pOldWinProc( hwnd, message, wParam, lParam );
+}
+
+////////////////////////////////////////////////////////////////////////
+
+void InitKeyHandler(void)
+{
+ if(!pOldWinProc)
+ { 
+ pOldWinProc = (WNDPROC)GetWindowLong(hWWindow, GWL_WNDPROC );
+ SetWindowLong(hWWindow, GWL_WNDPROC, (long)key_winproc);
+ }
+} 
+
+////////////////////////////////////////////////////////////////////////
+
+void ExitKeyHandler(void)
+{
+ if(pOldWinProc)
+ SetWindowLong(hWWindow,GWL_WNDPROC, // set old proc
+ (long)pOldWinProc);
+ pOldWinProc = 0; 
+}
+
+////////////////////////////////////////////////////////////////////////
+// reset stuff on special keyboard commands
+////////////////////////////////////////////////////////////////////////
+
+void ResetStuff(void)
+{
+ ResetTextureArea(TRUE);
+ ulKeybits&=~KEY_RESETTEXSTORE;
+
+ if(ulKeybits&KEY_BLACKWHITE)
+ {
+ if(bUseFixes) {bUseFixes=FALSE;dwActFixes=0;}
+ else {bUseFixes=TRUE; dwActFixes=dwCfgFixes;}
+ SetExtGLFuncs();
+ if(iFrameLimit==2) SetAutoFrameCap();
+ ulKeybits&=~KEY_BLACKWHITE;
+ }
+
+ if(ulKeybits&KEY_RESETFILTER)
+ {
+ if(ulKeybits&KEY_STEPDOWN)
+ iFilterType--;
+ else iFilterType++;
+ if(iFilterType>6) iFilterType=0;
+ if(iFilterType<0) iFilterType=6;
+ SetExtGLFuncs();
+ ulKeybits&=~(KEY_RESETFILTER|KEY_STEPDOWN);
+ BuildDispMenu(0);
+ }
+
+ if(ulKeybits&KEY_RESETOPAQUE)
+ {
+ bOpaquePass=!bOpaquePass;
+ SetExtGLFuncs();
+ ulKeybits&=~KEY_RESETOPAQUE;
+ BuildDispMenu(0);
+ }
+
+ if(ulKeybits&KEY_RESETADVBLEND)
+ {
+ bAdvancedBlend=!bAdvancedBlend;
+ SetExtGLFuncs();
+ ulKeybits&=~KEY_RESETADVBLEND;
+ BuildDispMenu(0);
+ }
+
+ if(ulKeybits&KEY_RESETDITHER)
+ {
+ bDrawDither=!bDrawDither;
+ if(bDrawDither) glEnable(GL_DITHER); 
+ else glDisable(GL_DITHER); 
+ ulKeybits&=~KEY_RESETDITHER;
+ BuildDispMenu(0);
+ }
+
+ if(ulKeybits & KEY_TOGGLEFBTEXTURE)
+ {
+ if(ulKeybits&KEY_STEPDOWN)
+ iFrameTexType--;
+ else iFrameTexType++;
+ if(iFrameTexType>3) iFrameTexType=0;
+ if(iFrameTexType<0) iFrameTexType=3;
+ if(gTexFrameName!=0) 
+ glDeleteTextures(1, &gTexFrameName); 
+ gTexFrameName=0; 
+ ulKeybits&=~(KEY_TOGGLEFBTEXTURE|KEY_STEPDOWN);
+ }
+
+ if(ulKeybits & KEY_TOGGLEFBREAD)
+ {
+ if(ulKeybits&KEY_STEPDOWN)
+ iFrameReadType--;
+ else iFrameReadType++;
+ if(iFrameReadType>4) iFrameReadType=0;
+ if(iFrameReadType<0) iFrameReadType=4;
+ if(iFrameReadType==4) bFullVRam=TRUE;
+ else bFullVRam=FALSE;
+ iRenderFVR=0;
+ ulKeybits&=~(KEY_TOGGLEFBREAD|KEY_STEPDOWN);
+ }
+}

pcsxr-1.9.93.tar.bz2/win32/plugins/peopsxgl/winsrc/ssave.c Added

@@ -0,0 +1,65 @@
+/***************************************************************************
+                           ssave.c  -  description
+                             -------------------
+    begin                : Sun Mar 08 2009
+    copyright            : (C) 1999-2009 by Pete Bernert
+    web                  : www.pbernert.com   
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+//*************************************************************************// 
+// History of changes:
+//
+// 2009/03/08 - Pete  
+// - generic cleanup for the Peops release
+//
+//*************************************************************************// 
+
+#include "stdafx.h"
+
+#include "externals.h"
+
+////////////////////////////////////////////////////////////////////////
+// screensaver stuff: dynamically load kernel32.dll to avoid export dependeny
+////////////////////////////////////////////////////////////////////////
+
+#ifdef __MINGW32__
+#define EXECUTION_STATE DWORD
+#endif
+
+void EnableScreenSaver(BOOL bEnab)
+{
+ HINSTANCE hKernel32 = NULL;
+ EXECUTION_STATE (WINAPI *D_SetThreadExecutionState)(EXECUTION_STATE esFlags);
+
+ if(bEnab)
+  {
+   hKernel32 = LoadLibrary("kernel32.dll");
+   if(hKernel32 != NULL)
+    {
+     if((D_SetThreadExecutionState=(EXECUTION_STATE (WINAPI *)(EXECUTION_STATE))GetProcAddress(hKernel32,"SetThreadExecutionState"))!=NULL)
+      D_SetThreadExecutionState(ES_SYSTEM_REQUIRED|ES_DISPLAY_REQUIRED);
+     FreeLibrary(hKernel32);
+    }
+  }
+ else
+  {
+   hKernel32 = LoadLibrary("kernel32.dll");
+   if(hKernel32 != NULL)
+    {
+     if((D_SetThreadExecutionState=(EXECUTION_STATE (WINAPI *)(EXECUTION_STATE))GetProcAddress(hKernel32,"SetThreadExecutionState"))!=NULL)
+      D_SetThreadExecutionState(ES_SYSTEM_REQUIRED|ES_DISPLAY_REQUIRED|ES_CONTINUOUS);
+     FreeLibrary(hKernel32);
+    }
+  }
+}
+

pcsxr-1.9.93.tar.bz2/win32/plugins/peopsxgl/winsrc/ssave.h Added

@@ -0,0 +1,29 @@
+/***************************************************************************
+                           ssave.h  -  description
+                             -------------------
+    begin                : Sun Mar 08 2009
+    copyright            : (C) 1999-2009 by Pete Bernert
+    web                  : www.pbernert.com   
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+//*************************************************************************// 
+// History of changes:
+//
+// 2009/03/08 - Pete  
+// - generic cleanup for the Peops release
+//
+//*************************************************************************// 
+
+// prototype
+
+void EnableScreenSaver(BOOL bEnab);
\ No newline at end of file

pcsxr-1.9.93.tar.bz2/win32/plugins/peopsxgl/winsrc/winmain.c Added

@@ -0,0 +1,42 @@
+/***************************************************************************
+                       gpuPeopsOpenGL.c  -  description
+                             -------------------
+    begin                : Sun Mar 08 2009
+    copyright            : (C) 1999-2009 by Pete Bernert
+    web                  : www.pbernert.com   
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+//*************************************************************************// 
+// History of changes:
+//
+// 2009/03/08 - Pete  
+// - generic cleanup for the Peops release
+//
+//*************************************************************************// 
+
+#include "stdafx.h"
+               
+///////////////////////////////////////////////////////////////////////////
+// GENERIC FUNCS //////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////
+
+HINSTANCE hInst=NULL;
+
+BOOL APIENTRY DllMain(HANDLE hModule,                  // DLL INIT
+                      DWORD  dwReason, 
+                      LPVOID lpReserved)
+{
+ hInst=(HINSTANCE)hModule;
+ return TRUE;                                          // very quick :)
+}
+

pcsxr-1.9.92.tar.bz2/win32/resource.h -> pcsxr-1.9.93.tar.bz2/win32/resource.h Changed

@@ -1,6 +1,6 @@
 //{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by pcsx.rc
+// Microsoft Visual C++ generated include file.
+// Used by pcsxr.rc
 //
 #define IDS_TITLE                       1
 #define IDC_SEARCHFOR                   100
@@ -61,7 +61,7 @@
 #define IDC_DESCR                       1013
 #define IDC_ADDRESS                     1013
 #define IDC_CLOSE                       1014
-#define IDC_PCSX_ABOUT_TEXT             1014
+#define IDC_PCSXR_ABOUT_TEXT            1014
 #define IDC_PSXOUT                      1014
 #define IDC_ASM_SCROLL                  1015
 #define IDC_CPU                         1015
@@ -70,6 +70,7 @@
 #define IDC_ASMCHECK3                   1017
 #define IDC_MDEC2                       1017
 #define IDC_CDTIMING                    1017
+#define IDC_SLOWBOOT                    1017
 #define IDC_ASMCHECK4                   1018
 #define IDC_ASMCHECK5                   1019
 #define IDC_RELOAD1                     1019
@@ -100,9 +101,9 @@
 #define IDC_LIST2                       1028
 #define IDC_CONNECTSTR                  1028
 #define IDC_ASMCHECK15                  1029
-#define IDC_PCSX_ABOUT_AUTHORS          1029
+#define IDC_PCSXR_ABOUT_AUTHORS         1029
 #define IDC_ASMCHECK16                  1030
-#define IDC_PCSX_ABOUT_GREETS           1030
+#define IDC_PCSXR_ABOUT_GREETS          1030
 #define IDC_ASMCHECK17                  1031
 #define IDC_SELPSX                      1031
 #define IDC_ASMCHECK18                  1032
@@ -125,6 +126,7 @@
 #define IDC_ASMCHECK24                  1038
 #define IDC_BIOS                        1038
 #define IDC_NETPLAY                     1039
+#define IDC_LINKCABLE                   1039
 #define IDC_NETPLAYNOTE                 1040
 #define IDC_FRAMEMCD1                   1041
 #define IDC_FRAMEMCD2                   1042
@@ -165,6 +167,7 @@
 #define IDC_TESTCDR                     1063
 #define IDC_ABOUTCDR                    1064
 #define IDC_COMBODRIVE                  1065
+#define IDC_LISTSIO1                    1065
 #define IDC_LISTPAD1                    1066
 #define IDC_CONFIGPAD1                  1067
 #define IDC_GPR12                       1068
@@ -180,8 +183,12 @@
 #define IDC_GPR17                       1073
 #define IDC_ABOUTPAD2                   1073
 #define IDC_GPR18                       1074
+#define IDC_CONFIGSIO1                  1074
 #define IDC_GPR19                       1075
+#define IDC_TESTSIO1                    1075
 #define IDC_GPR20                       1076
+#define IDC_ABOUTCDR2                   1076
+#define IDC_ABOUTSIO1                   1076
 #define IDC_GPR21                       1077
 #define IDC_GPR22                       1078
 #define IDC_GPR23                       1079
@@ -295,6 +302,8 @@
 #define IDC_LABEL_SEARCHFOR             1261
 #define IDC_LABEL_VALUE                 1262
 #define IDC_LABEL_DATABASE              1263
+#define IDC_WIDESCREEN                  1264
+#define IDC_HIDECURSOR                  1265
 #define ID_FILE_EXIT                    40001
 #define ID_HELP_ABOUT                   40002
 #define ID_FILE_RUN_CD                  40003
@@ -311,25 +320,36 @@
 #define ID_EMULATOR_RUN                 40014
 #define ID_DEBUGREG                     40015
 #define ID_DEBUG_MESSAGES               40015
+#define ID_EMULATOR_SHUTDOWN            40015
+#define ID_FILE_RUN_NOGUI               40016
 #define ID_CONFIGURATION_CONTROLLERS    40017
 #define ID_CONFIGURATION                40018
+#define ID_CONFIGURATION_LINKCABLE      40019
 #define ID_FILE_RUNBIOS                 40026
-#define ID_FILE_STATES_LOAD_SLOT1       40031
-#define ID_FILE_STATES_LOAD_SLOT2       40032
-#define ID_FILE_STATES_LOAD_SLOT3       40033
-#define ID_FILE_STATES_LOAD_SLOT4       40034
-#define ID_FILE_STATES_LOAD_SLOT5       40035
-#define ID_FILE_STATES_LOAD_OTHER       40036
-#define ID_FILE_STATES_SAVE_SLOT1       40037
-#define ID_FILE_STATES_SAVE_SLOT2       40038
-#define ID_FILE_STATES_SAVE_SLOT3       40039
-#define ID_FILE_STATES_SAVE_SLOT4       40040
-#define ID_FILE_STATES_SAVE_SLOT5       40041
-#define ID_FILE_STATES_SAVE_OTHER       40042
 #define ID_CONFIGURATION_NETPLAY        40043
 #define ID_EMULATOR_SWITCH_ISO          40044
 #define ID_CONFIGURATION_CHEATLIST      40045
 #define ID_CONFIGURATION_CHEATSEARCH    40046
+#define ID_FILE_STATES_LOAD_SLOT1       40048
+#define ID_FILE_STATES_LOAD_SLOT2       40049
+#define ID_FILE_STATES_LOAD_SLOT3       40050
+#define ID_FILE_STATES_LOAD_SLOT4       40051
+#define ID_FILE_STATES_LOAD_SLOT5       40052
+#define ID_FILE_STATES_LOAD_SLOT6       40053
+#define ID_FILE_STATES_LOAD_SLOT7       40054
+#define ID_FILE_STATES_LOAD_SLOT8       40055
+#define ID_FILE_STATES_LOAD_SLOT9       40056
+#define ID_FILE_STATES_LOAD_OTHER       40057
+#define ID_FILE_STATES_SAVE_SLOT1       40058
+#define ID_FILE_STATES_SAVE_SLOT2       40059
+#define ID_FILE_STATES_SAVE_SLOT3       40060
+#define ID_FILE_STATES_SAVE_SLOT4       40061
+#define ID_FILE_STATES_SAVE_SLOT5       40062
+#define ID_FILE_STATES_SAVE_SLOT6       40063
+#define ID_FILE_STATES_SAVE_SLOT7       40064
+#define ID_FILE_STATES_SAVE_SLOT8       40065
+#define ID_FILE_STATES_SAVE_SLOT9       40066
+#define ID_FILE_STATES_SAVE_OTHER       40067
 #define ID_LANGS                        50000
 
 // Next default values for new objects
@@ -339,6 +359,6 @@
 #define _APS_NEXT_RESOURCE_VALUE        116
 #define _APS_NEXT_COMMAND_VALUE         40047
 #define _APS_NEXT_CONTROL_VALUE         1054
-#define _APS_NEXT_SYMED_VALUE           101
+#define _APS_NEXT_SYMED_VALUE           102
 #endif
 #endif